diff options
author | John Arthorne | 2012-12-11 15:19:20 +0000 |
---|---|---|
committer | John Arthorne | 2012-12-11 15:19:20 +0000 |
commit | c5e4e2152eb0b0b89f5768bfbb11a26324a2f183 (patch) | |
tree | 5d3f1307d219c07eff515867acd53975ae880e7c | |
parent | ba852d2351bfd27f719619c0d08ec445532032b3 (diff) | |
download | rt.equinox.p2-c5e4e2152eb0b0b89f5768bfbb11a26324a2f183.tar.gz rt.equinox.p2-c5e4e2152eb0b0b89f5768bfbb11a26324a2f183.tar.xz rt.equinox.p2-c5e4e2152eb0b0b89f5768bfbb11a26324a2f183.zip |
Fixed API tools warningsv20121211-151920
8 files changed, 29 insertions, 17 deletions
diff --git a/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF index 902492177..560e130d0 100644 --- a/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.p2.engine;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 2.3.0.qualifier Bundle-Activator: org.eclipse.equinox.internal.p2.engine.EngineActivator Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.equinox.p2.engine/pom.xml b/bundles/org.eclipse.equinox.p2.engine/pom.xml index 1ad6f1e60..9fa8329cd 100644 --- a/bundles/org.eclipse.equinox.p2.engine/pom.xml +++ b/bundles/org.eclipse.equinox.p2.engine/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse</groupId> <artifactId>org.eclipse.equinox.p2.engine</artifactId> - <version>2.2.0-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.p2.metadata/.settings/.api_filters b/bundles/org.eclipse.equinox.p2.metadata/.settings/.api_filters index d8f48e5c2..088788964 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/.settings/.api_filters +++ b/bundles/org.eclipse.equinox.p2.metadata/.settings/.api_filters @@ -1,11 +1,19 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<component id="org.eclipse.equinox.p2.metadata" version="2"> - <resource path="src/org/eclipse/equinox/p2/query/CompoundQueryable.java" type="org.eclipse.equinox.p2.query.CompoundQueryable"> - <filter id="576720909"> - <message_arguments> - <message_argument value="IndexProvider<T>"/> - <message_argument value="CompoundQueryable<T>"/> - </message_arguments> - </filter> - </resource> -</component> +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.equinox.p2.metadata" version="2">
+ <resource path="META-INF/MANIFEST.MF">
+ <filter comment="API tools bug - there is no breaking change" id="923795461">
+ <message_arguments>
+ <message_argument value="2.1.100"/>
+ <message_argument value="2.1.0"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/equinox/p2/query/CompoundQueryable.java" type="org.eclipse.equinox.p2.query.CompoundQueryable">
+ <filter id="576720909">
+ <message_arguments>
+ <message_argument value="IndexProvider<T>"/>
+ <message_argument value="CompoundQueryable<T>"/>
+ </message_arguments>
+ </filter>
+ </resource>
+</component>
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IRequirement.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IRequirement.java index d894e8073..31b8e7673 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IRequirement.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IRequirement.java @@ -53,6 +53,7 @@ public interface IRequirement { /** * @noreference This method is not intended to be referenced by clients. + * @since 2.0 */ IMatchExpression<IInstallableUnit> getFilter(); diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IRequirementChange.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IRequirementChange.java index e65a9d8a8..952ca5db6 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IRequirementChange.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IRequirementChange.java @@ -21,21 +21,22 @@ public interface IRequirementChange { /** * * @noreference This method is not intended to be referenced by clients. + * @since 2.0 */ public IRequiredCapability applyOn(); /** * * @noreference This method is not intended to be referenced by clients. + * @since 2.0 */ - public IRequiredCapability newValue(); /** * * @noreference This method is not intended to be referenced by clients. + * @since 2.0 */ - public boolean matches(IRequiredCapability toMatch); /** @@ -48,6 +49,7 @@ public interface IRequirementChange { * <li> The result of <b>newValue()</b> on both objects are equal * </ul> * @noreference This method is not intended to be referenced by clients. + * @since 2.0 */ public boolean equals(Object other); }
\ No newline at end of file diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/IMatchQuery.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/IMatchQuery.java index e0a6413d3..7995464d5 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/IMatchQuery.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/IMatchQuery.java @@ -38,6 +38,7 @@ public interface IMatchQuery<T> extends IQuery<T> { * of this query, and <code>false</code> otherwise * * @noreference This method is not intended to be referenced by clients. + * @since 2.0 */ public boolean isMatch(T candidate); } diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/artifact/IArtifactRepository.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/artifact/IArtifactRepository.java index 8224c2579..1aaec049f 100644 --- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/artifact/IArtifactRepository.java +++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/artifact/IArtifactRepository.java @@ -37,6 +37,7 @@ public interface IArtifactRepository extends IRepository<IArtifactKey> { /** * The key for a boolean indicating if the repository is in runnable format. * @see IRepository#getProperties() + * @since 2.3 */ public static final String PROP_RUNNABLE = "p2.runnable"; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/.settings/org.eclipse.jdt.core.prefs index 1c4f1002d..d50f6a296 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,3 @@ -#Tue Dec 22 18:23:28 CET 2009 eclipse.preferences.version=1 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true org.eclipse.jdt.core.builder.cleanOutputFolder=clean @@ -9,7 +8,7 @@ org.eclipse.jdt.core.circularClasspath=error org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=jsr14 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.debug.lineNumber=generate |