From c6de012a66deebbaefa01cffdc6ed7961b3ed57e Mon Sep 17 00:00:00 2001 From: rbuj Date: Sat, 9 Aug 2014 15:51:20 +0200 Subject: javaunohelper: Iterate over each Entry in a Map Change-Id: I12a3348c297ddddcfd2902c1cbb04bd0ce35b15e Reviewed-on: https://gerrit.libreoffice.org/10846 Reviewed-by: David Tardon Tested-by: David Tardon --- javaunohelper/com/sun/star/comp/helper/Bootstrap.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'javaunohelper') diff --git a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java index 3bc5bdea0212..c11a415b386b 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 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 bootstrap_parameter : bootstrap_parameters.entrySet()) { + pairs[ n++ ] = bootstrap_parameter.getKey(); + pairs[ n++ ] = bootstrap_parameter.getValue(); } } -- cgit v1.2.3