Changeset 24811 for main/trunk/gli/src

Timestamp:

2011-11-09T21:41:57+13:00 (12 years ago)

Author:

ak19

Message:

The message that gets displayed on GLI startup if the PDFBox extension is not present now links to the trunk version unless GLI's PROGRAM_VERSION variable is other than trunk (and is therefore a release number). In this case, the URL in the message will point to the tags early for that release number.

File:

• main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (2 diffs)

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

@@ -79 +79 @@
     /** The current version of the GLI.
         * Note: the gs3-release-maker relies on this variable being declared
-        * in a line which maches this java regex:
+        * in a line which matches this java regex:
         * ^(.*)String\s*PROGRAM_VERSION\s*=\s*"trunk";
         * If change the declaration and it no longer matches the regex, please
@@ -1314 +1314 @@
         /** 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) {
-    WarningDialog dialog = new WarningDialog("warning.MissingPDFBox", Dictionary.get("MissingPDFBox.Title"), Dictionary.get("MissingPDFBox.Message", new String[]{zipExtension, extFolder}), null, false);
+    // point to the correct version of the PDFBox extension for this Greenstone release
+    String releaseTag = "";
+    if(!PROGRAM_VERSION.equals("trunk")) { // assume it's a release version
+        releaseTag = "main/tags/"+PROGRAM_VERSION+"/";
+    }
+
+    WarningDialog dialog = new WarningDialog("warning.MissingPDFBox", Dictionary.get("MissingPDFBox.Title"), Dictionary.get("MissingPDFBox.Message", new String[]{releaseTag, zipExtension, extFolder}), null, false);
         dialog.display();
         dialog.dispose();