Browse Source

add HolonElement fix

Jessey Widhalm 7 years ago
parent
commit
c541167931

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/outputFileStates.bin


BIN
.gradle/2.2.1/taskArtifacts/taskArtifacts.bin


+ 1 - 9
src/ui/view/AddObjectPopUp.java

@@ -168,15 +168,6 @@ public class AddObjectPopUp extends JDialog {
 						new ImageIcon(filePath).getImage().getScaledInstance(50, 50, Image.SCALE_SMOOTH));
 				if(icon != null)
 				lblImagePreview.setIcon(icon);
-			
-				
-//				sourcePath.setText(obj.getImage());
-//				if (sourcePath.getText().startsWith("/Images/")) {
-//					sourcePath
-//							.setText(System.getProperty("user.home") + "/praktikum-holons/res/" + sourcePath.getText());
-//				}
-//				filePath = sourcePath.getText();
-//				selectedFile = new File(sourcePath.getText());
 			}
 			sourcePath.setBounds(148, 77, 271, 20);
 			contentPanel.add(sourcePath);
@@ -187,6 +178,7 @@ public class AddObjectPopUp extends JDialog {
 			btnAddDefaultElement.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent arg0) {
 					addElement = new AddElementPopUp();
+					addElement.setActualCps(obj);
 					addElement.setVisible(true);
 					HolonElement hl = addElement.getElement();
 					addElement(hl);

+ 2 - 1
src/ui/view/GUI.java

@@ -698,7 +698,8 @@ public class GUI<E> implements CategoryListener {
 								"Please select a Category first before adding " + selectedOption + ".");
 					}
 					if (selectedNode.getLevel() == 1) {
-						addObjectPopUP = new AddObjectPopUp(false, null, null);
+						CpsObject tmp = new HolonObject("");
+						addObjectPopUP = new AddObjectPopUp(false, tmp, null);
 						addObjectPopUP.setVisible(true);
 						addObjectPopUP.setController(controller);
 						addObjectPopUP.setCategory(selectedNode.toString());