r995 - trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component - Wikitty-commits

29 Jun 2011

Author: mfortun
Date: 2011-06-29 11:54:51 +0200 (Wed, 29 Jun 2011)
New Revision: 995

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

Log:
* create a basic abstract component to handle the handler that can be found in the stack

Added:
   trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java
Modified:
   trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java
   trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java
   trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java
   trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java
   trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java
   trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java

Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java
===================================================================

--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java	                        (rev 0)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java	2011-06-29 09:54:51 UTC (rev 995)
@@ -0,0 +1,36 @@
+package org.nuiton.wikitty.struts.component;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts2.components.ClosingUIBean;
+
+import org.nuiton.wikitty.struts.WikittyFieldHandler;
+
+import com.opensymphony.xwork2.util.ValueStack;
+
+public abstract class AbstractWikittyComponent extends ClosingUIBean {
+    
+    
+    protected WikittyFieldHandler handler;
+
+    protected AbstractWikittyComponent(ValueStack stack,
+            HttpServletRequest request, HttpServletResponse response) {
+        super(stack, request, response);
+
+        handler = (WikittyFieldHandler) stack.getContext()
+        .get(WikittyTagBean.WIKITTY_STACK_KEY);
+
+        if (handler == null) {
+            // TODO mfortun-2011-06-29 throw exception if handler not in the stack
+        }
+        
+        
+    }
+
+    
+    
+    
+
+
+}


Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java	2011-06-29 09:27:04 UTC (rev 994)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java	2011-06-29 09:54:51 UTC (rev 995)
@@ -2,17 +2,13 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts2.components.ClosingUIBean;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.nuiton.util.StringUtil;
-import org.nuiton.wikitty.struts.WikittyFieldHandler;
-
 import com.opensymphony.xwork2.util.ValueStack;
 
 @StrutsTag(name = "boolean", tldTagClass = "org.nuiton.wikitty.struts.tag.BooleanTag",
         description = "", allowDynamicAttributes = false)
