diff --git a/src/ScreenTemplates.java b/src/ScreenTemplates.java index c67903d..67d104f 100644 --- a/src/ScreenTemplates.java +++ b/src/ScreenTemplates.java @@ -306,7 +306,7 @@ temp_json38.put("height", 19); Map temp_json39 = new HashMap<>(); temp_json39.put("type", "textInput"); - temp_json39.put("text", "textInput"); + temp_json39.put("text", ""); temp_json39.put("visible", true); temp_json39.put("x", 416); temp_json39.put("y", 384); @@ -322,7 +322,7 @@ temp_json40.put("height", 19); Map temp_json41 = new HashMap<>(); temp_json41.put("type", "textInput"); - temp_json41.put("text", "textInput"); + temp_json41.put("text", ""); temp_json41.put("visible", true); temp_json41.put("x", 720); temp_json41.put("y", 384); @@ -330,7 +330,7 @@ temp_json41.put("height", 64); Map temp_json42 = new HashMap<>(); temp_json42.put("type", "textInput"); - temp_json42.put("text", "textInput"); + temp_json42.put("text", ""); temp_json42.put("visible", true); temp_json42.put("x", 1032); temp_json42.put("y", 224); @@ -338,7 +338,7 @@ temp_json42.put("height", 64); Map temp_json43 = new HashMap<>(); temp_json43.put("type", "textInput"); - temp_json43.put("text", "textInput"); + temp_json43.put("text", ""); temp_json43.put("visible", true); temp_json43.put("x", 416); temp_json43.put("y", 224); @@ -370,7 +370,7 @@ temp_json46.put("height", 19); Map temp_json47 = new HashMap<>(); temp_json47.put("type", "textInput"); - temp_json47.put("text", "textInput"); + temp_json47.put("text", ""); temp_json47.put("visible", true); temp_json47.put("x", 416); temp_json47.put("y", 544); @@ -378,7 +378,7 @@ temp_json47.put("height", 64); Map temp_json48 = new HashMap<>(); temp_json48.put("type", "textInput"); - temp_json48.put("text", "textInput"); + temp_json48.put("text", ""); temp_json48.put("visible", true); temp_json48.put("x", 720); temp_json48.put("y", 225); @@ -402,7 +402,7 @@ temp_json50.put("height", 19); Map temp_json51 = new HashMap<>(); temp_json51.put("type", "textInput"); - temp_json51.put("text", "textInput"); + temp_json51.put("text", ""); temp_json51.put("visible", true); temp_json51.put("x", 1032); temp_json51.put("y", 389); @@ -418,7 +418,7 @@ temp_json52.put("height", 60); Map temp_json53 = new HashMap<>(); temp_json53.put("type", "textInput"); - temp_json53.put("text", "textInput"); + temp_json53.put("text", ""); temp_json53.put("visible", true); temp_json53.put("x", 112); temp_json53.put("y", 224); @@ -426,7 +426,7 @@ temp_json53.put("height", 64); Map temp_json54 = new HashMap<>(); temp_json54.put("type", "textInput"); - temp_json54.put("text", "textInput"); + temp_json54.put("text", ""); temp_json54.put("visible", true); temp_json54.put("x", 112); temp_json54.put("y", 544); @@ -442,7 +442,7 @@ temp_json55.put("height", 19); Map temp_json56 = new HashMap<>(); temp_json56.put("type", "textInput"); - temp_json56.put("text", "textInput"); + temp_json56.put("text", ""); temp_json56.put("visible", true); temp_json56.put("x", 112); temp_json56.put("y", 384); @@ -611,7 +611,7 @@ temp_json72.put("height", 20); Map temp_json73 = new HashMap<>(); temp_json73.put("type", "textInput"); - temp_json73.put("text", "textInput"); + temp_json73.put("text", ""); temp_json73.put("visible", true); temp_json73.put("x", 360); temp_json73.put("y", 345); @@ -627,7 +627,7 @@ temp_json74.put("height", 20); Map temp_json75 = new HashMap<>(); temp_json75.put("type", "textInput"); - temp_json75.put("text", "textInput"); + temp_json75.put("text", ""); temp_json75.put("visible", true); temp_json75.put("x", 55); temp_json75.put("y", 345); @@ -635,7 +635,7 @@ temp_json75.put("height", 40); Map temp_json76 = new HashMap<>(); temp_json76.put("type", "textInput"); - temp_json76.put("text", "textInput"); + temp_json76.put("text", ""); temp_json76.put("visible", true); temp_json76.put("x", 985); temp_json76.put("y", 345); @@ -643,7 +643,7 @@ temp_json76.put("height", 40); Map temp_json77 = new HashMap<>(); temp_json77.put("type", "textInput"); - temp_json77.put("text", "textInput"); + temp_json77.put("text", ""); temp_json77.put("visible", true); temp_json77.put("x", 985); temp_json77.put("y", 245); @@ -651,7 +651,7 @@ temp_json77.put("height", 40); Map temp_json78 = new HashMap<>(); temp_json78.put("type", "textInput"); - temp_json78.put("text", "textInput"); + temp_json78.put("text", ""); temp_json78.put("visible", true); temp_json78.put("x", 675); temp_json78.put("y", 345); @@ -667,7 +667,7 @@ temp_json79.put("height", 20); Map temp_json80 = new HashMap<>(); temp_json80.put("type", "textInput"); - temp_json80.put("text", "textInput"); + temp_json80.put("text", ""); temp_json80.put("visible", true); temp_json80.put("x", 1295); temp_json80.put("y", 345); @@ -699,7 +699,7 @@ temp_json83.put("height", 20); Map temp_json84 = new HashMap<>(); temp_json84.put("type", "textInput"); - temp_json84.put("text", "textInput"); + temp_json84.put("text", ""); temp_json84.put("visible", true); temp_json84.put("x", 1295); temp_json84.put("y", 245); @@ -731,7 +731,7 @@ temp_json87.put("height", 55); Map temp_json88 = new HashMap<>(); temp_json88.put("type", "textInput"); - temp_json88.put("text", "textInput"); + temp_json88.put("text", ""); temp_json88.put("visible", true); temp_json88.put("x", 55); temp_json88.put("y", 245); @@ -739,7 +739,7 @@ temp_json88.put("height", 40); Map temp_json89 = new HashMap<>(); temp_json89.put("type", "textInput"); - temp_json89.put("text", "textInput"); + temp_json89.put("text", ""); temp_json89.put("visible", true); temp_json89.put("x", 675); temp_json89.put("y", 245); @@ -755,7 +755,7 @@ temp_json90.put("height", 65); Map temp_json91 = new HashMap<>(); temp_json91.put("type", "textInput"); - temp_json91.put("text", "textInput"); + temp_json91.put("text", ""); temp_json91.put("visible", true); temp_json91.put("x", 360); temp_json91.put("y", 245); diff --git a/src/SwingPresenter.java b/src/SwingPresenter.java index 6cafb7c..618682b 100644 --- a/src/SwingPresenter.java +++ b/src/SwingPresenter.java @@ -406,7 +406,11 @@ tableModel.addRow(new Object[tableModel.getColumnCount()]); for (int j = 0; j < tableModel.getColumnCount(); j++) { String column = tableModel.getColumnName(j); - tableModel.setValueAt(rowData.get(column), i, j); + if (rowData.get(column) == null) { + tableModel.setValueAt(dataKey, i, j); + } else { + tableModel.setValueAt(rowData.get(column), i, j); + } } i++; } diff --git a/src/Widget1.java b/src/Widget1.java index 9f92943..234096b 100644 --- a/src/Widget1.java +++ b/src/Widget1.java @@ -143,6 +143,20 @@ if ((curScreen.equals("企業一覧")&&wid.equals("w0498c4eb3524489494c288e2fc7a3211"))) { // 「登録」ボタン this.curScreen.updateFromState2(curScreen, wid, this.state); } + if ((curScreen.equals("企業一覧")&&wid.equals("wa1b27f08c9fd4c08b7dda38625c04f3b"))) { // 「削除」ボタン + String w2d109ad3739d4744a1874ac179fc38b9 = this.w2d109ad3739d4744a1874ac179fc38b9.getValue(); + this.widget1 = screen.getWidgets().getWidget(w2d109ad3739d4744a1874ac179fc38b9); + String w2d109ad3739d4744a1874ac179fc38b9_ = this.widget1.getText(); + if (w2d109ad3739d4744a1874ac179fc38b9_ != null) { + this.businessCardManagement.delete(curScreen, wid, this.state, w2d109ad3739d4744a1874ac179fc38b9, w2d109ad3739d4744a1874ac179fc38b9_); + } + } + if ((curScreen.equals("企業一覧")&&wid.equals("importButton"))) { // 「データ読み込み」ボタン + this.businessCardManagement.imports(curScreen, wid, this.state); + } + if ((curScreen.equals("企業一覧")&&wid.equals("saveButton"))) { // 「保存」ボタン + this.businessCardManagement.save(curScreen, wid, this.state); + } if ((curScreen.equals("企業一覧")&&wid.equals("wa6aa4bcbb7a64e9eaf75758eae59310a"))) { // 「編集」ボタン String w2d109ad3739d4744a1874ac179fc38b9 = this.w2d109ad3739d4744a1874ac179fc38b9.getValue(); this.widget1 = screen.getWidgets().getWidget(w2d109ad3739d4744a1874ac179fc38b9); @@ -202,20 +216,6 @@ this.curScreen.updateFromState11(curScreen, wid, this.state, w2d109ad3739d4744a1874ac179fc38b9, w2d109ad3739d4744a1874ac179fc38b9_, company, representative, position, establishment, address1, address2, business1, business2, companyoverview, URL, contactPerson1, position1, tel1, email1, contactPerson2, position2, tel2, email2, contactPerson3, position3, tel3, email3, contactPerson4, position4, tel4, email4, w2d109ad3739d4744a1874ac179fc38b9_, representative_, position_, establishment_, address1_, address2_, business1_, business2_, companyoverview_, URL_, contactPerson1_, position1_, tel1_, email1_, contactPerson2_, position2_, tel2_, email2_, contactPerson3_, position3_, tel3_, email3_, contactPerson4_, position4_, tel4_, email4_); } } - if ((curScreen.equals("企業一覧")&&wid.equals("wa1b27f08c9fd4c08b7dda38625c04f3b"))) { // 「削除」ボタン - String w2d109ad3739d4744a1874ac179fc38b9 = this.w2d109ad3739d4744a1874ac179fc38b9.getValue(); - this.widget1 = screen.getWidgets().getWidget(w2d109ad3739d4744a1874ac179fc38b9); - String w2d109ad3739d4744a1874ac179fc38b9_ = this.widget1.getText(); - if (w2d109ad3739d4744a1874ac179fc38b9_ != null) { - this.businessCardManagement.delete(curScreen, wid, this.state, w2d109ad3739d4744a1874ac179fc38b9, w2d109ad3739d4744a1874ac179fc38b9_); - } - } - if ((curScreen.equals("企業一覧")&&wid.equals("importButton"))) { // 「データ読み込み」ボタン - this.businessCardManagement.imports(curScreen, wid, this.state); - } - if ((curScreen.equals("企業一覧")&&wid.equals("saveButton"))) { // 「保存」ボタン - this.businessCardManagement.save(curScreen, wid, this.state); - } if ((curScreen.equals("検索画面")&&wid.equals("w7de33900c55f4379983056aee325c057"))) { // 「検索項目の入力」ボタン this.curScreen.updateFromState10(curScreen, wid, this.state); }