Changeset 5534

Timestamp:

08/07/14 13:51:01 (10 years ago)

Author:

Twan Goosen

Message:

Created a reference validator that wraps the URL validator and also allows handles
Refs #613

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src

Files:

• main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/wizard/AddResourcesDialog.java (modified) (2 diffs)
• main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/wizard/EditResourceDialog.java (modified) (6 diffs)
• main/java/eu/clarin/cmdi/virtualcollectionregistry/service/impl/ReferenceValidator.java (added)
• test/java/eu/clarin/cmdi/virtualcollectionregistry/service/impl/ReferenceValidatorTest.java (added)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/wizard/AddResourcesDialog.java

@@ -19 +19 @@
 import org.apache.wicket.validation.ValidationError;
 import org.apache.wicket.validation.validator.AbstractValidator;
-import org.apache.wicket.validation.validator.UrlValidator;
 
 import eu.clarin.cmdi.virtualcollectionregistry.gui.dialog.ModalDialogBase;
 import eu.clarin.cmdi.virtualcollectionregistry.model.Resource;
+import eu.clarin.cmdi.virtualcollectionregistry.service.impl.ReferenceValidator;
 
 @SuppressWarnings("serial")
@@ -79 +79 @@
                     String[] refs = input.getValue();
                     if (refs != null) {
-                        UrlValidator v = new UrlValidator();
+                        ReferenceValidator v = new ReferenceValidator();
                         for (String ref : refs) {
                             if (ref.length() > 255) {

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/wizard/EditResourceDialog.java

@@ -1 +1 @@
 package eu.clarin.cmdi.virtualcollectionregistry.gui.wizard;
 
+import eu.clarin.cmdi.virtualcollectionregistry.service.impl.ReferenceValidator;
 import eu.clarin.cmdi.virtualcollectionregistry.gui.VolatileEntityModel;
 import java.util.Arrays;
@@ -13 +14 @@
 import org.apache.wicket.model.Model;
 import org.apache.wicket.validation.validator.StringValidator;
-import org.apache.wicket.validation.validator.UrlValidator;
 
 import eu.clarin.cmdi.virtualcollectionregistry.gui.dialog.ModalEditDialogBase;
@@ -27 +27 @@
         private final Form<Resource> form;
         private final FeedbackPanel feedbackPanel;
-        
+
         public Content(String id, IModel<Resource> model) {
             super(id);
             form = new Form<>("editResourceForm", model);
-                        
+
             form.add(new DropDownChoice<>("type",
                     Arrays.asList(Resource.Type.values()),
@@ -37 +37 @@
                     .setRequired(true)
             );
-            
+
             form.add(new RequiredTextField<String>("ref")
                     .add(new StringValidator.MaximumLengthValidator(255))
-                    .add(new UrlValidator(UrlValidator.NO_FRAGMENTS)));
-            
+                    .add(new ReferenceValidator()));
+
             form.add(new TextField<String>("label")
                     .add(new StringValidator.MaximumLengthValidator(255)));
-            
+
             form.add(new TextArea<String>("description"));
-            
+
             feedbackPanel = new FeedbackPanel("feedback");
             form.add(feedbackPanel);
             add(form);
         }
-        
+
         @Override
         public Form<Resource> getForm() {
             return form;
         }
-        
+
         @Override
         public FeedbackPanel getFeedbackPanel() {
@@ -67 +67 @@
         setInitialWidth(600);
     }
-    
+
     @Override
     protected ModalEditDialogBase<Resource>.ContentPanel
@@ -73 +73 @@
         return new Content(id, model);
     }
-    
+
     @Override
     protected final IModel<Resource> newInstanceModel() {
         return new VolatileEntityModel<>(new Resource());
     }
-    
+
     @Override
     protected final IModel<Resource> createEmptyModel() {
         return new VolatileEntityModel<>(null);
     }
-    
+
     @Override
     protected String getCssClass() {
         return "editResourceDialog";
     }
-    
+
 } // EditResourceDialog