Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikaël Barbero2013-10-28 12:34:31 -0400
committerMikaël Barbero2013-11-05 07:42:25 -0500
commitd4ce3f0f7a520b59442dd708baaa2583482314fd (patch)
tree5a001b5be0c38667dfbaafb99fec37d04e6785d0 /plugins/org.eclipse.emf.compare.ide.ui/src
parentf7c73227afd37f362c8fc599e8d445316a1f585a (diff)
downloadorg.eclipse.emf.compare-d4ce3f0f7a520b59442dd708baaa2583482314fd.tar.gz
org.eclipse.emf.compare-d4ce3f0f7a520b59442dd708baaa2583482314fd.tar.xz
org.eclipse.emf.compare-d4ce3f0f7a520b59442dd708baaa2583482314fd.zip
Fix regression in ComparisonEditorInput with new way of grouping.
Diffstat (limited to 'plugins/org.eclipse.emf.compare.ide.ui/src')
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/editor/ComparisonEditorInput.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/editor/ComparisonEditorInput.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/editor/ComparisonEditorInput.java
index b6527ef7f..9acd5634a 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/editor/ComparisonEditorInput.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/editor/ComparisonEditorInput.java
@@ -18,6 +18,8 @@ import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.compare.Comparison;
import org.eclipse.emf.compare.domain.ICompareEditingDomain;
import org.eclipse.emf.compare.ide.ui.internal.configuration.EMFCompareConfiguration;
+import org.eclipse.emf.edit.tree.TreeFactory;
+import org.eclipse.emf.edit.tree.TreeNode;
/**
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
@@ -43,6 +45,8 @@ public class ComparisonEditorInput extends AbstractEMFCompareEditorInput {
@Override
protected Object doPrepareInput(IProgressMonitor monitor) throws InvocationTargetException,
InterruptedException {
- return getAdapterFactory().adapt(comparison, ICompareInput.class);
+ final TreeNode treeNode = TreeFactory.eINSTANCE.createTreeNode();
+ treeNode.setData(comparison);
+ return getAdapterFactory().adapt(treeNode, ICompareInput.class);
}
}

Back to the top