This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository libnb-platform-java.
commit 48ab1460bfb0e74db173d7b00bf989872b95c182 Author: Markus Koschany <[email protected]> Date: Mon Jun 1 21:01:34 2015 +0200 Update osgi-update.patch --- debian/patches/osgi-update.patch | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/debian/patches/osgi-update.patch b/debian/patches/osgi-update.patch index 73089f0..1745481 100644 --- a/debian/patches/osgi-update.patch +++ b/debian/patches/osgi-update.patch @@ -4,8 +4,8 @@ Subject: osgi update --- netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java | 2 +- - netbinox/src/org/netbeans/modules/netbinox/Netbinox.java | 3 +++ - 2 files changed, 4 insertions(+), 1 deletion(-) + netbinox/src/org/netbeans/modules/netbinox/Netbinox.java | 8 ++++++++ + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java b/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java index d97a2cd..37846b0 100644 @@ -21,14 +21,26 @@ index d97a2cd..37846b0 100644 } catch (IOException dirEx) { NetbinoxFactory.LOG.log(Level.WARNING, diff --git a/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java b/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java -index 89c1357..2e929ff 100644 +index 89c1357..759907c 100644 --- a/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java +++ b/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java -@@ -239,5 +239,8 @@ class Netbinox extends Equinox { +@@ -61,6 +61,8 @@ import org.osgi.framework.InvalidSyntaxException; + import org.osgi.framework.ServiceListener; + import org.osgi.framework.ServiceReference; + import org.osgi.framework.ServiceRegistration; ++import org.osgi.framework.ServiceObjects; ++import org.osgi.framework.ServiceFactory; + + /** + * +@@ -239,5 +241,11 @@ class Netbinox extends Equinox { public void addBundleListener(BundleListener bl) { delegate.addBundleListener(bl); } -+ public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> reference) { ++ public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> refer) { ++ return null; ++ } ++ public <S> ServiceRegistration<S> registerService(Class<S> clazz, ServiceFactory<S> factory, Dictionary<String,?> dictio) { + return null; + } } // end of Context -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libnb-platform-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
