From 3fcd1f5d689f54fc9948554c21b3ab687d8553bb Mon Sep 17 00:00:00 2001 From: jensp Date: Fri, 13 Apr 2012 13:53:41 +0000 Subject: [PATCH] =?UTF-8?q?XML-Ausgabe=20der=20Publikationstypen=20nochmal?= =?UTF-8?q?s=20ein=20wenig=20versch=C3=B6nert.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@1591 8810af33-2d31-482b-a856-94f89814c4df --- .../ArticleInCollectedVolumeExtraXmlGenerator.java | 6 +++--- .../ui/ArticleInJournalExtraXmlGenerator.java | 6 +++--- .../ui/CollectedVolumeExtraXmlGenerator.java | 1 + .../contenttypes/ui/ExpertiseExtraXmlGenerator.java | 12 ++++++------ .../ui/InProceedingsExtraXmlGenerator.java | 7 +++---- .../contenttypes/ui/JournalExtraXmlGenerator.java | 1 + .../ui/ProceedingsExtraXmlGenerator.java | 7 ++++--- .../ui/PublicationExtraXmlGenerator.java | 3 +++ .../PublicationWithPublisherExtraXmlGenerator.java | 1 + .../ui/UnPublishedExtraXmlGenerator.java | 6 +++--- 10 files changed, 28 insertions(+), 22 deletions(-) diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumeExtraXmlGenerator.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumeExtraXmlGenerator.java index b2b6db135..2114c8f4a 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumeExtraXmlGenerator.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumeExtraXmlGenerator.java @@ -37,10 +37,10 @@ public class ArticleInCollectedVolumeExtraXmlGenerator final Element parent, final PageState state) { final CollectedVolume collectedVolume = article.getCollectedVolume(GlobalizationHelper.getNegotiatedLocale().getLanguage()); - if (collectedVolume != null) { - final Element collVolElem = parent.newChildElement("collectedVolume"); + if (collectedVolume != null) { final XmlGenerator generator = new XmlGenerator(collectedVolume); - generator.generateXML(state, collVolElem, ""); + generator.setItemElemName("collectedVolume", ""); + generator.generateXML(state, parent, ""); } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalExtraXmlGenerator.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalExtraXmlGenerator.java index 6e90e2a8f..dd40f3d5e 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalExtraXmlGenerator.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalExtraXmlGenerator.java @@ -36,10 +36,10 @@ public class ArticleInJournalExtraXmlGenerator implements ExtraXMLGenerator { final PageState state) { final Journal journal = article.getJournal(GlobalizationHelper. getNegotiatedLocale().getLanguage()); - if (journal != null) { - final Element journalElem = parent.newChildElement("journal"); + if (journal != null) { final XmlGenerator generator = new XmlGenerator(journal); - generator.generateXML(state, journalElem, ""); + generator.setItemElemName("journal", ""); + generator.generateXML(state, parent, ""); } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumeExtraXmlGenerator.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumeExtraXmlGenerator.java index c0e94b3ce..3600ca610 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumeExtraXmlGenerator.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumeExtraXmlGenerator.java @@ -56,6 +56,7 @@ public class CollectedVolumeExtraXmlGenerator implements ExtraXMLGenerator { final Element articlesElem, final PageState state) { final XmlGenerator generator = new XmlGenerator(article); + generator.setItemElemName("article", ""); generator.addItemAttribute("order", order.toString()); generator.generateXML(state, articlesElem, ""); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseExtraXmlGenerator.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseExtraXmlGenerator.java index c074488e9..55af93fc6 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseExtraXmlGenerator.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseExtraXmlGenerator.java @@ -38,10 +38,10 @@ public class ExpertiseExtraXmlGenerator implements ExtraXMLGenerator { final GenericOrganizationalUnit orga = expertise.getOrganization(GlobalizationHelper. getNegotiatedLocale().getLanguage()); - if (orga != null) { - final Element orgaElem = parent.newChildElement("organization"); + if (orga != null) { final XmlGenerator generator = new XmlGenerator(orga); - generator.generateXML(state, orgaElem, ""); + generator.setItemElemName("organization", ""); + generator.generateXML(state, parent, ""); } } @@ -51,10 +51,10 @@ public class ExpertiseExtraXmlGenerator implements ExtraXMLGenerator { final GenericOrganizationalUnit orderer = expertise.getOrderer(GlobalizationHelper. getNegotiatedLocale().getLanguage()); - if (orderer != null) { - final Element ordererElem = parent.newChildElement("orderer"); + if (orderer != null) { final XmlGenerator generator = new XmlGenerator(orderer); - generator.generateXML(state, ordererElem, ""); + generator.setItemElemName("orderer", ""); + generator.generateXML(state, parent, ""); } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsExtraXmlGenerator.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsExtraXmlGenerator.java index 4cb936faf..33c2eebdc 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsExtraXmlGenerator.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsExtraXmlGenerator.java @@ -37,11 +37,10 @@ public class InProceedingsExtraXmlGenerator implements ExtraXMLGenerator { final Proceedings proceedings = inProceedings.getProceedings(GlobalizationHelper. getNegotiatedLocale().getLanguage()); - if (proceedings != null) { - final Element proceedingsElem = - parent.newChildElement("proceedings"); + if (proceedings != null) { final XmlGenerator generator = new XmlGenerator(proceedings); - generator.generateXML(state, proceedingsElem, ""); + generator.setItemElemName("proceedings", ""); + generator.generateXML(state, parent, ""); } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalExtraXmlGenerator.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalExtraXmlGenerator.java index 9d66bdebb..ca7a4abd8 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalExtraXmlGenerator.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalExtraXmlGenerator.java @@ -53,6 +53,7 @@ public class JournalExtraXmlGenerator implements ExtraXMLGenerator { final Element articlesElem, final PageState state) { final XmlGenerator generator = new XmlGenerator(article); + generator.setItemElemName("article", ""); generator.addItemAttribute("order", order.toString()); generator.generateXML(state, articlesElem, ""); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsExtraXmlGenerator.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsExtraXmlGenerator.java index 9eaaaa3b8..1cc0ebab9 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsExtraXmlGenerator.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsExtraXmlGenerator.java @@ -41,10 +41,10 @@ public class ProceedingsExtraXmlGenerator implements ExtraXMLGenerator { final GenericOrganizationalUnit organizer = proceedings.getOrganizerOfConference(GlobalizationHelper. getNegotiatedLocale().getLanguage()); - if (organizer != null) { - final Element organizerElem = parent.newChildElement("organizer"); + if (organizer != null) { final XmlGenerator generator = new XmlGenerator(organizer); - generator.generateXML(state, organizerElem, ""); + generator.setItemElemName("organizer", ""); + generator.generateXML(state, parent, ""); } } @@ -70,6 +70,7 @@ public class ProceedingsExtraXmlGenerator implements ExtraXMLGenerator { final Element papersElem, final PageState state) { final XmlGenerator generator = new XmlGenerator(paper); + generator.setItemElemName("paper", ""); generator.addItemAttribute("order", order.toString()); generator.generateXML(state, papersElem, ""); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationExtraXmlGenerator.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationExtraXmlGenerator.java index 16c52cf66..28c0da727 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationExtraXmlGenerator.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationExtraXmlGenerator.java @@ -72,6 +72,7 @@ public class PublicationExtraXmlGenerator implements ExtraXMLGenerator { final Element authorsElem, final PageState state) { final XmlGenerator generator = new XmlGenerator(author); + generator.setItemElemName("author", ""); generator.addItemAttribute("isEditor", isAuthor.toString()); generator.addItemAttribute("order", order.toString()); generator.generateXML(state, authorsElem, ""); @@ -101,6 +102,7 @@ public class PublicationExtraXmlGenerator implements ExtraXMLGenerator { final Element orgaunitsElem, final PageState state) { final XmlGenerator generator = new XmlGenerator(orgaunit); + generator.setItemElemName("organizationalunit", ""); generator.generateXML(state, orgaunitsElem, ""); } @@ -125,6 +127,7 @@ public class PublicationExtraXmlGenerator implements ExtraXMLGenerator { final Element seriesElem, final PageState state) { final XmlGenerator generator = new XmlGenerator(series); + generator.setItemElemName("series", ""); generator.generateXML(state, seriesElem, ""); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationWithPublisherExtraXmlGenerator.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationWithPublisherExtraXmlGenerator.java index aaff0ea46..b58fd21d2 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationWithPublisherExtraXmlGenerator.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationWithPublisherExtraXmlGenerator.java @@ -44,6 +44,7 @@ public class PublicationWithPublisherExtraXmlGenerator } final XmlGenerator generator = new XmlGenerator(publisher); + generator.setItemElemName("publisher", ""); generator.generateXML(state, parent, ""); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/UnPublishedExtraXmlGenerator.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/UnPublishedExtraXmlGenerator.java index e87b95e4c..89a5e52df 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/UnPublishedExtraXmlGenerator.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/UnPublishedExtraXmlGenerator.java @@ -37,10 +37,10 @@ public class UnPublishedExtraXmlGenerator implements ExtraXMLGenerator { final GenericOrganizationalUnit orga = unPublished.getOrganization(GlobalizationHelper. getNegotiatedLocale().getLanguage()); - if (orga != null) { - final Element orgaElem = parent.newChildElement("organization"); + if (orga != null) { final XmlGenerator generator = new XmlGenerator(orga); - generator.generateXML(state, orgaElem, ""); + generator.setItemElemName("organization", ""); + generator.generateXML(state, parent, ""); } }