diff options
| author | Alexander Kurtakov | 2018-03-02 10:32:15 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2018-03-02 10:57:36 +0000 |
| commit | f032752bc00b63edf0e8fd418f2798ce5cb774e5 (patch) | |
| tree | 82d1cffd138da31a22ec1b515b94858e68ee7aff /bundles/org.eclipse.equinox.p2.repository/src | |
| parent | 98a3c2b3358c56689d75038a8ed860571f4cf0b2 (diff) | |
| download | rt.equinox.p2-f032752bc00b63edf0e8fd418f2798ce5cb774e5.tar.gz rt.equinox.p2-f032752bc00b63edf0e8fd418f2798ce5cb774e5.tar.xz rt.equinox.p2-f032752bc00b63edf0e8fd418f2798ce5cb774e5.zip | |
Bug 531917 - Remove redundant type parameters
With Java 8 and properly generified some apis it's not needed to specify
the types anymore.
Change-Id: Ib758c6f50b1b1fd3f56bd52eb7e664b89b6cc776
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.repository/src')
2 files changed, 7 insertions, 7 deletions
diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/artifact/ArtifactDescriptorQuery.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/artifact/ArtifactDescriptorQuery.java index e704b1763..6cba4ea89 100644 --- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/artifact/ArtifactDescriptorQuery.java +++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/artifact/ArtifactDescriptorQuery.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 IBM Corporation and others. + * Copyright (c) 2009, 2018 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 @@ -40,10 +40,10 @@ public final class ArtifactDescriptorQuery extends ExpressionMatchQuery<IArtifac properties.put(IArtifactDescriptor.FORMAT, format); } } else if (properties == null) - properties = Collections.<String, String> emptyMap(); + properties = Collections.emptyMap(); IExpressionFactory factory = ExpressionUtil.getFactory(); - return factory.<IArtifactDescriptor> matchExpression(descriptorMatch, id, range, properties); + return factory.matchExpression(descriptorMatch, id, range, properties); } /** diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/artifact/ArtifactKeyQuery.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/artifact/ArtifactKeyQuery.java index 1e8f0ade9..3ba1df3b1 100644 --- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/artifact/ArtifactKeyQuery.java +++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/artifact/ArtifactKeyQuery.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 IBM Corporation and others. + * Copyright (c) 2009, 2018 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 @@ -33,7 +33,7 @@ public final class ArtifactKeyQuery extends ExpressionMatchQuery<IArtifactKey> { private static IExpression createMatchExpression(IArtifactKey key) { if (key == null) return ExpressionUtil.TRUE_EXPRESSION; - return ExpressionUtil.getFactory().<IArtifactKey> matchExpression(matchKey, key); + return ExpressionUtil.getFactory().matchExpression(matchKey, key); } private static IExpression createMatchExpression(String classifier, String id, VersionRange range) { @@ -41,11 +41,11 @@ public final class ArtifactKeyQuery extends ExpressionMatchQuery<IArtifactKey> { if (classifier == null) { if (id == null) return ExpressionUtil.TRUE_EXPRESSION; - return ExpressionUtil.getFactory().<IArtifactKey> matchExpression(matchID, id); + return ExpressionUtil.getFactory().matchExpression(matchID, id); } range = VersionRange.emptyRange; } - return ExpressionUtil.getFactory().<IArtifactKey> matchExpression(matchIDClassifierRange, id, classifier, range); + return ExpressionUtil.getFactory().matchExpression(matchIDClassifierRange, id, classifier, range); } /** |