X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fmain%2FMain.java;h=b2b365178e221ec78e4da0728edcfac9408a6f7c;hb=06afd40ac14c5d00967a0fe1a8c80cf03b98c07a;hp=2552260d7115c2e795a1e350687d18044b70dc95;hpb=cf127faffabd3f07b0acc6de9ea746059d571b56;p=jSite2.git

diff --git a/src/net/pterodactylus/jsite/main/Main.java b/src/net/pterodactylus/jsite/main/Main.java
index 2552260..b2b3651 100644
--- a/src/net/pterodactylus/jsite/main/Main.java
+++ b/src/net/pterodactylus/jsite/main/Main.java
@@ -29,21 +29,21 @@ 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.jsite.project.ProjectManager;
 import net.pterodactylus.util.logging.Logging;
 
 /**
  * Main class that is called by the VM.
- * 
+ *
  * @author David ‘Bombe’ Roden <bombe@freenetproject.org>
  */
 public class Main {
 
 	/**
 	 * Main entry method for the VM.
-	 * 
+	 *
 	 * @param args
 	 *            The command-line arguments
 	 */
@@ -65,16 +65,14 @@ public class Main {
 		core.setNodeManager(nodeManager);
 		nodeManager.addNodeListener(core);
 
+		RequestManager requestManager = new RequestManager();
+		nodeManager.addNodeListener(requestManager);
+		core.setRequestManager(requestManager);
+
 		ProjectManager projectManager = new ProjectManager(configDirectory);
 		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 +83,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 +95,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 = new ArrayList<LookAndFeelInfo>(Arrays.asList(UIManager.getInstalledLookAndFeels()));
-		for (LookAndFeelInfo lookAndFeelInfo: lookAndFeelInfos) {
+		for (LookAndFeelInfo lookAndFeelInfo : lookAndFeelInfos) {
 			try {
 				Class.forName(lookAndFeelInfo.getClassName());
 				allLookAndFeelInfos.add(lookAndFeelInfo);
@@ -114,7 +112,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()]));
 	}
 
 }