Changeset 33 in tmcsimulator for trunk/src/tmcsim/client/CADClient.java

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/client/CADClient.java (modified) (4 diffs)

trunk/src/tmcsim/client/CADClient.java

@@ -60 +60 @@
  * @version $Date: 2009/04/17 16:27:47 $ $Revision: 1.8 $
  */
-/*Hai :3  yeeeee*/
+
 public class CADClient extends UnicastRemoteObject implements
         CADClientInterface {
@@ -113 +113 @@
     private CADClientInterface client = this;
 
+    private static final String CONFIG_FILE_NAME = "cad_client_config.properties";
+    
     /**
      * Constructor. Initialize data from parsed properties file. Create a socket
@@ -319 +321 @@
                     e);
         }
+        
 
         // Ensure that the properties file does not have null values for the
@@ -473 +476 @@
      */
     public static void main(String[] args) {
-        System.setProperty("CAD_CLIENT_PROPERTIES",
-                "config/cad_client_config.properties");
+        if(System.getProperty("CONFIG_DIR") == null){
+                System.setProperty("CONFIG_DIR", "config");
+        }
 
         try {
-            if (System.getProperty("CAD_CLIENT_PROPERTIES") != null) {
-                UIManager.setLookAndFeel(UIManager
-                        .getSystemLookAndFeelClassName());
-
-                new CADClient(System.getProperty("CAD_CLIENT_PROPERTIES"));
-            } else {
-                throw new Exception(
-                        "CAD_CLIENT_PROPERTIES system property not defined.");
-            }
+            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+            new CADClient(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + CONFIG_FILE_NAME);
+         
         } catch (Exception e) {
             cadClientLogger.logp(Level.SEVERE, "SimulationManager", "Main",