From 6d940840ee97d165873174a22abbb91c92343f1e Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Thu, 17 Feb 2011 04:51:38 +0000 Subject: [PATCH] bug 319512: Extracted class MatchKey --- .../eclipse/cdt/managedbuilder/core/ManagedBuildManager.java | 3 ++- .../org/eclipse/cdt/managedbuilder/internal/core/Builder.java | 2 +- .../eclipse/cdt/managedbuilder/internal/core/FolderInfo.java | 2 +- .../cdt/managedbuilder/internal/core/IMatchKeyProvider.java | 2 +- .../src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java | 2 +- .../eclipse/cdt/managedbuilder/internal/core/ToolChain.java | 2 +- 6 files changed, 7 insertions(+), 6 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 d6e67781bfd..781a077f7c7 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 @@ -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.ManagedMakeMessages; 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.MultiFolderInfo; import org.eclipse.cdt.managedbuilder.internal.core.MultiResourceInfo; @@ -4222,7 +4223,7 @@ public class ManagedBuildManager extends AbstractCExtension { HashMap map = new HashMap(); for(Iterator iter = elements.iterator(); iter.hasNext();){ IMatchKeyProvider p = (IMatchKeyProvider)iter.next(); - Object key = p.getMatchKey(); + MatchKey key = p.getMatchKey(); if(key == null) continue; diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java index de9d9b0c382..3f3ed2309de 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java @@ -2322,7 +2322,7 @@ public class Builder extends HoldsOptions implements IBuilder, IMatchKeyProvider return rBld == ManagedBuildManager.getRealBuilder(builder); } - public Object getMatchKey() { + public MatchKey getMatchKey() { if(isAbstract()) return null; if(!isExtensionBuilder) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java index e214a17e81c..569e18480b6 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/FolderInfo.java @@ -890,7 +890,7 @@ public class FolderInfo extends ResourceInfo implements IFolderInfo { LinkedHashMap map = new LinkedHashMap(); for(ITool t : tools){ Tool realTool = (Tool)ManagedBuildManager.getRealTool(t); - Object key = realTool.getMatchKey(); + MatchKey key = realTool.getMatchKey(); ITool toolValue = extValues ? ManagedBuildManager.getExtensionTool(t) : t; if(toolValue != null) map.put(key, toolValue); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/IMatchKeyProvider.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/IMatchKeyProvider.java index 5e266ce935a..9c8de3c386d 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/IMatchKeyProvider.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/IMatchKeyProvider.java @@ -13,7 +13,7 @@ package org.eclipse.cdt.managedbuilder.internal.core; import java.util.List; public interface IMatchKeyProvider extends Comparable { - Object getMatchKey(); + MatchKey getMatchKey(); void setIdenticalList(List list); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java index 46cb0be1239..e60e3092dc2 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java @@ -3616,7 +3616,7 @@ public class Tool extends HoldsOptions implements ITool, IOptionCategory, IMatch return supportsManagedBuild.booleanValue(); } - public Object getMatchKey() { + public MatchKey getMatchKey() { if(isAbstract()) return null; if(!isExtensionTool) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java index 2cb5de10054..e1f250cbbd3 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java @@ -2293,7 +2293,7 @@ public class ToolChain extends HoldsOptions implements IToolChain, IBuildPropert return false; } - public Object getMatchKey() { + public MatchKey getMatchKey() { if(isAbstract()) return null; if(!isExtensionToolChain)