Changeset 448 in tmcsimulator for trunk/src

Timestamp:

07/16/2019 06:34:33 AM (7 years ago)

Author:

jdalbey

Message:

Add CADcomments.log filename to CADserver config properties so Coordinator know where to write comments log.

Location:

trunk/src/tmcsim

Files:

• application.properties (modified) (1 diff)
• cadsimulator/CADServer.java (modified) (2 diffs)
• cadsimulator/Coordinator.java (modified) (3 diffs)

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Mon, 15 Jul 2019 16:19:28 -0700
+#Tue, 16 Jul 2019 08:06:49 -0700
 
-Application.revision=445
+Application.revision=447
 
-Application.buildnumber=159
+Application.buildnumber=160

trunk/src/tmcsim/cadsimulator/CADServer.java

@@ -133 +133 @@
          *  Filepath to which is written the simulation time.
          */
-        ELAPSED_TIME_FILE("ElapsedTimeFile");
+        ELAPSED_TIME_FILE("ElapsedTimeFile"),
+        /**
+         *  Filepath to which is written the CADcomments log.
+         */
+        CAD_COMMENTS_LOG("CADcommentsLog");
         
         public String name;
@@ -255 +259 @@
                 throw new SimulationException(SimulationException.PROPERTY_MISSING_ERROR);
             }
-            theCoordinator = new Coordinator(theModel, simTimeFilename);
+            /** Load the CAD comments log filename from properties */
+            String commentLogname =
+                    cadServerProperties.getProperty(
+                    CAD_PROPERTIES.CAD_COMMENTS_LOG.name);
+            if (commentLogname == null)
+            {
+                cadSimLogger.logp(Level.SEVERE, "CADSimulator", "Constructor",
+                        propertiesFile + " missing property for " + CAD_PROPERTIES.CAD_COMMENTS_LOG.name);
+                throw new SimulationException(SimulationException.PROPERTY_MISSING_ERROR);
+            }
+            theCoordinator = new Coordinator(theModel, simTimeFilename, commentLogname);
 
             startRegistry(Integer.parseInt(

trunk/src/tmcsim/cadsimulator/Coordinator.java

@@ -100 +100 @@
     private String kSimClockFilename;
     /**
-     * Name of output file for CAD comments 
-     */
-    private static final String LOG_FILE_NAME = "CADcomments.log";
+     * The name of file where CADcommentLog is written
+     */
+    private String kCADcommentLog;
     /**
      * Error logger.
@@ -131 +131 @@
      * initializeSimulation.
      * @param simTimeFilename name of the file where the simulation clock time is written
-     * @throws RemoteException
-     */
-    public Coordinator(CADSimulatorState model, String simTimeFilename) throws RemoteException
+     * @param commentLogname name of file where CADcommentLog is written
+     * @throws RemoteException
+     */
+    public Coordinator(CADSimulatorState model, String simTimeFilename, String commentLogname) throws RemoteException
     {
         super();
         cadModel = model;
         kSimClockFilename = simTimeFilename;
+        kCADcommentLog = commentLogname;
         clientList = new LinkedList<CADClientInterface>();
         cadData = new CADData();
@@ -768 +770 @@
         try 
         {
-            PrintWriter writer = new PrintWriter(new FileWriter(LOG_FILE_NAME));
+            PrintWriter writer = new PrintWriter(new FileWriter(kCADcommentLog));
             writer.print(output);
             writer.close();