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

bug 319512: Extracted class MatchKey

Browse source
This commit is contained in:
Andrew Gvozdev 2011-02-17 04:51:38 +00:00
parent 666b5e3edb
commit 6d940840ee
6 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java
View file

@ -81,6 +81,7 @@ import org.eclipse.cdt.managedbuilder.internal.core.ManagedBuildInfo;
import org.eclipse.cdt.managedbuilder.internal.core.ManagedCommandLineGenerator; import org.eclipse.cdt.managedbuilder.internal.core.ManagedCommandLineGenerator;
import org.eclipse.cdt.managedbuilder.internal.core.ManagedMakeMessages; import org.eclipse.cdt.managedbuilder.internal.core.ManagedMakeMessages;
import org.eclipse.cdt.managedbuilder.internal.core.ManagedProject; import org.eclipse.cdt.managedbuilder.internal.core.ManagedProject;
import org.eclipse.cdt.managedbuilder.internal.core.MatchKey;
import org.eclipse.cdt.managedbuilder.internal.core.MultiConfiguration; import org.eclipse.cdt.managedbuilder.internal.core.MultiConfiguration;
import org.eclipse.cdt.managedbuilder.internal.core.MultiFolderInfo; import org.eclipse.cdt.managedbuilder.internal.core.MultiFolderInfo;
import org.eclipse.cdt.managedbuilder.internal.core.MultiResourceInfo; import org.eclipse.cdt.managedbuilder.internal.core.MultiResourceInfo;
@ -4222,7 +4223,7 @@ public class ManagedBuildManager extends AbstractCExtension {
HashMap map = new HashMap(); HashMap map = new HashMap();
for(Iterator iter = elements.iterator(); iter.hasNext();){ for(Iterator iter = elements.iterator(); iter.hasNext();){
IMatchKeyProvider p = (IMatchKeyProvider)iter.next(); IMatchKeyProvider p = (IMatchKeyProvider)iter.next();
Object key = p.getMatchKey(); MatchKey key = p.getMatchKey();
if(key == null) if(key == null)
continue; continue;

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

@ -2322,7 +2322,7 @@ public class Builder extends HoldsOptions implements IBuilder, IMatchKeyProvider
return rBld == ManagedBuildManager.getRealBuilder(builder); return rBld == ManagedBuildManager.getRealBuilder(builder);
} }
public Object getMatchKey() { public MatchKey<Builder> getMatchKey() {
if(isAbstract()) if(isAbstract())
return null; return null;
if(!isExtensionBuilder) if(!isExtensionBuilder)

2
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java
View file

@ -890,7 +890,7 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo {
LinkedHashMap<Object, ITool> map = new LinkedHashMap<Object, ITool>(); LinkedHashMap<Object, ITool> map = new LinkedHashMap<Object, ITool>();
for(ITool t : tools){ for(ITool t : tools){
Tool realTool = (Tool)ManagedBuildManager.getRealTool(t); Tool realTool = (Tool)ManagedBuildManager.getRealTool(t);
Object key = realTool.getMatchKey(); MatchKey<Tool> key = realTool.getMatchKey();
ITool toolValue = extValues ? ManagedBuildManager.getExtensionTool(t) : t; ITool toolValue = extValues ? ManagedBuildManager.getExtensionTool(t) : t;
if(toolValue != null) if(toolValue != null)
map.put(key, toolValue); map.put(key, toolValue);

2
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/IMatchKeyProvider.java
View file

@ -13,7 +13,7 @@ package org.eclipse.cdt.managedbuilder.internal.core;
import java.util.List; import java.util.List;
public interface IMatchKeyProvider extends Comparable { public interface IMatchKeyProvider extends Comparable {
Object getMatchKey(); MatchKey getMatchKey();
void setIdenticalList(List list); void setIdenticalList(List list);

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

@ -3616,7 +3616,7 @@ public class Tool extends HoldsOptions implements ITool, IOptionCategory, IMatch
return supportsManagedBuild.booleanValue(); return supportsManagedBuild.booleanValue();
} }
public Object getMatchKey() { public MatchKey<Tool> getMatchKey() {
if(isAbstract()) if(isAbstract())
return null; return null;
if(!isExtensionTool) if(!isExtensionTool)

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

@ -2293,7 +2293,7 @@ public class ToolChain extends HoldsOptions implements IToolChain, IBuildPropert
return false; return false;
} }
public Object getMatchKey() { public MatchKey<ToolChain> getMatchKey() {
if(isAbstract()) if(isAbstract())
return null; return null;
if(!isExtensionToolChain) if(!isExtensionToolChain)