Implemented test applications for Distributed SWAN

.classpath

@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="ibis/smartsockets/viz/" kind="src" path="src"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry exported="true" kind="lib" path="external/jmdns-3.4.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="external/jstun-0.6.1.jar"/>
-	<classpathentry kind="lib" path="external/juds-0.94-universal.jar"/>
-	<classpathentry kind="lib" path="external/log4j-1.2.13.jar"/>
 	<classpathentry exported="true" kind="lib" path="external/sbbi-upnplib-1.0.2.jar"/>
-	<classpathentry kind="lib" path="external/slf4j-api-1.5.3.jar"/>
-	<classpathentry kind="lib" path="external/slf4j-log4j12-1.5.3.jar"/>
-	<classpathentry kind="lib" path="external/TGGraphLayout-ibis-1.58.jar"/>
 	<classpathentry exported="true" kind="lib" path="external/trilead-ssh2-r13339-CJ.jar"/>
+	<classpathentry exported="true" kind="lib" path="external/jstun-0.6.1.jar"/>
+	<classpathentry kind="lib" path="external/TGGraphLayout-ibis-1.58.jar"/>
+	<classpathentry exported="true" kind="lib" path="external/jmdns-3.4.0.jar"/>
+	<classpathentry kind="lib" path="external/juds-0.94-universal.jar"/>
+	<classpathentry kind="lib" path="external/slf4j-api-1.6.2.jar"/>
+	<classpathentry kind="lib" path="external/slf4j-on-android-1.6.2.jar"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>

AndroidManifest.xml

@@ -3,6 +3,6 @@
       package="ibis.smartsockets"
       android:versionCode="1"
       android:versionName="1.0">
-    <uses-sdk android:minSdkVersion="8" />
+    <uses-sdk android:minSdkVersion="10" />
 
 </manifest>

bin/hub

@@ -1,10 +1,5 @@
 #!/bin/sh
 
-for i in external/*.jar
-do
-    CP=$CP:$i
-done
-
 for i in lib/*.jar
 do
     CP=$CP:$i

bin/naming

@@ -1,10 +1,5 @@
 #!/bin/sh
 
-for i in external/*.jar
-do
-    CP=$CP:$i
-done
-
 for i in lib/*.jar
 do
     CP=$CP:$i
@@ -29,4 +24,4 @@ do
 	shift
 done
 
-java -cp $CP $SPECIAL ibis.smartsockets.util.NamingStarter $NORMAL
+java -cp $CP $SPECIAL ibis.smartsockets.util.NamingStarter $NORMAL

bin/viz

@@ -1,10 +1,5 @@
 #!/bin/sh
 
-for i in external/*.jar
-do
-    CP=$CP:$i
-done
-
 for i in lib/*.jar
 do
     CP=$CP:$i

build.xml

@@ -60,7 +60,6 @@
         <mkdir dir="${distdir}" />
         <mkdir dir="${builddir}" />
 
-
         <javac destdir="${builddir}" srcdir="${srcdir}" target="1.5" debug="true" includes="ibis/**/*.java" classpathref="default.classpath" />
 
         <jar jarfile="${distdir}/${jar}" basedir="${builddir}" includes="**">
@@ -104,6 +103,9 @@
 
     <target name="build" depends="clean,copy,compile,javadoc">
     </target>
+
+    <target name="build-android" depends="clean,copy,compile-android,javadoc">
+    </target>
 
 
     <target name="bin.zip" depends="build">

src-android/ibis/smartsockets/viz/android/RouterClientNode.java

@@ -59,7 +59,7 @@ public RouterClientNode(ClientInfo info, HubNode hub) {
         String adr = info.getClientAddress().toString();
 
         // System.out.println("Adding router " + adr);
-
+        
         setType(Node.TYPE_CIRCLE);
         setBackColor(Color.parseColor("#FF7F24"));
         setNodeBorderColor(Color.parseColor("#CD661D"));