[Libreoffice-commits] core.git: javaunohelper/com

rbuj robert.buj at gmail.com
Sat Aug 9 08:24:07 PDT 2014


 javaunohelper/com/sun/star/comp/helper/Bootstrap.java |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit c6de012a66deebbaefa01cffdc6ed7961b3ed57e
Author: rbuj <robert.buj at gmail.com>
Date:   Sat Aug 9 15:51:20 2014 +0200

    javaunohelper: Iterate over each Entry in a Map
    
    Change-Id: I12a3348c297ddddcfd2902c1cbb04bd0ce35b15e
    Reviewed-on: https://gerrit.libreoffice.org/10846
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
index 3bc5bde..c11a415 100644
--- a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
+++ b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
@@ -38,7 +38,6 @@ import java.io.File;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintStream;
-import java.util.Iterator;
 import java.util.Hashtable;
 import java.util.Random;
 
@@ -187,13 +186,10 @@ public class Bootstrap {
         if (null != bootstrap_parameters)
         {
             pairs = new String [ 2 * bootstrap_parameters.size() ];
-            Iterator<String> keys = bootstrap_parameters.keySet().iterator();
             int n = 0;
-            while (keys.hasNext())
-            {
-                String name = keys.next();
-                pairs[ n++ ] = name;
-                pairs[ n++ ] = bootstrap_parameters.get( name );
+            for (java.util.Map.Entry<String, String> bootstrap_parameter : bootstrap_parameters.entrySet()) {
+                pairs[ n++ ] = bootstrap_parameter.getKey();
+                pairs[ n++ ] = bootstrap_parameter.getValue();
             }
         }
 


More information about the Libreoffice-commits mailing list