r998 - in trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts: . component - Wikitty-commits

29 Jun 2011

Author: mfortun
Date: 2011-06-29 12:36:38 +0200 (Wed, 29 Jun 2011)
New Revision: 998

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

Log:
* cosmetic change
* add log attribute 

Modified:
   trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java
   trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java
   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
   trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java

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

--- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java	2011-06-29 10:24:37 UTC (rev 997)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java	2011-06-29 10:36:38 UTC (rev 998)
@@ -8,6 +8,8 @@
 import java.util.Map;
 import java.util.Set;
 import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.nuiton.util.StringUtil;
 import org.nuiton.wikitty.WikittyProxy;
 import org.nuiton.wikitty.entities.FieldType;
@@ -17,6 +19,10 @@
 
 public class WikittyFieldHandler {
 
+    /** to use log facility, just put in your code: log.info(\"...\"); */
+    final static private Log log = LogFactory.getLog(WikittyFieldHandler.class);
+    
+    
     protected Wikitty wikitty;
     protected WikittyProxy proxy;
     protected String include = "";

Modified: 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	2011-06-29 10:24:37 UTC (rev 997)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java	2011-06-29 10:36:38 UTC (rev 998)
@@ -3,6 +3,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.struts2.components.ClosingUIBean;
 
 import org.nuiton.wikitty.struts.WikittyFieldHandler;
@@ -11,6 +13,8 @@
 
 public abstract class AbstractWikittyComponent extends ClosingUIBean {
     
+    /** to use log facility, just put in your code: log.info(\"...\"); */
+    final static private Log log = LogFactory.getLog(AbstractWikittyComponent.class);
     
     protected WikittyFieldHandler handler;
 

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 10:24:37 UTC (rev 997)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/BooleanBean.java	2011-06-29 10:36:38 UTC (rev 998)
@@ -2,6 +2,8 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.nuiton.util.StringUtil;
 import com.opensymphony.xwork2.util.ValueStack;
@@ -10,14 +12,17 @@
         description = "", allowDynamicAttributes = false)
 public class BooleanBean extends AbstractWikittyComponent  {
 
+    /** to use log facility, just put in your code: log.info(\"...\"); */
+    final static private Log log = LogFactory.getLog(BooleanBean.class);
+    
+    public static final String OPEN_TEMPLATE = "ws-boolean";
+    public static final String TEMPLATE = "ws-boolean-close";
+    
+    
     public BooleanBean(ValueStack stack, HttpServletRequest request,
             HttpServletResponse response) {
         super(stack, request, response);
     }
-
-    public static final String OPEN_TEMPLATE = "ws-boolean";
-    public static final String TEMPLATE = "ws-boolean-close";
-
     
     @Override
     protected void evaluateExtraParams() {

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 10:24:37 UTC (rev 997)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/FixedSelectBean.java	2011-06-29 10:36:38 UTC (rev 998)
@@ -4,6 +4,8 @@
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.nuiton.util.StringUtil;
 import org.nuiton.wikitty.struts.Option;
@@ -12,6 +14,12 @@
 @StrutsTag(name = "fixedSelect", tldTagClass = "org.nuiton.wikitty.struts.tag.FixedSelectTag", description = "", allowDynamicAttributes = false)
 public class FixedSelectBean extends AbstractWikittyComponent {
 
+    /** to use log facility, just put in your code: log.info(\"...\"); */
+    final static private Log log = LogFactory.getLog(FixedSelectBean.class);
+
+    public static final String OPEN_TEMPLATE = "ws-fixedselect";
+    public static final String TEMPLATE = "ws-fixedselect-close";
+
     protected String fixvalues;
 
     public FixedSelectBean(ValueStack stack, HttpServletRequest request,
@@ -19,9 +27,6 @@
         super(stack, request, response);
     }
 
-    public static final String OPEN_TEMPLATE = "ws-fixedselect";
-    public static final String TEMPLATE = "ws-fixedselect-close";
-
     @Override
     protected void evaluateExtraParams() {
         super.evaluateExtraParams();

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 10:24:37 UTC (rev 997)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/HiddenBean.java	2011-06-29 10:36:38 UTC (rev 998)
@@ -2,6 +2,8 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.nuiton.util.StringUtil;
 import com.opensymphony.xwork2.util.ValueStack;
@@ -9,13 +11,17 @@
 @StrutsTag(name = "hidden", tldTagClass = "org.nuiton.wikitty.struts.tag.HiddenTag", description = "", allowDynamicAttributes = false)
 public class HiddenBean extends AbstractWikittyComponent {
 
+    /** to use log facility, just put in your code: log.info(\"...\"); */
+    final static private Log log = LogFactory.getLog(HiddenBean.class);
+    
+    public static final String OPEN_TEMPLATE = "ws-hidden";
+    public static final String TEMPLATE = "ws-hidden-close";
+    
     public HiddenBean(ValueStack stack, HttpServletRequest request,
             HttpServletResponse response) {
         super(stack, request, response);
     }
 
-    public static final String OPEN_TEMPLATE = "ws-hidden";
-    public static final String TEMPLATE = "ws-hidden-close";
 
     @Override
     protected void evaluateExtraParams() {

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 10:24:37 UTC (rev 997)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextAreaBean.java	2011-06-29 10:36:38 UTC (rev 998)
@@ -2,22 +2,26 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.nuiton.util.StringUtil;
-
 import com.opensymphony.xwork2.util.ValueStack;
 
 @StrutsTag(name = "textArea", tldTagClass = "org.nuiton.wikitty.struts.tag.TextAreaTag", description = "", allowDynamicAttributes = false)
 public class TextAreaBean extends AbstractWikittyComponent {
 
+    /** to use log facility, just put in your code: log.info(\"...\"); */
+    final static private Log log = LogFactory.getLog(TextAreaBean.class);
+
+    public static final String OPEN_TEMPLATE = "ws-textarea";
+    public static final String TEMPLATE = "ws-textarea-close";
+
     public TextAreaBean(ValueStack stack, HttpServletRequest request,
             HttpServletResponse response) {
         super(stack, request, response);
     }
 
-    public static final String OPEN_TEMPLATE = "ws-textarea";
-    public static final String TEMPLATE = "ws-textarea-close";
-
     @Override
     protected void evaluateExtraParams() {
         super.evaluateExtraParams();

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 10:24:37 UTC (rev 997)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/TextFieldBean.java	2011-06-29 10:36:38 UTC (rev 998)
@@ -2,23 +2,26 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.nuiton.util.StringUtil;
-
 import com.opensymphony.xwork2.util.ValueStack;
 
 @StrutsTag(name = "textField", tldTagClass = "org.nuiton.wikitty.struts.tag.TextFieldTag", description = "", allowDynamicAttributes = false)
 public class TextFieldBean extends AbstractWikittyComponent {
 
+    /** to use log facility, just put in your code: log.info(\"...\"); */
+    final static private Log log = LogFactory.getLog(TextFieldBean.class);
+
+    public static final String OPEN_TEMPLATE = "ws-textfield";
+    public static final String TEMPLATE = "ws-textfield-close";
+
     public TextFieldBean(ValueStack stack, HttpServletRequest request,
             HttpServletResponse response) {
         super(stack, request, response);
     }
 
-    public static final String OPEN_TEMPLATE = "ws-textfield";
-    public static final String TEMPLATE = "ws-textfield-close";
-
     @Override
     protected void evaluateExtraParams() {
         super.evaluateExtraParams();

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 10:24:37 UTC (rev 997)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittySelectBean.java	2011-06-29 10:36:38 UTC (rev 998)
@@ -4,6 +4,8 @@
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.nuiton.util.StringUtil;
 import org.nuiton.wikitty.entities.Wikitty;
@@ -11,13 +13,17 @@
 import org.nuiton.wikitty.search.PagedResult;
 import org.nuiton.wikitty.search.Search;
 import org.nuiton.wikitty.struts.Option;
-
-
 import com.opensymphony.xwork2.util.ValueStack;
 
 @StrutsTag(name = "wikittyselect", tldTagClass = "org.nuiton.wikitty.struts.tag.WikittySelectTag", description = "", allowDynamicAttributes = false)
 public class WikittySelectBean extends AbstractWikittyComponent {
 
+    /** to use log facility, just put in your code: log.info(\"...\"); */
+    final static private Log log = LogFactory.getLog(WikittySelectBean.class);
+
+    public static final String OPEN_TEMPLATE = "ws-wikittyselect";
+    public static final String TEMPLATE = "ws-wikittyselect-close";
+
     protected String criteria;
     protected String descfield;
 
@@ -26,17 +32,6 @@
         super(stack, request, response);
     }
 
-    public static final String OPEN_TEMPLATE = "ws-wikittyselect";
-    public static final String TEMPLATE = "ws-wikittyselect-close";
-
-    public String getDefaultOpenTemplate() {
-        return OPEN_TEMPLATE;
-    }
-
-    protected String getDefaultTemplate() {
-        return TEMPLATE;
-    }
-
     @Override
     protected void evaluateExtraParams() {
         super.evaluateExtraParams();
@@ -95,6 +90,14 @@
 
     }
 
+    public String getDefaultOpenTemplate() {
+        return OPEN_TEMPLATE;
+    }
+
+    protected String getDefaultTemplate() {
+        return TEMPLATE;
+    }
+
     public String getCriteria() {
         return criteria;
     }

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-29 10:24:37 UTC (rev 997)
+++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java	2011-06-29 10:36:38 UTC (rev 998)
@@ -2,6 +2,8 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.struts2.components.ClosingUIBean;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.nuiton.wikitty.WikittyProxy;
@@ -13,6 +15,10 @@
 @StrutsTag(name = "Wikitty", tldTagClass = "org.nuiton.wikitty.struts.tag.WikittyTag",
         description = "", allowDynamicAttributes = false)
 public class WikittyTagBean extends ClosingUIBean {
+    
+    /** to use log facility, just put in your code: log.info(\"...\"); */
+    final static private Log log = LogFactory.getLog(WikittyTagBean.class);
+    
 
     public static final String OPEN_TEMPLATE = "wikitty";
     public static final String TEMPLATE = "wikitty-close";
@@ -31,24 +37,7 @@
     protected Boolean orderBefore;
     
     protected Boolean allowDelete;
-    
-
-    public Boolean getOrderBefore() {
-        return orderBefore;
-    }
-
-    public void setOrderBefore(Boolean orderBefore) {
-        this.orderBefore = orderBefore;
-    }
-
-    public Boolean getAllowDelete() {
-        return allowDelete;
-    }
-
-    public void setAllowDelete(Boolean allowDelete) {
-        this.allowDelete = allowDelete;
-    }
-
+ 
     public WikittyTagBean(ValueStack stack, HttpServletRequest request,
             HttpServletResponse response) {
         super(stack, request, response);
@@ -77,9 +66,10 @@
 
         if (wikitty != null) {
             addParameter("wikittyid", findString(wikitty.getId()));
-            addParameter("wikittyversion", findString(wikitty.getVersion()));
-            addParameter("wikittyextensions", findString(wikitty
-                    .getExtensionNames().toString()));
+            //no uses finally: 
+            //addParameter("wikittyversion", findString(wikitty.getVersion()));
+            //addParameter("wikittyextensions", findString(wikitty
+            //        .getExtensionNames().toString()));
         }
 
         Object temp = stack.getContext().get(WIKITTY_STACK_KEY);
@@ -184,4 +174,20 @@
         this.allowDelete = allowDelete;
     }
 
+    public Boolean getOrderBefore() {
+        return orderBefore;
+    }
+
+    public void setOrderBefore(Boolean orderBefore) {
+        this.orderBefore = orderBefore;
+    }
+
+    public Boolean getAllowDelete() {
+        return allowDelete;
+    }
+
+    public void setAllowDelete(Boolean allowDelete) {
+        this.allowDelete = allowDelete;
+    }
+    
 }

    

r998 - in trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts: . component

mfortun＠users.nuiton.org

tags

participants (1)