X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fmain%2FMain.java;h=be543ebe2bfd17e65bb23c89411e5cfac68447ba;hb=f58c676a286a7cd8d37c3f510e787144a9bff5ad;hp=871db5fc8bc8a27830fcc27ca0964fbec70ac5c9;hpb=8aec0d9aa06efc24ffc5bcfc2503d0ce06d74d54;p=jSite2.git

diff --git a/src/net/pterodactylus/jsite/main/Main.java b/src/net/pterodactylus/jsite/main/Main.java
index 871db5f..be543eb 100644
--- a/src/net/pterodactylus/jsite/main/Main.java
+++ b/src/net/pterodactylus/jsite/main/Main.java
@@ -21,9 +21,12 @@ 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.
@@ -47,17 +50,28 @@ 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";
-		
+
 		ProjectManager projectManager = new ProjectManager(configDirectory);
 		core.setProjectManager(projectManager);
 
-		SwingInterface swingInterface = new SwingInterface(core);
+		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.setConfigDirectory(configDirectory);
-		swingInterface.start();
+		Logging.addLoggingListener(swingInterface);
 
 		core.start();
 	}