Changeset 37326

Timestamp:

2023-02-16T22:50:02+13:00 (14 months ago)

Author:

davidb

Message:

Initial set of changes that allows the webswing version of GLI call a Javascript callback hander

Location:

main/trunk/gli

Files:

• lib/webswing-api.jar (added)
• makegli.bat (modified) (2 diffs)
• makegli.sh (modified) (2 diffs)
• src/org/greenstone/gatherer/gui/PreviewButton.java (modified) (2 diffs)

main/trunk/gli/makegli.bat

@@ -140 +140 @@
     if "%GLILANG%" == "ru" echo Š®¬¯š«šà®¢ ­š¥ %1 š § ¢šáš¬ë¥ ª« ááë...
 
-    "%JAVACPATH%\javac.exe" %JAVACFLAGS% -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/jna.jar;lib/jna-platform.jar;lib/qfslib.jar;lib/rsyntaxtextarea.jar %1
+    "%JAVACPATH%\javac.exe" %JAVACFLAGS% -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/jna.jar;lib/jna-platform.jar;lib/qfslib.jar;lib/rsyntaxtextarea.jar;lib/webswing-api.jar %1
 
     if "%GLILANG%" == "en" echo Done!
@@ -161 +161 @@
 :: Compile the GLI
 :: Sun compiler (tested with 1.5 and 1.6) didn't compile DragTreeSelectionModel.java or MetadataAuditTableModel.java automatically, so we need to put them in explicitly
-"%JAVACPATH%\javac.exe" %JAVACFLAGS% -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/jna.jar;lib/jna-platform.jar;lib/qfslib.jar;lib/rsyntaxtextarea.jar src/org/greenstone/gatherer/GathererProg.java src/org/greenstone/gatherer/util/DragTreeSelectionModel.java src/org/greenstone/gatherer/metadata/MetadataAuditTableModel.java 
+"%JAVACPATH%\javac.exe" %JAVACFLAGS% -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/jna.jar;lib/jna-platform.jar;lib/qfslib.jar;lib/rsyntaxtextarea.jar;lib/webswing-api.jar src/org/greenstone/gatherer/GathererProg.java src/org/greenstone/gatherer/util/DragTreeSelectionModel.java src/org/greenstone/gatherer/metadata/MetadataAuditTableModel.java 
 if %ERRORLEVEL% NEQ 0 goto exit
-"%JAVACPATH%\javac.exe" %JAVACFLAGS% -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/jna.jar;lib/jna-platform.jar;lib/qfslib.jar;lib/rsyntaxtextarea.jar src/org/greenstone/gatherer/WebGatherer.java
+"%JAVACPATH%\javac.exe" %JAVACFLAGS% -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/jna.jar;lib/jna-platform.jar;lib/qfslib.jar;lib/rsyntaxtextarea.jar;lib/webswing-api.jar src/org/greenstone/gatherer/WebGatherer.java
 if %ERRORLEVEL% NEQ 0 goto exit
-"%JAVACPATH%\javac.exe" %JAVACFLAGS% -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/jna.jar;lib/jna-platform.jar;lib/qfslib.jar;lib/rsyntaxtextarea.jar src/org/greenstone/gatherer/GathererApplet.java
+"%JAVACPATH%\javac.exe" %JAVACFLAGS% -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/jna.jar;lib/jna-platform.jar;lib/qfslib.jar;lib/rsyntaxtextarea.jar;lib/webswing-api.jar src/org/greenstone/gatherer/GathererApplet.java
 if %ERRORLEVEL% NEQ 0 goto exit
-:: "%JAVACPATH%\javac.exe" $JAVACFLAGS% -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/jna.jar;lib/jna-platform.jar;lib/qfslib.jar;lib/rsyntaxtextarea.jar src/org/greenstone/gatherer/GathererApplet4gs3.java
+:: "%JAVACPATH%\javac.exe" $JAVACFLAGS% -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/jna.jar;lib/jna-platform.jar;lib/qfslib.jar;lib/rsyntaxtextarea.jar;lib/webswing-api.jar src/org/greenstone/gatherer/GathererApplet4gs3.java
 if %ERRORLEVEL% NEQ 0 goto exit
 :: Compile the GEMS
-"%JAVACPATH%\javac.exe" %JAVACFLAGS% -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/jna.jar;lib/jna-platform.jar;lib/qfslib.jar;lib/rsyntaxtextarea.jar src/org/greenstone/gatherer/gems/GEMS.java
+"%JAVACPATH%\javac.exe" %JAVACFLAGS% -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/jna.jar;lib/jna-platform.jar;lib/qfslib.jar;lib/rsyntaxtextarea.jar;lib/webswing-api.jar src/org/greenstone/gatherer/gems/GEMS.java
 if %ERRORLEVEL% NEQ 0 goto exit
 :: Compile the standalone programs needed on the server for remote building

main/trunk/gli/makegli.sh

@@ -131 +131 @@
     fi
 
