diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java index 7b96f1d379b..7c1c6363fb2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java @@ -269,9 +269,9 @@ public class BuildConsolePage extends Page ConsoleMessages.getString("BuildConsolePage.Select_All")); //$NON-NLS-1$ setGlobalAction(actionBars, ActionFactory.SELECT_ALL.getId(), action); //XXX Still using "old" resource access - ResourceBundle bundle = ResourceBundle.getBundle(ConsoleMessages.BUNDLE_NAME); //$NON-NLS-1$ + ResourceBundle bundle = ResourceBundle.getBundle(ConsoleMessages.BUNDLE_NAME); setGlobalAction(actionBars, ActionFactory.FIND.getId(), new FindReplaceAction(bundle, "find_replace_action.", //$NON-NLS-1$ - getConsoleView())); //$NON-NLS-1$ + getConsoleView())); action = new TextViewerGotoLineAction(getViewer()); setGlobalAction(actionBars, ITextEditorActionConstants.GOTO_LINE, action); actionBars.updateActionBars(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreator.java index 8d0e9e5b2a7..0995f1bf355 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreator.java @@ -80,7 +80,7 @@ public class CStructureCreator implements IStructureCreator { //are bugs while parsing C files, we might want to create a separate Structure //compare for c files, but we'll never be completely right about .h files IScanner scanner = - ParserFactory.createScanner(new CodeReader(s.toCharArray()), new ScannerInfo(), ParserMode.QUICK_PARSE, ParserLanguage.CPP, builder, new NullLogService(), null); //$NON-NLS-1$ + ParserFactory.createScanner(new CodeReader(s.toCharArray()), new ScannerInfo(), ParserMode.QUICK_PARSE, ParserLanguage.CPP, builder, new NullLogService(), null); IParser parser = ParserFactory.createParser(scanner, builder, ParserMode.QUICK_PARSE, ParserLanguage.CPP, ParserUtil.getParserLogService() ); parser.parse(); } catch (Exception e) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java index 969fb67a2f3..68f8bbdc99c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java @@ -153,7 +153,7 @@ public class MainActionGroup extends CViewActionGroup { collapseAllAction = new CollapseAllAction(getCView()); - toggleLinkingAction = new ToggleLinkingAction(getCView()); //$NON-NLS-1$ + toggleLinkingAction = new ToggleLinkingAction(getCView()); toggleLinkingAction.setToolTipText(CViewMessages.getString("ToggleLinkingAction.toolTip")); //$NON-NLS-1$ toggleLinkingAction.setImageDescriptor(getImageDescriptor("elcl16/synced.gif"));//$NON-NLS-1$ // toggleLinkingAction.setHoverImageDescriptor(getImageDescriptor("clcl16/synced.gif"));//$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusDialog.java index 59ba3a0d5f4..8c99058eac7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusDialog.java @@ -137,7 +137,7 @@ public abstract class StatusDialog extends Dialog { fStatusLine= new MessageLine(composite); fStatusLine.setAlignment(SWT.LEFT); fStatusLine.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - fStatusLine.setErrorMessage(null); //$NON-NLS-1$ + fStatusLine.setErrorMessage(null); super.createButtonBar(composite); return composite; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java index e9e161e5021..c29c9abe301 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java @@ -840,7 +840,7 @@ public class CPathIncludeSymbolEntryPage extends CPathIncludeSymbolEntryBasePage initialValue.append('='); initialValue.append((String)existing.getAttribute(CPElement.MACRO_VALUE)); dialog = new InputDialog(getShell(), CPathEntryMessages.getString("IncludeSymbolEntryPage.editSymbol.title"), //$NON-NLS-1$ - CPathEntryMessages.getString("IncludeSymbolEntryPage.editSymbol.message"), initialValue.toString(), //$NON-NLS-1$ //$NON-NLS-2$ + CPathEntryMessages.getString("IncludeSymbolEntryPage.editSymbol.message"), initialValue.toString(), //$NON-NLS-1$ null); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java index 6aec6a87b25..1264b418590 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java @@ -895,7 +895,7 @@ public class CPathIncludeSymbolEntryPerFilePage extends CPathIncludeSymbolEntryB initialValue.append('='); initialValue.append((String)existing.getAttribute(CPElement.MACRO_VALUE)); dialog = new InputDialog(getShell(), CPathEntryMessages.getString("IncludeSymbolEntryPage.editSymbol.title"), //$NON-NLS-1$ - CPathEntryMessages.getString("IncludeSymbolEntryPage.editSymbol.message"), initialValue.toString(), //$NON-NLS-1$ //$NON-NLS-2$ + CPathEntryMessages.getString("IncludeSymbolEntryPage.editSymbol.message"), initialValue.toString(), //$NON-NLS-1$ null); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchEditor.java index f1b9106b630..bd63590be2b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchEditor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchEditor.java @@ -17,7 +17,7 @@ import org.eclipse.jface.action.IMenuManager; public class ExternalSearchEditor extends CEditor { - public static final String EDITOR_ID = "org.eclipse.cdt.ui.editor.ExternalSearchEditor"; + public static final String EDITOR_ID = "org.eclipse.cdt.ui.editor.ExternalSearchEditor"; //$NON-NLS-1$ public ExternalSearchEditor(){ super(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/FindDeclarationsAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/FindDeclarationsAction.java index 81859fb211b..e8e375f0ca5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/FindDeclarationsAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/FindDeclarationsAction.java @@ -13,6 +13,8 @@ package org.eclipse.cdt.internal.ui.indexview; import org.eclipse.cdt.internal.core.pdom.dom.PDOMBinding; import org.eclipse.cdt.internal.ui.search.PDOMSearchBindingQuery; +import org.eclipse.cdt.internal.ui.search.PDOMSearchQuery; + import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; @@ -26,7 +28,7 @@ import org.eclipse.search.ui.NewSearchUI; public class FindDeclarationsAction extends IndexAction { public FindDeclarationsAction(TreeViewer viewer) { - super(viewer, CUIPlugin.getResourceString("IndexView.findDeclarations.name")); + super(viewer, CUIPlugin.getResourceString("IndexView.findDeclarations.name")); //$NON-NLS-1$ } private PDOMBinding getBinding() { @@ -43,7 +45,7 @@ public class FindDeclarationsAction extends IndexAction { PDOMSearchBindingQuery query = new PDOMSearchBindingQuery( null, binding, - PDOMSearchBindingQuery.FIND_DECLARATIONS | PDOMSearchBindingQuery.FIND_DEFINITIONS); + PDOMSearchQuery.FIND_DECLARATIONS | PDOMSearchQuery.FIND_DEFINITIONS); NewSearchUI.activateSearchResultView(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/FindReferencesAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/FindReferencesAction.java index 4cbaff1fd2b..6cd7803c2d9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/FindReferencesAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/FindReferencesAction.java @@ -13,6 +13,8 @@ package org.eclipse.cdt.internal.ui.indexview; import org.eclipse.cdt.internal.core.pdom.dom.PDOMBinding; import org.eclipse.cdt.internal.ui.search.PDOMSearchBindingQuery; +import org.eclipse.cdt.internal.ui.search.PDOMSearchQuery; + import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; @@ -26,7 +28,7 @@ import org.eclipse.search.ui.NewSearchUI; public class FindReferencesAction extends IndexAction { public FindReferencesAction(TreeViewer viewer) { - super(viewer, CUIPlugin.getResourceString("IndexView.findReferences.name")); + super(viewer, CUIPlugin.getResourceString("IndexView.findReferences.name")); //$NON-NLS-1$ } private PDOMBinding getBinding() { @@ -42,7 +44,7 @@ public class FindReferencesAction extends IndexAction { PDOMSearchBindingQuery query = new PDOMSearchBindingQuery( null, getBinding(), - PDOMSearchBindingQuery.FIND_REFERENCES); + PDOMSearchQuery.FIND_REFERENCES); NewSearchUI.activateSearchResultView(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexView.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexView.java index 52c8814ec4d..91c73fc58ca 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexView.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexView.java @@ -343,7 +343,7 @@ public class IndexView extends ViewPart implements PDOM.IListener, IElementChang } private void hookContextMenu() { - MenuManager menuMgr = new MenuManager("#PopupMenu"); + MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$ menuMgr.setRemoveAllWhenShown(true); menuMgr.addMenuListener(new IMenuListener() { public void menuAboutToShow(IMenuManager manager) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/SetFastIndexerAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/SetFastIndexerAction.java index bf894667b8b..caffc795351 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/SetFastIndexerAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/SetFastIndexerAction.java @@ -30,7 +30,7 @@ import org.eclipse.jface.viewers.TreeViewer; public class SetFastIndexerAction extends IndexAction { public SetFastIndexerAction(TreeViewer viewer) { - super(viewer, CUIPlugin.getResourceString("IndexView.setFastIndexer.name")); + super(viewer, CUIPlugin.getResourceString("IndexView.setFastIndexer.name")); //$NON-NLS-1$ } public void run() { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDragAdapterAssistant.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDragAdapterAssistant.java index 8d59412e752..7f5b75f5a0b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDragAdapterAssistant.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDragAdapterAssistant.java @@ -46,7 +46,7 @@ public class CNavigatorDragAdapterAssistant extends CommonDragAdapterAssistant { public boolean setDragData(DragSourceEvent event, IStructuredSelection selection) { if (selection instanceof IStructuredSelection) { - for (Iterator iter= ((IStructuredSelection)selection).iterator(); iter.hasNext();) { + for (Iterator iter= (selection).iterator(); iter.hasNext();) { Object element= iter.next(); if (element instanceof ICElement) { if (!(element instanceof ISourceReference)) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/OpenCElementAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/OpenCElementAction.java index e423e0c6ab5..6e025fbefd5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/OpenCElementAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/OpenCElementAction.java @@ -45,7 +45,7 @@ public class OpenCElementAction extends OpenFileAction { try { part= EditorUtility.openInEditor(fOpenElement); if (fOpenElement instanceof ISourceReference) { - EditorUtility.revealInEditor(part, (ICElement)fOpenElement); + EditorUtility.revealInEditor(part, fOpenElement); } } catch (CoreException exc) { CUIPlugin.getDefault().log(exc.getStatus()); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CParserPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CParserPreferencePage.java index d72be90f6f7..712b8ce28dc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CParserPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CParserPreferencePage.java @@ -78,7 +78,7 @@ public class CParserPreferencePage extends PreferencePage implements bufferGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); bufferGroup.setText(PreferencesMessages.getString("CBufferPreferences.CodeReaderBuffer.CodeReaderBufferGroup")); //$NON-NLS-1$ - bufferTextControl = (Text) addTextField( bufferGroup, PreferencesMessages.getString("CBufferPreferences.CodeReaderBuffer.Size"),6,0); //$NON-NLS-1$ //$NON-NLS-2$ + bufferTextControl = (Text) addTextField( bufferGroup, PreferencesMessages.getString("CBufferPreferences.CodeReaderBuffer.Size"),6,0); //$NON-NLS-1$ initialize(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java index 7234efc5fad..8dbeb93d4d6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java @@ -287,7 +287,7 @@ public abstract class OptionsConfigurationBlock { protected String[] getTokens(String text, String separator) { - StringTokenizer tok= new StringTokenizer(text, separator); //$NON-NLS-1$ + StringTokenizer tok= new StringTokenizer(text, separator); int nTokens= tok.countTokens(); String[] res= new String[nTokens]; for (int i= 0; i < res.length; i++) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ProposalFilterPreferencesUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ProposalFilterPreferencesUtil.java index 276d83739a9..568d5da1b6a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ProposalFilterPreferencesUtil.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ProposalFilterPreferencesUtil.java @@ -53,7 +53,7 @@ public class ProposalFilterPreferencesUtil { for (int j = 0; j < elements.length; ++j) { IConfigurationElement element = elements[j]; if ("ProposalFilter".equals(element.getName())) { //$NON-NLS-1$ - String filterName = element.getAttribute("name"); + String filterName = element.getAttribute("name"); //$NON-NLS-1$ if (null != filterName) { names.add(filterName); } @@ -79,12 +79,12 @@ public class ProposalFilterPreferencesUtil { * @return The list of filter names */ public static String getProposalFilternamesAsString() { - StringBuffer filterNames = new StringBuffer("0;"); - filterNames.append(""); // TODO: NP externalize this! + StringBuffer filterNames = new StringBuffer("0;"); //$NON-NLS-1$ + filterNames.append(""); // TODO: NP externalize this! //$NON-NLS-1$ String[] names = getProposalFilterNames(); for (int i = 0; i < names.length; i++) { String name = names[i]; - filterNames.append(";"); + filterNames.append(";"); //$NON-NLS-1$ filterNames.append(name); } return filterNames.toString(); @@ -114,7 +114,7 @@ public class ProposalFilterPreferencesUtil { IConfigurationElement testElement = elements[j]; if ("ProposalFilter".equals(testElement.getName())) { //$NON-NLS-1$ String testName = testElement - .getAttribute("name"); + .getAttribute("name"); //$NON-NLS-1$ if ((null != testName) && (filterName.equals(testName))) { element = testElement; @@ -154,8 +154,8 @@ public class ProposalFilterPreferencesUtil { text.append(selectionIndex); String[] entries = combo.getItems(); for (int i = 0; i < entries.length; i++) { - text.append(";"); - String entry = entries[i].replaceAll(";", ","); + text.append(";"); //$NON-NLS-1$ + String entry = entries[i].replaceAll(";", ","); //$NON-NLS-1$ //$NON-NLS-2$ text.append(entry); } return text.toString(); @@ -172,12 +172,12 @@ public class ProposalFilterPreferencesUtil { */ public static void restoreComboFromString(Combo combo, String text) { try { - int endFirstEntry = text.indexOf(";"); + int endFirstEntry = text.indexOf(";"); //$NON-NLS-1$ if (endFirstEntry > 0) { // First entry must contain at least one character String selectedString = text.substring(0, endFirstEntry); int selectedIndex = Integer.parseInt(selectedString); String[] entryList = text.substring(endFirstEntry + 1, - text.length()).split(";"); + text.length()).split(";"); //$NON-NLS-1$ combo.setItems(entryList); combo.select(selectedIndex); } @@ -204,13 +204,13 @@ public class ProposalFilterPreferencesUtil { public static ComboState getComboState(String comboPreference) { ComboState state = new ComboState(); try { - int endFirstEntry = comboPreference.indexOf(";"); + int endFirstEntry = comboPreference.indexOf(";"); //$NON-NLS-1$ if (endFirstEntry > 0) { // First entry must contain at least one character String selectedString = comboPreference.substring(0, endFirstEntry); state.selectedIndex = Integer.parseInt(selectedString); state.items = comboPreference.substring(endFirstEntry + 1, - comboPreference.length()).split(";"); + comboPreference.length()).split(";"); //$NON-NLS-1$ } } catch (NumberFormatException e) { // If this fails we return an empty ComboState diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchBindingQuery.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchBindingQuery.java index 2159e94aa7a..ca11faa758c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchBindingQuery.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchBindingQuery.java @@ -44,7 +44,7 @@ public class PDOMSearchBindingQuery extends PDOMSearchQuery { } public String getLabel() { - return super.getLabel() + " " + binding.getName(); + return super.getLabel() + " " + binding.getName(); //$NON-NLS-1$ } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchElementQuery.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchElementQuery.java index 105632c9cfc..6637cd16972 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchElementQuery.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchElementQuery.java @@ -58,7 +58,7 @@ public class PDOMSearchElementQuery extends PDOMSearchQuery { public String getLabel() { if (element instanceof ICElement) - return super.getLabel() + " " + ((ICElement)element).getElementName(); + return super.getLabel() + " " + ((ICElement)element).getElementName(); //$NON-NLS-1$ else return super.getLabel() + " something."; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchPage.java index 4db3fc1e7bc..2b8dfaf2ca3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchPage.java @@ -491,7 +491,7 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage { IDialogSettings settings = getDialogSettings(); - int searchFlags = PDOMSearchPatternQuery.FIND_ALL_TYPES | PDOMSearchPatternQuery.FIND_ALL_OCCURANCES; + int searchFlags = PDOMSearchPatternQuery.FIND_ALL_TYPES | PDOMSearchQuery.FIND_ALL_OCCURANCES; try { searchFlags = settings.getInt(STORE_SEARCH_FLAGS); } catch (NumberFormatException e) { @@ -580,7 +580,7 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage { } } - if ((searchFlags & PDOMSearchPatternQuery.FIND_ALL_OCCURANCES) == PDOMSearchPatternQuery.FIND_ALL_OCCURANCES) { + if ((searchFlags & PDOMSearchQuery.FIND_ALL_OCCURANCES) == PDOMSearchQuery.FIND_ALL_OCCURANCES) { limitToButtons[limitToAllButtonIndex].setSelection(true); } else { limitToButtons[limitToAllButtonIndex].setSelection(false); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchQuery.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchQuery.java index f5cd441f825..7bc559e5eb3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchQuery.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchQuery.java @@ -119,7 +119,7 @@ public abstract class PDOMSearchQuery implements ISearchQuery { IPDOMManager manager = CCorePlugin.getPDOMManager(); for (int i = 0; i < projects.length; ++i) { PDOM pdom = (PDOM)manager.getPDOM(projects[i]); - PDOMBinding pdomBinding = (PDOMBinding)pdom.getLinkage(language).adaptBinding(binding); + PDOMBinding pdomBinding = pdom.getLinkage(language).adaptBinding(binding); if (pdomBinding != null) { if ((flags & FIND_DECLARATIONS) != 0) { collectNames(pdomBinding.getFirstDeclaration()); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchTextSelectionQuery.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchTextSelectionQuery.java index bfb854a409d..8af08c49db5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchTextSelectionQuery.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchTextSelectionQuery.java @@ -57,7 +57,7 @@ public class PDOMSearchTextSelectionQuery extends PDOMSearchQuery { } public String getLabel() { - return super.getLabel() + " " + selection.getText(); + return super.getLabel() + " " + selection.getText(); //$NON-NLS-1$ } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsAction.java index 9f46abbb85f..3d12e0df67b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsAction.java @@ -22,8 +22,8 @@ public class FindDeclarationsAction extends FindAction { public FindDeclarationsAction(CEditor editor, String label, String tooltip){ super(editor); - setText(label); //$NON-NLS-1$ - setToolTipText(tooltip); //$NON-NLS-1$ + setText(label); + setToolTipText(tooltip); } public FindDeclarationsAction(CEditor editor){ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsInWorkingSetAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsInWorkingSetAction.java index 9ba0442278b..72df1044d6e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsInWorkingSetAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsInWorkingSetAction.java @@ -47,14 +47,14 @@ public class FindDeclarationsInWorkingSetAction extends FindAction { public FindDeclarationsInWorkingSetAction(CEditor editor, String label, String tooltip){ super(editor); - setText(label); //$NON-NLS-1$ - setToolTipText(tooltip); //$NON-NLS-1$ + setText(label); + setToolTipText(tooltip); } public FindDeclarationsInWorkingSetAction(IWorkbenchSite site,String label, String tooltip){ super(site); - setText(label); //$NON-NLS-1$ - setToolTipText(tooltip); //$NON-NLS-1$ + setText(label); + setToolTipText(tooltip); } protected String getScopeDescription() { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsProjectAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsProjectAction.java index 0d3966cf2e2..6e5135a840e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsProjectAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsProjectAction.java @@ -25,8 +25,8 @@ public class FindDeclarationsProjectAction extends FindAction { public FindDeclarationsProjectAction(CEditor editor, String label, String tooltip){ super(editor); - setText(label); //$NON-NLS-1$ - setToolTipText(tooltip); //$NON-NLS-1$ + setText(label); + setToolTipText(tooltip); } public FindDeclarationsProjectAction(CEditor editor){ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsAction.java index 7a8d8ebd70c..dd48ba74f95 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsAction.java @@ -32,8 +32,8 @@ public class FindRefsAction extends FindAction { public FindRefsAction(CEditor editor, String label, String tooltip) { super(editor); - setText(label); //$NON-NLS-1$ - setToolTipText(tooltip); //$NON-NLS-1$ + setText(label); + setToolTipText(tooltip); } public FindRefsAction(IWorkbenchSite site, String label, String tooltip) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsInWorkingSetAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsInWorkingSetAction.java index ae5f3b11956..793a45ae44d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsInWorkingSetAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsInWorkingSetAction.java @@ -48,13 +48,13 @@ public class FindRefsInWorkingSetAction extends FindAction { public FindRefsInWorkingSetAction(CEditor editor, String label, String tooltip) { super(editor); - setText(label); //$NON-NLS-1$ - setToolTipText(tooltip); //$NON-NLS-1$ + setText(label); + setToolTipText(tooltip); } public FindRefsInWorkingSetAction(IWorkbenchSite site, String label, String tooltip) { super(site); - setText(label); //$NON-NLS-1$ + setText(label); setToolTipText(tooltip); //$NON-NLS-1 } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsProjectAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsProjectAction.java index 6d890547c77..f3c32835974 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsProjectAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsProjectAction.java @@ -25,8 +25,8 @@ public class FindRefsProjectAction extends FindAction { public FindRefsProjectAction(CEditor editor, String label, String tooltip){ super(editor); - setText(label); //$NON-NLS-1$ - setToolTipText(tooltip); //$NON-NLS-1$ + setText(label); + setToolTipText(tooltip); } public FindRefsProjectAction(CEditor editor){ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionParseAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionParseAction.java index fd7fed1a295..d0b78edf42c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionParseAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionParseAction.java @@ -160,7 +160,7 @@ public class SelectionParseAction extends Action { statusManager = ((IEditorSite) fSite).getActionBars().getStatusLineManager(); } if( statusManager != null ) - statusManager.setErrorMessage(CSearchMessages.getString(message));//$NON-NLS-1$ + statusManager.setErrorMessage(CSearchMessages.getString(message)); } }); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/WorkingSetFindAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/WorkingSetFindAction.java index 5bb9f841a4f..de42211bdce 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/WorkingSetFindAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/WorkingSetFindAction.java @@ -27,13 +27,13 @@ public class WorkingSetFindAction extends FindAction { public WorkingSetFindAction(CEditor editor, FindAction action, String string) { super ( editor ); this.findAction = action; - setText(string); //$NON-NLS-1$ + setText(string); } public WorkingSetFindAction(IWorkbenchSite site,FindAction action, String string) { super(site); this.findAction = action; - setText(string); //$NON-NLS-1$ + setText(string); } protected String getScopeDescription() { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconcilingStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconcilingStrategy.java index 2ca69aca730..ca4b68191f1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconcilingStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconcilingStrategy.java @@ -81,7 +81,7 @@ public class CReconcilingStrategy implements IReconcilingStrategy { IDocument doc = fEditor.getDocumentProvider().getDocument(fEditor.getEditorInput()); if ((doc != null) && (!CWordFinder.isGlobal(doc, dOff))) { - String s = ""; + String s = ""; //$NON-NLS-1$ if (dirtyRegion.getType().charAt(2) == 'i') { // insert operation s = dirtyRegion.getText(); if (!CWordFinder.hasCBraces(s)) { 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 d8af6d5f421..1761ffab1e5 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 @@ -280,7 +280,7 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration { // prefix[0] is either '\t' or ' ' x tabWidth, depending on useSpaces int tabWidth= getTabWidth(sourceViewer); - boolean useSpaces= getPreferenceStore().getBoolean(CEditor.SPACES_FOR_TABS); //$NON-NLS-1$ + boolean useSpaces= getPreferenceStore().getBoolean(CEditor.SPACES_FOR_TABS); for (int i= 0; i <= tabWidth; i++) { StringBuffer prefix= new StringBuffer(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistPreference.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistPreference.java index eacd664699f..e0ed2e82f50 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistPreference.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistPreference.java @@ -64,7 +64,7 @@ public class ContentAssistPreference { /** Preference key for completion search scope */ public final static String PROJECT_SEARCH_SCOPE= "content_assist_project_search_scope"; //$NON-NLS-1$ /** Preference key for completion filtering */ - public final static String PROPOSALS_FILTER= "content_assist_proposal_filter"; //$NON_NLS 1$ + public final static String PROPOSALS_FILTER= "content_assist_proposal_filter"; //$NON-NLS-1$ private static Color getColor(IPreferenceStore store, String key, IColorManager manager) { RGB rgb= PreferenceConverter.getColor(store, key); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionContributor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionContributor.java index 37cac9964a4..36bd8364e85 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionContributor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionContributor.java @@ -35,6 +35,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType; import org.eclipse.cdt.core.dom.ast.cpp.ICPPDelegate; import org.eclipse.cdt.core.dom.ast.cpp.ICPPField; import org.eclipse.cdt.core.dom.ast.cpp.ICPPFunctionTemplate; +import org.eclipse.cdt.core.dom.ast.cpp.ICPPMember; import org.eclipse.cdt.core.dom.ast.cpp.ICPPNamespace; import org.eclipse.cdt.core.dom.ast.cpp.ICPPUsingDeclaration; import org.eclipse.cdt.core.model.IWorkingCopy; @@ -290,10 +291,10 @@ public class DOMCompletionContributor implements ICompletionContributor { imageDescriptor = CElementImageProvider.getFunctionImageDescriptor(); } else if (binding instanceof ICPPField) { switch (((ICPPField)binding).getVisibility()) { - case ICPPField.v_private: + case ICPPMember.v_private: imageDescriptor = CElementImageProvider.getFieldImageDescriptor(ASTAccessVisibility.PRIVATE); break; - case ICPPField.v_protected: + case ICPPMember.v_protected: imageDescriptor = CElementImageProvider.getFieldImageDescriptor(ASTAccessVisibility.PROTECTED); break; default: diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java index 279b0453a49..b85a61e962b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/EditorUtility.java @@ -188,7 +188,7 @@ public class EditorUtility { MessageBox errorMsg = new MessageBox(CUIPlugin.getActiveWorkbenchShell(), SWT.ICON_ERROR | SWT.OK); errorMsg.setText(CUIPlugin.getResourceString("EditorUtility.closedproject")); //$NON-NLS-1$ String desc= CUIPlugin.getResourceString("Editorutility.closedproject.description"); //$NON-NLS-1$ - errorMsg.setMessage (MessageFormat.format(desc, new Object[]{project.getName()})); //$NON-NLS-1$ + errorMsg.setMessage (MessageFormat.format(desc, new Object[]{project.getName()})); errorMsg.open(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java index a93c99e86a7..11a11053051 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassCodeGenerator.java @@ -65,11 +65,11 @@ public class NewClassCodeGenerator { private static final long serialVersionUID = 1L; public CodeGeneratorException(String message) { - super(new Status(Status.ERROR, CUIPlugin.getPluginId(), IStatus.OK, message, null)); + super(new Status(IStatus.ERROR, CUIPlugin.getPluginId(), IStatus.OK, message, null)); } public CodeGeneratorException(Throwable e) { - super(new Status(Status.ERROR, CUIPlugin.getPluginId(), IStatus.OK, e.getMessage(), e)); + super(new Status(IStatus.ERROR, CUIPlugin.getPluginId(), IStatus.OK, e.getMessage(), e)); } } @@ -832,14 +832,14 @@ public class NewClassCodeGenerator { StringBuffer buf = new StringBuffer(); buf.append("#include "); //$NON-NLS-1$ if (isSystemInclude) - buf.append('<'); //$NON-NLS-1$ + buf.append('<'); else - buf.append('\"'); //$NON-NLS-1$ + buf.append('\"'); buf.append(fileName); if (isSystemInclude) - buf.append('>'); //$NON-NLS-1$ + buf.append('>'); else - buf.append('\"'); //$NON-NLS-1$ + buf.append('\"'); return buf.toString(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/SourceFileSelectionDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/SourceFileSelectionDialog.java index 7eaad468144..1e7f5d7e147 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/SourceFileSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/SourceFileSelectionDialog.java @@ -318,7 +318,7 @@ public class SourceFileSelectionDialog extends SelectionStatusDialog { } ICElement e = CoreModel.getDefault().create(res.getFullPath()); if (e instanceof ITranslationUnit) { - existingFile = (ITranslationUnit) e; + existingFile = e; } if (existingFile == null) { status.setError(NewClassWizardMessages.getFormattedString("SourceFileSelectionDialog.error.NotASourceFile", str)); //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/MemberFilterActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/MemberFilterActionGroup.java index 7fa62574c1a..5d28556049e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/MemberFilterActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/MemberFilterActionGroup.java @@ -106,7 +106,7 @@ public class MemberFilterActionGroup extends ActionGroup { MemberFilterAction hideFields= new MemberFilterAction(this, title, FILTER_FIELDS, helpContext, doHideFields); hideFields.setDescription(ActionMessages.getString("MemberFilterActionGroup.hide_fields.description")); //$NON-NLS-1$ hideFields.setToolTipText(ActionMessages.getString("MemberFilterActionGroup.hide_fields.tooltip")); //$NON-NLS-1$ - CPluginImages.setImageDescriptors(hideFields, CPluginImages.T_LCL, CPluginImages.IMG_ACTION_SHOW_FIELDS); //$NON-NLS-1$ + CPluginImages.setImageDescriptors(hideFields, CPluginImages.T_LCL, CPluginImages.IMG_ACTION_SHOW_FIELDS); // static title= ActionMessages.getString("MemberFilterActionGroup.hide_static.label"); //$NON-NLS-1$ @@ -114,7 +114,7 @@ public class MemberFilterActionGroup extends ActionGroup { MemberFilterAction hideStatic= new MemberFilterAction(this, title, FILTER_STATIC, helpContext, doHideStatic); hideStatic.setDescription(ActionMessages.getString("MemberFilterActionGroup.hide_static.description")); //$NON-NLS-1$ hideStatic.setToolTipText(ActionMessages.getString("MemberFilterActionGroup.hide_static.tooltip")); //$NON-NLS-1$ - CPluginImages.setImageDescriptors(hideStatic, CPluginImages.T_LCL, CPluginImages.IMG_ACTION_SHOW_STATIC); //$NON-NLS-1$ + CPluginImages.setImageDescriptors(hideStatic, CPluginImages.T_LCL, CPluginImages.IMG_ACTION_SHOW_STATIC); // non-public title= ActionMessages.getString("MemberFilterActionGroup.hide_nonpublic.label"); //$NON-NLS-1$ @@ -122,7 +122,7 @@ public class MemberFilterActionGroup extends ActionGroup { MemberFilterAction hideNonPublic= new MemberFilterAction(this, title, FILTER_NONPUBLIC, helpContext, doHidePublic); hideNonPublic.setDescription(ActionMessages.getString("MemberFilterActionGroup.hide_nonpublic.description")); //$NON-NLS-1$ hideNonPublic.setToolTipText(ActionMessages.getString("MemberFilterActionGroup.hide_nonpublic.tooltip")); //$NON-NLS-1$ - CPluginImages.setImageDescriptors(hideNonPublic, CPluginImages.T_LCL, CPluginImages.IMG_ACTION_SHOW_PUBLIC); //$NON-NLS-1$ + CPluginImages.setImageDescriptors(hideNonPublic, CPluginImages.T_LCL, CPluginImages.IMG_ACTION_SHOW_PUBLIC); // order corresponds to order in toolbar fFilterActions= new MemberFilterAction[] { hideFields, hideStatic, hideNonPublic }; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java index 05c507ca61b..ab84aa3c804 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java @@ -111,7 +111,7 @@ public abstract class AbstractErrorParserBlock extends AbstractCOptionPage { */ public String getText(Object element) { String name = (String)mapParsers.get(element.toString()); - return name != null ? name : element.toString(); //$NON-NLS-1$ + return name != null ? name : element.toString(); } }; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassCreationWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassCreationWizardPage.java index 779fe5131af..0d50cd63803 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassCreationWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassCreationWizardPage.java @@ -1310,7 +1310,7 @@ public class NewClassCreationWizardPage extends NewElementWizardPage { } } ++count; - currName = className + separator + count; //$NON-NLS-1$ + currName = className + separator + count; } } @@ -1564,7 +1564,7 @@ public class NewClassCreationWizardPage extends NewElementWizardPage { } IQualifiedTypeName typeName = new QualifiedTypeName(className); - if (typeName.isQualified()) { //$NON-NLS-1$ + if (typeName.isQualified()) { status.setError(NewClassWizardMessages.getString("NewClassCreationWizardPage.error.QualifiedClassName")); //$NON-NLS-1$ return status; }