Fix OML model compare in Git staging view

io.opencaesar.rosetta.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="io.opencaesar.rosetta.feature"
       label="%featureName"
-      version="0.9.1"
+      version="0.9.2"
       provider-name="%providerName">
 
    <description url="http://www.example.com/description">

io.opencaesar.rosetta.feature/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>io.opencaesar.rosetta</groupId>
 		<artifactId>io.opencaesar.rosetta.parent</artifactId>
-		<version>0.9.1</version>
+		<version>0.9.2</version>
 	</parent>
 	<artifactId>io.opencaesar.rosetta.feature</artifactId>
 	<packaging>eclipse-feature</packaging>

io.opencaesar.rosetta.oml.ui/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: io.opencaesar.rosetta.oml.ui;singleton:=true
-Bundle-Version: 0.9.1
+Bundle-Version: 0.9.2
 Automatic-Module-Name: io.opencaesar.rosetta.oml.ui
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Localization: plugin

io.opencaesar.rosetta.oml.ui/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>io.opencaesar.rosetta</groupId>
 		<artifactId>io.opencaesar.rosetta.parent</artifactId>
-		<version>0.9.1</version>
+		<version>0.9.2</version>
 	</parent>
 	<artifactId>io.opencaesar.rosetta.oml.ui</artifactId>
 	<packaging>eclipse-plugin</packaging>

io.opencaesar.rosetta.oml.ui/src/io/opencaesar/rosetta/oml/ui/compare/OmlModelResolver.java

@@ -22,10 +22,15 @@
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IStorage;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.emf.compare.ide.ui.logical.AbstractModelResolver;
 import org.eclipse.emf.compare.ide.ui.logical.IStorageProviderAccessor;
+import org.eclipse.emf.compare.ide.ui.logical.IStorageProviderAccessor.DiffSide;
 import org.eclipse.emf.compare.ide.ui.logical.SynchronizationModel;
+import org.eclipse.emf.compare.ide.utils.ResourceUtil;
 import org.eclipse.emf.compare.ide.utils.StorageTraversal;
 
 /**
@@ -36,33 +41,75 @@
 public class OmlModelResolver extends AbstractModelResolver {
 
 	@Override
-	public SynchronizationModel resolveLocalModels(IResource left, IResource right, IResource origin,
-			IProgressMonitor monitor) throws InterruptedException {
-		return new SynchronizationModel(getTraversal(left), getTraversal(right), getTraversal(origin));
-	}
-
-	@Override
-	public SynchronizationModel resolveModels(IStorageProviderAccessor storageAccessor, IStorage left, IStorage right,
-			IStorage origin, IProgressMonitor monitor) throws InterruptedException {
-		return new SynchronizationModel(getTraversal(left), getTraversal(right), getTraversal(origin));
+	public boolean canResolve(IStorage sourceStorage) {
+		return true;
 	}
-
+
+	// Local
+
 	@Override
 	public StorageTraversal resolveLocalModel(IResource resource, IProgressMonitor monitor)
 			throws InterruptedException {
-		return getTraversal(resource);
+		return getLocalTraversal(resource);
 	}
 
 	@Override
-	public boolean canResolve(IStorage sourceStorage) {
-		return true;
+	public SynchronizationModel resolveLocalModels(IResource left, IResource right, IResource origin,
+			IProgressMonitor monitor) throws InterruptedException {
+		return new SynchronizationModel(getLocalTraversal(left), getLocalTraversal(right), getLocalTraversal(origin));
 	}
 
-	private static StorageTraversal getTraversal(Object resource) {
+	/**
+	 * For local resources, include the given resource directly in the StorageTraversal.
+	 */
+	private static StorageTraversal getLocalTraversal(IResource resource) {
 		if (resource instanceof IStorage) {
 			return new StorageTraversal(Collections.singleton((IStorage)resource));
 		} else {
 			return new StorageTraversal(Collections.emptySet());
 		}
 	}
+
+	// Remote
+
+	@Override
+	public SynchronizationModel resolveModels(IStorageProviderAccessor storageAccessor, IStorage left, IStorage right,
+			IStorage origin, IProgressMonitor monitor) throws InterruptedException {
+		var subMonitor = SubMonitor.convert(monitor, 3);
+		return new SynchronizationModel(
+				getRemoteTraversal(storageAccessor, left, DiffSide.SOURCE, subMonitor.split(1)),
+				getRemoteTraversal(storageAccessor, right, DiffSide.REMOTE, subMonitor.split(1)),
+				getRemoteTraversal(storageAccessor, origin, DiffSide.ORIGIN, subMonitor.split(1))
+		);
+	}
+
+	/**
+	 * For remote traversals, the IStorage given to us may be a wrapper for an underlying IStorage object that
+	 * doesn't actually exist and is null; trying to load the contents of this IStorage results in an error.
+	 * 
+	 * To prevent this, try to locate the storage object ourselves from the
+	 * storageAccessor using the given storage object's name to ensure it exists.
+	 */
+	private static StorageTraversal getRemoteTraversal(IStorageProviderAccessor storageAccessor, IStorage givenStorage, DiffSide side, IProgressMonitor monitor) {
+		try {
+			if (givenStorage != null) {
+				var path = ResourceUtil.getAbsolutePath(givenStorage);
+				var file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+				var storageProvider = storageAccessor.getStorageProvider(file, side);
+				if (storageProvider != null) {
+					var foundStorage = storageProvider.getStorage(monitor);
+					if (foundStorage != null) {
+						return new StorageTraversal(Collections.singleton(foundStorage));
+					}
+				}
+			}
+		} catch (CoreException e) {
+			// returns an empty traversal in the event of a CoreException
+			e.printStackTrace();
+		} finally {
+			monitor.done();
+		}
+		return new StorageTraversal(Collections.emptySet());
+	}
+
 }

