Changeset 38968

Timestamp:

2024-05-01T17:29:55+12:00 (3 weeks ago)

Author:

anupama

Message:

GsdlCollageApplet. 1. On stopRunning, DisplayImages may be looping in the graphics thread and in that case would through an exception when interrupted. I know check isStopped() within the loop to more tidily exit in such a case. 2. Finally remembered to handle the case of if there's no GS3 running server or no internet connection of any kind. It used to be the case that GsdlCollageApplet would display the Downloading message forever, noticeable when run as a commandline application and if I forgot to run the GS3 server. Now if downloading fails it will say so and come to halt instead of waiting for downloads and displaying the message Downloading forever. 3. Some useful local changes of debugging output on an exception in CURL.

Location:

main/trunk/greenstone3/src/java/org/greenstone/applet/GsdlCollageApplet

Files:

• CURL.java (modified) (1 diff)
• DisplayImages.java (modified) (4 diffs)
• DownloadUrls.java (modified) (3 diffs)
• GsdlCollageApplet.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/applet/GsdlCollageApplet/CURL.java

@@ -674 +674 @@
         }
         catch (Exception e) {
+        System.err.println("**** URL: " + url);
+        System.err.println("**** url_str: " + url_str);
+        System.err.println("**** HEAD: " + head);
+        System.err.println("**** TAIL: " + tail);
         e.printStackTrace();
         }

main/trunk/greenstone3/src/java/org/greenstone/applet/GsdlCollageApplet/DisplayImages.java

@@ -368 +368 @@
     public void paint(Graphics g)
     {
-
+    if(isStopping()) {
+        return;
+    }
     screen_graphic_.setColor(bgcolor_);
     screen_graphic_.fillRect(0,0,app_x_dim_,app_y_dim_);
@@ -374 +376 @@
     // get each image currently onscreen inturn
     
-    for (int i=0; i < inuse_.size(); i++)
+    for (int i=0; i < inuse_.size() && !isStopping(); i++)
         {
           
@@ -416 +418 @@
     
         }
-    
+
+    if(isStopping()) {
+        return;
+    }
         
     finished_graphic_.drawImage(screen_buffer_,0,0,app_);
@@ -427 +432 @@
             g.setColor(Color.white);
             g.setFont(new Font("font",Font.PLAIN+Font.BOLD,30));
-            g.drawString("Downloading" + dots[(dots_nums++)%dots.length],app_x_dim_/3-20,app_y_dim_/2-2);
+
+            if(app_.download_thread_.wasUnableToDownload()) {
+            //System.err.println("Display loop");
+            g.drawString("Can't download.", app_x_dim_/5-20,app_y_dim_/2-20);
+            g.drawString("Stopping.", app_x_dim_/5-20,app_y_dim_/2+20);
+            // GsdlCollageApplet.start() will handle rest of termination of threads
+            } else {
+            g.drawString("Downloading" + dots[(dots_nums++)%dots.length],app_x_dim_/3-20,app_y_dim_/2-2);
+            }
         }
         }

main/trunk/greenstone3/src/java/org/greenstone/applet/GsdlCollageApplet/DownloadUrls.java

@@ -47 +47 @@
      */
     private boolean stop_downloading = false;
+
+    /** Set to true when unable to download perhaps because of no internet connection. */
+    private boolean unable_to_download = false;
     
     /** CHRIS - Holds the contents of the collection's assoc directory */
@@ -601 +604 @@
    
     else {
-        System.err.println("Unable able to download "+new_url);
+        System.err.println("Unable to download "+new_url);
+        unable_to_download = true;
     }
 
@@ -609 +613 @@
     }
 
+    public boolean wasUnableToDownload() { return unable_to_download; }
+    
     
     /** Used in cases where the image maps to a url outside of it's original location.

main/trunk/greenstone3/src/java/org/greenstone/applet/GsdlCollageApplet/GsdlCollageApplet.java

@@ -812 +812 @@
 
             Thread curr_thread = Thread.currentThread();
-        
+            
             while (curr_thread == paint) {
-          
-               repaint();
+                
+                repaint();
                 
                 Thread.sleep(2000);
+                if(download_thread_.wasUnableToDownload()) {
+                repaint();
+                Thread.sleep(2000);
+                String msg = "@@@ GsdlCollageApplet is unable to download. (No internet?) Stopping.";
+                System.err.println(msg);
+                if(isWebswing) {
+                    WebswingUtil.getWebswingApi().sendActionEvent("javaToWebswingJSConsoleLog", msg, null);
+                }                 
+                if(!isRunAsApplet) {
+                    System.exit(-1);
+                } else {
+                    stopRunning();
+                    return;                
+                }
+                }
                 curr_thread = Thread.currentThread();
             }