1 files changed, 37 insertions, 11 deletions

diff --git a/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/compare/CDOCompareEditorUtil.java b/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/compare/CDOCompareEditorUtil.java
index 0095789ed8..f1577fbfec 100644
--- a/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/compare/CDOCompareEditorUtil.java
+++ b/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/compare/CDOCompareEditorUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, 2015, 2016, 2019, 2020 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2012, 2013, 2015, 2016, 2019-2022 Eike Stepper (Loehne, Germany) and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,7 +17,6 @@ import org.eclipse.emf.cdo.common.commit.CDOCommitInfo;
 import org.eclipse.emf.cdo.common.id.CDOID;
 import org.eclipse.emf.cdo.common.id.CDOIDUtil;
 import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta;
-import org.eclipse.emf.cdo.compare.CDOCompare;
 import org.eclipse.emf.cdo.compare.CDOCompareUtil;
 import org.eclipse.emf.cdo.compare.CDOComparisonScope;
 import org.eclipse.emf.cdo.session.CDORepositoryInfo;
@@ -96,8 +95,10 @@ public final class CDOCompareEditorUtil
 {
   /**
    * @since 4.6
+   * @deprecated As of 4.7 use {@link #compareImage()}.
    */
-  public static final Image COMPARE_IMAGE = OM.getImage("icons/compare.gif");
+  @Deprecated
+  public static final Image COMPARE_IMAGE = null;
 
   /**
    * @since 4.4
@@ -119,11 +120,26 @@ public final class CDOCompareEditorUtil
 
   private static final ThreadLocal<List<Runnable>> DISPOSE_RUNNABLES = new ThreadLocal<>();
 
+  private static Image compareImage;
+
   private CDOCompareEditorUtil()
   {
   }
 
   /**
+   * @since 4.7
+   */
+  public static Image compareImage()
+  {
+    if (compareImage == null)
+    {
+      compareImage = OM.getImage("icons/compare.gif");
+    }
+
+    return compareImage;
+  }
+
+  /**
    * @since 4.4
    */
   public static void closeTransactionAfterCommit(CDOTransaction transaction)
@@ -256,13 +272,13 @@ public final class CDOCompareEditorUtil
   /**
    * @since 4.3
    */
-  public static boolean openEditor(CDOCommitInfo rightCommitInfo, CDOBranchPoint leftPoint, boolean activate)
+  public static boolean openEditor(CDOCommitInfo leftCommitInfo, CDOBranchPoint rightPoint, boolean activate)
   {
     ACTIVATE_EDITOR.set(activate);
 
     try
     {
-      return openDialog(rightCommitInfo, leftPoint);
+      return openDialog(leftCommitInfo, rightPoint);
     }
     finally
     {
@@ -384,12 +400,12 @@ public final class CDOCompareEditorUtil
     }
   }
 
-  public static boolean openDialog(CDOCommitInfo rightCommitInfo, CDOBranchPoint leftPoint)
+  public static boolean openDialog(CDOCommitInfo leftCommitInfo, CDOBranchPoint rightPoint)
   {
-    CDORepositoryInfo repositoryInfo = (CDORepositoryInfo)rightCommitInfo.getCommitInfoManager().getRepository();
+    CDORepositoryInfo repositoryInfo = (CDORepositoryInfo)leftCommitInfo.getCommitInfoManager().getRepository();
     CDOSession session = repositoryInfo.getSession();
 
-    return openDialog(session, leftPoint, rightCommitInfo);
+    return openDialog(session, leftCommitInfo, rightPoint);
   }
 
   public static boolean openDialog(CDOCommitInfo commitInfo)
@@ -522,7 +538,7 @@ public final class CDOCompareEditorUtil
       return null;
     }
 
-    IComparisonScope scope = CDOCompare.getScope(comparison);
+    IComparisonScope scope = CDOCompareUtil.getScope(comparison);
     ICompareEditingDomain editingDomain = EMFCompareEditingDomain.create(scope.getLeft(), scope.getRight(), scope.getOrigin());
 
     ComposedAdapterFactory.Descriptor.Registry registry = EMFEditPlugin.getComposedAdapterFactoryDescriptorRegistry();
@@ -801,7 +817,7 @@ public final class CDOCompareEditorUtil
     private Input(CDOView sourceView, CDOView targetView, CompareConfiguration configuration, Comparison comparison, ICompareEditingDomain editingDomain,
         AdapterFactory adapterFactory)
     {
-      super(new org.eclipse.emf.compare.ide.ui.internal.configuration.EMFCompareConfiguration(configuration), comparison, editingDomain, adapterFactory);
+      super(createEMFCompareConfiguration(configuration, adapterFactory), comparison, editingDomain, adapterFactory);
       this.sourceView = sourceView;
       this.targetView = targetView;
       this.comparison = comparison;
@@ -818,6 +834,16 @@ public final class CDOCompareEditorUtil
       }
     }
 
+    private static org.eclipse.emf.compare.ide.ui.internal.configuration.EMFCompareConfiguration createEMFCompareConfiguration(
+        CompareConfiguration configuration, AdapterFactory adapterFactory)
+    {
+      org.eclipse.emf.compare.ide.ui.internal.configuration.EMFCompareConfiguration result = //
+          new org.eclipse.emf.compare.ide.ui.internal.configuration.EMFCompareConfiguration(configuration);
+
+      result.setAdapterFactory(adapterFactory);
+      return result;
+    }
+
     private void dispose()
     {
       AdapterFactory adapterFactory = getAdapterFactory();
@@ -839,7 +865,7 @@ public final class CDOCompareEditorUtil
     @Override
     public Image getTitleImage()
     {
-      return COMPARE_IMAGE;
+      return compareImage();
     }
 
     public void setDisposeRunnables(List<Runnable> disposeRunnables)