-public class BooleanBean extends ClosingUIBean  {
+public class BooleanBean extends AbstractWikittyComponent  {
 
     public BooleanBean(ValueStack stack, HttpServletRequest request,
             HttpServletResponse response) {
@@ -27,25 +23,18 @@
     protected void evaluateExtraParams() {
         super.evaluateExtraParams();
 
-        WikittyFieldHandler handler = (WikittyFieldHandler) stack.getContext()
-                .get(WikittyTagBean.WIKITTY_STACK_KEY);
-
-        if (handler != null) {
-            handler.addAddedField(name);
-            // if field defined as inclued
-            if (handler.isIncluded(name)) {
-                // parse extname and field name
-                String[] fieldsAccess = StringUtil.split(name, ".");
-                // add parametters to be use by the template
-                addParameter(
-                        "included",true);
-                addParameter(
-                        "value",
-                        handler.getWikitty().getFieldAsBoolean(fieldsAccess[0],
-                                fieldsAccess[1]));
-            }
-        } else {
-            // TODO mfortun-2011-06-28 throw exception if handler not in the stack
+        handler.addAddedField(name);
+        // if field defined as inclued
+        if (handler.isIncluded(name)) {
+            // parse extname and field name
+            String[] fieldsAccess = StringUtil.split(name, ".");
+            // add parametters to be use by the template
+            addParameter(
+                    "included",true);
+            addParameter(
+                    "value",
+                    handler.getWikitty().getFieldAsBoolean(fieldsAccess[0],
+                            fieldsAccess[1]));
         }
     }
     

Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java	2011-06-29 09:27:04 UTC (rev 994)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java	2011-06-29 09:54:51 UTC (rev 995)
@@ -4,16 +4,13 @@
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.apache.struts2.components.ClosingUIBean;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.nuiton.util.StringUtil;
 import org.nuiton.wikitty.struts.Option;
-import org.nuiton.wikitty.struts.WikittyFieldHandler;
-
 import com.opensymphony.xwork2.util.ValueStack;
 
 @StrutsTag(name = "fixedSelect", tldTagClass = "org.nuiton.wikitty.struts.tag.FixedSelectTag", description = "", allowDynamicAttributes = false)
-public class FixedSelectBean extends ClosingUIBean {
+public class FixedSelectBean extends AbstractWikittyComponent {
 
     protected String fixvalues;
 
@@ -29,34 +26,27 @@
     protected void evaluateExtraParams() {
         super.evaluateExtraParams();
 
-        WikittyFieldHandler handler = (WikittyFieldHandler) stack.getContext()
-                .get(WikittyTagBean.WIKITTY_STACK_KEY);
+        // if field defined as inclued
+        if (handler.isIncluded(name)) {
+            handler.addAddedField(name);
+            // parse extname and field name
+            String[] fieldsAccess = StringUtil.split(name, ".");
+            // add parametters to be use by the template
+            addParameter("included", true);
+            addParameter(
+                    "value",
+                    handler.getWikitty().getFieldAsString(fieldsAccess[0],
+                            fieldsAccess[1]));
 
-        if (handler != null) {
-            // if field defined as inclued
-            if (handler.isIncluded(name)) {
-                handler.addAddedField(name);
-                // parse extname and field name
-                String[] fieldsAccess = StringUtil.split(name, ".");
-                // add parametters to be use by the template
-                addParameter("included", true);
-                addParameter(
-                        "value",
-                        handler.getWikitty().getFieldAsString(fieldsAccess[0],
-                                fieldsAccess[1]));
-
-                List<Option> fixlist = new LinkedList<Option>();
-                String[] values = StringUtil.split(fixvalues, ",");
-                for (String it : values) {
-                    fixlist.add(new Option(it,it));
-                }
-                addParameter("fixvalues", fixlist);
-
+            List<Option> fixlist = new LinkedList<Option>();
+            String[] values = StringUtil.split(fixvalues, ",");
+            for (String it : values) {
+                fixlist.add(new Option(it, it));
             }
-        } else {
-            // TODO mfortun-2011-06-28 throw exception if handler not in the
-            // stack
+            addParameter("fixvalues", fixlist);
+
         }
+
     }
 
     public String getDefaultOpenTemplate() {

Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java	2011-06-29 09:27:04 UTC (rev 994)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java	2011-06-29 09:54:51 UTC (rev 995)
@@ -2,17 +2,12 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts2.components.ClosingUIBean;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.nuiton.util.StringUtil;
-import org.nuiton.wikitty.struts.WikittyFieldHandler;
-
 import com.opensymphony.xwork2.util.ValueStack;
 
-@StrutsTag(name = "hidden", tldTagClass = "org.nuiton.wikitty.struts.tag.HiddenTag",
-        description = "", allowDynamicAttributes = false)
-public class HiddenBean extends ClosingUIBean  {
+@StrutsTag(name = "hidden", tldTagClass = "org.nuiton.wikitty.struts.tag.HiddenTag", description = "", allowDynamicAttributes = false)
+public class HiddenBean extends AbstractWikittyComponent {
 
     public HiddenBean(ValueStack stack, HttpServletRequest request,
             HttpServletResponse response) {
@@ -26,28 +21,21 @@
     protected void evaluateExtraParams() {
         super.evaluateExtraParams();
 
-        WikittyFieldHandler handler = (WikittyFieldHandler) stack.getContext()
-                .get(WikittyTagBean.WIKITTY_STACK_KEY);
-
-        if (handler != null) {
-            // if field defined as inclued
-            if (handler.isIncluded(name)) {
-                handler.addAddedField(name);
-                // parse extname and field name
-                String[] fieldsAccess = StringUtil.split(name, ".");
-                // add parametters to be use by the template
-                addParameter(
-                        "included",true);
-                addParameter(
-                        "value",
-                        handler.getWikitty().getFieldAsString(fieldsAccess[0],
-                                fieldsAccess[1]));
-            }
-        } else {
-            // TODO mfortun-2011-06-28 throw exception if handler not in the stack
+        // if field defined as inclued
+        if (handler.isIncluded(name)) {
+            handler.addAddedField(name);
+            // parse extname and field name
+            String[] fieldsAccess = StringUtil.split(name, ".");
+            // add parametters to be use by the template
+            addParameter("included", true);
+            addParameter(
+                    "value",
+                    handler.getWikitty().getFieldAsString(fieldsAccess[0],
+                            fieldsAccess[1]));
         }
+
     }
-    
+
     public String getDefaultOpenTemplate() {
         return OPEN_TEMPLATE;
     }

Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java	2011-06-29 09:27:04 UTC (rev 994)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java	2011-06-29 09:54:51 UTC (rev 995)
@@ -2,17 +2,13 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts2.components.ClosingUIBean;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.nuiton.util.StringUtil;
-import org.nuiton.wikitty.struts.WikittyFieldHandler;
 
 import com.opensymphony.xwork2.util.ValueStack;
 
-@StrutsTag(name = "textArea", tldTagClass = "org.nuiton.wikitty.struts.tag.TextAreaTag",
-        description = "", allowDynamicAttributes = false)
-public class TextAreaBean extends ClosingUIBean  {
+@StrutsTag(name = "textArea", tldTagClass = "org.nuiton.wikitty.struts.tag.TextAreaTag", description = "", allowDynamicAttributes = false)
+public class TextAreaBean extends AbstractWikittyComponent {
 
     public TextAreaBean(ValueStack stack, HttpServletRequest request,
             HttpServletResponse response) {
@@ -22,33 +18,25 @@
     public static final String OPEN_TEMPLATE = "ws-textarea";
     public static final String TEMPLATE = "ws-textarea-close";
 
-    
     @Override
     protected void evaluateExtraParams() {
         super.evaluateExtraParams();
 
-        WikittyFieldHandler handler = (WikittyFieldHandler) stack.getContext()
-                .get(WikittyTagBean.WIKITTY_STACK_KEY);
-
-        if (handler != null) {
-            // if field defined as inclued
-            if (handler.isIncluded(name)) {
-                handler.addAddedField(name);
-                // parse extname and field name
-                String[] fieldsAccess = StringUtil.split(name, ".");
-                // add parametters to be use by the template
-                addParameter(
-                        "included",true);
-                addParameter(
-                        "value",
-                        handler.getWikitty().getFieldAsString(fieldsAccess[0],
-                                fieldsAccess[1]));
-            }
-        } else {
-            // TODO mfortun-2011-06-28 throw exception if handler not in the stack
+        // if field defined as inclued
+        if (handler.isIncluded(name)) {
+            handler.addAddedField(name);
+            // parse extname and field name
+            String[] fieldsAccess = StringUtil.split(name, ".");
+            // add parametters to be use by the template
+            addParameter("included", true);
+            addParameter(
+                    "value",
+                    handler.getWikitty().getFieldAsString(fieldsAccess[0],
+                            fieldsAccess[1]));
         }
+
     }
-    
+
     public String getDefaultOpenTemplate() {
         return OPEN_TEMPLATE;
     }

Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java	2011-06-29 09:27:04 UTC (rev 994)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java	2011-06-29 09:54:51 UTC (rev 995)
@@ -3,15 +3,13 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.struts2.components.ClosingUIBean;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.nuiton.util.StringUtil;
-import org.nuiton.wikitty.struts.WikittyFieldHandler;
 
 import com.opensymphony.xwork2.util.ValueStack;
 
 @StrutsTag(name = "textField", tldTagClass = "org.nuiton.wikitty.struts.tag.TextFieldTag", description = "", allowDynamicAttributes = false)
-public class TextFieldBean extends ClosingUIBean {
+public class TextFieldBean extends AbstractWikittyComponent {
 
     public TextFieldBean(ValueStack stack, HttpServletRequest request,
             HttpServletResponse response) {
@@ -25,26 +23,19 @@
     protected void evaluateExtraParams() {
         super.evaluateExtraParams();
 
-        WikittyFieldHandler handler = (WikittyFieldHandler) stack.getContext()
-                .get(WikittyTagBean.WIKITTY_STACK_KEY);
-
-        if (handler != null) {
-            handler.addAddedField(name);
-            // if field defined as inclued
-            if (handler.isIncluded(name)) {
-                // parse extname and field name
-                String[] fieldsAccess = StringUtil.split(name, ".");
-                // add parametters to be use by the template
-                addParameter(
-                        "included",true);
-                addParameter(
-                        "value",
-                        handler.getWikitty().getFieldAsString(fieldsAccess[0],
-                                fieldsAccess[1]));
-            }
-        } else {
-            // TODO mfortun-2011-06-28 throw exception if handler not in the stack
+        handler.addAddedField(name);
+        // if field defined as inclued
+        if (handler.isIncluded(name)) {
+            // parse extname and field name
+            String[] fieldsAccess = StringUtil.split(name, ".");
+            // add parametters to be use by the template
+            addParameter("included", true);
+            addParameter(
+                    "value",
+                    handler.getWikitty().getFieldAsString(fieldsAccess[0],
+                            fieldsAccess[1]));
         }
+
     }
 
     public String getDefaultOpenTemplate() {

Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java
===================================================================
--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java	2011-06-29 09:27:04 UTC (rev 994)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java	2011-06-29 09:54:51 UTC (rev 995)
@@ -2,11 +2,8 @@
 
 import java.util.LinkedList;
 import java.util.List;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts2.components.ClosingUIBean;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.nuiton.util.StringUtil;
 import org.nuiton.wikitty.entities.Wikitty;
@@ -14,12 +11,12 @@
 import org.nuiton.wikitty.search.PagedResult;
 import org.nuiton.wikitty.search.Search;
 import org.nuiton.wikitty.struts.Option;
-import org.nuiton.wikitty.struts.WikittyFieldHandler;
 
+
 import com.opensymphony.xwork2.util.ValueStack;
 
 @StrutsTag(name = "wikittyselect", tldTagClass = "org.nuiton.wikitty.struts.tag.WikittySelectTag", description = "", allowDynamicAttributes = false)
-public class WikittySelectBean extends ClosingUIBean {
+public class WikittySelectBean extends AbstractWikittyComponent {
 
     protected String criteria;
     protected String descfield;
@@ -44,65 +41,58 @@
     protected void evaluateExtraParams() {
         super.evaluateExtraParams();
 
-        WikittyFieldHandler handler = (WikittyFieldHandler) stack.getContext()
-                .get(WikittyTagBean.WIKITTY_STACK_KEY);
+        // if field defined as inclued
+        if (handler.isIncluded(name)) {
 
-        if (handler != null) {
-            // if field defined as inclued
-            if (handler.isIncluded(name)) {
-                
-                handler.addAddedField(name);
-                
-                // parse extname and field name
-                String[] fieldsAccess = StringUtil.split(name, ".");
-                // add parametters to be use by the template
-                addParameter("included", true);
-                addParameter(
-                        "value",
-                        handler.getWikitty().getFieldAsString(fieldsAccess[0],
-                                fieldsAccess[1]));
+            handler.addAddedField(name);
 
-                List<Option> fixlist = new LinkedList<Option>();
+            // parse extname and field name
+            String[] fieldsAccess = StringUtil.split(name, ".");
+            // add parametters to be use by the template
+            addParameter("included", true);
+            addParameter(
+                    "value",
+                    handler.getWikitty().getFieldAsString(fieldsAccess[0],
+                            fieldsAccess[1]));
 
-                // search for the wikitty with the criteria
-                Criteria criteria = Search.query().keyword(this.criteria)
-                        .criteria();
-                PagedResult<Wikitty> wikitties = handler.getProxy()
-                        .findAllByCriteria(criteria);
+            List<Option> fixlist = new LinkedList<Option>();
 
-                String[] descriptor = StringUtil.split(descfield, ",");
-    
-                // if wikitties not null contruct option result 
-                // with descriptor
-                if (wikitties != null) {
-                    for (Wikitty wiki : wikitties) {
-                        // by default value and description are the same
-                        // wikitty id
-                        String val = wiki.getId();
+            // search for the wikitty with the criteria
+            Criteria criteria = Search.query().keyword(this.criteria)
+                    .criteria();
+            PagedResult<Wikitty> wikitties = handler.getProxy()
+                    .findAllByCriteria(criteria);
 
-                        String desc = wiki.getId();
+            String[] descriptor = StringUtil.split(descfield, ",");
 
-                        // if attribute descripteur fill with something
-                        // extract from wikitty corresponding field value
-                        if (descriptor.length != 0) {
-                            desc = "";
-                            for (String descriptorIt : descriptor) {
-                                String[] descTable = StringUtil.split(
-                                        descriptorIt, ".");
+            // if wikitties not null contruct option result
+            // with descriptor
+            if (wikitties != null) {
+                for (Wikitty wiki : wikitties) {
+                    // by default value and description are the same
+                    // wikitty id
+                    String val = wiki.getId();
 
-                                desc += wiki.getFieldAsString(descTable[0],
-                                        descTable[1]);
-                            }
+                    String desc = wiki.getId();
+
+                    // if attribute descripteur fill with something
+                    // extract from wikitty corresponding field value
+                    if (descriptor.length != 0) {
+                        desc = "";
+                        for (String descriptorIt : descriptor) {
+                            String[] descTable = StringUtil.split(descriptorIt,
+                                    ".");
+
+                            desc += wiki.getFieldAsString(descTable[0],
+                                    descTable[1]);
                         }
-                        fixlist.add(new Option(val, desc));
                     }
-                    addParameter("wikittiesvalues", fixlist);
+                    fixlist.add(new Option(val, desc));
                 }
+                addParameter("wikittiesvalues", fixlist);
             }
-        } else {
-            // TODO mfortun-2011-06-28 throw exception if handler not in the
-            // stack
         }
+
     }
 
     public String getCriteria() {

    

r995 - trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component

mfortun＠users.nuiton.org

tags

participants (1)