@@ -64,7 +64,7 @@ public class Preferences {
    * Windows XP needs 66, and my Ubuntu machine needs 80+, so 80 seems proper.
    */
   static public int BUTTON_WIDTH = 
-    Integer.valueOf(Language.text("preferences.button.width"));
+    Integer.parseInt(Language.text("preferences.button.width"));
 
   /** height of the EditorHeader, EditorToolbar, and EditorStatus */
   static final int GRID_SIZE = 32;
 
@@ -43,7 +43,7 @@ public class ColorSelector implements Tool {
    * Only create one instance, otherwise we'll have dozens of animation
    * threads going if you open/close a lot of editor windows.
    */
-  static ColorChooser selector;
+  private static volatile ColorChooser selector;
 
   private Editor editor;
 
 
@@ -49,11 +49,6 @@ public class PresentMode {
   //JMenu preferencesMenu;
   static JComboBox selector;
 
-  /**
-   * Index of the currently selected display to be used for present mode.
-   */
-  static GraphicsDevice device;
-
 
   static {
     GraphicsEnvironment environment =
@@ -75,7 +70,6 @@ public class PresentMode {
     selector.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           int index = selector.getSelectedIndex();
-          //device = devices[index];
           Preferences.setInteger("run.present.display", index + 1);
         }
       });
 
@@ -2637,7 +2637,7 @@ public void updateListeners(Component comp) {
 //  protected int eventCount;
 
 
-  class InternalEventQueue {
+  static class InternalEventQueue {
     protected Event queue[] = new Event[10];
     protected int offset;
     protected int count;
@@ -9049,7 +9049,7 @@ static public String[] split(String value, char delim) {
     //}
     if (splitCount == 0) {
       String splits[] = new String[1];
-      splits[0] = new String(value);
+      splits[0] = value;
       return splits;
     }
     //int pieceCount = splitCount + 1;
 
@@ -1814,7 +1814,7 @@ public Font(PShapeSVG parent, XML properties) {
               namedGlyphs.put(fg.name, fg);
             }
             if (fg.unicode != 0) {
-              unicodeGlyphs.put(new Character(fg.unicode), fg);
+              unicodeGlyphs.put(Character.valueOf(fg.unicode), fg);
             }
           }
           glyphs[glyphCount++] = fg;
@@ -1848,7 +1848,7 @@ public void drawString(PGraphics g, String str, float x, float y, float size) {
       char[] c = str.toCharArray();
       for (int i = 0; i < c.length; i++) {
         // call draw on each char (pulling it w/ the unicode table)
-        FontGlyph fg = unicodeGlyphs.get(new Character(c[i]));
+        FontGlyph fg = unicodeGlyphs.get(Character.valueOf(c[i]));
         if (fg != null) {
           fg.draw(g);
           // add horizAdvX/unitsPerEm to the x coordinate along the way
@@ -1866,7 +1866,7 @@ public void drawChar(PGraphics g, char c, float x, float y, float size) {
       float s =  size / face.unitsPerEm;
       g.translate(x, y);
       g.scale(s, -s);
-      FontGlyph fg = unicodeGlyphs.get(new Character(c));
+      FontGlyph fg = unicodeGlyphs.get(Character.valueOf(c));
       if (fg != null) g.shape(fg);
       g.popMatrix();
     }
@@ -1877,7 +1877,7 @@ public float textWidth(String str, float size) {
       char[] c = str.toCharArray();
       for (int i = 0; i < c.length; i++) {
         // call draw on each char (pulling it w/ the unicode table)
-        FontGlyph fg = unicodeGlyphs.get(new Character(c[i]));
+        FontGlyph fg = unicodeGlyphs.get(Character.valueOf(c[i]));
         if (fg != null) {
           w += (float) fg.horizAdvX / face.unitsPerEm;
         }
 
@@ -1492,7 +1492,7 @@ static protected Object stringToValue(String string) {
             return d;
           }
         } else {
-          Long myLong = new Long(string);
+          Long myLong = Long.valueOf(string);
           if (myLong.longValue() == myLong.intValue()) {
             return Integer.valueOf(myLong.intValue());
           } else {
 
@@ -3862,7 +3862,7 @@ protected void checkBounds(int row, int column) {
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 
-  class HashMapBlows {
+  static class HashMapBlows {
     HashMap<String,Integer> dataToIndex = new HashMap<String, Integer>();
     ArrayList<String> indexToData = new ArrayList<String>();
 
 
@@ -1203,7 +1203,7 @@ protected Tessellator createTessellator(TessellatorCallback callback) {
   }
 
 
-  protected class Tessellator implements PGL.Tessellator {
+  protected static class Tessellator implements PGL.Tessellator {
     protected GLUtessellator tess;
     protected TessellatorCallback callback;
     protected GLUCallback gluCallback;
 
@@ -1438,7 +1438,7 @@ protected void setPointAttribute(int vboId, int size, int type,
   //
   // Class to store a user-specified value for a uniform parameter
   // in the shader
-  protected class UniformValue {
+  protected static class UniformValue {
     static final int INT1      = 0;
     static final int INT2      = 1;
     static final int INT3      = 2;
Original file line number	Diff line number	Diff line change
@@ -1492,7 +1492,7 @@ static protected Object stringToValue(String string) {
1492	1492	return d;
1493	1493	}
1494	1494	} else {
1495		- Long myLong = new Long(string);
	1495	+ Long myLong = Long.valueOf(string);
1496	1496	if (myLong.longValue() == myLong.intValue()) {
1497	1497	return Integer.valueOf(myLong.intValue());
1498	1498	} else {
Original file line number	Diff line number	Diff line change
@@ -1203,7 +1203,7 @@ protected Tessellator createTessellator(TessellatorCallback callback) {
1203	1203	}
1204	1204
1205	1205
1206		- protected class Tessellator implements PGL.Tessellator {
	1206	+ protected static class Tessellator implements PGL.Tessellator {
1207	1207	protected GLUtessellator tess;
1208	1208	protected TessellatorCallback callback;
1209	1209	protected GLUCallback gluCallback;