Changeset 11563

Timestamp:

2006-04-03T09:58:49+12:00 (18 years ago)

Author:

shaoqun

Message:

changed the code handling threads to make it threads safe

File:

• trunk/gsdl/src/java/org/nzdl/gsdl/GsdlCollageApplet/DownloadUrls.java (modified) (12 diffs)

trunk/gsdl/src/java/org/nzdl/gsdl/GsdlCollageApplet/DownloadUrls.java

@@ -6 +6 @@
 import java.util.*;
 
-// import javax.swing.ImageIcon; //****
+import javax.swing.ImageIcon; //****
 
 
@@ -48 +48 @@
 
     /** A static delay used when attempting to download more images into a full downloading buffer */
-    final int delay_       = 1000;
+    final int delay_       = 3000;
     /** The maximum number of images to have downloaded and not yet displayed */ 
-    final int buffer_size_ = 10;
+    final int buffer_size_ = 1;
 
     /** Used in cases where the image maps to a url outside of it's original location.
@@ -64 +64 @@
 
     int verbosity_ = 0;
+
+    protected boolean busy_ = false;
+    
+    MediaTracker tracker;
 
     /** Constructor to initialise a download thread from which images are found, 
@@ -78 +82 @@
             DownloadImages download_images, String starting_url, 
             String href_musthave, String image_mustnothave, 
-            String image_ignore, String image_type, String document_root,int verbosity)
+            String image_ignore, String image_type, String document_root,int verbosity, MediaTracker trk)
     {
     super("DownloadUrls");
@@ -91 +95 @@
     document_root_ = document_root; 
     verbosity_ = verbosity;
-     
+        tracker = trk;
 
     System.err.println("starting_url_ "  + starting_url +"\n"+
@@ -106 +110 @@
     }
 
-    
+      public boolean getStatus(){
+    return busy_;
+
+    } 
 
     /** Determines whether or not a url has already been examined
@@ -316 +323 @@
     public void add_image(URL url, String from_url, String img_name)
     {
-    try {
-
-        boolean had_to_wait = false;
-
-        // ensure that we don't download too many images
-        while (download_images_.size() >= buffer_size_)
-        {
-        had_to_wait = true;
-        Thread.sleep(delay_);
-        }
-        
         // get the image from the url
         if (verbosity_>=2) {
-        System.err.println("  Downloading image URL: " + url.toString());
-        }
-
-        //ImageIcon image_icon = new ImageIcon(url);
-        // Image image = image_icon.getImage();
-
-        // Image image = Toolkit.getDefaultToolkit().createImage(url);
-        // Image image = app_.getImage(url);
-        Image image = Toolkit.getDefaultToolkit().getImage(url);
-
-        //System.err.println("###DownloadingED image URL: " + url.toString());
-
-        boolean status = app_.prepareImage(image,app_);
-        //System.err.println(" Prepare Image status = " + status);
-
-        Thread.sleep(100);
-
-        // push image onto the downloaded images
-        /* System.err.println("*** Pushing: name="+img_name
-                   +" dimensions = "+image_icon.getIconWidth()+"x"+image_icon.getIconHeight());
-        //                 +" dimensions = "+image.getWidth(app_)+"x"+image.getHeight(app_));
-        */
-
-        download_images_.push(image,from_url, img_name);
-        
-        // if have completed the maximum number of downloads for the
-        // application then stop
-        if (download_images_.size() == app_.maxDownloads()) {
-        stop();
-        }
-        
-    }
-    catch (Exception e) {
-        thread_running_ = false;
-        stop();
-        e.printStackTrace();
-    }
+        //System.err.println("  ****Downloading image URL: " + url.toString());
+        }
+
+       int size = download_images_.downloadImage(tracker,url, from_url, img_name);
+          
+       try{
+           // if have completed the maximum number of downloads for the
+           // application then stop
+           if (size == app_.maxDownloads()) {
+           stop();
+           }
+           
+       }
+       catch (Exception e) {
+           thread_running_ = false;
+           stop();
+           e.printStackTrace();
+       }
     }
 
@@ -378 +355 @@
     {
 
-       
-    System.err.println("Parsing url =  " + new_url);
-    
     if (already_visited(new_url)) return;
 
@@ -410 +384 @@
         for (int i = 0; i < src_links.size(); i++) 
         {
-        URL url = (URL)src_links.elementAt(i);
+        URL url = (URL)src_links.get(i);
         String url_string  = url.toString();
                 
         //System.err.println(" source links " + i + " ["  + url_string +"]");
 
-        if (verbosity_ >= 3) {
+        if (verbosity_ >= 4) {
             System.err.println("    Unfiltered: src_link[" + i + "] = " + url_string);
         }
@@ -466 +440 @@
         for (int i = 0; i < href_links.size(); i++) 
         {
-            URL url = (URL)href_links.elementAt(i);
+            URL url = (URL)href_links.get(i);
             String url_string  = url.toString();
 
@@ -497 +471 @@
                 if (filter_href(url_string,new_url,depth))
                 {
-            
-                                    System.out.println("*************************************");
                     rec_add_images(url_string,depth+1);
                     
@@ -573 +545 @@
     
         rec_add_images(starting_url_,1);
-
+    download_images_.stopDownload();
     System.err.println("Download thread finished.");
     }