Introduce namespace support

[lgpl/argeo-commons.git] / org.argeo.api / src / org / argeo / api / gcr / ContentUtils.java

diff --git a/org.argeo.api/src/org/argeo/api/gcr/ContentUtils.java b/org.argeo.api/src/org/argeo/api/gcr/ContentUtils.java
index 285669cb614d03224f0ff7c856a27409083317ab..cf5115590844de1a5f62f4119200f4804e29d484 100644 (file)
--- a/org.argeo.api/src/org/argeo/api/gcr/ContentUtils.java
+++ b/org.argeo.api/src/org/argeo/api/gcr/ContentUtils.java
@@ -8,6 +8,8 @@ import java.util.Base64;
 import java.util.List;
 import java.util.function.BiConsumer;
 
+import javax.xml.namespace.QName;
+
 public class ContentUtils {
        public static void traverse(Content content, BiConsumer<Content, Integer> doIt) {
                traverse(content, doIt, 0);
@@ -28,7 +30,7 @@ public class ContentUtils {
                }
                String prefix = sb.toString();
                out.println(prefix + content.getName());
-               for (String key : content.keySet()) {
+               for (QName key : content.keySet()) {
                        out.println(prefix + " " + key + "=" + content.get(key));
                }
                if (printText) {
@@ -59,7 +61,7 @@ public class ContentUtils {
                if (!info.contains("base64"))
                        throw new IllegalArgumentException("URI must specify base64");
 
-               String base64Str = uri.toString().substring(commaIndex);
+               String base64Str = schemeSpecificPart.substring(commaIndex + 1);
                return Base64.getDecoder().decode(base64Str);
 
        }