mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 10:16:03 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2010-05-09 03:33:17 +00:00
parent a39fe6b4b2
commit a54b8f71ac
1 changed files with 55 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchPage.java
View file

@ -151,14 +151,14 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage {
private IStatusLineManager fLineManager; private IStatusLineManager fLineManager;
private static ICProject getProject(Object object) { private static ICProject getProject(Object object) {
if (object instanceof ICElement) if (object instanceof ICElement) {
return ((ICElement) object).getCProject(); return ((ICElement) object).getCProject();
else if (object instanceof IResource) { } else if (object instanceof IResource) {
return CoreModel.getDefault().create(((IResource) object).getProject()); return CoreModel.getDefault().create(((IResource) object).getProject());
} } else {
else
return null; return null;
} }
}
public boolean performAction() { public boolean performAction() {
fLineManager.setErrorMessage(null); fLineManager.setErrorMessage(null);
@ -170,9 +170,9 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage {
// Get search flags // Get search flags
int searchFlags = 0; int searchFlags = 0;
if (searchForButtons[searchAllButtonIndex].getSelection()) if (searchForButtons[searchAllButtonIndex].getSelection()) {
searchFlags |= PDOMSearchPatternQuery.FIND_ALL_TYPES; searchFlags |= PDOMSearchPatternQuery.FIND_ALL_TYPES;
else { } else {
for (int i = 0; i < searchForButtons.length; ++i) { for (int i = 0; i < searchForButtons.length; ++i) {
if (searchForButtons[i].getSelection()) if (searchForButtons[i].getSelection())
searchFlags |= ((Integer)searchForButtons[i].getData()).intValue(); searchFlags |= ((Integer)searchForButtons[i].getData()).intValue();
@ -202,11 +202,12 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage {
scopeDescription = CSearchMessages.SelectionScope; scopeDescription = CSearchMessages.SelectionScope;
for (Iterator<?> i = structuredSelection.iterator(); i.hasNext();) { for (Iterator<?> i = structuredSelection.iterator(); i.hasNext();) {
Object obj = i.next(); Object obj = i.next();
if (obj instanceof IResource) if (obj instanceof IResource) {
elements.add(CoreModel.getDefault().create((IResource)obj)); elements.add(CoreModel.getDefault().create((IResource)obj));
else if (obj instanceof ICElement) } else if (obj instanceof ICElement) {
elements.add(obj); elements.add(obj);
} }
}
break; break;
} }
break; break;
@ -228,10 +229,8 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage {
break; break;
} }
ICElement[] scope ICElement[] scope = elements.isEmpty() ?
= elements.isEmpty() null : elements.toArray(new ICElement[elements.size()]);
? null
: elements.toArray(new ICElement[elements.size()]);
try { try {
PDOMSearchPatternQuery job = new PDOMSearchPatternQuery(scope, scopeDescription, patternStr, PDOMSearchPatternQuery job = new PDOMSearchPatternQuery(scope, scopeDescription, patternStr,
@ -249,9 +248,9 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage {
IDialogSettings settings = getDialogSettings(); IDialogSettings settings = getDialogSettings();
settings.put(STORE_CASE_SENSITIVE, isCaseSensitive); settings.put(STORE_CASE_SENSITIVE, isCaseSensitive);
if (previousPatterns == null) if (previousPatterns == null) {
previousPatterns = new String[] { patternStr }; previousPatterns = new String[] { patternStr };
else { } else {
// Add only if we don't have it already // Add only if we don't have it already
boolean addit = true; boolean addit = true;
for (int i = 0; i < previousPatterns.length; ++i) { for (int i = 0; i < previousPatterns.length; ++i) {
@ -315,8 +314,7 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage {
IWorkbenchPartSite workbenchSite = page.getActivePart().getSite(); IWorkbenchPartSite workbenchSite = page.getActivePart().getSite();
if (workbenchSite instanceof IViewSite){ if (workbenchSite instanceof IViewSite){
return ((IViewSite) workbenchSite).getActionBars().getStatusLineManager(); return ((IViewSite) workbenchSite).getActionBars().getStatusLineManager();
} } else if (workbenchSite instanceof IEditorSite){
else if (workbenchSite instanceof IEditorSite){
return ((IEditorSite) workbenchSite).getActionBars().getStatusLineManager(); return ((IEditorSite) workbenchSite).getActionBars().getStatusLineManager();
} }
} }
@ -525,11 +523,12 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage {
// Need a type // Need a type
boolean any = false; boolean any = false;
for (int i = 0; i < searchForButtons.length; ++i) for (int i = 0; i < searchForButtons.length; ++i) {
if (searchForButtons[i].getSelection()) { if (searchForButtons[i].getSelection()) {
any = true; any = true;
break; break;
} }
}
if (!any) if (!any)
enable = false; enable = false;
@ -668,5 +667,4 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage {
} }
super.setVisible(visible); super.setVisible(visible);
} }
} }