break up the overly large processing.app pkg and get some distance between ui and non-ui code

Author: benfry

app/src/processing/app/Base.java

@@ -43,6 +43,11 @@
 import javax.swing.tree.DefaultMutableTreeNode;
 
 import processing.app.contrib.*;
+import processing.app.ui.Editor;
+import processing.app.ui.EditorConsole;
+import processing.app.ui.EditorState;
+import processing.app.ui.PreferencesFrame;
+import processing.app.ui.Recent;
 import processing.core.*;
 import processing.data.StringDict;
 import processing.data.StringList;
@@ -237,7 +242,7 @@ public static void setCommandLine() {
  }
 
 
- static protected boolean isCommandLine() {
+ static public boolean isCommandLine() {
  return commandLine;
  }
 
@@ -446,7 +451,7 @@ public List<Editor> getEditors() {
  * The call has already checked to make sure this sketch is not modified,
  * now change the mode.
  */
- protected void changeMode(Mode mode) {
+ public void changeMode(Mode mode) {
  if (activeEditor.getMode() != mode) {
  Sketch sketch = activeEditor.getSketch();
  nextMode = mode;
@@ -558,7 +563,7 @@ public byte[] getInstalledContribsInfo() {
  // changes to the focused and active Windows can be made. Developers must
  // never assume that this Window is the focused or active Window until this
  // Window receives a WINDOW_GAINED_FOCUS or WINDOW_ACTIVATED event.
- protected void handleActivated(Editor whichEditor) {
+ public void handleActivated(Editor whichEditor) {
  activeEditor = whichEditor;
 
  // set the current window to be the console that's getting output
@@ -1192,25 +1197,6 @@ public void populateSketchbookMenu(JMenu menu) {
  }
 
 
-// public JMenu getSketchbookMenu() {
-// if (sketchbookMenu == null) {
-// sketchbookMenu = new JMenu(Language.text("menu.file.sketchbook"));
-// rebuildSketchbookMenu();
-// }
-// return sketchbookMenu;
-// }
-
-
-// public JMenu getRecentMenu() {
-// if (recentMenu == null) {
-// recentMenu = recent.createMenu();
-// } else {
-// recent.updateMenu(recentMenu);
-// }
-// return recentMenu;
-// }
-
-
  public JMenu getRecentMenu() {
  return recent.getMenu();
  }
@@ -1224,10 +1210,13 @@ public JMenu getToolbarRecentMenu() {
  public void handleRecent(Editor editor) {
  recent.handle(editor);
  }
+
+
  public void handleRecentRename(Editor editor,String oldPath){
  recent.handleRename(editor,oldPath);
  }
 
+
  /**
  * Called before a sketch is renamed so that its old name is
  * no longer in the menu.
@@ -1863,7 +1852,7 @@ static public void openURL(String url) {
  * Used to determine whether to disable the "Show Sketch Folder" option.
  * @return true If a means of opening a folder is known to be available.
  */
- static protected boolean openFolderAvailable() {
+ static public boolean openFolderAvailable() {
  return platform.openFolderAvailable();
  }
 

app/src/processing/app/Mode.java

@@ -41,6 +41,9 @@
 import processing.app.contrib.ContributionType;
 import processing.app.contrib.ExamplesContribution;
 import processing.app.syntax.*;
+import processing.app.ui.Editor;
+import processing.app.ui.EditorState;
+import processing.app.ui.Toolkit;
 import processing.core.PApplet;
 import processing.core.PConstants;
 

app/src/processing/app/Preferences.java

@@ -25,6 +25,7 @@
 import java.io.*;
 import java.util.*;
 
+import processing.app.ui.Toolkit;
 import processing.core.*;
 
 
@@ -53,27 +54,6 @@ public class Preferences {
  static HashMap<String, String> table = new HashMap<String, String>();
  static File preferencesFile;
 
- static final String PROMPT_YES = Language.text("prompt.yes");
- static final String PROMPT_NO = Language.text("prompt.no");
- static final String PROMPT_CANCEL = Language.text("prompt.cancel");
- static final String PROMPT_OK = Language.text("prompt.ok");
- static final String PROMPT_BROWSE = Language.text("prompt.browse");
-
- /**
- * Standardized width for buttons. Mac OS X 10.3 wants 70 as its default,
- * Windows XP needs 66, and my Ubuntu machine needs 80+, so 80 seems proper.
- */
- static public int BUTTON_WIDTH =
- Integer.parseInt(Language.text("preferences.button.width"));
-
- // Indents and spacing standards. These probably need to be modified
- // per platform as well, because Mac OS X is so huge, Windows is smaller,
- // and Linux is all over the map. Consider these deprecated.
-
- static final int GUI_BIG = 13;
- static final int GUI_BETWEEN = 8;
- static final int GUI_SMALL = 6;
-
 
  static public void init() {
  // start by loading the defaults, in case something
@@ -192,7 +172,7 @@ static void handleProxy(String protocol, String hostProp, String portProp) {
  }
 
 
- static protected String getPreferencesPath() {
+ static public String getPreferencesPath() {
  return preferencesFile.getAbsolutePath();
  }
 
@@ -262,7 +242,7 @@ static protected boolean isPlatformSpecific(String key, String value,
  // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 
- static protected void save() {
+ static public void save() {
  // on startup, don't worry about it
  // this is trying to update the prefs for who is open
  // before Preferences.init() has been called.
@@ -452,7 +432,7 @@ static protected boolean checkSketchbookPref() {
  }
 
 
- static protected String getSketchbookPath() {
+ static public String getSketchbookPath() {
  return get("sketchbook.path.three"); //$NON-NLS-1$
  }
 

app/src/processing/app/Settings.java

@@ -27,6 +27,7 @@
 import java.io.*;
 import java.util.*;
 
+import processing.app.ui.Toolkit;
 import processing.core.*;
 
 

app/src/processing/app/Sketch.java

@@ -23,6 +23,9 @@
 
 package processing.app;
 
+import processing.app.ui.Editor;
+import processing.app.ui.ProgressFrame;
+import processing.app.ui.Toolkit;
 import processing.core.*;
 
 import java.awt.Component;
@@ -407,8 +410,8 @@ public void keyTyped(KeyEvent event) {
  JOptionPane.OK_CANCEL_OPTION,
  JOptionPane.PLAIN_MESSAGE,
  null, new Object[] {
- Preferences.PROMPT_OK,
- Preferences.PROMPT_CANCEL },
+ Toolkit.PROMPT_OK,
+ Toolkit.PROMPT_CANCEL },
  field);
 
  if (userReply == JOptionPane.OK_OPTION) {
@@ -604,7 +607,7 @@ protected void nameCode(String newName) {
  setCurrentCode(newName);
 
  // update the tabs
- editor.header.rebuild();
+ editor.rebuildHeader();
  }
 
 
@@ -657,7 +660,7 @@ public void handleDeleteCode() {
  // make a new sketch, and i think this will rebuild the sketch menu
  //editor.handleNewUnchecked();
  //editor.handleClose2();
- editor.base.handleClose(editor, false);
+ editor.getBase().handleClose(editor, false);
 
  } else {
  // delete the file
@@ -675,7 +678,7 @@ public void handleDeleteCode() {
  setCurrentCode(0);
 
  // update the tabs
- editor.header.repaint();
+ editor.repaintHeader();
  }
  }
  }
@@ -737,7 +740,7 @@ protected void calcModified() {
  break;
  }
  }
- editor.header.repaint();
+ editor.repaintHeader();
 
  if (Base.isMacOS()) {
  // http://developer.apple.com/qa/qa2001/qa1146.html
@@ -797,7 +800,7 @@ public boolean save() throws IOException {
  * Also removes the previously-generated .class and .jar files,
  * because they can cause trouble.
  */
- protected boolean saveAs() throws IOException {
+ public boolean saveAs() throws IOException {
  String newParentDir = null;
  String newName = null;
 
@@ -1005,8 +1008,8 @@ protected void updateInternal(String sketchName, File sketchFolder) {
  calcModified();
 // System.out.println("modified is now " + modified);
  editor.updateTitle();
- editor.base.rebuildSketchbookMenus();
- editor.base.handleRecentRename(editor,oldPath);
+ editor.getBase().rebuildSketchbookMenus();
+ editor.getBase().handleRecentRename(editor,oldPath);
 // editor.header.rebuild();
  }
 
@@ -1099,7 +1102,7 @@ public boolean addFile(File sourceFile) {
  // check whether this file already exists
  if (destFile.exists()) {
  Object[] options = { Language.text("prompt.ok"), Language.text("prompt.cancel") };
- String prompt = Language.interpolate("add_file.messages.confirm_replace", 
+ String prompt = Language.interpolate("add_file.messages.confirm_replace",
  filename);
  int result = JOptionPane.showOptionDialog(editor,
  prompt,
@@ -1167,7 +1170,7 @@ public boolean addFile(File sourceFile) {
  sortCode();
  }
  setCurrentCode(filename);
- editor.header.repaint();
+ editor.repaintHeader();
  if (isUntitled()) { // TODO probably not necessary? problematic?
  // Mark the new code as modified so that the sketch is saved
  current.setModified(true);
@@ -1217,16 +1220,15 @@ public void setCurrentCode(int which) {
  current.visited = System.currentTimeMillis();
 
  editor.setCode(current);
-// editor.header.rebuild();
- editor.header.repaint();
+ editor.repaintHeader();
  }
 
 
  /**
  * Internal helper function to set the current tab based on a name.
  * @param findName the file name (not pretty name) to be shown
  */
- protected void setCurrentCode(String findName) {
+ public void setCurrentCode(String findName) {
  for (int i = 0; i < codeCount; i++) {
  if (findName.equals(code[i].getFileName()) ||
  findName.equals(code[i].getPrettyName())) {

app/src/processing/app/contrib/ContributionManager.java

@@ -29,8 +29,8 @@
 import javax.swing.SwingWorker;
 
 import processing.app.Base;
-import processing.app.Editor;
 import processing.app.Language;
+import processing.app.ui.Editor;
 import processing.core.PApplet;
 import processing.data.StringDict;
 

app/src/processing/app/contrib/ContributionManagerDialog.java

@@ -31,6 +31,8 @@
 import javax.swing.*;
 
 import processing.app.*;
+import processing.app.ui.Editor;
+import processing.app.ui.Toolkit;
 
 /**
  * 

app/src/processing/app/contrib/ContributionPanel.java

@@ -41,9 +41,9 @@
 import javax.swing.text.html.StyleSheet;
 
 import processing.app.Base;
-import processing.app.Editor;
-import processing.app.Toolkit;
 import processing.app.Language;
+import processing.app.ui.Editor;
+import processing.app.ui.Toolkit;
 
 
 // TODO clean up accessors (too many cases of several de-references for basic tasks

app/src/processing/app/contrib/ContributionTab.java

@@ -38,6 +38,7 @@
 import javax.swing.event.*;
 
 import processing.app.*;
+import processing.app.ui.Editor;
 
 
 public class ContributionTab {

app/src/processing/app/contrib/ContributionType.java

@@ -27,8 +27,8 @@
 import java.util.ArrayList;
 
 import processing.app.Base;
-import processing.app.Editor;
 import processing.app.Library;
+import processing.app.ui.Editor;
 
 public enum ContributionType {
  LIBRARY, TOOL, MODE, EXAMPLES;