diff options
Diffstat (limited to 'netx/net/sourceforge/jnlp/cache')
4 files changed, 33 insertions, 27 deletions
diff --git a/netx/net/sourceforge/jnlp/cache/CacheUtil.java b/netx/net/sourceforge/jnlp/cache/CacheUtil.java index 9623edb..451e04a 100644 --- a/netx/net/sourceforge/jnlp/cache/CacheUtil.java +++ b/netx/net/sourceforge/jnlp/cache/CacheUtil.java @@ -400,12 +400,12 @@ public class CacheUtil { return; // only resources not starting out downloaded are displayed - List urlList = new ArrayList(); + List<URL> urlList = new ArrayList<URL>(); for (int i=0; i < resources.length; i++) { if (!tracker.checkResource(resources[i])) urlList.add(resources[i]); } - URL undownloaded[] = (URL[]) urlList.toArray( new URL[urlList.size()] ); + URL undownloaded[] = urlList.toArray( new URL[urlList.size()] ); listener = indicator.getListener(app, title, undownloaded); diff --git a/netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java b/netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java index bd1cbd9..407d6f4 100644 --- a/netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java +++ b/netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java @@ -118,7 +118,7 @@ public class DefaultDownloadIndicator implements DownloadIndicator { screen.height-frame.getHeight()); } - frame.show(); + frame.setVisible(true); return result; } @@ -135,7 +135,7 @@ public class DefaultDownloadIndicator implements DownloadIndicator { ActionListener hider = new ActionListener() { public void actionPerformed(ActionEvent evt) { if (frame.getContentPane().getComponentCount() == 1) - frame.hide(); + frame.setVisible(false); frame.getContentPane().remove((DownloadPanel) listener); frame.pack(); @@ -161,10 +161,10 @@ public class DefaultDownloadIndicator implements DownloadIndicator { private JLabel header = new JLabel(); /** list of URLs being downloaded */ - private List urls = new ArrayList(); + private List<URL> urls = new ArrayList<URL>(); /** list of ProgressPanels */ - private List panels = new ArrayList(); + private List<ProgressPanel> panels = new ArrayList<ProgressPanel>(); /** @@ -199,7 +199,9 @@ public class DefaultDownloadIndicator implements DownloadIndicator { /** * Update the download progress of a url. */ - protected void update(final URL url, final String version, final long readSoFar, final long total, final int overallPercent) { + protected void update(final URL url, final String version, + final long readSoFar, final long total, + final int overallPercent) { Runnable r = new Runnable() { public void run() { if (!urls.contains(url)) @@ -207,7 +209,7 @@ public class DefaultDownloadIndicator implements DownloadIndicator { setOverallPercent(overallPercent); - ProgressPanel panel = (ProgressPanel) panels.get(urls.indexOf(url)); + ProgressPanel panel = panels.get(urls.indexOf(url)); panel.setProgress(readSoFar, total); panel.repaint(); } diff --git a/netx/net/sourceforge/jnlp/cache/Resource.java b/netx/net/sourceforge/jnlp/cache/Resource.java index 172220f..08a31fb 100644 --- a/netx/net/sourceforge/jnlp/cache/Resource.java +++ b/netx/net/sourceforge/jnlp/cache/Resource.java @@ -60,10 +60,10 @@ public class Resource { public static final int STARTED = 128; // enqueued or being worked on /** list of weak references of resources currently in use */ - private static WeakList resources = new WeakList(); + private static WeakList<Resource> resources = new WeakList<Resource>(); /** weak list of trackers monitoring this resource */ - private WeakList trackers = new WeakList(); + private WeakList<ResourceTracker> trackers = new WeakList<ResourceTracker>(); /** the remote location of the resource */ URL location; @@ -111,7 +111,7 @@ public class Resource { int index = resources.indexOf(resource); if (index >= 0) { // return existing object - Resource result = (Resource) resources.get(index); + Resource result = resources.get(index); if (result != null) return result; } @@ -136,9 +136,9 @@ public class Resource { */ ResourceTracker getTracker() { synchronized (trackers) { - List t = trackers.hardList(); + List<ResourceTracker> t = trackers.hardList(); if (t.size() > 0) - return (ResourceTracker) t.get(0); + return t.get(0); return null; } @@ -225,7 +225,8 @@ public class Resource { */ public void addTracker(ResourceTracker tracker) { synchronized (trackers) { - List t = trackers.hardList(); // prevent GC between contains and add + // prevent GC between contains and add + List<ResourceTracker> t = trackers.hardList(); if (!t.contains(tracker)) trackers.add(tracker); @@ -238,14 +239,14 @@ public class Resource { * download event. */ protected void fireDownloadEvent() { - List send; + List<ResourceTracker> send; synchronized (trackers) { send = trackers.hardList(); } for (int i=0; i < send.size(); i++) { - ResourceTracker rt = (ResourceTracker) send.get(i); + ResourceTracker rt = send.get(i); rt.fireDownloadEvent(this); } } diff --git a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java index d65c840..df923f2 100644 --- a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java +++ b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java @@ -113,19 +113,21 @@ public class ResourceTracker { private static int threads = 0; /** weak list of resource trackers with resources to prefetch */ - private static WeakList prefetchTrackers = new WeakList(); + private static WeakList<ResourceTracker> prefetchTrackers = + new WeakList<ResourceTracker>(); /** resources requested to be downloaded */ - private static ArrayList queue = new ArrayList(); + private static ArrayList<Resource> queue = new ArrayList<Resource>(); /** resource trackers threads are working for (used for load balancing across multi-tracker downloads) */ - private static ArrayList active = new ArrayList(); // + private static ArrayList<ResourceTracker> active = + new ArrayList<ResourceTracker>(); // /** the resources known about by this resource tracker */ - private List resources = new ArrayList(); + private List<Resource> resources = new ArrayList<Resource>(); /** download listeners for this tracker */ - private List listeners = new ArrayList(); + private List<DownloadListener> listeners = new ArrayList<DownloadListener>(); /** whether to download parts before requested */ private boolean prefetch; @@ -293,7 +295,7 @@ public class ResourceTracker { protected void fireDownloadEvent(Resource resource) { DownloadListener l[] = null; synchronized (listeners) { - l = (DownloadListener[]) listeners.toArray(new DownloadListener[0]); + l = listeners.toArray(new DownloadListener[0]); } int status; @@ -865,7 +867,7 @@ public class ResourceTracker { // first find one to initialize synchronized (prefetchTrackers) { for (int i=0; i < prefetchTrackers.size() && result == null; i++) { - ResourceTracker tracker = (ResourceTracker) prefetchTrackers.get(i); + ResourceTracker tracker = prefetchTrackers.get(i); if (tracker == null) continue; @@ -907,12 +909,13 @@ public class ResourceTracker { * Calls to this method should be synchronized on lock and * source list.<p> */ - private static Resource selectByFlag(List source, int flag, int notflag) { + private static Resource selectByFlag(List<Resource> source, int flag, + int notflag) { Resource result = null; int score = Integer.MAX_VALUE; for (int i=0; i < source.size(); i++) { - Resource resource = (Resource) source.get(i); + Resource resource = source.get(i); boolean selectable = false; synchronized (resource) { @@ -924,7 +927,7 @@ public class ResourceTracker { int activeCount = 0; for (int j=0; j < active.size(); j++) - if ((ResourceTracker)active.get(j) == resource.getTracker()) + if (active.get(j) == resource.getTracker()) activeCount++; // try to spread out the downloads so that a slow host @@ -947,7 +950,7 @@ public class ResourceTracker { private Resource getResource(URL location) { synchronized (resources) { for (int i=0; i < resources.size(); i++) { - Resource resource = (Resource) resources.get(i); + Resource resource = resources.get(i); if (CacheUtil.urlEquals(resource.location, location)) return resource; |