diff --git a/src/BusinessCardManagement.java b/src/BusinessCardManagement.java index 433ddf6..252d8fc 100644 --- a/src/BusinessCardManagement.java +++ b/src/BusinessCardManagement.java @@ -5,11 +5,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import javax.swing.JFileChooser; import javax.swing.JOptionPane; @@ -28,7 +24,7 @@ private Result result; private CompanyList companyList; private W2d109ad3739d4744a1874ac179fc38b9 w2d109ad3739d4744a1874ac179fc38b9; - private Map value = new HashMap<>(); + private Map value = new LinkedHashMap<>(); private Widget1 widget; public BusinessCardManagement(Screen screen, ScreenTemplates screenTemplates, W4ca84254d30c423ab8e449171a5b5123 w4ca84254d30c423ab8e449171a5b5123, SearchScreen searchScreen, SearchCriteriaScreen searchCriteriaScreen, Result result, CompanyList companyList, W2d109ad3739d4744a1874ac179fc38b9 w2d109ad3739d4744a1874ac179fc38b9) { this.screen = screen; @@ -42,7 +38,7 @@ load(); } public Map> getValue() { - Map> value = new HashMap<>(); + Map> value = new LinkedHashMap<>(); for (String key: this.value.keySet()) { BusinessCardManagementElement businessCardManagementElement = this.value.get(key); value.put(key, businessCardManagementElement.getValue()); @@ -68,7 +64,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); @@ -96,7 +92,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); @@ -104,8 +100,22 @@ } public void updateFromState3(String scId, String wid, int state, String company_, String representative_, String position_, String establish_, String address1_, String address2_, String business1_, String business2_, String companydetail_, String URL_, String contactPerson1_, String position1_, String tel1_, String email1_, String contactPerson2_, String position2_, String tel2_, String email2_, String contactPerson3_, String position3_, String tel3_, String email3_, String contactPerson4_, String position4_, String tel4_, String email4_) { Map temp_if16; - if ((((state==0)&&!company_.equals(""))&&this.value.containsKey(company_))) { - this.value.put(company_,new BusinessCardManagementElement(representative_, position_, establish_, address1_, address2_, business1_, business2_, companydetail_, URL_, contactPerson1_, position1_, tel1_, email1_, contactPerson2_, position2_, tel2_, email2_, contactPerson3_, position3_, tel3_, email3_, contactPerson4_, position4_, tel4_, email4_)); + if ((state==0)&&!company_.isEmpty()) { + String w2d109ad3739d4744a1874ac179fc38b9 = this.w2d109ad3739d4744a1874ac179fc38b9.getValue(); + String companyList = this.companyList.getValue(); + this.widget = screenTemplates.getScreenTemplate(companyList).getWidgets1().getWidget1(w2d109ad3739d4744a1874ac179fc38b9); + String prevCompany = this.widget.getText(); + if (!company_.equals(prevCompany)) { + if (this.value.containsKey(company_)) { + JPanel mainPanel = screen.getPresenter().getMainPanel(); + JOptionPane.showMessageDialog(mainPanel, "会社名は既に存在します。"); + } else { + this.value.remove(prevCompany); + this.value.put(company_, new BusinessCardManagementElement(representative_, position_, establish_, address1_, address2_, business1_, business2_, companydetail_, URL_, contactPerson1_, position1_, tel1_, email1_, contactPerson2_, position2_, tel2_, email2_, contactPerson3_, position3_, tel3_, email3_, contactPerson4_, position4_, tel4_, email4_)); + } + } else { + this.value.put(company_, new BusinessCardManagementElement(representative_, position_, establish_, address1_, address2_, business1_, business2_, companydetail_, URL_, contactPerson1_, position1_, tel1_, email1_, contactPerson2_, position2_, tel2_, email2_, contactPerson3_, position3_, tel3_, email3_, contactPerson4_, position4_, tel4_, email4_)); + } temp_if16 = this.value; } else { temp_if16 = this.value; @@ -118,7 +128,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); @@ -133,7 +143,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); @@ -184,10 +194,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, "ファイルの取り込みに失敗しました。"); } } } @@ -271,7 +293,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(); @@ -346,10 +380,21 @@ return value; } - public void delete(String curScreen, String wid, int state, String tableWid, String key) { + public void delete(String curScreen, String wid, int state, String key) { if (state == 0) { this.value.remove(key); - this.screenTemplates.getScreenTemplate(curScreen).getWidgets1().getWidget1(tableWid).updateDataFromBusinessCardManagement4(curScreen, tableWid, getValue()); + 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/CurScreen.java b/src/CurScreen.java index 30f08a4..e1078df 100644 --- a/src/CurScreen.java +++ b/src/CurScreen.java @@ -1,3 +1,4 @@ +import javax.swing.*; import java.util.*; public class CurScreen { @@ -36,7 +37,7 @@ public void updateFromState3(String scId, String wid, int state) { String temp_if4; if ((state==0)) { - temp_if4 = "検索画面"; + temp_if4 = "検索項目画面"; } else { temp_if4 = this.value; } @@ -55,12 +56,22 @@ ScreenTemplate screenTemplate = screenTemplates.getScreenTemplate(this.value); this.screen.updateFromCurScreen(this.value, screenTemplate.getValue()); } - public void updateFromState5(String scId, String wid, int state, String company_, String representative_, String position_, String establish_, String address1_, String address2_, String business1_, String business2_, String companydetail_, String URL_, Map> businessCardManagement) { + public void updateFromState5(String scId, String wid, int state, String company_, String representative_, String position_, String establish_, String address1_, String address2_, String business1_, String business2_, String companydetail_, String URL_, Map> businessCardManagement, String companyList, String w2d109ad3739d4744a1874ac179fc38b9) { String temp_if7; if ((state==0)) { String temp_if6; - if ((!company_.equals("")&&businessCardManagement.containsKey(company_))) { - temp_if6 = "企業一覧"; + if (!company_.isEmpty()) { + Widget1 widget = screenTemplates.getScreenTemplate(companyList).getWidgets1().getWidget1(w2d109ad3739d4744a1874ac179fc38b9); + String prevCompany = widget.getText(); + if (!company_.equals(prevCompany)) { + if (businessCardManagement.containsKey(prevCompany)) { + temp_if6 = this.value; + } else { + temp_if6 = "企業一覧"; + } + } else { + temp_if6 = "企業一覧"; + } } else { temp_if6 = this.value; } diff --git a/src/Main.java b/src/Main.java index 1cb2994..04408d0 100644 --- a/src/Main.java +++ b/src/Main.java @@ -34,8 +34,10 @@ private Search1 search1; private Search2 search2; private Search3 search3; + private Search4 search4; private Search5 search5; private Search6 search6; + private Search7 search7; private Result result; private CompanyList companyList; private SearchCriteriaScreen searchCriteriaScreen; @@ -81,8 +83,10 @@ this.search1 = new Search1(screen); this.search2 = new Search2(screen); this.search3 = new Search3(screen); + this.search4 = new Search4(screen); this.search5 = new Search5(screen); this.search6 = new Search6(screen); + this.search7 = new Search7(screen); this.result = new Result(screen, screenTemplates); this.companyList = new CompanyList(screenTemplates); this.searchCriteriaScreen = new SearchCriteriaScreen(screen, screenTemplates); @@ -90,7 +94,7 @@ this.w2d109ad3739d4744a1874ac179fc38b9 = new W2d109ad3739d4744a1874ac179fc38b9(screenTemplates); this.w4ca84254d30c423ab8e449171a5b5123 = new W4ca84254d30c423ab8e449171a5b5123(screenTemplates); this.businessCardManagement = new BusinessCardManagement(screen, screenTemplates, w4ca84254d30c423ab8e449171a5b5123, searchScreen, searchCriteriaScreen, result, companyList, w2d109ad3739d4744a1874ac179fc38b9); - this.screenTemplates.setReferences(screen, curScreen, presenter, businessCardManagement, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, contactPerson1, position1, tel1, email1, contactPerson2, position2, tel2, email2, contactPerson3, position3, tel3, email3, contactPerson4, position4, tel4, email4, searchCriteriaScreen, search1, search2, search3, search5, search6, result, w2d109ad3739d4744a1874ac179fc38b9, w4ca84254d30c423ab8e449171a5b5123); + this.screenTemplates.setReferences(screen, curScreen, presenter, businessCardManagement, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, contactPerson1, position1, tel1, email1, contactPerson2, position2, tel2, email2, contactPerson3, position3, tel3, email3, contactPerson4, position4, tel4, email4, searchCriteriaScreen, search1, search2, search3, search4, search5, search6, search7, result, w2d109ad3739d4744a1874ac179fc38b9, w4ca84254d30c423ab8e449171a5b5123); changeCurScreen("企業一覧"); } public Map getScreenTemplates() { @@ -165,12 +169,18 @@ public String getSearch3() { return this.search3.getValue(); } - public String getSearch6() { - return this.search6.getValue(); + public String getSearch4() { + return this.search4.getValue(); } public String getSearch5() { return this.search5.getValue(); } + public String getSearch6() { + return this.search6.getValue(); + } + public String getSearch7() { + return this.search7.getValue(); + } public String getResult() { return this.result.getValue(); } diff --git a/src/ScreenTemplate.java b/src/ScreenTemplate.java index 1470069..6903e0c 100644 --- a/src/ScreenTemplate.java +++ b/src/ScreenTemplate.java @@ -31,9 +31,9 @@ public ScreenTemplate() { this.widgets = new Widgets1(); } - public void setReferences(Screen screen, CurScreen curScreen, SwingPresenter presenter, BusinessCardManagement businessCardManagement, Company company, Representative representative, Position position, Establishment establishment, Address1 address1, Address2 address2, Businessdescription1 businessdescription1, Businessdescription2 businessdescription2, Companyoverview companyoverview, URL URL, ContactPerson1 contactPerson1, Position1 position1, Tel1 tel1, Email1 email1, ContactPerson2 contactPerson2, Position2 position2, Tel2 tel2, Email2 email2, ContactPerson3 contactPerson3, Position3 position3, Tel3 tel3, Email3 email3, ContactPerson4 contactPerson4, Position4 position4, Tel4 tel4, Email4 email4, SearchCriteriaScreen searchCriteriaScreen, Search1 search1, Search2 search2, Search3 search3, Search5 search5, Search6 search6, Result result, W2d109ad3739d4744a1874ac179fc38b9 w2d109ad3739d4744a1874ac179fc38b9, W4ca84254d30c423ab8e449171a5b5123 w4ca84254d30c423ab8e449171a5b5123) { + public void setReferences(Screen screen, CurScreen curScreen, SwingPresenter presenter, BusinessCardManagement businessCardManagement, Company company, Representative representative, Position position, Establishment establishment, Address1 address1, Address2 address2, Businessdescription1 businessdescription1, Businessdescription2 businessdescription2, Companyoverview companyoverview, URL URL, ContactPerson1 contactPerson1, Position1 position1, Tel1 tel1, Email1 email1, ContactPerson2 contactPerson2, Position2 position2, Tel2 tel2, Email2 email2, ContactPerson3 contactPerson3, Position3 position3, Tel3 tel3, Email3 email3, ContactPerson4 contactPerson4, Position4 position4, Tel4 tel4, Email4 email4, SearchCriteriaScreen searchCriteriaScreen, Search1 search1, Search2 search2, Search3 search3, Search4 search4, Search5 search5, Search6 search6, Search7 search7, Result result, W2d109ad3739d4744a1874ac179fc38b9 w2d109ad3739d4744a1874ac179fc38b9, W4ca84254d30c423ab8e449171a5b5123 w4ca84254d30c423ab8e449171a5b5123) { this.curScreen = curScreen; this.presenter = presenter; - this.widgets.setReferences(screen, curScreen, presenter, businessCardManagement, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, contactPerson1, position1, tel1, email1, contactPerson2, position2, tel2, email2, contactPerson3, position3, tel3, email3, contactPerson4, position4, tel4, email4, searchCriteriaScreen, search1, search2, search3, search5, search6, result, w2d109ad3739d4744a1874ac179fc38b9, w4ca84254d30c423ab8e449171a5b5123); + this.widgets.setReferences(screen, curScreen, presenter, businessCardManagement, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, contactPerson1, position1, tel1, email1, contactPerson2, position2, tel2, email2, contactPerson3, position3, tel3, email3, contactPerson4, position4, tel4, email4, searchCriteriaScreen, search1, search2, search3, search4, search5, search6, search7, result, w2d109ad3739d4744a1874ac179fc38b9, w4ca84254d30c423ab8e449171a5b5123); } } \ No newline at end of file diff --git a/src/ScreenTemplates.java b/src/ScreenTemplates.java index 1c39303..c4fde8d 100644 --- a/src/ScreenTemplates.java +++ b/src/ScreenTemplates.java @@ -16,7 +16,21 @@ temp_json5.put("会社概要", "_"); temp_json5.put("URL", "_"); temp_json5.put("担当者１", "_"); + temp_json5.put("役職１", "_"); temp_json5.put("電話番号１", "_"); + temp_json5.put("メール１", "_"); + temp_json5.put("担当者２", "_"); + temp_json5.put("役職２", "_"); + temp_json5.put("電話番号２", "_"); + temp_json5.put("メール２", "_"); + temp_json5.put("担当者３", "_"); + temp_json5.put("役職３", "_"); + temp_json5.put("電話番号３", "_"); + temp_json5.put("メール３", "_"); + temp_json5.put("担当者４", "_"); + temp_json5.put("役職４", "_"); + temp_json5.put("電話番号４", "_"); + temp_json5.put("メール４", "_"); Map temp_json4 = new HashMap<>(); temp_json4.put("_", temp_json5); List temp_list1 = new ArrayList<>(); @@ -30,7 +44,21 @@ temp_list1.add("会社概要"); temp_list1.add("URL"); temp_list1.add("担当者１"); + temp_list1.add("役職１"); temp_list1.add("電話番号１"); + temp_list1.add("メール１"); + temp_list1.add("担当者２"); + temp_list1.add("役職２"); + temp_list1.add("電話番号２"); + temp_list1.add("メール２"); + temp_list1.add("担当者３"); + temp_list1.add("役職３"); + temp_list1.add("電話番号３"); + temp_list1.add("メール３"); + temp_list1.add("担当者４"); + temp_list1.add("役職４"); + temp_list1.add("電話番号４"); + temp_list1.add("メール４"); Map temp_json3 = new HashMap<>(); temp_json3.put("type", "table"); temp_json3.put("text", ""); @@ -131,6 +159,22 @@ temp_json20.put("事業内容２", "_"); temp_json20.put("会社概要", "_"); temp_json20.put("URL", "_"); + temp_json20.put("担当者１", "_"); + temp_json20.put("役職１", "_"); + temp_json20.put("電話番号１", "_"); + temp_json20.put("メール１", "_"); + temp_json20.put("担当者２", "_"); + temp_json20.put("役職２", "_"); + temp_json20.put("電話番号２", "_"); + temp_json20.put("メール２", "_"); + temp_json20.put("担当者３", "_"); + temp_json20.put("役職３", "_"); + temp_json20.put("電話番号３", "_"); + temp_json20.put("メール３", "_"); + temp_json20.put("担当者４", "_"); + temp_json20.put("役職４", "_"); + temp_json20.put("電話番号４", "_"); + temp_json20.put("メール４", "_"); Map temp_json19 = new HashMap<>(); temp_json19.put("_", temp_json20); List temp_list2 = new ArrayList<>(); @@ -143,6 +187,22 @@ temp_list2.add("事業内容２"); temp_list2.add("会社概要"); temp_list2.add("URL"); + temp_list2.add("担当者１"); + temp_list2.add("役職１"); + temp_list2.add("電話番号１"); + temp_list2.add("メール１"); + temp_list2.add("担当者２"); + temp_list2.add("役職２"); + temp_list2.add("電話番号２"); + temp_list2.add("メール２"); + temp_list2.add("担当者３"); + temp_list2.add("役職３"); + temp_list2.add("電話番号３"); + temp_list2.add("メール３"); + temp_list2.add("担当者４"); + temp_list2.add("役職４"); + temp_list2.add("電話番号４"); + temp_list2.add("メール４"); Map temp_json18 = new HashMap<>(); temp_json18.put("type", "table"); temp_json18.put("text", "table"); @@ -807,6 +867,22 @@ temp_json64.put("事業内容２", "_"); temp_json64.put("会社概要", "_"); temp_json64.put("URL", "_"); + temp_json64.put("担当者１", "_"); + temp_json64.put("役職１", "_"); + temp_json64.put("電話番号１", "_"); + temp_json64.put("メール１", "_"); + temp_json64.put("担当者２", "_"); + temp_json64.put("役職２", "_"); + temp_json64.put("電話番号２", "_"); + temp_json64.put("メール２", "_"); + temp_json64.put("担当者３", "_"); + temp_json64.put("役職３", "_"); + temp_json64.put("電話番号３", "_"); + temp_json64.put("メール３", "_"); + temp_json64.put("担当者４", "_"); + temp_json64.put("役職４", "_"); + temp_json64.put("電話番号４", "_"); + temp_json64.put("メール４", "_"); Map temp_json63 = new HashMap<>(); temp_json63.put("_", temp_json64); List temp_list3 = new ArrayList<>(); @@ -819,6 +895,22 @@ temp_list3.add("事業内容２"); temp_list3.add("会社概要"); temp_list3.add("URL"); + temp_list3.add("担当者１"); + temp_list3.add("役職１"); + temp_list3.add("電話番号１"); + temp_list3.add("メール１"); + temp_list3.add("担当者２"); + temp_list3.add("役職２"); + temp_list3.add("電話番号２"); + temp_list3.add("メール２"); + temp_list3.add("担当者３"); + temp_list3.add("役職３"); + temp_list3.add("電話番号３"); + temp_list3.add("メール３"); + temp_list3.add("担当者４"); + temp_list3.add("役職４"); + temp_list3.add("電話番号４"); + temp_list3.add("メール４"); Map temp_json62 = new HashMap<>(); temp_json62.put("type", "table"); temp_json62.put("text", ""); @@ -1408,11 +1500,11 @@ public Map getValue() { return new HashMap<>(this.value); } - public void setReferences(Screen screen, CurScreen curScreen, SwingPresenter presenter, BusinessCardManagement businessCardManagement, Company company, Representative representative, Position position, Establishment establishment, Address1 address1, Address2 address2, Businessdescription1 businessdescription1, Businessdescription2 businessdescription2, Companyoverview companyoverview, URL URL, ContactPerson1 contactPerson1, Position1 position1, Tel1 tel1, Email1 email1, ContactPerson2 contactPerson2, Position2 position2, Tel2 tel2, Email2 email2, ContactPerson3 contactPerson3, Position3 position3, Tel3 tel3, Email3 email3, ContactPerson4 contactPerson4, Position4 position4, Tel4 tel4, Email4 email4, SearchCriteriaScreen searchCriteriaScreen, Search1 search1, Search2 search2, Search3 search3, Search5 search5, Search6 search6, Result result, W2d109ad3739d4744a1874ac179fc38b9 w2d109ad3739d4744a1874ac179fc38b9, W4ca84254d30c423ab8e449171a5b5123 w4ca84254d30c423ab8e449171a5b5123) { + public void setReferences(Screen screen, CurScreen curScreen, SwingPresenter presenter, BusinessCardManagement businessCardManagement, Company company, Representative representative, Position position, Establishment establishment, Address1 address1, Address2 address2, Businessdescription1 businessdescription1, Businessdescription2 businessdescription2, Companyoverview companyoverview, URL URL, ContactPerson1 contactPerson1, Position1 position1, Tel1 tel1, Email1 email1, ContactPerson2 contactPerson2, Position2 position2, Tel2 tel2, Email2 email2, ContactPerson3 contactPerson3, Position3 position3, Tel3 tel3, Email3 email3, ContactPerson4 contactPerson4, Position4 position4, Tel4 tel4, Email4 email4, SearchCriteriaScreen searchCriteriaScreen, Search1 search1, Search2 search2, Search3 search3, Search4 search4, Search5 search5, Search6 search6, Search7 search7, Result result, W2d109ad3739d4744a1874ac179fc38b9 w2d109ad3739d4744a1874ac179fc38b9, W4ca84254d30c423ab8e449171a5b5123 w4ca84254d30c423ab8e449171a5b5123) { this.presenter = presenter; this.curScreen = curScreen; for (ScreenTemplate screenTemplate: value.values()) { - screenTemplate.setReferences(screen, curScreen, presenter, businessCardManagement, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, contactPerson1, position1, tel1, email1, contactPerson2, position2, tel2, email2, contactPerson3, position3, tel3, email3, contactPerson4, position4, tel4, email4, searchCriteriaScreen, search1, search2, search3, search5, search6, result, w2d109ad3739d4744a1874ac179fc38b9, w4ca84254d30c423ab8e449171a5b5123); + screenTemplate.setReferences(screen, curScreen, presenter, businessCardManagement, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, contactPerson1, position1, tel1, email1, contactPerson2, position2, tel2, email2, contactPerson3, position3, tel3, email3, contactPerson4, position4, tel4, email4, searchCriteriaScreen, search1, search2, search3, search4, search5, search6, search7, result, w2d109ad3739d4744a1874ac179fc38b9, w4ca84254d30c423ab8e449171a5b5123); } } public ScreenTemplate getScreenTemplate(String scId) { diff --git a/src/Search4.java b/src/Search4.java new file mode 100644 index 0000000..057f38d --- /dev/null +++ b/src/Search4.java @@ -0,0 +1,10 @@ +public class Search4 { + private Screen screen; + private String value = "search4"; + public Search4(Screen screen) { + this.screen = screen; + } + public String getValue() { + return new String(this.value); + } +} \ No newline at end of file diff --git a/src/Search7.java b/src/Search7.java new file mode 100644 index 0000000..9079720 --- /dev/null +++ b/src/Search7.java @@ -0,0 +1,10 @@ +public class Search7 { + private Screen screen; + private String value = "search7"; + public Search7(Screen screen) { + this.screen = screen; + } + public String getValue() { + return new String(this.value); + } +} \ No newline at end of file diff --git a/src/SwingPresenter.java b/src/SwingPresenter.java index 618682b..d3fa86c 100644 --- a/src/SwingPresenter.java +++ b/src/SwingPresenter.java @@ -190,6 +190,7 @@ } }); + table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF); JScrollPane scroll = new JScrollPane(table); mainPanel.add(scroll); components.put(key, table); @@ -356,6 +357,7 @@ } }); + table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF); JScrollPane scroll = new JScrollPane(table); scroll.setLocation(x, y); scroll.setSize(width, height); @@ -395,7 +397,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/Widget.java b/src/Widget.java index db33813..6f6067b 100644 --- a/src/Widget.java +++ b/src/Widget.java @@ -99,7 +99,7 @@ // public void updateFromWidget(String self, String scId, String wid, Map widget, String curScreen) { // this.value = widget; // } - public void updateDataFromState(String screenId, String widId, int state, String search1, String search2, String search3, String search5, String search6, String result, String address1_, String address2_, String businessdescription1_, String businessdescription2_, String companyoverview_, Map> businessCardManagement) { + public void updateDataFromState(String screenId, String widId, int state, String search1, String search2, String search3, String search4, String search5, String search6, String search7, String result, Map> businessCardManagement) { Map> temp_if0; if ((state==0)) { Map temp_json92 = new HashMap<>(); @@ -108,9 +108,13 @@ temp_json92.put("事業内容１", search1); temp_json92.put("事業内容２", search2); temp_json92.put("会社概要", search3); + temp_json92.put("担当者", search7); Map> temp_search0 = new HashMap<>(); for (String key: businessCardManagement.keySet()) { boolean isMatch = true; + if (search4 != null && !search4.isEmpty()) { // 会社名を指定 + if (!key.contains(search4)) continue; + } for (String qKey: temp_json92.keySet()) { Map value = businessCardManagement.get(key); for (String valKey: value.keySet()) { @@ -136,6 +140,8 @@ } public void textEvent(String wid, String nextText) { this.text = nextText; + this.widget = screenTemplates.getScreenTemplate(curScreen.getValue()).getWidgets1().getWidget1(wid); + this.widget.updateTextFromText(wid, wid, wid, this.text, curScreen.getValue()); } public void mouseEvent(String wid, int nextState) { this.state = nextState; diff --git a/src/Widget1.java b/src/Widget1.java index 36cb996..3c3a8fb 100644 --- a/src/Widget1.java +++ b/src/Widget1.java @@ -48,8 +48,10 @@ private Search1 search1; private Search2 search2; private Search3 search3; + private Search4 search4; private Search5 search5; private Search6 search6; + private Search7 search7; private Result result; private W2d109ad3739d4744a1874ac179fc38b9 w2d109ad3739d4744a1874ac179fc38b9; private W4ca84254d30c423ab8e449171a5b5123 w4ca84254d30c423ab8e449171a5b5123; @@ -121,6 +123,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; } @@ -152,6 +157,8 @@ String w2d109ad3739d4744a1874ac179fc38b9 = this.w2d109ad3739d4744a1874ac179fc38b9.getValue(); this.widget1 = screen.getWidgets().getWidget(w2d109ad3739d4744a1874ac179fc38b9); String w2d109ad3739d4744a1874ac179fc38b9_ = this.widget1.getText(); + if (w2d109ad3739d4744a1874ac179fc38b9_ != null && !w2d109ad3739d4744a1874ac179fc38b9_.isEmpty()) { + this.businessCardManagement.delete(curScreen, wid, this.state, w2d109ad3739d4744a1874ac179fc38b9_); if (w2d109ad3739d4744a1874ac179fc38b9_ != null) { JPanel mainPanel = screen.getPresenter().getMainPanel(); int result = JOptionPane.showConfirmDialog(mainPanel, w2d109ad3739d4744a1874ac179fc38b9_ + "を削除しますか？", "削除確認", JOptionPane.YES_NO_OPTION); @@ -170,7 +177,7 @@ String w2d109ad3739d4744a1874ac179fc38b9 = this.w2d109ad3739d4744a1874ac179fc38b9.getValue(); this.widget1 = screen.getWidgets().getWidget(w2d109ad3739d4744a1874ac179fc38b9); String w2d109ad3739d4744a1874ac179fc38b9_ = this.widget1.getText(); - if (w2d109ad3739d4744a1874ac179fc38b9_ != null) { + if (w2d109ad3739d4744a1874ac179fc38b9_ != null && !w2d109ad3739d4744a1874ac179fc38b9_.isEmpty()) { String company = this.company.getValue(); String representative = this.representative.getValue(); String position = this.position.getValue(); @@ -395,92 +402,12 @@ this.widget1 = screen.getWidgets().getWidget(email4); String email4_ = this.widget1.getText(); Map> businessCardManagement = this.businessCardManagement.getValue(); - this.curScreen.updateFromState5(curScreen, wid, this.state, company_, representative_, position_, establish_, address1_, address2_, business1_, business2_, companydetail_, URL_, businessCardManagement); + String w2d109ad3739d4744a1874ac179fc38b9 = this.w2d109ad3739d4744a1874ac179fc38b9.getValue(); + this.curScreen.updateFromState5(curScreen, wid, this.state, company_, representative_, position_, establish_, address1_, address2_, business1_, business2_, companydetail_, URL_, businessCardManagement, "企業一覧", w2d109ad3739d4744a1874ac179fc38b9); } if ((curScreen.equals("登録画面１")&&wid.equals("wf10ab1752fe44c4d97ffb2ca2afdeba0"))) { // 「一覧へ戻る」ボタン this.curScreen.updateFromState(curScreen, wid, this.state); } - if ((curScreen.equals("登録画面１")&&wid.equals("wf10ab1752fe44c4d97ffb2ca2afdeba0"))) { // 「一覧へ戻る」ボタン - String company = this.company.getValue(); - String representative = this.representative.getValue(); - String position = this.position.getValue(); - String establishment = this.establishment.getValue(); - String address1 = this.address1.getValue(); - String address2 = this.address2.getValue(); - String businessdescription1 = this.businessdescription1.getValue(); - String businessdescription2 = this.businessdescription2.getValue(); - String companyoverview = this.companyoverview.getValue(); - String URL = this.URL.getValue(); - String contactPerson1 = this.contactPerson1.getValue(); - String position1 = this.position1.getValue(); - String tel1 = this.tel1.getValue(); - String email1 = this.email1.getValue(); - String contactPerson2 = this.contactPerson2.getValue(); - String position2 = this.position2.getValue(); - String tel2 = this.tel2.getValue(); - String email2 = this.email2.getValue(); - String contactPerson3 = this.contactPerson3.getValue(); - String position3 = this.position3.getValue(); - String tel3 = this.tel3.getValue(); - String email3 = this.email3.getValue(); - String contactPerson4 = this.contactPerson4.getValue(); - String position4 = this.position4.getValue(); - String tel4 = this.tel4.getValue(); - String email4 = this.email4.getValue(); - this.widget1 = screen.getWidgets().getWidget(company); - String company_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(representative); - String representative_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(position); - String position_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(establishment); - String establishment_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(address1); - String address1_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(address2); - String address2_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(businessdescription1); - String businessdescription1_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(businessdescription2); - String businessdescription2_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(companyoverview); - String companyoverview_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(URL); - String URL_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(contactPerson1); - String contactPerson1_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(position1); - String position1_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(tel1); - String tel1_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(email1); - String email1_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(contactPerson2); - String contactPerson2_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(position2); - String position2_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(tel2); - String tel2_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(email2); - String email2_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(contactPerson3); - String contactPerson3_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(position3); - String position3_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(tel3); - String tel3_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(email3); - String email3_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(contactPerson4); - String contactPerson4_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(position4); - String position4_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(tel4); - String tel4_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(email4); - String email4_ = this.widget1.getText(); - this.businessCardManagement.updateFromState(curScreen, wid, this.state, company_, representative_, position_, establishment_, address1_, address2_, businessdescription1_, businessdescription2_, companyoverview_, URL_, contactPerson1_, position1_, tel1_, email1_, contactPerson2_, position2_, tel2_, email2_, contactPerson3_, position3_, tel3_, email3_, contactPerson4_, position4_, tel4_, email4_); - } if ((curScreen.equals("登録画面１")&&wid.equals("w7c6cfb14ed4f410aa33a440e6ab2e4bf"))) { // 「登録」ボタン String company = this.company.getValue(); String representative = this.representative.getValue(); @@ -606,11 +533,11 @@ String search1 = this.search1.getValue(); String search2 = this.search2.getValue(); String search3 = this.search3.getValue(); + String search4 = this.search4.getValue(); String search5 = this.search5.getValue(); String search6 = this.search6.getValue(); + String search7 = this.search7.getValue(); String result = this.result.getValue(); - String address1 = this.address1.getValue(); - String address2 = this.address2.getValue(); String businessdescription1 = this.businessdescription1.getValue(); String businessdescription2 = this.businessdescription2.getValue(); String companyoverview = this.companyoverview.getValue(); @@ -620,27 +547,21 @@ String search2_ = this.widget1.getText(); this.widget1 = screen.getWidgets().getWidget(search3); String search3_ = this.widget1.getText(); + this.widget1 = screen.getWidgets().getWidget(search4); + String search4_ = this.widget1.getText(); this.widget1 = screen.getWidgets().getWidget(search5); String search5_ = this.widget1.getText(); this.widget1 = screen.getWidgets().getWidget(search6); String search6_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(address1); - String address1_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(address2); - String address2_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(businessdescription1); - String businessdescription1_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(businessdescription2); - String businessdescription2_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(companyoverview); - String companyoverview_ = this.widget1.getText(); + this.widget1 = screen.getWidgets().getWidget(search7); + String search7_ = this.widget1.getText(); this.widget1 = screen.getWidgets().getWidget(result); String result_ = this.widget1.getText(); Map> businessCardManagement = this.businessCardManagement.getValue(); - this.widget1.updateDataFromState(curScreen, result, this.state, search1_, search2_, search3_, search5_, search6_, result_, address1_, address2_, businessdescription1_, businessdescription2_, companyoverview_, businessCardManagement); + this.widget1.updateDataFromState(curScreen, result, this.state, search1_, search2_, search3_, search4_, search5_, search6_, search7_, result_, businessCardManagement); } } - public void setReferences(Screen screen, CurScreen curScreen, SwingPresenter presenter, BusinessCardManagement businessCardManagement, Company company, Representative representative, Position position, Establishment establishment, Address1 address1, Address2 address2, Businessdescription1 businessdescription1, Businessdescription2 businessdescription2, Companyoverview companyoverview, URL URL, ContactPerson1 contactPerson1, Position1 position1, Tel1 tel1, Email1 email1, ContactPerson2 contactPerson2, Position2 position2, Tel2 tel2, Email2 email2, ContactPerson3 contactPerson3, Position3 position3, Tel3 tel3, Email3 email3, ContactPerson4 contactPerson4, Position4 position4, Tel4 tel4, Email4 email4, SearchCriteriaScreen searchCriteriaScreen, Search1 search1, Search2 search2, Search3 search3, Search5 search5, Search6 search6, Result result, W2d109ad3739d4744a1874ac179fc38b9 w2d109ad3739d4744a1874ac179fc38b9, W4ca84254d30c423ab8e449171a5b5123 w4ca84254d30c423ab8e449171a5b5123) { + public void setReferences(Screen screen, CurScreen curScreen, SwingPresenter presenter, BusinessCardManagement businessCardManagement, Company company, Representative representative, Position position, Establishment establishment, Address1 address1, Address2 address2, Businessdescription1 businessdescription1, Businessdescription2 businessdescription2, Companyoverview companyoverview, URL URL, ContactPerson1 contactPerson1, Position1 position1, Tel1 tel1, Email1 email1, ContactPerson2 contactPerson2, Position2 position2, Tel2 tel2, Email2 email2, ContactPerson3 contactPerson3, Position3 position3, Tel3 tel3, Email3 email3, ContactPerson4 contactPerson4, Position4 position4, Tel4 tel4, Email4 email4, SearchCriteriaScreen searchCriteriaScreen, Search1 search1, Search2 search2, Search3 search3, Search4 search4, Search5 search5, Search6 search6, Search7 search7, Result result, W2d109ad3739d4744a1874ac179fc38b9 w2d109ad3739d4744a1874ac179fc38b9, W4ca84254d30c423ab8e449171a5b5123 w4ca84254d30c423ab8e449171a5b5123) { this.screen = screen; this.curScreen = curScreen; this.presenter = presenter; @@ -675,8 +596,10 @@ this.search1 = search1; this.search2 = search2; this.search3 = search3; + this.search4 = search4; this.search5 = search5; this.search6 = search6; + this.search7 = search7; this.result = result; this.w2d109ad3739d4744a1874ac179fc38b9 = w2d109ad3739d4744a1874ac179fc38b9; this.w4ca84254d30c423ab8e449171a5b5123 = w4ca84254d30c423ab8e449171a5b5123; diff --git a/src/Widgets1.java b/src/Widgets1.java index 4f72d35..a4f48ef 100644 --- a/src/Widgets1.java +++ b/src/Widgets1.java @@ -42,11 +42,11 @@ public Widget1 getWidget1(String wid) { return this.value.get(wid); } - public void setReferences(Screen screen, CurScreen curScreen, SwingPresenter presenter, BusinessCardManagement businessCardManagement, Company company, Representative representative, Position position, Establishment establishment, Address1 address1, Address2 address2, Businessdescription1 businessdescription1, Businessdescription2 businessdescription2, Companyoverview companyoverview, URL URL, ContactPerson1 contactPerson1, Position1 position1, Tel1 tel1, Email1 email1, ContactPerson2 contactPerson2, Position2 position2, Tel2 tel2, Email2 email2, ContactPerson3 contactPerson3, Position3 position3, Tel3 tel3, Email3 email3, ContactPerson4 contactPerson4, Position4 position4, Tel4 tel4, Email4 email4, SearchCriteriaScreen searchCriteriaScreen, Search1 search1, Search2 search, Search3 search3, Search5 search5, Search6 search6, Result result, W2d109ad3739d4744a1874ac179fc38b9 w2d109ad3739d4744a1874ac179fc38b9, W4ca84254d30c423ab8e449171a5b5123 w4ca84254d30c423ab8e449171a5b5123) { + public void setReferences(Screen screen, CurScreen curScreen, SwingPresenter presenter, BusinessCardManagement businessCardManagement, Company company, Representative representative, Position position, Establishment establishment, Address1 address1, Address2 address2, Businessdescription1 businessdescription1, Businessdescription2 businessdescription2, Companyoverview companyoverview, URL URL, ContactPerson1 contactPerson1, Position1 position1, Tel1 tel1, Email1 email1, ContactPerson2 contactPerson2, Position2 position2, Tel2 tel2, Email2 email2, ContactPerson3 contactPerson3, Position3 position3, Tel3 tel3, Email3 email3, ContactPerson4 contactPerson4, Position4 position4, Tel4 tel4, Email4 email4, SearchCriteriaScreen searchCriteriaScreen, Search1 search1, Search2 search, Search3 search3, Search4 search4, Search5 search5, Search6 search6, Search7 search7, Result result, W2d109ad3739d4744a1874ac179fc38b9 w2d109ad3739d4744a1874ac179fc38b9, W4ca84254d30c423ab8e449171a5b5123 w4ca84254d30c423ab8e449171a5b5123) { this.curScreen = curScreen; this.presenter = presenter; for (Widget1 widget: value.values()) { - widget.setReferences(screen, curScreen, presenter, businessCardManagement, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, contactPerson1, position1, tel1, email1, contactPerson2, position2, tel2, email2, contactPerson3, position3, tel3, email3, contactPerson4, position4, tel4, email4, searchCriteriaScreen, search1, search, search3, search5, search6, result, w2d109ad3739d4744a1874ac179fc38b9, w4ca84254d30c423ab8e449171a5b5123); + widget.setReferences(screen, curScreen, presenter, businessCardManagement, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, contactPerson1, position1, tel1, email1, contactPerson2, position2, tel2, email2, contactPerson3, position3, tel3, email3, contactPerson4, position4, tel4, email4, searchCriteriaScreen, search1, search, search3, search4, search5, search6, search7, result, w2d109ad3739d4744a1874ac179fc38b9, w4ca84254d30c423ab8e449171a5b5123); } } } \ No newline at end of file