mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2011-10-01 18:56:48 -07:00
parent aa09934d72
commit 5f065af0d8
5 changed files with 36 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/includebrowser/BasicIncludeBrowserTest.java
View file

@ -34,7 +34,6 @@ public class BasicIncludeBrowserTest extends IncludeBrowserBaseTest {
return suite(BasicIncludeBrowserTest.class);
}
// // source
// #include "user.h"
// #include <system.h>
@ -55,7 +54,7 @@ public class BasicIncludeBrowserTest extends IncludeBrowserBaseTest {
checkTreeNode(tree, 0, 0, "user.h");
checkTreeNode(tree, 0, 1, "system.h");
// the tree has to be reversed
// The tree has to be reversed
openIncludeBrowser(user, true);
checkTreeNode(tree, 0, "user.h");
checkTreeNode(tree, 0, 0, "source.cpp");
@ -89,7 +88,7 @@ public class BasicIncludeBrowserTest extends IncludeBrowserBaseTest {
checkTreeNode(tree, 0, 0, "user.h");
checkTreeNode(tree, 0, 1, "system.h");
// the tree has to be reversed
// The tree has to be reversed
openIncludeBrowser(user, true);
checkTreeNode(tree, 0, "user.h");
checkTreeNode(tree, 0, 0, "source.cpp");
@ -97,10 +96,8 @@ public class BasicIncludeBrowserTest extends IncludeBrowserBaseTest {
openIncludeBrowser(system);
checkTreeNode(tree, 0, "system.h");
checkTreeNode(tree, 0, 0, "source.cpp");
} finally {
CProjectHelper.delete(op);
}
}
}

27
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBContentProvider.java
View file

@ -34,7 +34,6 @@ import org.eclipse.cdt.internal.ui.viewsupport.AsyncTreeContentProvider;
* This is the content provider for the include browser.
*/
public class IBContentProvider extends AsyncTreeContentProvider {
private static final IProgressMonitor NPM = new NullProgressMonitor();
private boolean fComputeIncludedBy = true;
@ -66,7 +65,7 @@ public class IBContentProvider extends AsyncTreeContentProvider {
return NO_CHILDREN;
}
}
// allow for async computation
// Allow for asynchronous computation
return null;
}
@ -98,8 +97,7 @@ public class IBContentProvider extends AsyncTreeContentProvider {
IIndexInclude[] includes;
if (fComputeIncludedBy) {
includes= findIncludedBy(index, ifl, NPM);
}
else {
} else {
includes= findIncludesTo(index, ifl, NPM);
directiveFile= node.getRepresentedFile();
}
@ -110,13 +108,11 @@ public class IBContentProvider extends AsyncTreeContentProvider {
try {
if (fComputeIncludedBy) {
directiveFile= targetFile= new IBFile(project, include.getIncludedByLocation());
}
else {
} else {
IIndexFileLocation includesPath= include.getIncludesLocation();
if (includesPath == null) {
targetFile= new IBFile(include.getFullName());
}
else {
} else {
targetFile= new IBFile(project, includesPath);
}
}
@ -127,24 +123,20 @@ public class IBContentProvider extends AsyncTreeContentProvider {
newnode.setIsActiveCode(include.isActive());
newnode.setIsSystemInclude(include.isSystemInclude());
result.add(newnode);
}
catch (CoreException e) {
} catch (CoreException e) {
CUIPlugin.log(e);
}
}
return result.toArray();
}
}
finally {
} finally {
index.releaseReadLock();
}
}
return NO_CHILDREN;
}
public void setComputeIncludedBy(boolean value) {
fComputeIncludedBy = value;
}
@ -153,7 +145,6 @@ public class IBContentProvider extends AsyncTreeContentProvider {
return fComputeIncludedBy;
}
private IIndexInclude[] findIncludedBy(IIndex index, IIndexFileLocation ifl, IProgressMonitor pm) {
try {
if (ifl != null) {
@ -176,8 +167,7 @@ public class IBContentProvider extends AsyncTreeContentProvider {
return list.toArray(new IIndexInclude[list.size()]);
}
}
}
catch (CoreException e) {
} catch (CoreException e) {
CUIPlugin.log(e);
}
return new IIndexInclude[0];
@ -205,8 +195,7 @@ public class IBContentProvider extends AsyncTreeContentProvider {
return list.toArray(new IIndexInclude[list.size()]);
}
}
}
catch (CoreException e) {
} catch (CoreException e) {
CUIPlugin.log(e);
}
return new IIndexInclude[0];

40
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java
View file

