mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-08 10:16:03 +02:00
Cosmetics.
This commit is contained in:
parent
a39fe6b4b2
commit
a54b8f71ac
1 changed files with 55 additions and 57 deletions
|
@ -151,14 +151,14 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage {
|
|||
private IStatusLineManager fLineManager;
|
||||
|
||||
private static ICProject getProject(Object object) {
|
||||
if (object instanceof ICElement)
|
||||
if (object instanceof ICElement) {
|
||||
return ((ICElement) object).getCProject();
|
||||
else if (object instanceof IResource) {
|
||||
} else if (object instanceof IResource) {
|
||||
return CoreModel.getDefault().create(((IResource) object).getProject());
|
||||
}
|
||||
else
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public boolean performAction() {
|
||||
fLineManager.setErrorMessage(null);
|
||||
|
@ -170,9 +170,9 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage {
|
|||
|
||||
// Get search flags
|
||||
int searchFlags = 0;
|
||||
if (searchForButtons[searchAllButtonIndex].getSelection())
|
||||
if (searchForButtons[searchAllButtonIndex].getSelection()) {
|
||||
searchFlags |= PDOMSearchPatternQuery.FIND_ALL_TYPES;
|
||||
else {
|
||||
} else {
|
||||
for (int i = 0; i < searchForButtons.length; ++i) {
|
||||
if (searchForButtons[i].getSelection())
|
||||
searchFlags |= ((Integer)searchForButtons[i].getData()).intValue();
|
||||
|
@ -202,11 +202,12 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage {
|
|||
scopeDescription = CSearchMessages.SelectionScope;
|
||||
for (Iterator<?> i = structuredSelection.iterator(); i.hasNext();) {
|
||||
Object obj = i.next();
|
||||
if (obj instanceof IResource)
|
||||
if (obj instanceof IResource) {
|
||||
elements.add(CoreModel.getDefault().create((IResource)obj));
|
||||
else if (obj instanceof ICElement)
|
||||
} else if (obj instanceof ICElement) {
|
||||
elements.add(obj);
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
@ -228,10 +229,8 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage {
|
|||
break;
|
||||
}
|
||||
|
||||
ICElement[] scope
|
||||
= elements.isEmpty()
|
||||
? null
|
||||
: elements.toArray(new ICElement[elements.size()]);
|
||||
ICElement[] scope = elements.isEmpty() ?
|
||||
null : elements.toArray(new ICElement[elements.size()]);
|
||||
|
||||
try {
|
||||
PDOMSearchPatternQuery job = new PDOMSearchPatternQuery(scope, scopeDescription, patternStr,
|
||||
|
@ -249,9 +248,9 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage {
|
|||
IDialogSettings settings = getDialogSettings();
|
||||
settings.put(STORE_CASE_SENSITIVE, isCaseSensitive);
|
||||
|
||||
if (previousPatterns == null)
|
||||
if (previousPatterns == null) {
|
||||
previousPatterns = new String[] { patternStr };
|
||||
else {
|
||||
} else {
|
||||
// Add only if we don't have it already
|
||||
boolean addit = true;
|
||||
for (int i = 0; i < previousPatterns.length; ++i) {
|
||||
|
@ -315,8 +314,7 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage {
|
|||
IWorkbenchPartSite workbenchSite = page.getActivePart().getSite();
|
||||
if (workbenchSite instanceof IViewSite){
|
||||
return ((IViewSite) workbenchSite).getActionBars().getStatusLineManager();
|
||||
}
|
||||
else if (workbenchSite instanceof IEditorSite){
|
||||
} else if (workbenchSite instanceof IEditorSite){
|
||||
return ((IEditorSite) workbenchSite).getActionBars().getStatusLineManager();
|
||||
}
|
||||
}
|
||||
|
@ -525,11 +523,12 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage {
|
|||
|
||||
// Need a type
|
||||
boolean any = false;
|
||||
for (int i = 0; i < searchForButtons.length; ++i)
|
||||
for (int i = 0; i < searchForButtons.length; ++i) {
|
||||
if (searchForButtons[i].getSelection()) {
|
||||
any = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!any)
|
||||
enable = false;
|
||||
|
||||
|
@ -668,5 +667,4 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage {
|
|||
}
|
||||
super.setVisible(visible);
|
||||
}
|
||||
|
||||
}
|
Loading…
Add table
Reference in a new issue