Changeset 3060

Timestamp:

02/16/09 22:24:19 (4 years ago)

Author:

mosipov

Message:

Fixed bad code marked by FindBugs

Location:

FCKeditor.Java/trunk/java-core/src

Files:

• main/java/net/fckeditor/FCKeditor.java (modified) (1 diff)
• main/java/net/fckeditor/connector/impl/AbstractLocalFileSystemConnector.java (modified) (1 diff)
• main/java/net/fckeditor/connector/impl/ContextConnector.java (modified) (1 diff)
• main/java/net/fckeditor/connector/impl/LocalConnector.java (modified) (1 diff)
• main/java/net/fckeditor/handlers/ConnectorHandler.java (modified) (1 diff)
• main/java/net/fckeditor/handlers/LocalizedMessages.java (modified) (1 diff)
• main/java/net/fckeditor/handlers/RequestCycleHandler.java (modified) (2 diffs)
• main/java/net/fckeditor/tool/Compatibility.java (modified) (1 diff)
• test/java/net/fckeditor/response/UploadResponseTest.java (modified) (5 diffs)

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

@@ -44 +44 @@
         private FCKeditorConfig config;
         private String instanceName;
-        private String value = new String();
+        private String value = "";
         private HttpServletRequest request;
 

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

@@ -61 +61 @@
 public abstract class AbstractLocalFileSystemConnector implements Connector {
 
-        protected static ServletContext servletContext;
+        protected ServletContext servletContext;
 
         /* (non-Javadoc)

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

@@ -61 +61 @@
          */
         public void init(final ServletContext servletContext) throws Exception {
-                AbstractLocalFileSystemConnector.servletContext = servletContext;
+                this.servletContext = servletContext;
                 String defaultAbsolutePath = getRealUserFilesAbsolutePath(PropertiesLoader
                                 .getUserFilesPath());

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

@@ -53 +53 @@
          */
         public void init(final ServletContext servletContext) throws Exception {
-                AbstractLocalFileSystemConnector.servletContext = servletContext;
+                this.servletContext = servletContext;
         }
 

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

@@ -50 +50 @@
                                 connector = (Connector) clazz.newInstance();
                                 logger.info("Connector initialized to {}", className);
-                        } catch (Exception e) {
+                        } catch (Throwable e) {
                                 logger.error("Connector implementation {} could not be instantiated", className);
                                 // TODO should be throw a RuntimeException here

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

@@ -126 +126 @@
                                         localeResolver = (LocaleResolver) clazz.newInstance();
                                         logger.info("LocaleResolver initialized to {}", className); //$NON-NLS-1$
-                                } catch (Exception e) {
+                                } catch (Throwable e) {
                                         logger.error("LocaleResolver implementation {} could not be instantiated", className); //$NON-NLS-1$
                                         // TODO should be throw a RuntimeException here

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

@@ -55 +55 @@
                                 userAction = (UserAction) clazz.newInstance();
                                 logger.info("UserAction initialized to {}", className);
-                        } catch (Exception e) {
+                        } catch (Throwable e) {
                                 logger.error("UserAction implementation {} could not be instantiated", className);
                                 // TODO should be throw a RuntimeException here
@@ -70 +70 @@
                                 userPathBuilder = (UserPathBuilder) clazz.newInstance();
                                 logger.info("UserPathBuilder initialized to {}", className);
-                        } catch (Exception e) {
+                        } catch (Throwable e) {
                                 logger.error("UserPathBuilder implementation {} could not be instantiated", className);
                                 // TODO should be throw a RuntimeException here

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

@@ -47 +47 @@
                 // IE 5.5+, check special keys like 'Opera' and 'mac', because there are some
                 // other browsers, containing 'MSIE' in there agent string!
-                if (userAgentStr.indexOf("opera") < 0 && userAgentStr.indexOf("mac") < 0) {
-                        if (getBrowserVersion(userAgentStr, ".*msie ([\\d]+.[\\d]+).*") >= 5.5f)
-                                return true;
-                }
-                
+                if (userAgentStr.indexOf("opera") < 0
+                                && userAgentStr.indexOf("mac") < 0
+                                && getBrowserVersion(userAgentStr, ".*msie ([\\d]+.[\\d]+).*") >= 5.5f)
+                        return true;
+                                
                 // for all gecko based browsers
                 if (getBrowserVersion(userAgentStr, ".*rv:([\\d]+.[\\d]+).*") > 1.7f)

FCKeditor.Java/trunk/java-core/src/test/java/net/fckeditor/response/UploadResponseTest.java

@@ -32 +32 @@
                 UploadResponse actual = new UploadResponse(
                                 UploadResponse.EN_INVALID_FILE_TYPE_ERROR);
-                String expected = new String("<script type=\"text/javascript\">\n"
+                String expected = "<script type=\"text/javascript\">\n"
                                 + "(function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();\n"
-                                + "window.parent.OnUploadCompleted(202);\n</script>");
+                                + "window.parent.OnUploadCompleted(202);\n</script>";
                 assertEquals(expected, actual.toString());
         }
@@ -41 +41 @@
         public void fourArguments() throws Exception {
                 UploadResponse actual = new UploadResponse(UploadResponse.EN_OK,"/fckeditor-java/userfiles/image/fredck.jpg");
-                String expected = new String("<script type=\"text/javascript\">\n"
+                String expected = "<script type=\"text/javascript\">\n"
                                 + "(function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();\n"
-                                + "window.parent.OnUploadCompleted(0,'/fckeditor-java/userfiles/image/fredck.jpg');\n</script>");
+                                + "window.parent.OnUploadCompleted(0,'/fckeditor-java/userfiles/image/fredck.jpg');\n</script>";
                 assertEquals(expected, actual.toString());
         }
@@ -50 +50 @@
         public void renamedFile() throws Exception {
                 UploadResponse actual = new UploadResponse(UploadResponse.EN_FILE_RENAMED_WARNING,"/fckeditor-java/userfiles/image/hacked_php.txt","hacked_php.txt");
-                String expected = new String("<script type=\"text/javascript\">\n"
+                String expected = "<script type=\"text/javascript\">\n"
                                 + "(function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();\n"
-                                + "window.parent.OnUploadCompleted(201,'/fckeditor-java/userfiles/image/hacked_php.txt','hacked_php.txt');\n</script>");
+                                + "window.parent.OnUploadCompleted(201,'/fckeditor-java/userfiles/image/hacked_php.txt','hacked_php.txt');\n</script>";
                 assertEquals(expected, actual.toString());
         }
@@ -60 +60 @@
                 UploadResponse actual = new UploadResponse(UploadResponse.EN_CUSTOM_ERROR);
                 actual.setCustomMessage("some error");
-                String expected = new String("<script type=\"text/javascript\">\n"
+                String expected = "<script type=\"text/javascript\">\n"
                                 + "(function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();\n"
-                                + "window.parent.OnUploadCompleted(1,'','','some error');\n</script>");
+                                + "window.parent.OnUploadCompleted(1,'','','some error');\n</script>";
                 assertEquals(expected, actual.toString());
         }
@@ -70 +70 @@
         public void nullArguments() throws Exception {
                 UploadResponse actual = new UploadResponse(UploadResponse.EN_CUSTOM_ERROR,null,null,null);
-                String expected = new String("<script type=\"text/javascript\">\n"
+                String expected = "<script type=\"text/javascript\">\n"
                                 + "(function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();\n"
-                                + "window.parent.OnUploadCompleted(1,'','','');\n</script>");
+                                + "window.parent.OnUploadCompleted(1,'','','');\n</script>";
                 assertEquals(expected, actual.toString());
         }