Changeset 457 in tmcsimulator


Ignore:
Timestamp:
07/18/2019 08:55:21 AM (7 years ago)
Author:
jdalbey
Message:

Source file re-org. Move files from obsolete atmsdriver package to highwaymodel package.

Location:
trunk
Files:
1 added
3 edited
12 copied

Legend:

Unmodified
Added
Removed

  • trunk/src/tmcsim/application.properties

    r455 r457  
    1 #Thu, 18 Jul 2019 09:49:25 -0700 
     1#Thu, 18 Jul 2019 10:22:38 -0700 
    22 
    3 Application.revision=453 
     3Application.revision=455 
    44 
    55Application.buildnumber=165 

  • trunk/src/tmcsim/cadsimulator/managers/TrafficModelManager.java

    r445 r457  
    11package tmcsim.cadsimulator.managers; 
    22 
    3 import atmsdriver.GoogleMapAnimator; 
     3import tmcsim.highwaymodel.GoogleMapAnimator; 
    44import tmcsim.highwaymodel.Highways; 
    55import tmcsim.highwaymodel.LoopDetector; 

  • trunk/src/tmcsim/highwaymodel/GoogleMapAnimator.java

    r422 r457  
    1 package atmsdriver; 
     1package tmcsim.highwaymodel; 
    22 
    33import tmcsim.highwaymodel.Highways; 
    … …  
    141141    @SuppressWarnings("unchecked") 
    142142    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents 
    143     private void initComponents() 
    144     { 
     143    private void initComponents() { 
    145144 
    146145        scrollBar = new javax.swing.JScrollBar(); 
    … …  
    150149        setPreferredSize(new java.awt.Dimension(151, 92)); 
    151150 
    152         scrollBar.addAdjustmentListener(new java.awt.event.AdjustmentListener() 
    153         { 
    154             public void adjustmentValueChanged(java.awt.event.AdjustmentEvent evt) 
    155             { 
     151        scrollBar.addAdjustmentListener(new java.awt.event.AdjustmentListener() { 
     152            public void adjustmentValueChanged(java.awt.event.AdjustmentEvent evt) { 
    156153                scrollbarValueChanged(evt); 
    157154            } 

  • trunk/src/tmcsim/highwaymodel/Highways.java

    r422 r457  
    11package tmcsim.highwaymodel; 
    22 
    3 import atmsdriver.trafficeventseditor.TrafficLaneEvent; 
     3import tmcsim.highwaymodel.trafficeventseditor.TrafficLaneEvent; 
    44import tmcsim.highwaymodel.Station.DIRECTION; 
    55import java.io.File; 

  • trunk/src/tmcsim/highwaymodel/TrafficEventsAnimator.java

    r422 r457  
    1 package atmsdriver; 
     1package tmcsim.highwaymodel; 
    22 
    33import tmcsim.highwaymodel.Highways; 
    … …  
    115115    @SuppressWarnings("unchecked") 
    116116    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents 
    117     private void initComponents() 
    118     { 
     117    private void initComponents() { 
    119118 
    120119        scrollBar = new javax.swing.JScrollBar(); 
    … …  
    122121        txtDisplay = new javax.swing.JTextArea(); 
    123122 
    124         scrollBar.addAdjustmentListener(new java.awt.event.AdjustmentListener() 
    125         { 
    126             public void adjustmentValueChanged(java.awt.event.AdjustmentEvent evt) 
    127             { 
     123        scrollBar.addAdjustmentListener(new java.awt.event.AdjustmentListener() { 
     124            public void adjustmentValueChanged(java.awt.event.AdjustmentEvent evt) { 
    128125                scrollbarValueChanged(evt); 
    129126            } 

  • trunk/src/tmcsim/highwaymodel/trafficeventseditor/TimeFrame.java

    r238 r457  
    1 package atmsdriver.trafficeventseditor; 
     1package tmcsim.highwaymodel.trafficeventseditor; 
    22 
    33import java.util.ArrayList; 

  • trunk/src/tmcsim/highwaymodel/trafficeventseditor/TimeFrames.java

    r422 r457  
    11 
    2 package atmsdriver.trafficeventseditor; 
     2package tmcsim.highwaymodel.trafficeventseditor; 
    33 
    44import tmcsim.highwaymodel.Highway; 

  • trunk/src/tmcsim/highwaymodel/trafficeventseditor/TrafficEventsEditor.java

    r422 r457  
    1 package atmsdriver.trafficeventseditor; 
     1package tmcsim.highwaymodel.trafficeventseditor; 
    22 
    33import tmcsim.highwaymodel.Highway; 
    … …  
    340340    @SuppressWarnings("unchecked") 
    341341    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents 
    342     private void initComponents() 
    343     { 
     342    private void initComponents() { 
    344343 
    345344        colorRadioButtons = new javax.swing.ButtonGroup(); 
    … …  
    409408        jPanel2.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1), "Highway")); 
    410409 
    411         HighwayList.setModel(new javax.swing.AbstractListModel() 
    412         { 
     410        HighwayList.setModel(new javax.swing.AbstractListModel() { 
    413411            String[] strings = { "Item 1", "Item 2", "Item 3", "Item 4", "Item 5" }; 
    414412            public int getSize() { return strings.length; } 
    … …  
    431429 
    432430        StationTable.setModel(new javax.swing.table.DefaultTableModel( 
    433             new Object [][] 
    434             { 
     431            new Object [][] { 
    435432                {null, null, null, null}, 
    436433                {null, null, null, null}, 
    … …  
    438435                {null, null, null, null} 
    439436            }, 
    440             new String [] 
    441             { 
     437            new String [] { 
    442438                "Title 1", "Title 2", "Title 3", "Title 4" 
    443439            } 
    … …  
    459455 
    460456        LoopDetectorTable.setModel(new javax.swing.table.DefaultTableModel( 
    461             new Object [][] 
    462             { 
     457            new Object [][] { 
    463458                {null, null, null, null}, 
    464459                {null, null, null, null}, 
    … …  
    466461                {null, null, null, null} 
    467462            }, 
    468             new String [] 
    469             { 
     463            new String [] { 
    470464                "Title 1", "Title 2", "Title 3", "Title 4" 
    471465            } 
    … …  
    632626 
    633627        AddNewEventButton.setText("Add New Event"); 
    634         AddNewEventButton.addActionListener(new java.awt.event.ActionListener() 
    635         { 
    636             public void actionPerformed(java.awt.event.ActionEvent evt) 
    637             { 
     628        AddNewEventButton.addActionListener(new java.awt.event.ActionListener() { 
     629            public void actionPerformed(java.awt.event.ActionEvent evt) { 
    638630                AddLaneEventButtonActionPerformed(evt); 
    639631            } 
    … …  
    641633 
    642634        DeleteEventButton.setText("Delete Selected Event"); 
    643         DeleteEventButton.addActionListener(new java.awt.event.ActionListener() 
    644         { 
    645             public void actionPerformed(java.awt.event.ActionEvent evt) 
    646             { 
     635        DeleteEventButton.addActionListener(new java.awt.event.ActionListener() { 
     636            public void actionPerformed(java.awt.event.ActionEvent evt) { 
    647637                DeleteEventButtonActonPerformed(evt); 
    648638            } 
    … …  
    690680 
    691681        SinglePreviewStationButton.setText("Send Selected Station Events"); 
    692         SinglePreviewStationButton.addActionListener(new java.awt.event.ActionListener() 
    693         { 
    694             public void actionPerformed(java.awt.event.ActionEvent evt) 
    695             { 
     682        SinglePreviewStationButton.addActionListener(new java.awt.event.ActionListener() { 
     683            public void actionPerformed(java.awt.event.ActionEvent evt) { 
    696684                SinglePreviewStationButtonActionPerformed(evt); 
    697685            } 
    … …  
    699687 
    700688        SinglePreviewHighwaysButton.setText("Send All Events"); 
    701         SinglePreviewHighwaysButton.addActionListener(new java.awt.event.ActionListener() 
    702         { 
    703             public void actionPerformed(java.awt.event.ActionEvent evt) 
    704             { 
     689        SinglePreviewHighwaysButton.addActionListener(new java.awt.event.ActionListener() { 
     690            public void actionPerformed(java.awt.event.ActionEvent evt) { 
    705691                SinglePreviewHighwaysButtonActionPerformed(evt); 
    706692            } 
    … …  
    733719 
    734720        CumulativePreviewStationButton.setText("Send Selected Station Events"); 
    735         CumulativePreviewStationButton.addActionListener(new java.awt.event.ActionListener() 
    736         { 
    737             public void actionPerformed(java.awt.event.ActionEvent evt) 
    738             { 
     721        CumulativePreviewStationButton.addActionListener(new java.awt.event.ActionListener() { 
     722            public void actionPerformed(java.awt.event.ActionEvent evt) { 
    739723                CumulativeStationPreviewButtonActionPerformed(evt); 
    740724            } 
    … …  
    742726 
    743727        CumulativePreviewHighwaysButton.setText("Send All Events"); 
    744         CumulativePreviewHighwaysButton.addActionListener(new java.awt.event.ActionListener() 
    745         { 
    746             public void actionPerformed(java.awt.event.ActionEvent evt) 
    747             { 
     728        CumulativePreviewHighwaysButton.addActionListener(new java.awt.event.ActionListener() { 
     729            public void actionPerformed(java.awt.event.ActionEvent evt) { 
    748730                CumulativeHighwaysPreviewButtonActionPerformed(evt); 
    749731            } 
    … …  
    775757        jPanel3.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(0, 0, 0)), "Time Frame")); 
    776758 
    777         TimeFrameList.setModel(new javax.swing.AbstractListModel() 
    778         { 
     759        TimeFrameList.setModel(new javax.swing.AbstractListModel() { 
    779760            String[] strings = { "Item 1", "Item 2", "Item 3", "Item 4", "Item 5" }; 
    780761            public int getSize() { return strings.length; } 
    … …  
    787768        AddNewTimeFrameButton.setText("New"); 
    788769        AddNewTimeFrameButton.setActionCommand("addTimeFrame"); 
    789         AddNewTimeFrameButton.addActionListener(new java.awt.event.ActionListener() 
    790         { 
    791             public void actionPerformed(java.awt.event.ActionEvent evt) 
    792             { 
     770        AddNewTimeFrameButton.addActionListener(new java.awt.event.ActionListener() { 
     771            public void actionPerformed(java.awt.event.ActionEvent evt) { 
    793772                addNewTimeFrameButtonClicked(evt); 
    794773            } 
    … …  
    796775 
    797776        DeleteTimeFrameButton.setText("Delete"); 
    798         DeleteTimeFrameButton.addActionListener(new java.awt.event.ActionListener() 
    799         { 
    800             public void actionPerformed(java.awt.event.ActionEvent evt) 
    801             { 
     777        DeleteTimeFrameButton.addActionListener(new java.awt.event.ActionListener() { 
     778            public void actionPerformed(java.awt.event.ActionEvent evt) { 
    802779                DeleteTimeFrameButtonActionPerformed(evt); 
    803780            } 
    … …  
    844821 
    845822        TrafficLaneEventsTable.setModel(new javax.swing.table.DefaultTableModel( 
    846             new Object [][] 
    847             { 
     823            new Object [][] { 
    848824                {null, null, null, null}, 
    849825                {null, null, null, null}, 
    … …  
    851827                {null, null, null, null} 
    852828            }, 
    853             new String [] 
    854             { 
     829            new String [] { 
    855830                "Title 1", "Title 2", "Title 3", "Title 4" 
    856831            } 
    … …  
    897872 
    898873        btnSave.setText("Save Script"); 
    899         btnSave.addActionListener(new java.awt.event.ActionListener() 
    900         { 
    901             public void actionPerformed(java.awt.event.ActionEvent evt) 
    902             { 
     874        btnSave.addActionListener(new java.awt.event.ActionListener() { 
     875            public void actionPerformed(java.awt.event.ActionEvent evt) { 
    903876                btnSaveActionPerformed(evt); 
    904877            } 

  • trunk/src/tmcsim/highwaymodel/trafficeventseditor/TrafficLaneEvent.java

    r422 r457  
    1 package atmsdriver.trafficeventseditor; 
     1package tmcsim.highwaymodel.trafficeventseditor; 
    22 
    33import tmcsim.highwaymodel.LoopDetector; 

  • trunk/test/tmcsim/highwaymodel/ConsoleTrafficDriver.java

    r443 r457  
    1 package atmsdriver; 
     1package tmcsim.highwaymodel; 
    22 
    33import tmcsim.highwaymodel.Highways; 
    … …  
    1414import java.util.logging.Logger; 
    1515import tmcsim.common.SimulationException; 
     16import tmcsim.highwaymodel.Highway; 
     17import tmcsim.highwaymodel.Highways; 
     18import tmcsim.highwaymodel.Station; 
    1619 
    1720/** 
    1821 * A console application to drive the ATMS Server. 
    19  * Use for test driving the FEP Simulator.   OBSOLETE as of completion of CPTMS. 
     22 * Use for test driving the Highway Model. 
    2023 * 
    2124 * @author jdalbey, John A. Torres 

  • trunk/test/tmcsim/highwaymodel/TrafficModelEventDriver.java

    r422 r457  
    1 package atmsdriver; 
     1package tmcsim.highwaymodel; 
    22 
    33import tmcsim.highwaymodel.Highways; 
Note: See TracChangeset for help on using the changeset viewer.