Adds LinkColor Model, Controller, Visualization(Tree & Panel)

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

@@ -0,0 +1,77 @@
+package de.tu_darmstadt.tk.SmartHomeNetworkSim.control;
+
+import java.awt.Color;
+
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Link;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Model;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.configuration.LinkColorManager;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.util.Pair;
+
+/**
+ * Controller which enables access to the link colors
+ *
+ * @author Andreas T. Meyer-Berg
+ */
+public class LinkColorController {
+	
+	/**
+	 * Link colors
+	 */
+	private LinkColorManager linkColorManager;
+	/**
+	 * Model of the program
+	 */
+	private Model model;
+	/**
+	 * Main Controller
+	 */
+	private Controller controller;
+	
+	/**
+	 * Creates new LinkColorController which enables access to Colors of Links
+	 * 
+	 * @param model Model which should be manipulated
+	 * @param controller controller which can be used
+	 */
+	public LinkColorController(Model model, Controller controller) {
+		this.model = model;
+		this.controller = controller;
+		linkColorManager = this.model.getConfigurator().getLinkColors();
+	}
+	
+	/**
+	 * Returns the color & index of the given Link
+	 * @param link link which should be looked up
+	 * @return Index & Color
+	 */
+	public Pair<Integer,Color> getColorOfLink(Link link){
+		Pair<Integer,Color> pair =  linkColorManager.getColorOfLink(link);
+		if(pair == null){
+			pair = new Pair<Integer, Color>(-1,linkColorManager.getNextLinkColor());
+			linkColorManager.addLinkColor(link, pair);
+		}
+		return pair;
+	}
+	
+	/**
+	 * Changes Color of link to the new Color
+	 * @param link link which should be updated
+	 * @param color new color
+	 */
+	public void setColorOfLink(Link link, Color color){
+		Pair<Integer, Color> elem = linkColorManager.getColorOfLink(link);
+		if(elem!=null)
+			elem.setRight(color);
+		else
+			linkColorManager.addLinkColor(link, new Pair<Integer,Color>(-1,color));
+		controller.notifyObservers();
+	}
+	
+	/**
+	 * Removes the given Link and its color
+	 * @param link link to be removed
+	 */
+	public void removeLink(Link link){
+		linkColorManager.removeLink(link);;
+	}
+}

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

