Some fix for Labels

src/ui/view/GUI.java

@@ -641,6 +641,7 @@ public class GUI<E> implements CategoryListener {
 							controller.calculateStateForTimeStep(model.getCurIteration());
 							// Names displayed in graph are not updated
 						}
+						eleToDelete.clear();
 						selectedElements.clear();
 					}
 					// For MultiSelection of CpsObject
@@ -652,7 +653,11 @@ public class GUI<E> implements CategoryListener {
 					}
 					refreshTableHolonElement();
 					refreshTableProperties();
+					eleToDelete.clear();
+					selectedElements.clear();
 				}
+				elementGraph.setText("None ");
+				holonEleNamesDisplayed = "None ";
 			}
 		});
 		/*
@@ -819,13 +824,16 @@ public class GUI<E> implements CategoryListener {
 							if (mousePos.y / tableProperties.getRowHeight() == 2) {
 								Boolean bTemp = Boolean.parseBoolean(temp.toString());
 								((HolonSwitch) getActualCps()).setManualMode(bTemp);
+								if (bTemp) {
+									tableModelProperties.setCellEditable(3, 1, true);
+								} else {
+									tableModelProperties.setCellEditable(3, 1, false);
+								}
 							} else if (mousePos.y / tableProperties.getRowHeight() == 3) {
 								if (((HolonSwitch) getActualCps()).getManualMode()) {
 									tableModelProperties.setCellEditable(3, 1, true);
 									Boolean bTemp = Boolean.parseBoolean(temp.toString());
-									((HolonSwitch) getActualCps()).setActiveAt(bTemp);
-								} else {
-									tableModelProperties.setCellEditable(3, 1, false);
+									((HolonSwitch) getActualCps()).setManualState(bTemp);
 								}
 							}
 						}
@@ -1135,12 +1143,10 @@ public class GUI<E> implements CategoryListener {
 						Object[] tempMode = { "Manual", ((HolonSwitch) temp).getManualMode() };
 						tableModelProperties.addRow(tempMode);
 						if (((HolonSwitch) temp).getManualMode()) {
-							System.out.println("Manual Mode");
 							Object[] tempActive = { "Active", ((HolonSwitch) temp).getActiveManual() };
 							tableModelProperties.addRow(tempActive);
 							tableModelProperties.setCellEditable(3, 1, true);
 						} else {
-							System.out.println("Auto Mode");
 							Object[] tempActive = { "Active",
 									((HolonSwitch) temp).getActiveAt()[model.getCurIteration()] };
 							tableModelProperties.addRow(tempActive);