Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
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/contentmergeviewer/util/RedoAction.java12
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/util/UndoAction.java12
2 files changed, 2 insertions, 22 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/util/RedoAction.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/util/RedoAction.java
index ab125e2e1..cd494f855 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/util/RedoAction.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/util/RedoAction.java
@@ -27,16 +27,6 @@ public class RedoAction extends Action {
setEditingDomain(domain);
}
- /**
- * Do not use this, will be removed in the next version.
- *
- * @deprecated
- */
- @Deprecated
- public RedoAction() {
- super(EMFEditUIPlugin.INSTANCE.getString("_UI_Redo_menu_item", new Object[] {"" })); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
@Override
public void run() {
if (domain != null) {
@@ -45,7 +35,7 @@ public class RedoAction extends Action {
/*
* FIXME : Domain may be null since we never unregister the actions from the handler service. It
* is set to null from #setEditingDomain(ICompareEditingDomain) when we switch to another content
- * viewer. In such cases, we "may" reach this run() before the new viwer is fully displayed and
+ * viewer. In such cases, we "may" reach this run() before the new viewer is fully displayed and
* its action initialized with a proper editing domain.
*/
}
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/util/UndoAction.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/util/UndoAction.java
index 50413e244..76dde54e3 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/util/UndoAction.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/util/UndoAction.java
@@ -27,16 +27,6 @@ public class UndoAction extends Action {
setEditingDomain(domain);
}
- /**
- * Do not use this, will be removed in the next version.
- *
- * @deprecated
- */
- @Deprecated
- public UndoAction() {
- super(EMFEditUIPlugin.INSTANCE.getString("_UI_Undo_menu_item", new Object[] {"" })); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
@Override
public void run() {
if (domain != null) {
@@ -45,7 +35,7 @@ public class UndoAction extends Action {
/*
* FIXME : Domain may be null since we never unregister the actions from the handler service. It
* is set to null from #setEditingDomain(ICompareEditingDomain) when we switch to another content
- * viewer. In such cases, we "may" reach this run() before the new viwer is fully displayed and
+ * viewer. In such cases, we "may" reach this run() before the new viewer is fully displayed and
* its action initialized with a proper editing domain.
*/
}

Back to the top