Improved versionprinter to print offline versions even if database is not available

git-svn-id: http://svn.osgeo.org/postgis/trunk@1672 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/jdbc2/src/examples/VersionPrinter.java b/jdbc2/src/examples/VersionPrinter.java
index 79d2298892221bf06f531cb04863d60bdb2fe66a..a091a09bdccdb78a5091580ac94d4d538c5b4bfc 100644 (file)
--- a/jdbc2/src/examples/VersionPrinter.java
+++ b/jdbc2/src/examples/VersionPrinter.java
@@ -53,13 +53,25 @@ public class VersionPrinter {
     public static void main(String[] args) {
         Statement stat = null;
         Driver d;
+
+       // Print PostGIS version
+        printHeading("PostGIS jdbc client code");
+        printVersionString("getFullVersion", Version.getFullVersion());
+
+       // Print PGJDBC Versions
+        printHeading("PGJDBC Driver");
+        printVersionString("getVersion", Driver.getVersion());
         try {
             d = new Driver();
         } catch (Exception e) {
             System.err.println("Cannot create Driver instance: " + e.getMessage());
             System.exit(1);
             return;
-        }
+        }      
+        printVersionString("getMajorVersion", d.getMajorVersion());
+        printVersionString("getMinorVersion", d.getMinorVersion());
+
+       // Print PostgreSQL server versions
         if (args.length == 3) {
             Connection conn = null;
             try {
@@ -77,14 +89,6 @@ public class VersionPrinter {
             return;
         }
 
-        printHeading("PostGIS jdbc client code");
-        printVersionString("getFullVersion", Version.getFullVersion());
-
-        printHeading("PGJDBC Driver");
-        printVersionString("getVersion", Driver.getVersion());
-        printVersionString("getMajorVersion", d.getMajorVersion());
-        printVersionString("getMinorVersion", d.getMinorVersion());
-
         if (stat == null) {
             System.out.println("No online version available.");
         }
@@ -92,6 +96,7 @@ public class VersionPrinter {
         printHeading("PostgreSQL Server");
         printVersionString("version", stat);
 
+       // Print PostGIS versions
         printHeading("PostGIS Server");
         for (int i = 0; i < GISVERSIONS.length; i++) {
             printVersionString(GISVERSIONS[i], stat);