Changeset 5456

Timestamp:

07/08/14 07:48:30 (10 years ago)

Author:

Twan Goosen

Message:

Fixed adding and removing keywords to collections

Location:

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

Files:

• DynamicProxyModel.java (added)
• VolatileEntityModel.java (modified) (2 diffs)
• wizard/AddKeywordDialog.java (modified) (5 diffs)
• wizard/CreateVirtualCollectionWizard.java (modified) (5 diffs)

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

@@ -2 +2 @@
 
 import eu.clarin.cmdi.virtualcollectionregistry.model.IdentifiedEntity;
+import java.io.Serializable;
 import javax.persistence.EntityManager;
 import org.apache.wicket.model.IModel;
@@ -17 +18 @@
  * @see EntityManager#merge(java.lang.Object)
  */
-public class VolatileEntityModel<T extends IdentifiedEntity> implements IModel<T> {
+public class VolatileEntityModel<T extends IdentifiedEntity & Serializable> implements IModel<T> {
 
     private final static Logger logger = LoggerFactory.getLogger(VolatileEntityModel.class);

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

@@ -1 +1 @@
 package eu.clarin.cmdi.virtualcollectionregistry.gui.wizard;
 
+import eu.clarin.cmdi.virtualcollectionregistry.gui.DynamicProxyModel;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.RequiredTextField;
@@ -13 +14 @@
 @SuppressWarnings("serial")
 public abstract class AddKeywordDialog extends ModalEditDialogBase<String> {
+
+
     private final class Content extends
             ModalEditDialogBase<String>.ContentPanel {
+
         private final Form<String> form;
         private final FeedbackPanel feedbackPanel;
@@ -21 +25 @@
             super(id);
             form = new Form<String>("addKeywordForm", model);
-            final TextField<String> keywordField =
-                new RequiredTextField<String>("keyword", form.getModel());
+            final TextField<String> keywordField
+                    = new RequiredTextField<String>("keyword", new DynamicProxyModel<String>() {
+
+                @Override
+                protected IModel<String> getWrappedModel() {
+                    return form.getModel();
+                }
+            });
             keywordField.add(new StringValidator.MaximumLengthValidator(255));
             form.add(keywordField);
@@ -48 +58 @@
     @Override
     protected ModalEditDialogBase<String>.ContentPanel
-        createContentPanel(String id, IModel<String> model) {
+            createContentPanel(String id, IModel<String> model) {
         return new Content(id, model);
     }
@@ -54 +64 @@
     @Override
     protected final IModel<String> newInstanceModel() {
-        return new Model<String>();
+        return Model.of("");
     }
 

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

@@ -2 +2 @@
 
 import eu.clarin.cmdi.virtualcollectionregistry.gui.VolatileEntityModel;
+import eu.clarin.cmdi.virtualcollectionregistry.gui.dialog.ConfirmationDialog;
+import eu.clarin.cmdi.virtualcollectionregistry.model.Creator;
+import eu.clarin.cmdi.virtualcollectionregistry.model.Resource;
+import eu.clarin.cmdi.virtualcollectionregistry.model.VirtualCollection;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
-
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -39 +42 @@
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
+import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.model.StringResourceModel;
 import org.apache.wicket.validation.validator.StringValidator;
 import org.apache.wicket.validation.validator.UrlValidator;
 
-import eu.clarin.cmdi.virtualcollectionregistry.gui.dialog.ConfirmationDialog;
-import eu.clarin.cmdi.virtualcollectionregistry.model.Creator;
-import eu.clarin.cmdi.virtualcollectionregistry.model.Resource;
-import eu.clarin.cmdi.virtualcollectionregistry.model.VirtualCollection;
-
 @SuppressWarnings("serial")
 public abstract class CreateVirtualCollectionWizard extends WizardBase {
@@ -77 +76 @@
             private final ListView<String> itemsView;
 
-            public KeywordsList(String id, final List<String> items) {
+            public KeywordsList(String id, final IModel<List<String>> itemsModel) {
                 super(id);
                 setOutputMarkupId(true);
 
-                itemsView = new ListView<String>("keywords", items) {
+                itemsView = new ListView<String>("keywords", itemsModel) {
                     @Override
                     protected void populateItem(final ListItem<String> item) {
@@ -141 +140 @@
                             new EnumChoiceRenderer<VirtualCollection.Reproducibility>(this));
             add(reproducibilityChoice);
-            final TextArea<String> reproducibilityNoticeArea
+                final TextArea<String> reproducibilityNoticeArea
                     = new TextArea<String>("reproducibilityNotice");
             add(reproducibilityNoticeArea);
 
             final KeywordsList keywordList
-                    = new KeywordsList("keywordsList", vc.getObject().getKeywords());
+                    = new KeywordsList("keywordsList", 
+                            new PropertyModel<List<String>>(vc, "keywords"));
             add(keywordList);
             add(new AjaxLink<String>("keywordsAdd") {
@@ -158 +158 @@
                 @Override
                 public void onSubmit(AjaxRequestTarget target, String keyword) {
-                    if (!vc.getObject().getKeywords().contains(keyword)) {
-                        vc.getObject().getKeywords().add(keyword);
+                    final List<String> keywords = vc.getObject().getKeywords();
+                    if (!keywords.contains(keyword)) {
+                        keywords.add(keyword);
                     }
                     target.addComponent(keywordList);