Index: /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/FCKeditor.java =================================================================== --- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/FCKeditor.java (revision 2230) +++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/FCKeditor.java (revision 2231) @@ -30,5 +30,5 @@ /** - * Java represantation of the FCKeditor. This class creates the html code for + * Java representation of the FCKeditor. This class creates the HTML code for * the FCKeditor based on the following things: *
GetFolders
: Retrieves a list of folders in the current
* folderGetFoldersAndFiles
: Retrives a list of files and folders
- * in the current folderGetFoldersAndFiles
: Retrieves a list of files and
+ * folders in the current folderCreateFolder
: Creates a new folder in the current folderFileUpload
: Stores an uploaded file into the current
@@ -72,5 +72,6 @@
private static final long serialVersionUID = -5742008970929377161L;
- private static final Logger logger = LoggerFactory.getLogger(ConnectorServlet.class);
+ private static final Logger logger = LoggerFactory
+ .getLogger(ConnectorServlet.class);
/**
@@ -79,5 +80,5 @@
public void init() throws ServletException, IllegalArgumentException {
String realDefaultUserFilesPath = getServletContext().getRealPath(
- ConnectorHandler.getDefaultUserFilesPath());
+ ConnectorHandler.getDefaultUserFilesPath());
File defaultUserFilesDir = new File(realDefaultUserFilesPath);
@@ -99,5 +100,5 @@
*/
public void doGet(HttpServletRequest request, HttpServletResponse response)
- throws ServletException, IOException {
+ throws ServletException, IOException {
logger.debug("Entering ConnectorServlet#doGet");
@@ -119,16 +120,24 @@
if (!RequestCycleHandler.isEnabledForFileBrowsing(request))
- xr = new XmlResponse(XmlResponse.EN_ERROR, lrh.getString("message.connector.fileBrowsing.disabled"));
+ xr = new XmlResponse(XmlResponse.EN_ERROR, lrh
+ .getString("message.connector.fileBrowsing.disabled"));
else if (!CommandHandler.isValidForGet(commandStr))
- xr = new XmlResponse(XmlResponse.EN_ERROR, lrh.getString("message.connector.invalid_command_specified"));
+ 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, lrh.getString("message.connector.invalid_type_specified"));
+ xr = new XmlResponse(XmlResponse.EN_ERROR, lrh
+ .getString("message.connector.invalid_type_specified"));
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,
+ lrh
+ .getString("message.connector.invalid_current_folder_speficied"));
else {
CommandHandler command = CommandHandler.getCommand(commandStr);
- ResourceTypeHandler resourceType = ResourceTypeHandler.getDefaultResourceType(typeStr);
-
- String typePath = UtilsFile.constructServerSidePath(request, resourceType);
+ ResourceTypeHandler resourceType = ResourceTypeHandler
+ .getDefaultResourceType(typeStr);
+
+ String typePath = UtilsFile.constructServerSidePath(request,
+ resourceType);
String typeDirPath = getServletContext().getRealPath(typePath);
@@ -142,7 +151,8 @@
else {
- xr = new XmlResponse(command, resourceType, currentFolderStr, UtilsResponse
- .constructResponseUrl(request, resourceType, currentFolderStr, true,
- ConnectorHandler.isFullUrl()));
+ xr = new XmlResponse(command, resourceType, currentFolderStr,
+ UtilsResponse.constructResponseUrl(request,
+ resourceType, currentFolderStr, true,
+ ConnectorHandler.isFullUrl()));
if (command.equals(CommandHandler.GET_FOLDERS))
@@ -152,5 +162,5 @@
else if (command.equals(CommandHandler.CREATE_FOLDER)) {
String newFolderStr = UtilsFile.sanitizeFolderName(request
- .getParameter("NewFolderName"));
+ .getParameter("NewFolderName"));
logger.debug("Parameter NewFolderName: {}", newFolderStr);
@@ -163,5 +173,5 @@
try {
errorNumber = (newFolder.mkdir()) ? XmlResponse.EN_OK
- : XmlResponse.EN_INVALID_FOLDER_NAME;
+ : XmlResponse.EN_INVALID_FOLDER_NAME;
} catch (SecurityException e) {
errorNumber = XmlResponse.EN_SECURITY_ERROR;
@@ -191,5 +201,5 @@
@SuppressWarnings("unchecked")
public void doPost(HttpServletRequest request, HttpServletResponse response)
- throws ServletException, IOException {
+ throws ServletException, IOException {
logger.debug("Entering Connector#doPost");
@@ -218,17 +228,26 @@
if (!RequestCycleHandler.isEnabledForFileUpload(request))
- ur = new UploadResponse(UploadResponse.SC_SECURITY_ERROR, null, null,
- lrh.getString("message.connector.fileUpload.disabled"));
+ ur = new UploadResponse(UploadResponse.SC_SECURITY_ERROR, null,
+ null, lrh
+ .getString("message.connector.fileUpload.disabled"));
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, lrh
+ .getString("message.connector.invalid_command_specified"));
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, lrh
+ .getString("message.connector.invalid_type_specified"));
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,
+ lrh
+ .getString("message.connector.invalid_current_folder_speficied"));
else {
- ResourceTypeHandler resourceType = ResourceTypeHandler.getDefaultResourceType(typeStr);
-
- String typePath = UtilsFile.constructServerSidePath(request, resourceType);
+ ResourceTypeHandler resourceType = ResourceTypeHandler
+ .getDefaultResourceType(typeStr);
+
+ String typePath = UtilsFile.constructServerSidePath(request,
+ resourceType);
String typeDirPath = getServletContext().getRealPath(typePath);
@@ -239,6 +258,10 @@
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,
+ lrh
+ .getString("message.connector.invalid_current_folder_speficied"));
else {
@@ -253,5 +276,6 @@
// We upload only one file at the same time
FileItem uplFile = items.get(0);
- String rawName = UtilsFile.sanitizeFileName(uplFile.getName());
+ String rawName = UtilsFile.sanitizeFileName(uplFile
+ .getName());
String filename = FilenameUtils.getName(rawName);
String baseName = FilenameUtils.removeExtension(filename);
@@ -259,5 +283,6 @@
if (!ExtensionsHandler.isAllowed(resourceType, extension))
- ur = new UploadResponse(UploadResponse.SC_INVALID_EXTENSION);
+ ur = new UploadResponse(
+ UploadResponse.SC_INVALID_EXTENSION);
else {
@@ -266,6 +291,7 @@
int counter = 1;
while (pathToSave.exists()) {
- newFilename = baseName.concat("(").concat(String.valueOf(counter))
- .concat(")").concat(".").concat(extension);
+ newFilename = baseName.concat("(").concat(
+ String.valueOf(counter)).concat(")")
+ .concat(".").concat(extension);
pathToSave = new File(currentDir, newFilename);
counter++;
@@ -273,21 +299,25 @@
if (Utils.isEmpty(newFilename))
- ur = new UploadResponse(UploadResponse.SC_OK, UtilsResponse
- .constructResponseUrl(request, resourceType, currentFolderStr,
- true, ConnectorHandler.isFullUrl()).concat(filename));
+ ur = new UploadResponse(UploadResponse.SC_OK,
+ UtilsResponse.constructResponseUrl(request,
+ resourceType, currentFolderStr,
+ true, ConnectorHandler.isFullUrl())
+ .concat(filename));
else
ur = new UploadResponse(UploadResponse.SC_RENAMED,
- UtilsResponse.constructResponseUrl(request, resourceType,
- currentFolderStr, true, ConnectorHandler.isFullUrl())
- .concat(newFilename), newFilename);
+ UtilsResponse.constructResponseUrl(request,
+ resourceType, currentFolderStr,
+ true, ConnectorHandler.isFullUrl())
+ .concat(newFilename), newFilename);
// secure image check
if (resourceType.equals(ResourceTypeHandler.IMAGE)
- && ConnectorHandler.isSecureImageUploads()) {
+ && ConnectorHandler.isSecureImageUploads()) {
if (UtilsFile.isImage(uplFile.getInputStream()))
uplFile.write(pathToSave);
else {
uplFile.delete();
- ur = new UploadResponse(UploadResponse.SC_INVALID_EXTENSION);
+ ur = new UploadResponse(
+ UploadResponse.SC_INVALID_EXTENSION);
}
} else
Index: /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/CommandHandler.java
===================================================================
--- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/CommandHandler.java (revision 2230)
+++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/CommandHandler.java (revision 2231)
@@ -89,5 +89,5 @@
/**
- * Checks if a specfied string represents a valid GET
+ * Checks if a specified string represents a valid GET
* command.
*
@@ -102,5 +102,5 @@
/**
- * Checks if a specfied string represents a valid POST
+ * Checks if a specified string represents a valid POST
* command.
*
Index: /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/ResourceTypeHandler.java
===================================================================
--- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/ResourceTypeHandler.java (revision 2230)
+++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/ResourceTypeHandler.java (revision 2231)
@@ -101,5 +101,5 @@
/**
*
- * Checks if a specfied string represents a valid resource type.
+ * Checks if a specified string represents a valid resource type.
*
* @param name
Index: /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/response/UploadResponse.java
===================================================================
--- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/response/UploadResponse.java (revision 2230)
+++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/response/UploadResponse.java (revision 2231)
@@ -28,5 +28,5 @@
*
* The usage is quite easy but can be tricky since varargs are used in the class
- * constructor.
The requestor expects a JS method callback with variable
+ * constructor.
The requester expects a JS method callback with variable
* arguments size.
*
- * Use, if possible, the pre-defined error numbers or upload responses. + * Use, if possible, the predefined error numbers or upload responses. *
*@@ -130,7 +131,9 @@ StringBuffer sb = new StringBuffer(400); sb.append("