From 3e04941539e4d0626846ca8ead1e65f6f19c81be Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Fri, 24 Dec 2004 15:16:00 +0000 Subject: [PATCH] Remove most to the warnings. --- .../ui/dialogs/cpaths/CPathContainerDefaultPage.java | 2 +- .../ui/dialogs/cpaths/CPathContainerDescriptor.java | 9 +++++---- .../ui/dialogs/cpaths/CPathContainerEntryPage.java | 6 +++--- .../ui/dialogs/cpaths/CPathContainerSelectionPage.java | 2 +- .../cdt/internal/ui/dialogs/cpaths/CPathFilterPage.java | 2 +- .../ui/dialogs/cpaths/CPathLibraryEntryPage.java | 4 ++-- .../internal/ui/dialogs/cpaths/CPathOutputEntryPage.java | 2 +- .../ui/dialogs/cpaths/IncludesSymbolsPropertyPage.java | 2 +- .../ui/dialogs/cpaths/MultipleFolderSelectionDialog.java | 4 ++-- .../internal/ui/dialogs/cpaths/ProjectContainerPage.java | 4 ++-- .../ui/dialogs/cpaths/SourceAttachmentBlock.java | 4 ++-- 11 files changed, 21 insertions(+), 20 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDefaultPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDefaultPage.java index 011de081abe..1618211590a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDefaultPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDefaultPage.java @@ -57,7 +57,7 @@ public class CPathContainerDefaultPage extends NewElementWizardPage implements I validatePath(); } - private void validatePath() { + protected void validatePath() { StatusInfo status= new StatusInfo(); String str= fEntryField.getText(); if (str.length() == 0) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDescriptor.java index fd6a94b1db8..ae2b1bd21af 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDescriptor.java @@ -17,6 +17,7 @@ import org.eclipse.cdt.core.model.IContainerEntry; import org.eclipse.cdt.core.model.IPathEntry; import org.eclipse.cdt.internal.ui.util.CoreUtility; import org.eclipse.cdt.ui.CUIPlugin; +import org.eclipse.cdt.ui.wizards.ICPathContainerPage; import org.eclipse.cdt.ui.wizards.IPathEntryContainerPage; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; @@ -43,11 +44,11 @@ public class CPathContainerDescriptor implements IContainerDescriptor { * @deprecated */ public class PathEntryContainerPageAdapter implements IWizardPage, IPathEntryContainerPage { - private final org.eclipse.cdt.ui.wizards.ICPathContainerPage fPage; + private final ICPathContainerPage fPage; /** * @param pageName */ - protected PathEntryContainerPageAdapter(org.eclipse.cdt.ui.wizards.ICPathContainerPage page) { + protected PathEntryContainerPageAdapter(ICPathContainerPage page) { fPage = page; } @@ -264,8 +265,8 @@ public class CPathContainerDescriptor implements IContainerDescriptor { Object elem = CoreUtility.createExtension(fConfigElement, ATT_PAGE_CLASS); if (elem instanceof IPathEntryContainerPage) { return (IPathEntryContainerPage) elem; - } else if (elem instanceof org.eclipse.cdt.ui.wizards.ICPathContainerPage) { - return new PathEntryContainerPageAdapter((org.eclipse.cdt.ui.wizards.ICPathContainerPage)elem); + } else if (elem instanceof ICPathContainerPage) { + return new PathEntryContainerPageAdapter((ICPathContainerPage)elem); } String id = fConfigElement.getAttribute(ATT_ID); throw new CoreException(new Status(IStatus.ERROR, CUIPlugin.PLUGIN_ID, 0, diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerEntryPage.java index 2a1372bf156..e826ccb81dc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerEntryPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerEntryPage.java @@ -178,7 +178,7 @@ public class CPathContainerEntryPage extends CPathBasePage { } } - private void containerPageCustomButtonPressed(DialogField field, int index) { + void containerPageCustomButtonPressed(DialogField field, int index) { CPElement[] containers = null; switch (index) { case IDX_ADD : @@ -343,7 +343,7 @@ public class CPathContainerEntryPage extends CPathBasePage { } - private void containerPageSelectionChanged(DialogField field) { + void containerPageSelectionChanged(DialogField field) { List selElements = fContainersList.getSelectedElements(); fContainersList.enableButton(IDX_EDIT, canEdit(selElements)); fContainersList.enableButton(IDX_REMOVE, canRemove(selElements)); @@ -365,7 +365,7 @@ public class CPathContainerEntryPage extends CPathBasePage { return false; } - private void containerPageDialogFieldChanged(DialogField field) { + void containerPageDialogFieldChanged(DialogField field) { if (fCurrCProject != null) { // already initialized updateCPathList(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerSelectionPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerSelectionPage.java index 6986c5b5a3a..6c2cf4f104f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerSelectionPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerSelectionPage.java @@ -115,7 +115,7 @@ public class CPathContainerSelectionPage extends WizardPage { /** * Method validatePage. */ - private void validatePage() { + void validatePage() { setPageComplete(getSelected() != null); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathFilterPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathFilterPage.java index 284877aa1f2..82ce98bcab4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathFilterPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathFilterPage.java @@ -126,7 +126,7 @@ public class CPathFilterPage extends WizardPage { /** * Method validatePage. */ - private void validatePage() { + void validatePage() { setPageComplete(getSelectedEntries().length > 0); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathLibraryEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathLibraryEntryPage.java index ab4ee8944de..59e64054920 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathLibraryEntryPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathLibraryEntryPage.java @@ -220,7 +220,7 @@ public class CPathLibraryEntryPage extends CPathBasePage { } } - private void libraryPageCustomButtonPressed(DialogField field, int index) { + protected void libraryPageCustomButtonPressed(DialogField field, int index) { CPElement[] libentries= null; switch (index) { case IDX_ADD_LIB: /* add jar */ @@ -404,7 +404,7 @@ public class CPathLibraryEntryPage extends CPathBasePage { } } - private void libraryPageSelectionChanged(DialogField field) { + protected void libraryPageSelectionChanged(DialogField field) { List selElements= fLibrariesList.getSelectedElements(); fLibrariesList.enableButton(IDX_EDIT, canEdit(selElements)); fLibrariesList.enableButton(IDX_REMOVE, canRemove(selElements)); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOutputEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOutputEntryPage.java index 77fa182b4b8..78651461712 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOutputEntryPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOutputEntryPage.java @@ -373,7 +373,7 @@ public class CPathOutputEntryPage extends CPathBasePage { return false; } - private void outputPageDialogFieldChanged(DialogField field) { + protected void outputPageDialogFieldChanged(DialogField field) { if (fCurrCProject == null) { // not initialized return; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IncludesSymbolsPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IncludesSymbolsPropertyPage.java index 3b2a2459f18..fdac9440c2a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IncludesSymbolsPropertyPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IncludesSymbolsPropertyPage.java @@ -162,7 +162,7 @@ public class IncludesSymbolsPropertyPage extends PropertyPage implements IStatus return null; } - private ICElement getCElement() { + protected ICElement getCElement() { IAdaptable adaptable = getElement(); if (adaptable != null) { ICElement elem = (ICElement)adaptable.getAdapter(ICElement.class); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/MultipleFolderSelectionDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/MultipleFolderSelectionDialog.java index b607827e7fe..08a3b8a54f4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/MultipleFolderSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/MultipleFolderSelectionDialog.java @@ -47,7 +47,7 @@ import org.eclipse.ui.views.navigator.ResourceSorter; */ public class MultipleFolderSelectionDialog extends SelectionStatusDialog implements ISelectionChangedListener { - private CheckboxTreeViewer fViewer; + CheckboxTreeViewer fViewer; private ILabelProvider fLabelProvider; private ITreeContentProvider fContentProvider; @@ -56,7 +56,7 @@ public class MultipleFolderSelectionDialog extends SelectionStatusDialog impleme private Object fInput; private Button fNewFolderButton; private IContainer fSelectedContainer; - private Set fExisting; + Set fExisting; private Object fFocusElement; public MultipleFolderSelectionDialog(Shell parent, ILabelProvider labelProvider, ITreeContentProvider contentProvider) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerPage.java index 512b119707b..7ad11178ea4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerPage.java @@ -40,7 +40,7 @@ public class ProjectContainerPage extends WizardPage implements IPathEntryContai private int[] fFilterType; private TableViewer viewer; - private ICProject fCProject; + ICProject fCProject; protected ProjectContainerPage(int[] filterType) { super("projectContainerPage"); //$NON-NLS-1$ @@ -151,7 +151,7 @@ public class ProjectContainerPage extends WizardPage implements IPathEntryContai /** * Method validatePage. */ - private void validatePage() { + protected void validatePage() { setPageComplete(getSelected() != null); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentBlock.java index 8238764ca97..d09dab05a95 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentBlock.java @@ -230,7 +230,7 @@ public class SourceAttachmentBlock { } } - private void attachmentChangeControlPressed(DialogField field) { + void attachmentChangeControlPressed(DialogField field) { if (field == fFileNameField) { IPath jarFilePath = chooseExtJarFile(); if (jarFilePath != null) { @@ -241,7 +241,7 @@ public class SourceAttachmentBlock { // ---------- IDialogFieldListener -------- - private void attachmentDialogFieldChanged(DialogField field) { + void attachmentDialogFieldChanged(DialogField field) { if (field == fFileNameField) { fNameStatus = updateFileNameStatus(); } else if (field == fWorkspaceButton) {