io.opencaesar.rosetta.product/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>io.opencaesar.rosetta</groupId>
 		<artifactId>io.opencaesar.rosetta.parent</artifactId>
-		<version>0.9.1</version>
+		<version>0.9.2</version>
 	</parent>
 
 	<build>

io.opencaesar.rosetta.product/rosetta.product

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Rosetta" uid="rosetta" id="io.opencaesar.rosetta.rcp.product" application="org.eclipse.ui.ide.workbench" version="0.9.1" useFeatures="true" includeLaunchers="true">
+<product name="Rosetta" uid="rosetta" id="io.opencaesar.rosetta.rcp.product" application="org.eclipse.ui.ide.workbench" version="0.9.2" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/io.opencaesar.rosetta.rcp/images/about.png"/>

io.opencaesar.rosetta.rcp.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="io.opencaesar.rosetta.rcp.feature"
       label="%featureName"
-      version="0.9.1"
+      version="0.9.2"
       provider-name="%providerName">
 
    <description url="http://www.example.com/description">

io.opencaesar.rosetta.rcp.feature/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>io.opencaesar.rosetta</groupId>
 		<artifactId>io.opencaesar.rosetta.parent</artifactId>
-		<version>0.9.1</version>
+		<version>0.9.2</version>
 	</parent>
 	<artifactId>io.opencaesar.rosetta.rcp.feature</artifactId>
 	<packaging>eclipse-feature</packaging>

io.opencaesar.rosetta.rcp/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: io.opencaesar.rosetta.rcp;singleton:=true
-Bundle-Version: 0.9.1
+Bundle-Version: 0.9.2
 Automatic-Module-Name: io.opencaesar.rosetta.rcp
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Localization: plugin

io.opencaesar.rosetta.rcp/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>io.opencaesar.rosetta</groupId>
 		<artifactId>io.opencaesar.rosetta.parent</artifactId>
-		<version>0.9.1</version>
+		<version>0.9.2</version>
 	</parent>
 	<artifactId>io.opencaesar.rosetta.rcp</artifactId>
 	<packaging>eclipse-plugin</packaging>

io.opencaesar.rosetta.repository/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>io.opencaesar.rosetta</groupId>
 		<artifactId>io.opencaesar.rosetta.parent</artifactId>
-		<version>0.9.1</version>
+		<version>0.9.2</version>
 	</parent>
 
 	<artifactId>io.opencaesar.rosetta.repository</artifactId>

io.opencaesar.rosetta.sirius.viewpoint/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: io.opencaesar.rosetta.sirius.viewpoint;singleton:=true
-Bundle-Version: 0.9.1
+Bundle-Version: 0.9.2
 Automatic-Module-Name: io.opencaesar.rosetta.sirius.viewpoint
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Activator: io.opencaesar.rosetta.sirius.viewpoint.Activator

io.opencaesar.rosetta.sirius.viewpoint/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>io.opencaesar.rosetta</groupId>
 		<artifactId>io.opencaesar.rosetta.parent</artifactId>
-		<version>0.9.1</version>
+		<version>0.9.2</version>
 	</parent>
 
 	<artifactId>io.opencaesar.rosetta.sirius.viewpoint</artifactId>

io.opencaesar.rosetta.sirius/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: io.opencaesar.rosetta.sirius;singleton:=true
-Bundle-Version: 0.9.1
+Bundle-Version: 0.9.2
 Bundle-Localization: plugin
 Automatic-Module-Name: io.opencaesar.rosetta.sirius
 Bundle-RequiredExecutionEnvironment: JavaSE-11

io.opencaesar.rosetta.target/pom.xml

@@ -7,7 +7,7 @@
   <parent>
   	<groupId>io.opencaesar.rosetta</groupId>
 	<artifactId>io.opencaesar.rosetta.parent</artifactId>
-  	<version>0.9.1</version>
+  	<version>0.9.2</version>
   </parent>
 
 </project>

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.opencaesar.rosetta</groupId>
 	<artifactId>io.opencaesar.rosetta.parent</artifactId>
-	<version>0.9.1</version>
+	<version>0.9.2</version>
 	<packaging>pom</packaging>
 
 	<modules>

version.txt

@@ -1 +1 @@
-0.9.1
+0.9.2