diff --git a/src/BusinessCardManagement.java b/src/BusinessCardManagement.java index 8d8ee08..1fbec09 100644 --- a/src/BusinessCardManagement.java +++ b/src/BusinessCardManagement.java @@ -1,3 +1,4 @@ +import javax.swing.*; import java.util.*; public class BusinessCardManagement { @@ -32,10 +33,10 @@ public BusinessCardManagementElement getBusinessCardManagementElement(String companyName) { return this.value.get(companyName); } - public void updateFromState(String scId, String wid, int state, String company_, String company, String representative_, String representative, String position_, String position, String establishment_, String establishment, String address1_, String address1, String address2_, String address2, String businessdescription1_, String businessdescription1, String businessdescription2_, String businessdescription2, String companyoverview_, String companyoverview, String URL_, String URL) { + public void updateFromState(String scId, String wid, int state, String company_, String representative_, String position_, String establishment_, String address1_, String address2_, String businessdescription1_, String businessdescription2_, String companyoverview_, 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_if15; if ((((state==0)&&!company_.equals(""))&&!(this.value.containsKey(company_)))) { - this.value.put(company_,new BusinessCardManagementElement(representative_, position_, establishment_, address1_, address2_, businessdescription1_, businessdescription2_, companyoverview_, URL_)); + this.value.put(company_,new BusinessCardManagementElement(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_)); temp_if15 = this.value; } else { temp_if15 = this.value; @@ -54,10 +55,10 @@ this.widget = screenTemplates.getScreenTemplate(searchScreen).getWidgets1().getWidget1(w4ca84254d30c423ab8e449171a5b5123); this.widget.updateDataFromBusinessCardManagement2(scId, wid, this.getValue(), w4ca84254d30c423ab8e449171a5b5123, searchScreen); } - public void updateFromState2(String scId, String wid, int state, String company_, String representative_, String position_, String establishment_, String address1_, String address2_, String businessdescription1_, String businessdescription2_, String companyoverview_, String URL_) { + public void updateFromState2(String scId, String wid, int state, String company_, String representative_, String position_, String establishment_, String address1_, String address2_, String businessdescription1_, String businessdescription2_, String companyoverview_, 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_if14; if ((((state==0)&&!company_.equals(""))&&!(this.value.containsKey(company_)))) { - this.value.put(company_,new BusinessCardManagementElement(representative_, position_, establishment_, address1_, address2_, businessdescription1_, businessdescription2_, companyoverview_, URL_)); + this.value.put(company_,new BusinessCardManagementElement(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_)); temp_if14 = this.value; } else { temp_if14 = this.value; @@ -76,10 +77,10 @@ this.widget = screenTemplates.getScreenTemplate(searchScreen).getWidgets1().getWidget1(w4ca84254d30c423ab8e449171a5b5123); this.widget.updateDataFromBusinessCardManagement2(scId, wid, this.getValue(), w4ca84254d30c423ab8e449171a5b5123, searchScreen); } - public void updateFromState3(String scId, String wid, int state, String editcompany_, String editcompany, String editrepresentative_, String editrepresentative, String editposition_, String editposition, String editestablish_, String editestablish, String editaddress1_, String editaddress1, String editaddress2_, String editaddress2, String editbusiness1_, String editbusiness1, String editbusiness2_, String editbusiness2, String editcompanydetail_, String editcompanydetail, String editURL_, String editURL) { + public void updateFromState3(String scId, String wid, int state, String editcompany_, String editrepresentative_, String editposition_, String editestablish_, String editaddress1_, String editaddress2_, String editbusiness1_, String editbusiness2_, String editcompanydetail_, String editURL_, String editcontactPerson1_, String editposition1_, String edittel1_, String editemail1_, String editcontactPerson2_, String editposition2_, String edittel2_, String editemail2_, String editcontactPerson3_, String editposition3_, String edittel3_, String editemail3_, String editcontactPerson4_, String editposition4_, String edittel4_, String editemail4_) { Map temp_if16; if ((((state==0)&&!editcompany_.equals(""))&&this.value.containsKey(editcompany_))) { - this.value.put(editcompany_,new BusinessCardManagementElement(editrepresentative_, editposition_, editestablish_, editaddress1_, editaddress2_, editbusiness1_, editbusiness2_, editcompanydetail_, editURL_)); + this.value.put(editcompany_,new BusinessCardManagementElement(editrepresentative_, editposition_, editestablish_, editaddress1_, editaddress2_, editbusiness1_, editbusiness2_, editcompanydetail_, editURL_, editcontactPerson1_, editposition1_, edittel1_, editemail1_, editcontactPerson2_, editposition2_, edittel2_, editemail2_, editcontactPerson3_, editposition3_, edittel3_, editemail3_, editcontactPerson4_, editposition4_, edittel4_, editemail4_)); temp_if16 = this.value; } else { temp_if16 = this.value; @@ -98,8 +99,8 @@ this.widget = screenTemplates.getScreenTemplate(searchScreen).getWidgets1().getWidget1(w4ca84254d30c423ab8e449171a5b5123); this.widget.updateDataFromBusinessCardManagement2(scId, wid, this.getValue(), w4ca84254d30c423ab8e449171a5b5123, searchScreen); } - public void addBusinessCardManagement(String scId, String wid, String representative, String position, String establishment, String address1, String address2, String businessDescription1, String businessDescription2, String companyOverview, String URL, String companyName) { - this.value.put(companyName,new BusinessCardManagementElement(representative, position, establishment, address1, address2, businessDescription1, businessDescription2, companyOverview, URL)); + public void addBusinessCardManagement(String scId, String wid, String representative, String position, String establishment, String address1, String address2, String businessDescription1, String businessDescription2, String companyOverview, String URL, String companyName, 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) { + this.value.put(companyName,new BusinessCardManagementElement(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)); String searchCriteriaScreen = this.searchCriteriaScreen.getValue(); String result = this.result.getValue(); this.widget = screenTemplates.getScreenTemplate(searchCriteriaScreen).getWidgets1().getWidget1(result); @@ -113,4 +114,12 @@ this.widget = screenTemplates.getScreenTemplate(searchScreen).getWidgets1().getWidget1(w4ca84254d30c423ab8e449171a5b5123); this.widget.updateDataFromBusinessCardManagement2(scId, wid, this.getValue(), w4ca84254d30c423ab8e449171a5b5123, searchScreen); } + + public void imports(String curScreen, String wid, int state) { + JPanel mainPanel = screen.getPresenter().getMainPanel(); + } + + public void save(String curScreen, String wid, int state) { + JPanel mainPanel = screen.getPresenter().getMainPanel(); + } } \ No newline at end of file diff --git a/src/BusinessCardManagementElement.java b/src/BusinessCardManagementElement.java index f6f651f..1c1b3e0 100644 --- a/src/BusinessCardManagementElement.java +++ b/src/BusinessCardManagementElement.java @@ -10,7 +10,24 @@ private String businessDescription1; private String companyOverview; private String URL; - public BusinessCardManagementElement(String representative, String position, String establishment, String address1, String address2, String businessDescription1, String businessDescription2, String companyOverview, String URL) { + private String contactPerson1; + private String position1; + private String tel1; + private String email1; + private String contactPerson2; + private String position2; + private String tel2; + private String email2; + private String contactPerson3; + private String position3; + private String tel3; + private String email3; + private String contactPerson4; + private String position4; + private String tel4; + private String email4; + + public BusinessCardManagementElement(String representative, String position, String establishment, String address1, String address2, String businessDescription1, String businessDescription2, String companyOverview, 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) { this.representative = representative; this.position = position; this.establishment = establishment; @@ -20,18 +37,50 @@ this.businessDescription2 = businessDescription2; this.companyOverview = companyOverview; this.URL = URL; + this.contactPerson1 = contactPerson1; + this.position1 = position1; + this.tel1 = tel1; + this.email1 = email1; + this.contactPerson2 = contactPerson2; + this.position2 = position2; + this.tel2 = tel2; + this.email2 = email2; + this.contactPerson3 = contactPerson3; + this.position3 = position3; + this.tel3 = tel3; + this.email3 = email3; + this.contactPerson4 = contactPerson4; + this.position4 = position4; + this.tel4 = tel4; + this.email4 = email4; } public Map getValue() { Map temp_nil0 = new HashMap<>(); - temp_nil0.put("代表者",this.getRepresentative()); - temp_nil0.put("役職",this.getPosition()); - temp_nil0.put("設立",this.getEstablishment()); - temp_nil0.put("住所１",this.getAddress1()); - temp_nil0.put("住所２",this.getAddress2()); - temp_nil0.put("事業内容１",this.getBusinessDescription1()); - temp_nil0.put("事業内容２",this.getBusinessDescription2()); - temp_nil0.put("会社概要",this.getCompanyOverview()); - temp_nil0.put("URL",this.getURL()); + temp_nil0.put("代表者", this.getRepresentative()); + temp_nil0.put("役職", this.getPosition()); + temp_nil0.put("設立", this.getEstablishment()); + temp_nil0.put("住所１", this.getAddress1()); + temp_nil0.put("住所２", this.getAddress2()); + temp_nil0.put("事業内容１", this.getBusinessDescription1()); + temp_nil0.put("事業内容２", this.getBusinessDescription2()); + temp_nil0.put("会社概要", this.getCompanyOverview()); + temp_nil0.put("URL", this.getURL()); + temp_nil0.put("担当者１", this.getContactPerson1()); + temp_nil0.put("役職１", this.getPosition1()); + temp_nil0.put("電話番号１", this.getTel1()); + temp_nil0.put("メール１", this.getEmail1()); + temp_nil0.put("担当者２", this.getContactPerson2()); + temp_nil0.put("役職２", this.getPosition2()); + temp_nil0.put("電話番号２", this.getTel2()); + temp_nil0.put("メール２", this.getEmail2()); + temp_nil0.put("担当者３", this.getContactPerson3()); + temp_nil0.put("役職３", this.getPosition3()); + temp_nil0.put("電話番号３", this.getTel3()); + temp_nil0.put("メール３", this.getEmail3()); + temp_nil0.put("担当者４", this.getContactPerson4()); + temp_nil0.put("役職４", this.getPosition4()); + temp_nil0.put("電話番号４", this.getTel4()); + temp_nil0.put("メール４", this.getEmail4()); return temp_nil0; } public String getRepresentative() { @@ -88,4 +137,36 @@ public void changeURLOfBusinessCardManagement(String companyName, String newURL) { this.URL = newURL; } + public String getContactPerson1() { return this.contactPerson1; } + public void changeContactPerson1OfBusinessCardManagement(String companyName, String newContactPerson1) { this.contactPerson1 = newContactPerson1; } + public String getPosition1() { return this.position1; } + public void changePosition1OfBusinessCardManagement(String companyName, String newPosition1) { this.position1 = newPosition1; } + public String getTel1() { return this.tel1; } + public void changeTel1OfBusinessCardManagement(String companyName, String newTel1) { this.tel1 = newTel1; } + public String getEmail1() { return this.email1; } + public void changeEmail1OfBusinessCardManagement(String companyName, String newEmail1) { this.email1 = newEmail1; } + public String getContactPerson2() { return this.contactPerson2; } + public void changeContactPerson2OfBusinessCardManagement(String companyName, String newContactPerson2) { this.contactPerson2 = newContactPerson2; } + public String getPosition2() { return this.position2; } + public void changePosition2OfBusinessCardManagement(String companyName, String newPosition2) { this.position2 = newPosition2; } + public String getTel2() { return this.tel2; } + public void changeTel2OfBusinessCardManagement(String companyName, String newTel2) { this.tel2 = newTel2; } + public String getEmail2() { return this.email2; } + public void changeEmail2OfBusinessCardManagement(String companyName, String newEmail2) { this.email2 = newEmail2; } + public String getContactPerson3() { return this.contactPerson3; } + public void changeContactPerson3OfBusinessCardManagement(String companyName, String newContactPerson3) { this.contactPerson3 = newContactPerson3; } + public String getPosition3() { return this.position3; } + public void changePosition3OfBusinessCardManagement(String companyName, String newPosition3) { this.position3 = newPosition3; } + public String getTel3() { return this.tel3; } + public void changeTel3OfBusinessCardManagement(String companyName, String newTel3) { this.tel3 = newTel3; } + public String getEmail3() { return this.email3; } + public void changeEmail3OfBusinessCardManagement(String companyName, String newEmail3) { this.email3 = newEmail3; } + public String getContactPerson4() { return this.contactPerson4; } + public void changeContactPerson4OfBusinessCardManagement(String companyName, String newContactPerson4) { this.contactPerson4 = newContactPerson4; } + public String getPosition4() { return this.position4; } + public void changePosition4OfBusinessCardManagement(String companyName, String newPosition4) { this.position4 = newPosition4; } + public String getTel4() { return this.tel4; } + public void changeTel4OfBusinessCardManagement(String companyName, String newTel4) { this.tel4 = newTel4; } + public String getEmail4() { return this.email4; } + public void changeEmail4OfBusinessCardManagement(String companyName, String newEmail4) { this.email4 = newEmail4; } } \ No newline at end of file diff --git a/src/ContactPerson1.java b/src/ContactPerson1.java new file mode 100644 index 0000000..b4de162 --- /dev/null +++ b/src/ContactPerson1.java @@ -0,0 +1,12 @@ +import java.util.*; + +public class ContactPerson1 { + private Screen screen; + private String value = "contactPerson1"; + public ContactPerson1(Screen screen) { + this.screen = screen; + } + public String getValue() { + return new String(this.value); + } +} diff --git a/src/ContactPerson2.java b/src/ContactPerson2.java new file mode 100644 index 0000000..d90f515 --- /dev/null +++ b/src/ContactPerson2.java @@ -0,0 +1,12 @@ +import java.util.*; + +public class ContactPerson2 { + private Screen screen; + private String value = "contactPerson2"; + public ContactPerson2(Screen screen) { + this.screen = screen; + } + public String getValue() { + return new String(this.value); + } +} diff --git a/src/ContactPerson3.java b/src/ContactPerson3.java new file mode 100644 index 0000000..8b1302f --- /dev/null +++ b/src/ContactPerson3.java @@ -0,0 +1,12 @@ +import java.util.*; + +public class ContactPerson3 { + private Screen screen; + private String value = "contactPerson3"; + public ContactPerson3(Screen screen) { + this.screen = screen; + } + public String getValue() { + return new String(this.value); + } +} diff --git a/src/ContactPerson4.java b/src/ContactPerson4.java new file mode 100644 index 0000000..95863be --- /dev/null +++ b/src/ContactPerson4.java @@ -0,0 +1,12 @@ +import java.util.*; + +public class ContactPerson4 { + private Screen screen; + private String value = "contactPerson4"; + public ContactPerson4(Screen screen) { + this.screen = screen; + } + public String getValue() { + return new String(this.value); + } +} diff --git a/src/CurScreen.java b/src/CurScreen.java index b898928..e453db2 100644 --- a/src/CurScreen.java +++ b/src/CurScreen.java @@ -55,7 +55,7 @@ Map screenTemplate = screenTemplates.getScreenTemplate(this.value).getValue(); this.screen.updateFromCurScreen(this.value, screenTemplate); } - public void updateFromState5(String scId, String wid, int state, String editcompany_, String editcompany, String editrepresentative_, String editrepresentative, String editposition_, String editposition, String editestablish_, String editestablish, String editaddress1_, String editaddress1, String editaddress2_, String editaddress2, String editbusiness1_, String editbusiness1, String editbusiness2_, String editbusiness2, String editcompanydetail_, String editcompanydetail, String editURL_, String editURL, Map> businessCardManagement) { + public void updateFromState5(String scId, String wid, int state, String editcompany_, String editrepresentative_, String editposition_, String editestablish_, String editaddress1_, String editaddress2_, String editbusiness1_, String editbusiness2_, String editcompanydetail_, String editURL_, Map> businessCardManagement) { String temp_if7; if ((state==0)) { String temp_if6; @@ -133,6 +133,17 @@ Map screenTemplate = screenTemplates.getScreenTemplate(this.value).getValue(); this.screen.updateFromCurScreen(this.value, screenTemplate); } + public void updateFromState11(String scId, String wid, int state) { + String temp_if14; + if ((state==0)) { + temp_if14 = "編集画面２"; + } else { + temp_if14 = this.value; + } + this.value = temp_if14; + Map screenTemplate = screenTemplates.getScreenTemplate(this.value).getValue(); + this.screen.updateFromCurScreen(this.value, screenTemplate); + } public void changeCurScreen(String nextScId) { this.value = nextScId; Map screenTemplate = screenTemplates.getScreenTemplate(this.value).getValue(); diff --git a/src/EditURL.java b/src/EditURL.java deleted file mode 100644 index 3ae753a..0000000 --- a/src/EditURL.java +++ /dev/null @@ -1,12 +0,0 @@ -import java.util.*; - -public class EditURL { - private Screen screen; - private String value = "editURL"; - public EditURL(Screen screen) { - this.screen = screen; - } - public String getValue() { - return new String(this.value); - } -} \ No newline at end of file diff --git a/src/Editaddress1.java b/src/Editaddress1.java deleted file mode 100644 index efbb1af..0000000 --- a/src/Editaddress1.java +++ /dev/null @@ -1,12 +0,0 @@ -import java.util.*; - -public class Editaddress1 { - private Screen screen; - private String value = "editaddress1"; - public Editaddress1(Screen screen) { - this.screen = screen; - } - public String getValue() { - return new String(this.value); - } -} \ No newline at end of file diff --git a/src/Editaddress2.java b/src/Editaddress2.java deleted file mode 100644 index 823748b..0000000 --- a/src/Editaddress2.java +++ /dev/null @@ -1,12 +0,0 @@ -import java.util.*; - -public class Editaddress2 { - private Screen screen; - private String value = "editaddress2"; - public Editaddress2(Screen screen) { - this.screen = screen; - } - public String getValue() { - return new String(this.value); - } -} \ No newline at end of file diff --git a/src/Editbusiness1.java b/src/Editbusiness1.java deleted file mode 100644 index 87cca66..0000000 --- a/src/Editbusiness1.java +++ /dev/null @@ -1,12 +0,0 @@ -import java.util.*; - -public class Editbusiness1 { - private Screen screen; - private String value = "editbusiness1"; - public Editbusiness1(Screen screen) { - this.screen = screen; - } - public String getValue() { - return new String(this.value); - } -} \ No newline at end of file diff --git a/src/Editbusiness2.java b/src/Editbusiness2.java deleted file mode 100644 index 3401173..0000000 --- a/src/Editbusiness2.java +++ /dev/null @@ -1,12 +0,0 @@ -import java.util.*; - -public class Editbusiness2 { - private Screen screen; - private String value = "editbusiness2"; - public Editbusiness2(Screen screen) { - this.screen = screen; - } - public String getValue() { - return new String(this.value); - } -} \ No newline at end of file diff --git a/src/Editcompany.java b/src/Editcompany.java deleted file mode 100644 index 1c52e00..0000000 --- a/src/Editcompany.java +++ /dev/null @@ -1,12 +0,0 @@ -import java.util.*; - -public class Editcompany { - private Screen screen; - private String value = "editcompany"; - public Editcompany(Screen screen) { - this.screen = screen; - } - public String getValue() { - return new String(this.value); - } -} \ No newline at end of file diff --git a/src/Editcompanydetail.java b/src/Editcompanydetail.java deleted file mode 100644 index 14ffa8b..0000000 --- a/src/Editcompanydetail.java +++ /dev/null @@ -1,12 +0,0 @@ -import java.util.*; - -public class Editcompanydetail { - private Screen screen; - private String value = "editcompanydetail"; - public Editcompanydetail(Screen screen) { - this.screen = screen; - } - public String getValue() { - return new String(this.value); - } -} \ No newline at end of file diff --git a/src/Editestablish.java b/src/Editestablish.java deleted file mode 100644 index 81275c5..0000000 --- a/src/Editestablish.java +++ /dev/null @@ -1,12 +0,0 @@ -import java.util.*; - -public class Editestablish { - private Screen screen; - private String value = "editestablish"; - public Editestablish(Screen screen) { - this.screen = screen; - } - public String getValue() { - return new String(this.value); - } -} \ No newline at end of file diff --git a/src/Editposition.java b/src/Editposition.java deleted file mode 100644 index 19b8d89..0000000 --- a/src/Editposition.java +++ /dev/null @@ -1,12 +0,0 @@ -import java.util.*; - -public class Editposition { - private Screen screen; - private String value = "editposition"; - public Editposition(Screen screen) { - this.screen = screen; - } - public String getValue() { - return new String(this.value); - } -} \ No newline at end of file diff --git a/src/Editrepresentative.java b/src/Editrepresentative.java deleted file mode 100644 index 80763fe..0000000 --- a/src/Editrepresentative.java +++ /dev/null @@ -1,12 +0,0 @@ -import java.util.*; - -public class Editrepresentative { - private Screen screen; - private String value = "editrepresentative"; - public Editrepresentative(Screen screen) { - this.screen = screen; - } - public String getValue() { - return new String(this.value); - } -} \ No newline at end of file diff --git a/src/Email1.java b/src/Email1.java new file mode 100644 index 0000000..75f09d6 --- /dev/null +++ b/src/Email1.java @@ -0,0 +1,12 @@ +import java.util.*; + +public class Email1 { + private Screen screen; + private String value = "email1"; + public Email1(Screen screen) { + this.screen = screen; + } + public String getValue() { + return new String(this.value); + } +} diff --git a/src/Email2.java b/src/Email2.java new file mode 100644 index 0000000..9d8dd81 --- /dev/null +++ b/src/Email2.java @@ -0,0 +1,12 @@ +import java.util.*; + +public class Email2 { + private Screen screen; + private String value = "email2"; + public Email2(Screen screen) { + this.screen = screen; + } + public String getValue() { + return new String(this.value); + } +} diff --git a/src/Email3.java b/src/Email3.java new file mode 100644 index 0000000..34a67ca --- /dev/null +++ b/src/Email3.java @@ -0,0 +1,12 @@ +import java.util.*; + +public class Email3 { + private Screen screen; + private String value = "email3"; + public Email3(Screen screen) { + this.screen = screen; + } + public String getValue() { + return new String(this.value); + } +} diff --git a/src/Email4.java b/src/Email4.java new file mode 100644 index 0000000..a17350b --- /dev/null +++ b/src/Email4.java @@ -0,0 +1,12 @@ +import java.util.*; + +public class Email4 { + private Screen screen; + private String value = "email4"; + public Email4(Screen screen) { + this.screen = screen; + } + public String getValue() { + return new String(this.value); + } +} diff --git a/src/Main.java b/src/Main.java index cef5557..c514058 100644 --- a/src/Main.java +++ b/src/Main.java @@ -1,41 +1,47 @@ import java.util.*; public class Main { + private ScreenTemplates screenTemplates; private Screen screen; - private Search1 search1; - private Search6 search6; - private Editcompany editcompany; - private Editbusiness2 editbusiness2; - private Search5 search5; - private Establishment establishment; - private Editcompanydetail editcompanydetail; - private Position position; - private Editaddress2 editaddress2; - private Search2 search2; - private URL URL; - private Editrepresentative editrepresentative; - private Businessdescription2 businessdescription2; - private Editposition editposition; - private Editestablish editestablish; - private EditURL editURL; - private Editbusiness1 editbusiness1; - private ScreenTemplates screenTemplates; + private CurScreen curScreen; + private BusinessCardManagement businessCardManagement; + private Company company; + private Representative representative; + private Position position; + private Establishment establishment; + private Address1 address1; + private Address2 address2; + private Businessdescription1 businessdescription1; + private Businessdescription2 businessdescription2; + private Companyoverview companyoverview; + private URL URL; + private ContactPerson1 contactPerson1; + private Position1 position1; + private Tel1 tel1; + private Email1 email1; + private ContactPerson2 contactPerson2; + private Position2 position2; + private Tel2 tel2; + private Email2 email2; + private ContactPerson3 contactPerson3; + private Position3 position3; + private Tel3 tel3; + private Email3 email3; + private ContactPerson4 contactPerson4; + private Position4 position4; + private Tel4 tel4; + private Email4 email4; + private Search1 search1; + private Search2 search2; + private Search3 search3; + private Search5 search5; + private Search6 search6; + private Result result; private CompanyList companyList; + private SearchCriteriaScreen searchCriteriaScreen; + private SearchScreen searchScreen; private W2d109ad3739d4744a1874ac179fc38b9 w2d109ad3739d4744a1874ac179fc38b9; - private SearchCriteriaScreen searchCriteriaScreen; - private Result result; private W4ca84254d30c423ab8e449171a5b5123 w4ca84254d30c423ab8e449171a5b5123; - private SearchScreen searchScreen; - private BusinessCardManagement businessCardManagement; - private Editaddress1 editaddress1; - private Businessdescription1 businessdescription1; - private Companyoverview companyoverview; - private Search3 search3; - private Address2 address2; - private CurScreen curScreen; - private Company company; - private Address1 address1; - private Representative representative; public static void main(String[] args) { new Main(); } @@ -46,170 +52,146 @@ this.screen = new Screen(screenTemplates, true, presenter); this.curScreen = new CurScreen(screen, screenTemplates); this.screen.setCurScreen(curScreen); - this.search1 = new Search1(screen); - this.search6 = new Search6(screen); - this.editcompany = new Editcompany(screen); - this.editbusiness2 = new Editbusiness2(screen); - this.search5 = new Search5(screen); - this.establishment = new Establishment(screen); - this.editcompanydetail = new Editcompanydetail(screen); - this.position = new Position(screen); - this.editaddress2 = new Editaddress2(screen); - this.search2 = new Search2(screen); - this.URL = new URL(screen); - this.editrepresentative = new Editrepresentative(screen); + this.company = new Company(screen); + this.representative = new Representative(screen); + this.position = new Position(screen); + this.establishment = new Establishment(screen); + this.address2 = new Address2(screen); + this.address1 = new Address1(screen); + this.businessdescription1 = new Businessdescription1(screen); this.businessdescription2 = new Businessdescription2(screen); - this.editposition = new Editposition(screen); - this.editestablish = new Editestablish(screen); - this.editURL = new EditURL(screen); - this.editbusiness1 = new Editbusiness1(screen); + this.companyoverview = new Companyoverview(screen); + this.URL = new URL(screen); + this.contactPerson1 = new ContactPerson1(screen); + this.position1 = new Position1(screen); + this.tel1 = new Tel1(screen); + this.email1 = new Email1(screen); + this.contactPerson2 = new ContactPerson2(screen); + this.position2 = new Position2(screen); + this.tel2 = new Tel2(screen); + this.email2 = new Email2(screen); + this.contactPerson3 = new ContactPerson3(screen); + this.position3 = new Position3(screen); + this.tel3 = new Tel3(screen); + this.email3 = new Email3(screen); + this.contactPerson4 = new ContactPerson4(screen); + this.position4 = new Position4(screen); + this.tel4 = new Tel4(screen); + this.email4 = new Email4(screen); + this.search1 = new Search1(screen); + this.search2 = new Search2(screen); + this.search3 = new Search3(screen); + this.search5 = new Search5(screen); + this.search6 = new Search6(screen); + this.result = new Result(screen, screenTemplates); this.companyList = new CompanyList(screenTemplates); + this.searchCriteriaScreen = new SearchCriteriaScreen(screen, screenTemplates); + this.searchScreen = new SearchScreen(screenTemplates); this.w2d109ad3739d4744a1874ac179fc38b9 = new W2d109ad3739d4744a1874ac179fc38b9(screenTemplates); - this.searchCriteriaScreen = new SearchCriteriaScreen(screen, screenTemplates); - this.result = new Result(screen, screenTemplates); this.w4ca84254d30c423ab8e449171a5b5123 = new W4ca84254d30c423ab8e449171a5b5123(screenTemplates); - this.searchScreen = new SearchScreen(screenTemplates); this.businessCardManagement = new BusinessCardManagement(screen, screenTemplates, w4ca84254d30c423ab8e449171a5b5123, searchScreen, searchCriteriaScreen, result, companyList, w2d109ad3739d4744a1874ac179fc38b9); - this.editaddress1 = new Editaddress1(screen); - this.businessdescription1 = new Businessdescription1(screen); - this.companyoverview = new Companyoverview(screen); - this.search3 = new Search3(screen); - this.address2 = new Address2(screen); - this.company = new Company(screen); - this.address1 = new Address1(screen); - this.representative = new Representative(screen); - this.screenTemplates.setReferences(screen, curScreen, presenter, businessCardManagement, editcompany, editaddress1, editbusiness1, editestablish, editbusiness2, editposition, editcompanydetail, editURL, editaddress2, editrepresentative, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, searchCriteriaScreen, search1, search2, search3, search5, search6, result); + 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); changeCurScreen("企業一覧"); } - public Map getBusinessCardManagementElement(String companyName) { - return this.businessCardManagement.getBusinessCardManagementElement(companyName).getValue(); - } - public Map getScreenTemplate(String nextScId) { - return this.screenTemplates.getScreenTemplate(nextScId).getValue(); - } - public Map getWidgets(String scId) { - return this.screenTemplates.getScreenTemplate(scId).getWidgets1().getValue(); - } - public Map getWidget(String scId, String wid) { - return this.screenTemplates.getScreenTemplate(scId).getWidgets1().getWidget1(wid).getValue(); - } - public Map getWidgets1() { - return this.screen.getWidgets().getValue(); - } - public Map getWidget1(String editposition) { - return this.screen.getWidgets().getWidget(editposition).getValue(); - } + public Map getScreenTemplates() { + return this.screenTemplates.getValue(); + } + public Map getScreenTemplate(String nextScId) { + return this.screenTemplates.getScreenTemplate(nextScId).getValue(); + } + public Map getWidgets1() { + return this.screen.getWidgets().getValue(); + } + public Map getWidget1(String editposition) { + return this.screen.getWidgets().getWidget(editposition).getValue(); + } public Map getScreen() { return this.screen.getValue(); } - public String getSearch1() { - return this.search1.getValue(); - } - public String getSearch6() { - return this.search6.getValue(); - } - public String getEditcompany() { - return this.editcompany.getValue(); - } - public String getEditbusiness2() { - return this.editbusiness2.getValue(); - } - public String getSearch5() { - return this.search5.getValue(); - } - public String getEstablishment() { - return this.establishment.getValue(); - } - public String getEditcompanydetail() { - return this.editcompanydetail.getValue(); - } - public String getPosition() { - return this.position.getValue(); - } - public String getEditaddress2() { - return this.editaddress2.getValue(); - } - public String getSearch2() { - return this.search2.getValue(); - } + public Map getWidgets(String scId) { + return this.screenTemplates.getScreenTemplate(scId).getWidgets1().getValue(); + } + public Map getWidget(String scId, String wid) { + return this.screenTemplates.getScreenTemplate(scId).getWidgets1().getWidget1(wid).getValue(); + } + public String getCurScreen() { + return this.curScreen.getValue(); + } + public void changeCurScreen(String nextScId) { + this.curScreen.changeCurScreen(nextScId); + } + public Map> getBusinessCardManagement() { + return this.businessCardManagement.getValue(); + } + public Map getBusinessCardManagementElement(String companyName) { + return this.businessCardManagement.getBusinessCardManagementElement(companyName).getValue(); + } + public String getCompany() { + return this.company.getValue(); + } + public String getRepresentative() { + return this.representative.getValue(); + } + public String getPosition() { + return this.position.getValue(); + } + public String getEstablishment() { + return this.establishment.getValue(); + } + public String getAddress1() { + return this.address1.getValue(); + } + public String getAddress2() { + return this.address2.getValue(); + } + public String getBusinessdescription1() { + return this.businessdescription1.getValue(); + } + public String getBusinessdescription2() { + return this.businessdescription2.getValue(); + } + public String getCompanyoverview() { + return this.companyoverview.getValue(); + } public String getURL() { return this.URL.getValue(); } - public String getEditrepresentative() { - return this.editrepresentative.getValue(); - } - public String getBusinessdescription2() { - return this.businessdescription2.getValue(); - } - public String getEditposition() { - return this.editposition.getValue(); - } - public String getEditestablish() { - return this.editestablish.getValue(); - } - public String getEditURL() { - return this.editURL.getValue(); - } - public String getEditbusiness1() { - return this.editbusiness1.getValue(); - } - public Map getScreenTemplates() { - return this.screenTemplates.getValue(); - } + public String getSearch1() { + return this.search1.getValue(); + } + public String getSearch2() { + return this.search2.getValue(); + } + public String getSearch3() { + return this.search3.getValue(); + } + public String getSearch6() { + return this.search6.getValue(); + } + public String getSearch5() { + return this.search5.getValue(); + } + public String getResult() { + return this.result.getValue(); + } public String getCompanyList() { return this.companyList.getValue(); } + public String getSearchScreen() { + return this.searchScreen.getValue(); + } + public String getSearchCriteriaScreen() { + return this.searchCriteriaScreen.getValue(); + } public String getW2d109ad3739d4744a1874ac179fc38b9() { return this.w2d109ad3739d4744a1874ac179fc38b9.getValue(); } - public String getSearchCriteriaScreen() { - return this.searchCriteriaScreen.getValue(); - } - public String getResult() { - return this.result.getValue(); - } public String getW4ca84254d30c423ab8e449171a5b5123() { return this.w4ca84254d30c423ab8e449171a5b5123.getValue(); } - public String getSearchScreen() { - return this.searchScreen.getValue(); - } - public Map> getBusinessCardManagement() { - return this.businessCardManagement.getValue(); - } - public String getEditaddress1() { - return this.editaddress1.getValue(); - } - public String getBusinessdescription1() { - return this.businessdescription1.getValue(); - } - public String getCompanyoverview() { - return this.companyoverview.getValue(); - } - public String getSearch3() { - return this.search3.getValue(); - } - public String getAddress2() { - return this.address2.getValue(); - } - public String getCurScreen() { - return this.curScreen.getValue(); - } - public String getCompany() { - return this.company.getValue(); - } - public String getAddress1() { - return this.address1.getValue(); - } - public String getRepresentative() { - return this.representative.getValue(); - } public String getText(String editURL) { return this.screen.getWidgets().getWidget(editURL).getText(); } - public void textEvent(String wid, String nextText) { - this.screen.getWidgets().getWidget(wid).textEvent(wid, nextText); - } public Map> getData(String wid) { return this.screen.getWidgets().getWidget(wid).getData(); } @@ -279,11 +261,8 @@ public void changeBusinessDescription2OfBusinessCardManagement(String companyName, String newBusinessDescription2) { this.businessCardManagement.getBusinessCardManagementElement(companyName).changeBusinessDescription2OfBusinessCardManagement(companyName, newBusinessDescription2); } - public void addBusinessCardManagement(String scId, String wid, String representative, String position, String establishment, String address1, String address2, String businessDescription1, String businessDescription2, String companyOverview, String URL, String companyName) { - this.businessCardManagement.addBusinessCardManagement(scId, wid, representative, position, establishment, address1, address2, businessDescription1, businessDescription2, companyOverview, URL, companyName); - } - public void changeCurScreen(String nextScId) { - this.curScreen.changeCurScreen(nextScId); + public void addBusinessCardManagement(String scId, String wid, String representative, String position, String establishment, String address1, String address2, String businessDescription1, String businessDescription2, String companyOverview, String URL, String companyName, 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) { + this.businessCardManagement.addBusinessCardManagement(scId, wid, representative, position, establishment, address1, address2, businessDescription1, businessDescription2, companyOverview, URL, companyName, contactPerson1, position1, tel1, email1, contactPerson2, position2, tel2, email2, contactPerson3, position3, tel3, email3, contactPerson4, position4, tel4, email4); } public int getState(String scId, String wid) { return this.screenTemplates.getScreenTemplate(scId).getWidgets1().getWidget1(wid).getState(); @@ -297,13 +276,16 @@ public int getState(String wid) { return this.screen.getWidgets().getWidget(wid).getState(); } - public void mouseEvent(String wid, int nextState) { - this.screen.getWidgets().getWidget(wid).mouseEvent(wid, nextState); - } public String getEstablishment(String companyName) { return this.businessCardManagement.getBusinessCardManagementElement(companyName).getEstablishment(); } public void changeEstablishmentOfBusinessCardManagement(String companyName, String newEstablishment) { this.businessCardManagement.getBusinessCardManagementElement(companyName).changeEstablishmentOfBusinessCardManagement(companyName, newEstablishment); } + public void textEvent(String wid, String nextText) { + this.screen.getWidgets().getWidget(wid).textEvent(wid, nextText); + } + public void mouseEvent(String wid, int nextState) { + this.screen.getWidgets().getWidget(wid).mouseEvent(wid, nextState); + } } \ No newline at end of file diff --git a/src/Position1.java b/src/Position1.java new file mode 100644 index 0000000..22e2335 --- /dev/null +++ b/src/Position1.java @@ -0,0 +1,12 @@ +import java.util.*; + +public class Position1 { + private Screen screen; + private String value = "position1"; + public Position1(Screen screen) { + this.screen = screen; + } + public String getValue() { + return new String(this.value); + } +} diff --git a/src/Position2.java b/src/Position2.java new file mode 100644 index 0000000..e2bcf60 --- /dev/null +++ b/src/Position2.java @@ -0,0 +1,12 @@ +import java.util.*; + +public class Position2 { + private Screen screen; + private String value = "position2"; + public Position2(Screen screen) { + this.screen = screen; + } + public String getValue() { + return new String(this.value); + } +} diff --git a/src/Position3.java b/src/Position3.java new file mode 100644 index 0000000..f3b93f4 --- /dev/null +++ b/src/Position3.java @@ -0,0 +1,12 @@ +import java.util.*; + +public class Position3 { + private Screen screen; + private String value = "position3"; + public Position3(Screen screen) { + this.screen = screen; + } + public String getValue() { + return new String(this.value); + } +} diff --git a/src/Position4.java b/src/Position4.java new file mode 100644 index 0000000..394a8b1 --- /dev/null +++ b/src/Position4.java @@ -0,0 +1,12 @@ +import java.util.*; + +public class Position4 { + private Screen screen; + private String value = "position4"; + public Position4(Screen screen) { + this.screen = screen; + } + public String getValue() { + return new String(this.value); + } +} diff --git a/src/Screen.java b/src/Screen.java index e9312a5..655d402 100644 --- a/src/Screen.java +++ b/src/Screen.java @@ -30,13 +30,16 @@ public boolean getLayout() { return this.layout; } + public void changeLayout(boolean layout) { + this.layout = layout; + presenter.setLayout(layout); + } public String getScreenId() { return this.screenId; } - public void changeLayout(boolean layout) { - this.layout = layout; - presenter.setLayout(layout); - } + public SwingPresenter getPresenter() { + return this.presenter; + } public void setCurScreen(CurScreen curScreen) { widgets.setCurScreen(curScreen); } diff --git a/src/ScreenTemplate.java b/src/ScreenTemplate.java index 32899ae..019cf37 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, Editcompany editcompany, Editaddress1 editaddress1, Editbusiness1 editbusiness1, Editestablish editestablish, Editbusiness2 editbusiness2, Editposition editposition, Editcompanydetail editcompanydetail, EditURL editURL, Editaddress2 editaddress2, Editrepresentative editrepresentative, Company company, Representative representative, Position position, Establishment establishment, Address1 address1, Address2 address2, Businessdescription1 businessdescription1, Businessdescription2 businessdescription2, Companyoverview companyoverview, URL URL, SearchCriteriaScreen searchCriteriaScreen, Search1 search1, Search2 search2, Search3 search3, Search5 search5, Search6 search6, Result result) { + 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) { this.curScreen = curScreen; this.presenter = presenter; - this.widgets.setReferences(screen, curScreen, presenter, businessCardManagement, editcompany, editaddress1, editbusiness1, editestablish, editbusiness2, editposition, editcompanydetail, editURL, editaddress2, editrepresentative, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, searchCriteriaScreen, search1, search2, search3, search5, search6, result); + 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); } } \ No newline at end of file diff --git a/src/ScreenTemplates.java b/src/ScreenTemplates.java index d8ecfd9..86972de 100644 --- a/src/ScreenTemplates.java +++ b/src/ScreenTemplates.java @@ -571,7 +571,7 @@ temp_json59.put("w2d109ad3739d4744a1874ac179fc38b9", temp_json62); temp_json59.put("w0498c4eb3524489494c288e2fc7a3211", temp_json65); temp_json59.put("wa6aa4bcbb7a64e9eaf75758eae59310a", temp_json66); - temp_json59.put("inportButton", temp_json01_); + temp_json59.put("importButton", temp_json01_); temp_json59.put("saveButton", temp_json02_); Map temp_json58 = new HashMap<>(); temp_json58.put("screenId", "企業一覧"); @@ -814,11 +814,11 @@ public Map getValue() { return new HashMap<>(this.value); } - public void setReferences(Screen screen, CurScreen curScreen, SwingPresenter presenter, BusinessCardManagement businessCardManagement, Editcompany editcompany, Editaddress1 editaddress1, Editbusiness1 editbusiness1, Editestablish editestablish, Editbusiness2 editbusiness2, Editposition editposition, Editcompanydetail editcompanydetail, EditURL editURL, Editaddress2 editaddress2, Editrepresentative editrepresentative, Company company, Representative representative, Position position, Establishment establishment, Address1 address1, Address2 address2, Businessdescription1 businessdescription1, Businessdescription2 businessdescription2, Companyoverview companyoverview, URL URL, SearchCriteriaScreen searchCriteriaScreen, Search1 search1, Search2 search2, Search3 search3, Search5 search5, Search6 search6, Result result) { + 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) { this.presenter = presenter; this.curScreen = curScreen; for (ScreenTemplate screenTemplate: value.values()) { - screenTemplate.setReferences(screen, curScreen, presenter, businessCardManagement, editcompany, editaddress1, editbusiness1, editestablish, editbusiness2, editposition, editcompanydetail, editURL, editaddress2, editrepresentative, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, searchCriteriaScreen, search1, search2, search3, search5, search6, result); + 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); } } public ScreenTemplate getScreenTemplate(String scId) { diff --git a/src/SwingPresenter.java b/src/SwingPresenter.java index dab6412..46d5525 100644 --- a/src/SwingPresenter.java +++ b/src/SwingPresenter.java @@ -24,6 +24,10 @@ this.mainPanel = mainPanel; } + public JPanel getMainPanel() { + return mainPanel; + } + public void screenUpdate(Map prevValue, Map value) { Map widgets = (Map) value.get("widgets"); boolean layout = (boolean) value.get("layout"); diff --git a/src/Tel1.java b/src/Tel1.java new file mode 100644 index 0000000..a244cfc --- /dev/null +++ b/src/Tel1.java @@ -0,0 +1,12 @@ +import java.util.*; + +public class Tel1 { + private Screen screen; + private String value = "tel1"; + public Tel1(Screen screen) { + this.screen = screen; + } + public String getValue() { + return new String(this.value); + } +} diff --git a/src/Tel2.java b/src/Tel2.java new file mode 100644 index 0000000..8c70de8 --- /dev/null +++ b/src/Tel2.java @@ -0,0 +1,12 @@ +import java.util.*; + +public class Tel2 { + private Screen screen; + private String value = "tel2"; + public Tel2(Screen screen) { + this.screen = screen; + } + public String getValue() { + return new String(this.value); + } +} diff --git a/src/Tel3.java b/src/Tel3.java new file mode 100644 index 0000000..31d5ef6 --- /dev/null +++ b/src/Tel3.java @@ -0,0 +1,12 @@ +import java.util.*; + +public class Tel3 { + private Screen screen; + private String value = "tel3"; + public Tel3(Screen screen) { + this.screen = screen; + } + public String getValue() { + return new String(this.value); + } +} diff --git a/src/Tel4.java b/src/Tel4.java new file mode 100644 index 0000000..a2fdb33 --- /dev/null +++ b/src/Tel4.java @@ -0,0 +1,12 @@ +import java.util.*; + +public class Tel4 { + private Screen screen; + private String value = "tel4"; + public Tel4(Screen screen) { + this.screen = screen; + } + public String getValue() { + return new String(this.value); + } +} diff --git a/src/Widget1.java b/src/Widget1.java index c78f2eb..6ed190e 100644 --- a/src/Widget1.java +++ b/src/Widget1.java @@ -17,16 +17,6 @@ private Screen screen; private CurScreen curScreen; private SwingPresenter presenter; - private Editcompany editcompany; - private Editaddress1 editaddress1; - private Editbusiness1 editbusiness1; - private Editestablish editestablish; - private Editbusiness2 editbusiness2; - private Editposition editposition; - private Editcompanydetail editcompanydetail; - private EditURL editURL; - private Editaddress2 editaddress2; - private Editrepresentative editrepresentative; private Company company; private Representative representative; private Position position; @@ -37,6 +27,22 @@ private Businessdescription2 businessdescription2; private Companyoverview companyoverview; private URL URL; + private ContactPerson1 contactPerson1; + private Position1 position1; + private Tel1 tel1; + private Email1 email1; + private ContactPerson2 contactPerson2; + private Position2 position2; + private Tel2 tel2; + private Email2 email2; + private ContactPerson3 contactPerson3; + private Position3 position3; + private Tel3 tel3; + private Email3 email3; + private ContactPerson4 contactPerson4; + private Position4 position4; + private Tel4 tel4; + private Email4 email4; private SearchCriteriaScreen searchCriteriaScreen; private Search1 search1; private Search2 search2; @@ -126,98 +132,169 @@ } public void updateStateFromState(String self, String self2, String wid, int state, String curScreen) { this.state = state; - if ((curScreen.equals("検索画面")&&wid.equals("w7de33900c55f4379983056aee325c057"))) { - this.curScreen.updateFromState10(curScreen, wid, this.state); - } - if ((curScreen.equals("編集画面２")&&wid.equals("w71f9e06eb3654cc2bb57ce3482579e11"))) { - this.curScreen.updateFromState9(curScreen, wid, this.state); - } - if ((curScreen.equals("検索画面")&&wid.equals("web3d4ea933244ee195c972cec50c9474"))) { + if ((curScreen.equals("企業一覧")&&wid.equals("w191cc519b2344758b8d9878328b41cd9"))) { // 「検索」ボタン + this.curScreen.updateFromState3(curScreen, wid, this.state); + } + if ((curScreen.equals("企業一覧")&&wid.equals("w0498c4eb3524489494c288e2fc7a3211"))) { // 「登録」ボタン + this.curScreen.updateFromState2(curScreen, wid, this.state); + } + if ((curScreen.equals("企業一覧")&&wid.equals("wa6aa4bcbb7a64e9eaf75758eae59310a"))) { // 「編集」ボタン + this.curScreen.updateFromState11(curScreen, wid, this.state); + } + if ((curScreen.equals("企業一覧")&&wid.equals("wa1b27f08c9fd4c08b7dda38625c04f3b"))) { // 「削除」ボタン + } + 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); + } + if ((curScreen.equals("検索画面")&&wid.equals("web3d4ea933244ee195c972cec50c9474"))) { // 「一覧へ戻る」ボタン this.curScreen.updateFromState8(curScreen, wid, this.state); } - if ((curScreen.equals("検索画面結果")&&wid.equals("w0becbeb6b2d54c03a69d63e3facd2eaa"))) { - this.curScreen.updateFromState7(curScreen, wid, this.state); + if ((curScreen.equals("編集画面２")&&wid.equals("w71f9e06eb3654cc2bb57ce3482579e11"))) { // 「一覧へ戻る」ボタン + this.curScreen.updateFromState9(curScreen, wid, this.state); + } + if ((curScreen.equals("編集画面２")&&wid.equals("w11dd0f050a5044d384b10351b83ad390"))) { // 「編集」ボタン + 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 business1 = this.businessdescription1.getValue(); + String business2 = 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 establish_ = 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(business1); + String business1_ = this.widget1.getText(); + this.widget1 = screen.getWidgets().getWidget(business2); + String business2_ = this.widget1.getText(); + this.widget1 = screen.getWidgets().getWidget(companyoverview); + String companydetail_ = this.widget1.getText(); + this.widget1 = screen.getWidgets().getWidget(URL); + String URL_ = this.widget1.getText(); + 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_ = ""; +// 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.updateFromState3(curScreen, wid, this.state, company_, 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 ((curScreen.equals("編集画面２")&&wid.equals("w11dd0f050a5044d384b10351b83ad390"))) { - String editcompany = this.editcompany.getValue(); - String editrepresentative = this.editrepresentative.getValue(); - String editposition = this.editposition.getValue(); - String editestablish = this.editestablish.getValue(); - String editaddress1 = this.editaddress1.getValue(); - String editaddress2 = this.editaddress2.getValue(); - String editbusiness1 = this.editbusiness1.getValue(); - String editbusiness2 = this.editbusiness2.getValue(); - String editcompanydetail = this.editcompanydetail.getValue(); - String editURL = this.editURL.getValue(); - this.widget1 = screen.getWidgets().getWidget(editcompany); - String editcompany_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(editrepresentative); - String editrepresentative_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(editposition); - String editposition_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(editestablish); - String editestablish_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(editaddress1); - String editaddress1_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(editaddress2); - String editaddress2_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(editbusiness1); - String editbusiness1_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(editbusiness2); - String editbusiness2_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(editcompanydetail); - String editcompanydetail_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(editURL); - String editURL_ = this.widget1.getText(); - this.businessCardManagement.updateFromState3(curScreen, wid, this.state, editcompany_, editcompany, editrepresentative_, editrepresentative, editposition_, editposition, editestablish_, editestablish, editaddress1_, editaddress1, editaddress2_, editaddress2, editbusiness1_, editbusiness1, editbusiness2_, editbusiness2, editcompanydetail_, editcompanydetail, editURL_, editURL); - } - if ((curScreen.equals("編集画面２")&&wid.equals("w11dd0f050a5044d384b10351b83ad390"))) { - String editcompany = this.editcompany.getValue(); - String editrepresentative = this.editrepresentative.getValue(); - String editposition = this.editposition.getValue(); - String editestablish = this.editestablish.getValue(); - String editaddress1 = this.editaddress1.getValue(); - String editaddress2 = this.editaddress2.getValue(); - String editbusiness1 = this.editbusiness1.getValue(); - String editbusiness2 = this.editbusiness2.getValue(); - String editcompanydetail = this.editcompanydetail.getValue(); - String editURL = this.editURL.getValue(); - this.widget1 = screen.getWidgets().getWidget(editcompany); - String editcompany_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(editrepresentative); - String editrepresentative_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(editposition); - String editposition_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(editestablish); - String editestablish_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(editaddress1); - String editaddress1_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(editaddress2); - String editaddress2_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(editbusiness1); - String editbusiness1_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(editbusiness2); - String editbusiness2_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(editcompanydetail); - String editcompanydetail_ = this.widget1.getText(); - this.widget1 = screen.getWidgets().getWidget(editURL); - String editURL_ = this.widget1.getText(); + if ((curScreen.equals("編集画面２")&&wid.equals("w11dd0f050a5044d384b10351b83ad390"))) { // 「編集」ボタン + 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 business1 = this.businessdescription1.getValue(); + String business2 = this.businessdescription2.getValue(); + String companyoverview = this.companyoverview.getValue(); + String URL = this.URL.getValue(); + String contactPerson1 = this.contactPerson1.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 establish_ = 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(business1); + String business1_ = this.widget1.getText(); + this.widget1 = screen.getWidgets().getWidget(business2); + String business2_ = this.widget1.getText(); + this.widget1 = screen.getWidgets().getWidget(companyoverview); + String companydetail_ = this.widget1.getText(); + this.widget1 = screen.getWidgets().getWidget(URL); + String URL_ = this.widget1.getText(); + this.widget1 = screen.getWidgets().getWidget(contactPerson1); Map> businessCardManagement = this.businessCardManagement.getValue(); - this.curScreen.updateFromState5(curScreen, wid, this.state, editcompany_, editcompany, editrepresentative_, editrepresentative, editposition_, editposition, editestablish_, editestablish, editaddress1_, editaddress1, editaddress2_, editaddress2, editbusiness1_, editbusiness1, editbusiness2_, editbusiness2, editcompanydetail_, editcompanydetail, editURL_, editURL, businessCardManagement); + this.curScreen.updateFromState5(curScreen, wid, this.state, company_, representative_, position_, establish_, address1_, address2_, business1_, business2_, companydetail_, URL_, businessCardManagement); } - if ((curScreen.equals("検索項目画面")&&wid.equals("w614b5ee1e161473d8f859fbfb5c8074e"))) { - this.curScreen.updateFromState4(curScreen, wid, this.state); - } - if ((curScreen.equals("企業一覧")&&wid.equals("w191cc519b2344758b8d9878328b41cd9"))) { - this.curScreen.updateFromState3(curScreen, wid, this.state); - } - if ((curScreen.equals("企業一覧")&&wid.equals("w0498c4eb3524489494c288e2fc7a3211"))) { - this.curScreen.updateFromState2(curScreen, wid, this.state); - } - if ((curScreen.equals("登録画面１")&&wid.equals("wf10ab1752fe44c4d97ffb2ca2afdeba0"))) { + if ((curScreen.equals("登録画面１")&&wid.equals("wf10ab1752fe44c4d97ffb2ca2afdeba0"))) { // 「一覧へ戻る」ボタン this.curScreen.updateFromState(curScreen, wid, this.state); } - if ((curScreen.equals("登録画面１")&&wid.equals("wf10ab1752fe44c4d97ffb2ca2afdeba0"))) { + if ((curScreen.equals("登録画面１")&&wid.equals("wf10ab1752fe44c4d97ffb2ca2afdeba0"))) { // 「一覧へ戻る」ボタン String company = this.company.getValue(); String representative = this.representative.getValue(); String position = this.position.getValue(); @@ -228,6 +305,22 @@ 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); @@ -248,9 +341,57 @@ String companyoverview_ = this.widget1.getText(); this.widget1 = screen.getWidgets().getWidget(URL); String URL_ = this.widget1.getText(); - this.businessCardManagement.updateFromState(curScreen, wid, this.state, company_, company, representative_, representative, position_, position, establishment_, establishment, address1_, address1, address2_, address2, businessdescription1_, businessdescription1, businessdescription2_, businessdescription2, companyoverview_, companyoverview, URL_, 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_ = ""; +// 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"))) { + if ((curScreen.equals("登録画面１")&&wid.equals("w7c6cfb14ed4f410aa33a440e6ab2e4bf"))) { // 「登録」ボタン String company = this.company.getValue(); String representative = this.representative.getValue(); String position = this.position.getValue(); @@ -261,6 +402,22 @@ 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); @@ -281,9 +438,57 @@ String companyoverview_ = this.widget1.getText(); this.widget1 = screen.getWidgets().getWidget(URL); String URL_ = this.widget1.getText(); - this.businessCardManagement.updateFromState2(curScreen, wid, this.state, company_, representative_, position_, establishment_, address1_, address2_, businessdescription1_, businessdescription2_, companyoverview_, URL_); + this.widget1 = screen.getWidgets().getWidget(contactPerson1); + 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_ = ""; +// 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.updateFromState2(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"))) { + if ((curScreen.equals("登録画面１")&&wid.equals("w7c6cfb14ed4f410aa33a440e6ab2e4bf"))) { // 「登録」ボタン String company = this.company.getValue(); String representative = this.representative.getValue(); String position = this.position.getValue(); @@ -317,7 +522,13 @@ Map> businessCardManagement = this.businessCardManagement.getValue(); this.curScreen.updateFromState6(curScreen, wid, this.state, company_, representative_, position_, establishment_, address1_, address2_, businessdescription1_, businessdescription2_, companyoverview_, URL_, businessCardManagement); } - if ((curScreen.equals("検索項目画面")&&wid.equals("w725d1e48b8584a70bad1fbdc07ea8280"))) { + if ((curScreen.equals("検索項目画面")&&wid.equals("w614b5ee1e161473d8f859fbfb5c8074e"))) { // 「一覧へ戻る」ボタン + this.curScreen.updateFromState4(curScreen, wid, this.state); + } + if ((curScreen.equals("検索画面結果")&&wid.equals("w0becbeb6b2d54c03a69d63e3facd2eaa"))) { // 「一覧へ戻る」ボタン + this.curScreen.updateFromState7(curScreen, wid, this.state); + } + if ((curScreen.equals("検索項目画面")&&wid.equals("w725d1e48b8584a70bad1fbdc07ea8280"))) { // 「検索」ボタン String searchCriteriaScreen = this.searchCriteriaScreen.getValue(); String search1 = this.search1.getValue(); String search2 = this.search2.getValue(); @@ -358,21 +569,11 @@ this.widget1.updateDataFromState(curScreen, wid, this.state, searchCriteriaScreen_, search1_, search2_, search3_, search5_, search6_, result_, address1_, address2_, businessdescription1_, businessdescription2_, companyoverview_, businessCardManagement); } } - public void setReferences(Screen screen, CurScreen curScreen, SwingPresenter presenter, BusinessCardManagement businessCardManagement, Editcompany editcompany, Editaddress1 editaddress1, Editbusiness1 editbusiness1, Editestablish editestablish, Editbusiness2 editbusiness2, Editposition editposition, Editcompanydetail editcompanydetail, EditURL editURL, Editaddress2 editaddress2, Editrepresentative editrepresentative, Company company, Representative representative, Position position, Establishment establishment, Address1 address1, Address2 address2, Businessdescription1 businessdescription1, Businessdescription2 businessdescription2, Companyoverview companyoverview, URL URL, SearchCriteriaScreen searchCriteriaScreen, Search1 search1, Search2 search2, Search3 search3, Search5 search5, Search6 search6, Result result) { + 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) { this.screen = screen; this.curScreen = curScreen; this.presenter = presenter; this.businessCardManagement = businessCardManagement; - this.editcompany = editcompany; - this.editaddress1 = editaddress1; - this.editbusiness1 = editbusiness1; - this.editestablish = editestablish; - this.editbusiness2 = editbusiness2; - this.editposition = editposition; - this.editcompanydetail = editcompanydetail; - this.editURL = editURL; - this.editaddress2 = editaddress2; - this.editrepresentative = editrepresentative; this.company = company; this.representative = representative; this.position = position; @@ -383,6 +584,22 @@ this.businessdescription2 = businessdescription2; this.companyoverview = companyoverview; this.URL = URL; + this.contactPerson1 = contactPerson1; + this.position1 = position1; + this.tel1 = tel1; + this.email1 = email1; + this.contactPerson2 = contactPerson2; + this.position2 = position2; + this.tel2 = tel2; + this.email2 = email2; + this.contactPerson3 = contactPerson3; + this.position3 = position3; + this.tel3 = tel3; + this.email3 = email3; + this.contactPerson4 = contactPerson4; + this.position4 = position4; + this.tel4 = tel4; + this.email4 = email4; this.searchCriteriaScreen = searchCriteriaScreen; this.search1 = search1; this.search2 = search2; diff --git a/src/Widgets1.java b/src/Widgets1.java index b22232d..bf58ccc 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, Editcompany editcompany, Editaddress1 editaddress1, Editbusiness1 editbusiness1, Editestablish editestablish, Editbusiness2 editbusiness2, Editposition editposition, Editcompanydetail editcompanydetail, EditURL editURL, Editaddress2 editaddress2, Editrepresentative editrepresentative, Company company, Representative representative, Position position, Establishment establishment, Address1 address1, Address2 address2, Businessdescription1 businessdescription1, Businessdescription2 businessdescription2, Companyoverview companyoverview, URL URL, SearchCriteriaScreen searchCriteriaScreen, Search1 search1, Search2 search, Search3 search3, Search5 search5, Search6 search6, Result result) { + 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) { this.curScreen = curScreen; this.presenter = presenter; for (Widget1 widget: value.values()) { - widget.setReferences(screen, curScreen, presenter, businessCardManagement, editcompany, editaddress1, editbusiness1, editestablish, editbusiness2, editposition, editcompanydetail, editURL, editaddress2, editrepresentative, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, searchCriteriaScreen, search1, search, search3, search5, search6, result); + 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); } } } \ No newline at end of file