org.eclipse.cdt
cdt-parent
- 8.5.0-SNAPSHOT
+ 8.6.0-SNAPSHOT
../../pom.xml
diff -Nru eclipse-cdt-8.5.0/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/actions/RunCodeAnalysis.java eclipse-cdt-8.6.0/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/actions/RunCodeAnalysis.java
--- eclipse-cdt-8.5.0/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/actions/RunCodeAnalysis.java 2014-09-17 20:29:37.000000000 +0000
+++ eclipse-cdt-8.6.0/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/actions/RunCodeAnalysis.java 2015-02-11 19:19:10.000000000 +0000
@@ -38,35 +38,36 @@
@Override
public void run(IAction action) {
- Job job = new Job(CodanUIMessages.Job_TitleRunningAnalysis) {
- @SuppressWarnings("unchecked")
- @Override
- protected IStatus run(final IProgressMonitor monitor) {
- IStructuredSelection ss = (IStructuredSelection) sel;
- int count = ss.size();
- monitor.beginTask(getName(), count * 100);
- if (monitor.isCanceled())
- return Status.CANCEL_STATUS;
- for (Iterator iterator = ss.iterator(); iterator.hasNext();) {
- Object o = iterator.next();
- if (o instanceof IAdaptable) {
- o = ((IAdaptable) o).getAdapter(IResource.class);
- }
- if (o instanceof IResource) {
- IResource res = (IResource) o;
- SubProgressMonitor subMon = new SubProgressMonitor(monitor, 100);
- CodanRuntime.getInstance().getBuilder().processResource(res, subMon, CheckerLaunchMode.RUN_ON_DEMAND);
- if (subMon.isCanceled())
- return Status.CANCEL_STATUS;
- }
+ if (sel instanceof IStructuredSelection) {
+ final IStructuredSelection ss = (IStructuredSelection) sel;
+ Job job = new Job(CodanUIMessages.Job_TitleRunningAnalysis) {
+ @Override
+ protected IStatus run(final IProgressMonitor monitor) {
+ int count = ss.size();
+ monitor.beginTask(getName(), count * 100);
if (monitor.isCanceled())
return Status.CANCEL_STATUS;
+ for (Iterator iterator = ss.iterator(); iterator.hasNext();) {
+ Object o = iterator.next();
+ if (o instanceof IAdaptable) {
+ o = ((IAdaptable) o).getAdapter(IResource.class);
+ }
+ if (o instanceof IResource) {
+ IResource res = (IResource) o;
+ SubProgressMonitor subMon = new SubProgressMonitor(monitor, 100);
+ CodanRuntime.getInstance().getBuilder().processResource(res, subMon, CheckerLaunchMode.RUN_ON_DEMAND);
+ if (subMon.isCanceled())
+ return Status.CANCEL_STATUS;
+ }
+ if (monitor.isCanceled())
+ return Status.CANCEL_STATUS;
+ }
+ return Status.OK_STATUS;
}
- return Status.OK_STATUS;
- }
- };
- job.setUser(true);
- job.schedule();
+ };
+ job.setUser(true);
+ job.schedule();
+ }
}
@Override
diff -Nru eclipse-cdt-8.5.0/codan/org.eclipse.cdt.codan.ui.cfgview/src/org/eclipse/cdt/codan/ui/cfgview/views/ControlFlowGraphView.java eclipse-cdt-8.6.0/codan/org.eclipse.cdt.codan.ui.cfgview/src/org/eclipse/cdt/codan/ui/cfgview/views/ControlFlowGraphView.java
--- eclipse-cdt-8.5.0/codan/org.eclipse.cdt.codan.ui.cfgview/src/org/eclipse/cdt/codan/ui/cfgview/views/ControlFlowGraphView.java 2014-09-17 20:29:37.000000000 +0000
+++ eclipse-cdt-8.6.0/codan/org.eclipse.cdt.codan.ui.cfgview/src/org/eclipse/cdt/codan/ui/cfgview/views/ControlFlowGraphView.java 2015-02-11 19:19:10.000000000 +0000
@@ -86,6 +86,7 @@
* are presented in the same way everywhere.
*
*/
+@SuppressWarnings("restriction")
public class ControlFlowGraphView extends ViewPart {
/**
* The ID of the view as specified by the extension.
@@ -123,20 +124,26 @@
if (parent instanceof Collection) {
return ((Collection) parent).toArray();
} else if (parent instanceof IControlFlowGraph) {
- Collection blocks = getFlat(((IControlFlowGraph) parent).getStartNode(), new ArrayList());
+ IControlFlowGraph cfg = (IControlFlowGraph) parent;
+ Collection blocks = getFlat(cfg.getStartNode(), new ArrayList());
DeadNodes dead = new DeadNodes();
- Iterator iter = ((IControlFlowGraph) parent).getUnconnectedNodeIterator();
+ Iterator iter = cfg.getUnconnectedNodeIterator();
for (; iter.hasNext();) {
IBasicBlock iBasicBlock = iter.next();
dead.add(iBasicBlock);
}
- ArrayList all = new ArrayList();
+ ArrayList