Package: libnb-platform18-java / 8.1+dfsg1-5

osgi-update.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
From: Markus Koschany <apo@debian.org>
Date: Mon, 1 Jun 2015 20:52:04 +0200
Subject: osgi update

Implement missing methods or correct parameter changes due to the latest OSGi
upgrade. It may be possible to drop this patch in the future, when upstream
catches up.

Forwarded: not-needed
---
 netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java | 2 +-
 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
--- a/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java
+++ b/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java
@@ -128,7 +128,7 @@ final class JarBundleFile extends BundleFile implements BundleContent {
                             final File bf = new File(getBaseFile().getPath());
                             if (bf.isDirectory()) {
                                 try {
-                                    delegate = new DirBundleFile(bf, false);
+                                    delegate = new DirBundleFile(bf);
                                     return false;
                                 } 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..77a70d3 100644
--- a/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java
+++ b/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java
@@ -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> refer) {
+            return null;
+        }
+        public <S> ServiceRegistration<S> registerService(Class<S> clazz, ServiceFactory<S> factory, Dictionary<String,?> dictio) {
+            return null;
+        }
     } // end of Context
 }