Changeset 32926 for main

Timestamp:

2019-03-26T15:53:49+13:00 (5 years ago)

Author:

ak19

Message:

Only the older Java versions we use to build nightlies seemed to trip over local variables declared outside private inner Runnable class invokedLater by SwingUtilities not being final

Location:

main/trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (2 diffs)
• GathererProg.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -1474 +1474 @@
 
         /** Prints a message informing the user where they can get PDFBox from to process PDF files of v1.5 and greater */
-    static private void missingPDFBox(String zipExtension, String extFolder) {
+    static private void missingPDFBox(final String zipExtension, final String extFolder) {
      try {
       SwingUtilities.invokeAndWait(new Runnable() {
@@ -1513 +1513 @@
 
     /** Prints a message informing the user that their collecthome is non-standard (not inside GS installation) */
-    static private void nonStandardCollectHomeMessage(String open_collection_file_path, String defaultColDir) {
+    static private void nonStandardCollectHomeMessage(final String open_collection_file_path, final String defaultColDir) {
      try {
       SwingUtilities.invokeAndWait(new Runnable() {

main/trunk/gli/src/org/greenstone/gatherer/GathererProg.java

@@ -75 +75 @@
     
     // Create an instance of the Gatherer class, which will parse the args and prepare the rest of the GLI
-    Gatherer gatherer = new Gatherer(args);
+    final Gatherer gatherer = new Gatherer(args);
         
     // TESTING circumventing the old GUI event dispatch thread exceptions in GLI. Follows