Merge branch 'ide-1.5.x' into ide-1.5.x-java7

Conflicts:
	build/build.xml
	build/macosx/template.app/Contents/Info.plist

.classpath

@@ -3,7 +3,6 @@
 	<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"/>
@@ -21,5 +20,6 @@
 	<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,6 +13,7 @@ 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/jre.zip
 build/windows/libastylej*
@@ -35,6 +36,7 @@ test-bin
 *.iml
 .idea
 .DS_Store
+.directory
 build/windows/launch4j-*
 build/windows/launcher/launch4j
 build/windows/WinAVR-*.zip

app/.classpath

@@ -1,11 +1,11 @@
 <?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 kind="lib" path="lib/antlr.jar"/>
 	<classpathentry kind="lib" path="lib/jna.jar"/>
 	<classpathentry kind="lib" path="lib/ecj.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/processing-core"/>
 	<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"/>
@@ -14,5 +14,12 @@
 	<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/build.xml

@@ -6,7 +6,7 @@
       <include name="*.jar"/>
     </fileset>
     <pathelement path="${env.JAVA_HOME}/lib/tools.jar"/>
-    <pathelement path="../core/core.jar"/>
+    <pathelement path="../arduino-core/arduino-core.jar"/>
   </path>
 
   <path id="class.path.test">
@@ -25,9 +25,9 @@
 
   <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" />
 
@@ -54,27 +54,18 @@
     <condition property="java.additional.library.path" value=".">
       <os family="mac"/>
     </condition>
-    <condition property="java.additional.jvmargs" value="-d32">
-      <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="java.additional.jvmargs" value="-Ddummy=0">
-      <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>
-    <condition property="java.additional.jvmargs" value="-Ddummy=0">
-      <os family="unix"/>
-    </condition>
 
 <!--
     <dirname property="blah" file="${java.home}" />
@@ -89,9 +80,6 @@
 	   includeAntRuntime="false"
 	   debug="true"
 	   classpathref="class.path" />
-    <copy todir="bin" overwrite="true" verbose="true">
-      <fileset dir="src" includes="**/*.properties" />
-    </copy>
   </target>
 
   <target name="test" depends="compile" description="Runs the test">
@@ -115,7 +103,6 @@
 
     <junit printsummary="yes" dir="${work.dir}" fork="true">
       <jvmarg value="-Djava.library.path=${java.additional.library.path}"/>
-      <jvmarg value="${java.additional.jvmargs}"/>
       <classpath>
         <pathelement location="bin"/>
         <pathelement location="test-bin"/>

app/src/cc/arduino/packages/MonitorFactory.java

@@ -0,0 +1,17 @@
+package cc.arduino.packages;
+
+import processing.app.AbstractMonitor;
+import processing.app.NetworkMonitor;
+import processing.app.SerialMonitor;
+
+public class MonitorFactory {
+
+  public AbstractMonitor newMonitor(BoardPort port) {
+    if ("network".equals(port.getProtocol())) {
+      return new NetworkMonitor(port);
+    }
+
+    return new SerialMonitor(port);
+  }
+
+}

app/src/processing/app/AbstractMonitor.java

@@ -1,7 +1,7 @@
 package processing.app;
 
 import processing.app.debug.MessageConsumer;
-import processing.core.PApplet;
+import processing.app.legacy.PApplet;
 
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
@@ -14,6 +14,7 @@
 
 import static processing.app.I18n._;
 
+@SuppressWarnings("serial")
 public abstract class AbstractMonitor extends JFrame implements MessageConsumer {
 
   protected final JLabel noLineEndingAlert;