diff --git a/src/BusinessCardManagement.java b/src/BusinessCardManagement.java index a6e4385..a83b8aa 100644 --- a/src/BusinessCardManagement.java +++ b/src/BusinessCardManagement.java @@ -68,7 +68,7 @@ String w2d109ad3739d4744a1874ac179fc38b9 = this.w2d109ad3739d4744a1874ac179fc38b9.getValue(); String companyList = this.companyList.getValue(); this.widget = screenTemplates.getScreenTemplate(companyList).getWidgets1().getWidget1(w2d109ad3739d4744a1874ac179fc38b9); - this.widget.updateDataFromBusinessCardManagement3(scId, wid, this.getValue(), w2d109ad3739d4744a1874ac179fc38b9, companyList); + this.widget.updateDataFromBusinessCardManagement3(scId, wid, this.getValue(), companyList, w2d109ad3739d4744a1874ac179fc38b9); String w4ca84254d30c423ab8e449171a5b5123 = this.w4ca84254d30c423ab8e449171a5b5123.getValue(); String searchScreen = this.searchScreen.getValue(); this.widget = screenTemplates.getScreenTemplate(searchScreen).getWidgets1().getWidget1(w4ca84254d30c423ab8e449171a5b5123); @@ -90,7 +90,7 @@ String w2d109ad3739d4744a1874ac179fc38b9 = this.w2d109ad3739d4744a1874ac179fc38b9.getValue(); String companyList = this.companyList.getValue(); this.widget = screenTemplates.getScreenTemplate(companyList).getWidgets1().getWidget1(w2d109ad3739d4744a1874ac179fc38b9); - this.widget.updateDataFromBusinessCardManagement3(scId, wid, this.getValue(), w2d109ad3739d4744a1874ac179fc38b9, companyList); + this.widget.updateDataFromBusinessCardManagement3(scId, wid, this.getValue(), companyList, w2d109ad3739d4744a1874ac179fc38b9); String w4ca84254d30c423ab8e449171a5b5123 = this.w4ca84254d30c423ab8e449171a5b5123.getValue(); String searchScreen = this.searchScreen.getValue(); this.widget = screenTemplates.getScreenTemplate(searchScreen).getWidgets1().getWidget1(w4ca84254d30c423ab8e449171a5b5123); @@ -112,7 +112,7 @@ String w2d109ad3739d4744a1874ac179fc38b9 = this.w2d109ad3739d4744a1874ac179fc38b9.getValue(); String companyList = this.companyList.getValue(); this.widget = screenTemplates.getScreenTemplate(companyList).getWidgets1().getWidget1(w2d109ad3739d4744a1874ac179fc38b9); - this.widget.updateDataFromBusinessCardManagement3(scId, wid, this.getValue(), w2d109ad3739d4744a1874ac179fc38b9, companyList); + this.widget.updateDataFromBusinessCardManagement3(scId, wid, this.getValue(), companyList, w2d109ad3739d4744a1874ac179fc38b9); String w4ca84254d30c423ab8e449171a5b5123 = this.w4ca84254d30c423ab8e449171a5b5123.getValue(); String searchScreen = this.searchScreen.getValue(); this.widget = screenTemplates.getScreenTemplate(searchScreen).getWidgets1().getWidget1(w4ca84254d30c423ab8e449171a5b5123); @@ -127,7 +127,7 @@ String w2d109ad3739d4744a1874ac179fc38b9 = this.w2d109ad3739d4744a1874ac179fc38b9.getValue(); String companyList = this.companyList.getValue(); this.widget = screenTemplates.getScreenTemplate(companyList).getWidgets1().getWidget1(w2d109ad3739d4744a1874ac179fc38b9); - this.widget.updateDataFromBusinessCardManagement3(scId, wid, this.getValue(), w2d109ad3739d4744a1874ac179fc38b9, companyList); + this.widget.updateDataFromBusinessCardManagement3(scId, wid, this.getValue(), companyList, w2d109ad3739d4744a1874ac179fc38b9); String w4ca84254d30c423ab8e449171a5b5123 = this.w4ca84254d30c423ab8e449171a5b5123.getValue(); String searchScreen = this.searchScreen.getValue(); this.widget = screenTemplates.getScreenTemplate(searchScreen).getWidgets1().getWidget1(w4ca84254d30c423ab8e449171a5b5123); @@ -178,10 +178,22 @@ = new BusinessCardManagementElement("", "", "", address, "", "", "", "", "", names[0], positions[0], tells[0], "", names[1], positions[1], tells[1], "",names[2], positions[2], tells[2], "",names[3], positions[3], tells[3], ""); value.put(companyName, bussinessCard); } -// screen.getPresenter().setTable(curScreen, w2d109ad3739d4744a1874ac179fc38b9.getValue(), getValue()); + String searchCriteriaScreen = this.searchCriteriaScreen.getValue(); + String res = this.result.getValue(); + this.widget = screenTemplates.getScreenTemplate(searchCriteriaScreen).getWidgets1().getWidget1(res); + this.widget.updateDataFromBusinessCardManagement(searchCriteriaScreen, res, this.getValue(), searchCriteriaScreen, res); + String w2d109ad3739d4744a1874ac179fc38b9 = this.w2d109ad3739d4744a1874ac179fc38b9.getValue(); + String companyList = this.companyList.getValue(); + this.widget = screenTemplates.getScreenTemplate(companyList).getWidgets1().getWidget1(w2d109ad3739d4744a1874ac179fc38b9); + this.widget.updateDataFromBusinessCardManagement3(companyList, w2d109ad3739d4744a1874ac179fc38b9, this.getValue(), companyList, w2d109ad3739d4744a1874ac179fc38b9); + String w4ca84254d30c423ab8e449171a5b5123 = this.w4ca84254d30c423ab8e449171a5b5123.getValue(); + String searchScreen = this.searchScreen.getValue(); + this.widget = screenTemplates.getScreenTemplate(searchScreen).getWidgets1().getWidget1(w4ca84254d30c423ab8e449171a5b5123); + this.widget.updateDataFromBusinessCardManagement2(searchScreen, w4ca84254d30c423ab8e449171a5b5123, this.getValue(), w4ca84254d30c423ab8e449171a5b5123, searchScreen); +// screen.getPresenter().setTable(companyList, w2d109ad3739d4744a1874ac179fc38b9.getValue(), getValue()); } catch (IOException e) { e.printStackTrace(); - JOptionPane.showMessageDialog(mainPanel, "ファイルの読み込みに失敗しました。"); + JOptionPane.showMessageDialog(mainPanel, "ファイルの取り込みに失敗しました。"); } } } @@ -225,7 +237,19 @@ ); value.put(values[0], businessCard); } -// screen.getPresenter().setTable(curScreen, w2d109ad3739d4744a1874ac179fc38b9.getValue(), getValue()); + String searchCriteriaScreen = this.searchCriteriaScreen.getValue(); + String result = this.result.getValue(); + this.widget = screenTemplates.getScreenTemplate(searchCriteriaScreen).getWidgets1().getWidget1(result); + this.widget.updateData(this.getValue()); + String w2d109ad3739d4744a1874ac179fc38b9 = this.w2d109ad3739d4744a1874ac179fc38b9.getValue(); + String companyList = this.companyList.getValue(); + this.widget = screenTemplates.getScreenTemplate(companyList).getWidgets1().getWidget1(w2d109ad3739d4744a1874ac179fc38b9); + this.widget.updateData(this.getValue()); + String w4ca84254d30c423ab8e449171a5b5123 = this.w4ca84254d30c423ab8e449171a5b5123.getValue(); + String searchScreen = this.searchScreen.getValue(); + this.widget = screenTemplates.getScreenTemplate(searchScreen).getWidgets1().getWidget1(w4ca84254d30c423ab8e449171a5b5123); + this.widget.updateData(this.getValue()); +// screen.getPresenter().setTable(companyList, w2d109ad3739d4744a1874ac179fc38b9.getValue(), getValue()); } catch (URISyntaxException | IOException e) { // TODO 自動生成された catch ブロック e.printStackTrace(); diff --git a/src/SwingPresenter.java b/src/SwingPresenter.java index 618682b..a04538c 100644 --- a/src/SwingPresenter.java +++ b/src/SwingPresenter.java @@ -395,7 +395,7 @@ } public void setTable(String scId, String wid, Map> data) { - if (!curScreenId.equals(scId)) return; + if (curScreenId == null || !curScreenId.equals(scId)) return; if (!(components.get(wid) instanceof JTable)) return; JTable table = (JTable) components.get(wid); DefaultTableModel tableModel = (DefaultTableModel) table.getModel(); diff --git a/src/Widget1.java b/src/Widget1.java index d9237eb..e134881 100644 --- a/src/Widget1.java +++ b/src/Widget1.java @@ -120,6 +120,9 @@ public void updateText(String text) { this.text = text; } + public void updateData(Map> businessCardManagement) { + this.data = businessCardManagement; + } public void updateTextFromText(String self, String self2, String wid, String text, String curScreen) { this.text = text; }