X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fmain%2FMain.java;h=be543ebe2bfd17e65bb23c89411e5cfac68447ba;hb=f58c676a286a7cd8d37c3f510e787144a9bff5ad;hp=0c7e6377c0b2df7f7fd6a4a1e4f227eaf2bec7f8;hpb=029548705a1fa60731ad7f492103333acdd48001;p=jSite2.git

diff --git a/src/net/pterodactylus/jsite/main/Main.java b/src/net/pterodactylus/jsite/main/Main.java
index 0c7e637..be543eb 100644
--- a/src/net/pterodactylus/jsite/main/Main.java
+++ b/src/net/pterodactylus/jsite/main/Main.java
@@ -21,14 +21,16 @@ package net.pterodactylus.jsite.main;
 
 import java.io.File;
 
-import net.pterodactylus.jsite.core.Core;
+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$
  */
@@ -36,7 +38,7 @@ public class Main {
 
 	/**
 	 * Main entry method for the VM.
-	 *
+	 * 
 	 * @param args
 	 *            The command-line arguments
 	 */
@@ -48,7 +50,9 @@ public class Main {
 	 * Starts the core and the default {@link SwingInterface}.
 	 */
 	private void start() {
-		Core core = new Core();
+		Logging.setup("jSite");
+
+		CoreImpl core = new CoreImpl();
 
 		String configDirectory = System.getProperty("user.home") + File.separator + ".jSite";
 
@@ -57,10 +61,17 @@ public class Main {
 
 		NodeManager nodeManager = new NodeManager("jSite-" + Version.getVersion(), configDirectory);
 		core.setNodeManager(nodeManager);
+		nodeManager.addNodeListener(core);
+
+		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);
-		swingInterface.start();
+		Logging.addLoggingListener(swingInterface);
 
 		core.start();
 	}