Ignore:
Timestamp:
09/14/2022 03:31:54 PM (4 years ago)
Author:
jdalbey
Message:

Multifile commit - revise source to match revisions to config filenames. Fix broken system tests. Fix defect #160.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/tmcsim/simulationmanager/SimulationManager.java

    r658 r664  
    2222 * communicator and applying diversions. A history of all events is shown as 
    2323 * well.<br> 
    24  * The SimulationManager may be started at any point before, during, or after a 
    25  * simulation has begun. The SimulationManager connects to the CADSimulator and 
     24 * The CADServer must be running before the SimulationManager is started.  
     25 * SimulationManager connects to the CADServer and 
    2626 * communicates through Java RMI methods. If two SimulationManagers are started, 
    2727 * the second one started, chronologically, will receive communication from the 
    28  * CADSimulator. <br><br> 
    29  * The properties file for the SimulationManager class contains the following 
    30  * data.<br> 
    31  * <code> 
    32  * -----------------------------------------------------------------------------<br> 
    33  * Host Name The host name where the CADSimulator is located.<br> 
    34  * Error File The target file to use for error logging.<br> 
    35  * -----------------------------------------------------------------------------<br> 
    36  * Example File: <br> 
    37  * CADSimulatorHost = localhost <br> 
    38  * ErrorFile = sim_mgr_error.xml <br> 
    39  * -----------------------------------------------------------------------------<br> 
    40  * </code> 
     28 * CADServer. (It's a bad idea to do this, there's no normal use case 
     29 * that requires it.)<br><br> 
    4130 * 
    4231 * @author Matthew Cechini (mcechini@calpoly.edu) 
    … …  
    4635{ 
    4736 
    48     private static final String CONFIG_FILE_NAME = "sim_manager_config.properties"; 
     37    private static final String CONFIG_FILE_NAME = "sim_manager.properties"; 
    4938    /* 
    5039     * Default name of folder that contains Scenario xml files. 
    … …  
    6554    { 
    6655 
    67         CAD_SIM_HOST("CADSimulatorHost"), 
    68         CAD_SIM_PORT("CADSimulatorRMIPort"), 
     56        CAD_SERVER_HOST("CADServerHost"), 
     57        CAD_SERVER_PORT("CADServerRMIPort"), 
    6958        SCENARIOS_DIR("ScenariosDir"), 
    7059        FAKE_PARAMICS("FakeParamicsConnection"); 
    … …  
    116105 
    117106            //make sure properties aren't null 
    118             if (simManagerProperties.getProperty(PROPERTIES.CAD_SIM_HOST.name) == null) 
     107            if (simManagerProperties.getProperty(PROPERTIES.CAD_SERVER_HOST.name) == null) 
    119108            { 
    120109                throw new Exception("CAD Simulator host property is null."); 
    121110            } 
    122111 
    123             if (simManagerProperties.getProperty(PROPERTIES.CAD_SIM_PORT.name) == null) 
     112            if (simManagerProperties.getProperty(PROPERTIES.CAD_SERVER_PORT.name) == null) 
    124113            { 
    125114                throw new Exception("CAD Simulator port property is null."); 
    … …  
    138127        { 
    139128            theSimManagerModel = new SimulationManagerModel( 
    140                     simManagerProperties.getProperty(PROPERTIES.CAD_SIM_HOST.name).trim(), 
    141                     simManagerProperties.getProperty(PROPERTIES.CAD_SIM_PORT.name).trim()); 
     129                    simManagerProperties.getProperty(PROPERTIES.CAD_SERVER_HOST.name).trim(), 
     130                    simManagerProperties.getProperty(PROPERTIES.CAD_SERVER_PORT.name).trim()); 
    142131 
    143132            //Construct the SimulationManagerView and set up the Model-View references. 
Note: See TracChangeset for help on using the changeset viewer.