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

29 Jun 2010

Author: bbrossaud
Date: 2010-06-29 10:43:09 +0200 (Tue, 29 Jun 2010)
New Revision: 162

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

Log:
retrieved only the last extension version

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

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

--- trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/LoginController.java	2010-06-28 15:56:28 UTC (rev 161)
+++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/LoginController.java	2010-06-29 08:43:09 UTC (rev 162)
@@ -11,6 +11,7 @@
 import java.util.List;
 import java.util.Properties;
 import java.util.Set;
+import javax.swing.ComboBoxEditor;
 import org.apache.commons.lang.UnhandledException;
 import org.nuiton.util.ApplicationConfig;
 import org.nuiton.util.ArgumentsParserException;
@@ -185,11 +186,23 @@
         return proxy;
     }
 
-    protected void goToWikittyPage(WikittyProxy proxy){
+    protected void goToWikittyPage(WikittyProxy proxy) {
         Sessions.getCurrent().setAttribute("proxy", proxy);
         Executions.sendRedirect("wikitty.zul");
     }
 
+    protected void fillDistantProxy(Data data) {
+        ((Textbox) this.self.getFellow("distantName")).setValue(data.getName());
+        ((Textbox) this.self.getFellow("distantURL")).setValue(data.getUrl());
+    }
+
+    protected void fillLocalProxy(Data data) {
+        ((Textbox) this.self.getFellow("Name")).setValue(data.getName());
+        ((Textbox) this.self.getFellow("Solr")).setValue(data.getSolr());
+        ((Textbox) this.self.getFellow("Db")).setValue(data.getDb());
+        ((Combobox) this.self.getFellow("driver")).setValue(data.getDriver());
+    }
+
     /*
      * Events
      */
@@ -214,6 +227,19 @@
         }
     }
 
+    public void onClick$modify() {
+        Listitem item = dataList.getSelectedItem();
+        if (item != null) {
+            Data data = (Data) item.getValue();
+            String url = data.getUrl();
+            if (!url.isEmpty()) {
+                fillDistantProxy(data);
+            } else {
+                fillLocalProxy(data);
+            }
+        }
+    }
+
     public void onClick$select() throws ArgumentsParserException {
         Listitem item = dataList.getSelectedItem();
         if (item != null) {
@@ -225,7 +251,7 @@
                     return;
                 }
             }
-             ApplicationConfig config = new ApplicationConfig();
+            ApplicationConfig config = new ApplicationConfig();
             config.parse(new String[]{});
             Properties properties = config.getFlatOptions();
             properties.setProperty("solr.data.dir", data.getSolr());

Modified: trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Model.java
===================================================================
--- trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Model.java	2010-06-28 15:56:28 UTC (rev 161)
+++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/Model.java	2010-06-29 08:43:09 UTC (rev 162)
@@ -6,7 +6,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import org.bouncycastle.jce.provider.JDKAlgorithmParameterGenerator.ElGamal;
 import org.nuiton.wikitty.Criteria;
 import org.nuiton.wikitty.Wikitty;
 import org.nuiton.wikitty.WikittyExtension;
@@ -41,7 +40,10 @@
         List<WikittyExtension> extensions = new ArrayList<WikittyExtension>();
         for (String id : ids) {
             WikittyExtension wikittyExtension = _service.restoreExtension(null, id);
-            extensions.add(wikittyExtension);
+            wikittyExtension = _service.restoreExtensionLastVersion(null, wikittyExtension.getName());
+            if (extensions.contains(wikittyExtension) == false) {
+                extensions.add(wikittyExtension);
+            }
         }
         return extensions;
     }
@@ -65,11 +67,11 @@
     public void update(Wikitty wikitty) {
         _service.store(null, wikitty);
     }
-    
+
     /*
      * Delete
      */
-     public void deleteWikittyById(String id) {
-         _service.delete(null, id);
-     }
+    public void deleteWikittyById(String id) {
+        _service.delete(null, id);
+    }
 }

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-28 15:56:28 UTC (rev 161)
+++ trunk/wikitty-ui-zk/src/main/java/org/nuiton/wikitty/ui/WikittyController.java	2010-06-29 08:43:09 UTC (rev 162)
@@ -10,19 +10,19 @@
 import java.util.List;
 import java.util.Set;
 import javax.servlet.http.HttpSession;
+import org.nuiton.wikitty.FieldType;
 import org.nuiton.wikitty.Wikitty;
 import org.nuiton.wikitty.WikittyExtension;
 import org.nuiton.wikitty.WikittyProxy;
 import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.util.GenericForwardComposer;
-import org.zkoss.zul.Hbox;
+import org.zkoss.zul.Button;
 import org.zkoss.zul.Label;
 import org.zkoss.zul.ListModel;
 import org.zkoss.zul.Listbox;
 import org.zkoss.zul.Listcell;
 import org.zkoss.zul.Listitem;
 import org.zkoss.zul.ListitemRenderer;
