From 0bec11f97ee42242f7d618f2597d72f59fd3a047 Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Wed, 29 Jan 2003 18:18:30 +0000 Subject: [PATCH] With the help of eclipse-2.1 compiler remove warnings about accessing static fields in the object instance. --- .../ui/buildconsole/BuildConsoleView.java | 5 +++-- .../internal/ui/cview/FilterSelectionAction.java | 3 ++- .../internal/ui/cview/ShowLibrariesAction.java | 2 +- .../AbstractElementListSelectionDialog.java | 8 ++++---- .../cdt/internal/ui/dialogs/SelectionList.java | 4 ++-- .../cdt/internal/ui/editor/BracketPainter.java | 2 +- .../internal/ui/editor/CContentOutlinePage.java | 3 ++- .../internal/ui/editor/OpenIncludeAction.java | 3 ++- .../ui/editor/OpenOnSelectionAction.java | 3 ++- .../ui/preferences/EditTemplateDialog.java | 16 ++++++++-------- .../cdt/internal/ui/text/CPairMatcher.java | 4 ++-- .../ui/text/CSourceViewerConfiguration.java | 2 +- .../ui/wizards/dialogfields/DialogField.java | 2 +- .../dialogfields/StringButtonDialogField.java | 2 +- .../cdt/internal/ui/wizards/swt/MGridLayout.java | 12 ++++++------ 15 files changed, 38 insertions(+), 33 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleView.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleView.java index 7ca4f61eefd..6d8fba889de 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleView.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleView.java @@ -25,6 +25,7 @@ import org.eclipse.jface.preference.PreferenceConverter; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.ITextListener; +import org.eclipse.jface.text.ITextOperationTarget; import org.eclipse.jface.text.TextEvent; import org.eclipse.jface.text.TextViewer; import org.eclipse.jface.util.IPropertyChangeListener; @@ -85,8 +86,8 @@ public class BuildConsoleView extends ViewPart implements ISelectionListener, IB IActionBars actionBars = getViewSite().getActionBars(); fClearOutputAction = new ClearConsoleAction(this); - fCopyAction = new BuildConsoleAction(bundle, "Editor.Copy.", fTextViewer, fTextViewer.COPY); - fSelectAllAction = new BuildConsoleAction(bundle, "Editor.SelectAll.", fTextViewer, fTextViewer.SELECT_ALL); + fCopyAction = new BuildConsoleAction(bundle, "Editor.Copy.", fTextViewer, ITextOperationTarget.COPY); + fSelectAllAction = new BuildConsoleAction(bundle, "Editor.SelectAll.", fTextViewer, ITextOperationTarget.SELECT_ALL); actionBars.setGlobalActionHandler(ITextEditorActionConstants.COPY, fCopyAction); actionBars.setGlobalActionHandler(ITextEditorActionConstants.SELECT_ALL, fSelectAllAction); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/FilterSelectionAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/FilterSelectionAction.java index 894938da409..7a14c3b37cf 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/FilterSelectionAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/FilterSelectionAction.java @@ -9,6 +9,7 @@ import java.io.StringWriter; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.window.Window; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.actions.SelectionProviderAction; import org.eclipse.ui.dialogs.ListSelectionDialog; @@ -56,7 +57,7 @@ class FilterSelectionAction extends SelectionProviderAction { dialog.setInitialSelections(contentProvider.getInitialSelections()); dialog.open(); - if (dialog.getReturnCode() == dialog.OK) { + if (dialog.getReturnCode() == Window.OK) { Object[] results= dialog.getResult(); String[] selectedPatterns= new String[results.length]; System.arraycopy(results, 0, selectedPatterns, 0, results.length); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/ShowLibrariesAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/ShowLibrariesAction.java index d511c7ae09f..30b115c3d20 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/ShowLibrariesAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/ShowLibrariesAction.java @@ -56,7 +56,7 @@ class ShowLibrariesAction extends SelectionProviderAction { CUIPlugin plugin = CUIPlugin.getDefault(); Boolean b = new Boolean (cview.getLibraryFilter().getShowLibraries()); - plugin.getPreferenceStore().putValue(cview.TAG_SHOWLIBRARIES, b.toString()); + plugin.getPreferenceStore().putValue(CView.TAG_SHOWLIBRARIES, b.toString()); } private void updateToolTipText() { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/AbstractElementListSelectionDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/AbstractElementListSelectionDialog.java index 350f796cb19..bf7a17a9866 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/AbstractElementListSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/AbstractElementListSelectionDialog.java @@ -86,8 +86,8 @@ public abstract class AbstractElementListSelectionDialog extends SelectionStatus spec.heightHint= initialSize.y; spec.grabExcessVerticalSpace= true; spec.grabExcessHorizontalSpace= true; - spec.horizontalAlignment= spec.FILL; - spec.verticalAlignment= spec.FILL; + spec.horizontalAlignment= GridData.FILL; + spec.verticalAlignment= GridData.FILL; fSelectionList.setLayoutData(spec); return contents; @@ -101,8 +101,8 @@ public abstract class AbstractElementListSelectionDialog extends SelectionStatus GridData spec= new GridData(); spec.grabExcessVerticalSpace= false; spec.grabExcessHorizontalSpace= true; - spec.horizontalAlignment= spec.FILL; - spec.verticalAlignment= spec.BEGINNING; + spec.horizontalAlignment= GridData.FILL; + spec.verticalAlignment= GridData.BEGINNING; text.setLayoutData(spec); return text; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/SelectionList.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/SelectionList.java index bac3a7cc6f6..b1318f67f99 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/SelectionList.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/SelectionList.java @@ -69,8 +69,8 @@ public class SelectionList extends Composite { GridData spec= new GridData(); spec.grabExcessVerticalSpace= false; spec.grabExcessHorizontalSpace= true; - spec.horizontalAlignment= spec.FILL; - spec.verticalAlignment= spec.BEGINNING; + spec.horizontalAlignment= GridData.FILL; + spec.verticalAlignment= GridData.BEGINNING; fText.setLayoutData(spec); Listener l= new Listener() { public void handleEvent(Event evt) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/BracketPainter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/BracketPainter.java index dfaf069ca2f..5884a836ad5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/BracketPainter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/BracketPainter.java @@ -88,7 +88,7 @@ public final class BracketPainter implements IPainter, PaintListener { if (region.getOffset() <= offset && region.getOffset() + region.getLength() >= offset + length) { offset -= region.getOffset(); - if (fMatcher.RIGHT == fAnchor) + if (CPairMatcher.RIGHT == fAnchor) draw(gc, offset, 1); else draw(gc, offset + length -1, 1); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java index 6d153de199f..8272487baf6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java @@ -18,6 +18,7 @@ import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.util.ListenerList; +import org.eclipse.jface.viewers.AbstractTreeViewer; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; @@ -133,7 +134,7 @@ public class CContentOutlinePage extends Page implements IContentOutlinePage, IS //treeViewer.setContentProvider(new CModelContentProvider()); treeViewer.setContentProvider(new CContentProvider(true, true)); treeViewer.setLabelProvider(new StandardCElementLabelProvider()); - treeViewer.setAutoExpandLevel(treeViewer.ALL_LEVELS); + treeViewer.setAutoExpandLevel(AbstractTreeViewer.ALL_LEVELS); treeViewer.addSelectionChangedListener(this); CUIPlugin.getDefault().getProblemMarkerManager().addListener(treeViewer); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java index 81184e43dde..8936db3cdd4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java @@ -22,6 +22,7 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.window.Window; import org.eclipse.ui.IEditorDescriptor; import org.eclipse.ui.IEditorRegistry; @@ -147,7 +148,7 @@ public class OpenIncludeAction extends Action { dialog.setMessage(CUIPlugin.getResourceString(DIALOG_MESSAGE)); dialog.setElements(filesFound); - if (dialog.open() == dialog.OK) { + if (dialog.open() == Window.OK) { return (IFile) dialog.getSelectedElement(); } return null; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenOnSelectionAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenOnSelectionAction.java index e78026e894b..a07371debe9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenOnSelectionAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenOnSelectionAction.java @@ -30,6 +30,7 @@ import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.ITextSelection; import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.window.Window; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.PartInitException; @@ -254,7 +255,7 @@ public class OpenOnSelectionAction extends Action { dialog.setMessage(message); dialog.setElements(elements); - if (dialog.open() == dialog.OK) { + if (dialog.open() == Window.OK) { Object[] selection= dialog.getResult(); if (selection != null && selection.length > 0) { nResults= selection.length; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java index f1d892d6da7..7bb51aa585e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java @@ -110,8 +110,8 @@ public class EditTemplateDialog extends StatusDialog { //assistant.enableAutoInsert(store.getBoolean(ContentAssistPreference.AUTOINSERT)); assistant.enableAutoActivation(store.getBoolean(ContentAssistPreference.AUTOACTIVATION)); assistant.setAutoActivationDelay(store.getInt(ContentAssistPreference.AUTOACTIVATION_DELAY)); - assistant.setProposalPopupOrientation(assistant.PROPOSAL_OVERLAY); - assistant.setContextInformationPopupOrientation(assistant.CONTEXT_INFO_ABOVE); + assistant.setProposalPopupOrientation(IContentAssistant.PROPOSAL_OVERLAY); + assistant.setContextInformationPopupOrientation(IContentAssistant.CONTEXT_INFO_ABOVE); //assistant.setInformationControlCreator(getInformationControlCreator(sourceViewer)); Display display= sourceViewer.getTextWidget().getDisplay(); @@ -421,27 +421,27 @@ public class EditTemplateDialog extends StatusDialog { } private void initializeActions() { - TextViewerAction action= new TextViewerAction(fPatternEditor, fPatternEditor.UNDO); + TextViewerAction action= new TextViewerAction(fPatternEditor, ITextOperationTarget.UNDO); action.setText(TemplateMessages.getString("EditTemplateDialog.undo")); //$NON-NLS-1$ fGlobalActions.put(ITextEditorActionConstants.UNDO, action); - action= new TextViewerAction(fPatternEditor, fPatternEditor.CUT); + action= new TextViewerAction(fPatternEditor, ITextOperationTarget.CUT); action.setText(TemplateMessages.getString("EditTemplateDialog.cut")); //$NON-NLS-1$ fGlobalActions.put(ITextEditorActionConstants.CUT, action); - action= new TextViewerAction(fPatternEditor, fPatternEditor.COPY); + action= new TextViewerAction(fPatternEditor, ITextOperationTarget.COPY); action.setText(TemplateMessages.getString("EditTemplateDialog.copy")); //$NON-NLS-1$ fGlobalActions.put(ITextEditorActionConstants.COPY, action); - action= new TextViewerAction(fPatternEditor, fPatternEditor.PASTE); + action= new TextViewerAction(fPatternEditor, ITextOperationTarget.PASTE); action.setText(TemplateMessages.getString("EditTemplateDialog.paste")); //$NON-NLS-1$ fGlobalActions.put(ITextEditorActionConstants.PASTE, action); - action= new TextViewerAction(fPatternEditor, fPatternEditor.SELECT_ALL); + action= new TextViewerAction(fPatternEditor, ITextOperationTarget.SELECT_ALL); action.setText(TemplateMessages.getString("EditTemplateDialog.select.all")); //$NON-NLS-1$ fGlobalActions.put(ITextEditorActionConstants.SELECT_ALL, action); - action= new TextViewerAction(fPatternEditor, fPatternEditor.CONTENTASSIST_PROPOSALS); + action= new TextViewerAction(fPatternEditor, ISourceViewer.CONTENTASSIST_PROPOSALS); action.setText(TemplateMessages.getString("EditTemplateDialog.content.assist")); //$NON-NLS-1$ fGlobalActions.put("ContentAssistProposal", action); //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CPairMatcher.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CPairMatcher.java index e8c8e26fcf1..dc1a057cc5f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CPairMatcher.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CPairMatcher.java @@ -154,7 +154,7 @@ public class CPairMatcher { int stack= 1; int c= fReader.read(); - while (c != fReader.EOF) { + while (c != CCodeReader.EOF) { if (c == openingPeer && c != closingPeer) stack++; else if (c == closingPeer) @@ -175,7 +175,7 @@ public class CPairMatcher { int stack= 1; int c= fReader.read(); - while (c != fReader.EOF) { + while (c != CCodeReader.EOF) { if (c == closingPeer && c != openingPeer) stack++; else if (c == openingPeer) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java index 41442d28b30..ba6e15b32ac 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java @@ -172,7 +172,7 @@ public class CSourceViewerConfiguration extends SourceViewerConfiguration { assistant.setContentAssistProcessor(new CCompletionProcessor(fEditor), IDocument.DEFAULT_CONTENT_TYPE); assistant.enableAutoActivation(true); assistant.setAutoActivationDelay(500); - assistant.setProposalPopupOrientation(assistant.PROPOSAL_OVERLAY); + assistant.setProposalPopupOrientation(IContentAssistant.PROPOSAL_OVERLAY); return assistant; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/DialogField.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/DialogField.java index 813c77a81b5..15f44225f15 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/DialogField.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/DialogField.java @@ -33,7 +33,7 @@ public class DialogField { public static Control createEmptySpace(Composite parent, int span) { Label label= new Label(parent, SWT.LEFT); MGridData gd= new MGridData(); - gd.horizontalAlignment= gd.BEGINNING; + gd.horizontalAlignment= MGridData.BEGINNING; gd.grabExcessHorizontalSpace= false; gd.horizontalSpan= span; gd.horizontalIndent= 0; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/StringButtonDialogField.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/StringButtonDialogField.java index 16e02e7746a..5c8c18edcd1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/StringButtonDialogField.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/StringButtonDialogField.java @@ -77,7 +77,7 @@ public class StringButtonDialogField extends StringDialogField { } protected static MGridData gridDataForControl(int span) { MGridData gd= new MGridData(); - gd.horizontalAlignment= gd.FILL; + gd.horizontalAlignment= MGridData.FILL; gd.grabExcessHorizontalSpace= false; gd.horizontalSpan= span; return gd; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/swt/MGridLayout.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/swt/MGridLayout.java index e75d34d4be1..f7db96fd995 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/swt/MGridLayout.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/swt/MGridLayout.java @@ -634,14 +634,14 @@ public final class MGridLayout extends Layout { widgetX= columnX; // Calculate the x and width values for the widget. - if (hAlign == spec.CENTER) { + if (hAlign == MGridData.CENTER) { widgetX= widgetX + (spannedWidth / 2) - (childExtent.x / 2); - } else if (hAlign == spec.END) { + } else if (hAlign == MGridData.END) { widgetX= widgetX + spannedWidth - childExtent.x - spec.horizontalIndent; } else { widgetX= widgetX + spec.horizontalIndent; } - if (hAlign == spec.FILL) { + if (hAlign == MGridData.FILL) { widgetW= spannedWidth - spec.horizontalIndent; widgetX= columnX + spec.horizontalIndent; } else { @@ -651,14 +651,14 @@ public final class MGridLayout extends Layout { // Calculate the y and height values for the widget. vAlign= spec.verticalAlignment; widgetY= rowY; - if (vAlign == spec.CENTER) { + if (vAlign == MGridData.CENTER) { widgetY= widgetY + (spannedHeight / 2) - (childExtent.y / 2); - } else if (vAlign == spec.END) { + } else if (vAlign == MGridData.END) { widgetY= widgetY + spannedHeight - childExtent.y; } else { widgetY= widgetY; } - if (vAlign == spec.FILL) { + if (vAlign == MGridData.FILL) { widgetH= spannedHeight; widgetY= rowY; } else {