Suppress some status messages; Add JDI impl.

Make code compatible with Java 1.6; Update build script and picode.jar.

.classpath

@@ -31,5 +31,12 @@
 	<classpathentry kind="lib" path="lib/kinect/library/slf4j-api-1.5.8.jar"/>
 	<classpathentry kind="lib" path="lib/kinect/library/slf4j-simple-1.5.8.jar"/>
 	<classpathentry kind="lib" path="picode-resources.jar"/>
+	<classpathentry kind="lib" path="processing/lib/tools.jar"/>
+	<!--
+	<classpathentry kind="lib" path="processing/lib/com.ibm.icu_4.4.2.v20110823.jar"/>
+	<classpathentry kind="lib" path="processing/lib/jdi.jar"/>
+	<classpathentry kind="lib" path="processing/lib/jdimodel.jar"/>
+	<classpathentry kind="lib" path="processing/lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar"/>
+	-->
 	<classpathentry kind="output" path="bin"/>
 </classpath>

README.md

@@ -1,8 +1,6 @@
 Picode: Proccessing-based IDE with Inline Photos
 ================================================================
-Copyright (C) 2013 Jun KATO
-
-version 0.0.1
+Copyright (C) 2013-2014 Jun KATO
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 ## How to use
@@ -16,6 +14,8 @@ Then, simply double-click picode.cmd
 
 ### Mac OS X
 
+Environmental variable JAVA_HOME should point to JDK 6 or 7.
+
 Simply double-click picode.sh
 
 ### Supported hardware
@@ -25,4 +25,4 @@ Simply double-click picode.sh
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 http://github.com/arcatdmz/picode
-arc (at) digitalmuseum.jp
+i (at) junkato.jp

build-core.xml

@@ -5,10 +5,12 @@
 	<!-- ****Properties**** -->
 
 	<!-- Software version -->
-	<property name="picode-version" value="0.1.0" />
+	<property name="picode-version" value="0.2.0" />
 
 	<!-- Dependent class pathes -->
-	<property name="pde.classpath" value="./lib/core/library/core.jar; ${env.JAVA_HOME}/lib/tools.jar; ./processing/lib/ant.jar; ./processing/lib/ant-launcher.jar; ./processing/lib/antlr.jar; ./processing/lib/apple.jar; ./processing/lib/jdt-core.jar; ./processing/lib/jna.jar; ./processing/lib/org-netbeans-swing-outline.jar; ./processing/lib/ecj.jar"/>
+	<!-- <property name="jdi.classpath" value="./processing/lib/com.ibm.icu_4.4.2.v20110823.jar; ./processing/lib/jdi.jar; ./processing/lib/jdimodel.jar; ./processing/lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar"/> -->
+	<property name="jdi.classpath" value="./processing/lib/tools.jar"/>
+	<property name="pde.classpath" value="./lib/core/library/core.jar; ${jdi.classpath}; ./processing/lib/ant.jar; ./processing/lib/ant-launcher.jar; ./processing/lib/antlr.jar; ./processing/lib/apple.jar; ./processing/lib/jna.jar; ./processing/lib/org-netbeans-swing-outline.jar; ./processing/lib/ecj.jar"/>
 	<property name="phybots.classpath" value="./lib/phybots/library/phybots-core-1.0.2.jar; ./lib/phybots/library/connector-1.0.6.jar; ./lib/phybots/library/capture-1.0.3.jar; ./lib/phybots/library/bluecove-2.1.1-SNAPSHOT.jar" />
 	<property name="kinect.classpath" value="./lib/kinect/library/kinect.jar; ./lib/kinect/library/libthrift-0.9.0.jar; ./lib/kinect/library/slf4j-api-1.5.8.jar; ./lib/kinect/library/slf4j-simple-1.5.8.jar" />
 	<property name="picode-classpath" value="./bin; ${pde.classpath}; ${phybots.classpath}; ${kinect.classpath}" />

picode-x86.cmd

