OldPopUps...

src/ui/view/NewPopUp.java

@@ -17,6 +17,8 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 
+import classes.HolonBattery;
+import classes.HolonObject;
 import javafx.scene.paint.Color;
 import ui.controller.Control;
 
@@ -71,12 +73,15 @@ public class NewPopUp extends JDialog{
 			actualOption = Option.getEnumAtIndex(optionList.getSelectedIndex());
 		    cl.show(cards, actualOption.name());
 		    saveButton.setEnabled(actualOption != Option.None);  
+		    //TODO delete and make own iterface
+		    saveButton.setVisible(actualOption != Option.Object);	
 		});
 		
 		
         contentPanel.add(makeBottemPanel(), BorderLayout.PAGE_END);
         addSaveButtonLogik();
-        add(contentPanel);	
+        add(contentPanel);
+        saveButton.setEnabled(false);	
 		setMinimumSize(new Dimension(400,350));
 		pack();
 		setLocationRelativeTo(parentFrame);
@@ -107,13 +112,15 @@ public class NewPopUp extends JDialog{
 			content = makeSwitchPanel();
 			break;
 		default:
-			content = new JPanel();
+			content = makeNothingPanel();
 			break;
 		}
 		actualOption = aOption;
 		contentPanel.add(content, BorderLayout.CENTER);
 		contentPanel.add(makeBottemPanel(), BorderLayout.PAGE_END);
-		addSaveButtonLogik();
+		addSaveButtonLogik(); 
+		//TODO delete and make own iterface
+	    if(aOption == Option.Object) saveButton.setVisible(false);
 		add(contentPanel);	
 		setMinimumSize(new Dimension(400,350));
 		pack();
@@ -132,9 +139,10 @@ public class NewPopUp extends JDialog{
 	private JPanel makeBottemPanel() {
 		JPanel bottomPanel = new JPanel();
         bottomPanel.setLayout(new FlowLayout(FlowLayout.RIGHT));
-        saveButton.setEnabled(false);
+       
         bottomPanel.add(saveButton);
         JButton cancelButton = new JButton("Cancel");
+        cancelButton.addActionListener(actionEvent -> dispose());
         bottomPanel.add(cancelButton);
 		return bottomPanel;
 	}
@@ -146,18 +154,49 @@ public class NewPopUp extends JDialog{
 		JComboBox<String> selectedCategory = new JComboBox<String>(actualController.getCategoriesStrings());
 		objectPanel.add(selectedCategory);
 		
+		
+		JButton nextButton = new JButton("Next");
+		objectPanel.add(nextButton);
+		nextButton.addActionListener(actionEvent -> {
+			makeOldObjectPopUp(selectedCategory.getSelectedItem().toString());
+		});
 		return objectPanel;
 	}
 
+	private void makeOldObjectPopUp(String categoryName) {
+		//TODO: del and make own on
+		
+		HolonObject hO = new HolonObject("");
+		
+		AddObjectPopUp addObjectPopUP = new AddObjectPopUp(false,hO , "hei", null);
+		addObjectPopUP.setVisible(true);
+		addObjectPopUP.setController(actualController);
+		addObjectPopUP.setCategory(categoryName);
+		dispose();
+	}
+
 	private JPanel makeBatteryPanel() {
-		System.out.println("ssds222");
-		return new JPanel();
+		JPanel objectPanel = new JPanel();
+		JLabel categoryText = new JLabel("In Category:");
+		objectPanel.add(categoryText);
+		JComboBox<String> selectedCategory = new JComboBox<String>(actualController.getCategoriesStrings());
+		objectPanel.add(selectedCategory);
+		
+		
+		JButton nextButton = new JButton("Next");
+		objectPanel.add(nextButton);
+		nextButton.addActionListener(actionEvent -> {
+			makeOldBatteryPopUp(selectedCategory.getSelectedItem().toString());
+		});
+		return objectPanel;
+	}
+
+	private void makeOldBatteryPopUp(String string) {
+		
 	}
 
 	private JPanel makeNothingPanel() {
-		System.out.println("ssds");
 		return new JPanel();
-		
 	}
 	
 	private JPanel makeCategoryPanel()
@@ -204,6 +243,7 @@ public class NewPopUp extends JDialog{
 				} catch (IOException e) {
 					System.err.println("IOException addCategory");
 				}
+				dispose();
 			}
 		});
 	}