Mercurial > hg > release > icedtea-web-1.3
changeset 404:6df151bb5320
Changed for-loops over iterators and indices to for-each loops if they
were sufficient and clearer.
| author | Adam Domurad <adomurad@redhat.com> |
|---|---|
| date | Fri, 25 May 2012 11:44:13 -0400 |
| parents | 082f04822f12 |
| children | c0b0577ecbe4 |
| files | ChangeLog netx/net/sourceforge/jnlp/JNLPFile.java netx/net/sourceforge/jnlp/PluginBridge.java netx/net/sourceforge/jnlp/ResourcesDesc.java netx/net/sourceforge/jnlp/cache/CacheUtil.java netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java netx/net/sourceforge/jnlp/cache/Resource.java netx/net/sourceforge/jnlp/cache/ResourceTracker.java netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java plugin/icedteanp/java/netscape/javascript/JSObject.java plugin/icedteanp/java/sun/applet/JavaConsole.java plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java plugin/icedteanp/java/sun/applet/PluginAppletViewer.java |
| diffstat | 14 files changed, 94 insertions(+), 80 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri May 25 11:23:47 2012 -0400 +++ b/ChangeLog Fri May 25 11:44:13 2012 -0400 @@ -1,3 +1,21 @@ +2012-05-25 Adam Domurad <adomurad@redhat.com> + + Changed for-loops over iterators and indices to for-each loops if they + were sufficient and clearer. + * netx/net/sourceforge/jnlp/JNLPFile.java: Changed for-loops that could + be expressed more clearly as for-each loops. + * netx/net/sourceforge/jnlp/PluginBridge.java: Same + * netx/net/sourceforge/jnlp/ResourcesDesc.java: Same + * netx/net/sourceforge/jnlp/cache/CacheUtil.java: Same + * netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java: Same + * netx/net/sourceforge/jnlp/cache/Resource.java: Same + * netx/net/sourceforge/jnlp/cache/ResourceTracker.java: Same + * netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java: Same + * netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java: Same + * plugin/icedteanp/java/netscape/javascript/JSObject.java: Same + * plugin/icedteanp/java/sun/applet/JavaConsole.java: Same + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Same + 2012-05-23 Adam Domurad <adomurad@redhat.com> Removed instances of snprintf where buffer size was not known. Added buffer size constant for allocating buffers for numeric conversions.
--- a/netx/net/sourceforge/jnlp/JNLPFile.java Fri May 25 11:23:47 2012 -0400 +++ b/netx/net/sourceforge/jnlp/JNLPFile.java Fri May 25 11:44:13 2012 -0400 @@ -396,9 +396,7 @@ public <T> List<T> getResources(Class<T> launchType) { List<T> result = new ArrayList<T>(); - for (int i = 0; i < resources.size(); i++) { - ResourcesDesc rescDesc = resources.get(i); - + for (ResourcesDesc rescDesc : resources) { if (localMatches(locale, rescDesc.getLocales()) && stringMatches(os, rescDesc.getOS()) && stringMatches(arch, rescDesc.getArch()))
--- a/netx/net/sourceforge/jnlp/PluginBridge.java Fri May 25 11:23:47 2012 -0400 +++ b/netx/net/sourceforge/jnlp/PluginBridge.java Fri May 25 11:44:13 2012 -0400 @@ -204,9 +204,7 @@ List<JARDesc> jarDescs = new ArrayList<JARDesc>(); jarDescs.addAll(sharedResources.getResources(JARDesc.class)); - Iterator<String> it = jars.iterator(); - while(it.hasNext()) { - String name = it.next(); + for (String name : jars) { if (name.length() > 0) jarDescs.add(new JARDesc(new URL(codeBase, name), null, null, false, true, false, true));
--- a/netx/net/sourceforge/jnlp/ResourcesDesc.java Fri May 25 11:23:47 2012 -0400 +++ b/netx/net/sourceforge/jnlp/ResourcesDesc.java Fri May 25 11:44:13 2012 -0400 @@ -75,9 +75,10 @@ public JARDesc getMainJAR() { JARDesc jars[] = getJARs(); - for (int i = 0; i < jars.length; i++) - if (jars[i].isMain()) - return jars[i]; + for (JARDesc jar : jars) { + if (jar.isMain()) + return jar; + } if (jars.length > 0) return jars[0]; @@ -160,8 +161,7 @@ public Map<String, String> getPropertiesMap() { Map<String, String> properties = new HashMap<String, String>(); List<PropertyDesc> resources = getResources(PropertyDesc.class); - for (int i = 0; i < resources.size(); i++) { - PropertyDesc prop = resources.get(i); + for (PropertyDesc prop : resources) { properties.put(prop.getKey(), prop.getValue()); } @@ -205,9 +205,10 @@ public <T> List<T> getResources(Class<T> type) { List<T> result = new ArrayList<T>(); - for (int i = 0; i < resources.size(); i++) - if (type.isAssignableFrom(resources.get(i).getClass())) - result.add(type.cast(resources.get(i))); + for (Object resource : resources) { + if (type.isAssignableFrom(resource.getClass())) + result.add(type.cast(resource)); + } return result; }
--- a/netx/net/sourceforge/jnlp/cache/CacheUtil.java Fri May 25 11:23:47 2012 -0400 +++ b/netx/net/sourceforge/jnlp/cache/CacheUtil.java Fri May 25 11:44:13 2012 -0400 @@ -500,9 +500,9 @@ // only resources not starting out downloaded are displayed List<URL> urlList = new ArrayList<URL>(); - for (int i = 0; i < resources.length; i++) { - if (!tracker.checkResource(resources[i])) - urlList.add(resources[i]); + for (URL url : resources) { + if (!tracker.checkResource(url)) + urlList.add(url); } URL undownloaded[] = urlList.toArray(new URL[urlList.size()]); @@ -512,28 +512,29 @@ long read = 0; long total = 0; - for (int i = 0; i < undownloaded.length; i++) { + for (URL url : undownloaded) { // add in any -1's; they're insignificant - total += tracker.getTotalSize(undownloaded[i]); - read += tracker.getAmountRead(undownloaded[i]); + total += tracker.getTotalSize(url); + read += tracker.getAmountRead(url); } int percent = (int) ((100 * read) / Math.max(1, total)); - for (int i = 0; i < undownloaded.length; i++) - listener.progress(undownloaded[i], "version", - tracker.getAmountRead(undownloaded[i]), - tracker.getTotalSize(undownloaded[i]), + for (URL url : undownloaded) { + listener.progress(url, "version", + tracker.getAmountRead(url), + tracker.getTotalSize(url), percent); + } } while (!tracker.waitForResources(resources, indicator.getUpdateRate())); // make sure they read 100% until indicator closes - for (int i = 0; i < undownloaded.length; i++) - listener.progress(undownloaded[i], "version", - tracker.getTotalSize(undownloaded[i]), - tracker.getTotalSize(undownloaded[i]), + for (URL url : undownloaded) { + listener.progress(url, "version", + tracker.getTotalSize(url), + tracker.getTotalSize(url), 100); - + } } catch (InterruptedException ex) { if (JNLPRuntime.isDebug()) ex.printStackTrace();
--- a/netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java Fri May 25 11:23:47 2012 -0400 +++ b/netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java Fri May 25 11:44:13 2012 -0400 @@ -106,9 +106,11 @@ frame.getContentPane().setLayout(new GridBagLayout()); } - if (resources != null) - for (int i = 0; i < resources.length; i++) - result.addProgressPanel(resources[i], null); + if (resources != null) { + for (URL url : resources) { + result.addProgressPanel(url, null); + } + } frame.getContentPane().add(result, vertical); frame.pack();
--- a/netx/net/sourceforge/jnlp/cache/Resource.java Fri May 25 11:23:47 2012 -0400 +++ b/netx/net/sourceforge/jnlp/cache/Resource.java Fri May 25 11:44:13 2012 -0400 @@ -272,8 +272,7 @@ send = trackers.hardList(); } - for (int i = 0; i < send.size(); i++) { - ResourceTracker rt = send.get(i); + for (ResourceTracker rt : send) { rt.fireDownloadEvent(this); } }
--- a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Fri May 25 11:23:47 2012 -0400 +++ b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Fri May 25 11:44:13 2012 -0400 @@ -331,13 +331,13 @@ } DownloadEvent event = new DownloadEvent(this, resource); - for (int i = 0; i < l.length; i++) { + for (DownloadListener dl : l) { if (0 != ((ERROR | DOWNLOADED) & status)) - l[i].downloadCompleted(event); + dl.downloadCompleted(event); else if (0 != (DOWNLOADING & status)) - l[i].downloadStarted(event); + dl.downloadStarted(event); else if (0 != (CONNECTING & status)) - l[i].updateStarted(event); + dl.updateStarted(event); } } @@ -449,8 +449,9 @@ synchronized (resources) { // keep the lock so getResource doesn't have to aquire it each time - for (int i = 0; i < urls.length; i++) + for (int i = 0; i < urls.length; i++) { resources[i] = getResource(urls[i]); + } } if (resources.length > 0) @@ -868,8 +869,7 @@ resource.toString() + " : " + urls); } URL bestUrl = null; - for (int i = 0; i < urls.size(); i++) { - URL url = urls.get(i); + for (URL url : urls) { try { URLConnection connection = url.openConnection(); connection.addRequestProperty("Accept-Encoding", "pack200-gzip, gzip"); @@ -999,8 +999,7 @@ Resource result = null; int score = Integer.MAX_VALUE; - for (int i = 0; i < source.size(); i++) { - Resource resource = source.get(i); + for (Resource resource : source) { boolean selectable = false; synchronized (resource) { @@ -1011,9 +1010,10 @@ if (selectable) { int activeCount = 0; - for (int j = 0; j < active.size(); j++) - if (active.get(j) == resource.getTracker()) + for (ResourceTracker rt : active) { + if (rt == resource.getTracker()) activeCount++; + } // try to spread out the downloads so that a slow host // won't monopolize the downloads @@ -1034,9 +1034,7 @@ */ private Resource getResource(URL location) { synchronized (resources) { - for (int i = 0; i < resources.size(); i++) { - Resource resource = resources.get(i); - + for (Resource resource : resources) { if (CacheUtil.urlEquals(resource.location, location)) return resource; } @@ -1058,8 +1056,9 @@ long startTime = System.currentTimeMillis(); // start them downloading / connecting in background - for (int i = 0; i < resources.length; i++) - startResource(resources[i]); + for (Resource resource : resources) { + startResource(resource); + } // wait for completion while (true) { @@ -1067,11 +1066,11 @@ synchronized (lock) { // check for completion - for (int i = 0; i < resources.length; i++) { + for (Resource resource : resources) { //NetX Deadlocking may be solved by removing this //synch block. - synchronized (resources[i]) { - if (!resources[i].isSet(DOWNLOADED | ERROR)) { + synchronized (resource) { + if (!resource.isSet(DOWNLOADED | ERROR)) { finished = false; break; }
--- a/netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java Fri May 25 11:23:47 2012 -0400 +++ b/netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java Fri May 25 11:44:13 2012 -0400 @@ -116,8 +116,8 @@ destroyed = true; List<AppletAudioClip> clips = weakClips.hardList(); - for (int i = 0; i < clips.size(); i++) { - clips.get(i).dispose(); + for (AppletAudioClip clip : clips) { + clip.dispose(); } }
--- a/netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java Fri May 25 11:23:47 2012 -0400 +++ b/netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java Fri May 25 11:44:13 2012 -0400 @@ -231,8 +231,8 @@ PrivilegedAction<Object> installProps = new PrivilegedAction<Object>() { public Object run() { - for (int i = 0; i < props.length; i++) { - System.setProperty(props[i].getKey(), props[i].getValue()); + for (PropertyDesc propDesc : props) { + System.setProperty(propDesc.getKey(), propDesc.getValue()); } return null; @@ -272,8 +272,7 @@ try { // destroy resources - for (int i = 0; i < weakWindows.size(); i++) { - Window w = weakWindows.get(i); + for (Window w : weakWindows) { if (w != null) w.dispose(); }
--- a/plugin/icedteanp/java/netscape/javascript/JSObject.java Fri May 25 11:23:47 2012 -0400 +++ b/plugin/icedteanp/java/netscape/javascript/JSObject.java Fri May 25 11:44:13 2012 -0400 @@ -130,9 +130,9 @@ StackTraceElement[] stack = Thread.currentThread().getStackTrace(); boolean mayProceed = false; - for (int i = 0; i < stack.length; i++) { - if (stack[i].getClassName().equals("netscape.javascript.JSObject") && - stack[i].getMethodName().equals("getWindow")) { + for (StackTraceElement element : stack) { + if (element.getClassName().equals("netscape.javascript.JSObject") && + element.getMethodName().equals("getWindow")) { mayProceed = true; } } @@ -209,8 +209,9 @@ args = new Object[0]; PluginDebug.debug("JSObject.call ", methodName); - for (int i = 0; i < args.length; i++) - PluginDebug.debug(" ", args[i]); + for (Object arg : args) { + PluginDebug.debug(" ", arg); + } PluginDebug.debug(""); return PluginAppletViewer.call(internal, methodName, args); }
--- a/plugin/icedteanp/java/sun/applet/JavaConsole.java Fri May 25 11:23:47 2012 -0400 +++ b/plugin/icedteanp/java/sun/applet/JavaConsole.java Fri May 25 11:44:13 2012 -0400 @@ -308,8 +308,8 @@ boolean toShowConsole = false; - for (int i = 0; i < args.length; i++) { - if (args[i] == "--show-console") { + for (String arg : args) { + if ("--show-console".equals(arg)) { toShowConsole = true; } }
--- a/plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java Fri May 25 11:23:47 2012 -0400 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java Fri May 25 11:44:13 2012 -0400 @@ -1295,9 +1295,7 @@ Permissions grantedPermissions = new Permissions(); - for (int i = 0; i < nsPrivilegeList.length; i++) { - String privilege = nsPrivilegeList[i]; - + for (String privilege : nsPrivilegeList) { if (privilege.equals("UniversalBrowserRead")) { BrowserReadPermission bp = new BrowserReadPermission(); grantedPermissions.add(bp);
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri May 25 11:23:47 2012 -0400 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri May 25 11:44:13 2012 -0400 @@ -237,27 +237,27 @@ // ","-separated list. No error-checking will be done on the list. String[] events = eventList.split(","); - for (int i = 0; i < events.length; i++) { - PluginDebug.debug("Adding event to queue: ", events[i]); - if (events[i].equals("dispose")) + for (String event : events) { + PluginDebug.debug("Adding event to queue: ", event); + if ("dispose".equals(event)) panel.sendEvent(AppletPanel.APPLET_DISPOSE); - else if (events[i].equals("load")) + else if ("load".equals(event)) panel.sendEvent(AppletPanel.APPLET_LOAD); - else if (events[i].equals("init")) + else if ("init".equals(event)) panel.sendEvent(AppletPanel.APPLET_INIT); - else if (events[i].equals("start")) + else if ("start".equals(event)) panel.sendEvent(AppletPanel.APPLET_START); - else if (events[i].equals("stop")) + else if ("stop".equals(event)) panel.sendEvent(AppletPanel.APPLET_STOP); - else if (events[i].equals("destroy")) + else if ("destroy".equals(event)) panel.sendEvent(AppletPanel.APPLET_DESTROY); - else if (events[i].equals("quit")) + else if ("quit".equals(event)) panel.sendEvent(AppletPanel.APPLET_QUIT); - else if (events[i].equals("error")) + else if ("error".equals(event)) panel.sendEvent(AppletPanel.APPLET_ERROR); else // non-fatal error if we get an unrecognized event - PluginDebug.debug("Unrecognized event name: ", events[i]); + PluginDebug.debug("Unrecognized event name: ", event); } while (!panel.emptyEventQueue())