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

Timestamp:

2008-07-15 12:48:20 (6 months ago)

Author:

mosipov

Message:

ASSIGNED - #2361: Provide interface for locale resolution

Files:

• FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/connector/ConnectorServlet.java (modified) (5 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.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 {