diff options
author | Alexander Kurtakov | 2015-12-14 06:49:09 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2015-12-14 06:49:09 +0000 |
commit | 34281a96e0e6e4c72938b4c0beb46a361d17f696 (patch) | |
tree | 98275d54052eed72b5a907abe3262058c811bb7e /build/org.eclipse.cdt.autotools.core/src | |
parent | af49d7701ab719a7176ad941bc91b956931c8133 (diff) | |
download | org.eclipse.cdt-34281a96e0e6e4c72938b4c0beb46a361d17f696.tar.gz org.eclipse.cdt-34281a96e0e6e4c72938b4c0beb46a361d17f696.tar.xz org.eclipse.cdt-34281a96e0e6e4c72938b4c0beb46a361d17f696.zip |
autotools: Additional generification.
Properly generify now that o.e.text is generified. This alows removing a
number of suppressed warnings. In a few places it is better to use
wildcard than suppressing warnings.
Also remove DefaultNoDependencyCalculator as it was suppressing warnings
but better to remove directly as it's not use anywhere.
Change-Id: I70c4ac073ce5b6c2a45443372037fa61b7c36c76
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'build/org.eclipse.cdt.autotools.core/src')
3 files changed, 2 insertions, 48 deletions
diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsConfigurationBuilder.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsConfigurationBuilder.java index a28ae58b4df..34ed7bbdc58 100644 --- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsConfigurationBuilder.java +++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsConfigurationBuilder.java @@ -47,7 +47,7 @@ public class AutotoolsConfigurationBuilder extends ACBuilder { } @Override - protected IProject[] build(int kind, @SuppressWarnings("rawtypes") Map args, IProgressMonitor monitor) + protected IProject[] build(int kind, Map<String, String> args, IProgressMonitor monitor) throws CoreException { IProject project = getProject(); if(!isCdtProjectCreated(project)) diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/DefaultNoDependencyCalculator.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/DefaultNoDependencyCalculator.java deleted file mode 100644 index b2db65c21df..00000000000 --- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/DefaultNoDependencyCalculator.java +++ /dev/null @@ -1,45 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM - Initial API and implementation - *******************************************************************************/ - -package org.eclipse.cdt.internal.autotools.core; - -import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo; -import org.eclipse.cdt.managedbuilder.makegen.IManagedDependencyGenerator; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; - -/** - * This is the dependency calculator used by the makefile generation system when - * nothing is defined for a tool. - * - * @since 2.0 - */ -@SuppressWarnings("deprecation") -public class DefaultNoDependencyCalculator implements IManagedDependencyGenerator { - - @Override - public IResource[] findDependencies(IResource resource, IProject project) { - // Never answers any dependencies - return null; - } - - @Override - public int getCalculatorType() { - return TYPE_NODEPS; - } - - @Override - public String getDependencyCommand(IResource resource, IManagedBuildInfo info) { - // Never answers this call with an actual value - return null; - } - -} diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/FlagConfigureOption.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/FlagConfigureOption.java index 667199ceca4..5a89da37ee0 100644 --- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/FlagConfigureOption.java +++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/FlagConfigureOption.java @@ -29,11 +29,10 @@ public class FlagConfigureOption extends AbstractConfigurationOption { this.value = name; } - @SuppressWarnings("unchecked") private FlagConfigureOption(String name, AutotoolsConfiguration cfg, String value, ArrayList<String> children) { super(name, cfg); this.value = value; - this.children = (ArrayList<String>) children.clone(); + this.children = new ArrayList<>(children); } @Override |