r170 - in trunk/wikitty-ui-zk/src/main: java/org/nuiton/wikitty/ui webapp - Wikitty-commits

29 Jun 2010

Author: bbrossaud
Date: 2010-06-29 16:12:18 +0200 (Tue, 29 Jun 2010)
New Revision: 170

Url: http://nuiton.org/repositories/revision/wikitty/170

Log:
refresh the list when CRUD and multiple-selection works

Modified:
   trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java
   trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyForm.java
   trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul

Modified: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java
===================================================================

--- trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java	2010-06-29 13:59:21 UTC (rev 169)
+++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java	2010-06-29 14:12:18 UTC (rev 170)
@@ -35,7 +35,7 @@
 
     protected Model _model = null;
     protected List<WikittyExtension> _extensions = new ArrayList<WikittyExtension>();
-    protected WikittyExtension _selectedExtension;
+    protected WikittyExtension _selectedExtension = null;
     protected WikittyExtension _selectedNewExtension;
     protected Listbox formListBox;
     protected WikittyForm _wikittyForm = new WikittyForm();
@@ -89,19 +89,24 @@
     }
 
     public void onClick$add() {
-        Wikitty newWikitty = _wikittyForm.retriveWikittyInForm(formListBox);
+        Wikitty newWikitty = _wikittyForm.retriveWikittyInForm(formListBox, new Wikitty());
         _model.create(newWikitty);
+        if (_selectedExtension != null) {
+            List<Wikitty> list = _model.retrieveWikittiesByExtensionName(_selectedExtension.getName());
+            _wikittyModel.setWikitties(list);
+        }
     }
 
     public void onClick$update() {
         if (_wikittyForm.isSelected()) {
-            Wikitty newWikitty = _wikittyForm.retriveWikittyInForm(formListBox);
+            Wikitty newWikitty = _wikittyForm.retriveWikittyInForm(formListBox, null);
             _model.update(newWikitty);
         }
     }
 
     public void onClick$delete() {
-        Set<Listitem> items = wikittiesListBox.getSelectedItems();
+        Set<Listitem> set = wikittiesListBox.getSelectedItems();
+        List<Listitem> items = new ArrayList<Listitem>(set);
         for (Listitem item : items) {
             Wikitty wikitty = (Wikitty) item.getValue();
             _model.deleteWikittyById(wikitty.getId());
@@ -191,6 +196,7 @@
      * Setters
      */
     public void setSelectedExtension(WikittyExtension current) {
+        _selectedExtension = current;
         _wikittyForm.setHoldExtensions(current);
         List<Wikitty> list = _model.retrieveWikittiesByExtensionName(current.getName());
         _wikittyModel.setWikitties(list);

Modified: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyForm.java
===================================================================
--- trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyForm.java	2010-06-29 13:59:21 UTC (rev 169)
+++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyForm.java	2010-06-29 14:12:18 UTC (rev 170)
@@ -178,12 +178,9 @@
         return booleans;
     }
 
-    public Wikitty retriveWikittyInForm(Listbox formListBox) {
-        Wikitty newWikitty = null;
-        if (_wikitty != null) {
+    public Wikitty retriveWikittyInForm(Listbox formListBox, Wikitty newWikitty) {
+        if (newWikitty == null) {
             newWikitty = _wikitty;
-        } else {
-            newWikitty = new Wikitty();
         }
         newWikitty.addExtension(_holdExtensions);
         List<Listitem> items = formListBox.getItems();

Modified: trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul
===================================================================
--- trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul	2010-06-29 13:59:21 UTC (rev 169)
+++ trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul	2010-06-29 14:12:18 UTC (rev 170)
@@ -4,7 +4,7 @@
 
     Search: <textbox id="Search" />
     <toolbarbutton id="home" label="Select another proxy"/>
-    <listbox id="extensionListBox" multiple="true" rows="8" model="@{win$composer.extensions}"
+    <listbox id="extensionListBox" rows="8" model="@{win$composer.extensions}"
     selectedItem="@{win$composer.selectedExtension}">
 
         <listhead>
@@ -21,7 +21,7 @@
 
     <groupbox>
         <caption label="wikitties" />
-        <listbox id="wikittiesListBox" rows="8" model="@{win$composer.wikittyModel}" itemRenderer="@{win$composer.wikittyRenderer}" selectedItem="@{win$composer.selectedWikitty}">
+        <listbox multiple="true" id="wikittiesListBox" rows="8" model="@{win$composer.wikittyModel}" itemRenderer="@{win$composer.wikittyRenderer}" selectedItem="@{win$composer.selectedWikitty}">
         <listhead sizable="true">
             <listheader label="ID" />
             <listheader label="Extensions" />

    

r170 - in trunk/wikitty-ui-zk/src/main: java/org/nuiton/wikitty/ui webapp

bbrossaud＠users.nuiton.org

tags

participants (1)