Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2018-03-02 10:32:15 +0000
committerAlexander Kurtakov2018-03-02 10:57:36 +0000
commitf032752bc00b63edf0e8fd418f2798ce5cb774e5 (patch)
tree82d1cffd138da31a22ec1b515b94858e68ee7aff /bundles/org.eclipse.equinox.p2.operations
parent98a3c2b3358c56689d75038a8ed860571f4cf0b2 (diff)
downloadrt.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.operations')
-rw-r--r--bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/RequestFlexer.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/UpdateOperation.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/RequestFlexer.java b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/RequestFlexer.java
index e071acc21..f4007def3 100644
--- a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/RequestFlexer.java
+++ b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/RequestFlexer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2013, 2017 Red Hat, Inc. and others
+ * Copyright (c) 2013, 2018 Red Hat, Inc. 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
@@ -338,7 +338,7 @@ public class RequestFlexer {
expressionParameters[count * 2 + 1] = iu.getVersion();
count++;
}
- IMatchExpression<IInstallableUnit> iuMatcher = ExpressionUtil.getFactory().<IInstallableUnit> matchExpression(ExpressionUtil.parse(expression.toString()), expressionParameters);
+ IMatchExpression<IInstallableUnit> iuMatcher = ExpressionUtil.getFactory().matchExpression(ExpressionUtil.parse(expression.toString()), expressionParameters);
return MetadataFactory.createRequirement(iuMatcher, null, optional ? 0 : 1, 1, true);
}
diff --git a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/UpdateOperation.java b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/UpdateOperation.java
index 8706c7a1e..28ce01459 100644
--- a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/UpdateOperation.java
+++ b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/UpdateOperation.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2017 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
@@ -283,7 +283,7 @@ public class UpdateOperation extends ProfileChangeOperation {
private Collection<IInstallableUnit> getInstalledIUs() {
IProfile profile = session.getProfileRegistry().getProfile(profileId);
if (profile == null)
- return Collections.<IInstallableUnit> emptyList();
+ return Collections.emptyList();
IQuery<IInstallableUnit> query = new UserVisibleRootQuery();
IQueryResult<IInstallableUnit> queryResult = profile.query(query, null);
return queryResult.toUnmodifiableSet();

Back to the top