diff --git a/src/BusinessCardManagement.java b/src/BusinessCardManagement.java index 252d8fc..50e3406 100644 --- a/src/BusinessCardManagement.java +++ b/src/BusinessCardManagement.java @@ -382,19 +382,23 @@ public void delete(String curScreen, String wid, int state, String key) { if (state == 0) { - this.value.remove(key); - String searchCriteriaScreen = this.searchCriteriaScreen.getValue(); - String result = this.result.getValue(); - this.widget = screenTemplates.getScreenTemplate(searchCriteriaScreen).getWidgets1().getWidget1(result); - this.widget.updateDataFromBusinessCardManagement(searchCriteriaScreen, result, this.getValue(), searchCriteriaScreen, result); - String w2d109ad3739d4744a1874ac179fc38b9 = this.w2d109ad3739d4744a1874ac179fc38b9.getValue(); - String companyList = this.companyList.getValue(); - this.widget = screenTemplates.getScreenTemplate(companyList).getWidgets1().getWidget1(w2d109ad3739d4744a1874ac179fc38b9); - this.widget.updateDataFromBusinessCardManagement4(companyList, w2d109ad3739d4744a1874ac179fc38b9, this.getValue()); - 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); + JPanel mainPanel = screen.getPresenter().getMainPanel(); + int ret = JOptionPane.showConfirmDialog(mainPanel, key + "を削除しますか?", "削除確認", JOptionPane.YES_NO_OPTION); + if (ret == JOptionPane.YES_OPTION) { + this.value.remove(key); + String searchCriteriaScreen = this.searchCriteriaScreen.getValue(); + String result = this.result.getValue(); + this.widget = screenTemplates.getScreenTemplate(searchCriteriaScreen).getWidgets1().getWidget1(result); + this.widget.updateDataFromBusinessCardManagement(searchCriteriaScreen, result, this.getValue(), searchCriteriaScreen, result); + String w2d109ad3739d4744a1874ac179fc38b9 = this.w2d109ad3739d4744a1874ac179fc38b9.getValue(); + String companyList = this.companyList.getValue(); + this.widget = screenTemplates.getScreenTemplate(companyList).getWidgets1().getWidget1(w2d109ad3739d4744a1874ac179fc38b9); + this.widget.updateDataFromBusinessCardManagement4(companyList, w2d109ad3739d4744a1874ac179fc38b9, this.getValue()); + 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); + } } } diff --git a/src/Widget1.java b/src/Widget1.java index 327e16c..dd27f99 100644 --- a/src/Widget1.java +++ b/src/Widget1.java @@ -158,11 +158,7 @@ this.widget1 = screen.getWidgets().getWidget(w2d109ad3739d4744a1874ac179fc38b9); String w2d109ad3739d4744a1874ac179fc38b9_ = this.widget1.getText(); if (w2d109ad3739d4744a1874ac179fc38b9_ != null && !w2d109ad3739d4744a1874ac179fc38b9_.isEmpty()) { - JPanel mainPanel = screen.getPresenter().getMainPanel(); - int result = JOptionPane.showConfirmDialog(mainPanel, w2d109ad3739d4744a1874ac179fc38b9_ + "を削除しますか?", "削除確認", JOptionPane.YES_NO_OPTION); - if (result == JOptionPane.YES_OPTION) { - this.businessCardManagement.delete(curScreen, wid, this.state, w2d109ad3739d4744a1874ac179fc38b9_); - } + this.businessCardManagement.delete(curScreen, wid, this.state, w2d109ad3739d4744a1874ac179fc38b9_); } } if ((curScreen.equals("企業一覧")&&wid.equals("importButton"))) { // 「データ読み込み」ボタン