Changeset 38890

Timestamp:

2024-03-29T22:29:25+13:00 (4 weeks ago)

Author:

anupama

Message:

1. Got rid of one deprecated warning: replaced deprecated Applet.mouseDown() with registering a MouseListner (MouseAdapter) and implementing its mouseDown-equivalent mousePressed(). 2. The old mouseDown wasn't opening a clicked image in new windows, and opening an image is expected behaviour I found. With the new method at least, this now works. 3. Fixed up the webswing-phind/-collage.xsl files to correctly work out the URL to open in a new browser tab. It used to leave the tab target name appended. It still opened the image in firefox, but we couldn't have relied on this. Other browsers or future browser versions may have not opened the image because the url string wasn't just right but contained an unnecessary string at the end.

Location:

main/trunk/greenstone3

Files:

• src/java/org/greenstone/applet/GsdlCollageApplet/GsdlCollageApplet.java (modified) (8 diffs)
• src/java/org/greenstone/applet/GsdlCollageApplet/MyAffineTransform.java (modified) (1 diff)
• web/interfaces/default/transform/pages/webswing-collage.xsl (modified) (1 diff)
• web/interfaces/default/transform/pages/webswing-phind.xsl (modified) (1 diff)

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

@@ -1 +1 @@
 package org.greenstone.applet.GsdlCollageApplet;
+
+import org.webswing.toolkit.api.WebswingUtil;
 
 //import java.applet.Applet;
 import javax.swing.JApplet;
-//import javax.swing.SwingUtilities;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
@@ -33 +37 @@
     private int Y_DIM = 300;
 
-    public int X_DIM() {
-    return X_DIM;
-    }
-    public int Y_DIM() {
-    return Y_DIM;
-    }
-
     // To run this GsdlCollageApplet as Application instead of as Applet
     boolean isWebswingApplication = false; // if run as webswing *and* application (not applet)
@@ -99 +96 @@
 
    
-
+    /** Gets the set, calculated or default width (x dimension) of the applet/application */
+    public int X_DIM() {
+    return X_DIM;
+    }
+    /** Gets the set, calculated or default height (y dimension) of the applet/application */
+    public int Y_DIM() {
+    return Y_DIM;
+    }
+    
     /** Gets verbosity */
     public int verbosity()    { return verbosity_; }
@@ -152 +157 @@
     //}
 
+    this.addMouseListener(new CollageMouseAdapter());
     }
 
@@ -432 +438 @@
             image_url = image_url + classifierSuffix;
         }
-
-        /*
-        if(library != null && site != null && collection_param != null) {
-            String gs3CollImgPath = library + "/sites/" + site + "/collect/" + collection_param;
-            if(href_musthave == null) {
-                href_musthave = gs3CollImgPath;
-            } else {
-            href_musthave += "%" + gs3CollImgPath;
-            }          
-            if(verbosity_ >= 3) {
-            System.err.println("href_musthave includes gs3CollImgPath: " + gs3CollImgPath);
-            }
-        }
-        */
         }
     }
@@ -466 +458 @@
     return this.statusBar;
     }
-    
+
+    protected class CollageMouseAdapter extends MouseAdapter {
  
     /** Goes to the url associated with the image that is clicked on screen<br>
      *  Displays the url containing the image in a new window */
-    public boolean mouseDown(Event event, int x, int y)
+    //public boolean mouseDown(Event event, int x, int y)
+    public void mousePressed(MouseEvent e)
     {
+
+    System.err.println("Mouse pressed");
+    int x = e.getX();
+    int y = e.getY();
+    
     // determines which image was clicked on
-    CollageImage cimage = display_thread_.clickedOnImage(x,y);
+    CollageImage cimage = GsdlCollageApplet.this.display_thread_.clickedOnImage(x,y);
     // if they were clicking on an image (as opposed to background)
     if (cimage != null)
@@ -491 +490 @@
             from_url =  new URL(cimage.from_url_  + "#" + cimage.name_);
         }
-        getAppletContext().showDocument(from_url,"gsdlDoc");
+
+        if(isRunAsApplet) {
+            GsdlCollageApplet.this.getAppletContext().showDocument(from_url,"gsdlDoc");
+        } else if(isWebswingApplication) {
+            WebswingUtil.getWebswingApi().sendActionEvent("openURL",
+                      from_url.toString() + " - " +"gsdlDoc",
+                      null); // window name is gsdlDoc          
+        } else {
+            System.err.println("@@@GsdlCollageApplet.CollageMouseAdapter.mousePressed()"
+               + "\n\topening url " + from_url + "\n\t"
+               + "for non-applet and non-webswing application is not yet implemented.");
+        }
         } 
-        catch (MalformedURLException e) { 
-        e.printStackTrace();
-        }
-
-    }
-        return true;
+        catch (MalformedURLException ex) { 
+        ex.printStackTrace();
+        }
+
+    }
+        //return true;
+    }
     }
     
@@ -662 +673 @@
         // It's now figured out the dimensions based on anything specified, so set frame size
         frame.setSize(collageApp.X_DIM(), collageApp.Y_DIM()); //Y_DIM+EXTRA_HEIGHT);
+        
         // status bar code. Not ideal, but had to add it here to get relative dimensions right
         collageApp.setLayout(new BorderLayout());

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

@@ -21 +21 @@
 
     double scale_factor = 1.0;
+
+    //to avoid attempting to divide by 0
+    // TODO: Why is it even 0? I had initialised app_x/y_dim_ with fallback to ensure non-0
+    // Hard to debug, as I've seen it happen only once.
+    //if(DisplayImages.app_x_dim_ == 0 || DisplayImages.app_y_dim_ == 0) {
+    //    return scale_factor;
+    //}
 
     // three quarters of the application width & height

main/trunk/greenstone3/web/interfaces/default/transform/pages/webswing-collage.xsl

@@ -120 +120 @@
               var url = data;
           // check if a target tab/window name has been specified
-          // Any better way of passing more than 1 string between Java and JavaScript?
+          // TODO: Any better way of passing > 1 string between Java and JavaScript?
           var index = url.indexOf(" - ");
           if (index !== -1) {
              var target = url.substring(index+3); // skip past " - " to get target name
+             url = url.substring(0, index);
+             // Note that target window name is not the same as target window title
+             // https://stackoverflow.com/questions/8051811/how-to-show-window-title-using-window-open
              window.open(url, target);               
           } else {

main/trunk/greenstone3/web/interfaces/default/transform/pages/webswing-phind.xsl

@@ -119 +119 @@
               var url = data;
           // check if a target tab/window name has been specified
-          // Any better way of passing more than 1 string between Java and JavaScript?
+          // TODO: Any better way of passing > 1 string between Java and JavaScript?
           var index = url.indexOf(" - ");
           if (index !== -1) {
              var target = url.substring(index+3); // skip past " - " to get target name
+             url = url.substring(0, index);
              window.open(url, target);               
           } else {