r3260 - in branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions: . admin poll user - Pollen-commits

13 Apr 2012

Author: fdesbois
Date: 2012-04-13 17:41:50 +0200 (Fri, 13 Apr 2012)
New Revision: 3260

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

Log:
use enumeration for skin (pageLogo, jqueryTheme)

Added:
   branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java
Modified:
   branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java
   branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java
   branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java
   branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java
   branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java
   branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java
   branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java
   branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java
   branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java
   branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java
   branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java
   branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java
   branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java

Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java
===================================================================

--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java	                        (rev 0)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java	2012-04-13 15:41:50 UTC (rev 3260)
@@ -0,0 +1,35 @@
+package org.chorem.pollen.ui.actions;
+
+/**
+ * Created: 13/04/12
+ *
+ * @author fdesbois <desbois@codelutin.com>
+ * @since 1.3
+ */
+public enum PageSkin {
+    
+    INDEX("Index", "yellow"),
+    
+    VOTE("Vote", "green"),
+    
+    RESULT("VoteCounting", "cupertino"),
+    
+    EDITION("Creation", "cupertino");
+    
+    private String cssSuffix;
+    
+    private String theme;
+
+    private PageSkin(String cssSuffix, String theme) {
+        this.cssSuffix = cssSuffix;
+        this.theme = theme;
+    }
+
+    public String getCssSuffix() {
+        return cssSuffix;
+    }
+
+    public String getTheme() {
+        return theme;
+    }
+}

Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java	2012-04-13 15:41:42 UTC (rev 3259)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java	2012-04-13 15:41:50 UTC (rev 3260)
@@ -64,13 +64,7 @@
 public class PollenActionSupport extends BaseAction implements TopiaTransactionAware {
 
     private static final long serialVersionUID = 1L;
-    
-    protected static final String JQUERY_THEME_BLUE = "cupertino";
 
-    protected static final String JQUERY_THEME_YELLOW = "yellow";
-
-    protected static final String JQUERY_THEME_GREEN = "green";
-
     private static DateFormat dateTimeFormat;
 
     private DateFormat dateFormat;
@@ -100,10 +94,18 @@
 
     protected transient TopiaContext transaction;
 
+    public PageSkin getSkin() {
+        return PageSkin.INDEX;
+    }
+
     public String getPageLogo() {
-        return "Index";
+        return getSkin().getCssSuffix();
     }
 
+    public String getJqueryTheme() {
+        return getSkin().getTheme();
+    }
+
     public PollenSession getPollenSession() {
         if (pollenSession == null) {
             pollenSession = PollenSession.get(getActionContext());
@@ -128,10 +130,6 @@
         URL url = getServiceContext().getApplicationURL();
         return url;
     }
-    
-    public String getJqueryTheme() {
-        return JQUERY_THEME_BLUE;
-    }
 
     /**
      * Fabrique pour récupérer le ServiceContext tel qu'il devrait être fourni

Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java	2012-04-13 15:41:42 UTC (rev 3259)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java	2012-04-13 15:41:50 UTC (rev 3260)
@@ -33,8 +33,4 @@
 
     private static final long serialVersionUID = 1L;
 
-    @Override
-    public String getJqueryTheme() {
-        return JQUERY_THEME_YELLOW;
-    }
 }

Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java	2012-04-13 15:41:42 UTC (rev 3259)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java	2012-04-13 15:41:50 UTC (rev 3260)
@@ -43,11 +43,6 @@
 
     protected UserAccount user;
 
-    @Override
-    public String getJqueryTheme() {
-        return JQUERY_THEME_YELLOW;
-    }
-
     public UserAccount getUser() {
         if (user == null) {
             UserService service = newService(UserService.class);

Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java	2012-04-13 15:41:42 UTC (rev 3259)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java	2012-04-13 15:41:50 UTC (rev 3260)
@@ -40,6 +40,7 @@
 import org.chorem.pollen.common.VoteCountingType;
 import org.chorem.pollen.services.PollenServiceFunctions;
 import org.chorem.pollen.services.impl.PollService;
+import org.chorem.pollen.ui.actions.PageSkin;
 import org.chorem.pollen.ui.actions.PollenActionSupport;
 
 import java.util.Collection;
@@ -105,8 +106,8 @@
     private transient Function<Choice, Choice> imageChoiceCreator;
 
     @Override
-    public String getPageLogo() {
-        return "Creation";
+    public PageSkin getSkin() {
+        return PageSkin.EDITION;
     }
 
     protected PollService getPollService() {

Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java	2012-04-13 15:41:42 UTC (rev 3259)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java	2012-04-13 15:41:50 UTC (rev 3260)
@@ -46,6 +46,7 @@
 import org.chorem.pollen.services.impl.PollResultsService;
 import org.chorem.pollen.services.impl.PollService;
 import org.chorem.pollen.services.impl.VoteService;
+import org.chorem.pollen.ui.actions.PageSkin;
 
 import java.text.DateFormat;
 import java.util.Date;
@@ -103,8 +104,8 @@
     private Map<String, String[]> parameters;
 
     @Override
-    public String getPageLogo() {
-        return "Vote";
+    public PageSkin getSkin() {
+        return PageSkin.VOTE;
     }
 
     protected PollResultsService getPollResultsService() {

Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java	2012-04-13 15:41:42 UTC (rev 3259)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java	2012-04-13 15:41:50 UTC (rev 3260)
@@ -23,6 +23,7 @@
  */
 package org.chorem.pollen.ui.actions.poll;
 
+import org.chorem.pollen.ui.actions.PageSkin;
 import org.chorem.pollen.ui.actions.PollenActionSupport;
 
 /**
@@ -36,7 +37,7 @@
     private static final long serialVersionUID = 1L;
 
     @Override
-    public String getPageLogo() {
-        return "Creation";
+    public PageSkin getSkin() {
+        return PageSkin.EDITION;
     }
 }

Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java	2012-04-13 15:41:42 UTC (rev 3259)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java	2012-04-13 15:41:50 UTC (rev 3260)
@@ -23,6 +23,7 @@
  */
 package org.chorem.pollen.ui.actions.poll;
 
+import org.chorem.pollen.ui.actions.PageSkin;
 import org.chorem.pollen.ui.actions.PollenActionSupport;
 
 /**
@@ -36,12 +37,7 @@
     private static final long serialVersionUID = 1L;
 
     @Override
-    public String getPageLogo() {
-        return "Vote";
+    public PageSkin getSkin() {
+        return PageSkin.VOTE;
     }
-
-    @Override
-    public String getJqueryTheme() {
-        return JQUERY_THEME_GREEN;
-    }
 }

Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java	2012-04-13 15:41:42 UTC (rev 3259)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java	2012-04-13 15:41:50 UTC (rev 3260)
@@ -44,6 +44,7 @@
 import org.chorem.pollen.services.exceptions.PollNotFoundException;
 import org.chorem.pollen.services.impl.PollResultsService;
 import org.chorem.pollen.services.impl.PollService;
+import org.chorem.pollen.ui.actions.PageSkin;
 import org.nuiton.util.StringUtil;
 
 import java.net.URL;
@@ -89,8 +90,8 @@
     private List<PollResult> topRanking;
 
     @Override
-    public final String getPageLogo() {
-        return "VoteCounting";
+    public PageSkin getSkin() {
+        return PageSkin.RESULT;
     }
 
     public Poll getPoll() {

Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java	2012-04-13 15:41:42 UTC (rev 3259)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java	2012-04-13 15:41:50 UTC (rev 3260)
@@ -27,6 +27,7 @@
 import org.chorem.pollen.services.exceptions.UserEmailAlreadyUsedException;
 import org.chorem.pollen.services.exceptions.UserInvalidPasswordException;
 import org.chorem.pollen.services.impl.UserService;
+import org.chorem.pollen.ui.actions.PageSkin;
 import org.chorem.pollen.ui.actions.PollenActionSupport;
 
 /**
@@ -45,8 +46,9 @@
 
     protected String newPassword2;
 
-    public String getPageLogo() {
-        return "Creation";
+    @Override
+    public PageSkin getSkin() {
+        return PageSkin.EDITION;
     }
 
     public UserAccount getUser() {

Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java	2012-04-13 15:41:42 UTC (rev 3259)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java	2012-04-13 15:41:50 UTC (rev 3260)
@@ -32,6 +32,7 @@
 import org.chorem.pollen.services.exceptions.FavoriteListNotOwnedByUserException;
 import org.chorem.pollen.services.exceptions.ParticipantAlreadyFoundInListException;
 import org.chorem.pollen.services.impl.FavoriteService;
+import org.chorem.pollen.ui.actions.PageSkin;
 import org.chorem.pollen.ui.actions.PollenActionSupport;
 
 import java.util.Map;
@@ -49,8 +50,8 @@
     private Map<String, String[]> parameters;
 
     @Override
-    public String getPageLogo() {
-        return "Creation";
+    public PageSkin getSkin() {
+        return PageSkin.EDITION;
     }
 
     protected String action;

Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java	2012-04-13 15:41:42 UTC (rev 3259)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java	2012-04-13 15:41:50 UTC (rev 3260)
@@ -27,6 +27,7 @@
 import org.chorem.pollen.business.persistence.PersonList;
 import org.chorem.pollen.services.exceptions.FavoriteListAlreadyExistException;
 import org.chorem.pollen.services.impl.FavoriteService;
+import org.chorem.pollen.ui.actions.PageSkin;
 import org.chorem.pollen.ui.actions.PollenActionSupport;
 
 import java.io.File;
@@ -90,8 +91,8 @@
     }
 
     @Override
-    public String getPageLogo() {
-        return "Creation";
+    public PageSkin getSkin() {
+        return PageSkin.EDITION;
     }
 
     public String create() throws Exception {

Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java	2012-04-13 15:41:42 UTC (rev 3259)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java	2012-04-13 15:41:50 UTC (rev 3260)
@@ -27,6 +27,7 @@
 import org.chorem.pollen.services.exceptions.UserEmailAlreadyUsedException;
 import org.chorem.pollen.services.exceptions.UserLoginAlreadyUsedException;
 import org.chorem.pollen.services.impl.UserService;
+import org.chorem.pollen.ui.actions.PageSkin;
 import org.chorem.pollen.ui.actions.PollenActionSupport;
 
 /**
@@ -59,8 +60,9 @@
         this.password2 = password2;
     }
 
-    public String getPageLogo() {
-        return "Creation";
+    @Override
+    public PageSkin getSkin() {
+        return PageSkin.EDITION;
     }
 
     @Override

Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java	2012-04-13 15:41:42 UTC (rev 3259)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java	2012-04-13 15:41:50 UTC (rev 3260)
@@ -24,6 +24,7 @@
 package org.chorem.pollen.ui.actions.user;
 
 import org.chorem.pollen.business.persistence.UserAccount;
+import org.chorem.pollen.ui.actions.PageSkin;
 import org.chorem.pollen.ui.actions.PollenActionSupport;
 
 /**
@@ -36,8 +37,9 @@
 
     private static final long serialVersionUID = 1L;
 
-    public String getPageLogo() {
-        return "Creation";
+    @Override
+    public PageSkin getSkin() {
+        return PageSkin.EDITION;
     }
 
     public UserAccount getUser() {

    

r3260 - in branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions: . admin poll user

fdesbois＠users.chorem.org

tags

participants (1)