Changeset 11716

Timestamp:

2006-04-26T16:56:15+12:00 (18 years ago)

Author:

kjdon

Message:

committed Shaoquns version of the applet for the branch - version 1.10

File:

• branches/gsdl-2_70-distribution-branch/gsdl/src/java/org/nzdl/gsdl/GsdlCollageApplet/GsdlCollageApplet.java (modified) (8 diffs)

branches/gsdl-2_70-distribution-branch/gsdl/src/java/org/nzdl/gsdl/GsdlCollageApplet/GsdlCollageApplet.java

@@ -57 +57 @@
 
     /** Time lapse between repainting of the applet */
-    protected int refreshDelay_ = 1500;
+    protected int refreshDelay_ = 2000;
     
     /** Stores an image and url pair and provides associated methods */
@@ -123 +123 @@
     }
 
+
     if (verbosity_ >= 4) { 
         System.err.println("Got parameters.");
     }
-    verbosity_=0;
+
     if (caption_param != null && !caption_param.startsWith("_")) {
         caption_ = caption_param;
@@ -238 +239 @@
 
  
-
     /** Goes to the url associated with the image that is clicked on screen<br>
      *  Displays the url containing the image in a new window */
@@ -251 +251 @@
         try {
         // displays the associated url in a new window
-        URL from_url = new URL(cimage.from_url_  + "#" + cimage.name_);
+                URL from_url = null;        
+        
+        java.util.regex.Pattern p = java.util.regex.Pattern.compile("cl=CL\\d(\\.\\d)*\\s");
+        java.util.regex.Matcher m = p.matcher(cimage.from_url_.trim()+" ");
+
+                if (m.find() ){
+            from_url = cimage.url_;
+        }
+        else{
+            from_url =  new URL(cimage.from_url_  + "#" + cimage.name_);
+        }
         getAppletContext().showDocument(from_url,"gsdlDoc");
         } 
-        catch (MalformedURLException e) {
+        catch (MalformedURLException e) { 
         e.printStackTrace();
         }
@@ -266 +276 @@
     {
     
+    download_thread_.start();   
+
+    display_thread_.start();
+
          paint =  new Thread(new Runnable(){
                 public void run() {
@@ -276 +290 @@
                repaint();
                 
-                Thread.sleep(1000);
+                Thread.sleep(2000);
                 curr_thread = Thread.currentThread();
             }
@@ -282 +296 @@
         
             } catch (Exception e) {
-            e.printStackTrace();
+            
             }
         }
@@ -290 +304 @@
 
         paint.start();
-
-
-        download_thread_.start();   
-
-    display_thread_.start();
-
+   
     }