just some cleaning

benfry · benfry · commit 21d14dde99c4 · 2015-08-23T08:08:11.000-04:00
diff --git a/app/src/processing/app/ui/Editor.java b/app/src/processing/app/ui/Editor.java
@@ -267,10 +267,6 @@ public void paintComponent(Graphics g) {
 
     upper.add(textarea);
 
-    // alternate spot for status, but ugly
-//    status = new EditorStatus(this);
-//    upper.add(status);
-
     splitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, upper, footer);
 
     // disable this because it hides the message area, which is essential (issue #745)
@@ -285,48 +281,20 @@ public void paintComponent(Graphics g) {
     // remove an ugly border around anything in a SplitPane !$*&!%
     UIManager.getDefaults().put("SplitPane.border", BorderFactory.createEmptyBorder());
     // set the height per our gui design
-    //splitPane.setDividerSize(mode.getInteger("divider.height"));
     splitPane.setDividerSize(EditorStatus.HIGH);
 
     // override the look of the SplitPane so that it's identical across OSes
     splitPane.setUI(new BasicSplitPaneUI() {
       public BasicSplitPaneDivider createDefaultDivider() {
         status = new EditorStatus(this, Editor.this);
         return status;
-        /*
-        return new BasicSplitPaneDivider(this) {
-          final Color dividerColor = mode.getColor("divider.color"); //new Color(204, 204, 204);
-          final Color dotColor = mode.getColor("divider.dot.color"); //new Color(80, 80, 80);
-          int dotSize = mode.getInteger("divider.dot.diameter"); //3;
-
-          @Override
-          public void paint(Graphics g) {
-            Graphics2D g2 = (Graphics2D) g;
-            g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-                                RenderingHints.VALUE_ANTIALIAS_ON);
-
-            final int w = getSize().width;
-            final int h = getSize().height;
-            g.setColor(dividerColor);
-            g.fillRect(0, 0, w, h);
-
-            g.setColor(dotColor);
-            int x = w/2 - dotSize/2;
-            int y = h/2 - dotSize/2;
-            g.fillOval(x, y, dotSize, dotSize);
-          }
-        };
-        */
       }
     });
 
     box.add(splitPane);
 
     contentPain.add(box);
 
-    // get shift down/up events so we can show the alt version of toolbar buttons
-    //textarea.addKeyListener(toolbar);
-
     // end an undo-chunk any time the caret moves unless it's when text is edited
     textarea.addCaretListener(new CaretListener() {
       String lastText = textarea.getText();
@@ -348,8 +316,9 @@ public void caretUpdate(CaretEvent e) {
     state.apply(this);
 
     // Set the minimum size for the editor window
-    setMinimumSize(new Dimension(Preferences.getInteger("editor.window.width.min"),
-                                 Preferences.getInteger("editor.window.height.min")));
+    int minWidth = Preferences.getInteger("editor.window.width.min");
+    int minHeight = Preferences.getInteger("editor.window.height.min");
+    setMinimumSize(new Dimension(minWidth, minHeight));
 
     // Bring back the general options for the editor
     applyPreferences();
@@ -362,10 +331,6 @@ public void caretUpdate(CaretEvent e) {
       public void windowGainedFocus(WindowEvent e) {
         textarea.requestFocusInWindow();
       }
-
-//      public void windowLostFocus(WindowEvent e) {
-//        System.out.println("lost focus, should we tell the text area?");
-//      }
     });
 
     // Open the document that was passed in
@@ -391,43 +356,9 @@ public void removeToolContrib(ToolContribution tc) {
   }
 
 
-  /**
-   * Broken out to get modes working for GSOC, but this needs a longer-term
-   * solution where the listeners are handled properly.
-   */
   protected JEditTextArea createTextArea() {
     return new JEditTextArea(new PdeTextAreaDefaults(mode),
                              new PdeInputHandler());
-    /*
-    return new JEditTextArea(new PdeTextAreaDefaults(mode), new PdeInputHandler()) {
-      // this is a kludge that needs to be removed [fry 150120]
-      public void processKeyEvent(KeyEvent evt) {
-        // this had to be added in Processing 007X, because the menu key
-        // events weren't making it up to the frame.
-        super.processKeyEvent(evt);
-
-        if (inputHandler != null) {
-          // Prevent sketch being marked modified cia ctrl-, on Windows/Linux
-          if ((evt.getModifiers() & InputEvent.CTRL_MASK) != 0 &&
-              evt.getKeyChar() == ',') {
-            System.out.println("skipping " + evt);
-            return;
-          }
-          switch (evt.getID()) {
-          case KeyEvent.KEY_TYPED:
-            inputHandler.keyTyped(evt);
-            break;
-          case KeyEvent.KEY_PRESSED:
-            inputHandler.keyPressed(evt);
-            break;
-          case KeyEvent.KEY_RELEASED:
-            inputHandler.keyReleased(evt);
-            break;
-          }
-        }
-      }
-    };
-    */
   }
 
 
@@ -453,16 +384,6 @@ public EditorState getEditorState() {
   }
 
 
-//  public void removeRecent() {
-//    Recent.remove(this);
-//  }
-//
-//
-//  public void addRecent() {
-//    Recent.handle(this);
-//  }
-
-
   /**
    * Handles files dragged & dropped from the desktop and into the editor
    * window. Dragging files into the editor window is the same as using
diff --git a/app/src/processing/app/ui/EditorStatus.java b/app/src/processing/app/ui/EditorStatus.java
@@ -81,7 +81,6 @@ public class EditorStatus extends BasicSplitPaneDivider {  //JPanel {
   Thread thread;
 
 
-  //public EditorStatus(Editor editor) {
   public EditorStatus(BasicSplitPaneUI ui, Editor editor) {
     super(ui);
     this.editor = editor;
