Browse Source

pop-up fix

Jessey Widhalm 8 years ago
parent
commit
2f0e213dd5
2 changed files with 15 additions and 16 deletions
  1. BIN
      bin/ui/view/AddObjectPopUp.class
  2. 15 16
      src/ui/view/AddObjectPopUp.java

BIN
bin/ui/view/AddObjectPopUp.class


+ 15 - 16
src/ui/view/AddObjectPopUp.java

@@ -89,18 +89,18 @@ public class AddObjectPopUp extends JDialog {
 				@Override
 				public void keyPressed(KeyEvent arg0) {
 					// TODO Auto-generated method stub
-					
+
 				}
 
 				@Override
 				public void keyReleased(KeyEvent e) {
 					// TODO Auto-generated method stub
-					
+
 				}
 
 				@Override
 				public void keyTyped(KeyEvent e) {
-					objectName.setBackground(Color.WHITE);					
+					objectName.setBackground(Color.WHITE);
 				}
 			});
 			objectName.setBounds(98, 18, 172, 20);
@@ -124,18 +124,18 @@ public class AddObjectPopUp extends JDialog {
 				@Override
 				public void keyPressed(KeyEvent arg0) {
 					// TODO Auto-generated method stub
-					
+
 				}
 
 				@Override
 				public void keyReleased(KeyEvent e) {
 					// TODO Auto-generated method stub
-					
+
 				}
 
 				@Override
 				public void keyTyped(KeyEvent e) {
-					sourcePath.setBackground(Color.WHITE);					
+					sourcePath.setBackground(Color.WHITE);
 				}
 			});
 			sourcePath.setBounds(148, 77, 271, 20);
@@ -202,15 +202,8 @@ public class AddObjectPopUp extends JDialog {
 				okButton.addMouseListener(new MouseAdapter() {
 					public void mouseClicked(MouseEvent e) {
 						Component frame = null;
-						if (objectName.getText().length() == 0) {
-							// JOptionPane.showMessageDialog(frame, "please
-							// enter a name");
-							objectName.setBackground(new Color(255, 50, 50));
-							if (!sourcePath.getText().equals(filePath)) {
-								// JOptionPane.showMessageDialog(frame, "No
-								// image selected!");
-								sourcePath.setBackground(new Color(255, 50, 50));
-							} else {
+						if (objectName.getText().length() > 0) {
+							if (sourcePath.getText().equals(filePath)) {
 								copieFile();
 								theObject = new HolonObject(objectName.getText());
 								theObject.setElements(hElements);
@@ -219,7 +212,13 @@ public class AddObjectPopUp extends JDialog {
 								System.out.println(theObject.getImage());
 								System.out.println(givenCategory);
 								dispose();
-							}
+							} else
+								sourcePath.setBackground(new Color(255, 50, 50));
+						} else {
+							objectName.setBackground(new Color(255, 50, 50));
+							if (!sourcePath.getText().equals(filePath))
+								sourcePath.setBackground(new Color(255, 50, 50));
+
 						}
 					}
 				});