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: Missing type arguments on managedbuilder.core

Browse source
This commit is contained in:
Andrew Gvozdev 2011-03-09 23:24:39 +00:00
parent b7073a4f52
commit 0e149f27ae
4 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -75,7 +75,7 @@ import org.eclipse.core.variables.IStringVariableManager;
import org.eclipse.core.variables.VariablesPlugin;
import org.osgi.framework.Version;
public class Builder extends HoldsOptions implements IBuilder, IMatchKeyProvider, IRealBuildObjectAssociation {
public class Builder extends HoldsOptions implements IBuilder, IMatchKeyProvider<Builder>, IRealBuildObjectAssociation {
private static final String EMPTY_STRING = ""; //$NON-NLS-1$
@ -2575,8 +2575,7 @@ public class Builder extends HoldsOptions implements IBuilder, IMatchKeyProvider
return num;
}
public int compareTo(Object o) {
Builder other = (Builder)o;
public int compareTo(Builder other) {
if(other.isSystemObject() != isSystemObject())
return isSystemObject() ? 1 : -1;

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

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

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

@ -92,7 +92,7 @@ import org.osgi.framework.Version;
* Note that this class implements IOptionCategory to represent the top
* category.
*/
public class Tool extends HoldsOptions implements ITool, IOptionCategory, IMatchKeyProvider, IRealBuildObjectAssociation {
public class Tool extends HoldsOptions implements ITool, IOptionCategory, IMatchKeyProvider<Tool>, IRealBuildObjectAssociation {
public static final String DEFAULT_PATTERN = "${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}"; //$NON-NLS-1$
public static final String DEFAULT_CBS_PATTERN = "${COMMAND}"; //$NON-NLS-1$
@ -4020,8 +4020,7 @@ public class Tool extends HoldsOptions implements ITool, IOptionCategory, IMatch
return num;
}
public int compareTo(Object o) {
Tool other = (Tool)o;
public int compareTo(Tool other) {
if(other.isSystemObject() != isSystemObject())
return isSystemObject() ? 1 : -1;

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

@ -57,7 +57,7 @@ import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Platform;
import org.osgi.framework.Version;
public class ToolChain extends HoldsOptions implements IToolChain, IBuildPropertiesRestriction, IMatchKeyProvider, IRealBuildObjectAssociation {
public class ToolChain extends HoldsOptions implements IToolChain, IBuildPropertiesRestriction, IMatchKeyProvider<ToolChain>, IRealBuildObjectAssociation {
private static final String EMPTY_STRING = new String();
@ -2628,8 +2628,7 @@ public class ToolChain extends HoldsOptions implements IToolChain, IBuildPropert
return num;
}
public int compareTo(Object o) {
ToolChain other = (ToolChain)o;
public int compareTo(ToolChain other) {
if(other.isSystemObject() != isSystemObject())
return isSystemObject() ? 1 : -1;