Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2016-11-14 14:11:36 +0000
committerThomas Watson2017-06-16 12:38:08 +0000
commitf919cea9a25f4b6e05a9e04397c3254c51f85780 (patch)
tree2b5c8a8defae9a2cee2749ad5ae602c5c73e2d6e /bundles/org.eclipse.osgi/osgi/src/org/osgi/resource
parent0af49fa8440cd17af48b6a54c5d52f6ea26267c9 (diff)
downloadrt.equinox.framework-f919cea9a25f4b6e05a9e04397c3254c51f85780.tar.gz
rt.equinox.framework-f919cea9a25f4b6e05a9e04397c3254c51f85780.tar.xz
rt.equinox.framework-f919cea9a25f4b6e05a9e04397c3254c51f85780.zip
Update framework API to the latest for R7.
Change-Id: I6c9d481175591949ba2791dc4000fb6be5639abb Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
Diffstat (limited to 'bundles/org.eclipse.osgi/osgi/src/org/osgi/resource')
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/Capability.java4
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/Requirement.java4
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/Resource.java4
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/Wire.java4
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/Wiring.java11
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/packageinfo1
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/packageinfo1
7 files changed, 17 insertions, 12 deletions
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/Capability.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/Capability.java
index e79d11402..4c1f7f430 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/Capability.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/Capability.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2011, 2013). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2011, 2015). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -77,6 +77,7 @@ public interface Capability {
* @return {@code true} if this {@code Capability} is equal to the other
* object; {@code false} otherwise.
*/
+ @Override
boolean equals(Object obj);
/**
@@ -84,5 +85,6 @@ public interface Capability {
*
* @return The hashCode of this {@code Capability}.
*/
+ @Override
int hashCode();
}
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/Requirement.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/Requirement.java
index 252221aea..210e42713 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/Requirement.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/Requirement.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2011, 2013). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2011, 2015). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -81,6 +81,7 @@ public interface Requirement {
* @return {@code true} if this {@code Requirement} is equal to the other
* object; {@code false} otherwise.
*/
+ @Override
boolean equals(Object obj);
/**
@@ -88,5 +89,6 @@ public interface Requirement {
*
* @return The hashCode of this {@code Requirement}.
*/
+ @Override
int hashCode();
}
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/Resource.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/Resource.java
index c7b6462fb..6f13a1b53 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/Resource.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/Resource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2011, 2013). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2011, 2015). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -73,6 +73,7 @@ public interface Resource {
* @return {@code true} if this {@code Resource} is equal to the other
* object; {@code false} otherwise.
*/
+ @Override
boolean equals(Object obj);
/**
@@ -80,5 +81,6 @@ public interface Resource {
*
* @return The hashCode of this {@code Resource}.
*/
+ @Override
int hashCode();
}
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/Wire.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/Wire.java
index 6c248ea2b..a0d1c39e1 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/Wire.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/Wire.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2011, 2013). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2011, 2015). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -79,6 +79,7 @@ public interface Wire {
* @return {@code true} if this {@code Wire} is equal to the other object;
* {@code false} otherwise.
*/
+ @Override
boolean equals(Object obj);
/**
@@ -86,5 +87,6 @@ public interface Wire {
*
* @return The hashCode of this {@code Wire}.
*/
+ @Override
int hashCode();
}
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/Wiring.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/Wiring.java
index 935272fa9..7cb138426 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/Wiring.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/Wiring.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2011, 2013). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2011, 2016). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
package org.osgi.resource;
import java.util.List;
+
import org.osgi.annotation.versioning.ConsumerType;
/**
@@ -75,22 +76,20 @@ public interface Wiring {
/**
* Returns the requirements of this wiring.
- *
* <p>
* Only requirements considered by the resolver are returned. For example,
* requirements with {@link Namespace#REQUIREMENT_EFFECTIVE_DIRECTIVE
* effective} directive not equal to {@link Namespace#EFFECTIVE_RESOLVE
* resolve} are not returned.
- *
* <p>
* A wiring for a non-fragment resource has a subset of the declared
* requirements from the resource and all attached fragment resources. Not
* all declared requirements may be present since some may be discarded. For
- * example, if a package is declared to be optionally imported and is not
- * actually imported, the requirement must be discarded.
+ * example, if a package is declared to be both exported and imported, only
+ * one is selected and the other is discarded.
*
* @param namespace The namespace of the requirements to return or
- * {@code null} to return the requirements from all namespaces.
+ * {@code null} to return the requirements from all namespaces.
* @return A list containing a snapshot of the {@link Requirement}s, or an
* empty list if this wiring uses no requirements in the specified
* namespace. For a given namespace, the list contains the
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/packageinfo b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/packageinfo
deleted file mode 100644
index 7c8de0324..000000000
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.0
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/packageinfo b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/packageinfo
deleted file mode 100644
index 7c8de0324..000000000
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/packageinfo
+++ /dev/null
@@ -1 +0,0 @@
-version 1.0

Back to the top