Correct update of switch state

src/ui/view/GUI.java

@@ -1186,10 +1186,9 @@ public class GUI<E> implements CategoryListener {
 				if (e.getClickCount() == 2) {
 					yProThis = e.getY();
 					xProThis = e.getX();
-				} else {
-					yProThisOneClick = e.getY();
-					xProThisOneClick = e.getX();
 				}
+				yProThisOneClick = e.getY();
+				xProThisOneClick = e.getX();
 			}
 		});
 
@@ -1202,17 +1201,19 @@ public class GUI<E> implements CategoryListener {
 				try {
 					Object temp;
 					Object btemp;
-					Point mousePos = tableProperties.getMousePosition();
 					int selValueY = (int) Math.floor(yProThis / 16);
 					int selValueX = (int) Math.floor(xProThis / (tableProperties.getWidth() / 2));
+					int selValueYBool = (int) Math.floor(yProThisOneClick / 16);
+					int selValueXBool = (int) Math.floor(xProThisOneClick / (tableProperties.getWidth() / 2));
 					if (updCon.getActualCps() != null && selValueX != 0) {
 						temp = model.getPropertyTable().getValueAt(selValueY, selValueX);
+						btemp = model.getPropertyTable().getValueAt(selValueYBool, selValueXBool);
+						// Case: Switch selected
 						if (updCon.getActualCps() instanceof HolonSwitch) {
-							btemp = model.getPropertyTable().getValueAt(mousePos.y / tableProperties.getRowHeight(),
-									mousePos.x / (tableProperties.getWidth() / 2));
-							if (mousePos.y / tableProperties.getRowHeight() == 0) {
-								updCon.getActualCps().setName(btemp.toString());
-							} else if (mousePos.y / tableProperties.getRowHeight() == 2) {
+							if (selValueY == 0) {
+								updCon.getActualCps().setName(temp.toString());
+							}
+							if (selValueYBool == 2) {
 								Boolean bbTemp = Boolean.parseBoolean(btemp.toString());
 								((HolonSwitch) updCon.getActualCps()).setManualMode(bbTemp);
 								if (bbTemp) {
@@ -1220,15 +1221,18 @@ public class GUI<E> implements CategoryListener {
 								} else {
 									model.getPropertyTable().setCellEditable(3, 1, false);
 								}
-							} else if (mousePos.y / tableProperties.getRowHeight() == 3) {
+							} else if (selValueYBool == 3) {
 								if (((HolonSwitch) updCon.getActualCps()).getManualMode()) {
 									model.getPropertyTable().setCellEditable(3, 1, true);
 									Boolean bTemp = Boolean.parseBoolean(temp.toString());
 									((HolonSwitch) updCon.getActualCps()).setManualState(bTemp);
 								}
 							}
-						} else if (updCon.getActualCps() instanceof CpsUpperNode) {
+						} // Case: UpperNode selected
+						else if (updCon.getActualCps() instanceof CpsUpperNode) {
+							// Name edition through double click
 							updCon.getActualCps().setName(temp.toString());
+							// Update of name on the tab in the tab section
 							for (int index = 4; index < tabbedPane.getTabCount(); index++) {
 								UpperNodeCanvas unc = ((UpperNodeCanvas) ((JScrollPane) tabbedPane.getComponent(index))
 										.getViewport().getComponent(0));
@@ -1241,15 +1245,16 @@ public class GUI<E> implements CategoryListener {
 									}
 								}
 							}
-						} else if (updCon.getActualCps() instanceof HolonObject) {
+						} // Case: HolonObject is selected
+						else if (updCon.getActualCps() instanceof HolonObject) {
+							// Name edition through double click
 							updCon.getActualCps().setName(temp.toString());
 						}
-					} else {
-						selValueY = (int) Math.floor(yProThisOneClick / 16);
-						selValueX = (int) Math.floor(xProThisOneClick / (tableProperties.getWidth() / 2));
+					} // Case: Edge is selected
+					else {
 						temp = model.getPropertyTable().getValueAt(selValueY, selValueX);
-						btemp = model.getPropertyTable().getValueAt(mousePos.y / tableProperties.getRowHeight(),
-								mousePos.x / (tableProperties.getWidth() / 2));
+						btemp = model.getPropertyTable().getValueAt(selValueYBool, selValueXBool);
+						// Edit modus for capacity by double clicking
 						if (selValueY == 2) {
 							Float ftemp;
 							if (Float.parseFloat(temp.toString()) >= 0.0) {
@@ -1258,7 +1263,9 @@ public class GUI<E> implements CategoryListener {
 								ftemp = model.getSelectedEdge().getCapacity();
 							}
 							model.getSelectedEdge().setCapacity(ftemp);
-						} else if (mousePos.y / tableProperties.getRowHeight() == 3) {
+						}
+						// Status edition through a check box
+						if (selValueYBool == 3) {
 							Boolean bbTemp = Boolean.parseBoolean(btemp.toString());
 							model.getSelectedEdge().setState(bbTemp);
 						}