-import org.zkoss.zul.Popup;
 import org.zkoss.zul.Textbox;
 
 /**
@@ -93,6 +93,23 @@
         _wikittyForm.addExtension(_selectedNewExtension);
     }
 
+    public void onSelect$formListBox() {
+        Listitem item = formListBox.getSelectedItem();
+        if (item != null) {
+            FieldExtension fieldExtension = (FieldExtension) item.getValue();
+            FieldType fieldType = fieldExtension.getFieldType();
+            Button add = (Button) self.getFellow("addNewInput");
+            Button delete = (Button) self.getFellow("deleteInput");
+            if (!fieldType.isCollection()) {
+                add.setDisabled(true);
+                delete.setDisabled(true);
+            } else {
+                add.setDisabled(false);
+                delete.setDisabled(false);
+            }
+        }
+    }
+
     /*
      * Renderers
      */
@@ -106,38 +123,17 @@
                 Listcell cell2 = new Listcell();
                 item.appendChild(cell1);
                 item.appendChild(cell2);
-                Hbox box = new Hbox();
-                cell2.appendChild(box);
                 Collection<String> extensions = ((Wikitty) data).getExtensionNames();
                 Iterator<String> itCurrent = extensions.iterator();
                 while (itCurrent.hasNext()) {
                     String extension = itCurrent.next();
-                    String toolTip = "";
-                    WikittyExtension wikittyExtension = ((Wikitty) data).getExtension(extension);
-                    Collection<String> fieldNames = wikittyExtension.getFieldNames();
-                    for (String fieldName : fieldNames) {
-                        String result = ((Wikitty) data).getFieldAsString(extension, fieldName);
-                        if (result == null) {
-                            result = "";
-                        }
-                        if (result.length() > 50) {
-                            result = result.substring(0, 46);
-                            if (wikittyExtension.getFieldType(fieldName).isCollection()) {
-                                result += "...]";
-                            } else {
-                                result += "...";
-                            }
-                        }
-                        toolTip += fieldName + " : " + result + "\n";
-                    }
+                    String toolTip = getToolTipsByExtension(extension, (Wikitty) data);
                     if (itCurrent.hasNext()) {
                         extension += ", ";
                     }
                     Label label = new Label(extension);
                     label.setTooltiptext(toolTip);
-                    label.setMultiline(true);
-                    System.out.println(label.getTooltiptext());
-                    box.appendChild(label);
+                    cell2.appendChild(label);
                 }
             }
         };
@@ -190,4 +186,25 @@
     /*
      * Methods
      */
+    protected String getToolTipsByExtension(String extension, Wikitty wikitty) {
+        String toolTip = "";
+        WikittyExtension wikittyExtension = wikitty.getExtension(extension);
+        Collection<String> fieldNames = wikittyExtension.getFieldNames();
+        for (String fieldName : fieldNames) {
+            String result = wikitty.getFieldAsString(extension, fieldName);
+            if (result == null) {
+                result = "";
+            }
+            if (result.length() > 50) {
+                result = result.substring(0, 46);
+                if (wikittyExtension.getFieldType(fieldName).isCollection()) {
+                    result += "...]";
+                } else {
+                    result += "...";
+                }
+            }
+            toolTip += fieldName + " : " + result + "\n";
+        }
+        return toolTip;
+    }
 }

Modified: trunk/wikitty-ui-zk/src/main/webapp/index.zul
===================================================================
--- trunk/wikitty-ui-zk/src/main/webapp/index.zul	2010-06-28 15:56:28 UTC (rev 161)
+++ trunk/wikitty-ui-zk/src/main/webapp/index.zul	2010-06-29 08:43:09 UTC (rev 162)
@@ -18,6 +18,7 @@
         </groupbox>
         <button id="select" label="Select" width="36px" height="24px" />
         <button id="delete" label="Delete" width="36px" height="24px" />
+        <button id="modify" label="Modify" width="36px" height="24px" />
     </groupbox>
     <groupbox>
         <vbox>

Modified: trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul
===================================================================
--- trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul	2010-06-28 15:56:28 UTC (rev 161)
+++ trunk/wikitty-ui-zk/src/main/webapp/wikitty.zul	2010-06-29 08:43:09 UTC (rev 162)
@@ -3,7 +3,7 @@
 <window id="win" title="To do list" width="800px" border="normal" apply="org.nuiton.wikitty.ui.WikittyController">
 
     Search: <textbox id="Search" />
-    <listbox id="extensionListBox" multiple="true" rows="8" model="@{win$composer.extensions, load-after='add.onClick, update.onClick'}"
+    <listbox id="extensionListBox" multiple="true" rows="8" model="@{win$composer.extensions}"
     selectedItem="@{win$composer.selectedExtension}">
 
         <listhead>

    

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

bbrossaud＠users.nuiton.org

tags

participants (1)