Merge branch 'ide-1.5.x'

Author: Federico Fissore

.classpath

@@ -1,12 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry excluding="processing/app/tools/format/|processing/app/tools/format/src/|processing/app/Trace.java|processing/app/RunnerClassLoader.java" kind="src" path="app/src"/>
+	<classpathentry kind="src" path="app/test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/processing-core"/>
 	<classpathentry kind="lib" path="app/lib/antlr.jar"/>
 	<classpathentry kind="lib" path="app/lib/apple.jar"/>
 	<classpathentry kind="lib" path="app/lib/ecj.jar"/>
 	<classpathentry kind="lib" path="app/lib/jna.jar"/>
-	<classpathentry kind="lib" path="app/lib/RXTXcomm.jar"/>
+	<classpathentry kind="lib" path="app/test-lib/junit-4.11.jar"/>
+	<classpathentry kind="lib" path="app/test-lib/fest-assert-1.2.jar"/>
+	<classpathentry kind="lib" path="app/test-lib/fest-reflect-1.2.jar"/>
+	<classpathentry kind="lib" path="app/test-lib/fest-swing-1.2.jar" sourcepath="/home/megabug/git/fest-swing-1.2-sources.jar"/>
+	<classpathentry kind="lib" path="app/test-lib/fest-util-1.1.2.jar"/>
+	<classpathentry kind="lib" path="app/test-lib/jcip-annotations-1.0.jar"/>
+	<classpathentry kind="lib" path="app/lib/commons-codec-1.7.jar"/>
+	<classpathentry kind="lib" path="app/lib/commons-exec-1.1.jar"/>
+	<classpathentry kind="lib" path="app/lib/commons-httpclient-3.1.jar"/>
+	<classpathentry kind="lib" path="app/lib/commons-logging-1.0.4.jar"/>
+	<classpathentry kind="lib" path="app/lib/jmdns-3.4.1.jar"/>
+	<classpathentry kind="lib" path="app/lib/jsch-0.1.50.jar"/>
+	<classpathentry kind="lib" path="app/lib/jssc-2.8.0.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/arduino-core"/>
 	<classpathentry kind="output" path="app/bin"/>
 </classpath>

.gitignore

@@ -1,8 +1,8 @@
 app/bin/
 app/pde.jar
 build/macosx/work/
-core/bin/
-core/core.jar
+arduino-core/bin/
+arduino-core/arduino-core.jar
 hardware/arduino/bootloaders/caterina_LUFA/Descriptors.o
 hardware/arduino/bootloaders/caterina_LUFA/Descriptors.lst
 hardware/arduino/bootloaders/caterina_LUFA/Caterina.sym
@@ -13,12 +13,35 @@ hardware/arduino/bootloaders/caterina_LUFA/Caterina.lss
 hardware/arduino/bootloaders/caterina_LUFA/Caterina.elf
 hardware/arduino/bootloaders/caterina_LUFA/Caterina.eep
 hardware/arduino/bootloaders/caterina_LUFA/.dep/
+build/libastylej-*.zip
 build/windows/work/
