/ - Diff - Application: gvSIG desktop - gvSIG

Revision 47844

     import java.util.Queue;
     import java.util.concurrent.ConcurrentLinkedQueue;
     import java.util.concurrent.Executor;
     import org.apache.commons.collections4.map.LRUMap;
     import org.apache.commons.io.FileUtils;
     import org.apache.http.entity.ContentType;
     import org.gvsig.compat.net.ICancellable;
-...
     //    private boolean canceled;
         private final long latency = 500;
         private static final Logger LOG = LoggerFactory.getLogger(SEDownloader.class);
         private static final int MAX_URL_TO_FILE_CACHE = 1000;
         /**
          * Used to cancel a group of files
-...
         @Override
         public void addDownloadedURL(URL url, String filePath) {
             if (cachedURItoFile == null) {
                 cachedURItoFile = new HashMap();
                 cachedURItoFile = new LRUMap(MAX_URL_TO_FILE_CACHE);
+            }
             URI theuri;
-...
+                    }
+                }
             } else {
                 LOG.info(url.toString() + " cached at '" + f.getAbsolutePath() + "'");
                 LOG.info("CACHED "+url.toString() + " at '" + f.getAbsolutePath() + "'");
+            }
             return f;
-...
         @Override
         public synchronized File downloadFile(URL url, String method, ContentType contenttype, String data, String name, ICancellable cancel,int maxbytes) throws IOException, ConnectException, UnknownHostException {
             File f;
             LOG.info("Download file "+Objects.toString(url));
             return downloadFile(url, method, contenttype, data, name, cancel, maxbytes, true);
+        }
         @Override
         public synchronized File downloadFile(URL url, String method, ContentType contenttype, String data, String name, ICancellable cancel, int maxbytes, boolean useCache) throws IOException, ConnectException, UnknownHostException {
             LOG.info("Download file " + Objects.toString(url));
             if (useCache) {
                 File target = getPreviousDownloadedURL(url, data);
                 if (target != null) {
                     return target;
+                }
+            }
             File f = getUniqueTemporaryFile(name);
             if ((f = getPreviousDownloadedURL(url, data)) == null) {
                 f = getUniqueTemporaryFile(name);
             if (cancel == null) {
                 cancel = new ICancellable() {
                     @Override
                     public boolean isCanceled() {
                         return false;
+                    }
                 if (cancel == null) {
                     cancel = new ICancellable() {
                         @Override
                         public boolean isCanceled() {
                             return false;
+                        }
                         @Override
                         public Object getID() {
                             return SEDownloader.class.getName();
+                        }
                     };
+                }
                 SEMonitor monitorObj = new SEMonitor(this, cancel);
                 Thread downloader = new Thread(
                         createDownloaderTask(this, url, method, contenttype, data, f, cancel.getID(),maxbytes)
                 );
                 Thread monitor = new Thread(monitorObj);
                 downloader.setName("Downloader_"+downloader.getId());
                 monitor.setName("DownloaderMon_"+monitor.getId());
                 monitor.start();
                 downloader.start();
                 while (!getCanceled(cancel.getID()) && downloader.isAlive()) {
                     try {
                         Thread.sleep(latency);
                         this.executorUI.runCommands();
                     } catch (InterruptedException e) {
                         LOG.error("Error", e);
                     @Override
                     public Object getID() {
                         return SEDownloader.class.getName();
+                    }
+                }
                 };
+            }
             SEMonitor monitorObj = new SEMonitor(this, cancel);
             Thread downloader = new Thread(
                 createDownloaderTask(this, url, method, contenttype, data, f, cancel.getID(), maxbytes)
             );
             Thread monitor = new Thread(monitorObj);
             downloader.setName("Downloader_" + downloader.getId());
             monitor.setName("DownloaderMon_" + monitor.getId());
             monitor.start();
             downloader.start();
             while (!getCanceled(cancel.getID()) && downloader.isAlive()) {
                 try {
                     monitorObj.setFinish(true);
                     monitor.join();
                     downloader.join();
                 } catch (InterruptedException e1) {
                     LOG.warn(e1.getMessage());
                     Thread.sleep(latency);
                     this.executorUI.runCommands();
                 } catch (InterruptedException e) {
                     LOG.error("Error", e);
+                }
                 downloader = null;
                 monitor = null;
+            }
                 if (getCanceled(cancel.getID())) {
                     return null;
             try {
                 monitorObj.setFinish(true);
                 monitor.join();
                 downloader.join();
             } catch (InterruptedException e1) {
                 LOG.warn(e1.getMessage());
+            }
             downloader = null;
             monitor = null;
             if (getCanceled(cancel.getID())) {
                 return null;
+            }
             if (this.downloadException != null) {
                 Exception e = this.downloadException;
                 if (e instanceof FileNotFoundException) {
                     throw (IOException) e;
                 } else if (e instanceof IOException) {
                     throw (IOException) e;
                 } else if (e instanceof ConnectException) {
                     throw (ConnectException) e;
                 } else if (e instanceof UnknownHostException) {
                     throw (UnknownHostException) e;
+                }
                 if (this.downloadException != null) {
                     Exception e = this.downloadException;
                     if (e instanceof FileNotFoundException) {
                         throw (IOException) e;
                     } else if (e instanceof IOException) {
                         throw (IOException) e;
                     } else if (e instanceof ConnectException) {
                         throw (ConnectException) e;
                     } else if (e instanceof UnknownHostException) {
                         throw (UnknownHostException) e;
+                    }
+                }
             } else {
                 LOG.info(url.toString() + " cached at '" + f.getAbsolutePath() + "'");
+            }
             return f;

                 <artifactId>httpcore</artifactId>
                 <scope>compile</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-collections4</artifactId>
                 <scope>compile</scope>
             </dependency>
         </dependencies>
         <description>This library contains the implementation for JavaSE 1.5 of the API definition of the library for compatibility with java 1.4 in JVM CDC</description>

         public File downloadFile(URL url, String method, ContentType contentType, String data, String name, ICancellable cancel,int maxbytes) throws IOException, ConnectException, UnknownHostException;
         public File downloadFile(URL url, String method, ContentType contentType, String data, String name, ICancellable cancel,int maxbytes, boolean useCache) throws IOException, ConnectException, UnknownHostException;
         public void removeURL(URL url);
         public void removeURL(Object url);

Also available in: Unified diff