Changeset 33 in tmcsimulator for trunk/src/tmcsim/paramicscommunicator

Timestamp:

04/29/2016 12:55:04 AM (10 years ago)

Author:

bokumura

Message:

Directory Restructure: All system properties have been deprecated and replaced by the system property: "CONFIG_DIR". If CONFIG_DIR is not specified at run time, it will default to the "config/" directory.

File:

• trunk/src/tmcsim/paramicscommunicator/ParamicsCommunicator.java (modified) (3 diffs)

trunk/src/tmcsim/paramicscommunicator/ParamicsCommunicator.java

@@ -19 +19 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import javax.swing.JOptionPane;
 import javax.swing.UIManager;
+
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+
 import tmcsim.common.CADProtocol.PARAMICS_ACTIONS;
 import tmcsim.common.CADProtocol.PARAMICS_COMM_TAGS;
@@ -60 +63 @@
 {
 
-    /**
+    private static final String CONFIG_FILE_NAME = "paramics_communicator_config.properties";
+        /**
      * Error logger.
      */
@@ -480 +484 @@
      * @param args Command line arguments.
      */
-    public static void main(String[] args)
-    {
-        System.setProperty("PARAMICS_COMM_PROPERTIES", "config/paramics_communicator_config.properties");
-
-        try
-        {
-            if (System.getProperty("PARAMICS_COMM_PROPERTIES") != null)
-            {
-                UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-
-                new Thread(new ParamicsCommunicator(System.getProperty(
-                        "PARAMICS_COMM_PROPERTIES"))).start();
-            } else
-            {
-                throw new Exception("PARAMICS_COMM_PROPERTIES system property not defined.");
-            }
-        } catch (Exception e)
-        {
+    public static void main(String[] args) {
+        if(System.getProperty("CONFIG_DIR") == null){
+                System.setProperty("CONFIG_DIR", "config");
+        }
+        
+        try{
+
+                UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+            new Thread(new ParamicsCommunicator(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + CONFIG_FILE_NAME)).start();
+        
+        } catch (Exception e) {
             paramLogger.logp(Level.SEVERE, "ParamicsCommunicator", "Main",
                     "Error occured initializing application", e);