Bug 427406 - Add support for EndPoint objects and define extensions.

EndPoints not yet supported, but fixed some related issues. Fix in URI
resolver for local references.

1 files changed, 2 insertions, 3 deletions

diff --git a/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/model/Bpmn2ModelerResourceImpl.java b/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/model/Bpmn2ModelerResourceImpl.java
index 924f30e3..66e50de4 100644
--- a/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/model/Bpmn2ModelerResourceImpl.java
+++ b/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/model/Bpmn2ModelerResourceImpl.java
@@ -1163,9 +1163,8 @@ public class Bpmn2ModelerResourceImpl extends Bpmn2ResourceImpl {
 			} catch (Exception e) {
 			}
 
-			String uriString = xmlHelper.getPathForPrefix(prefix).appendFragment(fragment).toString();
-			
 			if (!isTargetNamespacePrefix) {
+				String uriString = xmlHelper.getPathForPrefix(prefix).appendFragment(fragment).toString();
 				URI uri = URI.createURI(uriString);
 				ResourceSet rs = ModelUtil.slightlyHackedResourceSet(xmlHelper.getResource().getResourceSet());
 				Resource r = ((Bpmn2ModelerResourceSetImpl)rs).getResource(uri, true, "wsdl"); // the only problem here... //$NON-NLS-1$
@@ -1184,7 +1183,7 @@ public class Bpmn2ModelerResourceImpl extends Bpmn2ResourceImpl {
 				return xmlHelper.getPathForPrefix(prefix).appendFragment(fragment).toString();
 			}
 			else {
-				return uriString;
+				return URI.createURI("").appendFragment(fragment).toString();
 			}
 		}
 	}