Changeset 2223

Timestamp:

07/15/08 12:48:20 (5 years ago)

Author:

mosipov

Message:

ASSIGNED - #2361: Provide interface for locale resolution

Location:

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

Files:

• java/net/fckeditor/connector/ConnectorServlet.java (modified) (5 diffs)
• java/net/fckeditor/connector/Messages.java (deleted)
• java/net/fckeditor/handlers/LocaleResolverHandler.java (added)
• java/net/fckeditor/localization/impl/JstlResolver.java (modified) (1 diff)
• java/net/fckeditor/response/UploadResponse.java (modified) (2 diffs)
• java/net/fckeditor/tags/CheckTag.java (modified) (3 diffs)
• resources/net/fckeditor/handlers/default.properties (modified) (1 diff)

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

@@ -34 +34 @@
 import net.fckeditor.handlers.ConnectorHandler;
 import net.fckeditor.handlers.ExtensionsHandler;
+import net.fckeditor.handlers.LocaleResolverHandler;
 import net.fckeditor.handlers.RequestCycleHandler;
 import net.fckeditor.handlers.ResourceTypeHandler;
@@ -115 +116 @@
 
                 XmlResponse xr;
+                LocaleResolverHandler lrh = new LocaleResolverHandler(request);
 
                 if (!RequestCycleHandler.isEnabledForFileBrowsing(request))
-                        xr = new XmlResponse(XmlResponse.EN_ERROR, Messages.NOT_AUTHORIZED_FOR_BROWSING);
+                        xr = new XmlResponse(XmlResponse.EN_ERROR, lrh.getString("message.connector.fileBrowsing.disabled"));
                 else if (!CommandHandler.isValidForGet(commandStr))
-                        xr = new XmlResponse(XmlResponse.EN_ERROR, Messages.INVALID_COMMAND);
+                        xr = new XmlResponse(XmlResponse.EN_ERROR, lrh.getString("message.connector.invalid_command_specified"));
                 else if (typeStr != null && !ResourceTypeHandler.isValid(typeStr))
-                        xr = new XmlResponse(XmlResponse.EN_ERROR, Messages.INVALID_TYPE);
+                        xr = new XmlResponse(XmlResponse.EN_ERROR, lrh.getString("message.connector.invalid_type_specified"));
                 else if (!UtilsFile.isValidPath(currentFolderStr))
-                        xr = new XmlResponse(XmlResponse.EN_ERROR, Messages.INVALID_CURRENT_FOLDER);
+                        xr = new XmlResponse(XmlResponse.EN_ERROR, lrh.getString("message.connector.invalid_current_folder_speficied"));
                 else {
                         CommandHandler command = CommandHandler.getCommand(commandStr);
@@ -206 +208 @@
 
                 UploadResponse ur;
+                LocaleResolverHandler lrh = new LocaleResolverHandler(request);
 
                 // if this is a QuickUpload request, 'commandStr' and 'currentFolderStr'
@@ -216 +219 @@
                 if (!RequestCycleHandler.isEnabledForFileUpload(request))
                         ur = new UploadResponse(UploadResponse.SC_SECURITY_ERROR, null, null,
-                                Messages.NOT_AUTHORIZED_FOR_UPLOAD);
+                                lrh.getString("message.connector.fileUpload.disabled"));
                 else if (!CommandHandler.isValidForPost(commandStr))
-                        ur = new UploadResponse(UploadResponse.SC_ERROR, null, null, Messages.INVALID_COMMAND);
+                        ur = new UploadResponse(UploadResponse.SC_ERROR, null, null, lrh.getString("message.connector.invalid_command_specified"));
                 else if (typeStr != null && !ResourceTypeHandler.isValid(typeStr))
-                        ur = new UploadResponse(UploadResponse.SC_ERROR, null, null, Messages.INVALID_TYPE);
+                        ur = new UploadResponse(UploadResponse.SC_ERROR, null, null, lrh.getString("message.connector.invalid_type_specified"));
                 else if (!UtilsFile.isValidPath(currentFolderStr))
