Browse Source

Update of properties and elements

Edgardo Palza 8 years ago
parent
commit
d897a5517f
1 changed files with 12 additions and 10 deletions
  1. 12 10
      src/ui/view/GUI.java

+ 12 - 10
src/ui/view/GUI.java

@@ -20,6 +20,8 @@ import javax.swing.JTable;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeCellRenderer;
 
+import com.sun.javafx.geom.Edge;
+
 import ui.controller.Control;
 import ui.model.*;
 
@@ -358,7 +360,12 @@ public class GUI implements CategoryListener {
 						.floor(e.getX() / (tableProperties.getColumnModel().getTotalColumnWidth() / 2));
 				int selectedY = (int) Math.floor(e.getY() / 16);
 				if (tableModelProperties.isCellEditable(selectedY, selectedX) && e.getClickCount() == 2) {
-					System.out.println("QUEEE");
+					if (getActualCps() != null) {
+						
+						tableModelProperties.fireTableCellUpdated(selectedY, selectedX);
+					} else {
+						System.out.println("Edge");
+					}
 				}
 			}
 		});
@@ -569,13 +576,14 @@ public class GUI implements CategoryListener {
 				if (canvas.tempCps != null) {
 					Object[] tempName = { "Name", canvas.tempCps.getName() };
 					tableModelProperties.addRow(tempName);
-					tableModelProperties.setCellEditable(0, 1, true);
 					Object[] tempId = { "ID", canvas.tempCps.getID() };
 					tableModelProperties.addRow(tempId);
 					if (canvas.tempCps.getClass() == HolonObject.class) {
 						Object[] tempEnergy = { "Total Energy", ((HolonObject) canvas.tempCps).getCurrentEnergy() };
 						tableModelProperties.addRow(tempEnergy);
 					}
+					tableModelProperties.setCellEditable(0, 1, true);
+					tableModelProperties.setCellEditable(2, 1, false);
 					ArrayList<CpsEdge> temp_array = canvas.tempCps.getConnectedTo();
 					if (!temp_array.isEmpty()) {
 						boolean first = true;
@@ -614,7 +622,8 @@ public class GUI implements CategoryListener {
 					tableModelProperties.addRow(tempFlow);
 					Object[] tempCapacity = { "Max. Capacity", model.getSelectedEdge().getCapacity() };
 					tableModelProperties.addRow(tempCapacity);
-
+					tableModelProperties.setCellEditable(0, 1, false);
+					tableModelProperties.setCellEditable(2, 1, true);
 				}
 			}
 
@@ -877,18 +886,11 @@ public class GUI implements CategoryListener {
 		deleteRows();
 		if (canvas.dataSelected != null) {
 			fillElementTable(canvas.dataSelected);
-<<<<<<< HEAD
-		} /**
-			 * hinzugef�gt damit man auch nach dem objekt platziert wurde
-			 * elemente von Objekten in Kategorien ansehen kann
-			 */
-=======
 		}
 		/**
 		 * hinzugef�gt damit man auch nach dem objekt platziert wurde elemente
 		 * von Objekten in Kategorien ansehen kann
 		 */
->>>>>>> 20576a4b5d0fa38909435f477849c16d57f2d047
 		canvas.dataSelected = null;
 
 	}