r3580 - in trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions: . admin poll - Pollen-commits

31 Jul 2012

Author: tchemit
Date: 2012-07-31 18:53:17 +0200 (Tue, 31 Jul 2012)
New Revision: 3580

Url: http://chorem.org/repositories/revision/pollen/3580

Log:
review PageSkin usage (once for all\!)

Modified:
   trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java
   trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupportForEdition.java
   trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupportForVote.java
   trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java
   trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollUriIdAction.java
   trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java
   trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AttachPoll.java
   trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java
   trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SummaryPoll.java

Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java
===================================================================

--- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java	2012-07-31 16:21:30 UTC (rev 3579)
+++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java	2012-07-31 16:53:17 UTC (rev 3580)
@@ -119,15 +119,26 @@
 
     private transient SecurityService securityService;
 
-    public PageSkin getSkin() {
-        return PageSkin.INDEX;
+    private final PageSkin skin;
+
+    public PollenActionSupport() {
+        // by default use the index skin
+        this(PageSkin.INDEX);
     }
 
-    public String getPageLogo() {
+    public PollenActionSupport(PageSkin skin) {
+        this.skin = skin;
+    }
+
+    public final PageSkin getSkin() {
+        return skin;
+    }
+
+    public final String getPageLogo() {
         return getSkin().getCssSuffix();
     }
 
-    public String getJqueryTheme() {
+    public final String getJqueryTheme() {
         return getSkin().getTheme();
     }
 

Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupportForEdition.java
===================================================================
--- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupportForEdition.java	2012-07-31 16:21:30 UTC (rev 3579)
+++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupportForEdition.java	2012-07-31 16:53:17 UTC (rev 3580)
@@ -2,8 +2,8 @@
 /*
  * #%L
  * Pollen :: UI (struts2)
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
  * %%
  * Copyright (C) 2009 - 2012 CodeLutin
  * %%
@@ -32,8 +32,8 @@
 
     private static final long serialVersionUID = 1L;
 
-    @Override
-    public final PageSkin getSkin() {
-        return PageSkin.EDITION;
+    public PollenActionSupportForEdition() {
+        super(PageSkin.EDITION);
     }
+
 }

Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupportForVote.java
===================================================================
--- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupportForVote.java	2012-07-31 16:21:30 UTC (rev 3579)
+++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupportForVote.java	2012-07-31 16:53:17 UTC (rev 3580)
@@ -2,7 +2,7 @@
 /*
  * #%L
  * Pollen :: UI (struts2)
- * $Id:$
+ * $Id$
  * $HeadURL:$
  * %%
  * Copyright (C) 2009 - 2012 CodeLutin
@@ -32,8 +32,8 @@
 
     private static final long serialVersionUID = 1L;
 
-    @Override
-    public final PageSkin getSkin() {
-        return PageSkin.VOTE;
+    public PollenActionSupportForVote() {
+        super(PageSkin.VOTE);
     }
+
 }

Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java
===================================================================
--- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java	2012-07-31 16:21:30 UTC (rev 3579)
+++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java	2012-07-31 16:53:17 UTC (rev 3580)
@@ -58,10 +58,6 @@
         return getUser();
     }
 
-//    public UserAccount getDeleteUser() {
-//        return getUser();
-//    }
-
     public String getAction() {
         return action;
     }

Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollUriIdAction.java
===================================================================
--- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollUriIdAction.java	2012-07-31 16:21:30 UTC (rev 3579)
+++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollUriIdAction.java	2012-07-31 16:53:17 UTC (rev 3580)
@@ -25,6 +25,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.chorem.pollen.bean.PollUri;
+import org.chorem.pollen.ui.actions.PageSkin;
 import org.chorem.pollen.ui.actions.PollenActionSupport;
 import org.chorem.pollen.ui.converters.PollUriConverter;
 
@@ -53,6 +54,13 @@
 
     private int page;
 
+    protected AbstractPollUriIdAction() {
+    }
+
+    protected AbstractPollUriIdAction(PageSkin skin) {
+        super(skin);
+    }
+
     public final PollUri getUriId() {
         return pollUri;
     }

Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java
===================================================================
--- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java	2012-07-31 16:21:30 UTC (rev 3579)
+++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java	2012-07-31 16:53:17 UTC (rev 3580)
@@ -170,6 +170,10 @@
      */
     private transient HttpServletRequest request;
 
+    protected AbstractVoteAction() {
+        super(PageSkin.VOTE);
+    }
+
     /**
      * @return {@code true} if moderation is possible, {@code false} otherwise
      * @since 1.4
@@ -177,11 +181,6 @@
     public abstract boolean isModerate();
 
     @Override
-    public PageSkin getSkin() {
-        return PageSkin.VOTE;
-    }
-
-    @Override
     public void setParameters(Map<String, String[]> parameters) {
         this.parameters = parameters;
     }

Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AttachPoll.java
===================================================================
--- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AttachPoll.java	2012-07-31 16:21:30 UTC (rev 3579)
+++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AttachPoll.java	2012-07-31 16:53:17 UTC (rev 3580)
@@ -39,9 +39,8 @@
 
     private static final long serialVersionUID = 1L;
 
-    @Override
-    public PageSkin getSkin() {
-        return PageSkin.EDITION;
+    public AttachPoll() {
+        super(PageSkin.EDITION);
     }
 
     @Override

Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java
===================================================================
--- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java	2012-07-31 16:21:30 UTC (rev 3579)
+++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java	2012-07-31 16:53:17 UTC (rev 3580)
@@ -131,9 +131,8 @@
     @Inject(required = true)
     private UrlHelper urlHelper;
 
-    @Override
-    public PageSkin getSkin() {
-        return PageSkin.RESULT;
+    public ResultForPoll() {
+        super(PageSkin.RESULT);
     }
 
     public Poll getPoll() {

Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SummaryPoll.java
===================================================================
--- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SummaryPoll.java	2012-07-31 16:21:30 UTC (rev 3579)
+++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SummaryPoll.java	2012-07-31 16:53:17 UTC (rev 3580)
@@ -64,16 +64,15 @@
      */
     private transient HttpServletRequest request;
 
+    public SummaryPoll() {
+        super(PageSkin.EDITION);
+    }
+
     @Override
     public void setServletRequest(HttpServletRequest request) {
         this.request = request;
     }
 
-    @Override
-    public PageSkin getSkin() {
-        return PageSkin.EDITION;
-    }
-
     public Poll getPoll() {
         return poll;
     }

    

r3580 - in trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions: . admin poll

tchemit＠users.chorem.org

tags

participants (1)