diff --git a/AlgebraicDataflowArchitectureModel/src/simulator/interfaces/html/HtmlElementTableReceiver.java b/AlgebraicDataflowArchitectureModel/src/simulator/interfaces/html/HtmlElementTableReceiver.java index 37e5173..617ed9e 100644 --- a/AlgebraicDataflowArchitectureModel/src/simulator/interfaces/html/HtmlElementTableReceiver.java +++ b/AlgebraicDataflowArchitectureModel/src/simulator/interfaces/html/HtmlElementTableReceiver.java @@ -54,7 +54,9 @@ MapTerm datas = new MapTerm(); datas.insert("nextTableData", nextTableData); json.addMember("datas", datas); - + System.out.println("--------------------------"); + System.out.println(datas); + System.out.println("--------------------------"); ws.send(json.toString(), sessionId); } } diff --git a/AlgebraicDataflowArchitectureModel/src/simulator/interfaces/html/HtmlPresenter.java b/AlgebraicDataflowArchitectureModel/src/simulator/interfaces/html/HtmlPresenter.java index c620566..1fe270b 100644 --- a/AlgebraicDataflowArchitectureModel/src/simulator/interfaces/html/HtmlPresenter.java +++ b/AlgebraicDataflowArchitectureModel/src/simulator/interfaces/html/HtmlPresenter.java @@ -38,6 +38,7 @@ public final String setVisibleChannelName = "SetVisible"; public final String setTextChannelName = "SetText"; public final String setTableChannelName = "OnTableChanged"; + public final String setTableChannelName2 = "OnTableChanged2"; public final String mouseEventChannelName = "MouseEvent"; public final String textEventChannelName = "TextEvent"; @@ -49,6 +50,7 @@ protected DataTransferChannel textEventChannel; protected DataTransferChannel setTextChannel; protected DataTransferChannel setTableChannel; + protected DataTransferChannel setTableChannel2; protected Map> channelAndResourcesForReceiving = new HashMap<>(); @@ -70,6 +72,7 @@ setTextChannel = (DataTransferChannel) simulator.getModel().getChannel(setTextChannelName); textEventChannel = (DataTransferChannel) simulator.getModel().getInputChannel(textEventChannelName); setTableChannel = (DataTransferChannel) simulator.getModel().getChannel(setTableChannelName); + setTableChannel2 = (DataTransferChannel) simulator.getModel().getChannel(setTableChannelName2); simulator.addNativeReceiver(this, screenUpdateChannel); elements = elems; @@ -167,7 +170,7 @@ addTextInput(widget, newWid, addElements, widgetResource); break; case "\"table\"": - addTable(widget, newWid, addElements, screenTemplateResource.getChildrenMap().get("widgets").getChildrenMap().get(newWid)); + addTable(widget, newWid, addElements, screenTemplateResource.getChildrenMap().get("widgets").getChildrenMap().get(newWid), widgetResource); break; } } @@ -318,7 +321,7 @@ addElements.append(textInput.toMap()); } - private void addTable(JsonTerm widget, String wid, ListTerm addElements, Resource widgetResource) { + private void addTable(JsonTerm widget, String wid, ListTerm addElements, Resource widgetResource, Resource widgetResource2) { String text = widget.get("text").toString(); HtmlElement table = new HtmlElement("table", wid, text); @@ -426,6 +429,7 @@ //テーブルのデータが変更されたことを通知 HtmlElementTableReceiver nativeTableReceiver = new HtmlElementTableReceiver(table, ws, sessionId); simulator.addNativeReceiver(nativeTableReceiver, setTableChannel, widgetResource.getChildrenMap().get("data")); + simulator.addNativeReceiver(nativeTableReceiver, setTableChannel2, widgetResource2.getChildrenMap().get("data")); resources = channelAndResourcesForReceiving.get(setTableChannel); if (resources == null) { resources = new HashMap<>();