Attachment 199146 Details for Bug 349618 – updated patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] updated patch

349618.txt (text/plain), 3.63 KB, created by Thomas Watson

on 2011-07-05 15:23:25 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Watson

Created: 2011-07-05 15:23:25 EDT

Size: 3.63 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.region.tests
>Index: src/org/eclipse/equinox/internal/region/hook/RegionResolverHookTests.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/components/bundles/org.eclipse.equinox.region.tests/src/org/eclipse/equinox/internal/region/hook/RegionResolverHookTests.java,v
>retrieving revision 1.3
>diff -u -r1.3 RegionResolverHookTests.java
>--- src/org/eclipse/equinox/internal/region/hook/RegionResolverHookTests.java	4 May 2011 03:14:44 -0000	1.3
>+++ src/org/eclipse/equinox/internal/region/hook/RegionResolverHookTests.java	5 Jul 2011 19:21:40 -0000
>@@ -403,6 +403,11 @@
> 		}
> 
> 		@Override
>+		public BundleRevision getResource() {
>+			return getRevision();
>+		}
>+
>+		@Override
> 		public BundleRevision getRevision() {
> 			return new StubBundleRevision(bundle(this.bundleSymbolicName));
> 		}
>@@ -481,6 +486,11 @@
> 		}
> 
> 		@Override
>+		public BundleRevision getResource() {
>+			return getRevision();
>+		}
>+
>+		@Override
> 		public BundleRevision getRevision() {
> 			return new StubBundleRevision(bundle(this.bundleSymbolicName));
> 		}
>@@ -543,6 +553,11 @@
> 		}
> 
> 		@Override
>+		public BundleRevision getResource() {
>+			return getRevision();
>+		}
>+
>+		@Override
> 		public BundleRevision getRevision() {
> 			return this.bundleRevision;
> 		}
>@@ -552,6 +567,12 @@
> 			throw new UnsupportedOperationException();
> 		}
> 
>+		@Override
>+		public boolean matches(Capability capability) {
>+			if (!(capability instanceof BundleCapability))
>+				return false;
>+			return matches((BundleCapability) capability);
>+		}
> 	}
> 
> 	final class StubBundleRevision implements BundleRevision {
>@@ -597,6 +618,17 @@
> 			throw new UnsupportedOperationException();
> 		}
> 
>+		@SuppressWarnings({"cast", "unchecked", "rawtypes"})
>+		@Override
>+		public List<Capability> getCapabilities(String namespace) {
>+			return (List<Capability>) (List) getDeclaredCapabilities(namespace);
>+		}
>+
>+		@SuppressWarnings({"cast", "unchecked", "rawtypes"})
>+		@Override
>+		public List<Requirement> getRequirements(String namespace) {
>+			return (List<Requirement>) (List) getDeclaredRequirements(namespace);
>+		}
> 	}
> 
> }
>#P org.eclipse.osgi.tests
>Index: test_files/genericCapability/c1.osgi.MF
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/framework/bundles/org.eclipse.osgi.tests/test_files/genericCapability/c1.osgi.MF,v
>retrieving revision 1.3
>diff -u -r1.3 c1.osgi.MF
>--- test_files/genericCapability/c1.osgi.MF	1 Feb 2011 20:47:33 -0000	1.3
>+++ test_files/genericCapability/c1.osgi.MF	5 Jul 2011 19:21:41 -0000
>@@ -17,4 +17,6 @@
>   filter:="(&(rank>=100)(!(rank>=200))
>           (percent>=0.1)(!(percent>=0.2))
>           (test.version>=1.0)(!(test.version>=2.0))
>-          (test.string~=abc))"
>+          (test.string~=abc))",
>+ osgi.identity;
>+  filter:="(&(osgi.identity=p1.*)(version=1.0)(type=osgi.bundle))"
>Index: test_files/wiringTests/bundles/resource.tb3/META-INF/MANIFEST.MF
>===================================================================
>RCS file: test_files/wiringTests/bundles/resource.tb3/META-INF/MANIFEST.MF
>diff -N test_files/wiringTests/bundles/resource.tb3/META-INF/MANIFEST.MF
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ test_files/wiringTests/bundles/resource.tb3/META-INF/MANIFEST.MF	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,9 @@
>+Manifest-Version: 1.0
>+Bundle-ManifestVersion: 2
>+Bundle-SymbolicName: resource.tb3
>+Bundle-Version: 1.0.0
>+Require-Capability: osgi.identity;
>+ filter:=(&(osgi.identity=resource.tb1)(version=1.0.0)(type=osgi.bundle)),
>+ osgi.identity;
>+ filter:=(&(osgi.identity=resource.tf1)(version=1.0.0)(type=osgi.fragment))
>+

Actions: View | Diff

Attachments on bug 349618: 198155 | 198209 | 198272 | 198420 | 198779 | 198857 | 198921 | 199140 | 199146