X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fmain%2FMain.java;h=8dcbe5aa6eaae4dad6b1b833faede774b89afaa7;hb=ec82a43f701abc033111200db79b1fb3522e7422;hp=151c6b18f11f8ac3cf231fad643d88126f5b7ed5;hpb=57c2535880c2404a535308ffe0c176076be1c6dd;p=jSite2.git

diff --git a/src/net/pterodactylus/jsite/main/Main.java b/src/net/pterodactylus/jsite/main/Main.java
index 151c6b1..8dcbe5a 100644
--- a/src/net/pterodactylus/jsite/main/Main.java
+++ b/src/net/pterodactylus/jsite/main/Main.java
@@ -20,6 +20,7 @@
 package net.pterodactylus.jsite.main;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -29,21 +30,19 @@ import javax.swing.UIManager.LookAndFeelInfo;
 import net.pterodactylus.jsite.core.CoreImpl;
 import net.pterodactylus.jsite.core.NodeManager;
 import net.pterodactylus.jsite.core.ProjectManager;
-import net.pterodactylus.jsite.core.RequestManager;
 import net.pterodactylus.jsite.gui.SwingInterface;
 import net.pterodactylus.util.logging.Logging;
 
 /**
  * Main class that is called by the VM.
- * 
+ *
  * @author David ‘Bombe’ Roden <bombe@freenetproject.org>
- * @version $Id$
  */
 public class Main {
 
 	/**
 	 * Main entry method for the VM.
-	 * 
+	 *
 	 * @param args
 	 *            The command-line arguments
 	 */
@@ -69,12 +68,6 @@ public class Main {
 		core.setProjectManager(projectManager);
 		projectManager.setNodeManager(nodeManager);
 
-		RequestManager requestManager = new RequestManager();
-		core.setRequestManager(requestManager);
-		nodeManager.addNodeListener(requestManager);
-		requestManager.setNodeManager(nodeManager);
-		requestManager.addRequestListener(core);
-
 		SwingInterface swingInterface = new SwingInterface(core, configDirectory);
 		core.addCoreListener(swingInterface);
 		Logging.addLoggingListener(swingInterface);
@@ -85,7 +78,7 @@ public class Main {
 	/**
 	 * Tries to load the class with the given name and includes the look & feel
 	 * in the UIManager, if it exists.
-	 * 
+	 *
 	 * @param name
 	 *            The name of the look & feel
 	 * @param className
@@ -97,16 +90,16 @@ public class Main {
 	}
 
 	/**
-	 * Tries to load each look & feel and adds it to the list of installed look &
-	 * feels.
-	 * 
+	 * Tries to load each look & feel and adds it to the list of installed look
+	 * & feels.
+	 *
 	 * @see UIManager#setInstalledLookAndFeels(LookAndFeelInfo[])
 	 * @param lookAndFeelInfos
 	 *            The look & feels to add
 	 */
 	private void addLookAndFeels(LookAndFeelInfo... lookAndFeelInfos) {
-		List<LookAndFeelInfo> allLookAndFeelInfos = Arrays.asList(UIManager.getInstalledLookAndFeels());
-		for (LookAndFeelInfo lookAndFeelInfo: lookAndFeelInfos) {
+		List<LookAndFeelInfo> allLookAndFeelInfos = new ArrayList<LookAndFeelInfo>(Arrays.asList(UIManager.getInstalledLookAndFeels()));
+		for (LookAndFeelInfo lookAndFeelInfo : lookAndFeelInfos) {
 			try {
 				Class.forName(lookAndFeelInfo.getClassName());
 				allLookAndFeelInfos.add(lookAndFeelInfo);
@@ -114,7 +107,7 @@ public class Main {
 				/* okay, it doesn't exist, ignore. */
 			}
 		}
-		UIManager.setInstalledLookAndFeels(allLookAndFeelInfos.toArray(new LookAndFeelInfo[0]));
+		UIManager.setInstalledLookAndFeels(allLookAndFeelInfos.toArray(new LookAndFeelInfo[allLookAndFeelInfos.size()]));
 	}
 
 }