Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 349618 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/equinox/internal/region/hook/RegionResolverHookTests.java (+32 lines)
Lines 403-408 Link Here
403
		}
403
		}
404
404
405
		@Override
405
		@Override
406
		public BundleRevision getResource() {
407
			return getRevision();
408
		}
409
410
		@Override
406
		public BundleRevision getRevision() {
411
		public BundleRevision getRevision() {
407
			return new StubBundleRevision(bundle(this.bundleSymbolicName));
412
			return new StubBundleRevision(bundle(this.bundleSymbolicName));
408
		}
413
		}
Lines 481-486 Link Here
481
		}
486
		}
482
487
483
		@Override
488
		@Override
489
		public BundleRevision getResource() {
490
			return getRevision();
491
		}
492
493
		@Override
484
		public BundleRevision getRevision() {
494
		public BundleRevision getRevision() {
485
			return new StubBundleRevision(bundle(this.bundleSymbolicName));
495
			return new StubBundleRevision(bundle(this.bundleSymbolicName));
486
		}
496
		}
Lines 543-548 Link Here
543
		}
553
		}
544
554
545
		@Override
555
		@Override
556
		public BundleRevision getResource() {
557
			return getRevision();
558
		}
559
560
		@Override
546
		public BundleRevision getRevision() {
561
		public BundleRevision getRevision() {
547
			return this.bundleRevision;
562
			return this.bundleRevision;
548
		}
563
		}
Lines 552-557 Link Here
552
			throw new UnsupportedOperationException();
567
			throw new UnsupportedOperationException();
553
		}
568
		}
554
569
570
		@Override
571
		public boolean matches(Capability capability) {
572
			if (!(capability instanceof BundleCapability))
573
				return false;
574
			return matches((BundleCapability) capability);
575
		}
555
	}
576
	}
556
577
557
	final class StubBundleRevision implements BundleRevision {
578
	final class StubBundleRevision implements BundleRevision {
Lines 597-602 Link Here
597
			throw new UnsupportedOperationException();
618
			throw new UnsupportedOperationException();
598
		}
619
		}
599
620
621
		@SuppressWarnings({"cast", "unchecked", "rawtypes"})
622
		@Override
623
		public List<Capability> getCapabilities(String namespace) {
624
			return (List<Capability>) (List) getDeclaredCapabilities(namespace);
625
		}
626
627
		@SuppressWarnings({"cast", "unchecked", "rawtypes"})
628
		@Override
629
		public List<Requirement> getRequirements(String namespace) {
630
			return (List<Requirement>) (List) getDeclaredRequirements(namespace);
631
		}
600
	}
632
	}
601
633
602
}
634
}
(-)test_files/genericCapability/c1.osgi.MF (-1 / +3 lines)
Lines 17-20 Link Here
17
  filter:="(&(rank>=100)(!(rank>=200))
17
  filter:="(&(rank>=100)(!(rank>=200))
18
          (percent>=0.1)(!(percent>=0.2))
18
          (percent>=0.1)(!(percent>=0.2))
19
          (test.version>=1.0)(!(test.version>=2.0))
19
          (test.version>=1.0)(!(test.version>=2.0))
20
          (test.string~=abc))"
20
          (test.string~=abc))",
21
 osgi.identity;
22
  filter:="(&(osgi.identity=p1.*)(version=1.0)(type=osgi.bundle))"
(-)test_files/wiringTests/bundles/resource.tb3/META-INF/MANIFEST.MF (+9 lines)
Added Link Here
1
Manifest-Version: 1.0
2
Bundle-ManifestVersion: 2
3
Bundle-SymbolicName: resource.tb3
4
Bundle-Version: 1.0.0
5
Require-Capability: osgi.identity;
6
 filter:=(&(osgi.identity=resource.tb1)(version=1.0.0)(type=osgi.bundle)),
7
 osgi.identity;
8
 filter:=(&(osgi.identity=resource.tf1)(version=1.0.0)(type=osgi.fragment))
9

Return to bug 349618