Use jdk 5 for-each loopI20190616-1800I20190615-1800

Replace simple uses of Iterator with a corresponding for-each loop. Also
add missing braces on loops as necessary.

Change-Id: I8cee98245fb49892d80949d1dcda89c9bf72f3e4
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>

2 files changed, 11 insertions, 14 deletions

diff --git a/bundles/org.eclipse.jsch.core/src/org/eclipse/jsch/internal/core/JSchCorePlugin.java b/bundles/org.eclipse.jsch.core/src/org/eclipse/jsch/internal/core/JSchCorePlugin.java
index fcc4a0bd0..2cbe82ef2 100644
--- a/bundles/org.eclipse.jsch.core/src/org/eclipse/jsch/internal/core/JSchCorePlugin.java
+++ b/bundles/org.eclipse.jsch.core/src/org/eclipse/jsch/internal/core/JSchCorePlugin.java
@@ -121,11 +121,9 @@ public class JSchCorePlugin extends Plugin{
     String[] selected = Utils.getSelectedSSHAgent().split(","); //$NON-NLS-1$
     IdentityRepository irepo = null;
 
-    for(int i=0; i<selected.length; i++){
-      for(int j=0; j<repositories.length; j++){
-        IdentityRepository _irepo = repositories[j];
-        if(selected[i].equals(_irepo.getName()) &&
-           _irepo.getStatus()==IdentityRepository.RUNNING){
+    for(String s : selected) {
+      for(IdentityRepository _irepo : repositories) {
+        if(s.equals(_irepo.getName()) && _irepo.getStatus()==IdentityRepository.RUNNING) {
           irepo = _irepo;
           break;
         }
@@ -153,8 +151,7 @@ public class JSchCorePlugin extends Plugin{
       return new IdentityRepository[0];
 
     ArrayList<IdentityRepository> tmp = new ArrayList<>();
-    for(int i=0; i<extensions.length; i++){
-      IExtension extension=extensions[i];
+    for(IExtension extension : extensions) {
       IConfigurationElement[] configs=extension.getConfigurationElements();
       if(configs.length==0){
         JSchCorePlugin
diff --git a/bundles/org.eclipse.jsch.core/src/org/eclipse/jsch/internal/core/Utils.java b/bundles/org.eclipse.jsch.core/src/org/eclipse/jsch/internal/core/Utils.java
index 59bfc814a..d3bf31d5c 100644
--- a/bundles/org.eclipse.jsch.core/src/org/eclipse/jsch/internal/core/Utils.java
+++ b/bundles/org.eclipse.jsch.core/src/org/eclipse/jsch/internal/core/Utils.java
@@ -90,15 +90,15 @@ public class Utils{
     String[] pkey=pkeys.split(","); //$NON-NLS-1$
     String[] _pkey=current_pkeys.split(","); //$NON-NLS-1$
     String result=""; //$NON-NLS-1$
-    for(int i=0; i<pkey.length; i++){
-      file=new java.io.File(pkey[i]);
+    for(String p : pkey){
+      file=new java.io.File(p);
       if(!file.isAbsolute()){
-        file=new java.io.File(ssh_home, pkey[i]);
+        file=new java.io.File(ssh_home, p);
       }
       if(file.exists()){
         boolean notyet=true;
-        for(int j=0; j<_pkey.length; j++){
-          if(pkey[i].equals(_pkey[j])){
+        for(String _p : _pkey){
+          if(p.equals(_p)){
             notyet=false;
             break;
           }
@@ -107,10 +107,10 @@ public class Utils{
           if(notyet)
             jsch.addIdentity(file.getPath());
           if(result.length()==0){
-            result=pkey[i];
+            result=p;
           }
           else{
-            result+=(","+pkey[i]); //$NON-NLS-1$
+            result+=(","+p); //$NON-NLS-1$
           }
         }
         catch(JSchException e){