-    $javacpath $JAVACFLAGS -deprecation -d classes/ -sourcepath src/ -classpath classes/:lib/apache.jar:lib/jna.jar:lib/jna-platform.jar:lib/qfslib.jar:lib/rsyntaxtextarea.jar $*
+    $javacpath $JAVACFLAGS -deprecation -d classes/ -sourcepath src/ -classpath classes/:lib/apache.jar:lib/jna.jar:lib/jna-platform.jar:lib/qfslib.jar:lib/rsyntaxtextarea.jar:lib/webswing-api.jar $*
 
     if [ "$glilang" = "es" ]; then
@@ -161 +161 @@
 
 # Compile the GLI
-$javacpath $JAVACFLAGS -deprecation -d classes/ -sourcepath src/ -classpath classes/:lib/apache.jar:lib/jna.jar:lib/jna-platform.jar:lib/qfslib.jar:lib/rsyntaxtextarea.jar src/org/greenstone/gatherer/GathererProg.java
+$javacpath $JAVACFLAGS -deprecation -d classes/ -sourcepath src/ -classpath classes/:lib/apache.jar:lib/jna.jar:lib/jna-platform.jar:lib/qfslib.jar:lib/rsyntaxtextarea.jar:lib/webswing-api.jar src/org/greenstone/gatherer/GathererProg.java
 if [ $? -ne 0 ]; then
     exit 1;
 fi               
-$javacpath $JAVACFLAGS -deprecation -d classes/ -sourcepath src/ -classpath classes/:lib/apache.jar:lib/jna.jar:lib/jna-platform.jar:lib/qfslib.jar:lib/rsyntaxtextarea.jar src/org/greenstone/gatherer/WebGatherer.java
+$javacpath $JAVACFLAGS -deprecation -d classes/ -sourcepath src/ -classpath classes/:lib/apache.jar:lib/jna.jar:lib/jna-platform.jar:lib/qfslib.jar:lib/rsyntaxtextarea.jar:lib/webswing-api.jar src/org/greenstone/gatherer/WebGatherer.java
 if [ $? -ne 0 ]; then
     exit 1;
 fi               
-$javacpath $JAVACFLAGS -deprecation -d classes/ -sourcepath src/ -classpath classes/:lib/apache.jar:lib/jna.jar:lib/jna-platform.jar:lib/qfslib.jar:lib/rsyntaxtextarea.jar src/org/greenstone/gatherer/GathererApplet.java
+$javacpath $JAVACFLAGS -deprecation -d classes/ -sourcepath src/ -classpath classes/:lib/apache.jar:lib/jna.jar:lib/jna-platform.jar:lib/qfslib.jar:lib/rsyntaxtextarea.jar:lib/webswing-api.jar src/org/greenstone/gatherer/GathererApplet.java
 if [ $? -ne 0 ]; then
     exit 1;
 fi               
-#$javacpath -deprecation -d classes/ -sourcepath src/ -classpath classes/:lib/apache.jar:lib/jna.jar:lib/jna-platform.jar:lib/qfslib.jar:lib/rsyntaxtextarea.jar src/org/greenstone/gatherer/GathererApplet4gs3.java
+#$javacpath -deprecation -d classes/ -sourcepath src/ -classpath classes/:lib/apache.jar:lib/jna.jar:lib/jna-platform.jar:lib/qfslib.jar:lib/rsyntaxtextarea.jar:lib/webswing-api.jar src/org/greenstone/gatherer/GathererApplet4gs3.java
 # Compile the GEMS
-$javacpath -deprecation -d classes/ -sourcepath src/ -classpath classes/:lib/apache.jar:lib/jna.jar:lib/jna-platform.jar:lib/qfslib.jar:lib/rsyntaxtextarea.jar src/org/greenstone/gatherer/gems/GEMS.java
+$javacpath -deprecation -d classes/ -sourcepath src/ -classpath classes/:lib/apache.jar:lib/jna.jar:lib/jna-platform.jar:lib/qfslib.jar:lib/rsyntaxtextarea.jar:lib/webswing-api.jar src/org/greenstone/gatherer/gems/GEMS.java
 if [ $? -ne 0 ]; then
     exit 1;

main/trunk/gli/src/org/greenstone/gatherer/gui/PreviewButton.java

@@ -34 +34 @@
 import java.awt.event.*;
 import javax.swing.*;
+
+import org.webswing.toolkit.api.WebswingUtil;
+
 import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
@@ -163 +166 @@
         Gatherer.configGS3Server(Configuration.site_name, ServletConfiguration.ADD_COMMAND + Gatherer.c_man.getLoadedCollectionName());
         }
+
         if(preview_address != null) {
-        Gatherer.spawnBrowser(preview_address);
+        if (Gatherer.isWebswing) {
+            WebswingUtil.getWebswingApi().sendActionEvent("previewURL", preview_address, null);
+        }
+        else {
+            Gatherer.spawnBrowser(preview_address);
+        }
         }
 
+
+        
     }