Renames ConfigurationController to SettingsController

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/Main.java

@@ -1,6 +1,6 @@
 package de.tu_darmstadt.tk.SmartHomeNetworkSim;
 
-import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.ConfigurationController;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.SettingsController;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.Controller;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Connection;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.ConnectionPerformance;
@@ -37,7 +37,7 @@ public class Main {
 	 */
 	static Controller c;
 	
-	static ConfigurationController conf;
+	static SettingsController conf;
 	/**
 	 * SimulationManager which runs the simulation
 	 */

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/control/Controller.java

@@ -32,7 +32,12 @@ public class Controller {
 	/**
 	 * Controller which allows configuration of the program
 	 */
-	private ConfigurationController configurationController;
+	private SettingsController settingsController;
+	
+	/**
+	 * NetworkController for manipulation of the network model
+	 */
+	private NetworkController networkController;
 	
 	/**
 	 * Create a new Controller, which controls the given model and allows
@@ -43,8 +48,9 @@ public class Controller {
 	 */
 	public Controller(Model model) {
 		this.model = model;
-		configurationController = new ConfigurationController(this.model, this);
+		settingsController = new SettingsController(this.model, this);
 		importController = new ImportController(this.model, this);
+		networkController = new NetworkController(this.model, this);
 	}
 	
 	/**
@@ -58,10 +64,18 @@ public class Controller {
 	
 	/**
 	 * Returns the controller responsible for configuration of the program
-	 * @return {@link ConfigurationController}
+	 * @return {@link SettingsController}
+	 */
+	public SettingsController getControllerConfiguration(){
+		return settingsController;
+	}
+	
+	/**
+	 * Return the controller, managing the networkModel
+	 * @return
 	 */
-	public ConfigurationController getControllerConfiguration(){
-		return configurationController;
+	public NetworkController getNetworkController(){
+		return networkController;
 	}
 	
 	/**
@@ -365,7 +379,7 @@ public class Controller {
 	 * @return the device_visualization_radius
 	 */
 	private int getDevice_visualization_radius() {
-		return configurationController.getDeviceVisualizationRadius();
+		return settingsController.getDeviceVisualizationRadius();
 	}
 	
 	/**

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/control/ConfigurationController.java → src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/control/SettingsController.java

@@ -8,7 +8,7 @@ import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Model;
  *
  * @author Andreas T. Meyer-Berg
  */
-public class ConfigurationController {
+public class SettingsController {
 
 	/**
 	 * Model which is configured
@@ -23,7 +23,7 @@ public class ConfigurationController {
 	 * 
 	 * @param model model which stores the configuration
 	 */
-	public ConfigurationController(Model model, Controller controller) {
+	public SettingsController(Model model, Controller controller) {
 		this.model = model;
 		this.controller = controller;
 	}

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/VisualisationInteractor.java

@@ -14,7 +14,7 @@ import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
 import javax.swing.event.MouseInputListener;
 
-import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.ConfigurationController;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.SettingsController;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.Controller;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Connection;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.ConnectionPerformance;
@@ -54,7 +54,7 @@ public class VisualisationInteractor implements MouseInputListener,
 	/**
 	 * Configurations
 	 */
-	private ConfigurationController config;
+	private SettingsController config;
 
 	/**
 	 * Panel which is observed

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/VisualisationPanel.java

@@ -12,7 +12,7 @@ import java.util.Observer;
 
 import javax.swing.JPanel;
 
-import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.ConfigurationController;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.SettingsController;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.Controller;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Connection;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Link;
@@ -48,7 +48,7 @@ public class VisualisationPanel extends JPanel implements Observer {
 	/**
 	 * Configurations
 	 */
-	private ConfigurationController config;
+	private SettingsController config;
 
 	/**
 	 * Listener which processes the GUI Interactions

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/popups/SettingsPopUp.java

@@ -11,7 +11,7 @@ import javax.swing.JSlider;
 import javax.swing.JTabbedPane;
 import javax.swing.SwingConstants;
 
-import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.ConfigurationController;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.SettingsController;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.Controller;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Model;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.view.util.Utility;
@@ -24,7 +24,7 @@ import de.tu_darmstadt.tk.SmartHomeNetworkSim.view.util.Utility;
 public class SettingsPopUp extends JFrame {
 	Model model;
 	Controller controller;
-	ConfigurationController config;
+	SettingsController config;
 	
 	public SettingsPopUp(Model model, Controller controller) {
 		setBounds(new Rectangle(0, 0, 450, 300));

src/test/java/de/tu_darmstadt/tk/shNetSimTests/control/ConfigurationTest.java

@@ -4,7 +4,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.ConfigurationController;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.SettingsController;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.Controller;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Model;
 
@@ -17,7 +17,7 @@ import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Model;
 public class ConfigurationTest {
 	private Controller control;
 	private Model model;
-	private ConfigurationController config;
+	private SettingsController config;
 
 	@Before
 	public void initialize() {