소스 검색

AddElementPopUp cancel button works now
Element values can be changed inside the table again(buggy)

Jessey Widhalm 7 년 전
부모
커밋
8ee51a3767

BIN
.gradle/2.2.1/taskArtifacts/cache.properties.lock


BIN
.gradle/2.2.1/taskArtifacts/fileHashes.bin


BIN
.gradle/2.2.1/taskArtifacts/fileSnapshots.bin


BIN
.gradle/2.2.1/taskArtifacts/taskArtifacts.bin


+ 5 - 0
src/ui/view/AddElementPopUp.java

@@ -148,6 +148,11 @@ public class AddElementPopUp extends JDialog {
 				JButton cancelButton = new JButton("Cancel");
 				cancelButton.setActionCommand("Cancel");
 				buttonPane.add(cancelButton);
+				cancelButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						dispose();
+					}
+				});
 			}
 		}
 	}

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

@@ -600,7 +600,7 @@ public class GUI implements CategoryListener {
 					tableModelProperties.addRow(tempName);
 					Object[] tempFlow = { "Current flow", model.getSelectedEdge().getFlow() };
 					tableModelProperties.addRow(tempFlow);
-					Object[] tempCapacity = {"Max. Capacity", model.getSelectedEdge().getCapacity()};
+					Object[] tempCapacity = { "Max. Capacity", model.getSelectedEdge().getCapacity() };
 					tableModelProperties.addRow(tempCapacity);
 
 				}
@@ -621,16 +621,17 @@ public class GUI implements CategoryListener {
 							for (int c = 0; c < tableModelHolonElement.getColumnCount(); c++) {
 								temp.add(tableHolonElement.getValueAt(r, c));
 							}
-							float ch;
-							if (temp.get(1).toString().compareTo("-") == 0) {
-								ch = -1;
-							} else {
-								ch = 1;
-							}
-							float fa = Float.parseFloat(temp.get(2).toString());
-							int i = Integer.parseInt(temp.get(3).toString());
+							// float ch;
+							// if (temp.get(1).toString().compareTo("-") == 0) {
+							// ch = -1;
+							// } else {
+							// ch = 1;
+							// }
+							float fa = Float.parseFloat(temp.get(1).toString());
+							int i = Integer.parseInt(temp.get(2).toString());
 							((HolonObject) tempCps).getElements().get(r).setEleName((String) temp.get(0));
-							((HolonObject) tempCps).getElements().get(r).setSign(ch);
+							// ((HolonObject)
+							// tempCps).getElements().get(r).setSign(ch);
 							((HolonObject) tempCps).getElements().get(r).setEnergy(fa);
 							((HolonObject) tempCps).getElements().get(r).setAmount(i);
 							// System.out.println(tableHolonElement.getRowCount()