@@ -60,7 +60,7 @@ public class NetworkTreeSettingsController {
 			/**
 			 * String node, is the top most -> Hide/Show the hole network
 			 */
-			getStatusOfObject(o).setExpanded(visible);
+			getStatusOfObject(o).setVisible(visible);
 			for(Link l:controller.getNetworkController().getLinks())
 				setVisibilityOfLink(l, visible);
 		}else if(o instanceof Link){

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

@@ -25,6 +25,10 @@ public class SettingsController {
 	 */
 	private NetworkTreeSettingsController networkTreeSettings;
 	
+	/**
+	 * Link ColorController
+	 */
+	private LinkColorController linkColors;
 	/**
 	 * 
 	 * @param model model which stores the configuration
@@ -33,6 +37,7 @@ public class SettingsController {
 		this.model = model;
 		this.controller = controller;
 		networkTreeSettings = new NetworkTreeSettingsController(model,controller);
+		linkColors = new LinkColorController(model, controller);
 	}
 	
 	/**
@@ -44,6 +49,13 @@ public class SettingsController {
 		return networkTreeSettings;
 	}
 	
+	/**
+	 * @return the linkColors
+	 */
+	public LinkColorController getLinkColors() {
+		return linkColors;
+	}
+
 	/**
 	 * Returns the ConfigurationManager
 	 * 

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/core/ConfigurationManager.java

@@ -1,6 +1,7 @@
 package de.tu_darmstadt.tk.SmartHomeNetworkSim.core;
 
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.configuration.ImportConfiguration;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.configuration.LinkColorManager;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.configuration.NetworkTreeSettings;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.configuration.SelectionModel;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.configuration.VisualizationConfiguration;
@@ -31,6 +32,10 @@ public class ConfigurationManager {
 	 * Settings of the networkTree
 	 */
 	private NetworkTreeSettings networkTree;
+	/**
+	 * Link Color manager
+	 */
+	private LinkColorManager linkColors;
 	/**
 	 * Initialize the Configuration Manager
 	 */
@@ -39,6 +44,7 @@ public class ConfigurationManager {
 		importConf = new ImportConfiguration();
 		selection = new SelectionModel();
 		networkTree = new NetworkTreeSettings();
+		linkColors = new LinkColorManager();
 	}
 
 	/**
@@ -68,7 +74,18 @@ public class ConfigurationManager {
 		return selection;
 	}
 	
+	/**
+	 * Returns the NetworkTreeSettings
+	 * @return network tree settings
+	 */
 	public NetworkTreeSettings getNetworkTreeSettings(){
 		return networkTree;
 	}
+
+	/**
+	 * @return the linkColors
+	 */
+	public LinkColorManager getLinkColors() {
+		return linkColors;
+	}
 }

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/core/configuration/LinkColorManager.java

@@ -0,0 +1,76 @@
+package de.tu_darmstadt.tk.SmartHomeNetworkSim.core.configuration;
+
+import java.awt.Color;
+import java.util.HashMap;
+
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Link;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.util.Pair;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.view.util.Utility;
+
+/**
+ * Container for the different Link colors
+ *
+ * @author Andreas T. Meyer-Berg
+ */
+public class LinkColorManager {
+
+	/**
+	 * Map which stores the Colors and circle positions for all links
+	 */
+	private HashMap<Link, Pair<Integer,Color>> linkColors = null;
+	/**
+	 * Integer which contains the next color index, which should be used
+	 */
+	private int i = 0;
+	/**
+	 * Initialize the color manager
+	 */
+	public LinkColorManager() {
+		linkColors = new HashMap<Link, Pair<Integer,Color>>();
+	}
+	
+	/**
+	 * Returns the color & index of the given Link
+	 * @param link link which should be looked up
+	 * @return Index & Color
+	 */
+	public Pair<Integer,Color> getColorOfLink(Link link){
+		return linkColors.get(link);
+	}
+	
+	/**
+	 * Removes the given Link and its color
+	 * @param link link to be removed
+	 */
+	public void removeLink(Link link){
+		linkColors.remove(link);
+	}
+
+	/**
+	 * Adds a link with the given Color
+	 * @param link link to be added
+	 * @param pair Index&Color of the link
+	 */
+	public void addLinkColor(Link link, Pair<Integer, Color> pair) {
+		linkColors.put(link, pair);
+	}
+	
+	/**
+	 * Returns the color of the next Link
+	 * @return next color
+	 */
+	public Color getNextLinkColor(){
+		/**
+		 * Distinct Color as String containing the hex values (128 static ones should be enough)
+		 */
+		String colorHex = Utility.indexcolors[i++%Utility.indexcolors.length];
+		/**
+		 * Color of the given Hex String (Base16)
+		 */
+		Color color =  new Color(
+				Integer.valueOf(colorHex.substring(1,3),16),
+	            Integer.valueOf(colorHex.substring(3,5),16),
+	            Integer.valueOf(colorHex.substring(5,7),16));
+		return color;
+	}
+}

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

@@ -16,6 +16,7 @@ import java.util.Observer;
 
 import javax.swing.JPanel;
 
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.LinkColorController;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.SettingsController;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.Controller;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.NetworkController;
@@ -26,7 +27,6 @@ import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.SmartDevice;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.util.Pair;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.view.VisualisationInteractor;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.view.util.LinkToolTip;
-import de.tu_darmstadt.tk.SmartHomeNetworkSim.view.util.Utility;
 
 /**
  * Panel which visualizes the SmartHome Network, it's Devices and Connections
@@ -210,27 +210,16 @@ public class VisualisationPanel extends JPanel implements Observer {
 		/**
 		 * Map of links to Colors and position of the Color
 		 */
-		HashMap<Link, Pair<Integer,Color>> linkColors = null;
+		LinkColorController linkColors = config.getLinkColors();
 		
 		if(config.isShowLinks()){
-			linkColors = new HashMap<Link, Pair<Integer,Color>>();
 			int i = 0;
 			for(Link l: network.getVisibleLinks()){
 				/**
-				 * Distinct Color as String containing the hex values (128 static ones should be enough)
+				 * Index & Color
 				 */
-				String colorHex = Utility.indexcolors[i%Utility.indexcolors.length];
-				/**
-				 * Color of the given Hex String (Base16)
-				 */
-				Color color =  new Color(
-						Integer.valueOf(colorHex.substring(1,3),16),
-			            Integer.valueOf(colorHex.substring(3,5),16),
-			            Integer.valueOf(colorHex.substring(5,7),16));
-				/**
-				 * Put position and Color into the HashMap
-				 */
-				linkColors.put(l, new Pair<Integer, Color>(i,color));
+				Pair<Integer, Color> p = config.getLinkColors().getColorOfLink(l);
+				p.setLeft(i);
 				i++;
 			}
 		}
@@ -287,8 +276,8 @@ public class VisualisationPanel extends JPanel implements Observer {
 					/**
 					 * Number and color of the current link
 					 */
-					Pair<Integer, Color> linkPos = linkColors.get(l);
-					if(linkPos==null)continue;//Skip Links, which are not in the model
+					Pair<Integer, Color> linkPos = linkColors.getColorOfLink(l);
+					if(linkPos==null||!config.getNetworkTreeSettingsController().isVisible(l))continue;//Skip Links, which are not in the model or hidden
 					g.setColor(linkPos.getRight());
 					g.fillArc(x - deviceRadius - config.getLinkRadius(), y - deviceRadius - config.getLinkRadius(),
 							2 * deviceRadius - 1 + 2 * config.getLinkRadius(), 2 * deviceRadius - 1 + 2*config.getLinkRadius(),

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

@@ -13,6 +13,7 @@ import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Connection;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Link;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.SmartDevice;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.configuration.NetworkTreeNodeStatus;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.util.Pair;
 
 /**
  * TreeCellRenderer for the Network tree, which visualizes the different network parts
@@ -47,7 +48,7 @@ public class NetworkTreeCellRenderer implements TreeCellRenderer {
 		/**
 		 * Status of the object (hidden, expanded etc.)
 		 */
-		NetworkTreeNodeStatus status = controller.getSettingsController().getConfigurationManager().getNetworkTreeSettings().getStatusOfObject(o);
+		NetworkTreeNodeStatus status = controller.getSettingsController().getNetworkTreeSettingsController().getStatusOfObject(o);
 		label.setSelected(status.isVisible());
 		
 		if (o instanceof SmartDevice) {
@@ -73,8 +74,14 @@ public class NetworkTreeCellRenderer implements TreeCellRenderer {
 			 */
 			Link link = (Link) o;
 			//label.setIcon(new ImageIcon(Utility.loadFile("/images/smartHome_icon.png").getScaledInstance(12, 12, 0)));
-			
-			label.setText(link.getName());
+			/**
+			 * Index & Color of the link
+			 */
+			Pair<Integer,Color> pair = controller.getSettingsController().getLinkColors().getColorOfLink(link);
+			int r = pair.getRight().getRed();
+			int g = pair.getRight().getGreen();
+			int b = pair.getRight().getBlue();
+			label.setText("<html><font color=\"rgb("+r+","+g+","+b+")\">"+link.getName()+"</font></html>");
 			
 		}
 		else {