mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 14:42:11 +02:00
Code Issues Wiki Activity

Fix for bugs 140854 and 147296

Browse source
This commit is contained in:
Mikhail Sennikovsky 2006-06-16 10:00:46 +00:00
parent a94a0fef49
commit 74e3308a05
3 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2004, 2005 Intel Corporation and others. * Copyright (c) 2004, 2006 Intel Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -11,6 +11,7 @@
package org.eclipse.cdt.managedbuilder.internal.core; package org.eclipse.cdt.managedbuilder.internal.core;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.SortedMap; import java.util.SortedMap;
import java.util.StringTokenizer; import java.util.StringTokenizer;
@ -830,8 +831,8 @@ public class Builder extends BuildObject implements IBuilder {
String version = ManagedBuildManager String version = ManagedBuildManager
.getVersionFromIdAndVersion(superClassId); .getVersionFromIdAndVersion(superClassId);
IBuilder[] builderElements = (IBuilder[]) subMap.values() Collection c = subMap.values();
.toArray(); IBuilder[] builderElements = (IBuilder[])c.toArray(new IBuilder[c.size()]);
for (int i = 0; i < builderElements.length; i++) { for (int i = 0; i < builderElements.length; i++) {
IBuilder builderElement = builderElements[i]; IBuilder builderElement = builderElements[i];

14
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java
View file

@ -13,6 +13,7 @@ package org.eclipse.cdt.managedbuilder.internal.core;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@ -26,12 +27,12 @@ import org.eclipse.cdt.managedbuilder.core.IBuildObject;
import org.eclipse.cdt.managedbuilder.core.IConfiguration; import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.managedbuilder.core.IEnvVarBuildPath; import org.eclipse.cdt.managedbuilder.core.IEnvVarBuildPath;
import org.eclipse.cdt.managedbuilder.core.IHoldsOptions; import org.eclipse.cdt.managedbuilder.core.IHoldsOptions;
import org.eclipse.cdt.managedbuilder.core.IManagedProject;
import org.eclipse.cdt.managedbuilder.core.IOptionApplicability;
import org.eclipse.cdt.managedbuilder.core.IInputType; import org.eclipse.cdt.managedbuilder.core.IInputType;
import org.eclipse.cdt.managedbuilder.core.IManagedCommandLineGenerator; import org.eclipse.cdt.managedbuilder.core.IManagedCommandLineGenerator;
import org.eclipse.cdt.managedbuilder.core.IManagedConfigElement; import org.eclipse.cdt.managedbuilder.core.IManagedConfigElement;
import org.eclipse.cdt.managedbuilder.core.IManagedProject;
import org.eclipse.cdt.managedbuilder.core.IOption; import org.eclipse.cdt.managedbuilder.core.IOption;
import org.eclipse.cdt.managedbuilder.core.IOptionApplicability;
import org.eclipse.cdt.managedbuilder.core.IOptionCategory; import org.eclipse.cdt.managedbuilder.core.IOptionCategory;
import org.eclipse.cdt.managedbuilder.core.IOutputType; import org.eclipse.cdt.managedbuilder.core.IOutputType;
import org.eclipse.cdt.managedbuilder.core.IProjectType; import org.eclipse.cdt.managedbuilder.core.IProjectType;
@ -49,12 +50,12 @@ import org.eclipse.cdt.managedbuilder.makegen.IManagedDependencyGenerator;
import org.eclipse.cdt.managedbuilder.makegen.IManagedDependencyGeneratorType; import org.eclipse.cdt.managedbuilder.makegen.IManagedDependencyGeneratorType;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ProjectScope; import org.eclipse.core.resources.ProjectScope;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.PluginVersionIdentifier; import org.eclipse.core.runtime.PluginVersionIdentifier;
import org.eclipse.core.runtime.content.IContentType; import org.eclipse.core.runtime.content.IContentType;
@ -2631,14 +2632,15 @@ public class Tool extends HoldsOptions implements ITool, IOptionCategory {
// for each element in the 'subMap', // for each element in the 'subMap',
// check the 'versionsSupported' attribute whether the given // check the 'versionsSupported' attribute whether the given
// builder version is supported // tool version is supported
String baseId = ManagedBuildManager String baseId = ManagedBuildManager
.getIdFromIdAndVersion(superClassId); .getIdFromIdAndVersion(superClassId);
String version = ManagedBuildManager String version = ManagedBuildManager
.getVersionFromIdAndVersion(superClassId); .getVersionFromIdAndVersion(superClassId);
ITool[] toolElements = (ITool[]) subMap.values().toArray(); Collection c = subMap.values();
ITool[] toolElements = (ITool[]) c.toArray(new ITool[c.size()]);
for (int i = 0; i < toolElements.length; i++) { for (int i = 0; i < toolElements.length; i++) {
ITool toolElement = toolElements[i]; ITool toolElement = toolElements[i];

4
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java
View file

@ -11,6 +11,7 @@
package org.eclipse.cdt.managedbuilder.internal.core; package org.eclipse.cdt.managedbuilder.internal.core;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@ -1582,7 +1583,8 @@ public class ToolChain extends HoldsOptions implements IToolChain {
String baseId = ManagedBuildManager.getIdFromIdAndVersion(superClassId); String baseId = ManagedBuildManager.getIdFromIdAndVersion(superClassId);
String version = getVersionFromId().toString(); String version = getVersionFromId().toString();
IToolChain[] toolChainElements = (IToolChain[]) subMap.values().toArray(); Collection c = subMap.values();
IToolChain[] toolChainElements = (IToolChain[]) c.toArray(new IToolChain[c.size()]);
for (int i = 0; i < toolChainElements.length; i++) { for (int i = 0; i < toolChainElements.length; i++) {
IToolChain toolChainElement = toolChainElements[i]; IToolChain toolChainElement = toolChainElements[i];