From e136b0b9b93fc9ca4fe78ea6ae0851de32d33094 Mon Sep 17 00:00:00 2001 From: benfry Date: Sat, 29 Oct 2011 15:03:28 +0000 Subject: [PATCH] moving packages around, changing some visibility to make it work --- app/src/processing/app/Base.java | 34 ++++++++++--------- app/src/processing/app/Editor.java | 5 +-- app/src/processing/app/Library.java | 7 ++-- app/src/processing/app/Mode.java | 4 +-- app/src/processing/app/UpdateCheck.java | 9 ++--- .../{ => contrib}/ContributionListPanel.java | 8 ++--- .../{ => contrib}/ContributionListing.java | 9 +++-- .../{ => contrib}/ContributionManager.java | 11 +++--- .../ContributionManagerDialog.java | 26 +++++++------- .../app/{ => contrib}/FileDownloader.java | 2 +- .../app/{ => contrib}/LibraryCompilation.java | 12 +++---- .../app/{ => contrib}/ModeContribution.java | 7 ++-- .../app/{ => contrib}/ProgressMonitor.java | 2 +- .../app/{ => contrib}/ToolContribution.java | 7 ++-- 14 files changed, 73 insertions(+), 70 deletions(-) rename app/src/processing/app/{ => contrib}/ContributionListPanel.java (99%) rename app/src/processing/app/{ => contrib}/ContributionListing.java (98%) rename app/src/processing/app/{ => contrib}/ContributionManager.java (95%) rename app/src/processing/app/{ => contrib}/ContributionManagerDialog.java (97%) rename app/src/processing/app/{ => contrib}/FileDownloader.java (98%) rename app/src/processing/app/{ => contrib}/LibraryCompilation.java (89%) rename app/src/processing/app/{ => contrib}/ModeContribution.java (93%) rename app/src/processing/app/{ => contrib}/ProgressMonitor.java (99%) rename app/src/processing/app/{ => contrib}/ToolContribution.java (94%) diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java index 9597b74ce..6aa52d536 100644 --- a/app/src/processing/app/Base.java +++ b/app/src/processing/app/Base.java @@ -35,7 +35,12 @@ import javax.swing.*; import javax.swing.tree.*; import processing.app.contrib.Contribution; +import processing.app.contrib.ContributionListing; +import processing.app.contrib.ContributionManager; +import processing.app.contrib.ContributionManagerDialog; import processing.app.contrib.InstalledContribution; +import processing.app.contrib.ModeContribution; +import processing.app.contrib.ToolContribution; import processing.core.*; /** @@ -94,11 +99,8 @@ public class Base { // A single instance of the library manager window ContributionManagerDialog libraryManagerFrame; - ContributionManagerDialog toolManagerFrame; - ContributionManagerDialog modeManagerFrame; - ContributionManagerDialog updateManagerFrame; // set to true after the first time the menu is built. @@ -116,7 +118,7 @@ public class Base { private Mode defaultMode; private Mode[] coreModes; - List contribModes; + public List contribModes; private JMenu sketchbookMenu; @@ -320,15 +322,15 @@ public class Base { private void buildCoreModes() { - defaultMode = ModeContribution - .getCoreMode(this, "processing.mode.java.JavaMode", - getContentFile("modes/java")); - Mode androidMode = ModeContribution - .getCoreMode(this, "processing.mode.android.AndroidMode", - getContentFile("modes/android")); - Mode javaScriptMode = ModeContribution - .getCoreMode(this, "processing.mode.javascript.JavaScriptMode", - getContentFile("modes/javascript")); + defaultMode = + ModeContribution.getCoreMode(this, "processing.mode.java.JavaMode", + getContentFile("modes/java")); + Mode androidMode = + ModeContribution.getCoreMode(this, "processing.mode.android.AndroidMode", + getContentFile("modes/android")); + Mode javaScriptMode = + ModeContribution.getCoreMode(this, "processing.mode.javascript.JavaScriptMode", + getContentFile("modes/javascript")); coreModes = new Mode[] { defaultMode, androidMode, javaScriptMode }; } @@ -340,8 +342,8 @@ public class Base { if (contribModes == null) contribModes = new ArrayList(); - ArrayList newContribs = ModeContribution - .list(this, getSketchbookModesFolder()); + ArrayList newContribs = + ModeContribution.list(this, getSketchbookModesFolder()); for (ModeContribution contrib : newContribs) { if (!contribModes.contains(contrib)) { if (contrib.instantiateModeClass()) { @@ -626,7 +628,7 @@ public class Base { static final int SHORTCUT_KEY_MASK = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(); /** Command-W on Mac OS X, Ctrl-W on Windows and Linux */ - static final KeyStroke WINDOW_CLOSE_KEYSTROKE = + public static final KeyStroke WINDOW_CLOSE_KEYSTROKE = KeyStroke.getKeyStroke('W', SHORTCUT_KEY_MASK); /** Command-Option on Mac OS X, Ctrl-Alt on Windows and Linux */ static final int SHORTCUT_ALT_KEY_MASK = ActionEvent.ALT_MASK | diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java index 2ed844bf8..385294a55 100644 --- a/app/src/processing/app/Editor.java +++ b/app/src/processing/app/Editor.java @@ -22,6 +22,7 @@ package processing.app; +import processing.app.contrib.ToolContribution; import processing.app.syntax.*; import processing.app.tools.*; import processing.core.*; @@ -106,7 +107,7 @@ public abstract class Editor extends JFrame implements RunnerListener { JMenu modeMenu; ArrayList coreTools; - ArrayList contribTools; + public ArrayList contribTools; protected Editor(final Base base, String path, int[] location, final Mode mode) { super("Processing"); @@ -872,7 +873,7 @@ public abstract class Editor extends JFrame implements RunnerListener { } - protected void rebuildToolMenu() { + public void rebuildToolMenu() { if (toolsMenu == null) { toolsMenu = new JMenu("Tools"); } else { diff --git a/app/src/processing/app/Library.java b/app/src/processing/app/Library.java index c27ca69aa..364c37935 100644 --- a/app/src/processing/app/Library.java +++ b/app/src/processing/app/Library.java @@ -35,7 +35,7 @@ public class Library extends InstalledContribution { */ String nativeLibraryPath; - static String propertiesFileName = "library.properties"; + static public final String propertiesFileName = "library.properties"; /** Filter to pull out just files and no directories, and to skip export.txt */ static FilenameFilter standardFilter = new FilenameFilter() { @@ -371,13 +371,13 @@ public class Library extends InstalledContribution { } }; - static protected ArrayList discover(File folder) { + public static ArrayList discover(File folder) { ArrayList libraries = new ArrayList(); discover(folder, libraries); return libraries; } - static protected void discover(File folder, ArrayList libraries) { + static public void discover(File folder, ArrayList libraries) { String[] list = folder.list(junkFolderFilter); // if a bad folder or something like that, this might come back null @@ -445,5 +445,4 @@ public class Library extends InstalledContribution { public Type getType() { return Type.LIBRARY; } - } diff --git a/app/src/processing/app/Mode.java b/app/src/processing/app/Mode.java index 0302fe9f2..11d2cbbd5 100644 --- a/app/src/processing/app/Mode.java +++ b/app/src/processing/app/Mode.java @@ -42,8 +42,8 @@ public abstract class Mode { protected File librariesFolder; protected File referenceFolder; - protected ArrayList coreLibraries; - protected ArrayList contribLibraries; + public ArrayList coreLibraries; + public ArrayList contribLibraries; public Mode(Base base, File folder) { diff --git a/app/src/processing/app/UpdateCheck.java b/app/src/processing/app/UpdateCheck.java index d5727c555..5ef4b298b 100644 --- a/app/src/processing/app/UpdateCheck.java +++ b/app/src/processing/app/UpdateCheck.java @@ -123,12 +123,9 @@ public class UpdateCheck { // Wait for xml file to be downloaded and updates to come in. (this // should really be handled better). Thread.sleep(5 * 1000); - if (!base.libraryManagerFrame.hasAlreadyBeenOpened() - && base.libraryManagerFrame.contribListing.hasUpdates() - || !base.toolManagerFrame.hasAlreadyBeenOpened() - && base.toolManagerFrame.contribListing.hasUpdates() - || !base.modeManagerFrame.hasAlreadyBeenOpened() - && base.modeManagerFrame.contribListing.hasUpdates()) { + if (!base.libraryManagerFrame.hasAlreadyBeenOpened() && base.libraryManagerFrame.hasUpdates() || + !base.toolManagerFrame.hasAlreadyBeenOpened() && base.toolManagerFrame.hasUpdates() || + !base.modeManagerFrame.hasAlreadyBeenOpened() && base.modeManagerFrame.hasUpdates()) { promptToOpenContributionManager(); } } diff --git a/app/src/processing/app/ContributionListPanel.java b/app/src/processing/app/contrib/ContributionListPanel.java similarity index 99% rename from app/src/processing/app/ContributionListPanel.java rename to app/src/processing/app/contrib/ContributionListPanel.java index fc745f3a7..a3dc5750d 100644 --- a/app/src/processing/app/ContributionListPanel.java +++ b/app/src/processing/app/contrib/ContributionListPanel.java @@ -20,7 +20,7 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package processing.app; +package processing.app.contrib; import java.util.*; import java.util.List; @@ -39,9 +39,9 @@ import java.awt.*; import java.io.File; import java.net.*; -import processing.app.ContributionListing.AdvertisedContribution; -import processing.app.ContributionListing.ContributionChangeListener; -import processing.app.contrib.*; +import processing.app.Base; +import processing.app.contrib.ContributionListing.AdvertisedContribution; +import processing.app.contrib.ContributionListing.ContributionChangeListener; public class ContributionListPanel extends JPanel implements Scrollable, ContributionChangeListener { diff --git a/app/src/processing/app/ContributionListing.java b/app/src/processing/app/contrib/ContributionListing.java similarity index 98% rename from app/src/processing/app/ContributionListing.java rename to app/src/processing/app/contrib/ContributionListing.java index 22d0d026d..e605d19f4 100644 --- a/app/src/processing/app/ContributionListing.java +++ b/app/src/processing/app/contrib/ContributionListing.java @@ -21,15 +21,14 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package processing.app; +package processing.app.contrib; import java.io.*; import java.net.*; import java.util.*; import java.util.concurrent.locks.ReentrantLock; -import processing.app.contrib.*; -import processing.app.contrib.Contribution.Type; +import processing.app.Base; import processing.core.PApplet; public class ContributionListing { @@ -468,7 +467,7 @@ public class ContributionListing { HashMap exports = new HashMap(); Base.readSettings(null, strings, exports); - Type kind = Contribution.Type.toType(type); + Contribution.Type kind = Contribution.Type.toType(type); outgoing.add(new AdvertisedContribution(kind, exports)); start = end + 1; @@ -563,7 +562,7 @@ public class ContributionListing { return downloadingListingLock.isLocked(); } - static interface Filter { + public static interface Filter { boolean matches(Contribution contrib); } diff --git a/app/src/processing/app/ContributionManager.java b/app/src/processing/app/contrib/ContributionManager.java similarity index 95% rename from app/src/processing/app/ContributionManager.java rename to app/src/processing/app/contrib/ContributionManager.java index 24536915d..fed15f11b 100644 --- a/app/src/processing/app/ContributionManager.java +++ b/app/src/processing/app/contrib/ContributionManager.java @@ -1,4 +1,4 @@ -package processing.app; +package processing.app.contrib; import java.io.*; import java.net.URL; @@ -8,9 +8,12 @@ import java.util.zip.*; import javax.swing.JOptionPane; -import processing.app.ContributionListing.AdvertisedContribution; -import processing.app.contrib.*; +import processing.app.Base; +import processing.app.Editor; +import processing.app.Library; +import processing.app.Preferences; import processing.app.contrib.Contribution.Type; +import processing.app.contrib.ContributionListing.AdvertisedContribution; interface ErrorWidget { void setErrorMessage(String msg); @@ -137,7 +140,7 @@ public class ContributionManager { editor.rebuildToolMenu(); } - static ArrayList discover(Type type, File tempDir) { + static ArrayList discover(Contribution.Type type, File tempDir) { switch (type) { case LIBRARY: return Library.discover(tempDir); diff --git a/app/src/processing/app/ContributionManagerDialog.java b/app/src/processing/app/contrib/ContributionManagerDialog.java similarity index 97% rename from app/src/processing/app/ContributionManagerDialog.java rename to app/src/processing/app/contrib/ContributionManagerDialog.java index 2331d614f..9420d6a9d 100644 --- a/app/src/processing/app/ContributionManagerDialog.java +++ b/app/src/processing/app/contrib/ContributionManagerDialog.java @@ -21,7 +21,7 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package processing.app; +package processing.app.contrib; import java.awt.*; import java.awt.event.*; @@ -31,36 +31,30 @@ import java.util.List; import javax.swing.*; import javax.swing.event.*; -import processing.app.ContributionListing.Filter; -import processing.app.contrib.*; +import processing.app.Base; +import processing.app.Editor; +import processing.app.Library; +import processing.app.contrib.ContributionListing.Filter; public class ContributionManagerDialog { static final String ANY_CATEGORY = "All"; JFrame dialog; - String title; - Filter permaFilter; - JComboBox categoryChooser; - JScrollPane scrollPane; - ContributionListPanel contributionListPanel; - StatusPanel statusBar; - FilterField filterField; // the calling editor, so updates can be applied Editor editor; - String category; - ContributionListing contribListing; + public ContributionManagerDialog(String title, ContributionListing.Filter filter) { @@ -73,7 +67,13 @@ public class ContributionManagerDialog { contribListing.addContributionListener(contributionListPanel); } - protected void showFrame(Editor editor) { + + public boolean hasUpdates() { + return contribListing.hasUpdates(); + } + + + public void showFrame(Editor editor) { this.editor = editor; if (dialog == null) { diff --git a/app/src/processing/app/FileDownloader.java b/app/src/processing/app/contrib/FileDownloader.java similarity index 98% rename from app/src/processing/app/FileDownloader.java rename to app/src/processing/app/contrib/FileDownloader.java index 9846bd5eb..567cce9af 100644 --- a/app/src/processing/app/FileDownloader.java +++ b/app/src/processing/app/contrib/FileDownloader.java @@ -21,7 +21,7 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package processing.app; +package processing.app.contrib; import java.io.File; import java.io.FileNotFoundException; diff --git a/app/src/processing/app/LibraryCompilation.java b/app/src/processing/app/contrib/LibraryCompilation.java similarity index 89% rename from app/src/processing/app/LibraryCompilation.java rename to app/src/processing/app/contrib/LibraryCompilation.java index ac97322d1..e07861b39 100644 --- a/app/src/processing/app/LibraryCompilation.java +++ b/app/src/processing/app/contrib/LibraryCompilation.java @@ -1,18 +1,17 @@ -package processing.app; +package processing.app.contrib; import java.io.*; import java.util.*; -import processing.app.contrib.*; +import processing.app.Library; + public class LibraryCompilation extends InstalledContribution { - ArrayList libraries; - static String propertiesFileName = "compilation.properties"; - private LibraryCompilation(File folder) throws IOException { - + + private LibraryCompilation(File folder) throws IOException { super(folder, LibraryCompilation.propertiesFileName); libraries = new ArrayList(); @@ -24,6 +23,7 @@ public class LibraryCompilation extends InstalledContribution { } } + public static ArrayList list(ArrayList libraries) { HashMap folderByGroup = new HashMap(); diff --git a/app/src/processing/app/ModeContribution.java b/app/src/processing/app/contrib/ModeContribution.java similarity index 93% rename from app/src/processing/app/ModeContribution.java rename to app/src/processing/app/contrib/ModeContribution.java index 2e14186c4..a7db4a2bd 100644 --- a/app/src/processing/app/ModeContribution.java +++ b/app/src/processing/app/contrib/ModeContribution.java @@ -20,7 +20,7 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package processing.app; +package processing.app.contrib; import java.io.File; import java.io.FileFilter; @@ -31,7 +31,8 @@ import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; -import processing.app.contrib.InstalledContribution; +import processing.app.Base; +import processing.app.Mode; public class ModeContribution extends InstalledContribution { @@ -137,7 +138,7 @@ public class ModeContribution extends InstalledContribution { return loader.equals(other.loader) && className.equals(other.className); } - static protected ArrayList list(Base base, File folder) { + static public ArrayList list(Base base, File folder) { ArrayList modes = new ArrayList(); ArrayList modeFolders = discover(folder); diff --git a/app/src/processing/app/ProgressMonitor.java b/app/src/processing/app/contrib/ProgressMonitor.java similarity index 99% rename from app/src/processing/app/ProgressMonitor.java rename to app/src/processing/app/contrib/ProgressMonitor.java index e338855ca..7386ae2ca 100644 --- a/app/src/processing/app/ProgressMonitor.java +++ b/app/src/processing/app/contrib/ProgressMonitor.java @@ -20,7 +20,7 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package processing.app; +package processing.app.contrib; /** * The ProgressMonitor interface should be implemented by objects that observe diff --git a/app/src/processing/app/ToolContribution.java b/app/src/processing/app/contrib/ToolContribution.java similarity index 94% rename from app/src/processing/app/ToolContribution.java rename to app/src/processing/app/contrib/ToolContribution.java index d2faa9a96..62e63868c 100644 --- a/app/src/processing/app/ToolContribution.java +++ b/app/src/processing/app/contrib/ToolContribution.java @@ -20,16 +20,17 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -package processing.app; +package processing.app.contrib; import java.io.*; import java.net.*; import java.util.*; import java.util.zip.*; -import processing.app.contrib.*; +import processing.app.Editor; import processing.app.tools.Tool; + public class ToolContribution extends InstalledContribution implements Tool { String className; @@ -159,7 +160,7 @@ public class ToolContribution extends InstalledContribution implements Tool { * Tools that failed to initialize for whatever reason are not * returned */ - static protected ArrayList list(File folder, boolean doInitializeToolClass) { + public static ArrayList list(File folder, boolean doInitializeToolClass) { ArrayList toolsFolders = ToolContribution.discover(folder); ArrayList tools = new ArrayList();