[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[cdt-patch] removing warnings.
|
Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/ChangeLog,v
retrieving revision 1.53
diff -u -r1.53 ChangeLog
--- ChangeLog 24 Jan 2003 20:40:15 -0000 1.53
+++ ChangeLog 29 Jan 2003 18:17:25 -0000
@@ -1,3 +1,24 @@
+2003-01-28 Alain Magloire
+
+ With the help of the 2.1 compiler, fix the warnings when accessiong static
+ fields.
+
+ * src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleView.java:
+ * src/org/eclipse/cdt/internal/ui/cview/FilerSelectionAction.java:
+ * src/org/eclipse/cdt/internal/ui/cview/ShowLibrariesAction.java:
+ * src/org/eclipse/cdt/internal/ui/dialogs/AbstractElementListSelection.java:
+ * src/org/eclipse/cdt/internal/ui/dialogs/SelectionList.java:
+ * src/org/eclipse/cdt/internal/ui/editor/BracketPainter.java:
+ * src/org/eclipse/cdt/internal/ui/editor/ContentOulinerPager.java:
+ * src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java:
+ * src/org/eclipse/cdt/internal/ui/editor/OpenOnSelectionAction.java:
+ * src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java:
+ * src/org/eclipse/cdt/internal/ui/text/CPaintMatcher.java:
+ * src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java:
+ * src/org/eclipse/cdt/internal/ui/wizards/dialogfields/DialogField.java:
+ * src/org/eclipse/cdt/internal/ui/wizards/dialogfields/StringButtonDialogField.java:
+ * src/org/eclipse/cdt/internal/ui/wizards/swt/MGridLayout.java:
+
2003-01-24 Alain Magloire
* src/org/eclipse/cdt/ui/wizards/SettingsBlock.java (doRung):
Index: src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleView.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleView.java,v
retrieving revision 1.4
diff -u -r1.4 BuildConsoleView.java
--- src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleView.java 27 Nov 2002 19:54:40 -0000 1.4
+++ src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleView.java 29 Jan 2003 18:17:25 -0000
@@ -25,6 +25,7 @@
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 @@
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);
Index: src/org/eclipse/cdt/internal/ui/cview/FilterSelectionAction.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/FilterSelectionAction.java,v
retrieving revision 1.2
diff -u -r1.2 FilterSelectionAction.java
--- src/org/eclipse/cdt/internal/ui/cview/FilterSelectionAction.java 29 Oct 2002 21:40:58 -0000 1.2
+++ src/org/eclipse/cdt/internal/ui/cview/FilterSelectionAction.java 29 Jan 2003 18:17:26 -0000
@@ -9,6 +9,7 @@
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 @@
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);
Index: src/org/eclipse/cdt/internal/ui/cview/ShowLibrariesAction.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/ShowLibrariesAction.java,v
retrieving revision 1.2
diff -u -r1.2 ShowLibrariesAction.java
--- src/org/eclipse/cdt/internal/ui/cview/ShowLibrariesAction.java 29 Oct 2002 21:40:58 -0000 1.2
+++ src/org/eclipse/cdt/internal/ui/cview/ShowLibrariesAction.java 29 Jan 2003 18:17:25 -0000
@@ -56,7 +56,7 @@
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() {
Index: src/org/eclipse/cdt/internal/ui/dialogs/AbstractElementListSelectionDialog.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/AbstractElementListSelectionDialog.java,v
retrieving revision 1.2
diff -u -r1.2 AbstractElementListSelectionDialog.java
--- src/org/eclipse/cdt/internal/ui/dialogs/AbstractElementListSelectionDialog.java 16 Oct 2002 20:13:29 -0000 1.2
+++ src/org/eclipse/cdt/internal/ui/dialogs/AbstractElementListSelectionDialog.java 29 Jan 2003 18:17:25 -0000
@@ -86,8 +86,8 @@
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 @@
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;
}
Index: src/org/eclipse/cdt/internal/ui/dialogs/SelectionList.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/SelectionList.java,v
retrieving revision 1.2
diff -u -r1.2 SelectionList.java
--- src/org/eclipse/cdt/internal/ui/dialogs/SelectionList.java 16 Oct 2002 20:13:29 -0000 1.2
+++ src/org/eclipse/cdt/internal/ui/dialogs/SelectionList.java 29 Jan 2003 18:17:25 -0000
@@ -69,8 +69,8 @@
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) {
Index: src/org/eclipse/cdt/internal/ui/editor/BracketPainter.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/BracketPainter.java,v
retrieving revision 1.1
diff -u -r1.1 BracketPainter.java
--- src/org/eclipse/cdt/internal/ui/editor/BracketPainter.java 26 Jun 2002 20:55:44 -0000 1.1
+++ src/org/eclipse/cdt/internal/ui/editor/BracketPainter.java 29 Jan 2003 18:17:25 -0000
@@ -88,7 +88,7 @@
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);
Index: src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java,v
retrieving revision 1.3
diff -u -r1.3 CContentOutlinePage.java
--- src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java 29 Oct 2002 21:40:58 -0000 1.3
+++ src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java 29 Jan 2003 18:17:25 -0000
@@ -18,6 +18,7 @@
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 @@
//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);
Index: src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java,v
retrieving revision 1.3
diff -u -r1.3 OpenIncludeAction.java
--- src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java 29 Oct 2002 21:40:58 -0000 1.3
+++ src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java 29 Jan 2003 18:17:25 -0000
@@ -22,6 +22,7 @@
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 @@
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;
Index: src/org/eclipse/cdt/internal/ui/editor/OpenOnSelectionAction.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenOnSelectionAction.java,v
retrieving revision 1.3
diff -u -r1.3 OpenOnSelectionAction.java
--- src/org/eclipse/cdt/internal/ui/editor/OpenOnSelectionAction.java 1 Dec 2002 19:11:36 -0000 1.3
+++ src/org/eclipse/cdt/internal/ui/editor/OpenOnSelectionAction.java 29 Jan 2003 18:17:25 -0000
@@ -30,6 +30,7 @@
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 @@
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;
Index: src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java,v
retrieving revision 1.4
diff -u -r1.4 EditTemplateDialog.java
--- src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java 29 Oct 2002 21:40:58 -0000 1.4
+++ src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java 29 Jan 2003 18:17:26 -0000
@@ -110,8 +110,8 @@
//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 @@
}
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$
Index: src/org/eclipse/cdt/internal/ui/text/CPairMatcher.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CPairMatcher.java,v
retrieving revision 1.1
diff -u -r1.1 CPairMatcher.java
--- src/org/eclipse/cdt/internal/ui/text/CPairMatcher.java 26 Jun 2002 20:55:44 -0000 1.1
+++ src/org/eclipse/cdt/internal/ui/text/CPairMatcher.java 29 Jan 2003 18:17:26 -0000
@@ -154,7 +154,7 @@
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 @@
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)
Index: src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java,v
retrieving revision 1.9
diff -u -r1.9 CSourceViewerConfiguration.java
--- src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java 6 Dec 2002 14:50:50 -0000 1.9
+++ src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java 29 Jan 2003 18:17:26 -0000
@@ -172,7 +172,7 @@
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;
}
Index: src/org/eclipse/cdt/internal/ui/wizards/dialogfields/DialogField.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/DialogField.java,v
retrieving revision 1.1
diff -u -r1.1 DialogField.java
--- src/org/eclipse/cdt/internal/ui/wizards/dialogfields/DialogField.java 26 Jun 2002 20:55:44 -0000 1.1
+++ src/org/eclipse/cdt/internal/ui/wizards/dialogfields/DialogField.java 29 Jan 2003 18:17:25 -0000
@@ -33,7 +33,7 @@
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;
Index: src/org/eclipse/cdt/internal/ui/wizards/dialogfields/StringButtonDialogField.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/StringButtonDialogField.java,v
retrieving revision 1.1
diff -u -r1.1 StringButtonDialogField.java
--- src/org/eclipse/cdt/internal/ui/wizards/dialogfields/StringButtonDialogField.java 26 Jun 2002 20:55:44 -0000 1.1
+++ src/org/eclipse/cdt/internal/ui/wizards/dialogfields/StringButtonDialogField.java 29 Jan 2003 18:17:25 -0000
@@ -77,7 +77,7 @@
}
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;
Index: src/org/eclipse/cdt/internal/ui/wizards/swt/MGridLayout.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/swt/MGridLayout.java,v
retrieving revision 1.1
diff -u -r1.1 MGridLayout.java
--- src/org/eclipse/cdt/internal/ui/wizards/swt/MGridLayout.java 26 Jun 2002 20:55:44 -0000 1.1
+++ src/org/eclipse/cdt/internal/ui/wizards/swt/MGridLayout.java 29 Jan 2003 18:17:25 -0000
@@ -634,14 +634,14 @@
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 @@
// 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 {
