|
|
@@ -199,15 +199,9 @@ public class AddObjectPopUp extends JDialog {
|
|
|
addElement.setActualCps(toEdit);
|
|
|
addElement.setVisible(true);
|
|
|
HolonElement hl = addElement.getElement();
|
|
|
-<<<<<<< HEAD
|
|
|
- if (hl != null) {
|
|
|
- addElement(hl);
|
|
|
- }
|
|
|
-=======
|
|
|
hl.setSav(givenCategory);
|
|
|
hl.setObj(objectName.getText());
|
|
|
addElement(hl);
|
|
|
->>>>>>> e31b286b827a2f60952b26ca6921853e95260ca5
|
|
|
}
|
|
|
});
|
|
|
|