@@ -1,9 +1,12 @@
-set pde=.\lib\core\library\core.jar;%JAVA_HOME%\lib\tools.jar;.\processing\lib\ant.jar;.\processing\lib\ant-launcher.jar;.\processing\lib\antlr.jar;.\processing\lib\apple.jar;.\processing\lib\jdt-core.jar;.\processing\lib\jna.jar;.\processing\lib\org-netbeans-swing-outline.jar;.\processing\lib\ecj.jar
+REM set jdi=.\processing\lib\com.ibm.icu_4.4.2.v20110823.jar;.\processing\lib\jdi.jar;.\processing\lib\jdimodel.jar;.\processing\lib\org.eclipse.osgi_3.8.1.v20120830-144521.jar
+set jdi=.\processing\lib\tools.jar
+set pde=.\lib\core\library\core.jar;%jdi%;.\processing\lib\ant.jar;.\processing\lib\ant-launcher.jar;.\processing\lib\antlr.jar;.\processing\lib\apple.jar;.\processing\lib\jna.jar;.\processing\lib\org-netbeans-swing-outline.jar;.\processing\lib\ecj.jar
 set phybots=.\lib\phybots\library\phybots-core-1.0.2.jar;.\lib\phybots\library\connector-1.0.6.jar;.\lib\phybots\library\capture-1.0.3.jar;.\lib\phybots\library\bluecove-2.1.1-SNAPSHOT.jar;.\lib\phybots\library\fantom.jar
 set kinect=.\lib\kinect\library\kinect.jar;.\lib\kinect\library\libthrift-0.9.0.jar;.\lib\kinect\library\slf4j-api-1.5.8.jar;.\lib\kinect\library\slf4j-simple-1.5.8.jar
 set picode=.\picode.jar;%pde%;%phybots%;%kinect%
 
-set JAVA_HOME=C:\Program Files (x86)\Java\jdk1.7.0_45
+set JAVA_HOME="C:\Program Files (x86)\Java\jdk1.7.0_45"
+set JAVA="%JAVA_HOME%\bin\java.exe"
+REM set JAVA=java
 
-
-"%JAVA_HOME%\bin\java.exe" -Djava.library.path=.\lib\phybots\library\ -classpath "%picode%" com.phybots.picode.PicodeMain%*
+"%JAVA%" -Djava.library.path=.\lib\phybots\library\ -classpath "%picode%" com.phybots.picode.PicodeMain%*

picode.cmd

@@ -1,6 +1,12 @@
-set pde=.\lib\core\library\core.jar;%JAVA_HOME%\lib\tools.jar;.\processing\lib\ant.jar;.\processing\lib\ant-launcher.jar;.\processing\lib\antlr.jar;.\processing\lib\apple.jar;.\processing\lib\jdt-core.jar;.\processing\lib\jna.jar;.\processing\lib\org-netbeans-swing-outline.jar;.\processing\lib\ecj.jar
+REM set jdi=.\processing\lib\com.ibm.icu_4.4.2.v20110823.jar;.\processing\lib\jdi.jar;.\processing\lib\jdimodel.jar;.\processing\lib\org.eclipse.osgi_3.8.1.v20120830-144521.jar
+set jdi=.\processing\lib\tools.jar
+set pde=.\lib\core\library\core.jar;%jdi%;.\processing\lib\ant.jar;.\processing\lib\ant-launcher.jar;.\processing\lib\antlr.jar;.\processing\lib\apple.jar;.\processing\lib\jna.jar;.\processing\lib\org-netbeans-swing-outline.jar;.\processing\lib\ecj.jar
 set phybots=.\lib\phybots\library\phybots-core-1.0.2.jar;.\lib\phybots\library\connector-1.0.6.jar;.\lib\phybots\library\capture-1.0.3.jar;.\lib\phybots\library\bluecove-2.1.1-SNAPSHOT.jar;.\lib\phybots\library\fantom.jar
 set kinect=.\lib\kinect\library\kinect.jar;.\lib\kinect\library\libthrift-0.9.0.jar;.\lib\kinect\library\slf4j-api-1.5.8.jar;.\lib\kinect\library\slf4j-simple-1.5.8.jar
 set picode=.\picode.jar;%pde%;%phybots%;%kinect%
 
