[squareness] 11/12: Fixed the build failure with Java 9 (Closes: #873704)

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Mar 7 11:06:54 GMT 2018


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

ebourg-guest pushed a commit to branch master
in repository squareness.

commit 116a242b0d32ceb555ba0b2e986e5e34abc23f6e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Mar 7 12:04:35 2018 +0100

    Fixed the build failure with Java 9 (Closes: #873704)
---
 debian/changelog                            |  1 +
 debian/patches/01-java9-compatibility.patch | 45 +++++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 47 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0d6a6d3..65570be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 squareness (2.3.0-7) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Fixed the build failure with Java 9 (Closes: #873704)
   * Moved the package to Git
   * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 4.1.3
diff --git a/debian/patches/01-java9-compatibility.patch b/debian/patches/01-java9-compatibility.patch
new file mode 100644
index 0000000..ec38256
--- /dev/null
+++ b/debian/patches/01-java9-compatibility.patch
@@ -0,0 +1,45 @@
+Description: Fixes the compatibility issues with Java 9
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/source/org/jvnet/lafplugin/XMLElement.java
++++ b/source/org/jvnet/lafplugin/XMLElement.java
+@@ -478,9 +478,9 @@
+         this.children = new Vector();
+         this.entities = entities;
+         this.lineNr = 0;
+-        Enumeration enum = this.entities.keys();
+-        while (enum.hasMoreElements()) {
+-            Object key = enum.nextElement();
++        Enumeration enumeration = this.entities.keys();
++        while (enumeration.hasMoreElements()) {
++            Object key = enumeration.nextElement();
+             Object value = this.entities.get(key);
+             if (value instanceof String) {
+                 value = ((String) value).toCharArray();
+@@ -2168,10 +2168,10 @@
+         writer.write('<');
+         writer.write(this.name);
+         if (! this.attributes.isEmpty()) {
+-            Enumeration enum = this.attributes.keys();
+-            while (enum.hasMoreElements()) {
++            Enumeration enumeration = this.attributes.keys();
++            while (enumeration.hasMoreElements()) {
+                 writer.write(' ');
+-                String key = (String) enum.nextElement();
++                String key = (String) enumeration.nextElement();
+                 String value = (String) this.attributes.get(key);
+                 writer.write(key);
+                 writer.write('='); writer.write('"');
+@@ -2189,9 +2189,9 @@
+             writer.write('/'); writer.write('>');
+         } else {
+             writer.write('>');
+-            Enumeration enum = this.enumerateChildren();
+-            while (enum.hasMoreElements()) {
+-                XMLElement child = (XMLElement) enum.nextElement();
++            Enumeration enumeration = this.enumerateChildren();
++            while (enumeration.hasMoreElements()) {
++                XMLElement child = (XMLElement) enumeration.nextElement();
+                 child.write(writer);
+             }
+             writer.write('<'); writer.write('/');
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..12bc5e0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-java9-compatibility.patch

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



More information about the pkg-java-commits mailing list