Added mandatory text field validator to location

register-app/src/main/java/se/citerus/registerapp/RegisterApp.java

@@ -55,13 +55,24 @@ public class RegisterApp {
     assert handlingEventService != null : "No HandlingEventService available";
     
     handlingEventService.register(ISO8601_DATE_FORMAT.format(completionTimeField.getValue()), 
-                                  trackingIdField.getValue().toString(), 
-                                  carrierMovementField.getValue().toString(), 
-                                  locationField.getValue().toString(), 
-                                  eventTypeField.getValue().toString());
+                                  getStringValue(trackingIdField), 
+                                  getStringValue(carrierMovementField), 
+                                  getStringValue(locationField), 
+                                  getStringValue(eventTypeField));
     
     clearForm();
   }
+
+
+  private String getStringValue(JFormattedTextField formattedTextField) {
+    Object value = formattedTextField.getValue();
+    
+    if (value != null) {
+      return value.toString();
+    } else {
+      return null;
+    }
+  }
   
   
   /////////////////////////////////////////////////////////////////////////////
@@ -140,6 +151,7 @@ public class RegisterApp {
     
     validator.add(eventTypeField, new MandatoryTextFieldValidator("Event type can't be empty"));
     validator.add(trackingIdField, new MandatoryTextFieldValidator("Tracking id can't be empty"));
+    validator.add(locationField, new MandatoryTextFieldValidator("Location can't be empty"));
   }
   
   

register-app/src/main/java/se/citerus/registerapp/validation/AbstractFormValidationDecorator.java

@@ -15,7 +15,9 @@ public abstract class AbstractFormValidationDecorator implements FormValidationD
 
     component.addKeyListener(new KeyListener(){
       public void keyPressed(KeyEvent e) {
-        undecorate(component);
+        for (final Entry<JComponent, ComponentValidator> entry : validators.entrySet()) {
+          undecorate(entry.getKey());
+        }
       }
 
       public void keyReleased(KeyEvent e) {}

register-app/src/main/java/se/citerus/registerapp/validation/FormValidationSwingDecorator.java

@@ -14,7 +14,7 @@ import javax.swing.JPanel;
 
 public class FormValidationSwingDecorator extends AbstractFormValidationDecorator{
 
-  private static final int POPUP_Y_OFFSET = 4;
+  private static final int POPUP_Y_OFFSET = 0;
   private static final int POPUP_X_OFFSET = 12;
   private Color oldColor = Color.WHITE;
   private JFrame form;
@@ -31,7 +31,10 @@ public class FormValidationSwingDecorator extends AbstractFormValidationDecorato
     glassPane.setLayout(null);
 //    glassPane.setPreferredSize(form.getPreferredSize());
     glassPane.setSize(form.getSize());
+    
     form.setGlassPane(glassPane);
+    
+    
   }
 
   public FormValidationSwingDecorator(JFrame form, String message) {
@@ -48,6 +51,7 @@ public class FormValidationSwingDecorator extends AbstractFormValidationDecorato
     } else {
       popupPane = new JPanel(new FlowLayout());
       glassPane.add(popupPane);
+      glassPane.setVisible(true);
       
       popupPane.add(getIconLabel());
       popupPane.add(getMessageLabel());
@@ -98,8 +102,9 @@ public class FormValidationSwingDecorator extends AbstractFormValidationDecorato
     this.message = validator.getMessage();
     this.oldColor = component.getBackground();
     component.setBackground(Color.PINK);
-    popups.put(component, createPopupRelativeTo(component));
-    glassPane.setVisible(true);
+    JPanel panel = createPopupRelativeTo(component);
+    popups.put(component, panel);
+    panel.setVisible(true);
   }
 
   @Override
@@ -109,6 +114,5 @@ public class FormValidationSwingDecorator extends AbstractFormValidationDecorato
     if (panel != null){
       panel.setVisible(false);
     }
-    glassPane.setVisible(false);
   }
 }