diff options
2 files changed, 3 insertions, 32 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java index a59d13da68d..e770b48d5a0 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java @@ -313,24 +313,14 @@ public class ManagedBuildManager extends AbstractCExtension { e.printStackTrace(); } - // Get the project types for this project and all referenced projects - List<IProjectType> definedTypes = null; - // To Do - // Create the array and copy the elements over int size = projectTypes != null ? projectTypes.size() : 0; - size += definedTypes != null ? definedTypes.size() : 0; IProjectType[] types = new IProjectType[size]; - if (size > 0) { - int n = 0; - for (int i = 0; i < projectTypes.size(); i++) - types[n++] = projectTypes.get(i); - - if (definedTypes != null) - for (int i = 0; i < definedTypes.size(); i++) - types[n++] = definedTypes.get(i); + int n = 0; + for (IProjectType type : projectTypes) { + types[n++] = type; } return types; @@ -1951,8 +1941,6 @@ public class ManagedBuildManager extends AbstractCExtension { // o The major versions are equal, but the remainder of the .cdtbuild version # is // greater than the MBS version # boolean compatible = false; - if (version == null) - compatible = false; if (buildInfoVersion.getMajor() != version.getMajor()) compatible = false; if (buildInfoVersion.getMinor() > version.getMinor()) diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLookupParticipant.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLookupParticipant.java index 0b31d12fbee..6265d555a9a 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLookupParticipant.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceLookupParticipant.java @@ -25,9 +25,7 @@ import java.util.Map; import org.eclipse.cdt.debug.core.sourcelookup.AbsolutePathSourceContainer; import org.eclipse.cdt.debug.core.sourcelookup.ISourceLookupChangeListener; import org.eclipse.cdt.debug.internal.core.ListenerList; -import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; -import org.eclipse.debug.core.model.IBreakpoint; import org.eclipse.debug.core.model.IDebugElement; import org.eclipse.debug.core.sourcelookup.AbstractSourceLookupParticipant; import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector; @@ -77,7 +75,6 @@ public class CSourceLookupParticipant extends AbstractSourceLookupParticipant { // Workaround for cases when the stack frame doesn't contain the source file name String name = null; - IBreakpoint breakpoint = null; if (object instanceof String) { name = (String) object; } @@ -96,20 +93,6 @@ public class CSourceLookupParticipant extends AbstractSourceLookupParticipant { } } - // Source lookup participant order is preserved where possible except for one case: - // - If we've stopped at a breakpoint the user has made on an IResource, we definitely want to show - // that IResource before others - if (breakpoint != null && breakpoint.getMarker() != null && breakpoint.getMarker().getResource() != null) { - IResource breakpointResource = breakpoint.getMarker().getResource(); - for (int i = 0; i < foundElements.length; i++) { - if (foundElements[i].equals(breakpointResource)) { - Object temp = foundElements[0]; - foundElements[0] = foundElements[i]; - foundElements[i] = temp; - break; - } - } - } fCachedResults.put(object, foundElements); return foundElements; } |