Changeset 2292 for FCKeditor.Java/trunk

Timestamp:

2008-07-25 15:31:14 (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) (5 diffs)
• handlers/LocaleResolverHandler.java (deleted)
• handlers/LocalizedPropertiesLoader.java (added)
• handlers/PropertiesLoader.java (modified) (2 diffs)
• tags/CheckTag.java (modified) (2 diffs)

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.LocalizedPropertiesLoader;
 import net.fckeditor.handlers.RequestCycleHandler;
 import net.fckeditor.handlers.ResourceTypeHandler;
@@ -117 +117 @@
 
                 XmlResponse xr;
-                LocaleResolverHandler lrh = new LocaleResolverHandler(request);
+                LocalizedPropertiesLoader lpl = LocalizedPropertiesLoader.getInstance(request);
 
                 if (!RequestCycleHandler.isEnabledForFileBrowsing(request))
-                        xr = new XmlResponse(XmlResponse.EN_ERROR, lrh
-                                        .getString("message.connector.fileBrowsing.disabled"));
+                        xr = new XmlResponse(XmlResponse.EN_ERROR, lpl
+                                        .getFileBrowsingDisabled());
                 else if (!CommandHandler.isValidForGet(commandStr))
-                        xr = new XmlResponse(XmlResponse.EN_ERROR, lrh
-                                        .getString("message.connector.invalid_command_specified"));
+                        xr = new XmlResponse(XmlResponse.EN_ERROR, lpl.getInvalidCommand());
                 else if (typeStr != null && !ResourceTypeHandler.isValid(typeStr))
-                        xr = new XmlResponse(XmlResponse.EN_ERROR, lrh
-                                        .getString("message.connector.invalid_type_specified"));
+                        xr = new XmlResponse(XmlResponse.EN_ERROR, lpl.getInvalidType());
                 else if (!UtilsFile.isValidPath(currentFolderStr))
-                        xr = new XmlResponse(
-                                        XmlResponse.EN_ERROR,
-                                        lrh
-                                                        .getString("message.connector.invalid_current_folder_speficied"));
+                        xr = new XmlResponse(XmlResponse.EN_ERROR, lpl
+                                        .getInvalidCurrentFolder());
                 else {
                         CommandHandler command = CommandHandler.getCommand(commandStr);
@@ -218 +214 @@
 
                 UploadResponse ur;
-                LocaleResolverHandler lrh = new LocaleResolverHandler(request);
+                LocalizedPropertiesLoader lpl = LocalizedPropertiesLoader.getInstance(request);
 
                 // if this is a QuickUpload request, 'commandStr' and 'currentFolderStr'
@@ -229 +225 @@
                 if (!RequestCycleHandler.isEnabledForFileUpload(request))
                         ur = new UploadResponse(UploadResponse.SC_SECURITY_ERROR, null,
-                                        null, lrh
-                                                        .getString("message.connector.fileUpload.disabled"));
+                                        null, lpl.getFileBrowsingDisabled());
                 else if (!CommandHandler.isValidForPost(commandStr))
-                        ur = new UploadResponse(UploadResponse.SC_ERROR, null, null, lrh
-                                        .getString("message.connector.invalid_command_specified"));
+                        ur = new UploadResponse(UploadResponse.SC_ERROR, null, null, lpl
+                                        .getInvalidCommand());
                 else if (typeStr != null && !ResourceTypeHandler.isValid(typeStr))
-                        ur = new UploadResponse(UploadResponse.SC_ERROR, null, null, lrh
-                                        .getString("message.connector.invalid_type_specified"));
+                        ur = new UploadResponse(UploadResponse.SC_ERROR, null, null, lpl
+                                        .getInvalidType());
                 else if (!UtilsFile.isValidPath(currentFolderStr))
-                        ur = new UploadResponse(
-                                        UploadResponse.SC_ERROR,
-                                        null,
-                                        null,
-                                        lrh
-                                                        .getString("message.connector.invalid_current_folder_speficied"));
+                        ur = new UploadResponse(UploadResponse.SC_ERROR, null, null, lpl
+                                        .getInvalidCurrentFolder());
                 else {
                         ResourceTypeHandler resourceType = ResourceTypeHandler
@@ -258 +249 @@
 
                         if (!currentDir.exists())
-                                ur = new UploadResponse(
-                                                UploadResponse.SC_ERROR,
-                                                null,
-                                                null,
-                                                lrh
-                                                                .getString("message.connector.invalid_current_folder_speficied"));
+                                ur = new UploadResponse(UploadResponse.SC_ERROR, null, null,
+                                                lpl.getInvalidCurrentFolder());
                         else {
 

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

@@ -75 +75 @@
                 // 2. load user defaults
                 InputStream in2 = PropertiesLoader.class
-                                .getResourceAsStream("/fckeditor.properties_");
+                                .getResourceAsStream("/fckeditor.properties");
 
                 if (in2 == null) {
@@ -126 +126 @@
                 properties.setProperty(key, value);
         }
+        
+        /**
+         * Retrieve the <em>cloned</em> properties.
+         * @return The properties in the loader
+         */
+        public static Properties getProperties() {
+                return (Properties) properties.clone();
+        }
 }

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.LocaleResolverHandler;
+import net.fckeditor.handlers.LocalizedPropertiesLoader;
 import net.fckeditor.handlers.RequestCycleHandler;
 import net.fckeditor.tool.Compatibility;
@@ -78 +78 @@
 
                 HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
-                LocaleResolverHandler lrh = new LocaleResolverHandler(request);
+                LocalizedPropertiesLoader lpl = LocalizedPropertiesLoader.getInstance(request);
                 String response = null;
 
                 if (command.equals(FILE_UPLOAD)) {
                         if (RequestCycleHandler.isEnabledForFileUpload(request))
-                                response = lrh.getString("message.connector.fileUpload.enabled");
+                                response = lpl.getFileUploadEnabled();
                         else
-                                response = lrh.getString("message.connector.fileUpload.disabled");
+                                response = lpl.getFileUploadDisabled();
                 }
 
                 if (command.equals(FILE_BROWSING)) {
                         if (RequestCycleHandler.isEnabledForFileBrowsing(request))
-                                response = lrh.getString("message.connector.fileBrowsing.enabled");
+                                response = lpl.getFileBrowsingEnabled();
                         else
-                                response = lrh.getString("message.connector.fileBrowsing.disabled");
+                                response = lpl.getFileBrowsingDisabled();
                 }
                 if (command.equals(COMPATIBLE_BROWSER)) {
                         if (Compatibility.isCompatibleBrowser(request))
-                                response = lrh.getString("message.compatible_browser.yes");
+                                response = lpl.getCompatibleBrowser();
                         else
-                                response = lrh.getString("message.compatible_browser.no");
+                                response = lpl.getNotCompatibleBrowser();
                 }