Merge branch 'releases/v2-2' into 'master'

Updated to v2.2, using maven to resolve API-dependency

Now including API-dependencies via maven

See merge request !2

.classpath

@@ -6,13 +6,12 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry combineaccessrules="false" kind="src" path="/simonstrator-api"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

pom.xml

@@ -2,9 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>PeerfactSim.KOM</groupId>
-	<artifactId>PeerfactSim.KOM</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<groupId>maki</groupId>
+	<artifactId>simonstrator-peerfactsim</artifactId>
+	<version>2.2</version>
 	<build>
 		<sourceDirectory>src</sourceDirectory>
 		<testSourceDirectory>test</testSourceDirectory>
@@ -108,6 +108,13 @@
 	</build>
 
 	<repositories>
+	
+		<!-- simonstrator-repository -->
+		<repository>
+			<id>simonstrator</id>
+			<url>http://dev.kom.e-technik.tu-darmstadt.de/mvn/</url>
+		</repository>
+	
 		<!-- local kom repository -->
 		<repository>
 			<id>maven.kom</id>
@@ -137,6 +144,15 @@
 	</repositories>
 
 	<dependencies>	
+	
+		<!-- Meta: to remove unused dependencies :) -->
+		<dependency>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-dependency-plugin</artifactId>
+			<version>2.9</version>
+		</dependency>
+				
+	
 		<!-- XML -->
 		<dependency>
 			<groupId>dom4j</groupId>
@@ -160,6 +176,7 @@
             <artifactId>batik-1.5-fop</artifactId>
             <version>0.20-5</version>
   		</dependency>
+  		<!-- unused?
 		<dependency>
             <groupId>batik</groupId>
             <artifactId>batik-parser</artifactId>
@@ -169,7 +186,7 @@
             <groupId>batik</groupId>
             <artifactId>batik-awt-util</artifactId>
             <version>1.5</version>
-  		</dependency>
+  		</dependency> -->
       
 		<!-- Testing -->
 		<dependency>
@@ -184,6 +201,7 @@
 		</dependency>
 
 		<!-- Logging -->
+		<!-- unused
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
@@ -193,7 +211,7 @@
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
 			<version>1.6.1</version>
-		</dependency>
+		</dependency> -->
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
@@ -201,6 +219,7 @@
 		</dependency>
 		
 		<!-- Parsing, Bytecode, ... -->
+		<!-- Unused
 		<dependency>
 			<groupId>antlr</groupId>
 			<artifactId>antlr</artifactId>
@@ -215,7 +234,7 @@
 			<groupId>javassist</groupId>
 			<artifactId>javassist</artifactId>
 			<version>3.12.0.GA</version>
-		</dependency>
+		</dependency> -->
 
 		<!-- Geometric calculations -->
 		<dependency>
@@ -232,11 +251,12 @@
 		</dependency>
 		
 		<!-- Chart creation -->
+		<!-- unused?
 		<dependency>
 			<groupId>jfree</groupId>
 			<artifactId>jcommon</artifactId>
 			<version>1.0.16</version>
-		</dependency>
+		</dependency> -->
 		<dependency>
 			<groupId>jfree</groupId>
 			<artifactId>jfreechart</artifactId>
@@ -305,6 +325,7 @@
 		</dependency>
 
 		<!-- SimCfg, Xtext, EMF dependencies -->
+		<!-- unused
 		<dependency>
 			<groupId>org.eclipse</groupId>
 			<artifactId>xtext</artifactId>
@@ -359,7 +380,7 @@
 			<groupId>org.eclipse.emf</groupId>
 			<artifactId>mwe.utils</artifactId>
 			<version>1.2.1</version>
-		</dependency>
+		</dependency> -->
 		
 		<!-- Math -->
 		<dependency>
@@ -381,6 +402,7 @@
 			<artifactId>javax.inject</artifactId>
 			<version>1</version>
 		</dependency>
+		<!-- unused
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
@@ -395,7 +417,7 @@
 			<groupId>org.codehaus.plexus</groupId>
 			<artifactId>plexus-utils</artifactId>
 			<version>2.1</version>
-		</dependency>
+		</dependency> -->
 		<dependency>
 		<groupId>commons-lang</groupId>
 			<artifactId>commons-lang</artifactId>
@@ -416,6 +438,7 @@
 -->
 
         <!-- Geodemlia -->
+        <!-- unused
         <dependency>
             <groupId>org.swinglabs</groupId>
             <artifactId>jxmapviewer</artifactId>
@@ -425,15 +448,15 @@
             <groupId>org.swinglabs</groupId>
             <artifactId>swingx</artifactId>
             <version>1.6.1</version>
-        </dependency>
+        </dependency> -->
 		
 <!-- 		JUNG Graph Library -->
-		<dependency>
+		<!--  unused<dependency>
 		    <groupId>net.sf.jung</groupId>
 		    <artifactId>jung2</artifactId>
 		    <version>2.0.1</version>
 		    <type>pom</type>
-		</dependency>
+		</dependency> -->
 		<dependency>
 			<groupId>net.sf.jung</groupId>
 			<artifactId>jung-api</artifactId>
@@ -454,6 +477,7 @@
 			<artifactId>jung-io</artifactId>
 			<version>2.0.1</version>
 		</dependency>
+		<!-- unused
 		<dependency>
 			<groupId>net.sf.jung</groupId>
 			<artifactId>jung-visualization</artifactId>
@@ -463,9 +487,15 @@
 			<groupId>net.sf.jung</groupId>
 			<artifactId>jung-samples</artifactId>
 			<version>2.0.1</version>
-		</dependency>
+		</dependency> -->
     
     
+	    <!-- Simonstrator-Platform -->
+	    <dependency>
+	  		<groupId>maki</groupId>
+	  		<artifactId>simonstrator-api</artifactId>
+	  		<version>2.2</version>
+	  	</dependency>
 
     </dependencies>
 </project>

src/de/tud/kom/p2psim/impl/util/guirunner/GUIRunner.java

@@ -109,9 +109,10 @@ public class GUIRunner extends JFrame implements WindowListener, KeyListener {
 
 		this.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
 		this.addWindowListener(this);
-
-		this.setSize(Config.getValue(CONF_PATH_WIDTH, 600), Config.getValue(
-				CONF_PATH_HEIGHT, 600));
+
+		int winWidth = Config.getValue(CONF_PATH_WIDTH, 600);
+		int winHeight = Config.getValue(CONF_PATH_HEIGHT, 600);
+		this.setSize(winWidth, winHeight);
 		this.setLocation(new Point(Config.getValue(CONF_PATH_POSX, 0), Config
 				.getValue(CONF_PATH_POSY, 0)));
 

src/de/tud/kom/p2psim/impl/util/guirunner/impl/FileToolkit.java

@@ -51,9 +51,11 @@ public class FileToolkit {
 			File rootDir) {
 
 		File[] filesArray = rootDir.listFiles();
-		Set<File> files = new TreeSet<File>();
-		for (int i = 0; i < filesArray.length; i++)
-			files.add(filesArray[i]);
+		Set<File> files = new TreeSet<File>();
+		if (filesArray != null) {
+			for (int i = 0; i < filesArray.length; i++)
+				files.add(filesArray[i]);
+		}
 
 		boolean containsAConfig = false;