[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[cdt-patch] Cleanup cdt.ui of warnings.
|
By boosting the compiler warning levels to see unused imports etc ..
================================================
Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/ChangeLog,v
retrieving revision 1.4
diff -u -r1.4 ChangeLog
--- ChangeLog 16 Oct 2002 14:39:27 -0000 1.4
+++ ChangeLog 16 Oct 2002 20:12:13 -0000
@@ -1,4 +1,51 @@
2002-10-16 Alain Magloire
+ By Boosting the level warning of the java compiler,
+ we catch unused imports or variables. For example
+ by changing the scope, the compiler no longer has
+ to provide synthetic methos.
+
+ * src/../internal/corext/textmanipulation/MoveTextEdit.java:
+ * src/org/eclipse/cdt/internal/corext/textmanipulation/TextBufferFactory.java :
+ * src/../internal/corext/textmanipulation/TextEditNode.java:
+ * src/../internal/ui/BuildConsoleView.java:
+ * src/../internal/ui/CContentProvider.java:
+ * src/../internal/ui/CPlugin.java:
+ * src/../internal/ui/cview/CView.java:
+ * src/../internal/ui/dialogs/AbstractElementListSelectionDialog.java:
+ * src/../internal/ui/dialogs/MessageLine.java:
+ * src/../internal/ui/dialogs/SelectionList.java:
+ * src/../internal/ui/editor/CContentOutlinePage.java:
+ * src/../internal/ui/editor/CDocumentProvider.java:
+ * src/../internal/ui/editor/CEditorActionContributor.java:
+ * src/../internal/ui/editor/CEditorErrorTickUpdater.java
+ * src/../internal/ui/editor/OverviewRuler.java:
+ * src/../internal/ui/editor/PaintManager.java:
+ * src/../internal/ui/editor/ProblemPainter.java:
+ * src/../internal/ui/editor/asm/AsmCodeScanner.java:
+ * src/../internal/ui/editor/asm/AsmSourceViewerConfiguration.java:
+ * src/../internal/ui/editor/asm/AsmTextEditor.java:
+ * src/../internal/ui/editor/asm/AsmTextTools.java:
+ * src/../internal/ui/makeview/MakeView.java:
+ * src/../internal/ui/preferences/CEditorPreferencePage.java:
+ * src/../internal/ui/preferences/CLaunchingPropertyPage.java:
+ * src/../internal/ui/preferences/CPluginPreferencePage.java:
+ * src/../internal/ui/preferences/CProjectPropertyPage.java:
+ * src/../internal/ui/preferences/ColorEditor.java:
+ * src/../internal/ui/preferences/EditTemplateDialog.java:
+ * src/../internal/ui/preferences/OverlayPreferenceStore.java:
+ * src/../internal/ui/preferences/TemplatePreferencePage.java:
+ * src/../internal/ui/text/CCodeScanner.java:
+ * src/../internal/ui/text/CSourceViewerConfiguration.java:
+ * src/../internal/ui/text/util/CColorManager.java:
+ * src/../internal/ui/util/ProblemTreeViewer.java:
+ * src/../internal/ui/wizards/dialogfields/StringDialogField.java:
+ * src/../ui/wizards/CProjectWizardPage.java:
+ * src/../ui/wizards/SettingsBlock.java:
+ * src/../ui/wizards/conversion/ConvertProjectWizardPage.java:
+ * utils.ui/../utils/ui/controls/RadioButtonsArea.java:
+ Remove unused imports and change the scope when necessary.
+
+2002-10-16 Alain Magloire
By Boosting the level warning of the java compiler,
we catch unused imports or variables.
Index: src/org/eclipse/cdt/internal/corext/textmanipulation/MoveTextEdit.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/textmanipulation/MoveTextEdit.java,v
retrieving revision 1.1
diff -u -r1.1 MoveTextEdit.java
--- src/org/eclipse/cdt/internal/corext/textmanipulation/MoveTextEdit.java 26 Jun 2002 20:55:44 -0000 1.1
+++ src/org/eclipse/cdt/internal/corext/textmanipulation/MoveTextEdit.java 16 Oct 2002 20:12:15 -0000
@@ -114,7 +114,7 @@
//---- Helper method ---------------------------------------------------------------------------------
- private void internalPerform(TextBuffer buffer) throws CoreException {
+ protected void internalPerform(TextBuffer buffer) throws CoreException {
Assert.isTrue(fPerformCounter < 2);
if (++fPerformCounter == 2) {
TextRange source= getSourceRange();
Index: src/org/eclipse/cdt/internal/corext/textmanipulation/TextBufferFactory.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/textmanipulation/TextBufferFactory.java,v
retrieving revision 1.1
diff -u -r1.1 TextBufferFactory.java
--- src/org/eclipse/cdt/internal/corext/textmanipulation/TextBufferFactory.java 26 Jun 2002 20:55:44 -0000 1.1
+++ src/org/eclipse/cdt/internal/corext/textmanipulation/TextBufferFactory.java 16 Oct 2002 20:12:15 -0000
@@ -32,7 +32,7 @@
/* package */ class TextBufferFactory {
- private IDocumentProvider fDocumentProvider;
+ protected IDocumentProvider fDocumentProvider;
private Map fFileValueMap;
private Map fBufferValueMap;
Index: src/org/eclipse/cdt/internal/corext/textmanipulation/TextEditNode.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/textmanipulation/TextEditNode.java,v
retrieving revision 1.1
diff -u -r1.1 TextEditNode.java
--- src/org/eclipse/cdt/internal/corext/textmanipulation/TextEditNode.java 26 Jun 2002 20:55:44 -0000 1.1
+++ src/org/eclipse/cdt/internal/corext/textmanipulation/TextEditNode.java 16 Oct 2002 20:12:14 -0000
@@ -311,7 +311,7 @@
return new RootNode(length);
}
- private TextEditNode(TextEdit edit) {
+ protected TextEditNode(TextEdit edit) {
fEdit= edit;
}
Index: src/org/eclipse/cdt/internal/ui/BuildConsoleView.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BuildConsoleView.java,v
retrieving revision 1.3
diff -u -r1.3 BuildConsoleView.java
--- src/org/eclipse/cdt/internal/ui/BuildConsoleView.java 16 Oct 2002 14:39:18 -0000 1.3
+++ src/org/eclipse/cdt/internal/ui/BuildConsoleView.java 16 Oct 2002 20:12:13 -0000
@@ -40,7 +40,7 @@
public class BuildConsoleView extends ViewPart {
- private TextViewer fTextViewer;
+ protected TextViewer fTextViewer;
private ClearConsoleAction fClearOutputAction;
private TextEditorAction fCopyAction;
private TextEditorAction fSelectAllAction;
@@ -99,7 +99,7 @@
WorkbenchHelp.setHelp(fTextViewer.getControl(), ICHelpContextIds.CLEAR_CONSOLE_VIEW);
}
- private void initializeWidgetFont(StyledText styledText) {
+ protected void initializeWidgetFont(StyledText styledText) {
IPreferenceStore store= CPlugin.getDefault().getPreferenceStore();
String prefKey= CPluginPreferencePage.PREF_CONSOLE_FONT;
FontData data= null;
Index: src/org/eclipse/cdt/internal/ui/CContentProvider.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CContentProvider.java,v
retrieving revision 1.1
diff -u -r1.1 CContentProvider.java
--- src/org/eclipse/cdt/internal/ui/CContentProvider.java 26 Jun 2002 20:55:44 -0000 1.1
+++ src/org/eclipse/cdt/internal/ui/CContentProvider.java 16 Oct 2002 20:12:13 -0000
@@ -165,7 +165,7 @@
});
}
- private boolean updateContainer(ICProject cproject) {
+ protected boolean updateContainer(ICProject cproject) {
IParent binContainer = cproject.getBinaryContainer();
IParent libContainer = cproject.getArchiveContainer();
if (binContainer != null) {
Index: src/org/eclipse/cdt/internal/ui/CPlugin.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPlugin.java,v
retrieving revision 1.6
diff -u -r1.6 CPlugin.java
--- src/org/eclipse/cdt/internal/ui/CPlugin.java 15 Aug 2002 20:39:37 -0000 1.6
+++ src/org/eclipse/cdt/internal/ui/CPlugin.java 16 Oct 2002 20:12:13 -0000
@@ -137,7 +137,7 @@
private ProblemMarkerManager fProblemMarkerManager;
static class ConsoleDocument extends ConsoleOutputStream implements IConsole {
- private IDocument fDocument;
+ protected IDocument fDocument;
public ConsoleDocument() {
fDocument = new Document();
Index: src/org/eclipse/cdt/internal/ui/cview/CView.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java,v
retrieving revision 1.3
diff -u -r1.3 CView.java
--- src/org/eclipse/cdt/internal/ui/cview/CView.java 26 Aug 2002 22:11:42 -0000 1.3
+++ src/org/eclipse/cdt/internal/ui/cview/CView.java 16 Oct 2002 20:12:14 -0000
@@ -228,7 +228,7 @@
* Handles double clicks in viewer.
* Opens editor if file double-clicked.
*/
- private void handleDoubleClick(DoubleClickEvent event) {
+ protected void handleDoubleClick(DoubleClickEvent event) {
IStructuredSelection s = (IStructuredSelection)event.getSelection();
//Object element = s.getFirstElement();
IAdaptable element = (IAdaptable)s.getFirstElement();
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.1
diff -u -r1.1 AbstractElementListSelectionDialog.java
--- src/org/eclipse/cdt/internal/ui/dialogs/AbstractElementListSelectionDialog.java 26 Jun 2002 20:55:44 -0000 1.1
+++ src/org/eclipse/cdt/internal/ui/dialogs/AbstractElementListSelectionDialog.java 16 Oct 2002 20:12:13 -0000
@@ -44,7 +44,7 @@
/*
* @private
*/
- private void access$superOpen() {
+ protected void access$superOpen() {
super.open();
}
/*
Index: src/org/eclipse/cdt/internal/ui/dialogs/MessageLine.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/MessageLine.java,v
retrieving revision 1.1
diff -u -r1.1 MessageLine.java
--- src/org/eclipse/cdt/internal/ui/dialogs/MessageLine.java 26 Jun 2002 20:55:44 -0000 1.1
+++ src/org/eclipse/cdt/internal/ui/dialogs/MessageLine.java 16 Oct 2002 20:12:13 -0000
@@ -25,7 +25,7 @@
private Color fDefaultColor;
private RGB fErrorRGB;
- private Color fErrorColor;
+ protected Color fErrorColor;
private static RGB fgErrorRGB= new RGB(200, 0, 0);
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.1
diff -u -r1.1 SelectionList.java
--- src/org/eclipse/cdt/internal/ui/dialogs/SelectionList.java 26 Jun 2002 20:55:44 -0000 1.1
+++ src/org/eclipse/cdt/internal/ui/dialogs/SelectionList.java 16 Oct 2002 20:12:13 -0000
@@ -37,7 +37,7 @@
// State
private Object[] fElements;
- private ILabelProvider fRenderer;
+ protected ILabelProvider fRenderer;
private boolean fIgnoreCase;
// Implementation details
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.1
diff -u -r1.1 CContentOutlinePage.java
--- src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java 26 Jun 2002 20:55:44 -0000 1.1
+++ src/org/eclipse/cdt/internal/ui/editor/CContentOutlinePage.java 16 Oct 2002 20:12:13 -0000
@@ -96,7 +96,7 @@
}
}
- private ISelection updateSelection(ISelection sel) {
+ protected ISelection updateSelection(ISelection sel) {
ArrayList newSelection= new ArrayList();
if (sel instanceof IStructuredSelection) {
Iterator iter= ((IStructuredSelection)sel).iterator();
@@ -114,7 +114,7 @@
/**
* called to create the context menu of the outline
*/
- private void contextMenuAboutToShow(IMenuManager menu) {
+ protected void contextMenuAboutToShow(IMenuManager menu) {
if (OpenIncludeAction.canActionBeAdded(getSelection())) {
menu.add(fOpenIncludeAction);
}
Index: src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java,v
retrieving revision 1.5
diff -u -r1.5 CDocumentProvider.java
--- src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java 24 Sep 2002 19:59:20 -0000 1.5
+++ src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java 16 Oct 2002 20:12:13 -0000
@@ -5,11 +5,9 @@
* All Rights Reserved.
*/
-import org.eclipse.core.resources.IResource;
+import org.eclipse.cdt.internal.ui.CPlugin;
import org.eclipse.core.resources.IStorage;
import org.eclipse.core.runtime.CoreException;
-
-
import org.eclipse.jface.text.AbstractDocument;
import org.eclipse.jface.text.DefaultLineTracker;
import org.eclipse.jface.text.GapTextStore;
@@ -18,13 +16,9 @@
import org.eclipse.jface.text.IDocumentListener;
import org.eclipse.jface.text.IDocumentPartitioner;
import org.eclipse.jface.text.source.IAnnotationModel;
-
-
import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.IStorageEditorInput;
import org.eclipse.ui.editors.text.FileDocumentProvider;
-
-import org.eclipse.cdt.internal.ui.CPlugin;
public class CDocumentProvider extends FileDocumentProvider {
Index: src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java,v
retrieving revision 1.2
diff -u -r1.2 CEditorActionContributor.java
--- src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java 9 Aug 2002 21:08:22 -0000 1.2
+++ src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java 16 Oct 2002 20:12:13 -0000
@@ -5,11 +5,11 @@
* All Rights Reserved.
*/
-import java.util.HashMap;
-import java.util.Map;
import java.util.ResourceBundle;
-import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.cdt.internal.ui.CPlugin;
+import org.eclipse.cdt.internal.ui.CPluginImages;
+import org.eclipse.cdt.internal.ui.IContextMenuConstants;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.IStatusLineManager;
import org.eclipse.jface.action.IToolBarManager;
@@ -21,16 +21,10 @@
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IWorkbenchActionConstants;
import org.eclipse.ui.texteditor.BasicTextEditorActionContributor;
-import org.eclipse.ui.texteditor.IStatusField;
import org.eclipse.ui.texteditor.ITextEditor;
import org.eclipse.ui.texteditor.RetargetTextEditorAction;
-import org.eclipse.ui.texteditor.StatusLineContributionItem;
import org.eclipse.ui.texteditor.TextEditorAction;
import org.eclipse.ui.texteditor.TextOperationAction;
-
-import org.eclipse.cdt.internal.ui.CPlugin;
-import org.eclipse.cdt.internal.ui.CPluginImages;
-import org.eclipse.cdt.internal.ui.IContextMenuConstants;
public class CEditorActionContributor extends BasicTextEditorActionContributor {
Index: src/org/eclipse/cdt/internal/ui/editor/CEditorErrorTickUpdater.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorErrorTickUpdater.java,v
retrieving revision 1.1
diff -u -r1.1 CEditorErrorTickUpdater.java
--- src/org/eclipse/cdt/internal/ui/editor/CEditorErrorTickUpdater.java 26 Jun 2002 20:55:44 -0000 1.1
+++ src/org/eclipse/cdt/internal/ui/editor/CEditorErrorTickUpdater.java 16 Oct 2002 20:12:13 -0000
@@ -24,7 +24,7 @@
*/
public class CEditorErrorTickUpdater implements IAnnotationModelListener {
- private CEditor fCEditor;
+ protected CEditor fCEditor;
private IAnnotationModel fAnnotationModel;
private CElementLabelProvider fLabelProvider;
Index: src/org/eclipse/cdt/internal/ui/editor/OverviewRuler.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OverviewRuler.java,v
retrieving revision 1.1
diff -u -r1.1 OverviewRuler.java
--- src/org/eclipse/cdt/internal/ui/editor/OverviewRuler.java 9 Aug 2002 02:31:24 -0000 1.1
+++ src/org/eclipse/cdt/internal/ui/editor/OverviewRuler.java 16 Oct 2002 20:12:13 -0000
@@ -152,9 +152,9 @@
/** The model of the overview ruler */
- private IAnnotationModel fModel;
+ protected IAnnotationModel fModel;
/** The view to which this ruler is connected */
- private ITextViewer fTextViewer;
+ protected ITextViewer fTextViewer;
/** The ruler's canvas */
private Canvas fCanvas;
/** The drawable for double buffering */
@@ -186,7 +186,7 @@
return fWidth;
}
- private int getType(Annotation annotation) {
+ protected int getType(Annotation annotation) {
if (annotation instanceof IProblemAnnotation) {
IProblemAnnotation pa= (IProblemAnnotation) annotation;
//if (!pa.isRelevant())
@@ -259,7 +259,7 @@
/**
* Disposes the ruler's resources.
*/
- private void handleDispose() {
+ protected void handleDispose() {
if (fTextViewer != null) {
fTextViewer.removeTextListener(fInternalListener);
@@ -283,7 +283,7 @@
/**
* Double buffer drawing.
*/
- private void doubleBufferPaint(GC dest) {
+ protected void doubleBufferPaint(GC dest) {
Point size= fCanvas.getSize();
@@ -408,7 +408,7 @@
/**
* Redraws the overview ruler.
*/
- private void redraw() {
+ protected void redraw() {
if (fCanvas != null && !fCanvas.isDisposed()) {
GC gc= new GC(fCanvas);
doubleBufferPaint(gc);
@@ -472,7 +472,7 @@
return found;
}
- private void handleMouseDown(MouseEvent event) {
+ protected void handleMouseDown(MouseEvent event) {
if (fTextViewer != null) {
int[] lines= toLineNumbers(event.y);
Position p= getProblemPositionAt(lines);
@@ -484,7 +484,7 @@
}
}
- private void handleMouseMove(MouseEvent event) {
+ protected void handleMouseMove(MouseEvent event) {
if (fTextViewer != null) {
int[] lines= toLineNumbers(event.y);
Position p= getProblemPositionAt(lines);
Index: src/org/eclipse/cdt/internal/ui/editor/PaintManager.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/PaintManager.java,v
retrieving revision 1.1
diff -u -r1.1 PaintManager.java
--- src/org/eclipse/cdt/internal/ui/editor/PaintManager.java 26 Jun 2002 20:55:44 -0000 1.1
+++ src/org/eclipse/cdt/internal/ui/editor/PaintManager.java 16 Oct 2002 20:12:13 -0000
@@ -94,8 +94,8 @@
private List fPainters= new ArrayList(2);
private PositionManager fManager;
- private ISourceViewer fSourceViewer;
- private boolean fTextChanged= false;
+ protected ISourceViewer fSourceViewer;
+ protected boolean fTextChanged= false;
private boolean fAutoRepeat= false;
@@ -163,7 +163,7 @@
}
}
- private void paint(int reason) {
+ protected void paint(int reason) {
for (Iterator e = fPainters.iterator(); e.hasNext();)
((IPainter) e.next()).paint(reason);
}
Index: src/org/eclipse/cdt/internal/ui/editor/ProblemPainter.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ProblemPainter.java,v
retrieving revision 1.1
diff -u -r1.1 ProblemPainter.java
--- src/org/eclipse/cdt/internal/ui/editor/ProblemPainter.java 26 Jun 2002 20:55:44 -0000 1.1
+++ src/org/eclipse/cdt/internal/ui/editor/ProblemPainter.java 16 Oct 2002 20:12:13 -0000
@@ -37,7 +37,7 @@
private boolean fIsActive= false;
private boolean fIsPainting= false;
- private boolean fIsModelChanging= false;
+ protected boolean fIsModelChanging= false;
private Color fColor;
private ITextEditor fTextEditor;
@@ -58,7 +58,7 @@
return !fProblemPositions.isEmpty();
}
- private void enablePainting() {
+ protected void enablePainting() {
if (!fIsPainting && hasProblems()) {
fIsPainting= true;
fTextWidget.addPaintListener(this);
@@ -66,7 +66,7 @@
}
}
- private void disablePainting(boolean redraw) {
+ protected void disablePainting(boolean redraw) {
if (fIsPainting) {
fIsPainting= false;
fTextWidget.removePaintListener(this);
@@ -75,7 +75,7 @@
}
}
- private void setModel(IAnnotationModel model) {
+ protected void setModel(IAnnotationModel model) {
if (fModel != model) {
if (fModel != null)
Index: src/org/eclipse/cdt/internal/ui/editor/asm/AsmCodeScanner.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmCodeScanner.java,v
retrieving revision 1.3
diff -u -r1.3 AsmCodeScanner.java
--- src/org/eclipse/cdt/internal/ui/editor/asm/AsmCodeScanner.java 5 Sep 2002 15:03:44 -0000 1.3
+++ src/org/eclipse/cdt/internal/ui/editor/asm/AsmCodeScanner.java 16 Oct 2002 20:12:13 -0000
@@ -6,20 +6,18 @@
*/
+import java.util.ArrayList;
+import java.util.List;
+
import org.eclipse.cdt.internal.ui.text.AbstractCScanner;
import org.eclipse.cdt.internal.ui.text.ICColorConstants;
import org.eclipse.cdt.internal.ui.text.IColorManager;
import org.eclipse.cdt.internal.ui.text.util.CWhitespaceDetector;
-
-import java.util.ArrayList;
-import java.util.List;
-
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.rules.EndOfLineRule;
import org.eclipse.jface.text.rules.ICharacterScanner;
import org.eclipse.jface.text.rules.IRule;
import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.jface.text.rules.IWordDetector;
import org.eclipse.jface.text.rules.SingleLineRule;
import org.eclipse.jface.text.rules.Token;
import org.eclipse.jface.text.rules.WhitespaceRule;
Index: src/org/eclipse/cdt/internal/ui/editor/asm/AsmSourceViewerConfiguration.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmSourceViewerConfiguration.java,v
retrieving revision 1.4
diff -u -r1.4 AsmSourceViewerConfiguration.java
--- src/org/eclipse/cdt/internal/ui/editor/asm/AsmSourceViewerConfiguration.java 16 Oct 2002 14:38:54 -0000 1.4
+++ src/org/eclipse/cdt/internal/ui/editor/asm/AsmSourceViewerConfiguration.java 16 Oct 2002 20:12:13 -0000
@@ -5,7 +5,6 @@
* All Rights Reserved.
*/
-import org.eclipse.cdt.internal.ui.text.util.CColorManager;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.presentation.IPresentationReconciler;
import org.eclipse.jface.text.presentation.PresentationReconciler;
Index: src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextEditor.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextEditor.java,v
retrieving revision 1.3
diff -u -r1.3 AsmTextEditor.java
--- src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextEditor.java 16 Oct 2002 14:38:54 -0000 1.3
+++ src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextEditor.java 16 Oct 2002 20:12:13 -0000
@@ -5,40 +5,28 @@
* All Rights Reserved.
*/
-import org.eclipse.cdt.internal.ui.CPlugin;
-import org.eclipse.cdt.internal.ui.editor.CEditorMessages;
import java.lang.reflect.InvocationTargetException;
import java.text.MessageFormat;
-
-import org.eclipse.swt.widgets.Shell;
-
-
+import org.eclipse.cdt.internal.ui.CPlugin;
+import org.eclipse.cdt.internal.ui.editor.CEditorMessages;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
-
-
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.util.PropertyChangeEvent;
-
-
+import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.actions.WorkspaceModifyOperation;
import org.eclipse.ui.dialogs.SaveAsDialog;
import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.texteditor.AbstractTextEditor;
-import org.eclipse.ui.texteditor.ConvertLineDelimitersAction;
import org.eclipse.ui.texteditor.DefaultRangeIndicator;
-import org.eclipse.ui.texteditor.IAbstractTextEditorHelpContextIds;
import org.eclipse.ui.texteditor.ITextEditorActionConstants;
-import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
-import org.eclipse.ui.texteditor.ResourceAction;
import org.eclipse.ui.texteditor.StatusTextEditor;
Index: src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextTools.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextTools.java,v
retrieving revision 1.3
diff -u -r1.3 AsmTextTools.java
--- src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextTools.java 5 Sep 2002 15:03:44 -0000 1.3
+++ src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextTools.java 16 Oct 2002 20:12:13 -0000
@@ -9,12 +9,10 @@
import org.eclipse.cdt.internal.ui.text.ICColorConstants;
import org.eclipse.cdt.internal.ui.text.SingleTokenCScanner;
import org.eclipse.cdt.internal.ui.text.util.CColorManager;
-
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.IDocumentPartitioner;
import org.eclipse.jface.text.rules.DefaultPartitioner;
import org.eclipse.jface.text.rules.IPartitionTokenScanner;
-import org.eclipse.jface.text.rules.RuleBasedPartitioner;
import org.eclipse.jface.text.rules.RuleBasedScanner;
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;
Index: src/org/eclipse/cdt/internal/ui/makeview/MakeView.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/makeview/MakeView.java,v
retrieving revision 1.1
diff -u -r1.1 MakeView.java
--- src/org/eclipse/cdt/internal/ui/makeview/MakeView.java 26 Jun 2002 20:55:44 -0000 1.1
+++ src/org/eclipse/cdt/internal/ui/makeview/MakeView.java 16 Oct 2002 20:12:14 -0000
@@ -45,7 +45,7 @@
* Handles double clicks in viewer.
* Opens editor if file double-clicked.
*/
- private void handleDoubleClick(DoubleClickEvent event) {
+ protected void handleDoubleClick(DoubleClickEvent event) {
IStructuredSelection s = (IStructuredSelection)event.getSelection();
Object element = s.getFirstElement();
//System.out.println ("Double click on " + element);
@@ -62,7 +62,7 @@
/**
* called to create the context menu of the outline
*/
- private void contextMenuAboutToShow(IMenuManager menu) {
+ protected void contextMenuAboutToShow(IMenuManager menu) {
IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
Object element = selection.getFirstElement ();
if (element instanceof MakeTarget) {
Index: src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java,v
retrieving revision 1.2
diff -u -r1.2 CEditorPreferencePage.java
--- src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java 9 Aug 2002 02:32:07 -0000 1.2
+++ src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java 16 Oct 2002 20:12:14 -0000
@@ -132,7 +132,7 @@
};
- private final String[][] fListModel= new String[][] {
+ protected final String[][] fListModel= new String[][] {
{ "Multi-line comment", ICColorConstants.C_MULTI_LINE_COMMENT },
{ "Single-line comment", ICColorConstants.C_SINGLE_LINE_COMMENT },
{ "Keywords", ICColorConstants.C_KEYWORD },
@@ -141,7 +141,7 @@
{ "Others", ICColorConstants.C_DEFAULT }
};
- private final String[][] fAppearanceColorListModel= new String[][] {
+ protected final String[][] fAppearanceColorListModel= new String[][] {
{"Line number color", CEditor.LINE_NUMBER_COLOR}, //$NON-NLS-1$
{"Matching bracket color", CEditor.MATCHING_BRACKETS_COLOR}, //$NON-NLS-1$
{"Current line highlight color", CEditor.CURRENT_LINE_COLOR}, //$NON-NLS-1$
@@ -150,10 +150,10 @@
{"Linked position color", CEditor.LINKED_POSITION_COLOR}, //$NON-NLS-1$
};
- private OverlayPreferenceStore fOverlayStore;
+ protected OverlayPreferenceStore fOverlayStore;
private CTextTools fCTextTools;
- private Map fColorButtons= new HashMap();
+ protected Map fColorButtons= new HashMap();
private SelectionListener fColorButtonListener= new SelectionListener() {
public void widgetDefaultSelected(SelectionEvent e) {
}
@@ -163,7 +163,7 @@
}
};
- private Map fCheckBoxes= new HashMap();
+ protected Map fCheckBoxes= new HashMap();
private SelectionListener fCheckBoxListener= new SelectionListener() {
public void widgetDefaultSelected(SelectionEvent e) {
}
@@ -173,7 +173,7 @@
}
};
- private Map fTextFields= new HashMap();
+ protected Map fTextFields= new HashMap();
private ModifyListener fTextFieldListener= new ModifyListener() {
public void modifyText(ModifyEvent e) {
Text text= (Text) e.widget;
@@ -182,18 +182,18 @@
};
private WorkbenchChainedTextFontFieldEditor fFontEditor;
- private List fList;
- private ColorEditor fForegroundColorEditor;
- private ColorEditor fBackgroundColorEditor;
+ protected List fList;
+ protected ColorEditor fForegroundColorEditor;
+ protected ColorEditor fBackgroundColorEditor;
private Button fBackgroundDefaultRadioButton;
- private Button fBackgroundCustomRadioButton;
- private Button fBackgroundColorButton;
- private Button fBoldCheckBox;
- private SourceViewer fPreviewViewer;
+ protected Button fBackgroundCustomRadioButton;
+ protected Button fBackgroundColorButton;
+ protected Button fBoldCheckBox;
+ protected SourceViewer fPreviewViewer;
- private List fAppearanceColorList;
+ protected List fAppearanceColorList;
private ColorEditor fSyntaxForegroundColorEditor;
- private ColorEditor fAppearanceForegroundColorEditor;
+ protected ColorEditor fAppearanceForegroundColorEditor;
public CEditorPreferencePage() {
setDescription(CPlugin.getResourceString("CEditorPreferencePage.description"));
@@ -296,7 +296,7 @@
//WorkbenchHelp.setHelp(getControl(), ICHelpContextIds.JAVA_EDITOR_PREFERENCE_PAGE);
}
- private void handleListSelection() {
+ protected void handleListSelection() {
int i= fList.getSelectionIndex();
String key= fListModel[i][1];
RGB rgb= PreferenceConverter.getColor(fOverlayStore, key);
@@ -495,7 +495,7 @@
*
* @param viewer the viewer to be initialized
*/
- private void initializeViewerColors(ISourceViewer viewer) {
+ protected void initializeViewerColors(ISourceViewer viewer) {
IPreferenceStore store= fOverlayStore;
if (store != null) {
@@ -538,7 +538,7 @@
}
// sets enabled flag for a control and all its sub-tree
- private static void setEnabled(Control control, boolean enable) {
+ protected static void setEnabled(Control control, boolean enable) {
control.setEnabled(enable);
if (control instanceof Composite) {
Composite composite= (Composite) control;
@@ -560,15 +560,15 @@
private Control fBracketHighlightColor;
private Button fLineHighlightButton;
private Control fLineHighlightColor;
- private Button fPrintMarginButton;
- private Control fPrintMarginColor;
- private Control fPrintMarginColumn;
+ protected Button fPrintMarginButton;
+ protected Control fPrintMarginColor;
+ protected Control fPrintMarginColumn;
private Button fProblemIndicationButton;
private Control fProblemIndicationColor;
private Control fFindScopeColor;
private Control fLinkedPositionColor;
- private void handleAppearanceColorListSelection() {
+ protected void handleAppearanceColorListSelection() {
int i= fAppearanceColorList.getSelectionIndex();
String key= fAppearanceColorListModel[i][1];
RGB rgb= PreferenceConverter.getColor(fOverlayStore, key);
@@ -995,7 +995,7 @@
return buffer.toString();
}
- private void numberFieldChanged(Text textControl) {
+ protected void numberFieldChanged(Text textControl) {
String number= textControl.getText();
IStatus status= validatePositiveNumber(number);
if (!status.matches(IStatus.ERROR))
Index: src/org/eclipse/cdt/internal/ui/preferences/CLaunchingPropertyPage.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CLaunchingPropertyPage.java,v
retrieving revision 1.2
diff -u -r1.2 CLaunchingPropertyPage.java
--- src/org/eclipse/cdt/internal/ui/preferences/CLaunchingPropertyPage.java 21 Aug 2002 01:00:42 -0000 1.2
+++ src/org/eclipse/cdt/internal/ui/preferences/CLaunchingPropertyPage.java 16 Oct 2002 20:12:14 -0000
@@ -5,37 +5,31 @@
* All Rights Reserved.
*/
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Shell;
-
+import org.eclipse.cdt.core.CProjectNature;
+import org.eclipse.cdt.internal.ui.CPlugin;
+import org.eclipse.cdt.internal.ui.ICHelpContextIds;
+import org.eclipse.cdt.internal.ui.dialogs.StatusInfo;
+import org.eclipse.cdt.internal.ui.dialogs.StatusTool;
+import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField;
+import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
+import org.eclipse.cdt.internal.ui.wizards.dialogfields.IStringButtonAdapter;
+import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringButtonDialogField;
+import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringDialogField;
+import org.eclipse.cdt.internal.ui.wizards.swt.MGridLayout;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.QualifiedName;
-
import org.eclipse.jface.dialogs.ErrorDialog;
-
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.DirectoryDialog;
+import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.dialogs.PropertyPage;
-import org.eclipse.ui.help.DialogPageContextComputer;
import org.eclipse.ui.help.WorkbenchHelp;
-
-import org.eclipse.cdt.internal.ui.dialogs.StatusInfo;
-import org.eclipse.cdt.internal.ui.dialogs.StatusTool;
-import org.eclipse.cdt.internal.ui.wizards.dialogfields.DialogField;
-import org.eclipse.cdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
-import org.eclipse.cdt.internal.ui.wizards.dialogfields.IStringButtonAdapter;
-import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringButtonDialogField;
-import org.eclipse.cdt.internal.ui.wizards.dialogfields.StringDialogField;
-import org.eclipse.cdt.internal.ui.wizards.swt.MGridLayout;
-
-import org.eclipse.cdt.core.CProjectNature;
-import org.eclipse.cdt.internal.ui.CPlugin;
-import org.eclipse.cdt.internal.ui.ICHelpContextIds;
public class CLaunchingPropertyPage extends PropertyPage {
private static final String PAGE_NAME= "CLaunchingPropertyPage";
@@ -47,7 +41,7 @@
private static final String ERROR_WORKINGDIR_NOTEXISTS= PAGE_NAME + ".error.WorkingDirNotExists";
private StringDialogField fArgumentField;
- private StringButtonDialogField fWorkingDirField;
+ protected StringButtonDialogField fWorkingDirField;
private StatusInfo fWorkingDirStatus;
@@ -174,7 +168,7 @@
}
}
- private void doFieldChanged(DialogField field) {
+ protected void doFieldChanged(DialogField field) {
if (field == fWorkingDirField) {
updateWorkingDirStatus();
}
@@ -198,7 +192,7 @@
return (IFile)getElement();
}
- private String chooseFolder(String initPath) {
+ protected String chooseFolder(String initPath) {
DirectoryDialog dialog= new DirectoryDialog(fShell, 0);
dialog.setFilterPath(initPath);
String res= dialog.open();
Index: src/org/eclipse/cdt/internal/ui/preferences/CPluginPreferencePage.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CPluginPreferencePage.java,v
retrieving revision 1.3
diff -u -r1.3 CPluginPreferencePage.java
--- src/org/eclipse/cdt/internal/ui/preferences/CPluginPreferencePage.java 21 Aug 2002 01:00:42 -0000 1.3
+++ src/org/eclipse/cdt/internal/ui/preferences/CPluginPreferencePage.java 16 Oct 2002 20:12:14 -0000
@@ -5,25 +5,20 @@
* All Rights Reserved.
*/
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.widgets.Composite;
-
+import org.eclipse.cdt.internal.ui.CPlugin;
+import org.eclipse.cdt.internal.ui.ICHelpContextIds;
import org.eclipse.jface.preference.BooleanFieldEditor;
import org.eclipse.jface.preference.FieldEditorPreferencePage;
import org.eclipse.jface.preference.FontFieldEditor;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
import org.eclipse.jface.resource.JFaceResources;
-
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.help.DialogPageContextComputer;
import org.eclipse.ui.help.WorkbenchHelp;
-
-import org.eclipse.cdt.core.CCorePlugin;
-import org.eclipse.cdt.internal.ui.CPlugin;
-import org.eclipse.cdt.internal.ui.ICHelpContextIds;
/**
* The page for setting c plugin preferences.
Index: src/org/eclipse/cdt/internal/ui/preferences/CProjectPropertyPage.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CProjectPropertyPage.java,v
retrieving revision 1.3
diff -u -r1.3 CProjectPropertyPage.java
--- src/org/eclipse/cdt/internal/ui/preferences/CProjectPropertyPage.java 21 Aug 2002 01:00:42 -0000 1.3
+++ src/org/eclipse/cdt/internal/ui/preferences/CProjectPropertyPage.java 16 Oct 2002 20:12:14 -0000
@@ -18,14 +18,12 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.TabFolder;
import org.eclipse.swt.widgets.TabItem;
import org.eclipse.ui.dialogs.PropertyPage;
-import org.eclipse.ui.help.DialogPageContextComputer;
import org.eclipse.ui.help.WorkbenchHelp;
public class CProjectPropertyPage extends PropertyPage implements IStatusChangeListener, IValidation {
Index: src/org/eclipse/cdt/internal/ui/preferences/ColorEditor.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ColorEditor.java,v
retrieving revision 1.1
diff -u -r1.1 ColorEditor.java
--- src/org/eclipse/cdt/internal/ui/preferences/ColorEditor.java 26 Jun 2002 20:55:44 -0000 1.1
+++ src/org/eclipse/cdt/internal/ui/preferences/ColorEditor.java 16 Oct 2002 20:12:14 -0000
@@ -30,10 +30,10 @@
public class ColorEditor {
private Point fExtent;
- private Image fImage;
- private RGB fColorValue;
- private Color fColor;
- private Button fButton;
+ protected Image fImage;
+ protected RGB fColorValue;
+ protected Color fColor;
+ protected Button fButton;
public ColorEditor(Composite parent) {
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.2
diff -u -r1.2 EditTemplateDialog.java
--- src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java 26 Jun 2002 21:53:41 -0000 1.2
+++ src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java 16 Oct 2002 20:12:14 -0000
@@ -191,19 +191,19 @@
private final Template fTemplate;
- private Text fNameText;
+ protected Text fNameText;
private Text fDescriptionText;
- private Combo fContextCombo;
- private SourceViewer fPatternEditor;
+ protected Combo fContextCombo;
+ protected SourceViewer fPatternEditor;
private Button fInsertVariableButton;
- private TemplateTranslator fTranslator= new TemplateTranslator();
- private boolean fSuppressError= true; // #4354
+ protected TemplateTranslator fTranslator= new TemplateTranslator();
+ protected boolean fSuppressError= true; // #4354
private Map fGlobalActions= new HashMap(10);
private List fSelectionActions = new ArrayList(3);
private Vector fContextTypes= new Vector();
- private final TemplateVariableProcessor fProcessor= new TemplateVariableProcessor();
+ protected final TemplateVariableProcessor fProcessor= new TemplateVariableProcessor();
public EditTemplateDialog(Shell parent, Template template, boolean edit) {
super(parent);
@@ -382,7 +382,7 @@
return viewer;
}
- private void handleKeyPressed(KeyEvent event) {
+ protected void handleKeyPressed(KeyEvent event) {
if (event.stateMask != SWT.CTRL)
return;
@@ -398,7 +398,7 @@
}
}
- private void handleVerifyKeyPressed(VerifyEvent event) {
+ protected void handleVerifyKeyPressed(VerifyEvent event) {
if (!event.doit)
return;
@@ -462,7 +462,7 @@
text.setMenu(menu);
}
- private void fillContextMenu(IMenuManager menu) {
+ protected void fillContextMenu(IMenuManager menu) {
menu.add(new GroupMarker(ITextEditorActionConstants.GROUP_UNDO));
menu.appendToGroup(ITextEditorActionConstants.GROUP_UNDO, (IAction) fGlobalActions.get(ITextEditorActionConstants.UNDO));
@@ -513,7 +513,7 @@
super.okPressed();
}
- private void updateButtons() {
+ protected void updateButtons() {
boolean valid= fNameText.getText().trim().length() != 0;
StatusInfo status= new StatusInfo();
Index: src/org/eclipse/cdt/internal/ui/preferences/OverlayPreferenceStore.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OverlayPreferenceStore.java,v
retrieving revision 1.1
diff -u -r1.1 OverlayPreferenceStore.java
--- src/org/eclipse/cdt/internal/ui/preferences/OverlayPreferenceStore.java 26 Jun 2002 20:55:44 -0000 1.1
+++ src/org/eclipse/cdt/internal/ui/preferences/OverlayPreferenceStore.java 16 Oct 2002 20:12:14 -0000
@@ -17,7 +17,7 @@
public static final class TypeDescriptor {
- private TypeDescriptor() {
+ protected TypeDescriptor() {
}
};
@@ -52,8 +52,8 @@
};
- private IPreferenceStore fParent;
- private IPreferenceStore fStore;
+ protected IPreferenceStore fParent;
+ protected IPreferenceStore fStore;
private OverlayKey[] fOverlayKeys;
private PropertyListener fPropertyListener;
@@ -65,7 +65,7 @@
fStore= new PreferenceStore();
}
- private OverlayKey findOverlayKey(String key) {
+ protected OverlayKey findOverlayKey(String key) {
for (int i= 0; i < fOverlayKeys.length; i++) {
if (fOverlayKeys[i].fKey.equals(key))
return fOverlayKeys[i];
@@ -77,7 +77,7 @@
return (findOverlayKey(key) != null);
}
- private void propagateProperty(IPreferenceStore orgin, OverlayKey key, IPreferenceStore target) {
+ protected void propagateProperty(IPreferenceStore orgin, OverlayKey key, IPreferenceStore target) {
if (orgin.isDefault(key.fKey)) {
if (!target.isDefault(key.fKey))
Index: src/org/eclipse/cdt/internal/ui/preferences/TemplatePreferencePage.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TemplatePreferencePage.java,v
retrieving revision 1.2
diff -u -r1.2 TemplatePreferencePage.java
--- src/org/eclipse/cdt/internal/ui/preferences/TemplatePreferencePage.java 21 Aug 2002 01:00:42 -0000 1.2
+++ src/org/eclipse/cdt/internal/ui/preferences/TemplatePreferencePage.java 16 Oct 2002 20:12:14 -0000
@@ -5,6 +5,11 @@
* All Rights Reserved.
*/
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
import org.eclipse.cdt.internal.corext.template.ContextType;
import org.eclipse.cdt.internal.corext.template.ContextTypeRegistry;
import org.eclipse.cdt.internal.corext.template.Template;
@@ -18,27 +23,7 @@
import org.eclipse.cdt.internal.ui.text.template.TemplateContentProvider;
import org.eclipse.cdt.internal.ui.text.template.TemplateLabelProvider;
import org.eclipse.cdt.internal.ui.util.SWTUtil;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-
import org.eclipse.core.runtime.CoreException;
-
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.preference.IPreferenceStore;
@@ -59,10 +44,21 @@
import org.eclipse.jface.viewers.TableLayout;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerSorter;
-
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.help.DialogPageContextComputer;
import org.eclipse.ui.help.WorkbenchHelp;
@@ -331,7 +327,7 @@
return data;
}
- private void selectionChanged1() {
+ protected void selectionChanged1() {
IStructuredSelection selection= (IStructuredSelection) fTableViewer.getSelection();
if (selection.size() == 1) {
@@ -355,7 +351,7 @@
fDisableAllButton.setEnabled(itemCount > 0);
}
- private void add() {
+ protected void add() {
Template template= new Template();
@@ -380,7 +376,7 @@
}
}
- private void edit() {
+ protected void edit() {
IStructuredSelection selection= (IStructuredSelection) fTableViewer.getSelection();
Object[] objects= selection.toArray();
@@ -416,7 +412,7 @@
}
}
- private void import_() {
+ protected void import_() {
FileDialog dialog= new FileDialog(getShell());
dialog.setText(TemplateMessages.getString("TemplatePreferencePage.import.title")); //$NON-NLS-1$
dialog.setFilterExtensions(new String[] {TemplateMessages.getString("TemplatePreferencePage.import.extension")}); //$NON-NLS-1$
@@ -437,11 +433,11 @@
}
}
- private void exportAll() {
+ protected void exportAll() {
export(fTemplates);
}
- private void export() {
+ protected void export() {
IStructuredSelection selection= (IStructuredSelection) fTableViewer.getSelection();
Object[] templates= selection.toArray();
@@ -480,7 +476,7 @@
TemplateMessages.getFormattedString("TemplatePreferencePage.export.exists.message", file.getAbsolutePath()));
}
- private void remove() {
+ protected void remove() {
IStructuredSelection selection= (IStructuredSelection) fTableViewer.getSelection();
Iterator elements= selection.iterator();
@@ -492,7 +488,7 @@
fTableViewer.refresh();
}
- private void enableAll(boolean enable) {
+ protected void enableAll(boolean enable) {
Template[] templates= fTemplates.getTemplates();
for (int i= 0; i != templates.length; i++)
templates[i].setEnabled(enable);
Index: src/org/eclipse/cdt/internal/ui/text/CCodeScanner.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCodeScanner.java,v
retrieving revision 1.4
diff -u -r1.4 CCodeScanner.java
--- src/org/eclipse/cdt/internal/ui/text/CCodeScanner.java 11 Oct 2002 13:40:40 -0000 1.4
+++ src/org/eclipse/cdt/internal/ui/text/CCodeScanner.java 16 Oct 2002 20:12:14 -0000
@@ -6,22 +6,16 @@
*/
-import org.eclipse.cdt.internal.ui.text.util.CWordDetector;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
+import org.eclipse.cdt.internal.ui.text.util.CWordDetector;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.rules.ICharacterScanner;
import org.eclipse.jface.text.rules.IRule;
-import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.jface.text.rules.IWordDetector;
import org.eclipse.jface.text.rules.PatternRule;
import org.eclipse.jface.text.rules.SingleLineRule;
import org.eclipse.jface.text.rules.Token;
import org.eclipse.jface.text.rules.WordRule;
-import org.eclipse.jface.util.Assert;
import org.eclipse.jface.util.PropertyChangeEvent;
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.5
diff -u -r1.5 CSourceViewerConfiguration.java
--- src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java 9 Aug 2002 02:32:38 -0000 1.5
+++ src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java 16 Oct 2002 20:12:14 -0000
@@ -7,6 +7,10 @@
import java.util.HashMap;
import java.util.Vector;
+import org.eclipse.cdt.internal.ui.CPlugin;
+import org.eclipse.cdt.internal.ui.editor.CEditor;
+import org.eclipse.cdt.internal.ui.editor.CEditorTextHoverDispatcher;
+import org.eclipse.cdt.ui.ICDTConstants;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
@@ -29,17 +33,11 @@
import org.eclipse.jface.text.reconciler.Reconciler;
import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
import org.eclipse.jface.text.rules.DefaultPartitioner;
-import org.eclipse.jface.text.rules.RuleBasedDamagerRepairer;
import org.eclipse.jface.text.rules.RuleBasedScanner;
import org.eclipse.jface.text.source.IAnnotationHover;
import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.jface.text.source.SourceViewerConfiguration;
import org.eclipse.ui.texteditor.ITextEditor;
-
-import org.eclipse.cdt.internal.ui.CPlugin;
-import org.eclipse.cdt.internal.ui.editor.CEditor;
-import org.eclipse.cdt.internal.ui.editor.CEditorTextHoverDispatcher;
-import org.eclipse.cdt.ui.ICDTConstants;
Index: src/org/eclipse/cdt/internal/ui/text/util/CColorManager.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/util/CColorManager.java,v
retrieving revision 1.1
diff -u -r1.1 CColorManager.java
--- src/org/eclipse/cdt/internal/ui/text/util/CColorManager.java 26 Jun 2002 20:55:44 -0000 1.1
+++ src/org/eclipse/cdt/internal/ui/text/util/CColorManager.java 16 Oct 2002 20:12:14 -0000
@@ -27,7 +27,7 @@
public CColorManager() {
}
- private void dispose(Display display) {
+ protected void dispose(Display display) {
Map colorTable= (Map) fDisplayTable.get(display);
if (colorTable != null) {
Iterator e= colorTable.values().iterator();
Index: src/org/eclipse/cdt/internal/ui/util/ProblemTreeViewer.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemTreeViewer.java,v
retrieving revision 1.1
diff -u -r1.1 ProblemTreeViewer.java
--- src/org/eclipse/cdt/internal/ui/util/ProblemTreeViewer.java 26 Jun 2002 20:55:44 -0000 1.1
+++ src/org/eclipse/cdt/internal/ui/util/ProblemTreeViewer.java 16 Oct 2002 20:12:14 -0000
@@ -26,7 +26,7 @@
*/
public class ProblemTreeViewer extends TreeViewer implements IProblemChangedListener {
- private ProblemItemMapper fProblemItemMapper;
+ protected ProblemItemMapper fProblemItemMapper;
/*
* @see TreeViewer#TreeViewer(Composite)
Index: src/org/eclipse/cdt/internal/ui/wizards/dialogfields/StringDialogField.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/StringDialogField.java,v
retrieving revision 1.1
diff -u -r1.1 StringDialogField.java
--- src/org/eclipse/cdt/internal/ui/wizards/dialogfields/StringDialogField.java 26 Jun 2002 20:55:44 -0000 1.1
+++ src/org/eclipse/cdt/internal/ui/wizards/dialogfields/StringDialogField.java 16 Oct 2002 20:12:13 -0000
@@ -34,7 +34,8 @@
return new Control[] { label, text };
}
- private void doModifyText(ModifyEvent e) {
+
+ protected void doModifyText(ModifyEvent e) {
if (isOkToUse(fTextControl)) {
fText= fTextControl.getText();
}
Index: src/org/eclipse/cdt/ui/wizards/CProjectWizardPage.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CProjectWizardPage.java,v
retrieving revision 1.3
diff -u -r1.3 CProjectWizardPage.java
--- src/org/eclipse/cdt/ui/wizards/CProjectWizardPage.java 16 Sep 2002 13:34:37 -0000 1.3
+++ src/org/eclipse/cdt/ui/wizards/CProjectWizardPage.java 16 Oct 2002 20:12:15 -0000
@@ -49,7 +49,7 @@
*/
public class CProjectWizardPage extends WizardPage {
- private boolean useDefaults = true;
+ protected boolean useDefaults = true;
// initial value stores
private String initialProjectFieldValue;
@@ -57,9 +57,9 @@
// widgets
private Text projectNameField;
- private Text locationPathField;
- private Label locationLabel;
- private Button browseButton;
+ protected Text locationPathField;
+ protected Label locationLabel;
+ protected Button browseButton;
private Listener nameModifyListener = new Listener() {
public void handleEvent(Event e) {
@@ -250,7 +250,7 @@
/**
* Open an appropriate directory browser
*/
- private void handleLocationBrowseButtonPressed() {
+ protected void handleLocationBrowseButtonPressed() {
DirectoryDialog dialog = new DirectoryDialog(locationPathField.getShell());
dialog.setMessage(CPlugin.getResourceString("CProjectWizardPage.directoryLabel")); //$NON-NLS-1$
@@ -280,7 +280,7 @@
/**
* Set the location to the default location if we are set to useDefaults.
*/
- private void setLocationForSelection() {
+ protected void setLocationForSelection() {
if (useDefaults) {
IPath defaultPath = Platform.getLocation().append(projectNameField.getText());
locationPathField.setText(defaultPath.toOSString());
@@ -294,7 +294,7 @@
* @return <code>true</code> if all controls are valid, and
* <code>false</code> if at least one is invalid
*/
- private boolean validatePage() {
+ protected boolean validatePage() {
IWorkspace workspace = ResourcesPlugin.getWorkspace();
String projectFieldContents = projectNameField.getText();
Index: src/org/eclipse/cdt/ui/wizards/SettingsBlock.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/SettingsBlock.java,v
retrieving revision 1.1
diff -u -r1.1 SettingsBlock.java
--- src/org/eclipse/cdt/ui/wizards/SettingsBlock.java 26 Jun 2002 20:55:44 -0000 1.1
+++ src/org/eclipse/cdt/ui/wizards/SettingsBlock.java 16 Oct 2002 20:12:15 -0000
@@ -50,9 +50,9 @@
private static final String KEEP_ARG = "keep"; //$NON-NLS-1$
private static final String STOP_ARG = "stop"; //$NON-NLS-1$
- private RadioButtonsArea radioButtons;
- private Button defButton;
- private Text cmdText;
+ protected RadioButtonsArea radioButtons;
+ protected Button defButton;
+ protected Text cmdText;
private boolean stopOnError;
private boolean useDefaultBuildCmd;
Index: src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java,v
retrieving revision 1.6
diff -u -r1.6 ConvertProjectWizardPage.java
--- src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java 30 Sep 2002 19:34:16 -0000 1.6
+++ src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java 16 Oct 2002 20:12:15 -0000
@@ -73,7 +73,7 @@
protected Button deselectAllButton;
// We only need to calculate this once per instantiation of this wizard
- private Object[] listItems = null;
+ protected Object[] listItems = null;
/**
* Constructor for ConvertProjectWizardPage.
@@ -258,7 +258,7 @@
* dependent on what is selected
*/
- private void updateSelectionButtons() {
+ protected void updateSelectionButtons() {
// update select and deselect buttons as required
Object[] checkedObjects = tableViewer.getCheckedElements();
Index: utils.ui/org/eclipse/cdt/utils/ui/controls/RadioButtonsArea.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/RadioButtonsArea.java,v
retrieving revision 1.1
diff -u -r1.1 RadioButtonsArea.java
--- utils.ui/org/eclipse/cdt/utils/ui/controls/RadioButtonsArea.java 26 Jun 2002 21:17:46 -0000 1.1
+++ utils.ui/org/eclipse/cdt/utils/ui/controls/RadioButtonsArea.java 16 Oct 2002 20:12:15 -0000
@@ -48,7 +48,7 @@
* The radio buttons, or <code>null</code> if none
* (before creation and after disposal).
*/
- private Button[] radioButtons;
+ protected Button[] radioButtons;
public RadioButtonsArea(Composite parent, String labelText, int numColumns, String[][] labelAndValues) {
@@ -82,7 +82,7 @@
return true;
}
- private void fireSelectionEvent(SelectionEvent event) {
+ protected void fireSelectionEvent(SelectionEvent event) {
for(Iterator i = externalListeners.iterator(); i.hasNext(); ) {
SelectionListener s = (SelectionListener)i.next();
s.widgetSelected(event);
