From 569d34418ae5c94523178b1c8a246b453a14f533 Mon Sep 17 00:00:00 2001
From: Eugen Podaru <eugen.podaru@live.com>
Date: Sun, 18 Aug 2013 14:42:56 -0700
Subject: [PATCH] Implemented test applications for Distributed SWAN

---
 .classpath                                        | 15 +++++++--------
 AndroidManifest.xml                               |  2 +-
 bin/hub                                           |  5 -----
 bin/naming                                        |  7 +------
 bin/viz                                           |  5 -----
 build.xml                                         |  4 +++-
 default.properties                                | 12 ------------
 .../viz/android/RouterClientNode.java             |  2 +-
 8 files changed, 13 insertions(+), 39 deletions(-)
 delete mode 100644 default.properties

diff --git a/.classpath b/.classpath
index 59df41e..fc4c457 100644
--- a/.classpath
+++ b/.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>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f8e5895..218783c 100644
--- a/AndroidManifest.xml
+++ b/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>
\ No newline at end of file
diff --git a/bin/hub b/bin/hub
index 0983ead..32175a6 100755
--- a/bin/hub
+++ b/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
diff --git a/bin/naming b/bin/naming
index 1c8ceb6..ec3a690 100755
--- a/bin/naming
+++ b/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
\ No newline at end of file
+java -cp $CP $SPECIAL ibis.smartsockets.util.NamingStarter $NORMAL
diff --git a/bin/viz b/bin/viz
index fc7142f..059c9aa 100755
--- a/bin/viz
+++ b/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
diff --git a/build.xml b/build.xml
index b67a8dd..7ccb87f 100644
--- a/build.xml
+++ b/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">
diff --git a/default.properties b/default.properties
deleted file mode 100644
index 948be06..0000000
--- a/default.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-8
-android.library=true
diff --git a/src-android/ibis/smartsockets/viz/android/RouterClientNode.java b/src-android/ibis/smartsockets/viz/android/RouterClientNode.java
index 9aa28ac..122d775 100644
--- a/src-android/ibis/smartsockets/viz/android/RouterClientNode.java
+++ b/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"));