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

Conflicts:
	src/ui/view/GUI.java

src/ui/view/GUI.java

@@ -310,8 +310,15 @@ public class GUI implements CategoryListener {
 						&& tempCpsObject.getID() != 0) {
 					addElementPopUp = new AddElementPopUp();
 					addElementPopUp.setVisible(true);
+<<<<<<< HEAD
 					controller.addElementCanvasObject(tempCpsObject.getID(), addElementPopUp.getElement().getEleName(),
 							addElementPopUp.getElement().getAmount(), addElementPopUp.getElement().getEnergy());
+=======
+					controller.addElementCanvasObject(tempCpsObject.getID(),
+							addElementPopUp.getElement().getEleName(), addElementPopUp.getElement().getAmount(),
+							addElementPopUp.getElement().getEnergy());
+					refreshTableHolonElement();
+>>>>>>> e4dd5230480ec56a5237cc665a0168f4a8b095d8
 				}
 			}
 		});
@@ -329,6 +336,7 @@ public class GUI implements CategoryListener {
 					tempElement = getActualHolonElement(obj, yValueElements);
 					if (tempElement != null && obj.getClass() == HolonObject.class && obj.getID() != 0) {
 						controller.deleteElementCanvas(obj.getID(), tempElement.getEleName());
+						refreshTableHolonElement();
 					}
 				}
 			}
@@ -515,18 +523,7 @@ public class GUI implements CategoryListener {
 			@Override
 			public void mousePressed(MouseEvent e) {
 				// Update of the Information about the HolonElements - only for
-				// HolonObjects
-				if (tableModelHolonElement.getRowCount() > 0) {
-					for (int i = tableModelHolonElement.getRowCount() - 1; i > -1; i--) {
-						tableModelHolonElement.removeRow(i);
-					}
-				}
-				if (canvas.dataSelected != null) {
-					for (HolonElement he : canvas.dataSelected) {
-						Object[] temp = { he.getEleName(), he.getEnergy(), he.getAmount() };
-						tableModelHolonElement.addRow(temp);
-					}
-				}
+				refreshTableHolonElement();
 
 				// Update of the Information about the Properties - only for
 				// CpsObjects
@@ -789,7 +786,6 @@ public class GUI implements CategoryListener {
 	public CpsObject getActualCps() {
 		int tempID = model.getSelectedObjectID();
 		CpsObject tempCps = controller.searchByID(tempID);
-		System.out.println(tempCps.getID());
 		return tempCps;
 	}
 
@@ -805,4 +801,23 @@ public class GUI implements CategoryListener {
 			return null;
 		}
 	}
+	
+	/*
+	 * Refresh the Table displaying the Holon Elements
+	 */
+	public void refreshTableHolonElement() {
+		// Update of the Information about the HolonElements - only for
+		// HolonObjects
+		if (tableModelHolonElement.getRowCount() > 0) {
+			for (int i = tableModelHolonElement.getRowCount() - 1; i > -1; i--) {
+				tableModelHolonElement.removeRow(i);
+			}
+		}
+		if (canvas.dataSelected != null) {
+			for (HolonElement he : canvas.dataSelected) {
+				Object[] temp = { he.getEleName(), he.getEnergy(), he.getAmount() };
+				tableModelHolonElement.addRow(temp);
+			}
+		}
+	}
 }

src/ui/view/TimePanel.java

@@ -62,15 +62,19 @@ public class TimePanel extends JPanel {
 		timeSlider.setPaintTicks(true);
 		timeSlider.setPaintLabels(true);
 		timeSlider.setMinorTickSpacing(1);
+		timeSlider.setMajorTickSpacing(5);
 		timeSlider.setToolTipText("Time Slider");
-		timeSlider.setMinimum(1);
 		timeSlider.setMaximum(model.getIterations());
-		timeSlider.setValue(1);
+		timeSlider.setValue(0);
 		timeSlider.setBackground(Color.WHITE);
+
+		// Panel
+		timeBtnPanel.setBorder(null);
 		timeBtnPanel.setBackground(Color.WHITE);
 
 		// Buttons
 		timeBtnPanel.setLayout(new FlowLayout(FlowLayout.CENTER, 0, 0));
+		playBtn.setToolTipText("Play");
 
 		playBtn.setBackground(Color.WHITE);
 		playBtn.setBorderPainted(false);
@@ -92,6 +96,7 @@ public class TimePanel extends JPanel {
 				}
 			}
 		});
+		timeResetBtn.setToolTipText("Reset");
 
 		timeResetBtn.setBorderPainted(false);
 		timeResetBtn.setBackground(Color.WHITE);
@@ -103,6 +108,7 @@ public class TimePanel extends JPanel {
 				timeSlider.setValue(timeSlider.getMinimum());
 			}
 		});
+		timeForwardBtn.setToolTipText("Forward");
 
 		timeForwardBtn.setBorderPainted(false);
 		timeForwardBtn.setContentAreaFilled(false);
@@ -114,6 +120,7 @@ public class TimePanel extends JPanel {
 				timeSlider.setValue(timeSlider.getValue() + 1);
 			}
 		});
+		timeBackwardBtn.setToolTipText("Backward");
 
 		timeBackwardBtn.setBackground(Color.WHITE);
 		timeBackwardBtn.setBorderPainted(false);