[Wikitty-commits] r969 - in trunk/wikitty-struts/src/main/java: org/nuiton/wikitty/struts/component template/xhtml

23 Jun 2011

Author: mfortun
Date: 2011-06-23 18:16:58 +0200 (Thu, 23 Jun 2011)
New Revision: 969

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

Log:
* complete partially wikitty template

Modified:
   trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java
   trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java
   trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java
   trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl
   trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl
   trunk/wikitty-struts/src/main/java/template/xhtml/ws-field-close.ftl
   trunk/wikitty-struts/src/main/java/template/xhtml/ws-field.ftl

Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java
===================================================================

--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java	2011-06-23 15:24:40 UTC (rev 968)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/ExtensionFieldStrutsBean.java	2011-06-23 16:16:58 UTC (rev 969)
@@ -5,7 +5,7 @@
     
     protected String name;
     protected String type;
-    protected Object Value;
+    protected Object value;
     public String getName() {
         return name;
     }
@@ -19,16 +19,20 @@
         this.type = type;
     }
     public Object getValue() {
-        return Value;
+        return value;
     }
     public void setValue(Object value) {
-        Value = value;
+        this.value = value;
     }
     public ExtensionFieldStrutsBean(String name, String type, Object value) {
         this.name = name;
         this.type = type;
-        Value = value;
+        this.value = value;
     }
+    public ExtensionFieldStrutsBean() {
+        super();
+
+    }
     
     
    

Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java	2011-06-23 15:24:40 UTC (rev 968)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyFieldHandler.java	2011-06-23 16:16:58 UTC (rev 969)
@@ -1,5 +1,6 @@
 package org.nuiton.wikitty.struts.component;
 
+import java.util.LinkedList;
 import java.util.List;
 
 import org.nuiton.wikitty.WikittyProxy;
@@ -12,82 +13,79 @@
     protected String include;
     protected String exclude;
     protected String order;
-    protected List<FieldSpecialisation> field; 
-    
+    protected List<FieldSpecialisation> field;
+
     public WikittyFieldHandler() {
         super();
     }
 
-
     public Wikitty getWikitty() {
         return wikitty;
     }
 
-
     public void setWikitty(Wikitty wikitty) {
         this.wikitty = wikitty;
     }
 
-
     public WikittyProxy getProxy() {
         return proxy;
     }
 
-
     public void setProxy(WikittyProxy proxy) {
         this.proxy = proxy;
     }
 
-
     public String getInclude() {
         return include;
     }
 
-
     public void setInclude(String include) {
         this.include = include;
     }
 
-
     public String getExclude() {
         return exclude;
     }
 
-
     public void setExclude(String exclude) {
         this.exclude = exclude;
     }
 
-
     public String getOrder() {
         return order;
     }
 
-
     public void setOrder(String order) {
         this.order = order;
     }
 
-
     public List<FieldSpecialisation> getField() {
+
         return field;
     }
 
-
     public void setField(List<FieldSpecialisation> field) {
         this.field = field;
     }
 
