@@ -38,7 +38,7 @@ public class BundleDocument {
     private String[] extensions;
     private boolean isPackage = false;
 
-    private String capitalizeFirst(String string) {
+    static private String capitalizeFirst(String string) {
         char[] stringArray = string.toCharArray();
         stringArray[0] = Character.toUpperCase(stringArray[0]);
         return new String(stringArray);
 
@@ -92,6 +92,7 @@ _ no high-dpi support for core on Windows
 _   https://github.com/processing/processing/issues/2411
 _ retina sketches slow to start
 _   https://github.com/processing/processing/issues/2357
+_ glw? lwjgl? retina jogl?
 
 
 cantfix
 
@@ -174,7 +174,7 @@ public void windowDestroyNotify(final WindowEvent e) {
   }
 
 
-  private void displayWindows() {
+  static private void displayWindows() {
     int totalCount = 0;
     int realizedCount = 0;
     for (GLWindow win: GLW.windows.values()) {
 
@@ -647,8 +647,10 @@ static public String[] listFonts() {
 //      fontList = new String[entries.size()];
       fontList = new String[map.size()];
       int count = 0;
-      for (Object entry : map.entrySet()) {
-        fontList[count++] = (String) ((Map.Entry) entry).getKey();
+      for (Object key : map.keySet()) {
+//      for (Object entry : map.entrySet()) {
+//        fontList[count++] = (String) ((Map.Entry) entry).getKey();
+        fontList[count++] = (String) key;
       }
 //      Iterator it = entries.iterator();
 //      int count = 0;
 
@@ -561,7 +561,7 @@ public ClassMember resolveExpression3rdParty(ASTNode nearestNode,
       }
       else {
         // or in a predefined class?
-        Class tehClass = findClassIfExists(((SimpleName) astNode).toString());
+        Class<?> tehClass = findClassIfExists(((SimpleName) astNode).toString());
         if (tehClass != null) {
           return new ClassMember(tehClass);
         }
@@ -587,7 +587,7 @@ public ClassMember resolveExpression3rdParty(ASTNode nearestNode,
             /*The type wasn't found in local code, so it might be something like
              * log(), or maybe belonging to super class, etc.
              */
-            Class tehClass = findClassIfExists(((SimpleName)fa.getExpression()).toString());
+            Class<?> tehClass = findClassIfExists(((SimpleName)fa.getExpression()).toString());
             if (tehClass != null) {
               // Method Expression is a simple name and wasn't located locally, but found in a class
               // so look for method in this class.
 
@@ -1116,7 +1116,7 @@ protected void printThis(ThreadReference t) {
                     for (Field f : type.visibleFields()) {
                         System.out.println(f.typeName() + " " + f.name() + " = " + thisObject.getValue(f));
                     }
-                } else {
+                } else {  // TODO [this is not reachable - fry]
                     System.out.println("can't get this (in native or static method)");
                 }
             }
 
@@ -213,7 +213,7 @@ public static int distance(String a, String b) {
   }
 
   public void minDistInGrid(int g[][], int i, int j, int fi, int fj,
-                                   char s1[], char s2[], ArrayList set) {
+                                   char s1[], char s2[], ArrayList<OfsSetTemp> set) {
 //    if(i < s1.length)System.out.print(s1[i] + " <->");
 //    if(j < s2.length)System.out.print(s2[j]);
     if (i < s1.length && j < s2.length) {
 
@@ -74,7 +74,7 @@ public class VariableInspector extends javax.swing.JFrame {
     protected List<VariableNode> declaredThisFields; // declared i.e. non-inherited fields of this
     protected DebugEditor editor; // the editor
     protected Debugger dbg; // the debugger
-    protected List<TreePath> expandedNodes = new ArrayList(); // list of expanded tree paths. (using list to maintain the order of expansion)
+    protected List<TreePath> expandedNodes = new ArrayList<>(); // list of expanded tree paths. (using list to maintain the order of expansion)
     protected boolean p5mode = true; // processing / "advanced" mode flag (currently not used
 
     /**
@@ -515,7 +515,7 @@ public void treeCollapsed(TreeExpansionEvent tee) {
             // first remove all children of collapsed path
             // this makes sure children do not appear before parents in the list.
             // (children can't be expanded before their parents)
-            List<TreePath> removalList = new ArrayList();
+            List<TreePath> removalList = new ArrayList<>();
             for (TreePath path : expandedNodes) {
                 if (path.getParentPath().equals(tee.getPath())) {
                     removalList.add(path);
 
@@ -53,7 +53,7 @@ public class VariableNode implements MutableTreeNode {
     protected String type;
     protected String name;
     protected Value value;
-    protected List<MutableTreeNode> children = new ArrayList();
+    protected List<MutableTreeNode> children = new ArrayList<>();
     protected MutableTreeNode parent;
 
     /**
 
@@ -1,5 +1,11 @@
 0230 pde (3.0a3)
 
+earlier
+X repo cleanup
+X   remove non-web stuff from web
+X   remove non-android stuff from android
+X   remove web and android from the main repo
+
 pulls
 X Add polling to detect file system changes
 X   https://github.com/processing/processing/issues/1939
@@ -9,18 +15,24 @@ X   https://github.com/processing/processing/issues/632
 X   https://github.com/processing/processing/pull/2084
 X   http://code.google.com/p/processing/issues/detail?id=593
 _   need to make sure the .properties files are read properly as UTF-8
+X Indent breaks when hitting enter before spaces
+X   https://github.com/processing/processing/issues/2004
+X   https://github.com/processing/processing/pull/2690
+X support for Japanese
+X   https://github.com/processing/processing/pull/2688
 
 
 pending
 _ look at the sound library https://github.com/wirsing/ProcessingSound
 _   sound is not yet supported on Windows
-_ glw? lwjgl? retina jogl?
 _ make reference build process part of dist
 _   https://github.com/processing/processing-docs/issues/85
 _   separate ant target, but only require them for dist
 _   as separate targets, folks can build explicitly if they'd like
 _   processing-docs/java_generate/ReferenceGenerator/processingrefBuild.sh
 _   remove reference.zip from main repo
+_ clean out the repo
+_   https://github.com/processing/processing/issues/1898
 
 
 gsoc/help me
@@ -59,12 +71,6 @@ _ display "1" is not correct in 2.1.2
 _   https://github.com/processing/processing/issues/2502
 _ re/move things from Google Code downloads
 _   https://code.google.com/p/support/wiki/DownloadsFAQ
-_ clean out the repo
-_   https://github.com/processing/processing/issues/1898
-_   requires re-forking, so still a ton of work
-_   remove non-web stuff from web
-_   remove non-android stuff from android
-_   remove web and android from the main repo
 _ add font fixes to the rest of the API
 _   https://github.com/processing/processing/commit/eaff673d173b2d27f276cf5c59e3abf6c0fab86b
 _   g2.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS,
@@ -96,9 +102,6 @@ _ add documentation for how to run mode development from Eclipse
 _   implementation/changes from JDF
 _ modes are being loaded multiple times, which can cause trouble
 _ add minimum version required (or max version?) to libraries/modes/etc
-_ no high-res display support for the PDE
-_ PDE and sketches are 2x smaller on high-res Windows 8 machines
-_   https://github.com/processing/processing/issues/2411
 
 
 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . 
@@ -802,6 +805,8 @@ _   avoid some confusion for when describing the libraries folder to users
 
 DIST / Windows
 
+_ PDE and sketches are 2x smaller on high-res Windows 8 machines
+_   https://github.com/processing/processing/issues/2411
 _ processing-java output as UTF-8 makes Windows unhappy
 _   https://github.com/processing/processing/issues/1633
 _ does launching p5 from inside the .zip folder cause it to quit immediately?
Original file line number	Diff line number	Diff line change
@@ -174,7 +174,7 @@ public void windowDestroyNotify(final WindowEvent e) {
174	174	}
175	175
176	176
177		- private void displayWindows() {
	177	+ static private void displayWindows() {
178	178	int totalCount = 0;
179	179	int realizedCount = 0;
180	180	for (GLWindow win: GLW.windows.values()) {
Original file line number	Diff line number	Diff line change
@@ -1116,7 +1116,7 @@ protected void printThis(ThreadReference t) {
1116	1116	for (Field f : type.visibleFields()) {
1117	1117	System.out.println(f.typeName() + " " + f.name() + " = " + thisObject.getValue(f));
1118	1118	}
1119		- } else {
	1119	+ } else { // TODO [this is not reachable - fry]
1120	1120	System.out.println("can't get this (in native or static method)");
1121	1121	}
1122	1122	}
Original file line number	Diff line number	Diff line change
@@ -213,7 +213,7 @@ public static int distance(String a, String b) {
213	213	}
214	214
215	215	public void minDistInGrid(int g[][], int i, int j, int fi, int fj,
216		- char s1[], char s2[], ArrayList set) {
	216	+ char s1[], char s2[], ArrayList<OfsSetTemp> set) {
217	217	// if(i < s1.length)System.out.print(s1[i] + " <->");
218	218	// if(j < s2.length)System.out.print(s2[j]);
219	219	if (i < s1.length && j < s2.length) {