wip

keeps · Mar 20, 2024 · 0275de3 · 0275de3
1 parent 23cd711
commit 0275de3
Show file tree

Hide file tree

Showing 7 changed files with 108 additions and 137 deletions.
diff --git a/roda-core/roda-core/src/main/java/org/roda/core/common/PremisV3Utils.java b/roda-core/roda-core/src/main/java/org/roda/core/common/PremisV3Utils.java
diff --git a/...oda-core/src/main/java/org/roda/core/common/characterization/model/TechnicalMetadata.java b/...oda-core/src/main/java/org/roda/core/common/characterization/model/TechnicalMetadata.java
@@ -12,12 +12,14 @@
 import jakarta.xml.bind.annotation.XmlAttribute;
 import jakarta.xml.bind.annotation.XmlElement;
 import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * @author Carlos Afonso <[email protected]>
  */
 @XmlRootElement(name = "featureExtractor")
 @XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(namespace = "http://www.loc.gov/premis/v3")
 public class TechnicalMetadata {
 
   @XmlAttribute
@@ -31,7 +33,7 @@ public class TechnicalMetadata {
   @XmlAttribute
   private String algorithm;
 
-  @XmlElement(name = "metadata")
+  @XmlElement(name = "metadata", namespace = "http://www.loc.gov/premis/v3")
   private TechnicalMetadataElement technicalMetadataElement;
 
   public TechnicalMetadata() {

diff --git a/...e/src/main/java/org/roda/core/common/characterization/model/TechnicalMetadataElement.java b/...e/src/main/java/org/roda/core/common/characterization/model/TechnicalMetadataElement.java
@@ -10,6 +10,7 @@
 import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,9 +19,10 @@
  * @author Miguel Guimarães <[email protected]>
  */
 @XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(namespace = "http://www.loc.gov/premis/v3")
 public class TechnicalMetadataElement {
 
-  @XmlElement(name = "field")
+  @XmlElement(name = "field", namespace = "http://www.loc.gov/premis/v3")
   private List<TechnicalMetadataField> technicalMetadataFields = new ArrayList<>();
 
   public TechnicalMetadataElement() {

diff --git a/...ore/src/main/java/org/roda/core/common/characterization/model/TechnicalMetadataField.java b/...ore/src/main/java/org/roda/core/common/characterization/model/TechnicalMetadataField.java
@@ -10,15 +10,14 @@
 import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlAttribute;
-import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 import jakarta.xml.bind.annotation.XmlValue;
 
 /**
  * @author Miguel Guimarães <[email protected]>
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlRootElement(name = "metadata")
-
+@XmlType(namespace = "http://www.loc.gov/premis/v3")
 public class TechnicalMetadataField {
 
   public TechnicalMetadataField() {

diff --git a/roda-ui/roda-wui/src/main/java/org/roda/wui/client/common/dialogs/Dialogs.java b/roda-ui/roda-wui/src/main/java/org/roda/wui/client/common/dialogs/Dialogs.java
@@ -162,12 +162,12 @@ public static void showTechnicalMetadataInformation(String title, String downloa
     layout.add(verticalPanel);
     layout.addStyleName("wui-dialog-message");
 
-    footer.add(downloadButton);
     footer.add(closeButton);
+    footer.add(downloadButton);
     footer.addStyleName("wui-dialog-layout-footer");
 
     downloadButton.addStyleName("btn btn-download");
-    closeButton.addStyleName("btn btn-default btn-times-circle btn-separator");
+    closeButton.addStyleName("btn btn-link");
     main.addStyleName("wui-dialog-layout");
     main.add(layout);
     main.add(footer);

diff --git a/roda-ui/roda-wui/src/main/java/org/roda/wui/common/HTMLUtils.java b/roda-ui/roda-wui/src/main/java/org/roda/wui/common/HTMLUtils.java
@@ -12,6 +12,7 @@
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.ResourceBundle;
 
 import org.roda.core.RodaCoreFactory;
 import org.roda.core.common.Messages;
@@ -86,7 +87,7 @@ public static String preservationMetadataEventToHtml(Binary binary, boolean only
     }
   }
 
-  public static Map<String, String> getTranslations(String descriptiveMetadataType, String descriptiveMetadataVersion,
+  public static Map<String, String>   getTranslations(String descriptiveMetadataType, String descriptiveMetadataVersion,
     final Locale locale) {
     Map<String, String> translations = null;
     Messages messages = RodaCoreFactory.getI18NMessages(locale);

diff --git a/roda-ui/roda-wui/src/main/resources/config/i18n/ServerMessages.properties b/roda-ui/roda-wui/src/main/resources/config/i18n/ServerMessages.properties
@@ -523,45 +523,6 @@ crosswalks.dissemination.html.dc_simpledc20021212.source=Source
 crosswalks.dissemination.html.dc_simpledc20021212.subject=Subject
 crosswalks.dissemination.html.dc_simpledc20021212.type=Type
 
-crosswalks.dissemination.html.tika_1.transparency_alpha=Transparency
-crosswalks.dissemination.html.tika_1.parsed_by_full_set=Parsed by
-crosswalks.dissemination.html.tika_1.tiff_imagelength=Length
-crosswalks.dissemination.html.tika_1.compression_compressiontypename=Compression type
-crosswalks.dissemination.html.tika_1.data_bitspersample=Bitrate sample
-crosswalks.dissemination.html.tika_1.data_planarconfiguration=Planar configuration
-crosswalks.dissemination.html.tika_1.ihdr=IHDR
-crosswalks.dissemination.html.tika_1.sbit_sbit_rgbalpha=RGBA
-crosswalks.dissemination.html.tika_1.chroma_colorspacetype=Color space type
-crosswalks.dissemination.html.tika_1.tiff_bitspersample=Bitrate Sample
-crosswalks.dissemination.html.tika_1.content_type=Content type
-crosswalks.dissemination.html.tika_1.height=Height
-crosswalks.dissemination.html.tika_1.imagereader_numimages=Number of images
-crosswalks.dissemination.html.tika_1.text_textentry=Text entry
-crosswalks.dissemination.html.tika_1.dimension_pixelaspectratio=Pixel aspect ratio
-crosswalks.dissemination.html.tika_1.compression_numprogressivescans=Number of progressive scans
-crosswalks.dissemination.html.tika_1.data_significantbitspersample=Bitrate sample
-crosswalks.dissemination.html.tika_1.x_tika_parsed_by=Parsed by
-crosswalks.dissemination.html.tika_1.chroma_blackiszero=Is black zero
-crosswalks.dissemination.html.tika_1.compression_lossless=Compression lossless
-crosswalks.dissemination.html.tika_1.width=Width
-crosswalks.dissemination.html.tika_1.dimension_imageorientation=Image orientation
-crosswalks.dissemination.html.tika_1.tiff_imagewidth=Width
-crosswalks.dissemination.html.tika_1.chroma_numchannels=Number of channels
-crosswalks.dissemination.html.tika_1.data_sampleformat=Sample format
-crosswalks.dissemination.html.tika_1.filesize=File size
-crosswalks.dissemination.html.tika_1.xmpdm_genre=Genre
-crosswalks.dissemination.html.tika_1.xmpdm_composer=Composer
-crosswalks.dissemination.html.tika_1.xmpdm_album=Album
-crosswalks.dissemination.html.tika_1.xmpdm_releasedate=Release date
-crosswalks.dissemination.html.tika_1.xmpdm_artist=Artist
-crosswalks.dissemination.html.tika_1.xmpdm_duration=Duration
-crosswalks.dissemination.html.tika_1.meta_paragraph_count=Paragraph count
-crosswalks.dissemination.html.tika_1.meta_word_count=Word count
-crosswalks.dissemination.html.tika_1.extended_properties_application=Application
-crosswalks.dissemination.html.tika_1.dc_creator=Creator
-crosswalks.dissemination.html.tika_1.meta_slide_count=Slide count
-
-
 crosswalks.dissemination.html.event.identifierType: Identifier type
 crosswalks.dissemination.html.event.identifierValue: Identifier value
 crosswalks.dissemination.html.event.dateTime: Date