Changeset 49 in tmcsimulator

Timestamp:

07/02/2016 09:43:59 AM (10 years ago)

Author:

jdalbey

Message:

CADSimulatorViewer.java Add log message for missing application.properties. Update build.xml.

Location:

trunk

Files:

• IDE_metadata/NetBeans/TMCSim/build.xml (modified) (1 diff)
• config/cad_simulator_config.properties (modified) (1 diff)
• src/tmcsim/application.properties (modified) (1 diff)
• src/tmcsim/cadsimulator/CADSimulator.java (modified) (2 diffs)
• src/tmcsim/cadsimulator/viewer/CADSimulatorViewer.java (modified) (1 diff)
• test/tmcsim/cadsimulator/viewer/CADSimulatorViewModelTest.java (modified) (1 diff)

trunk/IDE_metadata/NetBeans/TMCSim/build.xml

@@ -100 +100 @@
        basedir="${build.dir}/classes"
        includes="tmcsim/cadsimulator/**, tmcsim/common/**, tmcsim/interfaces/**,
-                 tmcsim/client/cadclientgui/**, tmcsim/cadmodels/**"
+                 tmcsim/client/cadclientgui/**, tmcsim/cadmodels/**,
+                 tmcsim/application.properties"
        excludes="**/Test.class">
         <zipgroupfileset dir="dist/lib" includes="xercesImpl.jar"/>

trunk/config/cad_simulator_config.properties

@@ -4 +4 @@
 CMSDiversionXML        = config/cmsdiversions.xml
 AudioFileLocation      = audio/
+#UserInterface          = tmcsim.cadsimulator.viewer.CADConsoleViewer
 UserInterface          = tmcsim.cadsimulator.viewer.CADSimulatorViewer
-#UserInterface          = tmcsim.cadsimulator.viewer.CADConsoleViewer
 ParamicsProperties     = config/cad_simulator_paramics_config.properties
 ATMSProperties         = config/cad_simulator_atms_config.properties

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Tue, 28 Jun 2016 14:56:40 -0700
+#Sat, 02 Jul 2016 09:45:14 -0700
 
-Application.revision=44
+Application.revision=47
 
-Application.buildnumber=10
+Application.buildnumber=19

trunk/src/tmcsim/cadsimulator/CADSimulator.java

@@ -190 +190 @@
             cadSimulatorProperties = new Properties();
             cadSimulatorProperties.load(new FileInputStream(propertiesFile));
+            cadSimLogger.logp(Level.INFO, "CADSimulator", "Constructor",
+                    "Properties loaded from " + propertiesFile);
         } catch (Exception e)
         {
@@ -215 +217 @@
                 Class uiClass = Class.forName(userInterfaceName);
                 theViewer = (CADViewer) uiClass.newInstance();
-            } catch (Throwable exc)
+            } catch (Exception exc)
             {
                 cadSimLogger.logp(Level.SEVERE, "CADSimulator", "Constructor",
-                        "Unable to instantiate user interface: " + userInterfaceName);
+                        "Unable to instantiate user interface: " + userInterfaceName
+                        + " " + exc);
                 throw new SimulationException(SimulationException.INITIALIZE_ERROR);
             }

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

@@ -80 +80 @@
         {
             Logger.getLogger("tmcsim/cadsimulator").log(Level.SEVERE,
-                    "CADSimulatorView.getAppVersion()",
-                    "IOError reading " + propfilename);
+                    "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/test/tmcsim/cadsimulator/viewer/CADSimulatorViewModelTest.java

@@ -3 +3 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
 import org.uispec4j.*;
 import tmcsim.cadsimulator.viewer.model.CADSimulatorModel;