simplify loops

diff --git a/webservices/compbio/ws/client/CmdHelper.java b/webservices/compbio/ws/client/CmdHelper.java
index 509abcc..1175230 100644 (file)
--- a/webservices/compbio/ws/client/CmdHelper.java
+++ b/webservices/compbio/ws/client/CmdHelper.java
@@ -27,7 +27,6 @@ import static compbio.ws.client.Constraints.servicekey;
 import static compbio.ws.client.Constraints.testKey;\r
 \r
 class CmdHelper {\r
-\r
        /**\r
         * Check whether presetList is set in the command line\r
         * \r
@@ -80,9 +79,9 @@ class CmdHelper {
        static boolean keyFound(String[] cmd, String key) {\r
                assert cmd != null && cmd.length > 0;\r
                assert key != null;\r
-               for (int i = 0; i < cmd.length; i++) {\r
-                       String listPresets = cmd[i];\r
-                       if (listPresets.trim().equalsIgnoreCase(key)) {\r
+\r
+               for (String c : cmd) {\r
+                       if (c.trim().equalsIgnoreCase(key)) {\r
                                return true;\r
                        }\r
                }\r
@@ -98,11 +97,9 @@ class CmdHelper {
         */\r
        static String getPresetName(String[] cmd) {\r
                String preset = null;\r
-               for (int i = 0; i < cmd.length; i++) {\r
-                       String presetPrm = cmd[i];\r
-                       if (presetPrm.trim().toLowerCase()\r
-                                       .startsWith(presetkey + pseparator)) {\r
-                               preset = presetPrm.substring(presetPrm.indexOf(pseparator) + 1);\r
+               for (String c : cmd) {\r
+                       if (c.trim().toLowerCase().startsWith(presetkey + pseparator)) {\r
+                               preset = c.substring(c.indexOf(pseparator) + 1);\r
                                break;\r
                        }\r
                }\r
@@ -117,10 +114,9 @@ class CmdHelper {
         * @return service name or null if it is not defined\r
         */\r
        public static String getServiceName(String[] cmd) {\r
-               for (int i = 0; i < cmd.length; i++) {\r
-                       String serv = cmd[i];\r
-                       if (serv.trim().toLowerCase().startsWith(servicekey + pseparator)) {\r
-                               return serv.substring(serv.indexOf(pseparator) + 1);\r
+               for (String c : cmd) {\r
+                       if (c.trim().toLowerCase().startsWith(servicekey + pseparator)) {\r
+                               return c.substring(c.indexOf(pseparator) + 1);\r
                        }\r
                }\r
                return null;\r
@@ -134,10 +130,9 @@ class CmdHelper {
         * @return host name or null if it is not defined\r
         */\r
        public static String getHost(String[] cmd) {\r
-               for (int i = 0; i < cmd.length; i++) {\r
-                       String host = cmd[i];\r
-                       if (host.trim().toLowerCase().startsWith(hostkey + pseparator)) {\r
-                               return host.substring(host.indexOf(pseparator) + 1);\r
+               for (String c : cmd) {\r
+                       if (c.trim().toLowerCase().startsWith(hostkey + pseparator)) {\r
+                               return c.substring(c.indexOf(pseparator) + 1);\r
                        }\r
                }\r
                return null;\r
@@ -153,5 +148,4 @@ class CmdHelper {
        static boolean listParameters(String[] cmd) {\r
                return keyFound(cmd, paramList);\r
        }\r
-\r
 }\r

diff --git a/webservices/compbio/ws/client/IOHelper.java b/webservices/compbio/ws/client/IOHelper.java
index 290e0e1..3e4b726 100644 (file)
--- a/webservices/compbio/ws/client/IOHelper.java
+++ b/webservices/compbio/ws/client/IOHelper.java
@@ -46,8 +46,8 @@ public class IOHelper {
        static File getFile(String[] cmd, String key, boolean mustExist)\r
                        throws IOException {\r
                assert key != null && key.trim().length() != 0;\r
-               for (int i = 0; i < cmd.length; i++) {\r
-                       String filename = cmd[i];\r
+               for (String c : cmd) {\r
+                       String filename = c;\r
                        filename = filename.trim();\r
                        if (filename.toLowerCase().startsWith(key + pseparator)) {\r
                                filename = filename.substring((key + pseparator).length());\r