MCR-3342 fix viewer

* viewer opens now in preview * viewer opens now in fullscreen
MyCoRe-Org · Feb 26, 2025 · 5b39dd2 · 5b39dd2
1 parent 0d1bd6e
commit 5b39dd2
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/mycore-viewer/src/main/java/org/mycore/viewer/configuration/MCRViewerConfiguration.java b/mycore-viewer/src/main/java/org/mycore/viewer/configuration/MCRViewerConfiguration.java
@@ -68,10 +68,15 @@
  */
 public class MCRViewerConfiguration {
 
-    private static final Logger LOGGER = LogManager.getLogger(MCRViewerConfiguration.class);
+    private static final Logger LOGGER = LogManager.getLogger();
 
     public enum ResourceType {
-        SCRIPT, MODULE, CSS
+        SCRIPT, MODULE, CSS;
+
+        @Override
+        public String toString() {
+            return super.toString().toLowerCase(Locale.ROOT);
+        }
     }
 
     private final Multimap<ResourceType, String> resources;
@@ -353,7 +358,7 @@ public final List<MCRIViewClientProperty> getProperties() {
     @XmlRootElement(name = "resource")
     private static class MCRIViewClientResource {
 
-        @XmlAttribute(name = "type", required = true)
+        @XmlTransient
         public ResourceType type;
 
         @XmlValue
@@ -368,6 +373,11 @@ private static class MCRIViewClientResource {
             this.url = url;
         }
 
+        @XmlAttribute(name = "type", required = true)
+        public String getType() {
+            return type.name().toLowerCase(Locale.ROOT);
+        }
+
         @Override
         public boolean equals(Object obj) {
             if (obj instanceof MCRIViewClientResource rhs) {
@@ -412,7 +422,6 @@ public String getXMLValue() {
 
     private static final class MultimapSerializer implements JsonSerializer<Multimap<ResourceType, String>> {
 
-        @SuppressWarnings("serial")
         private static final Type T = new TypeToken<Map<ResourceType, Collection<String>>>() {
         }.getType();