[391257] Provide a CDOTransactionCommentator that automatically appends

a change summary to commit comments 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=391257

5 files changed, 19 insertions, 4 deletions

diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/RepositoryContentProvider.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/RepositoryContentProvider.java
index 9ed47fdc76..5ed6e282bb 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/RepositoryContentProvider.java
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/ide/RepositoryContentProvider.java
@@ -17,6 +17,8 @@ import org.eclipse.emf.cdo.common.branch.CDOBranchCreatedEvent;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.team.IRepositoryManager;
 import org.eclipse.emf.cdo.team.IRepositoryProject;
+import org.eclipse.emf.cdo.transaction.CDOTransaction;
+import org.eclipse.emf.cdo.transaction.CDOTransactionCommentator;
 import org.eclipse.emf.cdo.ui.CDOEditorInput;
 import org.eclipse.emf.cdo.ui.CDOEditorUtil;
 import org.eclipse.emf.cdo.ui.CDOEventHandler;
@@ -491,12 +493,13 @@ public class RepositoryContentProvider extends StructuredContentProvider<IWorksp
       if (selection instanceof CDOResource)
       {
         IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-        CDOView view = ((CDOResource)selection).cdoView().getSession().openTransaction();
+        CDOTransaction transaction = ((CDOResource)selection).cdoView().getSession().openTransaction();
+        new CDOTransactionCommentator(transaction);
 
         try
         {
-          CDOEditorInput editorInput = CDOEditorUtil.createCDOEditorInput(view, ((CDOResource)selection).getPath(),
-              true);
+          CDOEditorInput editorInput = CDOEditorUtil.createCDOEditorInput(transaction,
+              ((CDOResource)selection).getPath(), true);
           page.openEditor(editorInput, CDOEditorUtil.getEditorID());
         }
         catch (PartInitException ex)
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/ExportResourceActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/ExportResourceActionDelegate.java
index 1df54c429b..0f51f5a6e5 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/ExportResourceActionDelegate.java
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/ExportResourceActionDelegate.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.CDOObject;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.internal.ui.dialogs.ImportResourceDialog;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
+import org.eclipse.emf.cdo.transaction.CDOTransactionCommentator;
 import org.eclipse.emf.cdo.ui.internal.ide.messages.Messages;
 
 import org.eclipse.net4j.util.io.IORuntimeException;
@@ -62,6 +63,8 @@ public class ExportResourceActionDelegate extends TransactionalBackgroundActionD
       {
         targetURI = uris.get(0);
         CDOTransaction transaction = object.cdoView().getSession().openTransaction();
+        new CDOTransactionCommentator(transaction);
+
         CDOObject transactionalObject = transaction.getObject(object);
         return transactionalObject;
       }
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/ImportResourceActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/ImportResourceActionDelegate.java
index 39448bbad9..bc7149b4a2 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/ImportResourceActionDelegate.java
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/ImportResourceActionDelegate.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.eresource.CDOResourceNode;
 import org.eclipse.emf.cdo.internal.ui.dialogs.ImportResourceDialog;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
+import org.eclipse.emf.cdo.transaction.CDOTransactionCommentator;
 import org.eclipse.emf.cdo.ui.internal.ide.messages.Messages;
 
 import org.eclipse.emf.common.util.EList;
@@ -56,7 +57,10 @@ public class ImportResourceActionDelegate extends NewResourceActionDelegate
         sourceURI = uris.get(0);
         setNewResourceNode(createNewResourceNode());
         getNewResourceNode().setName(dialog.getTargetPath());
+
         CDOTransaction transaction = object.cdoView().getSession().openTransaction();
+        new CDOTransactionCommentator(transaction);
+
         CDOObject transactionalObject = transaction.getObject(object);
         return transactionalObject;
       }
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/RemoveResourceActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/RemoveResourceActionDelegate.java
index 2be13f2ac1..3c14054ceb 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/RemoveResourceActionDelegate.java
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/RemoveResourceActionDelegate.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.eresource.CDOResourceFolder;
 import org.eclipse.emf.cdo.eresource.CDOResourceNode;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
+import org.eclipse.emf.cdo.transaction.CDOTransactionCommentator;
 import org.eclipse.emf.cdo.ui.internal.ide.bundle.OM;
 import org.eclipse.emf.cdo.ui.internal.ide.messages.Messages;
 
@@ -82,6 +83,7 @@ public class RemoveResourceActionDelegate implements IObjectActionDelegate
             if (transaction == null)
             {
               transaction = node.cdoView().getSession().openTransaction();
+              new CDOTransactionCommentator(transaction);
               repositoryToTransaction.put(sessionID, transaction);
             }
 
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/TransactionalBackgroundActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/TransactionalBackgroundActionDelegate.java
index 02e5bdd89f..e88a81a521 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/TransactionalBackgroundActionDelegate.java
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/TransactionalBackgroundActionDelegate.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.ui.internal.ide.actions;
 
 import org.eclipse.emf.cdo.CDOObject;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
+import org.eclipse.emf.cdo.transaction.CDOTransactionCommentator;
 import org.eclipse.emf.cdo.ui.internal.ide.messages.Messages;
 import org.eclipse.emf.cdo.view.CDOView;
 
@@ -96,7 +97,7 @@ public abstract class TransactionalBackgroundActionDelegate extends LongRunningA
    * Usually opens a new transaction based on the passed object and its view/session and returns a "contextualized" copy
    * of this object. Clients may override to access the UI thread before the background job is started or change the
    * contextualization procedure.
-   * 
+   *
    * @param object
    *          Usually an object in a read-only view that needs to be modified in a separate transaction.
    * @return A transactional copy of the passed object, or <code>null</code> to indicate cancelation of this action.
@@ -104,6 +105,8 @@ public abstract class TransactionalBackgroundActionDelegate extends LongRunningA
   protected CDOObject preRun(CDOObject object)
   {
     CDOTransaction transaction = object.cdoView().getSession().openTransaction();
+    new CDOTransactionCommentator(transaction);
+
     CDOObject transactionalObject = transaction.getObject(object);
     return transactionalObject;
   }