Changeset 658 in tmcsimulator


Ignore:
Timestamp:
09/12/2022 02:19:40 PM (4 years ago)
Author:
jdalbey
Message:

Replace hard-code scenario folder name in Simulation Manager with config property.

Location:
trunk
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/tmcsim/cadsimulator/Coordinator.java

    r657 r658  
    8383import tmcsim.interfaces.CoordinatorInterface; 
    8484import tmcsim.interfaces.SimulationManagerInterface; 
    85 import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder; 
    8685import tmcsim.simulationmanager.SimulationManagerView; 
    8786import tmcsim.simulationmanager.actions.LoadScriptAction; 
     87import static tmcsim.simulationmanager.SimulationManager.SCENARIOS_DIR; 
    8888 
    8989/** 
    … …  
    167167        try 
    168168        { 
    169             CardfileReader cfr = new CardfileReader(kScenarioFolder+"/Cardfile.xml", cardfileData); 
     169            CardfileReader cfr = new CardfileReader(SCENARIOS_DIR+"/Cardfile.xml", cardfileData); 
    170170        } catch (Exception e) 
    171171        { 

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

    r559 r658  
    4848    private static final String CONFIG_FILE_NAME = "sim_manager_config.properties"; 
    4949    /* 
    50      * Name of filesystem folder that contains Scenario xml files.   
     50     * Default name of folder that contains Scenario xml files. 
     51     * Actual name retrieved from config file. 
    5152    */ 
    52     public static final String kScenarioFolder = "Scenarios"; 
     53    public static String SCENARIOS_DIR = "Scenarios"; 
    5354    /** 
    5455     * Error logger. 
    … …  
    6667        CAD_SIM_HOST("CADSimulatorHost"), 
    6768        CAD_SIM_PORT("CADSimulatorRMIPort"), 
    68         SCRIPT_DIR("ScriptDir"), 
     69        SCENARIOS_DIR("ScenariosDir"), 
    6970        FAKE_PARAMICS("FakeParamicsConnection"); 
    7071        public String name; 
    … …  
    111112            simManagerProperties.load(new FileInputStream(new File(propertiesFile))); 
    112113 
    113             SimulationManagerView.SCRIPT_DIR = 
    114                     simManagerProperties.getProperty(PROPERTIES.SCRIPT_DIR.name).trim(); 
     114            SCENARIOS_DIR = 
     115                    simManagerProperties.getProperty(PROPERTIES.SCENARIOS_DIR.name).trim(); 
    115116 
    116117            //make sure properties aren't null 
    … …  
    229230            { 
    230231                arg1 = args[0]; 
    231                 File scriptFile = new File(kScenarioFolder+ System.getProperty("file.separator") + arg1); 
     232                File scriptFile = new File(SCENARIOS_DIR+ System.getProperty("file.separator") + arg1); 
    232233                // if the script file exists, load it and show name in title bar 
    233234                if (scriptFile.exists()) 

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

    r460 r658  
    8383    /** Maximum Paramics network ID (100) */ 
    8484    private static int MAX_NETWORK_ID    = 100; 
    85  
    86     /** Default directory for script loading. */ 
    87     public static String SCRIPT_DIR      = "."; 
    8885 
    8986    /** Reference to the simulation manager model. */ 

  • trunk/src/tmcsim/simulationmanager/actions/AddIncidentAction.java

    r2 r658  
    1515import tmcsim.common.SimulationException; 
    1616import tmcsim.common.CADEnums.SCRIPT_STATUS; 
     17import tmcsim.simulationmanager.SimulationManager; 
    1718import tmcsim.simulationmanager.SimulationManagerView; 
    1819import tmcsim.simulationmanager.dialogs.AddIncidentDialog; 
    … …  
    6061                try{                 
    6162                    JFileChooser chooser   = new JFileChooser( 
    62                             SimulationManagerView.SCRIPT_DIR); 
     63                            SimulationManager.SCENARIOS_DIR); 
    6364                     
    6465                    chooser.setDialogTitle("Open Simulation Script File"); 

  • trunk/src/tmcsim/simulationmanager/actions/LoadScriptAction.java

    r6 r658  
    1010import tmcsim.common.ScriptException; 
    1111import tmcsim.common.SimulationException; 
     12import tmcsim.simulationmanager.SimulationManager; 
    1213import tmcsim.simulationmanager.SimulationManagerView; 
    1314import tmcsim.simulationmanager.model.XmlFilter; 
    … …  
    3940        SwingUtilities.invokeLater(new Runnable(){       
    4041            public void run() {  
    41                 JFileChooser chooser = new JFileChooser( 
    42                         SimulationManagerView.SCRIPT_DIR); 
     42                JFileChooser chooser = new JFileChooser(SimulationManager.SCENARIOS_DIR); 
    4343                 
    44                 chooser.setDialogTitle("Open Simulation Script File"); 
     44                chooser.setDialogTitle("Open Simulation Scenario File"); 
    4545                chooser.setMultiSelectionEnabled(false);         
    4646                chooser.setFileFilter(new XmlFilter()); 

  • trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleDriver.java

    r558 r658  
    1313import tmcsim.interfaces.CADClientInterface; 
    1414import tmcsim.interfaces.SimulationManagerInterface; 
    15 import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder; 
     15import static tmcsim.simulationmanager.SimulationManager.SCENARIOS_DIR; 
    1616 
    1717/** 
    … …  
    8787 
    8888        // Load a script file 
    89         String autoloadScriptname = kScenarioFolder+"/one-incident.xml"; 
     89        String autoloadScriptname = SCENARIOS_DIR+"/one-incident.xml"; 
    9090        app.theCoordinator.loadScriptFile(new File(autoloadScriptname)); 
    9191        // The status should now say Ready 

  • trunk/test/tmcsim/cadsimulator/CADSimulatorConsoleTest.java

    r657 r658  
    1717import tmcsim.interfaces.CADClientInterface; 
    1818import tmcsim.interfaces.SimulationManagerInterface; 
    19 import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder; 
     19import static tmcsim.simulationmanager.SimulationManager.SCENARIOS_DIR; 
    2020 
    2121/** 
    … …  
    253253        System.out.println("Sim status"); 
    254254        // Load a script file - to put status at Ready 
    255         String autoloadScriptname = kScenarioFolder+"/one-incident.xml"; 
     255        String autoloadScriptname = SCENARIOS_DIR+"/one-incident.xml"; 
    256256        app.theCoordinator.loadScriptFile(new File(autoloadScriptname)); 
    257257        pause(2000); 
    … …  
    335335    { 
    336336        new File("scripts").mkdir(); 
    337         writedata(kScenarioFolder+"/Cardfile.xml", cardfileData); 
    338         writedata(kScenarioFolder+"/one-incident.xml", oneincidentXML); 
     337        writedata(SCENARIOS_DIR+"/Cardfile.xml", cardfileData); 
     338        writedata(SCENARIOS_DIR+"/one-incident.xml", oneincidentXML); 
    339339    } 
    340340 

  • trunk/test/tmcsim/cadsimulator/CADSimulatorFixture.java

    r558 r658  
    1313import java.util.logging.Logger; 
    1414import static tmcsim.cadsimulator.CADSimulatorFixture.bos; 
    15 import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder; 
     15import static tmcsim.simulationmanager.SimulationManager.SCENARIOS_DIR; 
    1616 
    1717/** 
    … …  
    6868    public static void writeScriptfiles() 
    6969    { 
    70         writeFileFromURL(kScenarioFolder+"/Cardfile.xml", cardfileURL); 
    71         writeFileFromURL(kScenarioFolder+"/one-incident.xml", smallXMLURL); 
     70        writeFileFromURL(SCENARIOS_DIR+"/Cardfile.xml", cardfileURL); 
     71        writeFileFromURL(SCENARIOS_DIR+"/one-incident.xml", smallXMLURL); 
    7272    } 
    7373 

  • trunk/test/tmcsim/cadsimulator/CADSimulatorGUITest.java

    r558 r658  
    1616import tmcsim.interfaces.CADClientInterface; 
    1717import tmcsim.interfaces.SimulationManagerInterface; 
    18 import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder; 
     18import static tmcsim.simulationmanager.SimulationManager.SCENARIOS_DIR; 
    1919 
    2020/** 
    … …  
    140140 
    141141        // Load a script file 
    142         String autoloadScriptname = kScenarioFolder+"/one-incident.xml"; 
     142        String autoloadScriptname = SCENARIOS_DIR+"/one-incident.xml"; 
    143143        app.theCoordinator.loadScriptFile(new File(autoloadScriptname)); 
    144144        // The status should now say Ready 

  • trunk/test/tmcsim/cadsimulator/SystemConsoleTest.java

    r653 r658  
    1919import tmcsim.paramicscommunicator.gui.ParamicsCommunicatorGUI; 
    2020import tmcsim.simulationmanager.SimulationManager; 
    21 import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder; 
     21import static tmcsim.simulationmanager.SimulationManager.SCENARIOS_DIR; 
    2222 
    2323/** 
    … …  
    150150 
    151151        // Load a script file 
    152         String autoloadScriptname = kScenarioFolder+"/audio_systest.xml"; 
     152        String autoloadScriptname = SCENARIOS_DIR+"/audio_systest.xml"; 
    153153        simMgrApp.loadScript(new File(autoloadScriptname)); 
    154154        try 

  • trunk/test/tmcsim/cadsimulator/SystemTest.java

    r657 r658  
    1515import tmcsim.paramicscommunicator.gui.ParamicsCommunicatorGUI; 
    1616import tmcsim.simulationmanager.SimulationManager; 
    17 import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder; 
     17import static tmcsim.simulationmanager.SimulationManager.SCENARIOS_DIR; 
    1818 
    1919/** 
    … …  
    9898 
    9999        // Load a script file 
    100         String autoloadScriptname = kScenarioFolder+"/system_test_script.xml"; 
     100        String autoloadScriptname = SCENARIOS_DIR+"/system_test_script.xml"; 
    101101        simMgrApp.loadScript(new File(autoloadScriptname)); 
    102102        try 

  • trunk/test/tmcsim/cadsimulator/VisibleSystemDemoDriver.java

    r558 r658  
    1414import tmcsim.paramicscommunicator.gui.ParamicsCommunicatorGUI; 
    1515import tmcsim.simulationmanager.SimulationManager; 
    16 import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder; 
     16import static tmcsim.simulationmanager.SimulationManager.SCENARIOS_DIR; 
    1717 
    1818/** 
    … …  
    138138 
    139139        // Load a script file 
    140         String autoloadScriptname = kScenarioFolder+"/audio_systest.xml"; 
     140        String autoloadScriptname = SCENARIOS_DIR+"/audio_systest.xml"; 
    141141        simMgrApp.loadScript(new File(autoloadScriptname)); 
    142142        try 

  • trunk/test/tmcsim/simulationmanager/SimulationManagerSmokeTest.java

    r558 r658  
    1717import tmcsim.common.ScriptException; 
    1818import tmcsim.common.SimulationException; 
    19 import static tmcsim.simulationmanager.SimulationManager.kScenarioFolder; 
     19import static tmcsim.simulationmanager.SimulationManager.SCENARIOS_DIR; 
    2020 
    2121/** 
    … …  
    110110 
    111111        // Load a script file 
    112         String autoloadScriptname = kScenarioFolder+"/practice_script_2016.xml"; 
     112        String autoloadScriptname = SCENARIOS_DIR+"/practice_script_2016.xml"; 
    113113        SimulationManagerModel simMgrModel = simMgrApp.theSimManagerModel; 
    114114        simMgrModel.loadScript(new File(autoloadScriptname)); 
Note: See TracChangeset for help on using the changeset viewer.