r1814 - trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity - Wao-commits

3 Apr 2014

Author: tchemit
Date: 2014-04-03 11:12:52 +0200 (Thu, 03 Apr 2014)
New Revision: 1814

Url: http://forge.codelutin.com/projects/wao/repository/revisions/1814

Log:
add I18nAble on Enums

Modified:
   trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactState.java
   trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/DataReliability.java
   trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/LocationType.java
   trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObsProgram.java
   trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObservationType.java
   trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObservedDataControl.java
   trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SynthesisId.java
   trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/UserRole.java

Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactState.java
===================================================================

--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactState.java	2014-04-03 09:06:53 UTC (rev 1813)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactState.java	2014-04-03 09:12:52 UTC (rev 1814)
@@ -47,7 +47,7 @@
  *
  * @author fdesbois <fdesbois@codelutin.com>
  */
-public enum ContactState {
+public enum ContactState implements I18nAble{
 
     /** Usually, the first step, observer just contacted someone */
     CONTACT_START(n("ContactState.CONTACT_START"), false, false, false, true),
@@ -84,8 +84,6 @@
     /** true if this value can be used for a contact of program {@link fr.ifremer.wao.entity.ObsProgram#OBSDEB} */
     protected boolean allowedForObsDeb;
 
-    /** @deprecated I18N should be done properly by tapestry */
-    @Deprecated
     ContactState(String i18nKey, boolean finalState, boolean unfinishedState,
                          boolean allowedForObsVente, boolean allowedForObsDeb) {
         this.i18nKey = i18nKey;
@@ -95,6 +93,11 @@
         this.allowedForObsDeb = allowedForObsDeb;
     }
 
+    @Override
+    public String getI18nKey() {
+        return i18nKey;
+    }
+
     public boolean isFinalState() {
         return this.finalState;
     }

Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/DataReliability.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/DataReliability.java	2014-04-03 09:06:53 UTC (rev 1813)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/DataReliability.java	2014-04-03 09:12:52 UTC (rev 1814)
@@ -31,7 +31,7 @@
  *
  * @author bleny
  */
-public enum DataReliability {
+public enum DataReliability implements I18nAble{
 
     /** Data are trustworthy (100% trust). */
     RELIABLE(n("DataReliability.RELIABLE")),
@@ -67,4 +67,9 @@
         return null;
     }
 
+
+    @Override
+    public String getI18nKey() {
+        return i18nKey;
+    }
 }

Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/LocationType.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/LocationType.java	2014-04-03 09:06:53 UTC (rev 1813)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/LocationType.java	2014-04-03 09:12:52 UTC (rev 1814)
@@ -22,7 +22,7 @@
 
 import static org.nuiton.i18n.I18n.n;
 
-public enum LocationType {
+public enum LocationType implements I18nAble{
 
     PORT(n("LocationType.PORT")),
     AUCTION(n("LocationType.AUCTION")),
@@ -35,6 +35,11 @@
         this.i18nKey = i18nKey;
     }
 
+    @Override
+    public String getI18nKey() {
+        return i18nKey;
+    }
+
     public static LocationType valueOf(Integer locationTypeOrdinal) {
         if (locationTypeOrdinal != null) {
             for (LocationType locationType : LocationType.values()) {

Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObsProgram.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObsProgram.java	2014-04-03 09:06:53 UTC (rev 1813)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObsProgram.java	2014-04-03 09:12:52 UTC (rev 1814)
@@ -22,7 +22,7 @@
 
 import static org.nuiton.i18n.I18n.n;
 
-public enum ObsProgram implements I18nAble{
+public enum ObsProgram implements I18nAble {
 
     OBSMER("M", n("ObsProgram.OBSMER")),
     OBSVENTE("V", n("ObsProgram.OBSVENTE")),

Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObservationType.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObservationType.java	2014-04-03 09:06:53 UTC (rev 1813)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObservationType.java	2014-04-03 09:12:52 UTC (rev 1814)
@@ -31,7 +31,7 @@
  *
  * @author bleny
  */
-public enum ObservationType {
+public enum ObservationType implements I18nAble{
 
     /** Information obtained by observation on the field work */
     FIELD_WORK_OBSERVATION(n("ObservationType.FIELD_WORK_OBSERVATION")),
@@ -60,4 +60,9 @@
     public boolean isFieldWorkObservation() {
         return this == ObservationType.FIELD_WORK_OBSERVATION;
     }
+
+    @Override
+    public String getI18nKey() {
+        return i18nKey;
+    }
 }

Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObservedDataControl.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObservedDataControl.java	2014-04-03 09:06:53 UTC (rev 1813)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObservedDataControl.java	2014-04-03 09:12:52 UTC (rev 1814)
@@ -28,7 +28,7 @@
 /**
  * Pour ObsMer indique si les données saisies dans Allegro sont valides.
  */
-public enum ObservedDataControl {
+public enum ObservedDataControl implements I18nAble{
 
     CORRECTION_ASKED(n("ObservedDataControl.CORRECTION_ASKED")),
 
@@ -41,4 +41,8 @@
         this.i18nKey = i18nKey;
     }
 
+    @Override
+    public String getI18nKey() {
+        return i18nKey;
+    }
 }

Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SynthesisId.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SynthesisId.java	2014-04-03 09:06:53 UTC (rev 1813)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SynthesisId.java	2014-04-03 09:12:52 UTC (rev 1814)
@@ -32,7 +32,7 @@
  *
  * @author fdesbois <fdesbois@codelutin.com>
  */
-public enum SynthesisId {
+public enum SynthesisId implements I18nAble {
 
     /**  */
     GRAPH_SAMPLING(n("SynthesisId.GRAPH_SAMPLING")),
@@ -65,6 +65,11 @@
         this.i18nKey = i18nKey;
     }
 
+    @Override
+    public String getI18nKey() {
+        return i18nKey;
+    }
+
     public static SynthesisId valueOf(int ordinal) {
         for (SynthesisId synthesisId : SynthesisId.values()) {
             if (synthesisId.ordinal() == ordinal) {

Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/UserRole.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/UserRole.java	2014-04-03 09:06:53 UTC (rev 1813)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/UserRole.java	2014-04-03 09:12:52 UTC (rev 1814)
@@ -39,7 +39,7 @@
  * @author tchemit <tchemit@codelutin.com>
  * @version $Id$
  */
-public enum UserRole {
+public enum UserRole implements I18nAble {
     /** Admin role **/
     ADMIN(n("UserRole.ADMIN")),
     /** User/observer role **/
@@ -66,6 +66,7 @@
         throw new IllegalArgumentException("ordinal " + userRoleOrdinal);
     }
 
+    @Override
     public String getI18nKey() {
         return i18nKey;
     }

    

r1814 - trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity

tchemit＠users.forge.codelutin.com

tags

participants (1)