Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons

# Conflicts:
#	src/ui/view/StatisticGraphPanel.java

src/ui/controller/UpdateController.java

@@ -201,6 +201,7 @@ public class UpdateController {
 	 */
 	public AbstractCpsObject getActualCps() {
 		int tempID = model.getSelectedObjectID();
+		System.out.println(model.getSelectedObjectID());
 		AbstractCpsObject tempCps = controller.searchByID(tempID);
 		return tempCps;
 	}

src/ui/view/GUI.java

@@ -733,6 +733,7 @@ public class GUI<E> implements CategoryListener {
 		model.getTableHolonElement().addMouseListener(new MouseAdapter() {
 			public void mousePressed(MouseEvent e) {
 				HolonObject obj = (HolonObject) updCon.getActualCps();
+				System.out.println(obj);
 				yValueElements = e.getY();
 				HolonElement ele = null;
 				// Search for current clicked HolonElement
@@ -1577,19 +1578,33 @@ public class GUI<E> implements CategoryListener {
 			int dialogResult = JOptionPane.showConfirmDialog(null, "Old autosave file was found, should it be loaded?",
 					warningText, dialogButton);
 			if (dialogResult == JOptionPane.YES_OPTION) {
+				if(dest.exists()){
 				model.setAutoSaveNr(dest.listFiles().length - 1);
 				mntmRedo.doClick();
-			} else {
-				controller.deleteDirectory(dest);
-				dest.mkdirs();
-				try {
-					controller.autoSave();
-				} catch (IOException e1) {
-					// TODO Auto-generated catch block
-					e1.printStackTrace();
+				}else{
+					JOptionPane.showMessageDialog(frmCyberPhysical, "Autosave could not be loaded.");
+					setUpAutoSave(dest);
 				}
+			} else {
+				setUpAutoSave(dest);
 			}
-
+		}
+	}
+	
+	/**
+	 * Sets up autosave if no old one is loaded at the beginning
+	 * 
+	 * @param dest
+	 * 			path to save-folder
+	 */
+	public void setUpAutoSave(File dest){
+		controller.deleteDirectory(dest);
+		dest.mkdirs();
+		try {
+			controller.autoSave();
+		} catch (IOException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
 		}
 	}
 
@@ -1815,7 +1830,8 @@ public class GUI<E> implements CategoryListener {
 			unc.addMouseListener(new MouseAdapter() {
 				@Override
 				public void mousePressed(MouseEvent e) {
-					temp = ((UpperNodeCanvas) ((JScrollPane) tabbedPane.getSelectedComponent()).getViewport().getComponent(0)).tempCps;
+					temp = ((UpperNodeCanvas) ((JScrollPane) tabbedPane.getSelectedComponent()).getViewport()
+							.getComponent(0)).tempCps;
 					if (doubleClick() && temp instanceof CpsUpperNode) {
 						openNewUpperNodeTab();
 					}

src/ui/view/StatisticGraph.java

@@ -58,6 +58,8 @@ public class StatisticGraph extends JPanel {
 		this.controller = control;
 		this.model = model;
 
+		
+	
 		this.setBackground(Color.WHITE);
 	}
 

src/ui/view/StatisticGraphPanel.java

@@ -5,12 +5,13 @@ import javax.swing.JPanel;
 import classes.TrackedDataSet;
 import ui.controller.Control;
 import ui.model.Model;
+
 import javax.swing.JLabel;
-import javax.swing.BoxLayout;
 import javax.swing.JButton;
 import javax.swing.SwingConstants;
 import java.awt.BorderLayout;
 import javax.swing.border.LineBorder;
+
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
@@ -30,7 +31,6 @@ public class StatisticGraphPanel extends JPanel {
 	private final JLabel maximumLabel = new JLabel("0");
 	private JPanel topPanel = new JPanel();
 	private JButton closeButton = new JButton("X");
-	private JPanel that;
 
 	// Variables
 	String graphName;
@@ -46,7 +46,6 @@ public class StatisticGraphPanel extends JPanel {
 	 */
 	public StatisticGraphPanel(Model mod, Control cont, String name) {
 		super();
-		setBorder(new LineBorder(new Color(0, 0, 0), 1, true));
 		this.model = mod;
 		this.controller = cont;
 		this.sGraph = new StatisticGraph(mod, cont);
@@ -54,36 +53,44 @@ public class StatisticGraphPanel extends JPanel {
 		setLayout(new BorderLayout(0, 0));
 
 		// ******************** Component Propertys ***************//
-		//Graph Name
+		// Graph Name
 		graphNameLabel = new JLabel(graphName);
 		graphNameLabel.setHorizontalTextPosition(JLabel.CENTER);
 
-		//Panel on top (Name and Close Button)
+		// Panel on top (Name and Close Button)
 		topPanel.setLayout(new BorderLayout(0, 0));
 		topPanel.add(graphNameLabel, BorderLayout.CENTER);
 		topPanel.add(closeButton, BorderLayout.EAST);
 		topPanel.setBorder(null);
-		
-		//Maximum Label
+
+		// Maximum Label
 		maximumLabel.setVerticalAlignment(SwingConstants.TOP);
-		maximumLabel.setPreferredSize(new Dimension(30,10));
+		maximumLabel.setPreferredSize(new Dimension(30, 10));
 		// ******************** Component Listener ****************//
-		
-		that = this;
+
+		JPanel that = this;
 		closeButton.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				JPanel parent = (JPanel) that.getParent();
+				for (int i = 0; i < parent.getComponentCount(); i++) {
+					if (parent.getComponent(i).equals(that)) {
+						parent.remove(parent.getComponent(i+1));
+						break;
+					}
+				}
 				parent.remove(that);
-				parent.revalidate();
+				parent.updateUI();
 			}
 		});
-		
+
 		// ******************** add everything ********************//
 		this.add(sGraph);
 		this.add(topPanel, BorderLayout.NORTH);
 		this.add(maximumLabel, BorderLayout.WEST);
 		this.add(Legendpanel, BorderLayout.SOUTH);
+		
+
 	}
 
 	/**
@@ -97,9 +104,10 @@ public class StatisticGraphPanel extends JPanel {
 
 	/**
 	 * Repaint the Graph.
-	 * 
-	 * public void repaint() { sGraph.repaint(); }
 	 */
+	public void repaintGraph() {
+		sGraph.repaint();
+	}
 
 	/**
 	 * Set the Maximum Label

src/ui/view/UpperNodeCanvas.java

@@ -624,13 +624,12 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 					controller.addTextToConsole("" + cps.getID(), Color.RED, 12, true, false, true);
 					dragging = true;
 					if (e.isControlDown() && tempCps != null) {
-						System.out.println(tempCps.getName() + " " + tempCps.getID());
 						if (model.getSelectedCpsObjects().contains(tempCps)) {
 							controller.deleteSelectedObject(tempCps);
 						} else {
 							controller.addSelectedObject(tempCps);
 						}
-					} else {
+					} else if (e.getButton() != MouseEvent.BUTTON3) {
 						controller.setSelectedObjectID(tempCps.getID());
 						model.getSelectedCpsObjects().clear();
 						controller.addSelectedObject(tempCps);
@@ -713,9 +712,9 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 	@Override
 	public void mouseReleased(MouseEvent e) {
 		dragging = false;
-
-		updCon.refreshTableHolonElement(model.getMultiTable(), model.getSingleTable());
-		updCon.refreshTableProperties(model.getPropertyTable());
+		// updCon.refreshTableHolonElement(model.getMultiTable(),
+		// model.getSingleTable());
+		// updCon.refreshTableProperties(model.getPropertyTable());
 		if (model.getSelectedCpsObjects().size() > 1) {
 			model.getTableHolonElement().setModel(model.getMultiTable());
 		} else if (model.getSelectedCpsObjects().size() == 1) {

src/ui/view/splitPane.java

@@ -352,11 +352,11 @@ public class splitPane extends JSplitPane implements GraphListener {
 					 }
 				 }
 				 */
-				 StatisticGraph tmp = new StatisticGraph(controller.getModel(), controller);
+				 StatisticGraphPanel tmp = new StatisticGraphPanel(controller.getModel(), controller, graphNrTxtField.getText());
 				 tmp.setPreferredSize(new Dimension(280,120));
 				 tmp.setMaximumSize(new Dimension(1000,120));
 				 tmp.setMinimumSize(new Dimension(100,45));
-				 tmp.setBorder(new LineBorder(new Color(0, 0, 0), 2));
+				 tmp.setBorder(new LineBorder(new Color(0, 0, 0), 1));
 				 graphPanel.add(tmp);
 				 graphPanel.add(Box.createRigidArea(new Dimension(50,50)));
 				 graphPanel.revalidate();