Changeset 10683 in osm for applications/editors

Timestamp:

2008-09-14T14:45:39+02:00 (16 years ago)

Author:

petrdlouhy

Message:

added thread pool

Location:

applications/editors/josm/plugins/wmsplugin/src/wmsplugin

Files:

• Grabber.java (modified) (1 diff)
• WMSGrabber.java (modified) (3 diffs)
• WMSLayer.java (modified) (5 diffs)
• YAHOOGrabber.java (modified) (3 diffs)

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Grabber.java

@@ -1 +1 @@
 package wmsplugin;
-import java.io.IOException;
-import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.projection.Projection;
-import java.util.ArrayList;
-import org.openstreetmap.josm.gui.MapView;
 
-public interface Grabber {
-        public void start();
+public interface Grabber extends Runnable {
+        
 }

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSGrabber.java

@@ -24 +24 @@
 
 
-public class WMSGrabber extends Thread implements Grabber{
+public class WMSGrabber implements Grabber {
         protected String baseURL;
 
@@ -43 +43 @@
                 mv = _mv;
                 layer = _layer;
-                this.setDaemon(true);
-                this.setPriority(Thread.MIN_PRIORITY);
         }
 
@@ -92 +90 @@
 
         protected BufferedImage grab(URL url) throws IOException {
-                        InputStream is = new ProgressInputStream(
-                                url.openConnection(), null);
-                        BufferedImage img;
-                synchronized (layer){ //download only one tile in one moment
-                        if(!image.isVisible(mv)){
-                                return null;
-                        }
-                        img = ImageIO.read(is);
-                }
-                        is.close();
-                        return img;
+                InputStream is = new ProgressInputStream(
+                        url.openConnection(), null);
+                if(!image.isVisible(mv))
+                        return null;
+                BufferedImage img = ImageIO.read(is);
+                is.close();
+                return img;
         }
 }

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java

@@ -36 +36 @@
 import org.openstreetmap.josm.gui.MapView;
 import java.util.ArrayList;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
@@ -63 +66 @@
         protected String baseURL;
         protected final int serializeFormatVersion = 3;
+        
+        private ExecutorService executor;
 
         public WMSLayer() {
@@ -73 +78 @@
                 initializeImages();
                 this.baseURL = baseURL;
+                
+                executor = Executors.newFixedThreadPool(3);
         }
 
@@ -147 +154 @@
                                                 img.image = null;
                                                 Grabber gr = WMSPlugin.getGrabber(baseURL, XYtoBounds(x,y), Main.main.proj, pixelPerDegree, img, mv, this);
-                                                gr.start();
+                                                executor.submit(gr);
                                 }
                         }
@@ -160 +167 @@
                 for(int x = 0; x<dax; ++x)
                         for(int y = 0; y<day; ++y)
-                                        if(images[x][y]!=null){
-                                                v.visit(images[x][y].min);
-                                                v.visit(images[x][y].max);
-                                        }
+                                if(images[x][y]!=null){
+                                        v.visit(images[x][y].min);
+                                        v.visit(images[x][y].max);
+                                }
         }
 

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/YAHOOGrabber.java

@@ -34 +34 @@
 
 
-public class YAHOOGrabber extends Thread implements Grabber{
+public class YAHOOGrabber implements Grabber{
         protected String baseURL;
         protected String browserCmd;
@@ -56 +56 @@
                 this.mv = _mv;
                 this.layer = _layer;
-                this.setDaemon(true);
-                this.setPriority(Thread.MIN_PRIORITY);
         }
 
@@ -74 +72 @@
                                 image.min = proj.latlon2eastNorth(b.min);
                                 image.max = proj.latlon2eastNorth(b.max);
-                                synchronized (layer) {
-                                        if(!image.isVisible(mv)){
-                                                image.downloadingStarted = false;
-                                                return;
-                                        }
-                                        Process browser = browse(url.toString());;
-                                        image.image =  new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-                                        img = ImageIO.read(browser.getInputStream()).getScaledInstance(width, height, Image.SCALE_FAST);
+                                if(!image.isVisible(mv)){ //don't download, if the image isn't visible already
+                                        image.downloadingStarted = false;
+                                        return;
                                 }
+                                Process browser = browse(url.toString());;
+                                image.image =  new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+                                img = ImageIO.read(browser.getInputStream()).getScaledInstance(width, height, Image.SCALE_FAST);
                                 image.image.getGraphics().drawImage(img, 0 , 0, null);