@ -104,9 +104,7 @@ import org.eclipse.cdt.internal.ui.viewsupport.WorkingSetFilterUI;
/**
* The view part for the include browser.
*/
public class IBViewPart extends ViewPart
implements IShowInSource, IShowInTarget, IShowInTargetList {
public class IBViewPart extends ViewPart implements IShowInSource, IShowInTarget, IShowInTargetList {
private static final int MAX_HISTORY_SIZE = 10;
private static final String TRUE = "true"; //$NON-NLS-1$
private static final String FALSE = "false"; //$NON-NLS-1$
@ -183,8 +181,7 @@ public class IBViewPart extends ViewPart
if (CCorePlugin.getIndexManager().isIndexerIdle()) {
setInputIndexerIdle(input);
}
else {
} else {
setMessage(IBMessages.IBViewPart_waitingOnIndexerMessage);
fSetInputJob.setInput(input);
fSetInputJob.schedule();
@ -202,8 +199,7 @@ public class IBViewPart extends ViewPart
fIncludesToAction.setChecked(!isHeader);
fIncludedByAction.setEnabled(false);
updateSorter();
}
else {
} else {
fIncludedByAction.setEnabled(true);
}
fTreeViewer.setInput(input);
@ -349,14 +345,12 @@ public class IBViewPart extends ViewPart
}
}
@Override
public void init(IViewSite site, IMemento memento) throws PartInitException {
fMemento= memento;
super.init(site, memento);
}
@Override
public void saveState(IMemento memento) {
putDialogSettings();
@ -501,8 +495,7 @@ public class IBViewPart extends ViewPart
public void run() {
if (isChecked()) {
fTreeViewer.addFilter(fInactiveFilter);
}
else {
} else {
fTreeViewer.removeFilter(fInactiveFilter);
}
}
@ -525,8 +518,7 @@ public class IBViewPart extends ViewPart
public void run() {
if (isChecked()) {
fTreeViewer.addFilter(fSystemFilter);
}
else {
} else {
fTreeViewer.removeFilter(fSystemFilter);
}
}
@ -675,8 +667,7 @@ public class IBViewPart extends ViewPart
private void updateSorter() {
if (fIncludedByAction.isChecked()) {
fTreeViewer.setComparator(fSorterAlphaNumeric);
}
else {
} else {
fTreeViewer.setComparator(fSorterReferencePosition);
}
}
@ -693,15 +684,13 @@ public class IBViewPart extends ViewPart
file= path.lastSegment() + "(" + path.removeLastSegments(1) + ")"; //$NON-NLS-1$//$NON-NLS-2$
if (fWorkingSetFilter == null) {
scope= IBMessages.IBViewPart_workspaceScope;
}
else {
} else {
scope= fWorkingSetFilter.getLabel();
}
if (fIncludedByAction.isChecked()) {
format= IBMessages.IBViewPart_IncludedByContentDescription;
}
else {
} else {
format= IBMessages.IBViewPart_IncludesToContentDescription;
}
message= Messages.format(format, file, scope);
@ -717,12 +706,10 @@ public class IBViewPart extends ViewPart
fTreeViewer.removeFilter(fWorkingSetFilter);
fWorkingSetFilter= null;
}
}
else {
} else {
if (fWorkingSetFilter != null) {
fTreeViewer.refresh();
}
else {
} else {
fWorkingSetFilter= new IBWorkingSetFilter(filterUI);
fTreeViewer.addFilter(fWorkingSetFilter);
}
@ -777,7 +764,6 @@ public class IBViewPart extends ViewPart
}
});
}
}
}
m.add(new Separator(IContextMenuConstants.GROUP_ADDITIONS));
@ -797,8 +783,7 @@ public class IBViewPart extends ViewPart
IFile f= ibf.getResource();
if (f != null) {
EditorOpener.open(page, f, region, timestamp);
}
else {
} else {
IIndexFileLocation ifl = ibf.getLocation();
if (ifl != null) {
IPath location= IndexLocationFactory.getAbsolutePath(ifl);
@ -807,8 +792,7 @@ public class IBViewPart extends ViewPart
}
}
}
}
else {
} else {
ITranslationUnit tu= IBConversions.selectionToTU(selection);
if (tu != null) {
IResource r= tu.getResource();

3
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IncludeBrowserUI.java
View file

@ -80,8 +80,7 @@ public class IncludeBrowserUI {
return CoreModelUtil.findTranslationUnitForLocation(loc, project);
}
}
}
finally {
} finally {
index.releaseReadLock();
}
}