-                        ur = UploadResponse.UR_INVALID_CURRENT_FOLDER;
+                        ur = new UploadResponse(UploadResponse.SC_ERROR, null, null,
+                                        lrh.getString("message.connector.invalid_current_folder_speficied"));
                 else {
                         ResourceTypeHandler resourceType = ResourceTypeHandler.getDefaultResourceType(typeStr);
@@ -235 +239 @@
 
                         if (!currentDir.exists())
-                                ur = UploadResponse.UR_INVALID_CURRENT_FOLDER;
+                                ur = new UploadResponse(UploadResponse.SC_ERROR, null, null,
+                                                lrh.getString("message.connector.invalid_current_folder_speficied"));
                         else {
 

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

@@ -12 +12 @@
         public Locale resolveLocale(HttpServletRequest request) {
                 
-                // TODO need to check locale is null?
                 return (Locale) Config.get(request.getSession(), Config.FMT_LOCALE);
         }

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

@@ -21 +21 @@
 package net.fckeditor.response;
 
-import net.fckeditor.connector.Messages;
 import net.fckeditor.tool.Utils;
 
@@ -64 +63 @@
         public static final int SC_SECURITY_ERROR = 203;
         
-        /** UploadResponse INVALID CURRENT FOLDER */
-        public static final UploadResponse UR_INVALID_CURRENT_FOLDER = new UploadResponse(
-                        UploadResponse.SC_ERROR, null, null,
-                        Messages.INVALID_CURRENT_FOLDER);
-
         /**
          * Constructs the response with variable amount of parameters.

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

@@ -31 +31 @@
 import javax.servlet.jsp.tagext.TagSupport;
 
-import net.fckeditor.handlers.PropertiesLoader;
+import net.fckeditor.handlers.LocaleResolverHandler;
 import net.fckeditor.handlers.RequestCycleHandler;
 import net.fckeditor.tool.Compatibility;
 
 /**
+ * TODO Rework JavaDoc when ticket #2361
  * This tag displays information about browser and user capabilities. There are
  * tree available commands (CompatibleBrowser, FileBrowsing, FileUpload) which
@@ -50 +51 @@
         private static final String FILE_BROWSING = "FileBrowsing";
         private static final String COMPATIBLE_BROWSER = "CompatibleBrowser";
-        private static final String PROPERTY_MESSAGE_FILE_BROWSING_DISABLED = "message.enabled_tag.connector.file_browsing.disabled";
-        private static final String PROPERTY_MESSAGE_FILE_BROWSING_ENABLED = "message.enabled_tag.connector.file_browsing.enabled";
-        private static final String PROPERTY_MESSAGE_FILE_UPLOAD_DISABLED = "message.enabled_tag.connector.file_upload.disalbed";
-        private static final String PROPERTY_MESSAGE_FILE_UPLOAD_ENABLED = "message.enabled_tag.connector.file_upload.enabled";
-        private static final String PROPERTY_MESSAGE_NOT_COMPATIBLE_BROWSER = "message.enabled_tag.compatible_browser.no";
-        private static final String PROPERTY_MESSAGE_COMPATIBLE_BROWSER = "message.enabled_tag.compatible_browser.yes";
         private static Set<String> commands = new HashSet<String>(3);
 
@@ -83 +78 @@
 
                 HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
+                LocaleResolverHandler lrh = new LocaleResolverHandler(request);
                 String response = null;
 
                 if (command.equals(FILE_UPLOAD)) {
                         if (RequestCycleHandler.isEnabledForFileUpload(request))
-                                response = PropertiesLoader
-                                        .getProperty(CheckTag.PROPERTY_MESSAGE_FILE_UPLOAD_ENABLED);
+                                response = lrh.getString("message.connector.fileUpload.enabled");
                         else
-                                response = PropertiesLoader
-                                        .getProperty(CheckTag.PROPERTY_MESSAGE_FILE_UPLOAD_DISABLED);
+                                response = lrh.getString("message.connector.fileUpload.disabled");
                 }
 
                 if (command.equals(FILE_BROWSING)) {
                         if (RequestCycleHandler.isEnabledForFileBrowsing(request))
-                                response = PropertiesLoader
-                                        .getProperty(CheckTag.PROPERTY_MESSAGE_FILE_BROWSING_ENABLED);
+                                response = lrh.getString("message.connector.fileBrowsing.enabled");
                         else
-                                response = PropertiesLoader
-                                        .getProperty(CheckTag.PROPERTY_MESSAGE_FILE_BROWSING_DISABLED);
+                                response = lrh.getString("message.connector.fileBrowsing.disabled");
                 }
                 if (command.equals(COMPATIBLE_BROWSER)) {
                         if (Compatibility.isCompatibleBrowser(request))
-                                response = PropertiesLoader
-                                        .getProperty(CheckTag.PROPERTY_MESSAGE_COMPATIBLE_BROWSER);
+                                response = lrh.getString("message.compatible_browser.yes");
                         else
-                                response = PropertiesLoader
-                                        .getProperty(CheckTag.PROPERTY_MESSAGE_NOT_COMPATIBLE_BROWSER);
+                                response = lrh.getString("message.compatible_browser.no");
                 }
 

FCKeditor.Java/trunk/java-core/src/main/resources/net/fckeditor/handlers/default.properties

@@ -61 +61 @@
 fckeditor.width = 100%
 
-# some messages
-message.enabled_tag.compatible_browser.no = Your browser is not compatible
-message.enabled_tag.compatible_browser.yes = Your browser is fully compatible
-message.enabled_tag.connector.file_browsing.disabled = The Connector is disabled for FileBrowsing
-message.enabled_tag.connector.file_browsing.enabled = The Connector is enabled for FileBrowsing
-message.enabled_tag.connector.file_upload.disabled = The Connector is disabled for FileUpload
-message.enabled_tag.connector.file_upload.enabled = The Connector is enabled for FileUpload
+# default LocaleResolver implementation
+localization.localeResolverImpl = net.fckeditor.localization.impl.AcceptLanguageHeaderResolver
+
+# default messages (localizable)
+message.compatible_browser.no = Your browser is not compatible
+message.compatible_browser.yes = Your browser is fully compatible
+
+message.connector.fileUpload.disabled = You are not authorized to upload files!
+message.connector.fileUpload.enabled = You are authorized to upload files!
+message.connector.fileBrowsing.disabled = You are not authorized to browse files!
+message.connector.fileBrowsing.enabled = You are authorized to browse files!
+message.connector.invalid_command_specified = Invalid command specified
+message.connector.invalid_type_specified = Invalid resource type specified
+message.connector.invalid_current_folder_speficied = Invalid current folder specified