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

Minor fixes to Java Mode
This commit is contained in:
Ben Fry
2016-02-13 10:43:05 -05:00
2 changed files with 3 additions and 4 deletions

View File

@@ -2497,6 +2497,7 @@ public class ASTGenerator {
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()));

View File

@@ -493,11 +493,9 @@ public class JavaTextAreaPainter extends TextAreaPainter
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);