Make Madds Java6 compatible

Dahie · Jul 30, 2012 · 09f56cd · 09f56cd
1 parent 537e31c
commit 09f56cd
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,6 @@ Badds/bin
 Badds/build
 Radds/bin
 Radds/build
+Madds/bin
+Madds/build
 *Alias*
diff --git a/Madds/.classpath b/Madds/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6"/>
 	<classpathentry kind="lib" path="lib/TMAppletSwing.jar"/>
 	<classpathentry kind="lib" path="lib/DDSUtils.jar"/>
 	<classpathentry kind="lib" path="lib/CJWizards-0.2.jar"/>

diff --git a/Madds/build.xml b/Madds/build.xml
@@ -3,15 +3,17 @@
     <!--this file was created by Eclipse Runnable JAR Export Wizard-->
     <!--ANT 1.7 is required                                        -->
     <target name="create_run_jar">
-        <jar destfile="/Users/danielsenff/madds.jar" filesetmanifest="mergewithoutmain">
+        <jar destfile="build/madds.jar" filesetmanifest="mergewithoutmain">
             <manifest>
                 <attribute name="Main-Class" value="de.danielsenff.de.madds.Madds"/>
                 <attribute name="Class-Path" value="."/>
             </manifest>
-            <fileset dir="/Users/danielsenff/Produktion/Java/workspace/DDS-Utils/Madds/bin"/>
-            <zipfileset excludes="META-INF/*.SF" src="/Users/danielsenff/Produktion/Java/workspace/DDS-Utils/Madds/lib/TMAppletSwing.jar"/>
-            <fileset dir="/Users/danielsenff/Produktion/Java/workspace/DDS-Utils/Madds/lib"/>
-            <zipfileset excludes="META-INF/*.SF" src="/Users/danielsenff/Produktion/Java/workspace/DDS-Utils/Madds/lib/DDSUtils.jar"/>
+            <fileset dir="bin"/>
+            <fileset dir="lib"/>
+            <zipfileset excludes="META-INF/*.SF" src="lib/TMAppletSwing.jar"/>
+            <zipfileset excludes="META-INF/*.SF" src="lib/DDSUtils.jar"/>
+            <zipfileset excludes="META-INF/*.SF" src="lib/CJWizards-0.2.jar"/>
+            <zipfileset excludes="META-INF/*.SF" src="lib/commons-logging-1.1.1.jar"/>
         </jar>
     </target>
 </project>
diff --git a/Madds/src/de/danielsenff/de/madds/Madds.java b/Madds/src/de/danielsenff/de/madds/Madds.java
@@ -84,7 +84,6 @@ public void onPageChanged(WizardPage newPage, List<WizardPage> path) {
 		dialog.pack();
 		dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
 		dialog.setVisible(true);
-
 	}
 
 	public static TMView showTMApp(Inventorizer inventorizer, File rootFile) throws IllegalAccessException {

diff --git a/Madds/src/de/danielsenff/de/madds/models/Inventorizer.java b/Madds/src/de/danielsenff/de/madds/models/Inventorizer.java
@@ -19,7 +19,7 @@ public class Inventorizer {
 
 	public Inventorizer(final String extension) {
 		this.filter = new TextureNodeFileFilter(extension);
-		this.fileTree = new Graph<>();
+		this.fileTree = new Graph<Sizable>();
 		this.textureFiles = TextureHashMap.getTextureHashMap();
 	}
 
@@ -37,7 +37,7 @@ public void makeInventoryForDir(Node<Sizable> parentNode, File[] files) {
 				// add file to tree
 				try {
 					TextureFile tfile = TextureFile.read(file);
-					fileTree.insertAt(0.0, parentNode, new Node<>((Sizable)tfile));
+					fileTree.insertAt(0.0, parentNode, new Node<Sizable>((Sizable)tfile));
 					this.textureFiles.put(file, tfile);
 					parentNode.getData().addSize(tfile.getSize());
 				} catch (IOException e) {

diff --git a/Madds/src/de/danielsenff/de/madds/models/SummaryTableModel.java b/Madds/src/de/danielsenff/de/madds/models/SummaryTableModel.java
@@ -17,7 +17,7 @@ public class SummaryTableModel extends AbstractTableModel {
 
 	public SummaryTableModel(Collection<TextureFile> collection) {
 		this.files = collection;
-		this.table = new HashMap<>();
+		this.table = new HashMap<Integer, CalculatedValue>();
 
 		for (TextureFile textureFile : collection) {
 

diff --git a/Madds/src/de/danielsenff/de/madds/util/Logger.java b/Madds/src/de/danielsenff/de/madds/util/Logger.java
@@ -17,7 +17,7 @@
  */
 public class Logger {
 
-	private static Map<Class<?>, Logger> logger = new HashMap<>();
+	private static Map<Class<?>, Logger> logger = new HashMap<Class<?>, Logger>();
 
 	private PrintStream printer;
 	private boolean enabled;

diff --git a/Madds/src/de/master/core/graph/base/Graph.java b/Madds/src/de/master/core/graph/base/Graph.java
@@ -51,7 +51,7 @@ public class Graph<T>
 	public Graph()
 	{
 		nodes 			= new LinkedList<Node<T>>();
-		weights			= new HashMap<>();
+		weights			= new HashMap<Node<T>, Map<Node<T>, Double>>();
 		predecessors 	= new HashMap<Node<T>, Node<T>>();
 	}
 
@@ -190,7 +190,7 @@ public void remove(final Node<T> node)
 		removeWeight(pre, node);
 
 		// remove also from neighbours
-		Stack<Node> buffer = new Stack<>();
+		Stack<Node> buffer = new Stack<Node>();
 		for(Node n : node.getNeighbours())
 		{
 			buffer.push(n);
@@ -224,7 +224,7 @@ protected void insertWeight(Node<T> a, Node<T> b, double weight)
 			weights.put(a, link);
 		} 
 		else {
-			link = new HashMap<>();
+			link = new HashMap<Node<T>, Double>();
 			link.put(b, weight);
 			weights.put(a, link);
 		}
@@ -237,7 +237,7 @@ protected void insertWeight(Node<T> a, Node<T> b, double weight)
 		} 
 		else 
 		{
-			link= new HashMap<>();
+			link= new HashMap<Node<T>, Double>();
 			link.put(a, weight);
 			weights.put(b, link);
 		}

diff --git a/Madds/src/de/master/core/graph/base/Node.java b/Madds/src/de/master/core/graph/base/Node.java
@@ -33,7 +33,7 @@ public Node() {
 	public Node(final T data)
 	{
 		this.data = data;
-		this.edges = new LinkedList<>();
+		this.edges = new LinkedList<Node<T>>();
 		this.id = ++currentID;
 	}