+build/windows/*.zip
+build/windows/*.tgz
+build/windows/libastylej*
+build/windows/arduino-*.zip
+build/windows/dist/*.tar.gz
+build/windows/dist/*.tar.bz2
+build/windows/launch4j-*
+build/windows/launcher/launch4j
+build/windows/WinAVR-*.zip
+build/macosx/arduino-*.zip
+build/macosx/dist/*.tar.gz
+build/macosx/dist/*.tar.bz2
+build/macosx/libastylej*
+build/macosx/appbundler*.jar
 build/linux/work/
 build/linux/dist/*.tar.gz
+build/linux/dist/*.tar.bz2
 build/linux/*.tgz
+build/linux/*.zip
+build/linux/libastylej*
 test-bin
 *.iml
+.idea
+.DS_Store
+.directory
 build/windows/launch4j-*
 build/windows/launcher/launch4j
 build/windows/WinAVR-*.zip
+hardware/arduino/avr/libraries/Bridge/examples/XivelyClient/passwords.h
+avr-toolchain-*.zip

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

@@ -0,0 +1,4 @@
+#Fri Dec 30 12:12:25 CET 2011
+eclipse.preferences.version=1
+formatter_profile=_Arduino
+formatter_settings_version=11

.settings/org.eclipse.jdt.ui.prefs

@@ -1,20 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry excluding="processing/app/tools/format/" kind="src" path="src"/>
+	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/core"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/dxf"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/net"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/opengl">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="opengl/library"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry combineaccessrules="false" kind="src" path="/pdf"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/serial"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/video"/>
 	<classpathentry kind="lib" path="lib/antlr.jar"/>
 	<classpathentry kind="lib" path="lib/jna.jar"/>
 	<classpathentry kind="lib" path="lib/ecj.jar"/>
+	<classpathentry kind="lib" path="lib/apple.jar"/>
+	<classpathentry kind="lib" path="lib/commons-codec-1.7.jar"/>
+	<classpathentry kind="lib" path="lib/commons-exec-1.1.jar"/>
+	<classpathentry kind="lib" path="lib/commons-httpclient-3.1.jar"/>
+	<classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/>
+	<classpathentry kind="lib" path="lib/jmdns-3.4.1.jar"/>
+	<classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>
+	<classpathentry kind="lib" path="lib/jssc-2.8.0.jar"/>
+	<classpathentry kind="lib" path="test-lib/junit-4.11.jar"/>
+	<classpathentry kind="lib" path="test-lib/fest-assert-1.2.jar"/>
+	<classpathentry kind="lib" path="test-lib/fest-reflect-1.2.jar"/>
+	<classpathentry kind="lib" path="test-lib/fest-swing-1.2.jar"/>
+	<classpathentry kind="lib" path="test-lib/fest-util-1.1.2.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/arduino-core"/>
+	<classpathentry kind="lib" path="test-lib/jcip-annotations-1.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

app/.classpath

@@ -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/.classpath_vista

@@ -1,16 +1,33 @@
 <?xml version="1.0"?>
 <project name="Arduino PDE" default="build">
-  
+
+  <path id="class.path">
+    <fileset dir="lib">
+      <include name="*.jar"/>
+    </fileset>
+    <pathelement path="${env.JAVA_HOME}/lib/tools.jar"/>
+    <pathelement path="../arduino-core/arduino-core.jar"/>
+  </path>
+
+  <path id="class.path.test">
+    <path refid="class.path"/>
+    <pathelement location="bin/"/>
+    <fileset dir="test-lib">
+      <include name="*.jar"/>
+    </fileset>
+  </path>
+
   <target name="clean" description="Clean the build directories">
     <delete dir="bin" />
+    <delete dir="test-bin" />
     <delete file="pde.jar" />
   </target>
 
   <target name="compile" description="Compile sources">
     <condition property="core-built">
-      <available file="../core/core.jar" />
+      <available file="../arduino-core/arduino-core.jar" />
     </condition>
-    <fail unless="core-built" message="Please build the core library first and make sure it sits in ../core/core.jar" />
+    <fail unless="core-built" message="Please build the Arduino-core library first and make sure it sits in ../arduino-core/arduino-core.jar" />
 
     <mkdir dir="bin" />
 
@@ -24,32 +41,87 @@
     <property name="java_home" value="${env.JAVA_HOME}" />
 
     <condition property="linux"><os family="unix" /></condition>
-    <fail if="linux" unless="java_home" 
+    <fail if="linux" unless="java_home"
 	  message="The JAVA_HOME variable must be set to the location of a full JDK. For instance, on Ubuntu Linux, this might be /usr/lib/jvm/java-6-sun." />
 
     <condition property="windows"><os family="windows" /></condition>
-    <fail if="windows" unless="java_home" 
+    <fail if="windows" unless="java_home"
 	  message="The JAVA_HOME variable must be set to the location of a full JDK. For instance, on Windows, this might be c:\jdk1.6.0_18." />
 
+    <condition property="work.dir" value="../build/macosx/work/Arduino.app/Contents/Resources/Java/">
+      <os family="mac"/>
+    </condition>
+    <condition property="java.additional.library.path" value=".">
+      <os family="mac"/>
+    </condition>
+    <condition property="work.dir" value="../build/windows/work/">
+      <os family="windows"/>
+    </condition>
+    <condition property="java.additional.library.path" value=".">
+      <os family="windows"/>
+    </condition>
+    <condition property="work.dir" value="../build/linux/work/">
+      <os family="unix"/>
+    </condition>
+    <condition property="java.additional.library.path" value="lib">
+      <os family="unix"/>
+    </condition>
+
 <!--
     <dirname property="blah" file="${java.home}" />
     <echo message="here! ${java.home}/lib/tools.jar or there: ${blah}" />
     <echo message="override ${env.JAVA_HOME}/lib/tools.jar" />
     <fail />
 -->
-    <javac target="1.5" 
-	   srcdir="src" 
-	   destdir="bin" 
-	   excludes="**/tools/format/**" 
+    <javac source="1.6" target="1.6"
+	   srcdir="src"
+	   destdir="bin"
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
 	   debug="true"
-	   classpath="../core/core.jar; ${env.JAVA_HOME}/lib/tools.jar; lib/ant.jar; lib/ant-launcher.jar; lib/apple.jar; lib/ecj.jar; lib/jna.jar; lib/RXTXcomm.jar" />
-    <copy todir="bin" overwrite="true" verbose="true">
-      <fileset dir="src" includes="**/*.properties" />
+	   classpathref="class.path" />
+  </target>
+
+  <target name="test" depends="compile" description="Runs the test">
+    <mkdir dir="test-bin"/>
+
+    <javac source="1.6" target="1.6"
+           srcdir="test"
+           destdir="test-bin"
+           encoding="UTF-8"
+           includeAntRuntime="false"
+           debug="true"
+           classpathref="class.path.test">
+    </javac>
+
+    <copy todir="test-bin" overwrite="true" verbose="true">
+      <fileset dir="test" includes="**/*.zip" />
+      <fileset dir="test" includes="**/*.txt" />
+      <fileset dir="test" includes="**/*.properties" />
+      <fileset dir="test" includes="**/*.ino" />
     </copy>
+
+    <junit printsummary="yes" dir="${work.dir}" fork="true">
+      <jvmarg value="-Djava.library.path=${java.additional.library.path}"/>
+      <classpath>
+        <pathelement location="bin"/>
+        <pathelement location="test-bin"/>
+        <pathelement path="../build/macosx/work/Arduino.app/Contents/Resources/Java/quaqua.jar"/>
+        <path refid="class.path.test"/>
+      </classpath>
+
+      <formatter type="xml"/>
+
+      <batchtest fork="yes" todir="test-bin">
+        <fileset dir="test">
+          <include name="**/*Test.java"/>
+          <exclude name="**/Abstract*.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+
   </target>
-  
+
   <target name="build" depends="compile" description="Build PDE">
     <jar basedir="bin" destfile="pde.jar" />
   </target>

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

@@ -34,7 +34,7 @@
  * <A HREF="http://jalopy.sourceforge.net/">Jalopy</A>. This is to replace
  * the buggy code formatter found in previous releases.
  */
-public class AutoFormat {
+  public class AutoFormat {
   Editor editor;