XML-Ausgabe der Publikationstypen nochmals ein wenig verschönert.

git-svn-id: https://svn.libreccm.org/ccm/trunk@1591 8810af33-2d31-482b-a856-94f89814c4df

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumeExtraXmlGenerator.java

@@ -38,9 +38,9 @@ public class ArticleInCollectedVolumeExtraXmlGenerator
                                           final PageState state) {
         final CollectedVolume collectedVolume = article.getCollectedVolume(GlobalizationHelper.getNegotiatedLocale().getLanguage());
         if (collectedVolume != null) {            
-            final Element collVolElem = parent.newChildElement("collectedVolume");
             final XmlGenerator generator = new XmlGenerator(collectedVolume);
-            generator.generateXML(state, collVolElem, "");
+            generator.setItemElemName("collectedVolume", "");
+            generator.generateXML(state, parent, "");
         }
     }
 

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalExtraXmlGenerator.java

@@ -37,9 +37,9 @@ public class ArticleInJournalExtraXmlGenerator implements ExtraXMLGenerator {
         final Journal journal = article.getJournal(GlobalizationHelper.
                 getNegotiatedLocale().getLanguage());
         if (journal != null) {            
-            final Element journalElem = parent.newChildElement("journal");
             final XmlGenerator generator = new XmlGenerator(journal);
-            generator.generateXML(state, journalElem, "");
+            generator.setItemElemName("journal", "");
+            generator.generateXML(state, parent, "");
         }
     }
 

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, "");
     }

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseExtraXmlGenerator.java

@@ -39,9 +39,9 @@ public class ExpertiseExtraXmlGenerator implements ExtraXMLGenerator {
                                         expertise.getOrganization(GlobalizationHelper.
                 getNegotiatedLocale().getLanguage());
         if (orga != null) {            
-            final Element orgaElem = parent.newChildElement("organization");
             final XmlGenerator generator = new XmlGenerator(orga);
-            generator.generateXML(state, orgaElem, "");
+            generator.setItemElemName("organization", "");
+            generator.generateXML(state, parent, "");
         }
     }
 
@@ -52,9 +52,9 @@ public class ExpertiseExtraXmlGenerator implements ExtraXMLGenerator {
                                         expertise.getOrderer(GlobalizationHelper.
                 getNegotiatedLocale().getLanguage());
         if (orderer != null) {            
-            final Element ordererElem = parent.newChildElement("orderer");
             final XmlGenerator generator = new XmlGenerator(orderer);
-            generator.generateXML(state, ordererElem, "");
+            generator.setItemElemName("orderer", "");
+            generator.generateXML(state, parent, "");
         }
     }
 

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsExtraXmlGenerator.java

@@ -38,10 +38,9 @@ public class InProceedingsExtraXmlGenerator implements ExtraXMLGenerator {
                           inProceedings.getProceedings(GlobalizationHelper.
                 getNegotiatedLocale().getLanguage());
         if (proceedings != null) {            
-            final Element proceedingsElem =
-                          parent.newChildElement("proceedings");
             final XmlGenerator generator = new XmlGenerator(proceedings);
-            generator.generateXML(state, proceedingsElem, "");
+            generator.setItemElemName("proceedings", "");
+            generator.generateXML(state, parent, "");
         }
     }
 

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, "");
     }

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsExtraXmlGenerator.java

@@ -42,9 +42,9 @@ public class ProceedingsExtraXmlGenerator implements ExtraXMLGenerator {
                                         proceedings.getOrganizerOfConference(GlobalizationHelper.
                 getNegotiatedLocale().getLanguage());
         if (organizer != null) {                       
-            final Element organizerElem = parent.newChildElement("organizer");
             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, "");
     }

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, "");
     }
 

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, "");                
     }
 

ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/UnPublishedExtraXmlGenerator.java

@@ -38,9 +38,9 @@ public class UnPublishedExtraXmlGenerator implements ExtraXMLGenerator {
                                         unPublished.getOrganization(GlobalizationHelper.
                 getNegotiatedLocale().getLanguage());
         if (orga != null) {            
-            final Element orgaElem = parent.newChildElement("organization");
             final XmlGenerator generator = new XmlGenerator(orga);
-            generator.generateXML(state, orgaElem, "");
+            generator.setItemElemName("organization", "");
+            generator.generateXML(state, parent, "");
         }
     }