Add OAI_DATACITE megtadata format to ListMetadataFormats (again?)

oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererAbs.java

@@ -40,6 +40,13 @@ public abstract class MetadataFormatListDelivererAbs
     mft.setSchema(OAIPMHUtilities.OAIDC_SCHEMA_LOCATION);
     result.getMetadataFormat().add(mft);
 
+    // Add metadata format for OPEN AIRE.
+    MetadataFormatType mftOpenAire = new MetadataFormatType();
+    mftOpenAire.setMetadataNamespace(OAIPMHUtilities.OPEN_AIRE_NAMESPACE);
+    mftOpenAire.setMetadataPrefix(TGConstants.METADATA_OPENAIRE_PREFIX);
+    mftOpenAire.setSchema(OAIPMHUtilities.OPEN_AIRE_SCHEMA_LOCATION);
+    result.getMetadataFormat().add(mftOpenAire);
+
     return result;
   }
 

oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererDH.java

@@ -23,7 +23,8 @@ public class MetadataFormatListDelivererDH extends MetadataFormatListDelivererAb
    * String)
    */
   public ListMetadataFormatsType setMetadataFormatList(String id) {
-    return setMetadataFormatList();
+    // Get things from abstract class.
+    return super.setMetadataFormatList();
   }
 
 }

oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererTG.java

@@ -77,14 +77,8 @@ public class MetadataFormatListDelivererTG extends MetadataFormatListDelivererAb
    */
   public ListMetadataFormatsType setMetadataFormatList() {
 
-    ListMetadataFormatsType result = new ListMetadataFormatsType();
-
-    // Add default metadata format (oai_dc).
-    MetadataFormatType mft = new MetadataFormatType();
-    mft.setMetadataPrefix(OAIPMHUtilities.OAIDC_PREFIX);
-    mft.setMetadataNamespace(OAIPMHUtilities.OAIDC_NAMESPACE);
-    mft.setSchema(OAIPMHUtilities.OAIDC_SCHEMA_LOCATION);
-    result.getMetadataFormat().add(mft);
+    // Get things from abstract class.
+    ListMetadataFormatsType result = super.setMetadataFormatList();
 
     // Add metadata format for IDIOM.
     MetadataFormatType mftIdiomMets = new MetadataFormatType();
@@ -93,13 +87,6 @@ public class MetadataFormatListDelivererTG extends MetadataFormatListDelivererAb
     mftIdiomMets.setSchema(OAIPMHUtilities.METS_SCHEMA_LOCATION);
     result.getMetadataFormat().add(mftIdiomMets);
 
-    // Add metadata format for OPEN AIRE.
-    MetadataFormatType mftOpenAire = new MetadataFormatType();
-    mftOpenAire.setMetadataNamespace(OAIPMHUtilities.OPEN_AIRE_NAMESPACE);
-    mftOpenAire.setMetadataPrefix(TGConstants.METADATA_OPENAIRE_PREFIX);
-    mftOpenAire.setSchema(OAIPMHUtilities.OPEN_AIRE_SCHEMA_LOCATION);
-    result.getMetadataFormat().add(mftOpenAire);
-
     return result;
   }