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

Timestamp:

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

Author:

Twan Goosen

Message:

Fixed adding and removing keywords to collections

File:

• VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/wizard/CreateVirtualCollectionWizard.java (modified) (5 diffs)

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);