Code cleanup

Author: Federico Fissore

app/src/processing/app/syntax/SketchTextArea.java

@@ -86,7 +86,7 @@ public SketchTextArea(PdeKeywords pdeKeywords) throws IOException {
     installFeatures();
   }
 
-  protected void installFeatures() throws IOException {
+  private void installFeatures() throws IOException {
     setTheme(PreferencesData.get("editor.syntax_theme", "default"));
 
     setLinkGenerator(new DocLinkGenerator(pdeKeywords));
@@ -96,7 +96,7 @@ protected void installFeatures() throws IOException {
     setSyntaxEditingStyle(SYNTAX_STYLE_CPLUSPLUS);
   }
 
-  public void setTheme(String name) throws IOException {
+  private void setTheme(String name) throws IOException {
     FileInputStream defaultXmlInputStream = null;
     try {
       defaultXmlInputStream = new FileInputStream(new File(BaseNoGui.getContentFile("lib"), "theme/syntax/" + name + ".xml"));
@@ -143,31 +143,26 @@ private void setSyntaxTheme(int tokenType, String id) {
 
   // Removing the default focus traversal keys
   // This is because the DefaultKeyboardFocusManager handles the keypress and consumes the event
-  protected void fixControlTab() {
+  private void fixControlTab() {
     removeCTRLTabFromFocusTraversal();
 
     removeCTRLSHIFTTabFromFocusTraversal();
   }
 
   private void removeCTRLSHIFTTabFromFocusTraversal() {
     KeyStroke ctrlShiftTab = KeyStroke.getKeyStroke("ctrl shift TAB");
-    Set<AWTKeyStroke> backwardKeys = new HashSet<AWTKeyStroke>(this.getFocusTraversalKeys(KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS));
+    Set<AWTKeyStroke> backwardKeys = new HashSet<>(this.getFocusTraversalKeys(KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS));
     backwardKeys.remove(ctrlShiftTab);
   }
 
   private void removeCTRLTabFromFocusTraversal() {
     KeyStroke ctrlTab = KeyStroke.getKeyStroke("ctrl TAB");
-    Set<AWTKeyStroke> forwardKeys = new HashSet<AWTKeyStroke>(this.getFocusTraversalKeys(KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS));
+    Set<AWTKeyStroke> forwardKeys = new HashSet<>(this.getFocusTraversalKeys(KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS));
     forwardKeys.remove(ctrlTab);
     this.setFocusTraversalKeys(KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS, forwardKeys);
   }
 
 
-  @Override
-  public void select(int selectionStart, int selectionEnd) {
-    super.select(selectionStart, selectionEnd);
-  }
-
   public boolean isSelectionActive() {
     return this.getSelectedText() != null;
   }
@@ -221,17 +216,6 @@ public void switchDocument(Document document, UndoManager newUndo) {
 
   }
 
-  @Override
-  protected JPopupMenu createPopupMenu() {
-    JPopupMenu menu = super.createPopupMenu();
-    return menu;
-  }
-
-  @Override
-  protected void configurePopupMenu(JPopupMenu popupMenu) {
-    super.configurePopupMenu(popupMenu);
-  }
-
   @Override
   protected RTAMouseListener createMouseListener() {
     return new SketchTextAreaMouseListener(this);
@@ -242,7 +226,7 @@ public void getTextLine(int line, Segment segment) {
       int offset = getLineStartOffset(line);
       int end = getLineEndOffset(line);
       getDocument().getText(offset, end - offset, segment);
-    } catch (BadLocationException e) {
+    } catch (BadLocationException ignored) {
     }
   }
 
@@ -271,16 +255,16 @@ public DocLinkGenerator(PdeKeywords pdeKeywords) {
 
     @Override
     public LinkGeneratorResult isLinkAtOffset(RSyntaxTextArea textArea, final int offs) {
+      Token token = textArea.modelToToken(offs);
+      if (token == null) {
+        return null;
+      }
 
-      final Token token = textArea.modelToToken(offs);
-
-      final String reference = pdeKeywords.getReference(token.getLexeme());
-
-      // LOG.fine("reference: " + reference + ", match: " + (token.getType() == TokenTypes.DATA_TYPE || token.getType() == TokenTypes.VARIABLE || token.getType() == TokenTypes.FUNCTION));
+      String reference = pdeKeywords.getReference(token.getLexeme());
 
-      if (token != null && (reference != null || (token.getType() == TokenTypes.DATA_TYPE || token.getType() == TokenTypes.VARIABLE || token.getType() == TokenTypes.FUNCTION))) {
+      if (reference != null || (token.getType() == TokenTypes.DATA_TYPE || token.getType() == TokenTypes.VARIABLE || token.getType() == TokenTypes.FUNCTION)) {
 
-        LinkGeneratorResult generatorResult = new LinkGeneratorResult() {
+        return new LinkGeneratorResult() {
 
           @Override
           public int getSourceOffset() {
@@ -297,8 +281,6 @@ public HyperlinkEvent execute() {
             return null;
           }
         };
-
-        return generatorResult;
       }
 
       return null;
@@ -316,7 +298,7 @@ private class SketchTextAreaMouseListener extends RTextAreaMutableCaretEvent {
     private boolean isScanningForLinks;
     private int hoveredOverLinkOffset = -1;
 
-    protected SketchTextAreaMouseListener(RTextArea textArea) {
+    SketchTextAreaMouseListener(RTextArea textArea) {
       super(textArea);
       insets = new Insets(0, 0, 0, 0);
     }
@@ -458,7 +440,7 @@ private void stopScanningForLinks() {
       if (isScanningForLinks) {
         Cursor c = getCursor();
         isScanningForLinks = false;
-        if (c != null && c.getType() == Cursor.HAND_CURSOR) {
+        if (c.getType() == Cursor.HAND_CURSOR) {
           setCursor(Cursor.getPredefinedCursor(Cursor.TEXT_CURSOR));
           repaint(); // TODO: Repaint just the affected line.
         }