18 Aug 2009

Author: nrannou
Date: 2009-08-18 14:26:50 +0200 (Tue, 18 Aug 2009)
New Revision: 2732

Modified:
   trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPersonListConverter.java
   trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollAccountConverter.java
   trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPreventRuleConverter.java
   trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataVotingListConverter.java
   trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PollAccountDTO.java
   trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/VoteDTO.java
   trunk/pollen-business/src/main/java/org/chorem/pollen/business/migration/PollenMigrationCallbackHandler.java
   trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollAccount.java
   trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServicePreventRuleImplTest.java
   trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Chart.java
   trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FeedBack.java
   trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FileLink.java
   trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/HeadLink.java
   trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Image.java
   trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/ConfigurationImpl.java
   trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/PollenShutdown.java
   trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingGroupDTO.java
   trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java
   trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/ServiceVoteCountingImplTest.java
Log:
formattage du code

Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPersonListConverter.java
===================================================================

--- trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPersonListConverter.java	2009-08-18 12:22:46 UTC (rev 2731)
+++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPersonListConverter.java	2009-08-18 12:26:50 UTC (rev 2732)
@@ -31,7 +31,8 @@
  *
  * @author tcicognani
  * @author rannou
- * @version $Id$
+ * @version $Id: DataPersonListConverter.java 2615 2009-07-01 13:47:45Z nrannou
+ *          $
  */
 public class DataPersonListConverter extends DataConverter {
 

Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollAccountConverter.java
===================================================================
--- trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollAccountConverter.java	2009-08-18 12:22:46 UTC (rev 2731)
+++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollAccountConverter.java	2009-08-18 12:26:50 UTC (rev 2732)
@@ -33,7 +33,8 @@
  * Gestion de la conversion des dtos pollAccount en entité et vice-versa.
  *
  * @author kmorin
- * @version $Id$
+ * @version $Id: DataPollAccountConverter.java 2652 2009-07-17 08:10:26Z nrannou
+ *          $
  */
 public class DataPollAccountConverter extends DataConverter {
 

Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPreventRuleConverter.java
===================================================================
--- trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPreventRuleConverter.java	2009-08-18 12:22:46 UTC (rev 2731)
+++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPreventRuleConverter.java	2009-08-18 12:26:50 UTC (rev 2732)
@@ -31,7 +31,8 @@
  * Gestion de la conversion des dtos règle en entité et vice-versa.
  *
  * @author rannou
- * @version $Id$
+ * @version $Id: DataPreventRuleConverter.java 2615 2009-07-01 13:47:45Z nrannou
+ *          $
  */
 public class DataPreventRuleConverter extends DataConverter {
 

Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataVotingListConverter.java
===================================================================
--- trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataVotingListConverter.java	2009-08-18 12:22:46 UTC (rev 2731)
+++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataVotingListConverter.java	2009-08-18 12:26:50 UTC (rev 2732)
@@ -39,7 +39,8 @@
  * Gestion de la conversion des dtos VotingList en entité et vice-versa.
  *
  * @author enema
- * @version $Id$
+ * @version $Id: DataVotingListConverter.java 2650 2009-07-16 12:57:46Z nrannou
+ *          $
  */
 public class DataVotingListConverter extends DataConverter {
 

Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PollAccountDTO.java
===================================================================
--- trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PollAccountDTO.java	2009-08-18 12:22:46 UTC (rev 2731)
+++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PollAccountDTO.java	2009-08-18 12:26:50 UTC (rev 2732)
@@ -30,7 +30,7 @@
 public class PollAccountDTO implements Serializable {
 
     private String id = "";
-    
+
     private String accountId = "";
 
     private String votingId = "";
@@ -74,7 +74,7 @@
     public void setId(String id) {
         this.id = id;
     }
-    
+
     public String getAccountId() {
         return accountId;
     }

Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/VoteDTO.java
===================================================================
--- trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/VoteDTO.java	2009-08-18 12:22:46 UTC (rev 2731)
+++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/VoteDTO.java	2009-08-18 12:26:50 UTC (rev 2732)
@@ -34,7 +34,7 @@
     private double weight = 0;
 
     private String comment = "";
-    
+
     private boolean anonymous = false;
 
     private String pollAccountId = "";
@@ -81,7 +81,7 @@
     public void setComment(String comment) {
         this.comment = comment;
     }
-    
+
     public boolean isAnonymous() {
         return anonymous;
     }

Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/migration/PollenMigrationCallbackHandler.java
===================================================================
--- trunk/pollen-business/src/main/java/org/chorem/pollen/business/migration/PollenMigrationCallbackHandler.java	2009-08-18 12:22:46 UTC (rev 2731)
+++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/migration/PollenMigrationCallbackHandler.java	2009-08-18 12:26:50 UTC (rev 2732)
@@ -107,7 +107,8 @@
                     "alter table preventrule add onetime boolean default false;", };
         } else {
             if (log.isErrorEnabled()) {
-                log.error("Migration non prise en charge pour ce type de dialect : "
+                log
+                        .error("Migration non prise en charge pour ce type de dialect : "
                                 + dialect);
             }
         }

Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollAccount.java
===================================================================
--- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollAccount.java	2009-08-18 12:22:46 UTC (rev 2731)
+++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollAccount.java	2009-08-18 12:26:50 UTC (rev 2732)
@@ -83,7 +83,7 @@
      * @return un compte
      */
     public PollAccountDTO findPollAccountById(String pollAccountId);
-    
+
     /**
      * Récupération du compte à partir de son identifiant.
      *

Modified: trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServicePreventRuleImplTest.java
===================================================================
--- trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServicePreventRuleImplTest.java	2009-08-18 12:22:46 UTC (rev 2731)
+++ trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServicePreventRuleImplTest.java	2009-08-18 12:26:50 UTC (rev 2732)
@@ -36,7 +36,8 @@
  * Tests de la gestion des règles de notification.
  *
  * @author rannou
- * @version $Id$
+ * @version $Id: ServicePreventRuleImplTest.java 2649 2009-07-15 16:30:23Z
+ *          nrannou $
  */
 public class ServicePreventRuleImplTest {
     private ServicePreventRuleImpl instance;

Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Chart.java
===================================================================
--- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Chart.java	2009-08-18 12:22:46 UTC (rev 2731)
+++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Chart.java	2009-08-18 12:26:50 UTC (rev 2732)
@@ -52,10 +52,10 @@
  * <pre>
  * Utilisation :
  * <t:chart width="210" height="190" values="choice" title="title" type="1"/>
- * 
+ *
  * - choice est une liste de chaînes représentant les labels et leur valeurs respectives. ({"val1", "20", "val2", "10"}...)
  * - type est le type de représentation du diagramme (1:PIE, 2:PIE3D...)
- * 
+ *
  * Pour généraliser à d'autres types de graphes il faudrait passer un JFreeChart :
  * Persist Parameter(required=true)
  * private JFreeChart _chart;

Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FeedBack.java
===================================================================
--- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FeedBack.java	2009-08-18 12:22:46 UTC (rev 2731)
+++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FeedBack.java	2009-08-18 12:26:50 UTC (rev 2732)
@@ -36,9 +36,8 @@
  * <pre>
  * Utilisation :
  * <t:feedback t:id="feedback"/>
- * 
- * @Component(id = "feedback") private FeedBack feedback;
  *
+ * @Component(id = "feedback") private FeedBack feedback;
  * feedback.addInfo("message d'info");
  * feedback.addError("message d'erreur");
  * </pre>

Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FileLink.java
===================================================================
--- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FileLink.java	2009-08-18 12:22:46 UTC (rev 2731)
+++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FileLink.java	2009-08-18 12:26:50 UTC (rev 2732)
@@ -57,7 +57,7 @@
     /** Type MIME du fichier */
     @Parameter
     private String _type;
-    
+
     @Inject
     private Logger logger;
 

Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/HeadLink.java
===================================================================
--- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/HeadLink.java	2009-08-18 12:22:46 UTC (rev 2731)
+++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/HeadLink.java	2009-08-18 12:26:50 UTC (rev 2732)
@@ -57,7 +57,7 @@
 
     @Parameter
     private String _title;
-    
+
     @Inject
     private Logger logger;
 

Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Image.java
===================================================================
--- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Image.java	2009-08-18 12:22:46 UTC (rev 2731)
+++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Image.java	2009-08-18 12:26:50 UTC (rev 2732)
@@ -43,7 +43,7 @@
  * <pre>
  * Utilisation :
  * <t:image src="/img/image.png" />
- * 
+ *
  * Pour afficher une image statique il est préférable d'utiliser :
  * <img src="${asset:context:img}/image.png" />
  * </pre>
@@ -68,7 +68,7 @@
     /** Hauteur de l'image */
     @Parameter
     private int _height;
-    
+
     @Inject
     private Logger logger;
 

Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/ConfigurationImpl.java
===================================================================
--- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/ConfigurationImpl.java	2009-08-18 12:22:46 UTC (rev 2731)
+++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/ConfigurationImpl.java	2009-08-18 12:26:50 UTC (rev 2732)
@@ -35,7 +35,7 @@
     public ConfigurationImpl(Properties conf) {
         this.conf = conf;
     }
-    
+
     public ConfigurationImpl(String filename) {
         conf = PropertiesLoader.loadPropertiesFile(filename);
     }

Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/PollenShutdown.java
===================================================================
--- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/PollenShutdown.java	2009-08-18 12:22:46 UTC (rev 2731)
+++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/PollenShutdown.java	2009-08-18 12:26:50 UTC (rev 2732)
@@ -22,7 +22,7 @@
 /**
  * Service de gestion de l'arrêt du serveur. Ce service exécute une action à la
  * fermeture du registre Tapestry.
- * 
+ *
  * @author rannou
  * @version $Id$
  */

Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingGroupDTO.java
===================================================================
--- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingGroupDTO.java	2009-08-18 12:22:46 UTC (rev 2731)
+++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingGroupDTO.java	2009-08-18 12:26:50 UTC (rev 2732)
@@ -29,7 +29,7 @@
 public class VotingGroupDTO implements ListBehavior<VotingPersonDTO> {
 
     private String name;
-    
+
     private double weight;
 
     private String idGroup;
@@ -46,7 +46,7 @@
     public List<VotingPersonDTO> list() {
         return votingPersons;
     }
-    
+
     public String getName() {
         return name;
     }

Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java
===================================================================
--- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java	2009-08-18 12:22:46 UTC (rev 2731)
+++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java	2009-08-18 12:26:50 UTC (rev 2732)
@@ -41,7 +41,8 @@
  * Implémentation du service de dépouillement.
  *
  * @author fdesbois
- * @version $Id$
+ * @version $Id: ServiceVoteCountingImpl.java 2697 2009-08-11 09:39:09Z nrannou
+ *          $
  */
 public class ServiceVoteCountingImpl implements ServiceVoteCounting {
     /**
@@ -57,7 +58,8 @@
      */
     private Context context;
     /** log. */
-    private static final Log log = LogFactory.getLog(ServiceVoteCountingImpl.class);
+    private static final Log log = LogFactory
+            .getLog(ServiceVoteCountingImpl.class);
 
     /**
      * Constructeur
@@ -183,8 +185,8 @@
      */
     private void routeGroup(VotingGroupDTO group) {
         if (log.isInfoEnabled()) {
-            log.info("Ajout group : " + group.getIdGroup()
-                    + " _ weight=" + group.getWeight());
+            log.info("Ajout group : " + group.getIdGroup() + " _ weight="
+                    + group.getWeight());
         }
         this.context.addGroup(group.getIdGroup(), group.getWeight());
         for (Object o : group.getVotingPersons()) {
@@ -201,8 +203,8 @@
      */
     private void routePerson(VotingPersonDTO person) {
         if (log.isInfoEnabled()) {
-            log.info("Ajout person : " + person.getVotingId()
-                    + " _ weight=" + person.getWeight());
+            log.info("Ajout person : " + person.getVotingId() + " _ weight="
+                    + person.getWeight());
         }
         for (Object o : person.getChoices()) {
             VoteToChoiceDTO vote = (VoteToChoiceDTO) o;
@@ -220,8 +222,8 @@
     private void addVoteToContext(VoteToChoiceDTO vote, double weight,
             String votingID) {
         if (log.isInfoEnabled()) {
-            log.info("Ajout vote : " + vote.getValue()
-                    + " _ choice=" + vote.getIdChoice());
+            log.info("Ajout vote : " + vote.getValue() + " _ choice="
+                    + vote.getIdChoice());
         }
         this.context.getChoice(vote.getIdChoice())
                 .getGroup(this.currentIdGroup).addVote(vote.getValue(), weight,

Modified: trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/ServiceVoteCountingImplTest.java
===================================================================
--- trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/ServiceVoteCountingImplTest.java	2009-08-18 12:22:46 UTC (rev 2731)
+++ trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/ServiceVoteCountingImplTest.java	2009-08-18 12:26:50 UTC (rev 2732)
@@ -27,7 +27,8 @@
 /**
  * Tests des dépouillements.
  *
- * @version $Id$
+ * @version $Id: ServiceVoteCountingImplTest.java 2649 2009-07-15 16:30:23Z
+ *          nrannou $
  */
 public class ServiceVoteCountingImplTest {

    

nrannou＠users.chorem.org