Changeset 7527

Timestamp:

2004-06-02T10:15:26+12:00 (20 years ago)

Author:

davidb

Message:

Incorrect file commited. This is the correct one!

File:

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

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

@@ -65 +65 @@
     protected Display display_ = null;
 
-
-    public static int app_x_dim_  = 0;
-    public static int app_y_dim_  = 0;
-
-
     /** Gets verbosity */
     public int verbosity()    { return verbosity_; }
@@ -200 +195 @@
         image_url += "&cl=" + classifier_param;
     }
-
-    /*  
+    
     // creates a class to store the image and it's associated url
     download_images_ = new DownloadImages(verbosity_);
@@ -210 +204 @@
     // starts the display image thread with the currently downloaded images
     display_thread_ = new DisplayImages(this,download_images_, isJava2_, bgcolor_);
-
-    */
-
-
-
-    // creates initial screen
-    app_x_dim_ = getWidth();
-    app_y_dim_ = getHeight();
-
-    // display_ = new Display(this);
+    display_ = new Display(this);
     }
 
@@ -248 +233 @@
     public void start() 
     {
-    // download_thread_.start();
-    // display_thread_.start();
-    // display_.start();
+    download_thread_.start();
+    display_thread_.start();
+    display_.start();
     }
 
@@ -256 +241 @@
     public void stop() 
     {
-    // download_thread_.stop();
-    // display_thread_.stop();
-    // display_.stop();
+    download_thread_.stop();
+    display_thread_.stop();
+    display_.stop();
 
     download_thread_ = null;
@@ -268 +253 @@
     public void destroyed() 
     {
-    // download_thread_ = null;
-    // display_thread_ = null;
-    // display_ = null;
+    download_thread_ = null;
+    display_thread_ = null;
+    display_ = null;
     }
 
@@ -282 +267 @@
     /** Repaints the applet using the paint method of the thread that is currently displaying images */
     public void paint(Graphics g) {
-
-    System.err.println("Paint called!");
-    g.setColor(bgcolor_);
-    g.fillRect(0,0,app_x_dim_,app_y_dim_);
-    g.fillRect(0,0,100,200);
-
+    if (display_thread_!=null)
+    {
+        //display_thread_.display_collage();
+        display_thread_.paint(g);
+    }
+    else
+    {
+        System.err.println("Applet still trying to paint!!");
+    }
     }