[458452] Prioritize URI over nested name when locating CompletePackage

3 files changed, 13 insertions, 7 deletions

diff --git a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CompleteModelImpl.java b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CompleteModelImpl.java
index 624319f978..4d7973c938 100644
--- a/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CompleteModelImpl.java
+++ b/plugins/org.eclipse.ocl.pivot/emf-gen/org/eclipse/ocl/pivot/internal/CompleteModelImpl.java
@@ -508,7 +508,7 @@ public class CompleteModelImpl extends NamedElementImpl implements CompleteModel
 	}
 
 	@Override
-	public @Nullable CompletePackage getCompletePackageByURI(@NonNull String packageURI) {
+	public @Nullable CompletePackageInternal getCompletePackageByURI(@NonNull String packageURI) {
 		return completeURIs.getCompletePackageByURI(packageURI);
 	}
 
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompleteModelInternal.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompleteModelInternal.java
index f01bb0d073..4a731b7ac1 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompleteModelInternal.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/CompleteModelInternal.java
@@ -17,7 +17,6 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.ocl.pivot.CollectionType;
 import org.eclipse.ocl.pivot.CompleteModel;
-import org.eclipse.ocl.pivot.CompletePackage;
 import org.eclipse.ocl.pivot.LambdaType;
 import org.eclipse.ocl.pivot.Model;
 import org.eclipse.ocl.pivot.TupleType;
@@ -25,8 +24,8 @@ import org.eclipse.ocl.pivot.Type;
 import org.eclipse.ocl.pivot.TypedElement;
 import org.eclipse.ocl.pivot.internal.OrphanCompletePackageImpl;
 import org.eclipse.ocl.pivot.internal.PrimitiveCompletePackageImpl;
-import org.eclipse.ocl.pivot.internal.manager.PivotMetamodelManager;
 import org.eclipse.ocl.pivot.internal.manager.Orphanage;
+import org.eclipse.ocl.pivot.internal.manager.PivotMetamodelManager;
 import org.eclipse.ocl.pivot.internal.manager.TupleTypeManager;
 import org.eclipse.ocl.pivot.internal.utilities.EnvironmentFactoryInternal;
 import org.eclipse.ocl.pivot.values.CollectionTypeParameters;
@@ -47,7 +46,7 @@ public interface CompleteModelInternal extends CompleteModel
 	@Override
 	@NonNull CompletePackageInternal getCompletePackage(@NonNull org.eclipse.ocl.pivot.Package partialPackage);
 	@Override
-	@Nullable CompletePackage getCompletePackageByURI(@NonNull String packageURI);
+	@Nullable CompletePackageInternal getCompletePackageByURI(@NonNull String packageURI);
 	@NonNull CompleteURIs getCompleteURIs();
 	@NonNull EnvironmentFactoryInternal getEnvironmentFactory();
 	@NonNull LambdaType getLambdaType(@NonNull String typeName, @NonNull Type contextType, @NonNull List<? extends Type> parameterTypes, @NonNull Type resultType,
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/NestedCompletePackages.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/NestedCompletePackages.java
index e30b02ec6a..6df2ffa3fd 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/NestedCompletePackages.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/complete/NestedCompletePackages.java
@@ -55,13 +55,20 @@ public class NestedCompletePackages extends AbstractCompletePackages
 
 	@Override
 	public @NonNull CompletePackageInternal getOwnedCompletePackage(@NonNull org.eclipse.ocl.pivot.Package partialPackage) {
-		String name = partialPackage.getName();
-		CompletePackageInternal completePackage = super.getOwnedCompletePackage(name);
+		CompletePackageInternal completePackage = null;
+		String uri = partialPackage.getURI();
+		if (uri != null) {
+			completePackage = getCompleteModel().getCompletePackageByURI(uri);
+		}
+		if (completePackage == null) {
+			String name = partialPackage.getName();
+			completePackage = super.getOwnedCompletePackage(name);
+		}
 		if (completePackage == null) {
 			completePackage = createCompletePackage(partialPackage);
-			completePackage.getPartialPackages().add(partialPackage);
 			add(completePackage);
 		}
+		completePackage.getPartialPackages().add(partialPackage);
 		return completePackage;
 	}