Changeset 446

Timestamp:

04/02/12 17:01:12 (12 years ago)

Author:

vmipsl

Message:

getMessage récup du texte ds messages.properties

Location:

tapas

Files:

• common/implementation/com/ether/EtherHelper.java (modified) (2 diffs)
• web/src/com/ether/Controller.java (modified) (1 diff)
• web/src/com/ether/ControllerEther.java (modified) (2 diffs)
• web/src/com/ether/WebHelper.java (modified) (2 diffs)

tapas/common/implementation/com/ether/EtherHelper.java

@@ -17 +17 @@
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Random;
+import java.util.ResourceBundle;
 
 /**
@@ -226 +228 @@
         }
     }
+
+    /**
+     * This method return the text corresponding to the code in the files messages**.properties
+     *
+     * @param code
+     * @param locale
+     * @return
+     */
+    public static String getMessage( @NotNull final String code, @Nullable final Locale locale )
+    {
+        ResourceBundle bundle = ResourceBundle.getBundle( "messages", Locale.ENGLISH );
+        if( null != locale )
+            bundle = ResourceBundle.getBundle( "messages", locale );
+
+        return bundle.getString( code );
+    }
+
 }

tapas/web/src/com/ether/Controller.java

@@ -33 +33 @@
      * @throws WebException
      */
-    //@ControllerMethod(view = VIEW_FORM_TAPAS, loginMandatory = true, defaultView = VIEW_INDEX)
-    @ControllerMethod(view = VIEW_FORM_TAPAS, loginMandatory = false, defaultView = VIEW_INDEX)
+    @ControllerMethod(view = VIEW_FORM_TAPAS, loginMandatory = true, defaultView = VIEW_INDEX)
     public JSONObject viewForm()
             throws WebException

tapas/web/src/com/ether/ControllerEther.java

@@ -74 +74 @@
     }
 
-    /**
-     * This method return the text from the files messages**.properties
-     *
-     * @param code
-     * @return
-     */
-    public String getMessage( @NotNull final String code )
-    {
-        final String webInfPath = getServletContext().getRealPath( "WEB-INF" );
-        return WebHelper.getMessage( webInfPath, code );
-    }
-
     @Override
     @Nullable
@@ -97 +85 @@
 
             request.setCharacterEncoding( UTF8Charset.getEncoding() );
-//            String message = getMessage( "bo.fulltitle" );
 
             // Get method to call

tapas/web/src/com/ether/WebHelper.java

@@ -8 +8 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.springframework.context.MessageSource;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 import javax.servlet.ServletOutputStream;
@@ -132 +130 @@
     }
 
-    /**
-     * This method return the text from the files messages**.properties
-     *
-     * @param code
-     * @return
-     */
-    public static String getMessage( @NotNull final String webInfPath, @NotNull final String code )
-    {
-        final MessageSource resources = new ClassPathXmlApplicationContext( webInfPath + "/classes/servlet-context.xml" );
-        final String message = resources.getMessage( code, null, "Default", null );
-        return message;
-    }
-
     public static final int STATUS_CODE_SERVICE_EXCEPTION = 500;
     public static final String PROPERTIES_FILE = "tapas.properties";