Changeset 11565

Timestamp:

2006-04-03T10:01:06+12:00 (18 years ago)

Author:

shaoqun

Message:

new wersion that does not use Dislay class

File:

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

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

@@ -1 +1 @@
 package org.nzdl.gsdl.GsdlCollageApplet;
 
-import java.applet.*;
+import java.applet.Applet;
 import java.awt.*;
 import java.net.*;
@@ -67 +67 @@
     protected DisplayImages display_thread_   = null;
 
-    protected Display display_ = null;
+   
 
     /** Gets verbosity */
@@ -92 +92 @@
      *     the gwcgi, collection and classifier parameters as provided.
      * Then starts downloading and displaying images */
+
+    Thread paint ;
+
     public void init() 
     {       
@@ -123 +126 @@
         System.err.println("Got parameters.");
     }
-
+    verbosity_=0;
     if (caption_param != null && !caption_param.startsWith("_")) {
         caption_ = caption_param;
@@ -176 +179 @@
     if ((max_downloads_param!=null) && (!max_downloads_param.startsWith("_"))) {
         maxDownloads_ = Integer.parseInt(max_downloads_param);
+            System.out.println(" maxDownloads " + maxDownloads_ );
+        maxDownloads_=50;
     }
 
     if ((max_display_param!=null) && (!max_display_param.startsWith("_"))) {
         maxDisplay_ = Integer.parseInt(max_display_param);
+              
     }
 
@@ -217 +223 @@
     }
 
+    MediaTracker trk = new  MediaTracker(this);
 
     // creates a class to store the image and it's associated url
-    download_images_ = new DownloadImages(verbosity_);
+    download_images_ = new DownloadImages( this, verbosity_,isJava2_ );
     // starts the download image thread with the starting url
 
         download_thread_ = new DownloadUrls(this, download_images_, 
                         image_url, href_musthave, image_mustnothave, 
-                        image_ignore, imageType_,document_root,verbosity_);
+                        image_ignore, imageType_,document_root,verbosity_,trk);
     // starts the display image thread with the currently downloaded images
-    display_thread_ = new DisplayImages(this,download_images_, isJava2_, bgcolor_);
-    display_ = new Display(this);
-    }
+    display_thread_ = new DisplayImages(this, download_images_,isJava2_, bgcolor_);
+    
+    }
+
+ 
 
     /** Goes to the url associated with the image that is clicked on screen<br>
@@ -256 +265 @@
     public void start() 
     {
-    download_thread_.start();
+    
+         paint =  new Thread(new Runnable(){
+                public void run() {
+            try {
+
+            Thread curr_thread = Thread.currentThread();
+        
+            while (curr_thread == paint) {
+          
+               repaint();
+                
+                Thread.sleep(1000);
+                curr_thread = Thread.currentThread();
+            }
+
+        
+            } catch (Exception e) {
+            e.printStackTrace();
+            }
+        }
+
+
+        });
+
+        paint.start();
+
+
+        download_thread_.start();   
+
     display_thread_.start();
-    display_.start();
+
     }
 
@@ -266 +303 @@
     download_thread_.stop();
     display_thread_.stop();
-    display_.stop();
-
+    
     download_thread_ = null;
     display_thread_ = null;
-    display_ = null;
+    
     }
 
@@ -277 +313 @@
     {
     download_thread_ = null;
+    
     display_thread_ = null;
-    display_ = null;
-    }
+    
+    }
+
 
     /** Repaints the applet */
@@ -287 +325 @@
     paint(g); 
     } 
-        
+    
     /** Repaints the applet using the paint method of the thread that is
      * currently displaying images */
     public void paint(Graphics g) {
     if (display_thread_!=null)
-    {
-        //display_thread_.display_collage();
-        display_thread_.paint(g);
-    }
+        {   
+          
+            //display_thread_.display_collage();
+              display_thread_.paint(g);
+        }
     else
-    {
-        System.err.println("Applet still trying to paint!!");
-    }
-    }
-
-
+        {
+        System.err.println("Applet still trying to paint!!");
+        }
+
+    
+    
+    }
+
+  
     
     /** Ensures a URL address (as string) has a protocol, host, and file.