/hg/release/icedtea7-forest-2.6/jdk: 10 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Fri Jun 29 16:47:38 UTC 2018


changeset 3fa6e7c8dcde in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=3fa6e7c8dcde
author: andrew
date: Thu Apr 19 18:49:49 2018 +0100

	Bump to icedtea-2.6.14


changeset a17a9fd15b88 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=a17a9fd15b88
author: mbalao
date: Wed May 02 06:31:31 2018 +0100

	8189123: More consistent classloading
	Reviewed-by: adinn, andrew


changeset 18bac81b4778 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=18bac81b4778
author: ljiang
date: Tue Mar 27 18:03:51 2018 -0700

	8200314: JDK 8u171 l10n resource file update - msg drop 40
	Reviewed-by: coffeys


changeset 5687cff098b5 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=5687cff098b5
author: andrew
date: Wed May 09 17:41:51 2018 +0100

	Added tag jdk7u181-b01 for changeset 18bac81b4778


changeset 581773232054 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=581773232054
author: andrew
date: Thu May 17 02:55:38 2018 +0100

	Merge jdk7u181-b01


changeset 742e02451a37 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=742e02451a37
author: andrew
date: Thu May 24 04:03:50 2018 +0100

	Added tag icedtea-2.6.14 for changeset 581773232054


changeset 07c30d3f55d0 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=07c30d3f55d0
author: andrew
date: Tue Jun 19 03:30:02 2018 +0100

	PR3606: jni_util.c does not import header file which declares getLastErrorString


changeset 52fb4a409da5 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=52fb4a409da5
author: prr
date: Fri Apr 17 12:32:46 2015 -0700

	8075942, PR3605: ArrayIndexOutOfBoundsException in sun.java2d.pisces.Dasher.goTo
	Reviewed-by: flar, lbourges


changeset 384dd407114d in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=384dd407114d
author: andrew
date: Fri Jun 29 17:43:17 2018 +0100

	Bump to icedtea-2.6.15pre01


changeset 898472e83882 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=898472e83882
author: andrew
date: Fri Jun 29 17:43:42 2018 +0100

	Added tag icedtea-2.6.15pre01 for changeset 384dd407114d


diffstat:

 .hgtags                                                                           |   3 +
 make/jdk_generic_profile.sh                                                       |   2 +-
 src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties               |   4 +-
 src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties |   2 +-
 src/share/classes/java/lang/ClassLoader.java                                      |   5 +
 src/share/classes/sun/java2d/pisces/Dasher.java                                   |   2 +-
 src/share/classes/sun/security/tools/keytool/Resources_de.java                    |   8 +-
 src/share/classes/sun/security/tools/policytool/Resources_sv.java                 |   4 +-
 src/share/classes/sun/security/util/Resources_sv.java                             |   4 +-
 src/share/native/common/jni_util.c                                                |   3 +-
 test/java/awt/BasicStroke/DashStrokeTest.java                                     |  69 ++++++++++
 11 files changed, 91 insertions(+), 15 deletions(-)

diffs (237 lines):

diff -r 88859cc294e1 -r 898472e83882 .hgtags
--- a/.hgtags	Thu Apr 19 17:55:33 2018 +0100
+++ b/.hgtags	Fri Jun 29 17:43:42 2018 +0100
@@ -672,3 +672,6 @@
 68b6bb380175e4469e995a6c8a49a64a4c658cdc icedtea-2.6.13
 7ae89263e2c362312ec38041f456b52a0bfddc30 icedtea-2.6.14pre01
 9483a1259c9e24e766d449f085b015ef57736dd6 jdk7u181-b00
+18bac81b47784889754737181ff206995d36e97d jdk7u181-b01
+5817732320544e829dd476ad38127e8bf02190e5 icedtea-2.6.14
+384dd407114dfafab773e480bc034cd96cf99169 icedtea-2.6.15pre01
diff -r 88859cc294e1 -r 898472e83882 make/jdk_generic_profile.sh
--- a/make/jdk_generic_profile.sh	Thu Apr 19 17:55:33 2018 +0100
+++ b/make/jdk_generic_profile.sh	Fri Jun 29 17:43:42 2018 +0100
@@ -672,7 +672,7 @@
 
 # IcedTea versioning
 export ICEDTEA_NAME="IcedTea"
-export PACKAGE_VERSION="2.6.14pre01"
+export PACKAGE_VERSION="2.6.15pre01"
 export DERIVATIVE_ID="${ICEDTEA_NAME} ${PACKAGE_VERSION}"
 echo "Building ${DERIVATIVE_ID}"
 
diff -r 88859cc294e1 -r 898472e83882 src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties
--- a/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties	Thu Apr 19 17:55:33 2018 +0100
+++ b/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties	Fri Jun 29 17:43:42 2018 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -122,7 +122,7 @@
 crsreader.caldetected = En kalender har identifierats
 
 #CachedRowSetWriter exceptions