+    public void specialiseField(FieldSpecialisation fieldSpe) {
 
-    public void specialiseField(FieldSpecialisation fieldSpe){
-        
     }
-    
-    
-    public List<ExtensionFieldStrutsBean> getWikittyField(){
-        return null;
+
+    public List<ExtensionFieldStrutsBean> getWikittyField() {
+
+        List<ExtensionFieldStrutsBean> list = new LinkedList<ExtensionFieldStrutsBean>();
+
+        for (String fielNa : wikitty.getAllFieldNames()) {
+            ExtensionFieldStrutsBean temp = new ExtensionFieldStrutsBean(
+                    fielNa, "textfield", null);
+            // TODO mfortun-2011-06-23 handle field with specific wikitty class
+            // ?
+
+            list.add(temp);
+        }
+
+        return list;
     }
-    
-    
-    
+
 }

Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java	2011-06-23 15:24:40 UTC (rev 968)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java	2011-06-23 16:16:58 UTC (rev 969)
@@ -24,7 +24,7 @@
     protected String include;
     protected String exclude;
     protected String order;
-    protected boolean allowDelete;
+    protected Boolean allowDelete;
 
     public WikittyTagBean(ValueStack stack, HttpServletRequest request,
             HttpServletResponse response) {
@@ -43,27 +43,34 @@
             addParameter("redirect", findString(redirect));
         }
 
+        if (allowDelete != null) {
+            addParameter("allowDelete", allowDelete);
+        }
+
+        if (wikitty != null) {
+            addParameter("wikittyid", findString(wikitty.getId()));
+            addParameter("wikittyversion", findString(wikitty.getVersion()));
+            addParameter("wikittyextensions", findString(wikitty
+                    .getExtensionNames().toString()));
+        }
+
         Object temp = stack.getContext().get(WIKITTY_STACK_KEY);
         WikittyFieldHandler handler;
         if (temp == null) {
             handler = new WikittyFieldHandler();
             stack.getContext().put(WIKITTY_STACK_KEY, handler);
-            
+
             handler.setExclude(exclude);
             handler.setInclude(include);
             handler.setOrder(order);
             handler.setWikitty(wikitty);
             handler.setProxy(proxy);
-            
+
         } else {
             handler = (WikittyFieldHandler) temp;
-            handler.getField();
+            addParameter("wikittyfields", handler.getWikittyField());
         }
-        
-        
 
-        
-
         /*
          * 
          * si l'élément key est null on l'initialise en y mettant tout les

Modified: trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl
===================================================================
--- trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl	2011-06-23 15:24:40 UTC (rev 968)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/wikitty-close.ftl	2011-06-23 16:16:58 UTC (rev 969)
@@ -1 +1,31 @@
-</wikitty >
+
+<#assign aKeys = parameters.wikittyfields><#t/>
+    <#list aKeys as aKey><#t/>
+ 
+<#if  aKey.type=="file">
+<input type="hidden" name="${aKey.name}" value="BINARY" />
+<input type="file" name="File" label ="File"/>
+</#if>
+<#if  aKey.type=="textarea" >
+<textarea id="${aKey.name}" cols="80" rows="20" name="${aKey.name}">${aKey.value}</textarea>
+</#if>
+<#if  aKey.type=="textfield" >
+<input type="text" name="${aKey.name}" value="${aKey.value}" >
+</#if>
+
+<#if  aKey.type=="boolean" >                            
+<input type="checkbox" name="${aKey.name}" value="true"  "checked " />                          
+</#if>      
+<#if  parametters.nulle?? >                       
+ <input type="checkbox" name="isNull- ${aKey.name}"
+                            value="true"  "  checkedNull "/>(null)"
+</#if>
+ 
+</#list><#t/> 
+
+
+<input type="submit" name="store" value="Store" />
+<#if parameters.allowDelete?? && parameters.allowDelete==true >
+<input type="submit" name="delete" value="Delete" />
+</#if>
+</form>
\ No newline at end of file

Modified: trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl
===================================================================
--- trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl	2011-06-23 15:24:40 UTC (rev 968)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/wikitty.ftl	2011-06-23 16:16:58 UTC (rev 969)
@@ -1 +1,7 @@
-<wikitty >
+<form class="edit" action="${parameters.action}" method="post" enctype="multipart/form-data" >
+<input type="hidden" name="id" value="${parameters.wikittyid}" />
+<input type="hidden" name="version" value="${parameters.wikittyversion}" />
+<input type="hidden" name="extensions" value="${parameters.wikittyextensions}"/>
+<#if parameters.redirect??>
+<input type="hidden" name="redirect" value="${parameters.redirect}" />
+</#if>
\ No newline at end of file

Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-field-close.ftl
===================================================================
--- trunk/wikitty-struts/src/main/java/template/xhtml/ws-field-close.ftl	2011-06-23 15:24:40 UTC (rev 968)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-field-close.ftl	2011-06-23 16:16:58 UTC (rev 969)
@@ -1 +0,0 @@
-</field >

Modified: trunk/wikitty-struts/src/main/java/template/xhtml/ws-field.ftl
===================================================================
--- trunk/wikitty-struts/src/main/java/template/xhtml/ws-field.ftl	2011-06-23 15:24:40 UTC (rev 968)
+++ trunk/wikitty-struts/src/main/java/template/xhtml/ws-field.ftl	2011-06-23 16:16:58 UTC (rev 969)
@@ -1,3 +0,0 @@
-<field >
-${parameters.name}<#rt/>
-${parameters.truc.ig}<#rt/>
\ No newline at end of file

    

[Wikitty-commits] r969 - in trunk/wikitty-struts/src/main/java: org/nuiton/wikitty/struts/component template/xhtml

mfortun＠users.nuiton.org