Fixed eclipse project files

app/.settings/org.eclipse.jdt.core.prefs

@@ -1,9 +1,9 @@
-#Wed Jun 04 15:47:46 EDT 2008
+#Wed Jan 11 13:49:57 CET 2012
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -63,7 +63,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

app/src/processing/app/debug/Sizer.java

@@ -25,47 +25,37 @@
 
 package processing.app.debug;
 
-import java.io.File;
+import processing.app.Base;
-import java.text.MessageFormat;
+
-import java.util.Map;
+import java.io.*;
-import java.util.NoSuchElementException;
+import java.util.*;
-import java.util.StringTokenizer;
 
 public class Sizer implements MessageConsumer {
   private String buildPath, sketchName;
-
   private String firstLine;
-
   private long size;
-
   private RunnerException exception;
 
-  private Map<String, String> prefs;
+  public Sizer(String buildPath, String sketchName) {
-
-  public Sizer(String buildPath, String sketchName,
-               Map<String, String> prefs) {
     this.buildPath = buildPath;
     this.sketchName = sketchName;
-    this.prefs = prefs;
   }
   
   public long computeSize() throws RunnerException {
-    String args[] = new String[3];
+    String avrBasePath = Base.getAvrBasePath();
-    args[0] = prefs.get("compiler.path");
+    String commandSize[] = new String[] {
-    args[1] = prefs.get("compiler.size.cmd");
+      avrBasePath + "avr-size",
-    args[2] = buildPath + File.separator + sketchName;
+      " "
+    };
     
-    String recipe = prefs.get("recipe.size.pattern");
+    commandSize[1] = buildPath + File.separator + sketchName + ".hex";
-    MessageFormat compileFormat = new MessageFormat(recipe);
-    String command = compileFormat.format(args);
-    String[] commandArray = command.split("\\|");
 
     int r = 0;
     try {
       exception = null;
       size = -1;
       firstLine = null;
-      Process process = Runtime.getRuntime().exec(commandArray);
+      Process process = Runtime.getRuntime().exec(commandSize);
       MessageSiphon in = new MessageSiphon(process.getInputStream(), this);
       MessageSiphon err = new MessageSiphon(process.getErrorStream(), this);
 
@@ -79,17 +69,14 @@ public class Sizer implements MessageConsumer {
             err.thread.join();
           r = process.waitFor();
           running = false;
-        } catch (InterruptedException intExc) {
+        } catch (InterruptedException intExc) { }
-        }
       }
     } catch (Exception e) {
       // The default Throwable.toString() never returns null, but apparently
       // some sub-class has overridden it to do so, thus we need to check for
       // it.  See: http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1166589459
-      if (e.toString() == null)
+      exception = new RunnerException(
-        exception = new RunnerException(e.getClass().getName() + r);
+        (e.toString() == null) ? e.getClass().getName() + r : e.toString() + r);
-      else
-        exception = new RunnerException(e.toString() + r);
     }
     
     if (exception != null)

build/windows/launcher/launch4j/.classpath

@@ -9,8 +9,7 @@
 	<classpathentry kind="lib" path="lib/commons-logging.jar"/>
 	<classpathentry kind="lib" path="lib/looks.jar"/>
 	<classpathentry kind="lib" path="lib/foxtrot.jar"/>
-	<classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.ant_1.7.0.v200706080842/lib/ant.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/j2sdk1.4.2"/>
 	<classpathentry kind="lib" path="lib/forms.jar"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>

build/windows/launcher/launch4j/.settings/org.eclipse.jdt.core.prefs

@@ -1,12 +1,12 @@
-#Sun Jul 20 14:10:30 CEST 2008
+#Wed Jan 11 13:54:29 CET 2012
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.4
+org.eclipse.jdt.core.compiler.source=1.6