Merge pull request processing#4114 from GKFX/null-check-tap

benfry · benfry · commit 3b279202e5e8 · 2016-02-13T10:43:05.000-05:00
Minor fixes to Java Mode
diff --git a/java/src/processing/mode/java/pdex/ASTGenerator.java b/java/src/processing/mode/java/pdex/ASTGenerator.java
@@ -2497,6 +2497,7 @@ public static void printRecur(ASTNode node) {
 
   protected static ASTNode findLineOfNode(ASTNode node, int lineNumber,
                                         int offset, String name) {
+    if (node == null) return null;
 
     CompilationUnit root = (CompilationUnit) node.getRoot();
 //    log("Inside "+getNodeAsString(node) + " | " + root.getLineNumber(node.getStartPosition()));
diff --git a/java/src/processing/mode/java/pdex/JavaTextAreaPainter.java b/java/src/processing/mode/java/pdex/JavaTextAreaPainter.java
@@ -493,11 +493,9 @@ public String getToolTipText(MouseEvent event) {
         setToolTipText(null);
         return super.getToolTipText(event);
       }
-      String s = textArea.getLineText(line);
-      if (s == "") {
-        return event.toString();
 
-      } else if (s.length() == 0) {
+      String s = textArea.getLineText(line);
+      if (s == null || s.isEmpty()) {
         setToolTipText(null);
         return super.getToolTipText(event);
 
