Changeset 365 in tmcsimulator for trunk/src

Timestamp:

04/11/2019 07:01:03 PM (7 years ago)

Author:

jdalbey

Message:

RevisionNumber?.java, SimulationManagerView?.java : Fix defect #119

Location:

trunk/src

Files:

• spikes/ShowUserDir.java (modified) (2 diffs)
• tmcsim/application.properties (modified) (1 diff)
• tmcsim/cadsimulator/viewer/CADServerViewer.java (modified) (2 diffs)
• tmcsim/common/RevisionNumber.java (modified) (2 diffs)
• tmcsim/simulationmanager/SimulationManagerView.java (modified) (1 diff)

trunk/src/spikes/ShowUserDir.java

@@ -2 +2 @@
 package spikes;
 
+import java.io.File;
 import java.io.FileInputStream;
+import java.net.URL;
+import java.net.URLClassLoader;
 import java.util.Properties;
 import java.util.logging.Level;
@@ -17 +20 @@
     public ShowUserDir()
     {
+        // This shows the path to where the Jar is located
+        String currpath = getClass().getProtectionDomain().getCodeSource().getLocation().getPath();
+        JOptionPane.showMessageDialog(new JWindow(), 
+                currpath,
+                "Show Jar Path", JOptionPane.INFORMATION_MESSAGE); 
+        // This shows the current working directory, which is different
+        // if you double-click launch in Nautilus from command line launch.
         JOptionPane.showMessageDialog(new JWindow(), 
                 "\nUser.Dir=" + System.getProperty("user.dir"),
-                "Show User Dir", JOptionPane.INFORMATION_MESSAGE);                        
+                "Show User Dir", JOptionPane.INFORMATION_MESSAGE); 
+        
     }   
     public static void main(String[] args)

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Thu, 11 Apr 2019 09:48:15 -0700
+#Thu, 11 Apr 2019 20:30:13 -0700
 
-Application.revision=360
+Application.revision=364
 
-Application.buildnumber=121
+Application.buildnumber=130

trunk/src/tmcsim/cadsimulator/viewer/CADServerViewer.java

@@ -23 +23 @@
 import tmcsim.cadsimulator.viewer.model.CADSimulatorStatus;
 import tmcsim.interfaces.CADViewer;
+import tmcsim.common.RevisionNumber;
 
 /**
@@ -64 +65 @@
     {
         super();
-        setTitle("CAD Server " + getAppVersion());
+        setTitle("CAD Server " + RevisionNumber.getAppVersion());
 
         initComponents();
     }
 
-    /**
-     * Read the version number from the application properties. The file
-     * 'application.properties' is generated by build.xml.
-     *
-     * @return a version string obtained from application.properties file, or
-     * "Version: unknown" if an IOerror prevents us from reading the file.
-     */
-    private String getAppVersion()
-    {
-        String propfilename = "/tmcsim/application.properties";
-        String propKey = "Application.revision";
-        String version = "unknown";
-        try
-        {
-            Properties props = new Properties();
-            props.load(this.getClass().getResourceAsStream(propfilename));
-            version = (String) props.get(propKey);
-        } catch (IOException ex)
-        {
-            Logger.getLogger("tmcsim/cadsimulator").log(Level.SEVERE,
-                    "CADSimulatorView.getAppVersion()."
-                    + " IOError reading " + propfilename);
-        } catch (NullPointerException npe)
-        {
-            Logger.getLogger("tmcsim/cadsimulator").log(Level.SEVERE,
-                    "CADSimulatorView.getAppVersion().load."
-                    + " Missing file: " + propfilename);
-        }
-        return "revision: " + version;
-    }
+
 
     /**

trunk/src/tmcsim/common/RevisionNumber.java

@@ -2 +2 @@
 
 import java.io.File;
+import java.io.IOException;
+import java.util.Properties;
 import java.util.Scanner;
 import java.util.logging.Level;
@@ -15 +17 @@
  * @author jdalbey
  */
-public class RevisionNumber
+public final class RevisionNumber
 {
 
     private static Logger logger = Logger.getLogger("tmcsim.common");
     // Read the subversion revision info and return it
-
+    /**
+     * Read the version number from the application properties. The file
+     * 'application.properties' is generated by build.xml.
+     *
+     * @return a version string obtained from application.properties file, or
+     * "Version: unknown" if an IOerror prevents us from reading the file.
+     */
+    public static String getAppVersion()
+    {
+        String propfilename = "/tmcsim/application.properties";
+        String propKey = "Application.revision";
+        String version = "unknown";
+        try
+        {
+            Properties props = new Properties();
+            props.load(RevisionNumber.class.getResourceAsStream(propfilename));
+            version = (String) props.get(propKey);
+        } catch (IOException ex)
+        {
+            Logger.getLogger("tmcsim/common").log(Level.SEVERE,
+                    "getAppVersion(): IOError reading " + propfilename);
+        } catch (NullPointerException npe)
+        {
+            Logger.getLogger("tmcsim/common").log(Level.SEVERE,
+                    "getAppVersion().load:  Missing file: " + propfilename);
+        }
+        return "revision: " + version;
+    }
+    
     /**
      * Return the version number as a string. The revision number is generated

trunk/src/tmcsim/simulationmanager/SimulationManagerView.java

@@ -702 +702 @@
             public void actionPerformed(java.awt.event.ActionEvent evt)
             {
-                String ver = RevisionNumber.getString();
+                String ver = RevisionNumber.getAppVersion();
                 JOptionPane.showMessageDialog(rootPane, "Version: " + ver, "About", JOptionPane.INFORMATION_MESSAGE);
             }