Adapt to changes in Argeo Commons

[gpl/argeo-suite.git] / org.argeo.app.core / src / org / argeo / app / core / SuiteContentTypes.java

diff --git a/org.argeo.app.core/src/org/argeo/app/core/SuiteContentTypes.java b/org.argeo.app.core/src/org/argeo/app/core/SuiteContentTypes.java
index 3c8b5d8f397c3f5c7ab581cd2e8f563c11fd6d86..f42cde65ce459aff4fd95cc3221ed64c7a5c48f4 100644 (file)
--- a/org.argeo.app.core/src/org/argeo/app/core/SuiteContentTypes.java
+++ b/org.argeo.app.core/src/org/argeo/app/core/SuiteContentTypes.java
@@ -5,6 +5,14 @@ import java.net.URL;
 import java.util.Objects;
 
 public enum SuiteContentTypes {
+       //
+       // ARGEO
+       //
+       ENTITY("entity", "http://www.argeo.org/ns/entity", null, null),
+       //
+       ARGEO_DBK("argeodbk", "http://www.argeo.org/ns/argeodbk", null, null),
+       //
+       // EXTERNAL
        //
        XCARD_4_0("xcard", "urn:ietf:params:xml:ns:vcard-4.0", "xCard-4.0.xsd", null),
        //
@@ -12,6 +20,18 @@ public enum SuiteContentTypes {
                        "https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/fop/src/foschema/fop.xsd"),
        //
 //     XCAL_2_0("xcal", "urn:ietf:params:xml:ns:icalendar-2.0", "xCal-2.0.xsd", null),
+       //
+       // ODK
+       //
+       JR("jr", "http://openrosa.org/javarosa", null, null),
+       //
+       ORX("orx", "http://openrosa.org/xforms", null, null),
+       //
+       ORX_LIST("orxList", "http://openrosa.org/xforms/xformsList", null, null),
+       //
+       ORX_MANIFEST("orxManifest", "http://openrosa.org/xforms/xformsManifest", null, null),
+       //
+       ODK("odk", "http://www.opendatakit.org/xforms", null, null),
        //
        ;
 
@@ -27,8 +47,10 @@ public enum SuiteContentTypes {
                this.defaultPrefix = defaultPrefix;
                Objects.requireNonNull(namespace);
                this.namespace = namespace;
-               resource = getClass().getResource(RESOURCE_BASE + resourceFileName);
-               Objects.requireNonNull(resource);
+               if (resourceFileName != null) {
+                       resource = getClass().getResource(RESOURCE_BASE + resourceFileName);
+                       Objects.requireNonNull(resource);
+               }
                if (publicUrl != null)
                        try {
                                this.publicUrl = new URL(publicUrl);