Kaydet (Commit) c6de012a authored tarafından rbuj's avatar rbuj Kaydeden (comit) David Tardon

javaunohelper: Iterate over each Entry in a Map

Change-Id: I12a3348c297ddddcfd2902c1cbb04bd0ce35b15e
Reviewed-on: https://gerrit.libreoffice.org/10846Reviewed-by: 's avatarDavid Tardon <dtardon@redhat.com>
Tested-by: 's avatarDavid Tardon <dtardon@redhat.com>
üst 0b684fa3
...@@ -38,7 +38,6 @@ import java.io.File; ...@@ -38,7 +38,6 @@ import java.io.File;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.PrintStream; import java.io.PrintStream;
import java.util.Iterator;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.Random; import java.util.Random;
...@@ -187,13 +186,10 @@ public class Bootstrap { ...@@ -187,13 +186,10 @@ public class Bootstrap {
if (null != bootstrap_parameters) if (null != bootstrap_parameters)
{ {
pairs = new String [ 2 * bootstrap_parameters.size() ]; pairs = new String [ 2 * bootstrap_parameters.size() ];
Iterator<String> keys = bootstrap_parameters.keySet().iterator();
int n = 0; int n = 0;
while (keys.hasNext()) for (java.util.Map.Entry<String, String> bootstrap_parameter : bootstrap_parameters.entrySet()) {
{ pairs[ n++ ] = bootstrap_parameter.getKey();
String name = keys.next(); pairs[ n++ ] = bootstrap_parameter.getValue();
pairs[ n++ ] = name;
pairs[ n++ ] = bootstrap_parameters.get( name );
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment