Merge branch 'master' of

https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons.git

Conflicts:
	src/ui/view/StatisticGraph.java

src/ui/view/GUI.java

@@ -1916,6 +1916,7 @@ public class GUI<E> implements CategoryListener {
 		// check if tab already open for clicked NodeOfNode
 		boolean dupl = false;
 		for (int i = 2; i < tabbedPane.getTabCount() && dupl == false; i++) {
+			System.out.println(i);
 			if (((UpperNodeCanvas) ((JScrollPane) tabbedPane.getComponentAt(i)).getViewport().getComponent(0)).upperNode
 					.getID() == temp.getID()) {
 				dupl = true;
@@ -1930,9 +1931,10 @@ public class GUI<E> implements CategoryListener {
 			unc.addMouseListener(new MouseAdapter() {
 				@Override
 				public void mousePressed(MouseEvent e) {
-					temp = unc.tempCps;
+					temp = ((UpperNodeCanvas) ((JScrollPane) tabbedPane.getSelectedComponent()).getViewport().getComponent(0)).tempCps;
 					if (doubleClick() && temp instanceof CpsUpperNode) {
 						openNewUpperNodeTab();
+						System.out.println("done");
 					}
 					// updCon.refreshTableProperties(table);
 				}

src/ui/view/StatisticGraph.java

@@ -10,14 +10,10 @@ import java.util.ArrayList;
 
 import javax.swing.JPanel;
 
-import com.sun.javafx.css.CalculatedValue;
-
-import classes.AbstractCpsObject;
 import classes.HolonElement;
 import classes.HolonObject;
 import classes.HolonSwitch;
 import classes.TrackedDataSet;
-import javafx.util.Pair;
 import ui.controller.Control;
 import ui.model.Model;
 
@@ -37,9 +33,6 @@ public class StatisticGraph extends JPanel {
 	// is the Simulation running?
 	private boolean isSimRunning;
 
-	// Colours
-	private ArrayList<Color> colors = new ArrayList<>();
-
 	// model and controller
 	private Model model;
 	private Control controller;
@@ -145,11 +138,6 @@ public class StatisticGraph extends JPanel {
 		for (TrackedDataSet set : objects) {
 			controller.addTextToConsole("Function not available");
 		}
-
-		/*
-		 * if (objects.contains(obj)) { objPaths.remove(objects.indexOf(obj));
-		 * objects.remove(obj); }
-		 */
 	}
 
 	/**