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

src/ui/controller/Control.java

@@ -94,7 +94,7 @@ public class Control {
 	}
 
 	public void addSwitch(Category cat, String obj) {
-		categoryController.addNewHolonSwitch(cat, obj, "/Images/switch-off.png");
+		categoryController.addNewHolonSwitch(cat, obj, "/Images/switch-on.png");
 	}
 
 	public void deleteCategory(String cat) {

src/ui/controller/ObjectController.java

@@ -118,7 +118,7 @@ public class ObjectController {
 	}
 
 	/**
-	 * adds a selectedObject
+	 * 	s a selectedObject
 	 * 
 	 * @param Cpsobject
 	 */

src/ui/view/CategoryPanel.java

@@ -3,3 +3,5 @@ package ui.view;
 public class CategoryPanel {
 
 }
+
+//hier müsste das Panel eigentlich sein

src/ui/view/GUI.java

@@ -373,7 +373,7 @@ public class GUI<E> implements CategoryListener {
 				unitGraph.empty();
 			}
 		});
-		
+
 		String cntrlFDown = "controlF";
 		inputMap.put(KeyStroke.getKeyStroke("control F"), cntrlFDown);
 		actionMap.put(cntrlFDown, new AbstractAction() {
@@ -386,9 +386,6 @@ public class GUI<E> implements CategoryListener {
 			}
 		});
 