-crswriter.connect = Kan inte uppr\u00E4tta n\u00E5gon anslutning
+crswriter.connect = Kan inte uppr\u00E4tta anslutning
 crswriter.tname = writeData kan inte fastst\u00E4lla tabellnamnet
 crswriter.params1 = Parameterv\u00E4rde1: {0} 
 crswriter.params2 = Parameterv\u00E4rde2: {0} 
diff -r 88859cc294e1 -r 898472e83882 src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties
--- a/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties	Thu Apr 19 17:55:33 2018 +0100
+++ b/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties	Fri Jun 29 17:43:42 2018 +0100
@@ -66,7 +66,7 @@
 FileChooser.cancelButtonToolTip.textAndMnemonic=Avbryt dialogrutan f\u00F6r filval
 FileChooser.saveButtonToolTip.textAndMnemonic=Spara vald fil
 FileChooser.openButtonToolTip.textAndMnemonic=\u00D6ppna vald fil
-FileChooser.updateButtonToolTip.textAndMnemonic=Uppdatera kataloglistan
+FileChooser.updateButtonToolTip.textAndMnemonic=Uppdatera kataloglista
 FileChooser.helpButtonToolTip.textAndMnemonic=Hj\u00E4lp f\u00F6r val av fil
 FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\u00D6ppna vald katalog
 
diff -r 88859cc294e1 -r 898472e83882 src/share/classes/java/lang/ClassLoader.java
--- a/src/share/classes/java/lang/ClassLoader.java	Thu Apr 19 17:55:33 2018 +0100
+++ b/src/share/classes/java/lang/ClassLoader.java	Fri Jun 29 17:43:42 2018 +0100
@@ -188,6 +188,11 @@
     // must be added *after* it.
     private final ClassLoader parent;
 
+    // Used by ClassLoaderDependencies native class. This attribute is
+    // expected to be the 2nd instance attribute of ClassLoader class,
+    // according to java_lang_ClassLoader native class.
+    private final Object[] dependencies = new Object[2];
+
     /**
      * Encapsulates the set of parallel capable loader types.
      */
diff -r 88859cc294e1 -r 898472e83882 src/share/classes/sun/java2d/pisces/Dasher.java
--- a/src/share/classes/sun/java2d/pisces/Dasher.java	Thu Apr 19 17:55:33 2018 +0100
+++ b/src/share/classes/sun/java2d/pisces/Dasher.java	Fri Jun 29 17:43:42 2018 +0100
@@ -146,7 +146,7 @@
         if (dashOn) {
             if (starting) {
                 firstSegmentsBuffer = Helpers.widenArray(firstSegmentsBuffer,
-                                      firstSegidx, type - 2);
+                                      firstSegidx, type - 2 + 1);
                 firstSegmentsBuffer[firstSegidx++] = type;
                 System.arraycopy(pts, off, firstSegmentsBuffer, firstSegidx, type - 2);
                 firstSegidx += type - 2;
diff -r 88859cc294e1 -r 898472e83882 src/share/classes/sun/security/tools/keytool/Resources_de.java
--- a/src/share/classes/sun/security/tools/keytool/Resources_de.java	Thu Apr 19 17:55:33 2018 +0100
+++ b/src/share/classes/sun/security/tools/keytool/Resources_de.java	Fri Jun 29 17:43:42 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -423,11 +423,11 @@
 
         // 8171319: keytool should print out warnings when reading or
         // generating cert/cert req using weak algorithms
-        {"the.certificate.request", "Die Zertifikatsanforderung"},
+        {"the.certificate.request", "Die Zertifikatanforderung"},
         {"the.issuer", "Der Aussteller"},
         {"the.generated.certificate", "Das generierte Zertifikat"},
         {"the.generated.crl", "Die generierte CRL"},
-        {"the.generated.certificate.request", "Die generierte Zertifikatsanforderung"},
+        {"the.generated.certificate.request", "Die generierte Zertifikatanforderung"},
         {"the.certificate", "Das Zertifikat"},
         {"the.crl", "Die CRL"},
         {"the.tsa.certificate", "Das TSA-Zertifikat"},
@@ -442,7 +442,7 @@
         {".PATTERN.printX509Cert.with.weak",
                 "Eigent\u00FCmer: {0}\nAussteller: {1}\nSeriennummer: {2}\nG\u00FCltig von: {3} bis: {4}\nZertifikatfingerprints:\n\t MD5: {5}\n\t SHA1: {6}\n\t SHA256: {7}\nSignaturalgorithmusname: {8}\nAlgorithmus des Public Key von Betreff: {9}\nVersion: {10}"},
         {"PKCS.10.with.weak",
-                "PKCS #10-Zertifikatsanforderung (Version 1.0)\nSubject: %1$s\nFormat: %2$s\nPublic Key: %3$s\nSignaturalgorithmus: %4$s\n"},
+                "PKCS #10-Zertifikatanforderung (Version 1.0)\nSubject: %1$s\nFormat: %2$s\nPublic Key: %3$s\nSignaturalgorithmus: %4$s\n"},
         {"verified.by.s.in.s.weak", "Von %1$s in %2$s mit %3$s verifiziert"},
         {"whose.sigalg.risk", "%1$s verwendet den Signaturalgorithmus %2$s. Dies gilt als Sicherheitsrisiko."},
         {"whose.key.risk", "%1$s verwendet %2$s. Dies gilt als Sicherheitsrisiko."},
