Fix more rawtype warnings
Change-Id: I50e401a7a604dde7bfad63639bdadb29c2b8a4a9 Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
parent
b091b02391
commit
bd8e5c1e8b
@ -24,7 +24,6 @@ import com.google.gwt.event.dom.client.KeyPressEvent;
|
||||
import com.google.gwt.event.dom.client.KeyPressHandler;
|
||||
import com.google.gwt.event.dom.client.MouseUpEvent;
|
||||
import com.google.gwt.event.dom.client.MouseUpHandler;
|
||||
|
||||
import com.google.gwt.event.logical.shared.ValueChangeEvent;
|
||||
import com.google.gwt.event.logical.shared.ValueChangeHandler;
|
||||
import com.google.gwt.event.shared.GwtEvent;
|
||||
@ -43,7 +42,7 @@ import java.util.Map;
|
||||
* registered input widget.
|
||||
*/
|
||||
public class OnEditEnabler implements KeyPressHandler, KeyDownHandler,
|
||||
MouseUpHandler, ChangeHandler, ValueChangeHandler {
|
||||
MouseUpHandler, ChangeHandler, ValueChangeHandler<Object> {
|
||||
|
||||
private final FocusWidget widget;
|
||||
private Map<TextBoxBase, String> strings = new HashMap<TextBoxBase, String>();
|
||||
@ -102,8 +101,9 @@ public class OnEditEnabler implements KeyPressHandler, KeyDownHandler,
|
||||
lb.addChangeHandler(this);
|
||||
}
|
||||
|
||||
@SuppressWarnings({"unchecked", "rawtypes"})
|
||||
public void listenTo(final CheckBox cb) {
|
||||
cb.addValueChangeHandler(this);
|
||||
cb.addValueChangeHandler((ValueChangeHandler) this);
|
||||
}
|
||||
|
||||
|
||||
@ -129,12 +129,13 @@ public class OnEditEnabler implements KeyPressHandler, KeyDownHandler,
|
||||
on(e);
|
||||
}
|
||||
|
||||
@SuppressWarnings("rawtypes")
|
||||
@Override
|
||||
public void onValueChange(final ValueChangeEvent e) {
|
||||
on(e);
|
||||
}
|
||||
|
||||
private void on(final GwtEvent e) {
|
||||
private void on(final GwtEvent<?> e) {
|
||||
if (widget.isEnabled() ||
|
||||
! (e.getSource() instanceof FocusWidget) ||
|
||||
! ((FocusWidget) e.getSource()).isEnabled() ) {
|
||||
|
@ -146,6 +146,7 @@ class OpenIdServiceImpl implements OpenIdService {
|
||||
"auth", null, "maxOpenIdSessionAge", -1, TimeUnit.SECONDS);
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public void discover(final String openidIdentifier, final SignInMode mode,
|
||||
final boolean remember, final String returnToken,
|
||||
final AsyncCallback<DiscoveryResult> cb) {
|
||||
|
@ -162,7 +162,7 @@ public class ChangeListServiceImpl extends BaseServiceImplementation implements
|
||||
}
|
||||
|
||||
if (s instanceof ChangeDataSource) {
|
||||
ArrayList<Change> r = new ArrayList();
|
||||
ArrayList<Change> r = new ArrayList<Change>();
|
||||
HashSet<Change.Id> want = new HashSet<Change.Id>();
|
||||
for (ChangeData d : ((ChangeDataSource) s).read()) {
|
||||
if (d.hasChange()) {
|
||||
|
@ -60,6 +60,7 @@ public class MimeUtilFileTypeRegistry implements FileTypeRegistry {
|
||||
mimeUtil.registerMimeDetector(name);
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public MimeType getMimeType(final String path, final byte[] content) {
|
||||
Set<MimeType> mimeTypes = new HashSet<MimeType>();
|
||||
if (content != null && content.length > 0) {
|
||||
|
@ -105,6 +105,7 @@ final class ProxyEhcache implements Ehcache {
|
||||
return self().get(key);
|
||||
}
|
||||
|
||||
@SuppressWarnings("rawtypes")
|
||||
public Map getAllWithLoader(Collection keys, Object loaderArgument)
|
||||
throws CacheException {
|
||||
return self().getAllWithLoader(keys, loaderArgument);
|
||||
@ -150,14 +151,17 @@ final class ProxyEhcache implements Ehcache {
|
||||
return self().getGuid();
|
||||
}
|
||||
|
||||
@SuppressWarnings("rawtypes")
|
||||
public List getKeys() throws IllegalStateException, CacheException {
|
||||
return self().getKeys();
|
||||
}
|
||||
|
||||
@SuppressWarnings("rawtypes")
|
||||
public List getKeysNoDuplicateCheck() throws IllegalStateException {
|
||||
return self().getKeysNoDuplicateCheck();
|
||||
}
|
||||
|
||||
@SuppressWarnings("rawtypes")
|
||||
public List getKeysWithExpiryCheck() throws IllegalStateException,
|
||||
CacheException {
|
||||
return self().getKeysWithExpiryCheck();
|
||||
@ -247,6 +251,7 @@ final class ProxyEhcache implements Ehcache {
|
||||
self().load(key);
|
||||
}
|
||||
|
||||
@SuppressWarnings("rawtypes")
|
||||
public void loadAll(Collection keys, Object argument) throws CacheException {
|
||||
self().loadAll(keys, argument);
|
||||
}
|
||||
|
@ -109,9 +109,10 @@ public abstract class QueryBuilder<T> {
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings("rawtypes")
|
||||
private final Map<String, OperatorFactory> opFactories;
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@SuppressWarnings({"unchecked", "rawtypes"})
|
||||
protected QueryBuilder(Definition<T, ? extends QueryBuilder<T>> def) {
|
||||
opFactories = (Map) def.opFactories;
|
||||
}
|
||||
@ -199,7 +200,8 @@ public abstract class QueryBuilder<T> {
|
||||
@SuppressWarnings("unchecked")
|
||||
private Predicate<T> operator(final String name, final String value)
|
||||
throws QueryParseException {
|
||||
final OperatorFactory f = opFactories.get(name);
|
||||
@SuppressWarnings("rawtypes")
|
||||
OperatorFactory f = opFactories.get(name);
|
||||
if (f == null) {
|
||||
throw error("Unsupported operator " + name + ":" + value);
|
||||
}
|
||||
@ -271,7 +273,7 @@ public abstract class QueryBuilder<T> {
|
||||
public <P extends OperatorPredicate<T>> P find(Predicate<T> p,
|
||||
Class<P> clazz, String name) {
|
||||
if (p instanceof OperatorPredicate
|
||||
&& ((OperatorPredicate) p).getOperator().equals(name)
|
||||
&& ((OperatorPredicate<?>) p).getOperator().equals(name)
|
||||
&& clazz.isAssignableFrom(p.getClass())) {
|
||||
return (P) p;
|
||||
}
|
||||
|
@ -81,7 +81,7 @@ public abstract class QueryRewriter<T> {
|
||||
if ((m.getModifiers() & Modifier.ABSTRACT) != Modifier.ABSTRACT
|
||||
&& (m.getModifiers() & Modifier.PUBLIC) == Modifier.PUBLIC
|
||||
&& rp != null) {
|
||||
rewriteRules.add(new MethodRewrite(qb, rp.value(), m));
|
||||
rewriteRules.add(new MethodRewrite<T>(qb, rp.value(), m));
|
||||
}
|
||||
}
|
||||
c = c.getSuperclass();
|
||||
@ -414,7 +414,7 @@ public abstract class QueryRewriter<T> {
|
||||
return null;
|
||||
}
|
||||
|
||||
final Predicate[] argList = new Predicate[argNames.length];
|
||||
final Predicate<T>[] argList = new Predicate[argNames.length];
|
||||
for (int i = 0; i < argList.length; i++) {
|
||||
argList[i] = args.get(argNames[i]);
|
||||
if (argList[i] == null) {
|
||||
@ -438,7 +438,7 @@ public abstract class QueryRewriter<T> {
|
||||
}
|
||||
|
||||
if (rep instanceof RewritePredicate) {
|
||||
((RewritePredicate) rep).init(method.getName(), argList);
|
||||
((RewritePredicate<T>) rep).init(method.getName(), argList);
|
||||
}
|
||||
|
||||
if (res.extra == null) {
|
||||
|
@ -39,7 +39,7 @@ public abstract class RewritePredicate<T> extends Predicate<T> {
|
||||
@Override
|
||||
public boolean equals(Object other) {
|
||||
if (other instanceof RewritePredicate) {
|
||||
RewritePredicate that = (RewritePredicate<T>) other;
|
||||
RewritePredicate<T> that = (RewritePredicate<T>) other;
|
||||
if (this.init && that.init) {
|
||||
return this.getClass() == that.getClass()
|
||||
&& this.name.equals(that.name)
|
||||
|
@ -473,7 +473,7 @@ public class ChangeQueryBuilder extends QueryBuilder<ChangeData> {
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public int getLimit(Predicate<ChangeData> p) {
|
||||
return ((IntPredicate) find(p, IntPredicate.class, FIELD_LIMIT)).intValue();
|
||||
return ((IntPredicate<?>) find(p, IntPredicate.class, FIELD_LIMIT)).intValue();
|
||||
}
|
||||
|
||||
public boolean hasSortKey(Predicate<ChangeData> p) {
|
||||
|
@ -290,7 +290,7 @@ public class QueryProcessor {
|
||||
|
||||
} else if (value instanceof Collection) {
|
||||
out.print('\n');
|
||||
for (Object thing : ((Collection) value)) {
|
||||
for (Object thing : ((Collection<?>) value)) {
|
||||
if (isPrimitive(thing)) {
|
||||
out.print(' ');
|
||||
out.print(value);
|
||||
|
@ -85,7 +85,8 @@ public class DispatchCommandProvider implements Provider<DispatchCommand> {
|
||||
}
|
||||
}
|
||||
|
||||
return Collections.unmodifiableMap(new LinkedHashMap(m));
|
||||
return Collections.unmodifiableMap(
|
||||
new LinkedHashMap<String, Provider<Command>>(m));
|
||||
}
|
||||
|
||||
private static final TypeLiteral<Command> type =
|
||||
|
@ -29,7 +29,7 @@ import org.kohsuke.args4j.spi.Setter;
|
||||
public class AccountGroupIdHandler extends OptionHandler<AccountGroup.Id> {
|
||||
private final GroupCache groupCache;
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@SuppressWarnings({"unchecked", "rawtypes"})
|
||||
@Inject
|
||||
public AccountGroupIdHandler(final GroupCache groupCache,
|
||||
@Assisted final CmdLineParser parser, @Assisted final OptionDef option,
|
||||
|
@ -35,7 +35,7 @@ public class AccountIdHandler extends OptionHandler<Account.Id> {
|
||||
private final AccountResolver accountResolver;
|
||||
private final AccountManager accountManager;
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@SuppressWarnings({"unchecked", "rawtypes"})
|
||||
@Inject
|
||||
public AccountIdHandler(final AccountResolver accountResolver,
|
||||
final AccountManager accountManager,
|
||||
|
@ -26,7 +26,7 @@ import org.kohsuke.args4j.spi.Parameters;
|
||||
import org.kohsuke.args4j.spi.Setter;
|
||||
|
||||
public class PatchSetIdHandler extends OptionHandler<PatchSet.Id> {
|
||||
@SuppressWarnings("unchecked")
|
||||
@SuppressWarnings({"unchecked", "rawtypes"})
|
||||
@Inject
|
||||
public PatchSetIdHandler(@Assisted final CmdLineParser parser,
|
||||
@Assisted final OptionDef option, @Assisted final Setter setter) {
|
||||
|
@ -30,7 +30,7 @@ import org.kohsuke.args4j.spi.Setter;
|
||||
public class ProjectControlHandler extends OptionHandler<ProjectControl> {
|
||||
private final ProjectControl.Factory projectControlFactory;
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@SuppressWarnings({"unchecked", "rawtypes"})
|
||||
@Inject
|
||||
public ProjectControlHandler(
|
||||
final ProjectControl.Factory projectControlFactory,
|
||||
|
@ -28,7 +28,7 @@ import org.kohsuke.args4j.spi.Setter;
|
||||
import java.net.SocketAddress;
|
||||
|
||||
public class SocketAddressHandler extends OptionHandler<SocketAddress> {
|
||||
@SuppressWarnings("unchecked")
|
||||
@SuppressWarnings({"unchecked", "rawtypes"})
|
||||
@Inject
|
||||
public SocketAddressHandler(@Assisted final CmdLineParser parser,
|
||||
@Assisted final OptionDef option, @Assisted final Setter setter) {
|
||||
|
@ -25,7 +25,7 @@ import org.kohsuke.args4j.spi.Parameters;
|
||||
import org.kohsuke.args4j.spi.Setter;
|
||||
|
||||
public class SubcommandHandler extends OptionHandler<String> {
|
||||
@SuppressWarnings("unchecked")
|
||||
@SuppressWarnings({"unchecked", "rawtypes"})
|
||||
@Inject
|
||||
public SubcommandHandler(@Assisted final CmdLineParser parser,
|
||||
@Assisted final OptionDef option, @Assisted final Setter setter) {
|
||||
|
@ -132,7 +132,7 @@ public class CmdLineParser {
|
||||
super(bean);
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@SuppressWarnings({"unchecked", "rawtypes"})
|
||||
@Override
|
||||
protected OptionHandler createOptionHandler(final OptionDef option,
|
||||
final Setter setter) {
|
||||
@ -157,13 +157,11 @@ public class CmdLineParser {
|
||||
return option.handler() != OptionHandler.class;
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private boolean isEnum(final Setter setter) {
|
||||
private <T> boolean isEnum(Setter<T> setter) {
|
||||
return Enum.class.isAssignableFrom(setter.getType());
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private boolean isPrimitive(final Setter setter) {
|
||||
private <T> boolean isPrimitive(Setter<T> setter) {
|
||||
return setter.getType().isPrimitive();
|
||||
}
|
||||
}
|
||||
|
@ -20,6 +20,7 @@ import org.kohsuke.args4j.spi.Setter;
|
||||
|
||||
/** Creates an args4j OptionHandler through a Guice Injector. */
|
||||
public interface OptionHandlerFactory<T> {
|
||||
@SuppressWarnings("rawtypes")
|
||||
OptionHandler create(org.kohsuke.args4j.CmdLineParser cmdLineParser,
|
||||
OptionDef optionDef, Setter setter);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user