From d3805612d37e494da032724310762c32286969e5 Mon Sep 17 00:00:00 2001 From: jensp Date: Sat, 9 Nov 2013 16:12:50 +0000 Subject: [PATCH] =?UTF-8?q?Kleine=20Verbesserungen=20an=20der=20XML-Ausgab?= =?UTF-8?q?e=20des=20SciProjectSummaryTab=20(Ber=C3=BCcksichtigung=20mehre?= =?UTF-8?q?rer=20Mittelgeber)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@2434 8810af33-2d31-482b-a856-94f89814c4df --- .../contenttypes/ui/SciProjectSummaryTab.java | 30 ++++++++++--------- .../ui/SciProjectSummaryTabConfig.java | 1 - 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectSummaryTab.java b/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectSummaryTab.java index 89175f569..84916ec43 100644 --- a/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectSummaryTab.java +++ b/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectSummaryTab.java @@ -40,13 +40,12 @@ public class SciProjectSummaryTab implements GenericOrgaUnitTab { static { config.load(); } - - + @Override public String getKey() { return key; } - + @Override public void setKey(final String key) { this.key = key; @@ -209,8 +208,8 @@ public class SciProjectSummaryTab implements GenericOrgaUnitTab { final GenericOrganizationalUnitPersonCollection members = project. getPersons(); - - while (members.next()) { + + while (members.next()) { generateMemberXml(members.getPerson(), membersElem, members.getRoleName(), @@ -249,7 +248,7 @@ public class SciProjectSummaryTab implements GenericOrgaUnitTab { * * while (members.next()) { generateMemberXml(members.getPerson(), * membersElem, members.getRoleName(), state); } - } + } */ logger.debug(String.format("Generated members XML for project '%s'" @@ -440,7 +439,7 @@ public class SciProjectSummaryTab implements GenericOrgaUnitTab { generator.setListMode(true); generator.setItemElemName("subProject", ""); generator.generateXML(state, parent, ""); - + logger.debug(String.format("Generated XML for subproject '%s' in" + "%d ms", subProject.getName(), @@ -450,15 +449,17 @@ public class SciProjectSummaryTab implements GenericOrgaUnitTab { protected void generateFundingXml(final SciProject project, final Element parent, final PageState state) { - if ((project.getSponsors() != null) - && !project.getSponsors().isEmpty()) { - final Element sponsorElem = parent.newChildElement("sponsor"); + if ((project.getSponsors() != null) + && !project.getSponsors().isEmpty()) { final SciProjectSponsorCollection sponsors = project.getSponsors(); - sponsors.next(); - final GenericOrganizationalUnit sponsor = sponsors.getSponsor(); - sponsorElem.setText(sponsor.getTitle()); + final Element sponsorsElem = parent.newChildElement("sponsors"); + while (sponsors.next()) { + final Element sponsorElem = sponsorsElem.newChildElement("sponsor"); + final GenericOrganizationalUnit sponsor = sponsors.getSponsor(); + sponsorElem.setText(sponsor.getTitle()); + } } - + if ((project.getFunding() != null) && !project.getFunding().trim().isEmpty()) { final Element fundingElem = parent.newChildElement("funding"); @@ -486,5 +487,6 @@ public class SciProjectSummaryTab implements GenericOrgaUnitTab { protected ContentItem getContentItem(final PageState state) { return item; } + } } diff --git a/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectSummaryTabConfig.java b/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectSummaryTabConfig.java index 7dc0cfc24..4d8e58aeb 100644 --- a/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectSummaryTabConfig.java +++ b/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectSummaryTabConfig.java @@ -55,7 +55,6 @@ public class SciProjectSummaryTabConfig extends AbstractConfig { Parameter.REQUIRED, true); - register(showMembers); register(mergeMembers); register(showContacts);