Merge branch 'master' of https://github.com/processing/processing

Author: REAS

app/src/processing/app/Base.java

@@ -28,7 +28,6 @@
 import java.awt.Frame;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-
 import java.io.*;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -45,6 +44,8 @@
 
 import processing.app.contrib.*;
 import processing.core.*;
+import processing.data.StringDict;
+import processing.data.StringList;
 
 
 /**
@@ -104,12 +105,9 @@ public class Base {
  PreferencesFrame preferencesFrame;
 
  // A single instance of the library manager window
- ContributionManagerDialog libraryManagerFrame;
- ContributionManagerDialog toolManagerFrame;
- ContributionManagerDialog modeManagerFrame;
- ContributionManagerDialog exampleManagerFrame;
- ContributionManagerDialog updateManagerFrame;
+ ContributionManagerDialog contributionManagerFrame;
 
+ 
  // Location for untitled items
  static File untitledFolder;
 
@@ -396,16 +394,8 @@ public Base(String[] args) throws Exception {
  }
  }
 
- libraryManagerFrame =
- new ContributionManagerDialog(ContributionType.LIBRARY);
- toolManagerFrame =
- new ContributionManagerDialog(ContributionType.TOOL);
- modeManagerFrame =
- new ContributionManagerDialog(ContributionType.MODE);
- exampleManagerFrame =
- new ContributionManagerDialog(ContributionType.EXAMPLES);
- updateManagerFrame =
- new ContributionManagerDialog(null);
+ contributionManagerFrame =
+ new ContributionManagerDialog();
 
  // Make sure ThinkDifferent has library examples too
  nextMode.rebuildLibraryList();
@@ -449,9 +439,7 @@ public Base(String[] args) throws Exception {
  }
 
  // check for updates
- if (Preferences.getBoolean("update.check")) { //$NON-NLS-1$
- new UpdateCheck(this);
- }
+ new UpdateCheck(this);
  }
 
 
@@ -528,6 +516,60 @@ public List<ExamplesContribution> getExampleContribs() {
  }
 
 
+ private List<Contribution> getInstalledContribs() {
+ List<Contribution> contributions = new ArrayList<Contribution>();
+
+ List<ModeContribution> modeContribs = getModeContribs();
+ contributions.addAll(modeContribs);
+
+ for (ModeContribution modeContrib : modeContribs) {
+ Mode mode = modeContrib.getMode();
+ contributions.addAll(new ArrayList<Library>(mode.contribLibraries));
+ }
+
+ // TODO this duplicates code in Editor, but it's not editor-specific
+// List<ToolContribution> toolContribs =
+// ToolContribution.loadAll(Base.getSketchbookToolsFolder());
+// contributions.addAll(toolContribs);
+ contributions.addAll(ToolContribution.loadAll(getSketchbookToolsFolder()));
+
+ contributions.addAll(getExampleContribs());
+ return contributions;
+ }
+
+
+ public byte[] getInstalledContribsInfo() {
+ List<Contribution> contribs = getInstalledContribs();
+ StringList entries = new StringList();
+ for (Contribution c : contribs) {
+ String entry = c.getTypeName() + "=" +
+ PApplet.urlEncode(String.format("name=%s\nurl=%s\nrevision=%d\nversion=%s",
+ c.getName(), c.getUrl(),
+ c.getVersion(), c.getPrettyVersion()));
+ entries.append(entry);
+ }
+ String joined =
+ "id=" + Preferences.get("update.id") + "&" + entries.join("&");
+// StringBuilder sb = new StringBuilder();
+// try {
+// // Truly ridiculous attempt to shove everything into a GET request.
+// // More likely to be seen as part of a grand plot.
+// ByteArrayOutputStream baos = new ByteArrayOutputStream();
+// GZIPOutputStream output = new GZIPOutputStream(baos);
+// PApplet.saveStream(output, new ByteArrayInputStream(joined.getBytes()));
+// output.close();
+// byte[] b = baos.toByteArray();
+// for (int i = 0; i < b.length; i++) {
+// sb.append(PApplet.hex(b[i], 2));
+// }
+// } catch (IOException e) {
+// e.printStackTrace();
+// }
+// return sb.toString();
+ return joined.getBytes();
+ }
+
+
  // Because of variations in native windowing systems, no guarantees about
  // 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
@@ -1415,36 +1457,36 @@ public void handlePrefs() {
  * Show the library installer window.
  */
  public void handleOpenLibraryManager() {
- libraryManagerFrame.showFrame(activeEditor);
+ contributionManagerFrame.showFrame(activeEditor,ContributionType.LIBRARY);
  }
 
 
  /**
  * Show the tool installer window.
  */
  public void handleOpenToolManager() {
- toolManagerFrame.showFrame(activeEditor);
+ contributionManagerFrame.showFrame(activeEditor,ContributionType.TOOL);
  }
 
 
  /**
  * Show the mode installer window.
  */
  public void handleOpenModeManager() {
- modeManagerFrame.showFrame(activeEditor);
+ contributionManagerFrame.showFrame(activeEditor,ContributionType.MODE);
  }
 
 
  /**
  * Show the examples installer window.
  */
  public void handleOpenExampleManager() {
- exampleManagerFrame.showFrame(activeEditor);
+ contributionManagerFrame.showFrame(activeEditor,ContributionType.EXAMPLES);
  }
 
 
  public void handleShowUpdates() {
- updateManagerFrame.showFrame(activeEditor);
+ contributionManagerFrame.showFrame(activeEditor,null);
  }
 
 
