ID Selection in ObjectControl

src/classes/GlobalVariables.java

@@ -1,5 +1,5 @@
 package classes;
 
 public class GlobalVariables {
-	public static int SCALE = 70;
+	public static int SCALE = 75;
 }

src/ui/controller/ObjectControl.java

@@ -19,6 +19,7 @@ public class ObjectControl {
 
 	private Model M;
 	private int ID;
+	private int selectedID = 0;
 
 	public ObjectControl(Model model) {
 		this.M = model;
@@ -137,4 +138,25 @@ public class ObjectControl {
 
 		return obj;
 	}
+	
+	/**
+	 * Set the ID of the selected Object
+	 * 0 = no Object is selected
+	 * 
+	 * @param ID
+	 * 
+	 */
+	public void setSelectedObjectID(int id){
+		this.selectedID = id;
+	}
+	
+	/**
+	 * Returns the ID of the selected Object
+	 * 0 = no Object is selecet
+	 * 
+	 * @return ID
+	 */
+	public int getSelectedObjectID(){
+		return selectedID;
+	}
 }

src/ui/view/GUI.java

@@ -46,6 +46,7 @@ import classes.GlobalVariables;
 import classes.HolonObject;
 import classes.HolonSwitch;
 import classes.HolonTransformer;
+import jdk.nashorn.internal.objects.Global;
 import Interfaces.CategoryListener;
 
 import java.awt.event.ActionListener;
@@ -117,7 +118,7 @@ public class GUI implements CategoryListener {
 	private void initialize() {
 		frmCyberPhysical = new JFrame();
 		frmCyberPhysical.setTitle("Cyber Physical Systems Model");
-		frmCyberPhysical.setBounds(100, 100, 891, 467);
+		frmCyberPhysical.setBounds(100, 100, 1000, 800);
 		frmCyberPhysical.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
 		frmCyberPhysical.setJMenuBar(menuBar);
@@ -183,48 +184,38 @@ public class GUI implements CategoryListener {
 		splitPane_2.setDividerLocation(200);
 
 		splitPane.setLeftComponent(scrollPane_1);
-		img = new ImageIcon(this.getClass().getResource("/Images/Dummy_House.png")).getImage().getScaledInstance(GlobalVariables.SCALE, GlobalVariables.SCALE,
-				java.awt.Image.SCALE_SMOOTH);
-		Icon icon = new ImageIcon(img);
 
 		TreeCellRenderer customRenderer = new TreeCellRenderer() {
-
 			@Override
 			public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded,
 					boolean leaf, int row, boolean hasFocus) {
 				JLabel label = new JLabel();
 				Image imgR = null;
-				CpsObject tempCPS = null;
-
-				for (Category cat : model.getCategories()) {
-					if (value.toString().compareTo(cat.getCompareName()) == 0) {
-						label.setText(cat.getCompareName());
-					}
-					for (CpsObject cps : cat.getObjects()) {
-						if (value.toString().compareTo(cps.getCompareName()) == 0) {
-							tempCPS = cps;
-							imgR = new ImageIcon(this.getClass().getResource(cps.getImage())).getImage()
-									.getScaledInstance(GlobalVariables.SCALE, GlobalVariables.SCALE, java.awt.Image.SCALE_SMOOTH);
-							if (imgR != null) {
-								label.setIcon(new ImageIcon(imgR));
+				
+				if(leaf){
+					for (Category cat : model.getCategories()) {
+						for (CpsObject cps : cat.getObjects()) {
+							if (value.toString().compareTo(cps.getCompareName()) == 0) {
+								imgR = new ImageIcon(this.getClass().getResource(cps.getImage())).getImage()
+										.getScaledInstance(GlobalVariables.SCALE, GlobalVariables.SCALE, java.awt.Image.SCALE_SMOOTH);
+								if (imgR != null) {
+									label.setIcon(new ImageIcon(imgR));
+								}
+								label.setText(cps.getName());
 							}
-							label.setText(cps.getName());
 						}
 					}
 				}
+				
+				if(hasFocus) label.setForeground(new Color(0, 0, 255));
+				tree.setRowHeight(GlobalVariables.SCALE);
 				if(label.getText().length() == 0) label.setText(value.toString());
+				
 				return label;
 
 			}
 		};
 
-		/*
-		 * DefaultTreeCellRenderer renderer = (DefaultTreeCellRenderer)
-		 * tree.getCellRenderer(); renderer.setLeafIcon(icon); //
-		 * renderer.setClosedIcon(icon); // renderer.setOpen
-		 */
-		tree.setRowHeight(icon.getIconHeight());
-
 		tree.setCellRenderer(customRenderer);
 
 		tree.addMouseListener(new MouseAdapter() {

src/ui/view/MyCanvas.java

@@ -59,8 +59,14 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 		this.addMouseMotionListener(this);
 	}
 
+	
+	/**
+	 * Paints all Components on the Canvas
+	 * 
+	 * @param Graphics
+	 *            
+	 */
 	public void paintComponent(Graphics g) {
-		// Draws the image to the canvas
 		super.paintComponent(g);
 		if(selectRect != null){
 			g.setColor(new Color(220, 220, 220));
@@ -70,7 +76,6 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 		for (CpsObject cps : model.getObjectsOnCanvas()) {
 			img = new ImageIcon(this.getClass().getResource(cps.getImage())).getImage();
 			g.drawImage(img, cps.getPos().x, cps.getPos().y, GlobalVariables.SCALE, GlobalVariables.SCALE, null);
-			//g.drawImage(img, cps.getPos().x, cps.getPos().y, null);
 		}
 	}