-		
-		
-
 		String cntrlCDown = "controlC";
 		inputMap.put(KeyStroke.getKeyStroke("control C"), cntrlCDown);
 		actionMap.put(cntrlCDown, new AbstractAction() {
@@ -888,12 +885,11 @@ public class GUI<E> implements CategoryListener {
 							if (value.toString().compareTo(cps.getObjName()) == 0) {
 								File checkPath = new File(cps.getImage());
 								if (checkPath.exists()) {
-									imgR = new ImageIcon(cps.getImage()).getImage().getScaledInstance(
-											50, 50, java.awt.Image.SCALE_SMOOTH);
+									imgR = new ImageIcon(cps.getImage()).getImage().getScaledInstance(50, 50,
+											java.awt.Image.SCALE_SMOOTH);
 								} else {
 									imgR = new ImageIcon(this.getClass().getResource(cps.getImage())).getImage()
-											.getScaledInstance(50, 50,
-													java.awt.Image.SCALE_SMOOTH);
+											.getScaledInstance(50, 50, java.awt.Image.SCALE_SMOOTH);
 								}
 								if (imgR != null) {
 									label.setIcon(new ImageIcon(imgR));
@@ -995,13 +991,11 @@ public class GUI<E> implements CategoryListener {
 								if (actualObjectClicked.compareTo(cps.getObjName()) == 0) {
 									File checkPath = new File(cps.getImage());
 									if (checkPath.exists()) {
-										img = new ImageIcon(cps.getImage()).getImage().getScaledInstance(
-												50, 50,
+										img = new ImageIcon(cps.getImage()).getImage().getScaledInstance(50, 50,
 												java.awt.Image.SCALE_SMOOTH);
 									} else {
 										img = new ImageIcon(this.getClass().getResource(cps.getImage())).getImage()
-												.getScaledInstance(50, 50,
-														java.awt.Image.SCALE_SMOOTH);
+												.getScaledInstance(50, 50, java.awt.Image.SCALE_SMOOTH);
 									}
 									tempCps = cps;
 									dragging = true;
@@ -1034,7 +1028,7 @@ public class GUI<E> implements CategoryListener {
 
 		panel.add(toolBar);
 		toolBar.add(comboBox);
-		comboBox.setModel(new DefaultComboBoxModel(new String[] { "Category", "Object", "Transformer", "Switch" }));
+		comboBox.setModel(new DefaultComboBoxModel(new String[] { "Category", "Object", "Switch" }));
 		// Add Button
 		btnAdd.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent arg0) {
@@ -1042,32 +1036,36 @@ public class GUI<E> implements CategoryListener {
 				Object nodeInfo = tree.getLastSelectedPathComponent();
 				String selectedOption = comboBox.getSelectedItem().toString();
 				DefaultMutableTreeNode selectedNode = (DefaultMutableTreeNode) nodeInfo;
+				try {
 
-				switch (selectedOption) {
+					switch (selectedOption) {
 
-				case "Category":
-					String catName = JOptionPane.showInputDialog("Please enter a Name for Category ");
-					if (catName.length() != 0) {
-						controller.addCategory(catName);
-					}
-					break;
-				case "Object":
-					if (selectedNode == null) {
-						JOptionPane.showMessageDialog(new JFrame(),
-								"Please select a Category first before adding " + selectedOption + ".");
-					}
-					if (selectedNode.getLevel() == 1) {
-						CpsObject tmp = new HolonObject("");
-						addObjectPopUP = new AddObjectPopUp(false, tmp, null);
-						addObjectPopUP.setVisible(true);
-						addObjectPopUP.setController(controller);
-						addObjectPopUP.setCategory(selectedNode.toString());
-					}
-					break;
+					case "Category":
+						String catName = JOptionPane.showInputDialog("Please enter a Name for Category ");
+						if (catName.length() != 0) {
+							controller.addCategory(catName);
+						}
+						break;
+					case "Object":
+						if (selectedNode == null) {
+							JOptionPane.showMessageDialog(new JFrame(),
+									"Please select a Category first before adding " + selectedOption + ".");
+						}
+						if (selectedNode.getLevel() == 1) {
+							CpsObject tmp = new HolonObject("");
+							addObjectPopUP = new AddObjectPopUp(false, tmp, null);
+							addObjectPopUP.setVisible(true);
+							addObjectPopUP.setController(controller);
+							addObjectPopUP.setCategory(selectedNode.toString());
+						}
+						break;
 
-				default:
-					addObjectAction(selectedOption, selectedNode);
-					break;
+					default:
+						addObjectAction(selectedOption, selectedNode);
+						break;
+					}
+				} catch (Exception e) {
+					// TODO: handle exception
 				}
 				tree.repaint();
 			}
@@ -1502,10 +1500,6 @@ public class GUI<E> implements CategoryListener {
 					case "Switch":
 						controller.addSwitch(cat, objname);
 						break;
-
-					case "Transformer":
-						controller.addTransformer(cat, objname);
-						break;
 					}
 				}
 			} else {

src/ui/view/UnitGraph.java

@@ -107,7 +107,7 @@ class UnitGraph extends JPanel implements MouseListener, MouseMotionListener, Co
 		if (isElement) {
 			// array fillen
 			fillArrayofValue();
-	
+
 			if (arrayOfFloats != null) {
 				// Draw the Lines
 				g2.setStroke(new BasicStroke(2));
@@ -133,12 +133,12 @@ class UnitGraph extends JPanel implements MouseListener, MouseMotionListener, Co
 							this.getHeight() - 10);
 				}
 			}
-			//drag Information
+			// drag Information
 			if (tempP != null) {
 				dragInformation = "" + convertToValueY(getYValueAt((int) tempP.getX()));
-				g2.drawString(dragInformation, (int) (tempP.getX()* scaleX)+10, (int) (tempP.getY()* scaleY)+10);
+				g2.drawString(dragInformation, (int) (tempP.getX() * scaleX) + 10, (int) (tempP.getY() * scaleY) + 10);
 			}
-			
+
 			/*
 			 * // Actual Iteration Point Visualization g2.setColor(Color.RED);
 			 * if (arrayOfValue != null) { for (int i = 0; i <
@@ -179,11 +179,20 @@ class UnitGraph extends JPanel implements MouseListener, MouseMotionListener, Co
 				}
 			}
 			if (tempP != null) {
-				dragInformation = "model.get";
-				g2.drawString(dragInformation, (int) (getMousePosition().getX())+10, (int) (getMousePosition().getY())+10);
+				try {
+					int i;
+					for (i = 0; (i * this.getWidth() / (model.getIterations() - 1) < getMousePosition().getX()); i++) {
+
+					}
+					dragInformation = "" + i;
+					g2.drawString(dragInformation, (int) (getMousePosition().getX()) + 10,
+							(int) (getMousePosition().getY()) + 10);
+				} catch (Exception e) {
+					// TODO: handle exception
+				}
 			}
 		}
-		
+
 		// Iteration Line
 		g2.setColor(Color.BLUE);
 		g2.setStroke(new BasicStroke(1));
@@ -423,6 +432,7 @@ class UnitGraph extends JPanel implements MouseListener, MouseMotionListener, Co
 			tempP = null;
 		}
 		dragInformation = "";
+		repaint();
 	}
 
 	public void componentResized(ComponentEvent e) {