[Yanel-commits] rev 40294 - public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/communication

[michi at wyona.com]

Author: michi
Date: 2008-12-08 15:29:31 +0100 (Mon, 08 Dec 2008)
New Revision: 40294

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/communication/HttpRequest.java
Log:
obsolete else removed

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/communication/HttpRequest.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/communication/HttpRequest.java	2008-12-08 14:28:31 UTC (rev 40293)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/communication/HttpRequest.java	2008-12-08 14:29:31 UTC (rev 40294)
@@ -82,16 +82,15 @@
         String value = super.getParameter(name);
         if(!isMultipartRequest()) {
             return fixEncoding(value);
-        } else {
-            Iterator iter = this.items.iterator();
-            while (iter.hasNext()) {
-                FileItem item = (FileItem)iter.next();
-                if (item.getFieldName().equals(name) && item.isFormField()) {
-                    return item.getString(); // TODO: fix encoding ?
-                }
+        }
+        Iterator iter = this.items.iterator();
+        while (iter.hasNext()) {
+            FileItem item = (FileItem)iter.next();
+            if (item.getFieldName().equals(name) && item.isFormField()) {
+                return item.getString(); // TODO: fix encoding ?
             }
-            return null;
         }
+        return null;
     }
     
     private String fixEncoding(String str) {
@@ -124,20 +123,19 @@
     public Map getParameterMap() {
         if(!isMultipartRequest()) {
             return super.getParameterMap();
-        } else {
-            Map map = new HashMap();
-            Iterator iter = this.items.iterator();
-            while (iter.hasNext()) {
-                FileItem item = (FileItem)iter.next();
-                if (item.isFormField()) {
-                    map.put(item.getFieldName(), item.getString()); // TODO: fix encoding
-                    // TODO: fix multiple parameters for one name -> create array
-                } else {
-                    // TODO
-                }
+        }
+        Map map = new HashMap();
+        Iterator iter = this.items.iterator();
+        while (iter.hasNext()) {
+            FileItem item = (FileItem)iter.next();
+            if (item.isFormField()) {
+                map.put(item.getFieldName(), item.getString()); // TODO: fix encoding
+                // TODO: fix multiple parameters for one name -> create array
+            } else {
+                // TODO
             }
-            return map;
-        }        
+        }
+        return map;        
     }
     
     /**
@@ -146,19 +144,18 @@
     public Enumeration getParameterNames() {
         if(!isMultipartRequest()) {
             return super.getParameterNames();
-        } else {
-            // use a set to avoid duplicate entries
-            HashSet set = new HashSet();
-            Iterator iter = this.items.iterator();
-            while (iter.hasNext()) {
-                FileItem item = (FileItem)iter.next();
-                if (item.isFormField()) {
-                    // don't add file upload fields
-                    set.add(item.getFieldName());
-                }
+        }
+        // use a set to avoid duplicate entries
+        HashSet set = new HashSet();
+        Iterator iter = this.items.iterator();
+        while (iter.hasNext()) {
+            FileItem item = (FileItem)iter.next();
+            if (item.isFormField()) {
+                // don't add file upload fields
+                set.add(item.getFieldName());
             }
-            return new Vector(set).elements();
         }
+        return new Vector(set).elements();
     }
     
     /**
@@ -168,17 +165,16 @@
         if(!isMultipartRequest()) {
             // TODO: fix encoding
             return super.getParameterValues(name);
-        } else {
-            ArrayList values = new ArrayList();
-            Iterator iter = this.items.iterator();
-            while (iter.hasNext()) {
-                FileItem item = (FileItem)iter.next();
-                if (item.getFieldName().equals(name)) {
-                    values.add(item.getString()); // TODO: fix encoding ?
-                }
+        }
+        ArrayList values = new ArrayList();
+        Iterator iter = this.items.iterator();
+        while (iter.hasNext()) {
+            FileItem item = (FileItem)iter.next();
+            if (item.getFieldName().equals(name)) {
+                values.add(item.getString()); // TODO: fix encoding ?
             }
-            return (String[]) values.toArray(new String[values.size()]);
         }
+        return (String[]) values.toArray(new String[values.size()]);
     }
     
     public boolean isMultipartRequest() {
@@ -194,17 +190,16 @@
     public Enumeration getFileNames() {
         if(!isMultipartRequest()) {
             return null;
-        } else {
-            Vector parameterNames = new Vector(); 
-            Iterator iter = this.items.iterator();
-            while (iter.hasNext()) {
-                FileItem item = (FileItem)iter.next();
-                if (!item.isFormField()) {
-                    parameterNames.addElement(item.getFieldName());
-                }
+        }
+        Vector parameterNames = new Vector(); 
+        Iterator iter = this.items.iterator();
+        while (iter.hasNext()) {
+            FileItem item = (FileItem)iter.next();
+            if (!item.isFormField()) {
+                parameterNames.addElement(item.getFieldName());
             }
-            return parameterNames.elements();
         }
+        return parameterNames.elements();
     }
     
     /**
@@ -215,16 +210,15 @@
     public String getFilesystemName(String name) {
         if(!isMultipartRequest()) {
             return null;
-        } else {
-            Iterator iter = this.items.iterator();
-            while (iter.hasNext()) {
-                FileItem item = (FileItem)iter.next();
-                if (item.getFieldName().equals(name)) {
-                    return fixFileName(item.getName());
-                }
+        }
+        Iterator iter = this.items.iterator();
+        while (iter.hasNext()) {
+            FileItem item = (FileItem)iter.next();
+            if (item.getFieldName().equals(name)) {
+                return fixFileName(item.getName());
             }
-            return null;
         }
+        return null;
     }
     
     /**
@@ -235,16 +229,15 @@
     public String getContentType(String name) {
         if(!isMultipartRequest()) {
             return null;
-        } else {
-            Iterator iter = this.items.iterator();
-            while (iter.hasNext()) {
-                FileItem item = (FileItem)iter.next();
-                if (item.getFieldName().equals(name)) {
-                    return item.getContentType();
-                }
+        }
+        Iterator iter = this.items.iterator();
+        while (iter.hasNext()) {
+            FileItem item = (FileItem)iter.next();
+            if (item.getFieldName().equals(name)) {
+                return item.getContentType();
             }
-            return null;
         }
+        return null;
     
     }
     
@@ -257,16 +250,15 @@
     public InputStream getInputStream(String name) throws IOException {
         if(!isMultipartRequest()) {
             return null;
-        } else {
-            Iterator iter = this.items.iterator();
-            while (iter.hasNext()) {
-                FileItem item = (FileItem)iter.next();
-                if (item.getFieldName().equals(name)) {
-                    return item.getInputStream();
-                }
+        }
+        Iterator iter = this.items.iterator();
+        while (iter.hasNext()) {
+            FileItem item = (FileItem)iter.next();
+            if (item.getFieldName().equals(name)) {
+                return item.getInputStream();
             }
-            return null;
         }
+        return null;
     }    
     
     protected String fixFileName(String name) {