Changeset 2217

Timestamp:

2008-07-14 15:15:12 (6 months ago)

Author:

mosipov

Message:

ASSIGNED - #2361: Provide interface for locale resolution

Location:

FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor

Files:

• connector/ConnectorServlet.java (modified) (2 diffs)
• localization/impl/JstlResolver.java (moved) (moved from FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/localization/JstlResolver.java) (2 diffs, 1 prop)

FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/connector/ConnectorServlet.java

@@ -36 +36 @@
 import net.fckeditor.handlers.RequestCycleHandler;
 import net.fckeditor.handlers.ResourceTypeHandler;
-import net.fckeditor.localization.JstlResolver;
 import net.fckeditor.response.UploadResponse;
 import net.fckeditor.response.XmlResponse;
@@ -101 +100 @@
                 throws ServletException, IOException {
                 logger.debug("Entering ConnectorServlet#doGet");
-                System.out.println(new JstlResolver().resolveLocale(request));
 
                 response.setCharacterEncoding("UTF-8");

FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/localization/impl/JstlResolver.java

@@ -1 @@
-package net.fckeditor.localization;
+package net.fckeditor.localization.impl;
 
 import java.util.Locale;
@@ -6 +6 @@
 import javax.servlet.jsp.jstl.core.Config;
 
+import net.fckeditor.localization.LocaleResolver;
+
 public class JstlResolver implements LocaleResolver {
 
         public Locale resolveLocale(HttpServletRequest request) {
                 
-                return (Locale) Config.get(request, Config.FMT_LOCALE);
+                // TODO need to check locale is null?
+                return (Locale) Config.get(request.getSession(), Config.FMT_LOCALE);
         }