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

Conflicts:
	bin/ui/view/GUI$1.class
	bin/ui/view/GUI$2.class
	bin/ui/view/GUI$3.class
	bin/ui/view/GUI$4.class
	bin/ui/view/GUI.class
	src/ui/view/GUI.java

src/classes/CpsObject.java

@@ -31,6 +31,12 @@ public class CpsObject implements ComparableObject {
 		position = new Position();
 		id = IdCounter.nextId();
 	}
+	public CpsObject(CpsObject obj) {
+		this.objName = obj.getObjName();
+		connectedTo = new ArrayList<CpsObject>();
+		position = new Position();
+		id = IdCounter.nextId();
+	}
 	
 	/* Obj type */
 	public String getObjName() {

src/classes/HolonElement.java

@@ -23,6 +23,15 @@ public class HolonElement {
 		System.out.println("You create some " + name + "'s. The amount is:" + amount);
 		System.out.println("It's actual status is: " + isWorking);
 	}
+	
+	public HolonElement(HolonElement hol) {
+		this.name = hol.getName();
+		this.amount = hol.getAmount();
+		this.energy = hol.getEnergy();
+		this.isWorking = true;
+		System.out.println("You create some " + name + "'s. The amount is:" + amount);
+		System.out.println("It's actual status is: " + isWorking);
+	}
 
 	public String getName() {
 		return name;

src/classes/HolonObject.java

@@ -26,6 +26,12 @@ public class HolonObject extends CpsObject {
 		super(ObjName);
 	}
 	
+	public HolonObject(HolonObject obj) {
+		super(obj.objName);
+		this.consumers = obj.consumers;
+		this.producers = obj.producers;
+	}
+	
 	public void addConsumer(HolonElement consumer){
 		consumers.add(consumer);
 	}

src/classes/HolonSwitch.java

@@ -9,6 +9,12 @@ public class HolonSwitch extends CpsObject {
 		isWorking = false;
 	}
 	
+	public HolonSwitch(HolonObject obj) {
+		super(obj.objName);
+		isWorking = false;
+	}
+	
+	
 	public void switchState() {
 		this.isWorking = !isWorking;
 	}

src/classes/HolonTransformer.java

@@ -12,6 +12,11 @@ public class HolonTransformer extends CpsObject {
 	public HolonTransformer(String ObjName) {
 		super(ObjName);
 	}
+	
+	public HolonTransformer(HolonObject obj) {
+		super(obj.objName);
+	}
+	
 
 	/**
 	 * Set transform ratio

src/ui/controller/CategoryController.java

@@ -36,9 +36,13 @@ public class CategoryController {
 		Category component = new Category("Component");
 
 		HolonObject powerp = new HolonObject("Power Plant");
+		powerp.setImage("/Images/Dummy_House.png");
 		HolonObject house = new HolonObject("House");
+		house.setImage("/Images/Dummy_House.png");
 		HolonTransformer transformer = new HolonTransformer("Transformer");
+		transformer.setImage("/Images/Dummy_House.png");
 		HolonSwitch sw = new HolonSwitch("Switch");
+		sw.setImage("/Images/Dummy_House.png");
 
 		addObject(energy, powerp);
 		addObject(building, house);

src/ui/controller/ObjectControl.java

@@ -22,7 +22,7 @@ public class ObjectControl {
 	 *            CpsObject to be added.
 	 */
 	public void addObject(CpsObject object) {
-		String name = object.getObjName();
+		String name = object.getName();
 		M.getObjectsOnCanvas().add(object);
 		notifyObjListeners();
 		System.out.println("Added: " + name);

src/ui/view/GUI.java

@@ -53,6 +53,8 @@ import javax.swing.ImageIcon;
 import classes.Category;
 import classes.CpsObject;
 import classes.HolonObject;
+import classes.HolonSwitch;
+import classes.HolonTransformer;
 import Interfaces.CategoryListener;
 
 import java.awt.event.ActionListener;
@@ -102,8 +104,17 @@ public class GUI implements CategoryListener {
 	private final JToolBar toolBar = new JToolBar();
 
 	// variables
+<<<<<<< HEAD
 	boolean dragging = false;
 	String actualObjectClicked;
+=======
+	private boolean dragging = false;
+	private Image img = null;
+	private CpsObject tempCps = null;
+	private HolonObject tempHol = null;
+	private HolonSwitch tempSw = null;
+	private HolonTransformer tempTrans = null;
+>>>>>>> 1c5a1a2c88c580db3f508d880b0796434747d61f
 
 	private final MyCanvas canvas;
 
@@ -191,9 +202,8 @@ public class GUI implements CategoryListener {
 		splitPane_2.setDividerLocation(200);
 
 		splitPane.setLeftComponent(scrollPane_1);
-		final Image img = new ImageIcon(this.getClass().getResource("/Images/Dummy_House.png")).getImage()
-				.getScaledInstance(30, 30, java.awt.Image.SCALE_SMOOTH);
-		Icon icon = new ImageIcon(img);
+		
+		Icon icon = new ImageIcon(new ImageIcon(this.getClass().getResource("/Images/Dummy_House.png")).getImage().getScaledInstance(30, 30, java.awt.Image.SCALE_SMOOTH));
 		DefaultTreeCellRenderer renderer = (DefaultTreeCellRenderer) tree.getCellRenderer();
 		renderer.setLeafIcon(icon);
 		// renderer.setClosedIcon(icon);
@@ -203,9 +213,14 @@ public class GUI implements CategoryListener {
 
 		tree.addMouseListener(new MouseAdapter() {
 			public void mouseReleased(MouseEvent e) {
-				try {
+				try {//wenn ein bild "gedraged" wird
 					if (dragging) {
+<<<<<<< HEAD
 						HolonObject h = new HolonObject(actualObjectClicked);
+=======
+						//neues Object
+						CpsObject h = new CpsObject(tempCps);
+>>>>>>> 1c5a1a2c88c580db3f508d880b0796434747d61f
 						h.setPos((int) canvas.getMousePosition().getX(), (int) canvas.getMousePosition().getY());
 						controller.addObject(h);
 						canvas.repaint();
@@ -213,6 +228,7 @@ public class GUI implements CategoryListener {
 					}
 				} catch (Exception e2) {
 				}
+				//Cursor normalisieren
 				frmCyberPhysical.setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
 			}
 		});
@@ -220,6 +236,7 @@ public class GUI implements CategoryListener {
 		tree.addMouseListener(new MouseAdapter() {
 			public void mousePressed(MouseEvent e) {
 				try {
+<<<<<<< HEAD
 					actualObjectClicked = tree.getPathForLocation(e.getX(), e.getY()).getLastPathComponent().toString();
 					// System.out.println(name);
 					if (actualObjectClicked.compareTo("Power Plant") == 0 || actualObjectClicked.compareTo("House") == 0
@@ -228,11 +245,30 @@ public class GUI implements CategoryListener {
 						dragging = true;
 						Cursor cursor = Toolkit.getDefaultToolkit().createCustomCursor(img, new Point(0, 0), "Image");
 						frmCyberPhysical.setCursor(cursor);
+=======
+					//Object zum draggen?
+					String name = tree.getPathForLocation(e.getX(), e.getY()).getLastPathComponent().toString();
+					//System.out.println(name);
+					boolean found = false;
+					for (Category cat : model.getCategories()) {
+						System.out.println(cat.getName()+":");
+						for (CpsObject cps : cat.getObjects()) {
+							System.out.println(name+" - "+cps.getCompareName());
+							if(name.compareTo(cps.getCompareName())==0 ){
+								tempCps = cps;
+								img = new ImageIcon(this.getClass().getResource(tempCps.getImage())).getImage().getScaledInstance(30, 30, java.awt.Image.SCALE_SMOOTH);
+								dragging = true;
+								Cursor cursor = Toolkit.getDefaultToolkit().createCustomCursor(img, new Point(0, 0),"Image");
+								frmCyberPhysical.setCursor(cursor);
+							 }
+						}
+>>>>>>> 1c5a1a2c88c580db3f508d880b0796434747d61f
 					}
 				} catch (Exception e2) {
 				}
 			}
 		});
+<<<<<<< HEAD
 
 		/*
 		 * tree.addTreeSelectionListener(new TreeSelectionListener() {
@@ -247,6 +283,9 @@ public class GUI implements CategoryListener {
 		 * (Exception e2) {} } });
 		 */
 
+=======
+	
+>>>>>>> 1c5a1a2c88c580db3f508d880b0796434747d61f
 		scrollPane_1.setViewportView(tree);
 
 		scrollPane_1.setColumnHeaderView(panel);

src/ui/view/MyCanvas.java

@@ -27,7 +27,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 	
 	boolean dragging = false;
 	boolean dropDelete = false;
-	CpsObject tempCPS = null;
+	CpsObject tempCps = null;
 
 	// PopUpMenu
 	JPopupMenu popmenu = new JPopupMenu();
@@ -40,7 +40,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 		itemDelete.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				model.getObjectsOnCanvas().remove(tempCPS);
+				model.getObjectsOnCanvas().remove(tempCps);
 				repaint();
 			}
 		});
@@ -88,7 +88,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 			int cy = cps.getPos().y;
 			if (x - img.getWidth(null) <= cx && y - img.getHeight(null) <= cy && x + img.getWidth(null) >= cx
 					&& y + img.getHeight(null) >= cy) {
-				tempCPS = cps;
+				tempCps = cps;
 				if (e.getButton() == e.BUTTON1) {
 					dragging = true;
 				} else {
@@ -104,8 +104,8 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 			x = e.getX();
 			y = e.getY();
 			dragging = false;
-			tempCPS.setPos(e.getX() - 15, e.getY() - 15);
-			tempCPS = null;
+			tempCps.setPos(e.getX() - 15, e.getY() - 15);
+			tempCps = null;
 			repaint();
 		}
 		// Rechtsklick Liste
@@ -120,7 +120,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 	public void mouseDragged(MouseEvent e) {
 		// TODO Auto-generated method stub
 		if (dragging) {
-			tempCPS.setPos(e.getX() - 15, e.getY() - 15);
+			tempCps.setPos(e.getX() - 15, e.getY() - 15);
 			repaint();
 			System.out.println("drag: " + e.getX() + " " + e.getY());
 		}