@@ -2346,7 +2388,7 @@ static public byte[] loadBytesRaw(File file) throws IOException {
  * Changed in 3.0a6 to return null (rather than empty hash) if no file,
  * and changed return type to Map instead of HashMap.
  */
- static public Map<String, String> readSettings(File inputFile) {
+ static public StringDict readSettings(File inputFile) {
  if (!inputFile.exists()) {
  if (DEBUG) System.err.println(inputFile + " does not exist.");
  return null;
@@ -2364,13 +2406,13 @@ static public Map<String, String> readSettings(File inputFile) {
  * Parse a String array that contains attribute/value pairs separated
  * by = (the equals sign). The # (hash) symbol is used to denote comments.
  * Comments can be anywhere on a line. Blank lines are ignored.
- * In 3.0a6, no longer taking a blank HahMap as param; no cases in the main
+ * In 3.0a6, no longer taking a blank HashMap as param; no cases in the main
  * PDE code of adding to a (Hash)Map. Also returning the Map instead of void.
  * Both changes modify the method signature, but this was only used by the
  * contrib classes.
  */
- static public Map<String, String> readSettings(String filename, String[] lines) {
- Map<String, String> settings = new HashMap<>();
+ static public StringDict readSettings(String filename, String[] lines) {
+ StringDict settings = new StringDict();
  for (String line : lines) {
  // Remove comments
  int commentMarker = line.indexOf('#');
@@ -2390,7 +2432,7 @@ static public Map<String, String> readSettings(String filename, String[] lines)
  } else {
  String attr = line.substring(0, equals).trim();
  String valu = line.substring(equals + 1).trim();
- settings.put(attr, valu);
+ settings.set(attr, valu);
  }
  }
  }
@@ -2745,8 +2787,9 @@ static public String contentsToClassPath(File folder) {
  * @param path the input classpath
  * @return array of possible package names
  */
- static public String[] packageListFromClassPath(String path) {
- Map<String, Object> map = new HashMap<String, Object>();
+ static public StringList packageListFromClassPath(String path) {
+// Map<String, Object> map = new HashMap<String, Object>();
+ StringList list = new StringList();
  String pieces[] =
  PApplet.split(path, File.pathSeparatorChar);
 
@@ -2757,32 +2800,35 @@ static public String[] packageListFromClassPath(String path) {
  if (pieces[i].toLowerCase().endsWith(".jar") ||
  pieces[i].toLowerCase().endsWith(".zip")) {
  //System.out.println("checking " + pieces[i]);
- packageListFromZip(pieces[i], map);
+ packageListFromZip(pieces[i], list);
 
  } else { // it's another type of file or directory
  File dir = new File(pieces[i]);
  if (dir.exists() && dir.isDirectory()) {
- packageListFromFolder(dir, null, map);
+ packageListFromFolder(dir, null, list);
  //importCount = magicImportsRecursive(dir, null,
  // map);
  //imports, importCount);
  }
  }
  }
- int mapCount = map.size();
- String output[] = new String[mapCount];
- int index = 0;
- Set<String> set = map.keySet();
- for (String s : set) {
- output[index++] = s.replace('/', '.');
+// int mapCount = map.size();
+// String output[] = new String[mapCount];
+// int index = 0;
+// Set<String> set = map.keySet();
+// for (String s : set) {
+// output[index++] = s.replace('/', '.');
+// }
+// return output;
+ StringList outgoing = new StringList(list.size());
+ for (String item : list) {
+ outgoing.append(item.replace('/', '.'));
  }
- //System.arraycopy(imports, 0, output, 0, importCount);
- //PApplet.printarr(output);
- return output;
+ return outgoing;
  }
 
 
- static private void packageListFromZip(String filename, Map<String, Object> map) {
+ static private void packageListFromZip(String filename, StringList list) {
  try {
  ZipFile file = new ZipFile(filename);
  Enumeration entries = file.entries();
@@ -2797,9 +2843,10 @@ static private void packageListFromZip(String filename, Map<String, Object> map)
  if (slash == -1) continue;
 
  String pname = name.substring(0, slash);
- if (map.get(pname) == null) {
- map.put(pname, new Object());
- }
+// if (map.get(pname) == null) {
+// map.put(pname, new Object());
+// }
+ list.appendUnique(pname);
  }
  }
  }
@@ -2818,10 +2865,8 @@ static private void packageListFromZip(String filename, Map<String, Object> map)
  * walk down into that folder and continue.
  */
  static private void packageListFromFolder(File dir, String sofar,
- Map<String, Object> map) {
- //String imports[],
- //int importCount) {
- //System.err.println("checking dir '" + dir + "'");
+ StringList list) {
+// Map<String, Object> map) {
  boolean foundClass = false;
  String files[] = dir.list();
 
@@ -2832,15 +2877,16 @@ static private void packageListFromFolder(File dir, String sofar,
  if (sub.isDirectory()) {
  String nowfar =
  (sofar == null) ? files[i] : (sofar + "." + files[i]);
- packageListFromFolder(sub, nowfar, map);
+ packageListFromFolder(sub, nowfar, list);
  //System.out.println(nowfar);
  //imports[importCount++] = nowfar;
  //importCount = magicImportsRecursive(sub, nowfar,
  // imports, importCount);
  } else if (!foundClass) { // if no classes found in this folder yet
  if (files[i].endsWith(".class")) {
  //System.out.println("unique class: " + files[i] + " for " + sofar);
- map.put(sofar, new Object());
+// map.put(sofar, new Object());
+ list.appendUnique(sofar);
  foundClass = true;
  }
  }