diff --git a/AlgebraicDataflowArchitectureModel/models/SimpleUI.model b/AlgebraicDataflowArchitectureModel/models/SimpleUI.model index f393c9d..584d8e3 100644 --- a/AlgebraicDataflowArchitectureModel/models/SimpleUI.model +++ b/AlgebraicDataflowArchitectureModel/models/SimpleUI.model @@ -17,3 +17,15 @@ native channel TextEvent(wid: Str) { out screen.widgets.{wid}.text(curText: Str, textEvent(nextText)) = nextText } + +channel AddButton { + out screen.widgets(widgets: Map, addButton(wid: Str, text: Str)) = insert(widgets, wid, {"type": "button", "text": text, "state": 0}) +} + +channel AddLabel { + out screen.widgets(widgets: Map, addLabel(wid: Str, text: Str)) = insert(widgets, wid, {"type": "label", "text": text, "state": 0}) +} + +channel AddInputText { + out screen.widgets(widgets: Map, addInputText(wid: Str)) = insert(widgets, wid, {"type": "inputText", "state": 0}) +} diff --git a/AlgebraicDataflowArchitectureModel/src/application/SimulatorWindow.java b/AlgebraicDataflowArchitectureModel/src/application/SimulatorWindow.java index 6a0684b..915eb6c 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/SimulatorWindow.java +++ b/AlgebraicDataflowArchitectureModel/src/application/SimulatorWindow.java @@ -61,9 +61,6 @@ public class SimulatorWindow extends JFrame{ - /** - * - */ private static final long serialVersionUID = -2425820512017088254L; public static final String title = "Simulation Tool"; @@ -73,7 +70,10 @@ private Editor editor = null; private mxGraph graph = null; private mxGraphComponent graphComponent = null; + private UIWindow uiWindow; + private Simulator simulator = null; + private boolean bReflectingArchitectureModel = false; private double x = 20; private double y = 20; @@ -131,6 +131,8 @@ simulator = new Simulator(model); constructSimulateGraph(simulator.getCurState().getRootResources(), this.editor.getModel(),this.editor.getDataFlowGraph()); graphComponent.setCellEditor(new InputEventCellEditor(graphComponent, simulator, this.editor, graph)); + + uiWindow = new UIWindow(simulator); } diff --git a/AlgebraicDataflowArchitectureModel/src/application/UIWindow.java b/AlgebraicDataflowArchitectureModel/src/application/UIWindow.java new file mode 100644 index 0000000..97ca1e3 --- /dev/null +++ b/AlgebraicDataflowArchitectureModel/src/application/UIWindow.java @@ -0,0 +1,26 @@ +package application; + +import javax.swing.JFrame; +import javax.swing.JPanel; + +import simulator.Simulator; +import simulator.interfaces.swing.SwingPresenter; + +public class UIWindow extends JFrame { + + private static final long serialVersionUID = 1770206525826167136L; + private SwingPresenter presenter; + private Simulator simulator; + private JPanel mainPanel; + + public UIWindow(Simulator simulator) { + setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + this.simulator = simulator; + mainPanel = new JPanel(); + presenter = new SwingPresenter(mainPanel, simulator); + this.add(mainPanel); + + setSize(870,640); + setVisible(true); + } +} diff --git a/AlgebraicDataflowArchitectureModel/src/models/algebra/Term.java b/AlgebraicDataflowArchitectureModel/src/models/algebra/Term.java index 1b5a6ac..3398f18 100644 --- a/AlgebraicDataflowArchitectureModel/src/models/algebra/Term.java +++ b/AlgebraicDataflowArchitectureModel/src/models/algebra/Term.java @@ -172,8 +172,11 @@ boolean bReduced = false; for (Expression child: children) { if (child instanceof Term && !(child instanceof Constant)) { - child = ((Term) (child)).reduce(); - bReduced = true; + Expression newChild = ((Term) (child)).reduce(); + if (newChild != child) { + bReduced = true; + child = newChild; + } } newChildren.add(child); } diff --git a/AlgebraicDataflowArchitectureModel/src/simulator/interfaces/swing/SwingPresenter.java b/AlgebraicDataflowArchitectureModel/src/simulator/interfaces/swing/SwingPresenter.java index f8b3b2e..68df398 100644 --- a/AlgebraicDataflowArchitectureModel/src/simulator/interfaces/swing/SwingPresenter.java +++ b/AlgebraicDataflowArchitectureModel/src/simulator/interfaces/swing/SwingPresenter.java @@ -1,6 +1,7 @@ package simulator.interfaces.swing; import java.awt.Component; +import java.awt.Toolkit; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -10,8 +11,10 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTextField; +import javax.swing.SwingUtilities; import models.algebra.Expression; +import models.algebra.Term; import models.dataConstraintModel.JsonTerm; import models.dataConstraintModel.MapTerm; import models.dataConstraintModel.ResourcePath; @@ -39,87 +42,95 @@ public SwingPresenter(JPanel mainPanel, Simulator simulator) { this.mainPanel = mainPanel; this.simulator = simulator; + components = new HashMap<>(); screenUpdateChannel = (DataTransferChannel) simulator.getModel().getChannel(screenUpdateChannelName); setVisibleChannel = (DataTransferChannel) simulator.getModel().getChannel(setVisibleChannelName); - mouseEventChannel = (DataTransferChannel) simulator.getModel().getChannel(mouseEventChannelName); - textEventChannel = (DataTransferChannel) simulator.getModel().getChannel(textEventChannelName); + mouseEventChannel = (DataTransferChannel) simulator.getModel().getInputChannel(mouseEventChannelName); + textEventChannel = (DataTransferChannel) simulator.getModel().getInputChannel(textEventChannelName); simulator.addNativeReceiver(this, screenUpdateChannel); } @Override public void onReceiveFromModel(Event event) { Expression message = event.getMessage(); - if (message instanceof JsonTerm) { - // Remove old native receivers. - for (DataTransferChannel channel: channelAndResourcesForReceiving.keySet()) { - for (Resource resource: channelAndResourcesForReceiving.get(channel)) { - simulator.removeNativeReceiver(channel, resource); + if (message instanceof Term && ((Term) message).getChildren().size() == 1) { + message = ((Term) message).getChild(0); + if (message instanceof JsonTerm) { + // Remove old native receivers. + for (DataTransferChannel channel: channelAndResourcesForReceiving.keySet()) { + for (Resource resource: channelAndResourcesForReceiving.get(channel)) { + simulator.removeNativeReceiver(channel, resource); + } } - } - channelAndResourcesForReceiving.clear(); - - // Reconstruct swing components. - JsonTerm screenContent = (JsonTerm) message; - Resource screenResource = simulator.getCurState().getResource(event.getInputResource().getResourceIdentifier()); - Expression widgets = screenContent.get("\"widgets\""); - Resource widgetsResource = screenResource.getChildrenMap().get("\"widgets\""); - if (widgets instanceof MapTerm) { - for (String key: ((MapTerm) widgets).keySet()) { - Expression value = ((MapTerm) widgets).get(key); - if (value instanceof JsonTerm) { - JsonTerm widget = (JsonTerm) value; - Resource widgetResource = widgetsResource.getChildrenMap().get(key); - Expression type = widget.get("\"type\""); - if (type.toString().equals("button")) { - // Add a button component. - Expression text = widget.get("\"text\""); - JButton button = new JButton(text.toString().toString()); - mainPanel.add(button); - components.put(key, button); - // Connect swing component and model. - ResourcePath resPath = mouseEventChannel.getOutputResources().iterator().next(); - button.addMouseListener(new ComponentMouseSender(simulator, mouseEventChannel, resPath, widgetResource)); // button => widgetResource - ComponentVisibilityReceiver nativeReceiver = new ComponentVisibilityReceiver(button); // widgetResource => button - simulator.addNativeReceiver(nativeReceiver, setVisibleChannel, widgetResource); - Set resources = channelAndResourcesForReceiving.get(setVisibleChannel); - if (resources == null) { - resources = new HashSet<>(); - channelAndResourcesForReceiving.put(setVisibleChannel, resources); + channelAndResourcesForReceiving.clear(); + + // Reconstruct swing components. + JsonTerm screenContent = (JsonTerm) message; + Resource screenResource = simulator.getCurState().getResource(event.getInputResource().getResourceIdentifier()); + Expression widgets = screenContent.get("widgets"); + Resource widgetsResource = screenResource.getChildrenMap().get("widgets"); + if (widgets instanceof MapTerm) { + mainPanel.removeAll(); + for (String key: ((MapTerm) widgets).keySet()) { + Expression value = ((MapTerm) widgets).get(key); + if (value instanceof JsonTerm) { + JsonTerm widget = (JsonTerm) value; + Resource widgetResource = widgetsResource.getChildrenMap().get(key); + Expression type = widget.get("\"type\""); + if (type.toString().equals("\"button\"")) { + // Add a button component. + Expression text = widget.get("\"text\""); + JButton button = new JButton(text.toString().replace("\"", "")); + mainPanel.add(button); + components.put(key, button); + // Connect swing component and model. + ResourcePath resPath = mouseEventChannel.getOutputResources().iterator().next(); + button.addMouseListener(new ComponentMouseSender(simulator, mouseEventChannel, resPath, widgetResource)); // button => widgetResource + ComponentVisibilityReceiver nativeReceiver = new ComponentVisibilityReceiver(button); // widgetResource => button + simulator.addNativeReceiver(nativeReceiver, setVisibleChannel, widgetResource); + Set resources = channelAndResourcesForReceiving.get(setVisibleChannel); + if (resources == null) { + resources = new HashSet<>(); + channelAndResourcesForReceiving.put(setVisibleChannel, resources); + } + resources.add(widgetsResource); + } else if (type.toString().equals("\"label\"")) { + // Add a label component. + Expression text = widget.get("\"text\""); + JLabel label = new JLabel(text.toString().replace("\"", "")); + mainPanel.add(label); + components.put(key, label); + // Connect swing component and model. + ComponentVisibilityReceiver nativeReceiver = new ComponentVisibilityReceiver(label); + simulator.addNativeReceiver(nativeReceiver, setVisibleChannel, widgetResource); + Set resources = channelAndResourcesForReceiving.get(setVisibleChannel); + if (resources == null) { + resources = new HashSet<>(); + channelAndResourcesForReceiving.put(setVisibleChannel, resources); + } + resources.add(widgetsResource); + } else if (type.toString().equals("\"inputText\"")) { + // Add a text input component. + JTextField textField = new JTextField(10); + mainPanel.add(textField); + components.put(key, textField); + // Connect swing component and model. + ResourcePath resPath = textEventChannel.getOutputResources().iterator().next(); + textField.addInputMethodListener(new ComponentTextSender(simulator, textEventChannel, resPath, widgetResource)); // textField => widgetResource + ComponentVisibilityReceiver nativeReceiver = new ComponentVisibilityReceiver(textField); // widgetResource => textField + simulator.addNativeReceiver(nativeReceiver, setVisibleChannel, widgetResource); + Set resources = channelAndResourcesForReceiving.get(setVisibleChannel); + if (resources == null) { + resources = new HashSet<>(); + channelAndResourcesForReceiving.put(setVisibleChannel, resources); + } + resources.add(widgetsResource); } - resources.add(widgetsResource); - } else if (type.toString().equals("label")) { - // Add a label component. - Expression text = widget.get("\"text\""); - JLabel label = new JLabel(text.toString().toString()); - mainPanel.add(label); - components.put(key, label); - // Connect swing component and model. - ComponentVisibilityReceiver nativeReceiver = new ComponentVisibilityReceiver(label); - simulator.addNativeReceiver(nativeReceiver, setVisibleChannel, widgetResource); - Set resources = channelAndResourcesForReceiving.get(setVisibleChannel); - if (resources == null) { - resources = new HashSet<>(); - channelAndResourcesForReceiving.put(setVisibleChannel, resources); - } - resources.add(widgetsResource); - } else if (type.toString().equals("inputText")) { - // Add a text input component. - JTextField textField = new JTextField(); - mainPanel.add(textField); - components.put(key, textField); - // Connect swing component and model. - ResourcePath resPath = textEventChannel.getOutputResources().iterator().next(); - textField.addInputMethodListener(new ComponentTextSender(simulator, textEventChannel, resPath, widgetResource)); // textField => widgetResource - ComponentVisibilityReceiver nativeReceiver = new ComponentVisibilityReceiver(textField); // widgetResource => textField - simulator.addNativeReceiver(nativeReceiver, setVisibleChannel, widgetResource); - Set resources = channelAndResourcesForReceiving.get(setVisibleChannel); - if (resources == null) { - resources = new HashSet<>(); - channelAndResourcesForReceiving.put(setVisibleChannel, resources); - } - resources.add(widgetsResource); } } + mainPanel.invalidate(); + mainPanel.validate(); + mainPanel.repaint(); } } } diff --git a/AlgebraicDataflowArchitectureModel/src/simulator/states/ListResourceState.java b/AlgebraicDataflowArchitectureModel/src/simulator/states/ListResourceState.java index 022a32f..0e45334 100644 --- a/AlgebraicDataflowArchitectureModel/src/simulator/states/ListResourceState.java +++ b/AlgebraicDataflowArchitectureModel/src/simulator/states/ListResourceState.java @@ -9,19 +9,16 @@ import models.algebra.Expression; import models.algebra.Term; import models.dataConstraintModel.DataConstraintModel; +import models.dataConstraintModel.ListTerm; public class ListResourceState extends CompositeResourceState { private List children = new ArrayList<>(); @Override public Expression getValue() { - Term value = new Constant(DataConstraintModel.nil); - value.setType(DataConstraintModel.typeList); + ListTerm value = new ListTerm(); for (ResourceState child: children) { - Term newTerm = new Term(DataConstraintModel.append); - newTerm.addChild(value); - newTerm.addChild(child.getValue()); - value = newTerm; + value.append(child.getValue()); } return value; } diff --git a/AlgebraicDataflowArchitectureModel/src/simulator/states/MapResourceState.java b/AlgebraicDataflowArchitectureModel/src/simulator/states/MapResourceState.java index 5bd2fc7..e03d70e 100644 --- a/AlgebraicDataflowArchitectureModel/src/simulator/states/MapResourceState.java +++ b/AlgebraicDataflowArchitectureModel/src/simulator/states/MapResourceState.java @@ -7,20 +7,17 @@ import models.algebra.Expression; import models.algebra.Term; import models.dataConstraintModel.DataConstraintModel; +import models.dataConstraintModel.MapTerm; public class MapResourceState extends CompositeResourceState { private Map children = new HashMap<>(); @Override public Expression getValue() { - Term value = new Constant(DataConstraintModel.nil); + MapTerm value = new MapTerm(); value.setType(DataConstraintModel.typeMap); for (Map.Entry childEnt: children.entrySet()) { - Term newTerm = new Term(DataConstraintModel.insert); - newTerm.addChild(value); - newTerm.addChild(new Constant(childEnt.getKey(), DataConstraintModel.typeString)); - newTerm.addChild(childEnt.getValue().getValue()); - value = newTerm; + value.insert(childEnt.getKey(), childEnt.getValue().getValue()); } return value; }