diff options
author | Kenn Hussey | 2012-04-20 15:21:05 +0000 |
---|---|---|
committer | Kenn Hussey | 2012-04-20 15:21:05 +0000 |
commit | fac207ea53da3032eaa1d99118f6af923312ba57 (patch) | |
tree | 58ed8f3ee8859da0a733150b76e37c70dfa97547 | |
parent | 18c27e0a76d2081526784764544ea48d4007d198 (diff) | |
download | org.eclipse.uml2.test-fac207ea53da3032eaa1d99118f6af923312ba57.tar.gz org.eclipse.uml2.test-fac207ea53da3032eaa1d99118f6af923312ba57.tar.xz org.eclipse.uml2.test-fac207ea53da3032eaa1d99118f6af923312ba57.zip |
[364419] Adjust priority/order of default XMI content handler.
-rw-r--r-- | plugins/org.eclipse.uml2.uml.resources/src/org/eclipse/uml2/uml/resources/util/UMLResourcesUtil.java | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/plugins/org.eclipse.uml2.uml.resources/src/org/eclipse/uml2/uml/resources/util/UMLResourcesUtil.java b/plugins/org.eclipse.uml2.uml.resources/src/org/eclipse/uml2/uml/resources/util/UMLResourcesUtil.java index af43264a..0f4694c6 100644 --- a/plugins/org.eclipse.uml2.uml.resources/src/org/eclipse/uml2/uml/resources/util/UMLResourcesUtil.java +++ b/plugins/org.eclipse.uml2.uml.resources/src/org/eclipse/uml2/uml/resources/util/UMLResourcesUtil.java @@ -187,6 +187,16 @@ public class UMLResourcesUtil if (resourceSet == null) { contentHandlers = ContentHandler.Registry.INSTANCE + .get(ContentHandler.Registry.LOW_PRIORITY); + + if (contentHandlers == null + || !contentHandlers.contains(XMI_CONTENT_HANDLER)) { + + ContentHandler.Registry.INSTANCE.put( + ContentHandler.Registry.LOW_PRIORITY, XMI_CONTENT_HANDLER); + } + + contentHandlers = ContentHandler.Registry.INSTANCE .get(ContentHandler.Registry.NORMAL_PRIORITY); if (contentHandlers == null) { @@ -199,10 +209,6 @@ public class UMLResourcesUtil .getContentHandlers(); } - if (!contentHandlers.contains(XMI_CONTENT_HANDLER)) { - contentHandlers.add(XMI_CONTENT_HANDLER); - } - if (!contentHandlers.contains(UML2_1_0_0_CONTENT_HANDLER)) { contentHandlers.add(UML2_1_0_0_CONTENT_HANDLER); } @@ -255,6 +261,12 @@ public class UMLResourcesUtil contentHandlers.add(CMOF_2_4_1_CONTENT_HANDLER); } + if (resourceSet != null + && !contentHandlers.contains(XMI_CONTENT_HANDLER)) { + + contentHandlers.add(XMI_CONTENT_HANDLER); + } + (resourceSet == null ? Resource.Factory.Registry.INSTANCE : resourceSet.getResourceFactoryRegistry()) |