From 0dde6f02d92f0f2519921b7e457ae99fdeb3101a Mon Sep 17 00:00:00 2001 From: Eike Stepper Date: Sun, 7 Oct 2007 04:30:28 +0000 Subject: [205651] Implement transaction rollback https://bugs.eclipse.org/bugs/show_bug.cgi?id=205651 --- .../internal/ui/actions/CreateCommitAction.java | 25 ---------------------- .../internal/ui/actions/CreateRollbackAction.java | 25 ---------------------- .../ui/actions/RollbackTransactionAction.java | 25 ++++++++++++++++++++++ .../emf/cdo/internal/ui/views/CDOItemProvider.java | 8 +++---- 4 files changed, 29 insertions(+), 54 deletions(-) delete mode 100644 plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CreateCommitAction.java delete mode 100644 plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CreateRollbackAction.java create mode 100644 plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RollbackTransactionAction.java diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CreateCommitAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CreateCommitAction.java deleted file mode 100644 index 1b0cc58467..0000000000 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CreateCommitAction.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.eclipse.emf.cdo.internal.ui.actions; - -import org.eclipse.emf.cdo.CDOView; - -import org.eclipse.ui.IWorkbenchPage; - -/** - * @author Eike Stepper - */ -public final class CreateCommitAction extends ViewAction -{ - private static final String TITLE = "Commit"; - - public CreateCommitAction(IWorkbenchPage page, CDOView view) - { - super(page, TITLE, "Commit this transaction", null, view); - setEnabled(getTransaction().isDirty()); - } - - @Override - protected void doRun() throws Exception - { - getTransaction().commit(); - } -} \ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CreateRollbackAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CreateRollbackAction.java deleted file mode 100644 index 18bdd29c7d..0000000000 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CreateRollbackAction.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.eclipse.emf.cdo.internal.ui.actions; - -import org.eclipse.emf.cdo.CDOView; - -import org.eclipse.ui.IWorkbenchPage; - -/** - * @author Eike Stepper - */ -public final class CreateRollbackAction extends ViewAction -{ - private static final String TITLE = "Rollback"; - - public CreateRollbackAction(IWorkbenchPage page, CDOView view) - { - super(page, TITLE, "Rollback this transaction", null, view); - setEnabled(getTransaction().isDirty()); - } - - @Override - protected void doRun() throws Exception - { - getTransaction().rollback(); - } -} \ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RollbackTransactionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RollbackTransactionAction.java new file mode 100644 index 0000000000..fc064b8e43 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RollbackTransactionAction.java @@ -0,0 +1,25 @@ +package org.eclipse.emf.cdo.internal.ui.actions; + +import org.eclipse.emf.cdo.CDOView; + +import org.eclipse.ui.IWorkbenchPage; + +/** + * @author Eike Stepper + */ +public final class RollbackTransactionAction extends ViewAction +{ + private static final String TITLE = "Rollback"; + + public RollbackTransactionAction(IWorkbenchPage page, CDOView view) + { + super(page, TITLE, "Rollback this transaction", null, view); + setEnabled(getTransaction().isDirty()); + } + + @Override + protected void doRun() throws Exception + { + getTransaction().rollback(); + } +} \ No newline at end of file diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java index b204523b70..6cf7dc32dd 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java @@ -20,9 +20,9 @@ import org.eclipse.emf.cdo.CDOViewEvent; import org.eclipse.emf.cdo.internal.ui.SharedIcons; import org.eclipse.emf.cdo.internal.ui.actions.CloseSessionAction; import org.eclipse.emf.cdo.internal.ui.actions.CloseViewAction; -import org.eclipse.emf.cdo.internal.ui.actions.CreateCommitAction; +import org.eclipse.emf.cdo.internal.ui.actions.CommitTransactionAction; import org.eclipse.emf.cdo.internal.ui.actions.CreateResourceAction; -import org.eclipse.emf.cdo.internal.ui.actions.CreateRollbackAction; +import org.eclipse.emf.cdo.internal.ui.actions.RollbackTransactionAction; import org.eclipse.emf.cdo.internal.ui.actions.LoadResourceAction; import org.eclipse.emf.cdo.internal.ui.actions.ManagePackagesAction; import org.eclipse.emf.cdo.internal.ui.actions.OpenAuditAction; @@ -289,8 +289,8 @@ public class CDOItemProvider extends ContainerItemProvider> if (view.getViewType() == CDOView.Type.TRANSACTION) { manager.add(new CreateResourceAction(page, view)); - manager.add(new CreateCommitAction(page, view)); - manager.add(new CreateRollbackAction(page, view)); + manager.add(new CommitTransactionAction(page, view)); + manager.add(new RollbackTransactionAction(page, view)); } manager.add(new Separator()); -- cgit v1.2.3