diff --git a/src/Main.java b/src/Main.java index 6fc14ee..6eae838 100644 --- a/src/Main.java +++ b/src/Main.java @@ -42,7 +42,7 @@ public Main() { StartupManagementWindow window = new StartupManagementWindow(this); SwingPresenter presenter = window.getPresenter(); - this.screenTemplates = new ScreenTemplates(presenter); + this.screenTemplates = new ScreenTemplates(); this.screen = new Screen(screenTemplates, true, presenter); this.curScreen = new CurScreen(screen, screenTemplates); this.screen.setCurScreen(curScreen); @@ -78,7 +78,7 @@ this.company = new Company(screen); this.address1 = new Address1(screen); this.representative = new Representative(screen); - this.screenTemplates.setReferences(screen, businessCardManagement, curScreen, editcompany, editaddress1, editbusiness1, editestablish, editbusiness2, editposition, editcompanydetail, editURL, editaddress2, editrepresentative, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, search6, searchCriteriaScreen, search3, search5, search1, result, search2); + 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, search6, searchCriteriaScreen, search3, search5, search1, result, search2); changeCurScreen("企業一覧"); } public Map getBusinessCardManagementElement(String companyName) { diff --git a/src/ScreenTemplate.java b/src/ScreenTemplate.java index 0546fc6..68f0863 100644 --- a/src/ScreenTemplate.java +++ b/src/ScreenTemplate.java @@ -29,7 +29,7 @@ public ScreenTemplate(SwingPresenter presenter) { this.widgets = new Widgets1(presenter); } - public void setReferences(Screen screen, BusinessCardManagement businessCardManagement, CurScreen curScreen, 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, Search6 search6, SearchCriteriaScreen searchCriteriaScreen, Search3 search3, Search5 search5, Search1 search1, Result result, Search2 search) { - this.widgets.setReferences(screen, businessCardManagement, curScreen, editcompany, editaddress1, editbusiness1, editestablish, editbusiness2, editposition, editcompanydetail, editURL, editaddress2, editrepresentative, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, search6, searchCriteriaScreen, search3, search5, search1, result, search); + 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, Search6 search6, SearchCriteriaScreen searchCriteriaScreen, Search3 search3, Search5 search5, Search1 search1, Result result, Search2 search) { + 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, search6, searchCriteriaScreen, search3, search5, search1, result, search); } } \ No newline at end of file diff --git a/src/ScreenTemplates.java b/src/ScreenTemplates.java index ffc2079..46b4732 100644 --- a/src/ScreenTemplates.java +++ b/src/ScreenTemplates.java @@ -768,17 +768,17 @@ temp_json67.put("screenId", "登録画面１"); temp_json67.put("layout", false); temp_json67.put("widgets", temp_json68); - ScreenTemplate screenTemplate_temp1 = new ScreenTemplate(presenter); + ScreenTemplate screenTemplate_temp1 = new ScreenTemplate(); screenTemplate_temp1.setValue(temp_json1); - ScreenTemplate screenTemplate_temp9 = new ScreenTemplate(presenter); + ScreenTemplate screenTemplate_temp9 = new ScreenTemplate(); screenTemplate_temp9.setValue(temp_json9); - ScreenTemplate screenTemplate_temp12 = new ScreenTemplate(presenter); + ScreenTemplate screenTemplate_temp12 = new ScreenTemplate(); screenTemplate_temp12.setValue(temp_json12); - ScreenTemplate screenTemplate_temp33 = new ScreenTemplate(presenter); + ScreenTemplate screenTemplate_temp33 = new ScreenTemplate(); screenTemplate_temp33.setValue(temp_json33); - ScreenTemplate screenTemplate_temp58 = new ScreenTemplate(presenter); + ScreenTemplate screenTemplate_temp58 = new ScreenTemplate(); screenTemplate_temp58.setValue(temp_json58); - ScreenTemplate screenTemplate_temp67 = new ScreenTemplate(presenter); + ScreenTemplate screenTemplate_temp67 = new ScreenTemplate(); screenTemplate_temp67.setValue(temp_json67); value.put("検索画面", screenTemplate_temp1); value.put("検索画面結果", screenTemplate_temp9); @@ -788,16 +788,16 @@ value.put("登録画面１", screenTemplate_temp67); } - public ScreenTemplates(SwingPresenter presenter) { - this.presenter = presenter; + public ScreenTemplates() { } public Map getValue() { return new HashMap<>(this.value); } - public void setReferences(Screen screen, BusinessCardManagement businessCardManagement, CurScreen curScreen, 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, Search6 search6, SearchCriteriaScreen searchCriteriaScreen, Search3 search3, Search5 search5, Search1 search1, Result result, Search2 search) { + 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, Search6 search6, SearchCriteriaScreen searchCriteriaScreen, Search3 search3, Search5 search5, Search1 search1, Result result, Search2 search) { + this.presenter = presenter; this.curScreen = curScreen; for (ScreenTemplate screenTemplate: value.values()) { - screenTemplate.setReferences(screen, businessCardManagement, curScreen, editcompany, editaddress1, editbusiness1, editestablish, editbusiness2, editposition, editcompanydetail, editURL, editaddress2, editrepresentative, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, search6, searchCriteriaScreen, search3, search5, search1, result, search); + 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, search6, searchCriteriaScreen, search3, search5, search1, result, search); } } public ScreenTemplate getScreenTemplate(String scId) { diff --git a/src/Widget1.java b/src/Widget1.java index 41d87d2..a7a480b 100644 --- a/src/Widget1.java +++ b/src/Widget1.java @@ -51,11 +51,8 @@ this.y = y; this.width = width; this.height = height; - this.screen = screen; this.state = state; this.data = data; - this.businessCardManagement = businessCardManagement; - this.curScreen = curScreen; this.presenter = presenter; } public Map getValue() { @@ -347,8 +344,9 @@ 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, BusinessCardManagement businessCardManagement, CurScreen curScreen, 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, Search6 search6, SearchCriteriaScreen searchCriteriaScreen, Search3 search3, Search5 search5, Search1 search1, Result result, Search2 search) { + 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, Search6 search6, SearchCriteriaScreen searchCriteriaScreen, Search3 search3, Search5 search5, Search1 search1, Result result, Search2 search) { this.screen = screen; + this.presenter = presenter; this.businessCardManagement = businessCardManagement; this.curScreen = curScreen; this.editcompany = editcompany; diff --git a/src/Widgets1.java b/src/Widgets1.java index 0f401cd..799da9b 100644 --- a/src/Widgets1.java +++ b/src/Widgets1.java @@ -33,16 +33,16 @@ if (((Map) value.get(key)).get("width") != null) width = (int) ((Map) value.get(key)).get("width"); int state = 0; if (((Map) value.get(key)).get("state") != null) state = (int) ((Map) value.get(key)).get("state"); - this.value.put(key, new Widget1(type, text, true, x, y, width, height, 0, null, presenter)); + this.value.put(key, new Widget1(type, text, visible, x, y, width, height, 0, null, presenter)); } } public Widget1 getWidget1(String wid) { return this.value.get(wid); } - public void setReferences(Screen screen, BusinessCardManagement businessCardManagement, CurScreen curScreen, 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, Search6 search6, SearchCriteriaScreen searchCriteriaScreen, Search3 search3, Search5 search5, Search1 search1, Result result, Search2 search) { + 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, Search6 search6, SearchCriteriaScreen searchCriteriaScreen, Search3 search3, Search5 search5, Search1 search1, Result result, Search2 search) { this.curScreen = curScreen; for (Widget1 widget: value.values()) { - widget.setReferences(screen, businessCardManagement, curScreen, editcompany, editaddress1, editbusiness1, editestablish, editbusiness2, editposition, editcompanydetail, editURL, editaddress2, editrepresentative, company, representative, position, establishment, address1, address2, businessdescription1, businessdescription2, companyoverview, URL, search6, searchCriteriaScreen, search3, search5, search1, result, search); + 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, search6, searchCriteriaScreen, search3, search5, search1, result, search); } } } \ No newline at end of file