Browse code Merge branch 'dynamicResourceCreation' into two-stage-modeling # Conflicts: # AlgebraicDataflowArchitectureModel/src/application/simulator/SimulatorWindow.java dynamicResourceCreation feature-keyboard-shortcuts fix-window-position htmlGUi two-stage-modeling update-dtram-parser
commit 8894650048cbf3b1c2a2f0e59e8126bd12f14034 2 parents 8bd7f5b + e69508c Shohei Yamagiwa authored on 7 Oct

Showing 40 changed files

• AlgebraicDataflowArchitectureModel/models/Accounts.model
• AlgebraicDataflowArchitectureModel/models/SimpleUI.model
• AlgebraicDataflowArchitectureModel/models/Timer.model
• AlgebraicDataflowArchitectureModel/src/application/SimulatorWindow.java
• AlgebraicDataflowArchitectureModel/src/application/actions/SimulateAction.java
• AlgebraicDataflowArchitectureModel/src/application/editor/InputEventCellEditor.java
• AlgebraicDataflowArchitectureModel/src/application/simulator/InputEventCellEditor.java
• AlgebraicDataflowArchitectureModel/src/application/simulator/SimulationLayout.java
• AlgebraicDataflowArchitectureModel/src/application/simulator/SimulatorMenuBar.java
• AlgebraicDataflowArchitectureModel/src/application/simulator/SimulatorWindow.java
• AlgebraicDataflowArchitectureModel/src/application/simulator/UISimulatorWindow.java
• AlgebraicDataflowArchitectureModel/src/application/simulator/actions/ShowUISimulatorAction.java
• AlgebraicDataflowArchitectureModel/src/models/algebra/Term.java
• AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java
• AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/JsonTerm.java
• AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/ListTerm.java
• AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/MapTerm.java
• AlgebraicDataflowArchitectureModel/src/parser/Parser.java
• AlgebraicDataflowArchitectureModel/src/simulator/ChannelState.java
• AlgebraicDataflowArchitectureModel/src/simulator/Event.java
• AlgebraicDataflowArchitectureModel/src/simulator/Resource.java
• AlgebraicDataflowArchitectureModel/src/simulator/Simulator.java
• AlgebraicDataflowArchitectureModel/src/simulator/SystemState.java
• AlgebraicDataflowArchitectureModel/src/simulator/interfaces/INativeReceiver.java
• AlgebraicDataflowArchitectureModel/src/simulator/interfaces/swing/ComponentHeightReceiver.java
• AlgebraicDataflowArchitectureModel/src/simulator/interfaces/swing/ComponentTextReceiver.java
• AlgebraicDataflowArchitectureModel/src/simulator/interfaces/swing/ComponentTextSender.java
• AlgebraicDataflowArchitectureModel/src/simulator/interfaces/swing/ComponentVisibilityReceiver.java
• AlgebraicDataflowArchitectureModel/src/simulator/interfaces/swing/ComponentWidthReceiver.java
• AlgebraicDataflowArchitectureModel/src/simulator/interfaces/swing/ComponentXReceiver.java
• AlgebraicDataflowArchitectureModel/src/simulator/interfaces/swing/ComponentYReceiver.java
• AlgebraicDataflowArchitectureModel/src/simulator/interfaces/swing/SwingPresenter.java
• AlgebraicDataflowArchitectureModel/src/simulator/interfaces/timers/TimerEventSender.java
• AlgebraicDataflowArchitectureModel/src/simulator/interfaces/timers/TimerService.java
• AlgebraicDataflowArchitectureModel/src/simulator/states/JsonResourceState.java
• AlgebraicDataflowArchitectureModel/src/simulator/states/ListResourceState.java
• AlgebraicDataflowArchitectureModel/src/simulator/states/MapResourceState.java
• AlgebraicDataflowArchitectureModel/src/simulator/states/PrimitiveResourceState.java
• AlgebraicDataflowArchitectureModel/src/simulator/states/State.java
• AlgebraicDataflowArchitectureModel/src/tests/NativeAccessTest.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/models/Accounts.model

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/models/SimpleUI.model

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/models/Timer.model 0 → 100644

Show notes View AlgebraicDataflowArchitectureModel/src/application/SimulatorWindow.java 100644 → 0

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/application/actions/SimulateAction.java

Show notes View AlgebraicDataflowArchitectureModel/src/application/editor/InputEventCellEditor.java 100644 → 0

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/application/simulator/InputEventCellEditor.java 0 → 100644

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/application/simulator/SimulationLayout.java 0 → 100644

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/application/simulator/SimulatorMenuBar.java 0 → 100644

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/application/simulator/SimulatorWindow.java 0 → 100644

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/application/simulator/UISimulatorWindow.java 0 → 100644

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/application/simulator/actions/ShowUISimulatorAction.java 0 → 100644

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/models/algebra/Term.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/JsonTerm.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/ListTerm.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/MapTerm.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/parser/Parser.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/simulator/ChannelState.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/simulator/Event.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/simulator/Resource.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/simulator/Simulator.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/simulator/SystemState.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/simulator/interfaces/INativeReceiver.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/simulator/interfaces/swing/ComponentHeightReceiver.java 0 → 100644

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/simulator/interfaces/swing/ComponentTextReceiver.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/simulator/interfaces/swing/ComponentTextSender.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/simulator/interfaces/swing/ComponentVisibilityReceiver.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/simulator/interfaces/swing/ComponentWidthReceiver.java 0 → 100644

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/simulator/interfaces/swing/ComponentXReceiver.java 0 → 100644

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/simulator/interfaces/swing/ComponentYReceiver.java 0 → 100644

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/simulator/interfaces/swing/SwingPresenter.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/simulator/interfaces/timers/TimerEventSender.java 0 → 100644

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/simulator/interfaces/timers/TimerService.java 0 → 100644

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/simulator/states/JsonResourceState.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/simulator/states/ListResourceState.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/simulator/states/MapResourceState.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/simulator/states/PrimitiveResourceState.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/simulator/states/State.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/tests/NativeAccessTest.java

Show line notes below