[libnb-platform-java] 03/07: Update java9.patch and implement a missing method from

Markus Koschany apo at moszumanska.debian.org
Tue Apr 24 19:17:10 BST 2018


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

apo pushed a commit to branch master
in repository libnb-platform-java.

commit 262689c45c159f3d9af7c9ba8aa29633ea9475f5
Author: Markus Koschany <apo at debian.org>
Date:   Tue Apr 24 18:54:18 2018 +0200

    Update java9.patch and implement a missing method from
    
    java.lang.instrument.Instrumentation.
---
 debian/patches/java9.patch | 56 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 53 insertions(+), 3 deletions(-)

diff --git a/debian/patches/java9.patch b/debian/patches/java9.patch
index 35cb840..c8487b3 100644
--- a/debian/patches/java9.patch
+++ b/debian/patches/java9.patch
@@ -3,10 +3,60 @@ Date: Tue, 24 Apr 2018 18:39:21 +0200
 Subject: java9
 
 ---
- openide.util.lookup/nbproject/project.properties                     | 2 +-
- .../util/lookup/implspi/AbstractServiceProviderProcessor.java        | 5 +++--
- 2 files changed, 4 insertions(+), 3 deletions(-)
+ o.n.bootstrap/src/org/netbeans/NbInstrumentation.java      | 14 ++++++++++++++
+ .../src/org/openide/explorer/view/TreeView.java            |  2 +-
+ openide.util.lookup/nbproject/project.properties           |  2 +-
+ .../lookup/implspi/AbstractServiceProviderProcessor.java   |  5 +++--
+ 4 files changed, 19 insertions(+), 4 deletions(-)
 
+diff --git a/o.n.bootstrap/src/org/netbeans/NbInstrumentation.java b/o.n.bootstrap/src/org/netbeans/NbInstrumentation.java
+index 83eb654..74bc122 100644
+--- a/o.n.bootstrap/src/org/netbeans/NbInstrumentation.java
++++ b/o.n.bootstrap/src/org/netbeans/NbInstrumentation.java
+@@ -49,10 +49,13 @@ import java.lang.instrument.Instrumentation;
+ import java.lang.instrument.UnmodifiableClassException;
+ import java.lang.reflect.InvocationTargetException;
+ import java.lang.reflect.Method;
++import java.lang.Module;
+ import java.security.ProtectionDomain;
+ import java.util.Collection;
+ import java.util.Collections;
+ import java.util.List;
++import java.util.Map;
++import java.util.Set;
+ import java.util.concurrent.CopyOnWriteArrayList;
+ import java.util.jar.JarFile;
+ import java.util.logging.Level;
+@@ -206,5 +209,16 @@ final class NbInstrumentation implements Instrumentation {
+     public void setNativeMethodPrefix(ClassFileTransformer transformer, String prefix) {
+         throw new UnsupportedOperationException();
+     }
++    @Override
++    public boolean isModifiableModule(Module mod) {
++        throw new UnsupportedOperationException();
++    }
++    @Override
++    public void redefineModule(Module module,Set<Module>
++            extraReads,Map<String,Set<Module>>
++            extraExports,Map<String,Set<Module>> extraOpens,Set<Class<?>>
++            extraUses,Map<Class<?>,List<Class<?>>> extraProvides) {
++        throw new UnsupportedOperationException();
++    }
+     
+ }
+diff --git a/openide.explorer/src/org/openide/explorer/view/TreeView.java b/openide.explorer/src/org/openide/explorer/view/TreeView.java
+index 3ee3fe0..e8f6a01 100644
+--- a/openide.explorer/src/org/openide/explorer/view/TreeView.java
++++ b/openide.explorer/src/org/openide/explorer/view/TreeView.java
+@@ -645,7 +645,7 @@ public abstract class TreeView extends JScrollPane {
+     private void expandOrCollapseAll(TreePath parent, boolean expand) {
+         TreeNode node = (TreeNode) parent.getLastPathComponent();
+         if (node.getChildCount() > 0) {
+-            for (Enumeration<TreeNode> e = node.children(); e.hasMoreElements();) {
++            for (Enumeration<TreeNode> e = (Enumeration<TreeNode>) node.children(); e.hasMoreElements();) {
+                 TreeNode n = e.nextElement();
+                 TreePath path = parent.pathByAddingChild(n);
+                 expandOrCollapseAll(path, expand);
 diff --git a/openide.util.lookup/nbproject/project.properties b/openide.util.lookup/nbproject/project.properties
 index f04bc5b..2511aa0 100644
 --- a/openide.util.lookup/nbproject/project.properties

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



More information about the pkg-java-commits mailing list