-java -Djava.library.path=.\lib\phybots\library\ -classpath "%picode%" com.phybots.picode.PicodeMain%*
+REM set JAVA_HOME="C:\Program Files (x86)\Java\jdk1.7.0_45"
+REM set JAVA=%JAVA_HOME%\bin\java.exe
+set JAVA=java
+
+"%JAVA%" -Djava.library.path=.\lib\phybots\library\ -classpath "%picode%" com.phybots.picode.PicodeMain%*

src.core/com/phybots/picode/api/MindstormsNXT.java

@@ -33,10 +33,11 @@ protected void initialize() {
 	public void setConnector(String connector) {
 		try {
 			raw.setConnector(ConnectorFactory.makeConnector(connector));
-		} catch (InstantiationError | Exception e) {
-			// Do nothing.
+		} catch (InstantiationError e) {
 			// This happens when there's no compatible jfantom native library.
-			System.err.println(String.format("faile to set connector: %s", e.getMessage()));
+			System.err.println(String.format("failed to set connector: %s", e.getMessage()));
+		} catch (Exception e) {
+			// Do nothing.
 		}
 	}
 
@@ -63,10 +64,11 @@ public boolean connect() {
 				if (ids != null) {
 					setConnector(ids[0]);
 				}
-			} catch (InstantiationError | Exception e) {
-				// Do nothing.
+			} catch (InstantiationError e) {
 				// This happens when there's no compatible jfantom native library.
-				return false;
+				System.err.println(String.format("failed to set connector: %s", e.getMessage()));
+			} catch (Exception e) {
+				// Do nothing.
 			}
 		}
 

src.core/com/phybots/picode/api/remote/MindstormsNXTServer.java

@@ -39,7 +39,7 @@ private MindstormsNXTServer() {
 	public void register(MindstormsNXT nxt) {
 		if (!contains(nxt)) {
 			nxts.put(id ++, nxt);
-			System.out.println("server: registered " + id);
+			//System.out.println("server: registered " + id);
 		}
 	}
 
@@ -70,9 +70,9 @@ public boolean start() {
 
 				@Override
 				public void run() {
-					System.out.println("server: start");
+					//System.out.println("server: start");
 					server.serve();
-					System.out.println("server: stop");
+					//System.out.println("server: stop");
 				}
 			});
 			return true;
@@ -97,11 +97,11 @@ private class MindstormsNXTServiceImpl implements MindstormsNXTService.Iface {
 
 		@Override
 		public int connect(String identifier) throws TException {
-			System.out.println("server: look for " + identifier);
+			//System.out.println("server: look for " + identifier);
 			if (identifier == null) return -1;
 			for (Entry<Integer, MindstormsNXT> entry : nxts.entrySet()) {
 				if (identifier.equals(entry.getValue().getIdentifier())) {
-					System.out.println("server: found");
+					//System.out.println("server: found");
 					return entry.getValue().connect() ? entry.getKey() : -1;
 				}
 			}

src/com/phybots/picode/PicodeMain.java

@@ -258,7 +258,7 @@ public void stopSketch() {
 			try {
 				Thread.sleep(1000);
 			} catch (InterruptedException e) {
-				e.printStackTrace();
+				System.err.println(e.getMessage());
 			}
 
 			// Connect to the posers.

src/com/phybots/picode/ui/dialog/ConnectorPanel.java

@@ -147,7 +147,9 @@ public boolean test() {
 	public Connector newConnectorInstance() {
 		try {
 			return ConnectorFactory.makeConnector(getConnectionString());
-		} catch (InstantiationError | Exception e) {
+		} catch (InstantiationError e) {
+			return null;
+		} catch (Exception e) {
 			return null;
 		}
 	}