Changeset 2626 in josm for trunk/src/org/openstreetmap/josm/io/MultiPartFormOutputStream.java

Timestamp:

2009-12-13T11:48:12+01:00 (15 years ago)

Author:

jttt

Message:

Fixed some of the warnings found by FindBugs

File:

• trunk/src/org/openstreetmap/josm/io/MultiPartFormOutputStream.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/io/MultiPartFormOutputStream.java

@@ -8 +8 @@
 are permitted provided that the following conditions are met:
 
-    * Redistribution of source code must retain the above copyright notice, this list
+ * Redistribution of source code must retain the above copyright notice, this list
       of conditions and the following disclaimer.
 
-    * Redistribution in binary form must reproduce the above copyright notice, this
+ * Redistribution in binary form must reproduce the above copyright notice, this
       list of conditions and the following disclaimer in the documentation and/or other
       materials provided with the distribution.
@@ -31 +31 @@
 You acknowledge that this software is not designed, licensed or intended for use in the
 design, construction, operation or maintenance of any nuclear facility.
-*/
+ */
 
 package org.openstreetmap.josm.io;
@@ -86 +86 @@
      */
     public MultiPartFormOutputStream(OutputStream os, String boundary) {
-        if(os == null) {
+        if(os == null)
             throw new IllegalArgumentException("Output stream is required.");
-        }
-        if(boundary == null || boundary.length() == 0) {
+        if(boundary == null || boundary.length() == 0)
             throw new IllegalArgumentException("Boundary stream is required.");
-        }
         this.out = new DataOutputStream(os);
         this.boundary = boundary;
@@ -106 +104 @@
     public void writeField(String name, boolean value)
     throws java.io.IOException {
-        writeField(name, new Boolean(value).toString());
+        writeField(name, Boolean.valueOf(value).toString());
     }
 
@@ -178 +176 @@
     public void writeField(String name, char value)
     throws java.io.IOException {
-        writeField(name, new Character(value).toString());
+        writeField(name, Character.valueOf(value).toString());
     }
 
@@ -191 +189 @@
     public void writeField(String name, String value)
     throws java.io.IOException {
-        if(name == null) {
+        if(name == null)
             throw new IllegalArgumentException("Name cannot be null or empty.");
-        }
         if(value == null) {
             value = "";
@@ -229 +226 @@
     public void writeFile(String name, String mimeType, java.io.File file)
     throws java.io.IOException {
-        if(file == null) {
+        if(file == null)
             throw new IllegalArgumentException("File cannot be null.");
-        }
-        if(!file.exists()) {
+        if(!file.exists())
             throw new IllegalArgumentException("File does not exist.");
-        }
-        if(file.isDirectory()) {
+        if(file.isDirectory())
             throw new IllegalArgumentException("File cannot be a directory.");
-        }
         writeFile(name, mimeType, file.getCanonicalPath(), new FileInputStream(file));
     }
@@ -254 +248 @@
             String fileName, InputStream is)
     throws java.io.IOException {
-        if(is == null) {
+        if(is == null)
             throw new IllegalArgumentException("Input stream cannot be null.");
-        }
-        if(fileName == null || fileName.length() == 0) {
+        if(fileName == null || fileName.length() == 0)
             throw new IllegalArgumentException("File name cannot be null or empty.");
-        }
         /*
             --boundary\r\n
@@ -308 +300 @@
             String fileName, byte[] data)
     throws java.io.IOException {
-        if(data == null) {
+        if(data == null)
             throw new IllegalArgumentException("Data cannot be null.");
-        }
-        if(fileName == null || fileName.length() == 0) {
+        if(fileName == null || fileName.length() == 0)
             throw new IllegalArgumentException("File name cannot be null or empty.");
-        }
         /*
             --boundary\r\n