Changeset 5491

Timestamp:

07/28/14 12:05:49 (10 years ago)

Author:

Twan Goosen

Message:

Added label and description to resources. Labels and descriptions can now be stored, viewed and edited.

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry

Files:

• gui/pages/ReferenceLinkPanel.html (modified) (1 diff)
• gui/pages/ReferenceLinkPanel.java (modified) (2 diffs)
• gui/wizard/EditResourceDialog$Content.html (modified) (1 diff)
• gui/wizard/EditResourceDialog.java (modified) (3 diffs)
• model/Resource.java (modified) (5 diffs)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/ReferenceLinkPanel.html

@@ -6 +6 @@
     <wicket:panel>
         <a target="_blank" wicket:id="reference"><span wicket:id="referenceLabel"></span></a>
+        <p wicket:id="description">[description]</p>
     </wicket:panel>
 </html>

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/ReferenceLinkPanel.java

@@ -3 +3 @@
 import eu.clarin.cmdi.virtualcollectionregistry.gui.HandleLinkModel;
 import eu.clarin.cmdi.virtualcollectionregistry.model.Resource;
+import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.link.ExternalLink;
 import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.util.string.Strings;
 
 /**
@@ -17 +20 @@
     public ReferenceLinkPanel(String id, IModel<Resource> model) {
         super(id, model);
-        
-        // Rerence model shared by link and label
-        final PropertyModel refModel = new PropertyModel(model, "ref");
-        
+
+        // Shared rerence model
+        final PropertyModel<String> refModel = new PropertyModel<>(model, "ref");
+
         // Wrapper for link model that detects handles
         final HandleLinkModel linkModel = new HandleLinkModel(refModel);
         final ExternalLink link = new ExternalLink("reference", linkModel);
-        
+        link.add(new AttributeModifier("title", true, refModel));
+
         // Set label on link
         // TODO: get label from 'label' property if available
-        link.add(new Label("referenceLabel", refModel));
-        
+        final ReferenceLabelModel labelModel = new ReferenceLabelModel(model);
+        link.add(new Label("referenceLabel", labelModel));
+
         add(link);
+
+        final PropertyModel<String> descriptionModel = new PropertyModel<>(model, "description");
+        add(new Label("description", descriptionModel) {
+
+            @Override
+            protected void onConfigure() {
+                super.onConfigure();
+                setVisible(descriptionModel.getObject() != null);
+            }
+
+        });
+
+    }
+
+    /**
+     * String model that returns the label of a {@link Resource} if it is
+     * available (not null or empty), otherwise the reference URI
+     */
+    private static class ReferenceLabelModel extends AbstractReadOnlyModel<String> {
+
+        private final IModel<Resource> resourceModel;
+
+        public ReferenceLabelModel(IModel<Resource> resourceModel) {
+            this.resourceModel = resourceModel;
+        }
+
+        @Override
+        public String getObject() {
+            final Resource resource = resourceModel.getObject();
+            if (resource == null) {
+                return null;
+            } else {
+                if (!Strings.isEmpty(resource.getLabel())) {
+                    return resource.getLabel();
+                }
+                return resource.getRef();
+            }
+        }
+
+        @Override
+        public void detach() {
+            resourceModel.detach();
+        }
+
     }
 

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

@@ -17 +17 @@
       <input wicket:id="ref" id="edit_resource_ref" type="text" />
     </div>
+    <div class="optional">
+      <label for="edit_resource_label">Label</label>
+      <input wicket:id="label" id="edit_resource_label" type="text" />
+    </div>
+    <div class="optional">
+      <label for="edit_resource_description">Description</label>
+      <input wicket:id="description" id="edit_resource_description" type="text" />
+    </div>
   </fieldset>
   <div wicket:id="feedback" class="feedback"></div>

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

@@ -10 +10 @@
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.markup.html.panel.FeedbackPanel;
-import org.apache.wicket.model.CompoundPropertyModel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
@@ -21 +20 @@
 @SuppressWarnings("serial")
 public abstract class EditResourceDialog extends ModalEditDialogBase<Resource> {
+
     private final class Content extends
             ModalEditDialogBase<Resource>.ContentPanel {
+
         private final Form<Resource> form;
         private final FeedbackPanel feedbackPanel;
-
+        
         public Content(String id, IModel<Resource> model) {
             super(id);
-            form = new Form<Resource>("editResourceForm", model);
-            final DropDownChoice<Resource.Type> typeChoice =
-                new DropDownChoice<Resource.Type>("type",
-                        Arrays.asList(Resource.Type.values()),
-                        new EnumChoiceRenderer<Resource.Type>(this));
-            typeChoice.setRequired(true);
-            form.add(typeChoice);
-            final TextField<String> refField =
-                new RequiredTextField<String>("ref");
-            refField.add(new StringValidator.MaximumLengthValidator(255));
-            refField.add(new UrlValidator(UrlValidator.NO_FRAGMENTS));
-            form.add(refField);
+            form = new Form<>("editResourceForm", model);
+                        
+            form.add(new DropDownChoice<>("type",
+                    Arrays.asList(Resource.Type.values()),
+                    new EnumChoiceRenderer<Resource.Type>(this))
+                    .setRequired(true)
+            );
+            
+            form.add(new RequiredTextField<String>("ref")
+                    .add(new StringValidator.MaximumLengthValidator(255))
+                    .add(new UrlValidator(UrlValidator.NO_FRAGMENTS)));
+            
+            form.add(new TextField<String>("label"));
+            form.add(new TextField<String>("description"));
+            
             feedbackPanel = new FeedbackPanel("feedback");
             form.add(feedbackPanel);
             add(form);
         }
-
+        
         @Override
         public Form<Resource> getForm() {
             return form;
         }
-
+        
         @Override
         public FeedbackPanel getFeedbackPanel() {
@@ -56 +60 @@
     } // class EditResourceDialog.Content
 
-
     public EditResourceDialog(final String id) {
-        super(id, new Model<String>("Add/Edit Resource"));
+        super(id, Model.of("Add/Edit Resource"));
         setInitialWidth(600);
     }
-
+    
     @Override
     protected ModalEditDialogBase<Resource>.ContentPanel
-        createContentPanel(String id, IModel<Resource> model) {
+            createContentPanel(String id, IModel<Resource> model) {
         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

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/model/Resource.java

@@ -39 +39 @@
     private String ref;
     
+    @Column(name = "label", nullable = true)
+    private String label;
+    
+    @Column(name = "description", nullable = true)
+    private String description;
+    
     public Resource() {
         super();
@@ -49 +55 @@
     }
     
+    @Override
     public Long getId() {
         return id;
@@ -77 +84 @@
         }
         this.ref = ref;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
     }
     
@@ -108 +131 @@
         ref = resource.getRef();
         type = resource.getType();
+        label = resource.getLabel();
+        description = resource.getDescription();
     }
     
@@ -115 +140 @@
         copy.setRef(ref);
         copy.setType(type);
+        copy.setLabel(label);
+        copy.setDescription(description);
         return copy;
     }