diff -r 88859cc294e1 -r 898472e83882 src/share/classes/sun/security/tools/policytool/Resources_sv.java
--- a/src/share/classes/sun/security/tools/policytool/Resources_sv.java	Thu Apr 19 17:55:33 2018 +0100
+++ b/src/share/classes/sun/security/tools/policytool/Resources_sv.java	Fri Jun 29 17:43:42 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -111,7 +111,7 @@
             "Kan inte specificera identitetshavare utan namn"},
         {"Permission.and.Target.Name.must.have.a.value",
                 "Beh\u00F6righet och m\u00E5lnamn m\u00E5ste ha ett v\u00E4rde"},
-        {"Remove.this.Policy.Entry.", "Vill du ta bort den h\u00E4r policyposten?"},
+        {"Remove.this.Policy.Entry.", "Vill du ta bort policyposten?"},
         {"Overwrite.File", "Skriv \u00F6ver fil"},
         {"Policy.successfully.written.to.filename",
                 "Policy har skrivits till {0}"},
diff -r 88859cc294e1 -r 898472e83882 src/share/classes/sun/security/util/Resources_sv.java
--- a/src/share/classes/sun/security/util/Resources_sv.java	Thu Apr 19 17:55:33 2018 +0100
+++ b/src/share/classes/sun/security/util/Resources_sv.java	Fri Jun 29 17:43:42 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@
 
         // javax.security.auth.PrivateCredentialPermission
         {"invalid.null.input.s.", "ogiltiga null-indata"},
-        {"actions.can.only.be.read.", "funktioner kan endast 'l\u00E4sas'"},
+        {"actions.can.only.be.read.", "\u00E5tg\u00E4rder kan endast 'l\u00E4sas'"},
         {"permission.name.name.syntax.invalid.",
                 "syntaxen f\u00F6r beh\u00F6righetsnamnet [{0}] \u00E4r ogiltig: "},
         {"Credential.Class.not.followed.by.a.Principal.Class.and.Name",
diff -r 88859cc294e1 -r 898472e83882 src/share/native/common/jni_util.c
--- a/src/share/native/common/jni_util.c	Thu Apr 19 17:55:33 2018 +0100
+++ b/src/share/native/common/jni_util.c	Fri Jun 29 17:43:42 2018 +0100
@@ -27,8 +27,7 @@
 #include <string.h>
 
 #include "jvm.h"
-#include "jni.h"
-#include "jni_util.h"
+#include "io_util.h"
 
 /* Due to a bug in the win32 C runtime library strings
  * such as "z:" need to be appended with a "." so we
diff -r 88859cc294e1 -r 898472e83882 test/java/awt/BasicStroke/DashStrokeTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/awt/BasicStroke/DashStrokeTest.java	Fri Jun 29 17:43:42 2018 +0100
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ * @test
+ * @bug 8075942
+ * @summary test there is no exception rendering a dashed stroke
+ * @run DashStrokeTest
+ * @run -Dsun.java2d.renderer=sun.java2d.pisces.PiscesRenderingEngine
+ */
+
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.Stroke;
+import java.awt.geom.GeneralPath;
+import java.awt.image.BufferedImage;
+
+
+public class DashStrokeTest {
+
+    public static void main(String[] args) {
+
+        GeneralPath shape = new GeneralPath();
+        int[] pointTypes = {0, 0, 1, 1, 0, 1, 1, 0};
+        double[] xpoints = {428, 420, 400, 400, 400, 400, 420, 733};
+        double[] ypoints = {180, 180, 180, 160, 30, 10, 10, 10};
+        shape.moveTo(xpoints[0], ypoints[0]);
+        for (int i = 1; i < pointTypes.length; i++) {
+            if (pointTypes[i] == 1 && i < pointTypes.length - 1) {
+                shape.quadTo(xpoints[i], ypoints[i],
+                             xpoints[i + 1], ypoints[i + 1]);
+            } else {
+                shape.lineTo(xpoints[i], ypoints[i]);
+            }
+        }
+
+        BufferedImage image = new
+            BufferedImage(1000, 1000, BufferedImage.TYPE_INT_ARGB);
+        Graphics2D g2 = image.createGraphics();
+
+        Color color = new Color(124, 0, 124, 255);
+        g2.setColor(color);
+        Stroke stroke = new BasicStroke(1.0f,
+                                        BasicStroke.CAP_BUTT,
+                                        BasicStroke.JOIN_BEVEL,
+                                        10.0f, new float[] {9, 6}, 0.0f);
+        g2.setStroke(stroke);
+        g2.draw(shape);
+    }
+}


More information about the distro-pkg-dev mailing list