Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Arthorne2013-04-19 14:49:53 +0000
committerJohn Arthorne2013-04-19 14:50:31 +0000
commita9e8d3dcbcca0e59dbdaf704e317c4d6a9767943 (patch)
tree1a092bc967218ce4735f97a639e9850d299d10c9
parent58d91751aae765fb226e077f9b7783f002c4e775 (diff)
downloadrt.equinox.p2-a9e8d3dcbcca0e59dbdaf704e317c4d6a9767943.tar.gz
rt.equinox.p2-a9e8d3dcbcca0e59dbdaf704e317c4d6a9767943.tar.xz
rt.equinox.p2-a9e8d3dcbcca0e59dbdaf704e317c4d6a9767943.zip
Fixed API warnings
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/MetadataFactory.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/QueryUtil.java11
-rw-r--r--bundles/org.eclipse.equinox.p2.operations/.settings/.api_filters8
-rw-r--r--bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/internal/p2/operations/RequestFlexer.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIImages.java2
5 files changed, 17 insertions, 8 deletions
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/MetadataFactory.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/MetadataFactory.java
index fe741767f..cd7227621 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/MetadataFactory.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/MetadataFactory.java
@@ -65,7 +65,7 @@ public final class MetadataFactory {
/**
* A property key (value <code>"org.eclipse.equinox.p2.type.product"</code>) for a
* boolean property indicating that an installable unit is the root IU of a product.
- *
+ * @since 2.2
*/
public static final String PROP_TYPE_PRODUCT = "org.eclipse.equinox.p2.type.product"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/QueryUtil.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/QueryUtil.java
index 44f7c995c..82123514c 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/QueryUtil.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/QueryUtil.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 Cloudsmith Inc. and others.
+ * Copyright (c) 2010, 2013 Cloudsmith 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
@@ -7,6 +7,7 @@
*
* Contributors:
* Cloudsmith Inc. - initial API and implementation
+ * IBM Corporation - ongoing development
*******************************************************************************/
package org.eclipse.equinox.p2.query;
@@ -34,8 +35,6 @@ public class QueryUtil {
public static final String PROP_TYPE_GROUP = "org.eclipse.equinox.p2.type.group"; //$NON-NLS-1$
- public static final String PROP_TYPE_PRODUCT = "org.eclipse.equinox.p2.type.product"; //$NON-NLS-1$
-
public static final String PROP_TYPE_PATCH = "org.eclipse.equinox.p2.type.patch"; //$NON-NLS-1$
private static final IExpression matchesRequirementsExpression = ExpressionUtil.parse("$0.exists(r | this ~= r)"); //$NON-NLS-1$
@@ -213,9 +212,10 @@ public class QueryUtil {
/**
* Creates an {@link IInstallableUnit} that will match all products.
* @return The created query
+ * @since 2.2
*/
public static IQuery<IInstallableUnit> createIUProductQuery() {
- return createIUPropertyQuery(QueryUtil.PROP_TYPE_PRODUCT, Boolean.TRUE.toString());
+ return createIUPropertyQuery(MetadataFactory.InstallableUnitDescription.PROP_TYPE_PRODUCT, Boolean.TRUE.toString());
}
/**
@@ -510,9 +510,10 @@ public class QueryUtil {
* Test if the {@link IInstallableUnit} is a product.
* @param iu the element being tested.
* @return <tt>true</tt> if the parameter is a group.
+ * @since 2.2
*/
public static boolean isProduct(IInstallableUnit iu) {
- String value = iu.getProperty(PROP_TYPE_PRODUCT);
+ String value = iu.getProperty(MetadataFactory.InstallableUnitDescription.PROP_TYPE_PRODUCT);
if (value != null && (value.equals(Boolean.TRUE.toString())))
return true;
return false;
diff --git a/bundles/org.eclipse.equinox.p2.operations/.settings/.api_filters b/bundles/org.eclipse.equinox.p2.operations/.settings/.api_filters
index 0245801b4..365f96f8d 100644
--- a/bundles/org.eclipse.equinox.p2.operations/.settings/.api_filters
+++ b/bundles/org.eclipse.equinox.p2.operations/.settings/.api_filters
@@ -8,6 +8,14 @@
</message_arguments>
</filter>
</resource>
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.equinox.p2.operations.RelaxedUpdateInstallOperation">
+ <filter id="305324134">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.RelaxedUpdateInstallOperation"/>
+ <message_argument value="org.eclipse.equinox.p2.operations_2.3.0"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="src/org/eclipse/equinox/p2/operations/ProfileChangeOperation.java" type="org.eclipse.equinox.p2.operations.ProfileChangeOperation">
<filter id="338792546">
<message_arguments>
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 fc03057cc..be053634f 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
@@ -386,7 +386,7 @@ public class RequestFlexer {
}
private boolean hasProduct() {
- return !profile.available(new UserVisibleRootQuery(), new NullProgressMonitor()).query(QueryUtil.createIUPropertyQuery(QueryUtil.PROP_TYPE_PRODUCT, Boolean.TRUE.toString()), new NullProgressMonitor()).isEmpty();
+ return !profile.available(new UserVisibleRootQuery(), new NullProgressMonitor()).query(QueryUtil.createIUPropertyQuery(MetadataFactory.InstallableUnitDescription.PROP_TYPE_PRODUCT, Boolean.TRUE.toString()), new NullProgressMonitor()).isEmpty();
}
}
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIImages.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIImages.java
index 53a05fd74..d9e0c6930 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIImages.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUIImages.java
@@ -71,7 +71,7 @@ public class ProvUIImages {
* Returns the image for the given image ID. Returns <code>null</code> if
* there is no such image.
*
- * @param upgraded_overlayid
+ * @param id
* the identifier for the image to retrieve
* @return the image associated with the given ID. This image is managed in
* an image registry and should not be freed by the client.

Back to the top