[bnd] 06/32: Fix implement-missing-methods.patch

[Kai-Chung Yan]

This is an automated email from the git hooks/post-receive script.

seamlik-guest pushed a commit to branch master
in repository bnd.

commit 5d01ac9f090a967f481d1d9c4c0429efacd32571
Author: 殷啟聰 | Kai-Chung Yan <seamlikok at gmail.com>
Date:   Fri Mar 2 00:31:24 2018 +0800

    Fix implement-missing-methods.patch
---
 debian/patches/implement-missing-methods.patch | 83 ++++++++++++++++++++++----
 1 file changed, 72 insertions(+), 11 deletions(-)

diff --git a/debian/patches/implement-missing-methods.patch b/debian/patches/implement-missing-methods.patch
index 76d596c..ca3b7f0 100644
--- a/debian/patches/implement-missing-methods.patch
+++ b/debian/patches/implement-missing-methods.patch
@@ -9,30 +9,91 @@ R6.
 Forwarded: no
 --- a/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java
 +++ b/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java
-@@ -424,4 +424,11 @@
+@@ -385,16 +385,20 @@
+ 	}
+ 
+ 	@Override
+-	public ServiceRegistration registerService(String[] clazzes, Object service, Dictionary properties) {
++	public ServiceRegistration<?> registerService(String[] clazzes, Object service, Dictionary<String,?> properties) {
+ 		return null;
+ 	}
+ 
+ 	@Override
+-	public ServiceRegistration registerService(String clazz, Object service, Dictionary properties) {
++	public ServiceRegistration<?> registerService(String clazz, Object service, Dictionary<String,?> properties) {
+ 		return null;
+ 	}
+ 
+-	public ServiceRegistration registerService(Class< ? > clazz, Object service, Dictionary<String, ? > properties) {
++	public <S> ServiceRegistration<S> registerService(Class<S> clazz, S service, Dictionary<String, ? > properties) {
++		return null;
++	}
++
++	public <S> ServiceRegistration<S> registerService(Class<S> clazz, org.osgi.framework.ServiceFactory<S> factory, Dictionary<String, ? > properties) {
+ 		return null;
+ 	}
+ 
+@@ -402,7 +406,7 @@
+ 		return null;
+ 	}
+ 
+-	public <S> Collection<ServiceReference> getServiceReferences(Class<S> clazz, String filter)
++	public <S> Collection<ServiceReference<S>> getServiceReferences(Class<S> clazz, String filter)
+ 			throws InvalidSyntaxException {
+ 		return null;
+ 	}
+@@ -424,4 +428,8 @@
  	public <A> A adapt(Class<A> type) {
  		return null;
  	}
 +
-+    public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> reference) {
-+        return null;
-+    }
-+    public <S> ServiceRegistration<S> registerService(Class<S> clazz, ServiceFactory<S> factory, Dictionary<String, ?> properties) {
++    public <S> org.osgi.framework.ServiceObjects<S> getServiceObjects(ServiceReference<S> reference) {
 +        return null;
 +    }
  }
 --- a/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java
 +++ b/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java
-@@ -382,4 +382,12 @@
- 	public <A> A adapt(Class<A> type) {
- 		return null;
+@@ -52,6 +52,11 @@
  	}
+ 
+ 	@Override
++	public void init(FrameworkListener... listeners) throws BundleException {
++		init();
++	}
 +
-+	public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> reference) {
++	@Override
+ 	public FrameworkEvent waitForStop(long timeout) throws InterruptedException {
+ 		long deadline = System.currentTimeMillis() + timeout;
+ 
+@@ -352,7 +357,12 @@
+ 		return null;
+ 	}
+ 
+-	public <S> ServiceRegistration registerService(Class<S> clazz, S service, Dictionary<String, ? > properties) {
++	public <S> ServiceRegistration<S> registerService(Class<S> clazz, S service, Dictionary<String, ? > properties) {
 +		return null;
 +	}
 +
-+	public <S> ServiceRegistration<S> registerService(Class<S> clazz, ServiceFactory<S> factory, Dictionary<String, ?> properties) {
++	@Override
++	public <S> ServiceRegistration<S> registerService(Class<S> clazz, org.osgi.framework.ServiceFactory<S> factory, Dictionary<String, ? > properties) {
+ 		return null;
+ 	}
+ 
+@@ -360,7 +370,7 @@
+ 		return null;
+ 	}
+ 
+-	public <S> Collection<ServiceReference> getServiceReferences(Class<S> clazz, String filter)
++	public <S> Collection<ServiceReference<S>> getServiceReferences(Class<S> clazz, String filter)
+ 			throws InvalidSyntaxException {
+ 		return null;
+ 	}
+@@ -382,4 +392,8 @@
+ 	public <A> A adapt(Class<A> type) {
+ 		return null;
+ 	}
++
++	public <S> org.osgi.framework.ServiceObjects<S> getServiceObjects(ServiceReference<S> reference) {
 +		return null;
-+    }
++	}
  }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bnd.git