Edgardo Palza 8 年 前
コミット
27bfd4dd96

+ 0 - 1
src/ui/controller/ObjectController.java

@@ -174,7 +174,6 @@ public class ObjectController {
 		HolonObject object = (HolonObject) mpC.searchByID(id);
 		HolonElement element = mpC.searchEleById(object, eleid);
 		// mpC.searchEle(object, ele);
-		System.out.println(object.getName() + " and " + element.getEleName());
 		deleteElement(object, element);
 	}
 

+ 13 - 2
src/ui/controller/UpdateController.java

@@ -84,7 +84,6 @@ public class UpdateController {
 	public void refreshTableHolonElement(PropertyTable multiTable, PropertyTable singleTable) {
 		// Update of the Information about the HolonElements - only for
 		// HolonObjects
-
 		if (model.getSelectedCpsObjects().size() > 1) {
 			deleteRows(multiTable);
 			fillElementTable(model.getSelectedCpsObjects(), multiTable);
@@ -159,7 +158,9 @@ public class UpdateController {
 			if (obj == null) {
 				String tempStringObj = tables.get(1).getValueAt(yTemp, 0).toString();
 				int idTempObj = Integer.parseInt(tempStringObj.split(", ")[1]);
-				obtTemp = (HolonObject) controller.searchByID(idTempObj);
+				if (model.getSelectedCpsObjects() != null) {
+					obtTemp = (HolonObject) getHolonObjSelected(idTempObj);
+				}
 				id = Integer.parseInt(tables.get(1).getValueAt(yTemp, 1).toString());
 				ArrayList<HolonElement> eleTemp = new ArrayList<HolonElement>();
 				if (model.getEleToDelete().containsKey(idTempObj) && toMultiHash == 2) {
@@ -322,4 +323,14 @@ public class UpdateController {
 		}
 	}
 
+	public AbstractCpsObject getHolonObjSelected(int id) {
+		AbstractCpsObject obj = null;
+		for (AbstractCpsObject o : model.getSelectedCpsObjects()) {
+			if (o.getID() == id) {
+				obj = o;
+			}
+		}
+		return obj;
+	}
+
 }

+ 6 - 3
src/ui/view/GUI.java

@@ -776,8 +776,11 @@ public class GUI<E> implements CategoryListener {
 		 */
 		model.getTableHolonElement().addMouseListener(new MouseAdapter() {
 			public void mousePressed(MouseEvent e) {
-				HolonObject obj = (HolonObject) updCon.getActualCps();
-				System.out.println(obj);
+				HolonObject obj = null;
+				if (model.getSelectedCpsObjects().size() == 1
+						&& model.getSelectedCpsObjects().get(0) instanceof HolonObject) {
+					obj = (HolonObject) model.getSelectedCpsObjects().get(0);
+				}
 				yValueElements = e.getY();
 				HolonElement ele = null;
 				// Search for current clicked HolonElement
@@ -1878,7 +1881,7 @@ public class GUI<E> implements CategoryListener {
 				public void mousePressed(MouseEvent e) {
 					temp = ((UpperNodeCanvas) ((JScrollPane) tabbedPane.getSelectedComponent()).getViewport()
 							.getComponent(0)).tempCps;
-					if (doubleClick()&& MouseEvent.BUTTON3 != e.getButton() && temp instanceof CpsUpperNode) {
+					if (doubleClick() && MouseEvent.BUTTON3 != e.getButton() && temp instanceof CpsUpperNode) {
 						openNewUpperNodeTab();
 					}
 					// updCon.refreshTableProperties(table);

+ 2 - 4
src/ui/view/UpperNodeCanvas.java

@@ -584,7 +584,7 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 
 	@Override
 	public void mouseClicked(MouseEvent e) {
-
+		updCon.refreshTableHolonElement(model.getMultiTable(), model.getSingleTable());
 	}
 
 	@Override
@@ -597,6 +597,7 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 
 	@Override
 	public void mousePressed(MouseEvent e) {
+		System.out.println(model.getObjectsOnCanvas());
 		tempCps = null;
 		dataSelected = null;
 		edgeHighlight = null;
@@ -711,9 +712,6 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 	@Override
 	public void mouseReleased(MouseEvent e) {
 		dragging = false;
-		// updCon.refreshTableHolonElement(model.getMultiTable(),
-		// model.getSingleTable());
-		// updCon.refreshTableProperties(model.getPropertyTable());
 		if (model.getSelectedCpsObjects().size() > 1) {
 			model.getTableHolonElement().setModel(model.getMultiTable());
 		} else if (model.getSelectedCpsObjects().size() == 1) {