Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2003-11-24 09:36:33 -0500
committerAndre Weinand2003-11-24 09:36:33 -0500
commitbae585d14485d902351e0edeaff1253d0c36b470 (patch)
tree520c314ddcfea6365096c1dbbee567aed138fdc9
parentb820bbe0f614e3653ea163397eaaa790885e90a2 (diff)
downloadeclipse.platform.team-bae585d14485d902351e0edeaff1253d0c36b470.tar.gz
eclipse.platform.team-bae585d14485d902351e0edeaff1253d0c36b470.tar.xz
eclipse.platform.team-bae585d14485d902351e0edeaff1253d0c36b470.zip
removed use of deprecated symbolsv20031125
-rw-r--r--bundles/org.eclipse.compare/buildnotes_compare.html8
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java18
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java7
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html8
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java18
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java7
6 files changed, 42 insertions, 24 deletions
diff --git a/bundles/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/buildnotes_compare.html
index 96f36ffbc..fdac0c826 100644
--- a/bundles/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/buildnotes_compare.html
@@ -11,6 +11,14 @@
<h1>
Eclipse Platform Build Notes<br>
Compare</h1>
+Eclipse Build Input November 25th 2003
+
+<h2>
+Problem reports fixed</h2>
+removed use of deprecated symbols
+
+<h1>
+<hr WIDTH="100%"></h1>
Eclipse Build Input November 19th 2003
<h2>
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
index 0388ee25e..479b49808 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
@@ -49,8 +49,8 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.IKeyBindingService;
-import org.eclipse.ui.IWorkbenchActionConstants;
import org.eclipse.ui.IWorkbenchPartSite;
+import org.eclipse.ui.actions.ActionFactory;
import org.eclipse.ui.help.WorkbenchHelp;
import org.eclipse.compare.*;
@@ -120,14 +120,14 @@ public class TextMergeViewer extends ContentMergeViewer {
private static final boolean DEBUG= false;
private static final String[] GLOBAL_ACTIONS= {
- IWorkbenchActionConstants.UNDO,
- IWorkbenchActionConstants.REDO,
- IWorkbenchActionConstants.CUT,
- IWorkbenchActionConstants.COPY,
- IWorkbenchActionConstants.PASTE,
- IWorkbenchActionConstants.DELETE,
- IWorkbenchActionConstants.SELECT_ALL,
- IWorkbenchActionConstants.SAVE
+ ActionFactory.UNDO.getId(),
+ ActionFactory.REDO.getId(),
+ ActionFactory.CUT.getId(),
+ ActionFactory.COPY.getId(),
+ ActionFactory.PASTE.getId(),
+ ActionFactory.DELETE.getId(),
+ ActionFactory.SELECT_ALL.getId(),
+ ActionFactory.SAVE.getId()
};
private static final String[] TEXT_ACTIONS= {
MergeSourceViewer.UNDO_ID,
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java
index a1ecc745d..254d0d395 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java
@@ -15,10 +15,11 @@ import java.util.ResourceBundle;
import org.eclipse.jface.action.*;
import org.eclipse.ui.*;
+import org.eclipse.ui.actions.ActionFactory;
import org.eclipse.ui.help.WorkbenchHelp;
import org.eclipse.ui.part.EditorActionBarContributor;
-import org.eclipse.compare.*;
+import org.eclipse.compare.*;
public class CompareEditorContributor extends EditorActionBarContributor {
@@ -94,8 +95,8 @@ public class CompareEditorContributor extends EditorActionBarContributor {
CompareEditor editor= (CompareEditor) targetEditor;
editor.setActionBars(actionBars);
- actionBars.setGlobalActionHandler(IWorkbenchActionConstants.NEXT, fNext);
- actionBars.setGlobalActionHandler(IWorkbenchActionConstants.PREVIOUS, fPrevious);
+ actionBars.setGlobalActionHandler(ActionFactory.NEXT.getId(), fNext);
+ actionBars.setGlobalActionHandler(ActionFactory.PREVIOUS.getId(), fPrevious);
CompareConfiguration cc= editor.getCompareConfiguration();
fIgnoreWhitespace.setCompareConfiguration(cc);
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
index 96f36ffbc..fdac0c826 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
@@ -11,6 +11,14 @@
<h1>
Eclipse Platform Build Notes<br>
Compare</h1>
+Eclipse Build Input November 25th 2003
+
+<h2>
+Problem reports fixed</h2>
+removed use of deprecated symbols
+
+<h1>
+<hr WIDTH="100%"></h1>
Eclipse Build Input November 19th 2003
<h2>
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
index 0388ee25e..479b49808 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
@@ -49,8 +49,8 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.IKeyBindingService;
-import org.eclipse.ui.IWorkbenchActionConstants;
import org.eclipse.ui.IWorkbenchPartSite;
+import org.eclipse.ui.actions.ActionFactory;
import org.eclipse.ui.help.WorkbenchHelp;
import org.eclipse.compare.*;
@@ -120,14 +120,14 @@ public class TextMergeViewer extends ContentMergeViewer {
private static final boolean DEBUG= false;
private static final String[] GLOBAL_ACTIONS= {
- IWorkbenchActionConstants.UNDO,
- IWorkbenchActionConstants.REDO,
- IWorkbenchActionConstants.CUT,
- IWorkbenchActionConstants.COPY,
- IWorkbenchActionConstants.PASTE,
- IWorkbenchActionConstants.DELETE,
- IWorkbenchActionConstants.SELECT_ALL,
- IWorkbenchActionConstants.SAVE
+ ActionFactory.UNDO.getId(),
+ ActionFactory.REDO.getId(),
+ ActionFactory.CUT.getId(),
+ ActionFactory.COPY.getId(),
+ ActionFactory.PASTE.getId(),
+ ActionFactory.DELETE.getId(),
+ ActionFactory.SELECT_ALL.getId(),
+ ActionFactory.SAVE.getId()
};
private static final String[] TEXT_ACTIONS= {
MergeSourceViewer.UNDO_ID,
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java
index a1ecc745d..254d0d395 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java
@@ -15,10 +15,11 @@ import java.util.ResourceBundle;
import org.eclipse.jface.action.*;
import org.eclipse.ui.*;
+import org.eclipse.ui.actions.ActionFactory;
import org.eclipse.ui.help.WorkbenchHelp;
import org.eclipse.ui.part.EditorActionBarContributor;
-import org.eclipse.compare.*;
+import org.eclipse.compare.*;
public class CompareEditorContributor extends EditorActionBarContributor {
@@ -94,8 +95,8 @@ public class CompareEditorContributor extends EditorActionBarContributor {
CompareEditor editor= (CompareEditor) targetEditor;
editor.setActionBars(actionBars);
- actionBars.setGlobalActionHandler(IWorkbenchActionConstants.NEXT, fNext);
- actionBars.setGlobalActionHandler(IWorkbenchActionConstants.PREVIOUS, fPrevious);
+ actionBars.setGlobalActionHandler(ActionFactory.NEXT.getId(), fNext);
+ actionBars.setGlobalActionHandler(ActionFactory.PREVIOUS.getId(), fPrevious);
CompareConfiguration cc= editor.getCompareConfiguration();
fIgnoreWhitespace.setCompareConfiguration(cc);

Back to the top