--- a/jdk/make/common/Release.gmk Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/make/common/Release.gmk Tue Mar 12 18:12:44 2013 -0700
@@ -348,7 +348,6 @@
sun/tools/serialver \
sun/tools/tree \
sun/tools/util \
- sun/security/tools/jarsigner/JarBASE64Encoder.class \
sun/security/tools/jarsigner/Main.class \
sun/security/tools/jarsigner/JarSignerParameters.class \
sun/security/tools/jarsigner/Resources.class \
@@ -576,7 +575,6 @@
$(ECHO) "sun/tools/serialver/" >> $@
$(ECHO) "sun/tools/tree/" >> $@
$(ECHO) "sun/tools/util/" >> $@
- $(ECHO) "sun/security/tools/jarsigner/JarBASE64Encoder.class" >> $@
$(ECHO) "sun/security/tools/jarsigner/Main.class" >> $@
$(ECHO) "sun/security/tools/jarsigner/JarSignerParameters.class" >> $@
$(ECHO) "sun/security/tools/jarsigner/Resources.class" >> $@
--- a/jdk/make/java/java/FILES_java.gmk Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/make/java/java/FILES_java.gmk Tue Mar 12 18:12:44 2013 -0700
@@ -257,6 +257,7 @@
sun/util/calendar/ZoneInfoFile.java \
java/util/TooManyListenersException.java \
java/util/Comparator.java \
+ java/util/Comparators.java \
java/util/Collections.java \
java/util/Iterator.java \
java/util/ListIterator.java \
--- a/jdk/make/java/zip/Makefile Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/make/java/zip/Makefile Tue Mar 12 18:12:44 2013 -0700
@@ -68,6 +68,16 @@
FILES_reorder += reorder-$(ARCH)
endif
endif
+
+#
+# Use mapfile unconditionally (even with fastdebug).
+# JDK's internal zlib is incompatible with stock zlib, because the
+# size of struct z_stream has been changed, so internal zlib
+# implementation must not be allowed to leak outside of libzip.so,
+# else you get hard to debug failures with fastdebug jdk when user
+# native code includes stock zlib.
+#
+FILES_m = mapfile-vers
include $(BUILDDIR)/common/Mapfile-vers.gmk
include $(BUILDDIR)/common/Library.gmk
--- a/jdk/make/launchers/Makefile Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/make/launchers/Makefile Tue Mar 12 18:12:44 2013 -0700
@@ -77,6 +77,7 @@
-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger, )
$(call make-launcher, jps, sun.tools.jps.Jps, , )
$(call make-launcher, jrunscript, com.sun.tools.script.shell.Main, , )
+$(call make-launcher, jjs, jdk.nashorn.tools.Shell, , )
$(call make-launcher, jsadebugd, sun.jvm.hotspot.jdi.SADebugServer, , )
$(call make-launcher, jstack, sun.tools.jstack.JStack, \
-J-Dsun.jvm.hotspot.debugger.useProcDebugger \
--- a/jdk/make/sun/cmm/lcms/Makefile Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/make/sun/cmm/lcms/Makefile Tue Mar 12 18:12:44 2013 -0700
@@ -28,6 +28,9 @@
LIBRARY = lcms
PRODUCT = sun
+# Use highest level of optimization on this library
+OPTIMIZATION_LEVEL = HIGHEST
+
include $(BUILDDIR)/common/Defs.gmk
#
--- a/jdk/make/sun/cmm/lcms/mapfile-vers Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/make/sun/cmm/lcms/mapfile-vers Tue Mar 12 18:12:44 2013 -0700
@@ -27,13 +27,12 @@
SUNWprivate_1.1 {
global:
- Java_sun_java2d_cmm_lcms_LCMS_loadProfile;
- Java_sun_java2d_cmm_lcms_LCMS_freeProfile;
+ Java_sun_java2d_cmm_lcms_LCMS_loadProfileNative;
+ Java_sun_java2d_cmm_lcms_LCMS_freeProfileNative;
Java_sun_java2d_cmm_lcms_LCMS_getProfileSize;
Java_sun_java2d_cmm_lcms_LCMS_getProfileData;
- Java_sun_java2d_cmm_lcms_LCMS_getTagSize;
- Java_sun_java2d_cmm_lcms_LCMS_getTagData;
- Java_sun_java2d_cmm_lcms_LCMS_setTagData;
+ Java_sun_java2d_cmm_lcms_LCMS_getTagNative;
+ Java_sun_java2d_cmm_lcms_LCMS_setTagDataNative;
Java_sun_java2d_cmm_lcms_LCMS_colorConvert;
Java_sun_java2d_cmm_lcms_LCMS_getProfileID;
Java_sun_java2d_cmm_lcms_LCMS_initLCMS;
--- a/jdk/make/tools/javazic/Makefile Mon Mar 04 15:40:12 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1998, 2005, 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. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# 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.
-#
-
-#
-# Makefile for building the javazic tool
-#
-
-BUILDDIR = ../..
-PACKAGE = build.tools.javazic
-PRODUCT = javazic
-PROGRAM = javazic
-include $(BUILDDIR)/common/Defs.gmk
-
-BUILDTOOL_SOURCE_ROOT = $(BUILDDIR)/tools/src
-BUILDTOOL_MAIN = $(PKGDIR)/Main.java
-
-#
-# Build tool jar rules.
-#
-include $(BUILDDIR)/common/BuildToolJar.gmk
-
--- a/jdk/make/tools/src/build/tools/deps/refs.allowed Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/make/tools/src/build/tools/deps/refs.allowed Tue Mar 12 18:12:44 2013 -0700
@@ -33,8 +33,3 @@
#
java.beans.PropertyChangeListener=java.util.logging.LogManager,sun.org.mozilla.javascript.internal.Context,compact1,compact2,compact3
java.beans.PropertyChangeEvent=sun.org.mozilla.javascript.internal.Context,compact3
-
-# JFR traces even in builds with JFR disabled
-com.oracle.jrockit.jfr.FlightRecorder: com.sun.management.MissionControl, compact3
-com.oracle.jrockit.jfr.management.FlightRecorderMBean: com.sun.management.MissionControl, compact3
-
--- a/jdk/make/tools/src/build/tools/javazic/BackEnd.java Mon Mar 04 15:40:12 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2000, 2004, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package build.tools.javazic;
-
-/**
- * <code>BackEnd</code> is an abstract base class for a back-end of compiling
- * Olson's zoneinfo database and generating Java zoneinfo database.
- *
- * @since 1.4
- */
-abstract class BackEnd {
-
- /**
- * Receives each zone's TimeZone information which was created by
- * {@link Zoneinfo#parse} in class <code>Zoneinfo</code>,
- * and processes it.
- *
- * @param tz Timezone object for each zone
- * @return 0 if no error occurred, otherwise 1.
- */
- abstract int processZoneinfo(Timezone tz);
-
- /**
- * Receives whole information which is generated by JavaZic's front-end
- * in the form of Mapping object and generates all Java zone information
- * files.
- *
- * @param m Mappings object which is generated by
- * {@link Main#compile() Main.compile()}.
- * @return 0 if no error occurred, otherwise 1.
- */
- abstract int generateSrc(Mappings m);
-
- /**
- * Decides which backend class should be used and returns its instance.
- * @return an instance of backend class
- */
- static BackEnd getBackEnd() {
- if (Zoneinfo.isYearForTimeZoneDataSpecified) {
- return new Simple();
- } else if (Main.outputDoc) {
- return new GenDoc();
- } else {
- return new Gen();
- }
- }
-}
--- a/jdk/make/tools/src/build/tools/javazic/Checksum.java Mon Mar 04 15:40:12 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2000, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package build.tools.javazic;
-
-import java.util.zip.CRC32;
-
-/**
- * Checksum provides methods for calculating a CRC32 value for a
- * transitions table.
- *
- * @since 1.4
- */
-public class Checksum extends CRC32
-{
- /**
- * Updates the CRC32 value from each byte of the given int
- * value. The bytes are used in the big endian order.
- * @param val the int value
- */
- public void update(int val) {
- byte[] b = new byte[4];
- b[0] = (byte)((val >>> 24) & 0xff);
- b[1] = (byte)((val >>> 16) & 0xff);
- b[2] = (byte)((val >>> 8) & 0xff);
- b[3] = (byte)(val & 0xff);
- update(b);
- }
-
- /**
- * Updates the CRC32 value from each byte of the given long
- * value. The bytes are used in the big endian order.
- * @param val the long value
- */
- void update(long val) {
- byte[] b = new byte[8];
- b[0] = (byte)((val >>> 56) & 0xff);
- b[1] = (byte)((val >>> 48) & 0xff);
- b[2] = (byte)((val >>> 40) & 0xff);
- b[3] = (byte)((val >>> 32) & 0xff);
- b[4] = (byte)((val >>> 24) & 0xff);
- b[5] = (byte)((val >>> 16) & 0xff);
- b[6] = (byte)((val >>> 8) & 0xff);
- b[7] = (byte)(val & 0xff);
- update(b);
- }
-}
--- a/jdk/make/tools/src/build/tools/javazic/DayOfWeek.java Mon Mar 04 15:40:12 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2004, 2006, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package build.tools.javazic;
-
-/**
- * Day of week enum.
- *
- * @since 1.6
- */
-
-enum DayOfWeek {
- SUNDAY("Sun"),
- MONDAY("Mon"),
- TUESDAY("Tue"),
- WEDNESDAY("Wed"),
- THURSDAY("Thu"),
- FRIDAY("Fri"),
- SATURDAY("Sat");
-
- private final String abbr;
-
- private DayOfWeek(String abbr) {
- this.abbr = abbr;
- }
-
- String getAbbr() {
- return abbr;
- }
-
- int value() {
- return ordinal() + 1;
- }
-}
--- a/jdk/make/tools/src/build/tools/javazic/Gen.java Mon Mar 04 15:40:12 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,347 +0,0 @@
-/*
- * Copyright (c) 2000, 2011, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package build.tools.javazic;
-
-import java.io.IOException;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.DataOutputStream;
-import java.io.RandomAccessFile;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import sun.util.calendar.ZoneInfoFile;
-
-/**
- * <code>Gen</code> is one of back-end classes of javazic, and generates
- * ZoneInfoMappings and zone-specific file for each zone.
- */
-class Gen extends BackEnd {
-
- /**
- * Generates datafile in binary TLV format for each time zone.
- * Regarding contents of output files, see {@link ZoneInfoFile}.
- *
- * @param Timezone
- * @return 0 if no errors, or 1 if error occurred.
- */
- int processZoneinfo(Timezone tz) {
- try {
- int size;
- String outputDir = Main.getOutputDir();
- String zonefile = ZoneInfoFile.getFileName(tz.getName());
-
- /* If outputDir doesn't end with file-separator, adds it. */
- if (!outputDir.endsWith(File.separator)) {
- outputDir += File.separatorChar;
- }
-
- /* If zonefile includes file-separator, it's treated as part of
- * pathname. And make directory if necessary.
- */
- int index = zonefile.lastIndexOf(File.separatorChar);
- if (index != -1) {
- outputDir += zonefile.substring(0, index+1);
- }
- File outD = new File(outputDir);
- outD.mkdirs();
-
- FileOutputStream fos =
- new FileOutputStream(outputDir + zonefile.substring(index+1));
- DataOutputStream dos = new DataOutputStream(fos);
-
- /* Output Label */
- dos.write(ZoneInfoFile.JAVAZI_LABEL, 0,
- ZoneInfoFile.JAVAZI_LABEL.length);
-
- /* Output Version of ZoneInfoFile */
- dos.writeByte(ZoneInfoFile.JAVAZI_VERSION);
-
- List<Long> transitions = tz.getTransitions();
- if (transitions != null) {
- List<Integer> dstOffsets = tz.getDstOffsets();
- List<Integer> offsets = tz.getOffsets();
-
- if ((dstOffsets == null && offsets != null) ||
- (dstOffsets != null && offsets == null)) {
- Main.panic("Data not exist. (dstOffsets or offsets)");
- return 1;
- }
-
- /* Output Transition records */
- dos.writeByte(ZoneInfoFile.TAG_Transition);
- size = transitions.size();
- dos.writeShort((size * 8) & 0xFFFF);
- int dstoffset;
- for (int i = 0; i < size; i++) {
- /* if DST offset is 0, this means DST isn't used.
- * (NOT: offset's index is 0.)
- */
- if ((dstoffset = dstOffsets.get(i).intValue()) == -1) {
- dstoffset = 0;
- }
-
- dos.writeLong((transitions.get(i).longValue() << 12)
- | (dstoffset << 4)
- | offsets.get(i).intValue());
-
- }
-
- /* Output data for GMTOffset */
- List<Integer> gmtoffset = tz.getGmtOffsets();
- dos.writeByte(ZoneInfoFile.TAG_Offset);
- size = gmtoffset.size();
- dos.writeShort((size * 4) & 0xFFFF);
- for (int i = 0; i < size; i++) {
- dos.writeInt(gmtoffset.get(i));
- }
- }
-
- /* Output data for SimpleTimeZone */
- List<RuleRec> stz = tz.getLastRules();
- if (stz != null) {
- RuleRec[] rr = new RuleRec[2];
- boolean wall = true;
-
- rr[0] = stz.get(0);
- rr[1] = stz.get(1);
-
- dos.writeByte(ZoneInfoFile.TAG_SimpleTimeZone);
- wall = rr[0].getTime().isWall() && rr[1].getTime().isWall();
- if (wall) {
- dos.writeShort(32);
- } else {
- dos.writeShort(40);
- }
-
- for (int i = 0; i < 2; i++) {
- dos.writeInt(rr[i].getMonthNum() - 1); // 0-based month number
- dos.writeInt(rr[i].getDay().getDayForSimpleTimeZone());
- dos.writeInt(rr[i].getDay().getDayOfWeekForSimpleTimeZoneInt());
- dos.writeInt((int)rr[i].getTime().getTime());
- if (!wall) {
- dos.writeInt((rr[i].getTime().getType() & 0xFF) - 1);
- }
- }
- }
-
- /* Output RawOffset */
- dos.writeByte(ZoneInfoFile.TAG_RawOffset);
- dos.writeShort(4);
- dos.writeInt(tz.getRawOffset());
-
- /* Output willGMTOffsetChange flag */
- if (tz.willGMTOffsetChange()) {
- dos.writeByte(ZoneInfoFile.TAG_GMTOffsetWillChange);
- dos.writeShort(1);
- dos.writeByte(1);
- }
-
- /* Output LastDSTSaving */
- dos.writeByte(ZoneInfoFile.TAG_LastDSTSaving);
- dos.writeShort(2);
- dos.writeShort(tz.getLastDSTSaving()/1000);
-
- /* Output checksum */
- dos.writeByte(ZoneInfoFile.TAG_CRC32);
- dos.writeShort(4);
- dos.writeInt(tz.getCRC32());
-
- fos.close();
- dos.close();
- } catch(IOException e) {
- Main.panic("IO error: "+e.getMessage());
- return 1;
- }
-
- return 0;
- }
-
- /**
- * Generates ZoneInfoMappings in binary TLV format for each zone.
- * Regarding contents of output files, see {@link ZoneInfoFile}.
- *
- * @param Mappings
- * @return 0 if no errors, or 1 if error occurred.
- */
- int generateSrc(Mappings map) {
- try {
- int index;
- int block_size;
- int roi_size;
- long fp;
- String outputDir = Main.getOutputDir();
-
- /* If outputDir doesn't end with file-separator, adds it. */
- if (!outputDir.endsWith(File.separator)) {
- outputDir += File.separatorChar;
- }
-
- File outD = new File(outputDir);
- outD.mkdirs();
-
- /* Open ZoneInfoMapping file to write. */
- RandomAccessFile raf =
- new RandomAccessFile(outputDir + ZoneInfoFile.JAVAZM_FILE_NAME, "rw");
-
- /* Whether rawOffsetIndex list exists or not. */
- List<Integer> roi = map.getRawOffsetsIndex();
- if (roi == null) {
- Main.panic("Data not exist. (rawOffsetsIndex)");
- return 1;
- }
- roi_size = roi.size();
-
- /* Whether rawOffsetIndexTable list exists or not. */
- List<Set<String>> roit = map.getRawOffsetsIndexTable();
- if (roit == null || roit.size() != roi_size) {
- Main.panic("Data not exist. (rawOffsetsIndexTable) Otherwise, Invalid size");
- return 1;
- }
-
- /* Output Label */
- raf.write(ZoneInfoFile.JAVAZM_LABEL, 0,
- ZoneInfoFile.JAVAZM_LABEL.length);
-
- /* Output Version */
- raf.writeByte(ZoneInfoFile.JAVAZM_VERSION);
-
- index = ZoneInfoFile.JAVAZM_LABEL.length + 2;
-
- /* Output Version of Olson's tzdata */
- byte[] b = Main.getVersionName().getBytes("UTF-8");
- raf.writeByte(ZoneInfoFile.TAG_TZDataVersion);
- raf.writeShort((b.length+1) & 0xFFFF);
- raf.write(b);
- raf.writeByte(0x00);
- index += b.length + 4;
-
- /* Output ID list. */
- raf.writeByte(ZoneInfoFile.TAG_ZoneIDs);
- block_size = 2;
- raf.writeShort(block_size & 0xFFFF);
- short nID = 0;
- raf.writeShort(nID & 0xFFFF);
- for (int i = 0; i < roi_size; i++) {
- for (String key : roit.get(i)) {
- byte size = (byte)key.getBytes("UTF-8").length;
- raf.writeByte(size & 0xFF);
- raf.write(key.getBytes("UTF-8"), 0, size);
- block_size += 1 + size;
- nID++;
- }
- }
- fp = raf.getFilePointer();
- raf.seek(index);
- raf.writeShort((block_size) & 0xFFFF);
- raf.writeShort(nID & 0xFFFF);
- raf.seek(fp);
-
- /* Output sorted rawOffset list. */
- raf.writeByte(ZoneInfoFile.TAG_RawOffsets);
- index += 3 + block_size;
- block_size = roi_size * 4;
- raf.writeShort(block_size & 0xFFFF);
- for (int i = 0; i < roi_size; i++) {
- raf.writeInt(Integer.parseInt(roi.get(i).toString()));
- }
-
- /* Output sorted rawOffsetIndex list. */
- raf.writeByte(ZoneInfoFile.TAG_RawOffsetIndices);
- index += 3 + block_size;
- block_size = 0;
- raf.writeShort(block_size & 0xFFFF);
- int num;
- for (int i = 0; i < roi_size; i++) {
- num = roit.get(i).size();
- block_size += num;
- for (int j = 0; j < num; j++) {
- raf.writeByte(i);
- }
- }
- fp = raf.getFilePointer();
- raf.seek(index);
- raf.writeShort((block_size) & 0xFFFF);
- raf.seek(fp);
-
- /* Whether alias list exists or not. */
- Map<String,String> a = map.getAliases();
- if (a == null) {
- Main.panic("Data not exist. (aliases)");
- return 0;
- }
-
- /* Output ID list. */
- raf.writeByte(ZoneInfoFile.TAG_ZoneAliases);
- index += 3 + block_size;
- block_size = 2;
- raf.writeShort(block_size & 0xFFFF);
- raf.writeShort(a.size() & 0xFFFF);
- for (String key : a.keySet()) {
- String alias = a.get(key);
- byte key_size = (byte)key.length();
- byte alias_size = (byte)alias.length();
- raf.writeByte(key_size & 0xFF);
- raf.write(key.getBytes("UTF-8"), 0, key_size);
- raf.writeByte(alias_size & 0xFF);
- raf.write(alias.getBytes("UTF-8"), 0, alias_size);
- block_size += 2 + key_size + alias_size;
- }
- fp = raf.getFilePointer();
- raf.seek(index);
- raf.writeShort((block_size) & 0xFFFF);
- raf.seek(fp);
-
- /* Output the exclude list if it exists. */
- List<String> excludedZones = map.getExcludeList();
- if (excludedZones != null) {
- raf.writeByte(ZoneInfoFile.TAG_ExcludedZones);
- index += 3 + block_size;
- block_size = 2;
- raf.writeShort(block_size & 0xFFFF); // place holder
- raf.writeShort(excludedZones.size()); // the number of excluded zones
- for (String name : excludedZones) {
- byte size = (byte) name.length();
- raf.writeByte(size); // byte length
- raf.write(name.getBytes("UTF-8"), 0, size); // zone name
- block_size += 1 + size;
- }
- fp = raf.getFilePointer();
- raf.seek(index);
- raf.writeShort(block_size & 0xFFFF);
- raf.seek(fp);
- }
-
- /* Close ZoneInfoMapping file. */
- raf.close();
- } catch(IOException e) {
- Main.panic("IO error: "+e.getMessage());
- return 1;
- }
-
- return 0;
- }
-}
--- a/jdk/make/tools/src/build/tools/javazic/GenDoc.java Mon Mar 04 15:40:12 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,781 +0,0 @@
-/*
- * Copyright (c) 2001, 2011, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package build.tools.javazic;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.StringTokenizer;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import sun.util.calendar.ZoneInfoFile;
-
-/**
- * <code>GenDoc</code> is one of back-end classes of javazic, and generates
- * index.html and other html files which prints the detailed time zone
- * information for each zone.
- */
-class GenDoc extends BackEnd {
-
- private static final String docDir = "doc";
-
- private static final String header1 =
- "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Frameset//EN\"" +
- "\"http://www.w3.org/TR/REC-html40/frameset.dtd\">\n" +
- "<HTML>\n<HEAD>\n<!-- Generated by javazic on ";
- private static final String header2 =
- "-->\n<TITLE>\n" +
- "Java Platform, Standard Edition - TimeZone information based on ";
- private static final String header3 =
- "-->\n<TITLE>\n" +
- "Java Platform, Standard Edition TimeZone - ";
- private static final String header4 =
- "</TITLE>\n" +
- "</HEAD>\n\n";
-
- private static final String body1 =
- "<BODY BGCOLOR=\"white\">\n";
- private static final String body2 =
- "</BODY>\n";
-
- private static final String footer =
- "</HTML>\n";
-
-
- // list of time zone name and zonefile name/real time zone name
- // e.g.
- // key (String) : value (String)
- // "America/Denver" : "America/Denver.html" (real time zone)
- // "America/Shiprock" : "America/Denver" (alias)
- TreeMap<String,String> timezoneList = new TreeMap<String,String>();
-
- // list of time zone's display name and time zone name
- // e.g.
- // key (String) : value (String)
- // "Tokyo, Asia" : "Asia/Tokyo"
- // "Marengo, Indiana, America" : "America/Indiana/Marengo"
- // (aliases included)
- TreeMap<String,String> displayNameList = new TreeMap<String,String>();
-
- // list of top level regions
- // e.g.
- // key (String) : value (String)
- // "America" : "America.html"
- // (including entries in America/Indiana/, America/Kentucky/, ...)
- TreeMap<String,String> regionList = new TreeMap<String,String>();
-
- // mapping list from zone name to latitude & longitude
- // This list is generated from zone.tab.
- // e.g.
- // key (String) : value (LatitudeAndLongitude object)
- // "Asia/Tokyo" : latitude=35.3916, longitude=13.9444
- // (aliases not included)
- HashMap<String,LatitudeAndLongitude> mapList = null;
-
- // SortedMap of zone IDs sorted by their GMT offsets. If zone's GMT
- // offset will change in the future, its last known offset is
- // used.
- SortedMap<Integer, Set<String>> zonesByOffset = new TreeMap<Integer, Set<String>>();
-
- /**
- * Generates HTML document for each zone.
- * @param Timezone
- * @return 0 if no errors, or 1 if error occurred.
- */
- int processZoneinfo(Timezone tz) {
- try {
- int size;
- int index;
- String outputDir = Main.getOutputDir();
- String zonename = tz.getName();
- String zonefile = ZoneInfoFile.getFileName(zonename) + ".html";
- List<RuleRec> stz = tz.getLastRules();
- timezoneList.put(zonename, zonefile);
- displayNameList.put(transform(zonename), zonename);
-
- // Populate zonesByOffset. (Zones that will change their
- // GMT offsets are also added to zonesByOffset here.)
- int lastKnownOffset = tz.getRawOffset();
- Set<String> set = zonesByOffset.get(lastKnownOffset);
- if (set == null) {
- set = new TreeSet<String>();
- zonesByOffset.put(lastKnownOffset, set);
- }
- set.add(zonename);
-
- /* If outputDir doesn't end with file-separator, adds it. */
- if (!outputDir.endsWith(File.separator)) {
- outputDir += File.separatorChar;
- }
- outputDir += docDir + File.separatorChar;
-
- index = zonename.indexOf('/');
- if (index != -1) {
- regionList.put(zonename.substring(0, index),
- zonename.substring(0, index) + ".html");
- }
-
- /* If zonefile includes file-separator, it's treated as part of
- * pathname. And make directory if necessary.
- */
- index = zonefile.lastIndexOf('/');
- if (index != -1) {
- zonefile.replace('/', File.separatorChar);
- outputDir += zonefile.substring(0, index+1);
- }
- File outD = new File(outputDir);
- outD.mkdirs();
-
- /* If mapfile is available, add a link to the appropriate map */
- if ((mapList == null) && (Main.getMapFile() != null)) {
- FileReader fr = new FileReader(Main.getMapFile());
- BufferedReader in = new BufferedReader(fr);
- mapList = new HashMap<String,LatitudeAndLongitude>();
- String line;
- while ((line = in.readLine()) != null) {
- // skip blank and comment lines
- if (line.length() == 0 || line.charAt(0) == '#') {
- continue;
- }
- StringTokenizer tokens = new StringTokenizer(line);
- String token = tokens.nextToken(); /* We don't use the first token. */
- token = tokens.nextToken();
- LatitudeAndLongitude location = new LatitudeAndLongitude(token);
- token = tokens.nextToken();
- mapList.put(token, location);
- }
- in.close();
- }
-
- /* Open zoneinfo file to write. */
- FileWriter fw = new FileWriter(outputDir + zonefile.substring(index+1));
- BufferedWriter out = new BufferedWriter(fw);
-
- out.write(header1 + new Date() + header3 + zonename + header4);
- out.write(body1 + "<FONT size=\"+2\"><B>" + zonename + "</B></FONT>");
- LatitudeAndLongitude location = mapList.get(zonename);
- if (location != null) {
- int deg, min, sec;
-
- deg = location.getLatDeg();
- min = location.getLatMin();
- sec = location.getLatSec();
- if (deg < 0) {
- min = -min;
- sec = -sec;
- } else if (min < 0) {
- sec = -sec;
- }
- out.write(" " +
- "<A HREF=\"http://www.mapquest.com/maps/map.adp?" +
- "latlongtype=degrees" +
- "&latdeg=" + deg +
- "&latmin=" + min +
- "&latsec=" + sec);
-
- deg = location.getLongDeg();
- min = location.getLongMin();
- sec = location.getLongSec();
- if (deg < 0) {
- min = -min;
- sec = -sec;
- } else if (min < 0) {
- sec = -sec;
- }
- out.write("&longdeg=" + deg +
- "&longmin=" + min +
- "&longsec=" + sec +
- "\" target=\"_blank\">[map]</A>");
- }
- out.write("\n<P>\n");
-
- List<ZoneRec> zone = tz.getZones();
- List<RuleRec> rule = tz.getRules();
- if (rule != null && zone != null) {
- out.write("<TABLE BORDER=\"0\" WIDTH=\"100%\" CELLPADDING=\"1\" CELLSPACING=\"0\">\n" +
- "<TR>\n" +
- "<TD BGCOLOR=\"#EEEEFF\" WIDTH=\"50%\" ALIGN=\"CENTER\"><BR>" +
- "<A HREF=\"#Rules\">Rules</A><BR></TD>\n" +
- "<TD BGCOLOR=\"#EEEEFF\" WIDTH=\"50%\" ALIGN=\"CENTER\">" +
- "<A HREF=\"#Zone\"><BR>Zone<BR></A></TD>\n" +
- "</TR>\n</TABLE>\n");
- }
-
- /* Output Rule records. */
- if (rule != null) {
- size = rule.size();
- out.write("<P>\n<A NAME=\"Rules\">" +
- "<FONT SIZE=\"+1\"><B>Rules</B></FONT></A>\n" +
- "<TABLE BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" CELLSPACING=\"0\">\n" +
- "<TR BGCOLOR=\"#CCCCFF\">\n" +
- "<TD>NAME</TD><TD>FROM</TD><TD>TO</TD><TD>TYPE</TD>" +
- "<TD>IN</TD><TD>ON</TD><TD>AT</TD><TD>SAVE</TD>" +
- "<TD>LETTER/S</TD><TD>NOTES</TD>\n</TR>\n");
- for (int i = 0; i < size; i++) {
- out.write("<TR BGCOLOR=\"#FFFFFF\">\n");
- StringTokenizer st = new StringTokenizer(rule.get(i).getLine());
- String s;
- if (st.hasMoreTokens()) { /* RULE - truncated */
- st.nextToken();
- }
- if (st.hasMoreTokens()) { /* NAME */
- out.write("<TD>" + st.nextToken() + "</TD>");
- }
- if (st.hasMoreTokens()) { /* FROM */
- out.write("<TD>" + st.nextToken() + "</TD>");
- }
- if (st.hasMoreTokens()) { /* TO */
- s = st.nextToken();
- if (s.equals("min") || s.equals("max")) {
- out.write("<TD><FONT COLOR=\"red\">" + s + "</FONT></TD>");
- } else {
- out.write("<TD>" + s + "</TD>");
- }
- }
- if (st.hasMoreTokens()) { /* TYPE */
- out.write("<TD>" + st.nextToken() + "</TD>");
- }
- if (st.hasMoreTokens()) { /* IN */
- out.write("<TD>" + st.nextToken() + "</TD>");
- }
- if (st.hasMoreTokens()) { /* ON */
- out.write("<TD>" + st.nextToken() + "</TD>");
- }
- if (st.hasMoreTokens()) { /* AT */
- out.write("<TD>" + st.nextToken() + "</TD>");
- }
- if (st.hasMoreTokens()) { /* SAVE */
- out.write("<TD>" + st.nextToken() + "</TD>");
- }
- if (st.hasMoreTokens()) { /* LETTER/S */
- out.write("<TD>" + st.nextToken() + "</TD>");
- }
- if (st.hasMoreTokens()) { /* NOTES */
- s = st.nextToken();
- while (st.hasMoreTokens()) {
- s += " " + st.nextToken();
- }
- index = s.indexOf('#');
- out.write("<TD>" + s.substring(index+1) + "</TD>\n");
- } else {
- out.write("<TD> </TD>\n");
- }
- out.write("</TR>\n");
- }
- out.write("</TABLE>\n<P> <P>\n");
- }
-
- /* Output Zone records. */
- if (zone != null) {
- size = zone.size();
- out.write("<P>\n<A NAME=\"Zone\">" +
- "<FONT SIZE=\"+1\"><B>Zone</B></FONT></A>\n" +
- "<TABLE BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" CELLSPACING=\"0\">\n" +
- "<TR BGCOLOR=\"#CCCCFF\">\n<TD>GMTOFF</TD>" +
- "<TD>RULES</TD><TD>FORMAT</TD><TD>UNTIL</TD>" +
- "<TD>NOTES</TD>\n</TR>\n");
- for (int i = 0; i < size; i++) {
- out.write("<TR>\n");
- StringTokenizer st = new StringTokenizer(zone.get(i).getLine());
- String s = st.nextToken();
- if (s.equals("Zone")) { /* NAME */
- s = st.nextToken();
- s = st.nextToken();
- }
- out.write("<TD>" + s + "</TD>"); /* GMTOFFSET */
- if (st.hasMoreTokens()) { /* RULES */
- out.write("<TD>" + st.nextToken() + "</TD>");
- }
- if (st.hasMoreTokens()) { /* FORMAT */
- s = st.nextToken();
- index = s.indexOf('#');
- if (index != -1) {
- if (index != 0) {
- out.write("<TD>" + s.substring(0, index-1) +
- "</TD>"); /* FORMAT */
- s = s.substring(index+1);
- } else {
- out.write("<TD> </TD>"); /* FORMAT */
- }
- while (st.hasMoreTokens()) {
- s += " " + st.nextToken();
- }
- out.write("<TD> </TD>"); /* UNTIL */
- out.write("<TD>" + s + "</TD>\n</TR>\n"); /* NOTES */
- continue;
- } else {
- out.write("<TD>" + s + "</TD>"); /* FORMAT */
- }
- }
-
- if (st.hasMoreTokens()) { /* UNTIL */
- s = st.nextToken();
- while (st.hasMoreTokens()) {
- s += " " + st.nextToken();
- }
- index = s.indexOf('#');
- if (index != -1) {
- if (index != 0) {
- out.write("<TD>" + s.substring(0, index-1) +
- "</TD>"); /* UNTIL */
- } else {
- out.write("<TD> </TD>"); /* UNTIL */
- }
- out.write("<TD>" + s.substring(index+1) +
- "</TD>\n"); /* NOTES */
- } else {
- out.write("<TD>" + s + "</TD>"); /* UNTIL */
- out.write("<TD> </TD>\n"); /* NOTES */
- }
- } else {
- out.write("<TD> </TD>"); /* UNTIL */
- out.write("<TD> </TD>\n"); /* NOTES */
- }
- out.write("</TR>\n");
- }
- out.write("</TABLE>\n");
- }
- out.write(body2 + footer);
-
- out.close();
- fw.close();
- } catch(IOException e) {
- Main.panic("IO error: "+e.getMessage());
- return 1;
- }
-
- return 0;
- }
-
- /**
- * Generates index.html and other top-level frame files.
- * @param Mappings
- * @return 0 if no errors, or 1 if error occurred.
- */
- int generateSrc(Mappings map) {
- try {
- int len;
- Object o[];
- String outputDir = Main.getOutputDir();
- FileWriter fw1, fw2;
- BufferedWriter out1, out2;
-
- /* Whether alias list exists or not. */
- Map<String,String> a = map.getAliases();
- if (a == null) {
- Main.panic("Data not exist. (aliases)");
- return 1;
- }
-
- timezoneList.putAll(a);
-
- /* If outputDir doesn't end with file-separator, adds it. */
- if (!outputDir.endsWith(File.separator)) {
- outputDir += File.separatorChar;
- }
- outputDir += docDir + File.separatorChar;
-
- File outD = new File(outputDir);
- outD.mkdirs();
-
- /* Creates index.html */
- fw1 = new FileWriter(outputDir + "index.html", false);
- out1 = new BufferedWriter(fw1);
-
- out1.write(header1 + new Date() + header2 + Main.getVersionName() +
- header4 +
- "<FRAMESET cols=\"20%,80%\">\n" +
- "<FRAMESET rows=\"30%,70%\">\n" +
- "<FRAME src=\"overview-frame.html\" name=\"TimeZoneListFrame\">\n" +
- "<FRAME src=\"allTimeZone-frame1.html\" name=\"allTimeZoneFrame\">\n" +
- "</FRAMESET>" +
- "<FRAME src=\"overview-summary.html\" name=\"rightFrame\">\n" +
- "</FRAMESET>\n" +
- "<NOFRAMES>\n" +
- "<H2>\nFrame Alert\n</H2>\n\n" +
- "<P>\n\n" +
- "This document is designed to be viewed using the frames feature. If you see this\n" +
- "message, you are using a non-frame-capable web client.\n" +
- "<BR>\n" +
- "Link to<A HREF=\"overview-summary.html\">Non-frame version.</A>\n" +
- "</NOFRAMES>\n" + footer);
-
- out1.close();
- fw1.close();
-
-
- /* Creates overview-frame.html */
- fw1 = new FileWriter(outputDir + "overview-frame.html", false);
- out1 = new BufferedWriter(fw1);
-
- out1.write(header1 + new Date() + header2 + Main.getVersionName() +
- header4 + body1 +
- "<TABLE BORDER=\"0\" WIDTH=\"100%\">\n<TR>\n" +
- "<TD NOWRAP><FONT size=\"+1\">\n" +
- "<B>Java<sup><font size=-2>TM</font></sup> Platform<br>Standard Ed.</B></FONT></TD>\n" +
- "</TR>\n</TABLE>\n\n" +
- "<TABLE BORDER=\"0\" WIDTH=\"100%\">\n<TR>\n<TD NOWRAP>" +
- "<P>\n<FONT size=\"+1\">\nAll Time Zones Sorted By:</FONT>\n<BR>\n" +
- " <A HREF=\"allTimeZone-frame1.html\" TARGET=\"allTimeZoneFrame\">GMT offsets</A></FONT>\n<BR>\n" +
- " <A HREF=\"allTimeZone-frame2.html\" TARGET=\"allTimeZoneFrame\">Zone names</A></FONT>\n<BR>" +
- " <A HREF=\"allTimeZone-frame3.html\" TARGET=\"allTimeZoneFrame\">City names</A></FONT>\n" +
- "<P>\n<FONT size=\"+1\">\nContinents and Oceans</FONT>\n<BR>\n");
-
- for (String regionKey : regionList.keySet()) {
- out1.write(" <A HREF=\"" + regionList.get(regionKey) +
- "\" TARGET=\"allTimeZoneFrame\">" + regionKey +
- "</A><BR>\n");
-
- fw2 = new FileWriter(outputDir + regionList.get(regionKey),
- false);
- out2 = new BufferedWriter(fw2);
-
- out2.write(header1 + new Date() + header3 + regionKey +
- header4 + body1 + "<FONT size=\"+1\"><B>" +
- regionKey + "</B></FONT>\n<BR>\n<TABLE>\n<TR>\n<TD>");
-
- boolean found = false;
- for (String timezoneKey : timezoneList.keySet()) {
- int regionIndex = timezoneKey.indexOf('/');
- if (regionIndex == -1 ||
- !regionKey.equals(timezoneKey.substring(0, regionIndex))) {
- if (found) {
- break;
- } else {
- continue;
- }
- }
-
- found = true;
- if (a.containsKey(timezoneKey)) {
- Object realName = a.get(timezoneKey);
- while (a.containsKey(realName)) {
- realName = a.get(realName);
- }
- out2.write(timezoneKey +
- " (alias for " + "<A HREF=\"" +
- timezoneList.get(realName) +
- "\" TARGET=\"rightFrame\">" +
- realName + "</A>)");
- } else {
- out2.write("<A HREF=\"" + timezoneList.get(timezoneKey) +
- "\" TARGET=\"rightFrame\">" + timezoneKey +
- "</A>");
- }
- out2.write("<BR>\n");
- }
- out2.write("</TD>\n</TR>\n</TABLE>\n" + body2 + footer);
-
- out2.close();
- fw2.close();
- }
- out1.write("</FONT></TD>\n</TR></TABLE>\n" + body2 + footer);
-
- out1.close();
- fw1.close();
-
-
- /* Creates allTimeZone-frame1.html (Sorted by GMT offsets) */
- fw1 = new FileWriter(outputDir + "allTimeZone-frame1.html", false);
- out1 = new BufferedWriter(fw1);
-
- out1.write(header1 + new Date() + header2 + Main.getVersionName() +
- header4 + body1 +
- "<FONT size=\"+1\"><B>Sorted by GMT offsets</B></FONT>\n" +
- "<BR>\n\n" + "<TABLE BORDER=\"0\" WIDTH=\"100%\">\n" +
- "<TR>\n<TD NOWRAP>\n");
-
- List<Integer> roi = map.getRawOffsetsIndex();
- List<Set<String>> roit = map.getRawOffsetsIndexTable();
-
- int index = 0;
- for (Integer offset : zonesByOffset.keySet()) {
- int off = roi.get(index);
- Set<String> perRO = zonesByOffset.get(offset);
- if (offset == off) {
- // Merge aliases into zonesByOffset
- perRO.addAll(roit.get(index));
- }
- index++;
-
- for (String timezoneKey : perRO) {
- out1.write("<TR>\n<TD><FONT SIZE=\"-1\">(" +
- Time.toGMTFormat(offset.toString()) +
- ")</FONT></TD>\n<TD>");
-
- if (a.containsKey(timezoneKey)) {
- Object realName = a.get(timezoneKey);
- while (a.containsKey(realName)) {
- realName = a.get(realName);
- }
- out1.write(timezoneKey +
- " (alias for " + "<A HREF=\"" +
- timezoneList.get(realName) +
- "\" TARGET=\"rightFrame\">" + realName +
- "</A>)");
- } else {
- out1.write("<A HREF=\"" + timezoneList.get(timezoneKey) +
- "\" TARGET=\"rightFrame\">" + timezoneKey +
- "</A>");
- }
- out1.write("</TD>\n</TR>\n");
- }
- }
- out1.write("</FONT></TD>\n</TR>\n</TABLE>\n" + body2 + footer);
-
- out1.close();
- fw1.close();
-
-
- /* Creates allTimeZone-frame2.html (Sorted by zone names) */
- fw1 = new FileWriter(outputDir + "allTimeZone-frame2.html", false);
- out1 = new BufferedWriter(fw1);
-
- out1.write(header1 + new Date() + header2 + Main.getVersionName() +
- header4 + body1 +
- "<FONT size=\"+1\"><B>Sorted by zone names</B></FONT>\n" +
- "<BR>\n\n" + "<TABLE BORDER=\"0\" WIDTH=\"100%\">\n" +
- "<TR>\n<TD NOWRAP>\n");
- o = timezoneList.keySet().toArray();
- len = timezoneList.size();
- for (int i = 0; i < len; i++) {
- Object timezoneKey = o[i];
- if (a.containsKey(timezoneKey)) {
- Object realName = a.get(timezoneKey);
- while (a.containsKey(realName)) {
- realName = a.get(realName);
- }
- out1.write(timezoneKey +
- " (alias for " +
- "<A HREF=\"" + timezoneList.get(realName) +
- "\" TARGET=\"rightFrame\">" + realName +
- "</A>)");
- } else {
- out1.write("<A HREF=\"" + timezoneList.get(timezoneKey) +
- "\" TARGET=\"rightFrame\">" + timezoneKey +
- "</A>");
- }
- out1.write("<BR> \n");
- }
- out1.write("</FONT></TD>\n</TR>\n</TABLE>\n" + body2 + footer);
-
- out1.close();
- fw1.close();
-
- /* Creates allTimeZone-frame3.html (Sorted by city names) */
- fw1 = new FileWriter(outputDir + "allTimeZone-frame3.html", false);
- out1 = new BufferedWriter(fw1);
-
- out1.write(header1 + new Date() + header2 + Main.getVersionName() +
- header4 + body1 +
- "<FONT size=\"+1\"><B>Sorted by city names</B></FONT>\n" +
- "<BR>\n\n" + "<TABLE BORDER=\"0\" WIDTH=\"100%\">\n" +
- "<TR>\n<TD NOWRAP>\n");
-
- Set<String> aliasSet = a.keySet();
- len = aliasSet.size();
- String aliasNames[] = aliasSet.toArray(new String[0]);
- for (int i = 0; i < len; i++) {
- displayNameList.put(transform(aliasNames[i]),
- aliasNames[i]);
- }
-
- o = displayNameList.keySet().toArray();
- len = displayNameList.size();
- for (int i = 0; i < len; i++) {
- Object displayName = o[i];
- Object timezoneKey = displayNameList.get(o[i]);
- if (a.containsKey(timezoneKey)) {
- Object realName = a.get(timezoneKey);
- while (a.containsKey(realName)) {
- realName = a.get(realName);
- }
- out1.write(displayName +
- " (alias for " +
- "<A HREF=\"" + timezoneList.get(realName) +
- "\" TARGET=\"rightFrame\">" + realName +
- "</A>)");
- } else {
- out1.write("<A HREF=\"" + timezoneList.get(timezoneKey) +
- "\" TARGET=\"rightFrame\">" + displayName +
- "</A>");
- }
- out1.write("<BR> \n");
- }
-
- out1.write("</FONT></TD>\n</TR>\n</TABLE>\n" + body2 + footer);
-
- out1.close();
- fw1.close();
-
- /* Creates overview-summary.html */
- fw1 = new FileWriter(outputDir + "overview-summary.html", false);
- out1 = new BufferedWriter(fw1);
-
- out1.write(header1 + new Date() + header2 + Main.getVersionName() +
- header4 + body1 +
- "<p>This is the list of time zones generated from <B>" +
- Main.getVersionName() + "</B> for Java Platform, " +
- "Standard Edition. The source code can be obtained " +
- "from ftp site <a href=\"ftp://elsie.nci.nih.gov/pub/\">" +
- "ftp://elsie.nci.nih.gov/pub/</a>. A total of <B>" +
- len +
- "</B> time zones and aliases are supported " +
- "in this edition. For the " +
- "format of rules and zones, refer to the zic " +
- "(zoneinfo compiler) man page on " +
- "Solaris or Linux.</p>\n" +
- "<p>Note that the time zone data is not " +
- "a public interface of the Java Platform. No " +
- "applications should rely on the time zone data of " +
- "this document. Time zone names and data " +
- "may change without any prior notice.</p>\n" +
- body2 + footer);
-
- out1.close();
- fw1.close();
- } catch(IOException e) {
- Main.panic("IO error: "+e.getMessage());
- return 1;
- }
-
- return 0;
- }
-
- String transform(String s) {
- int index = s.lastIndexOf("/");
-
- /* If the string doesn't include any delimiter, return */
- if (index == -1) {
- return s;
- }
-
- int lastIndex = index;
- String str = s.substring(index+1);
- do {
- index = s.substring(0, lastIndex).lastIndexOf('/');
- str += ", " + s.substring(index+1, lastIndex);
- lastIndex = index;
- } while (index > -1);
-
- return str;
- }
-
- static class LatitudeAndLongitude {
-
- private int latDeg, latMin, latSec, longDeg, longMin, longSec;
-
- LatitudeAndLongitude(String s) {
- try {
- // First of all, check the string has the correct format:
- // either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS
-
- if (!s.startsWith("+") && !s.startsWith("-")) {
- Main.warning("Wrong latitude&longitude data: " + s);
- return;
- }
- int index;
- if (((index = s.lastIndexOf("+")) <= 0) &&
- ((index = s.lastIndexOf("-")) <= 0)) {
- Main.warning("Wrong latitude&longitude data: " + s);
- return;
- }
-
- if (index == 5) {
- latDeg = Integer.parseInt(s.substring(1, 3));
- latMin = Integer.parseInt(s.substring(3, 5));
- latSec = 0;
- } else if (index == 7) {
- latDeg = Integer.parseInt(s.substring(1, 3));
- latMin = Integer.parseInt(s.substring(3, 5));
- latSec = Integer.parseInt(s.substring(5, 7));
- } else {
- Main.warning("Wrong latitude&longitude data: " + s);
- return;
- }
- if (s.startsWith("-")){
- latDeg = -latDeg;
- latMin = -latMin;
- latSec = -latSec;
- }
-
- int len = s.length();
- if (index == 5 && len == 11) {
- longDeg = Integer.parseInt(s.substring(index+1, index+4));
- longMin = Integer.parseInt(s.substring(index+4, index+6));
- longSec = 0;
- } else if (index == 7 && len == 15) {
- longDeg = Integer.parseInt(s.substring(index+1, index+4));
- longMin = Integer.parseInt(s.substring(index+4, index+6));
- longSec = Integer.parseInt(s.substring(index+6, index+8));
- } else {
- Main.warning("Wrong latitude&longitude data: " + s);
- return;
- }
- if (s.charAt(index) == '-'){
- longDeg = -longDeg;
- longMin = -longMin;
- longSec = -longSec;
- }
- } catch(Exception e) {
- Main.warning("LatitudeAndLongitude() Parse error: " + s);
- }
- }
-
- int getLatDeg() {
- return latDeg;
- }
-
- int getLatMin() {
- return latMin;
- }
-
- int getLatSec() {
- return latSec;
- }
-
- int getLongDeg() {
- return longDeg;
- }
-
- int getLongMin() {
- return longMin;
- }
-
- int getLongSec() {
- return longSec;
- }
- }
-}
--- a/jdk/make/tools/src/build/tools/javazic/Main.java Mon Mar 04 15:40:12 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,238 +0,0 @@
-/*
- * Copyright (c) 2000, 2011, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package build.tools.javazic;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Main class for the javazic time zone data compiler.
- *
- * @since 1.4
- */
-public class Main {
-
- private static boolean verbose = false;
- static boolean outputDoc = false;
-
- private List<String> ziFiles = new ArrayList<String>();
- private static String zoneNamesFile = null;
- private static String versionName = "unknown";
- private static String outputDir = "zoneinfo";
- private static String mapFile = null;
-
- /**
- * Parses the specified arguments and sets up the variables.
- * @param argv the arguments
- */
- void processArgs(String[] argv) {
- for (int i = 0; i < argv.length; i++) {
- String arg = argv[i];
- if (arg.startsWith("-h")) {
- usage();
- System.exit(0);
- } else if (arg.equals("-d")) {
- outputDir = argv[++i];
- } else if (arg.equals("-v")) {
- verbose = true;
- } else if (arg.equals("-V")) {
- versionName = argv[++i];
- } else if (arg.equals("-doc")) {
- outputDoc = true;
- } else if (arg.equals("-map")) {
- outputDoc = true;
- mapFile = argv[++i];
- } else if (arg.equals("-f")) {
- zoneNamesFile = argv[++i];
- } else if (arg.equals("-S")) {
- try {
- Zoneinfo.setYear(Integer.parseInt(argv[++i]));
- } catch (Exception e) {
- error("invalid year: " + argv[i]);
- usage();
- System.exit(1);
- }
- } else {
- boolean isStartYear = arg.equals("-s");
- if (isStartYear || arg.equals("-e")) {
- try {
- int year = Integer.parseInt(argv[++i]);
- if (isStartYear) {
- Zoneinfo.setStartYear(year);
- } else {
- Zoneinfo.setEndYear(year);
- }
- } catch (Exception e) {
- error("invalid year: " + argv[i]);
- usage();
- System.exit(1);
- }
- } else {
- // the rest of args are zoneinfo source files
- while (i < argv.length) {
- ziFiles.add(argv[i++]);
- }
- }
- }
- }
- }
-
- /**
- * Parses zoneinfo source files
- */
- int compile() {
- int nFiles = ziFiles.size();
- int status = 0;
- Mappings maps = new Mappings();
- BackEnd backend = BackEnd.getBackEnd();
-
- for (int i = 0; i < nFiles; i++) {
- Zoneinfo frontend = Zoneinfo.parse(ziFiles.get(i));
-
- for (String key : frontend.getZones().keySet()) {
- info(key);
-
- Timezone tz = frontend.phase2(key);
- status |= backend.processZoneinfo(tz);
- }
-
- maps.add(frontend);
- }
-
- // special code for dealing with the conflicting name "MET"
- Zone.addMET();
-
- maps.resolve();
-
- status |= backend.generateSrc(maps);
-
- return status;
- }
-
- public static void main(String[] argv) {
- Main zic = new Main();
-
- /*
- * Parse args
- */
- zic.processArgs(argv);
-
- /*
- * Read target zone names
- */
- if (zoneNamesFile != null) {
- Zone.readZoneNames(zoneNamesFile);
- }
-
- int status = zic.compile();
-
- System.exit(status);
- }
-
- void usage() {
- System.err.println("Usage: javazic [options] file...\n"+
- " -f namefile file containing zone names\n"+
- " to be generated (ie, generating subset)\n"+
- " -d dir output directory\n"+
- " -v verbose\n"+
- " -V datavers specifies the tzdata version string\n"+
- " (eg, \"tzdata2000g\")"+
- " -S year output only SimleTimeZone data of that year\n"+
- " -s year start year (default: 1900)\n"+
- " -e year end year (default: 2037)\n"+
- " -doc generates HTML documents\n"+
- " -map mapfile generates HTML documents with map information\n"+
- " file... zoneinfo source file(s)");
- }
-
- /**
- * @return the output directory path name
- */
- static String getOutputDir() {
- return outputDir;
- }
-
- /**
- * @return the map file's path and name
- */
- static String getMapFile() {
- return mapFile;
- }
-
- /**
- * Returns the time zone data version string specified by the -V
- * option. If it is not specified, "unknown" is returned.
- * @return the time zone data version string
- */
- static String getVersionName() {
- return versionName;
- }
-
- /**
- * Prints out the specified fatal error message and calls {@link
- * java.lang.System#exit System.exit(1)}.
- * @param msg the fatal error message
- */
- static void panic(String msg) {
- printMessage("fatal error", msg);
- System.exit(1);
- }
-
- /**
- * Prints out the specified error message.
- * @param msg the error message
- */
- static void error(String msg) {
- printMessage("error", msg);
- }
-
- /**
- * Prints out the specified warning message.
- * @param msg the warning message
- */
- static void warning(String msg) {
- printMessage("warning", msg);
- }
-
- /**
- * Prints out the informative message.
- * @param msg the informative message
- */
- static void info(String msg) {
- if (verbose) {
- printMessage(null, msg);
- }
- }
-
- private static void printMessage(String type, String msg) {
- if (type != null) {
- type += ": ";
- } else {
- type = "";
- }
- System.err.println("javazic: " + type + msg);
- }
-}
--- a/jdk/make/tools/src/build/tools/javazic/Mappings.java Mon Mar 04 15:40:12 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,197 +0,0 @@
-/*
- * Copyright (c) 2000, 2012, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package build.tools.javazic;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
-
-/**
- * <code>Mappings</code> generates two Maps and a List which are used by
- * javazic BackEnd.
- *
- * @since 1.4
- */
-class Mappings {
- // All aliases specified by Link statements. It's alias name to
- // real name mappings.
- private Map<String,String> aliases;
-
- private List<Integer> rawOffsetsIndex;
-
- private List<Set<String>> rawOffsetsIndexTable;
-
- // Zone names to be excluded from rawOffset table. Those have GMT
- // offsets to change some future time.
- private List<String> excludeList;
-
- /**
- * Constructor creates some necessary instances.
- */
- Mappings() {
- aliases = new TreeMap<String,String>();
- rawOffsetsIndex = new LinkedList<Integer>();
- rawOffsetsIndexTable = new LinkedList<Set<String>>();
- }
-
- /**
- * Generates aliases and rawOffsets tables.
- * @param zi a Zoneinfo containing Zones
- */
- void add(Zoneinfo zi) {
- Map<String,Zone> zones = zi.getZones();
-
- for (String zoneName : zones.keySet()) {
- Zone zone = zones.get(zoneName);
- String zonename = zone.getName();
- int rawOffset = zone.get(zone.size()-1).getGmtOffset();
-
- // If the GMT offset of this Zone will change in some
- // future time, this Zone is added to the exclude list.
- boolean isExcluded = false;
- for (int i = 0; i < zone.size(); i++) {
- ZoneRec zrec = zone.get(i);
- if ((zrec.getGmtOffset() != rawOffset)
- && (zrec.getUntilTime(0) > Time.getCurrentTime())) {
- if (excludeList == null) {
- excludeList = new ArrayList<String>();
- }
- excludeList.add(zone.getName());
- isExcluded = true;
- break;
- }
- }
-
- if (!rawOffsetsIndex.contains(new Integer(rawOffset))) {
- // Find the index to insert this raw offset zones
- int n = rawOffsetsIndex.size();
- int i;
- for (i = 0; i < n; i++) {
- if (rawOffsetsIndex.get(i) > rawOffset) {
- break;
- }
- }
- rawOffsetsIndex.add(i, rawOffset);
-
- Set<String> perRawOffset = new TreeSet<String>();
- if (!isExcluded) {
- perRawOffset.add(zonename);
- }
- rawOffsetsIndexTable.add(i, perRawOffset);
- } else if (!isExcluded) {
- int i = rawOffsetsIndex.indexOf(new Integer(rawOffset));
- Set<String> perRawOffset = rawOffsetsIndexTable.get(i);
- perRawOffset.add(zonename);
- }
- }
-
- Map<String,String> a = zi.getAliases();
- // If there are time zone names which refer to any of the
- // excluded zones, add those names to the excluded list.
- if (excludeList != null) {
- for (String zoneName : a.keySet()) {
- String realname = a.get(zoneName);
- if (excludeList.contains(realname)) {
- excludeList.add(zoneName);
- }
- }
- }
- aliases.putAll(a);
- }
-
- /**
- * Adds valid aliases to one of per-RawOffset table and removes
- * invalid aliases from aliases List. Aliases referring to
- * excluded zones are not added to a per-RawOffset table.
- */
- void resolve() {
- int index = rawOffsetsIndexTable.size();
- List<String> toBeRemoved = new ArrayList<String>();
- for (String key : aliases.keySet()) {
- boolean validname = false;
- for (int j = 0; j < index; j++) {
- Set<String> perRO = rawOffsetsIndexTable.get(j);
- boolean isExcluded = (excludeList == null) ?
- false : excludeList.contains(key);
-
- if ((perRO.contains(aliases.get(key)) || isExcluded)
- && Zone.isTargetZone(key)) {
- validname = true;
- if (!isExcluded) {
- perRO.add(key);
- Main.info("Alias <"+key+"> added to the list.");
- }
- break;
- }
- }
-
- if (!validname) {
- Main.info("Alias <"+key+"> removed from the list.");
- toBeRemoved.add(key);
- }
- }
-
- // Remove zones, if any, from the list.
- for (String key : toBeRemoved) {
- aliases.remove(key);
- }
- // Eliminate any alias-to-alias mappings. For example, if
- // there are A->B and B->C, A->B is changed to A->C.
- Map<String, String> newMap = new HashMap<String, String>();
- for (String key : aliases.keySet()) {
- String realid = aliases.get(key);
- String leaf = realid;
- while (aliases.get(leaf) != null) {
- leaf = aliases.get(leaf);
- }
- if (!realid.equals(leaf)) {
- newMap.put(key, leaf);
- }
- }
- aliases.putAll(newMap);
- }
-
- Map<String,String> getAliases() {
- return(aliases);
- }
-
- List<Integer> getRawOffsetsIndex() {
- return(rawOffsetsIndex);
- }
-
- List<Set<String>> getRawOffsetsIndexTable() {
- return(rawOffsetsIndexTable);
- }
-
- List<String> getExcludeList() {
- return excludeList;
- }
-}
--- a/jdk/make/tools/src/build/tools/javazic/Month.java Mon Mar 04 15:40:12 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2000, 2004, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package build.tools.javazic;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Month enum handles month related manipulation.
- *
- * @since 1.4
- */
-enum Month {
- JANUARY("Jan"),
- FEBRUARY("Feb"),
- MARCH("Mar"),
- APRIL("Apr"),
- MAY("May"),
- JUNE("Jun"),
- JULY("Jul"),
- AUGUST("Aug"),
- SEPTEMBER("Sep"),
- OCTOBER("Oct"),
- NOVEMBER("Nov"),
- DECEMBER("Dec");
-
- private final String abbr;
-
- private static final Map<String,Month> abbreviations
- = new HashMap<String,Month>(12);
-
- static {
- for (Month m : Month.values()) {
- abbreviations.put(m.abbr, m);
- }
- }
-
- private Month(String abbr) {
- this.abbr = abbr;
- }
-
- int value() {
- return ordinal() + 1;
- }
-
- /**
- * Parses the specified string as a month abbreviation.
- * @param name the month abbreviation
- * @return the Month value
- */
- static Month parse(String name) {
- Month m = abbreviations.get(name);
- if (m != null) {
- return m;
- }
- return null;
- }
-
- /**
- * @param month the nunmth number (1-based)
- * @return the month name in uppercase of the specified month
- */
- static String toString(int month) {
- if (month >= JANUARY.value() && month <= DECEMBER.value()) {
- return "Calendar." + Month.values()[month - 1];
- }
- throw new IllegalArgumentException("wrong month number: " + month);
- }
-}
--- a/jdk/make/tools/src/build/tools/javazic/Rule.java Mon Mar 04 15:40:12 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,184 +0,0 @@
-/*
- * Copyright (c) 2000, 2004, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package build.tools.javazic;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-import java.util.StringTokenizer;
-
-/**
- * Rule manipulates Rule records.
- *
- * @since 1.4
- */
-class Rule {
-
- private List<RuleRec> list;
- private String name;
-
- /**
- * Constructs a Rule which consists of a Rule record list. The
- * specified name is given to this Rule.
- * @param name the Rule name
- */
- Rule(String name) {
- this.name = name;
- list = new ArrayList<RuleRec>();
- }
-
- /**
- * Added a RuleRec to the Rule record list.
- */
- void add(RuleRec rec) {
- list.add(rec);
- }
-
- /**
- * @return the Rule name
- */
- String getName() {
- return name;
- }
-
- /**
- * Gets all rule records that cover the given year.
- *
- * @param year the year number for which the rule is applicable.
- * @return rules in List that are collated in time. If no rule is found, an empty
- * List is returned.
- */
- List<RuleRec> getRules(int year) {
- List<RuleRec> rules = new ArrayList<RuleRec>(3);
- for (RuleRec rec : list) {
- if (year >= rec.getFromYear() && year <= rec.getToYear()) {
- if ((rec.isOdd() && year % 2 == 0) || (rec.isEven() && year % 2 == 1))
- continue;
- rules.add(rec);
- }
- }
- int n = rules.size();
- if (n <= 1) {
- return rules;
- }
- if (n == 2) {
- RuleRec rec1 = rules.get(0);
- RuleRec rec2 = rules.get(1);
- if (rec1.getMonthNum() > rec2.getMonthNum()) {
- rules.set(0, rec2);
- rules.set(1, rec1);
- } else if (rec1.getMonthNum() == rec2.getMonthNum()) {
- // TODO: it's not accurate to ignore time types (STD, WALL, UTC)
- long t1 = Time.getLocalTime(year, rec1.getMonth(),
- rec1.getDay(), rec1.getTime().getTime());
- long t2 = Time.getLocalTime(year, rec2.getMonth(),
- rec2.getDay(), rec2.getTime().getTime());
- if (t1 > t2) {
- rules.set(0, rec2);
- rules.set(1, rec1);
- }
- }
- return rules;
- }
-
- final int y = year;
- RuleRec[] recs = new RuleRec[rules.size()];
- rules.toArray(recs);
- Arrays.sort(recs, new Comparator<RuleRec>() {
- public int compare(RuleRec r1, RuleRec r2) {
- int n = r1.getMonthNum() - r2.getMonthNum();
- if (n != 0) {
- return n;
- }
- // TODO: it's not accurate to ignore time types (STD, WALL, UTC)
- long t1 = Time.getLocalTime(y, r1.getMonth(),
- r1.getDay(), r1.getTime().getTime());
- long t2 = Time.getLocalTime(y, r2.getMonth(),
- r2.getDay(), r2.getTime().getTime());
- return (int)(t1 - t2);
- }
- public boolean equals(Object o) {
- return this == o;
- }
- });
- rules.clear();
- for (int i = 0; i < n; i++) {
- rules.add(recs[i]);
- }
- return rules;
- }
-
- /**
- * Gets rule records that have either "max" or cover the endYear
- * value in its DST schedule.
- *
- * @return rules that contain last DST schedule. An empty
- * ArrayList is returned if no last rules are found.
- */
- List<RuleRec> getLastRules() {
- RuleRec start = null;
- RuleRec end = null;
-
- for (int i = 0; i < list.size(); i++) {
- RuleRec rec = list.get(i);
- if (rec.isLastRule()) {
- if (rec.getSave() > 0) {
- start = rec;
- } else {
- end = rec;
- }
- }
- }
- if (start == null || end == null) {
- int endYear = Zoneinfo.getEndYear();
- for (int i = 0; i < list.size(); i++) {
- RuleRec rec = list.get(i);
- if (endYear >= rec.getFromYear() && endYear <= rec.getToYear()) {
- if (start == null && rec.getSave() > 0) {
- start = rec;
- } else {
- if (end == null && rec.getSave() == 0) {
- end = rec;
- }
- }
- }
- }
- }
-
- List<RuleRec> r = new ArrayList<RuleRec>(2);
- if (start == null || end == null) {
- if (start != null || end != null) {
- Main.warning("found last rules for "+name+" inconsistent.");
- }
- return r;
- }
-
- r.add(start);
- r.add(end);
- return r;
- }
-}
--- a/jdk/make/tools/src/build/tools/javazic/RuleDay.java Mon Mar 04 15:40:12 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,190 +0,0 @@
-/*
- * Copyright (c) 2000, 2010, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package build.tools.javazic;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * RuleDay class represents the value of the "ON" field. The day of
- * week values start from 1 following the {@link java.util.Calendar}
- * convention.
- *
- * @since 1.4
- */
-class RuleDay {
- private static final Map<String,DayOfWeek> abbreviations = new HashMap<String,DayOfWeek>(7);
- static {
- for (DayOfWeek day : DayOfWeek.values()) {
- abbreviations.put(day.getAbbr(), day);
- }
- }
-
- private String dayName = null;
- private DayOfWeek dow;
- private boolean lastOne = false;
- private int soonerOrLater = 0;
- private int thanDayOfMonth; // day of month (e.g., 8 for "Sun>=8")
-
- RuleDay() {
- }
-
- RuleDay(int day) {
- thanDayOfMonth = day;
- }
-
- int getDay() {
- return thanDayOfMonth;
- }
-
- /**
- * @return the day of week value (1-based)
- */
- int getDayOfWeekNum() {
- return dow.value();
- }
-
- /**
- * @return true if this rule day represents the last day of
- * week. (e.g., lastSun).
- */
- boolean isLast() {
- return lastOne;
- }
-
- /**
- * @return true if this rule day represents the day of week on or
- * later than (after) the {@link #getDay}. (e.g., Sun>=1)
- */
- boolean isLater() {
- return soonerOrLater > 0;
- }
-
- /**
- * @return true if this rule day represents the day of week on or
- * earlier than (before) the {@link #getDay}. (e.g., Sun<=15)
- */
- boolean isEarlier() {
- return soonerOrLater < 0;
- }
-
- /**
- * @return true if this rule day represents an exact day.
- */
- boolean isExact() {
- return soonerOrLater == 0;
- }
-
- /**
- * Parses the "ON" field and constructs a RuleDay.
- * @param day an "ON" field string (e.g., "Sun>=1")
- * @return a RuleDay representing the given "ON" field
- */
- static RuleDay parse(String day) {
- RuleDay d = new RuleDay();
- if (day.startsWith("last")) {
- d.lastOne = true;
- d.dayName = day.substring(4);
- d.dow = getDOW(d.dayName);
- } else {
- int index;
- if ((index = day.indexOf(">=")) != -1) {
- d.dayName = day.substring(0, index);
- d.dow = getDOW(d.dayName);
- d.soonerOrLater = 1; // greater or equal
- d.thanDayOfMonth = Integer.parseInt(day.substring(index+2));
- } else if ((index = day.indexOf("<=")) != -1) {
- d.dayName = day.substring(0, index);
- d.dow = getDOW(d.dayName);
- d.soonerOrLater = -1; // less or equal
- d.thanDayOfMonth = Integer.parseInt(day.substring(index+2));
- } else {
- // it should be an integer value.
- d.thanDayOfMonth = Integer.parseInt(day);
- }
- }
- return d;
- }
-
- /**
- * Converts this RuleDay to the SimpleTimeZone day rule.
- * @return the converted SimpleTimeZone day rule
- */
- int getDayForSimpleTimeZone() {
- if (isLast()) {
- return -1;
- }
- return isEarlier() ? -getDay() : getDay();
- }
-
- /**
- * Converts this RuleDay to the SimpleTimeZone day-of-week rule.
- * @return the SimpleTimeZone day-of-week rule value
- */
- int getDayOfWeekForSimpleTimeZoneInt() {
- if (isEarlier() || isLater()) {
- return -getDayOfWeekNum();
- }
- return isLast() ? getDayOfWeekNum() : 0;
- }
-
- /**
- * @return the string representation of the {@link
- * #getDayOfWeekForSimpleTimeZoneInt} value
- */
- String getDayOfWeekForSimpleTimeZone() {
- int d = getDayOfWeekForSimpleTimeZoneInt();
- if (d == 0) {
- return "0";
- }
- String sign = "";
- if (d < 0) {
- sign = "-";
- d = -d;
- }
- return sign + toString(d);
- }
-
- private static DayOfWeek getDOW(String abbr) {
- return abbreviations.get(abbr);
- }
-
- /**
- * Converts the specified day of week value to the day-of-week
- * name defined in {@link java.util.Calenda}.
- * @param dow 1-based day of week value
- * @return the Calendar day of week name with "Calendar." prefix.
- * @throws IllegalArgumentException if the specified dow value is out of range.
- */
- static String toString(int dow) {
- if (dow >= DayOfWeek.SUNDAY.value() && dow <= DayOfWeek.SATURDAY.value()) {
- return "Calendar." + DayOfWeek.values()[dow - 1];
- }
- throw new IllegalArgumentException("wrong Day_of_Week number: " + dow);
- }
-}
--- a/jdk/make/tools/src/build/tools/javazic/RuleRec.java Mon Mar 04 15:40:12 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,232 +0,0 @@
-/*
- * Copyright (c) 2000, 2004, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package build.tools.javazic;
-
-import java.util.StringTokenizer;
-
-/**
- * RuleRec class represents one record of the Rule set.
- *
- * @since 1.4
- */
-class RuleRec {
- private int fromYear;
- private int toYear;
- private String type;
- private Month inMonth;
- private RuleDay onDay;
- private Time atTime;
- private int save;
- private String letters;
- private String line;
- private boolean isLastRule;
-
- int getFromYear() {
- return fromYear;
- }
-
- int getToYear() {
- return toYear;
- }
-
- Month getMonth() {
- return inMonth;
- }
-
- int getMonthNum() {
- return inMonth.value();
- }
-
- RuleDay getDay() {
- return onDay;
- }
-
- Time getTime() {
- return atTime;
- }
-
- int getSave() {
- return save;
- }
-
- String getLine() {
- return line;
- }
-
- /**
- * Sets the line from the text file.
- * @param line the text of the line
- */
- void setLine(String line) {
- this.line = line;
- }
-
- /**
- * @return true if the rule type is "odd".
- */
- boolean isOdd() {
- return "odd".equals(type);
- }
-
- /**
- * @return true if the rule type is "even".
- */
- boolean isEven() {
- return "even".equals(type);
- }
-
- /**
- * Determines if this rule record is the last DST schedule rule.
- *
- * @return true if this rule record has "max" as TO (year).
- */
- boolean isLastRule() {
- return isLastRule;
- }
-
- /**
- * Determines if the unadjusted until time of the specified ZoneRec
- * is the same as the transition time of this rule in the same
- * year as the ZoneRec until year.
- *
- * @param zrec ZoneRec to compare to
- * @param save the amount of daylight saving in milliseconds
- * @param gmtOffset the GMT offset value in milliseconds
- * @return true if the unadjusted until time is the same as rule's
- * transition time.
- */
- boolean isSameTransition(ZoneRec zrec, int save, int gmtOffset) {
- long until, transition;
-
- if (zrec.getUntilTime().getType() != atTime.getType()) {
- until = zrec.getLocalUntilTime(save, gmtOffset);
- transition = Time.getLocalTime(zrec.getUntilYear(),
- getMonth(),
- getDay(),
- save,
- gmtOffset,
- atTime);
- } else {
- until = zrec.getLocalUntilTime();
- transition = Time.getLocalTime(zrec.getUntilYear(),
- getMonth(),
- getDay(),
- atTime.getTime());
- }
-
- return until == transition;
- }
-
- /**
- * Parses a Rule line and returns a RuleRec object.
- *
- * @param tokens a StringTokenizer object that should contain a
- * token for the "FROM" field and the rest.
- * @return a RuleRec object.
- */
- static RuleRec parse(StringTokenizer tokens) {
- RuleRec rec = new RuleRec();
- try {
- // FROM
- String token = tokens.nextToken();
- try {
- rec.fromYear = Integer.parseInt(token);
- } catch (NumberFormatException e) {
- // it's not integer
- if ("min".equals(token) || "minimum".equals(token)) {
- rec.fromYear = Zoneinfo.getMinYear();
- } else if ("max".equals(token) || "maximum".equals(token)) {
- rec.fromYear = Zoneinfo.getMaxYear();
- } else {
- Main.panic("invalid year value: "+token);
- }
- }
-
- // TO
- token = tokens.nextToken();
- rec.isLastRule = false;
- try {
- rec.toYear = Integer.parseInt(token);
- } catch (NumberFormatException e) {
- // it's not integer
- if ("min".equals(token) || "minimum".equals(token)) {
- rec.fromYear = Zoneinfo.getMinYear();
- } else if ("max".equals(token) || "maximum".equals(token)) {
- rec.toYear = Integer.MAX_VALUE;
- rec.isLastRule = true;
- } else if ("only".equals(token)) {
- rec.toYear = rec.fromYear;
- } else {
- Main.panic("invalid year value: "+token);
- }
- }
-
- // TYPE
- rec.type = tokens.nextToken();
-
- // IN
- rec.inMonth = Month.parse(tokens.nextToken());
-
- // ON
- rec.onDay = RuleDay.parse(tokens.nextToken());
-
- // AT
- rec.atTime = Time.parse(tokens.nextToken());
-
- // SAVE
- rec.save = (int) Time.parse(tokens.nextToken()).getTime();
-
- // LETTER/S
- rec.letters = tokens.nextToken();
- } catch (Exception e) {
- e.printStackTrace();
- }
- return rec;
- }
-
- /**
- * Calculates the transition time of the given year under this rule.
- * @param year the year value
- * @param gmtOffset the GMT offset value in milliseconds
- * @param save the amount of daylight save time
- * @return the transition time in milliseconds of the given year in UTC.
- */
- long getTransitionTime(int year, int gmtOffset, int save) {
- long time = Time.getLocalTime(year, getMonth(),
- getDay(), atTime.getTime());
- if (atTime.isSTD()) {
- time -= gmtOffset;
- } else if (atTime.isWall()) {
- time -= gmtOffset + save;
- }
- return time;
- }
-
- private static int getInt(StringTokenizer tokens) {
- String token = tokens.nextToken();
- return Integer.parseInt(token);
- }
-}
--- a/jdk/make/tools/src/build/tools/javazic/Simple.java Mon Mar 04 15:40:12 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,188 +0,0 @@
-/*
- * Copyright (c) 2000, 2011, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package build.tools.javazic;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.TreeSet;
-
-/**
- * <code>Simple</code> generates TimeZoneData, which had been used as internal
- * data of TimeZone before J2SDK1.3.
- * Since J2SDK1.4 doesn't need TimeZoneData, this class is for maintenance
- * of old JDK release.
- */
-class Simple extends BackEnd {
-
- /**
- * Zone records which are applied for given year.
- */
- private static Map<String,ZoneRec> lastZoneRecs = new HashMap<>();
-
- /**
- * Rule records which are applied for given year.
- */
- private static Map<String,List<RuleRec>> lastRules = new TreeMap<>();
-
- /**
- * zone IDs sorted by their GMT offsets. If zone's GMT
- * offset will change in the future, its last known offset is
- * used.
- */
- private SortedMap<Integer, Set<String>> zonesByOffset = new TreeMap<>();
-
- /**
- * Sets last Rule records and Zone records for given timezone to
- * each Map.
- *
- * @param tz Timezone object for each zone
- * @return always 0
- */
- int processZoneinfo(Timezone tz) {
- String zonename = tz.getName();
-
- lastRules.put(zonename, tz.getLastRules());
- lastZoneRecs.put(zonename, tz.getLastZoneRec());
-
- // Populate zonesByOffset. (Zones that will change their
- // GMT offsets are also added to zonesByOffset here.)
- int lastKnownOffset = tz.getRawOffset();
- Set<String> set = zonesByOffset.get(lastKnownOffset);
- if (set == null) {
- set = new TreeSet<>();
- zonesByOffset.put(lastKnownOffset, set);
- }
- set.add(zonename);
-
- return 0;
- }
-
- /**
- * Generates TimeZoneData to output SimpleTimeZone data.
- * @param map Mappings object which is generated by {@link Main#compile}.
- * @return 0 if no error occurred, otherwise 1.
- */
- int generateSrc(Mappings map) {
- try {
- File outD = new File(Main.getOutputDir());
- outD.mkdirs();
-
- FileWriter fw =
- new FileWriter(new File(outD, "TimeZoneData.java"), false);
- BufferedWriter out = new BufferedWriter(fw);
-
- out.write("import java.util.SimpleTimeZone;\n\n");
- out.write(" static SimpleTimeZone zones[] = {\n");
-
- Map<String,String> a = map.getAliases();
- List<Integer> roi = map.getRawOffsetsIndex();
- List<Set<String>> roit = map.getRawOffsetsIndexTable();
-
- int index = 0;
- for (int offset : zonesByOffset.keySet()) {
- int o = roi.get(index);
- Set<String> set = zonesByOffset.get(offset);
- if (offset == o) {
- // Merge aliases into zonesByOffset
- set.addAll(roit.get(index));
- }
- index++;
-
- for (String key : set) {
- ZoneRec zrec;
- String realname;
- List<RuleRec> stz;
- if ((realname = a.get(key)) != null) {
- // if this alias is not targeted, ignore it.
- if (!Zone.isTargetZone(key)) {
- continue;
- }
- stz = lastRules.get(realname);
- zrec = lastZoneRecs.get(realname);
- } else {
- stz = lastRules.get(key);
- zrec = lastZoneRecs.get(key);
- }
-
- out.write("\t//--------------------------------------------------------------------\n");
- String s = Time.toFormedString(offset);
- out.write("\tnew SimpleTimeZone(" +
- Time.toFormedString(offset) + ", \"" + key + "\"");
- if (realname != null) {
- out.write(" /* " + realname + " */");
- }
-
- if (stz == null) {
- out.write("),\n");
- } else {
- RuleRec rr0 = stz.get(0);
- RuleRec rr1 = stz.get(1);
-
- out.write(",\n\t " + Month.toString(rr0.getMonthNum()) +
- ", " + rr0.getDay().getDayForSimpleTimeZone() + ", " +
- rr0.getDay().getDayOfWeekForSimpleTimeZone() + ", " +
- Time.toFormedString((int)rr0.getTime().getTime()) + ", " +
- rr0.getTime().getTypeForSimpleTimeZone() + ",\n" +
-
- "\t " + Month.toString(rr1.getMonthNum()) + ", " +
- rr1.getDay().getDayForSimpleTimeZone() + ", " +
- rr1.getDay().getDayOfWeekForSimpleTimeZone() + ", " +
- Time.toFormedString((int)rr1.getTime().getTime())+ ", " +
- rr1.getTime().getTypeForSimpleTimeZone() + ",\n" +
-
- "\t " + Time.toFormedString(rr0.getSave()) + "),\n");
-
- out.write("\t// " + rr0.getLine() + "\n");
- out.write("\t// " + rr1.getLine() + "\n");
- }
-
- String zline = zrec.getLine();
- if (zline.indexOf("Zone") == -1) {
- zline = "Zone " + key + "\t" + zline.trim();
- }
- out.write("\t// " + zline + "\n");
- }
- }
- out.write(" };\n");
-
- out.close();
- fw.close();
- } catch(IOException e) {
- Main.panic("IO error: "+e.getMessage());
- return 1;
- }
-
- return 0;
- }
-}
--- a/jdk/make/tools/src/build/tools/javazic/Time.java Mon Mar 04 15:40:12 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,343 +0,0 @@
-/*
- * Copyright (c) 2000, 2011, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package build.tools.javazic;
-
-import java.util.Locale;
-import sun.util.calendar.CalendarDate;
-import sun.util.calendar.CalendarSystem;
-import sun.util.calendar.Gregorian;
-
-/**
- * Time class represents the "AT" field and other time related information.
- *
- * @since 1.4
- */
-class Time {
-
- static final Gregorian gcal = CalendarSystem.getGregorianCalendar();
-
- // type is wall clock time
- private static final int WALL = 1;
-
- // type is standard time
- private static final int STD = 2;
-
- // type is UTC
- private static final int UTC = 3;
-
- // type of representing time
- private int type;
-
- /**
- * Time from the EPOCH in milliseconds
- */
- private long time;
-
- /**
- * Current time in milliseconds
- */
- private static final long currentTime = System.currentTimeMillis();
-
- Time() {
- time = 0L;
- }
-
- Time(long time) {
- this.time = time;
- }
-
- void setType(int type) {
- this.type = type;
- }
-
- long getTime() {
- return time;
- }
-
- int getType() {
- return type;
- }
-
- static long getCurrentTime() {
- return currentTime;
- }
-
- /**
- * @return true if the time is represented in wall-clock time.
- */
- boolean isWall() {
- return type == WALL;
- }
-
- /**
- * @return true if the time is represented in standard time.
- */
- boolean isSTD() {
- return type == STD;
- }
-
- /**
- * @return true if the time is represented in UTC time.
- */
- boolean isUTC() {
- return type == UTC;
- }
-
- /**
- * Converts the type to a string that represents the type in the
- * SimpleTimeZone time mode. (e.g., "SimpleTimeZone.WALL_TIME").
- * @return the converted string or null if the type is undefined.
- */
- String getTypeForSimpleTimeZone() {
- String stz = "SimpleTimeZone.";
- if (isWall()) {
- return stz+"WALL_TIME";
- }
- else if (isSTD()) {
- return stz+"STANDARD_TIME";
- }
- else if (isUTC()) {
- return stz+"UTC_TIME";
- }
- else {
- return null;
- }
- }
-
- /**
- * Converts the given Gregorian calendar field values to local time.
- * Local time is represented by the amount of milliseconds from
- * January 1, 1970 0:00 GMT.
- * @param year the year value
- * @param month the Month value
- * @param day the day represented by {@link RuleDay}
- * @param save the amount of daylight time in milliseconds
- * @param gmtOffset the GMT offset in milliseconds
- * @param time the time of the day represented by {@link Time}
- * @return local time
- */
- static long getLocalTime(int year, Month month, RuleDay day, int save,
- int gmtOffset, Time time) {
- long t = time.getTime();
-
- if (time.isSTD())
- t = time.getTime() + save;
- else if (time.isUTC())
- t = time.getTime() + save + gmtOffset;
-
- return getLocalTime(year, month, day, t);
- }
-
- /**
- * Converts the given Gregorian calendar field values to local time.
- * Local time is represented by the amount of milliseconds from
- * January 1, 1970 0:00 GMT.
- * @param year the year value
- * @param month the Month value
- * @param day the day value
- * @param time the time of the day in milliseconds
- * @return local time
- */
- static long getLocalTime(int year, Month month, int day, long time) {
- CalendarDate date = gcal.newCalendarDate(null);
- date.setDate(year, month.value(), day);
- long millis = gcal.getTime(date);
- return millis + time;
- }
-
- /**
- * Equivalent to <code>getLocalTime(year, month, day, (long)time)</code>.
- * @param year the year value
- * @param month the Month value
- * @param day the day value
- * @param time the time of the day in milliseconds
- * @return local time
- */
- static long getLocalTime(int year, Month month, int day, int time) {
- return getLocalTime(year, month, day, (long)time);
- }
-
- /**
- * Equivalent to {@link #getLocalTime(int, Month, RuleDay, int)
- * getLocalTime(year, month, day, (int) time)}.
- * @param year the year value
- * @param month the Month value
- * @param day the day represented by {@link RuleDay}
- * @param time the time of the day represented by {@link Time}
- * @return local time
- */
- static long getLocalTime(int year, Month month, RuleDay day, long time) {
- return getLocalTime(year, month, day, (int) time);
- }
-
- /**
- * Converts the given Gregorian calendar field values to local time.
- * Local time is represented by the amount of milliseconds from
- * January 1, 1970 0:00 GMT.
- * @param year the year value
- * @param month the Month value
- * @param day the day represented by {@link RuleDay}
- * @param time the time of the day represented by {@link Time}
- * @return local time
- */
- static long getLocalTime(int year, Month month, RuleDay day, int time) {
- CalendarDate cdate = gcal.newCalendarDate(null);
- int monthValue = month.value();
-
- if (day.isLast()) { // e.g., "lastSun"
- cdate.setDate(year, monthValue, 1);
- cdate.setDayOfMonth(gcal.getMonthLength(cdate));
- cdate = gcal.getNthDayOfWeek(-1, day.getDayOfWeekNum(), cdate);
- } else if (day.isLater()) { // e.g., "Sun>=1"
- cdate.setDate(year, monthValue, day.getDay());
- cdate = gcal.getNthDayOfWeek(1, day.getDayOfWeekNum(), cdate);
- } else if (day.isExact()) {
- cdate.setDate(year, monthValue, day.getDay());
- } else if (day.isEarlier()) { // e.g., "Sun<=15"
- cdate.setDate(year, monthValue, day.getDay());
- cdate = gcal.getNthDayOfWeek(-1, day.getDayOfWeekNum(), cdate);
- } else {
- Main.panic("invalid day type: " + day);
- }
- return gcal.getTime(cdate) + time;
- }
-
- /**
- * Parses the given "AT" field and constructs a Time object.
- * @param the "AT" field string
- * @return the Time object
- */
- static Time parse(String time) {
- int sign;
- int index = 0;
- Time tm;
-
- if (time.charAt(0) == '-') {
- sign = -1;
- index++;
- } else {
- sign = 1;
- }
- int val = 0;
- int num = 0;
- int countDelim = 0;
- while (index < time.length()) {
- char c = time.charAt(index++);
- if (c == ':') {
- val = val * 60 + num;
- countDelim++;
- num = 0;
- continue;
- }
- int d = Character.digit(c, 10);
- if (d == -1) {
- --index;
- break;
- }
- num = num * 10 + d;
- }
- val = val * 60 + num;
- // convert val to second
- for (; countDelim < 2; countDelim++) {
- val *= 60;
- }
- tm = new Time((long)val * 1000 * sign);
- if (index < time.length()) {
- char c = time.charAt(index++);
- if (c == 's') {
- tm.setType(Time.STD);
- } else if (c == 'u' || c == 'g' || c == 'z') {
- tm.setType(Time.UTC);
- } else if (c == 'w') {
- tm.setType(Time.WALL);
- } else {
- Main.panic("unknown time mode: "+c);
- }
- } else {
- tm.setType(Time.WALL);
- }
- return tm;
- }
-
- /**
- * Converts the given milliseconds string to a "[+-]hh:mm" string.
- * @param ms the milliseconds string
- */
- static String toGMTFormat(String ms) {
- long sec = Long.parseLong(ms) / 1000;
- char sign;
- if (sec < 0) {
- sign = '-';
- sec = -sec;
- } else {
- sign = '+';
- }
- return String.format((Locale)null, "%c%02d:%02d",
- sign, sec/3600, (sec%3600)/60);
- }
-
- /**
- * Converts the given millisecond value to a string for a
- * SimpleTimeZone parameter.
- * @param ms the millisecond value
- * @return the string in a human readable form
- */
- static String toFormedString(int ms) {
- StringBuilder s = new StringBuilder();
- boolean minus = false;
-
- if (ms < 0) {
- s.append("-");
- minus = true;
- ms = -ms;
- } else if (ms == 0) {
- return "0";
- }
-
- int hour = ms / (60 * 60 * 1000);
- ms %= (60 * 60 * 1000);
- int minute = ms / (60 * 1000);
-
- if (hour != 0) {
- if (minus && minute != 0) {
- s.append("(");
- }
- s.append(Integer.toString(hour) + "*ONE_HOUR");
- }
-
- if (minute != 0) {
- if (hour != 0) {
- s.append("+");
- }
- s.append(Integer.toString(minute) + "*ONE_MINUTE");
- if (minus && hour != 0) {
- s.append(")");
- }
- }
-
- return s.toString();
- }
-}
--- a/jdk/make/tools/src/build/tools/javazic/Timezone.java Mon Mar 04 15:40:12 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,454 +0,0 @@
-/*
- * Copyright (c) 2000, 2004, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package build.tools.javazic;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Timezone represents all information of a single point of time to
- * generate its time zone database.
- *
- * @since 1.4
- */
-class Timezone {
- /**
- * zone name of this time zone
- */
- private String name;
-
- /**
- * transition time values in UTC (millisecond)
- */
- private List<Long> transitions;
-
- /**
- * All offset values in millisecond
- * @see sun.util.calendar.ZoneInfo
- */
- private List<Integer> offsets;
-
- /**
- * Indices of GMT offset values (both raw and raw+saving)
- * at transitions
- */
- private List<Integer> gmtOffsets;
-
- /**
- * Indices of regular or "direct" saving time values
- * at transitions
- */
- private List<Integer> dstOffsets;
-
- /**
- * Zone records of this time zone
- */
- private List<ZoneRec> usedZoneRecs;
-
- /**
- * Rule records referred to by this time zone
- */
- private List<RuleRec> usedRuleRecs;
-
- /**
- * Type of DST rules in this time zone
- */
- private int dstType;
- static final int UNDEF_DST = 0; // DST type not set yet
- static final int NO_DST = 1; // never observed DST
- static final int LAST_DST = 2; // last rule ends in DST (all year round DST-only)
- static final int X_DST = 3; // used to observe DST
- static final int DST = 4; // observing DST regularly
-
- /**
- * Raw GMT offset of this time zone in the last rule
- */
- private int rawOffset;
-
- /**
- * The CRC32 value of the transitions data
- */
- private int crc32;
-
- /**
- * The last ZoneRec
- */
- private ZoneRec lastZoneRec;
-
- /**
- * The last DST rules. lastRules[0] is the DST start
- * rule. lastRules[1] is the DST end rules.
- */
- private List<RuleRec> lastRules;
-
- /**
- * The amount of DST saving value (millisecond) in the last DST
- * rule.
- */
- private int lastSaving;
-
- /**
- * true if the raw offset will change in the future time.
- */
- private boolean willRawOffsetChange = false;
-
-
- /**
- * Constracts a Timezone object with the given zone name.
- * @param name the zone name
- */
- Timezone(String name) {
- this.name = name;
- }
-
- /**
- * @return the number of transitions
- */
- int getNTransitions() {
- if (transitions == null) {
- return 0;
- }
- return transitions.size();
- }
-
- /**
- * @return the zone name
- */
- String getName() {
- return name;
- }
-
- /**
- * Returns the list of all rule records that have been referred to
- * by this time zone.
- * @return the rule records list
- */
- List<RuleRec> getRules() {
- return usedRuleRecs;
- }
-
- /**
- * Returns the list of all zone records that have been referred to
- * by this time zone.
- * @return the zone records list
- */
- List<ZoneRec> getZones() {
- return usedZoneRecs;
- }
-
- /**
- * @return the transition table (list)
- */
- List<Long> getTransitions() {
- return transitions;
- }
-
- /**
- * @return the offsets list
- */
- List<Integer> getOffsets() {
- return offsets;
- }
-
- /**
- * @return the DST saving offsets list
- */
- List<Integer> getDstOffsets() {
- return dstOffsets;
- }
-
- /**
- * @return the GMT offsets list
- */
- List<Integer> getGmtOffsets() {
- return gmtOffsets;
- }
-
- /**
- * @return the checksum (crc32) value of the trasition table
- */
- int getCRC32() {
- return crc32;
- }
-
- /**
- * @return true if the GMT offset of this time zone would change
- * after the time zone database has been generated, false, otherwise.
- */
- boolean willGMTOffsetChange() {
- return willRawOffsetChange;
- }
-
- /**
- * @return the last known GMT offset value in milliseconds
- */
- int getRawOffset() {
- return rawOffset;
- }
-
- /**
- * Sets time zone's GMT offset to <code>offset</code>.
- * @param offset the GMT offset value in milliseconds
- */
- void setRawOffset(int offset) {
- rawOffset = offset;
- }
-
- /**
- * Sets time zone's GMT offset value to <code>offset</code>. If
- * <code>startTime</code> is future time, then the {@link
- * #willRawOffsetChange} value is set to true.
- * @param offset the GMT offset value in milliseconds
- * @param startTime the UTC time at which the GMT offset is in effective
- */
- void setRawOffset(int offset, long startTime) {
- // if this rawOffset is for the future time, let the run-time
- // look for the current GMT offset.
- if (startTime > Time.getCurrentTime()) {
- willRawOffsetChange = true;
- }
- setRawOffset(offset);
- }
-
- /**
- * Adds the specified transition information to the end of the transition table.
- * @param time the UTC time at which this transition happens
- * @param offset the total amount of the offset from GMT in milliseconds
- * @param dstOffset the amount of time in milliseconds saved at this transition
- */
- void addTransition(long time, int offset, int dstOffset) {
- if (transitions == null) {
- transitions = new ArrayList<Long>();
- offsets = new ArrayList<Integer>();
- dstOffsets = new ArrayList<Integer>();
- }
- transitions.add(time);
- offsets.add(offset);
- dstOffsets.add(dstOffset);
- }
-
- /**
- * Sets the type of historical daylight saving time
- * observation. For example, China used to observed daylight
- * saving time, but it no longer does. Then, X_DST is set to the
- * China time zone.
- * @param type the type of daylight saving time
- */
- void setDSTType(int type) {
- dstType = type;
- }
-
- /**
- * @return the type of historical daylight saving time
- * observation.
- */
- int getDSTType() {
- return dstType;
- }
-
- /**
- * Adds the specified zone record to the zone records list.
- * @param rec the zone record
- */
- void addUsedRec(ZoneRec rec) {
- if (usedZoneRecs == null) {
- usedZoneRecs = new ArrayList<ZoneRec>();
- }
- usedZoneRecs.add(rec);
- }
-
- /**
- * Adds the specified rule record to the rule records list.
- * @param rec the rule record
- */
- void addUsedRec(RuleRec rec) {
- if (usedRuleRecs == null) {
- usedRuleRecs = new ArrayList<RuleRec>();
- }
- // if the last used rec is the same as the given rec, avoid
- // putting the same rule.
- int n = usedRuleRecs.size();
- for (int i = 0; i < n; i++) {
- if (usedRuleRecs.get(i).equals(rec)) {
- return;
- }
- }
- usedRuleRecs.add(rec);
- }
-
- /**
- * Sets the last zone record for this time zone.
- * @param the last zone record
- */
- void setLastZoneRec(ZoneRec zrec) {
- lastZoneRec = zrec;
- }
-
- /**
- * @return the last zone record for this time zone.
- */
- ZoneRec getLastZoneRec() {
- return lastZoneRec;
- }
-
- /**
- * Sets the last rule records for this time zone. Those are used
- * for generating SimpleTimeZone parameters.
- * @param rules the last rule records
- */
- void setLastRules(List<RuleRec> rules) {
- int n = rules.size();
- if (n > 0) {
- lastRules = rules;
- RuleRec rec = rules.get(0);
- int offset = rec.getSave();
- if (offset > 0) {
- setLastDSTSaving(offset);
- } else {
- System.err.println("\t No DST starting rule in the last rules.");
- }
- }
- }
-
- /**
- * @return the last rule records for this time zone.
- */
- List<RuleRec> getLastRules() {
- return lastRules;
- }
-
- /**
- * Sets the last daylight saving amount.
- * @param the daylight saving amount
- */
- void setLastDSTSaving(int offset) {
- lastSaving = offset;
- }
-
- /**
- * @return the last daylight saving amount.
- */
- int getLastDSTSaving() {
- return lastSaving;
- }
-
- /**
- * Calculates the CRC32 value from the transition table and sets
- * the value to <code>crc32</code>.
- */
- void checksum() {
- if (transitions == null) {
- crc32 = 0;
- return;
- }
- Checksum sum = new Checksum();
- for (int i = 0; i < transitions.size(); i++) {
- int offset = offsets.get(i);
- // adjust back to make the transition in local time
- sum.update(transitions.get(i) + offset);
- sum.update(offset);
- sum.update(dstOffsets.get(i));
- }
- crc32 = (int)sum.getValue();
- }
-
- /**
- * Removes unnecessary transitions for Java time zone support.
- */
- void optimize() {
- // if there is only one offset, delete all transitions. This
- // could happen if only time zone abbreviations changed.
- if (gmtOffsets.size() == 1) {
- transitions = null;
- usedRuleRecs = null;
- setDSTType(NO_DST);
- return;
- }
- for (int i = 0; i < (transitions.size() - 2); i++) { // don't remove the last one
- if (transitions.get(i) == transitions.get(i+1)) {
- transitions.remove(i);
- offsets.remove(i);
- dstOffsets.remove(i);
- i--;
- }
- }
-
- for (int i = 0; i < (transitions.size() - 2); i++) { // don't remove the last one
- if (offsets.get(i) == offsets.get(i+1)
- && dstOffsets.get(i) == dstOffsets.get(i+1)) {
- transitions.remove(i+1);
- offsets.remove(i+1);
- dstOffsets.remove(i+1);
- i--;
- }
- }
- }
-
- /**
- * Stores the specified offset value from GMT in the GMT offsets
- * table and returns its index. The offset value includes the base
- * GMT offset and any additional daylight saving if applicable. If
- * the same value as the specified offset is already in the table,
- * its index is returned.
- * @param offset the offset value in milliseconds
- * @return the index to the offset value in the GMT offsets table.
- */
- int getOffsetIndex(int offset) {
- return getOffsetIndex(offset, 0);
- }
-
- /**
- * Stores the specified daylight saving value in the GMT offsets
- * table and returns its index. If the same value as the specified
- * offset is already in the table, its index is returned. If 0 is
- * specified, it's not stored in the table and -1 is returned.
- * @param offset the offset value in milliseconds
- * @return the index to the specified offset value in the GMT
- * offsets table, or -1 if 0 is specified.
- */
- int getDstOffsetIndex(int offset) {
- if (offset == 0) {
- return -1;
- }
- return getOffsetIndex(offset, 1);
- }
-
- private int getOffsetIndex(int offset, int index) {
- if (gmtOffsets == null) {
- gmtOffsets = new ArrayList<Integer>();
- }
- for (int i = index; i < gmtOffsets.size(); i++) {
- if (offset == gmtOffsets.get(i)) {
- return i;
- }
- }
- if (gmtOffsets.size() < index) {
- gmtOffsets.add(0);
- }
- gmtOffsets.add(offset);
- return gmtOffsets.size() - 1;
- }
-}
--- a/jdk/make/tools/src/build/tools/javazic/Zone.java Mon Mar 04 15:40:12 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 2000, 2004, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package build.tools.javazic;
-
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-/**
- * Zone holds information corresponding to a "Zone" part of a time
- * zone definition file.
- *
- * @since 1.4
- */
-class Zone {
- // zone name (e.g., "America/Los_Angeles")
- private String name;
-
- // zone records
- private List<ZoneRec> list;
-
- // target zone names for this compilation
- private static Set<String> targetZones;
-
- /**
- * Constructs a Zone with the specified zone name.
- * @param name the zone name
- */
- Zone(String name) {
- this.name = name;
- list = new ArrayList<ZoneRec>();
- }
-
- /**
- * Reads time zone names to be generated, called "target zone
- * name", from the specified text file and creats an internal hash
- * table to keep those names. It's assumed that one text line
- * contains a zone name or comments if it starts with
- * '#'. Comments can't follow a zone name in a single line.
- * @param fileName the text file name
- */
- static void readZoneNames(String fileName) {
- if (fileName == null) {
- return;
- }
- BufferedReader in = null;
- try {
- FileReader fr = new FileReader(fileName);
- in = new BufferedReader(fr);
- } catch (FileNotFoundException e) {
- Main.panic("can't open file: " + fileName);
- }
- targetZones = new HashSet<String>();
- String line;
-
- try {
- while ((line = in.readLine()) != null) {
- line = line.trim();
- if (line.length() == 0 || line.charAt(0) == '#') {
- continue;
- }
- if (!targetZones.add(line)) {
- Main.warning("duplicated target zone name: " + line);
- }
- }
- in.close();
- } catch (IOException e) {
- Main.panic("IO error: "+e.getMessage());
- }
- }
-
- /**
- * Determines whether the specified zone is one of the target zones.
- * If no target zones are specified, this method always returns
- * true for any zone name.
- * @param zoneName the zone name
- * @return true if the specified name is a target zone.
- */
- static boolean isTargetZone(String zoneName) {
- if (targetZones == null) {
- return true;
- }
- return targetZones.contains(zoneName);
- }
-
- /**
- * Forces to add "MET" to the target zone table. This is because
- * there is a conflict between Java zone name "WET" and Olson zone
- * name.
- */
- static void addMET() {
- if (targetZones != null) {
- targetZones.add("MET");
- }
- }
-
- /**
- * @return the zone name
- */
- String getName() {
- return name;
- }
-
- /**
- * Adds the specified zone record to the zone record list.
- */
- void add(ZoneRec rec) {
- list.add(rec);
- }
-
- /**
- * @param index the index at which the zone record in the list is returned.
- * @return the zone record specified by the index.
- */
- ZoneRec get(int index) {
- return list.get(index);
- }
-
- /**
- * @return the size of the zone record list
- */
- int size() {
- return list.size();
- }
-
- /**
- * Resolves the reference to a rule in each zone record.
- * @param zi the Zoneinfo object with which the rule reference is
- * resolved.
- */
- void resolve(Zoneinfo zi) {
- for (int i = 0; i < list.size(); i++) {
- ZoneRec rec = list.get(i);
- rec.resolve(zi);
- }
- }
-}
--- a/jdk/make/tools/src/build/tools/javazic/ZoneRec.java Mon Mar 04 15:40:12 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,252 +0,0 @@
-/*
- * Copyright (c) 2000, 2004, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package build.tools.javazic;
-
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-/**
- * ZoneRec hold information of time zone corresponding to each text
- * line of the "Zone" part.
- *
- * @since 1.4
- */
-class ZoneRec {
- private int gmtOffset;
- private String ruleName;
- private int directSave;
- private Rule ruleRef;
- private String format;
- private boolean hasUntil;
- private int untilYear;
- private Month untilMonth;
- private RuleDay untilDay;
- private Time untilTime;
- private long untilInMillis;
- private String line;
-
- /**
- * @return the "UNTIL" value in milliseconds
- */
- Time getUntilTime() {
- return untilTime;
- }
-
- /**
- * @return the GMT offset value in milliseconds
- */
- int getGmtOffset() {
- return gmtOffset;
- }
-
- /**
- * @return the rule name to which this zone record refers
- */
- String getRuleName() {
- return ruleName;
- }
-
- /**
- * @return the amount of saving time directly defined in the
- * "RULES/SAVE" field.
- */
- int getDirectSave() {
- return directSave;
- }
-
- /**
- * @return true if this zone record has a reference to a rule
- */
- boolean hasRuleReference() {
- return ruleRef != null;
- }
-
- /**
- * Returns the "FORMAT" field string of this zone record. This
- * @return the "FORMAT" field
- */
- String getFormat() {
- return format;
- }
-
- /**
- * @return the year in the "UNTIL" field
- */
- int getUntilYear() {
- return untilYear;
- }
-
- /**
- * Returns the "UNTIL" field value in milliseconds from Janurary
- * 1, 1970 0:00 GMT.
- * @param currentSave the amount of daylight saving in
- * milliseconds that is used to adjust wall-clock time.
- * @return the milliseconds value of the "UNTIL" field
- */
- long getUntilTime(int currentSave) {
- if (untilTime.isWall()) {
- return untilInMillis - currentSave;
- }
- return untilInMillis;
- }
-
- /**
- * Returns the "UNTIL" time in milliseconds without adjusting GMT
- * offsets or daylight saving.
- * @return local "UNTIL" time in milliseconds
- */
- long getLocalUntilTime() {
- return Time.getLocalTime(untilYear,
- untilMonth,
- untilDay,
- untilTime.getTime());
- }
-
- /**
- * Returns the "UNTIL" time in milliseconds with adjusting GMT offsets and daylight saving.
- * @return the "UNTIL" time after the adjustment
- */
- long getLocalUntilTime(int save, int gmtOffset) {
- return Time.getLocalTime(untilYear,
- untilMonth,
- untilDay,
- save,
- gmtOffset,
- untilTime);
- }
-
- /**
- * @return the text line of this zone record
- */
- String getLine() {
- return line;
- }
-
- /**
- * Sets the specified text line to this zone record
- */
- void setLine(String line) {
- this.line = line;
- }
-
- /**
- * @return true if this zone record has the "UNTIL" field
- */
- boolean hasUntil() {
- return this.hasUntil;
- }
-
- /**
- * Adjusts the "UNTIL" time to GMT offset if this zone record has
- * it. <code>untilTime</code> is not adjusted to daylight saving
- * in this method.
- */
- void adjustTime() {
- if (!hasUntil()) {
- return;
- }
- if (untilTime.isSTD() || untilTime.isWall()) {
- // adjust to gmt offset only here. adjust to real
- // wall-clock time when tracking rules
- untilInMillis -= gmtOffset;
- }
- }
-
- /**
- * @return the reference to the Rule object
- */
- Rule getRuleRef() {
- return ruleRef;
- }
-
- /**
- * Resolves the reference to a Rule and adjusts its "UNTIL" time
- * to GMT offset.
- */
- void resolve(Zoneinfo zi) {
- if (ruleName != null && (!"-".equals(ruleName))) {
- ruleRef = zi.getRule(ruleName);
- }
- adjustTime();
- }
-
- /**
- * Parses a Zone text line that is described by a StringTokenizer.
- * @param tokens represents tokens of a Zone text line
- * @return the zone record produced by parsing the text
- */
- static ZoneRec parse(StringTokenizer tokens) {
- ZoneRec rec = new ZoneRec();
- try {
- rec.gmtOffset = (int) Time.parse(tokens.nextToken()).getTime();
- String token = tokens.nextToken();
- char c = token.charAt(0);
- if (c >= '0' && c <= '9') {
- rec.directSave = (int) Time.parse(token).getTime();
- } else {
- rec.ruleName = token;
- }
- rec.format = tokens.nextToken();
- if (tokens.hasMoreTokens()) {
- rec.hasUntil = true;
- rec.untilYear = Integer.parseInt(tokens.nextToken());
- if (tokens.hasMoreTokens()) {
- rec.untilMonth = Month.parse(tokens.nextToken());
- } else {
- rec.untilMonth = Month.JANUARY;
- }
- if (tokens.hasMoreTokens()) {
- rec.untilDay = RuleDay.parse(tokens.nextToken());
- } else {
- rec.untilDay = new RuleDay(1);
- }
- if (tokens.hasMoreTokens()) {
- rec.untilTime = Time.parse(tokens.nextToken());
- } else {
- rec.untilTime = Time.parse("0:00");
- }
- rec.untilInMillis = rec.getLocalUntilTime();
- }
- } catch (Exception e) {
- // TODO: error reporting
- e.printStackTrace();
- }
- return rec;
- }
-
- private static void panic(String msg) {
- Main.panic(msg);
- }
-}
--- a/jdk/make/tools/src/build/tools/javazic/Zoneinfo.java Mon Mar 04 15:40:12 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,569 +0,0 @@
-/*
- * Copyright (c) 2000, 2011, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-package build.tools.javazic;
-
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-/**
- * Zoneinfo provides javazic compiler front-end functionality.
- * @since 1.4
- */
-class Zoneinfo {
-
- private static final int minYear = 1900;
- private static final int maxYear = 2037;
- private static final long minTime = Time.getLocalTime(minYear, Month.JANUARY, 1, 0);
- private static int startYear = minYear;
- private static int endYear = maxYear;
-
- /**
- * True if javazic should generate a list of SimpleTimeZone
- * instances for the SimpleTimeZone-based time zone support.
- */
- static boolean isYearForTimeZoneDataSpecified = false;
-
- /**
- * Zone name to Zone mappings
- */
- private Map<String,Zone> zones;
-
- /**
- * Rule name to Rule mappings
- */
- private Map<String,Rule> rules;
-
- /**
- * Alias name to real name mappings
- */
- private Map<String,String> aliases;
-
- /**
- * Constracts a Zoneinfo.
- */
- Zoneinfo() {
- zones = new HashMap<String,Zone>();
- rules = new HashMap<String,Rule>();
- aliases = new HashMap<String,String>();
- }
-
- /**
- * Adds the given zone to the list of Zones.
- * @param zone Zone to be added to the list.
- */
- void add(Zone zone) {
- String name = zone.getName();
- zones.put(name, zone);
- }
-
- /**
- * Adds the given rule to the list of Rules.
- * @param rule Rule to be added to the list.
- */
- void add(Rule rule) {
- String name = rule.getName();
- rules.put(name, rule);
- }
-
- /**
- * Puts the specifid name pair to the alias table.
- * @param name1 an alias time zone name
- * @param name2 the real time zone of the alias name
- */
- void putAlias(String name1, String name2) {
- aliases.put(name1, name2);
- }
-
- /**
- * Sets the given year for SimpleTimeZone list output.
- * This method is called when the -S option is specified.
- * @param year the year for which SimpleTimeZone list should be generated
- */
- static void setYear(int year) {
- setStartYear(year);
- setEndYear(year);
- isYearForTimeZoneDataSpecified = true;
- }
-
- /**
- * Sets the start year.
- * @param year the start year value
- * @throws IllegalArgumentException if the specified year value is
- * smaller than the minimum year or greater than the end year.
- */
- static void setStartYear(int year) {
- if (year < minYear || year > endYear) {
- throw new IllegalArgumentException("invalid start year specified: " + year);
- }
- startYear = year;
- }
-
- /**
- * @return the start year value
- */
- static int getStartYear() {
- return startYear;
- }
-
- /**
- * Sets the end year.
- * @param year the end year value
- * @throws IllegalArgumentException if the specified year value is
- * smaller than the start year or greater than the maximum year.
- */
- static void setEndYear(int year) {
- if (year < startYear || year > maxYear) {
- throw new IllegalArgumentException();
- }
- endYear = year;
- }
-
- /**
- * @return the end year value
- */
- static int getEndYear() {
- return endYear;
- }
-
- /**
- * @return the minimum year value
- */
- static int getMinYear() {
- return minYear;
- }
-
- /**
- * @return the maximum year value
- */
- static int getMaxYear() {
- return maxYear;
- }
-
- /**
- * @return the alias table
- */
- Map<String,String> getAliases() {
- return aliases;
- }
-
- /**
- * @return the Zone list
- */
- Map<String,Zone> getZones() {
- return zones;
- }
-
- /**
- * @return a Zone specified by name.
- * @param name a zone name
- */
- Zone getZone(String name) {
- return zones.get(name);
- }
-
- /**
- * @return a Rule specified by name.
- * @param name a rule name
- */
- Rule getRule(String name) {
- return rules.get(name);
- }
-
- private static String line;
-
- private static int lineNum;
-
- /**
- * Parses the specified time zone data file and creates a Zoneinfo
- * that has all Rules, Zones and Links (aliases) information.
- * @param fname the time zone data file name
- * @return a Zoneinfo object
- */
- static Zoneinfo parse(String fname) {
- BufferedReader in = null;
- try {
- FileReader fr = new FileReader(fname);
- in = new BufferedReader(fr);
- } catch (FileNotFoundException e) {
- panic("can't open file: "+fname);
- }
- Zoneinfo zi = new Zoneinfo();
- boolean continued = false;
- Zone zone = null;
- String l;
- lineNum = 0;
-
- try {
- while ((line = in.readLine()) != null) {
- lineNum++;
- // skip blank and comment lines
- if (line.length() == 0 || line.charAt(0) == '#') {
- continue;
- }
-
- // trim trailing comments
- int rindex = line.lastIndexOf('#');
- if (rindex != -1) {
- // take the data part of the line
- l = line.substring(0, rindex);
- } else {
- l = line;
- }
-
- StringTokenizer tokens = new StringTokenizer(l);
- if (!tokens.hasMoreTokens()) {
- continue;
- }
- String token = tokens.nextToken();
-
- if (continued || "Zone".equals(token)) {
- if (zone == null) {
- if (!tokens.hasMoreTokens()) {
- panic("syntax error: zone no more token");
- }
- token = tokens.nextToken();
- // if the zone name is in "GMT+hh" or "GMT-hh"
- // format, ignore it due to spec conflict.
- if (token.startsWith("GMT+") || token.startsWith("GMT-")) {
- continue;
- }
- zone = new Zone(token);
- } else {
- // no way to push the current token back...
- tokens = new StringTokenizer(l);
- }
-
- ZoneRec zrec = ZoneRec.parse(tokens);
- zrec.setLine(line);
- zone.add(zrec);
- if ((continued = zrec.hasUntil()) == false) {
- if (Zone.isTargetZone(zone.getName())) {
- // zone.resolve(zi);
- zi.add(zone);
- }
- zone = null;
- }
- } else if ("Rule".equals(token)) {
- if (!tokens.hasMoreTokens()) {
- panic("syntax error: rule no more token");
- }
- token = tokens.nextToken();
- Rule rule = zi.getRule(token);
- if (rule == null) {
- rule = new Rule(token);
- zi.add(rule);
- }
- RuleRec rrec = RuleRec.parse(tokens);
- rrec.setLine(line);
- rule.add(rrec);
- } else if ("Link".equals(token)) {
- // Link <newname> <oldname>
- try {
- String name1 = tokens.nextToken();
- String name2 = tokens.nextToken();
-
- // if the zone name is in "GMT+hh" or "GMT-hh"
- // format, ignore it due to spec conflict with
- // custom time zones. Also, ignore "ROC" for
- // PC-ness.
- if (name2.startsWith("GMT+") || name2.startsWith("GMT-")
- || "ROC".equals(name2)) {
- continue;
- }
- zi.putAlias(name2, name1);
- } catch (Exception e) {
- panic("syntax error: no more token for Link");
- }
- }
- }
- in.close();
- } catch (IOException ex) {
- panic("IO error: " + ex.getMessage());
- }
-
- return zi;
- }
-
- /**
- * Interprets a zone and constructs a Timezone object that
- * contains enough information on GMT offsets and DST schedules to
- * generate a zone info database.
- *
- * @param zoneName the zone name for which a Timezone object is
- * constructed.
- *
- * @return a Timezone object that contains all GMT offsets and DST
- * rules information.
- */
- Timezone phase2(String zoneName) {
- Timezone tz = new Timezone(zoneName);
- Zone zone = getZone(zoneName);
- zone.resolve(this);
-
- // TODO: merge phase2's for the regular and SimpleTimeZone ones.
- if (isYearForTimeZoneDataSpecified) {
- ZoneRec zrec = zone.get(zone.size()-1);
- tz.setLastZoneRec(zrec);
- tz.setRawOffset(zrec.getGmtOffset());
- if (zrec.hasRuleReference()) {
- /*
- * This part assumes that the specified year is covered by
- * the rules referred to by the last zone record.
- */
- List<RuleRec> rrecs = zrec.getRuleRef().getRules(startYear);
-
- if (rrecs.size() == 2) {
- // make sure that one is a start rule and the other is
- // an end rule.
- RuleRec r0 = rrecs.get(0);
- RuleRec r1 = rrecs.get(1);
- if (r0.getSave() == 0 && r1.getSave() > 0) {
- rrecs.set(0, r1);
- rrecs.set(1, r0);
- } else if (!(r0.getSave() > 0 && r1.getSave() == 0)) {
- rrecs = null;
- Main.error(zoneName + ": rules for " + startYear + " not found.");
- }
- } else {
- rrecs = null;
- }
- if (rrecs != null) {
- tz.setLastRules(rrecs);
- }
- }
- return tz;
- }
-
- int gmtOffset;
- int year = minYear;
- int fromYear = year;
- long fromTime = Time.getLocalTime(startYear,
- Month.JANUARY,
- 1, 0);
-
- // take the index 0 for the GMT offset of the last zone record
- ZoneRec zrec = zone.get(zone.size()-1);
- tz.getOffsetIndex(zrec.getGmtOffset());
-
- int currentSave = 0;
- boolean usedZone;
- for (int zindex = 0; zindex < zone.size(); zindex++) {
- zrec = zone.get(zindex);
- usedZone = false;
- gmtOffset = zrec.getGmtOffset();
- int stdOffset = zrec.getDirectSave();
-
- // If this is the last zone record, take the last rule info.
- if (!zrec.hasUntil()) {
- tz.setRawOffset(gmtOffset, fromTime);
- if (zrec.hasRuleReference()) {
- tz.setLastRules(zrec.getRuleRef().getLastRules());
- } else if (stdOffset != 0) {
- // in case the last rule is all year round DST-only
- // (Asia/Amman once announced this rule.)
- tz.setLastDSTSaving(stdOffset);
- }
- }
- if (!zrec.hasRuleReference()) {
- if (!zrec.hasUntil() || zrec.getUntilTime(stdOffset) >= fromTime) {
- tz.addTransition(fromTime,
- tz.getOffsetIndex(gmtOffset+stdOffset),
- tz.getDstOffsetIndex(stdOffset));
- usedZone = true;
- }
- currentSave = stdOffset;
- // optimization in case the last rule is fixed.
- if (!zrec.hasUntil()) {
- if (tz.getNTransitions() > 0) {
- if (stdOffset == 0) {
- tz.setDSTType(Timezone.X_DST);
- } else {
- tz.setDSTType(Timezone.LAST_DST);
- }
- long time = Time.getLocalTime(maxYear,
- Month.JANUARY, 1, 0);
- time -= zrec.getGmtOffset();
- tz.addTransition(time,
- tz.getOffsetIndex(gmtOffset+stdOffset),
- tz.getDstOffsetIndex(stdOffset));
- tz.addUsedRec(zrec);
- } else {
- tz.setDSTType(Timezone.NO_DST);
- }
- break;
- }
- } else {
- Rule rule = zrec.getRuleRef();
- boolean fromTimeUsed = false;
- currentSave = 0;
- year_loop:
- for (year = getMinYear(); year <= endYear; year++) {
- if (zrec.hasUntil() && year > zrec.getUntilYear()) {
- break;
- }
- List<RuleRec> rules = rule.getRules(year);
- if (rules.size() > 0) {
- for (int i = 0; i < rules.size(); i++) {
- RuleRec rrec = rules.get(i);
- long transition = rrec.getTransitionTime(year,
- gmtOffset,
- currentSave);
- if (zrec.hasUntil()) {
- if (transition >= zrec.getUntilTime(currentSave)) {
- break year_loop;
- }
- }
-
- if (fromTimeUsed == false) {
- if (fromTime <= transition) {
- fromTimeUsed = true;
-
- if (fromTime != minTime) {
- int prevsave;
-
- ZoneRec prevzrec = zone.get(zindex - 1);
-
- // See if until time in the previous
- // ZoneRec is the same thing as the
- // local time in the next rule.
- // (examples are Asia/Ashkhabad in 1991,
- // Europe/Riga in 1989)
-
- if (i > 0) {
- prevsave = rules.get(i-1).getSave();
- } else {
- List<RuleRec> prevrules = rule.getRules(year-1);
-
- if (prevrules.size() > 0) {
- prevsave = prevrules.get(prevrules.size()-1).getSave();
- } else {
- prevsave = 0;
- }
- }
-
- if (rrec.isSameTransition(prevzrec, prevsave, gmtOffset)) {
- currentSave = rrec.getSave();
- tz.addTransition(fromTime,
- tz.getOffsetIndex(gmtOffset+currentSave),
- tz.getDstOffsetIndex(currentSave));
- tz.addUsedRec(rrec);
- usedZone = true;
- continue;
- }
- if (!prevzrec.hasRuleReference()
- || rule != prevzrec.getRuleRef()
- || (rule == prevzrec.getRuleRef()
- && gmtOffset != prevzrec.getGmtOffset())) {
- int save = (fromTime == transition) ? rrec.getSave() : currentSave;
- tz.addTransition(fromTime,
- tz.getOffsetIndex(gmtOffset+save),
- tz.getDstOffsetIndex(save));
- tz.addUsedRec(rrec);
- usedZone = true;
- }
- } else { // fromTime == minTime
- int save = rrec.getSave();
- tz.addTransition(minTime,
- tz.getOffsetIndex(gmtOffset),
- tz.getDstOffsetIndex(0));
-
- tz.addTransition(transition,
- tz.getOffsetIndex(gmtOffset+save),
- tz.getDstOffsetIndex(save));
-
- tz.addUsedRec(rrec);
- usedZone = true;
- }
- } else if (year == fromYear && i == rules.size()-1) {
- int save = rrec.getSave();
- tz.addTransition(fromTime,
- tz.getOffsetIndex(gmtOffset+save),
- tz.getDstOffsetIndex(save));
- }
- }
-
- currentSave = rrec.getSave();
- if (fromTime < transition) {
- tz.addTransition(transition,
- tz.getOffsetIndex(gmtOffset+currentSave),
- tz.getDstOffsetIndex(currentSave));
- tz.addUsedRec(rrec);
- usedZone = true;
- }
- }
- } else {
- if (year == fromYear) {
- tz.addTransition(fromTime,
- tz.getOffsetIndex(gmtOffset+currentSave),
- tz.getDstOffsetIndex(currentSave));
- fromTimeUsed = true;
- }
- if (year == endYear && !zrec.hasUntil()) {
- if (tz.getNTransitions() > 0) {
- // Assume that this Zone stopped DST
- tz.setDSTType(Timezone.X_DST);
- long time = Time.getLocalTime(maxYear, Month.JANUARY,
- 1, 0);
- time -= zrec.getGmtOffset();
- tz.addTransition(time,
- tz.getOffsetIndex(gmtOffset),
- tz.getDstOffsetIndex(0));
- usedZone = true;
- } else {
- tz.setDSTType(Timezone.NO_DST);
- }
- }
- }
- }
- }
- if (usedZone) {
- tz.addUsedRec(zrec);
- }
- if (zrec.hasUntil() && zrec.getUntilTime(currentSave) > fromTime) {
- fromTime = zrec.getUntilTime(currentSave);
- fromYear = zrec.getUntilYear();
- year = zrec.getUntilYear();
- }
- }
-
- if (tz.getDSTType() == Timezone.UNDEF_DST) {
- tz.setDSTType(Timezone.DST);
- }
- tz.optimize();
- tz.checksum();
- return tz;
- }
-
- private static void panic(String msg) {
- Main.panic(msg);
- }
-}
--- a/jdk/makefiles/CompileLaunchers.gmk Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/makefiles/CompileLaunchers.gmk Tue Mar 12 18:12:44 2013 -0700
@@ -311,6 +311,9 @@
$(eval $(call SetupLauncher,jrunscript,\
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.script.shell.Main"$(COMMA) }'))
+$(eval $(call SetupLauncher,jjs,\
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "jdk.nashorn.tools.Shell"$(COMMA) }'))
+
$(eval $(call SetupLauncher,jsadebugd,\
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.jvm.hotspot.jdi.SADebugServer"$(COMMA) }' \
-DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \
--- a/jdk/makefiles/CompileNativeLibraries.gmk Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/makefiles/CompileNativeLibraries.gmk Tue Mar 12 18:12:44 2013 -0700
@@ -1218,7 +1218,7 @@
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
SRC:=$(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms,\
LANG:=C,\
- OPTIMIZATION:=LOW, \
+ OPTIMIZATION:=HIGHEST, \
CFLAGS:=$(filter-out -xc99=%none,$(CFLAGS_JDKLIB)) \
$(SHARED_LIBRARY_FLAGS) \
-I$(JDK_TOPDIR)/src/share/native/sun/java2d \
--- a/jdk/makefiles/CreateJars.gmk Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/makefiles/CreateJars.gmk Tue Mar 12 18:12:44 2013 -0700
@@ -213,28 +213,28 @@
org/relaxng/datatype \
sun/awt/HKSCS.class \
sun/awt/motif/X11GB2312.class \
- sun/awt/motif/X11GB2312\$$$$Decoder.class \
- sun/awt/motif/X11GB2312\$$$$Encoder.class \
+ sun/awt/motif/X11GB2312\$$Decoder.class \
+ sun/awt/motif/X11GB2312\$$Encoder.class \
sun/awt/motif/X11GBK.class \
- sun/awt/motif/X11GBK\$$$$Encoder.class \
+ sun/awt/motif/X11GBK\$$Encoder.class \
sun/awt/motif/X11KSC5601.class \
- sun/awt/motif/X11KSC5601\$$$$Decoder.class \
- sun/awt/motif/X11KSC5601\$$$$Encoder.class \
+ sun/awt/motif/X11KSC5601\$$Decoder.class \
+ sun/awt/motif/X11KSC5601\$$Encoder.class \
sun/jvmstat \
sun/net/spi/nameservice/dns \
sun/nio/cs/ext \
sun/rmi/rmic \
sun/security/ec/ECDHKeyAgreement.class \
sun/security/ec/ECDSASignature.class \
- sun/security/ec/ECDSASignature\$$$$Raw.class \
- sun/security/ec/ECDSASignature\$$$$SHA1.class \
- sun/security/ec/ECDSASignature\$$$$SHA224.class \
- sun/security/ec/ECDSASignature\$$$$SHA256.class \
- sun/security/ec/ECDSASignature\$$$$SHA384.class \
- sun/security/ec/ECDSASignature\$$$$SHA512.class \
+ sun/security/ec/ECDSASignature\$$Raw.class \
+ sun/security/ec/ECDSASignature\$$SHA1.class \
+ sun/security/ec/ECDSASignature\$$SHA224.class \
+ sun/security/ec/ECDSASignature\$$SHA256.class \
+ sun/security/ec/ECDSASignature\$$SHA384.class \
+ sun/security/ec/ECDSASignature\$$SHA512.class \
sun/security/ec/ECKeyFactory.class \
sun/security/ec/ECKeyPairGenerator.class \
- sun/security/ec/SunEC\$$$$1.class \
+ sun/security/ec/SunEC\$$1.class \
sun/security/ec/SunEC.class \
sun/security/ec/SunECEntries.class \
sun/security/internal \
@@ -1119,6 +1119,14 @@
##########################################################################################
+# Import nashorn.jar from nashorn dist dir.
+$(IMAGES_OUTPUTDIR)/lib/ext/nashorn.jar: $(NASHORN_DIST)/nashorn.jar
+ $(install-file)
+
+JARS += $(IMAGES_OUTPUTDIR)/lib/ext/nashorn.jar
+
+##########################################################################################
+
-include $(CUSTOM_MAKE_DIR)/CreateJars.gmk
##########################################################################################
--- a/jdk/makefiles/Images.gmk Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/makefiles/Images.gmk Tue Mar 12 18:12:44 2013 -0700
@@ -602,6 +602,7 @@
$(call info-file-item, "OS_NAME", "$(REQUIRED_OS_NAME)")
$(call info-file-item, "OS_VERSION", "$(REQUIRED_OS_VERSION)")
$(call info-file-item, "OS_ARCH", "$(OPENJDK_TARGET_CPU_LEGACY)")
+ if [ -n "$(JDK_ARCH_ABI_PROP_NAME)" ]; then $(call info-file-item, "SUN_ARCH_ABI", "$(JDK_ARCH_ABI_PROP_NAME)"); fi
$(call info-file-item, "SOURCE", "$(ALL_SOURCE_TIPS)")
endef
--- a/jdk/makefiles/mapfiles/liblcms/mapfile-vers Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/makefiles/mapfiles/liblcms/mapfile-vers Tue Mar 12 18:12:44 2013 -0700
@@ -27,13 +27,12 @@
SUNWprivate_1.1 {
global:
- Java_sun_java2d_cmm_lcms_LCMS_loadProfile;
- Java_sun_java2d_cmm_lcms_LCMS_freeProfile;
+ Java_sun_java2d_cmm_lcms_LCMS_loadProfileNative;
+ Java_sun_java2d_cmm_lcms_LCMS_freeProfileNative;
Java_sun_java2d_cmm_lcms_LCMS_getProfileSize;
Java_sun_java2d_cmm_lcms_LCMS_getProfileData;
- Java_sun_java2d_cmm_lcms_LCMS_getTagSize;
- Java_sun_java2d_cmm_lcms_LCMS_getTagData;
- Java_sun_java2d_cmm_lcms_LCMS_setTagData;
+ Java_sun_java2d_cmm_lcms_LCMS_getTagNative;
+ Java_sun_java2d_cmm_lcms_LCMS_setTagDataNative;
Java_sun_java2d_cmm_lcms_LCMS_colorConvert;
Java_sun_java2d_cmm_lcms_LCMS_getProfileID;
Java_sun_java2d_cmm_lcms_LCMS_initLCMS;
--- a/jdk/makefiles/profile-rtjar-includes.txt Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/makefiles/profile-rtjar-includes.txt Tue Mar 12 18:12:44 2013 -0700
@@ -349,6 +349,7 @@
com/sun/rowset/providers \
com/sun/script/javascript \
com/sun/script/util \
+ com/sun/security/auth \
com/sun/security/auth/callback \
com/sun/security/auth/login \
com/sun/security/auth/module \
@@ -448,8 +449,7 @@
sun/tracing \
sun/tracing/dtrace
-PROFILE_3_RTJAR_INCLUDE_TYPES := \
- com/sun/security/auth/*.class
+PROFILE_3_RTJAR_INCLUDE_TYPES :=
PROFILE_3_RTJAR_EXCLUDE_TYPES := \
javax/management/remote/rmi/_RMIConnectionImpl_Tie.class \
@@ -457,10 +457,10 @@
javax/management/remote/rmi/_RMIServerImpl_Tie.class \
javax/management/remote/rmi/_RMIServer_Stub.class \
com/sun/security/auth/callback/DialogCallbackHandler.class \
- com/sun/security/auth/callback/DialogCallbackHandler\$$$$1.class \
- com/sun/security/auth/callback/DialogCallbackHandler\$$$$2.class \
- com/sun/security/auth/callback/DialogCallbackHandler\$$$$Action.class \
- com/sun/security/auth/callback/DialogCallbackHandler\$$$$ConfirmationInfo.class
+ com/sun/security/auth/callback/DialogCallbackHandler\$$1.class \
+ com/sun/security/auth/callback/DialogCallbackHandler\$$2.class \
+ com/sun/security/auth/callback/DialogCallbackHandler\$$Action.class \
+ com/sun/security/auth/callback/DialogCallbackHandler\$$ConfirmationInfo.class
PROFILE_3_INCLUDE_METAINF_SERVICES := \
META-INF/services/javax.script.ScriptEngineFactory
--- a/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxUI.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxUI.java Tue Mar 12 18:12:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, 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
@@ -34,7 +34,6 @@
import javax.swing.event.*;
import javax.swing.plaf.*;
import javax.swing.plaf.basic.*;
-import com.apple.laf.ClientPropertyApplicator;
import com.apple.laf.ClientPropertyApplicator.Property;
import apple.laf.JRSUIConstants.Size;
@@ -142,35 +141,46 @@
return new AquaComboBoxEditor();
}
- class AquaComboBoxEditor extends BasicComboBoxEditor implements UIResource, DocumentListener {
- protected AquaComboBoxEditor() {
+ final class AquaComboBoxEditor extends BasicComboBoxEditor
+ implements UIResource, DocumentListener {
+
+ AquaComboBoxEditor() {
super();
editor = new AquaCustomComboTextField();
editor.addFocusListener(this);
editor.getDocument().addDocumentListener(this);
}
+ @Override
public void focusGained(final FocusEvent e) {
- arrowButton.repaint();
+ if (arrowButton != null) {
+ arrowButton.repaint();
+ }
}
+ @Override
public void focusLost(final FocusEvent e) {
- arrowButton.repaint();
+ if (arrowButton != null) {
+ arrowButton.repaint();
+ }
}
+ @Override
public void changedUpdate(final DocumentEvent e) {
editorTextChanged();
}
+ @Override
public void insertUpdate(final DocumentEvent e) {
editorTextChanged();
}
+ @Override
public void removeUpdate(final DocumentEvent e) {
editorTextChanged();
}
- protected void editorTextChanged() {
+ private void editorTextChanged() {
if (!popup.isVisible()) return;
final Object text = editor.getText();
--- a/jdk/src/macosx/classes/sun/awt/CGraphicsConfig.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/classes/sun/awt/CGraphicsConfig.java Tue Mar 12 18:12:44 2013 -0700
@@ -53,7 +53,7 @@
@Override
public Rectangle getBounds() {
- final Rectangle2D nativeBounds = nativeGetBounds(device.getCoreGraphicsScreen());
+ final Rectangle2D nativeBounds = nativeGetBounds(device.getCGDisplayID());
return nativeBounds.getBounds(); // does integer rounding
}
--- a/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java Tue Mar 12 18:12:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, 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
@@ -25,11 +25,12 @@
package sun.awt;
+import java.awt.AWTPermission;
+import java.awt.DisplayMode;
import java.awt.GraphicsConfiguration;
import java.awt.GraphicsDevice;
+import java.awt.Insets;
import java.awt.Window;
-import java.awt.AWTPermission;
-import java.awt.DisplayMode;
import java.util.Objects;
import sun.java2d.opengl.CGLGraphicsConfig;
@@ -58,9 +59,12 @@
}
/**
+ * Returns CGDirectDisplayID, which is the same id as @"NSScreenNumber" in
+ * NSScreen.
+ *
* @return CoreGraphics display id.
*/
- public int getCoreGraphicsScreen() {
+ public int getCGDisplayID() {
return displayID;
}
@@ -107,8 +111,9 @@
return nativeGetYResolution(displayID);
}
- private static native double nativeGetXResolution(int displayID);
- private static native double nativeGetYResolution(int displayID);
+ public Insets getScreenInsets() {
+ return nativeGetScreenInsets(displayID);
+ }
/**
* Enters full-screen mode, or returns to windowed mode.
@@ -214,9 +219,15 @@
return nativeGetDisplayModes(displayID);
}
- private native void nativeSetDisplayMode(int displayID, int w, int h, int bpp, int refrate);
+ private static native void nativeSetDisplayMode(int displayID, int w, int h, int bpp, int refrate);
+
+ private static native DisplayMode nativeGetDisplayMode(int displayID);
+
+ private static native DisplayMode[] nativeGetDisplayModes(int displayID);
- private native DisplayMode nativeGetDisplayMode(int displayID);
+ private static native double nativeGetXResolution(int displayID);
- private native DisplayMode[] nativeGetDisplayModes(int displayID);
+ private static native double nativeGetYResolution(int displayID);
+
+ private static native Insets nativeGetScreenInsets(int displayID);
}
--- a/jdk/src/macosx/classes/sun/font/CStrike.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/classes/sun/font/CStrike.java Tue Mar 12 18:12:44 2013 -0700
@@ -500,7 +500,10 @@
final Iterator<Long> i = generalCache.values().iterator();
while (i.hasNext()) {
final long longValue = i.next().longValue();
- if (longValue != -1 && longValue != 0) StrikeCache.freeLongPointer(longValue);
+ if (longValue != -1 && longValue != 0) {
+ removeGlyphInfoFromCache(longValue);
+ StrikeCache.freeLongPointer(longValue);
+ }
}
}
@@ -512,7 +515,10 @@
private static void disposeLongArray(final long[] longArray) {
for (int i = 0; i < longArray.length; i++) {
final long ptr = longArray[i];
- if (ptr != 0 && ptr != -1) StrikeCache.freeLongPointer(ptr); // free's the native struct pointer
+ if (ptr != 0 && ptr != -1) {
+ removeGlyphInfoFromCache(ptr);
+ StrikeCache.freeLongPointer(ptr); // free's the native struct pointer
+ }
}
}
--- a/jdk/src/macosx/classes/sun/font/CStrikeDisposer.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/classes/sun/font/CStrikeDisposer.java Tue Mar 12 18:12:44 2013 -0700
@@ -85,4 +85,6 @@
}
private native void freeNativeScalerContext(long pContext);
+
+ protected static native void removeGlyphInfoFromCache(long glyphInfo);
}
--- a/jdk/src/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java Tue Mar 12 18:12:44 2013 -0700
@@ -80,10 +80,8 @@
private ContextCapabilities oglCaps;
private OGLContext context;
private final Object disposerReferent = new Object();
-
- public static native int getDefaultPixFmt(int screennum);
private static native boolean initCGL();
- private static native long getCGLConfigInfo(int screennum, int visualnum,
+ private static native long getCGLConfigInfo(int displayID, int visualnum,
int swapInterval);
private static native int getOGLCapabilities(long configInfo);
@@ -137,15 +135,16 @@
// Java-level context and flush the queue...
OGLContext.invalidateCurrentContext();
- cfginfo = getCGLConfigInfo(device.getCoreGraphicsScreen(), pixfmt,
+ cfginfo = getCGLConfigInfo(device.getCGDisplayID(), pixfmt,
kOpenGLSwapInterval);
-
- OGLContext.setScratchSurface(cfginfo);
- rq.flushAndInvokeNow(new Runnable() {
- public void run() {
- ids[0] = OGLContext.getOGLIdString();
- }
- });
+ if (cfginfo != 0L) {
+ OGLContext.setScratchSurface(cfginfo);
+ rq.flushAndInvokeNow(new Runnable() {
+ public void run() {
+ ids[0] = OGLContext.getOGLIdString();
+ }
+ });
+ }
} finally {
rq.unlock();
}
@@ -253,8 +252,8 @@
@Override
public String toString() {
- int screen = getDevice().getCoreGraphicsScreen();
- return ("CGLGraphicsConfig[dev="+screen+",pixfmt="+pixfmt+"]");
+ int displayID = getDevice().getCGDisplayID();
+ return ("CGLGraphicsConfig[dev="+displayID+",pixfmt="+pixfmt+"]");
}
@Override
@@ -413,8 +412,8 @@
@Override
public void addDeviceEventListener(AccelDeviceEventListener l) {
- int screen = getDevice().getCoreGraphicsScreen();
- AccelDeviceEventNotifier.addListener(l, screen);
+ int displayID = getDevice().getCGDisplayID();
+ AccelDeviceEventNotifier.addListener(l, displayID);
}
@Override
--- a/jdk/src/macosx/classes/sun/lwawt/LWComponentPeer.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/classes/sun/lwawt/LWComponentPeer.java Tue Mar 12 18:12:44 2013 -0700
@@ -439,7 +439,7 @@
}
@Override
- public final Graphics getGraphics() {
+ public Graphics getGraphics() {
final Graphics g = getOnscreenGraphics();
if (g != null) {
synchronized (getPeerTreeLock()){
@@ -1227,10 +1227,10 @@
}
protected void sendEventToDelegate(final AWTEvent e) {
+ if (getDelegate() == null || !isShowing() || !isEnabled()) {
+ return;
+ }
synchronized (getDelegateLock()) {
- if (getDelegate() == null || !isShowing() || !isEnabled()) {
- return;
- }
AWTEvent delegateEvent = createDelegateEvent(e);
if (delegateEvent != null) {
AWTAccessor.getComponentAccessor()
@@ -1244,7 +1244,12 @@
}
}
- protected AWTEvent createDelegateEvent(AWTEvent e) {
+ /**
+ * Changes the target of the AWTEvent from awt component to appropriate
+ * swing delegate.
+ */
+ private AWTEvent createDelegateEvent(final AWTEvent e) {
+ // TODO modifiers should be changed to getModifiers()|getModifiersEx()?
AWTEvent delegateEvent = null;
if (e instanceof MouseWheelEvent) {
MouseWheelEvent me = (MouseWheelEvent) e;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/macosx/classes/sun/lwawt/LWLightweightFramePeer.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2013, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package sun.lwawt;
+
+import java.awt.Graphics;
+import java.awt.Insets;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Window;
+import java.awt.dnd.DropTarget;
+
+import sun.awt.CausedFocusEvent;
+import sun.awt.LightweightFrame;
+
+public class LWLightweightFramePeer extends LWWindowPeer {
+
+ public LWLightweightFramePeer(LightweightFrame target,
+ PlatformComponent platformComponent,
+ PlatformWindow platformWindow)
+ {
+ super(target, platformComponent, platformWindow, LWWindowPeer.PeerType.LW_FRAME);
+ }
+
+ private LightweightFrame getLwTarget() {
+ return (LightweightFrame)getTarget();
+ }
+
+ @Override
+ public Graphics getGraphics() {
+ return getLwTarget().getGraphics();
+ }
+
+ @Override
+ protected void setVisibleImpl(final boolean visible) {
+ }
+
+ @Override
+ public boolean requestWindowFocus(CausedFocusEvent.Cause cause) {
+ if (!focusAllowedFor()) {
+ return false;
+ }
+ if (getPlatformWindow().rejectFocusRequest(cause)) {
+ return false;
+ }
+
+ Window opposite = LWKeyboardFocusManagerPeer.getInstance().
+ getCurrentFocusedWindow();
+
+ changeFocusedWindow(true, opposite);
+
+ return true;
+ }
+
+ @Override
+ public Point getLocationOnScreen() {
+ Rectangle bounds = getBounds();
+ return new Point(bounds.x, bounds.y); // todo
+ }
+
+ @Override
+ public Insets getInsets() {
+ return new Insets(0, 0, 0, 0);
+ }
+
+ @Override
+ public void setBounds(int x, int y, int w, int h, int op) {
+ setBounds(x, y, w, h, op, true, false);
+ }
+
+ @Override
+ public void updateCursorImmediately() {
+ // TODO: tries to switch to the awt/fx toolkit thread and causes a deadlock on macosx
+ }
+
+ @Override
+ public void addDropTarget(DropTarget dt) {
+ }
+
+ @Override
+ public void removeDropTarget(DropTarget dt) {
+ }
+
+ @Override
+ public void grab() {
+ getLwTarget().grabFocus();
+ }
+
+ @Override
+ public void ungrab() {
+ getLwTarget().ungrabFocus();
+ }
+}
--- a/jdk/src/macosx/classes/sun/lwawt/LWToolkit.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/classes/sun/lwawt/LWToolkit.java Tue Mar 12 18:12:44 2013 -0700
@@ -218,6 +218,23 @@
return peer;
}
+ private LWLightweightFramePeer createDelegatedLwPeer(LightweightFrame target,
+ PlatformComponent platformComponent,
+ PlatformWindow platformWindow)
+ {
+ LWLightweightFramePeer peer = new LWLightweightFramePeer(target, platformComponent, platformWindow);
+ targetCreatedPeer(target, peer);
+ peer.initialize();
+ return peer;
+ }
+
+ @Override
+ public FramePeer createLightweightFrame(LightweightFrame target) {
+ PlatformComponent platformComponent = createLwPlatformComponent();
+ PlatformWindow platformWindow = createPlatformWindow(LWWindowPeer.PeerType.LW_FRAME);
+ return createDelegatedLwPeer(target, platformComponent, platformWindow);
+ }
+
@Override
public WindowPeer createWindow(Window target) {
PlatformComponent platformComponent = createPlatformComponent();
@@ -502,6 +519,8 @@
protected abstract PlatformComponent createPlatformComponent();
+ protected abstract PlatformComponent createLwPlatformComponent();
+
protected abstract FileDialogPeer createFileDialogPeer(FileDialog target);
// ---- UTILITY METHODS ---- //
--- a/jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java Tue Mar 12 18:12:44 2013 -0700
@@ -48,7 +48,8 @@
FRAME,
DIALOG,
EMBEDDED_FRAME,
- VIEW_EMBEDDED_FRAME
+ VIEW_EMBEDDED_FRAME,
+ LW_FRAME
}
private static final PlatformLogger focusLog = PlatformLogger.getLogger("sun.lwawt.focus.LWWindowPeer");
@@ -1090,7 +1091,7 @@
return platformWindow.requestWindowFocus();
}
- private boolean focusAllowedFor() {
+ protected boolean focusAllowedFor() {
Window window = getTarget();
// TODO: check if modal blocked
return window.isVisible() && window.isEnabled() && isFocusableWindow();
@@ -1113,10 +1114,15 @@
return !(window instanceof Dialog || window instanceof Frame);
}
+ @Override
+ public void emulateActivation(boolean activate) {
+ changeFocusedWindow(activate, null);
+ }
+
/*
* Changes focused window on java level.
*/
- private void changeFocusedWindow(boolean becomesFocused, Window opposite) {
+ protected void changeFocusedWindow(boolean becomesFocused, Window opposite) {
if (focusLog.isLoggable(PlatformLogger.FINE)) {
focusLog.fine((becomesFocused?"gaining":"loosing") + " focus window: " + this);
}
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java Tue Mar 12 18:12:44 2013 -0700
@@ -128,6 +128,15 @@
}
}
+ @Override
+ protected int postDropTargetEvent(Component component, int x, int y, int dropAction,
+ int actions, long[] formats, long nativeCtxt, int eventID,
+ boolean dispatchType) {
+ // On MacOS X all the DnD events should be synchronous
+ return super.postDropTargetEvent(component, x, y, dropAction, actions, formats, nativeCtxt,
+ eventID, SunDropTargetContextPeer.DISPATCH_SYNC);
+ }
+
// Signal drop complete:
protected void doDropDone(boolean success, int dropAction, boolean isLocal) {
long nativeDropTarget = this.getNativeDragContext();
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformComponent.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformComponent.java Tue Mar 12 18:12:44 2013 -0700
@@ -35,7 +35,7 @@
* On OSX {@code CPlatformComponent} stores pointer to the native CAlayer which
* can be used from JAWT.
*/
-final class CPlatformComponent extends CFRetainedResource
+class CPlatformComponent extends CFRetainedResource
implements PlatformComponent {
private volatile PlatformWindow platformWindow;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformLWComponent.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2013, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+
+package sun.lwawt.macosx;
+
+import sun.lwawt.PlatformWindow;
+
+class CPlatformLWComponent extends CPlatformComponent {
+
+ CPlatformLWComponent() {
+ super();
+ }
+
+ @Override
+ public long getPointer() {
+ return 0;
+ }
+
+ @Override
+ public void initialize(final PlatformWindow platformWindow) {
+ }
+
+ @Override
+ public void setBounds(final int x, final int y, final int w, final int h) {
+ }
+
+ @Override
+ public void dispose() {
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformLWView.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2013, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package sun.lwawt.macosx;
+
+import sun.lwawt.LWWindowPeer;
+import sun.java2d.SurfaceData;
+
+public class CPlatformLWView extends CPlatformView {
+
+ public CPlatformLWView() {
+ super();
+ }
+
+ @Override
+ public void initialize(LWWindowPeer peer, CPlatformResponder responder) {
+ initializeBase(peer, responder);
+ }
+
+ @Override
+ public long getAWTView() {
+ return 0;
+ }
+
+ @Override
+ public boolean isOpaque() {
+ return true;
+ }
+
+ @Override
+ public void setBounds(int x, int y, int width, int height) {
+ }
+
+ @Override
+ public void enterFullScreenMode() {
+ }
+
+ @Override
+ public void exitFullScreenMode() {
+ }
+
+ @Override
+ public SurfaceData replaceSurfaceData() {
+ return null;
+ }
+
+ @Override
+ public SurfaceData getSurfaceData() {
+ return null;
+ }
+
+ @Override
+ public void dispose() {
+ }
+
+ @Override
+ public long getWindowLayerPtr() {
+ return 0;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformLWWindow.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,202 @@
+/*
+ * Copyright (c) 2013, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package sun.lwawt.macosx;
+
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.GraphicsDevice;
+import java.awt.Insets;
+import java.awt.MenuBar;
+import java.awt.Point;
+import java.awt.Window;
+import sun.awt.CausedFocusEvent;
+import sun.java2d.SurfaceData;
+import sun.lwawt.LWWindowPeer;
+import sun.lwawt.PlatformWindow;
+
+public class CPlatformLWWindow extends CPlatformWindow {
+
+ @Override
+ public void initialize(Window target, LWWindowPeer peer, PlatformWindow owner) {
+ initializeBase(target, peer, owner, new CPlatformLWView());
+ }
+
+ @Override
+ public void toggleFullScreen() {
+ }
+
+ @Override
+ public void setMenuBar(MenuBar mb) {
+ }
+
+ @Override
+ public void dispose() {
+ }
+
+ @Override
+ public FontMetrics getFontMetrics(Font f) {
+ return null;
+ }
+
+ @Override
+ public Insets getInsets() {
+ return new Insets(0, 0, 0, 0);
+ }
+
+ @Override
+ public Point getLocationOnScreen() {
+ return null;
+ }
+
+ @Override
+ public GraphicsDevice getGraphicsDevice() {
+ return null;
+ }
+
+ @Override
+ public SurfaceData getScreenSurface() {
+ return null;
+ }
+
+ @Override
+ public SurfaceData replaceSurfaceData() {
+ return null;
+ }
+
+ @Override
+ public void setBounds(int x, int y, int w, int h) {
+ if (getPeer() != null) {
+ getPeer().notifyReshape(x, y, w, h);
+ }
+ }
+
+ @Override
+ public void setVisible(boolean visible) {
+ }
+
+ @Override
+ public void setTitle(String title) {
+ }
+
+ @Override
+ public void updateIconImages() {
+ }
+
+ @Override
+ public long getNSWindowPtr() {
+ return 0;
+ }
+
+ @Override
+ public SurfaceData getSurfaceData() {
+ return null;
+ }
+
+ @Override
+ public void toBack() {
+ }
+
+ @Override
+ public void toFront() {
+ }
+
+ @Override
+ public void setResizable(final boolean resizable) {
+ }
+
+ @Override
+ public void setSizeConstraints(int minW, int minH, int maxW, int maxH) {
+ }
+
+ @Override
+ public boolean rejectFocusRequest(CausedFocusEvent.Cause cause) {
+ return false;
+ }
+
+ @Override
+ public boolean requestWindowFocus() {
+ return true;
+ }
+
+ @Override
+ public boolean isActive() {
+ return true;
+ }
+
+ @Override
+ public void updateFocusableWindowState() {
+ }
+
+ @Override
+ public Graphics transformGraphics(Graphics g) {
+ return null;
+ }
+
+ @Override
+ public void setAlwaysOnTop(boolean isAlwaysOnTop) {
+ }
+
+ @Override
+ public PlatformWindow getTopmostPlatformWindowUnderMouse(){
+ return null;
+ }
+
+ @Override
+ public void setOpacity(float opacity) {
+ }
+
+ @Override
+ public void setOpaque(boolean isOpaque) {
+ }
+
+ @Override
+ public void enterFullScreenMode() {
+ }
+
+ @Override
+ public void exitFullScreenMode() {
+ }
+
+ @Override
+ public void setWindowState(int windowState) {
+ }
+
+ @Override
+ public LWWindowPeer getPeer() {
+ return super.getPeer();
+ }
+
+ @Override
+ public CPlatformView getContentView() {
+ return super.getContentView();
+ }
+
+ @Override
+ public long getLayerPtr() {
+ return 0;
+ }
+}
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformView.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformView.java Tue Mar 12 18:12:44 2013 -0700
@@ -54,8 +54,7 @@
}
public void initialize(LWWindowPeer peer, CPlatformResponder responder) {
- this.peer = peer;
- this.responder = responder;
+ initializeBase(peer, responder);
if (!LWCToolkit.getSunAwtDisableCALayers()) {
this.windowLayer = new CGLLayer(peer);
@@ -63,6 +62,11 @@
setPtr(nativeCreateView(0, 0, 0, 0, getWindowLayerPtr()));
}
+ protected void initializeBase(LWWindowPeer peer, CPlatformResponder responder) {
+ this.peer = peer;
+ this.responder = responder;
+ }
+
public long getAWTView() {
return ptr;
}
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Tue Mar 12 18:12:44 2013 -0700
@@ -30,6 +30,7 @@
import java.awt.event.*;
import java.awt.peer.WindowPeer;
import java.beans.*;
+import java.lang.reflect.InvocationTargetException;
import java.util.List;
import javax.swing.*;
@@ -44,7 +45,7 @@
import com.apple.laf.ClientPropertyApplicator.Property;
import com.sun.awt.AWTUtilities;
-public final class CPlatformWindow extends CFRetainedResource implements PlatformWindow {
+public class CPlatformWindow extends CFRetainedResource implements PlatformWindow {
private native long nativeCreateNSWindow(long nsViewPtr, long styleBits, double x, double y, double w, double h);
private static native void nativeSetNSWindowStyleBits(long nsWindowPtr, int mask, int data);
private static native void nativeSetNSWindowMenuBar(long nsWindowPtr, long menuBarPtr);
@@ -218,11 +219,7 @@
*/
@Override // PlatformWindow
public void initialize(Window _target, LWWindowPeer _peer, PlatformWindow _owner) {
- this.peer = _peer;
- this.target = _target;
- if (_owner instanceof CPlatformWindow) {
- this.owner = (CPlatformWindow)_owner;
- }
+ initializeBase(_target, _peer, _owner, new CPlatformView());
final int styleBits = getInitialStyleBits();
@@ -231,7 +228,6 @@
String warningString = target.getWarningString();
responder = new CPlatformResponder(peer, false);
- contentView = new CPlatformView();
contentView.initialize(peer, responder);
final long nativeWindowPtr = nativeCreateNSWindow(contentView.getAWTView(), styleBits, 0, 0, 0, 0);
@@ -253,6 +249,15 @@
validateSurface();
}
+ protected void initializeBase(Window target, LWWindowPeer peer, PlatformWindow owner, CPlatformView view) {
+ this.peer = peer;
+ this.target = target;
+ if (owner instanceof CPlatformWindow) {
+ this.owner = (CPlatformWindow)owner;
+ }
+ this.contentView = view;
+ }
+
private int getInitialStyleBits() {
// defaults style bits
int styleBits = DECORATED | HAS_SHADOW | CLOSEABLE | MINIMIZABLE | ZOOMABLE | RESIZABLE;
@@ -857,7 +862,16 @@
private void flushBuffers() {
if (isVisible() && !nativeBounds.isEmpty()) {
- LWCToolkit.getLWCToolkit().flushPendingEventsOnAppkit(target);
+ try {
+ LWCToolkit.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ //Posting an empty to flush the EventQueue without blocking the main thread
+ }
+ }, target);
+ } catch (InterruptedException | InvocationTargetException e) {
+ e.printStackTrace();
+ }
}
}
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CRobot.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CRobot.java Tue Mar 12 18:12:44 2013 -0700
@@ -65,7 +65,7 @@
mouseLastX = x;
mouseLastY = y;
- mouseEvent(fDevice.getCoreGraphicsScreen(), mouseLastX, mouseLastY,
+ mouseEvent(fDevice.getCGDisplayID(), mouseLastX, mouseLastY,
mouseButtonsState, true, true);
}
@@ -79,7 +79,7 @@
public void mousePress(int buttons) {
mouseButtonsState |= buttons;
- mouseEvent(fDevice.getCoreGraphicsScreen(), mouseLastX, mouseLastY,
+ mouseEvent(fDevice.getCGDisplayID(), mouseLastX, mouseLastY,
buttons, true, false);
}
@@ -93,7 +93,7 @@
public void mouseRelease(int buttons) {
mouseButtonsState &= ~buttons;
- mouseEvent(fDevice.getCoreGraphicsScreen(), mouseLastX, mouseLastY,
+ mouseEvent(fDevice.getCGDisplayID(), mouseLastX, mouseLastY,
buttons, false, false);
}
@@ -163,7 +163,7 @@
}
private native void initRobot();
- private native void mouseEvent(int screen, int lastX, int lastY,
+ private native void mouseEvent(int displayID, int lastX, int lastY,
int buttonsState,
boolean isButtonsDownState,
boolean isMouseMove);
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CToolkitThreadBlockedHandler.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CToolkitThreadBlockedHandler.java Tue Mar 12 18:12:44 2013 -0700
@@ -25,27 +25,33 @@
package sun.lwawt.macosx;
+import sun.awt.Mutex;
import sun.awt.datatransfer.ToolkitThreadBlockedHandler;
-final class CToolkitThreadBlockedHandler implements ToolkitThreadBlockedHandler {
- private final LWCToolkit toolkit = (LWCToolkit)java.awt.Toolkit.getDefaultToolkit();
-
- public void lock() {
- }
+final class CToolkitThreadBlockedHandler extends Mutex implements ToolkitThreadBlockedHandler {
+ private long awtRunLoopMediator = 0;
+ private final boolean processEvents;
- public void unlock() {
- }
-
- protected boolean isOwned() {
- return false;
+ CToolkitThreadBlockedHandler() {
+ super();
+ this.processEvents = true;
}
public void enter() {
- // Execute the next AppKit event while we are waiting for system to
- // finish our request - this will save us from biting our own tail
- toolkit.executeNextAppKitEvent();
+ if (!isOwned()) {
+ throw new IllegalMonitorStateException();
+ }
+ awtRunLoopMediator = LWCToolkit.createAWTRunLoopMediator();
+ unlock();
+ LWCToolkit.doAWTRunLoop(awtRunLoopMediator, processEvents);
+ lock();
}
public void exit() {
+ if (!isOwned()) {
+ throw new IllegalMonitorStateException();
+ }
+ LWCToolkit.stopAWTRunLoop(awtRunLoopMediator);
+ awtRunLoopMediator = 0;
}
}
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java Tue Mar 12 18:12:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, 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
@@ -63,8 +63,6 @@
private static native void initIDs();
- static native void executeNextAppKitEvent();
-
private static CInputMethodDescriptor sInputMethodDescriptor;
static {
@@ -160,6 +158,8 @@
return new CPlatformEmbeddedFrame();
} else if (peerType == PeerType.VIEW_EMBEDDED_FRAME) {
return new CViewPlatformEmbeddedFrame();
+ } else if (peerType == PeerType.LW_FRAME) {
+ return new CPlatformLWWindow();
} else {
assert (peerType == PeerType.SIMPLEWINDOW || peerType == PeerType.DIALOG || peerType == PeerType.FRAME);
return new CPlatformWindow();
@@ -172,6 +172,11 @@
}
@Override
+ protected PlatformComponent createLwPlatformComponent() {
+ return new CPlatformLWComponent();
+ }
+
+ @Override
protected FileDialogPeer createFileDialogPeer(FileDialog target) {
return new CFileDialog(target);
}
@@ -346,22 +351,7 @@
@Override
public Insets getScreenInsets(final GraphicsConfiguration gc) {
- final CGraphicsConfig cgc = (CGraphicsConfig) gc;
- final int displayId = cgc.getDevice().getCoreGraphicsScreen();
- Rectangle fullScreen, workArea;
- final long screen = CWrapper.NSScreen.screenByDisplayId(displayId);
- try {
- fullScreen = CWrapper.NSScreen.frame(screen).getBounds();
- workArea = CWrapper.NSScreen.visibleFrame(screen).getBounds();
- } finally {
- CWrapper.NSObject.release(screen);
- }
- // Convert between Cocoa's coordinate system and Java.
- int bottom = workArea.y - fullScreen.y;
- int top = fullScreen.height - workArea.height - bottom;
- int left = workArea.x - fullScreen.x;
- int right = fullScreen.width - workArea.width - left;
- return new Insets(top, left, bottom, right);
+ return ((CGraphicsConfig) gc).getDevice().getScreenInsets();
}
@Override
@@ -495,30 +485,6 @@
synchronized(ret) { return ret[0]; }
}
- /**
- * Just a wrapper for LWCToolkit.invokeAndWait. Posts an empty event to the
- * appropriate event queue and waits for it to finish.
- */
- public static void flushPendingEventsOnAppkit(final Component component) {
- try {
- invokeAndWait(new Runnable() {
- @Override
- public void run() {
- }
- }, component);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- // Kicks an event over to the appropriate eventqueue and waits for it to finish
- // To avoid deadlocking, we manually run the NSRunLoop while waiting
- // Any selector invoked using ThreadUtilities performOnMainThread will be processed in doAWTRunLoop
- // The CInvocationEvent will call LWCToolkit.stopAWTRunLoop() when finished, which will stop our manual runloop
- public static void invokeAndWait(Runnable event, Component component) throws InterruptedException, InvocationTargetException {
- invokeAndWait(event, component, true);
- }
-
public static <T> T invokeAndWait(final Callable<T> callable, Component component) throws Exception {
final CallableWrapper<T> wrapper = new CallableWrapper<T>(callable);
invokeAndWait(wrapper, component);
@@ -548,10 +514,27 @@
}
}
- public static void invokeAndWait(Runnable event, Component component, boolean detectDeadlocks) throws InterruptedException, InvocationTargetException {
- long mediator = createAWTRunLoopMediator();
+ // Kicks an event over to the appropriate eventqueue and waits for it to finish
+ // To avoid deadlocking, we manually run the NSRunLoop while waiting
+ // Any selector invoked using ThreadUtilities performOnMainThread will be processed in doAWTRunLoop
+ // The InvocationEvent will call LWCToolkit.stopAWTRunLoop() when finished, which will stop our manual runloop
+ // Does not dispatch native events while in the loop
+ public static void invokeAndWait(Runnable event, Component component) throws InterruptedException, InvocationTargetException {
+ final long mediator = createAWTRunLoopMediator();
- InvocationEvent invocationEvent = new CPeerEvent(event, mediator);
+ InvocationEvent invocationEvent =
+ new InvocationEvent(component != null ? component : Toolkit.getDefaultToolkit(), event) {
+ @Override
+ public void dispatch() {
+ try {
+ super.dispatch();
+ } finally {
+ if (mediator != 0) {
+ stopAWTRunLoop(mediator);
+ }
+ }
+ }
+ };
if (component != null) {
AppContext appContext = SunToolkit.targetToAppContext(component);
@@ -564,7 +547,7 @@
((LWCToolkit)Toolkit.getDefaultToolkit()).getSystemEventQueueForInvokeAndWait().postEvent(invocationEvent);
}
- doAWTRunLoop(mediator, true, detectDeadlocks);
+ doAWTRunLoop(mediator, false);
Throwable eventException = invocationEvent.getException();
if (eventException != null) {
@@ -576,7 +559,8 @@
}
public static void invokeLater(Runnable event, Component component) throws InvocationTargetException {
- final InvocationEvent invocationEvent = new CPeerEvent(event, 0);
+ final InvocationEvent invocationEvent =
+ new InvocationEvent(component != null ? component : Toolkit.getDefaultToolkit(), event);
if (component != null) {
final AppContext appContext = SunToolkit.targetToAppContext(component);
@@ -681,31 +665,6 @@
return false;
}
- // Extends PeerEvent because we want to pass long an ObjC mediator object and because we want these events to be posted early
- // Typically, rather than relying on the notifier to call notifyAll(), we use the mediator to stop the runloop
- public static class CPeerEvent extends PeerEvent {
- private long _mediator = 0;
-
- public CPeerEvent(Runnable runnable, long mediator) {
- super(Toolkit.getDefaultToolkit(), runnable, null, true, 0);
- _mediator = mediator;
- }
-
- public void dispatch() {
- try {
- super.dispatch();
- } finally {
- if (_mediator != 0) {
- LWCToolkit.stopAWTRunLoop(_mediator);
- }
- }
- }
- }
-
- // Call through to native methods
- public static void doAWTRunLoop(long mediator, boolean awtMode) { doAWTRunLoop(mediator, awtMode, true); }
- public static void doAWTRunLoop(long mediator) { doAWTRunLoop(mediator, true); }
-
private static Boolean sunAwtDisableCALayers = null;
/**
@@ -730,12 +689,20 @@
* Native methods section
************************/
- // These are public because they are accessed from WebKitPluginObject in JavaDeploy
- // Basic usage:
- // createAWTRunLoopMediator. Start client code on another thread. doAWTRunLoop. When client code is finished, stopAWTRunLoop.
- public static native long createAWTRunLoopMediator();
- public static native void doAWTRunLoop(long mediator, boolean awtMode, boolean detectDeadlocks);
- public static native void stopAWTRunLoop(long mediator);
+ static native long createAWTRunLoopMediator();
+ /**
+ * Method to run a nested run-loop. The nested loop is spinned in the javaRunLoop mode, so selectors sent
+ * by [JNFRunLoop performOnMainThreadWaiting] are processed.
+ * @param mediator a native pointer to the mediator object created by createAWTRunLoopMediator
+ * @param processEvents if true - dispatches event while in the nested loop. Used in DnD.
+ * Additional attention is needed when using this feature as we short-circuit normal event
+ * processing which could break Appkit.
+ * (One known example is when the window is resized with the mouse)
+ *
+ * if false - all events come after exit form the nested loop
+ */
+ static native void doAWTRunLoop(long mediator, boolean processEvents);
+ static native void stopAWTRunLoop(long mediator);
private native boolean nativeSyncQueue(long timeout);
--- a/jdk/src/macosx/native/sun/awt/AWTView.m Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/AWTView.m Tue Mar 12 18:12:44 2013 -0700
@@ -227,7 +227,7 @@
- (void) mouseMoved: (NSEvent *)event {
// TODO: better way to redirect move events to the "under" view
-
+
NSPoint eventLocation = [event locationInWindow];
NSPoint localPoint = [self convertPoint: eventLocation fromView: nil];
@@ -668,7 +668,7 @@
- (void) setDropTarget:(CDropTarget *)target {
self._dropTarget = target;
- [ThreadUtilities performOnMainThread:@selector(controlModelControlValid) onObject:self._dropTarget withObject:nil waitUntilDone:YES awtMode:YES];
+ [ThreadUtilities performOnMainThread:@selector(controlModelControlValid) on:self._dropTarget withObject:nil waitUntilDone:YES];
}
/******************************** BEGIN NSDraggingSource Interface ********************************/
@@ -1215,7 +1215,7 @@
fprintf(stderr, "AWTView InputMethod Selector Called : [abandonInput]\n");
#endif // IM_DEBUG
- [ThreadUtilities performOnMainThread:@selector(markedTextAbandoned:) onObject:[NSInputManager currentInputManager] withObject:self waitUntilDone:YES awtMode:YES];
+ [ThreadUtilities performOnMainThread:@selector(markedTextAbandoned:) on:[NSInputManager currentInputManager] withObject:self waitUntilDone:YES];
[self unmarkText];
}
--- a/jdk/src/macosx/native/sun/awt/ApplicationDelegate.m Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/ApplicationDelegate.m Tue Mar 12 18:12:44 2013 -0700
@@ -567,10 +567,9 @@
{
JNF_COCOA_ENTER(env);
[ThreadUtilities performOnMainThread:@selector(_registerForNotification:)
- onObject:[ApplicationDelegate class]
+ on:[ApplicationDelegate class]
withObject:[NSNumber numberWithInt:notificationType]
- waitUntilDone:NO
- awtMode:NO]; // AWT_THREADING Safe (non-blocking)
+ waitUntilDone:NO]; // AWT_THREADING Safe (non-blocking)
JNF_COCOA_EXIT(env);
}
--- a/jdk/src/macosx/native/sun/awt/CClipboard.m Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/CClipboard.m Tue Mar 12 18:12:44 2013 -0700
@@ -120,7 +120,7 @@
fClipboardOwner = JNFNewGlobalRef(inEnv, inClipboard);
}
}
- [ThreadUtilities performOnMainThread:@selector(_nativeDeclareTypes:) onObject:self withObject:inTypes waitUntilDone:YES awtMode:YES];
+ [ThreadUtilities performOnMainThread:@selector(_nativeDeclareTypes:) on:self withObject:inTypes waitUntilDone:YES];
}
- (void) _nativeDeclareTypes:(NSArray *)inTypes {
@@ -135,7 +135,7 @@
- (NSArray *) javaGetTypes {
NSMutableArray *args = [NSMutableArray arrayWithCapacity:1];
- [ThreadUtilities performOnMainThread:@selector(_nativeGetTypes:) onObject:self withObject:args waitUntilDone:YES awtMode:YES];
+ [ThreadUtilities performOnMainThread:@selector(_nativeGetTypes:) on:self withObject:args waitUntilDone:YES];
//NSLog(@"CClipboard getTypes returns %@", [args lastObject]);
return [args lastObject];
@@ -152,7 +152,7 @@
- (void) javaSetData:(NSData *)inData forType:(NSString *) inFormat {
CClipboardUpdate *newUpdate = [[CClipboardUpdate alloc] initWithData:inData withFormat:inFormat];
- [ThreadUtilities performOnMainThread:@selector(_nativeSetData:) onObject:self withObject:newUpdate waitUntilDone:YES awtMode:YES];
+ [ThreadUtilities performOnMainThread:@selector(_nativeSetData:) on:self withObject:newUpdate waitUntilDone:YES];
[newUpdate release];
//NSLog(@"CClipboard javaSetData forType %@", inFormat);
@@ -170,7 +170,7 @@
- (NSData *) javaGetDataForType:(NSString *) inFormat {
NSMutableArray *args = [NSMutableArray arrayWithObject:inFormat];
- [ThreadUtilities performOnMainThread:@selector(_nativeGetDataForType:) onObject:self withObject:args waitUntilDone:YES awtMode:YES];
+ [ThreadUtilities performOnMainThread:@selector(_nativeGetDataForType:) on:self withObject:args waitUntilDone:YES];
//NSLog(@"CClipboard javaGetDataForType %@ returns an NSData", inFormat);
return [args lastObject];
--- a/jdk/src/macosx/native/sun/awt/CDropTarget.m Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/CDropTarget.m Tue Mar 12 18:12:44 2013 -0700
@@ -390,8 +390,7 @@
// Release dragging data if any when Java's AWT event thread is all finished.
// Make sure dragging data is released on the native event thread.
- [ThreadUtilities performOnMainThread:@selector(safeReleaseDraggingData:) onObject:self
- withObject:draggingSequenceNumberID waitUntilDone:NO awtMode:NO];
+ [ThreadUtilities performOnMainThread:@selector(safeReleaseDraggingData:) on:self withObject:draggingSequenceNumberID waitUntilDone:NO];
}
- (jint)currentJavaActions {
--- a/jdk/src/macosx/native/sun/awt/CGraphicsDevice.m Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/CGraphicsDevice.m Tue Mar 12 18:12:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, 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
@@ -23,7 +23,8 @@
* questions.
*/
-#include "LWCToolkit.h"
+#import "LWCToolkit.h"
+#import "ThreadUtilities.h"
/*
* Convert the mode string to the more convinient bits per pixel value
@@ -148,6 +149,47 @@
/*
* Class: sun_awt_CGraphicsDevice
+ * Method: nativeGetScreenInsets
+ * Signature: (I)D
+ */
+JNIEXPORT jobject JNICALL
+Java_sun_awt_CGraphicsDevice_nativeGetScreenInsets
+ (JNIEnv *env, jclass class, jint displayID)
+{
+ jobject ret = NULL;
+ __block NSRect frame = NSZeroRect;
+ __block NSRect visibleFrame = NSZeroRect;
+JNF_COCOA_ENTER(env);
+
+ [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
+ NSArray *screens = [NSScreen screens];
+ for (NSScreen *screen in screens) {
+ NSDictionary *screenInfo = [screen deviceDescription];
+ NSNumber *screenID = [screenInfo objectForKey:@"NSScreenNumber"];
+ if ([screenID pointerValue] == displayID){
+ frame = [screen frame];
+ visibleFrame = [screen visibleFrame];
+ break;
+ }
+ }
+ }];
+ // Convert between Cocoa's coordinate system and Java.
+ jint bottom = visibleFrame.origin.y - frame.origin.y;
+ jint top = frame.size.height - visibleFrame.size.height - bottom;
+ jint left = visibleFrame.origin.x - frame.origin.x;
+ jint right = frame.size.width - visibleFrame.size.width - left;
+
+ static JNF_CLASS_CACHE(jc_Insets, "java/awt/Insets");
+ static JNF_CTOR_CACHE(jc_Insets_ctor, jc_Insets, "(IIII)V");
+ ret = JNFNewObject(env, jc_Insets_ctor, top, left, bottom, right);
+
+JNF_COCOA_EXIT(env);
+
+ return ret;
+}
+
+/*
+ * Class: sun_awt_CGraphicsDevice
* Method: nativeSetDisplayMode
* Signature: (IIIII)V
*/
--- a/jdk/src/macosx/native/sun/awt/CMenu.m Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/CMenu.m Tue Mar 12 18:12:44 2013 -0700
@@ -55,11 +55,11 @@
//- (void)finalize { [super finalize]; }
- (void)addJavaSubmenu:(CMenu *)submenu {
- [ThreadUtilities performOnMainThread:@selector(addNativeItem_OnAppKitThread:) onObject:self withObject:submenu waitUntilDone:YES awtMode:YES];
+ [ThreadUtilities performOnMainThread:@selector(addNativeItem_OnAppKitThread:) on:self withObject:submenu waitUntilDone:YES];
}
- (void)addJavaMenuItem:(CMenuItem *)theMenuItem {
- [ThreadUtilities performOnMainThread:@selector(addNativeItem_OnAppKitThread:) onObject:self withObject:theMenuItem waitUntilDone:YES awtMode:YES];
+ [ThreadUtilities performOnMainThread:@selector(addNativeItem_OnAppKitThread:) on:self withObject:theMenuItem waitUntilDone:YES];
}
- (void)addNativeItem_OnAppKitThread:(CMenuItem *)itemModified {
@@ -70,7 +70,7 @@
- (void)setJavaMenuTitle:(NSString *)title {
if (title) {
- [ThreadUtilities performOnMainThread:@selector(setNativeMenuTitle_OnAppKitThread:) onObject:self withObject:title waitUntilDone:YES awtMode:YES];
+ [ThreadUtilities performOnMainThread:@selector(setNativeMenuTitle_OnAppKitThread:) on:self withObject:title waitUntilDone:YES];
}
}
@@ -93,7 +93,7 @@
- (void)deleteJavaItem:(jint)index {
- [ThreadUtilities performOnMainThread:@selector(deleteNativeJavaItem_OnAppKitThread:) onObject:self withObject:[NSNumber numberWithInt:index] waitUntilDone:YES awtMode:YES];
+ [ThreadUtilities performOnMainThread:@selector(deleteNativeJavaItem_OnAppKitThread:) on:self withObject:[NSNumber numberWithInt:index] waitUntilDone:YES];
}
- (void)deleteNativeJavaItem_OnAppKitThread:(NSNumber *)number {
@@ -139,7 +139,7 @@
// We use an array here only to be able to get a return value
NSMutableArray *args = [[NSMutableArray alloc] initWithObjects:[NSValue valueWithBytes:&cPeerObjGlobal objCType:@encode(jobject)], nil];
- [ThreadUtilities performOnMainThread:@selector(_create_OnAppKitThread:) onObject:[CMenu alloc] withObject:args waitUntilDone:YES awtMode:YES];
+ [ThreadUtilities performOnMainThread:@selector(_create_OnAppKitThread:) on:[CMenu alloc] withObject:args waitUntilDone:YES];
aCMenu = (CMenu *)[args objectAtIndex: 0];
--- a/jdk/src/macosx/native/sun/awt/CMenuBar.m Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/CMenuBar.m Tue Mar 12 18:12:44 2013 -0700
@@ -197,7 +197,7 @@
if (self == sActiveMenuBar) {
NSArray *args = [[NSArray alloc] initWithObjects:theMenu, [NSNumber numberWithInt:-1], nil];
- [ThreadUtilities performOnMainThread:@selector(nativeAddMenuAtIndex_OnAppKitThread:) onObject:self withObject:args waitUntilDone:YES awtMode:YES];
+ [ThreadUtilities performOnMainThread:@selector(nativeAddMenuAtIndex_OnAppKitThread:) on:self withObject:args waitUntilDone:YES];
[args release];
}
}
@@ -216,7 +216,7 @@
if (self == sActiveMenuBar) {
NSArray *args = [[NSArray alloc] initWithObjects:theMenu, [NSNumber numberWithInt:index], nil];
- [ThreadUtilities performOnMainThread:@selector(nativeAddMenuAtIndex_OnAppKitThread:) onObject:self withObject:args waitUntilDone:YES awtMode:YES];
+ [ThreadUtilities performOnMainThread:@selector(nativeAddMenuAtIndex_OnAppKitThread:) on:self withObject:args waitUntilDone:YES];
[args release];
}
}
@@ -286,7 +286,7 @@
- (void) javaDeleteMenu: (jint)index {
if (self == sActiveMenuBar) {
- [ThreadUtilities performOnMainThread:@selector(nativeDeleteMenu_OnAppKitThread:) onObject:self withObject:[NSNumber numberWithInt:index] waitUntilDone:YES awtMode:YES];
+ [ThreadUtilities performOnMainThread:@selector(nativeDeleteMenu_OnAppKitThread:) on:self withObject:[NSNumber numberWithInt:index] waitUntilDone:YES];
}
@synchronized(self) {
@@ -388,7 +388,7 @@
// We use an array here only to be able to get a return value
NSMutableArray *args = [[NSMutableArray alloc] initWithObjects:[NSValue valueWithBytes:&cPeerObjGlobal objCType:@encode(jobject)], nil];
- [ThreadUtilities performOnMainThread:@selector(_create_OnAppKitThread:) onObject:[CMenuBar alloc] withObject:args waitUntilDone:YES awtMode:YES];
+ [ThreadUtilities performOnMainThread:@selector(_create_OnAppKitThread:) on:[CMenuBar alloc] withObject:args waitUntilDone:YES];
aCMenuBar = (CMenuBar *)[args objectAtIndex: 0];
--- a/jdk/src/macosx/native/sun/awt/CMenuItem.m Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/CMenuItem.m Tue Mar 12 18:12:44 2013 -0700
@@ -386,7 +386,7 @@
args = [[NSMutableArray alloc] initWithObjects:[NSValue valueWithBytes:&cPeerObjGlobal objCType:@encode(jobject)], [NSNumber numberWithBool:NO], nil];
}
- [ThreadUtilities performOnMainThread:@selector(_createMenuItem_OnAppKitThread:) onObject:[CMenuItem alloc] withObject:args waitUntilDone:YES awtMode:YES];
+ [ThreadUtilities performOnMainThread:@selector(_createMenuItem_OnAppKitThread:) on:[CMenuItem alloc] withObject:args waitUntilDone:YES];
aCMenuItem = (CMenuItem *)[args objectAtIndex: 0];
--- a/jdk/src/macosx/native/sun/awt/CRobot.m Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/CRobot.m Tue Mar 12 18:12:44 2013 -0700
@@ -135,7 +135,7 @@
JNIEXPORT void JNICALL
Java_sun_lwawt_macosx_CRobot_mouseEvent
(JNIEnv *env, jobject peer,
- jint screenIndex, jint mouseLastX, jint mouseLastY, jint buttonsState,
+ jint displayID, jint mouseLastX, jint mouseLastY, jint buttonsState,
jboolean isButtonsDownState, jboolean isMouseMove)
{
JNF_COCOA_ENTER(env);
@@ -149,8 +149,6 @@
CGError err = kCGErrorSuccess;
- CGDirectDisplayID displayID =
- FindCGDirectDisplayIDForScreenIndex(screenIndex);
CGRect globalDeviceBounds = CGDisplayBounds(displayID);
// Set unknown mouse location, if needed.
--- a/jdk/src/macosx/native/sun/awt/JavaComponentAccessibility.m Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/JavaComponentAccessibility.m Tue Mar 12 18:12:44 2013 -0700
@@ -1113,18 +1113,10 @@
JNIEnv *env = [ThreadUtilities getJNIEnv];
id value = nil;
- // This code frequently gets called indirectly by Java when VoiceOver is active.
- // Basically, we just have to know when we going to be a bad state, and do something "special".
- // Note that while NSApplication isn't technically correct, we post a focus changed notification
- // (which will call this method, but with the correct codepath) shortly afterwards. See +postFocusChanged.
- if (sInPerformFromJava) {
- return [NSApplication sharedApplication];
- } else {
- jobject focused = JNFCallStaticObjectMethod(env, jm_getFocusOwner, fComponent); // AWT_THREADING Safe (AWTRunLoop)
- if (focused != NULL) {
- if (JNFIsInstanceOf(env, focused, &sjc_Accessible)) {
- value = [JavaComponentAccessibility createWithAccessible:focused withEnv:env withView:fView];
- }
+ jobject focused = JNFCallStaticObjectMethod(env, jm_getFocusOwner, fComponent); // AWT_THREADING Safe (AWTRunLoop)
+ if (focused != NULL) {
+ if (JNFIsInstanceOf(env, focused, &sjc_Accessible)) {
+ value = [JavaComponentAccessibility createWithAccessible:focused withEnv:env withView:fView];
}
}
@@ -1149,7 +1141,7 @@
{
JNF_COCOA_ENTER(env);
- [ThreadUtilities performOnMainThread:@selector(postFocusChanged:) onObject:[JavaComponentAccessibility class] withObject:nil waitUntilDone:NO awtMode:NO];
+ [ThreadUtilities performOnMainThread:@selector(postFocusChanged:) on:[JavaComponentAccessibility class] withObject:nil waitUntilDone:NO];
JNF_COCOA_EXIT(env);
}
@@ -1164,7 +1156,7 @@
(JNIEnv *env, jclass jklass, jlong element)
{
JNF_COCOA_ENTER(env);
- [ThreadUtilities performOnMainThread:@selector(postValueChanged) onObject:(JavaComponentAccessibility *)jlong_to_ptr(element) withObject:nil waitUntilDone:NO awtMode:NO];
+ [ThreadUtilities performOnMainThread:@selector(postValueChanged) on:(JavaComponentAccessibility *)jlong_to_ptr(element) withObject:nil waitUntilDone:NO];
JNF_COCOA_EXIT(env);
}
@@ -1177,7 +1169,7 @@
(JNIEnv *env, jclass jklass, jlong element)
{
JNF_COCOA_ENTER(env);
- [ThreadUtilities performOnMainThread:@selector(postSelectionChanged) onObject:(JavaComponentAccessibility *)jlong_to_ptr(element) withObject:nil waitUntilDone:NO awtMode:NO];
+ [ThreadUtilities performOnMainThread:@selector(postSelectionChanged) on:(JavaComponentAccessibility *)jlong_to_ptr(element) withObject:nil waitUntilDone:NO];
JNF_COCOA_EXIT(env);
}
@@ -1191,7 +1183,7 @@
(JNIEnv *env, jclass jklass, jlong element)
{
JNF_COCOA_ENTER(env);
- [ThreadUtilities performOnMainThread:@selector(unregisterFromCocoaAXSystem) onObject:(JavaComponentAccessibility *)jlong_to_ptr(element) withObject:nil waitUntilDone:NO awtMode:NO];
+ [ThreadUtilities performOnMainThread:@selector(unregisterFromCocoaAXSystem) on:(JavaComponentAccessibility *)jlong_to_ptr(element) withObject:nil waitUntilDone:NO];
JNF_COCOA_EXIT(env);
}
--- a/jdk/src/macosx/native/sun/awt/LWCToolkit.h Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/LWCToolkit.h Tue Mar 12 18:12:44 2013 -0700
@@ -44,8 +44,6 @@
+ (void) eventCountPlusPlus;
@end
-CGDirectDisplayID FindCGDirectDisplayIDForScreenIndex(jint screenIndex);
-
/*
* Utility Macros
*/
--- a/jdk/src/macosx/native/sun/awt/LWCToolkit.m Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/native/sun/awt/LWCToolkit.m Tue Mar 12 18:12:44 2013 -0700
@@ -177,39 +177,6 @@
NSBeep(); // produces both sound and visual flash, if configured in System Preferences
}
-CGDirectDisplayID
-FindCGDirectDisplayIDForScreenIndex(jint screenIndex)
-{
- // most common case - just one monitor
- CGDirectDisplayID screenID = CGMainDisplayID();
-
- CGDisplayCount displayCount = 0;
- CGGetOnlineDisplayList(0, NULL, &displayCount);
-
- if ((displayCount > 1) &&
- (screenIndex >= 0) &&
- (screenIndex < (jint)displayCount))
- {
- if (displayCount < 10) {
- // stack allocated optimization for less than 10 monitors
- CGDirectDisplayID onlineDisplays[displayCount];
- CGGetOnlineDisplayList(displayCount, onlineDisplays, &displayCount);
- screenID = (CGDirectDisplayID)onlineDisplays[screenIndex];
- } else {
- CGDirectDisplayID *onlineDisplays =
- malloc(displayCount*sizeof(CGDirectDisplayID));
- if (onlineDisplays != NULL) {
- CGGetOnlineDisplayList(displayCount, onlineDisplays,
- &displayCount);
- screenID = (CGDirectDisplayID)onlineDisplays[screenIndex];
- free(onlineDisplays);
- }
- }
- }
-
- return screenID;
-}
-
/*
* Class: sun_lwawt_macosx_LWCToolkit
* Method: initIDs
@@ -332,7 +299,7 @@
* Signature: (JZZ)V
*/
JNIEXPORT void JNICALL Java_sun_lwawt_macosx_LWCToolkit_doAWTRunLoop
-(JNIEnv *env, jclass clz, jlong mediator, jboolean awtMode, jboolean detectDeadlocks)
+(JNIEnv *env, jclass clz, jlong mediator, jboolean processEvents)
{
AWT_ASSERT_APPKIT_THREAD;
JNF_COCOA_ENTER(env);
@@ -341,26 +308,25 @@
if (mediatorObject == nil) return;
- if (!sInPerformFromJava || !detectDeadlocks) {
-
- NSRunLoop *currentRunLoop = [NSRunLoop currentRunLoop];
- NSDate *distantFuture = [NSDate distantFuture];
- NSString *mode = (awtMode) ? [JNFRunLoop javaRunLoopMode] : NSDefaultRunLoopMode;
+ // Don't use acceptInputForMode because that doesn't setup autorelease pools properly
+ BOOL isRunning = true;
+ while (![mediatorObject shouldEndRunLoop] && isRunning) {
+ isRunning = [[NSRunLoop currentRunLoop] runMode:[JNFRunLoop javaRunLoopMode]
+ beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.010]];
+ if (processEvents) {
+ //We do not spin a runloop here as date is nil, so does not matter which mode to use
+ NSEvent *event;
+ if ((event = [NSApp nextEventMatchingMask:NSAnyEventMask
+ untilDate:nil
+ inMode:NSDefaultRunLoopMode
+ dequeue:YES]) != nil) {
+ [NSApp sendEvent:event];
+ }
- BOOL isRunning = YES;
- while (isRunning && ![mediatorObject shouldEndRunLoop]) {
- // Don't use acceptInputForMode because that doesn't setup autorelease pools properly
- isRunning = [currentRunLoop runMode:mode beforeDate:distantFuture];
}
-
}
-#ifndef PRODUCT_BUILD
- if (sInPerformFromJava) {
- NSLog(@"Apple AWT: Short-circuiting CToolkit.invokeAndWait trampoline deadlock!!!!!");
- NSLog(@"\tPlease file a bug report with this message and a reproducible test case.");
- }
-#endif
+
CFRelease(mediatorObject);
JNF_COCOA_EXIT(env);
@@ -379,7 +345,7 @@
AWTRunLoopObject* mediatorObject = (AWTRunLoopObject*)jlong_to_ptr(mediator);
- [ThreadUtilities performOnMainThread:@selector(endRunLoop) onObject:mediatorObject withObject:nil waitUntilDone:NO awtMode:YES];
+ [ThreadUtilities performOnMainThread:@selector(endRunLoop) on:mediatorObject withObject:nil waitUntilDone:NO];
CFRelease(mediatorObject);
@@ -463,20 +429,3 @@
}
-/*
- * Class: sun_lwawt_macosx_LWCToolkit
- * Method: executeNextAppKitEvent
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_sun_lwawt_macosx_LWCToolkit_executeNextAppKitEvent
-(JNIEnv *env, jclass cls)
-{
- // Simply get the next event in native loop and pass it to execution
- // We'll be called repeatedly so there's no need to block here
- NSRunLoop *theRL = [NSRunLoop currentRunLoop];
- NSApplication * app = [NSApplication sharedApplication];
- NSEvent * event = [app nextEventMatchingMask: 0xFFFFFFFF untilDate:nil inMode:NSDefaultRunLoopMode dequeue:YES];
- if (event != nil) {
- [app sendEvent: event];
- }
-}
--- a/jdk/src/macosx/native/sun/font/AWTStrike.m Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/native/sun/font/AWTStrike.m Tue Mar 12 18:12:44 2013 -0700
@@ -27,11 +27,13 @@
#import "java_awt_geom_PathIterator.h"
#import "sun_awt_SunHints.h"
#import "sun_font_CStrike.h"
+#import "sun_font_CStrikeDisposer.h"
#import "CGGlyphImages.h"
#import "CGGlyphOutlines.h"
#import "AWTStrike.h"
#import "CoreTextSupport.h"
//#import "jni_util.h"
+#include "fontscalerdefs.h"
/* Use THIS_FILE when it is available. */
#ifndef THIS_FILE
@@ -423,3 +425,19 @@
return metrics;
}
+
+extern void AccelGlyphCache_RemoveAllInfos(GlyphInfo* glyph);
+/*
+ * Class: sun_font_CStrikeDisposer
+ * Method: removeGlyphInfoFromCache
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_sun_font_CStrikeDisposer_removeGlyphInfoFromCache
+(JNIEnv *env, jclass cls, jlong glyphInfo)
+{
+ JNF_COCOA_ENTER(env);
+
+ AccelGlyphCache_RemoveAllCellInfos((GlyphInfo*)jlong_to_ptr(glyphInfo));
+
+ JNF_COCOA_EXIT(env);
+}
--- a/jdk/src/macosx/native/sun/java2d/opengl/CGLGraphicsConfig.m Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/native/sun/java2d/opengl/CGLGraphicsConfig.m Tue Mar 12 18:12:44 2013 -0700
@@ -192,12 +192,12 @@
JNIEXPORT jlong JNICALL
Java_sun_java2d_opengl_CGLGraphicsConfig_getCGLConfigInfo
(JNIEnv *env, jclass cglgc,
- jint screennum, jint pixfmt, jint swapInterval)
+ jint displayID, jint pixfmt, jint swapInterval)
{
jlong ret = 0L;
JNF_COCOA_ENTER(env);
NSMutableArray * retArray = [NSMutableArray arrayWithCapacity:3];
- [retArray addObject: [NSNumber numberWithInt: (int)screennum]];
+ [retArray addObject: [NSNumber numberWithInt: (int)displayID]];
[retArray addObject: [NSNumber numberWithInt: (int)pixfmt]];
[retArray addObject: [NSNumber numberWithInt: (int)swapInterval]];
if ([NSThread isMainThread]) {
@@ -217,7 +217,7 @@
+ (void) _getCGLConfigInfo: (NSMutableArray *)argValue {
AWT_ASSERT_APPKIT_THREAD;
- jint screennum = (jint)[(NSNumber *)[argValue objectAtIndex: 0] intValue];
+ jint displayID = (jint)[(NSNumber *)[argValue objectAtIndex: 0] intValue];
jint pixfmt = (jint)[(NSNumber *)[argValue objectAtIndex: 1] intValue];
jint swapInterval = (jint)[(NSNumber *)[argValue objectAtIndex: 2] intValue];
JNIEnv *env = [ThreadUtilities getJNIEnvUncached];
@@ -230,16 +230,11 @@
CGOpenGLDisplayMask glMask = (CGOpenGLDisplayMask)pixfmt;
if (sharedContext == NULL) {
if (glMask == 0) {
- CGDirectDisplayID id =
- FindCGDirectDisplayIDForScreenIndex(screennum);
- glMask = CGDisplayIDToOpenGLDisplayMask(id);
+ glMask = CGDisplayIDToOpenGLDisplayMask(displayID);
}
NSOpenGLPixelFormatAttribute attrs[] = {
NSOpenGLPFAClosestPolicy,
- NSOpenGLPFANoRecovery,
- NSOpenGLPFAAccelerated,
- NSOpenGLPFAFullScreen,
NSOpenGLPFAWindow,
NSOpenGLPFAPixelBuffer,
NSOpenGLPFADoubleBuffer,
@@ -412,7 +407,7 @@
return;
}
memset(cglinfo, 0, sizeof(CGLGraphicsConfigInfo));
- cglinfo->screen = screennum;
+ cglinfo->screen = displayID;
cglinfo->pixfmt = sharedPixelFormat;
cglinfo->context = oglc;
@@ -422,17 +417,6 @@
}
@end //GraphicsConfigUtil
-
-JNIEXPORT jint JNICALL
-Java_sun_java2d_opengl_CGLGraphicsConfig_getDefaultPixFmt
- (JNIEnv *env, jclass cglgc, jint screennum)
-{
- J2dTraceLn(J2D_TRACE_INFO, "CGLGraphicsConfig_getDefaultPixFmt");
-
- CGDirectDisplayID id = FindCGDirectDisplayIDForScreenIndex(screennum);
- return (jint)CGDisplayIDToOpenGLDisplayMask(id);
-}
-
JNIEXPORT jint JNICALL
Java_sun_java2d_opengl_CGLGraphicsConfig_getOGLCapabilities
(JNIEnv *env, jclass cglgc, jlong configInfo)
--- a/jdk/src/macosx/native/sun/osxapp/ThreadUtilities.h Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/native/sun/osxapp/ThreadUtilities.h Tue Mar 12 18:12:44 2013 -0700
@@ -122,19 +122,12 @@
#endif /* AWT_THREAD_ASSERTS */
// --------------------------------------------------------------------------
-// This tracks if we are current inside of a performOnMainThread that is both waiting and in the AWTRunLoopMode
-extern BOOL sInPerformFromJava;
-
-// This is an empty Obj-C object just so that -performSelectorOnMainThread
-// can be used, and to use the Obj-C +initialize feature.
__attribute__((visibility("default")))
-@interface ThreadUtilities : NSObject { }
+@interface ThreadUtilities { }
+ (JNIEnv*)getJNIEnv;
+ (JNIEnv*)getJNIEnvUncached;
-+ (void)performOnMainThread:(SEL)aSelector onObject:(id)target withObject:(id)arg waitUntilDone:(BOOL)wait awtMode:(BOOL)inAWT;
-
//Wrappers for the corresponding JNFRunLoop methods with a check for main thread
+ (void)performOnMainThreadWaiting:(BOOL)wait block:(void (^)())block;
+ (void)performOnMainThread:(SEL)aSelector on:(id)target withObject:(id)arg waitUntilDone:(BOOL)wait;
--- a/jdk/src/macosx/native/sun/osxapp/ThreadUtilities.m Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/macosx/native/sun/osxapp/ThreadUtilities.m Tue Mar 12 18:12:44 2013 -0700
@@ -34,85 +34,6 @@
JavaVM *jvm = NULL;
static JNIEnv *appKitEnv = NULL;
-static NSArray *sPerformModes = nil;
-static NSArray *sAWTPerformModes = nil;
-
-static BOOL sLoggingEnabled = YES;
-
-#ifdef AWT_THREAD_ASSERTS_ENV_ASSERT
-int sAWTThreadAsserts = 0;
-#endif /* AWT_THREAD_ASSERTS_ENV_ASSERT */
-
-BOOL sInPerformFromJava = NO;
-
-// This class is used so that performSelectorOnMainThread can be
-// controlled a little more easily by us. It has 2 roles.
-// The first is to set/unset a flag (sInPerformFromJava) that code can
-// check to see if we are in a synchronous perform initiated by a java thread.
-// The second is to implement the CocoaComponent backward compatibility mode.
-@interface CPerformer : NSObject {
- id fTarget;
- SEL fSelector;
- id fArg;
- BOOL fWait;
-}
-
-- (id) initWithTarget:(id)target selector:(SEL)selector arg:(id)arg wait:(BOOL)wait;
-- (void) perform;
-@end
-
-
-@implementation CPerformer
-
-- (id) initWithTarget:(id)target selector:(SEL)selector arg:(id)arg {
- return [self initWithTarget:target selector:selector arg:arg wait:YES];
-}
-
-- (id) initWithTarget:(id)target selector:(SEL)selector arg:(id)arg wait:(BOOL)wait {
- self = [super init];
- if (self != nil) {
- fTarget = [target retain];
- fSelector = selector;
- fArg = [arg retain];
- // Only set sInPerformFromJava if this is a synchronous perform
- fWait = wait;
- }
- return self;
-}
-
-- (void) dealloc {
- [fTarget release];
- [fArg release];
- [super dealloc];
-}
-//- (void)finalize { [super finalize]; }
-
-- (void) perform {
- AWT_ASSERT_APPKIT_THREAD;
-
- // If this is the first time we're going from java thread -> appkit thread,
- // set sInPerformFromJava for the duration of the invocation
- BOOL nestedPerform = sInPerformFromJava;
- if (fWait) {
- sInPerformFromJava = YES;
- }
-
- // Actually do the work (cheat to avoid a method call)
- @try {
- objc_msgSend(fTarget, fSelector, fArg);
- //[fTarget performSelector:fSelector withObject:fArg];
- } @catch (NSException *e) {
- NSLog(@"*** CPerformer: ignoring exception '%@' raised during perform of selector '%@' on target '%@' with args '%@'", e, NSStringFromSelector(fSelector), fTarget, fArg);
- } @finally {
- // If we actually set sInPerformFromJava, unset it now
- if (!nestedPerform && fWait) {
- sInPerformFromJava = NO;
- }
- }
-}
-@end
-
-
@implementation ThreadUtilities
+ (JNIEnv*)getJNIEnv {
@@ -129,36 +50,6 @@
return env;
}
-+ (void)initialize {
- // Headless: BOTH
- // Embedded: BOTH
- // Multiple Calls: NO
- // Caller: Obj-C class initialization
- // Thread: ?
-
- if (sPerformModes == nil) {
- // Create list of Run Loop modes to perform on
- // The default performSelector, with no mode argument, runs in Default,
- // ModalPanel, and EventTracking modes
- sPerformModes = [[NSArray alloc] initWithObjects:NSDefaultRunLoopMode, NSModalPanelRunLoopMode, nil];
- sAWTPerformModes = [[NSArray alloc] initWithObjects:NSDefaultRunLoopMode, NSModalPanelRunLoopMode, NSEventTrackingRunLoopMode, [JNFRunLoop javaRunLoopMode], nil];
-
-#ifdef AWT_THREAD_ASSERTS_ENV_ASSERT
- sAWTThreadAsserts = (getenv("COCOA_AWT_DISABLE_THREAD_ASSERTS") == NULL);
-#endif /* AWT_THREAD_ASSERTS_ENV_ASSERT */
- }
-}
-
-// These methods can behave slightly differently than the normal
-// performSelector... In particular, we define a special runloop mode
-// (AWTRunLoopMode) so that we can "block" the main thread against the
-// java event thread without deadlocking. See CToolkit.invokeAndWait.
-+ (void)performOnMainThread:(SEL)aSelector onObject:(id)target withObject:(id)arg waitUntilDone:(BOOL)wait awtMode:(BOOL)inAWT {
- CPerformer *performer = [[CPerformer alloc] initWithTarget:target selector:aSelector arg:arg wait:wait];
- [performer performSelectorOnMainThread:@selector(perform) withObject:nil waitUntilDone:wait modes:((inAWT) ? sAWTPerformModes : sPerformModes)]; // AWT_THREADING Safe (cover method)
- [performer release];
-}
-
+ (void)performOnMainThreadWaiting:(BOOL)wait block:(void (^)())block {
if ([NSThread isMainThread] && wait == YES) {
block();
--- a/jdk/src/share/back/transport.c Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/back/transport.c Tue Mar 12 18:12:44 2013 -0700
@@ -117,6 +117,9 @@
/* Construct library name (simple name or full path) */
dbgsysBuildLibName(libname, sizeof(libname), plibdir, name);
+ if (strlen(libname) == 0) {
+ return NULL;
+ }
/* dlopen (unix) / LoadLibrary (windows) the transport library */
handle = dbgsysLoadLibrary(libname, buf, sizeof(buf));
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java Tue Mar 12 18:12:44 2013 -0700
@@ -177,7 +177,7 @@
define(sd, ATTR_CONTEXT_METHOD, "Synthetic", "");
define(sd, ATTR_CONTEXT_METHOD, "Deprecated", "");
define(sd, ATTR_CONTEXT_METHOD, "Exceptions", "NH[RCH]");
- define(sd, ATTR_CONTEXT_METHOD, "MethodParameters", "NB[RUNHI]");
+ define(sd, ATTR_CONTEXT_METHOD, "MethodParameters", "NB[RUNHFH]");
//define(sd, ATTR_CONTEXT_METHOD, "Code", "HHNI[B]NH[PHPOHPOHRCNH]NH[RUHNI[B]]");
define(sd, ATTR_CONTEXT_CODE, "StackMapTable",
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java Tue Mar 12 18:12:44 2013 -0700
@@ -1505,7 +1505,7 @@
// band for predefine method parameters
IntBand method_MethodParameters_NB = method_attr_bands.newIntBand("method_MethodParameters_NB", BYTE1);
CPRefBand method_MethodParameters_name_RUN = method_attr_bands.newCPRefBand("method_MethodParameters_name_RUN", UNSIGNED5, CONSTANT_Utf8, NULL_IS_OK);
- IntBand method_MethodParameters_flag_I = method_attr_bands.newIntBand("method_MethodParameters_flag_I");
+ IntBand method_MethodParameters_flag_FH = method_attr_bands.newIntBand("method_MethodParameters_flag_FH");
MultiBand class_attr_bands = class_bands.newMultiBand("(class_attr_bands)", UNSIGNED5);
IntBand class_flags_hi = class_attr_bands.newIntBand("class_flags_hi");
@@ -1776,9 +1776,9 @@
new Band[]{
method_MethodParameters_NB,
method_MethodParameters_name_RUN,
- method_MethodParameters_flag_I
+ method_MethodParameters_flag_FH
},
- "MethodParameters", "NB[RUNHI]");
+ "MethodParameters", "NB[RUNHFH]");
assert(attrCodeEmpty == Package.attrCodeEmpty);
predefineAttribute(X_ATTR_Signature, ATTR_CONTEXT_METHOD,
new Band[] { method_Signature_RS },
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java Tue Mar 12 18:12:44 2013 -0700
@@ -564,7 +564,7 @@
code.bytes = new byte[readInt()];
in.readFully(code.bytes);
Entry[] cpMap = cls.getCPMap();
- Instruction.opcodeChecker(code.bytes, cpMap);
+ Instruction.opcodeChecker(code.bytes, cpMap, this.cls.version);
int nh = readUnsignedShort();
code.setHandlerCount(nh);
for (int i = 0; i < nh; i++) {
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java Tue Mar 12 18:12:44 2013 -0700
@@ -207,6 +207,10 @@
return tag;
}
+ public final boolean tagEquals(int tag) {
+ return getTag() == tag;
+ }
+
public Entry getRef(int i) {
return null;
}
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Constants.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Constants.java Tue Mar 12 18:12:44 2013 -0700
@@ -479,4 +479,10 @@
public final static int _qldc = _xldc_op+7;
public final static int _qldc_w = _xldc_op+8;
public final static int _xldc_limit = _xldc_op+9;
+
+ // handling of InterfaceMethodRef
+ public final static int _invoke_int_op = _xldc_limit;
+ public final static int _invokespecial_int = _invoke_int_op+0;
+ public final static int _invokestatic_int = _invoke_int_op+1;
+ public final static int _invoke_int_limit = _invoke_int_op+2;
}
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Instruction.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Instruction.java Tue Mar 12 18:12:44 2013 -0700
@@ -446,12 +446,14 @@
public static boolean isCPRefOp(int bc) {
if (bc < BC_INDEX[0].length && BC_INDEX[0][bc] > 0) return true;
if (bc >= _xldc_op && bc < _xldc_limit) return true;
+ if (bc == _invokespecial_int || bc == _invokestatic_int) return true;
return false;
}
public static byte getCPRefOpTag(int bc) {
if (bc < BC_INDEX[0].length && BC_INDEX[0][bc] > 0) return BC_TAG[0][bc];
if (bc >= _xldc_op && bc < _xldc_limit) return CONSTANT_LoadableValue;
+ if (bc == _invokestatic_int || bc == _invokespecial_int) return CONSTANT_InterfaceMethodref;
return CONSTANT_None;
}
@@ -647,7 +649,8 @@
}
}
- public static void opcodeChecker(byte[] code, ConstantPool.Entry[] cpMap) throws FormatException {
+ public static void opcodeChecker(byte[] code, ConstantPool.Entry[] cpMap,
+ Package.Version clsVersion) throws FormatException {
Instruction i = at(code, 0);
while (i != null) {
int opcode = i.getBC();
@@ -658,10 +661,17 @@
ConstantPool.Entry e = i.getCPRef(cpMap);
if (e != null) {
byte tag = i.getCPTag();
- if (!e.tagMatches(tag)) {
- String message = "illegal reference, expected type=" +
- ConstantPool.tagName(tag) + ": " +
- i.toString(cpMap);
+ boolean match = e.tagMatches(tag);
+ if (!match &&
+ (i.bc == _invokespecial || i.bc == _invokestatic) &&
+ e.tagMatches(CONSTANT_InterfaceMethodref) &&
+ clsVersion.greaterThan(Constants.JAVA7_MAX_CLASS_VERSION)) {
+ match = true;
+ }
+ if (!match) {
+ String message = "illegal reference, expected type="
+ + ConstantPool.tagName(tag) + ": "
+ + i.toString(cpMap);
throw new FormatException(message);
}
}
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java Tue Mar 12 18:12:44 2013 -0700
@@ -1521,7 +1521,7 @@
// *method_Exceptions_RC :UNSIGNED5 (cp_Class)
// *method_MethodParameters_NB: BYTE1
// *method_MethodParameters_RUN: UNSIGNED5 (cp_Utf8)
- // *method_MethodParameters_I: UNSIGNED5 (flag)
+ // *method_MethodParameters_FH: UNSIGNED5 (flag)
//
// code_attr_bands:
// *code_flags :UNSIGNED5
@@ -2256,6 +2256,12 @@
int origBC = bc;
int size = 2;
switch (bc) {
+ case _invokestatic_int:
+ origBC = _invokestatic;
+ break;
+ case _invokespecial_int:
+ origBC = _invokespecial;
+ break;
case _ildc:
case _cldc:
case _fldc:
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java Tue Mar 12 18:12:44 2013 -0700
@@ -1409,6 +1409,10 @@
int bc = i.getBC();
if (!(bc >= _first_linker_op && bc <= _last_linker_op)) return -1;
MemberEntry ref = (MemberEntry) i.getCPRef(curCPMap);
+ // do not optimize this case, simply fall back to regular coding
+ if ((bc == _invokespecial || bc == _invokestatic) &&
+ ref.tagEquals(CONSTANT_InterfaceMethodref))
+ return -1;
ClassEntry refClass = ref.classRef;
int self_bc = _self_linker_op + (bc - _first_linker_op);
if (refClass == curClass.thisClass)
@@ -1609,7 +1613,16 @@
case CONSTANT_Fieldref:
bc_which = bc_fieldref; break;
case CONSTANT_Methodref:
- bc_which = bc_methodref; break;
+ if (ref.tagEquals(CONSTANT_InterfaceMethodref)) {
+ if (bc == _invokespecial)
+ vbc = _invokespecial_int;
+ if (bc == _invokestatic)
+ vbc = _invokestatic_int;
+ bc_which = bc_imethodref;
+ } else {
+ bc_which = bc_methodref;
+ }
+ break;
case CONSTANT_InterfaceMethodref:
bc_which = bc_imethodref; break;
case CONSTANT_InvokeDynamic:
--- a/jdk/src/share/classes/java/awt/CheckboxMenuItem.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/awt/CheckboxMenuItem.java Tue Mar 12 18:12:44 2013 -0700
@@ -277,7 +277,7 @@
* @since 1.4
*/
public synchronized ItemListener[] getItemListeners() {
- return (ItemListener[])(getListeners(ItemListener.class));
+ return getListeners(ItemListener.class);
}
/**
--- a/jdk/src/share/classes/java/awt/Cursor.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/awt/Cursor.java Tue Mar 12 18:12:44 2013 -0700
@@ -163,11 +163,11 @@
* hashtable, filesystem dir prefix, filename, and properties for custom cursors support
*/
- private static final Hashtable systemCustomCursors = new Hashtable(1);
+ private static final Hashtable<String,Cursor> systemCustomCursors = new Hashtable<>(1);
private static final String systemCustomCursorDirPrefix = initCursorDir();
private static String initCursorDir() {
- String jhome = (String) java.security.AccessController.doPrivileged(
+ String jhome = java.security.AccessController.doPrivileged(
new sun.security.action.GetPropertyAction("java.home"));
return jhome +
File.separator + "lib" + File.separator + "images" +
@@ -298,7 +298,7 @@
static public Cursor getSystemCustomCursor(final String name)
throws AWTException, HeadlessException {
GraphicsEnvironment.checkHeadless();
- Cursor cursor = (Cursor)systemCustomCursors.get(name);
+ Cursor cursor = systemCustomCursors.get(name);
if (cursor == null) {
synchronized(systemCustomCursors) {
@@ -319,11 +319,11 @@
final String fileName =
systemCustomCursorProperties.getProperty(key);
- String localized = (String)systemCustomCursorProperties.getProperty(prefix + DotNameSuffix);
+ String localized = systemCustomCursorProperties.getProperty(prefix + DotNameSuffix);
if (localized == null) localized = name;
- String hotspot = (String)systemCustomCursorProperties.getProperty(prefix + DotHotspotSuffix);
+ String hotspot = systemCustomCursorProperties.getProperty(prefix + DotHotspotSuffix);
if (hotspot == null)
throw new AWTException("no hotspot property defined for cursor: " + name);
@@ -348,9 +348,9 @@
final int fy = y;
final String flocalized = localized;
- cursor = (Cursor) java.security.AccessController.doPrivileged(
- new java.security.PrivilegedExceptionAction() {
- public Object run() throws Exception {
+ cursor = java.security.AccessController.<Cursor>doPrivileged(
+ new java.security.PrivilegedExceptionAction<Cursor>() {
+ public Cursor run() throws Exception {
Toolkit toolkit = Toolkit.getDefaultToolkit();
Image image = toolkit.getImage(
systemCustomCursorDirPrefix + fileName);
@@ -447,8 +447,8 @@
systemCustomCursorProperties = new Properties();
try {
- AccessController.doPrivileged(
- new java.security.PrivilegedExceptionAction() {
+ AccessController.<Object>doPrivileged(
+ new java.security.PrivilegedExceptionAction<Object>() {
public Object run() throws Exception {
FileInputStream fis = null;
try {
--- a/jdk/src/share/classes/java/awt/EventQueue.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/awt/EventQueue.java Tue Mar 12 18:12:44 2013 -0700
@@ -171,7 +171,7 @@
* The modifiers field of the current event, if the current event is an
* InputEvent or ActionEvent.
*/
- private WeakReference currentEvent;
+ private WeakReference<AWTEvent> currentEvent;
/*
* Non-zero if a thread is waiting in getNextEvent(int) for an event of
@@ -809,7 +809,7 @@
pushPopLock.lock();
try {
return (Thread.currentThread() == dispatchThread)
- ? ((AWTEvent)currentEvent.get())
+ ? currentEvent.get()
: null;
} finally {
pushPopLock.unlock();
@@ -1167,7 +1167,7 @@
return;
}
- currentEvent = new WeakReference(e);
+ currentEvent = new WeakReference<>(e);
// This series of 'instanceof' checks should be replaced with a
// polymorphic type (for example, an interface which declares a
--- a/jdk/src/share/classes/java/awt/Menu.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/awt/Menu.java Tue Mar 12 18:12:44 2013 -0700
@@ -66,7 +66,7 @@
AWTAccessor.setMenuAccessor(
new AWTAccessor.MenuAccessor() {
- public Vector getItems(Menu menu) {
+ public Vector<MenuComponent> getItems(Menu menu) {
return menu.items;
}
});
@@ -78,7 +78,7 @@
* @serial
* @see #countItems()
*/
- Vector items = new Vector();
+ Vector<MenuComponent> items = new Vector<>();
/**
* This field indicates whether the menu has the
@@ -313,7 +313,7 @@
}
int nitems = getItemCount();
- Vector tempItems = new Vector();
+ Vector<MenuItem> tempItems = new Vector<>();
/* Remove the item at index, nitems-index times
storing them in a temporary vector in the
@@ -330,7 +330,7 @@
already in the correct order in the temp vector.
*/
for (int i = 0; i < tempItems.size() ; i++) {
- add((MenuItem)tempItems.elementAt(i));
+ add(tempItems.elementAt(i));
}
}
}
@@ -379,7 +379,7 @@
}
int nitems = getItemCount();
- Vector tempItems = new Vector();
+ Vector<MenuItem> tempItems = new Vector<>();
/* Remove the item at index, nitems-index times
storing them in a temporary vector in the
@@ -396,7 +396,7 @@
already in the correct order in the temp vector.
*/
for (int i = 0; i < tempItems.size() ; i++) {
- add((MenuItem)tempItems.elementAt(i));
+ add(tempItems.elementAt(i));
}
}
}
@@ -475,13 +475,13 @@
return null;
}
- synchronized Enumeration shortcuts() {
- Vector shortcuts = new Vector();
+ synchronized Enumeration<MenuShortcut> shortcuts() {
+ Vector<MenuShortcut> shortcuts = new Vector<>();
int nitems = getItemCount();
for (int i = 0 ; i < nitems ; i++) {
MenuItem mi = getItem(i);
if (mi instanceof Menu) {
- Enumeration e = ((Menu)mi).shortcuts();
+ Enumeration<MenuShortcut> e = ((Menu)mi).shortcuts();
while (e.hasMoreElements()) {
shortcuts.addElement(e.nextElement());
}
--- a/jdk/src/share/classes/java/awt/MenuBar.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/awt/MenuBar.java Tue Mar 12 18:12:44 2013 -0700
@@ -81,7 +81,7 @@
return menuBar.helpMenu;
}
- public Vector getMenus(MenuBar menuBar) {
+ public Vector<Menu> getMenus(MenuBar menuBar) {
return menuBar.menus;
}
});
@@ -94,7 +94,7 @@
* @serial
* @see #countMenus()
*/
- Vector menus = new Vector();
+ Vector<Menu> menus = new Vector<>();
/**
* This menu is a special menu dedicated to
@@ -309,7 +309,7 @@
* be called on the toolkit thread.
*/
final Menu getMenuImpl(int i) {
- return (Menu)menus.elementAt(i);
+ return menus.elementAt(i);
}
/**
@@ -321,10 +321,10 @@
* @since JDK1.1
*/
public synchronized Enumeration<MenuShortcut> shortcuts() {
- Vector shortcuts = new Vector();
+ Vector<MenuShortcut> shortcuts = new Vector<>();
int nmenus = getMenuCount();
for (int i = 0 ; i < nmenus ; i++) {
- Enumeration e = getMenu(i).shortcuts();
+ Enumeration<MenuShortcut> e = getMenu(i).shortcuts();
while (e.hasMoreElements()) {
shortcuts.addElement(e.nextElement());
}
@@ -438,7 +438,7 @@
// HeadlessException will be thrown from MenuComponent's readObject
s.defaultReadObject();
for (int i = 0; i < menus.size(); i++) {
- Menu m = (Menu)menus.elementAt(i);
+ Menu m = menus.elementAt(i);
m.parent = this;
}
}
--- a/jdk/src/share/classes/java/awt/MenuComponent.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/awt/MenuComponent.java Tue Mar 12 18:12:44 2013 -0700
@@ -290,7 +290,7 @@
public void setFont(Font f) {
font = f;
//Fixed 6312943: NullPointerException in method MenuComponent.setFont(Font)
- MenuComponentPeer peer = (MenuComponentPeer)this.peer;
+ MenuComponentPeer peer = this.peer;
if (peer != null) {
peer.setFont(f);
}
@@ -303,7 +303,7 @@
*/
public void removeNotify() {
synchronized (getTreeLock()) {
- MenuComponentPeer p = (MenuComponentPeer)this.peer;
+ MenuComponentPeer p = this.peer;
if (p != null) {
Toolkit.getEventQueue().removeSourceEvents(this, true);
this.peer = null;
--- a/jdk/src/share/classes/java/awt/MenuItem.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/awt/MenuItem.java Tue Mar 12 18:12:44 2013 -0700
@@ -564,7 +564,7 @@
* @since 1.4
*/
public synchronized ActionListener[] getActionListeners() {
- return (ActionListener[])(getListeners(ActionListener.class));
+ return getListeners(ActionListener.class);
}
/**
--- a/jdk/src/share/classes/java/awt/RenderingHints.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/awt/RenderingHints.java Tue Mar 12 18:12:44 2013 -0700
@@ -92,7 +92,7 @@
* {@code equals()} method.
*/
public abstract static class Key {
- private static HashMap identitymap = new HashMap(17);
+ private static HashMap<Object,Object> identitymap = new HashMap<>(17);
private String getIdentity() {
// Note that the identity string is dependent on 3 variables:
@@ -138,7 +138,7 @@
}
// Note: Use a weak reference to avoid holding on to extra
// objects and classes after they should be unloaded.
- identitymap.put(identity, new WeakReference(k));
+ identitymap.put(identity, new WeakReference<Key>(k));
}
private int privatekey;
@@ -195,7 +195,7 @@
}
}
- HashMap hintmap = new HashMap(7);
+ HashMap<Object,Object> hintmap = new HashMap<>(7);
/**
* Antialiasing hint key.
@@ -1267,12 +1267,13 @@
* object.
* @return a clone of this instance.
*/
+ @SuppressWarnings("unchecked")
public Object clone() {
RenderingHints rh;
try {
rh = (RenderingHints) super.clone();
if (hintmap != null) {
- rh.hintmap = (HashMap) hintmap.clone();
+ rh.hintmap = (HashMap<Object,Object>) hintmap.clone();
}
} catch (CloneNotSupportedException e) {
// this shouldn't happen, since we are Cloneable
--- a/jdk/src/share/classes/java/awt/datatransfer/Clipboard.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/awt/datatransfer/Clipboard.java Tue Mar 12 18:12:44 2013 -0700
@@ -71,7 +71,7 @@
*
* @since 1.5
*/
- private Set currentDataFlavors;
+ private Set<DataFlavor> currentDataFlavors;
/**
* Creates a clipboard object.
@@ -313,7 +313,7 @@
if (flavorListeners == null) {
return;
}
- Set prevDataFlavors = currentDataFlavors;
+ Set<DataFlavor> prevDataFlavors = currentDataFlavors;
currentDataFlavors = getAvailableDataFlavorSet();
if (prevDataFlavors.equals(currentDataFlavors)) {
return;
@@ -339,8 +339,8 @@
*
* @since 1.5
*/
- private Set getAvailableDataFlavorSet() {
- Set set = new HashSet();
+ private Set<DataFlavor> getAvailableDataFlavorSet() {
+ Set<DataFlavor> set = new HashSet<>();
Transferable contents = getContents(null);
if (contents != null) {
DataFlavor[] flavors = contents.getTransferDataFlavors();
--- a/jdk/src/share/classes/java/awt/dnd/DragGestureEvent.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/awt/dnd/DragGestureEvent.java Tue Mar 12 18:12:44 2013 -0700
@@ -165,7 +165,7 @@
* <P>
* @return an Iterator for the events comprising the gesture
*/
-
+ @SuppressWarnings("unchecked")
public Iterator<InputEvent> iterator() { return events.iterator(); }
/**
@@ -184,7 +184,7 @@
* <P>
* @return an array of the events comprising the gesture
*/
-
+ @SuppressWarnings("unchecked")
public Object[] toArray(Object[] array) { return events.toArray(array); }
/**
@@ -333,7 +333,6 @@
component = (Component)f.get("component", null);
origin = (Point)f.get("origin", null);
action = f.get("action", 0);
-
// Pre-1.4 support. 'events' was previously non-transient
try {
events = (List)f.get("events", null);
@@ -351,7 +350,7 @@
/*
* fields
*/
-
+ @SuppressWarnings("rawtypes")
private transient List events;
/**
--- a/jdk/src/share/classes/java/awt/dnd/DragGestureRecognizer.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/awt/dnd/DragGestureRecognizer.java Tue Mar 12 18:12:44 2013 -0700
@@ -297,7 +297,7 @@
* @return the initial event that triggered the drag gesture
*/
- public InputEvent getTriggerEvent() { return events.isEmpty() ? null : (InputEvent)events.get(0); }
+ public InputEvent getTriggerEvent() { return events.isEmpty() ? null : events.get(0); }
/**
* Reset the Recognizer, if its currently recognizing a gesture, ignore
--- a/jdk/src/share/classes/java/awt/dnd/DragSource.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/awt/dnd/DragSource.java Tue Mar 12 18:12:44 2013 -0700
@@ -600,7 +600,7 @@
* @since 1.4
*/
public DragSourceListener[] getDragSourceListeners() {
- return (DragSourceListener[])getListeners(DragSourceListener.class);
+ return getListeners(DragSourceListener.class);
}
/**
@@ -660,8 +660,7 @@
* @since 1.4
*/
public DragSourceMotionListener[] getDragSourceMotionListeners() {
- return (DragSourceMotionListener[])
- getListeners(DragSourceMotionListener.class);
+ return getListeners(DragSourceMotionListener.class);
}
/**
@@ -896,8 +895,8 @@
* @since 1.5
*/
public static int getDragThreshold() {
- int ts = ((Integer)AccessController.doPrivileged(
- new GetIntegerAction("awt.dnd.drag.threshold", 0))).intValue();
+ int ts = AccessController.doPrivileged(
+ new GetIntegerAction("awt.dnd.drag.threshold", 0)).intValue();
if (ts > 0) {
return ts;
} else {
--- a/jdk/src/share/classes/java/awt/dnd/InvalidDnDOperationException.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/awt/dnd/InvalidDnDOperationException.java Tue Mar 12 18:12:44 2013 -0700
@@ -36,6 +36,8 @@
public class InvalidDnDOperationException extends IllegalStateException {
+ private static final long serialVersionUID = 5156676500247816278L;
+
static private String dft_msg = "The operation requested cannot be performed by the DnD system since it is not in the appropriate state";
/**
--- a/jdk/src/share/classes/java/awt/geom/AffineTransform.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/awt/geom/AffineTransform.java Tue Mar 12 18:12:44 2013 -0700
@@ -876,6 +876,7 @@
* they have not been cached.
* @see #getType
*/
+ @SuppressWarnings("fallthrough")
private void calculateType() {
int ret = TYPE_IDENTITY;
boolean sgn0, sgn1;
@@ -1038,6 +1039,7 @@
* @see #TYPE_UNIFORM_SCALE
* @since 1.2
*/
+ @SuppressWarnings("fallthrough")
public double getDeterminant() {
switch (state) {
default:
@@ -1250,6 +1252,7 @@
default:
stateError();
/* NOTREACHED */
+ return;
case (APPLY_SHEAR | APPLY_SCALE | APPLY_TRANSLATE):
m02 = tx * m00 + ty * m01 + m02;
m12 = tx * m10 + ty * m11 + m12;
@@ -1631,6 +1634,7 @@
* Y axis direction
* @since 1.2
*/
+ @SuppressWarnings("fallthrough")
public void scale(double sx, double sy) {
int state = this.state;
switch (state) {
@@ -1705,6 +1709,7 @@
default:
stateError();
/* NOTREACHED */
+ return;
case (APPLY_SHEAR | APPLY_SCALE | APPLY_TRANSLATE):
case (APPLY_SHEAR | APPLY_SCALE):
double M0, M1;
@@ -2224,6 +2229,7 @@
* @see #preConcatenate
* @since 1.2
*/
+ @SuppressWarnings("fallthrough")
public void concatenate(AffineTransform Tx) {
double M0, M1;
double T00, T01, T10, T11;
@@ -2432,6 +2438,7 @@
* @see #concatenate
* @since 1.2
*/
+ @SuppressWarnings("fallthrough")
public void preConcatenate(AffineTransform Tx) {
double M0, M1;
double T00, T01, T10, T11;
@@ -2655,6 +2662,7 @@
default:
stateError();
/* NOTREACHED */
+ return null;
case (APPLY_SHEAR | APPLY_SCALE | APPLY_TRANSLATE):
det = m00 * m11 - m01 * m10;
if (Math.abs(det) <= Double.MIN_VALUE) {
@@ -2751,6 +2759,7 @@
default:
stateError();
/* NOTREACHED */
+ return;
case (APPLY_SHEAR | APPLY_SCALE | APPLY_TRANSLATE):
M00 = m00; M01 = m01; M02 = m02;
M10 = m10; M11 = m11; M12 = m12;
@@ -2885,6 +2894,7 @@
default:
stateError();
/* NOTREACHED */
+ return null;
case (APPLY_SHEAR | APPLY_SCALE | APPLY_TRANSLATE):
ptDst.setLocation(x * m00 + y * m01 + m02,
x * m10 + y * m11 + m12);
@@ -2968,6 +2978,7 @@
default:
stateError();
/* NOTREACHED */
+ return;
case (APPLY_SHEAR | APPLY_SCALE | APPLY_TRANSLATE):
dst.setLocation(x * m00 + y * m01 + m02,
x * m10 + y * m11 + m12);
@@ -3043,6 +3054,7 @@
default:
stateError();
/* NOTREACHED */
+ return;
case (APPLY_SHEAR | APPLY_SCALE | APPLY_TRANSLATE):
M00 = m00; M01 = m01; M02 = m02;
M10 = m10; M11 = m11; M12 = m12;
@@ -3157,6 +3169,7 @@
default:
stateError();
/* NOTREACHED */
+ return;
case (APPLY_SHEAR | APPLY_SCALE | APPLY_TRANSLATE):
M00 = m00; M01 = m01; M02 = m02;
M10 = m10; M11 = m11; M12 = m12;
@@ -3252,6 +3265,7 @@
default:
stateError();
/* NOTREACHED */
+ return;
case (APPLY_SHEAR | APPLY_SCALE | APPLY_TRANSLATE):
M00 = m00; M01 = m01; M02 = m02;
M10 = m10; M11 = m11; M12 = m12;
@@ -3347,6 +3361,7 @@
default:
stateError();
/* NOTREACHED */
+ return;
case (APPLY_SHEAR | APPLY_SCALE | APPLY_TRANSLATE):
M00 = m00; M01 = m01; M02 = m02;
M10 = m10; M11 = m11; M12 = m12;
@@ -3436,6 +3451,7 @@
* inverted.
* @since 1.2
*/
+ @SuppressWarnings("fallthrough")
public Point2D inverseTransform(Point2D ptSrc, Point2D ptDst)
throws NoninvertibleTransformException
{
@@ -3547,6 +3563,7 @@
default:
stateError();
/* NOTREACHED */
+ return;
case (APPLY_SHEAR | APPLY_SCALE | APPLY_TRANSLATE):
M00 = m00; M01 = m01; M02 = m02;
M10 = m10; M11 = m11; M12 = m12;
@@ -3679,6 +3696,7 @@
default:
stateError();
/* NOTREACHED */
+ return null;
case (APPLY_SHEAR | APPLY_SCALE | APPLY_TRANSLATE):
case (APPLY_SHEAR | APPLY_SCALE):
ptDst.setLocation(x * m00 + y * m01, x * m10 + y * m11);
@@ -3754,6 +3772,7 @@
default:
stateError();
/* NOTREACHED */
+ return;
case (APPLY_SHEAR | APPLY_SCALE | APPLY_TRANSLATE):
case (APPLY_SHEAR | APPLY_SCALE):
M00 = m00; M01 = m01;
--- a/jdk/src/share/classes/java/awt/peer/FramePeer.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/awt/peer/FramePeer.java Tue Mar 12 18:12:44 2013 -0700
@@ -125,4 +125,10 @@
// into an EmbeddedFramePeer which would extend FramePeer
Rectangle getBoundsPrivate();
+ /**
+ * Requests the peer to emulate window activation.
+ *
+ * @param activate activate or deactivate the window
+ */
+ void emulateActivation(boolean activate);
}
--- a/jdk/src/share/classes/java/awt/peer/WindowPeer.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/awt/peer/WindowPeer.java Tue Mar 12 18:12:44 2013 -0700
@@ -27,8 +27,6 @@
import java.awt.*;
-import java.awt.image.BufferedImage;
-
/**
* The peer interface for {@link Window}.
*
--- a/jdk/src/share/classes/java/beans/PropertyDescriptor.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/beans/PropertyDescriptor.java Tue Mar 12 18:12:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, 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
@@ -109,10 +109,6 @@
if (writeMethodName != null && getWriteMethod() == null) {
throw new IntrospectionException("Method not found: " + writeMethodName);
}
- boundInitialization(beanClass);
- }
-
- private void boundInitialization(Class<?> beanClass) {
// If this class or one of its base classes allow PropertyChangeListener,
// then we assume that any properties we discover are "bound".
// See Introspector.getTargetPropertyInfo() method.
@@ -163,7 +159,6 @@
setReadMethod(read);
setWriteMethod(write);
this.baseName = base;
- boundInitialization(bean);
}
/**
--- a/jdk/src/share/classes/java/lang/Class.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/lang/Class.java Tue Mar 12 18:12:44 2013 -0700
@@ -25,6 +25,7 @@
package java.lang;
+import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Array;
import java.lang.reflect.GenericArrayType;
import java.lang.reflect.Member;
@@ -3084,6 +3085,16 @@
}
/**
+ * {@inheritDoc}
+ * @throws NullPointerException {@inheritDoc}
+ * @since 1.5
+ */
+ @Override
+ public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass) {
+ return AnnotatedElement.super.isAnnotationPresent(annotationClass);
+ }
+
+ /**
* @throws NullPointerException {@inheritDoc}
* @since 1.8
*/
--- a/jdk/src/share/classes/java/lang/ClassLoader.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/lang/ClassLoader.java Tue Mar 12 18:12:44 2013 -0700
@@ -51,7 +51,6 @@
import java.util.Hashtable;
import java.util.WeakHashMap;
import java.util.concurrent.ConcurrentHashMap;
-import sun.misc.ClassFileTransformer;
import sun.misc.CompoundEnumeration;
import sun.misc.Resource;
import sun.misc.URLClassPath;
@@ -669,41 +668,6 @@
return source;
}
- private Class<?> defineTransformedClass(String name, byte[] b, int off, int len,
- ProtectionDomain pd,
- ClassFormatError cfe, String source)
- throws ClassFormatError
- {
- // Class format error - try to transform the bytecode and
- // define the class again
- //
- ClassFileTransformer[] transformers =
- ClassFileTransformer.getTransformers();
- Class<?> c = null;
-
- if (transformers != null) {
- for (ClassFileTransformer transformer : transformers) {
- try {
- // Transform byte code using transformer
- byte[] tb = transformer.transform(b, off, len);
- c = defineClass1(name, tb, 0, tb.length,
- pd, source);
- break;
- } catch (ClassFormatError cfe2) {
- // If ClassFormatError occurs, try next transformer
- }
- }
- }
-
- // Rethrow original ClassFormatError if unable to transform
- // bytecode to well-formed
- //
- if (c == null)
- throw cfe;
-
- return c;
- }
-
private void postDefineClass(Class<?> c, ProtectionDomain pd)
{
if (pd.getCodeSource() != null) {
@@ -783,17 +747,8 @@
throws ClassFormatError
{
protectionDomain = preDefineClass(name, protectionDomain);
-
- Class<?> c = null;
String source = defineClassSourceLocation(protectionDomain);
-
- try {
- c = defineClass1(name, b, off, len, protectionDomain, source);
- } catch (ClassFormatError cfe) {
- c = defineTransformedClass(name, b, off, len, protectionDomain, cfe,
- source);
- }
-
+ Class<?> c = defineClass1(name, b, off, len, protectionDomain, source);
postDefineClass(c, protectionDomain);
return c;
}
@@ -881,20 +836,8 @@
}
protectionDomain = preDefineClass(name, protectionDomain);
-
- Class<?> c = null;
String source = defineClassSourceLocation(protectionDomain);
-
- try {
- c = defineClass2(name, b, b.position(), len, protectionDomain,
- source);
- } catch (ClassFormatError cfe) {
- byte[] tb = new byte[len];
- b.get(tb); // get bytes out of byte buffer.
- c = defineTransformedClass(name, tb, 0, len, protectionDomain, cfe,
- source);
- }
-
+ Class<?> c = defineClass2(name, b, b.position(), len, protectionDomain, source);
postDefineClass(c, protectionDomain);
return c;
}
--- a/jdk/src/share/classes/java/lang/Deprecated.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/lang/Deprecated.java Tue Mar 12 18:12:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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,6 +36,7 @@
*
* @author Neal Gafter
* @since 1.5
+ * @jls 9.6.3.6 @Deprecated
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
--- a/jdk/src/share/classes/java/lang/Override.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/lang/Override.java Tue Mar 12 18:12:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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
@@ -43,7 +43,7 @@
*
* @author Peter von der Ahé
* @author Joshua Bloch
- * @jls 9.6.1.4 Override
+ * @jls 9.6.1.4 @Override
* @since 1.5
*/
@Target(ElementType.METHOD)
--- a/jdk/src/share/classes/java/lang/Package.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/lang/Package.java Tue Mar 12 18:12:44 2013 -0700
@@ -25,6 +25,7 @@
package java.lang;
+import java.lang.reflect.AnnotatedElement;
import java.io.InputStream;
import java.util.Enumeration;
@@ -386,6 +387,16 @@
}
/**
+ * {@inheritDoc}
+ * @throws NullPointerException {@inheritDoc}
+ * @since 1.5
+ */
+ @Override
+ public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass) {
+ return AnnotatedElement.super.isAnnotationPresent(annotationClass);
+ }
+
+ /**
* @throws NullPointerException {@inheritDoc}
* @since 1.8
*/
--- a/jdk/src/share/classes/java/lang/SafeVarargs.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/lang/SafeVarargs.java Tue Mar 12 18:12:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, 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
@@ -85,6 +85,7 @@
* @since 1.7
* @jls 4.7 Reifiable Types
* @jls 8.4.1 Formal Parameters
+ * @jls 9.6.3.7 @SafeVarargs
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
--- a/jdk/src/share/classes/java/lang/SecurityManager.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/lang/SecurityManager.java Tue Mar 12 18:12:44 2013 -0700
@@ -1320,6 +1320,9 @@
* <code>AWTPermission("showWindowWithoutWarningBanner")</code> permission,
* and returns <code>true</code> if a SecurityException is not thrown,
* otherwise it returns <code>false</code>.
+ * In the case of subset Profiles of Java SE that do not include the
+ * {@code java.awt} package, {@code checkPermission} is instead called
+ * to check the permission {@code java.security.AllPermission}.
* <p>
* If you override this method, then you should make a call to
* <code>super.checkTopLevelWindow</code>
@@ -1340,8 +1343,12 @@
if (window == null) {
throw new NullPointerException("window can't be null");
}
+ Permission perm = SecurityConstants.AWT.TOPLEVEL_WINDOW_PERMISSION;
+ if (perm == null) {
+ perm = SecurityConstants.ALL_PERMISSION;
+ }
try {
- checkPermission(SecurityConstants.AWT.TOPLEVEL_WINDOW_PERMISSION);
+ checkPermission(perm);
return true;
} catch (SecurityException se) {
// just return false
@@ -1379,6 +1386,9 @@
* This method calls <code>checkPermission</code> with the
* <code>AWTPermission("accessClipboard")</code>
* permission.
+ * In the case of subset Profiles of Java SE that do not include the
+ * {@code java.awt} package, {@code checkPermission} is instead called
+ * to check the permission {@code java.security.AllPermission}.
* <p>
* If you override this method, then you should make a call to
* <code>super.checkSystemClipboardAccess</code>
@@ -1391,7 +1401,11 @@
* @see #checkPermission(java.security.Permission) checkPermission
*/
public void checkSystemClipboardAccess() {
- checkPermission(SecurityConstants.AWT.ACCESS_CLIPBOARD_PERMISSION);
+ Permission perm = SecurityConstants.AWT.ACCESS_CLIPBOARD_PERMISSION;
+ if (perm == null) {
+ perm = SecurityConstants.ALL_PERMISSION;
+ }
+ checkPermission(perm);
}
/**
@@ -1400,6 +1414,10 @@
* <p>
* This method calls <code>checkPermission</code> with the
* <code>AWTPermission("accessEventQueue")</code> permission.
+ * In the case of subset Profiles of Java SE that do not include the
+ * {@code java.awt} package, {@code checkPermission} is instead called
+ * to check the permission {@code java.security.AllPermission}.
+ *
* <p>
* If you override this method, then you should make a call to
* <code>super.checkAwtEventQueueAccess</code>
@@ -1412,7 +1430,11 @@
* @see #checkPermission(java.security.Permission) checkPermission
*/
public void checkAwtEventQueueAccess() {
- checkPermission(SecurityConstants.AWT.CHECK_AWT_EVENTQUEUE_PERMISSION);
+ Permission perm = SecurityConstants.AWT.CHECK_AWT_EVENTQUEUE_PERMISSION;
+ if (perm == null) {
+ perm = SecurityConstants.ALL_PERMISSION;
+ }
+ checkPermission(perm);
}
/*
--- a/jdk/src/share/classes/java/lang/SuppressWarnings.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/lang/SuppressWarnings.java Tue Mar 12 18:12:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2013, 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
@@ -41,8 +41,13 @@
* suppress a warning in a particular method, you should annotate that
* method rather than its class.
*
+ * @author Josh Bloch
* @since 1.5
- * @author Josh Bloch
+ * @jls 4.8 Raw Types
+ * @jls 4.12.2 Variables of Reference Type
+ * @jls 5.1.9 Unchecked Conversion
+ * @jls 5.5.2 Checked Casts and Unchecked Casts
+ * @jls 9.6.3.5 @SuppressWarnings
*/
@Target({TYPE, FIELD, METHOD, PARAMETER, CONSTRUCTOR, LOCAL_VARIABLE})
@Retention(RetentionPolicy.SOURCE)
@@ -56,9 +61,11 @@
* free to emit a warning if an annotation contains an unrecognized
* warning name.
*
- * <p>Compiler vendors should document the warning names they support in
- * conjunction with this annotation type. They are encouraged to cooperate
- * to ensure that the same names work across multiple compilers.
+ * <p> The string {@code "unchecked"} is used to suppress
+ * unchecked warnings. Compiler vendors should document the
+ * additional warning names they support in conjunction with this
+ * annotation type. They are encouraged to cooperate to ensure
+ * that the same names work across multiple compilers.
*/
String[] value();
}
--- a/jdk/src/share/classes/java/lang/annotation/Inherited.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/lang/annotation/Inherited.java Tue Mar 12 18:12:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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
@@ -44,6 +44,7 @@
*
* @author Joshua Bloch
* @since 1.5
+ * @jls 9.6.3.3 @Inherited
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
--- a/jdk/src/share/classes/java/lang/annotation/InvalidContainerAnnotationError.java Mon Mar 04 15:40:12 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-package java.lang.annotation;
-
-import java.util.Objects;
-
-/**
- * Thrown to indicate that an annotation type expected to act as a
- * container for another annotation type by virture of an @Repeatable
- * annotation, does not act as a container.
- *
- * @see java.lang.reflect.AnnotatedElement
- * @since 1.8
- * @jls 9.6 Annotation Types
- * @jls 9.7 Annotations
- */
-public class InvalidContainerAnnotationError extends AnnotationFormatError {
- private static final long serialVersionUID = 5023L;
-
- /**
- * The instance of the erroneous container.
- */
- private transient Annotation container;
-
- /**
- * The type of the annotation that should be contained in the
- * container.
- */
- private transient Class<? extends Annotation> annotationType;
-
- /**
- * Constructs a new InvalidContainerAnnotationError with the
- * specified detail message.
- *
- * @param message the detail message.
- */
- public InvalidContainerAnnotationError(String message) {
- super(message);
- }
-
- /**
- * Constructs a new InvalidContainerAnnotationError with the specified
- * detail message and cause. Note that the detail message associated
- * with {@code cause} is <i>not</i> automatically incorporated in
- * this error's detail message.
- *
- * @param message the detail message
- * @param cause the cause, may be {@code null}
- */
- public InvalidContainerAnnotationError(String message, Throwable cause) {
- super(message, cause);
- }
-
- /**
- * Constructs a new InvalidContainerAnnotationError with the
- * specified cause and a detail message of {@code (cause == null ?
- * null : cause.toString())} (which typically contains the class
- * and detail message of {@code cause}).
- *
- * @param cause the cause, may be {@code null}
- */
- public InvalidContainerAnnotationError(Throwable cause) {
- super(cause);
- }
-
- /**
- * Constructs InvalidContainerAnnotationError for the specified
- * container instance and contained annotation type.
- *
- * @param message the detail message
- * @param cause the cause, may be {@code null}
- * @param container the erroneous container instance, may be
- * {@code null}
- * @param annotationType the annotation type intended to be
- * contained, may be {@code null}
- */
- public InvalidContainerAnnotationError(String message,
- Throwable cause,
- Annotation container,
- Class<? extends Annotation> annotationType) {
- super(message, cause);
- this.container = container;
- this.annotationType = annotationType;
- }
-
- /**
- * Returns the erroneous container.
- *
- * @return the erroneous container, may return {@code null}
- */
- public Annotation getContainer() {
- return container;
- }
-
- /**
- * Returns the annotation type intended to be contained. Returns
- * {@code null} if the annotation type intended to be contained
- * could not be determined.
- *
- * @return the annotation type intended to be contained, or {@code
- * null} if unknown
- */
- public Class<? extends Annotation> getAnnotationType() {
- return annotationType;
- }
-}
--- a/jdk/src/share/classes/java/lang/annotation/Retention.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/lang/annotation/Retention.java Tue Mar 12 18:12:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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
@@ -38,6 +38,7 @@
*
* @author Joshua Bloch
* @since 1.5
+ * @jls 9.6.3.2 @Retention
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
--- a/jdk/src/share/classes/java/lang/annotation/Target.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/lang/annotation/Target.java Tue Mar 12 18:12:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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
@@ -59,6 +59,9 @@
* ...
* }
* </pre>
+ *
+ * @since 1.5
+ * @jls 9.6.3.1 @Target
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
--- a/jdk/src/share/classes/java/lang/invoke/AbstractValidatingLambdaMetafactory.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/lang/invoke/AbstractValidatingLambdaMetafactory.java Tue Mar 12 18:12:44 2013 -0700
@@ -34,11 +34,11 @@
import static sun.invoke.util.Wrapper.*;
/**
- * Abstract implementation of a meta-factory which provides parameter unrolling and input validation.
+ * Abstract implementation of a lambda metafactory which provides parameter unrolling and input validation.
*
- * @author Robert Field
+ * @see LambdaMetafactory
*/
-/*non-public*/ abstract class AbstractValidatingLambdaMetafactory {
+/* package */ abstract class AbstractValidatingLambdaMetafactory {
/*
* For context, the comments for the following fields are marked in quotes with their values, given this program:
@@ -54,16 +54,19 @@
final Class<?> targetClass; // The class calling the meta-factory via invokedynamic "class X"
final MethodType invokedType; // The type of the invoked method "(CC)II"
final Class<?> samBase; // The type of the returned instance "interface JJ"
- final boolean isSerializable; // Should the returned instance be serializable
+ final MethodHandle samMethod; // Raw method handle for the functional interface method
final MethodHandleInfo samInfo; // Info about the SAM method handle "MethodHandleInfo[9 II.foo(Object)Object]"
final Class<?> samClass; // Interface containing the SAM method "interface II"
final MethodType samMethodType; // Type of the SAM method "(Object)Object"
+ final MethodHandle implMethod; // Raw method handle for the implementation method
final MethodHandleInfo implInfo; // Info about the implementation method handle "MethodHandleInfo[5 CC.impl(int)String]"
final int implKind; // Invocation kind for implementation "5"=invokevirtual
final boolean implIsInstanceMethod; // Is the implementation an instance method "true"
final Class<?> implDefiningClass; // Type defining the implementation "class CC"
final MethodType implMethodType; // Type of the implementation method "(int)String"
final MethodType instantiatedMethodType; // Instantiated erased functional interface method type "(Integer)Object"
+ final boolean isSerializable; // Should the returned instance be serializable
+ final Class<?>[] markerInterfaces; // Additional marker interfaces to be implemented
/**
@@ -80,27 +83,35 @@
* @param implMethod The implementation method which should be called (with suitable adaptation of argument
* types, return types, and adjustment for captured arguments) when methods of the resulting
* functional interface instance are invoked.
- * @param instantiatedMethodType The signature of the SAM method from the functional interface's perspective
+ * @param instantiatedMethodType The signature of the primary functional interface method after type variables
+ * are substituted with their instantiation from the capture site
* @throws ReflectiveOperationException
+ * @throws LambdaConversionException If any of the meta-factory protocol invariants are violated
*/
AbstractValidatingLambdaMetafactory(MethodHandles.Lookup caller,
MethodType invokedType,
MethodHandle samMethod,
MethodHandle implMethod,
- MethodType instantiatedMethodType)
- throws ReflectiveOperationException {
+ MethodType instantiatedMethodType,
+ int flags,
+ Class<?>[] markerInterfaces)
+ throws ReflectiveOperationException, LambdaConversionException {
this.targetClass = caller.lookupClass();
this.invokedType = invokedType;
this.samBase = invokedType.returnType();
- this.isSerializable = Serializable.class.isAssignableFrom(samBase);
+ this.samMethod = samMethod;
this.samInfo = new MethodHandleInfo(samMethod);
this.samClass = samInfo.getDeclaringClass();
this.samMethodType = samInfo.getMethodType();
+ this.implMethod = implMethod;
this.implInfo = new MethodHandleInfo(implMethod);
- this.implKind = implInfo.getReferenceKind() == MethodHandleInfo.REF_invokeSpecial? MethodHandleInfo.REF_invokeVirtual : implInfo.getReferenceKind(); // @@@ Temp work-around to hotspot incorrectly converting to invokespecial
+ // @@@ Temporary work-around pending resolution of 8005119
+ this.implKind = (implInfo.getReferenceKind() == MethodHandleInfo.REF_invokeSpecial)
+ ? MethodHandleInfo.REF_invokeVirtual
+ : implInfo.getReferenceKind();
this.implIsInstanceMethod =
implKind == MethodHandleInfo.REF_invokeVirtual ||
implKind == MethodHandleInfo.REF_invokeSpecial ||
@@ -109,6 +120,30 @@
this.implMethodType = implInfo.getMethodType();
this.instantiatedMethodType = instantiatedMethodType;
+
+ if (!samClass.isInterface()) {
+ throw new LambdaConversionException(String.format(
+ "Functional interface %s is not an interface",
+ samClass.getName()));
+ }
+
+ boolean foundSerializableSupertype = Serializable.class.isAssignableFrom(samBase);
+ for (Class<?> c : markerInterfaces) {
+ if (!c.isInterface()) {
+ throw new LambdaConversionException(String.format(
+ "Marker interface %s is not an interface",
+ c.getName()));
+ }
+ foundSerializableSupertype |= Serializable.class.isAssignableFrom(c);
+ }
+ this.isSerializable = ((flags & LambdaMetafactory.FLAG_SERIALIZABLE) != 0)
+ || foundSerializableSupertype;
+
+ if (isSerializable && !foundSerializableSupertype) {
+ markerInterfaces = Arrays.copyOf(markerInterfaces, markerInterfaces.length + 1);
+ markerInterfaces[markerInterfaces.length-1] = Serializable.class;
+ }
+ this.markerInterfaces = markerInterfaces;
}
/**
@@ -127,8 +162,9 @@
void validateMetafactoryArgs() throws LambdaConversionException {
// Check target type is a subtype of class where SAM method is defined
if (!samClass.isAssignableFrom(samBase)) {
- throw new LambdaConversionException(String.format("Invalid target type %s for lambda conversion; not a subtype of functional interface %s",
- samBase.getName(), samClass.getName()));
+ throw new LambdaConversionException(
+ String.format("Invalid target type %s for lambda conversion; not a subtype of functional interface %s",
+ samBase.getName(), samClass.getName()));
}
switch (implKind) {
@@ -149,14 +185,16 @@
final int samArity = samMethodType.parameterCount();
final int instantiatedArity = instantiatedMethodType.parameterCount();
if (implArity + receiverArity != capturedArity + samArity) {
- throw new LambdaConversionException(String.format("Incorrect number of parameters for %s method %s; %d captured parameters, %d functional interface parameters, %d implementation parameters",
- implIsInstanceMethod ? "instance" : "static", implInfo,
- capturedArity, samArity, implArity));
+ throw new LambdaConversionException(
+ String.format("Incorrect number of parameters for %s method %s; %d captured parameters, %d functional interface method parameters, %d implementation parameters",
+ implIsInstanceMethod ? "instance" : "static", implInfo,
+ capturedArity, samArity, implArity));
}
if (instantiatedArity != samArity) {
- throw new LambdaConversionException(String.format("Incorrect number of parameters for %s method %s; %d functional interface parameters, %d SAM method parameters",
- implIsInstanceMethod ? "instance" : "static", implInfo,
- instantiatedArity, samArity));
+ throw new LambdaConversionException(
+ String.format("Incorrect number of parameters for %s method %s; %d instantiated parameters, %d functional interface method parameters",
+ implIsInstanceMethod ? "instance" : "static", implInfo,
+ instantiatedArity, samArity));
}
// If instance: first captured arg (receiver) must be subtype of class where impl method is defined
@@ -180,8 +218,9 @@
// check receiver type
if (!implDefiningClass.isAssignableFrom(receiverClass)) {
- throw new LambdaConversionException(String.format("Invalid receiver type %s; not a subtype of implementation type %s",
- receiverClass, implDefiningClass));
+ throw new LambdaConversionException(
+ String.format("Invalid receiver type %s; not a subtype of implementation type %s",
+ receiverClass, implDefiningClass));
}
} else {
// no receiver
@@ -196,7 +235,8 @@
Class<?> capturedParamType = invokedType.parameterType(i + capturedStart);
if (!capturedParamType.equals(implParamType)) {
throw new LambdaConversionException(
- String.format("Type mismatch in captured lambda parameter %d: expecting %s, found %s", i, capturedParamType, implParamType));
+ String.format("Type mismatch in captured lambda parameter %d: expecting %s, found %s",
+ i, capturedParamType, implParamType));
}
}
// Check for adaptation match on SAM arguments
@@ -206,7 +246,8 @@
Class<?> instantiatedParamType = instantiatedMethodType.parameterType(i + samOffset);
if (!isAdaptableTo(instantiatedParamType, implParamType, true)) {
throw new LambdaConversionException(
- String.format("Type mismatch for lambda argument %d: %s is not convertible to %s", i, instantiatedParamType, implParamType));
+ String.format("Type mismatch for lambda argument %d: %s is not convertible to %s",
+ i, instantiatedParamType, implParamType));
}
}
@@ -218,7 +259,8 @@
: implMethodType.returnType();
if (!isAdaptableToAsReturn(actualReturnType, expectedType)) {
throw new LambdaConversionException(
- String.format("Type mismatch for lambda return: %s is not convertible to %s", actualReturnType, expectedType));
+ String.format("Type mismatch for lambda return: %s is not convertible to %s",
+ actualReturnType, expectedType));
}
}
@@ -274,8 +316,8 @@
}
- /*********** Logging support -- for debugging only
- static final Executor logPool = Executors.newSingleThreadExecutor(); // @@@ For debugging only
+ /*********** Logging support -- for debugging only, uncomment as needed
+ static final Executor logPool = Executors.newSingleThreadExecutor();
protected static void log(final String s) {
MethodHandleProxyLambdaMetafactory.logPool.execute(new Runnable() {
@Override
@@ -297,17 +339,21 @@
***********************/
/**
- * Find the SAM method and corresponding methods which should be bridged. SAM method and those to be bridged
- * will have the same name and number of parameters. Check for matching default methods (non-abstract), they
- * should not be bridged-over and indicate a complex bridging situation.
+ * Find the functional interface method and corresponding abstract methods
+ * which should be bridged. The functional interface method and those to be
+ * bridged will have the same name and number of parameters. Check for
+ * matching default methods (non-abstract), the VM will create bridges for
+ * default methods; We don't have enough readily available type information
+ * to distinguish between where the functional interface method should be
+ * bridged and where the default method should be bridged; This situation is
+ * flagged.
*/
class MethodAnalyzer {
private final Method[] methods = samBase.getMethods();
- private final List<Method> methodsFound = new ArrayList<>(methods.length);
private Method samMethod = null;
private final List<Method> methodsToBridge = new ArrayList<>(methods.length);
- private boolean defaultMethodFound = false;
+ private boolean conflictFoundBetweenDefaultAndBridge = false;
MethodAnalyzer() {
String samMethodName = samInfo.getName();
@@ -315,31 +361,36 @@
int samParamLength = samParamTypes.length;
Class<?> samReturnType = samMethodType.returnType();
Class<?> objectClass = Object.class;
+ List<Method> defaultMethods = new ArrayList<>(methods.length);
for (Method m : methods) {
if (m.getName().equals(samMethodName) && m.getDeclaringClass() != objectClass) {
Class<?>[] mParamTypes = m.getParameterTypes();
if (mParamTypes.length == samParamLength) {
+ // Method matches name and parameter length -- and is not Object
if (Modifier.isAbstract(m.getModifiers())) {
- // Exclude methods with duplicate signatures
- if (methodUnique(m)) {
- if (m.getReturnType().equals(samReturnType) && Arrays.equals(mParamTypes, samParamTypes)) {
- // Exact match, this is the SAM method signature
- samMethod = m;
- } else {
- methodsToBridge.add(m);
- }
+ // Method is abstract
+ if (m.getReturnType().equals(samReturnType)
+ && Arrays.equals(mParamTypes, samParamTypes)) {
+ // Exact match, this is the SAM method signature
+ samMethod = m;
+ } else if (!hasMatchingBridgeSignature(m)) {
+ // Record bridges, exclude methods with duplicate signatures
+ methodsToBridge.add(m);
}
} else {
- // This is a default method, flag for special processing
- defaultMethodFound = true;
- // Ignore future matching abstracts.
- // Note, due to reabstraction, this is really a punt, hence pass-off to VM
- methodUnique(m);
+ // Record default methods for conflict testing
+ defaultMethods.add(m);
}
}
}
}
+ for (Method dm : defaultMethods) {
+ if (hasMatchingBridgeSignature(dm)) {
+ conflictFoundBetweenDefaultAndBridge = true;
+ break;
+ }
+ }
}
Method getSamMethod() {
@@ -350,27 +401,26 @@
return methodsToBridge;
}
- boolean wasDefaultMethodFound() {
- return defaultMethodFound;
+ boolean conflictFoundBetweenDefaultAndBridge() {
+ return conflictFoundBetweenDefaultAndBridge;
}
/**
- * Search the list of previously found methods to determine if there is a method with the same signature
- * (return and parameter types) as the specified method. If it wasn't found before, add to the found list.
+ * Search the list of previously found bridge methods to determine if there is a method with the same signature
+ * (return and parameter types) as the specified method.
*
* @param m The method to match
- * @return False if the method was found, True otherwise
+ * @return True if the method was found, False otherwise
*/
- private boolean methodUnique(Method m) {
+ private boolean hasMatchingBridgeSignature(Method m) {
Class<?>[] ptypes = m.getParameterTypes();
Class<?> rtype = m.getReturnType();
- for (Method md : methodsFound) {
+ for (Method md : methodsToBridge) {
if (md.getReturnType().equals(rtype) && Arrays.equals(ptypes, md.getParameterTypes())) {
+ return true;
+ }
+ }
return false;
}
}
- methodsFound.add(m);
- return true;
- }
- }
}
--- a/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java Tue Mar 12 18:12:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2013, 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
@@ -55,8 +55,7 @@
}
// Factory methods:
-
- static DirectMethodHandle make(Class<?> receiver, MemberName member) {
+ static DirectMethodHandle make(byte refKind, Class<?> receiver, MemberName member) {
MethodType mtype = member.getMethodOrFieldType();
if (!member.isStatic()) {
if (!member.getDeclaringClass().isAssignableFrom(receiver) || member.isConstructor())
@@ -64,8 +63,14 @@
mtype = mtype.insertParameterTypes(0, receiver);
}
if (!member.isField()) {
- LambdaForm lform = preparedLambdaForm(member);
- return new DirectMethodHandle(mtype, lform, member);
+ if (refKind == REF_invokeSpecial) {
+ member = member.asSpecial();
+ LambdaForm lform = preparedLambdaForm(member);
+ return new Special(mtype, lform, member);
+ } else {
+ LambdaForm lform = preparedLambdaForm(member);
+ return new DirectMethodHandle(mtype, lform, member);
+ }
} else {
LambdaForm lform = preparedFieldLambdaForm(member);
if (member.isStatic()) {
@@ -79,6 +84,12 @@
}
}
}
+ static DirectMethodHandle make(Class<?> receiver, MemberName member) {
+ byte refKind = member.getReferenceKind();
+ if (refKind == REF_invokeSpecial)
+ refKind = REF_invokeVirtual;
+ return make(refKind, receiver, member);
+ }
static DirectMethodHandle make(MemberName member) {
if (member.isConstructor())
return makeAllocator(member);
@@ -114,6 +125,10 @@
//// Implementation methods.
@Override
+ MethodHandle viewAsType(MethodType newType) {
+ return new DirectMethodHandle(newType, form, member);
+ }
+ @Override
@ForceInline
MemberName internalMemberName() {
return member;
@@ -357,6 +372,21 @@
((DirectMethodHandle)mh).ensureInitialized();
}
+ /** This subclass represents invokespecial instructions. */
+ static class Special extends DirectMethodHandle {
+ private Special(MethodType mtype, LambdaForm form, MemberName member) {
+ super(mtype, form, member);
+ }
+ @Override
+ boolean isInvokeSpecial() {
+ return true;
+ }
+ @Override
+ MethodHandle viewAsType(MethodType newType) {
+ return new Special(newType, form, member);
+ }
+ }
+
/** This subclass handles constructor references. */
static class Constructor extends DirectMethodHandle {
final MemberName initMethod;
@@ -369,6 +399,10 @@
this.instanceClass = instanceClass;
assert(initMethod.isResolved());
}
+ @Override
+ MethodHandle viewAsType(MethodType newType) {
+ return new Constructor(newType, form, member, initMethod, instanceClass);
+ }
}
/*non-public*/ static Object constructorMethod(Object mh) {
@@ -395,6 +429,10 @@
@Override Object checkCast(Object obj) {
return fieldType.cast(obj);
}
+ @Override
+ MethodHandle viewAsType(MethodType newType) {
+ return new Accessor(newType, form, member, fieldOffset);
+ }
}
@ForceInline
@@ -434,6 +472,10 @@
@Override Object checkCast(Object obj) {
return fieldType.cast(obj);
}
+ @Override
+ MethodHandle viewAsType(MethodType newType) {
+ return new StaticAccessor(newType, form, member, staticBase, staticOffset);
+ }
}
@ForceInline
--- a/jdk/src/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java Tue Mar 12 18:12:44 2013 -0700
@@ -36,21 +36,28 @@
import java.security.PrivilegedAction;
/**
- * InnerClassLambdaMetafactory
+ * Lambda metafactory implementation which dynamically creates an inner-class-like class per lambda callsite.
+ *
+ * @see LambdaMetafactory
*/
-/*non-public*/ final class InnerClassLambdaMetafactory extends AbstractValidatingLambdaMetafactory {
+/* package */ final class InnerClassLambdaMetafactory extends AbstractValidatingLambdaMetafactory {
private static final int CLASSFILE_VERSION = 51;
- private static final Type TYPE_VOID = Type.getType(void.class);
private static final String METHOD_DESCRIPTOR_VOID = Type.getMethodDescriptor(Type.VOID_TYPE);
private static final String NAME_MAGIC_ACCESSOR_IMPL = "java/lang/invoke/MagicLambdaImpl";
- private static final String NAME_SERIALIZABLE = "java/io/Serializable";
private static final String NAME_CTOR = "<init>";
//Serialization support
- private static final String NAME_SERIALIZED_LAMBDA = "com/oracle/java/lang/invoke/SerializedLambdaImpl";
+ private static final String NAME_SERIALIZED_LAMBDA = "java/lang/invoke/SerializedLambda";
private static final String DESCR_METHOD_WRITE_REPLACE = "()Ljava/lang/Object;";
private static final String NAME_METHOD_WRITE_REPLACE = "writeReplace";
private static final String NAME_OBJECT = "java/lang/Object";
+ private static final String DESCR_CTOR_SERIALIZED_LAMBDA
+ = MethodType.methodType(void.class,
+ Class.class,
+ int.class, String.class, String.class, String.class,
+ int.class, String.class, String.class, String.class,
+ String.class,
+ Object[].class).toMethodDescriptorString();
// Used to ensure that each spun class name is unique
private static final AtomicInteger counter = new AtomicInteger(0);
@@ -70,7 +77,7 @@
private final Type[] instantiatedArgumentTypes; // ASM types for the functional interface arguments
/**
- * Meta-factory constructor.
+ * General meta-factory constructor, standard cases and allowing for uncommon options such as serialization.
*
* @param caller Stacked automatically by VM; represents a lookup context with the accessibility privileges
* of the caller.
@@ -83,16 +90,23 @@
* @param implMethod The implementation method which should be called (with suitable adaptation of argument
* types, return types, and adjustment for captured arguments) when methods of the resulting
* functional interface instance are invoked.
- * @param instantiatedMethodType The signature of the SAM method from the functional interface's perspective
+ * @param instantiatedMethodType The signature of the primary functional interface method after type variables
+ * are substituted with their instantiation from the capture site
+ * @param flags A bitmask containing flags that may influence the translation of this lambda expression. Defined
+ * fields include FLAG_SERIALIZABLE.
+ * @param markerInterfaces Additional interfaces which the lambda object should implement.
* @throws ReflectiveOperationException
+ * @throws LambdaConversionException If any of the meta-factory protocol invariants are violated
*/
public InnerClassLambdaMetafactory(MethodHandles.Lookup caller,
MethodType invokedType,
MethodHandle samMethod,
MethodHandle implMethod,
- MethodType instantiatedMethodType)
- throws ReflectiveOperationException {
- super(caller, invokedType, samMethod, implMethod, instantiatedMethodType);
+ MethodType instantiatedMethodType,
+ int flags,
+ Class<?>[] markerInterfaces)
+ throws ReflectiveOperationException, LambdaConversionException {
+ super(caller, invokedType, samMethod, implMethod, instantiatedMethodType, flags, markerInterfaces);
implMethodClassName = implDefiningClass.getName().replace('.', '/');
implMethodName = implInfo.getName();
implMethodDesc = implMethodType.toMethodDescriptorString();
@@ -109,7 +123,6 @@
argNames[i] = "arg$" + (i + 1);
}
instantiatedArgumentTypes = Type.getArgumentTypes(instantiatedMethodType.toMethodDescriptorString());
-
}
/**
@@ -120,7 +133,8 @@
*
* @return a CallSite, which, when invoked, will return an instance of the
* functional interface
- * @throws ReflectiveOperationException, LambdaConversionException
+ * @throws ReflectiveOperationException
+ * @throws LambdaConversionException If properly formed functional interface is not found
*/
@Override
CallSite buildCallSite() throws ReflectiveOperationException, LambdaConversionException {
@@ -151,8 +165,8 @@
} else {
return new ConstantCallSite(
MethodHandles.Lookup.IMPL_LOOKUP
- .findConstructor(innerClass, constructorType)
- .asType(constructorType.changeReturnType(samBase)));
+ .findConstructor(innerClass, constructorType)
+ .asType(constructorType.changeReturnType(samBase)));
}
}
@@ -161,16 +175,23 @@
* interface, define and return the class.
*
* @return a Class which implements the functional interface
+ * @throws LambdaConversionException If properly formed functional interface is not found
*/
- private <T> Class<? extends T> spinInnerClass() throws LambdaConversionException {
+ private Class<?> spinInnerClass() throws LambdaConversionException {
String samName = samBase.getName().replace('.', '/');
-
- cw.visit(CLASSFILE_VERSION, ACC_SUPER, lambdaClassName, null, NAME_MAGIC_ACCESSOR_IMPL,
- isSerializable ? new String[]{samName, NAME_SERIALIZABLE} : new String[]{samName});
+ String[] interfaces = new String[markerInterfaces.length + 1];
+ interfaces[0] = samName;
+ for (int i=0; i<markerInterfaces.length; i++) {
+ interfaces[i+1] = markerInterfaces[i].getName().replace('.', '/');
+ }
+ cw.visit(CLASSFILE_VERSION, ACC_SUPER,
+ lambdaClassName, null,
+ NAME_MAGIC_ACCESSOR_IMPL, interfaces);
// Generate final fields to be filled in by constructor
for (int i = 0; i < argTypes.length; i++) {
- FieldVisitor fv = cw.visitField(ACC_PRIVATE + ACC_FINAL, argNames[i], argTypes[i].getDescriptor(), null, null);
+ FieldVisitor fv = cw.visitField(ACC_PRIVATE + ACC_FINAL, argNames[i], argTypes[i].getDescriptor(),
+ null, null);
fv.visitEnd();
}
@@ -180,26 +201,24 @@
// Forward the SAM method
if (ma.getSamMethod() == null) {
- throw new LambdaConversionException(String.format("SAM method not found: %s", samMethodType));
+ throw new LambdaConversionException(String.format("Functional interface method not found: %s", samMethodType));
} else {
generateForwardingMethod(ma.getSamMethod(), false);
}
// Forward the bridges
- // @@@ Once the VM can do fail-over, uncomment the default method test
- if (!ma.getMethodsToBridge().isEmpty() /* && !ma.wasDefaultMethodFound() */) {
+ // @@@ The commented-out code is temporary, pending the VM's ability to bridge all methods on request
+ // @@@ Once the VM can do fail-over, uncomment the !ma.wasDefaultMethodFound() test, and emit the appropriate
+ // @@@ classfile attribute to request custom bridging. See 8002092.
+ if (!ma.getMethodsToBridge().isEmpty() /* && !ma.conflictFoundBetweenDefaultAndBridge() */ ) {
for (Method m : ma.getMethodsToBridge()) {
generateForwardingMethod(m, true);
}
}
- /***** Serialization not yet supported
if (isSerializable) {
- String samMethodName = samInfo.getName();
- Type samType = Type.getType(samBase);
- generateSerializationMethod(samType, samMethodName);
+ generateWriteReplace();
}
- ******/
cw.visitEnd();
@@ -212,7 +231,7 @@
try (FileOutputStream fos = new FileOutputStream(lambdaClassName.replace('/', '.') + ".class")) {
fos.write(classBytes);
} catch (IOException ex) {
- Logger.getLogger(InnerClassLambdaMetafactory.class.getName()).log(Level.SEVERE, null, ex);
+ PlatformLogger.getLogger(InnerClassLambdaMetafactory.class.getName()).severe(ex.getMessage(), ex);
}
***/
@@ -228,7 +247,8 @@
}
);
- return (Class<? extends T>) Unsafe.getUnsafe().defineClass(lambdaClassName, classBytes, 0, classBytes.length, loader, pd);
+ return (Class<?>) Unsafe.getUnsafe().defineClass(lambdaClassName, classBytes, 0, classBytes.length,
+ loader, pd);
}
/**
@@ -253,40 +273,44 @@
}
/**
- * Generate the serialization method (if needed)
+ * Generate the writeReplace method (if needed for serialization)
*/
- /****** This code is out of date -- known to be wrong -- and not currently used ******
- private void generateSerializationMethod(Type samType, String samMethodName) {
- String samMethodDesc = samMethodType.toMethodDescriptorString();
- TypeConvertingMethodAdapter mv = new TypeConvertingMethodAdapter(cw.visitMethod(ACC_PRIVATE + ACC_FINAL, NAME_METHOD_WRITE_REPLACE, DESCR_METHOD_WRITE_REPLACE, null, null));
+ private void generateWriteReplace() {
+ TypeConvertingMethodAdapter mv
+ = new TypeConvertingMethodAdapter(cw.visitMethod(ACC_PRIVATE + ACC_FINAL,
+ NAME_METHOD_WRITE_REPLACE, DESCR_METHOD_WRITE_REPLACE,
+ null, null));
mv.visitCode();
mv.visitTypeInsn(NEW, NAME_SERIALIZED_LAMBDA);
- mv.dup();
- mv.visitLdcInsn(samType);
- mv.visitLdcInsn(samMethodName);
- mv.visitLdcInsn(samMethodDesc);
- mv.visitLdcInsn(Type.getType(implDefiningClass));
- mv.visitLdcInsn(implMethodName);
- mv.visitLdcInsn(implMethodDesc);
+ mv.visitInsn(DUP);;
+ mv.visitLdcInsn(Type.getType(targetClass));
+ mv.visitLdcInsn(samInfo.getReferenceKind());
+ mv.visitLdcInsn(invokedType.returnType().getName().replace('.', '/'));
+ mv.visitLdcInsn(samInfo.getName());
+ mv.visitLdcInsn(samInfo.getMethodType().toMethodDescriptorString());
+ mv.visitLdcInsn(implInfo.getReferenceKind());
+ mv.visitLdcInsn(implInfo.getDeclaringClass().getName().replace('.', '/'));
+ mv.visitLdcInsn(implInfo.getName());
+ mv.visitLdcInsn(implInfo.getMethodType().toMethodDescriptorString());
+ mv.visitLdcInsn(instantiatedMethodType.toMethodDescriptorString());
mv.iconst(argTypes.length);
mv.visitTypeInsn(ANEWARRAY, NAME_OBJECT);
for (int i = 0; i < argTypes.length; i++) {
- mv.dup();
+ mv.visitInsn(DUP);
mv.iconst(i);
mv.visitVarInsn(ALOAD, 0);
- mv.getfield(lambdaClassName, argNames[i], argTypes[i].getDescriptor());
- mv.boxIfPrimitive(argTypes[i]);
+ mv.visitFieldInsn(GETFIELD, lambdaClassName, argNames[i], argTypes[i].getDescriptor());
+ mv.boxIfTypePrimitive(argTypes[i]);
mv.visitInsn(AASTORE);
}
- mv.invokespecial(NAME_SERIALIZED_LAMBDA, NAME_CTOR,
- "(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)V");
+ mv.visitMethodInsn(INVOKESPECIAL, NAME_SERIALIZED_LAMBDA, NAME_CTOR,
+ DESCR_CTOR_SERIALIZED_LAMBDA);
mv.visitInsn(ARETURN);
mv.visitMaxs(-1, -1); // Maxs computed by ClassWriter.COMPUTE_MAXS, these arguments ignored
mv.visitEnd();
}
- ********/
/**
* Generate a method which calls the lambda implementation method,
@@ -321,11 +345,11 @@
if (implKind == MethodHandleInfo.REF_newInvokeSpecial) {
visitTypeInsn(NEW, implMethodClassName);
- dup();
+ visitInsn(DUP);;
}
for (int i = 0; i < argTypes.length; i++) {
visitVarInsn(ALOAD, 0);
- getfield(lambdaClassName, argNames[i], argTypes[i].getDescriptor());
+ visitFieldInsn(GETFIELD, lambdaClassName, argNames[i], argTypes[i].getDescriptor());
}
convertArgumentTypes(Type.getArgumentTypes(m));
@@ -337,7 +361,7 @@
// Note: if adapting from non-void to void, the 'return' instruction will pop the unneeded result
Type samReturnType = Type.getReturnType(m);
convertType(implMethodReturnType, samReturnType, samReturnType);
- areturn(samReturnType);
+ visitInsn(samReturnType.getOpcode(Opcodes.IRETURN));
visitMaxs(-1, -1); // Maxs computed by ClassWriter.COMPUTE_MAXS, these arguments ignored
visitEnd();
@@ -352,7 +376,7 @@
Type rcvrType = samArgumentTypes[0];
Type instantiatedRcvrType = instantiatedArgumentTypes[0];
- load(lvIndex + 1, rcvrType);
+ visitVarInsn(rcvrType.getOpcode(ILOAD), lvIndex + 1);
lvIndex += rcvrType.getSize();
convertType(rcvrType, Type.getType(implDefiningClass), instantiatedRcvrType);
}
@@ -362,7 +386,7 @@
Type targetType = implMethodArgumentTypes[argOffset + i];
Type instantiatedArgType = instantiatedArgumentTypes[i];
- load(lvIndex + 1, argType);
+ visitVarInsn(argType.getOpcode(ILOAD), lvIndex + 1);
lvIndex += argType.getSize();
convertType(argType, targetType, instantiatedArgType);
}
@@ -388,45 +412,5 @@
throw new InternalError("Unexpected invocation kind: " + implKind);
}
}
-
- /**
- * The following methods are copied from
- * org.objectweb.asm.commons.InstructionAdapter. Part of ASM: a very
- * small and fast Java bytecode manipulation framework. Copyright (c)
- * 2000-2005 INRIA, France Telecom All rights reserved.
- *
- * Subclass with that (removing these methods) if that package/class is
- * ever added to the JDK.
- */
- private void iconst(final int cst) {
- if (cst >= -1 && cst <= 5) {
- mv.visitInsn(Opcodes.ICONST_0 + cst);
- } else if (cst >= Byte.MIN_VALUE && cst <= Byte.MAX_VALUE) {
- mv.visitIntInsn(Opcodes.BIPUSH, cst);
- } else if (cst >= Short.MIN_VALUE && cst <= Short.MAX_VALUE) {
- mv.visitIntInsn(Opcodes.SIPUSH, cst);
- } else {
- mv.visitLdcInsn(cst);
- }
- }
-
- private void load(final int var, final Type type) {
- mv.visitVarInsn(type.getOpcode(Opcodes.ILOAD), var);
- }
-
- private void dup() {
- mv.visitInsn(Opcodes.DUP);
- }
-
- private void areturn(final Type t) {
- mv.visitInsn(t.getOpcode(Opcodes.IRETURN));
- }
-
- private void getfield(
- final String owner,
- final String name,
- final String desc) {
- mv.visitFieldInsn(Opcodes.GETFIELD, owner, name, desc);
- }
}
}
--- a/jdk/src/share/classes/java/lang/invoke/LambdaMetafactory.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/lang/invoke/LambdaMetafactory.java Tue Mar 12 18:12:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, 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
@@ -42,14 +42,13 @@
* method, and the static types of the captured lambda arguments, and link a call site which, when invoked,
* produces the lambda object.
*
- * <p>Two pieces of information are needed about the functional interface: the SAM method and the type of the SAM
- * method in the functional interface. The type can be different when parameterized types are used. For example,
- * consider
- * <code>interface I<T> { int m(T x); }</code> if this SAM type is used in a lambda
- * <code>I<Byte> v = ...</code>, we need both the actual SAM method which has the signature
- * <code>(Object)int</code> and the functional interface type of the method, which has signature
- * <code>(Byte)int</code>. The latter is the instantiated erased functional interface method type, or
- * simply <I>instantiated method type</I>.
+ * <p>When parameterized types are used, the instantiated type of the functional interface method may be different
+ * from that in the functional interface. For example, consider
+ * <code>interface I<T> { int m(T x); }</code> if this functional interface type is used in a lambda
+ * <code>I<Byte> v = ...</code>, we need both the actual functional interface method which has the signature
+ * <code>(Object)int</code> and the erased instantiated type of the functional interface method (or simply
+ * <I>instantiated method type</I>), which has signature
+ * <code>(Byte)int</code>.
*
* <p>While functional interfaces only have a single abstract method from the language perspective (concrete
* methods in Object are and default methods may be present), at the bytecode level they may actually have multiple
@@ -138,11 +137,25 @@
* </tr>
* </table>
*
+ * The default bootstrap ({@link #metaFactory}) represents the common cases and uses an optimized protocol.
+ * Alternate bootstraps (e.g., {@link #altMetaFactory}) exist to support uncommon cases such as serialization
+ * or additional marker superinterfaces.
*
*/
public class LambdaMetafactory {
+ /** Flag for alternate metafactories indicating the lambda object is must to be serializable */
+ public static final int FLAG_SERIALIZABLE = 1 << 0;
+
/**
+ * Flag for alternate metafactories indicating the lambda object implements other marker interfaces
+ * besides Serializable
+ */
+ public static final int FLAG_MARKERS = 1 << 1;
+
+ private static final Class<?>[] EMPTY_CLASS_ARRAY = new Class<?>[0];
+
+/**
* Standard meta-factory for conversion of lambda expressions or method references to functional interfaces.
*
* @param caller Stacked automatically by VM; represents a lookup context with the accessibility privileges
@@ -158,7 +171,8 @@
* @param implMethod The implementation method which should be called (with suitable adaptation of argument
* types, return types, and adjustment for captured arguments) when methods of the resulting
* functional interface instance are invoked.
- * @param instantiatedMethodType The signature of the SAM method from the functional interface's perspective
+ * @param instantiatedMethodType The signature of the primary functional interface method after type variables
+ * are substituted with their instantiation from the capture site
* @return a CallSite, which, when invoked, will return an instance of the functional interface
* @throws ReflectiveOperationException
* @throws LambdaConversionException If any of the meta-factory protocol invariants are violated
@@ -171,7 +185,72 @@
MethodType instantiatedMethodType)
throws ReflectiveOperationException, LambdaConversionException {
AbstractValidatingLambdaMetafactory mf;
- mf = new InnerClassLambdaMetafactory(caller, invokedType, samMethod, implMethod, instantiatedMethodType);
+ mf = new InnerClassLambdaMetafactory(caller, invokedType, samMethod, implMethod, instantiatedMethodType,
+ 0, EMPTY_CLASS_ARRAY);
+ mf.validateMetafactoryArgs();
+ return mf.buildCallSite();
+ }
+
+ /**
+ * Alternate meta-factory for conversion of lambda expressions or method references to functional interfaces,
+ * which supports serialization and other uncommon options.
+ *
+ * The declared argument list for this method is:
+ *
+ * CallSite altMetaFactory(MethodHandles.Lookup caller,
+ * String invokedName,
+ * MethodType invokedType,
+ * Object... args)
+ *
+ * but it behaves as if the argument list is:
+ *
+ * CallSite altMetaFactory(MethodHandles.Lookup caller,
+ * String invokedName,
+ * MethodType invokedType,
+ * MethodHandle samMethod
+ * MethodHandle implMethod,
+ * MethodType instantiatedMethodType,
+ * int flags,
+ * int markerInterfaceCount, // IF flags has MARKERS set
+ * Class... markerInterfaces // IF flags has MARKERS set
+ * )
+ *
+ *
+ * @param caller Stacked automatically by VM; represents a lookup context with the accessibility privileges
+ * of the caller.
+ * @param invokedName Stacked automatically by VM; the name of the invoked method as it appears at the call site.
+ * Currently unused.
+ * @param invokedType Stacked automatically by VM; the signature of the invoked method, which includes thefu
+ * expected static type of the returned lambda object, and the static types of the captured
+ * arguments for the lambda. In the event that the implementation method is an instance method,
+ * the first argument in the invocation signature will correspond to the receiver.
+ * @param args argument to pass, flags, marker interface count, and marker interfaces as described above
+ * @return a CallSite, which, when invoked, will return an instance of the functional interface
+ * @throws ReflectiveOperationException
+ * @throws LambdaConversionException If any of the meta-factory protocol invariants are violated
+ */
+ public static CallSite altMetaFactory(MethodHandles.Lookup caller,
+ String invokedName,
+ MethodType invokedType,
+ Object... args)
+ throws ReflectiveOperationException, LambdaConversionException {
+ MethodHandle samMethod = (MethodHandle)args[0];
+ MethodHandle implMethod = (MethodHandle)args[1];
+ MethodType instantiatedMethodType = (MethodType)args[2];
+ int flags = (Integer) args[3];
+ Class<?>[] markerInterfaces;
+ int argIndex = 4;
+ if ((flags & FLAG_MARKERS) != 0) {
+ int markerCount = (Integer) args[argIndex++];
+ markerInterfaces = new Class<?>[markerCount];
+ System.arraycopy(args, argIndex, markerInterfaces, 0, markerCount);
+ argIndex += markerCount;
+ }
+ else
+ markerInterfaces = EMPTY_CLASS_ARRAY;
+ AbstractValidatingLambdaMetafactory mf;
+ mf = new InnerClassLambdaMetafactory(caller, invokedType, samMethod, implMethod, instantiatedMethodType,
+ flags, markerInterfaces);
mf.validateMetafactoryArgs();
return mf.buildCallSite();
}
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandle.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandle.java Tue Mar 12 18:12:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2013, 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
@@ -1250,8 +1250,6 @@
/*non-public*/
MethodHandle viewAsType(MethodType newType) {
// No actual conversions, just a new view of the same method.
- if (!type.isViewableAs(newType))
- throw new InternalError();
return MethodHandleImpl.makePairwiseConvert(this, newType, 0);
}
@@ -1268,6 +1266,11 @@
}
/*non-public*/
+ boolean isInvokeSpecial() {
+ return false; // DMH.Special returns true
+ }
+
+ /*non-public*/
Object internalValues() {
return null;
}
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java Tue Mar 12 18:12:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2013, 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
@@ -367,11 +367,11 @@
@Override
MethodHandle viewAsType(MethodType newType) {
- MethodHandle mh = super.viewAsType(newType);
+ if (newType.lastParameterType() != type().lastParameterType())
+ throw new InternalError();
+ MethodHandle newTarget = asFixedArity().viewAsType(newType);
// put back the varargs bit:
- MethodType type = mh.type();
- int arity = type.parameterCount();
- return mh.asVarargsCollector(type.parameterType(arity-1));
+ return new AsVarargsCollector(newTarget, newType, arrayType);
}
@Override
@@ -379,6 +379,12 @@
return asFixedArity().internalMemberName();
}
+ /*non-public*/
+ @Override
+ boolean isInvokeSpecial() {
+ return asFixedArity().isInvokeSpecial();
+ }
+
@Override
MethodHandle bindArgument(int pos, char basicType, Object value) {
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandleInfo.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandleInfo.java Tue Mar 12 18:12:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, 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
@@ -26,10 +26,12 @@
package java.lang.invoke;
import java.lang.invoke.MethodHandleNatives.Constants;
-//Not yet public: public
-class MethodHandleInfo {
+/**
+ * Cracking (reflecting) method handles back into their constituent symbolic parts.
+ *
+ */
+final class MethodHandleInfo {
public static final int
- REF_NONE = Constants.REF_NONE,
REF_getField = Constants.REF_getField,
REF_getStatic = Constants.REF_getStatic,
REF_putField = Constants.REF_putField,
@@ -45,12 +47,17 @@
private final MethodType methodType;
private final int referenceKind;
- public MethodHandleInfo(MethodHandle mh) throws ReflectiveOperationException {
+ public MethodHandleInfo(MethodHandle mh) {
MemberName mn = mh.internalMemberName();
+ if (mn == null) throw new IllegalArgumentException("not a direct method handle");
this.declaringClass = mn.getDeclaringClass();
this.name = mn.getName();
- this.methodType = mn.getMethodType();
- this.referenceKind = mn.getReferenceKind();
+ this.methodType = mn.getMethodOrFieldType();
+ byte refKind = mn.getReferenceKind();
+ if (refKind == REF_invokeSpecial && !mh.isInvokeSpecial())
+ // Devirtualized method invocation is usually formally virtual.
+ refKind = REF_invokeVirtual;
+ this.referenceKind = refKind;
}
public Class<?> getDeclaringClass() {
@@ -65,7 +72,32 @@
return methodType;
}
+ public int getModifiers() {
+ return -1; //TODO
+ }
+
public int getReferenceKind() {
return referenceKind;
}
+
+ static String getReferenceKindString(int referenceKind) {
+ switch (referenceKind) {
+ case REF_getField: return "getfield";
+ case REF_getStatic: return "getstatic";
+ case REF_putField: return "putfield";
+ case REF_putStatic: return "putstatic";
+ case REF_invokeVirtual: return "invokevirtual";
+ case REF_invokeStatic: return "invokestatic";
+ case REF_invokeSpecial: return "invokespecial";
+ case REF_newInvokeSpecial: return "newinvokespecial";
+ case REF_invokeInterface: return "invokeinterface";
+ default: return "UNKNOWN_REFENCE_KIND" + "[" + referenceKind + "]";
+ }
+ }
+
+ @Override
+ public String toString() {
+ return String.format("%s %s.%s:%s", getReferenceKindString(referenceKind),
+ declaringClass.getName(), name, methodType);
+ }
}
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandles.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandles.java Tue Mar 12 18:12:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2013, 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
@@ -1209,7 +1209,7 @@
checkMethod(refKind, refc, method);
if (method.isMethodHandleInvoke())
return fakeMethodHandleInvoke(method);
- MethodHandle mh = DirectMethodHandle.make(refc, method);
+ MethodHandle mh = DirectMethodHandle.make(refKind, refc, method);
mh = maybeBindCaller(method, mh);
mh = mh.setVarargs(method);
if (doRestrict)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/lang/invoke/SerializedLambda.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,197 @@
+/*
+ * Copyright (c) 2012, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package java.lang.invoke;
+
+import java.io.Serializable;
+import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.Objects;
+
+/**
+ * Serialized form of a lambda expression. The properties of this class represent the information that is present
+ * at the lambda factory site, including the identity of the primary functional interface method, the identity of the
+ * implementation method, and any variables captured from the local environment at the time of lambda capture.
+ *
+ * @see LambdaMetafactory
+ */
+public final class SerializedLambda implements Serializable {
+ private static final long serialVersionUID = 8025925345765570181L;
+ private final Class<?> capturingClass;
+ private final String functionalInterfaceClass;
+ private final String functionalInterfaceMethodName;
+ private final String functionalInterfaceMethodSignature;
+ private final int functionalInterfaceMethodKind;
+ private final String implClass;
+ private final String implMethodName;
+ private final String implMethodSignature;
+ private final int implMethodKind;
+ private final String instantiatedMethodType;
+ private final Object[] capturedArgs;
+
+ /**
+ * Create a {@code SerializedLambda} from the low-level information present at the lambda factory site.
+ *
+ * @param capturingClass The class in which the lambda expression appears
+ * @param functionalInterfaceMethodKind Method handle kind (see {@link MethodHandleInfo}) for the
+ * functional interface method handle present at the lambda factory site
+ * @param functionalInterfaceClass Name, in slash-delimited form, for the functional interface class present at the
+ * lambda factory site
+ * @param functionalInterfaceMethodName Name of the primary method for the functional interface present at the
+ * lambda factory site
+ * @param functionalInterfaceMethodSignature Signature of the primary method for the functional interface present
+ * at the lambda factory site
+ * @param implMethodKind Method handle kind for the implementation method
+ * @param implClass Name, in slash-delimited form, for the class holding the implementation method
+ * @param implMethodName Name of the implementation method
+ * @param implMethodSignature Signature of the implementation method
+ * @param instantiatedMethodType The signature of the primary functional interface method after type variables
+ * are substituted with their instantiation from the capture site
+ * @param capturedArgs The dynamic arguments to the lambda factory site, which represent variables captured by
+ * the lambda
+ */
+ public SerializedLambda(Class<?> capturingClass,
+ int functionalInterfaceMethodKind,
+ String functionalInterfaceClass,
+ String functionalInterfaceMethodName,
+ String functionalInterfaceMethodSignature,
+ int implMethodKind,
+ String implClass,
+ String implMethodName,
+ String implMethodSignature,
+ String instantiatedMethodType,
+ Object[] capturedArgs) {
+ this.capturingClass = capturingClass;
+ this.functionalInterfaceMethodKind = functionalInterfaceMethodKind;
+ this.functionalInterfaceClass = functionalInterfaceClass;
+ this.functionalInterfaceMethodName = functionalInterfaceMethodName;
+ this.functionalInterfaceMethodSignature = functionalInterfaceMethodSignature;
+ this.implMethodKind = implMethodKind;
+ this.implClass = implClass;
+ this.implMethodName = implMethodName;
+ this.implMethodSignature = implMethodSignature;
+ this.instantiatedMethodType = instantiatedMethodType;
+ this.capturedArgs = Objects.requireNonNull(capturedArgs).clone();
+ }
+
+ /** Get the name of the class that captured this lambda */
+ public String getCapturingClass() {
+ return capturingClass.getName().replace('.', '/');
+ }
+
+ /** Get the name of the functional interface class to which this lambda has been converted */
+ public String getFunctionalInterfaceClass() {
+ return functionalInterfaceClass;
+ }
+
+ /** Get the name of the primary method for the functional interface to which this lambda has been converted */
+ public String getFunctionalInterfaceMethodName() {
+ return functionalInterfaceMethodName;
+ }
+
+ /** Get the signature of the primary method for the functional interface to which this lambda has been converted */
+ public String getFunctionalInterfaceMethodSignature() {
+ return functionalInterfaceMethodSignature;
+ }
+
+ /** Get the method handle kind (see {@link MethodHandleInfo}) of the primary method for the functional interface
+ * to which this lambda has been converted */
+ public int getFunctionalInterfaceMethodKind() {
+ return functionalInterfaceMethodKind;
+ }
+
+ /** Get the name of the class containing the implementation method */
+ public String getImplClass() {
+ return implClass;
+ }
+
+ /** Get the name of the implementation method */
+ public String getImplMethodName() {
+ return implMethodName;
+ }
+
+ /** Get the signature of the implementation method */
+ public String getImplMethodSignature() {
+ return implMethodSignature;
+ }
+
+ /** Get the method handle kind (see {@link MethodHandleInfo}) of the implementation method */
+ public int getImplMethodKind() {
+ return implMethodKind;
+ }
+
+ /**
+ * Get the signature of the primary functional interface method after type variables are substituted with
+ * their instantiation from the capture site
+ */
+ public final String getInstantiatedMethodType() {
+ return instantiatedMethodType;
+ }
+
+ /** Get the count of dynamic arguments to the lambda capture site */
+ public int getCapturedArgCount() {
+ return capturedArgs.length;
+ }
+
+ /** Get a dynamic argument to the lambda capture site */
+ public Object getCapturedArg(int i) {
+ return capturedArgs[i];
+ }
+
+ private Object readResolve() throws ReflectiveOperationException {
+ try {
+ Method deserialize = AccessController.doPrivileged(new PrivilegedExceptionAction<Method>() {
+ @Override
+ public Method run() throws Exception {
+ Method m = capturingClass.getDeclaredMethod("$deserializeLambda$", SerializedLambda.class);
+ m.setAccessible(true);
+ return m;
+ }
+ });
+
+ return deserialize.invoke(null, this);
+ }
+ catch (PrivilegedActionException e) {
+ Exception cause = e.getException();
+ if (cause instanceof ReflectiveOperationException)
+ throw (ReflectiveOperationException) cause;
+ else if (cause instanceof RuntimeException)
+ throw (RuntimeException) cause;
+ else
+ throw new RuntimeException("Exception in SerializedLambda.readResolve", e);
+ }
+ }
+
+ @Override
+ public String toString() {
+ return String.format("SerializedLambda[capturingClass=%s, functionalInterfaceMethod=%s %s.%s:%s, " +
+ "implementation=%s %s.%s:%s, instantiatedMethodType=%s, numCaptured=%d]",
+ capturingClass, MethodHandleInfo.getReferenceKindString(functionalInterfaceMethodKind),
+ functionalInterfaceClass, functionalInterfaceMethodName, functionalInterfaceMethodSignature,
+ MethodHandleInfo.getReferenceKindString(implMethodKind), implClass, implMethodName,
+ implMethodSignature, instantiatedMethodType, capturedArgs.length);
+ }
+}
--- a/jdk/src/share/classes/java/lang/invoke/TypeConvertingMethodAdapter.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/lang/invoke/TypeConvertingMethodAdapter.java Tue Mar 12 18:12:44 2013 -0700
@@ -27,6 +27,7 @@
import jdk.internal.org.objectweb.asm.MethodVisitor;
import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.internal.org.objectweb.asm.Type;
import sun.invoke.util.Wrapper;
import static sun.invoke.util.Wrapper.*;
@@ -49,6 +50,9 @@
private static final Wrapper[] FROM_WRAPPER_NAME = new Wrapper[16];
+ // Table of wrappers for primitives, indexed by ASM type sorts
+ private static final Wrapper[] FROM_TYPE_SORT = new Wrapper[16];
+
static {
for (Wrapper w : Wrapper.values()) {
if (w.basicTypeChar() != 'L') {
@@ -71,6 +75,15 @@
initWidening(DOUBLE, Opcodes.I2D, BYTE, SHORT, INT, CHAR);
initWidening(DOUBLE, Opcodes.F2D, FLOAT);
initWidening(DOUBLE, Opcodes.L2D, LONG);
+
+ FROM_TYPE_SORT[Type.BYTE] = Wrapper.BYTE;
+ FROM_TYPE_SORT[Type.SHORT] = Wrapper.SHORT;
+ FROM_TYPE_SORT[Type.INT] = Wrapper.INT;
+ FROM_TYPE_SORT[Type.LONG] = Wrapper.LONG;
+ FROM_TYPE_SORT[Type.CHAR] = Wrapper.CHAR;
+ FROM_TYPE_SORT[Type.FLOAT] = Wrapper.FLOAT;
+ FROM_TYPE_SORT[Type.DOUBLE] = Wrapper.DOUBLE;
+ FROM_TYPE_SORT[Type.BOOLEAN] = Wrapper.BOOLEAN;
}
private static void initWidening(Wrapper to, int opcode, Wrapper... from) {
@@ -124,8 +137,9 @@
return "()" + w.basicTypeChar();
}
- void boxIfPrimitive(Wrapper w) {
- if (w.zero() != null) {
+ void boxIfTypePrimitive(Type t) {
+ Wrapper w = FROM_TYPE_SORT[t.getSort()];
+ if (w != null) {
box(w);
}
}
@@ -264,4 +278,22 @@
}
}
}
+
+ /**
+ * The following method is copied from
+ * org.objectweb.asm.commons.InstructionAdapter. Part of ASM: a very small
+ * and fast Java bytecode manipulation framework.
+ * Copyright (c) 2000-2005 INRIA, France Telecom All rights reserved.
+ */
+ void iconst(final int cst) {
+ if (cst >= -1 && cst <= 5) {
+ mv.visitInsn(Opcodes.ICONST_0 + cst);
+ } else if (cst >= Byte.MIN_VALUE && cst <= Byte.MAX_VALUE) {
+ mv.visitIntInsn(Opcodes.BIPUSH, cst);
+ } else if (cst >= Short.MIN_VALUE && cst <= Short.MAX_VALUE) {
+ mv.visitIntInsn(Opcodes.SIPUSH, cst);
+ } else {
+ mv.visitLdcInsn(cst);
+ }
+ }
}
--- a/jdk/src/share/classes/java/lang/reflect/AccessibleObject.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/lang/reflect/AccessibleObject.java Tue Mar 12 18:12:44 2013 -0700
@@ -181,6 +181,16 @@
}
/**
+ * {@inheritDoc}
+ * @throws NullPointerException {@inheritDoc}
+ * @since 1.5
+ */
+ @Override
+ public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass) {
+ return AnnotatedElement.super.isAnnotationPresent(annotationClass);
+ }
+
+ /**
* @throws NullPointerException {@inheritDoc}
* @since 1.8
*/
--- a/jdk/src/share/classes/java/lang/reflect/AnnotatedElement.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/lang/reflect/AnnotatedElement.java Tue Mar 12 18:12:44 2013 -0700
@@ -26,6 +26,7 @@
package java.lang.reflect;
import java.lang.annotation.Annotation;
+import java.lang.annotation.AnnotationFormatError;
/**
* Represents an annotated element of the program currently running in this
@@ -86,8 +87,8 @@
*
* <p>Attempting to read annotations of a repeatable annotation type T
* that are contained in an annotation whose type is not, in fact, the
- * containing annotation type of T will result in an
- * InvalidContainerAnnotationError.
+ * containing annotation type of T, will result in an {@link
+ * AnnotationFormatError}.
*
* <p>Finally, attempting to read a member whose definition has evolved
* incompatibly will result in a {@link
@@ -96,10 +97,9 @@
*
* @see java.lang.EnumConstantNotPresentException
* @see java.lang.TypeNotPresentException
- * @see java.lang.annotation.AnnotationFormatError
+ * @see AnnotationFormatError
* @see java.lang.annotation.AnnotationTypeMismatchException
* @see java.lang.annotation.IncompleteAnnotationException
- * @see java.lang.annotation.InvalidContainerAnnotationError
* @since 1.5
* @author Josh Bloch
*/
--- a/jdk/src/share/classes/java/lang/reflect/Constructor.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/lang/reflect/Constructor.java Tue Mar 12 18:12:44 2013 -0700
@@ -532,6 +532,7 @@
* {@inheritDoc}
* @since 1.8
*/
+ @Override
public AnnotatedType getAnnotatedReturnType() {
return getAnnotatedReturnType0(getDeclaringClass());
}
--- a/jdk/src/share/classes/java/lang/reflect/Executable.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/lang/reflect/Executable.java Tue Mar 12 18:12:44 2013 -0700
@@ -476,6 +476,20 @@
return declaredAnnotations;
}
+ /**
+ * Returns an AnnotatedType object that represents the potentially
+ * annotated return type of the method/constructor represented by this
+ * Executable.
+ *
+ * If this Executable represents a constructor, the AnnotatedType object
+ * represents the type of the constructed object.
+ *
+ * If this Executable represents a method, the AnnotatedType object
+ * represents the use of a type to specify the return type of the method.
+ *
+ * @since 1.8
+ */
+ public abstract AnnotatedType getAnnotatedReturnType();
/* Helper for subclasses of Executable.
*
--- a/jdk/src/share/classes/java/lang/reflect/Method.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/lang/reflect/Method.java Tue Mar 12 18:12:44 2013 -0700
@@ -629,6 +629,7 @@
* {@inheritDoc}
* @since 1.8
*/
+ @Override
public AnnotatedType getAnnotatedReturnType() {
return getAnnotatedReturnType0(getGenericReturnType());
}
--- a/jdk/src/share/classes/java/lang/reflect/Parameter.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/lang/reflect/Parameter.java Tue Mar 12 18:12:44 2013 -0700
@@ -115,7 +115,9 @@
(type.toString());
sb.append(Modifier.toString(getModifiers()));
- sb.append(" ");
+
+ if(0 != modifiers)
+ sb.append(" ");
if(isVarArgs())
sb.append(typename.replaceFirst("\\[\\]$", "..."));
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/net/HttpConnectSocketImpl.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,210 @@
+/*
+ * Copyright (c) 2010, 2013, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package java.net;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Basic SocketImpl that relies on the internal HTTP protocol handler
+ * implementation to perform the HTTP tunneling and authentication. The
+ * sockets impl is swapped out and replaced with the socket from the HTTP
+ * handler after the tunnel is successfully setup.
+ *
+ * @since 1.8
+ */
+
+/*package*/ class HttpConnectSocketImpl extends PlainSocketImpl {
+
+ private static final String httpURLClazzStr =
+ "sun.net.www.protocol.http.HttpURLConnection";
+ private static final String netClientClazzStr = "sun.net.NetworkClient";
+ private static final String doTunnelingStr = "doTunneling";
+ private static final Field httpField;
+ private static final Field serverSocketField;
+ private static final Method doTunneling;
+
+ private final String server;
+ private InetSocketAddress external_address;
+ private HashMap<Integer, Object> optionsMap = new HashMap<>();
+
+ static {
+ try {
+ Class<?> httpClazz = Class.forName(httpURLClazzStr, true, null);
+ httpField = httpClazz.getDeclaredField("http");
+ doTunneling = httpClazz.getDeclaredMethod(doTunnelingStr);
+ Class<?> netClientClazz = Class.forName(netClientClazzStr, true, null);
+ serverSocketField = netClientClazz.getDeclaredField("serverSocket");
+
+ java.security.AccessController.doPrivileged(
+ new java.security.PrivilegedAction<Void>() {
+ public Void run() {
+ httpField.setAccessible(true);
+ serverSocketField.setAccessible(true);
+ return null;
+ }
+ });
+ } catch (ReflectiveOperationException x) {
+ throw new InternalError("Should not reach here", x);
+ }
+ }
+
+ HttpConnectSocketImpl(String server, int port) {
+ this.server = server;
+ this.port = port;
+ }
+
+ HttpConnectSocketImpl(Proxy proxy) {
+ SocketAddress a = proxy.address();
+ if ( !(a instanceof InetSocketAddress) )
+ throw new IllegalArgumentException("Unsupported address type");
+
+ InetSocketAddress ad = (InetSocketAddress) a;
+ server = ad.getHostString();
+ port = ad.getPort();
+ }
+
+ @Override
+ protected void connect(SocketAddress endpoint, int timeout)
+ throws IOException
+ {
+ if (endpoint == null || !(endpoint instanceof InetSocketAddress))
+ throw new IllegalArgumentException("Unsupported address type");
+ final InetSocketAddress epoint = (InetSocketAddress)endpoint;
+ final String destHost = epoint.isUnresolved() ? epoint.getHostName()
+ : epoint.getAddress().getHostAddress();
+ final int destPort = epoint.getPort();
+
+ SecurityManager security = System.getSecurityManager();
+ if (security != null)
+ security.checkConnect(destHost, destPort);
+
+ // Connect to the HTTP proxy server
+ String urlString = "http://" + destHost + ":" + destPort;
+ Socket httpSocket = privilegedDoTunnel(urlString, timeout);
+
+ // Success!
+ external_address = epoint;
+
+ // close the original socket impl and release its descriptor
+ close();
+
+ // update the Sockets impl to the impl from the http Socket
+ AbstractPlainSocketImpl psi = (AbstractPlainSocketImpl) httpSocket.impl;
+ this.getSocket().impl = psi;
+
+ // best effort is made to try and reset options previously set
+ Set<Map.Entry<Integer,Object>> options = optionsMap.entrySet();
+ try {
+ for(Map.Entry<Integer,Object> entry : options) {
+ psi.setOption(entry.getKey(), entry.getValue());
+ }
+ } catch (IOException x) { /* gulp! */ }
+ }
+
+ @Override
+ public void setOption(int opt, Object val) throws SocketException {
+ super.setOption(opt, val);
+
+ if (external_address != null)
+ return; // we're connected, just return
+
+ // store options so that they can be re-applied to the impl after connect
+ optionsMap.put(opt, val);
+ }
+
+ private Socket privilegedDoTunnel(final String urlString,
+ final int timeout)
+ throws IOException
+ {
+ try {
+ return java.security.AccessController.doPrivileged(
+ new java.security.PrivilegedExceptionAction<Socket>() {
+ public Socket run() throws IOException {
+ return doTunnel(urlString, timeout);
+ }
+ });
+ } catch (java.security.PrivilegedActionException pae) {
+ throw (IOException) pae.getException();
+ }
+ }
+
+ private Socket doTunnel(String urlString, int connectTimeout)
+ throws IOException
+ {
+ Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(server, port));
+ URL destURL = new URL(urlString);
+ HttpURLConnection conn = (HttpURLConnection) destURL.openConnection(proxy);
+ conn.setConnectTimeout(connectTimeout);
+ conn.setReadTimeout(this.timeout);
+ conn.connect();
+ doTunneling(conn);
+ try {
+ Object httpClient = httpField.get(conn);
+ return (Socket) serverSocketField.get(httpClient);
+ } catch (IllegalAccessException x) {
+ throw new InternalError("Should not reach here", x);
+ }
+ }
+
+ private void doTunneling(HttpURLConnection conn) {
+ try {
+ doTunneling.invoke(conn);
+ } catch (ReflectiveOperationException x) {
+ throw new InternalError("Should not reach here", x);
+ }
+ }
+
+ @Override
+ protected InetAddress getInetAddress() {
+ if (external_address != null)
+ return external_address.getAddress();
+ else
+ return super.getInetAddress();
+ }
+
+ @Override
+ protected int getPort() {
+ if (external_address != null)
+ return external_address.getPort();
+ else
+ return super.getPort();
+ }
+
+ @Override
+ protected int getLocalPort() {
+ if (socket != null)
+ return super.getLocalPort();
+ if (external_address != null)
+ return external_address.getPort();
+ else
+ return super.getLocalPort();
+ }
+}
--- a/jdk/src/share/classes/java/net/Socket.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/net/Socket.java Tue Mar 12 18:12:44 2013 -0700
@@ -117,8 +117,10 @@
if (proxy == null) {
throw new IllegalArgumentException("Invalid Proxy");
}
- Proxy p = proxy == Proxy.NO_PROXY ? Proxy.NO_PROXY : sun.net.ApplicationProxy.create(proxy);
- if (p.type() == Proxy.Type.SOCKS) {
+ Proxy p = proxy == Proxy.NO_PROXY ? Proxy.NO_PROXY
+ : sun.net.ApplicationProxy.create(proxy);
+ Proxy.Type type = p.type();
+ if (type == Proxy.Type.SOCKS || type == Proxy.Type.HTTP) {
SecurityManager security = System.getSecurityManager();
InetSocketAddress epoint = (InetSocketAddress) p.address();
if (epoint.getAddress() != null) {
@@ -133,7 +135,8 @@
security.checkConnect(epoint.getAddress().getHostAddress(),
epoint.getPort());
}
- impl = new SocksSocketImpl(p);
+ impl = type == Proxy.Type.SOCKS ? new SocksSocketImpl(p)
+ : new HttpConnectSocketImpl(p);
impl.setSocket(this);
} else {
if (p == Proxy.NO_PROXY) {
--- a/jdk/src/share/classes/java/net/URL.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/net/URL.java Tue Mar 12 18:12:44 2013 -0700
@@ -661,8 +661,8 @@
* @param file the file on the host
* @param ref the internal reference in the URL
*/
- protected void set(String protocol, String host,
- int port, String file, String ref) {
+ void set(String protocol, String host, int port,
+ String file, String ref) {
synchronized (this) {
this.protocol = protocol;
this.host = host;
@@ -698,9 +698,9 @@
* @param query the query part of this URL
* @since 1.3
*/
- protected void set(String protocol, String host, int port,
- String authority, String userInfo, String path,
- String query, String ref) {
+ void set(String protocol, String host, int port,
+ String authority, String userInfo, String path,
+ String query, String ref) {
synchronized (this) {
this.protocol = protocol;
this.host = host;
--- a/jdk/src/share/classes/java/net/URLStreamHandler.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/net/URLStreamHandler.java Tue Mar 12 18:12:44 2013 -0700
@@ -509,8 +509,8 @@
/**
* Sets the fields of the <code>URL</code> argument to the indicated values.
- * Only classes derived from URLStreamHandler are supposed to be able
- * to call the set method on a URL.
+ * Only classes derived from URLStreamHandler are able
+ * to use this method to set the values of the URL fields.
*
* @param u the URL to modify.
* @param protocol the protocol name.
@@ -539,8 +539,8 @@
/**
* Sets the fields of the <code>URL</code> argument to the indicated values.
- * Only classes derived from URLStreamHandler are supposed to be able
- * to call the set method on a URL.
+ * Only classes derived from URLStreamHandler are able
+ * to use this method to set the values of the URL fields.
*
* @param u the URL to modify.
* @param protocol the protocol name. This value is ignored since 1.2.
--- a/jdk/src/share/classes/java/nio/file/Files.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/nio/file/Files.java Tue Mar 12 18:12:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, 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
@@ -1152,7 +1152,7 @@
* and file system dependent and therefore unspecified. Minimally, the
* {@link BasicFileAttributes#lastModifiedTime last-modified-time} is
* copied to the target file if supported by both the source and target
- * file store. Copying of file timestamps may result in precision
+ * file stores. Copying of file timestamps may result in precision
* loss. </td>
* </tr>
* <tr>
@@ -1169,12 +1169,12 @@
* implementation specific options.
*
* <p> Copying a file is not an atomic operation. If an {@link IOException}
- * is thrown then it possible that the target file is incomplete or some of
- * its file attributes have not been copied from the source file. When the
- * {@code REPLACE_EXISTING} option is specified and the target file exists,
- * then the target file is replaced. The check for the existence of the file
- * and the creation of the new file may not be atomic with respect to other
- * file system activities.
+ * is thrown, then it is possible that the target file is incomplete or some
+ * of its file attributes have not been copied from the source file. When
+ * the {@code REPLACE_EXISTING} option is specified and the target file
+ * exists, then the target file is replaced. The check for the existence of
+ * the file and the creation of the new file may not be atomic with respect
+ * to other file system activities.
*
* <p> <b>Usage Example:</b>
* Suppose we want to copy a file into a directory, giving it the same file
@@ -1279,15 +1279,16 @@
* <p> An implementation of this interface may support additional
* implementation specific options.
*
- * <p> Where the move requires that the file be copied then the {@link
- * BasicFileAttributes#lastModifiedTime last-modified-time} is copied to the
- * new file. An implementation may also attempt to copy other file
- * attributes but is not required to fail if the file attributes cannot be
- * copied. When the move is performed as a non-atomic operation, and a {@code
- * IOException} is thrown, then the state of the files is not defined. The
- * original file and the target file may both exist, the target file may be
- * incomplete or some of its file attributes may not been copied from the
- * original file.
+ * <p> Moving a file will copy the {@link
+ * BasicFileAttributes#lastModifiedTime last-modified-time} to the target
+ * file if supported by both source and target file stores. Copying of file
+ * timestamps may result in precision loss. An implementation may also
+ * attempt to copy other file attributes but is not required to fail if the
+ * file attributes cannot be copied. When the move is performed as
+ * a non-atomic operation, and an {@code IOException} is thrown, then the
+ * state of the files is not defined. The original file and the target file
+ * may both exist, the target file may be incomplete or some of its file
+ * attributes may not been copied from the original file.
*
* <p> <b>Usage Examples:</b>
* Suppose we want to rename a file to "newname", keeping the file in the
--- a/jdk/src/share/classes/java/sql/CallableStatement.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/sql/CallableStatement.java Tue Mar 12 18:12:44 2013 -0700
@@ -2621,7 +2621,7 @@
* parameter determines the Java type that must be used
* in the {@code get} method to read the value of that parameter.
* <p>
- * This version of {@code registrOutParameter} should be
+ * This version of {@code registerOutParameter} should be
* used when the parameter is of JDBC type {@code JDBCType.NUMERIC}
* or {@code JDBCType.DECIMAL}.
*<P>
@@ -2649,7 +2649,7 @@
/**
* Registers the designated output parameter.
* This version of
- * the method {@code registrOutParameter}
+ * the method {@code registerOutParameter}
* should be used for a user-defined or {@code REF} output parameter.
* Examples
* of user-defined types include: {@code STRUCT}, {@code DISTINCT},
@@ -2717,7 +2717,7 @@
* register the OUT Parameter.
* If the parameter is of JDBC type {@code JDBCType.NUMERIC}
* or {@code JDBCType.DECIMAL}, the version of
- * {@code registrOutParameter} that accepts a scale value
+ * {@code registerOutParameter} that accepts a scale value
* should be used.
* @exception SQLException if parameterName does not correspond to a named
* parameter; if a database access error occurs or
@@ -2745,7 +2745,7 @@
* parameter determines the Java type that must be used
* in the {@code get} method to read the value of that parameter.
* <p>
- * This version of {@code registrOutParameter} should be
+ * This version of {@code registerOutParameter} should be
* used when the parameter is of JDBC type {@code JDBCType.NUMERIC}
* or {@code JDBCType.DECIMAL}.
*<P>
@@ -2774,7 +2774,7 @@
/**
* Registers the designated output parameter. This version of
- * the method {@code registrOutParameter}
+ * the method {@code registerOutParameter}
* should be used for a user-named or REF output parameter. Examples
* of user-named types include: STRUCT, DISTINCT, JAVA_OBJECT, and
* named array types.
--- a/jdk/src/share/classes/java/text/DateFormat.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/text/DateFormat.java Tue Mar 12 18:12:44 2013 -0700
@@ -439,7 +439,12 @@
/**
* Gets the time formatter with the default formatting style
- * for the default locale.
+ * for the default {@link java.util.Locale.Category#FORMAT FORMAT} locale.
+ * <p>This is equivalent to calling
+ * {@link #getTimeInstance(int, Locale) getTimeInstance(DEFAULT,
+ * Locale.getDefault(Locale.Category.FORMAT))}.
+ * @see java.util.Locale#getDefault(java.util.Locale.Category)
+ * @see java.util.Locale.Category#FORMAT
* @return a time formatter.
*/
public final static DateFormat getTimeInstance()
@@ -449,7 +454,12 @@
/**
* Gets the time formatter with the given formatting style
- * for the default locale.
+ * for the default {@link java.util.Locale.Category#FORMAT FORMAT} locale.
+ * <p>This is equivalent to calling
+ * {@link #getTimeInstance(int, Locale) getTimeInstance(style,
+ * Locale.getDefault(Locale.Category.FORMAT))}.
+ * @see java.util.Locale#getDefault(java.util.Locale.Category)
+ * @see java.util.Locale.Category#FORMAT
* @param style the given formatting style. For example,
* SHORT for "h:mm a" in the US locale.
* @return a time formatter.
@@ -475,7 +485,12 @@
/**
* Gets the date formatter with the default formatting style
- * for the default locale.
+ * for the default {@link java.util.Locale.Category#FORMAT FORMAT} locale.
+ * <p>This is equivalent to calling
+ * {@link #getDateInstance(int, Locale) getDateInstance(DEFAULT,
+ * Locale.getDefault(Locale.Category.FORMAT))}.
+ * @see java.util.Locale#getDefault(java.util.Locale.Category)
+ * @see java.util.Locale.Category#FORMAT
* @return a date formatter.
*/
public final static DateFormat getDateInstance()
@@ -485,7 +500,12 @@
/**
* Gets the date formatter with the given formatting style
- * for the default locale.
+ * for the default {@link java.util.Locale.Category#FORMAT FORMAT} locale.
+ * <p>This is equivalent to calling
+ * {@link #getDateInstance(int, Locale) getDateInstance(style,
+ * Locale.getDefault(Locale.Category.FORMAT))}.
+ * @see java.util.Locale#getDefault(java.util.Locale.Category)
+ * @see java.util.Locale.Category#FORMAT
* @param style the given formatting style. For example,
* SHORT for "M/d/yy" in the US locale.
* @return a date formatter.
@@ -511,7 +531,12 @@
/**
* Gets the date/time formatter with the default formatting style
- * for the default locale.
+ * for the default {@link java.util.Locale.Category#FORMAT FORMAT} locale.
+ * <p>This is equivalent to calling
+ * {@link #getDateTimeInstance(int, int, Locale) getDateTimeInstance(DEFAULT,
+ * DEFAULT, Locale.getDefault(Locale.Category.FORMAT))}.
+ * @see java.util.Locale#getDefault(java.util.Locale.Category)
+ * @see java.util.Locale.Category#FORMAT
* @return a date/time formatter.
*/
public final static DateFormat getDateTimeInstance()
@@ -521,7 +546,12 @@
/**
* Gets the date/time formatter with the given date and time
- * formatting styles for the default locale.
+ * formatting styles for the default {@link java.util.Locale.Category#FORMAT FORMAT} locale.
+ * <p>This is equivalent to calling
+ * {@link #getDateTimeInstance(int, int, Locale) getDateTimeInstance(dateStyle,
+ * timeStyle, Locale.getDefault(Locale.Category.FORMAT))}.
+ * @see java.util.Locale#getDefault(java.util.Locale.Category)
+ * @see java.util.Locale.Category#FORMAT
* @param dateStyle the given date formatting style. For example,
* SHORT for "M/d/yy" in the US locale.
* @param timeStyle the given time formatting style. For example,
--- a/jdk/src/share/classes/java/text/DateFormatSymbols.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/text/DateFormatSymbols.java Tue Mar 12 18:12:44 2013 -0700
@@ -104,14 +104,19 @@
/**
* Construct a DateFormatSymbols object by loading format data from
- * resources for the default locale. This constructor can only
+ * resources for the default {@link java.util.Locale.Category#FORMAT FORMAT}
+ * locale. This constructor can only
* construct instances for the locales supported by the Java
* runtime environment, not for those supported by installed
* {@link java.text.spi.DateFormatSymbolsProvider DateFormatSymbolsProvider}
* implementations. For full locale coverage, use the
* {@link #getInstance(Locale) getInstance} method.
- *
+ * <p>This is equivalent to calling
+ * {@link #DateFormatSymbols(Locale)
+ * DateFormatSymbols(Locale.getDefault(Locale.Category.FORMAT))}.
* @see #getInstance()
+ * @see java.util.Locale#getDefault(java.util.Locale.Category)
+ * @see java.util.Locale.Category#FORMAT
* @exception java.util.MissingResourceException
* if the resources for the default locale cannot be
* found or cannot be loaded.
@@ -302,6 +307,10 @@
* as for those supported by installed
* {@link java.text.spi.DateFormatSymbolsProvider DateFormatSymbolsProvider}
* implementations.
+ * <p>This is equivalent to calling {@link #getInstance(Locale)
+ * getInstance(Locale.getDefault(Locale.Category.FORMAT))}.
+ * @see java.util.Locale#getDefault(java.util.Locale.Category)
+ * @see java.util.Locale.Category#FORMAT
* @return a <code>DateFormatSymbols</code> instance.
* @since 1.6
*/
--- a/jdk/src/share/classes/java/text/DecimalFormat.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/text/DecimalFormat.java Tue Mar 12 18:12:44 2013 -0700
@@ -381,7 +381,8 @@
/**
* Creates a DecimalFormat using the default pattern and symbols
- * for the default locale. This is a convenient way to obtain a
+ * for the default {@link java.util.Locale.Category#FORMAT FORMAT} locale.
+ * This is a convenient way to obtain a
* DecimalFormat when internationalization is not the main concern.
* <p>
* To obtain standard formats for a given locale, use the factory methods
@@ -411,7 +412,8 @@
/**
* Creates a DecimalFormat using the given pattern and the symbols
- * for the default locale. This is a convenient way to obtain a
+ * for the default {@link java.util.Locale.Category#FORMAT FORMAT} locale.
+ * This is a convenient way to obtain a
* DecimalFormat when internationalization is not the main concern.
* <p>
* To obtain standard formats for a given locale, use the factory methods
--- a/jdk/src/share/classes/java/text/DecimalFormatSymbols.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/text/DecimalFormatSymbols.java Tue Mar 12 18:12:44 2013 -0700
@@ -71,13 +71,19 @@
public class DecimalFormatSymbols implements Cloneable, Serializable {
/**
- * Create a DecimalFormatSymbols object for the default locale.
+ * Create a DecimalFormatSymbols object for the default
+ * {@link java.util.Locale.Category#FORMAT FORMAT} locale.
* This constructor can only construct instances for the locales
* supported by the Java runtime environment, not for those
* supported by installed
* {@link java.text.spi.DecimalFormatSymbolsProvider DecimalFormatSymbolsProvider}
* implementations. For full locale coverage, use the
* {@link #getInstance(Locale) getInstance} method.
+ * <p>This is equivalent to calling
+ * {@link #DecimalFormatSymbols(Locale)
+ * DecimalFormatSymbols(Locale.getDefault(Locale.Category.FORMAT))}.
+ * @see java.util.Locale#getDefault(java.util.Locale.Category)
+ * @see java.util.Locale.Category#FORMAT
*/
public DecimalFormatSymbols() {
initialize( Locale.getDefault(Locale.Category.FORMAT) );
@@ -133,6 +139,11 @@
* as for those supported by installed
* {@link java.text.spi.DecimalFormatSymbolsProvider
* DecimalFormatSymbolsProvider} implementations.
+ * <p>This is equivalent to calling
+ * {@link #getInstance(Locale)
+ * getInstance(Locale.getDefault(Locale.Category.FORMAT))}.
+ * @see java.util.Locale#getDefault(java.util.Locale.Category)
+ * @see java.util.Locale.Category#FORMAT
* @return a <code>DecimalFormatSymbols</code> instance.
* @since 1.6
*/
--- a/jdk/src/share/classes/java/text/MessageFormat.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/text/MessageFormat.java Tue Mar 12 18:12:44 2013 -0700
@@ -348,7 +348,8 @@
private static final long serialVersionUID = 6479157306784022952L;
/**
- * Constructs a MessageFormat for the default locale and the
+ * Constructs a MessageFormat for the default
+ * {@link java.util.Locale.Category#FORMAT FORMAT} locale and the
* specified pattern.
* The constructor first sets the locale, then parses the pattern and
* creates a list of subformats for the format elements contained in it.
--- a/jdk/src/share/classes/java/text/NumberFormat.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/text/NumberFormat.java Tue Mar 12 18:12:44 2013 -0700
@@ -389,7 +389,8 @@
//============== Locale Stuff =====================
/**
- * Returns a general-purpose number format for the current default locale.
+ * Returns a general-purpose number format for the current default
+ * {@link java.util.Locale.Category#FORMAT FORMAT} locale.
* This is the same as calling
* {@link #getNumberInstance() getNumberInstance()}.
*/
@@ -407,7 +408,13 @@
}
/**
- * Returns a general-purpose number format for the current default locale.
+ * Returns a general-purpose number format for the current default
+ * {@link java.util.Locale.Category#FORMAT FORMAT} locale.
+ * <p>This is equivalent to calling
+ * {@link #getNumberInstance(Locale)
+ * getNumberInstance(Locale.getDefault(Locale.Category.FORMAT))}.
+ * @see java.util.Locale#getDefault(java.util.Locale.Category)
+ * @see java.util.Locale.Category#FORMAT
*/
public final static NumberFormat getNumberInstance() {
return getInstance(Locale.getDefault(Locale.Category.FORMAT), NUMBERSTYLE);
@@ -421,14 +428,20 @@
}
/**
- * Returns an integer number format for the current default locale. The
+ * Returns an integer number format for the current default
+ * {@link java.util.Locale.Category#FORMAT FORMAT} locale. The
* returned number format is configured to round floating point numbers
* to the nearest integer using half-even rounding (see {@link
* java.math.RoundingMode#HALF_EVEN RoundingMode.HALF_EVEN}) for formatting,
* and to parse only the integer part of an input string (see {@link
* #isParseIntegerOnly isParseIntegerOnly}).
+ * <p>This is equivalent to calling
+ * {@link #getIntegerInstance(Locale)
+ * getIntegerInstance(Locale.getDefault(Locale.Category.FORMAT))}.
*
* @see #getRoundingMode()
+ * @see java.util.Locale#getDefault(java.util.Locale.Category)
+ * @see java.util.Locale.Category#FORMAT
* @return a number format for integer values
* @since 1.4
*/
@@ -453,7 +466,14 @@
}
/**
- * Returns a currency format for the current default locale.
+ * Returns a currency format for the current default
+ * {@link java.util.Locale.Category#FORMAT FORMAT} locale.
+ * <p>This is equivalent to calling
+ * {@link #getCurrencyInstance(Locale)
+ * getCurrencyInstance(Locale.getDefault(Locale.Category.FORMAT))}.
+ *
+ * @see java.util.Locale#getDefault(java.util.Locale.Category)
+ * @see java.util.Locale.Category#FORMAT
*/
public final static NumberFormat getCurrencyInstance() {
return getInstance(Locale.getDefault(Locale.Category.FORMAT), CURRENCYSTYLE);
@@ -467,7 +487,14 @@
}
/**
- * Returns a percentage format for the current default locale.
+ * Returns a percentage format for the current default
+ * {@link java.util.Locale.Category#FORMAT FORMAT} locale.
+ * <p>This is equivalent to calling
+ * {@link #getPercentInstance(Locale)
+ * getPercentInstance(Locale.getDefault(Locale.Category.FORMAT))}.
+ *
+ * @see java.util.Locale#getDefault(java.util.Locale.Category)
+ * @see java.util.Locale.Category#FORMAT
*/
public final static NumberFormat getPercentInstance() {
return getInstance(Locale.getDefault(Locale.Category.FORMAT), PERCENTSTYLE);
--- a/jdk/src/share/classes/java/text/SimpleDateFormat.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/text/SimpleDateFormat.java Tue Mar 12 18:12:44 2013 -0700
@@ -547,7 +547,8 @@
/**
* Constructs a <code>SimpleDateFormat</code> using the default pattern and
- * date format symbols for the default locale.
+ * date format symbols for the default
+ * {@link java.util.Locale.Category#FORMAT FORMAT} locale.
* <b>Note:</b> This constructor may not support all locales.
* For full coverage, use the factory methods in the {@link DateFormat}
* class.
@@ -560,11 +561,17 @@
/**
* Constructs a <code>SimpleDateFormat</code> using the given pattern and
- * the default date format symbols for the default locale.
+ * the default date format symbols for the default
+ * {@link java.util.Locale.Category#FORMAT FORMAT} locale.
* <b>Note:</b> This constructor may not support all locales.
* For full coverage, use the factory methods in the {@link DateFormat}
* class.
+ * <p>This is equivalent to calling
+ * {@link #SimpleDateFormat(String, Locale)
+ * SimpleDateFormat(pattern, Locale.getDefault(Locale.Category.FORMAT))}.
*
+ * @see java.util.Locale#getDefault(java.util.Locale.Category)
+ * @see java.util.Locale.Category#FORMAT
* @param pattern the pattern describing the date and time format
* @exception NullPointerException if the given pattern is null
* @exception IllegalArgumentException if the given pattern is invalid
--- a/jdk/src/share/classes/java/time/chrono/HijrahDeviationReader.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/time/chrono/HijrahDeviationReader.java Tue Mar 12 18:12:44 2013 -0700
@@ -70,7 +70,7 @@
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoField;
import java.util.Arrays;
-import java.util.function.Block;
+import java.util.function.Consumer;
/**
* A reader for Hijrah Deviation files.
@@ -126,13 +126,13 @@
* @param typeId the name of the calendar
* @param calendarType the calendar type
* @return {@code true} if the file was read and each entry accepted by the
- * Block; else {@code false} no configuration was done
+ * Consumer; else {@code false} no configuration was done
*
* @throws IOException for zip/jar file handling exception.
* @throws ParseException if the format of the configuration file is wrong.
*/
static boolean readDeviation(String typeId, String calendarType,
- Block<HijrahChronology.Deviation> block) throws IOException, ParseException {
+ Consumer<HijrahChronology.Deviation> consumer) throws IOException, ParseException {
InputStream is = getConfigFileInputStream(typeId);
if (is != null) {
try (BufferedReader br = new BufferedReader(new InputStreamReader(is))) {
@@ -142,7 +142,7 @@
num++;
HijrahChronology.Deviation entry = parseLine(line, num);
if (entry != null) {
- block.accept(entry);
+ consumer.accept(entry);
}
}
}
--- a/jdk/src/share/classes/java/time/format/DateTimeFormatSymbols.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/time/format/DateTimeFormatSymbols.java Tue Mar 12 18:12:44 2013 -0700
@@ -121,10 +121,16 @@
}
/**
- * Obtains symbols for the default locale.
+ * Obtains symbols for the default
+ * {@link java.util.Locale.Category#FORMAT FORMAT} locale.
* <p>
* This method provides access to locale sensitive symbols.
+ * <p>
+ * This is equivalent to calling
+ * {@link #of(Locale)
+ * of(Locale.getDefault(Locale.Category.FORMAT))}.
*
+ * @see java.util.Locale.Category#FORMAT
* @return the info, not null
*/
public static DateTimeFormatSymbols ofDefaultLocale() {
--- a/jdk/src/share/classes/java/time/format/DateTimeFormatterBuilder.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/time/format/DateTimeFormatterBuilder.java Tue Mar 12 18:12:44 2013 -0700
@@ -1007,7 +1007,7 @@
* is used, with {@code IsoChronology} as the fallback.
* <p>
* Note that this method provides similar functionality to methods on
- * {@code DateFormat} such as {@link DateFormat#getDateTimeInstance(int, int)}.
+ * {@code DateFormat} such as {@link java.text.DateFormat#getDateTimeInstance(int, int)}.
*
* @param dateStyle the date style to use, null means no date required
* @param timeStyle the time style to use, null means no time required
--- a/jdk/src/share/classes/java/util/Calendar.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/Calendar.java Tue Mar 12 18:12:44 2013 -0700
@@ -1572,7 +1572,8 @@
/**
* Constructs a Calendar with the default time zone
- * and locale.
+ * and the default {@link java.util.Locale.Category#FORMAT FORMAT}
+ * locale.
* @see TimeZone#getDefault
*/
protected Calendar()
@@ -1600,7 +1601,8 @@
/**
* Gets a calendar using the default time zone and locale. The
* <code>Calendar</code> returned is based on the current time
- * in the default time zone with the default locale.
+ * in the default time zone with the default
+ * {@link Locale.Category#FORMAT FORMAT} locale.
*
* @return a Calendar.
*/
@@ -1614,7 +1616,8 @@
/**
* Gets a calendar using the specified time zone and default locale.
* The <code>Calendar</code> returned is based on the current time
- * in the given time zone with the default locale.
+ * in the given time zone with the default
+ * {@link Locale.Category#FORMAT FORMAT} locale.
*
* @param zone the time zone to use
* @return a Calendar.
--- a/jdk/src/share/classes/java/util/Collections.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/Collections.java Tue Mar 12 18:12:44 2013 -0700
@@ -3759,7 +3759,7 @@
return c2.compareTo(c1);
}
- private Object readResolve() { return reverseOrder(); }
+ private Object readResolve() { return Collections.reverseOrder(); }
}
/**
--- a/jdk/src/share/classes/java/util/Comparator.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/Comparator.java Tue Mar 12 18:12:44 2013 -0700
@@ -25,6 +25,11 @@
package java.util;
+import java.util.function.Function;
+import java.util.function.ToIntFunction;
+import java.util.function.ToLongFunction;
+import java.util.function.ToDoubleFunction;
+
/**
* A comparison function, which imposes a <i>total ordering</i> on some
* collection of objects. Comparators can be passed to a sort method (such
@@ -165,4 +170,93 @@
* @see Object#hashCode()
*/
boolean equals(Object obj);
+
+ /**
+ * Returns a comparator that imposes the reverse ordering of this
+ * comparator.
+ *
+ * @return A comparator that imposes the reverse ordering of this
+ * comparator.
+ * @since 1.8
+ */
+ default Comparator<T> reverseOrder() {
+ return Collections.reverseOrder(this);
+ }
+
+ /**
+ * Constructs a lexicographic order comparator with another comparator.
+ * For example, a {@code Comparator<Person> byLastName} can be composed
+ * with another {@code Comparator<Person> byFirstName}, then {@code
+ * byLastName.thenComparing(byFirstName)} creates a {@code
+ * Comparator<Person>} which sorts by last name, and for equal last names
+ * sorts by first name.
+ *
+ * @param other the other comparator used when equals on this.
+ * @throws NullPointerException if the argument is null.
+ * @since 1.8
+ */
+ default Comparator<T> thenComparing(Comparator<? super T> other) {
+ return Comparators.compose(this, other);
+ }
+
+ /**
+ * Constructs a lexicographic order comparator with a function that
+ * extracts a {@code Comparable} key. This default implementation calls
+ * {@code thenComparing(this, Comparators.comparing(keyExtractor))}.
+ *
+ * @param <U> the {@link Comparable} type for comparison
+ * @param keyExtractor the function used to extract the {@link Comparable} sort key
+ * @throws NullPointerException if the argument is null.
+ * @see Comparators#comparing(Function)
+ * @see #thenComparing(Comparator)
+ * @since 1.8
+ */
+ default <U extends Comparable<? super U>> Comparator<T> thenComparing(Function<? super T, ? extends U> keyExtractor) {
+ return thenComparing(Comparators.comparing(keyExtractor));
+ }
+
+ /**
+ * Constructs a lexicographic order comparator with a function that
+ * extracts a {@code int} value. This default implementation calls {@code
+ * thenComparing(this, Comparators.comparing(keyExtractor))}.
+ *
+ * @param keyExtractor the function used to extract the integer value
+ * @throws NullPointerException if the argument is null.
+ * @see Comparators#comparing(ToIntFunction)
+ * @see #thenComparing(Comparator)
+ * @since 1.8
+ */
+ default Comparator<T> thenComparing(ToIntFunction<? super T> keyExtractor) {
+ return thenComparing(Comparators.comparing(keyExtractor));
+ }
+
+ /**
+ * Constructs a lexicographic order comparator with a function that
+ * extracts a {@code long} value. This default implementation calls
+ * {@code thenComparing(this, Comparators.comparing(keyExtractor))}.
+ *
+ * @param keyExtractor the function used to extract the long value
+ * @throws NullPointerException if the argument is null.
+ * @see Comparators#comparing(ToLongFunction)
+ * @see #thenComparing(Comparator)
+ * @since 1.8
+ */
+ default Comparator<T> thenComparing(ToLongFunction<? super T> keyExtractor) {
+ return thenComparing(Comparators.comparing(keyExtractor));
+ }
+
+ /**
+ * Constructs a lexicographic order comparator with a function that
+ * extracts a {@code double} value. This default implementation calls
+ * {@code thenComparing(this, Comparators.comparing(keyExtractor))}.
+ *
+ * @param keyExtractor the function used to extract the double value
+ * @throws NullPointerException if the argument is null.
+ * @see Comparators#comparing(ToDoubleFunction)
+ * @see #thenComparing(Comparator)
+ * @since 1.8
+ */
+ default Comparator<T> thenComparing(ToDoubleFunction<? super T> keyExtractor) {
+ return thenComparing(Comparators.comparing(keyExtractor));
+ }
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/Comparators.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,279 @@
+/*
+ * Copyright (c) 2012, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package java.util;
+
+import java.io.Serializable;
+import java.util.function.BinaryOperator;
+import java.util.function.Function;
+import java.util.function.ToDoubleFunction;
+import java.util.function.ToIntFunction;
+import java.util.function.ToLongFunction;
+
+/**
+ * This class consists of {@code static} utility methods for comparators. Mostly
+ * factory method that returns a {@link Comparator}.
+ *
+ * <p> Unless otherwise noted, passing a {@code null} argument to a method in
+ * this class will cause a {@link NullPointerException} to be thrown.
+ *
+ * @see Comparator
+ * @since 1.8
+ */
+public class Comparators {
+ private Comparators() {
+ throw new AssertionError("no instances");
+ }
+
+ /**
+ * Compares {@link Comparable} objects in natural order.
+ *
+ * @see Comparable
+ */
+ private enum NaturalOrderComparator implements Comparator<Comparable<Object>> {
+ INSTANCE;
+
+ @Override
+ public int compare(Comparable<Object> c1, Comparable<Object> c2) {
+ return c1.compareTo(c2);
+ }
+ }
+
+ /**
+ * Returns a comparator that imposes the reverse of the <em>natural
+ * ordering</em>.
+ *
+ * <p>The returned comparator is serializable.
+ *
+ * @param <T> {@link Comparable} type
+ *
+ * @return A comparator that imposes the reverse of the <i>natural
+ * ordering</i> on a collection of objects that implement
+ * the {@link Comparable} interface.
+ * @see Comparable
+ */
+ public static <T extends Comparable<? super T>> Comparator<T> reverseOrder() {
+ return Collections.reverseOrder();
+ }
+
+ /**
+ * Returns a comparator that imposes the reverse ordering of the specified
+ * {@link Comparator}.
+ *
+ * <p>The returned comparator is serializable (assuming the specified
+ * comparator is also serializable).
+ *
+ * @param <T> the element type to be compared
+ * @param cmp a comparator whose ordering is to be reversed by the returned
+ * comparator
+ * @return A comparator that imposes the reverse ordering of the
+ * specified comparator.
+ */
+ public static <T> Comparator<T> reverseOrder(Comparator<T> cmp) {
+ Objects.requireNonNull(cmp);
+ return Collections.reverseOrder(cmp);
+ }
+
+ /**
+ * Gets a comparator compares {@link Comparable} type in natural order.
+ *
+ * @param <T> {@link Comparable} type
+ */
+ public static <T extends Comparable<? super T>> Comparator<T> naturalOrder() {
+ return (Comparator<T>) NaturalOrderComparator.INSTANCE;
+ }
+
+ /**
+ * Gets a comparator compares {@link Map.Entry} in natural order on key.
+ *
+ * @param <K> {@link Comparable} key type
+ * @param <V> value type
+ */
+ public static <K extends Comparable<? super K>, V> Comparator<Map.Entry<K,V>> naturalOrderKeys() {
+ return (Comparator<Map.Entry<K, V>> & Serializable)
+ (c1, c2) -> c1.getKey().compareTo(c2.getKey());
+ }
+
+ /**
+ * Gets a comparator compares {@link Map.Entry} in natural order on value.
+ *
+ * @param <K> key type
+ * @param <V> {@link Comparable} value type
+ */
+ public static <K, V extends Comparable<? super V>> Comparator<Map.Entry<K,V>> naturalOrderValues() {
+ return (Comparator<Map.Entry<K, V>> & Serializable)
+ (c1, c2) -> c1.getValue().compareTo(c2.getValue());
+ }
+
+ /**
+ * Gets a comparator compares {@link Map.Entry} by key using the given
+ * {@link Comparator}.
+ *
+ * <p>The returned comparator is serializable assuming the specified
+ * comparators are also serializable.
+ *
+ * @param <K> key type
+ * @param <V> value type
+ * @param cmp the key {@link Comparator}
+ */
+ public static <K, V> Comparator<Map.Entry<K, V>> byKey(Comparator<? super K> cmp) {
+ Objects.requireNonNull(cmp);
+ return (Comparator<Map.Entry<K, V>> & Serializable)
+ (c1, c2) -> cmp.compare(c1.getKey(), c2.getKey());
+ }
+
+ /**
+ * Gets a comparator compares {@link Map.Entry} by value using the given
+ * {@link Comparator}.
+ *
+ * @param <K> key type
+ * @param <V> value type
+ * @param cmp the value {@link Comparator}
+ */
+ public static <K, V> Comparator<Map.Entry<K, V>> byValue(Comparator<? super V> cmp) {
+ Objects.requireNonNull(cmp);
+ return (Comparator<Map.Entry<K, V>> & Serializable)
+ (c1, c2) -> cmp.compare(c1.getValue(), c2.getValue());
+ }
+
+ /**
+ * Accepts a function that extracts a {@link java.lang.Comparable
+ * Comparable} sort key from a type {@code T}, and returns a {@code
+ * Comparator<T>} that compares by that sort key. For example, if a class
+ * {@code Person} has a {@code String}-valued getter {@code getLastName},
+ * then {@code comparing(Person::getLastName)} would return a {@code
+ * Comparator<Person>} that compares {@code Person} objects by their last
+ * name.
+ *
+ * @param <T> the original element type
+ * @param <U> the {@link Comparable} type for comparison
+ * @param keyExtractor the function used to extract the {@link Comparable} sort key
+ */
+ public static <T, U extends Comparable<? super U>> Comparator<T> comparing(Function<? super T, ? extends U> keyExtractor) {
+ Objects.requireNonNull(keyExtractor);
+ return (Comparator<T> & Serializable)
+ (c1, c2) -> keyExtractor.apply(c1).compareTo(keyExtractor.apply(c2));
+ }
+
+ /**
+ * Accepts a function that extracts an {@code int} value from a type {@code
+ * T}, and returns a {@code Comparator<T>} that compares by that value.
+ *
+ * <p>The returned comparator is serializable assuming the specified
+ * function is also serializable.
+ *
+ * @see #comparing(Function)
+ * @param <T> the original element type
+ * @param keyExtractor the function used to extract the integer value
+ */
+ public static <T> Comparator<T> comparing(ToIntFunction<? super T> keyExtractor) {
+ Objects.requireNonNull(keyExtractor);
+ return (Comparator<T> & Serializable)
+ (c1, c2) -> Integer.compare(keyExtractor.applyAsInt(c1), keyExtractor.applyAsInt(c2));
+ }
+
+ /**
+ * Accepts a function that extracts a {@code long} value from a type {@code
+ * T}, and returns a {@code Comparator<T>} that compares by that value.
+ *
+ * <p>The returned comparator is serializable assuming the specified
+ * function is also serializable.
+ *
+ * @see #comparing(Function)
+ * @param <T> the original element type
+ * @param keyExtractor the function used to extract the long value
+ */
+ public static <T> Comparator<T> comparing(ToLongFunction<? super T> keyExtractor) {
+ Objects.requireNonNull(keyExtractor);
+ return (Comparator<T> & Serializable)
+ (c1, c2) -> Long.compare(keyExtractor.applyAsLong(c1), keyExtractor.applyAsLong(c2));
+ }
+
+ /**
+ * Accepts a function that extracts a {@code double} value from a type
+ * {@code T}, and returns a {@code Comparator<T>} that compares by that
+ * value.
+ *
+ * <p>The returned comparator is serializable assuming the specified
+ * function is also serializable.
+ *
+ * @see #comparing(Function)
+ * @param <T> the original element type
+ * @param keyExtractor the function used to extract the double value
+ */
+ public static<T> Comparator<T> comparing(ToDoubleFunction<? super T> keyExtractor) {
+ Objects.requireNonNull(keyExtractor);
+ return (Comparator<T> & Serializable)
+ (c1, c2) -> Double.compare(keyExtractor.applyAsDouble(c1), keyExtractor.applyAsDouble(c2));
+ }
+
+ /**
+ * Constructs a lexicographic order from two {@link Comparator}s. For
+ * example, if you have comparators {@code byLastName} and {@code
+ * byFirstName}, each of type {@code Comparator<Person>}, then {@code
+ * compose(byLastName, byFirstName)} creates a {@code Comparator<Person>}
+ * which sorts by last name, and for equal last names sorts by first name.
+ *
+ * <p>The returned comparator is serializable assuming the specified
+ * comparators are also serializable.
+ *
+ * @param <T> the element type to be compared
+ * @param first the first comparator
+ * @param second the secondary comparator used when equals on the first
+ */
+ public static<T> Comparator<T> compose(Comparator<? super T> first, Comparator<? super T> second) {
+ Objects.requireNonNull(first);
+ Objects.requireNonNull(second);
+ return (Comparator<T> & Serializable) (c1, c2) -> {
+ int res = first.compare(c1, c2);
+ return (res != 0) ? res : second.compare(c1, c2);
+ };
+ }
+
+ /**
+ * Constructs a {@link BinaryOperator} which returns the lesser of two elements
+ * according to the specified {@code Comparator}
+ *
+ * @param comparator A {@code Comparator} for comparing the two values
+ * @param <T> the type of the elements to be compared
+ * @return a {@code BinaryOperator} which returns the lesser of its operands,
+ * according to the supplied {@code Comparator}
+ */
+ public static<T> BinaryOperator<T> lesserOf(Comparator<? super T> comparator) {
+ return (a, b) -> comparator.compare(a, b) <= 0 ? a : b;
+ }
+
+ /**
+ * Constructs a {@link BinaryOperator} which returns the greater of two elements
+ * according to the specified {@code Comparator}
+ *
+ * @param comparator A {@code Comparator} for comparing the two values
+ * @param <T> the type of the elements to be compared
+ * @return a {@code BinaryOperator} which returns the greater of its operands,
+ * according to the supplied {@code Comparator}
+ */
+ public static<T> BinaryOperator<T> greaterOf(Comparator<? super T> comparator) {
+ return (a, b) -> comparator.compare(a, b) >= 0 ? a : b;
+ }
+}
--- a/jdk/src/share/classes/java/util/Currency.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/Currency.java Tue Mar 12 18:12:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, 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
@@ -472,12 +472,18 @@
}
/**
- * Gets the symbol of this currency for the default locale.
+ * Gets the symbol of this currency for the default
+ * {@link Locale.Category#DISPLAY DISPLAY} locale.
* For example, for the US Dollar, the symbol is "$" if the default
* locale is the US, while for other locales it may be "US$". If no
* symbol can be determined, the ISO 4217 currency code is returned.
+ * <p>
+ * This is equivalent to calling
+ * {@link #getSymbol(Locale)
+ * getSymbol(Locale.getDefault(Locale.Category.DISPLAY))}.
*
- * @return the symbol of this currency for the default locale
+ * @return the symbol of this currency for the default
+ * {@link Locale.Category#DISPLAY DISPLAY} locale
*/
public String getSymbol() {
return getSymbol(Locale.getDefault(Locale.Category.DISPLAY));
@@ -533,10 +539,16 @@
/**
* Gets the name that is suitable for displaying this currency for
- * the default locale. If there is no suitable display name found
+ * the default {@link Locale.Category#DISPLAY DISPLAY} locale.
+ * If there is no suitable display name found
* for the default locale, the ISO 4217 currency code is returned.
+ * <p>
+ * This is equivalent to calling
+ * {@link #getDisplayName(Locale)
+ * getDisplayName(Locale.getDefault(Locale.Category.DISPLAY))}.
*
- * @return the display name of this currency for the default locale
+ * @return the display name of this currency for the default
+ * {@link Locale.Category#DISPLAY DISPLAY} locale
* @since 1.7
*/
public String getDisplayName() {
@@ -702,7 +714,7 @@
" ignored since cutover date has not passed :" + curdata, null);
return;
}
- } catch (IndexOutOfBoundsException | NullPointerException | ParseException ex) {
+ } catch (ParseException ex) {
info("currency.properties entry for " + ctry +
" ignored since exception encountered :" + ex.getMessage(), null);
return;
@@ -732,8 +744,7 @@
setMainTableEntry(ctry.charAt(0), ctry.charAt(1), entry);
}
- private static boolean isPastCutoverDate(String s)
- throws IndexOutOfBoundsException, NullPointerException, ParseException {
+ private static boolean isPastCutoverDate(String s) throws ParseException {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.ROOT);
format.setTimeZone(TimeZone.getTimeZone("UTC"));
format.setLenient(false);
--- a/jdk/src/share/classes/java/util/Formatter.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/Formatter.java Tue Mar 12 18:12:44 2013 -0700
@@ -1900,7 +1900,8 @@
* which may be retrieved by invoking {@link #out out()} and whose
* current content may be converted into a string by invoking {@link
* #toString toString()}. The locale used is the {@linkplain
- * Locale#getDefault() default locale} for this instance of the Java
+ * Locale#getDefault(Locale.Category) default locale} for
+ * {@linkplain Locale.Category#FORMAT formatting} for this instance of the Java
* virtual machine.
*/
public Formatter() {
@@ -1910,8 +1911,10 @@
/**
* Constructs a new formatter with the specified destination.
*
- * <p> The locale used is the {@linkplain Locale#getDefault() default
- * locale} for this instance of the Java virtual machine.
+ * <p> The locale used is the {@linkplain
+ * Locale#getDefault(Locale.Category) default locale} for
+ * {@linkplain Locale.Category#FORMAT formatting} for this instance of the Java
+ * virtual machine.
*
* @param a
* Destination for the formatted output. If {@code a} is
@@ -1961,8 +1964,10 @@
* java.nio.charset.Charset#defaultCharset() default charset} for this
* instance of the Java virtual machine.
*
- * <p> The locale used is the {@linkplain Locale#getDefault() default
- * locale} for this instance of the Java virtual machine.
+ * <p> The locale used is the {@linkplain
+ * Locale#getDefault(Locale.Category) default locale} for
+ * {@linkplain Locale.Category#FORMAT formatting} for this instance of the Java
+ * virtual machine.
*
* @param fileName
* The name of the file to use as the destination of this
@@ -1989,8 +1994,10 @@
/**
* Constructs a new formatter with the specified file name and charset.
*
- * <p> The locale used is the {@linkplain Locale#getDefault default
- * locale} for this instance of the Java virtual machine.
+ * <p> The locale used is the {@linkplain
+ * Locale#getDefault(Locale.Category) default locale} for
+ * {@linkplain Locale.Category#FORMAT formatting} for this instance of the Java
+ * virtual machine.
*
* @param fileName
* The name of the file to use as the destination of this
@@ -2068,8 +2075,10 @@
* java.nio.charset.Charset#defaultCharset() default charset} for this
* instance of the Java virtual machine.
*
- * <p> The locale used is the {@linkplain Locale#getDefault() default
- * locale} for this instance of the Java virtual machine.
+ * <p> The locale used is the {@linkplain
+ * Locale#getDefault(Locale.Category) default locale} for
+ * {@linkplain Locale.Category#FORMAT formatting} for this instance of the Java
+ * virtual machine.
*
* @param file
* The file to use as the destination of this formatter. If the
@@ -2096,8 +2105,10 @@
/**
* Constructs a new formatter with the specified file and charset.
*
- * <p> The locale used is the {@linkplain Locale#getDefault default
- * locale} for this instance of the Java virtual machine.
+ * <p> The locale used is the {@linkplain
+ * Locale#getDefault(Locale.Category) default locale} for
+ * {@linkplain Locale.Category#FORMAT formatting} for this instance of the Java
+ * virtual machine.
*
* @param file
* The file to use as the destination of this formatter. If the
@@ -2171,8 +2182,10 @@
/**
* Constructs a new formatter with the specified print stream.
*
- * <p> The locale used is the {@linkplain Locale#getDefault() default
- * locale} for this instance of the Java virtual machine.
+ * <p> The locale used is the {@linkplain
+ * Locale#getDefault(Locale.Category) default locale} for
+ * {@linkplain Locale.Category#FORMAT formatting} for this instance of the Java
+ * virtual machine.
*
* <p> Characters are written to the given {@link java.io.PrintStream
* PrintStream} object and are therefore encoded using that object's
@@ -2193,8 +2206,10 @@
* java.nio.charset.Charset#defaultCharset() default charset} for this
* instance of the Java virtual machine.
*
- * <p> The locale used is the {@linkplain Locale#getDefault() default
- * locale} for this instance of the Java virtual machine.
+ * <p> The locale used is the {@linkplain
+ * Locale#getDefault(Locale.Category) default locale} for
+ * {@linkplain Locale.Category#FORMAT formatting} for this instance of the Java
+ * virtual machine.
*
* @param os
* The output stream to use as the destination of this formatter.
@@ -2209,8 +2224,10 @@
* Constructs a new formatter with the specified output stream and
* charset.
*
- * <p> The locale used is the {@linkplain Locale#getDefault default
- * locale} for this instance of the Java virtual machine.
+ * <p> The locale used is the {@linkplain
+ * Locale#getDefault(Locale.Category) default locale} for
+ * {@linkplain Locale.Category#FORMAT formatting} for this instance of the Java
+ * virtual machine.
*
* @param os
* The output stream to use as the destination of this formatter.
--- a/jdk/src/share/classes/java/util/GregorianCalendar.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/GregorianCalendar.java Tue Mar 12 18:12:44 2013 -0700
@@ -587,7 +587,8 @@
/**
* Constructs a default <code>GregorianCalendar</code> using the current time
- * in the default time zone with the default locale.
+ * in the default time zone with the default
+ * {@link Locale.Category#FORMAT FORMAT} locale.
*/
public GregorianCalendar() {
this(TimeZone.getDefaultRef(), Locale.getDefault(Locale.Category.FORMAT));
@@ -596,7 +597,8 @@
/**
* Constructs a <code>GregorianCalendar</code> based on the current time
- * in the given time zone with the default locale.
+ * in the given time zone with the default
+ * {@link Locale.Category#FORMAT FORMAT} locale.
*
* @param zone the given time zone.
*/
--- a/jdk/src/share/classes/java/util/IdentityHashMap.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/IdentityHashMap.java Tue Mar 12 18:12:44 2013 -0700
@@ -25,6 +25,7 @@
package java.util;
import java.io.*;
+import java.lang.reflect.Array;
/**
* This class implements the <tt>Map</tt> interface with a hash table, using
@@ -1010,6 +1011,37 @@
result += System.identityHashCode(key);
return result;
}
+ public Object[] toArray() {
+ return toArray(new Object[size()]);
+ }
+ @SuppressWarnings("unchecked")
+ public <T> T[] toArray(T[] a) {
+ int expectedModCount = modCount;
+ int size = size();
+ if (a.length < size)
+ a = (T[]) Array.newInstance(a.getClass().getComponentType(), size);
+ Object[] tab = table;
+ int ti = 0;
+ for (int si = 0; si < tab.length; si += 2) {
+ Object key;
+ if ((key = tab[si]) != null) { // key present ?
+ // more elements than expected -> concurrent modification from other thread
+ if (ti >= size) {
+ throw new ConcurrentModificationException();
+ }
+ a[ti++] = (T) unmaskNull(key); // unmask key
+ }
+ }
+ // fewer elements than expected or concurrent modification from other thread detected
+ if (ti < size || expectedModCount != modCount) {
+ throw new ConcurrentModificationException();
+ }
+ // final null marker as per spec
+ if (ti < a.length) {
+ a[ti] = null;
+ }
+ return a;
+ }
}
/**
@@ -1062,6 +1094,36 @@
public void clear() {
IdentityHashMap.this.clear();
}
+ public Object[] toArray() {
+ return toArray(new Object[size()]);
+ }
+ @SuppressWarnings("unchecked")
+ public <T> T[] toArray(T[] a) {
+ int expectedModCount = modCount;
+ int size = size();
+ if (a.length < size)
+ a = (T[]) Array.newInstance(a.getClass().getComponentType(), size);
+ Object[] tab = table;
+ int ti = 0;
+ for (int si = 0; si < tab.length; si += 2) {
+ if (tab[si] != null) { // key present ?
+ // more elements than expected -> concurrent modification from other thread
+ if (ti >= size) {
+ throw new ConcurrentModificationException();
+ }
+ a[ti++] = (T) tab[si+1]; // copy value
+ }
+ }
+ // fewer elements than expected or concurrent modification from other thread detected
+ if (ti < size || expectedModCount != modCount) {
+ throw new ConcurrentModificationException();
+ }
+ // final null marker as per spec
+ if (ti < a.length) {
+ a[ti] = null;
+ }
+ return a;
+ }
}
/**
@@ -1149,25 +1211,35 @@
}
public Object[] toArray() {
- int size = size();
- Object[] result = new Object[size];
- Iterator<Map.Entry<K,V>> it = iterator();
- for (int i = 0; i < size; i++)
- result[i] = new AbstractMap.SimpleEntry<>(it.next());
- return result;
+ return toArray(new Object[size()]);
}
@SuppressWarnings("unchecked")
public <T> T[] toArray(T[] a) {
+ int expectedModCount = modCount;
int size = size();
if (a.length < size)
- a = (T[])java.lang.reflect.Array
- .newInstance(a.getClass().getComponentType(), size);
- Iterator<Map.Entry<K,V>> it = iterator();
- for (int i = 0; i < size; i++)
- a[i] = (T) new AbstractMap.SimpleEntry<>(it.next());
- if (a.length > size)
- a[size] = null;
+ a = (T[]) Array.newInstance(a.getClass().getComponentType(), size);
+ Object[] tab = table;
+ int ti = 0;
+ for (int si = 0; si < tab.length; si += 2) {
+ Object key;
+ if ((key = tab[si]) != null) { // key present ?
+ // more elements than expected -> concurrent modification from other thread
+ if (ti >= size) {
+ throw new ConcurrentModificationException();
+ }
+ a[ti++] = (T) new AbstractMap.SimpleEntry(unmaskNull(key), tab[si + 1]);
+ }
+ }
+ // fewer elements than expected or concurrent modification from other thread detected
+ if (ti < size || expectedModCount != modCount) {
+ throw new ConcurrentModificationException();
+ }
+ // final null marker as per spec
+ if (ti < a.length) {
+ a[ti] = null;
+ }
return a;
}
}
--- a/jdk/src/share/classes/java/util/Locale.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/Locale.java Tue Mar 12 18:12:44 2013 -0700
@@ -351,7 +351,8 @@
* you can use <code>getDisplayLanguage</code> to get the name of
* the language suitable for displaying to the user. Interestingly,
* the <code>getDisplayXXX</code> methods are themselves locale-sensitive
- * and have two versions: one that uses the default locale and one
+ * and have two versions: one that uses the default
+ * {@link Locale.Category#DISPLAY DISPLAY} locale and one
* that uses the locale specified as an argument.
*
* <p>The Java Platform provides a number of classes that perform locale-sensitive
@@ -369,7 +370,8 @@
* </pre>
* </blockquote>
* Each of these methods has two variants; one with an explicit locale
- * and one without; the latter uses the default locale:
+ * and one without; the latter uses the default
+ * {@link Locale.Category#FORMAT FORMAT} locale:
* <blockquote>
* <pre>
* NumberFormat.getInstance(myLocale)
@@ -1645,11 +1647,15 @@
/**
* Returns a name for the locale's language that is appropriate for display to the
* user.
- * If possible, the name returned will be localized for the default locale.
- * For example, if the locale is fr_FR and the default locale
+ * If possible, the name returned will be localized for the default
+ * {@link Locale.Category#DISPLAY DISPLAY} locale.
+ * For example, if the locale is fr_FR and the default
+ * {@link Locale.Category#DISPLAY DISPLAY} locale
* is en_US, getDisplayLanguage() will return "French"; if the locale is en_US and
- * the default locale is fr_FR, getDisplayLanguage() will return "anglais".
- * If the name returned cannot be localized for the default locale,
+ * the default {@link Locale.Category#DISPLAY DISPLAY} locale is fr_FR,
+ * getDisplayLanguage() will return "anglais".
+ * If the name returned cannot be localized for the default
+ * {@link Locale.Category#DISPLAY DISPLAY} locale,
* (say, we don't have a Japanese name for Croatian),
* this function falls back on the English name, and uses the ISO code as a last-resort
* value. If the locale doesn't specify a language, this function returns the empty string.
@@ -1679,10 +1685,12 @@
/**
* Returns a name for the the locale's script that is appropriate for display to
- * the user. If possible, the name will be localized for the default locale. Returns
+ * the user. If possible, the name will be localized for the default
+ * {@link Locale.Category#DISPLAY DISPLAY} locale. Returns
* the empty string if this locale doesn't specify a script code.
*
- * @return the display name of the script code for the current default locale
+ * @return the display name of the script code for the current default
+ * {@link Locale.Category#DISPLAY DISPLAY} locale
* @since 1.7
*/
public String getDisplayScript() {
@@ -1695,7 +1703,8 @@
* localized for the given locale. Returns the empty string if
* this locale doesn't specify a script code.
*
- * @return the display name of the script code for the current default locale
+ * @return the display name of the script code for the current default
+ * {@link Locale.Category#DISPLAY DISPLAY} locale
* @throws NullPointerException if <code>inLocale</code> is <code>null</code>
* @since 1.7
*/
@@ -1706,11 +1715,15 @@
/**
* Returns a name for the locale's country that is appropriate for display to the
* user.
- * If possible, the name returned will be localized for the default locale.
- * For example, if the locale is fr_FR and the default locale
+ * If possible, the name returned will be localized for the default
+ * {@link Locale.Category#DISPLAY DISPLAY} locale.
+ * For example, if the locale is fr_FR and the default
+ * {@link Locale.Category#DISPLAY DISPLAY} locale
* is en_US, getDisplayCountry() will return "France"; if the locale is en_US and
- * the default locale is fr_FR, getDisplayCountry() will return "Etats-Unis".
- * If the name returned cannot be localized for the default locale,
+ * the default {@link Locale.Category#DISPLAY DISPLAY} locale is fr_FR,
+ * getDisplayCountry() will return "Etats-Unis".
+ * If the name returned cannot be localized for the default
+ * {@link Locale.Category#DISPLAY DISPLAY} locale,
* (say, we don't have a Japanese name for Croatia),
* this function falls back on the English name, and uses the ISO code as a last-resort
* value. If the locale doesn't specify a country, this function returns the empty string.
@@ -1762,7 +1775,8 @@
/**
* Returns a name for the locale's variant code that is appropriate for display to the
- * user. If possible, the name will be localized for the default locale. If the locale
+ * user. If possible, the name will be localized for the default
+ * {@link Locale.Category#DISPLAY DISPLAY} locale. If the locale
* doesn't specify a variant code, this function returns the empty string.
*/
public final String getDisplayVariant() {
--- a/jdk/src/share/classes/java/util/LocaleISOData.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/LocaleISOData.java Tue Mar 12 18:12:44 2013 -0700
@@ -473,7 +473,7 @@
+ "YE" + "YEM" // Yemen
+ "YT" + "MYT" // Mayotte
+ "ZA" + "ZAF" // South Africa, Republic of
- + "ZM" + "ZMW" // Zambia, Republic of
+ + "ZM" + "ZMB" // Zambia, Republic of
+ "ZW" + "ZWE" // Zimbabwe
;
--- a/jdk/src/share/classes/java/util/Scanner.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/Scanner.java Tue Mar 12 18:12:44 2013 -0700
@@ -151,7 +151,8 @@
* <p> An instance of this class is capable of scanning numbers in the standard
* formats as well as in the formats of the scanner's locale. A scanner's
* <a name="initial-locale">initial locale </a>is the value returned by the {@link
- * java.util.Locale#getDefault} method; it may be changed via the {@link
+ * java.util.Locale#getDefault(Locale.Category)
+ * Locale.getDefault(Locale.Category.FORMAT)} method; it may be changed via the {@link
* #useLocale} method. The {@link #reset} method will reset the value of the
* scanner's locale to the initial locale regardless of whether it was
* previously changed.
@@ -2641,7 +2642,7 @@
*
* <blockquote><pre>
* scanner.useDelimiter("\\p{javaWhitespace}+")
- * .useLocale(Locale.getDefault())
+ * .useLocale(Locale.getDefault(Locale.Category.FORMAT))
* .useRadix(10);
* </pre></blockquote>
*
--- a/jdk/src/share/classes/java/util/TimeZone.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/TimeZone.java Tue Mar 12 18:12:44 2013 -0700
@@ -534,7 +534,7 @@
/**
* Gets the {@code TimeZone} for the given {@code zoneId}.
*
- * @param zoneid a {@link ZoneId} from which the time zone ID is obtained
+ * @param zoneId a {@link ZoneId} from which the time zone ID is obtained
* @return the specified {@code TimeZone}, or the GMT zone if the given ID
* cannot be understood.
* @throws NullPointerException if {@code zoneId} is {@code null}
--- a/jdk/src/share/classes/java/util/concurrent/ForkJoinPool.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/concurrent/ForkJoinPool.java Tue Mar 12 18:12:44 2013 -0700
@@ -35,6 +35,7 @@
package java.util.concurrent;
+import java.lang.Thread.UncaughtExceptionHandler;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -104,38 +105,45 @@
* there is little difference among choice of methods.
*
* <table BORDER CELLPADDING=3 CELLSPACING=1>
+ * <caption>Summary of task execution methods</caption>
* <tr>
* <td></td>
* <td ALIGN=CENTER> <b>Call from non-fork/join clients</b></td>
* <td ALIGN=CENTER> <b>Call from within fork/join computations</b></td>
* </tr>
* <tr>
- * <td> <b>Arrange async execution</td>
+ * <td> <b>Arrange async execution</b></td>
* <td> {@link #execute(ForkJoinTask)}</td>
* <td> {@link ForkJoinTask#fork}</td>
* </tr>
* <tr>
- * <td> <b>Await and obtain result</td>
+ * <td> <b>Await and obtain result</b></td>
* <td> {@link #invoke(ForkJoinTask)}</td>
* <td> {@link ForkJoinTask#invoke}</td>
* </tr>
* <tr>
- * <td> <b>Arrange exec and obtain Future</td>
+ * <td> <b>Arrange exec and obtain Future</b></td>
* <td> {@link #submit(ForkJoinTask)}</td>
* <td> {@link ForkJoinTask#fork} (ForkJoinTasks <em>are</em> Futures)</td>
* </tr>
* </table>
*
* <p>The common pool is by default constructed with default
- * parameters, but these may be controlled by setting three {@link
- * System#getProperty system properties} with prefix {@code
- * java.util.concurrent.ForkJoinPool.common}: {@code parallelism} --
- * an integer greater than zero, {@code threadFactory} -- the class
- * name of a {@link ForkJoinWorkerThreadFactory}, and {@code
- * exceptionHandler} -- the class name of a {@link
- * java.lang.Thread.UncaughtExceptionHandler
- * Thread.UncaughtExceptionHandler}. Upon any error in establishing
- * these settings, default parameters are used.
+ * parameters, but these may be controlled by setting three
+ * {@linkplain System#getProperty system properties}:
+ * <ul>
+ * <li>{@code java.util.concurrent.ForkJoinPool.common.parallelism}
+ * - the parallelism level, a non-negative integer
+ * <li>{@code java.util.concurrent.ForkJoinPool.common.threadFactory}
+ * - the class name of a {@link ForkJoinWorkerThreadFactory}
+ * <li>{@code java.util.concurrent.ForkJoinPool.common.exceptionHandler}
+ * - the class name of a {@link UncaughtExceptionHandler}
+ * </ul>
+ * The system class loader is used to load these classes.
+ * Upon any error in establishing these settings, default parameters
+ * are used. It is possible to disable or limit the use of threads in
+ * the common pool by setting the parallelism property to zero, and/or
+ * using a factory that may return {@code null}.
*
* <p><b>Implementation notes</b>: This implementation restricts the
* maximum number of running threads to 32767. Attempts to create
@@ -225,18 +233,18 @@
* for work-stealing (this would contaminate lifo/fifo
* processing). Instead, we randomly associate submission queues
* with submitting threads, using a form of hashing. The
- * ThreadLocal Submitter class contains a value initially used as
- * a hash code for choosing existing queues, but may be randomly
- * repositioned upon contention with other submitters. In
- * essence, submitters act like workers except that they are
- * restricted to executing local tasks that they submitted (or in
- * the case of CountedCompleters, others with the same root task).
- * However, because most shared/external queue operations are more
- * expensive than internal, and because, at steady state, external
- * submitters will compete for CPU with workers, ForkJoinTask.join
- * and related methods disable them from repeatedly helping to
- * process tasks if all workers are active. Insertion of tasks in
- * shared mode requires a lock (mainly to protect in the case of
+ * ThreadLocalRandom probe value serves as a hash code for
+ * choosing existing queues, and may be randomly repositioned upon
+ * contention with other submitters. In essence, submitters act
+ * like workers except that they are restricted to executing local
+ * tasks that they submitted (or in the case of CountedCompleters,
+ * others with the same root task). However, because most
+ * shared/external queue operations are more expensive than
+ * internal, and because, at steady state, external submitters
+ * will compete for CPU with workers, ForkJoinTask.join and
+ * related methods disable them from repeatedly helping to process
+ * tasks if all workers are active. Insertion of tasks in shared
+ * mode requires a lock (mainly to protect in the case of
* resizing) but we use only a simple spinlock (using bits in
* field qlock), because submitters encountering a busy queue move
* on to try or create other queues -- they block only when
@@ -469,7 +477,7 @@
* Common Pool
* ===========
*
- * The static commonPool always exists after static
+ * The static common Pool always exists after static
* initialization. Since it (or any other created pool) need
* never be used, we minimize initial construction overhead and
* footprint to the setup of about a dozen fields, with no nested
@@ -548,6 +556,7 @@
*
* @param pool the pool this thread works in
* @throws NullPointerException if the pool is null
+ * @return the new worker thread
*/
public ForkJoinWorkerThread newThread(ForkJoinPool pool);
}
@@ -564,26 +573,6 @@
}
/**
- * Per-thread records for threads that submit to pools. Currently
- * holds only pseudo-random seed / index that is used to choose
- * submission queues in method externalPush. In the future, this may
- * also incorporate a means to implement different task rejection
- * and resubmission policies.
- *
- * Seeds for submitters and workers/workQueues work in basically
- * the same way but are initialized and updated using slightly
- * different mechanics. Both are initialized using the same
- * approach as in class ThreadLocal, where successive values are
- * unlikely to collide with previous values. Seeds are then
- * randomly modified upon collisions using xorshifts, which
- * requires a non-zero seed.
- */
- static final class Submitter {
- int seed;
- Submitter(int s) { seed = s; }
- }
-
- /**
* Class for artificial tasks that are used to replace the target
* of local joins if they are removed from an interior queue slot
* in WorkQueue.tryRemoveAndExec. We don't need the proxy to
@@ -737,7 +726,7 @@
* shared-queue version is embedded in method externalPush.)
*
* @param task the task. Caller must ensure non-null.
- * @throw RejectedExecutionException if array cannot be resized
+ * @throws RejectedExecutionException if array cannot be resized
*/
final void push(ForkJoinTask<?> task) {
ForkJoinTask<?>[] a; ForkJoinPool p;
@@ -936,7 +925,7 @@
* or any other cancelled task. Returns (true) on any CAS
* or consistency check failure so caller can retry.
*
- * @return false if no progress can be made, else true;
+ * @return false if no progress can be made, else true
*/
final boolean tryRemoveAndExec(ForkJoinTask<?> task) {
boolean stat = true, removed = false, empty = true;
@@ -981,7 +970,7 @@
/**
* Polls for and executes the given task or any other task in
- * its CountedCompleter computation
+ * its CountedCompleter computation.
*/
final boolean pollAndExecCC(ForkJoinTask<?> root) {
ForkJoinTask<?>[] a; int b; Object o;
@@ -1055,7 +1044,6 @@
private static final int ABASE;
private static final int ASHIFT;
static {
- int s;
try {
U = sun.misc.Unsafe.getUnsafe();
Class<?> k = WorkQueue.class;
@@ -1063,13 +1051,13 @@
QLOCK = U.objectFieldOffset
(k.getDeclaredField("qlock"));
ABASE = U.arrayBaseOffset(ak);
- s = U.arrayIndexScale(ak);
+ int scale = U.arrayIndexScale(ak);
+ if ((scale & (scale - 1)) != 0)
+ throw new Error("data type scale not a power of two");
+ ASHIFT = 31 - Integer.numberOfLeadingZeros(scale);
} catch (Exception e) {
throw new Error(e);
}
- if ((s & (s-1)) != 0)
- throw new Error("data type scale not a power of two");
- ASHIFT = 31 - Integer.numberOfLeadingZeros(s);
}
}
@@ -1083,15 +1071,6 @@
defaultForkJoinWorkerThreadFactory;
/**
- * Per-thread submission bookkeeping. Shared across all pools
- * to reduce ThreadLocal pollution and because random motion
- * to avoid contention in one pool is likely to hold for others.
- * Lazily initialized on first submission (but null-checked
- * in other contexts to avoid unnecessary initialization).
- */
- static final ThreadLocal<Submitter> submitters;
-
- /**
* Permission required for callers of methods that may start or
* kill threads.
*/
@@ -1103,12 +1082,15 @@
* to paranoically avoid potential initialization circularities
* as well as to simplify generated code.
*/
- static final ForkJoinPool commonPool;
+ static final ForkJoinPool common;
/**
- * Common pool parallelism. Must equal commonPool.parallelism.
+ * Common pool parallelism. To allow simpler use and management
+ * when common pool threads are disabled, we allow the underlying
+ * common.config field to be zero, but in that case still report
+ * parallelism as 1 to reflect resulting caller-runs mechanics.
*/
- static final int commonPoolParallelism;
+ static final int commonParallelism;
/**
* Sequence number for creating workerNamePrefix.
@@ -1116,8 +1098,8 @@
private static int poolNumberSequence;
/**
- * Return the next sequence number. We don't expect this to
- * ever contend so use simple builtin sync.
+ * Returns the next sequence number. We don't expect this to
+ * ever contend, so use simple builtin sync.
*/
private static final synchronized int nextPoolId() {
return ++poolNumberSequence;
@@ -1161,7 +1143,7 @@
*/
private static final int SEED_INCREMENT = 0x61c88647;
- /**
+ /*
* Bits and masks for control variables
*
* Field ctl is a long packed with:
@@ -1268,39 +1250,28 @@
final int config; // mode and parallelism level
WorkQueue[] workQueues; // main registry
final ForkJoinWorkerThreadFactory factory;
- final Thread.UncaughtExceptionHandler ueh; // per-worker UEH
+ final UncaughtExceptionHandler ueh; // per-worker UEH
final String workerNamePrefix; // to create worker name string
volatile Object pad10, pad11, pad12, pad13, pad14, pad15, pad16, pad17;
volatile Object pad18, pad19, pad1a, pad1b;
- /*
+ /**
* Acquires the plock lock to protect worker array and related
* updates. This method is called only if an initial CAS on plock
- * fails. This acts as a spinLock for normal cases, but falls back
+ * fails. This acts as a spinlock for normal cases, but falls back
* to builtin monitor to block when (rarely) needed. This would be
* a terrible idea for a highly contended lock, but works fine as
* a more conservative alternative to a pure spinlock.
*/
private int acquirePlock() {
- int spins = PL_SPINS, r = 0, ps, nps;
+ int spins = PL_SPINS, ps, nps;
for (;;) {
if (((ps = plock) & PL_LOCK) == 0 &&
U.compareAndSwapInt(this, PLOCK, ps, nps = ps + PL_LOCK))
return nps;
- else if (r == 0) { // randomize spins if possible
- Thread t = Thread.currentThread(); WorkQueue w; Submitter z;
- if ((t instanceof ForkJoinWorkerThread) &&
- (w = ((ForkJoinWorkerThread)t).workQueue) != null)
- r = w.seed;
- else if ((z = submitters.get()) != null)
- r = z.seed;
- else
- r = 1;
- }
else if (spins >= 0) {
- r ^= r << 1; r ^= r >>> 3; r ^= r << 10; // xorshift
- if (r >= 0)
+ if (ThreadLocalRandom.nextSecondarySeed() >= 0)
--spins;
}
else if (U.compareAndSwapInt(this, PLOCK, ps, ps | PL_SIGNAL)) {
@@ -1332,39 +1303,6 @@
}
/**
- * Performs secondary initialization, called when plock is zero.
- * Creates workQueue array and sets plock to a valid value. The
- * lock body must be exception-free (so no try/finally) so we
- * optimistically allocate new array outside the lock and throw
- * away if (very rarely) not needed. (A similar tactic is used in
- * fullExternalPush.) Because the plock seq value can eventually
- * wrap around zero, this method harmlessly fails to reinitialize
- * if workQueues exists, while still advancing plock.
- *
- * Additionally tries to create the first worker.
- */
- private void initWorkers() {
- WorkQueue[] ws, nws; int ps;
- int p = config & SMASK; // find power of two table size
- int n = (p > 1) ? p - 1 : 1; // ensure at least 2 slots
- n |= n >>> 1; n |= n >>> 2; n |= n >>> 4; n |= n >>> 8; n |= n >>> 16;
- n = (n + 1) << 1;
- if ((ws = workQueues) == null || ws.length == 0)
- nws = new WorkQueue[n];
- else
- nws = null;
- if (((ps = plock) & PL_LOCK) != 0 ||
- !U.compareAndSwapInt(this, PLOCK, ps, ps += PL_LOCK))
- ps = acquirePlock();
- if (((ws = workQueues) == null || ws.length == 0) && nws != null)
- workQueues = nws;
- int nps = (ps & SHUTDOWN) | ((ps + PL_LOCK) & ~SHUTDOWN);
- if (!U.compareAndSwapInt(this, PLOCK, ps, nps))
- releasePlock(nps);
- tryAddWorker();
- }
-
- /**
* Tries to create and start one worker if fewer than target
* parallelism level exist. Adjusts counts etc on failure.
*/
@@ -1406,7 +1344,7 @@
* @return the worker's queue
*/
final WorkQueue registerWorker(ForkJoinWorkerThread wt) {
- Thread.UncaughtExceptionHandler handler; WorkQueue[] ws; int s, ps;
+ UncaughtExceptionHandler handler; WorkQueue[] ws; int s, ps;
wt.setDaemon(true);
if ((handler = ueh) != null)
wt.setUncaughtExceptionHandler(handler);
@@ -1450,7 +1388,7 @@
* array, and adjusts counts. If pool is shutting down, tries to
* complete termination.
*
- * @param wt the worker thread or null if construction failed
+ * @param wt the worker thread, or null if construction failed
* @param ex the exception causing failure, or null if none
*/
final void deregisterWorker(ForkJoinWorkerThread wt, Throwable ex) {
@@ -1489,7 +1427,7 @@
if (e > 0) { // activate or create replacement
if ((ws = workQueues) == null ||
(i = e & SMASK) >= ws.length ||
- (v = ws[i]) != null)
+ (v = ws[i]) == null)
break;
long nc = (((long)(v.nextWait & E_MASK)) |
((long)(u + UAC_UNIT) << 32));
@@ -1526,10 +1464,10 @@
* @param task the task. Caller must ensure non-null.
*/
final void externalPush(ForkJoinTask<?> task) {
- WorkQueue[] ws; WorkQueue q; Submitter z; int m; ForkJoinTask<?>[] a;
- if ((z = submitters.get()) != null && plock > 0 &&
+ WorkQueue[] ws; WorkQueue q; int z, m; ForkJoinTask<?>[] a;
+ if ((z = ThreadLocalRandom.getProbe()) != 0 && plock > 0 &&
(ws = workQueues) != null && (m = (ws.length - 1)) >= 0 &&
- (q = ws[m & z.seed & SQMASK]) != null &&
+ (q = ws[m & z & SQMASK]) != null &&
U.compareAndSwapInt(q, QLOCK, 0, 1)) { // lock
int b = q.base, s = q.top, n, an;
if ((a = q.array) != null && (an = a.length) > (n = s + 1 - b)) {
@@ -1549,34 +1487,48 @@
/**
* Full version of externalPush. This method is called, among
* other times, upon the first submission of the first task to the
- * pool, so must perform secondary initialization (via
- * initWorkers). It also detects first submission by an external
- * thread by looking up its ThreadLocal, and creates a new shared
- * queue if the one at index if empty or contended. The plock lock
- * body must be exception-free (so no try/finally) so we
- * optimistically allocate new queues outside the lock and throw
- * them away if (very rarely) not needed.
+ * pool, so must perform secondary initialization. It also
+ * detects first submission by an external thread by looking up
+ * its ThreadLocal, and creates a new shared queue if the one at
+ * index if empty or contended. The plock lock body must be
+ * exception-free (so no try/finally) so we optimistically
+ * allocate new queues outside the lock and throw them away if
+ * (very rarely) not needed.
+ *
+ * Secondary initialization occurs when plock is zero, to create
+ * workQueue array and set plock to a valid value. This lock body
+ * must also be exception-free. Because the plock seq value can
+ * eventually wrap around zero, this method harmlessly fails to
+ * reinitialize if workQueues exists, while still advancing plock.
*/
private void fullExternalPush(ForkJoinTask<?> task) {
- int r = 0; // random index seed
- for (Submitter z = submitters.get();;) {
+ int r;
+ if ((r = ThreadLocalRandom.getProbe()) == 0) {
+ ThreadLocalRandom.localInit();
+ r = ThreadLocalRandom.getProbe();
+ }
+ for (;;) {
WorkQueue[] ws; WorkQueue q; int ps, m, k;
- if (z == null) {
- if (U.compareAndSwapInt(this, INDEXSEED, r = indexSeed,
- r += SEED_INCREMENT) && r != 0)
- submitters.set(z = new Submitter(r));
- }
- else if (r == 0) { // move to a different index
- r = z.seed;
- r ^= r << 13; // same xorshift as WorkQueues
- r ^= r >>> 17;
- z.seed = r ^ (r << 5);
- }
- else if ((ps = plock) < 0)
+ boolean move = false;
+ if ((ps = plock) < 0)
throw new RejectedExecutionException();
else if (ps == 0 || (ws = workQueues) == null ||
- (m = ws.length - 1) < 0)
- initWorkers();
+ (m = ws.length - 1) < 0) { // initialize workQueues
+ int p = config & SMASK; // find power of two table size
+ int n = (p > 1) ? p - 1 : 1; // ensure at least 2 slots
+ n |= n >>> 1; n |= n >>> 2; n |= n >>> 4;
+ n |= n >>> 8; n |= n >>> 16; n = (n + 1) << 1;
+ WorkQueue[] nws = ((ws = workQueues) == null || ws.length == 0 ?
+ new WorkQueue[n] : null);
+ if (((ps = plock) & PL_LOCK) != 0 ||
+ !U.compareAndSwapInt(this, PLOCK, ps, ps += PL_LOCK))
+ ps = acquirePlock();
+ if (((ws = workQueues) == null || ws.length == 0) && nws != null)
+ workQueues = nws;
+ int nps = (ps & SHUTDOWN) | ((ps + PL_LOCK) & ~SHUTDOWN);
+ if (!U.compareAndSwapInt(this, PLOCK, ps, nps))
+ releasePlock(nps);
+ }
else if ((q = ws[k = r & m & SQMASK]) != null) {
if (q.qlock == 0 && U.compareAndSwapInt(q, QLOCK, 0, 1)) {
ForkJoinTask<?>[] a = q.array;
@@ -1598,7 +1550,7 @@
return;
}
}
- r = 0; // move on failure
+ move = true; // move on failure
}
else if (((ps = plock) & PL_LOCK) == 0) { // create new queue
q = new WorkQueue(this, null, SHARED_QUEUE, r);
@@ -1612,7 +1564,9 @@
releasePlock(nps);
}
else
- r = 0; // try elsewhere while lock held
+ move = true; // move if busy
+ if (move)
+ r = ThreadLocalRandom.advanceProbe(r);
}
}
@@ -1703,7 +1657,7 @@
* park awaiting signal, else lingering to help scan and signal.
*
* * If a non-empty queue discovered or left as a hint,
- * help wake up other workers before return
+ * help wake up other workers before return.
*
* @param w the worker (via its WorkQueue)
* @return a task or null if none found
@@ -1758,14 +1712,13 @@
else if ((int)(c >> AC_SHIFT) == 1 - (config & SMASK))
idleAwaitWork(w, nc, c);
}
- else if (w.eventCount < 0 && !tryTerminate(false, false) &&
- ctl == c) { // block
+ else if (w.eventCount < 0 && ctl == c) {
Thread wt = Thread.currentThread();
Thread.interrupted(); // clear status
U.putObject(wt, PARKBLOCKER, this);
w.parker = wt; // emulate LockSupport.park
if (w.eventCount < 0) // recheck
- U.park(false, 0L);
+ U.park(false, 0L); // block
w.parker = null;
U.putObject(wt, PARKBLOCKER, null);
}
@@ -1774,7 +1727,7 @@
(ws = workQueues) != null && h < ws.length &&
(q = ws[h]) != null) { // signal others before retry
WorkQueue v; Thread p; int u, i, s;
- for (int n = (config & SMASK) >>> 1;;) {
+ for (int n = (config & SMASK) - 1;;) {
int idleCount = (w.eventCount < 0) ? 0 : -1;
if (((s = idleCount - q.base + q.top) <= n &&
(n = s) <= 0) ||
@@ -1814,7 +1767,8 @@
*/
private void idleAwaitWork(WorkQueue w, long currentCtl, long prevCtl) {
if (w != null && w.eventCount < 0 &&
- !tryTerminate(false, false) && (int)prevCtl != 0) {
+ !tryTerminate(false, false) && (int)prevCtl != 0 &&
+ ctl == currentCtl) {
int dc = -(short)(currentCtl >>> TC_SHIFT);
long parkTime = dc < 0 ? FAST_IDLE_TIMEOUT: (dc + 1) * IDLE_TIMEOUT;
long deadline = System.nanoTime() + parkTime - TIMEOUT_SLOP;
@@ -1832,6 +1786,7 @@
if (deadline - System.nanoTime() <= 0L &&
U.compareAndSwapLong(this, CTL, currentCtl, prevCtl)) {
w.eventCount = (w.eventCount + E_SEQ) | E_MASK;
+ w.hint = -1;
w.qlock = -1; // shrink
break;
}
@@ -1973,7 +1928,6 @@
* @param task the task to join
* @param mode if shared, exit upon completing any task
* if all workers are active
- *
*/
private int helpComplete(ForkJoinTask<?> task, int mode) {
WorkQueue[] ws; WorkQueue q; int m, n, s, u;
@@ -2125,29 +2079,22 @@
/**
* Returns a (probably) non-empty steal queue, if one is found
- * during a random, then cyclic scan, else null. This method must
- * be retried by caller if, by the time it tries to use the queue,
- * it is empty.
+ * during a scan, else null. This method must be retried by
+ * caller if, by the time it tries to use the queue, it is empty.
* @param r a (random) seed for scanning
*/
private WorkQueue findNonEmptyStealQueue(int r) {
- for (WorkQueue[] ws;;) {
- int ps = plock, m, n;
- if ((ws = workQueues) == null || (m = ws.length - 1) < 1)
- return null;
- for (int j = (m + 1) << 2; ;) {
- WorkQueue q = ws[(((r + j) << 1) | 1) & m];
- if (q != null && (n = q.base - q.top) < 0) {
- if (n < -1)
- signalWork(q);
- return q;
- }
- else if (--j < 0) {
- if (plock == ps)
- return null;
- break;
+ for (;;) {
+ int ps = plock, m; WorkQueue[] ws; WorkQueue q;
+ if ((ws = workQueues) != null && (m = ws.length - 1) >= 0) {
+ for (int j = (m + 1) << 2; j >= 0; --j) {
+ if ((q = ws[(((r + j) << 1) | 1) & m]) != null &&
+ q.base - q.top < 0)
+ return q;
}
}
+ if (plock == ps)
+ return null;
}
}
@@ -2159,37 +2106,34 @@
*/
final void helpQuiescePool(WorkQueue w) {
for (boolean active = true;;) {
- ForkJoinTask<?> localTask; // exhaust local queue
- while ((localTask = w.nextLocalTask()) != null)
- localTask.doExec();
- // Similar to loop in scan(), but ignoring submissions
- WorkQueue q = findNonEmptyStealQueue(w.nextSeed());
- if (q != null) {
- ForkJoinTask<?> t; int b;
+ long c; WorkQueue q; ForkJoinTask<?> t; int b;
+ while ((t = w.nextLocalTask()) != null) {
+ if (w.base - w.top < 0)
+ signalWork(w);
+ t.doExec();
+ }
+ if ((q = findNonEmptyStealQueue(w.nextSeed())) != null) {
if (!active) { // re-establish active count
- long c;
active = true;
do {} while (!U.compareAndSwapLong
(this, CTL, c = ctl, c + AC_UNIT));
}
- if ((b = q.base) - q.top < 0 && (t = q.pollAt(b)) != null)
+ if ((b = q.base) - q.top < 0 && (t = q.pollAt(b)) != null) {
+ if (q.base - q.top < 0)
+ signalWork(q);
w.runSubtask(t);
- }
- else {
- long c;
- if (active) { // decrement active count without queuing
- active = false;
- do {} while (!U.compareAndSwapLong
- (this, CTL, c = ctl, c -= AC_UNIT));
- }
- else
- c = ctl; // re-increment on exit
- if ((int)(c >> AC_SHIFT) + (config & SMASK) == 0) {
- do {} while (!U.compareAndSwapLong
- (this, CTL, c = ctl, c + AC_UNIT));
- break;
}
}
+ else if (active) { // decrement active count without queuing
+ long nc = (c = ctl) - AC_UNIT;
+ if ((int)(nc >> AC_SHIFT) + (config & SMASK) == 0)
+ return; // bypass decrement-then-increment
+ if (U.compareAndSwapLong(this, CTL, c, nc))
+ active = false;
+ }
+ else if ((int)((c = ctl) >> AC_SHIFT) + (config & SMASK) == 0 &&
+ U.compareAndSwapLong(this, CTL, c, c + AC_UNIT))
+ return;
}
}
@@ -2205,8 +2149,11 @@
return t;
if ((q = findNonEmptyStealQueue(w.nextSeed())) == null)
return null;
- if ((b = q.base) - q.top < 0 && (t = q.pollAt(b)) != null)
+ if ((b = q.base) - q.top < 0 && (t = q.pollAt(b)) != null) {
+ if (q.base - q.top < 0)
+ signalWork(q);
return t;
+ }
}
}
@@ -2235,7 +2182,7 @@
* producing extra tasks amortizes the uncertainty of progress and
* diffusion assumptions.
*
- * So, users will want to use values larger, but not much larger
+ * So, users will want to use values larger (but not much larger)
* than 1 to both smooth over transient shortages and hedge
* against uneven progress; as traded off against the cost of
* extra task overhead. We leave the user to pick a threshold
@@ -2288,45 +2235,49 @@
* @return true if now terminating or terminated
*/
private boolean tryTerminate(boolean now, boolean enable) {
- if (this == commonPool) // cannot shut down
+ int ps;
+ if (this == common) // cannot shut down
return false;
+ if ((ps = plock) >= 0) { // enable by setting plock
+ if (!enable)
+ return false;
+ if ((ps & PL_LOCK) != 0 ||
+ !U.compareAndSwapInt(this, PLOCK, ps, ps += PL_LOCK))
+ ps = acquirePlock();
+ int nps = ((ps + PL_LOCK) & ~SHUTDOWN) | SHUTDOWN;
+ if (!U.compareAndSwapInt(this, PLOCK, ps, nps))
+ releasePlock(nps);
+ }
for (long c;;) {
- if (((c = ctl) & STOP_BIT) != 0) { // already terminating
+ if (((c = ctl) & STOP_BIT) != 0) { // already terminating
if ((short)(c >>> TC_SHIFT) == -(config & SMASK)) {
synchronized (this) {
- notifyAll(); // signal when 0 workers
+ notifyAll(); // signal when 0 workers
}
}
return true;
}
- if (plock >= 0) { // not yet enabled
- int ps;
- if (!enable)
+ if (!now) { // check if idle & no tasks
+ WorkQueue[] ws; WorkQueue w;
+ if ((int)(c >> AC_SHIFT) != -(config & SMASK))
return false;
- if (((ps = plock) & PL_LOCK) != 0 ||
- !U.compareAndSwapInt(this, PLOCK, ps, ps += PL_LOCK))
- ps = acquirePlock();
- if (!U.compareAndSwapInt(this, PLOCK, ps, SHUTDOWN))
- releasePlock(SHUTDOWN);
- }
- if (!now) { // check if idle & no tasks
- if ((int)(c >> AC_SHIFT) != -(config & SMASK) ||
- hasQueuedSubmissions())
- return false;
- // Check for unqueued inactive workers. One pass suffices.
- WorkQueue[] ws = workQueues; WorkQueue w;
- if (ws != null) {
- for (int i = 1; i < ws.length; i += 2) {
- if ((w = ws[i]) != null && w.eventCount >= 0)
- return false;
+ if ((ws = workQueues) != null) {
+ for (int i = 0; i < ws.length; ++i) {
+ if ((w = ws[i]) != null) {
+ if (!w.isEmpty()) { // signal unprocessed tasks
+ signalWork(w);
+ return false;
+ }
+ if ((i & 1) != 0 && w.eventCount >= 0)
+ return false; // unqueued inactive worker
+ }
}
}
}
if (U.compareAndSwapLong(this, CTL, c, c | STOP_BIT)) {
for (int pass = 0; pass < 3; ++pass) {
- WorkQueue[] ws = workQueues;
- if (ws != null) {
- WorkQueue w; Thread wt;
+ WorkQueue[] ws; WorkQueue w; Thread wt;
+ if ((ws = workQueues) != null) {
int n = ws.length;
for (int i = 0; i < n; ++i) {
if ((w = ws[i]) != null) {
@@ -2337,7 +2288,7 @@
if (!wt.isInterrupted()) {
try {
wt.interrupt();
- } catch (SecurityException ignore) {
+ } catch (Throwable ignore) {
}
}
U.unpark(wt);
@@ -2348,7 +2299,7 @@
// Wake up workers parked on event queue
int i, e; long cc; Thread p;
while ((e = (int)(cc = ctl) & E_MASK) != 0 &&
- (i = e & SMASK) < n &&
+ (i = e & SMASK) < n && i >= 0 &&
(w = ws[i]) != null) {
long nc = ((long)(w.nextWait & E_MASK) |
((cc + AC_UNIT) & AC_MASK) |
@@ -2374,26 +2325,26 @@
* least one task.
*/
static WorkQueue commonSubmitterQueue() {
- ForkJoinPool p; WorkQueue[] ws; int m; Submitter z;
- return ((z = submitters.get()) != null &&
- (p = commonPool) != null &&
+ ForkJoinPool p; WorkQueue[] ws; int m, z;
+ return ((z = ThreadLocalRandom.getProbe()) != 0 &&
+ (p = common) != null &&
(ws = p.workQueues) != null &&
(m = ws.length - 1) >= 0) ?
- ws[m & z.seed & SQMASK] : null;
+ ws[m & z & SQMASK] : null;
}
/**
* Tries to pop the given task from submitter's queue in common pool.
*/
static boolean tryExternalUnpush(ForkJoinTask<?> t) {
- ForkJoinPool p; WorkQueue[] ws; WorkQueue q; Submitter z;
- ForkJoinTask<?>[] a; int m, s;
+ ForkJoinPool p; WorkQueue[] ws; WorkQueue q;
+ ForkJoinTask<?>[] a; int m, s, z;
if (t != null &&
- (z = submitters.get()) != null &&
- (p = commonPool) != null &&
+ (z = ThreadLocalRandom.getProbe()) != 0 &&
+ (p = common) != null &&
(ws = p.workQueues) != null &&
(m = ws.length - 1) >= 0 &&
- (q = ws[m & z.seed & SQMASK]) != null &&
+ (q = ws[m & z & SQMASK]) != null &&
(s = q.top) != q.base &&
(a = q.array) != null) {
long j = (((a.length - 1) & (s - 1)) << ASHIFT) + ABASE;
@@ -2445,9 +2396,10 @@
if (task != null)
task.doExec();
if (root.status < 0 ||
- (u = (int)(ctl >>> 32)) >= 0 || (u >> UAC_SHIFT) >= 0)
+ (config != 0 &&
+ ((u = (int)(ctl >>> 32)) >= 0 || (u >> UAC_SHIFT) >= 0)))
break;
- if (task == null) {
+ if (task == null) {
helpSignal(root, q.poolIndex);
if (root.status >= 0)
helpComplete(root, SHARED_QUEUE);
@@ -2463,14 +2415,14 @@
*/
static void externalHelpJoin(ForkJoinTask<?> t) {
// Some hard-to-avoid overlap with tryExternalUnpush
- ForkJoinPool p; WorkQueue[] ws; WorkQueue q, w; Submitter z;
- ForkJoinTask<?>[] a; int m, s, n;
+ ForkJoinPool p; WorkQueue[] ws; WorkQueue q, w;
+ ForkJoinTask<?>[] a; int m, s, n, z;
if (t != null &&
- (z = submitters.get()) != null &&
- (p = commonPool) != null &&
+ (z = ThreadLocalRandom.getProbe()) != 0 &&
+ (p = common) != null &&
(ws = p.workQueues) != null &&
(m = ws.length - 1) >= 0 &&
- (q = ws[m & z.seed & SQMASK]) != null &&
+ (q = ws[m & z & SQMASK]) != null &&
(a = q.array) != null) {
int am = a.length - 1;
if ((s = q.top) != q.base) {
@@ -2496,18 +2448,6 @@
}
}
- /**
- * Restricted version of helpQuiescePool for external callers
- */
- static void externalHelpQuiescePool() {
- ForkJoinPool p; ForkJoinTask<?> t; WorkQueue q; int b;
- if ((p = commonPool) != null &&
- (q = p.findNonEmptyStealQueue(1)) != null &&
- (b = q.base) - q.top < 0 &&
- (t = q.pollAt(b)) != null)
- t.doExec();
- }
-
// Exported methods
// Constructors
@@ -2524,7 +2464,7 @@
* java.lang.RuntimePermission}{@code ("modifyThread")}
*/
public ForkJoinPool() {
- this(Runtime.getRuntime().availableProcessors(),
+ this(Math.min(MAX_CAP, Runtime.getRuntime().availableProcessors()),
defaultForkJoinWorkerThreadFactory, null, false);
}
@@ -2572,50 +2512,63 @@
*/
public ForkJoinPool(int parallelism,
ForkJoinWorkerThreadFactory factory,
- Thread.UncaughtExceptionHandler handler,
+ UncaughtExceptionHandler handler,
boolean asyncMode) {
+ this(checkParallelism(parallelism),
+ checkFactory(factory),
+ handler,
+ asyncMode,
+ "ForkJoinPool-" + nextPoolId() + "-worker-");
checkPermission();
+ }
+
+ private static int checkParallelism(int parallelism) {
+ if (parallelism <= 0 || parallelism > MAX_CAP)
+ throw new IllegalArgumentException();
+ return parallelism;
+ }
+
+ private static ForkJoinWorkerThreadFactory checkFactory
+ (ForkJoinWorkerThreadFactory factory) {
if (factory == null)
throw new NullPointerException();
- if (parallelism <= 0 || parallelism > MAX_CAP)
- throw new IllegalArgumentException();
+ return factory;
+ }
+
+ /**
+ * Creates a {@code ForkJoinPool} with the given parameters, without
+ * any security checks or parameter validation. Invoked directly by
+ * makeCommonPool.
+ */
+ private ForkJoinPool(int parallelism,
+ ForkJoinWorkerThreadFactory factory,
+ UncaughtExceptionHandler handler,
+ boolean asyncMode,
+ String workerNamePrefix) {
+ this.workerNamePrefix = workerNamePrefix;
this.factory = factory;
this.ueh = handler;
this.config = parallelism | (asyncMode ? (FIFO_QUEUE << 16) : 0);
long np = (long)(-parallelism); // offset ctl counts
this.ctl = ((np << AC_SHIFT) & AC_MASK) | ((np << TC_SHIFT) & TC_MASK);
- int pn = nextPoolId();
- StringBuilder sb = new StringBuilder("ForkJoinPool-");
- sb.append(Integer.toString(pn));
- sb.append("-worker-");
- this.workerNamePrefix = sb.toString();
- }
-
- /**
- * Constructor for common pool, suitable only for static initialization.
- * Basically the same as above, but uses smallest possible initial footprint.
- */
- ForkJoinPool(int parallelism, long ctl,
- ForkJoinWorkerThreadFactory factory,
- Thread.UncaughtExceptionHandler handler) {
- this.config = parallelism;
- this.ctl = ctl;
- this.factory = factory;
- this.ueh = handler;
- this.workerNamePrefix = "ForkJoinPool.commonPool-worker-";
}
/**
* Returns the common pool instance. This pool is statically
- * constructed; its run state is unaffected by attempts to
- * {@link #shutdown} or {@link #shutdownNow}.
+ * constructed; its run state is unaffected by attempts to {@link
+ * #shutdown} or {@link #shutdownNow}. However this pool and any
+ * ongoing processing are automatically terminated upon program
+ * {@link System#exit}. Any program that relies on asynchronous
+ * task processing to complete before program termination should
+ * invoke {@code commonPool().}{@link #awaitQuiescence awaitQuiescence},
+ * before exit.
*
* @return the common pool instance
* @since 1.8
*/
public static ForkJoinPool commonPool() {
- // assert commonPool != null : "static init error";
- return commonPool;
+ // assert common != null : "static init error";
+ return common;
}
// Execution methods
@@ -2671,7 +2624,7 @@
if (task instanceof ForkJoinTask<?>) // avoid re-wrap
job = (ForkJoinTask<?>) task;
else
- job = new ForkJoinTask.AdaptedRunnableAction(task);
+ job = new ForkJoinTask.RunnableExecuteAction(task);
externalPush(job);
}
@@ -2738,27 +2691,23 @@
// In previous versions of this class, this method constructed
// a task to run ForkJoinTask.invokeAll, but now external
// invocation of multiple tasks is at least as efficient.
- List<ForkJoinTask<T>> fs = new ArrayList<ForkJoinTask<T>>(tasks.size());
- // Workaround needed because method wasn't declared with
- // wildcards in return type but should have been.
- @SuppressWarnings({"unchecked", "rawtypes"})
- List<Future<T>> futures = (List<Future<T>>) (List) fs;
+ ArrayList<Future<T>> futures = new ArrayList<Future<T>>(tasks.size());
boolean done = false;
try {
for (Callable<T> t : tasks) {
ForkJoinTask<T> f = new ForkJoinTask.AdaptedCallable<T>(t);
+ futures.add(f);
externalPush(f);
- fs.add(f);
}
- for (ForkJoinTask<T> f : fs)
- f.quietlyJoin();
+ for (int i = 0, size = futures.size(); i < size; i++)
+ ((ForkJoinTask<?>)futures.get(i)).quietlyJoin();
done = true;
return futures;
} finally {
if (!done)
- for (ForkJoinTask<T> f : fs)
- f.cancel(false);
+ for (int i = 0, size = futures.size(); i < size; i++)
+ futures.get(i).cancel(false);
}
}
@@ -2777,7 +2726,7 @@
*
* @return the handler, or {@code null} if none
*/
- public Thread.UncaughtExceptionHandler getUncaughtExceptionHandler() {
+ public UncaughtExceptionHandler getUncaughtExceptionHandler() {
return ueh;
}
@@ -2787,7 +2736,8 @@
* @return the targeted parallelism level of this pool
*/
public int getParallelism() {
- return config & SMASK;
+ int par = (config & SMASK);
+ return (par > 0) ? par : 1;
}
/**
@@ -2797,7 +2747,7 @@
* @since 1.8
*/
public static int getCommonPoolParallelism() {
- return commonPoolParallelism;
+ return commonParallelism;
}
/**
@@ -3055,7 +3005,7 @@
* Possibly initiates an orderly shutdown in which previously
* submitted tasks are executed, but no new tasks will be
* accepted. Invocation has no effect on execution state if this
- * is the {@link #commonPool}, and no additional effect if
+ * is the {@link #commonPool()}, and no additional effect if
* already shut down. Tasks that are in the process of being
* submitted concurrently during the course of this method may or
* may not be rejected.
@@ -3073,7 +3023,7 @@
/**
* Possibly attempts to cancel and/or stop all tasks, and reject
* all subsequently submitted tasks. Invocation has no effect on
- * execution state if this is the {@link #commonPool}, and no
+ * execution state if this is the {@link #commonPool()}, and no
* additional effect if already shut down. Otherwise, tasks that
* are in the process of being submitted or executed concurrently
* during the course of this method may or may not be
@@ -3136,9 +3086,10 @@
/**
* Blocks until all tasks have completed execution after a
* shutdown request, or the timeout occurs, or the current thread
- * is interrupted, whichever happens first. Note that the {@link
- * #commonPool()} never terminates until program shutdown so
- * this method will always time out.
+ * is interrupted, whichever happens first. Because the {@link
+ * #commonPool()} never terminates until program shutdown, when
+ * applied to the common pool, this method is equivalent to {@link
+ * #awaitQuiescence(long, TimeUnit)} but always returns {@code false}.
*
* @param timeout the maximum time to wait
* @param unit the time unit of the timeout argument
@@ -3148,6 +3099,12 @@
*/
public boolean awaitTermination(long timeout, TimeUnit unit)
throws InterruptedException {
+ if (Thread.interrupted())
+ throw new InterruptedException();
+ if (this == common) {
+ awaitQuiescence(timeout, unit);
+ return false;
+ }
long nanos = unit.toNanos(timeout);
if (isTerminated())
return true;
@@ -3167,6 +3124,62 @@
}
/**
+ * If called by a ForkJoinTask operating in this pool, equivalent
+ * in effect to {@link ForkJoinTask#helpQuiesce}. Otherwise,
+ * waits and/or attempts to assist performing tasks until this
+ * pool {@link #isQuiescent} or the indicated timeout elapses.
+ *
+ * @param timeout the maximum time to wait
+ * @param unit the time unit of the timeout argument
+ * @return {@code true} if quiescent; {@code false} if the
+ * timeout elapsed.
+ */
+ public boolean awaitQuiescence(long timeout, TimeUnit unit) {
+ long nanos = unit.toNanos(timeout);
+ ForkJoinWorkerThread wt;
+ Thread thread = Thread.currentThread();
+ if ((thread instanceof ForkJoinWorkerThread) &&
+ (wt = (ForkJoinWorkerThread)thread).pool == this) {
+ helpQuiescePool(wt.workQueue);
+ return true;
+ }
+ long startTime = System.nanoTime();
+ WorkQueue[] ws;
+ int r = 0, m;
+ boolean found = true;
+ while (!isQuiescent() && (ws = workQueues) != null &&
+ (m = ws.length - 1) >= 0) {
+ if (!found) {
+ if ((System.nanoTime() - startTime) > nanos)
+ return false;
+ Thread.yield(); // cannot block
+ }
+ found = false;
+ for (int j = (m + 1) << 2; j >= 0; --j) {
+ ForkJoinTask<?> t; WorkQueue q; int b;
+ if ((q = ws[r++ & m]) != null && (b = q.base) - q.top < 0) {
+ found = true;
+ if ((t = q.pollAt(b)) != null) {
+ if (q.base - q.top < 0)
+ signalWork(q);
+ t.doExec();
+ }
+ break;
+ }
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Waits and/or attempts to assist performing tasks indefinitely
+ * until the {@link #commonPool()} {@link #isQuiescent}.
+ */
+ static void quiesceCommonPool() {
+ common.awaitQuiescence(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
+ }
+
+ /**
* Interface for extending managed parallelism for tasks running
* in {@link ForkJoinPool}s.
*
@@ -3175,9 +3188,9 @@
* not necessary. Method {@code block} blocks the current thread
* if necessary (perhaps internally invoking {@code isReleasable}
* before actually blocking). These actions are performed by any
- * thread invoking {@link ForkJoinPool#managedBlock}. The
- * unusual methods in this API accommodate synchronizers that may,
- * but don't usually, block for long periods. Similarly, they
+ * thread invoking {@link ForkJoinPool#managedBlock(ManagedBlocker)}.
+ * The unusual methods in this API accommodate synchronizers that
+ * may, but don't usually, block for long periods. Similarly, they
* allow more efficient internal handling of cases in which
* additional workers may be, but usually are not, needed to
* ensure sufficient parallelism. Toward this end,
@@ -3235,6 +3248,7 @@
/**
* Returns {@code true} if blocking is unnecessary.
+ * @return {@code true} if blocking is unnecessary
*/
boolean isReleasable();
}
@@ -3319,7 +3333,7 @@
private static final long QLOCK;
static {
- int s; // initialize field offsets for CAS etc
+ // initialize field offsets for CAS etc
try {
U = sun.misc.Unsafe.getUnsafe();
Class<?> k = ForkJoinPool.class;
@@ -3339,54 +3353,58 @@
(wk.getDeclaredField("qlock"));
Class<?> ak = ForkJoinTask[].class;
ABASE = U.arrayBaseOffset(ak);
- s = U.arrayIndexScale(ak);
- ASHIFT = 31 - Integer.numberOfLeadingZeros(s);
+ int scale = U.arrayIndexScale(ak);
+ if ((scale & (scale - 1)) != 0)
+ throw new Error("data type scale not a power of two");
+ ASHIFT = 31 - Integer.numberOfLeadingZeros(scale);
} catch (Exception e) {
throw new Error(e);
}
- if ((s & (s-1)) != 0)
- throw new Error("data type scale not a power of two");
- submitters = new ThreadLocal<Submitter>();
- ForkJoinWorkerThreadFactory fac = defaultForkJoinWorkerThreadFactory =
+ defaultForkJoinWorkerThreadFactory =
new DefaultForkJoinWorkerThreadFactory();
modifyThreadPermission = new RuntimePermission("modifyThread");
- /*
- * Establish common pool parameters. For extra caution,
- * computations to set up common pool state are here; the
- * constructor just assigns these values to fields.
- */
+ common = java.security.AccessController.doPrivileged
+ (new java.security.PrivilegedAction<ForkJoinPool>() {
+ public ForkJoinPool run() { return makeCommonPool(); }});
+ int par = common.config; // report 1 even if threads disabled
+ commonParallelism = par > 0 ? par : 1;
+ }
- int par = 0;
- Thread.UncaughtExceptionHandler handler = null;
- try { // TBD: limit or report ignored exceptions?
+ /**
+ * Creates and returns the common pool, respecting user settings
+ * specified via system properties.
+ */
+ private static ForkJoinPool makeCommonPool() {
+ int parallelism = -1;
+ ForkJoinWorkerThreadFactory factory
+ = defaultForkJoinWorkerThreadFactory;
+ UncaughtExceptionHandler handler = null;
+ try { // ignore exceptions in accesing/parsing properties
String pp = System.getProperty
("java.util.concurrent.ForkJoinPool.common.parallelism");
- String hp = System.getProperty
- ("java.util.concurrent.ForkJoinPool.common.exceptionHandler");
String fp = System.getProperty
("java.util.concurrent.ForkJoinPool.common.threadFactory");
+ String hp = System.getProperty
+ ("java.util.concurrent.ForkJoinPool.common.exceptionHandler");
+ if (pp != null)
+ parallelism = Integer.parseInt(pp);
if (fp != null)
- fac = ((ForkJoinWorkerThreadFactory)ClassLoader.
- getSystemClassLoader().loadClass(fp).newInstance());
+ factory = ((ForkJoinWorkerThreadFactory)ClassLoader.
+ getSystemClassLoader().loadClass(fp).newInstance());
if (hp != null)
- handler = ((Thread.UncaughtExceptionHandler)ClassLoader.
+ handler = ((UncaughtExceptionHandler)ClassLoader.
getSystemClassLoader().loadClass(hp).newInstance());
- if (pp != null)
- par = Integer.parseInt(pp);
} catch (Exception ignore) {
}
- if (par <= 0)
- par = Runtime.getRuntime().availableProcessors();
- if (par > MAX_CAP)
- par = MAX_CAP;
- commonPoolParallelism = par;
- long np = (long)(-par); // precompute initial ctl value
- long ct = ((np << AC_SHIFT) & AC_MASK) | ((np << TC_SHIFT) & TC_MASK);
-
- commonPool = new ForkJoinPool(par, ct, fac, handler);
+ if (parallelism < 0)
+ parallelism = Runtime.getRuntime().availableProcessors();
+ if (parallelism > MAX_CAP)
+ parallelism = MAX_CAP;
+ return new ForkJoinPool(parallelism, factory, handler, false,
+ "ForkJoinPool.commonPool-worker-");
}
}
--- a/jdk/src/share/classes/java/util/concurrent/ForkJoinTask.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/concurrent/ForkJoinTask.java Tue Mar 12 18:12:44 2013 -0700
@@ -464,7 +464,7 @@
}
/**
- * Records exception and possibly propagates
+ * Records exception and possibly propagates.
*
* @return status on exit
*/
@@ -497,7 +497,7 @@
}
/**
- * Removes exception node and clears status
+ * Removes exception node and clears status.
*/
private void clearExceptionalCompletion() {
int h = System.identityHashCode(this);
@@ -635,7 +635,7 @@
throw (Error)ex;
if (ex instanceof RuntimeException)
throw (RuntimeException)ex;
- throw uncheckedThrowable(ex, RuntimeException.class);
+ ForkJoinTask.<RuntimeException>uncheckedThrow(ex);
}
}
@@ -645,8 +645,9 @@
* unchecked exceptions
*/
@SuppressWarnings("unchecked") static <T extends Throwable>
- T uncheckedThrowable(final Throwable t, final Class<T> c) {
- return (T)t; // rely on vacuous cast
+ void uncheckedThrow(Throwable t) throws T {
+ if (t != null)
+ throw (T)t; // rely on vacuous cast
}
/**
@@ -681,7 +682,7 @@
if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread)
((ForkJoinWorkerThread)t).workQueue.push(this);
else
- ForkJoinPool.commonPool.externalPush(this);
+ ForkJoinPool.common.externalPush(this);
return this;
}
@@ -857,7 +858,7 @@
* <p>This method is designed to be invoked by <em>other</em>
* tasks. To terminate the current task, you can just return or
* throw an unchecked exception from its computation method, or
- * invoke {@link #completeExceptionally}.
+ * invoke {@link #completeExceptionally(Throwable)}.
*
* @param mayInterruptIfRunning this value has no effect in the
* default implementation because interrupts are not used to
@@ -1007,8 +1008,9 @@
if (Thread.interrupted())
throw new InterruptedException();
// Messy in part because we measure in nanosecs, but wait in millisecs
- int s; long ns, ms;
- if ((s = status) >= 0 && (ns = unit.toNanos(timeout)) > 0L) {
+ int s; long ms;
+ long ns = unit.toNanos(timeout);
+ if ((s = status) >= 0 && ns > 0L) {
long deadline = System.nanoTime() + ns;
ForkJoinPool p = null;
ForkJoinPool.WorkQueue w = null;
@@ -1104,7 +1106,7 @@
wt.pool.helpQuiescePool(wt.workQueue);
}
else
- ForkJoinPool.externalHelpQuiescePool();
+ ForkJoinPool.quiesceCommonPool();
}
/**
@@ -1391,6 +1393,24 @@
}
/**
+ * Adaptor for Runnables in which failure forces worker exception
+ */
+ static final class RunnableExecuteAction extends ForkJoinTask<Void> {
+ final Runnable runnable;
+ RunnableExecuteAction(Runnable runnable) {
+ if (runnable == null) throw new NullPointerException();
+ this.runnable = runnable;
+ }
+ public final Void getRawResult() { return null; }
+ public final void setRawResult(Void v) { }
+ public final boolean exec() { runnable.run(); return true; }
+ void internalPropagateException(Throwable ex) {
+ rethrow(ex); // rethrow outside exec() catches.
+ }
+ private static final long serialVersionUID = 5232453952276885070L;
+ }
+
+ /**
* Adaptor for Callables
*/
static final class AdaptedCallable<T> extends ForkJoinTask<T>
--- a/jdk/src/share/classes/java/util/concurrent/ThreadLocalRandom.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/concurrent/ThreadLocalRandom.java Tue Mar 12 18:12:44 2013 -0700
@@ -83,22 +83,20 @@
* programs.
*
* Because this class is in a different package than class Thread,
- * field access methods must use Unsafe to bypass access control
- * rules. The base functionality of Random methods is
- * conveniently isolated in method next(bits), that just reads and
- * writes the Thread field rather than its own field. However, to
- * conform to the requirements of the Random constructor, during
- * construction, the common static ThreadLocalRandom must maintain
- * initialization and value fields, mainly for the sake of
- * disabling user calls to setSeed while still allowing a call
- * from constructor. For serialization compatibility, these
- * fields are left with the same declarations as used in the
- * previous ThreadLocal-based version of this class, that used
- * them differently. Note that serialization is completely
- * unnecessary because there is only a static singleton. But these
- * mechanics still ensure compatibility across versions.
+ * field access methods use Unsafe to bypass access control rules.
+ * The base functionality of Random methods is conveniently
+ * isolated in method next(bits), that just reads and writes the
+ * Thread field rather than its own field. However, to conform to
+ * the requirements of the Random superclass constructor, the
+ * common static ThreadLocalRandom maintains an "initialized"
+ * field for the sake of rejecting user calls to setSeed while
+ * still allowing a call from constructor. Note that
+ * serialization is completely unnecessary because there is only a
+ * static singleton. But we generate a serial form containing
+ * "rnd" and "initialized" fields to ensure compatibility across
+ * versions.
*
- * Per-instance initialization is similar to that in the no-arg
+ * Per-thread initialization is similar to that in the no-arg
* Random constructor, but we avoid correlation among not only
* initial seeds of those created in different threads, but also
* those created using class Random itself; while at the same time
@@ -132,10 +130,11 @@
private static final ThreadLocal<Double> nextLocalGaussian =
new ThreadLocal<Double>();
- /*
- * Field used only during singleton initialization
+ /**
+ * Field used only during singleton initialization.
+ * True when constructor completes.
*/
- boolean initialized; // true when constructor completes
+ boolean initialized;
/** Constructor used only for static singleton */
private ThreadLocalRandom() {
@@ -184,7 +183,8 @@
* @throws UnsupportedOperationException always
*/
public void setSeed(long seed) {
- if (initialized) // allow call from super() constructor
+ // only allow call from super() constructor
+ if (initialized)
throw new UnsupportedOperationException();
}
@@ -357,39 +357,29 @@
r ^= r >>> 17;
r ^= r << 5;
}
- else if ((r = (int)UNSAFE.getLong(t, SEED)) == 0)
- r = 1; // avoid zero
+ else {
+ localInit();
+ if ((r = (int)UNSAFE.getLong(t, SEED)) == 0)
+ r = 1; // avoid zero
+ }
UNSAFE.putInt(t, SECONDARY, r);
return r;
}
- // Serialization support, maintains original persistent form.
+ // Serialization support
private static final long serialVersionUID = -5851777807851030925L;
/**
* @serialField rnd long
+ * seed for random computations
* @serialField initialized boolean
- * @serialField pad0 long
- * @serialField pad1 long
- * @serialField pad2 long
- * @serialField pad3 long
- * @serialField pad4 long
- * @serialField pad5 long
- * @serialField pad6 long
- * @serialField pad7 long
+ * always true
*/
private static final ObjectStreamField[] serialPersistentFields = {
new ObjectStreamField("rnd", long.class),
- new ObjectStreamField("initialized", boolean.class),
- new ObjectStreamField("pad0", long.class),
- new ObjectStreamField("pad1", long.class),
- new ObjectStreamField("pad2", long.class),
- new ObjectStreamField("pad3", long.class),
- new ObjectStreamField("pad4", long.class),
- new ObjectStreamField("pad5", long.class),
- new ObjectStreamField("pad6", long.class),
- new ObjectStreamField("pad7", long.class) };
+ new ObjectStreamField("initialized", boolean.class)
+ };
/**
* Saves the {@code ThreadLocalRandom} to a stream (that is, serializes it).
@@ -398,16 +388,8 @@
throws java.io.IOException {
java.io.ObjectOutputStream.PutField fields = out.putFields();
- fields.put("rnd", 0L);
+ fields.put("rnd", UNSAFE.getLong(Thread.currentThread(), SEED));
fields.put("initialized", true);
- fields.put("pad0", 0L);
- fields.put("pad1", 0L);
- fields.put("pad2", 0L);
- fields.put("pad3", 0L);
- fields.put("pad4", 0L);
- fields.put("pad5", 0L);
- fields.put("pad6", 0L);
- fields.put("pad7", 0L);
out.writeFields();
}
--- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicInteger.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicInteger.java Tue Mar 12 18:12:44 2013 -0700
@@ -219,7 +219,7 @@
int prev, next;
do {
prev = get();
- next = updateFunction.operateAsInt(prev);
+ next = updateFunction.applyAsInt(prev);
} while (!compareAndSet(prev, next));
return prev;
}
@@ -238,7 +238,7 @@
int prev, next;
do {
prev = get();
- next = updateFunction.operateAsInt(prev);
+ next = updateFunction.applyAsInt(prev);
} while (!compareAndSet(prev, next));
return next;
}
@@ -262,7 +262,7 @@
int prev, next;
do {
prev = get();
- next = accumulatorFunction.operateAsInt(prev, x);
+ next = accumulatorFunction.applyAsInt(prev, x);
} while (!compareAndSet(prev, next));
return prev;
}
@@ -286,7 +286,7 @@
int prev, next;
do {
prev = get();
- next = accumulatorFunction.operateAsInt(prev, x);
+ next = accumulatorFunction.applyAsInt(prev, x);
} while (!compareAndSet(prev, next));
return next;
}
--- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java Tue Mar 12 18:12:44 2013 -0700
@@ -263,7 +263,7 @@
int prev, next;
do {
prev = getRaw(offset);
- next = updateFunction.operateAsInt(prev);
+ next = updateFunction.applyAsInt(prev);
} while (!compareAndSetRaw(offset, prev, next));
return prev;
}
@@ -284,7 +284,7 @@
int prev, next;
do {
prev = getRaw(offset);
- next = updateFunction.operateAsInt(prev);
+ next = updateFunction.applyAsInt(prev);
} while (!compareAndSetRaw(offset, prev, next));
return next;
}
@@ -310,7 +310,7 @@
int prev, next;
do {
prev = getRaw(offset);
- next = accumulatorFunction.operateAsInt(prev, x);
+ next = accumulatorFunction.applyAsInt(prev, x);
} while (!compareAndSetRaw(offset, prev, next));
return prev;
}
@@ -336,7 +336,7 @@
int prev, next;
do {
prev = getRaw(offset);
- next = accumulatorFunction.operateAsInt(prev, x);
+ next = accumulatorFunction.applyAsInt(prev, x);
} while (!compareAndSetRaw(offset, prev, next));
return next;
}
--- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java Tue Mar 12 18:12:44 2013 -0700
@@ -281,7 +281,7 @@
int prev, next;
do {
prev = get(obj);
- next = updateFunction.operateAsInt(prev);
+ next = updateFunction.applyAsInt(prev);
} while (!compareAndSet(obj, prev, next));
return prev;
}
@@ -301,7 +301,7 @@
int prev, next;
do {
prev = get(obj);
- next = updateFunction.operateAsInt(prev);
+ next = updateFunction.applyAsInt(prev);
} while (!compareAndSet(obj, prev, next));
return next;
}
@@ -326,7 +326,7 @@
int prev, next;
do {
prev = get(obj);
- next = accumulatorFunction.operateAsInt(prev, x);
+ next = accumulatorFunction.applyAsInt(prev, x);
} while (!compareAndSet(obj, prev, next));
return prev;
}
@@ -351,7 +351,7 @@
int prev, next;
do {
prev = get(obj);
- next = accumulatorFunction.operateAsInt(prev, x);
+ next = accumulatorFunction.applyAsInt(prev, x);
} while (!compareAndSet(obj, prev, next));
return next;
}
--- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLong.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLong.java Tue Mar 12 18:12:44 2013 -0700
@@ -233,7 +233,7 @@
long prev, next;
do {
prev = get();
- next = updateFunction.operateAsLong(prev);
+ next = updateFunction.applyAsLong(prev);
} while (!compareAndSet(prev, next));
return prev;
}
@@ -252,7 +252,7 @@
long prev, next;
do {
prev = get();
- next = updateFunction.operateAsLong(prev);
+ next = updateFunction.applyAsLong(prev);
} while (!compareAndSet(prev, next));
return next;
}
@@ -276,7 +276,7 @@
long prev, next;
do {
prev = get();
- next = accumulatorFunction.operateAsLong(prev, x);
+ next = accumulatorFunction.applyAsLong(prev, x);
} while (!compareAndSet(prev, next));
return prev;
}
@@ -300,7 +300,7 @@
long prev, next;
do {
prev = get();
- next = accumulatorFunction.operateAsLong(prev, x);
+ next = accumulatorFunction.applyAsLong(prev, x);
} while (!compareAndSet(prev, next));
return next;
}
--- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLongArray.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLongArray.java Tue Mar 12 18:12:44 2013 -0700
@@ -262,7 +262,7 @@
long prev, next;
do {
prev = getRaw(offset);
- next = updateFunction.operateAsLong(prev);
+ next = updateFunction.applyAsLong(prev);
} while (!compareAndSetRaw(offset, prev, next));
return prev;
}
@@ -283,7 +283,7 @@
long prev, next;
do {
prev = getRaw(offset);
- next = updateFunction.operateAsLong(prev);
+ next = updateFunction.applyAsLong(prev);
} while (!compareAndSetRaw(offset, prev, next));
return next;
}
@@ -309,7 +309,7 @@
long prev, next;
do {
prev = getRaw(offset);
- next = accumulatorFunction.operateAsLong(prev, x);
+ next = accumulatorFunction.applyAsLong(prev, x);
} while (!compareAndSetRaw(offset, prev, next));
return prev;
}
@@ -335,7 +335,7 @@
long prev, next;
do {
prev = getRaw(offset);
- next = accumulatorFunction.operateAsLong(prev, x);
+ next = accumulatorFunction.applyAsLong(prev, x);
} while (!compareAndSetRaw(offset, prev, next));
return next;
}
--- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java Tue Mar 12 18:12:44 2013 -0700
@@ -284,7 +284,7 @@
long prev, next;
do {
prev = get(obj);
- next = updateFunction.operateAsLong(prev);
+ next = updateFunction.applyAsLong(prev);
} while (!compareAndSet(obj, prev, next));
return prev;
}
@@ -304,7 +304,7 @@
long prev, next;
do {
prev = get(obj);
- next = updateFunction.operateAsLong(prev);
+ next = updateFunction.applyAsLong(prev);
} while (!compareAndSet(obj, prev, next));
return next;
}
@@ -329,7 +329,7 @@
long prev, next;
do {
prev = get(obj);
- next = accumulatorFunction.operateAsLong(prev, x);
+ next = accumulatorFunction.applyAsLong(prev, x);
} while (!compareAndSet(obj, prev, next));
return prev;
}
@@ -354,7 +354,7 @@
long prev, next;
do {
prev = get(obj);
- next = accumulatorFunction.operateAsLong(prev, x);
+ next = accumulatorFunction.applyAsLong(prev, x);
} while (!compareAndSet(obj, prev, next));
return next;
}
--- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReference.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReference.java Tue Mar 12 18:12:44 2013 -0700
@@ -157,7 +157,7 @@
V prev, next;
do {
prev = get();
- next = updateFunction.operate(prev);
+ next = updateFunction.apply(prev);
} while (!compareAndSet(prev, next));
return prev;
}
@@ -176,7 +176,7 @@
V prev, next;
do {
prev = get();
- next = updateFunction.operate(prev);
+ next = updateFunction.apply(prev);
} while (!compareAndSet(prev, next));
return next;
}
@@ -200,7 +200,7 @@
V prev, next;
do {
prev = get();
- next = accumulatorFunction.operate(prev, x);
+ next = accumulatorFunction.apply(prev, x);
} while (!compareAndSet(prev, next));
return prev;
}
@@ -224,7 +224,7 @@
V prev, next;
do {
prev = get();
- next = accumulatorFunction.operate(prev, x);
+ next = accumulatorFunction.apply(prev, x);
} while (!compareAndSet(prev, next));
return next;
}
--- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java Tue Mar 12 18:12:44 2013 -0700
@@ -217,7 +217,7 @@
E prev, next;
do {
prev = getRaw(offset);
- next = updateFunction.operate(prev);
+ next = updateFunction.apply(prev);
} while (!compareAndSetRaw(offset, prev, next));
return prev;
}
@@ -238,7 +238,7 @@
E prev, next;
do {
prev = getRaw(offset);
- next = updateFunction.operate(prev);
+ next = updateFunction.apply(prev);
} while (!compareAndSetRaw(offset, prev, next));
return next;
}
@@ -264,7 +264,7 @@
E prev, next;
do {
prev = getRaw(offset);
- next = accumulatorFunction.operate(prev, x);
+ next = accumulatorFunction.apply(prev, x);
} while (!compareAndSetRaw(offset, prev, next));
return prev;
}
@@ -290,7 +290,7 @@
E prev, next;
do {
prev = getRaw(offset);
- next = accumulatorFunction.operate(prev, x);
+ next = accumulatorFunction.apply(prev, x);
} while (!compareAndSetRaw(offset, prev, next));
return next;
}
--- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java Tue Mar 12 18:12:44 2013 -0700
@@ -200,7 +200,7 @@
V prev, next;
do {
prev = get(obj);
- next = updateFunction.operate(prev);
+ next = updateFunction.apply(prev);
} while (!compareAndSet(obj, prev, next));
return prev;
}
@@ -220,7 +220,7 @@
V prev, next;
do {
prev = get(obj);
- next = updateFunction.operate(prev);
+ next = updateFunction.apply(prev);
} while (!compareAndSet(obj, prev, next));
return next;
}
@@ -245,7 +245,7 @@
V prev, next;
do {
prev = get(obj);
- next = accumulatorFunction.operate(prev, x);
+ next = accumulatorFunction.apply(prev, x);
} while (!compareAndSet(obj, prev, next));
return prev;
}
@@ -270,7 +270,7 @@
V prev, next;
do {
prev = get(obj);
- next = accumulatorFunction.operate(prev, x);
+ next = accumulatorFunction.apply(prev, x);
} while (!compareAndSet(obj, prev, next));
return next;
}
--- a/jdk/src/share/classes/java/util/concurrent/atomic/DoubleAccumulator.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/DoubleAccumulator.java Tue Mar 12 18:12:44 2013 -0700
@@ -100,14 +100,14 @@
Cell[] as; long b, v, r; int m; Cell a;
if ((as = cells) != null ||
(r = Double.doubleToRawLongBits
- (function.operateAsDouble
+ (function.applyAsDouble
(Double.longBitsToDouble(b = base), x))) != b && !casBase(b, r)) {
boolean uncontended = true;
if (as == null || (m = as.length - 1) < 0 ||
(a = as[getProbe() & m]) == null ||
!(uncontended =
(r = Double.doubleToRawLongBits
- (function.operateAsDouble
+ (function.applyAsDouble
(Double.longBitsToDouble(v = a.value), x))) == v ||
a.cas(v, r)))
doubleAccumulate(x, function, uncontended);
@@ -129,7 +129,7 @@
if (as != null) {
for (int i = 0; i < as.length; ++i) {
if ((a = as[i]) != null)
- result = function.operateAsDouble
+ result = function.applyAsDouble
(result, Double.longBitsToDouble(a.value));
}
}
@@ -174,7 +174,7 @@
if ((a = as[i]) != null) {
double v = Double.longBitsToDouble(a.value);
a.value = identity;
- result = function.operateAsDouble(result, v);
+ result = function.applyAsDouble(result, v);
}
}
}
--- a/jdk/src/share/classes/java/util/concurrent/atomic/LongAccumulator.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/LongAccumulator.java Tue Mar 12 18:12:44 2013 -0700
@@ -101,12 +101,12 @@
public void accumulate(long x) {
Cell[] as; long b, v, r; int m; Cell a;
if ((as = cells) != null ||
- (r = function.operateAsLong(b = base, x)) != b && !casBase(b, r)) {
+ (r = function.applyAsLong(b = base, x)) != b && !casBase(b, r)) {
boolean uncontended = true;
if (as == null || (m = as.length - 1) < 0 ||
(a = as[getProbe() & m]) == null ||
!(uncontended =
- (r = function.operateAsLong(v = a.value, x)) == v ||
+ (r = function.applyAsLong(v = a.value, x)) == v ||
a.cas(v, r)))
longAccumulate(x, function, uncontended);
}
@@ -127,7 +127,7 @@
if (as != null) {
for (int i = 0; i < as.length; ++i) {
if ((a = as[i]) != null)
- result = function.operateAsLong(result, a.value);
+ result = function.applyAsLong(result, a.value);
}
}
return result;
@@ -171,7 +171,7 @@
if ((a = as[i]) != null) {
long v = a.value;
a.value = identity;
- result = function.operateAsLong(result, v);
+ result = function.applyAsLong(result, v);
}
}
}
--- a/jdk/src/share/classes/java/util/concurrent/atomic/Striped64.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/Striped64.java Tue Mar 12 18:12:44 2013 -0700
@@ -253,7 +253,7 @@
else if (!wasUncontended) // CAS already known to fail
wasUncontended = true; // Continue after rehash
else if (a.cas(v = a.value, ((fn == null) ? v + x :
- fn.operateAsLong(v, x))))
+ fn.applyAsLong(v, x))))
break;
else if (n >= NCPU || cells != as)
collide = false; // At max size or stale
@@ -291,7 +291,7 @@
break;
}
else if (casBase(v = base, ((fn == null) ? v + x :
- fn.operateAsLong(v, x))))
+ fn.applyAsLong(v, x))))
break; // Fall back on using base
}
}
@@ -344,7 +344,7 @@
Double.doubleToRawLongBits
(Double.longBitsToDouble(v) + x) :
Double.doubleToRawLongBits
- (fn.operateAsDouble
+ (fn.applyAsDouble
(Double.longBitsToDouble(v), x)))))
break;
else if (n >= NCPU || cells != as)
@@ -387,7 +387,7 @@
Double.doubleToRawLongBits
(Double.longBitsToDouble(v) + x) :
Double.doubleToRawLongBits
- (fn.operateAsDouble
+ (fn.applyAsDouble
(Double.longBitsToDouble(v), x)))))
break; // Fall back on using base
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/function/BiConsumer.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2012, 2013, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package java.util.function;
+
+/**
+ * An operation which accepts two input arguments and returns no result. This is
+ * the two-arity specialization of {@link Consumer}. Unlike most other
+ * functional interfaces, {@code BiConsumer} is expected to operate via
+ * side-effects.
+ *
+ * @param <T> the type of the first argument to the {@code accept} operation.
+ * @param <U> the type of the second argument to the {@code accept} operation.
+ *
+ * @see Consumer
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface BiConsumer<T, U> {
+
+ /**
+ * Performs operations upon the provided objects which may modify those
+ * objects and/or external state.
+ *
+ * @param t an input object
+ * @param u an input object
+ */
+ void accept(T t, U u);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/function/BiFunction.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2010, 2013, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package java.util.function;
+
+/**
+ * Apply a function to the input arguments, yielding an appropriate result. This
+ * is the two-arity specialization of {@link Function}. A function may
+ * variously provide a mapping between types, object instances or keys and
+ * values or any other form of transformation upon the input.
+ *
+ * @param <T> the type of the first argument to the {@code apply} operation.
+ * @param <U> the type of the second argument to the {@code apply} operation.
+ * @param <R> the type of results returned by the {@code apply} operation.
+ *
+ * @see Function
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface BiFunction<T, U, R> {
+
+ /**
+ * Compute the result of applying the function to the input arguments
+ *
+ * @param t an input object
+ * @param u an input object
+ * @return the function result
+ */
+ R apply(T t, U u);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/function/BiPredicate.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2010, 2013, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package java.util.function;
+
+import java.util.Objects;
+
+/**
+ * Determines if the input objects match some criteria. This is the two-arity
+ * specialization of {@link Predicate}.
+ *
+ * @param <T> the type of the first argument to {@code test}.
+ * @param <U> the type of the second argument to {@code test}.
+ *
+ * @see Predicate
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface BiPredicate<T, U> {
+
+ /**
+ * Return {@code true} if the inputs match some criteria.
+ *
+ * @param t an input object.
+ * @param u an input object.
+ * @return {@code true} if the inputs match some criteria.
+ */
+ boolean test(T t, U u);
+
+ /**
+ * Returns a predicate which evaluates to {@code true} only if this
+ * predicate and the provided predicate both evaluate to {@code true}. If
+ * this predicate returns {@code false} then the remaining predicate is not
+ * evaluated.
+ *
+ * @param p a predicate which will be logically-ANDed with this predicate.
+ * @return a new predicate which returns {@code true} only if both
+ * predicates return {@code true}.
+ */
+ public default BiPredicate<T, U> and(BiPredicate<? super T, ? super U> p) {
+ Objects.requireNonNull(p);
+ return (T t, U u) -> test(t, u) && p.test(t, u);
+ }
+
+ /**
+ * Returns a predicate which negates the result of this predicate.
+ *
+ * @return a new predicate who's result is always the opposite of this
+ * predicate.
+ */
+ public default BiPredicate<T, U> negate() {
+ return (T t, U u) -> !test(t, u);
+ }
+
+ /**
+ * Returns a predicate which evaluates to {@code true} if either this
+ * predicate or the provided predicate evaluates to {@code true}. If this
+ * predicate returns {@code true} then the remaining predicate is not
+ * evaluated.
+ *
+ * @param p a predicate which will be logically-ORed with this predicate.
+ * @return a new predicate which returns {@code true} if either predicate
+ * returns {@code true}.
+ */
+ public default BiPredicate<T, U> or(BiPredicate<? super T, ? super U> p) {
+ Objects.requireNonNull(p);
+ return (T t, U u) -> test(t, u) || p.test(t, u);
+ }
+
+ /**
+ * Returns a predicate that evaluates to {@code true} if both or neither of
+ * the component predicates evaluate to {@code true}.
+ *
+ * @param p a predicate which will be logically-XORed with this predicate.
+ * @return a predicate that evaluates to {@code true} if both or neither of
+ * the component predicates evaluate to {@code true}.
+ */
+ public default BiPredicate<T, U> xor(BiPredicate<? super T, ? super U> p) {
+ Objects.requireNonNull(p);
+ return (T t, U u) -> test(t, u) ^ p.test(t, u);
+ }
+}
--- a/jdk/src/share/classes/java/util/function/BinaryOperator.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/function/BinaryOperator.java Tue Mar 12 18:12:44 2013 -0700
@@ -25,24 +25,14 @@
package java.util.function;
/**
- * An operation upon two operands yielding a result. The operands and the result
- * are all of the same type.
+ * An operation upon two operands yielding a result. This is a specialization of
+ * {@code BiFunction} where the operands and the result are all of the same type.
*
- * @param <T> the type of operands to {@code operate} and of the result
+ * @param <T> the type of operands to {@code apply} and of the result
*
+ * @see BiFunction
* @since 1.8
*/
@FunctionalInterface
-public interface BinaryOperator<T> {
-
- /**
- * Returns the result of the operation upon the operands.
- * The operands are named {@code left} and {@code right} for operations
- * where the order of operands matters.
- *
- * @param left the left operand
- * @param right the right operand
- * @return the result of the operation
- */
- public T operate(T left, T right);
+public interface BinaryOperator<T> extends BiFunction<T,T,T> {
}
--- a/jdk/src/share/classes/java/util/function/Block.java Mon Mar 04 15:40:12 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-package java.util.function;
-
-/**
- * An operation upon an input object. The operation may modify that object or
- * external state (other objects).
- *
- * @param <T> The type of input objects to {@code accept}
- *
- * @since 1.8
- */
-@FunctionalInterface
-public interface Block<T> {
-
- /**
- * Use the input object in operations which may modify that object or
- * external state (other objects).
- *
- * @param t the input object
- */
- public void accept(T t);
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/function/BooleanSupplier.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2012, 2013, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package java.util.function;
+
+
+/**
+ * A supplier of {@code boolean} values. This is the {@code boolean}-providing
+ * primitive specialization of {@link Supplier}.
+ *
+ * @see Supplier
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface BooleanSupplier {
+
+ /**
+ * Returns a {@code boolean} value.
+ *
+ * @return a {@code boolean} value
+ */
+ public boolean getAsBoolean();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/function/Consumer.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2010, 2013, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package java.util.function;
+
+/**
+ * An operation which accepts a single input argument and returns no result.
+ * Unlike most other functional interfaces, {@code Consumer} is expected to
+ * operate via side-effects.
+ *
+ * @param <T> The type of input objects to {@code accept}
+ *
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface Consumer<T> {
+
+ /**
+ * Accept an input value.
+ *
+ * @param t the input object
+ */
+ public void accept(T t);
+}
--- a/jdk/src/share/classes/java/util/function/DoubleBinaryOperator.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/function/DoubleBinaryOperator.java Tue Mar 12 18:12:44 2013 -0700
@@ -26,23 +26,22 @@
/**
* An operation on two {@code double} operands yielding a {@code double} result.
+ * This is the primitive type specialization of {@link BinaryOperator} for
+ * {@code double}.
*
+ * @see BinaryOperator
* @since 1.8
*/
@FunctionalInterface
-public interface DoubleBinaryOperator /* extends BinaryOperator<Double> */ {
-//
-// @Override
-// public default Double operate(Double left, Double right) { return operateAsDouble((double) left, (double) right); }
-
+public interface DoubleBinaryOperator {
/**
* Returns the {@code double} result of the operation upon the
* {@code double} operands. The parameters are named {@code left} and
* {@code right} for operations where the order of parameters matters.
*
* @param left the left operand value
- * @param right the right operand value
+ * @param right the right operand value
* @return the result of the operation
*/
- public double operateAsDouble(double left, double right);
+ public double applyAsDouble(double left, double right);
}
--- a/jdk/src/share/classes/java/util/function/DoubleBlock.java Mon Mar 04 15:40:12 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-package java.util.function;
-
-/**
- * An operation upon a {@code double} input value. The operation may modify
- * external state.
- *
- * <p/>This is the primitive type specialization of {@link Block} for
- * {@code double} and also may be used as a {@code Block<Double>}.
- *
- * @since 1.8
- */
-@FunctionalInterface
-public interface DoubleBlock {
-
- /**
- * Use the {@code double} input value in an operation which may modify
- * external state.
- *
- * @param t the input value
- */
- public void accept(double t);
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/function/DoubleConsumer.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2010, 2013, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package java.util.function;
+
+/**
+ * An operation which accepts a single double argument and returns no result.
+ * This is the primitive type specialization of {@link Consumer} for
+ * {@code double}. Unlike most other functional interfaces,
+ * {@code DoubleConsumer} is expected to operate via side-effects.
+ *
+ * @see Consumer
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface DoubleConsumer {
+
+ /**
+ * Accept an input value.
+ *
+ * @param value the input value
+ */
+ public void accept(double value);
+}
--- a/jdk/src/share/classes/java/util/function/DoubleFunction.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/function/DoubleFunction.java Tue Mar 12 18:12:44 2013 -0700
@@ -25,22 +25,23 @@
package java.util.function;
/**
- * Apply a function to the input object yielding an appropriate {@code double}
- * value; this is the {@code double}-bearing specialization for {@link Function}.
+ * Apply a function to the double-valued input argument, yielding an appropriate
+ * result. This is the {@code double}-consuming primitive specialization for
+ * {@link Function}.
*
- * @param <T> the type of input objects to the function
+ * @param <R> the type of output objects from the function
*
+ * @see Function
* @since 1.8
*/
@FunctionalInterface
-public interface DoubleFunction<T> {
+public interface DoubleFunction<R> {
/**
- * Apply a function to the input object yielding an appropriate
- * {@code double} value.
+ * Compute the result of applying the function to the input argument
*
- * @param t the input object
- * @return the function result value
+ * @param value the input value
+ * @return the function result
*/
- public double applyAsDouble(T t);
+ public R apply(double value);
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/function/DoublePredicate.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2010, 2013 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package java.util.function;
+
+import java.util.Objects;
+
+/**
+ * Determines if the {@code double} input value matches some criteria. This is
+ * the {@code double}-consuming primitive type specialization of
+ * {@link Predicate}.
+ *
+ * @see Predicate
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface DoublePredicate {
+
+ /**
+ * Returns {@code true} if the input value matches some criteria.
+ *
+ * @param value the value to be tested.
+ * @return {@code true} if the input value matches some criteria, otherwise
+ * {@code false}.
+ */
+ public boolean test(double value);
+
+ /**
+ * Returns a predicate which evaluates to {@code true} only if this
+ * predicate and the provided predicate both evaluate to {@code true}. If
+ * this predicate returns {@code false} then the remaining predicate is not
+ * evaluated.
+ *
+ * @param p a predicate which will be logically-ANDed with this predicate.
+ * @return a new predicate which returns {@code true} only if both
+ * predicates return {@code true}.
+ */
+ public default DoublePredicate and(DoublePredicate p) {
+ Objects.requireNonNull(p);
+ return (value) -> test(value) && p.test(value);
+ }
+
+ /**
+ * Returns a predicate which negates the result of this predicate.
+ *
+ * @return a new predicate who's result is always the opposite of this
+ * predicate.
+ */
+ public default DoublePredicate negate() {
+ return (value) -> !test(value);
+ }
+
+ /**
+ * Returns a predicate which evaluates to {@code true} if either this
+ * predicate or the provided predicate evaluates to {@code true}. If this
+ * predicate returns {@code true} then the remaining predicate is not
+ * evaluated.
+ *
+ * @param p a predicate which will be logically-ANDed with this predicate.
+ * @return a new predicate which returns {@code true} if either predicate
+ * returns {@code true}.
+ */
+ public default DoublePredicate or(DoublePredicate p) {
+ Objects.requireNonNull(p);
+ return (value) -> test(value) || p.test(value);
+ }
+
+ /**
+ * Returns a predicate that evaluates to {@code true} if both or neither of
+ * the component predicates evaluate to {@code true}.
+ *
+ * @param p a predicate which will be logically-XORed with this predicate.
+ * @return a predicate that evaluates to {@code true} if all or none of the
+ * component predicates evaluate to {@code true}.
+ */
+ public default DoublePredicate xor(DoublePredicate p) {
+ Objects.requireNonNull(p);
+ return (value) -> test(value) ^ p.test(value);
+ }
+}
--- a/jdk/src/share/classes/java/util/function/DoubleSupplier.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/function/DoubleSupplier.java Tue Mar 12 18:12:44 2013 -0700
@@ -25,11 +25,10 @@
package java.util.function;
/**
- * A supplier of {@code double} values.
+ * A supplier of {@code double} values. This is the {@code double}-providing
+ * primitive specialization of {@link Supplier}.
*
- * <p/>This is the primitive type specialization of {@link Supplier} for
- * {@code double} and also may be used as a {@code Supplier<Double>}.
- *
+ * @see Supplier
* @since 1.8
*/
@FunctionalInterface
--- a/jdk/src/share/classes/java/util/function/DoubleUnaryOperator.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/function/DoubleUnaryOperator.java Tue Mar 12 18:12:44 2013 -0700
@@ -25,9 +25,11 @@
package java.util.function;
/**
- * An operation on a single {@code double} operand yielding a {@code double}
- * result.
+ * An operation on a {@code double} operand yielding a {@code double}
+ * result. This is the primitive type specialization of {@link UnaryOperator}
+ * for {@code double}.
*
+ * @see UnaryOperator
* @since 1.8
*/
@FunctionalInterface
@@ -40,5 +42,5 @@
* @param operand the operand value
* @return the operation result value
*/
- public double operateAsDouble(double operand);
+ public double applyAsDouble(double operand);
}
--- a/jdk/src/share/classes/java/util/function/Function.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/function/Function.java Tue Mar 12 18:12:44 2013 -0700
@@ -24,14 +24,14 @@
*/
package java.util.function;
+
/**
- * Apply a function to the input object yielding an appropriate result object. A
+ * Apply a function to the input argument, yielding an appropriate result. A
* function may variously provide a mapping between types, object instances or
* keys and values or any other form of transformation upon the input.
*
- * @param <T> the type of input objects to the {@code apply} operation
- * @param <R> the type of result objects from the {@code apply} operation. May
- * be the same type as {@code <T>}.
+ * @param <T> the type of the input to the {@code apply} operation.
+ * @param <R> the type of the result of the {@code apply} operation.
*
* @since 1.8
*/
@@ -39,7 +39,7 @@
public interface Function<T, R> {
/**
- * Yield an appropriate result object for the input object.
+ * Compute the result of applying the function to the input argument
*
* @param t the input object
* @return the function result
--- a/jdk/src/share/classes/java/util/function/IntBinaryOperator.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/function/IntBinaryOperator.java Tue Mar 12 18:12:44 2013 -0700
@@ -26,7 +26,10 @@
/**
* An operation on two {@code int} operands yielding an {@code int} result.
+ * This is the primitive type specialization of {@link BinaryOperator} for
+ * {@code int}.
*
+ * @see BinaryOperator
* @since 1.8
*/
@FunctionalInterface
@@ -41,5 +44,5 @@
* @param right the right operand value
* @return the result of the operation
*/
- public int operateAsInt(int left, int right);
+ public int applyAsInt(int left, int right);
}
--- a/jdk/src/share/classes/java/util/function/IntBlock.java Mon Mar 04 15:40:12 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-package java.util.function;
-
-/**
- * An operation upon an {@code int} input value. The operation may modify
- * external state.
- *
- * <p/>This is the primitive type specialization of {@link Block} for
- * {@code int} and also may be used as a {@code Block<Integer>}.
- *
- * @since 1.8
- */
-@FunctionalInterface
-public interface IntBlock {
-
- /**
- * Use the {@code int} input value in an operation which may modify external
- * state.
- *
- * @param t the input value
- */
- public void accept(int t);
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/function/IntConsumer.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2010, 2013, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package java.util.function;
+
+/**
+ * An operation which accepts a single integer argument and returns no result.
+ * This is the primitive type specialization of {@link Consumer} for {@code int}.
+ * Unlike most other functional interfaces, {@code IntConsumer} is expected to
+ * operate via side-effects.
+ *
+ * @see Consumer
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface IntConsumer {
+
+ /**
+ * Accept an input value.
+ *
+ * @param value the input value
+ */
+ public void accept(int value);
+}
--- a/jdk/src/share/classes/java/util/function/IntFunction.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/function/IntFunction.java Tue Mar 12 18:12:44 2013 -0700
@@ -25,22 +25,23 @@
package java.util.function;
/**
- * Apply a function to the input object yielding an appropriate {@code int}
- * value; this is the {@code int}-bearing specialization for {@link Function}.
+ * Apply a function to the integer-valued input argument, yielding an
+ * appropriate result. This is the {@code int}-consuming primitive
+ * specialization for {@link Function}.
*
- * @param <T> the type of input objects to the function
+ * @param <R> the type of output objects from the function
*
+ * @see Function
* @since 1.8
*/
@FunctionalInterface
-public interface IntFunction<T> {
+public interface IntFunction<R> {
/**
- * Apply a function to the input object yielding an appropriate {@code int}
- * value.
+ * Compute the result of applying the function to the input argument
*
- * @param t the input object
- * @return the function result value
+ * @param value the input value
+ * @return the function result
*/
- public int applyAsInt(T t);
+ public R apply(int value);
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/function/IntPredicate.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2010, 2013 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package java.util.function;
+
+import java.util.Objects;
+
+/**
+ * Determines if the {@code int} input value matches some criteria. This is the
+ * {@code int}-consuming primitive type specialization of {@link Predicate}.
+ *
+ * @see Predicate
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface IntPredicate {
+
+ /**
+ * Returns {@code true} if the input value matches some criteria.
+ *
+ * @param value the value to be tested.
+ * @return {@code true} if the input value matches some criteria, otherwise
+ * {@code false}
+ */
+ public boolean test(int value);
+
+ /**
+ * Returns a predicate which evaluates to {@code true} only if this
+ * predicate and the provided predicate both evaluate to {@code true}. If
+ * this predicate returns {@code false} then the remaining predicate is not
+ * evaluated.
+ *
+ * @param p a predicate which will be logically-ANDed with this predicate.
+ * @return a new predicate which returns {@code true} only if both
+ * predicates return {@code true}.
+ */
+ public default IntPredicate and(IntPredicate p) {
+ Objects.requireNonNull(p);
+ return (value) -> test(value) && p.test(value);
+ }
+
+ /**
+ * Returns a predicate which negates the result of this predicate.
+ *
+ * @return a new predicate who's result is always the opposite of this
+ * predicate.
+ */
+ public default IntPredicate negate() {
+ return (value) -> !test(value);
+ }
+
+ /**
+ * Returns a predicate which evaluates to {@code true} if either this
+ * predicate or the provided predicate evaluates to {@code true}. If this
+ * predicate returns {@code true} then the remaining predicate is not
+ * evaluated.
+ *
+ * @param p a predicate which will be logically-ORed with this predicate.
+ * @return a new predicate which returns {@code true} if either predicate
+ * returns {@code true}.
+ */
+ public default IntPredicate or(IntPredicate p) {
+ Objects.requireNonNull(p);
+ return (value) -> test(value) || p.test(value);
+ }
+
+ /**
+ * Returns a predicate that evaluates to {@code true} if both or neither of
+ * the component predicates evaluate to {@code true}.
+ *
+ * @param p a predicate which will be logically-XORed with this predicate.
+ * @return a predicate that evaluates to {@code true} if both or neither of
+ * the component predicates evaluate to {@code true}
+ */
+ public default IntPredicate xor(IntPredicate p) {
+ Objects.requireNonNull(p);
+ return (value) -> test(value) ^ p.test(value);
+ }
+}
--- a/jdk/src/share/classes/java/util/function/IntSupplier.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/function/IntSupplier.java Tue Mar 12 18:12:44 2013 -0700
@@ -25,11 +25,10 @@
package java.util.function;
/**
- * A supplier of {@code int} values.
+ * A supplier of {@code int} values. This is the {@code int}-providing
+ * primitive specialization of {@link Supplier}.
*
- * <p/>This is the primitive type specialization of {@link Supplier} for
- * {@code int} and also may be used as a {@code Supplier<Integer>}.
- *
+ * @see Supplier
* @since 1.8
*/
@FunctionalInterface
--- a/jdk/src/share/classes/java/util/function/IntUnaryOperator.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/function/IntUnaryOperator.java Tue Mar 12 18:12:44 2013 -0700
@@ -26,18 +26,21 @@
/**
* An operation on a single {@code int} operand yielding an {@code int} result.
+ * This is the primitive type specialization of {@link UnaryOperator} for
+ * {@code int}.
*
+ * @see UnaryOperator
* @since 1.8
*/
@FunctionalInterface
public interface IntUnaryOperator {
/**
- * Returns the {@code int} result of the operation upon the {@code int}
- * operand.
+ * Returns the {@code int} value result of the operation upon the
+ * {@code int} operand.
*
* @param operand the operand value
* @return the operation result value
*/
- public int operateAsInt(int operand);
+ public int applyAsInt(int operand);
}
--- a/jdk/src/share/classes/java/util/function/LongBinaryOperator.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/function/LongBinaryOperator.java Tue Mar 12 18:12:44 2013 -0700
@@ -26,7 +26,10 @@
/**
* An operation on two {@code long} operands yielding a {@code long} result.
+ * This is the primitive type specialization of {@link BinaryOperator} for
+ * {@code long}.
*
+ * @see BinaryOperator
* @since 1.8
*/
@FunctionalInterface
@@ -41,5 +44,5 @@
* @param right the right operand value
* @return the result of the operation
*/
- public long operateAsLong(long left, long right);
+ public long applyAsLong(long left, long right);
}
--- a/jdk/src/share/classes/java/util/function/LongBlock.java Mon Mar 04 15:40:12 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-package java.util.function;
-
-/**
- * An operation upon a {@code long} input value. The operation may modify
- * external state.
- *
- * <p/>This is the primitive type specialization of {@link Block} for
- * {@code long} and also may be used as a {@code Block<Long>}.
- *
- * @since 1.8
- */
-@FunctionalInterface
-public interface LongBlock {
-
- /**
- * Use the {@code long} input value in an operation which may modify
- * external state.
- *
- * @param t the input value
- */
- public void accept(long t);
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/function/LongConsumer.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2010, 2013, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package java.util.function;
+
+/**
+ * An operation which accepts a single long argument and returns no result.
+ * This is the {@code long}-consuming primitive type specialization of
+ * {@link Consumer}. Unlike most other functional interfaces, {@code LongConsumer}
+ * is expected to operate via side-effects.
+ *
+ * @see Consumer
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface LongConsumer {
+
+ /**
+ * Accept an input value.
+ *
+ * @param value the input value
+ */
+ public void accept(long value);
+}
--- a/jdk/src/share/classes/java/util/function/LongFunction.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/function/LongFunction.java Tue Mar 12 18:12:44 2013 -0700
@@ -25,22 +25,23 @@
package java.util.function;
/**
- * Apply a function to the input object yielding an appropriate {@code long}
- * value; this is the {@code long}-bearing specialization for {@link Function}.
+ * Apply a function to the long-valued input argument, yielding an appropriate
+ * result. This is the {@code long}-consuming primitive specialization for
+ * {@link Function}.
*
- * @param <T> the type of input objects to the function
+ * @param <R> the type of output objects from the function
*
+ * @see Function
* @since 1.8
*/
@FunctionalInterface
-public interface LongFunction<T> {
+public interface LongFunction<R> {
/**
- * Apply a function to the input object yielding an appropriate {@code long}
- * value.
+ * Compute the result of applying the function to the input argument
*
- * @param t the input object
- * @return the function result value
+ * @param value the input value
+ * @return the function result
*/
- public long applyAsLong(T t);
+ public R apply(long value);
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/function/LongPredicate.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2010, 2013 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package java.util.function;
+
+import java.util.Objects;
+
+/**
+ * Determines if the {@code long} input value matches some criteria. This is the
+ * {@code long}-consuming primitive type specialization of {@link Predicate}.
+ *
+ * @see Predicate
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface LongPredicate {
+
+ /**
+ * Returns {@code true} if the input value matches some criteria.
+ *
+ * @param value the value to be tested.
+ * @return {@code true} if the input value matches some criteria, otherwise
+ * {@code false}.
+ */
+ public boolean test(long value);
+
+ /**
+ * Returns a predicate which evaluates to {@code true} only if this
+ * predicate and the provided predicate both evaluate to {@code true}. If
+ * this predicate returns {@code false} then the remaining predicate is not
+ * evaluated.
+ *
+ * @param p a predicate which will be logically-ANDed with this predicate.
+ * @return a new predicate which returns {@code true} only if both
+ * predicates return {@code true}.
+ */
+ public default LongPredicate and(LongPredicate p) {
+ Objects.requireNonNull(p);
+ return (value) -> test(value) && p.test(value);
+ }
+
+ /**
+ * Returns a predicate which negates the result of this predicate.
+ *
+ * @return a new predicate who's result is always the opposite of this
+ * predicate.
+ */
+ public default LongPredicate negate() {
+ return (value) -> !test(value);
+ }
+
+ /**
+ * Returns a predicate which evaluates to {@code true} if either this
+ * predicate or the provided predicate evaluates to {@code true}. If this
+ * predicate returns {@code true} then the remaining predicate is not
+ * evaluated.
+ *
+ * @param p a predicate which will be logically-ORed with this predicate.
+ * @return a new predicate which returns {@code true} if either predicate
+ * returns {@code true}.
+ */
+ public default LongPredicate or(LongPredicate p) {
+ Objects.requireNonNull(p);
+ return (value) -> test(value) || p.test(value);
+ }
+
+ /**
+ * Returns a predicate that evaluates to {@code true} if both or neither of
+ * the component predicates evaluate to {@code true}.
+ *
+ * @param p a predicate which will be logically-XORed with this predicate.
+ * @return a predicate that evaluates to {@code true} if both or neither of
+ * the component predicates evaluate to {@code true}.
+ */
+ public default LongPredicate xor(LongPredicate p) {
+ Objects.requireNonNull(p);
+ return (value) -> test(value) ^ p.test(value);
+ }
+}
--- a/jdk/src/share/classes/java/util/function/LongSupplier.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/function/LongSupplier.java Tue Mar 12 18:12:44 2013 -0700
@@ -25,11 +25,10 @@
package java.util.function;
/**
- * A supplier of {@code long} values.
+ * A supplier of {@code long} values. This is the {@code long}-providing
+ * primitive specialization of {@link Supplier}.
*
- * <p/>This is the primitive type specialization of {@link Supplier} for
- * {@code long} and also may be used as a {@code Supplier<Long>}.
- *
+ * @see Supplier
* @since 1.8
*/
@FunctionalInterface
@@ -38,7 +37,7 @@
/**
* Returns a {@code long} value.
*
- * @return a {@code long} value.
+ * @return a {@code long} value
*/
public long getAsLong();
}
--- a/jdk/src/share/classes/java/util/function/LongUnaryOperator.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/function/LongUnaryOperator.java Tue Mar 12 18:12:44 2013 -0700
@@ -26,7 +26,10 @@
/**
* An operation on a single {@code long} operand yielding a {@code long} result.
+ * This is the primitive type specialization of {@link UnaryOperator} for
+ * {@code long}.
*
+ * @see UnaryOperator
* @since 1.8
*/
@FunctionalInterface
@@ -39,5 +42,5 @@
* @param operand the operand value
* @return the operation result value
*/
- public long operateAsLong(long operand);
+ public long applyAsLong(long operand);
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/function/ObjDoubleConsumer.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2013, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package java.util.function;
+
+/**
+ * An operation which accepts an object reference and a double, and returns no
+ * result. This is the {@code (reference, double)} specialization of
+ * {@link BiConsumer}. Unlike most other functional interfaces,
+ * {@code ObjDoubleConsumer} is expected to operate via side-effects.
+ *
+ * @param <T> Type of reference argument to {@code accept()}.
+ *
+ * @see BiConsumer
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface ObjDoubleConsumer<T> {
+
+ /**
+ * Accept a set of input values.
+ *
+ * @param t an input object
+ * @param value an input value
+ */
+ public void accept(T t, double value);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/function/ObjIntConsumer.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2012, 2013 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package java.util.function;
+
+/**
+ * An operation which accepts an object reference and an int, and returns no
+ * result. This is the {@code (reference, int)} specialization of
+ * {@link BiConsumer}. Unlike most other functional interfaces,
+ * {@code ObjIntConsumer} is expected to operate via side-effects.
+ *
+ * @param <T> Type of reference argument to {@code accept()}.
+ *
+ * @see BiConsumer
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface ObjIntConsumer<T> {
+
+ /**
+ * Accept a set of input values.
+ *
+ * @param t an input object
+ * @param value an input value
+ */
+ public void accept(T t, int value);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/function/ObjLongConsumer.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2013, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package java.util.function;
+
+/**
+ * An operation which accepts an object reference and a long, and returns no
+ * result. This is the {@code (reference, long)} specialization of
+ * {@link BiConsumer}. Unlike most other functional interfaces,
+ * {@code ObjLongConsumer} is expected to operate via side-effects.
+ *
+ * @param <T> Type of reference argument to {@code accept()}.
+ *
+ * @see BiConsumer
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface ObjLongConsumer<T> {
+
+ /**
+ * Accept a set of input values.
+ *
+ * @param t an input object
+ * @param value an input value
+ */
+ public void accept(T t, long value);
+}
--- a/jdk/src/share/classes/java/util/function/Predicate.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/function/Predicate.java Tue Mar 12 18:12:44 2013 -0700
@@ -24,10 +24,12 @@
*/
package java.util.function;
+import java.util.Objects;
+
/**
* Determines if the input object matches some criteria.
*
- * @param <T> the type of input objects to {@code test}
+ * @param <T> the type of argument to {@code test}
*
* @since 1.8
*/
@@ -42,4 +44,57 @@
* {@code false}
*/
public boolean test(T t);
+
+ /**
+ * Returns a predicate which evaluates to {@code true} only if this
+ * predicate and the provided predicate both evaluate to {@code true}. If
+ * this predicate returns {@code false} then the remaining predicate is not
+ * evaluated.
+ *
+ * @param p a predicate which will be logically-ANDed with this predicate.
+ * @return a new predicate which returns {@code true} only if both
+ * predicates return {@code true}.
+ */
+ public default Predicate<T> and(Predicate<? super T> p) {
+ Objects.requireNonNull(p);
+ return (t) -> test(t) && p.test(t);
+ }
+
+ /**
+ * Returns a predicate which negates the result of this predicate.
+ *
+ * @return a new predicate who's result is always the opposite of this
+ * predicate.
+ */
+ public default Predicate<T> negate() {
+ return (t) -> !test(t);
+ }
+
+ /**
+ * Returns a predicate which evaluates to {@code true} if either this
+ * predicate or the provided predicate evaluates to {@code true}. If this
+ * predicate returns {@code true} then the remaining predicate is not
+ * evaluated.
+ *
+ * @param p a predicate which will be logically-ORed with this predicate.
+ * @return a new predicate which returns {@code true} if either predicate
+ * returns {@code true}.
+ */
+ public default Predicate<T> or(Predicate<? super T> p) {
+ Objects.requireNonNull(p);
+ return (t) -> test(t) || p.test(t);
+ }
+
+ /**
+ * Returns a predicate that evaluates to {@code true} if both or neither of
+ * the component predicates evaluate to {@code true}.
+ *
+ * @param p a predicate which will be logically-XORed with this predicte.
+ * @return a predicate that evaluates to {@code true} if both or neither of
+ * the component predicates evaluate to {@code true}.
+ */
+ public default Predicate<T> xor(Predicate<? super T> p) {
+ Objects.requireNonNull(p);
+ return (t) -> test(t) ^ p.test(t);
+ }
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/function/ToDoubleBiFunction.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2012, 2013 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package java.util.function;
+
+/**
+ * Apply a function to the input arguments, yielding an appropriate result.
+ * This is the {@code double}-bearing specialization for {@link BiFunction}.
+ *
+ * @param <T> the type of the first argument to the {@code applyAsDouble}
+ * operation.
+ * @param <U> the type of the second argument to the {@code applyAsDouble}
+ * operation.
+ *
+ * @see BiFunction
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface ToDoubleBiFunction<T, U> {
+
+ /**
+ * Compute the result of applying the function to the input arguments
+ *
+ * @param t an input object
+ * @param u an input object
+ * @return the function result value
+ */
+ public double applyAsDouble(T t, U u);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/function/ToDoubleFunction.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2012, 2013, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package java.util.function;
+
+/**
+ * Apply a function to the input argument, yielding an appropriate result.
+ * This is the {@code double}-bearing specialization for {@link Function}.
+ *
+ * @param <T> the type of input objects to the function
+ *
+ * @see Function
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface ToDoubleFunction<T> {
+
+ /**
+ * Compute the result of applying the function to the input argument
+ *
+ * @param t the input object
+ * @return the function result value
+ */
+ public double applyAsDouble(T t);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/function/ToIntBiFunction.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2012, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package java.util.function;
+
+/**
+ * Apply a function to the input arguments, yielding an appropriate result.
+ * This is the {@code int}-bearing specialization for {@link BiFunction}.
+ *
+ * @param <T> the type of the first argument to the {@code applyAsLong}
+ * operation.
+ * @param <U> the type of the second argument to the {@code applyAsLong}
+ * operation.
+ *
+ * @see BiFunction
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface ToIntBiFunction<T, U> {
+
+ /**
+ * Compute the result of applying the function to the input arguments
+ *
+ * @param t an input object
+ * @param u an input object
+ * @return the function result value
+ */
+ public int applyAsInt(T t, U u);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/function/ToIntFunction.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2012, 2013, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package java.util.function;
+
+/**
+ * Apply a function to the input argument, yielding an appropriate result.
+ * This is the {@code int}-bearing specialization for {@link Function}.
+ *
+ * @param <T> the type of input objects to the function
+ *
+ * @see Function
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface ToIntFunction<T> {
+
+ /**
+ * Compute the result of applying the function to the input arguments
+ *
+ * @param t the input object
+ * @return the function result value
+ */
+ public int applyAsInt(T t);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/function/ToLongBiFunction.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2012, 2013, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package java.util.function;
+
+/**
+ * Apply a function to the input arguments, yielding an appropriate result.
+ * This is the {@code long}-bearing specialization for {@link BiFunction}.
+ *
+ * @param <T> the type of the first argument to the {@code applyAsLong}
+ * operation.
+ * @param <U> the type of the second argument to the {@code applyAsLong}
+ * operation.
+ *
+ * @see BiFunction
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface ToLongBiFunction<T, U> {
+
+ /**
+ * Compute the result of applying the function to the input arguments.
+ *
+ * @param t an input object
+ * @param u an input object
+ * @return the function result value
+ */
+ public long applyAsLong(T t, U u);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/function/ToLongFunction.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2012, 2013, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+package java.util.function;
+
+/**
+ * Apply a function to the input argument, yielding an appropriate result.
+ * This is the {@code long}-bearing specialization for {@link Function}.
+ *
+ * @param <T> the type of input objects to the function
+ *
+ * @see Function
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface ToLongFunction<T> {
+
+ /**
+ * Compute the result of applying the function to the input arguments.
+ *
+ * @param t the input object
+ * @return the function result value
+ */
+ public long applyAsLong(T t);
+}
--- a/jdk/src/share/classes/java/util/function/UnaryOperator.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/function/UnaryOperator.java Tue Mar 12 18:12:44 2013 -0700
@@ -26,20 +26,14 @@
/**
* An operation upon a single operand yielding a result. The operand and the
- * result are of the same type.
+ * result are of the same type. This is a specialization of {@code Function} for
+ * the case where the operand and result are of the same type.
*
- * @param <T> the type of operand to {@code operate} and of the result
+ * @param <T> the type of operand to {@code apply} and of the result
*
+ * @see Function
* @since 1.8
*/
@FunctionalInterface
-public interface UnaryOperator<T> {
-
- /**
- * Returns the result of the operation upon the operand.
- *
- * @param operand the operand
- * @return the operation result
- */
- public T operate(T operand);
+public interface UnaryOperator<T> extends Function<T, T> {
}
--- a/jdk/src/share/classes/java/util/function/package-info.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/function/package-info.java Tue Mar 12 18:12:44 2013 -0700
@@ -22,27 +22,62 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
/**
- * <em>Functional interfaces</em> provide typing for lambda expressions. Each
- * functional interface provides a single abstract method to which the lambda
- * expression's parameter and return types are matched.
+ * <em>Functional interfaces</em> provide target types for lambda expressions
+ * and method references. Each functional interface has a single abstract method
+ * to which the lambda expression's parameter and return types are matched or
+ * adapted. Functional interfaces can provide a target type in multiple contexts,
+ * such as assignment context, method invocation, or cast context:
+ *
+ * <pre>
+ * Predicate<String> p = String::isEmpty;
+ *
+ * stream.filter(e -> e.getSize() > 10)...
*
- * <p>The interfaces in this package are all functional interfaces used with the
- * collections and streams frameworks. The operation identified by each
- * interface is generally applied to a collection or stream of objects.
+ * stream.map((ToIntFunction) e -> e.getSize())...
+ * </pre>
+ *
+ * <p>The interfaces in this package are functional interfaces used by the JDK,
+ * and are available to be used by user code as well. While they do not identify
+ * a complete set of function shapes to which lambda expressions might be adapted,
+ * they provide enough to cover common requirements.
*
- * <p>All functional interface implementations are expected to ensure that:
+ * <p>The interfaces in this package are annotated with @{link FunctionalInterface}.
+ * This annotation is not a requirement for the compiler to recognize an interface
+ * as a functional interface, but merely an aid to capture design intent and enlist the
+ * help of the compiler in identifying accidental violations of design intent.
+ *
+ * <p>The functional interfaces in this package follow an extensible naming convention,
+ * as follows:
+ *
* <ul>
- * <li>When used for aggregate operations upon many elements it should not be
- * assumed that the operation will be called upon elements in any specific order.
- * </li>
- * <li>{@code null} values are accepted and returned by these functional
- * interfaces according to the constraints of the specification in which the
- * functional interfaces are used. The functional interfaces themselves do not
- * constrain or mandate use of {@code null} values. Most usages of the
- * functional interfaces will define the role, if any, of {@code null} for that
- * context.
- * </li>
+ * <li>There are several basic function shapes, including {@link java.util.function.Function} ({@code T -> R}),
+ * {@link java.util.function.Consumer} ({@code T -> void}),
+ * {@link java.util.function.Predicate} ({@code T -> boolean}),
+ * and {@link java.util.function.Supplier} ({@code () -> T}).
+ * </li>
+ * <li>Function shapes have a natural arity based on how they are most commonly used.
+ * The basic shapes can be modified by an arity prefix to indicate a different arity,
+ * such as {@link java.util.function.BiFunction} ({@code (T, U) -> R}).
+ * </li>
+ * <li>There are additional derived function shapes which extend the basic function
+ * shapes, including {@link java.util.function.UnaryOperator} (extends {@code Function}) and
+ * {@link java.util.function.BinaryOperator} (extends {@code BiFunction}).
+ * </li>
+ * <li>Type parameters of functional interfaces can be specialized to primitives with
+ * additional type prefixes. To specialize the return type for a type that has both
+ * generic return type and generic arguments, we prefix {@code ToXxx}, as in
+ * {@link java.util.function.ToIntFunction}. Otherwise, type arguments are specialized left-to-right,
+ * as in {@link java.util.function.DoubleConsumer} or {@link java.util.function.ObjIntConsumer}.
+ * (The type prefix {@code Obj} is used to indicate that we don't want to specialize this parameter,
+ * but want to move on to the next parameter.) These schemes can be combined as in {@code IntToDoubleFunction}.
+ * </li>
+ * <li>If there are specialization prefixes for all arguments, the arity prefix may be left
+ * out (as in {@link java.util.function.ObjIntConsumer}).
+ * </li>
* </ul>
+ *
+ * @see java.lang.FunctionalInterface
*/
package java.util.function;
--- a/jdk/src/share/classes/java/util/jar/JarFile.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/jar/JarFile.java Tue Mar 12 18:12:44 2013 -0700
@@ -63,8 +63,13 @@
private JarVerifier jv;
private boolean jvInitialized;
private boolean verify;
- private boolean computedHasClassPathAttribute;
+
+ // indicates if Class-Path attribute present (only valid if hasCheckedSpecialAttributes true)
private boolean hasClassPathAttribute;
+ // indicates if Profile attribute present (only valid if hasCheckedSpecialAttributes true)
+ private boolean hasProfileAttribute;
+ // true if manifest checked for special attributes
+ private volatile boolean hasCheckedSpecialAttributes;
// Set up JavaUtilJarAccess in SharedSecrets
static {
@@ -421,27 +426,45 @@
jv);
}
- // Statics for hand-coded Boyer-Moore search in hasClassPathAttribute()
+ // Statics for hand-coded Boyer-Moore search
+ private static final char[] CLASSPATH_CHARS = {'c','l','a','s','s','-','p','a','t','h'};
+ private static final char[] PROFILE_CHARS = { 'p', 'r', 'o', 'f', 'i', 'l', 'e' };
// The bad character shift for "class-path"
- private static int[] lastOcc;
+ private static final int[] CLASSPATH_LASTOCC;
// The good suffix shift for "class-path"
- private static int[] optoSft;
- // Initialize the shift arrays to search for "class-path"
- private static char[] src = {'c','l','a','s','s','-','p','a','t','h'};
+ private static final int[] CLASSPATH_OPTOSFT;
+ // The bad character shift for "profile"
+ private static final int[] PROFILE_LASTOCC;
+ // The good suffix shift for "profile"
+ private static final int[] PROFILE_OPTOSFT;
+
static {
- lastOcc = new int[128];
- optoSft = new int[10];
- lastOcc[(int)'c']=1;
- lastOcc[(int)'l']=2;
- lastOcc[(int)'s']=5;
- lastOcc[(int)'-']=6;
- lastOcc[(int)'p']=7;
- lastOcc[(int)'a']=8;
- lastOcc[(int)'t']=9;
- lastOcc[(int)'h']=10;
+ CLASSPATH_LASTOCC = new int[128];
+ CLASSPATH_OPTOSFT = new int[10];
+ CLASSPATH_LASTOCC[(int)'c'] = 1;
+ CLASSPATH_LASTOCC[(int)'l'] = 2;
+ CLASSPATH_LASTOCC[(int)'s'] = 5;
+ CLASSPATH_LASTOCC[(int)'-'] = 6;
+ CLASSPATH_LASTOCC[(int)'p'] = 7;
+ CLASSPATH_LASTOCC[(int)'a'] = 8;
+ CLASSPATH_LASTOCC[(int)'t'] = 9;
+ CLASSPATH_LASTOCC[(int)'h'] = 10;
for (int i=0; i<9; i++)
- optoSft[i]=10;
- optoSft[9]=1;
+ CLASSPATH_OPTOSFT[i] = 10;
+ CLASSPATH_OPTOSFT[9]=1;
+
+ PROFILE_LASTOCC = new int[128];
+ PROFILE_OPTOSFT = new int[7];
+ PROFILE_LASTOCC[(int)'p'] = 1;
+ PROFILE_LASTOCC[(int)'r'] = 2;
+ PROFILE_LASTOCC[(int)'o'] = 3;
+ PROFILE_LASTOCC[(int)'f'] = 4;
+ PROFILE_LASTOCC[(int)'i'] = 5;
+ PROFILE_LASTOCC[(int)'l'] = 6;
+ PROFILE_LASTOCC[(int)'e'] = 7;
+ for (int i=0; i<6; i++)
+ PROFILE_OPTOSFT[i] = 7;
+ PROFILE_OPTOSFT[6] = 1;
}
private JarEntry getManEntry() {
@@ -466,17 +489,55 @@
return manEntry;
}
- // Returns true iff this jar file has a manifest with a class path
- // attribute. Returns false if there is no manifest or the manifest
- // does not contain a "Class-Path" attribute. Currently exported to
- // core libraries via sun.misc.SharedSecrets.
+ /**
+ * Returns {@code true} iff this JAR file has a manifest with the
+ * Class-Path attribute
+ */
boolean hasClassPathAttribute() throws IOException {
- if (computedHasClassPathAttribute) {
- return hasClassPathAttribute;
+ checkForSpecialAttributes();
+ return hasClassPathAttribute;
+ }
+
+ /**
+ * Returns {@code true} iff this JAR file has a manifest with the
+ * Profile attribute
+ */
+ boolean hasProfileAttribute() throws IOException {
+ checkForSpecialAttributes();
+ return hasProfileAttribute;
+ }
+
+ /**
+ * Returns true if the pattern {@code src} is found in {@code b}.
+ * The {@code lastOcc} and {@code optoSft} arrays are the precomputed
+ * bad character and good suffix shifts.
+ */
+ private boolean match(char[] src, byte[] b, int[] lastOcc, int[] optoSft) {
+ int len = src.length;
+ int last = b.length - len;
+ int i = 0;
+ next:
+ while (i<=last) {
+ for (int j=(len-1); j>=0; j--) {
+ char c = (char) b[i+j];
+ c = (((c-'A')|('Z'-c)) >= 0) ? (char)(c + 32) : c;
+ if (c != src[j]) {
+ i += Math.max(j + 1 - lastOcc[c&0x7F], optoSft[j]);
+ continue next;
+ }
+ }
+ return true;
}
+ return false;
+ }
- hasClassPathAttribute = false;
- if (!isKnownToNotHaveClassPathAttribute()) {
+ /**
+ * On first invocation, check if the JAR file has the Class-Path
+ * and/or Profile attributes. A no-op on subsequent calls.
+ */
+ private void checkForSpecialAttributes() throws IOException {
+ if (hasCheckedSpecialAttributes) return;
+ if (!isKnownNotToHaveSpecialAttributes()) {
JarEntry manEntry = getManEntry();
if (manEntry != null) {
byte[] b = new byte[(int)manEntry.getSize()];
@@ -484,31 +545,18 @@
super.getInputStream(manEntry))) {
dis.readFully(b, 0, b.length);
}
-
- int last = b.length - src.length;
- int i = 0;
- next:
- while (i<=last) {
- for (int j=9; j>=0; j--) {
- char c = (char) b[i+j];
- c = (((c-'A')|('Z'-c)) >= 0) ? (char)(c + 32) : c;
- if (c != src[j]) {
- i += Math.max(j + 1 - lastOcc[c&0x7F], optoSft[j]);
- continue next;
- }
- }
+ if (match(CLASSPATH_CHARS, b, CLASSPATH_LASTOCC, CLASSPATH_OPTOSFT))
hasClassPathAttribute = true;
- break;
- }
+ if (match(PROFILE_CHARS, b, PROFILE_LASTOCC, PROFILE_OPTOSFT))
+ hasProfileAttribute = true;
}
}
- computedHasClassPathAttribute = true;
- return hasClassPathAttribute;
+ hasCheckedSpecialAttributes = true;
}
private static String javaHome;
- private static String[] jarNames;
- private boolean isKnownToNotHaveClassPathAttribute() {
+ private static volatile String[] jarNames;
+ private boolean isKnownNotToHaveSpecialAttributes() {
// Optimize away even scanning of manifest for jar files we
// deliver which don't have a class-path attribute. If one of
// these jars is changed to include such an attribute this code
@@ -518,19 +566,20 @@
new GetPropertyAction("java.home"));
}
if (jarNames == null) {
- String[] names = new String[10];
+ String[] names = new String[11];
String fileSep = File.separator;
int i = 0;
names[i++] = fileSep + "rt.jar";
- names[i++] = fileSep + "sunrsasign.jar";
names[i++] = fileSep + "jsse.jar";
names[i++] = fileSep + "jce.jar";
names[i++] = fileSep + "charsets.jar";
names[i++] = fileSep + "dnsns.jar";
- names[i++] = fileSep + "ldapsec.jar";
+ names[i++] = fileSep + "zipfs.jar";
names[i++] = fileSep + "localedata.jar";
+ names[i++] = fileSep = "cldrdata.jar";
names[i++] = fileSep + "sunjce_provider.jar";
names[i++] = fileSep + "sunpkcs11.jar";
+ names[i++] = fileSep + "sunec.jar";
jarNames = names;
}
--- a/jdk/src/share/classes/java/util/jar/JavaUtilJarAccessImpl.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/java/util/jar/JavaUtilJarAccessImpl.java Tue Mar 12 18:12:44 2013 -0700
@@ -37,6 +37,10 @@
return jar.hasClassPathAttribute();
}
+ public boolean jarFileHasProfileAttribute(JarFile jar) throws IOException {
+ return jar.hasProfileAttribute();
+ }
+
public CodeSource[] getCodeSources(JarFile jar, URL url) {
return jar.getCodeSources(url);
}
--- a/jdk/src/share/classes/javax/swing/JFrame.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/javax/swing/JFrame.java Tue Mar 12 18:12:44 2013 -0700
@@ -387,13 +387,14 @@
operation != EXIT_ON_CLOSE) {
throw new IllegalArgumentException("defaultCloseOperation must be one of: DO_NOTHING_ON_CLOSE, HIDE_ON_CLOSE, DISPOSE_ON_CLOSE, or EXIT_ON_CLOSE");
}
+
+ if (operation == EXIT_ON_CLOSE) {
+ SecurityManager security = System.getSecurityManager();
+ if (security != null) {
+ security.checkExit(0);
+ }
+ }
if (this.defaultCloseOperation != operation) {
- if (operation == EXIT_ON_CLOSE) {
- SecurityManager security = System.getSecurityManager();
- if (security != null) {
- security.checkExit(0);
- }
- }
int oldValue = this.defaultCloseOperation;
this.defaultCloseOperation = operation;
firePropertyChange("defaultCloseOperation", oldValue, operation);
--- a/jdk/src/share/classes/javax/swing/SwingUtilities.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/javax/swing/SwingUtilities.java Tue Mar 12 18:12:44 2013 -0700
@@ -356,7 +356,7 @@
sourceEvent.getYOnScreen(),
sourceEvent.getClickCount(),
sourceEvent.isPopupTrigger(),
- MouseEvent.NOBUTTON );
+ sourceEvent.getButton());
}
return newEvent;
}
--- a/jdk/src/share/classes/javax/swing/text/html/FormView.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/javax/swing/text/html/FormView.java Tue Mar 12 18:12:44 2013 -0700
@@ -159,6 +159,10 @@
attr.getAttribute(StyleConstants.NameAttribute);
JComponent c = null;
Object model = attr.getAttribute(StyleConstants.ModelAttribute);
+
+ // Remove listeners previously registered in shared model
+ // when a new UI component is replaced. See bug 7189299.
+ removeStaleListenerForModel(model);
if (t == HTML.Tag.INPUT) {
c = createInputComponent(attr, model);
} else if (t == HTML.Tag.SELECT) {
@@ -310,6 +314,63 @@
return c;
}
+ private void removeStaleListenerForModel(Object model) {
+ if (model instanceof DefaultButtonModel) {
+ // case of JButton whose model is DefaultButtonModel
+ // Need to remove stale ActionListener, ChangeListener and
+ // ItemListener that are instance of AbstractButton$Handler.
+ DefaultButtonModel buttonModel = (DefaultButtonModel) model;
+ String listenerClass = "javax.swing.AbstractButton$Handler";
+ for (ActionListener listener : buttonModel.getActionListeners()) {
+ if (listenerClass.equals(listener.getClass().getName())) {
+ buttonModel.removeActionListener(listener);
+ }
+ }
+ for (ChangeListener listener : buttonModel.getChangeListeners()) {
+ if (listenerClass.equals(listener.getClass().getName())) {
+ buttonModel.removeChangeListener(listener);
+ }
+ }
+ for (ItemListener listener : buttonModel.getItemListeners()) {
+ if (listenerClass.equals(listener.getClass().getName())) {
+ buttonModel.removeItemListener(listener);
+ }
+ }
+ } else if (model instanceof AbstractListModel) {
+ // case of JComboBox and JList
+ // For JList, the stale ListDataListener is instance
+ // BasicListUI$Handler.
+ // For JComboBox, there are 2 stale ListDataListeners, which are
+ // BasicListUI$Handler and BasicComboBoxUI$Handler.
+ AbstractListModel listModel = (AbstractListModel) model;
+ String listenerClass1 =
+ "javax.swing.plaf.basic.BasicListUI$Handler";
+ String listenerClass2 =
+ "javax.swing.plaf.basic.BasicComboBoxUI$Handler";
+ for (ListDataListener listener : listModel.getListDataListeners()) {
+ if (listenerClass1.equals(listener.getClass().getName())
+ || listenerClass2.equals(listener.getClass().getName()))
+ {
+ listModel.removeListDataListener(listener);
+ }
+ }
+ } else if (model instanceof AbstractDocument) {
+ // case of JPasswordField, JTextField and JTextArea
+ // All have 2 stale DocumentListeners.
+ String listenerClass1 =
+ "javax.swing.plaf.basic.BasicTextUI$UpdateHandler";
+ String listenerClass2 =
+ "javax.swing.text.DefaultCaret$Handler";
+ AbstractDocument docModel = (AbstractDocument) model;
+ for (DocumentListener listener : docModel.getDocumentListeners()) {
+ if (listenerClass1.equals(listener.getClass().getName())
+ || listenerClass2.equals(listener.getClass().getName()))
+ {
+ docModel.removeDocumentListener(listener);
+ }
+ }
+ }
+ }
/**
* Determines the maximum span for this view along an
@@ -347,7 +408,7 @@
/**
- * Responsible for processeing the ActionEvent.
+ * Responsible for processing the ActionEvent.
* If the element associated with the FormView,
* has a type of "submit", "reset", "text" or "password"
* then the action is processed. In the case of a "submit"
--- a/jdk/src/share/classes/sun/awt/EmbeddedFrame.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/sun/awt/EmbeddedFrame.java Tue Mar 12 18:12:44 2013 -0700
@@ -582,5 +582,8 @@
public void repositionSecurityWarning() {
}
- }
+
+ public void emulateActivation(boolean activate) {
+ }
+ }
} // class EmbeddedFrame
--- a/jdk/src/share/classes/sun/awt/HToolkit.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/sun/awt/HToolkit.java Tue Mar 12 18:12:44 2013 -0700
@@ -64,6 +64,11 @@
throw new HeadlessException();
}
+ public FramePeer createLightweightFrame(LightweightFrame target)
+ throws HeadlessException {
+ throw new HeadlessException();
+ }
+
public FramePeer createFrame(Frame target)
throws HeadlessException {
throw new HeadlessException();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/sun/awt/LightweightFrame.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2013, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package sun.awt;
+
+import java.awt.Container;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Image;
+import java.awt.MenuBar;
+import java.awt.MenuComponent;
+import java.awt.Toolkit;
+import java.awt.peer.FramePeer;
+
+/**
+ * The class provides basic functionality for a lightweight frame
+ * implementation. A subclass is expected to provide painting to an
+ * offscreen image and access to it. Thus it can be used for lightweight
+ * embedding.
+ *
+ * @author Artem Ananiev
+ * @author Anton Tarasov
+ */
+@SuppressWarnings("serial")
+public abstract class LightweightFrame extends Frame {
+
+ /**
+ * Constructs a new, initially invisible {@code LightweightFrame}
+ * instance.
+ */
+ public LightweightFrame() {
+ setUndecorated(true);
+ setResizable(true);
+ setEnabled(true);
+ }
+
+ /**
+ * Blocks introspection of a parent window by this child.
+ *
+ * @return null
+ */
+ @Override public final Container getParent() { return null; }
+
+ @Override public Graphics getGraphics() { return null; }
+
+ @Override public final boolean isResizable() { return true; }
+
+ // Block modification of any frame attributes, since they aren't
+ // applicable for a lightweight frame.
+
+ @Override public final void setTitle(String title) {}
+ @Override public final void setIconImage(Image image) {}
+ @Override public final void setIconImages(java.util.List<? extends Image> icons) {}
+ @Override public final void setMenuBar(MenuBar mb) {}
+ @Override public final void setResizable(boolean resizable) {}
+ @Override public final void remove(MenuComponent m) {}
+ @Override public final void toFront() {}
+ @Override public final void toBack() {}
+
+ @Override public void addNotify() {
+ synchronized (getTreeLock()) {
+ if (getPeer() == null) {
+ SunToolkit stk = (SunToolkit)Toolkit.getDefaultToolkit();
+ try {
+ setPeer(stk.createLightweightFrame(this));
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ super.addNotify();
+ }
+ }
+
+ private void setPeer(final FramePeer p) {
+ AWTAccessor.getComponentAccessor().setPeer(this, p);
+ }
+
+ /**
+ * Requests the peer to emulate activation or deactivation of the
+ * frame. Peers should override this method if they are to implement
+ * this functionality.
+ *
+ * @param activate if <code>true</code>, activates the frame;
+ * otherwise, deactivates the frame
+ */
+ public void emulateActivation(boolean activate) {
+ ((FramePeer)getPeer()).emulateActivation(activate);
+ }
+
+ /**
+ * Delegates the focus grab action to the client (embedding) application.
+ * The method is called by the AWT grab machinery.
+ *
+ * @see SunToolkit#grab(java.awt.Window)
+ */
+ public abstract void grabFocus();
+
+ /**
+ * Delegates the focus ungrab action to the client (embedding) application.
+ * The method is called by the AWT grab machinery.
+ *
+ * @see SunToolkit#ungrab(java.awt.Window)
+ */
+ public abstract void ungrabFocus();
+}
--- a/jdk/src/share/classes/sun/awt/SunToolkit.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/sun/awt/SunToolkit.java Tue Mar 12 18:12:44 2013 -0700
@@ -131,6 +131,9 @@
public abstract FramePeer createFrame(Frame target)
throws HeadlessException;
+ public abstract FramePeer createLightweightFrame(LightweightFrame target)
+ throws HeadlessException;
+
public abstract DialogPeer createDialog(Dialog target)
throws HeadlessException;
--- a/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java Tue Mar 12 18:12:44 2013 -0700
@@ -1873,7 +1873,7 @@
*/
public class ReencodingInputStream extends InputStream {
protected BufferedReader wrapped;
- protected final char[] in = new char[1];
+ protected final char[] in = new char[2];
protected byte[] out;
protected CharsetEncoder encoder;
@@ -1926,7 +1926,7 @@
try {
encoder = Charset.forName(targetEncoding).newEncoder();
- out = new byte[(int)(encoder.maxBytesPerChar() + 0.5)];
+ out = new byte[(int)(encoder.maxBytesPerChar() * 2 + 0.5)];
inBuf = CharBuffer.wrap(in);
outBuf = ByteBuffer.wrap(out);
} catch (IllegalCharsetNameException e) {
@@ -1950,31 +1950,50 @@
}
}
+ private int readChar() throws IOException {
+ int c = wrapped.read();
+
+ if (c == -1) { // -1 is EOS
+ eos = true;
+ return -1;
+ }
+
+ // "c == 0" is not quite correct, but good enough on Windows.
+ if (numTerminators > 0 && c == 0) {
+ eos = true;
+ return -1;
+ } else if (eoln != null && matchCharArray(eoln, c)) {
+ c = '\n' & 0xFFFF;
+ }
+
+ return c;
+ }
+
public int read() throws IOException {
if (eos) {
return -1;
}
if (index >= limit) {
- int c = wrapped.read();
-
- if (c == -1) { // -1 is EOS
- eos = true;
+ // deal with supplementary characters
+ int c = readChar();
+ if (c == -1) {
return -1;
}
- // "c == 0" is not quite correct, but good enough on Windows.
- if (numTerminators > 0 && c == 0) {
- eos = true;
- return -1;
- } else if (eoln != null && matchCharArray(eoln, c)) {
- c = '\n' & 0xFFFF;
+ in[0] = (char) c;
+ in[1] = 0;
+ inBuf.limit(1);
+ if (Character.isHighSurrogate((char) c)) {
+ c = readChar();
+ if (c != -1) {
+ in[1] = (char) c;
+ inBuf.limit(2);
+ }
}
- in[0] = (char)c;
-
inBuf.rewind();
- outBuf.rewind();
+ outBuf.limit(out.length).rewind();
encoder.encode(inBuf, outBuf, false);
outBuf.flip();
limit = outBuf.limit();
--- a/jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java Tue Mar 12 18:12:44 2013 -0700
@@ -498,7 +498,7 @@
postDropTargetEvent(component, x, y, dropAction, actions,
formats, nativeCtxt,
SunDropTargetEvent.MOUSE_DROPPED,
- SunDropTargetContextPeer.DISPATCH_SYNC);
+ !SunDropTargetContextPeer.DISPATCH_SYNC);
}
/**
--- a/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java Tue Mar 12 18:12:44 2013 -0700
@@ -25,29 +25,91 @@
package sun.java2d.cmm.lcms;
-import java.awt.color.ColorSpace;
import java.awt.color.ICC_Profile;
-import java.awt.color.CMMException;
+import java.util.Arrays;
+import java.util.HashMap;
import sun.java2d.cmm.ColorTransform;
import sun.java2d.cmm.PCMM;
-import sun.java2d.cmm.lcms.LCMS;
-import sun.java2d.cmm.lcms.LCMSTransform;
public class LCMS implements PCMM {
/* methods invoked from ICC_Profile */
- public native long loadProfile(byte[] data);
+ @Override
+ public long loadProfile(byte[] data) {
+ long id = loadProfileNative(data);
+
+ if (id != 0L) {
+ if (profiles == null) {
+ profiles = new HashMap<>();
+ }
+ profiles.put(id, new TagCache(id));
+ }
+ return id;
+ }
- public native void freeProfile(long profileID);
+ private native long loadProfileNative(byte[] data);
+
+ @Override
+ public void freeProfile(long profileID) {
+ TagCache c = profiles.remove(profileID);
+ if (c != null) {
+ c.clear();
+ }
+ if (profiles.isEmpty()) {
+ profiles = null;
+ }
+ freeProfileNative(profileID);
+ }
+
+ private native void freeProfileNative(long profileID);
public native synchronized int getProfileSize(long profileID);
public native synchronized void getProfileData(long profileID, byte[] data);
- public native synchronized int getTagSize(long profileID, int tagSignature);
- public native synchronized void getTagData(long profileID, int tagSignature,
- byte[] data);
- public native synchronized void setTagData(long profileID, int tagSignature,
+ @Override
+ public synchronized int getTagSize(long profileID, int tagSignature) {
+ TagCache cache = profiles.get(profileID);
+
+ if (cache == null) {
+ cache = new TagCache(profileID);
+ profiles.put(profileID, cache);
+ }
+
+ TagData t = cache.getTag(tagSignature);
+ return t == null ? 0 : t.getSize();
+ }
+
+ private static native byte[] getTagNative(long profileID, int signature);
+
+ @Override
+ public synchronized void getTagData(long profileID, int tagSignature,
+ byte[] data)
+ {
+ TagCache cache = profiles.get(profileID);
+
+ if (cache == null) {
+ cache = new TagCache(profileID);
+ profiles.put(profileID, cache);
+ }
+
+ TagData t = cache.getTag(tagSignature);
+ if (t != null) {
+ t.copyDataTo(data);
+ }
+ }
+
+ @Override
+ public synchronized void setTagData(long profileID, int tagSignature, byte[] data) {
+ TagCache cache = profiles.get(profileID);
+
+ if (cache != null) {
+ cache.clear();
+ }
+ setTagDataNative(profileID, tagSignature, data);
+ }
+
+ private native synchronized void setTagDataNative(long profileID, int tagSignature,
byte[] data);
public static native long getProfileID(ICC_Profile profile);
@@ -103,4 +165,59 @@
initLCMS(LCMSTransform.class, LCMSImageLayout.class, ICC_Profile.class);
}
+
+ private static class TagData {
+ private int signature;
+ private byte[] data;
+
+ TagData(int sig, byte[] data) {
+ this.signature = sig;
+ this.data = data;
+ }
+
+ int getSize() {
+ return data.length;
+ }
+
+ byte[] getData() {
+ return Arrays.copyOf(data, data.length);
+ }
+
+ void copyDataTo(byte[] dst) {
+ System.arraycopy(data, 0, dst, 0, data.length);
+ }
+
+ int getSignature() {
+ return signature;
+ }
+ }
+
+ private static class TagCache {
+ private long profileID;
+ private HashMap<Integer, TagData> tags;
+
+ TagCache(long id) {
+ profileID = id;
+
+ tags = new HashMap<>();
+ }
+
+ TagData getTag(int sig) {
+ TagData t = tags.get(sig);
+ if (t == null) {
+ byte[] tagData = getTagNative(profileID, sig);
+ if (tagData != null) {
+ t = new TagData(sig, tagData);
+ tags.put(sig, t);
+ }
+ }
+ return t;
+ }
+
+ void clear() {
+ tags.clear();
+ }
+ }
+
+ private static HashMap<Long, TagCache> profiles;
}
--- a/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java Tue Mar 12 18:12:44 2013 -0700
@@ -22,26 +22,19 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-
package sun.java2d.cmm.lcms;
-import java.awt.Graphics2D;
import java.awt.image.BufferedImage;
import java.awt.image.ComponentColorModel;
-import java.awt.image.Raster;
-import java.awt.image.WritableRaster;
-import java.awt.image.SinglePixelPackedSampleModel;
import java.awt.image.ComponentSampleModel;
import java.awt.image.DataBuffer;
-import java.awt.image.DataBufferByte;
-import java.awt.image.DataBufferUShort;
-import java.awt.image.DataBufferInt;
import java.awt.image.ColorModel;
+import java.awt.image.Raster;
+import java.awt.image.SampleModel;
import sun.awt.image.ByteComponentRaster;
import sun.awt.image.ShortComponentRaster;
import sun.awt.image.IntegerComponentRaster;
-
class LCMSImageLayout {
public static int BYTES_SH(int x) {
@@ -49,47 +42,34 @@
}
public static int EXTRA_SH(int x) {
- return x<<7;
+ return x << 7;
}
public static int CHANNELS_SH(int x) {
- return x<<3;
+ return x << 3;
}
-
- public static final int SWAPFIRST = 1<<14;
-
- public static final int DOSWAP = 1<<10;
-
+ public static final int SWAPFIRST = 1 << 14;
+ public static final int DOSWAP = 1 << 10;
public static final int PT_RGB_8 =
- CHANNELS_SH(3) | BYTES_SH(1);
-
+ CHANNELS_SH(3) | BYTES_SH(1);
public static final int PT_GRAY_8 =
- CHANNELS_SH(1) | BYTES_SH(1);
-
+ CHANNELS_SH(1) | BYTES_SH(1);
public static final int PT_GRAY_16 =
- CHANNELS_SH(1) | BYTES_SH(2);
-
+ CHANNELS_SH(1) | BYTES_SH(2);
public static final int PT_RGBA_8 =
- EXTRA_SH(1) | CHANNELS_SH(3) | BYTES_SH(1);
-
+ EXTRA_SH(1) | CHANNELS_SH(3) | BYTES_SH(1);
public static final int PT_ARGB_8 =
- EXTRA_SH(1) | CHANNELS_SH(3) | BYTES_SH(1) | SWAPFIRST;
-
+ EXTRA_SH(1) | CHANNELS_SH(3) | BYTES_SH(1) | SWAPFIRST;
public static final int PT_BGR_8 =
- DOSWAP | CHANNELS_SH(3) | BYTES_SH(1);
-
+ DOSWAP | CHANNELS_SH(3) | BYTES_SH(1);
public static final int PT_ABGR_8 =
- DOSWAP | EXTRA_SH(1) | CHANNELS_SH(3) | BYTES_SH(1);
-
- public static final int PT_BGRA_8 = EXTRA_SH(1) | CHANNELS_SH(3) |
- BYTES_SH(1) | DOSWAP | SWAPFIRST;
-
- public static final int DT_BYTE = 0;
- public static final int DT_SHORT = 1;
- public static final int DT_INT = 2;
- public static final int DT_DOUBLE = 3;
-
-
+ DOSWAP | EXTRA_SH(1) | CHANNELS_SH(3) | BYTES_SH(1);
+ public static final int PT_BGRA_8 = EXTRA_SH(1) | CHANNELS_SH(3)
+ | BYTES_SH(1) | DOSWAP | SWAPFIRST;
+ public static final int DT_BYTE = 0;
+ public static final int DT_SHORT = 1;
+ public static final int DT_INT = 2;
+ public static final int DT_DOUBLE = 3;
boolean isIntPacked = false;
int pixelType;
int dataType;
@@ -98,25 +78,30 @@
int nextRowOffset;
int offset;
+ /* This flag indicates whether the image can be processed
+ * at once by doTransfrom() native call. Otherwise, the
+ * image is processed scan by scan.
+ */
+ private boolean imageAtOnce = false;
Object dataArray;
+
private LCMSImageLayout(int np, int pixelType, int pixelSize) {
this.pixelType = pixelType;
width = np;
height = 1;
- nextRowOffset = np*pixelSize;
+ nextRowOffset = np * pixelSize;
offset = 0;
}
private LCMSImageLayout(int width, int height, int pixelType,
- int pixelSize) {
+ int pixelSize) {
this.pixelType = pixelType;
this.width = width;
this.height = height;
- nextRowOffset = width*pixelSize;
+ nextRowOffset = width * pixelSize;
offset = 0;
}
-
public LCMSImageLayout(byte[] data, int np, int pixelType, int pixelSize) {
this(np, pixelType, pixelSize);
dataType = DT_BYTE;
@@ -135,102 +120,218 @@
dataArray = data;
}
- public LCMSImageLayout(double[] data, int np, int pixelType, int pixelSize)
- {
+ public LCMSImageLayout(double[] data, int np, int pixelType, int pixelSize) {
this(np, pixelType, pixelSize);
dataType = DT_DOUBLE;
dataArray = data;
}
- public LCMSImageLayout(BufferedImage image) {
- ShortComponentRaster shortRaster;
- IntegerComponentRaster intRaster;
- ByteComponentRaster byteRaster;
+ private LCMSImageLayout() {
+ }
+
+ /* This method creates a layout object for given image.
+ * Returns null if the image is not supported by current implementation.
+ */
+ public static LCMSImageLayout createImageLayout(BufferedImage image) {
+ LCMSImageLayout l = new LCMSImageLayout();
+
switch (image.getType()) {
case BufferedImage.TYPE_INT_RGB:
- pixelType = PT_ARGB_8;
- isIntPacked = true;
+ l.pixelType = PT_ARGB_8;
+ l.isIntPacked = true;
break;
case BufferedImage.TYPE_INT_ARGB:
- pixelType = PT_ARGB_8;
- isIntPacked = true;
+ l.pixelType = PT_ARGB_8;
+ l.isIntPacked = true;
break;
case BufferedImage.TYPE_INT_BGR:
- pixelType = PT_ABGR_8;
- isIntPacked = true;
+ l.pixelType = PT_ABGR_8;
+ l.isIntPacked = true;
break;
case BufferedImage.TYPE_3BYTE_BGR:
- pixelType = PT_BGR_8;
+ l.pixelType = PT_BGR_8;
break;
case BufferedImage.TYPE_4BYTE_ABGR:
- pixelType = PT_ABGR_8;
+ l.pixelType = PT_ABGR_8;
break;
case BufferedImage.TYPE_BYTE_GRAY:
- pixelType = PT_GRAY_8;
+ l.pixelType = PT_GRAY_8;
break;
case BufferedImage.TYPE_USHORT_GRAY:
- pixelType = PT_GRAY_16;
+ l.pixelType = PT_GRAY_16;
break;
default:
- // TODO: Add support for some images having
- // SinglePixelPackedModel and ComponentSampleModel
- throw new IllegalArgumentException(
- "CMMImageLayout - bad image type passed to constructor");
+ /* ColorConvertOp creates component images as
+ * default destination, so this kind of images
+ * has to be supported.
+ */
+ ColorModel cm = image.getColorModel();
+ if (cm instanceof ComponentColorModel) {
+ ComponentColorModel ccm = (ComponentColorModel) cm;
+
+ // verify whether the component size is fine
+ int[] cs = ccm.getComponentSize();
+ for (int s : cs) {
+ if (s != 8) {
+ return null;
+ }
+ }
+
+ return createImageLayout(image.getRaster());
+
+ }
+ return null;
}
- width = image.getWidth();
- height = image.getHeight();
+ l.width = image.getWidth();
+ l.height = image.getHeight();
switch (image.getType()) {
case BufferedImage.TYPE_INT_RGB:
case BufferedImage.TYPE_INT_ARGB:
case BufferedImage.TYPE_INT_BGR:
- intRaster = (IntegerComponentRaster)image.getRaster();
- nextRowOffset = intRaster.getScanlineStride()*4;
- offset = intRaster.getDataOffset(0)*4;
- dataArray = intRaster.getDataStorage();
- dataType = DT_INT;
+ do {
+ IntegerComponentRaster intRaster = (IntegerComponentRaster)
+ image.getRaster();
+ l.nextRowOffset = intRaster.getScanlineStride() * 4;
+ l.offset = intRaster.getDataOffset(0) * 4;
+ l.dataArray = intRaster.getDataStorage();
+ l.dataType = DT_INT;
+
+ if (l.nextRowOffset == l.width * 4 * intRaster.getPixelStride()) {
+ l.imageAtOnce = true;
+ }
+ } while (false);
break;
case BufferedImage.TYPE_3BYTE_BGR:
case BufferedImage.TYPE_4BYTE_ABGR:
- byteRaster = (ByteComponentRaster)image.getRaster();
- nextRowOffset = byteRaster.getScanlineStride();
- int firstBand = image.getSampleModel().getNumBands() - 1;
- offset = byteRaster.getDataOffset(firstBand);
- dataArray = byteRaster.getDataStorage();
- dataType = DT_BYTE;
+ do {
+ ByteComponentRaster byteRaster = (ByteComponentRaster)
+ image.getRaster();
+ l.nextRowOffset = byteRaster.getScanlineStride();
+ int firstBand = image.getSampleModel().getNumBands() - 1;
+ l.offset = byteRaster.getDataOffset(firstBand);
+ l.dataArray = byteRaster.getDataStorage();
+ l.dataType = DT_BYTE;
+ if (l.nextRowOffset == l.width * byteRaster.getPixelStride()) {
+ l.imageAtOnce = true;
+ }
+ } while (false);
break;
case BufferedImage.TYPE_BYTE_GRAY:
- byteRaster = (ByteComponentRaster)image.getRaster();
- nextRowOffset = byteRaster.getScanlineStride();
- offset = byteRaster.getDataOffset(0);
- dataArray = byteRaster.getDataStorage();
- dataType = DT_BYTE;
+ do {
+ ByteComponentRaster byteRaster = (ByteComponentRaster)
+ image.getRaster();
+ l.nextRowOffset = byteRaster.getScanlineStride();
+ l.offset = byteRaster.getDataOffset(0);
+ l.dataArray = byteRaster.getDataStorage();
+ l.dataType = DT_BYTE;
+
+ if (l.nextRowOffset == l.width * byteRaster.getPixelStride()) {
+ l.imageAtOnce = true;
+ }
+ } while (false);
break;
case BufferedImage.TYPE_USHORT_GRAY:
- shortRaster = (ShortComponentRaster)image.getRaster();
- nextRowOffset = shortRaster.getScanlineStride()*2;
- offset = shortRaster.getDataOffset(0) * 2;
- dataArray = shortRaster.getDataStorage();
- dataType = DT_SHORT;
+ do {
+ ShortComponentRaster shortRaster = (ShortComponentRaster)
+ image.getRaster();
+ l.nextRowOffset = shortRaster.getScanlineStride() * 2;
+ l.offset = shortRaster.getDataOffset(0) * 2;
+ l.dataArray = shortRaster.getDataStorage();
+ l.dataType = DT_SHORT;
+
+ if (l.nextRowOffset == l.width * 2 * shortRaster.getPixelStride()) {
+ l.imageAtOnce = true;
+ }
+ } while (false);
break;
+ default:
+ return null;
+ }
+ return l;
+ }
+
+ private static enum BandOrder {
+ DIRECT,
+ INVERTED,
+ ARBITRARY,
+ UNKNOWN;
+
+ public static BandOrder getBandOrder(int[] bandOffsets) {
+ BandOrder order = UNKNOWN;
+
+ int numBands = bandOffsets.length;
+
+ for (int i = 0; (order != ARBITRARY) && (i < bandOffsets.length); i++) {
+ switch (order) {
+ case UNKNOWN:
+ if (bandOffsets[i] == i) {
+ order = DIRECT;
+ } else if (bandOffsets[i] == (numBands - 1 - i)) {
+ order = INVERTED;
+ } else {
+ order = ARBITRARY;
+ }
+ break;
+ case DIRECT:
+ if (bandOffsets[i] != i) {
+ order = ARBITRARY;
+ }
+ break;
+ case INVERTED:
+ if (bandOffsets[i] != (numBands - 1 - i)) {
+ order = ARBITRARY;
+ }
+ break;
+ }
+ }
+ return order;
}
}
- public static boolean isSupported(BufferedImage image) {
- switch (image.getType()) {
- case BufferedImage.TYPE_INT_RGB:
- case BufferedImage.TYPE_INT_ARGB:
- case BufferedImage.TYPE_INT_BGR:
- case BufferedImage.TYPE_3BYTE_BGR:
- case BufferedImage.TYPE_4BYTE_ABGR:
- case BufferedImage.TYPE_BYTE_GRAY:
- case BufferedImage.TYPE_USHORT_GRAY:
- return true;
+ public static LCMSImageLayout createImageLayout(Raster r) {
+ LCMSImageLayout l = new LCMSImageLayout();
+ if (r instanceof ByteComponentRaster) {
+ ByteComponentRaster br = (ByteComponentRaster)r;
+
+ ComponentSampleModel csm = (ComponentSampleModel)r.getSampleModel();
+
+ l.pixelType = CHANNELS_SH(br.getNumBands()) | BYTES_SH(1);
+
+ int[] bandOffsets = csm.getBandOffsets();
+ BandOrder order = BandOrder.getBandOrder(bandOffsets);
+
+ int firstBand = 0;
+ switch (order) {
+ case INVERTED:
+ l.pixelType |= DOSWAP;
+ firstBand = csm.getNumBands() - 1;
+ break;
+ case DIRECT:
+ // do nothing
+ break;
+ default:
+ // unable to create the image layout;
+ return null;
+ }
+
+ l.nextRowOffset = br.getScanlineStride();
+ l.offset = br.getDataOffset(firstBand);
+ l.dataArray = br.getDataStorage();
+ l.dataType = DT_BYTE;
+
+ l.width = br.getWidth();
+ l.height = br.getHeight();
+
+ if (l.nextRowOffset == l.width * br.getPixelStride()) {
+ l.imageAtOnce = true;
+ }
+ return l;
}
- return false;
+ return null;
}
}
--- a/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java Tue Mar 12 18:12:44 2013 -0700
@@ -161,13 +161,18 @@
}
public void colorConvert(BufferedImage src, BufferedImage dst) {
- if (LCMSImageLayout.isSupported(src) &&
- LCMSImageLayout.isSupported(dst))
- {
- doTransform(new LCMSImageLayout(src), new LCMSImageLayout(dst));
- return;
+ LCMSImageLayout srcIL, dstIL;
+
+ dstIL = LCMSImageLayout.createImageLayout(dst);
+
+ if (dstIL != null) {
+ srcIL = LCMSImageLayout.createImageLayout(src);
+ if (srcIL != null) {
+ doTransform(srcIL, dstIL);
+ return;
+ }
}
- LCMSImageLayout srcIL, dstIL;
+
Raster srcRas = src.getRaster();
WritableRaster dstRas = dst.getRaster();
ColorModel srcCM = src.getColorModel();
@@ -439,6 +444,14 @@
public void colorConvert(Raster src, WritableRaster dst) {
LCMSImageLayout srcIL, dstIL;
+ dstIL = LCMSImageLayout.createImageLayout(dst);
+ if (dstIL != null) {
+ srcIL = LCMSImageLayout.createImageLayout(src);
+ if (srcIL != null) {
+ doTransform(srcIL, dstIL);
+ return;
+ }
+ }
// Can't pass src and dst directly to CMM, so process per scanline
SampleModel srcSM = src.getSampleModel();
SampleModel dstSM = dst.getSampleModel();
--- a/jdk/src/share/classes/sun/misc/ClassFileTransformer.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/sun/misc/ClassFileTransformer.java Tue Mar 12 18:12:44 2013 -0700
@@ -25,43 +25,31 @@
package sun.misc;
import java.util.ArrayList;
+import java.util.List;
/**
- * This is an abstract base class which is called by java.lang.ClassLoader
- * when ClassFormatError is thrown inside defineClass().
- *
- * The purpose of this class is to allow applications (e.g. Java Plug-in)
- * to have a chance to transform the byte code from one form to another
- * if necessary.
- *
- * One application of this class is used by Java Plug-in to transform
- * malformed JDK 1.1 class file into a well-formed Java 2 class file
- * on-the-fly, so JDK 1.1 applets with malformed class file in the
- * Internet may run in Java 2 after transformation.
+ * This is an abstract base class originally intended to be called by
+ * {@code java.lang.ClassLoader} when {@code ClassFormatError} is
+ * thrown inside {@code defineClass()}. It is no longer hooked into
+ * {@code ClassLoader} and will be removed in a future release.
*
* @author Stanley Man-Kit Ho
*/
-public abstract class ClassFileTransformer
-{
- // Singleton of ClassFileTransformer
- //
- private static ArrayList<ClassFileTransformer> transformerList
+@Deprecated
+public abstract class ClassFileTransformer {
+
+ private static final List<ClassFileTransformer> transformers
= new ArrayList<ClassFileTransformer>();
- private static ClassFileTransformer[] transformers
- = new ClassFileTransformer[0];
/**
* Add the class file transformer object.
*
* @param t Class file transformer instance
*/
- public static void add(ClassFileTransformer t)
- {
- synchronized(transformerList)
- {
- transformerList.add(t);
- transformers = transformerList.toArray(new ClassFileTransformer[0]);
+ public static void add(ClassFileTransformer t) {
+ synchronized (transformers) {
+ transformers.add(t);
}
}
@@ -70,13 +58,11 @@
*
* @return ClassFileTransformer object array
*/
- public static ClassFileTransformer[] getTransformers()
- {
- // transformers is not intended to be changed frequently,
- // so it is okay to not put synchronized block here
- // to speed up performance.
- //
- return transformers;
+ public static ClassFileTransformer[] getTransformers() {
+ synchronized (transformers) {
+ ClassFileTransformer[] result = new ClassFileTransformer[transformers.size()];
+ return transformers.toArray(result);
+ }
}
@@ -89,5 +75,5 @@
* @return Transformed byte array
*/
public abstract byte[] transform(byte[] b, int off, int len)
- throws ClassFormatError;
+ throws ClassFormatError;
}
--- a/jdk/src/share/classes/sun/misc/JavaUtilJarAccess.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/sun/misc/JavaUtilJarAccess.java Tue Mar 12 18:12:44 2013 -0700
@@ -35,6 +35,7 @@
public interface JavaUtilJarAccess {
public boolean jarFileHasClassPathAttribute(JarFile jar) throws IOException;
+ public boolean jarFileHasProfileAttribute(JarFile jar) throws IOException;
public CodeSource[] getCodeSources(JarFile jar, URL url);
public CodeSource getCodeSource(JarFile jar, URL url, String name);
public Enumeration<String> entryNames(JarFile jar, CodeSource[] cs);
--- a/jdk/src/share/classes/sun/misc/URLClassPath.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/sun/misc/URLClassPath.java Tue Mar 12 18:12:44 2013 -0700
@@ -808,9 +808,6 @@
/**
* If the Profile attribute is present then this method checks that the runtime
* supports that profile.
- *
- * ## Add a fast path like Class-Path to avoid reading the manifest when the attribute
- * is not present.
*/
void checkProfileAttribute() throws IOException {
Manifest man = jar.getManifest();
@@ -998,7 +995,8 @@
parseExtensionsDependencies();
// check Profile attribute if present
- if (!profileCheckSuppressedByLauncher) {
+ if (!profileCheckSuppressedByLauncher &&
+ SharedSecrets.javaUtilJarAccess().jarFileHasProfileAttribute(jar)) {
checkProfileAttribute();
}
--- a/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java Tue Mar 12 18:12:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2013, 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
@@ -2637,7 +2637,7 @@
multipleCookies = true;
}
- return retValue.length() == 0 ? null : retValue.toString();
+ return retValue.length() == 0 ? "" : retValue.toString();
}
return value;
--- a/jdk/src/share/classes/sun/print/RasterPrinterJob.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/sun/print/RasterPrinterJob.java Tue Mar 12 18:12:44 2013 -0700
@@ -527,9 +527,92 @@
}
}
+ private PageFormat attributeToPageFormat(PrintService service,
+ PrintRequestAttributeSet attSet) {
+ PageFormat page = defaultPage();
+
+ if (service == null) {
+ return page;
+ }
+
+ OrientationRequested orient = (OrientationRequested)
+ attSet.get(OrientationRequested.class);
+ if (orient == null) {
+ orient = (OrientationRequested)
+ service.getDefaultAttributeValue(OrientationRequested.class);
+ }
+ if (orient == OrientationRequested.REVERSE_LANDSCAPE) {
+ page.setOrientation(PageFormat.REVERSE_LANDSCAPE);
+ } else if (orient == OrientationRequested.LANDSCAPE) {
+ page.setOrientation(PageFormat.LANDSCAPE);
+ } else {
+ page.setOrientation(PageFormat.PORTRAIT);
+ }
+
+ Media media = (Media)attSet.get(Media.class);
+ if (media == null) {
+ media =
+ (Media)service.getDefaultAttributeValue(Media.class);
+ }
+ if (!(media instanceof MediaSizeName)) {
+ media = MediaSizeName.NA_LETTER;
+ }
+ MediaSize size =
+ MediaSize.getMediaSizeForName((MediaSizeName)media);
+ if (size == null) {
+ size = MediaSize.NA.LETTER;
+ }
+ Paper paper = new Paper();
+ float dim[] = size.getSize(1); //units == 1 to avoid FP error
+ double w = Math.rint((dim[0]*72.0)/Size2DSyntax.INCH);
+ double h = Math.rint((dim[1]*72.0)/Size2DSyntax.INCH);
+ paper.setSize(w, h);
+ MediaPrintableArea area =
+ (MediaPrintableArea)
+ attSet.get(MediaPrintableArea.class);
+ double ix, iw, iy, ih;
+
+ if (area != null) {
+ // Should pass in same unit as updatePageAttributes
+ // to avoid rounding off errors.
+ ix = Math.rint(
+ area.getX(MediaPrintableArea.INCH) * DPI);
+ iy = Math.rint(
+ area.getY(MediaPrintableArea.INCH) * DPI);
+ iw = Math.rint(
+ area.getWidth(MediaPrintableArea.INCH) * DPI);
+ ih = Math.rint(
+ area.getHeight(MediaPrintableArea.INCH) * DPI);
+ }
+ else {
+ if (w >= 72.0 * 6.0) {
+ ix = 72.0;
+ iw = w - 2 * 72.0;
+ } else {
+ ix = w / 6.0;
+ iw = w * 0.75;
+ }
+ if (h >= 72.0 * 6.0) {
+ iy = 72.0;
+ ih = h - 2 * 72.0;
+ } else {
+ iy = h / 6.0;
+ ih = h * 0.75;
+ }
+ }
+ paper.setImageableArea(ix, iy, iw, ih);
+ page.setPaper(paper);
+ return page;
+ }
protected void updatePageAttributes(PrintService service,
PageFormat page) {
+ updateAttributesWithPageFormat(service, page, this.attributes);
+ }
+
+ protected void updateAttributesWithPageFormat(PrintService service,
+ PageFormat page,
+ PrintRequestAttributeSet attributes) {
if (service == null || page == null) {
return;
}
@@ -659,6 +742,18 @@
throw new HeadlessException();
}
+ DialogTypeSelection dlg =
+ (DialogTypeSelection)attributes.get(DialogTypeSelection.class);
+
+ // Check for native, note that default dialog is COMMON.
+ if (dlg == DialogTypeSelection.NATIVE) {
+ PrintService pservice = getPrintService();
+ PageFormat page = pageDialog(attributeToPageFormat(pservice,
+ attributes));
+ updateAttributesWithPageFormat(pservice, page, attributes);
+ return page;
+ }
+
final GraphicsConfiguration gc =
GraphicsEnvironment.getLocalGraphicsEnvironment().
getDefaultScreenDevice().getDefaultConfiguration();
@@ -698,77 +793,7 @@
attributes.remove(amCategory);
}
attributes.addAll(newas);
-
- PageFormat page = defaultPage();
-
- OrientationRequested orient =
- (OrientationRequested)
- attributes.get(OrientationRequested.class);
- int pfOrient = PageFormat.PORTRAIT;
- if (orient != null) {
- if (orient == OrientationRequested.REVERSE_LANDSCAPE) {
- pfOrient = PageFormat.REVERSE_LANDSCAPE;
- } else if (orient == OrientationRequested.LANDSCAPE) {
- pfOrient = PageFormat.LANDSCAPE;
- }
- }
- page.setOrientation(pfOrient);
-
- Media media = (Media)attributes.get(Media.class);
- if (media == null) {
- media =
- (Media)service.getDefaultAttributeValue(Media.class);
- }
- if (!(media instanceof MediaSizeName)) {
- media = MediaSizeName.NA_LETTER;
- }
- MediaSize size =
- MediaSize.getMediaSizeForName((MediaSizeName)media);
- if (size == null) {
- size = MediaSize.NA.LETTER;
- }
- Paper paper = new Paper();
- float dim[] = size.getSize(1); //units == 1 to avoid FP error
- double w = Math.rint((dim[0]*72.0)/Size2DSyntax.INCH);
- double h = Math.rint((dim[1]*72.0)/Size2DSyntax.INCH);
- paper.setSize(w, h);
- MediaPrintableArea area =
- (MediaPrintableArea)
- attributes.get(MediaPrintableArea.class);
- double ix, iw, iy, ih;
-
- if (area != null) {
- // Should pass in same unit as updatePageAttributes
- // to avoid rounding off errors.
- ix = Math.rint(
- area.getX(MediaPrintableArea.INCH) * DPI);
- iy = Math.rint(
- area.getY(MediaPrintableArea.INCH) * DPI);
- iw = Math.rint(
- area.getWidth(MediaPrintableArea.INCH) * DPI);
- ih = Math.rint(
- area.getHeight(MediaPrintableArea.INCH) * DPI);
- }
- else {
- if (w >= 72.0 * 6.0) {
- ix = 72.0;
- iw = w - 2 * 72.0;
- } else {
- ix = w / 6.0;
- iw = w * 0.75;
- }
- if (h >= 72.0 * 6.0) {
- iy = 72.0;
- ih = h - 2 * 72.0;
- } else {
- iy = h / 6.0;
- ih = h * 0.75;
- }
- }
- paper.setImageableArea(ix, iy, iw, ih);
- page.setPaper(paper);
-
- return page;
+ return attributeToPageFormat(service, attributes);
} else {
return null;
}
@@ -795,7 +820,6 @@
throw new HeadlessException();
}
-
DialogTypeSelection dlg =
(DialogTypeSelection)attributes.get(DialogTypeSelection.class);
@@ -816,7 +840,6 @@
}
-
/* A security check has already been performed in the
* java.awt.print.printerJob.getPrinterJob method.
* So by the time we get here, it is OK for the current thread
--- a/jdk/src/share/classes/sun/reflect/annotation/AnnotationSupport.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/sun/reflect/annotation/AnnotationSupport.java Tue Mar 12 18:12:44 2013 -0700
@@ -86,11 +86,11 @@
Class<? extends Annotation> containerClass = containerInstance.annotationType();
AnnotationType annoType = AnnotationType.getInstance(containerClass);
if (annoType == null)
- throw new InvalidContainerAnnotationError(containerInstance + " is an invalid container for repeating annotations");
+ throw new AnnotationFormatError(containerInstance + " is an invalid container for repeating annotations");
Method m = annoType.members().get("value");
if (m == null)
- throw new InvalidContainerAnnotationError(containerInstance +
+ throw new AnnotationFormatError(containerInstance +
" is an invalid container for repeating annotations");
m.setAccessible(true);
@@ -103,11 +103,9 @@
IllegalArgumentException | // parameters doesn't match
InvocationTargetException | // the value method threw an exception
ClassCastException e) { // well, a cast failed ...
- throw new InvalidContainerAnnotationError(
+ throw new AnnotationFormatError(
containerInstance + " is an invalid container for repeating annotations",
- e,
- containerInstance,
- null);
+ e);
}
}
@@ -129,12 +127,10 @@
return l;
} catch (ClassCastException |
NullPointerException e) {
- throw new InvalidContainerAnnotationError(
+ throw new AnnotationFormatError(
String.format("%s is an invalid container for repeating annotations of type: %s",
containerInstance, annotationClass),
- e,
- containerInstance,
- annotationClass);
+ e);
}
}
}
--- a/jdk/src/share/classes/sun/security/jgss/GSSCredentialImpl.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/sun/security/jgss/GSSCredentialImpl.java Tue Mar 12 18:12:44 2013 -0700
@@ -29,6 +29,7 @@
import sun.security.jgss.spi.*;
import java.util.*;
import com.sun.security.jgss.*;
+import sun.security.jgss.spnego.SpNegoCredElement;
public class GSSCredentialImpl implements ExtendedGSSCredential {
@@ -87,6 +88,7 @@
throw new GSSException(GSSException.NO_CRED);
}
+ // Wrap a mech cred into a GSS cred
public GSSCredentialImpl(GSSManagerImpl gssManager,
GSSCredentialSpi mechElement) throws GSSException {
@@ -103,6 +105,11 @@
usage);
tempCred = mechElement;
hashtable.put(key, tempCred);
+ // More mechs that can use this cred, say, SPNEGO
+ if (!GSSUtil.isSpNegoMech(mechElement.getMechanism())) {
+ key = new SearchKey(GSSUtil.GSS_SPNEGO_MECH_OID, usage);
+ hashtable.put(key, new SpNegoCredElement(mechElement));
+ }
}
void init(GSSManagerImpl gssManager) {
--- a/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoCredElement.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoCredElement.java Tue Mar 12 18:12:44 2013 -0700
@@ -44,7 +44,7 @@
private GSSCredentialSpi cred = null;
- SpNegoCredElement(GSSCredentialSpi cred) throws GSSException {
+ public SpNegoCredElement(GSSCredentialSpi cred) throws GSSException {
this.cred = cred;
}
--- a/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java Tue Mar 12 18:12:44 2013 -0700
@@ -37,7 +37,7 @@
import java.security.SignatureException;
import java.security.PublicKey;
-import sun.misc.BASE64Encoder;
+import java.util.Base64;
import sun.security.util.*;
import sun.security.x509.AlgorithmId;
@@ -289,10 +289,9 @@
if (encoded == null)
throw new SignatureException("Cert request was not signed");
- BASE64Encoder encoder = new BASE64Encoder();
out.println("-----BEGIN NEW CERTIFICATE REQUEST-----");
- encoder.encodeBuffer(encoded, out);
+ out.println(Base64.getMimeEncoder().encodeToString(encoded));
out.println("-----END NEW CERTIFICATE REQUEST-----");
}
--- a/jdk/src/share/classes/sun/security/provider/PolicyFile.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/sun/security/provider/PolicyFile.java Tue Mar 12 18:12:44 2013 -0700
@@ -1336,10 +1336,9 @@
if (pppe.isWildcardName()) {
// a wildcard name matches any principal with the same class
- for (Principal p : principals) {
- if (pppe.principalClass.equals(p.getClass().getName())) {
- continue;
- }
+ if (wildcardPrincipalNameImplies(pppe.principalClass,
+ principals)) {
+ continue;
}
if (debug != null) {
debug.println("evaluation (principal name wildcard) failed");
@@ -1414,6 +1413,21 @@
addPerms(perms, principals, entry);
}
+ /**
+ * Returns true if the array of principals contains at least one
+ * principal of the specified class.
+ */
+ private static boolean wildcardPrincipalNameImplies(String principalClass,
+ Principal[] principals)
+ {
+ for (Principal p : principals) {
+ if (principalClass.equals(p.getClass().getName())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
private void addPerms(Permissions perms,
Principal[] accPs,
PolicyEntry entry) {
--- a/jdk/src/share/classes/sun/security/provider/X509Factory.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/sun/security/provider/X509Factory.java Tue Mar 12 18:12:44 2013 -0700
@@ -35,7 +35,7 @@
import sun.security.provider.certpath.X509CertificatePair;
import sun.security.util.DerValue;
import sun.security.util.Cache;
-import sun.misc.BASE64Decoder;
+import java.util.Base64;
import sun.security.pkcs.ParsingException;
/**
@@ -512,7 +512,7 @@
hyphen = 0;
last = next;
}
- if (hyphen == 5 && (last==-1 || last=='\r' || last=='\n')) {
+ if (hyphen == 5 && (last == -1 || last == '\r' || last == '\n')) {
break;
}
}
@@ -575,8 +575,7 @@
checkHeaderFooter(header.toString(), footer.toString());
- BASE64Decoder decoder = new BASE64Decoder();
- return decoder.decodeBuffer(new String(data, 0, pos));
+ return Base64.getMimeDecoder().decode(new String(data, 0, pos));
}
}
--- a/jdk/src/share/classes/sun/security/provider/certpath/OCSP.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/sun/security/provider/certpath/OCSP.java Tue Mar 12 18:12:44 2013 -0700
@@ -89,7 +89,7 @@
new GetIntegerAction("com.sun.security.ocsp.timeout",
DEFAULT_CONNECT_TIMEOUT));
if (tmp < 0) {
- tmp = DEFAULT_CONNECT_TIMEOUT;
+ return DEFAULT_CONNECT_TIMEOUT;
}
// Convert to milliseconds, as the system property will be
// specified in seconds
--- a/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java Tue Mar 12 18:12:44 2013 -0700
@@ -57,7 +57,7 @@
import sun.security.tools.PathList;
import sun.security.x509.*;
import sun.security.util.*;
-import sun.misc.BASE64Encoder;
+import java.util.Base64;
/**
@@ -1120,7 +1120,6 @@
* different, replace the hash in the manifest with the newly
* generated one. (This may invalidate existing signatures!)
*/
- BASE64Encoder encoder = new JarBASE64Encoder();
Vector<ZipEntry> mfFiles = new Vector<>();
boolean wasSigned = false;
@@ -1148,15 +1147,14 @@
if (manifest.getAttributes(ze.getName()) != null) {
// jar entry is contained in manifest, check and
// possibly update its digest attributes
- if (updateDigests(ze, zipFile, digests, encoder,
+ if (updateDigests(ze, zipFile, digests,
manifest) == true) {
mfModified = true;
}
} else if (!ze.isDirectory()) {
// Add entry to manifest
Attributes attrs = getDigestAttributes(ze, zipFile,
- digests,
- encoder);
+ digests);
mfEntries.put(ze.getName(), attrs);
mfModified = true;
}
@@ -1955,8 +1953,7 @@
* of base64-encoded strings.
*/
private synchronized String[] getDigests(ZipEntry ze, ZipFile zf,
- MessageDigest[] digests,
- BASE64Encoder encoder)
+ MessageDigest[] digests)
throws IOException {
int n, i;
@@ -1980,7 +1977,7 @@
// complete the digests
String[] base64Digests = new String[digests.length];
for (i=0; i<digests.length; i++) {
- base64Digests[i] = encoder.encode(digests[i].digest());
+ base64Digests[i] = Base64.getEncoder().encodeToString(digests[i].digest());
}
return base64Digests;
}
@@ -1990,11 +1987,10 @@
* attributes
*/
private Attributes getDigestAttributes(ZipEntry ze, ZipFile zf,
- MessageDigest[] digests,
- BASE64Encoder encoder)
+ MessageDigest[] digests)
throws IOException {
- String[] base64Digests = getDigests(ze, zf, digests, encoder);
+ String[] base64Digests = getDigests(ze, zf, digests);
Attributes attrs = new Attributes();
for (int i=0; i<digests.length; i++) {
@@ -2016,12 +2012,11 @@
*/
private boolean updateDigests(ZipEntry ze, ZipFile zf,
MessageDigest[] digests,
- BASE64Encoder encoder,
Manifest mf) throws IOException {
boolean update = false;
Attributes attrs = mf.getAttributes(ze.getName());
- String[] base64Digests = getDigests(ze, zf, digests, encoder);
+ String[] base64Digests = getDigests(ze, zf, digests);
for (int i=0; i<digests.length; i++) {
// The entry name to be written into attrs
@@ -2094,19 +2089,6 @@
}
}
-/**
- * This is a BASE64Encoder that does not insert a default newline at the end of
- * every output line. This is necessary because java.util.jar does its own
- * line management (see Manifest.make72Safe()). Inserting additional new lines
- * can cause line-wrapping problems (see CR 6219522).
- */
-class JarBASE64Encoder extends BASE64Encoder {
- /**
- * Encode the suffix that ends every output line.
- */
- protected void encodeLineSuffix(OutputStream aStream) throws IOException { }
-}
-
class SignatureFile {
/** SignatureFile */
@@ -2129,7 +2111,6 @@
sf = new Manifest();
Attributes mattr = sf.getMainAttributes();
- BASE64Encoder encoder = new JarBASE64Encoder();
mattr.putValue(Attributes.Name.SIGNATURE_VERSION.toString(), "1.0");
mattr.putValue("Created-By", version + " (" + javaVendor + ")");
@@ -2138,7 +2119,7 @@
// sign the whole manifest
for (int i=0; i < digests.length; i++) {
mattr.putValue(digests[i].getAlgorithm()+"-Digest-Manifest",
- encoder.encode(md.manifestDigest(digests[i])));
+ Base64.getEncoder().encodeToString(md.manifestDigest(digests[i])));
}
}
@@ -2149,7 +2130,7 @@
for (int i=0; i < digests.length; i++) {
mattr.putValue(digests[i].getAlgorithm() +
"-Digest-" + ManifestDigester.MF_MAIN_ATTRS,
- encoder.encode(mde.digest(digests[i])));
+ Base64.getEncoder().encodeToString(mde.digest(digests[i])));
}
} else {
throw new IllegalStateException
@@ -2170,7 +2151,7 @@
Attributes attr = new Attributes();
for (int i=0; i < digests.length; i++) {
attr.putValue(digests[i].getAlgorithm()+"-Digest",
- encoder.encode(mde.digest(digests[i])));
+ Base64.getEncoder().encodeToString(mde.digest(digests[i])));
}
entries.put(name, attr);
}
--- a/jdk/src/share/classes/sun/security/tools/keytool/Main.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/sun/security/tools/keytool/Main.java Tue Mar 12 18:12:44 2013 -0700
@@ -63,7 +63,7 @@
import java.security.cert.X509CRLEntry;
import java.security.cert.X509CRLSelector;
import javax.security.auth.x500.X500Principal;
-import sun.misc.BASE64Encoder;
+import java.util.Base64;
import sun.security.util.ObjectIdentifier;
import sun.security.pkcs10.PKCS10;
import sun.security.pkcs10.PKCS10Attribute;
@@ -73,7 +73,6 @@
import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
-import sun.misc.BASE64Decoder;
import sun.security.pkcs.PKCS9Attribute;
import sun.security.tools.KeyStoreUtil;
import sun.security.tools.PathList;
@@ -555,11 +554,11 @@
return cmd != PRINTCERT && cmd != PRINTCERTREQ;
}
+
/**
* Execute the commands.
*/
void doCommands(PrintStream out) throws Exception {
-
if (storetype == null) {
storetype = KeyStore.getDefaultType();
}
@@ -1189,7 +1188,7 @@
sb.append(s);
}
}
- byte[] rawReq = new BASE64Decoder().decodeBuffer(new String(sb));
+ byte[] rawReq = Base64.getMimeDecoder().decode(new String(sb));
PKCS10 req = new PKCS10(rawReq);
info.set(X509CertInfo.KEY, new CertificateX509Key(req.getSubjectPublicKeyInfo()));
@@ -1266,7 +1265,7 @@
crl.sign(privateKey, sigAlgName);
if (rfc) {
out.println("-----BEGIN X509 CRL-----");
- new BASE64Encoder().encodeBuffer(crl.getEncodedInternal(), out);
+ out.println(Base64.getMimeEncoder().encodeToString(crl.getEncodedInternal()));
out.println("-----END X509 CRL-----");
} else {
out.write(crl.getEncodedInternal());
@@ -2148,7 +2147,7 @@
if (rfc) {
X509CRL xcrl = (X509CRL)crl;
out.println("-----BEGIN X509 CRL-----");
- new BASE64Encoder().encodeBuffer(xcrl.getEncoded(), out);
+ out.println(Base64.getMimeEncoder().encodeToString(xcrl.getEncoded()));
out.println("-----END X509 CRL-----");
} else {
out.println(crl.toString());
@@ -2175,7 +2174,7 @@
sb.append(s);
}
}
- PKCS10 req = new PKCS10(new BASE64Decoder().decodeBuffer(new String(sb)));
+ PKCS10 req = new PKCS10(Base64.getMimeDecoder().decode(new String(sb)));
PublicKey pkey = req.getSubjectPublicKeyInfo();
out.printf(rb.getString("PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key."),
@@ -2227,8 +2226,10 @@
Object[] source = {new Integer(i + 1)};
out.println(form.format(source));
}
- if (rfc) dumpCert(x509Cert, out);
- else printX509Cert(x509Cert, out);
+ if (rfc)
+ dumpCert(x509Cert, out);
+ else
+ printX509Cert(x509Cert, out);
if (i < (certs.length-1)) {
out.println();
}
@@ -2946,9 +2947,8 @@
throws IOException, CertificateException
{
if (rfc) {
- BASE64Encoder encoder = new BASE64Encoder();
out.println(X509Factory.BEGIN_CERT);
- encoder.encodeBuffer(cert.getEncoded(), out);
+ out.println(Base64.getMimeEncoder().encodeToString(cert.getEncoded()));
out.println(X509Factory.END_CERT);
} else {
out.write(cert.getEncoded()); // binary
--- a/jdk/src/share/classes/sun/security/util/ManifestEntryVerifier.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/sun/security/util/ManifestEntryVerifier.java Tue Mar 12 18:12:44 2013 -0700
@@ -31,7 +31,7 @@
import java.util.*;
import java.util.jar.*;
-import sun.misc.BASE64Decoder;
+import java.util.Base64;
import sun.security.jca.Providers;
@@ -63,7 +63,6 @@
/** the manifest hashes for the digests in use */
ArrayList<byte[]> manifestHashes;
- private BASE64Decoder decoder = null;
private String name = null;
private Manifest man;
@@ -81,7 +80,6 @@
createdDigests = new HashMap<String, MessageDigest>(11);
digests = new ArrayList<MessageDigest>();
manifestHashes = new ArrayList<byte[]>();
- decoder = new BASE64Decoder();
this.man = man;
}
@@ -147,7 +145,7 @@
digest.reset();
digests.add(digest);
manifestHashes.add(
- decoder.decodeBuffer((String)se.getValue()));
+ Base64.getMimeDecoder().decode((String)se.getValue()));
}
}
}
--- a/jdk/src/share/classes/sun/security/util/SecurityConstants.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/sun/security/util/SecurityConstants.java Tue Mar 12 18:12:44 2013 -0700
@@ -71,31 +71,6 @@
public static final AllPermission ALL_PERMISSION = new AllPermission();
/**
- * Permission type used when AWT is not present.
- */
- private static class FakeAWTPermission extends BasicPermission {
- private static final long serialVersionUID = -1L;
- public FakeAWTPermission(String name) {
- super(name);
- }
- public String toString() {
- return "(\"java.awt.AWTPermission\" \"" + getName() + "\")";
- }
- }
-
- /**
- * Permission factory used when AWT is not present.
- */
- private static class FakeAWTPermissionFactory
- implements PermissionFactory<FakeAWTPermission>
- {
- @Override
- public FakeAWTPermission newPermission(String name) {
- return new FakeAWTPermission(name);
- }
- }
-
- /**
* AWT Permissions used in the JDK.
*/
public static class AWT {
@@ -107,37 +82,29 @@
private static final String AWTFactory = "sun.awt.AWTPermissionFactory";
/**
- * The PermissionFactory to create AWT permissions (or fake permissions
- * if AWT is not present).
+ * The PermissionFactory to create AWT permissions (or null if AWT is
+ * not present)
*/
private static final PermissionFactory<?> factory = permissionFactory();
private static PermissionFactory<?> permissionFactory() {
- Class<?> c = AccessController
- .doPrivileged(new PrivilegedAction<Class<?>>() {
- public Class<?> run() {
- try {
- return Class.forName(AWTFactory, true, null);
- } catch (ClassNotFoundException e) {
- // not available
- return null;
- }
- }});
- if (c != null) {
- // AWT present
- try {
- return (PermissionFactory<?>)c.newInstance();
- } catch (ReflectiveOperationException x) {
- throw new InternalError(x.getMessage(), x);
- }
- } else {
- // AWT not present
- return new FakeAWTPermissionFactory();
+ Class<?> c;
+ try {
+ c = Class.forName(AWTFactory, false, AWT.class.getClassLoader());
+ } catch (ClassNotFoundException e) {
+ // not available
+ return null;
+ }
+ // AWT present
+ try {
+ return (PermissionFactory<?>)c.newInstance();
+ } catch (ReflectiveOperationException x) {
+ throw new InternalError(x);
}
}
private static Permission newAWTPermission(String name) {
- return factory.newPermission(name);
+ return (factory == null) ? null : factory.newPermission(name);
}
// java.lang.SecurityManager
--- a/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java Tue Mar 12 18:12:44 2013 -0700
@@ -35,7 +35,7 @@
import java.util.jar.*;
import sun.security.pkcs.*;
-import sun.misc.BASE64Decoder;
+import java.util.Base64;
import sun.security.jca.Providers;
@@ -220,7 +220,6 @@
name);
}
- BASE64Decoder decoder = new BASE64Decoder();
CodeSigner[] newSigners = getSigners(infos, block);
@@ -232,10 +231,10 @@
sf.getEntries().entrySet().iterator();
// see if we can verify the whole manifest first
- boolean manifestSigned = verifyManifestHash(sf, md, decoder, manifestDigests);
+ boolean manifestSigned = verifyManifestHash(sf, md, manifestDigests);
// verify manifest main attributes
- if (!manifestSigned && !verifyManifestMainAttrs(sf, md, decoder)) {
+ if (!manifestSigned && !verifyManifestMainAttrs(sf, md)) {
throw new SecurityException
("Invalid signature file digest for Manifest main attributes");
}
@@ -247,7 +246,7 @@
String name = e.getKey();
if (manifestSigned ||
- (verifySection(e.getValue(), name, md, decoder))) {
+ (verifySection(e.getValue(), name, md))) {
if (name.startsWith("./"))
name = name.substring(2);
@@ -275,7 +274,6 @@
*/
private boolean verifyManifestHash(Manifest sf,
ManifestDigester md,
- BASE64Decoder decoder,
List<Object> manifestDigests)
throws IOException
{
@@ -297,7 +295,7 @@
if (digest != null) {
byte[] computedHash = md.manifestDigest(digest);
byte[] expectedHash =
- decoder.decodeBuffer((String)se.getValue());
+ Base64.getMimeDecoder().decode((String)se.getValue());
if (debug != null) {
debug.println("Signature File: Manifest digest " +
@@ -320,8 +318,7 @@
}
private boolean verifyManifestMainAttrs(Manifest sf,
- ManifestDigester md,
- BASE64Decoder decoder)
+ ManifestDigester md)
throws IOException
{
Attributes mattr = sf.getMainAttributes();
@@ -342,7 +339,7 @@
md.get(ManifestDigester.MF_MAIN_ATTRS, false);
byte[] computedHash = mde.digest(digest);
byte[] expectedHash =
- decoder.decodeBuffer((String)se.getValue());
+ Base64.getMimeDecoder().decode((String)se.getValue());
if (debug != null) {
debug.println("Signature File: " +
@@ -387,8 +384,7 @@
private boolean verifySection(Attributes sfAttr,
String name,
- ManifestDigester md,
- BASE64Decoder decoder)
+ ManifestDigester md)
throws IOException
{
boolean oneDigestVerified = false;
@@ -418,7 +414,7 @@
boolean ok = false;
byte[] expected =
- decoder.decodeBuffer((String)se.getValue());
+ Base64.getMimeDecoder().decode((String)se.getValue());
byte[] computed;
if (workaround) {
computed = mde.digestWorkaround(digest);
--- a/jdk/src/share/classes/sun/security/x509/X509CertImpl.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/sun/security/x509/X509CertImpl.java Tue Mar 12 18:12:44 2013 -0700
@@ -41,7 +41,7 @@
import javax.security.auth.x500.X500Principal;
import sun.misc.HexDumpEncoder;
-import sun.misc.BASE64Decoder;
+import java.util.Base64;
import sun.security.util.*;
import sun.security.provider.X509Factory;
@@ -263,7 +263,6 @@
}
if (line.equals(X509Factory.BEGIN_CERT)) {
/* stream appears to be hex-encoded bytes */
- BASE64Decoder decoder = new BASE64Decoder();
ByteArrayOutputStream decstream = new ByteArrayOutputStream();
try {
while ((line = certBufferedReader.readLine()) != null) {
@@ -271,7 +270,7 @@
der = new DerValue(decstream.toByteArray());
break;
} else {
- decstream.write(decoder.decodeBuffer(line));
+ decstream.write(Base64.getMimeDecoder().decode(line));
}
}
} catch (IOException ioe2) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/sun/swing/JLightweightFrame.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,250 @@
+/*
+ * Copyright (c) 2013, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package sun.swing;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.EventQueue;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.awt.image.BufferedImage;
+import java.awt.image.DataBufferInt;
+
+import javax.swing.JLayeredPane;
+import javax.swing.JPanel;
+import javax.swing.JRootPane;
+import javax.swing.LayoutFocusTraversalPolicy;
+import javax.swing.RootPaneContainer;
+
+import sun.awt.LightweightFrame;
+
+/**
+ * The frame serves as a lightweight container which paints its content
+ * to an offscreen image and provides access to the image's data via the
+ * {@link LightweightContent} interface. Note, that it may not be shown
+ * as a standalone toplevel frame. Its purpose is to provide functionality
+ * for lightweight embedding.
+ *
+ * @author Artem Ananiev
+ * @author Anton Tarasov
+ */
+public final class JLightweightFrame extends LightweightFrame implements RootPaneContainer {
+
+ private final JRootPane rootPane = new JRootPane();
+
+ private LightweightContent content;
+
+ private Component component;
+ private JPanel contentPane;
+
+ private BufferedImage bbImage;
+
+ /**
+ * Constructs a new, initially invisible {@code JLightweightFrame}
+ * instance.
+ */
+ public JLightweightFrame() {
+ super();
+ add(rootPane, BorderLayout.CENTER);
+ setBackground(new Color(0, 0, 0, 0));
+ setFocusTraversalPolicy(new LayoutFocusTraversalPolicy());
+ }
+
+ /**
+ * Sets the {@link LightweightContent} instance for this frame.
+ * The {@code JComponent} object returned by the
+ * {@link LightweightContent#getComponent()} method is immediately
+ * added to the frame's content pane.
+ *
+ * @param content the {@link LightweightContent} instance
+ */
+ public void setContent(LightweightContent content) {
+ this.content = content;
+ this.component = content.getComponent();
+
+ initInterior();
+ }
+
+ @Override
+ public Graphics getGraphics() {
+ if (bbImage == null) return null;
+
+ Graphics2D g = bbImage.createGraphics();
+ g.setBackground(getBackground());
+ g.setColor(getForeground());
+ g.setFont(getFont());
+ return g;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see LightweightContent#focusGrabbed()
+ */
+ @Override
+ public void grabFocus() {
+ if (content != null) content.focusGrabbed();
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see LightweightContent#focusUngrabbed()
+ */
+ @Override
+ public void ungrabFocus() {
+ if (content != null) content.focusUngrabbed();
+ }
+
+ private void initInterior() {
+ contentPane = new JPanel() {
+ @Override
+ public void paint(Graphics g) {
+ content.paintLock();
+ try {
+ super.paint(g);
+
+ final Rectangle clip = g.getClipBounds() != null ?
+ g.getClipBounds() : new Rectangle(0, 0, contentPane.getWidth(), contentPane.getHeight());
+
+ clip.x = Math.max(0, clip.x);
+ clip.y = Math.max(0, clip.y);
+ clip.width = Math.min(contentPane.getWidth(), clip.width);
+ clip.height = Math.min(contentPane.getHeight(), clip.height);
+
+ EventQueue.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ content.imageUpdated(clip.x, clip.y, clip.width, clip.height);
+ }
+ });
+ } finally {
+ content.paintUnlock();
+ }
+ }
+ @Override
+ protected boolean isPaintingOrigin() {
+ return true;
+ }
+ };
+ contentPane.setLayout(new BorderLayout());
+ contentPane.add(component);
+ setContentPane(contentPane);
+ }
+
+ @SuppressWarnings("deprecation")
+ @Override public void reshape(int x, int y, int width, int height) {
+ super.reshape(x, y, width, height);
+
+ if (width == 0 || height == 0) {
+ return;
+ }
+
+ content.paintLock();
+ try {
+ if ((bbImage == null) || (width != bbImage.getWidth()) || (height != bbImage.getHeight())) {
+ boolean createBB = true;
+ int newW = width;
+ int newH = height;
+ if (bbImage != null) {
+ int oldW = bbImage.getWidth();
+ int oldH = bbImage.getHeight();
+ if ((oldW >= newW) && (oldH >= newH)) {
+ createBB = false;
+ } else {
+ if (oldW >= newW) {
+ newW = oldW;
+ } else {
+ newW = Math.max((int)(oldW * 1.2), width);
+ }
+ if (oldH >= newH) {
+ newH = oldH;
+ } else {
+ newH = Math.max((int)(oldH * 1.2), height);
+ }
+ }
+ }
+ if (createBB) {
+ BufferedImage oldBB = bbImage;
+ bbImage = new BufferedImage(newW, newH, BufferedImage.TYPE_INT_ARGB_PRE);
+ if (oldBB != null) {
+ Graphics g = bbImage.getGraphics();
+ try {
+ g.drawImage(oldBB, 0, 0, newW, newH, null);
+ } finally {
+ g.dispose();
+ oldBB.flush();
+ }
+ }
+ DataBufferInt dataBuf = (DataBufferInt)bbImage.getRaster().getDataBuffer();
+ content.imageBufferReset(dataBuf.getData(), 0, 0, width, height, bbImage.getWidth());
+ } else {
+ content.imageReshaped(0, 0, width, height);
+ }
+ }
+ } finally {
+ content.paintUnlock();
+ }
+ }
+
+ @Override
+ public JRootPane getRootPane() {
+ return rootPane;
+ }
+
+ @Override
+ public void setContentPane(Container contentPane) {
+ getRootPane().setContentPane(contentPane);
+ }
+
+ @Override
+ public Container getContentPane() {
+ return getRootPane().getContentPane();
+ }
+
+ @Override
+ public void setLayeredPane(JLayeredPane layeredPane) {
+ getRootPane().setLayeredPane(layeredPane);
+ }
+
+ @Override
+ public JLayeredPane getLayeredPane() {
+ return getRootPane().getLayeredPane();
+ }
+
+ @Override
+ public void setGlassPane(Component glassPane) {
+ getRootPane().setGlassPane(glassPane);
+ }
+
+ @Override
+ public Component getGlassPane() {
+ return getRootPane().getGlassPane();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/sun/swing/LightweightContent.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2013, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package sun.swing;
+
+import javax.swing.JComponent;
+
+/**
+ * The interface by means of which the {@link JLightweightFrame} class
+ * communicates to its client application.
+ * <p>
+ * The client application implements this interface so it can response
+ * to requests and process notifications from {@code JLightweightFrame}.
+ * An implementation of this interface is associated with a {@code
+ * JLightweightFrame} instance via the {@link JLightweightFrame#setContent}
+ * method.
+ *
+ * A hierarchy of components contained in the {@code JComponent} instance
+ * returned by the {@link #getComponent} method should not contain any
+ * heavyweight components, otherwise {@code JLightweightFrame} may fail
+ * to paint it.
+ *
+ * @author Artem Ananiev
+ * @author Anton Tarasov
+ * @author Jim Graham
+ */
+public interface LightweightContent {
+
+ /**
+ * The client application overrides this method to return the {@code
+ * JComponent} instance which the {@code JLightweightFrame} container
+ * will paint as its lightweight content. A hierarchy of components
+ * contained in this component should not contain any heavyweight objects.
+ *
+ * @return the component to paint
+ */
+ public JComponent getComponent();
+
+ /**
+ * {@code JLightweightFrame} calls this method to notify the client
+ * application that it acquires the paint lock. The client application
+ * should implement the locking mechanism in order to synchronize access
+ * to the content image data, shared between {@code JLightweightFrame}
+ * and the client application.
+ *
+ * @see #paintUnlock
+ */
+ public void paintLock();
+
+ /**
+ * {@code JLightweightFrame} calls this method to notify the client
+ * application that it releases the paint lock. The client application
+ * should implement the locking mechanism in order to synchronize access
+ * to the content image data, shared between {@code JLightweightFrame}
+ * and the client application.
+ *
+ * @see #paintLock
+ */
+ public void paintUnlock();
+
+ /**
+ * {@code JLightweightFrame} calls this method to notify the client
+ * application that a new data buffer has been set as a content pixel
+ * buffer. Typically this occurs when a buffer of a larger size is
+ * created in response to a content resize event. The method reports
+ * a reference to the pixel data buffer, the content image bounds
+ * within the buffer and the line stride of the buffer. These values
+ * have the following correlation.
+ * <p>
+ * The {@code width} and {@code height} matches the size of the content
+ * (the component returned from the {@link #getComponent} method). The
+ * {@code x} and {@code y} is the origin of the content, {@code (0, 0)}
+ * in the coordinate space of the content, appearing at
+ * {@code data[y * linestride + x]} in the buffer. All indices
+ * {@code data[(y + j) * linestride + (x + i)]} where
+ * {@code (0 <= i < width)} and {@code (0 <= j < height)} will represent
+ * valid pixel data, {@code (i, j)} in the coordinate space of the content.
+ *
+ * @param data the content pixel data buffer of INT_ARGB_PRE type
+ * @param x the x coordinate of the image
+ * @param y the y coordinate of the image
+ * @param width the width of the image
+ * @param height the height of the image
+ * @param linestride the line stride of the pixel buffer
+ */
+ public void imageBufferReset(int[] data,
+ int x, int y,
+ int width, int height,
+ int linestride);
+
+ /**
+ * {@code JLightweightFrame} calls this method to notify the client
+ * application that the content image bounds have been changed within the
+ * image's pixel buffer.
+ *
+ * @param x the x coordinate of the image
+ * @param y the y coordinate of the image
+ * @param width the width of the image
+ * @param height the height of the image
+ *
+ * @see #imageBufferReset
+ */
+ public void imageReshaped(int x, int y, int width, int height);
+
+ /**
+ * {@code JLightweightFrame} calls this method to notify the client
+ * application that a part of the content image, or the whole image has
+ * been updated. The method reports bounds of the rectangular dirty region.
+ * The {@code dirtyX} and {@code dirtyY} is the origin of the dirty
+ * rectangle, which is relative to the origin of the content, appearing
+ * at {@code data[(y + dirtyY] * linestride + (x + dirtyX)]} in the pixel
+ * buffer (see {@link #imageBufferReset}). All indices
+ * {@code data[(y + dirtyY + j) * linestride + (x + dirtyX + i)]} where
+ * {@code (0 <= i < dirtyWidth)} and {@code (0 <= j < dirtyHeight)}
+ * will represent valid pixel data, {@code (i, j)} in the coordinate space
+ * of the dirty rectangle.
+ *
+ * @param dirtyX the x coordinate of the dirty rectangle,
+ * relative to the image origin
+ * @param dirtyY the y coordinate of the dirty rectangle,
+ * relative to the image origin
+ * @param dirtyWidth the width of the dirty rectangle
+ * @param dirtyHeight the height of the dirty rectangle
+ *
+ * @see #imageBufferReset
+ * @see #imageReshaped
+ */
+ public void imageUpdated(int dirtyX, int dirtyY,
+ int dirtyWidth, int dirtyHeight);
+
+ /**
+ * {@code JLightweightFrame} calls this method to notify the client
+ * application that the frame has grabbed focus.
+ */
+ public void focusGrabbed();
+
+ /**
+ * {@code JLightweightFrame} calls this method to notify the client
+ * application that the frame has ungrabbed focus.
+ */
+ public void focusUngrabbed();
+}
--- a/jdk/src/share/classes/sun/tools/jar/Manifest.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/sun/tools/jar/Manifest.java Tue Mar 12 18:12:44 2013 -0700
@@ -30,8 +30,7 @@
import java.security.*;
import sun.net.www.MessageHeader;
-import sun.misc.BASE64Encoder;
-import sun.misc.BASE64Decoder;
+import java.util.Base64;
/**
* This is OBSOLETE. DO NOT USE THIS. Use java.util.jar.Manifest
@@ -178,7 +177,6 @@
return;
}
- BASE64Encoder enc = new BASE64Encoder();
/* compute hashes, write over any other "Hash-Algorithms" (?) */
for (int j = 0; j < hashes.length; ++j) {
@@ -190,7 +188,7 @@
while ((len = is.read(tmpbuf, 0, tmpbuf.length)) != -1) {
dig.update(tmpbuf, 0, len);
}
- mh.set(hashes[j] + "-Digest", enc.encode(dig.digest()));
+ mh.set(hashes[j] + "-Digest", Base64.getMimeEncoder().encodeToString(dig.digest()));
} catch (NoSuchAlgorithmException e) {
throw new JarException("Digest algorithm " + hashes[j] +
" not available.");
--- a/jdk/src/share/classes/sun/tools/jar/SignatureFile.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/sun/tools/jar/SignatureFile.java Tue Mar 12 18:12:44 2013 -0700
@@ -30,8 +30,8 @@
import java.security.*;
import sun.net.www.MessageHeader;
-import sun.misc.BASE64Encoder;
-import sun.misc.BASE64Decoder;
+import java.util.Base64;
+
import sun.security.pkcs.*;
import sun.security.x509.AlgorithmId;
@@ -305,7 +305,6 @@
}
smh.set("Name", name);
- BASE64Encoder encoder = new BASE64Encoder();
try {
for (int i = 0; i < hashes.length; ++i) {
MessageDigest dig = getDigest(hashes[i]);
@@ -314,7 +313,7 @@
mh.print(ps);
byte[] headerBytes = baos.toByteArray();
byte[] digest = dig.digest(headerBytes);
- smh.set(hashes[i] + "-Digest", encoder.encode(digest));
+ smh.set(hashes[i] + "-Digest", Base64.getMimeEncoder().encodeToString(digest));
}
return smh;
} catch (NoSuchAlgorithmException e) {
--- a/jdk/src/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java Tue Mar 12 18:12:44 2013 -0700
@@ -33,6 +33,7 @@
import java.text.spi.DecimalFormatSymbolsProvider;
import java.text.spi.NumberFormatProvider;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
@@ -89,10 +90,7 @@
* LocaleProviderAdapter preference list. The default list is intended
* to behave the same manner in JDK7.
*/
- private static Type[] adapterPreference = {
- Type.JRE,
- Type.SPI,
- };
+ private static final List<Type> adapterPreference;
/**
* JRE Locale Data Adapter instance
@@ -129,10 +127,11 @@
static {
String order = AccessController.doPrivileged(
new sun.security.action.GetPropertyAction("java.locale.providers"));
- // Override adapterPreference with the properties one
+ List<Type> typeList = new ArrayList<>();
+
+ // Check user specified adapter preference
if (order != null && order.length() != 0) {
String[] types = order.split(",");
- List<Type> typeList = new ArrayList<>();
for (String type : types) {
try {
Type aType = Type.valueOf(type.trim().toUpperCase(Locale.ROOT));
@@ -153,19 +152,23 @@
LocaleServiceProviderPool.config(LocaleProviderAdapter.class, e.toString());
}
}
+ }
- if (!typeList.isEmpty()) {
- if (!typeList.contains(Type.JRE)) {
- // Append FALLBACK as the last resort.
- fallbackLocaleProviderAdapter = new FallbackLocaleProviderAdapter();
- typeList.add(Type.FALLBACK);
- }
- adapterPreference = typeList.toArray(new Type[0]);
+ if (!typeList.isEmpty()) {
+ if (!typeList.contains(Type.JRE)) {
+ // Append FALLBACK as the last resort.
+ fallbackLocaleProviderAdapter = new FallbackLocaleProviderAdapter();
+ typeList.add(Type.FALLBACK);
}
+ } else {
+ // Default preference list
+ typeList.add(Type.JRE);
+ typeList.add(Type.SPI);
}
+
+ adapterPreference = Collections.unmodifiableList(typeList);
}
-
/**
* Returns the singleton instance for each adapter type
*/
@@ -202,7 +205,7 @@
/**
* Returns the preference order of LocaleProviderAdapter.Type
*/
- public static Type[] getAdapterPreference() {
+ public static List<Type> getAdapterPreference() {
return adapterPreference;
}
--- a/jdk/src/share/demo/java2d/J2DBench/build.xml Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/demo/java2d/J2DBench/build.xml Tue Mar 12 18:12:44 2013 -0700
@@ -52,7 +52,7 @@
<javac debug="flase" source="1.5" target="1.5" srcdir="${src}" destdir="${build}"/>
</target>
- <target name="run" depends="dist"
+ <target name="run" depends="dist"
description="run J2DBench" >
<java jar="${dist}/J2DBench.jar"
fork="true"
@@ -60,7 +60,7 @@
</java>
</target>
- <target name="analyze" depends="dist"
+ <target name="analyze" depends="dist"
description="run J2DAnalyzer" >
<java jar="${dist}/J2DAnalyzer.jar"
fork="true"
@@ -80,6 +80,10 @@
<copy todir="${build}/j2dbench/tests/iio/images">
<fileset dir="${resources}/images" />
</copy>
+ <mkdir dir="${build}/j2dbench/tests/cmm/images"/>
+ <copy todir="${build}/j2dbench/tests/cmm/images">
+ <fileset dir="${resources}/cmm_images" />
+ </copy>
</target>
<target name="dist" depends="compile, resources"
@@ -88,14 +92,14 @@
<mkdir dir="${dist}"/>
<!-- Put everything in ${build} into the J2DBench.jar file -->
- <jar jarfile="${dist}/J2DBench.jar" basedir="${build}"
+ <jar jarfile="${dist}/J2DBench.jar" basedir="${build}"
excludes="j2dbench/report/**" >
<manifest>
<attribute name="Built-By" value="${user.name}"/>
<attribute name="Main-Class" value="j2dbench.J2DBench"/>
</manifest>
</jar>
- <jar jarfile="${dist}/J2DAnalyzer.jar" basedir="${build}"
+ <jar jarfile="${dist}/J2DAnalyzer.jar" basedir="${build}"
includes="j2dbench/report/**" >
<manifest>
<attribute name="Built-By" value="${user.name}"/>
Binary file jdk/src/share/demo/java2d/J2DBench/resources/cmm_images/img_icc_large.jpg has changed
Binary file jdk/src/share/demo/java2d/J2DBench/resources/cmm_images/img_icc_medium.jpg has changed
Binary file jdk/src/share/demo/java2d/J2DBench/resources/cmm_images/img_icc_small.jpg has changed
--- a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/cmm/ColorConversionTests.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/cmm/ColorConversionTests.java Tue Mar 12 18:12:44 2013 -0700
@@ -51,6 +51,7 @@
DataConversionTests.init();
ColorConvertOpTests.init();
+ EmbeddedProfileTests.init();
}
protected ColorConversionTests(Group parent, String nodeName, String description) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/cmm/EmbeddedProfileTests.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of Oracle nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * This source code is provided to illustrate the usage of a given feature
+ * or technique and has been deliberately simplified. Additional steps
+ * required for a production-quality application, such as security checks,
+ * input validation and proper error handling, might not be present in
+ * this sample code.
+ */
+
+package j2dbench.tests.cmm;
+
+import j2dbench.Group;
+import j2dbench.Option;
+import j2dbench.Result;
+import j2dbench.TestEnvironment;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.net.URL;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReader;
+import javax.imageio.stream.ImageInputStream;
+
+/* This benchmark verifies how changes in cmm library affects image decoding */
+public class EmbeddedProfileTests extends ColorConversionTests {
+
+ protected static Group grpRoot;
+ protected static Group grpOptionsRoot;
+
+ protected static Option inputImages;
+
+ public static void init() {
+ grpRoot = new Group(colorConvRoot, "embed", "Embedded Profile Tests");
+
+ grpOptionsRoot = new Group(grpRoot, "embedOptions", "Options");
+
+ inputImages = createImageList();
+
+ new ReadImageTest();
+ }
+
+ private static enum IccImageResource {
+ SMALL("images/img_icc_small.jpg", "512x512", "Small: 512x512"),
+ MEDIUM("images/img_icc_medium.jpg", "2048x2048", "Medium: 2048x2048"),
+ LARGE("images/img_icc_large.jpg", "4096x4096", "Large: 4096x4096");
+
+ private IccImageResource(String file, String name, String description) {
+ this.url = CMMTests.class.getResource(file);
+ this.abbrev = name;
+ this.description = description;
+ }
+
+ public final URL url;
+ public final String abbrev;
+ public final String description;
+ }
+
+ private static Option createImageList() {
+ IccImageResource[] images = IccImageResource.values();
+
+ int num = images.length;
+
+ String[] names = new String[num];
+ String[] abbrev = new String[num];
+ String[] descr = new String[num];
+
+ for (int i = 0; i < num; i++) {
+ names[i] = images[i].toString();
+ abbrev[i] = images[i].abbrev;
+ descr[i] = images[i].description;
+ }
+
+ Option list = new Option.ObjectList(grpOptionsRoot,
+ "Images", "Input Images",
+ names, images, abbrev, descr, 1);
+
+ return list;
+ }
+
+ public EmbeddedProfileTests(Group parent, String nodeName, String description) {
+ super(parent, nodeName, description);
+ addDependencies(grpOptionsRoot, true);
+ }
+
+ private static class Context {
+ URL input;
+
+ public Context(TestEnvironment env, Result res) {
+
+ IccImageResource icc_input = (IccImageResource)
+ env.getModifier(inputImages);
+
+ input = icc_input.url;
+ }
+ }
+
+ public Object initTest(TestEnvironment env, Result res) {
+ return new Context(env, res);
+ }
+
+ public void cleanupTest(TestEnvironment env, Object o) {
+ Context ctx = (Context)o;
+ ctx.input = null;
+ }
+
+ private static class ReadImageTest extends EmbeddedProfileTests {
+ public ReadImageTest() {
+ super(grpRoot, "embd_img_read", "ImageReader.read()");
+ }
+
+ public void runTest(Object octx, int numReps) {
+ final Context ctx = (Context)octx;
+ final URL url = ctx.input;
+ ImageInputStream iis = null;
+ ImageReader reader = null;
+
+ try {
+ iis = ImageIO.createImageInputStream(url.openStream());
+ reader = ImageIO.getImageReaders(iis).next();
+ } catch (IOException e) {
+ throw new RuntimeException("Unable to run the becnhmark", e);
+ }
+
+ do {
+ try {
+ reader.setInput(iis);
+ BufferedImage img = reader.read(0);
+ reader.reset();
+
+ iis = ImageIO.createImageInputStream(url.openStream());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ } while (--numReps >= 0);
+ }
+ }
+}
--- a/jdk/src/share/demo/jvmti/hprof/hprof_init.c Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/demo/jvmti/hprof/hprof_init.c Tue Mar 12 18:12:44 2013 -0700
@@ -1899,11 +1899,17 @@
*/
getSystemProperty("sun.boot.library.path", &boot_path);
md_build_library_name(lname, FILENAME_MAX, boot_path, name);
+ if ( strlen(lname) == 0 ) {
+ HPROF_ERROR(JNI_TRUE, "Could not find library");
+ }
jvmtiDeallocate(boot_path);
handle = md_load_library(lname, err_buf, (int)sizeof(err_buf));
if ( handle == NULL ) {
/* This may be necessary on Windows. */
md_build_library_name(lname, FILENAME_MAX, "", name);
+ if ( strlen(lname) == 0 ) {
+ HPROF_ERROR(JNI_TRUE, "Could not find library");
+ }
handle = md_load_library(lname, err_buf, (int)sizeof(err_buf));
if ( handle == NULL ) {
HPROF_ERROR(JNI_TRUE, err_buf);
@@ -1968,6 +1974,9 @@
getSystemProperty("sun.boot.library.path", &boot_path);
/* Load in NPT library for character conversions */
md_build_library_name(npt_lib, sizeof(npt_lib), boot_path, NPT_LIBNAME);
+ if ( strlen(npt_lib) == 0 ) {
+ HPROF_ERROR(JNI_TRUE, "Could not find npt library");
+ }
jvmtiDeallocate(boot_path);
NPT_INITIALIZE(npt_lib, &(gdata->npt), NPT_VERSION, NULL);
if ( gdata->npt == NULL ) {
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp Tue Mar 12 18:12:44 2013 -0700
@@ -354,7 +354,7 @@
BAND_INIT(method_metadata_bands, -1, -1),
BAND_INIT(method_MethodParameters_NB, BYTE1_spec, 0),
BAND_INIT(method_MethodParameters_name_RUN, UNSIGNED5_spec, NULL_OR_INDEX(CONSTANT_Utf8)),
- BAND_INIT(method_MethodParameters_flag_I, UNSIGNED5_spec, 0),
+ BAND_INIT(method_MethodParameters_flag_FH, UNSIGNED5_spec, 0),
BAND_INIT(method_attr_bands, -1, -1),
BAND_INIT(class_flags_hi, UNSIGNED5_spec, 0),
BAND_INIT(class_flags_lo, UNSIGNED5_spec, 0),
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/bands.h Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/bands.h Tue Mar 12 18:12:44 2013 -0700
@@ -214,7 +214,7 @@
e_method_metadata_bands,
e_method_MethodParameters_NB,
e_method_MethodParameters_name_RUN,
- e_method_MethodParameters_flag_I,
+ e_method_MethodParameters_flag_FH,
e_method_attr_bands,
e_class_flags_hi,
@@ -393,7 +393,7 @@
#define method_Signature_RS all_bands[e_method_Signature_RS]
#define method_MethodParameters_NB all_bands[e_method_MethodParameters_NB]
#define method_MethodParameters_name_RUN all_bands[e_method_MethodParameters_name_RUN]
-#define method_MethodParameters_flag_I all_bands[e_method_MethodParameters_flag_I]
+#define method_MethodParameters_flag_FH all_bands[e_method_MethodParameters_flag_FH]
#define method_attr_bands all_bands[e_method_attr_bands]
#define class_flags_hi all_bands[e_class_flags_hi]
#define class_flags_lo all_bands[e_class_flags_lo]
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h Tue Mar 12 18:12:44 2013 -0700
@@ -505,5 +505,9 @@
bc_qldc = _xldc_op+7,
bc_qldc_w = _xldc_op+8,
_xldc_limit = _xldc_op+9,
+ _invoke_int_op = _xldc_limit,
+ _invokespecial_int = _invoke_int_op+0,
+ _invokestatic_int = _invoke_int_op+1,
+ _invoke_int_limit = _invoke_int_op+2,
_xxx_3_end
};
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp Tue Mar 12 18:12:44 2013 -0700
@@ -2488,7 +2488,7 @@
method_MethodParameters_NB.readData(count);
count = method_MethodParameters_NB.getIntTotal();
method_MethodParameters_name_RUN.readData(count);
- method_MethodParameters_flag_I.readData(count);
+ method_MethodParameters_flag_FH.readData(count);
CHECK;
break;
@@ -2942,6 +2942,9 @@
case bc_putfield:
return &bc_fieldref;
+ case _invokespecial_int:
+ case _invokestatic_int:
+ return &bc_imethodref;
case bc_invokevirtual:
case bc_invokespecial:
case bc_invokestatic:
@@ -4177,6 +4180,12 @@
}
origBC = bc;
switch (bc) {
+ case _invokestatic_int:
+ origBC = bc_invokestatic;
+ break;
+ case _invokespecial_int:
+ origBC = bc_invokespecial;
+ break;
case bc_ildc:
case bc_cldc:
case bc_fldc:
@@ -4431,7 +4440,7 @@
putu1(count = method_MethodParameters_NB.getByte());
for (j = 0; j < count; j++) {
putref(method_MethodParameters_name_RUN.getRefN());
- putu4(method_MethodParameters_flag_I.getInt());
+ putu2(method_MethodParameters_flag_FH.getInt());
}
break;
--- a/jdk/src/share/native/common/check_code.c Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/native/common/check_code.c Tue Mar 12 18:12:44 2013 -0700
@@ -206,6 +206,10 @@
#define LDC_METHOD_HANDLE_MAJOR_VERSION 51
+#define NONZERO_PADDING_BYTES_IN_SWITCH_MAJOR_VERSION 51
+
+#define STATIC_METHOD_IN_INTERFACE_MAJOR_VERSION 52
+
#define ALLOC_STACK_SIZE 16 /* big enough */
typedef struct alloc_stack_type {
@@ -1144,11 +1148,14 @@
int *saved_operand;
int keys;
int k, delta;
- /* 4639449, 4647081: Padding bytes must be zero. */
- unsigned char* bptr = (unsigned char*) (code + offset + 1);
- for (; bptr < (unsigned char*)lpc; bptr++) {
- if (*bptr != 0) {
- CCerror(context, "Non zero padding bytes in switch");
+
+ if (context->major_version < NONZERO_PADDING_BYTES_IN_SWITCH_MAJOR_VERSION) {
+ /* 4639449, 4647081: Padding bytes must be zero. */
+ unsigned char* bptr = (unsigned char*) (code + offset + 1);
+ for (; bptr < (unsigned char*)lpc; bptr++) {
+ if (*bptr != 0) {
+ CCerror(context, "Non zero padding bytes in switch");
+ }
}
}
if (opcode == JVM_OPC_tableswitch) {
@@ -1246,11 +1253,24 @@
jclass cb = context->class;
fullinfo_type clazz_info;
int is_constructor, is_internal, is_invokedynamic;
- int kind = (opcode == JVM_OPC_invokeinterface
- ? 1 << JVM_CONSTANT_InterfaceMethodref
- : opcode == JVM_OPC_invokedynamic
- ? 1 << JVM_CONSTANT_NameAndType
- : 1 << JVM_CONSTANT_Methodref);
+ int kind;
+
+ switch (opcode ) {
+ case JVM_OPC_invokestatic:
+ kind = ((context->major_version < STATIC_METHOD_IN_INTERFACE_MAJOR_VERSION)
+ ? (1 << JVM_CONSTANT_Methodref)
+ : ((1 << JVM_CONSTANT_InterfaceMethodref) | (1 << JVM_CONSTANT_Methodref)));
+ break;
+ case JVM_OPC_invokedynamic:
+ kind = 1 << JVM_CONSTANT_NameAndType;
+ break;
+ case JVM_OPC_invokeinterface:
+ kind = 1 << JVM_CONSTANT_InterfaceMethodref;
+ break;
+ default:
+ kind = 1 << JVM_CONSTANT_Methodref;
+ }
+
is_invokedynamic = opcode == JVM_OPC_invokedynamic;
/* Make sure the constant pool item is the right type. */
verify_constant_pool_type(context, key, kind);
--- a/jdk/src/share/native/java/lang/System.c Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/native/java/lang/System.c Tue Mar 12 18:12:44 2013 -0700
@@ -212,6 +212,10 @@
PUTPROP(props, "os.version", sprops->os_version);
PUTPROP(props, "os.arch", sprops->os_arch);
+#ifdef JDK_ARCH_ABI_PROP_NAME
+ PUTPROP(props, "sun.arch.abi", sprops->sun_arch_abi);
+#endif
+
/* file system properties */
PUTPROP(props, "file.separator", sprops->file_separator);
PUTPROP(props, "path.separator", sprops->path_separator);
--- a/jdk/src/share/native/java/lang/java_props.h Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/native/java/lang/java_props.h Tue Mar 12 18:12:44 2013 -0700
@@ -41,6 +41,10 @@
char *os_version;
char *os_arch;
+#ifdef JDK_ARCH_ABI_PROP_NAME
+ char *sun_arch_abi;
+#endif
+
nchar *tmp_dir;
nchar *font_dir;
nchar *user_dir;
--- a/jdk/src/share/native/java/util/zip/Inflater.c Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/native/java/util/zip/Inflater.c Tue Mar 12 18:12:44 2013 -0700
@@ -27,6 +27,7 @@
* Native method support for java.util.zip.Inflater
*/
+#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
@@ -60,12 +61,13 @@
{
z_stream *strm = calloc(1, sizeof(z_stream));
- if (strm == 0) {
+ if (strm == NULL) {
JNU_ThrowOutOfMemoryError(env, 0);
return jlong_zero;
} else {
- char *msg;
- switch (inflateInit2(strm, nowrap ? -MAX_WBITS : MAX_WBITS)) {
+ const char *msg;
+ int ret = inflateInit2(strm, nowrap ? -MAX_WBITS : MAX_WBITS);
+ switch (ret) {
case Z_OK:
return ptr_to_jlong(strm);
case Z_MEM_ERROR:
@@ -73,7 +75,13 @@
JNU_ThrowOutOfMemoryError(env, 0);
return jlong_zero;
default:
- msg = strm->msg;
+ msg = ((strm->msg != NULL) ? strm->msg :
+ (ret == Z_VERSION_ERROR) ?
+ "zlib returned Z_VERSION_ERROR: "
+ "compile time and runtime zlib implementations differ" :
+ (ret == Z_STREAM_ERROR) ?
+ "inflateInit2 returned Z_STREAM_ERROR" :
+ "unknown error initializing zlib library");
free(strm);
JNU_ThrowInternalError(env, msg);
return jlong_zero;
--- a/jdk/src/share/native/sun/font/layout/LookupProcessor.cpp Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/native/sun/font/layout/LookupProcessor.cpp Tue Mar 12 18:12:44 2013 -0700
@@ -125,6 +125,10 @@
}
const LookupTable *lookupTable = lookupListTable->getLookupTable(lookupTableIndex);
+ if (lookupTable == NULL) {
+ success = LE_INTERNAL_ERROR;
+ return 0;
+ }
le_uint16 lookupFlags = SWAPW(lookupTable->lookupFlags);
GlyphIterator tempIterator(*glyphIterator, lookupFlags);
le_uint32 delta = applyLookupTable(lookupTable, &tempIterator, fontInstance, success);
--- a/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c Tue Mar 12 18:12:44 2013 -0700
@@ -117,6 +117,7 @@
static jfieldID IL_nextRowOffset_fID;
static jfieldID IL_width_fID;
static jfieldID IL_height_fID;
+static jfieldID IL_imageAtOnce_fID;
static jfieldID PF_ID_fID;
JavaVM *javaVM;
@@ -237,7 +238,7 @@
* Method: loadProfile
* Signature: ([B)J
*/
-JNIEXPORT jlong JNICALL Java_sun_java2d_cmm_lcms_LCMS_loadProfile
+JNIEXPORT jlong JNICALL Java_sun_java2d_cmm_lcms_LCMS_loadProfileNative
(JNIEnv *env, jobject obj, jbyteArray data)
{
jbyte* dataArray;
@@ -284,7 +285,7 @@
* Method: freeProfile
* Signature: (J)V
*/
-JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_freeProfile
+JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_freeProfileNative
(JNIEnv *env, jobject obj, jlong id)
{
storeID_t sProf;
@@ -369,48 +370,22 @@
static cmsBool _setHeaderInfo(cmsHPROFILE pf, jbyte* pBuffer, jint bufferSize);
static cmsBool _writeCookedTag(cmsHPROFILE pfTarget, cmsTagSignature sig, jbyte *pData, jint size);
-/*
- * Class: sun_java2d_cmm_lcms_LCMS
- * Method: getTagSize
- * Signature: (JI)I
- */
-JNIEXPORT jint JNICALL Java_sun_java2d_cmm_lcms_LCMS_getTagSize
- (JNIEnv *env, jobject obj, jlong id, jint tagSig)
-{
- storeID_t sProf;
- TagSignature_t sig;
- jint result = -1;
-
- sProf.j = id;
- sig.j = tagSig;
-
- if (tagSig == SigHead) {
- result = sizeof(cmsICCHeader);
- } else {
- if (cmsIsTag(sProf.pf, sig.cms)) {
- result = cmsReadRawTag(sProf.pf, sig.cms, NULL, 0);
- } else {
- JNU_ThrowByName(env, "java/awt/color/CMMException",
- "ICC profile tag not found");
- }
- }
-
- return result;
-}
/*
* Class: sun_java2d_cmm_lcms_LCMS
* Method: getTagData
* Signature: (JI[B)V
*/
-JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_getTagData
- (JNIEnv *env, jobject obj, jlong id, jint tagSig, jbyteArray data)
+JNIEXPORT jbyteArray JNICALL Java_sun_java2d_cmm_lcms_LCMS_getTagNative
+ (JNIEnv *env, jobject obj, jlong id, jint tagSig)
{
storeID_t sProf;
TagSignature_t sig;
cmsInt32Number tagSize;
- jbyte* dataArray;
+ jbyte* dataArray = NULL;
+ jbyteArray data = NULL;
+
jint bufSize;
sProf.j = id;
@@ -419,12 +394,14 @@
if (tagSig == SigHead) {
cmsBool status;
- bufSize =(*env)->GetArrayLength(env, data);
+ // allocate java array
+ bufSize = sizeof(cmsICCHeader);
+ data = (*env)->NewByteArray(env, bufSize);
- if (bufSize < sizeof(cmsICCHeader)) {
- JNU_ThrowByName(env, "java/awt/color/CMMException",
- "Insufficient buffer capacity");
- return;
+ if (data == NULL) {
+ JNU_ThrowByName(env, "java/awt/color/CMMException",
+ "Unable to allocate buffer");
+ return NULL;
}
dataArray = (*env)->GetByteArrayElements (env, data, 0);
@@ -432,7 +409,7 @@
if (dataArray == NULL) {
JNU_ThrowByName(env, "java/awt/color/CMMException",
"Unable to get buffer");
- return;
+ return NULL;
}
status = _getHeaderInfo(sProf.pf, dataArray, bufSize);
@@ -442,9 +419,10 @@
if (!status) {
JNU_ThrowByName(env, "java/awt/color/CMMException",
"ICC Profile header not found");
+ return NULL;
}
- return;
+ return data;
}
if (cmsIsTag(sProf.pf, sig.cms)) {
@@ -452,16 +430,15 @@
} else {
JNU_ThrowByName(env, "java/awt/color/CMMException",
"ICC profile tag not found");
- return;
+ return NULL;
}
- // verify data buffer capacity
- bufSize = (*env)->GetArrayLength(env, data);
-
- if (tagSize < 0 || 0 > bufSize || tagSize > bufSize) {
+ // allocate java array
+ data = (*env)->NewByteArray(env, tagSize);
+ if (data == NULL) {
JNU_ThrowByName(env, "java/awt/color/CMMException",
- "Insufficient buffer capacity.");
- return;
+ "Unable to allocate buffer");
+ return NULL;
}
dataArray = (*env)->GetByteArrayElements (env, data, 0);
@@ -469,7 +446,7 @@
if (dataArray == NULL) {
JNU_ThrowByName(env, "java/awt/color/CMMException",
"Unable to get buffer");
- return;
+ return NULL;
}
bufSize = cmsReadRawTag(sProf.pf, sig.cms, dataArray, tagSize);
@@ -479,8 +456,9 @@
if (bufSize != tagSize) {
JNU_ThrowByName(env, "java/awt/color/CMMException",
"Can not get tag data.");
+ return NULL;
}
- return;
+ return data;
}
/*
@@ -488,7 +466,7 @@
* Method: setTagData
* Signature: (JI[B)V
*/
-JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_setTagData
+JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_setTagDataNative
(JNIEnv *env, jobject obj, jlong id, jint tagSig, jbyteArray data)
{
storeID_t sProf;
@@ -586,6 +564,7 @@
char* inputRow;
char* outputRow;
jobject srcData, dstData;
+ jboolean srcAtOnce = JNI_FALSE, dstAtOnce = JNI_FALSE;
srcOffset = (*env)->GetIntField (env, src, IL_offset_fID);
srcNextRowOffset = (*env)->GetIntField (env, src, IL_nextRowOffset_fID);
@@ -594,6 +573,9 @@
width = (*env)->GetIntField (env, src, IL_width_fID);
height = (*env)->GetIntField (env, src, IL_height_fID);
+ srcAtOnce = (*env)->GetBooleanField(env, src, IL_imageAtOnce_fID);
+ dstAtOnce = (*env)->GetBooleanField(env, dst, IL_imageAtOnce_fID);
+
sTrans.j = (*env)->GetLongField (env, trans, Trans_ID_fID);
if (sTrans.xf == NULL) {
@@ -625,10 +607,14 @@
inputRow = (char*)inputBuffer + srcOffset;
outputRow = (char*)outputBuffer + dstOffset;
- for (i = 0; i < height; i++) {
- cmsDoTransform(sTrans.xf, inputRow, outputRow, width);
- inputRow += srcNextRowOffset;
- outputRow += dstNextRowOffset;
+ if (srcAtOnce && dstAtOnce) {
+ cmsDoTransform(sTrans.xf, inputRow, outputRow, width * height);
+ } else {
+ for (i = 0; i < height; i++) {
+ cmsDoTransform(sTrans.xf, inputRow, outputRow, width);
+ inputRow += srcNextRowOffset;
+ outputRow += dstNextRowOffset;
+ }
}
releaseILData(env, inputBuffer, srcDType, srcData);
@@ -670,6 +656,7 @@
IL_width_fID = (*env)->GetFieldID (env, IL, "width", "I");
IL_height_fID = (*env)->GetFieldID (env, IL, "height", "I");
IL_offset_fID = (*env)->GetFieldID (env, IL, "offset", "I");
+ IL_imageAtOnce_fID = (*env)->GetFieldID (env, IL, "imageAtOnce", "Z");
IL_nextRowOffset_fID = (*env)->GetFieldID (env, IL, "nextRowOffset", "I");
PF_ID_fID = (*env)->GetFieldID (env, Pf, "ID", "J");
--- a/jdk/src/share/native/sun/java2d/loops/AnyByteBinary.h Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/native/sun/java2d/loops/AnyByteBinary.h Tue Mar 12 18:12:44 2013 -0700
@@ -153,7 +153,10 @@
jint PREFIX ## rgb;
#define InitByteBinaryAlphaLoadData(TYPE, PREFIX, pRasInfo) \
- PREFIX ## Lut = (pRasInfo)->lutBase
+ do { \
+ PREFIX ## Lut = (pRasInfo)->lutBase; \
+ PREFIX ## rgb = 0; \
+ } while (0)
#define LoadAlphaFromByteBinaryFor4ByteArgb(TYPE, pRas, PREFIX, COMP_PREFIX) \
do { \
--- a/jdk/src/share/native/sun/java2d/loops/ByteIndexed.h Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/native/sun/java2d/loops/ByteIndexed.h Tue Mar 12 18:12:44 2013 -0700
@@ -202,7 +202,10 @@
jint PREFIX ## rgb;
#define InitByteIndexedAlphaLoadData(PREFIX, pRasInfo) \
- PREFIX ## Lut = (pRasInfo)->lutBase
+ do { \
+ PREFIX ## Lut = (pRasInfo)->lutBase; \
+ PREFIX ## rgb = 0; \
+ } while (0)
#define LoadAlphaFromByteIndexedFor4ByteArgb(pRas, PREFIX, COMP_PREFIX) \
do { \
--- a/jdk/src/share/native/sun/java2d/loops/IntArgb.h Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/native/sun/java2d/loops/IntArgb.h Tue Mar 12 18:12:44 2013 -0700
@@ -122,7 +122,8 @@
#define DeclareIntArgbAlphaLoadData(PREFIX) \
jint PREFIX;
-#define InitIntArgbAlphaLoadData(PREFIX, pRasInfo)
+#define InitIntArgbAlphaLoadData(PREFIX, pRasInfo) \
+ PREFIX = 0
#define LoadAlphaFromIntArgbFor4ByteArgb(pRas, PREFIX, COMP_PREFIX) \
do { \
--- a/jdk/src/share/native/sun/java2d/loops/IntArgbBm.h Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/native/sun/java2d/loops/IntArgbBm.h Tue Mar 12 18:12:44 2013 -0700
@@ -133,7 +133,8 @@
#define DeclareIntArgbBmAlphaLoadData(PREFIX) \
jint PREFIX;
-#define InitIntArgbBmAlphaLoadData(PREFIX, pRasInfo)
+#define InitIntArgbBmAlphaLoadData(PREFIX, pRasInfo) \
+ PREFIX = 0
#define LoadAlphaFromIntArgbBmFor4ByteArgb(pRas, PREFIX, COMP_PREFIX) \
do { \
--- a/jdk/src/share/native/sun/java2d/loops/IntArgbPre.h Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/native/sun/java2d/loops/IntArgbPre.h Tue Mar 12 18:12:44 2013 -0700
@@ -153,7 +153,8 @@
#define DeclareIntArgbPreAlphaLoadData(PREFIX) \
jint PREFIX;
-#define InitIntArgbPreAlphaLoadData(PREFIX, pRasInfo)
+#define InitIntArgbPreAlphaLoadData(PREFIX, pRasInfo) \
+ PREFIX = 0
#define LoadAlphaFromIntArgbPreFor4ByteArgb(pRas, PREFIX, COMP_PREFIX) \
do { \
--- a/jdk/src/share/native/sun/java2d/loops/TransformHelper.c Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/native/sun/java2d/loops/TransformHelper.c Tue Mar 12 18:12:44 2013 -0700
@@ -353,6 +353,9 @@
pInterpFunc = pBicubicFunc;
maxlinepix = LINE_SIZE / 16;
break;
+ default:
+ // Should not happen, but just in case.
+ return;
}
srcInfo.bounds.x1 = sx1;
--- a/jdk/src/share/native/sun/java2d/loops/Ushort4444Argb.h Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/native/sun/java2d/loops/Ushort4444Argb.h Tue Mar 12 18:12:44 2013 -0700
@@ -120,7 +120,8 @@
#define DeclareUshort4444ArgbAlphaLoadData(PREFIX) \
jint PREFIX;
-#define InitUshort4444ArgbAlphaLoadData(PREFIX, pRasInfo)
+#define InitUshort4444ArgbAlphaLoadData(PREFIX, pRasInfo) \
+ PREFIX = 0
#define LoadAlphaFromUshort4444ArgbFor4ByteArgb(pRas, PREFIX, COMP_PREFIX) \
do { \
--- a/jdk/src/share/native/sun/java2d/loops/UshortIndexed.h Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/native/sun/java2d/loops/UshortIndexed.h Tue Mar 12 18:12:44 2013 -0700
@@ -170,7 +170,10 @@
jint PREFIX ## rgb;
#define InitUshortIndexedAlphaLoadData(PREFIX, pRasInfo) \
- PREFIX ## Lut = (pRasInfo)->lutBase
+ do { \
+ PREFIX ## Lut = (pRasInfo)->lutBase; \
+ PREFIX ## rgb = 0; \
+ } while (0)
#define LoadAlphaFromUshortIndexedFor4ByteArgb(pRas, PREFIX, COMP_PREFIX) \
do { \
--- a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c Tue Mar 12 18:12:44 2013 -0700
@@ -687,8 +687,8 @@
if ((*env)->ExceptionCheck(env)) {
free(ckParam.RandomInfo.pClientRandom);
free(ckParam.RandomInfo.pServerRandom);
+ free(ckParam.pReturnedKeyMaterial->pIVClient);
free(ckParam.pReturnedKeyMaterial);
- free(ckParam.pReturnedKeyMaterial->pIVClient);
return ckParam;
}
--- a/jdk/src/solaris/back/linker_md.c Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/solaris/back/linker_md.c Tue Mar 12 18:12:44 2013 -0700
@@ -60,6 +60,7 @@
char *path_sep = PATH_SEPARATOR;
char *pathname = (char *)pname;
+ *buffer = '\0';
while (strlen(pathname) > 0) {
char *p = strchr(pathname, *path_sep);
if (p == NULL) {
@@ -69,13 +70,17 @@
if (p == pathname) {
continue;
}
- (void)snprintf(buffer, buflen, "%.*s/lib%s." LIB_SUFFIX, (p - pathname),
+ (void)snprintf(buffer, buflen, "%.*s/lib%s." LIB_SUFFIX, (int)(p - pathname),
pathname, fname);
if (access(buffer, F_OK) == 0) {
break;
}
- pathname = p + 1;
+ if (*p == '\0') {
+ pathname = p;
+ } else {
+ pathname = p + 1;
+ }
*buffer = '\0';
}
}
--- a/jdk/src/solaris/classes/sun/awt/X11/XFramePeer.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/solaris/classes/sun/awt/X11/XFramePeer.java Tue Mar 12 18:12:44 2013 -0700
@@ -641,4 +641,6 @@
public Rectangle getBoundsPrivate() {
return getBounds();
}
+
+ public void emulateActivation(boolean doActivate) {}
}
--- a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java Tue Mar 12 18:12:44 2013 -0700
@@ -419,6 +419,10 @@
return peer;
}
+ public FramePeer createLightweightFrame(LightweightFrame target) {
+ return null;
+ }
+
public FramePeer createFrame(Frame target) {
FramePeer peer = new XFramePeer(target);
targetCreatedPeer(target, peer);
--- a/jdk/src/solaris/demo/jvmti/hprof/hprof_md.c Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/solaris/demo/jvmti/hprof/hprof_md.c Tue Mar 12 18:12:44 2013 -0700
@@ -385,6 +385,7 @@
// Loosely based on os_solaris.cpp
char *pathname = (char *)pname;
+ *buffer = '\0';
while (strlen(pathname) > 0) {
char *p = strchr(pathname, ':');
if (p == NULL) {
@@ -395,12 +396,16 @@
continue;
}
(void)snprintf(buffer, buflen, "%.*s/lib%s" JNI_LIB_SUFFIX,
- (p - pathname), pathname, fname);
+ (int)(p - pathname), pathname, fname);
if (access(buffer, F_OK) == 0) {
- break;
+ break;
}
- pathname = p + 1;
+ if (*p == '\0') {
+ pathname = p;
+ } else {
+ pathname = p + 1;
+ }
*buffer = '\0';
}
}
--- a/jdk/src/solaris/native/java/lang/java_props_md.c Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/solaris/native/java/lang/java_props_md.c Tue Mar 12 18:12:44 2013 -0700
@@ -514,6 +514,11 @@
}
}
+ /* ABI property (optional) */
+#ifdef JDK_ARCH_ABI_PROP_NAME
+ sprops.sun_arch_abi = JDK_ARCH_ABI_PROP_NAME;
+#endif
+
/* Determine the language, country, variant, and encoding from the host,
* and store these in the user.language, user.country, user.variant and
* file.encoding system properties. */
--- a/jdk/src/windows/back/linker_md.c Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/windows/back/linker_md.c Tue Mar 12 18:12:44 2013 -0700
@@ -44,6 +44,7 @@
char *path_sep = PATH_SEPARATOR;
char *pathname = (char *)pname;
+ *buffer = '\0';
while (strlen(pathname) > 0) {
char *p = strchr(pathname, *path_sep);
if (p == NULL) {
@@ -54,16 +55,20 @@
continue;
}
if (*(p-1) == ':' || *(p-1) == '\\') {
- (void)_snprintf(buffer, buflen, "%.*s%s.dll", (p - pathname),
+ (void)_snprintf(buffer, buflen, "%.*s%s.dll", (int)(p - pathname),
pathname, fname);
} else {
- (void)_snprintf(buffer, buflen, "%.*s\\%s.dll", (p - pathname),
+ (void)_snprintf(buffer, buflen, "%.*s\\%s.dll", (int)(p - pathname),
pathname, fname);
}
if (_access(buffer, 0) == 0) {
break;
}
- pathname = p + 1;
+ if (*p == '\0') {
+ pathname = p;
+ } else {
+ pathname = p + 1;
+ }
*buffer = '\0';
}
}
--- a/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java Tue Mar 12 18:12:44 2013 -0700
@@ -226,15 +226,15 @@
}
@SuppressWarnings("deprecation")
- public void synthesizeWindowActivation(final boolean doActivate) {
- if (!doActivate || EventQueue.isDispatchThread()) {
- ((WEmbeddedFramePeer)getPeer()).synthesizeWmActivate(doActivate);
+ public void synthesizeWindowActivation(final boolean activate) {
+ if (!activate || EventQueue.isDispatchThread()) {
+ ((WFramePeer)getPeer()).emulateActivation(activate);
} else {
// To avoid focus concurrence b/w IE and EmbeddedFrame
// activation is postponed by means of posting it to EDT.
EventQueue.invokeLater(new Runnable() {
public void run() {
- ((WEmbeddedFramePeer)getPeer()).synthesizeWmActivate(true);
+ ((WFramePeer)getPeer()).emulateActivation(true);
}
});
}
--- a/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java Tue Mar 12 18:12:44 2013 -0700
@@ -65,8 +65,6 @@
public native Rectangle getBoundsPrivate();
- public native void synthesizeWmActivate(boolean doActivate);
-
@Override
public boolean isAccelCapable() {
// REMIND: Temp workaround for issues with using HW acceleration
--- a/jdk/src/windows/classes/sun/awt/windows/WFramePeer.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/windows/classes/sun/awt/windows/WFramePeer.java Tue Mar 12 18:12:44 2013 -0700
@@ -200,4 +200,11 @@
public Rectangle getBoundsPrivate() {
return getBounds();
}
+
+ // TODO: implement it in peers. WLightweightFramePeer may implement lw version.
+ public void emulateActivation(boolean activate) {
+ synthesizeWmActivate(activate);
+ }
+
+ private native void synthesizeWmActivate(boolean activate);
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/windows/classes/sun/awt/windows/WLightweightFramePeer.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2013, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package sun.awt.windows;
+
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.event.ComponentEvent;
+import java.awt.event.MouseEvent;
+
+import sun.awt.LightweightFrame;
+
+public class WLightweightFramePeer extends WFramePeer {
+
+ public WLightweightFramePeer(LightweightFrame target) {
+ super(target);
+ }
+
+ private LightweightFrame getLwTarget() {
+ return (LightweightFrame)target;
+ }
+
+ @Override
+ public Graphics getGraphics() {
+ return getLwTarget().getGraphics();
+ }
+
+ @Override
+ public void show() {
+ super.show();
+ postEvent(new ComponentEvent((Component)getTarget(), ComponentEvent.COMPONENT_SHOWN));
+ }
+
+ @Override
+ public void hide() {
+ super.hide();
+ postEvent(new ComponentEvent((Component)getTarget(), ComponentEvent.COMPONENT_HIDDEN));
+ }
+
+ @Override
+ public void reshape(int x, int y, int width, int height) {
+ super.reshape(x, y, width, height);
+ postEvent(new ComponentEvent((Component) getTarget(), ComponentEvent.COMPONENT_MOVED));
+ postEvent(new ComponentEvent((Component) getTarget(), ComponentEvent.COMPONENT_RESIZED));
+ }
+
+ @Override
+ public void handleEvent(java.awt.AWTEvent e) {
+ if (e.getID() == MouseEvent.MOUSE_PRESSED) {
+ emulateActivation(true);
+ }
+ super.handleEvent(e);
+ }
+
+ @Override
+ public void grab() {
+ getLwTarget().grabFocus();
+ }
+
+ @Override
+ public void ungrab() {
+ getLwTarget().ungrabFocus();
+ }
+}
--- a/jdk/src/windows/classes/sun/awt/windows/WToolkit.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/windows/classes/sun/awt/windows/WToolkit.java Tue Mar 12 18:12:44 2013 -0700
@@ -37,6 +37,7 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
import sun.awt.AWTAutoShutdown;
+import sun.awt.LightweightFrame;
import sun.awt.SunToolkit;
import sun.awt.Win32GraphicsDevice;
import sun.awt.Win32GraphicsEnvironment;
@@ -398,6 +399,12 @@
return peer;
}
+ public FramePeer createLightweightFrame(LightweightFrame target) {
+ FramePeer peer = new WLightweightFramePeer(target);
+ targetCreatedPeer(target, peer);
+ return peer;
+ }
+
public CanvasPeer createCanvas(Canvas target) {
CanvasPeer peer = new WCanvasPeer(target);
targetCreatedPeer(target, peer);
--- a/jdk/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java Tue Mar 12 18:12:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2013, 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
@@ -35,6 +35,7 @@
import java.nio.channels.Pipe;
import java.nio.channels.SelectableChannel;
import java.io.IOException;
+import java.nio.channels.CancelledKeyException;
import java.util.List;
import java.util.ArrayList;
import java.util.HashMap;
@@ -561,17 +562,19 @@
protected void implDereg(SelectionKeyImpl ski) throws IOException{
int i = ski.getIndex();
assert (i >= 0);
- if (i != totalChannels - 1) {
- // Copy end one over it
- SelectionKeyImpl endChannel = channelArray[totalChannels-1];
- channelArray[i] = endChannel;
- endChannel.setIndex(i);
- pollWrapper.replaceEntry(pollWrapper, totalChannels - 1,
+ synchronized (closeLock) {
+ if (i != totalChannels - 1) {
+ // Copy end one over it
+ SelectionKeyImpl endChannel = channelArray[totalChannels-1];
+ channelArray[i] = endChannel;
+ endChannel.setIndex(i);
+ pollWrapper.replaceEntry(pollWrapper, totalChannels - 1,
pollWrapper, i);
+ }
+ ski.setIndex(-1);
}
channelArray[totalChannels - 1] = null;
totalChannels--;
- ski.setIndex(-1);
if ( totalChannels != 1 && totalChannels % MAX_SELECTABLE_FDS == 1) {
totalChannels--;
threadsCount--; // The last thread has become redundant.
@@ -589,7 +592,11 @@
synchronized (closeLock) {
if (pollWrapper == null)
throw new ClosedSelectorException();
- pollWrapper.putEventOps(sk.getIndex(), ops);
+ // make sure this sk has not been removed yet
+ int index = sk.getIndex();
+ if (index == -1)
+ throw new CancelledKeyException();
+ pollWrapper.putEventOps(index, ops);
}
}
--- a/jdk/src/windows/demo/jvmti/hprof/hprof_md.c Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/windows/demo/jvmti/hprof/hprof_md.c Tue Mar 12 18:12:44 2013 -0700
@@ -372,6 +372,7 @@
// Loosley based on os_windows.cpp
char *pathname = (char *)pname;
+ *buffer = '\0';
while (strlen(pathname) > 0) {
char *p = strchr(pathname, ';');
if (p == NULL) {
@@ -382,16 +383,20 @@
continue;
}
if (*(p-1) == ':' || *(p-1) == '\\') {
- (void)_snprintf(buffer, buflen, "%.*s%s.dll", (p - pathname),
+ (void)_snprintf(buffer, buflen, "%.*s%s.dll", (int)(p - pathname),
pathname, fname);
} else {
- (void)_snprintf(buffer, buflen, "%.*s\\%s.dll", (p - pathname),
+ (void)_snprintf(buffer, buflen, "%.*s\\%s.dll", (int)(p - pathname),
pathname, fname);
}
if (_access(buffer, 0) == 0) {
break;
}
- pathname = p + 1;
+ if (*p == '\0') {
+ pathname = p;
+ } else {
+ pathname = p + 1;
+ }
*buffer = '\0';
}
}
--- a/jdk/src/windows/native/java/io/WinNTFileSystem_md.c Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/windows/native/java/io/WinNTFileSystem_md.c Tue Mar 12 18:12:44 2013 -0700
@@ -36,9 +36,7 @@
#include <windows.h>
#include <io.h>
-#include "jvm.h"
#include "jni.h"
-#include "jni_util.h"
#include "io_util.h"
#include "jlong.h"
#include "io_util_md.h"
@@ -115,13 +113,15 @@
DWORD len = (*GetFinalPathNameByHandle_func)(h, result, MAX_PATH, 0);
if (len >= MAX_PATH) {
/* retry with a buffer of the right size */
- result = (WCHAR*)realloc(result, (len+1) * sizeof(WCHAR));
- if (result != NULL) {
+ WCHAR* newResult = (WCHAR*)realloc(result, (len+1) * sizeof(WCHAR));
+ if (newResult != NULL) {
+ result = newResult;
len = (*GetFinalPathNameByHandle_func)(h, result, len, 0);
} else {
len = 0;
}
}
+
if (len > 0) {
/**
* Strip prefix (should be \\?\ or \\?\UNC)
--- a/jdk/src/windows/native/java/lang/ProcessImpl_md.c Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/windows/native/java/lang/ProcessImpl_md.c Tue Mar 12 18:12:44 2013 -0700
@@ -120,10 +120,12 @@
goto Catch;
}
si.hStdInput = inRead;
- SetHandleInformation(inWrite, HANDLE_FLAG_INHERIT, FALSE);
+ SetHandleInformation(inWrite, HANDLE_FLAG_INHERIT, 0);
handles[0] = (jlong) inWrite;
}
- SetHandleInformation(si.hStdInput, HANDLE_FLAG_INHERIT, TRUE);
+ SetHandleInformation(si.hStdInput,
+ HANDLE_FLAG_INHERIT,
+ HANDLE_FLAG_INHERIT);
if (handles[1] != (jlong) -1) {
si.hStdOutput = (HANDLE) handles[1];
@@ -134,10 +136,12 @@
goto Catch;
}
si.hStdOutput = outWrite;
- SetHandleInformation(outRead, HANDLE_FLAG_INHERIT, FALSE);
+ SetHandleInformation(outRead, HANDLE_FLAG_INHERIT, 0);
handles[1] = (jlong) outRead;
}
- SetHandleInformation(si.hStdOutput, HANDLE_FLAG_INHERIT, TRUE);
+ SetHandleInformation(si.hStdOutput,
+ HANDLE_FLAG_INHERIT,
+ HANDLE_FLAG_INHERIT);
if (redirectErrorStream) {
si.hStdError = si.hStdOutput;
@@ -151,10 +155,12 @@
goto Catch;
}
si.hStdError = errWrite;
- SetHandleInformation(errRead, HANDLE_FLAG_INHERIT, FALSE);
+ SetHandleInformation(errRead, HANDLE_FLAG_INHERIT, 0);
handles[2] = (jlong) errRead;
}
- SetHandleInformation(si.hStdError, HANDLE_FLAG_INHERIT, TRUE);
+ SetHandleInformation(si.hStdError,
+ HANDLE_FLAG_INHERIT,
+ HANDLE_FLAG_INHERIT);
processFlag = CREATE_NO_WINDOW | CREATE_UNICODE_ENVIRONMENT;
ret = CreateProcessW(0, /* executable name */
--- a/jdk/src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c Tue Mar 12 18:12:44 2013 -0700
@@ -89,6 +89,7 @@
rv = setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (char *) &opt, sizeof(opt));
if (rv == SOCKET_ERROR) {
NET_ThrowNew(env, WSAGetLastError(), "Socket creation failed");
+ closesocket(fd);
return -1;
}
--- a/jdk/src/windows/native/sun/windows/awt_Frame.cpp Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/windows/native/sun/windows/awt_Frame.cpp Tue Mar 12 18:12:44 2013 -0700
@@ -105,6 +105,7 @@
m_parentWnd = NULL;
menuBar = NULL;
m_isEmbedded = FALSE;
+ m_isLightweight = FALSE;
m_ignoreWmSize = FALSE;
m_isMenuDropped = FALSE;
m_isInputMethodWindow = FALSE;
@@ -170,14 +171,13 @@
* area of the browser is a Java Frame for parenting purposes, but
* really a Windows child window
*/
+ BOOL isEmbeddedInstance = FALSE;
+ BOOL isEmbedded = FALSE;
cls = env->FindClass("sun/awt/EmbeddedFrame");
- if (cls == NULL) {
- return NULL;
+ if (cls) {
+ isEmbeddedInstance = env->IsInstanceOf(target, cls);
}
INT_PTR handle;
- jboolean isEmbeddedInstance = env->IsInstanceOf(target, cls);
- jboolean isEmbedded = FALSE;
-
if (isEmbeddedInstance) {
handle = static_cast<INT_PTR>(env->GetLongField(target, AwtFrame::handleID));
if (handle != 0) {
@@ -186,6 +186,13 @@
}
frame->m_isEmbedded = isEmbedded;
+ BOOL isLightweight = FALSE;
+ cls = env->FindClass("sun/awt/LightweightFrame");
+ if (cls) {
+ isLightweight = env->IsInstanceOf(target, cls);
+ }
+ frame->m_isLightweight = isLightweight;
+
if (isEmbedded) {
hwndParent = (HWND)handle;
RECT rect;
@@ -230,6 +237,23 @@
rect.bottom-rect.top);
frame->InitPeerGraphicsConfig(env, self);
AwtToolkit::GetInstance().RegisterEmbedderProcessId(hwndParent);
+ } else if (isLightweight) {
+ frame->m_isUndecorated = true;
+ frame->m_peerObject = env->NewGlobalRef(self);
+ frame->RegisterClass();
+
+ DWORD exStyle = 0;
+ DWORD style = WS_POPUP;
+
+ frame->CreateHWnd(env, L"",
+ style,
+ exStyle,
+ 0, 0, 0, 0,
+ 0,
+ NULL,
+ ::GetSysColor(COLOR_WINDOWTEXT),
+ ::GetSysColor(COLOR_WINDOWFRAME),
+ self);
} else {
jint state = env->CallIntMethod(self, AwtFrame::getExtendedStateMID);
DWORD exStyle;
@@ -345,16 +369,20 @@
case WM_SETFOCUS:
if (sm_inSynthesizeFocus) break; // pass it up the WindowProc chain
- if (!sm_suppressFocusAndActivation && IsEmbeddedFrame()) {
- AwtSetActiveWindow();
+ if (!sm_suppressFocusAndActivation) {
+ if (IsLightweightFrame() || IsEmbeddedFrame()) {
+ AwtSetActiveWindow();
+ }
}
mr = mrConsume;
break;
case WM_KILLFOCUS:
if (sm_inSynthesizeFocus) break; // pass it up the WindowProc chain
- if (!sm_suppressFocusAndActivation && IsEmbeddedFrame()) {
- AwtWindow::SynthesizeWmActivate(FALSE, GetHWnd(), NULL);
+ if (!sm_suppressFocusAndActivation) {
+ if (IsLightweightFrame() || IsEmbeddedFrame()) {
+ AwtWindow::SynthesizeWmActivate(FALSE, GetHWnd(), NULL);
+ }
} else if (sm_restoreFocusAndActivation) {
if (AwtComponent::GetFocusedWindow() != NULL) {
@@ -640,6 +668,10 @@
HWND hwnd = GetHWnd();
JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
+ if (IsLightweightFrame()) {
+ return;
+ }
+
DTRACE_PRINTLN3("AwtFrame::Show:%s%s%s",
m_iconic ? " iconic" : "",
m_zoomed ? " zoomed" : "",
@@ -992,6 +1024,9 @@
// b) focus is requested to some of the frame's child.
m_actualFocusedWindow = NULL;
}
+ if (IsLightweightFrame()) {
+ return TRUE;
+ }
return AwtWindow::AwtSetActiveWindow(isMouseEventCause);
}
@@ -1873,7 +1908,7 @@
}
JNIEXPORT void JNICALL
-Java_sun_awt_windows_WEmbeddedFramePeer_synthesizeWmActivate(JNIEnv *env, jobject self, jboolean doActivate)
+Java_sun_awt_windows_WFramePeer_synthesizeWmActivate(JNIEnv *env, jobject self, jboolean doActivate)
{
TRY;
--- a/jdk/src/windows/native/sun/windows/awt_Frame.h Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/windows/native/sun/windows/awt_Frame.h Tue Mar 12 18:12:44 2013 -0700
@@ -72,6 +72,8 @@
/* Returns whether this frame is embedded in an external native frame. */
INLINE BOOL IsEmbeddedFrame() { return m_isEmbedded; }
+ /* Returns whether this frame is lightweight. */
+ INLINE virtual BOOL IsLightweightFrame() { return m_isLightweight; }
INLINE BOOL IsSimpleWindow() { return FALSE; }
@@ -169,6 +171,9 @@
/* The frame is an EmbeddedFrame. */
BOOL m_isEmbedded;
+ /* The frame is a LightweightFrame */
+ BOOL m_isLightweight;
+
/* used so that calls to ::MoveWindow in SetMenuBar don't propogate
because they are immediately followed by calls to Component.resize */
BOOL m_ignoreWmSize;
--- a/jdk/src/windows/native/sun/windows/awt_Window.h Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/src/windows/native/sun/windows/awt_Window.h Tue Mar 12 18:12:44 2013 -0700
@@ -143,6 +143,7 @@
INLINE HICON GetHIcon() {return m_hIcon;};
INLINE HICON GetHIconSm() {return m_hIconSm;};
INLINE BOOL IsIconInherited() {return m_iconInherited;};
+ INLINE virtual BOOL IsLightweightFrame() {return FALSE;}
/* Post events to the EventQueue */
void SendComponentEvent(jint eventId);
@@ -193,8 +194,10 @@
// Execute on Toolkit only.
INLINE static LRESULT SynthesizeWmActivate(BOOL doActivate, HWND targetHWnd, HWND oppositeHWnd) {
+ AwtWindow *win = static_cast<AwtWindow*>(AwtComponent::GetComponent(targetHWnd));
if (doActivate &&
- (!::IsWindowVisible(targetHWnd) || ::IsIconic(::GetAncestor(targetHWnd, GA_ROOT))))
+ (!::IsWindowVisible(targetHWnd) || ::IsIconic(::GetAncestor(targetHWnd, GA_ROOT))) &&
+ (win == NULL || !win->IsLightweightFrame()))
{
// The activation is rejected if either:
// - The toplevel is not visible
--- a/jdk/test/ProblemList.txt Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/ProblemList.txt Tue Mar 12 18:12:44 2013 -0700
@@ -134,6 +134,9 @@
# 7196801
java/lang/management/MemoryMXBean/LowMemoryTest2.sh generic-all
+# 8008200
+java/lang/Class/asSubclass/BasicUnit.java generic-all
+
############################################################################
# jdk_management
@@ -324,9 +327,6 @@
# 7150569
tools/launcher/UnicodeTest.java macosx-all
-# 8006039
-tools/launcher/I18NJarTest.java macosx-all
-
# 8007410
tools/launcher/FXLauncherTest.java linux-all
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/List/MouseDraggedOutCauseScrollingTest/MouseDraggedOutCauseScrollingTest.html Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,43 @@
+<html>
+<!--
+ Copyright (c) 2013, 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 6243382 8006070
+ @summary Dragging of mouse outside of a List and Choice area don't work properly on XAWT
+ @author Dmitry.Cherepanov@SUN.COM area=awt.list
+ @run applet/manual=yesno MouseDraggedOutCauseScrollingTest.html
+ -->
+<head>
+<title> ManualYesNoTest </title>
+</head>
+<body>
+
+<h1>ManualYesNoTest<br>Bug ID: </h1>
+
+<p> See the dialog box (usually in upper left corner) for instructions</p>
+
+<APPLET CODE="MouseDraggedOutCauseScrollingTest.class" WIDTH=200 HEIGHT=200></APPLET>
+</body>
+</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/List/MouseDraggedOutCauseScrollingTest/MouseDraggedOutCauseScrollingTest.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,246 @@
+/*
+ * Copyright (c) 2013, 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 6243382 8006070
+ @summary Dragging of mouse outside of a List and Choice area don't work properly on XAWT
+ @author Dmitry.Cherepanov@SUN.COM area=awt.list
+ @run applet/manual=yesno MouseDraggedOutCauseScrollingTest.html
+*/
+
+import java.applet.Applet;
+import java.awt.*;
+
+public class MouseDraggedOutCauseScrollingTest extends Applet
+{
+ Choice choice;
+ List singleList;
+ List multipleList;
+
+ public void init()
+ {
+ this.setLayout (new GridLayout (1, 3));
+
+ choice = new Choice();
+ singleList = new List(3, false);
+ multipleList = new List(3, true);
+
+ choice.add("Choice");
+ for (int i = 1; i < 100; i++){
+ choice.add(""+i);
+ }
+
+ singleList.add("Single list");
+ for (int i = 1; i < 100; i++)
+ singleList.add(""+i);
+
+ multipleList.add("Multiple list");
+ for (int i = 1; i < 100; i++)
+ multipleList.add(""+i);
+
+ this.add(choice);
+ this.add(singleList);
+ this.add(multipleList);
+
+ String toolkitName = Toolkit.getDefaultToolkit().getClass().getName();
+ if (!toolkitName.equals("sun.awt.X11.XToolkit")) {
+ String[] instructions =
+ {
+ "This test is not applicable to the current platform. Press PASS"
+ };
+ Sysout.createDialogWithInstructions( instructions );
+ } else {
+ String[] instructions =
+ {
+ "0) Please note, that this is only Motif/XAWT test. At first, make the applet active",
+ "1.1) Click on the choice",
+ "1.2) Press the left button of the mouse and keep on any item of the choice, for example 5",
+ "1.3) Drag mouse out of the area of the unfurled list, at the same time hold the X coordinate of the mouse position about the same",
+ "1.4) To make sure, that when the Y coordinate of the mouse position higher of the upper bound of the list then scrolling UP of the list and selected item changes on the upper. If not, the test failed",
+ "1.5) To make sure, that when the Y coordinate of the mouse position under of the lower bound of the list then scrolling DOWN of the list and selected item changes on the lower. If not, the test failed",
+ "-----------------------------------",
+ "2.1) Click on the single list",
+ "2.2) Press the left button of the mouse and keep on any item of the list, for example 5",
+ "2.3) Drag mouse out of the area of the unfurled list, at the same time hold the X coordinate of the mouse position about the same",
+ "2.4) To make sure, that when the Y coordinate of the mouse position higher of the upper bound of the list then scrolling UP of the list and selected item changes on the upper. If not, the test failed",
+ "2.5) To make sure, that when the Y coordinate of the mouse position under of the lower bound of the list then scrolling DOWN of the list and selected item changes on the lower. If not, the test failed",
+ "-----------------------------------",
+ "3.1) Click on the multiple list",
+ "3.2) Press the left button of the mouse and keep on any item of the list, for example 5",
+ "3.3) Drag mouse out of the area of the unfurled list, at the same time hold the X coordinate of the mouse position about the same",
+ "3.4) To make sure, that when the Y coordinate of the mouse position higher of the upper bound of the list then scrolling of the list NO OCCURED and selected item NO CHANGES on the upper. If not, the test failed",
+ "3.5) To make sure, that when the Y coordinate of the mouse position under of the lower bound of the list then scrolling of the list NO OCCURED and selected item NO CHANGES on the lower. If not, the test failed",
+ "4) Test passed."
+ };
+ Sysout.createDialogWithInstructions( instructions );
+ }
+
+ }//End init()
+
+ public void start ()
+ {
+ setSize (400,100);
+ setVisible(true);
+ validate();
+
+ }// start()
+
+}// class ManualYesNoTest
+
+/****************************************************
+ Standard Test Machinery
+ DO NOT modify anything below -- it's a standard
+ chunk of code whose purpose is to make user
+ interaction uniform, and thereby make it simpler
+ to read and understand someone else's test.
+ ****************************************************/
+
+/**
+ This is part of the standard test machinery.
+ It creates a dialog (with the instructions), and is the interface
+ for sending text messages to the user.
+ To print the instructions, send an array of strings to Sysout.createDialog
+ WithInstructions method. Put one line of instructions per array entry.
+ To display a message for the tester to see, simply call Sysout.println
+ with the string to be displayed.
+ This mimics System.out.println but works within the test harness as well
+ as standalone.
+ */
+
+class Sysout
+{
+ private static TestDialog dialog;
+
+ public static void createDialogWithInstructions( String[] instructions )
+ {
+ dialog = new TestDialog( new Frame(), "Instructions" );
+ dialog.printInstructions( instructions );
+ dialog.setVisible(true);
+ println( "Any messages for the tester will display here." );
+ }
+
+ public static void createDialog( )
+ {
+ dialog = new TestDialog( new Frame(), "Instructions" );
+ String[] defInstr = { "Instructions will appear here. ", "" } ;
+ dialog.printInstructions( defInstr );
+ dialog.setVisible(true);
+ println( "Any messages for the tester will display here." );
+ }
+
+
+ public static void printInstructions( String[] instructions )
+ {
+ dialog.printInstructions( instructions );
+ }
+
+
+ public static void println( String messageIn )
+ {
+ dialog.displayMessage( messageIn );
+ }
+
+}// Sysout class
+
+/**
+ This is part of the standard test machinery. It provides a place for the
+ test instructions to be displayed, and a place for interactive messages
+ to the user to be displayed.
+ To have the test instructions displayed, see Sysout.
+ To have a message to the user be displayed, see Sysout.
+ Do not call anything in this dialog directly.
+ */
+class TestDialog extends Dialog
+{
+
+ TextArea instructionsText;
+ TextArea messageText;
+ int maxStringLength = 80;
+
+ //DO NOT call this directly, go through Sysout
+ public TestDialog( Frame frame, String name )
+ {
+ super( frame, name );
+ int scrollBoth = TextArea.SCROLLBARS_BOTH;
+ instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth );
+ add( "North", instructionsText );
+
+ messageText = new TextArea( "", 5, maxStringLength, scrollBoth );
+ add("Center", messageText);
+
+ pack();
+
+ setVisible(true);
+ }// TestDialog()
+
+ //DO NOT call this directly, go through Sysout
+ public void printInstructions( String[] instructions )
+ {
+ //Clear out any current instructions
+ instructionsText.setText( "" );
+
+ //Go down array of instruction strings
+
+ String printStr, remainingStr;
+ for( int i=0; i < instructions.length; i++ )
+ {
+ //chop up each into pieces maxSringLength long
+ remainingStr = instructions[ i ];
+ while( remainingStr.length() > 0 )
+ {
+ //if longer than max then chop off first max chars to print
+ if( remainingStr.length() >= maxStringLength )
+ {
+ //Try to chop on a word boundary
+ int posOfSpace = remainingStr.
+ lastIndexOf( ' ', maxStringLength - 1 );
+
+ if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1;
+
+ printStr = remainingStr.substring( 0, posOfSpace + 1 );
+ remainingStr = remainingStr.substring( posOfSpace + 1 );
+ }
+ //else just print
+ else
+ {
+ printStr = remainingStr;
+ remainingStr = "";
+ }
+
+ instructionsText.append( printStr + "\n" );
+
+ }// while
+
+ }// for
+
+ }//printInstructions()
+
+ //DO NOT call this directly, go through Sysout
+ public void displayMessage( String messageIn )
+ {
+ messageText.append( messageIn + "\n" );
+ System.out.println(messageIn);
+ }
+
+}// TestDialog class
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/Modal/ModalDialogMultiscreenTest/ModalDialogMultiscreenTest.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,441 @@
+/*
+ * Copyright (c) 2013, 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 6430802 8008379
+ @summary WM should not hang after show()/close()
+ @author anthony.petrov@sun.com: area=awt.modal
+ @run main/manual ModalDialogMultiscreenTest
+*/
+
+
+/**
+ * ModalDialogMultiscreenTest.java
+ *
+ * summary: Tests whether a WM will hang on show()/close() a modal dialog in multiscreen mode
+ */
+
+import java.awt.*;
+import java.awt.event.*;
+import javax.swing.*;
+
+
+public class ModalDialogMultiscreenTest
+{
+
+ private static class ButtonActionListener implements ActionListener {
+ JFrame frame;
+ JDialog dialog;
+ public ButtonActionListener(JFrame frame, JDialog dialog) {
+ this.frame = frame;
+ this.dialog = dialog;
+ }
+ public void actionPerformed(ActionEvent e) {
+ dialog.setLocationRelativeTo(frame);
+ dialog.setVisible(true);
+ }
+ }
+ public static class TestDialog extends JDialog {
+ public TestDialog(Frame owner, String title, boolean modal, GraphicsConfiguration gc) {
+ super(owner, title, modal, gc);
+ setSize(200, 100);
+ JButton button = new JButton("Close");
+ button.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ dispose();
+ }
+ });
+ getContentPane().add(button);
+ }
+ }
+
+ private static void init()
+ {
+ GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
+ GraphicsDevice[] gs = ge.getScreenDevices();
+
+ Sysout.createDialog( );
+
+ if (gs.length < 2) {
+ System.out.println("Not multi-head environment, test not valid!");
+ ModalDialogMultiscreenTest.pass( );
+ }
+
+ String[] instructions =
+ {
+ "The test should be run on a multi-head X (non-xinerama) systems.",
+ "Otherwise click the Pass button right now.",
+ "You will see an open Frame on each screen your system has.",
+ "The frame has an 'Open dialog' button.",
+ "Clicking the button opens a modal dialog with a Close button.",
+ "The test procedure:",
+ "1. Open a dialog and close it with appropriate buttons.",
+ "2. Switch to another screen ($ DISPLAY=X.Y xprop)",
+ "3. Repeat steps 1-2 several times (about 3*<number-of-screens>)",
+ "If the test doesn't cause the window manager to hang, it's passed."
+ };
+ Sysout.printInstructions( instructions );
+
+
+ for (int i = 0; i < gs.length; i++) {
+ JFrame frame = new JFrame("Frame "+i,gs[i].getDefaultConfiguration());
+ JButton button = new JButton("Open Dialog");
+ button.setMinimumSize(new Dimension(200, 100));
+ button.setPreferredSize(new Dimension(200, 100));
+ button.setSize(new Dimension(200, 100));
+ button.addActionListener(new ButtonActionListener(frame, new TestDialog(frame, "Dialog #"+i, true, gs[i].getDefaultConfiguration())));
+ frame.getContentPane().add(button);
+ frame.pack();
+ frame.setVisible(true);
+ }
+
+ }//End init()
+
+
+ //ap203012: NO MORE CHANGES BELOW THIS LINE
+
+
+
+ /*****************************************************
+ * Standard Test Machinery Section
+ * DO NOT modify anything in this section -- it's a
+ * standard chunk of code which has all of the
+ * synchronisation necessary for the test harness.
+ * By keeping it the same in all tests, it is easier
+ * to read and understand someone else's test, as
+ * well as insuring that all tests behave correctly
+ * with the test harness.
+ * There is a section following this for test-defined
+ * classes
+ ******************************************************/
+ private static boolean theTestPassed = false;
+ private static boolean testGeneratedInterrupt = false;
+ private static String failureMessage = "";
+
+ private static Thread mainThread = null;
+
+ private static int sleepTime = 300000;
+
+ public static void main( String args[] ) throws InterruptedException
+ {
+ mainThread = Thread.currentThread();
+ try
+ {
+ init();
+ }
+ catch( TestPassedException e )
+ {
+ //The test passed, so just return from main and harness will
+ // interepret this return as a pass
+ return;
+ }
+ //At this point, neither test passed nor test failed has been
+ // called -- either would have thrown an exception and ended the
+ // test, so we know we have multiple threads.
+
+ //Test involves other threads, so sleep and wait for them to
+ // called pass() or fail()
+ try
+ {
+ Thread.sleep( sleepTime );
+ //Timed out, so fail the test
+ throw new RuntimeException( "Timed out after " + sleepTime/1000 + " seconds" );
+ }
+ catch (InterruptedException e)
+ {
+ if( ! testGeneratedInterrupt ) throw e;
+
+ //reset flag in case hit this code more than once for some reason (just safety)
+ testGeneratedInterrupt = false;
+ if ( theTestPassed == false )
+ {
+ throw new RuntimeException( failureMessage );
+ }
+ }
+
+ }//main
+
+ public static synchronized void setTimeoutTo( int seconds )
+ {
+ sleepTime = seconds * 1000;
+ }
+
+ public static synchronized void pass()
+ {
+ Sysout.println( "The test passed." );
+ Sysout.println( "The test is over, hit Ctl-C to stop Java VM" );
+ //first check if this is executing in main thread
+ if ( mainThread == Thread.currentThread() )
+ {
+ //Still in the main thread, so set the flag just for kicks,
+ // and throw a test passed exception which will be caught
+ // and end the test.
+ theTestPassed = true;
+ throw new TestPassedException();
+ }
+ //pass was called from a different thread, so set the flag and interrupt
+ // the main thead.
+ theTestPassed = true;
+ testGeneratedInterrupt = true;
+ mainThread.interrupt();
+ }//pass()
+
+ public static synchronized void fail()
+ {
+ //test writer didn't specify why test failed, so give generic
+ fail( "it just plain failed! :-)" );
+ }
+
+ public static synchronized void fail( String whyFailed )
+ {
+ Sysout.println( "The test failed: " + whyFailed );
+ Sysout.println( "The test is over, hit Ctl-C to stop Java VM" );
+ //check if this called from main thread
+ if ( mainThread == Thread.currentThread() )
+ {
+ //If main thread, fail now 'cause not sleeping
+ throw new RuntimeException( whyFailed );
+ }
+ theTestPassed = false;
+ testGeneratedInterrupt = true;
+ failureMessage = whyFailed;
+ mainThread.interrupt();
+ }//fail()
+
+}// class ModalDialogMultiscreenTest
+
+//This exception is used to exit from any level of call nesting
+// when it's determined that the test has passed, and immediately
+// end the test.
+class TestPassedException extends RuntimeException
+{
+}
+
+//*********** End Standard Test Machinery Section **********
+
+
+//************ Begin classes defined for the test ****************
+
+// make listeners in a class defined here, and instantiate them in init()
+
+/* Example of a class which may be written as part of a test
+class NewClass implements anInterface
+ {
+ static int newVar = 0;
+
+ public void eventDispatched(AWTEvent e)
+ {
+ //Counting events to see if we get enough
+ eventCount++;
+
+ if( eventCount == 20 )
+ {
+ //got enough events, so pass
+
+ ModalDialogMultiscreenTest.pass();
+ }
+ else if( tries == 20 )
+ {
+ //tried too many times without getting enough events so fail
+
+ ModalDialogMultiscreenTest.fail();
+ }
+
+ }// eventDispatched()
+
+ }// NewClass class
+
+*/
+
+
+//************** End classes defined for the test *******************
+
+
+
+
+/****************************************************
+ Standard Test Machinery
+ DO NOT modify anything below -- it's a standard
+ chunk of code whose purpose is to make user
+ interaction uniform, and thereby make it simpler
+ to read and understand someone else's test.
+ ****************************************************/
+
+/**
+ This is part of the standard test machinery.
+ It creates a dialog (with the instructions), and is the interface
+ for sending text messages to the user.
+ To print the instructions, send an array of strings to Sysout.createDialog
+ WithInstructions method. Put one line of instructions per array entry.
+ To display a message for the tester to see, simply call Sysout.println
+ with the string to be displayed.
+ This mimics System.out.println but works within the test harness as well
+ as standalone.
+ */
+
+class Sysout
+{
+ private static TestDialog dialog;
+
+ public static void createDialogWithInstructions( String[] instructions )
+ {
+ dialog = new TestDialog( new Frame(), "Instructions" );
+ dialog.printInstructions( instructions );
+ dialog.setVisible(true);
+ println( "Any messages for the tester will display here." );
+ }
+
+ public static void createDialog( )
+ {
+ dialog = new TestDialog( new Frame(), "Instructions" );
+ String[] defInstr = { "Instructions will appear here. ", "" } ;
+ dialog.printInstructions( defInstr );
+ dialog.setVisible(true);
+ println( "Any messages for the tester will display here." );
+ }
+
+
+ public static void printInstructions( String[] instructions )
+ {
+ dialog.printInstructions( instructions );
+ }
+
+
+ public static void println( String messageIn )
+ {
+ dialog.displayMessage( messageIn );
+ }
+
+}// Sysout class
+
+/**
+ This is part of the standard test machinery. It provides a place for the
+ test instructions to be displayed, and a place for interactive messages
+ to the user to be displayed.
+ To have the test instructions displayed, see Sysout.
+ To have a message to the user be displayed, see Sysout.
+ Do not call anything in this dialog directly.
+ */
+class TestDialog extends Dialog implements ActionListener
+{
+
+ TextArea instructionsText;
+ TextArea messageText;
+ int maxStringLength = 80;
+ Panel buttonP = new Panel();
+ Button passB = new Button( "pass" );
+ Button failB = new Button( "fail" );
+
+ //DO NOT call this directly, go through Sysout
+ public TestDialog( Frame frame, String name )
+ {
+ super( frame, name );
+ int scrollBoth = TextArea.SCROLLBARS_BOTH;
+ instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth );
+ add( "North", instructionsText );
+
+ messageText = new TextArea( "", 5, maxStringLength, scrollBoth );
+ add("Center", messageText);
+
+ passB = new Button( "pass" );
+ passB.setActionCommand( "pass" );
+ passB.addActionListener( this );
+ buttonP.add( "East", passB );
+
+ failB = new Button( "fail" );
+ failB.setActionCommand( "fail" );
+ failB.addActionListener( this );
+ buttonP.add( "West", failB );
+
+ add( "South", buttonP );
+ pack();
+
+ setVisible(true);
+ }// TestDialog()
+
+ //DO NOT call this directly, go through Sysout
+ public void printInstructions( String[] instructions )
+ {
+ //Clear out any current instructions
+ instructionsText.setText( "" );
+
+ //Go down array of instruction strings
+
+ String printStr, remainingStr;
+ for( int i=0; i < instructions.length; i++ )
+ {
+ //chop up each into pieces maxSringLength long
+ remainingStr = instructions[ i ];
+ while( remainingStr.length() > 0 )
+ {
+ //if longer than max then chop off first max chars to print
+ if( remainingStr.length() >= maxStringLength )
+ {
+ //Try to chop on a word boundary
+ int posOfSpace = remainingStr.
+ lastIndexOf( ' ', maxStringLength - 1 );
+
+ if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1;
+
+ printStr = remainingStr.substring( 0, posOfSpace + 1 );
+ remainingStr = remainingStr.substring( posOfSpace + 1 );
+ }
+ //else just print
+ else
+ {
+ printStr = remainingStr;
+ remainingStr = "";
+ }
+
+ instructionsText.append( printStr + "\n" );
+
+ }// while
+
+ }// for
+
+ }//printInstructions()
+
+ //DO NOT call this directly, go through Sysout
+ public void displayMessage( String messageIn )
+ {
+ messageText.append( messageIn + "\n" );
+ System.out.println(messageIn);
+ }
+
+ //catch presses of the passed and failed buttons.
+ //simply call the standard pass() or fail() static methods of
+ //ModalDialogMultiscreenTest
+ public void actionPerformed( ActionEvent e )
+ {
+ if( e.getActionCommand() == "pass" )
+ {
+ ModalDialogMultiscreenTest.pass();
+ }
+ else
+ {
+ ModalDialogMultiscreenTest.fail();
+ }
+ }
+
+}// TestDialog class
--- a/jdk/test/java/awt/Modal/WsDisabledStyle/Winkey/Winkey.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/java/awt/Modal/WsDisabledStyle/Winkey/Winkey.java Tue Mar 12 18:12:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, 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
@@ -22,8 +22,8 @@
*/
/*
- @test %I% %E%
- @bug 6572263 6571808
+ @test
+ @bug 6572263 6571808 8005920
@summary PIT:FileDialog minimized to taskbar(through 'Show Desktop')selecting the fileDialog using windowList
@author dmitry.cherepanov: area=awt.modal
@run main/manual Winkey
@@ -48,12 +48,14 @@
String[] instructions =
{
+ " 0. This test is for MS Windows only, if you use other OS, press \"pass\" button.",
" 1. there is a frame with a 'show modal' button, ",
" 2. press the button to show a modal dialog, ",
" 3. the modal dialog will be shown over the frame, ",
" 4. please verify that all (5.1, 5.2.1, 5.2.2) the following tests pass: ",
" ",
" 5.1. press combination Windows Key and M key to minimize all windows, ",
+ " note that the modal dialog and modal blocked windows are NOT minimized",
" 5.2. press combination Windows Key and D key to show desktop, ",
" 5.2.1. restore the dialog by choosing this one in the ALT-TAB list, ",
" 5.2.2. restore the dialog by mouse click on taskbar (on java or any other item)",
--- a/jdk/test/java/beans/Introspector/Test7192955.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/java/beans/Introspector/Test7192955.java Tue Mar 12 18:12:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, 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
@@ -23,17 +23,20 @@
/*
* @test
- * @bug 7192955
+ * @bug 7192955 8000183
* @summary Tests that all properties are bound
* @author Sergey Malenkov
*/
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
import java.beans.PropertyChangeListener;
+import java.beans.PropertyDescriptor;
import java.util.List;
public class Test7192955 {
- public static void main(String[] args) {
+ public static void main(String[] args) throws IntrospectionException {
if (!BeanUtils.findPropertyDescriptor(MyBean.class, "test").isBound()) {
throw new Error("a simple property is not bound");
}
@@ -43,6 +46,12 @@
if (!BeanUtils.findPropertyDescriptor(MyBean.class, "readOnly").isBound()) {
throw new Error("a read-only property is not bound");
}
+ PropertyDescriptor[] pds = Introspector.getBeanInfo(MyBean.class, BaseBean.class).getPropertyDescriptors();
+ for (PropertyDescriptor pd : pds) {
+ if (pd.getName().equals("test") && pd.isBound()) {
+ throw new Error("a simple property is bound without superclass");
+ }
+ }
}
public static class BaseBean {
--- a/jdk/test/java/lang/PrimitiveSumMinMaxTest.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/java/lang/PrimitiveSumMinMaxTest.java Tue Mar 12 18:12:44 2013 -0700
@@ -50,20 +50,20 @@
BinaryOperator<Boolean> xor = Boolean::logicalXor;
Comparator<Boolean> cmp = Boolean::compare;
- assertTrue(and.operate(true, true));
- assertFalse(and.operate(true, false));
- assertFalse(and.operate(false, true));
- assertFalse(and.operate(false, false));
+ assertTrue(and.apply(true, true));
+ assertFalse(and.apply(true, false));
+ assertFalse(and.apply(false, true));
+ assertFalse(and.apply(false, false));
- assertTrue(or.operate(true, true));
- assertTrue(or.operate(true, false));
- assertTrue(or.operate(false, true));
- assertFalse(or.operate(false, false));
+ assertTrue(or.apply(true, true));
+ assertTrue(or.apply(true, false));
+ assertTrue(or.apply(false, true));
+ assertFalse(or.apply(false, false));
- assertFalse(xor.operate(true, true));
- assertTrue(xor.operate(true, false));
- assertTrue(xor.operate(false, true));
- assertFalse(xor.operate(false, false));
+ assertFalse(xor.apply(true, true));
+ assertTrue(xor.apply(true, false));
+ assertTrue(xor.apply(false, true));
+ assertFalse(xor.apply(false, false));
assertEquals(Boolean.TRUE.compareTo(Boolean.TRUE), cmp.compare(true, true));
assertEquals(Boolean.TRUE.compareTo(Boolean.FALSE), cmp.compare(true, false));
@@ -83,12 +83,12 @@
int[] numbers = { -1, 0, 1, 100, Integer.MAX_VALUE, Integer.MIN_VALUE };
for (int i : numbers) {
for (int j : numbers) {
- assertEquals(i+j, (int) sum1.operate(i, j));
- assertEquals(i+j, sum2.operateAsInt(i, j));
- assertEquals(Math.max(i,j), (int) max1.operate(i, j));
- assertEquals(Math.max(i,j), max2.operateAsInt(i, j));
- assertEquals(Math.min(i,j), (int) min1.operate(i, j));
- assertEquals(Math.min(i,j), min2.operateAsInt(i, j));
+ assertEquals(i+j, (int) sum1.apply(i, j));
+ assertEquals(i+j, sum2.applyAsInt(i, j));
+ assertEquals(Math.max(i,j), (int) max1.apply(i, j));
+ assertEquals(Math.max(i,j), max2.applyAsInt(i, j));
+ assertEquals(Math.min(i,j), (int) min1.apply(i, j));
+ assertEquals(Math.min(i,j), min2.applyAsInt(i, j));
assertEquals(((Integer) i).compareTo(j), cmp.compare(i, j));
}
}
@@ -106,12 +106,12 @@
long[] numbers = { -1, 0, 1, 100, Long.MAX_VALUE, Long.MIN_VALUE };
for (long i : numbers) {
for (long j : numbers) {
- assertEquals(i+j, (long) sum1.operate(i, j));
- assertEquals(i+j, sum2.operateAsLong(i, j));
- assertEquals(Math.max(i,j), (long) max1.operate(i, j));
- assertEquals(Math.max(i,j), max2.operateAsLong(i, j));
- assertEquals(Math.min(i,j), (long) min1.operate(i, j));
- assertEquals(Math.min(i,j), min2.operateAsLong(i, j));
+ assertEquals(i+j, (long) sum1.apply(i, j));
+ assertEquals(i+j, sum2.applyAsLong(i, j));
+ assertEquals(Math.max(i,j), (long) max1.apply(i, j));
+ assertEquals(Math.max(i,j), max2.applyAsLong(i, j));
+ assertEquals(Math.min(i,j), (long) min1.apply(i, j));
+ assertEquals(Math.min(i,j), min2.applyAsLong(i, j));
assertEquals(((Long) i).compareTo(j), cmp.compare(i, j));
}
}
@@ -126,9 +126,9 @@
float[] numbers = { -1, 0, 1, 100, Float.MAX_VALUE, Float.MIN_VALUE };
for (float i : numbers) {
for (float j : numbers) {
- assertEquals(i+j, (float) sum1.operate(i, j));
- assertEquals(Math.max(i,j), (float) max1.operate(i, j));
- assertEquals(Math.min(i,j), (float) min1.operate(i, j));
+ assertEquals(i+j, (float) sum1.apply(i, j));
+ assertEquals(Math.max(i,j), (float) max1.apply(i, j));
+ assertEquals(Math.min(i,j), (float) min1.apply(i, j));
assertEquals(((Float) i).compareTo(j), cmp.compare(i, j));
}
}
@@ -146,12 +146,12 @@
double[] numbers = { -1, 0, 1, 100, Double.MAX_VALUE, Double.MIN_VALUE };
for (double i : numbers) {
for (double j : numbers) {
- assertEquals(i+j, (double) sum1.operate(i, j));
- assertEquals(i+j, sum2.operateAsDouble(i, j));
- assertEquals(Math.max(i,j), (double) max1.operate(i, j));
- assertEquals(Math.max(i,j), max2.operateAsDouble(i, j));
- assertEquals(Math.min(i,j), (double) min1.operate(i, j));
- assertEquals(Math.min(i,j), min2.operateAsDouble(i, j));
+ assertEquals(i+j, (double) sum1.apply(i, j));
+ assertEquals(i+j, sum2.applyAsDouble(i, j));
+ assertEquals(Math.max(i,j), (double) max1.apply(i, j));
+ assertEquals(Math.max(i,j), max2.applyAsDouble(i, j));
+ assertEquals(Math.min(i,j), (double) min1.apply(i, j));
+ assertEquals(Math.min(i,j), min2.applyAsDouble(i, j));
assertEquals(((Double) i).compareTo(j), cmp.compare(i, j));
}
}
--- a/jdk/test/java/lang/SecurityManager/NoAWT.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/java/lang/SecurityManager/NoAWT.java Tue Mar 12 18:12:44 2013 -0700
@@ -22,14 +22,43 @@
*/
/* @test
- * @bug 8004502
+ * @bug 8004502 8008793
* @summary Sanity check that SecurityManager methods that check AWTPermission
* behave as expected when AWT is not present
*/
+import java.security.AllPermission;
+import java.security.Permission;
+
public class NoAWT {
+
+ static class MySecurityManager extends SecurityManager {
+ Class<?> expectedClass;
+
+ void setExpectedPermissionClass(Class<?> c) {
+ expectedClass = c;
+ }
+
+ @Override
+ public void checkPermission(Permission perm) {
+ if (perm.getClass() != expectedClass)
+ throw new RuntimeException("Got: " + perm.getClass() + ", expected: " + expectedClass);
+ super.checkPermission(perm);
+ }
+ }
+
public static void main(String[] args) {
- SecurityManager sm = new SecurityManager();
+ Class<?> awtPermissionClass = null;
+ try {
+ awtPermissionClass = Class.forName("java.awt.AWTPermission");
+ } catch (ClassNotFoundException ignore) { }
+
+ MySecurityManager sm = new MySecurityManager();
+ if (awtPermissionClass != null) {
+ sm.setExpectedPermissionClass(awtPermissionClass);
+ } else {
+ sm.setExpectedPermissionClass(AllPermission.class);
+ }
try {
sm.checkAwtEventQueueAccess();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/instrument/RedefineMethodInBacktrace.sh Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,87 @@
+#
+# Copyright (c) 2013, 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 7174978
+# @summary Redefine a class with a method stored in a backtrace.
+# @author Stefan Karlsson
+#
+# @run shell MakeJAR3.sh RedefineMethodInBacktraceAgent 'Can-Redefine-Classes: true'
+# @run build RedefineMethodInBacktraceTarget RedefineMethodInBacktraceApp
+# @run shell RedefineMethodInBacktrace.sh
+#
+
+if [ "${TESTJAVA}" = "" ]
+then
+ echo "TESTJAVA not set. Test cannot execute. Failed."
+ exit 1
+fi
+
+if [ "${COMPILEJAVA}" = "" ]
+then
+ COMPILEJAVA="${TESTJAVA}"
+fi
+echo "COMPILEJAVA=${COMPILEJAVA}"
+
+if [ "${TESTSRC}" = "" ]
+then
+ echo "TESTSRC not set. Test cannot execute. Failed."
+ exit 1
+fi
+
+if [ "${TESTCLASSES}" = "" ]
+then
+ echo "TESTCLASSES not set. Test cannot execute. Failed."
+ exit 1
+fi
+
+JAVAC="${COMPILEJAVA}"/bin/javac
+JAVA="${TESTJAVA}"/bin/java
+
+cp "${TESTSRC}"/RedefineMethodInBacktraceTarget_2.java \
+ RedefineMethodInBacktraceTarget.java
+"${JAVAC}" ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . RedefineMethodInBacktraceTarget.java
+
+"${JAVA}" ${TESTVMOPTS} -javaagent:RedefineMethodInBacktraceAgent.jar \
+ -classpath "${TESTCLASSES}" RedefineMethodInBacktraceApp > output.log 2>&1
+RUN_RESULT=$?
+
+if [ $RUN_RESULT != 0 ]; then
+ echo "FAIL: the run failed with exit code '$RUN_RESULT'"
+ exit $RUN_RESULT
+fi
+
+cat output.log
+
+MESG="Exception"
+grep "$MESG" output.log
+result=$?
+if [ "$result" = 0 ]; then
+ echo "FAIL: found '$MESG' in the test output"
+ result=1
+else
+ echo "PASS: did NOT find '$MESG' in the test output"
+ result=0
+fi
+
+exit $result
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/instrument/RedefineMethodInBacktraceAgent.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+
+import java.lang.instrument.Instrumentation;
+
+public class RedefineMethodInBacktraceAgent {
+ private static Instrumentation instrumentation;
+
+ private RedefineMethodInBacktraceAgent() {}
+
+ public static void premain(String agentArgs, Instrumentation inst) {
+ System.out.println("Hello from RedefineMethodInBacktraceAgent!");
+ System.out.println("isRedefineClassesSupported()=" +
+ inst.isRedefineClassesSupported());
+
+ instrumentation = inst;
+ }
+
+ public static Instrumentation getInstrumentation() {
+ return instrumentation;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/instrument/RedefineMethodInBacktraceApp.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.lang.instrument.ClassDefinition;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/**
+ * When an exception is thrown, the JVM collects just enough information
+ * about the stack trace to be able to create a full fledged stack trace
+ * (StackTraceElement[]). The backtrace contains this information and the
+ * JVM must make sure that the data in the backtrace is still usable after
+ * a class redefinition.
+ *
+ * After the PermGen removal there was a bug when the last reference to a Method
+ * was in the backtrace. The class of the method was kept alive, because of the
+ * mirror stored in the backtrace, but the old versions of the redefined method
+ * could be freed, since class redefinition didn't know about the backtraces.
+ */
+public class RedefineMethodInBacktraceApp {
+ public static void main(String args[]) throws Exception {
+ System.out.println("Hello from RedefineMethodInBacktraceApp!");
+
+ new RedefineMethodInBacktraceApp().doTest();
+
+ System.exit(0);
+ }
+
+ private void doTest() throws Exception {
+ doMethodInBacktraceTest();
+ }
+
+ private void doMethodInBacktraceTest() throws Exception {
+ Throwable t = getThrowableFromMethodToRedefine();
+
+ doRedefine(RedefineMethodInBacktraceTarget.class);
+
+ doClassUnloading();
+
+ touchRedefinedMethodInBacktrace(t);
+ }
+
+ private static Throwable getThrowableFromMethodToRedefine() throws Exception {
+ Class<RedefineMethodInBacktraceTarget> c =
+ RedefineMethodInBacktraceTarget.class;
+ Method method = c.getMethod("methodToRedefine");
+
+ Throwable thrownFromMethodToRedefine = null;
+ try {
+ method.invoke(null);
+ } catch (InvocationTargetException e) {
+ thrownFromMethodToRedefine = e.getCause();
+ if (!(thrownFromMethodToRedefine instanceof RuntimeException)) {
+ throw e;
+ }
+ }
+ method = null;
+ c = null;
+
+ return thrownFromMethodToRedefine;
+ }
+
+ private static void doClassUnloading() {
+ // This will clean out old, unused redefined methods.
+ System.gc();
+ }
+
+ private static void touchRedefinedMethodInBacktrace(Throwable throwable) {
+ // Make sure that we can convert the backtrace, which is referring to
+ // the redefined method, to a StrackTraceElement[] without crashing.
+ throwable.getStackTrace();
+ }
+
+ private static void doRedefine(Class<?> clazz) throws Exception {
+ // Load the second version of this class.
+ File f = new File(clazz.getName() + ".class");
+ System.out.println("Reading test class from " + f.getAbsolutePath());
+ InputStream redefineStream = new FileInputStream(f);
+
+ byte[] redefineBuffer = NamedBuffer.loadBufferFromStream(redefineStream);
+
+ ClassDefinition redefineParamBlock = new ClassDefinition(
+ clazz, redefineBuffer);
+
+ RedefineMethodInBacktraceAgent.getInstrumentation().redefineClasses(
+ new ClassDefinition[] {redefineParamBlock});
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/instrument/RedefineMethodInBacktraceTarget.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+
+/**
+ * The first version of this class. The second version is in
+ * RedefineMethodInBacktraceTarget_2.java.
+ */
+public class RedefineMethodInBacktraceTarget {
+ public static void methodToRedefine() {
+ throw new RuntimeException("Test exception");
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/instrument/RedefineMethodInBacktraceTarget_2.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+
+/**
+ * This is the second version of this class. The first version is in
+ * RedefineMethodInBacktraceTarget.java.
+ */
+public class RedefineMethodInBacktraceTarget {
+ public static void methodToRedefine() {
+ throw new RuntimeException("Test exception 2");
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/instrument/RedefineMethodWithAnnotations.sh Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,85 @@
+#
+# Copyright (c) 2013, 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 7022100
+# @summary Method annotations are incorrectly set when redefining classes.
+# @author Stefan Karlsson
+#
+# @run shell MakeJAR3.sh RedefineMethodWithAnnotationsAgent 'Can-Redefine-Classes: true'
+# @run build RedefineMethodWithAnnotationsTarget RedefineMethodWithAnnotationsApp RedefineMethodWithAnnotationsAnnotations
+# @run shell RedefineMethodWithAnnotations.sh
+#
+
+if [ "${TESTJAVA}" = "" ]
+then
+ echo "TESTJAVA not set. Test cannot execute. Failed."
+ exit 1
+fi
+
+if [ "${COMPILEJAVA}" = "" ]
+then
+ COMPILEJAVA="${TESTJAVA}"
+fi
+echo "COMPILEJAVA=${COMPILEJAVA}"
+
+if [ "${TESTSRC}" = "" ]
+then
+ echo "TESTSRC not set. Test cannot execute. Failed."
+ exit 1
+fi
+
+if [ "${TESTCLASSES}" = "" ]
+then
+ echo "TESTCLASSES not set. Test cannot execute. Failed."
+ exit 1
+fi
+
+JAVAC="${COMPILEJAVA}"/bin/javac
+JAVA="${TESTJAVA}"/bin/java
+
+cp "${TESTSRC}"/RedefineMethodWithAnnotationsTarget_2.java \
+ RedefineMethodWithAnnotationsTarget.java
+cp "${TESTSRC}"/RedefineMethodWithAnnotationsAnnotations.java \
+ RedefineMethodWithAnnotationsAnnotations.java
+
+"${JAVAC}" ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . \
+ RedefineMethodWithAnnotationsTarget.java \
+ RedefineMethodWithAnnotationsAnnotations.java
+
+"${JAVA}" ${TESTVMOPTS} -javaagent:RedefineMethodWithAnnotationsAgent.jar \
+ -cp "${TESTCLASSES}" RedefineMethodWithAnnotationsApp > output.log 2>&1
+cat output.log
+
+MESG="Exception"
+grep "$MESG" output.log
+result=$?
+if [ "$result" = 0 ]; then
+ echo "FAIL: found '$MESG' in the test output"
+ result=1
+else
+ echo "PASS: did NOT find '$MESG' in the test output"
+ result=0
+fi
+
+exit $result
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsAgent.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+
+import java.lang.instrument.Instrumentation;
+
+public class RedefineMethodWithAnnotationsAgent {
+ private static Instrumentation instrumentation;
+
+ private RedefineMethodWithAnnotationsAgent() {}
+
+ public static void premain(String agentArgs, Instrumentation inst) {
+ System.out.println("Hello from RedefineMethodWithAnnotationsAgent!");
+ System.out.println("isRedefineClassesSupported()=" +
+ inst.isRedefineClassesSupported());
+
+ instrumentation = inst;
+ }
+
+ public static Instrumentation getInstrumentation() {
+ return instrumentation;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsAnnotations.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+@interface ParameterAnnotation {
+ // Values used for the annotations in the first version of the target class.
+ static final String STRING_VALUE_1 = "String1";
+ static final String INT_VALUE_1 = "Int1";
+
+ // Values used for the annotations in the second version of the target class.
+ static final String STRING_VALUE_2 = "String2";
+ static final String INT_VALUE_2 = "Int2";
+
+ String value();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsApp.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.lang.instrument.ClassDefinition;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.reflect.Method;
+
+public class RedefineMethodWithAnnotationsApp {
+ public static void main(String args[]) throws Exception {
+ System.out.println("Hello from RedefineMethodWithAnnotationsApp!");
+
+ new RedefineMethodWithAnnotationsApp().doTest();
+
+ System.exit(0);
+ }
+
+ private void doTest() throws Exception {
+ doMethodParameterAnnotationsTest();
+ }
+
+ private void doMethodParameterAnnotationsTest() throws Exception {
+ verifyMethodParameterAnnotationsValue(
+ ParameterAnnotation.STRING_VALUE_1);
+
+ doRedefine(RedefineMethodWithAnnotationsTarget.class);
+
+ verifyMethodParameterAnnotationsValue(
+ ParameterAnnotation.STRING_VALUE_2);
+ }
+
+ private static void verifyMethodParameterAnnotationsValue(
+ String expectedValue) throws Exception {
+ Class<RedefineMethodWithAnnotationsTarget> c =
+ RedefineMethodWithAnnotationsTarget.class;
+ Method method = c.getMethod("annotatedMethod", String.class);
+
+ Annotation [][] parametersAnnotations =
+ method.getParameterAnnotations();
+ if (parametersAnnotations.length != 1) {
+ throw new Exception("Incorrect number of parameters to method: " +
+ method.getName() + "." +
+ " Expected: 1," +
+ " got: " + parametersAnnotations.length);
+ }
+
+ Annotation[] parameterAnnotations = parametersAnnotations[0];
+ if (parameterAnnotations.length != 1) {
+ throw new Exception("Incorrect number of annotations." +
+ " Expected: 1" +
+ ", got " + parameterAnnotations.length);
+ }
+
+ Annotation parameterAnnotation = parameterAnnotations[0];
+ if (!(parameterAnnotation instanceof ParameterAnnotation)) {
+ throw new Exception("Incorrect Annotation class." +
+ " Expected: " + ParameterAnnotation.class.getName() +
+ ", got: " + parameterAnnotation.getClass().getName());
+ }
+
+ ParameterAnnotation pa = (ParameterAnnotation)parameterAnnotation;
+ String annotationValue = pa.value();
+ if (!expectedValue.equals(annotationValue)) {
+ throw new Exception("Incorrect parameter annotation value." +
+ " Expected: " + expectedValue +
+ ", got: " + annotationValue);
+ }
+ }
+
+ private static void doRedefine(Class<?> clazz) throws Exception {
+ // Load the second version of this class.
+ File f = new File(clazz.getName() + ".class");
+ System.out.println("Reading test class from " + f);
+ InputStream redefineStream = new FileInputStream(f);
+
+ byte[] redefineBuffer = NamedBuffer.loadBufferFromStream(redefineStream);
+
+ ClassDefinition redefineParamBlock = new ClassDefinition(
+ clazz, redefineBuffer);
+
+ RedefineMethodWithAnnotationsAgent.getInstrumentation().redefineClasses(
+ new ClassDefinition[] {redefineParamBlock});
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsTarget.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+
+/**
+ * The first version of this class. The second version is in
+ * RedefineMethodWithAnnotationsTarget_2.java.
+ */
+public class RedefineMethodWithAnnotationsTarget {
+ public void annotatedMethod(@ParameterAnnotation(
+ value = ParameterAnnotation.STRING_VALUE_1) String parameter) { }
+ public void annotatedMethod(@ParameterAnnotation(
+ value = ParameterAnnotation.INT_VALUE_1) int parameter) { }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsTarget_2.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+
+/**
+ * This is the second version of this class. The first version is in
+ * RedefineMethodWithAnnotationsTarget.java.
+ * <p>
+ * It has the same methods but with different annotations and order.
+ */
+public class RedefineMethodWithAnnotationsTarget {
+ public void annotatedMethod(@ParameterAnnotation(
+ value = ParameterAnnotation.INT_VALUE_2) int parameter) { }
+ public void annotatedMethod(@ParameterAnnotation(
+ value = ParameterAnnotation.STRING_VALUE_2) String parameter) { }
+}
--- a/jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh Tue Mar 12 18:12:44 2013 -0700
@@ -141,32 +141,30 @@
fi
PASS1_MESG="before any redefines"
-cnt=`grep "$PASS1_MESG" output.log | grep 'version-0' | wc -l | sed 's/^ *//'`
-case "$cnt" in
-2)
+cnt=`grep "$PASS1_MESG" output.log | grep 'version-0' | wc -l`
+# no quotes around $cnt so any whitespace from 'wc -l' is ignored
+if [ $cnt = 2 ]; then
echo "INFO: found 2 version-0 '$PASS1_MESG' mesgs."
- ;;
-*)
+else
echo "FAIL: did NOT find 2 version-0 '$PASS1_MESG' mesgs."
+ echo "INFO: cnt='$cnt'"
echo "INFO: grep '$PASS1_MESG' output:"
grep "$PASS1_MESG" output.log
result=1
- ;;
-esac
+fi
PASS2_MESG="after redefine"
-cnt=`grep "$PASS2_MESG" output.log | grep 'version-1' | wc -l | sed 's/^ *//'`
-case "$cnt" in
-2)
+cnt=`grep "$PASS2_MESG" output.log | grep 'version-1' | wc -l`
+# no quotes around $cnt so any whitespace from 'wc -l' is ignored
+if [ $cnt = 2 ]; then
echo "INFO: found 2 version-1 '$PASS2_MESG' mesgs."
- ;;
-*)
+else
echo "FAIL: did NOT find 2 version-1 '$PASS2_MESG' mesgs."
+ echo "INFO: cnt='$cnt'"
echo "INFO: grep '$PASS2_MESG' output:"
grep "$PASS2_MESG" output.log
result=1
- ;;
-esac
+fi
if [ "$result" = 0 ]; then
echo "PASS: test passed both positive and negative output checks."
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/invoke/7087570/Test7087570.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,326 @@
+/*
+ * Copyright (c) 2013, 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 7087570
+ * @summary REF_invokeSpecial DMHs (which are unusual) get marked explicitly; tweak the MHI to use this bit
+ *
+ * @run main Test7087570
+ */
+
+import java.lang.invoke.*;
+import java.lang.reflect.*;
+import java.util.*;
+
+import static java.lang.invoke.MethodHandles.*;
+import static java.lang.invoke.MethodType.*;
+
+public class Test7087570 {
+ // XXX may remove the following constant declarations when MethodHandleInfo is made public
+ private static final int
+ REF_getField = 1,
+ REF_getStatic = 2,
+ REF_putField = 3,
+ REF_putStatic = 4,
+ REF_invokeVirtual = 5,
+ REF_invokeStatic = 6,
+ REF_invokeSpecial = 7,
+ REF_newInvokeSpecial = 8,
+ REF_invokeInterface = 9,
+ REF_LIMIT = 10;
+
+ private static final TestMethodData[] TESTS = new TestMethodData[] {
+ // field accessors
+ data(DummyFieldHolder.class, "instanceField", getterMethodType(String.class), DummyFieldHolder.class, REF_getField),
+ data(DummyFieldHolder.class, "instanceField", setterMethodType(String.class), DummyFieldHolder.class, REF_putField),
+ data(DummyFieldHolder.class, "staticField", getterMethodType(Integer.class), DummyFieldHolder.class, REF_getStatic),
+ data(DummyFieldHolder.class, "staticField", setterMethodType(Integer.class), DummyFieldHolder.class, REF_putStatic),
+ data(DummyFieldHolder.class, "instanceByteField", getterMethodType(byte.class), DummyFieldHolder.class, REF_getField),
+ data(DummyFieldHolder.class, "instanceByteField", setterMethodType(byte.class), DummyFieldHolder.class, REF_putField),
+
+ // REF_invokeVirtual
+ data(Object.class, "hashCode", methodType(int.class), Object.class, REF_invokeVirtual),
+
+ // REF_invokeVirtual strength-reduced to REF_invokeSpecial,
+ // test if it normalizes back to REF_invokeVirtual in MethodHandleInfo as expected
+ data(String.class, "hashCode", methodType(int.class), String.class, REF_invokeVirtual),
+
+ // REF_invokeStatic
+ data(Collections.class, "sort", methodType(void.class, List.class), Collections.class, REF_invokeStatic),
+ data(Arrays.class, "asList", methodType(List.class, Object[].class), Arrays.class, REF_invokeStatic), // varargs case
+
+ // REF_invokeSpecial
+ data(Object.class, "hashCode", methodType(int.class), Object.class, REF_invokeSpecial),
+
+ // REF_newInvokeSpecial
+ data(String.class, "<init>", methodType(void.class, char[].class), String.class, REF_newInvokeSpecial),
+ data(DummyFieldHolder.class, "<init>", methodType(void.class, byte.class, Long[].class), DummyFieldHolder.class, REF_newInvokeSpecial), // varargs case
+
+ // REF_invokeInterface
+ data(List.class, "size", methodType(int.class), List.class, REF_invokeInterface)
+ };
+
+ public static void main(String... args) throws Throwable {
+ testWithLookup();
+ testWithUnreflect();
+ }
+
+ private static void doTest(MethodHandle mh, TestMethodData testMethod) {
+ Object mhi = newMethodHandleInfo(mh);
+
+ System.out.printf("%s.%s: %s, nominal refKind: %s, actual refKind: %s\n",
+ testMethod.clazz.getName(), testMethod.name, testMethod.methodType,
+ REF_KIND_NAMES[testMethod.referenceKind],
+ REF_KIND_NAMES[getReferenceKind(mhi)]);
+ assertEquals(testMethod.name, getName(mhi));
+ assertEquals(testMethod.methodType, getMethodType(mhi));
+ assertEquals(testMethod.declaringClass, getDeclaringClass(mhi));
+ assertEquals(testMethod.referenceKind == REF_invokeSpecial, isInvokeSpecial(mh));
+ assertRefKindEquals(testMethod.referenceKind, getReferenceKind(mhi));
+ }
+
+ private static void testWithLookup() throws Throwable {
+ for (TestMethodData testMethod : TESTS) {
+ MethodHandle mh = lookupFrom(testMethod);
+ doTest(mh, testMethod);
+ }
+ }
+
+ private static void testWithUnreflect() throws Throwable {
+ for (TestMethodData testMethod : TESTS) {
+ MethodHandle mh = unreflectFrom(testMethod);
+ doTest(mh, testMethod);
+ }
+ }
+
+ private static MethodType getterMethodType(Class<?> clazz) {
+ return methodType(clazz);
+ }
+
+ private static MethodType setterMethodType(Class<?> clazz) {
+ return methodType(void.class, clazz);
+ }
+
+ private static final String[] REF_KIND_NAMES = {
+ "MH::invokeBasic",
+ "REF_getField", "REF_getStatic", "REF_putField", "REF_putStatic",
+ "REF_invokeVirtual", "REF_invokeStatic", "REF_invokeSpecial",
+ "REF_newInvokeSpecial", "REF_invokeInterface"
+ };
+
+ private static final Lookup LOOKUP = lookup();
+
+ // XXX may remove the following reflective logic when MethodHandleInfo is made public
+ private static final MethodHandle MH_IS_INVOKESPECIAL;
+ private static final MethodHandle MHI_CONSTRUCTOR;
+ private static final MethodHandle MHI_GET_NAME;
+ private static final MethodHandle MHI_GET_METHOD_TYPE;
+ private static final MethodHandle MHI_GET_DECLARING_CLASS;
+ private static final MethodHandle MHI_GET_REFERENCE_KIND;
+
+ static {
+ try {
+ // This is white box testing. Use reflection to grab private implementation bits.
+ String magicName = "IMPL_LOOKUP";
+ Field magicLookup = MethodHandles.Lookup.class.getDeclaredField(magicName);
+ // This unit test will fail if a security manager is installed.
+ magicLookup.setAccessible(true);
+ // Forbidden fruit...
+ Lookup directInvokeLookup = (Lookup) magicLookup.get(null);
+ Class<?> mhiClass = Class.forName("java.lang.invoke.MethodHandleInfo", false, MethodHandle.class.getClassLoader());
+ MH_IS_INVOKESPECIAL = directInvokeLookup
+ .findVirtual(MethodHandle.class, "isInvokeSpecial", methodType(boolean.class));
+ MHI_CONSTRUCTOR = directInvokeLookup
+ .findConstructor(mhiClass, methodType(void.class, MethodHandle.class));
+ MHI_GET_NAME = directInvokeLookup
+ .findVirtual(mhiClass, "getName", methodType(String.class));
+ MHI_GET_METHOD_TYPE = directInvokeLookup
+ .findVirtual(mhiClass, "getMethodType", methodType(MethodType.class));
+ MHI_GET_DECLARING_CLASS = directInvokeLookup
+ .findVirtual(mhiClass, "getDeclaringClass", methodType(Class.class));
+ MHI_GET_REFERENCE_KIND = directInvokeLookup
+ .findVirtual(mhiClass, "getReferenceKind", methodType(int.class));
+ } catch (ReflectiveOperationException ex) {
+ throw new Error(ex);
+ }
+ }
+
+ private static class TestMethodData {
+ final Class<?> clazz;
+ final String name;
+ final MethodType methodType;
+ final Class<?> declaringClass;
+ final int referenceKind; // the nominal refKind
+
+ public TestMethodData(Class<?> clazz, String name,
+ MethodType methodType, Class<?> declaringClass,
+ int referenceKind) {
+ this.clazz = clazz;
+ this.name = name;
+ this.methodType = methodType;
+ this.declaringClass = declaringClass;
+ this.referenceKind = referenceKind;
+ }
+ }
+
+ private static TestMethodData data(Class<?> clazz, String name,
+ MethodType methodType, Class<?> declaringClass,
+ int referenceKind) {
+ return new TestMethodData(clazz, name, methodType, declaringClass, referenceKind);
+ }
+
+ private static MethodHandle lookupFrom(TestMethodData testMethod)
+ throws NoSuchMethodException, NoSuchFieldException, IllegalAccessException {
+ switch (testMethod.referenceKind) {
+ case REF_getField:
+ return LOOKUP.findGetter(testMethod.clazz, testMethod.name, testMethod.methodType.returnType());
+ case REF_putField:
+ return LOOKUP.findSetter(testMethod.clazz, testMethod.name, testMethod.methodType.parameterType(0));
+ case REF_getStatic:
+ return LOOKUP.findStaticGetter(testMethod.clazz, testMethod.name, testMethod.methodType.returnType());
+ case REF_putStatic:
+ return LOOKUP.findStaticSetter(testMethod.clazz, testMethod.name, testMethod.methodType.parameterType(0));
+ case REF_invokeVirtual:
+ case REF_invokeInterface:
+ return LOOKUP.findVirtual(testMethod.clazz, testMethod.name, testMethod.methodType);
+ case REF_invokeStatic:
+ return LOOKUP.findStatic(testMethod.clazz, testMethod.name, testMethod.methodType);
+ case REF_invokeSpecial:
+ Class<?> thisClass = LOOKUP.lookupClass();
+ return LOOKUP.findSpecial(testMethod.clazz, testMethod.name, testMethod.methodType, thisClass);
+ case REF_newInvokeSpecial:
+ return LOOKUP.findConstructor(testMethod.clazz, testMethod.methodType);
+ default:
+ throw new Error("ERROR: unexpected referenceKind in test data");
+ }
+ }
+
+ private static MethodHandle unreflectFrom(TestMethodData testMethod)
+ throws NoSuchMethodException, NoSuchFieldException, IllegalAccessException {
+ switch (testMethod.referenceKind) {
+ case REF_getField:
+ case REF_getStatic: {
+ Field f = testMethod.clazz.getDeclaredField(testMethod.name);
+ return LOOKUP.unreflectGetter(f);
+ }
+ case REF_putField:
+ case REF_putStatic: {
+ Field f = testMethod.clazz.getDeclaredField(testMethod.name);
+ return LOOKUP.unreflectSetter(f);
+ }
+ case REF_invokeVirtual:
+ case REF_invokeStatic:
+ case REF_invokeInterface: {
+ Method m = testMethod.clazz.getDeclaredMethod(testMethod.name, testMethod.methodType.parameterArray());
+ return LOOKUP.unreflect(m);
+ }
+ case REF_invokeSpecial: {
+ Method m = testMethod.clazz.getDeclaredMethod(testMethod.name, testMethod.methodType.parameterArray());
+ Class<?> thisClass = LOOKUP.lookupClass();
+ return LOOKUP.unreflectSpecial(m, thisClass);
+ }
+ case REF_newInvokeSpecial: {
+ Constructor c = testMethod.clazz.getDeclaredConstructor(testMethod.methodType.parameterArray());
+ return LOOKUP.unreflectConstructor(c);
+ }
+ default:
+ throw new Error("ERROR: unexpected referenceKind in test data");
+ }
+ }
+
+ private static Object newMethodHandleInfo(MethodHandle mh) {
+ try {
+ return MHI_CONSTRUCTOR.invoke(mh);
+ } catch (Throwable ex) {
+ throw new Error(ex);
+ }
+ }
+
+ private static boolean isInvokeSpecial(MethodHandle mh) {
+ try {
+ return (boolean) MH_IS_INVOKESPECIAL.invokeExact(mh);
+ } catch (Throwable ex) {
+ throw new Error(ex);
+ }
+ }
+
+ private static String getName(Object mhi) {
+ try {
+ return (String) MHI_GET_NAME.invoke(mhi);
+ } catch (Throwable ex) {
+ throw new Error(ex);
+ }
+ }
+
+ private static MethodType getMethodType(Object mhi) {
+ try {
+ return (MethodType) MHI_GET_METHOD_TYPE.invoke(mhi);
+ } catch (Throwable ex) {
+ throw new Error(ex);
+ }
+ }
+
+ private static Class<?> getDeclaringClass(Object mhi) {
+ try {
+ return (Class<?>) MHI_GET_DECLARING_CLASS.invoke(mhi);
+ } catch (Throwable ex) {
+ throw new Error(ex);
+ }
+ }
+
+ private static int getReferenceKind(Object mhi) {
+ try {
+ return (int) MHI_GET_REFERENCE_KIND.invoke(mhi);
+ } catch (Throwable ex) {
+ throw new Error(ex);
+ }
+ }
+
+ private static void assertRefKindEquals(int expect, int observed) {
+ if (expect == observed) return;
+
+ String msg = "expected " + REF_KIND_NAMES[(int) expect] +
+ " but observed " + REF_KIND_NAMES[(int) observed];
+ System.out.println("FAILED: " + msg);
+ throw new AssertionError(msg);
+ }
+
+ private static void assertEquals(Object expect, Object observed) {
+ if (java.util.Objects.equals(expect, observed)) return;
+
+ String msg = "expected " + expect + " but observed " + observed;
+ System.out.println("FAILED: " + msg);
+ throw new AssertionError(msg);
+ }
+}
+
+class DummyFieldHolder {
+ public static Integer staticField;
+ public String instanceField;
+ public byte instanceByteField;
+
+ public DummyFieldHolder(byte unused1, Long... unused2) {
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/invoke/lambda/LUtils.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,171 @@
+/*
+ * Copyright (c) 2012, 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.
+ */
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/*
+ * support infrastructure to invoke a java class from the command line
+ */
+class LUtils {
+ static final sun.tools.jar.Main jarTool =
+ new sun.tools.jar.Main(System.out, System.err, "jar-tool");
+ static final com.sun.tools.javac.Main javac =
+ new com.sun.tools.javac.Main();
+ static final File cwd = new File(".").getAbsoluteFile();
+ static final String JAVAHOME = System.getProperty("java.home");
+ static final boolean isWindows =
+ System.getProperty("os.name", "unknown").startsWith("Windows");
+ //static final boolean isSDK = JAVAHOME.endsWith("jre");
+ static final File JAVA_BIN_FILE = new File(JAVAHOME, "bin");
+ static final File JAVA_CMD = new File(JAVA_BIN_FILE,
+ isWindows ? "java.exe" : "java");
+
+ protected LUtils() {
+ }
+
+ public static void compile(String... args) {
+ if (javac.compile(args) != 0) {
+ throw new RuntimeException("compilation fails");
+ }
+ }
+
+ static void createFile(File outFile, List<String> content) {
+ try {
+ Files.write(outFile.getAbsoluteFile().toPath(), content,
+ Charset.defaultCharset());
+ } catch (IOException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+
+ static File getClassFile(File javaFile) {
+ return javaFile.getName().endsWith(".java")
+ ? new File(javaFile.getName().replace(".java", ".class"))
+ : null;
+ }
+
+ static String getSimpleName(File inFile) {
+ String fname = inFile.getName();
+ return fname.substring(0, fname.indexOf("."));
+ }
+
+ static TestResult doExec(String... cmds) {
+ return doExec(null, null, cmds);
+ }
+
+ /*
+ * A method which executes a java cmd and returns the results in a container
+ */
+ static TestResult doExec(Map<String, String> envToSet,
+ java.util.Set<String> envToRemove, String... cmds) {
+ String cmdStr = "";
+ for (String x : cmds) {
+ cmdStr = cmdStr.concat(x + " ");
+ }
+ ProcessBuilder pb = new ProcessBuilder(cmds);
+ Map<String, String> env = pb.environment();
+ if (envToRemove != null) {
+ for (String key : envToRemove) {
+ env.remove(key);
+ }
+ }
+ if (envToSet != null) {
+ env.putAll(envToSet);
+ }
+ BufferedReader rdr = null;
+ try {
+ List<String> outputList = new ArrayList<>();
+ pb.redirectErrorStream(true);
+ Process p = pb.start();
+ rdr = new BufferedReader(new InputStreamReader(p.getInputStream()));
+ String in = rdr.readLine();
+ while (in != null) {
+ outputList.add(in);
+ in = rdr.readLine();
+ }
+ p.waitFor();
+ p.destroy();
+
+ return new TestResult(cmdStr, p.exitValue(), outputList,
+ env, new Throwable("current stack of the test"));
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ throw new RuntimeException(ex.getMessage());
+ }
+ }
+
+ static class TestResult {
+ String cmd;
+ int exitValue;
+ List<String> testOutput;
+ Map<String, String> env;
+ Throwable t;
+
+ public TestResult(String str, int rv, List<String> oList,
+ Map<String, String> env, Throwable t) {
+ cmd = str;
+ exitValue = rv;
+ testOutput = oList;
+ this.env = env;
+ this.t = t;
+ }
+
+ void assertZero(String message) {
+ if (exitValue != 0) {
+ System.err.println(this);
+ throw new RuntimeException(message);
+ }
+ }
+
+ @Override
+ public String toString() {
+ StringWriter sw = new StringWriter();
+ PrintWriter status = new PrintWriter(sw);
+ status.println("Cmd: " + cmd);
+ status.println("Return code: " + exitValue);
+ status.println("Environment variable:");
+ for (String x : env.keySet()) {
+ status.println("\t" + x + "=" + env.get(x));
+ }
+ status.println("Output:");
+ for (String x : testOutput) {
+ status.println("\t" + x);
+ }
+ status.println("Exception:");
+ status.println(t.getMessage());
+ t.printStackTrace(status);
+
+ return sw.getBuffer().toString();
+ }
+ }
+}
--- a/jdk/test/java/lang/invoke/lambda/LambdaAccessControlDoPrivilegedTest.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/java/lang/invoke/lambda/LambdaAccessControlDoPrivilegedTest.java Tue Mar 12 18:12:44 2013 -0700
@@ -26,20 +26,12 @@
* @bug 8003881
* @summary tests DoPrivileged action (implemented as lambda expressions) by
* inserting them into the BootClassPath.
- * @compile -XDignore.symbol.file LambdaAccessControlDoPrivilegedTest.java
+ * @compile -XDignore.symbol.file LambdaAccessControlDoPrivilegedTest.java LUtils.java
* @run main/othervm LambdaAccessControlDoPrivilegedTest
*/
-import java.io.BufferedReader;
import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.nio.charset.Charset;
-import java.nio.file.Files;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
public class LambdaAccessControlDoPrivilegedTest extends LUtils {
public static void main(String... args) {
@@ -87,140 +79,3 @@
jarFile.delete();
}
}
-
-/*
- * support infrastructure to invoke a java class from the command line
- */
-class LUtils {
- static final sun.tools.jar.Main jarTool =
- new sun.tools.jar.Main(System.out, System.err, "jar-tool");
- static final com.sun.tools.javac.Main javac =
- new com.sun.tools.javac.Main();
- static final File cwd = new File(".").getAbsoluteFile();
- static final String JAVAHOME = System.getProperty("java.home");
- static final boolean isWindows =
- System.getProperty("os.name", "unknown").startsWith("Windows");
- //static final boolean isSDK = JAVAHOME.endsWith("jre");
- static final File JAVA_BIN_FILE = new File(JAVAHOME, "bin");
- static final File JAVA_CMD = new File(JAVA_BIN_FILE,
- isWindows ? "java.exe" : "java");
-
- protected LUtils() {
- }
-
- public static void compile(String... args) {
- if (javac.compile(args) != 0) {
- throw new RuntimeException("compilation fails");
- }
- }
-
- static void createFile(File outFile, List<String> content) {
- try {
- Files.write(outFile.getAbsoluteFile().toPath(), content,
- Charset.defaultCharset());
- } catch (IOException ex) {
- throw new RuntimeException(ex);
- }
- }
-
- static File getClassFile(File javaFile) {
- return javaFile.getName().endsWith(".java")
- ? new File(javaFile.getName().replace(".java", ".class"))
- : null;
- }
-
- static String getSimpleName(File inFile) {
- String fname = inFile.getName();
- return fname.substring(0, fname.indexOf("."));
- }
-
- static TestResult doExec(String... cmds) {
- return doExec(null, null, cmds);
- }
-
- /*
- * A method which executes a java cmd and returns the results in a container
- */
- static TestResult doExec(Map<String, String> envToSet,
- java.util.Set<String> envToRemove, String... cmds) {
- String cmdStr = "";
- for (String x : cmds) {
- cmdStr = cmdStr.concat(x + " ");
- }
- ProcessBuilder pb = new ProcessBuilder(cmds);
- Map<String, String> env = pb.environment();
- if (envToRemove != null) {
- for (String key : envToRemove) {
- env.remove(key);
- }
- }
- if (envToSet != null) {
- env.putAll(envToSet);
- }
- BufferedReader rdr = null;
- try {
- List<String> outputList = new ArrayList<>();
- pb.redirectErrorStream(true);
- Process p = pb.start();
- rdr = new BufferedReader(new InputStreamReader(p.getInputStream()));
- String in = rdr.readLine();
- while (in != null) {
- outputList.add(in);
- in = rdr.readLine();
- }
- p.waitFor();
- p.destroy();
-
- return new TestResult(cmdStr, p.exitValue(), outputList,
- env, new Throwable("current stack of the test"));
- } catch (Exception ex) {
- ex.printStackTrace();
- throw new RuntimeException(ex.getMessage());
- }
- }
-
- static class TestResult {
- String cmd;
- int exitValue;
- List<String> testOutput;
- Map<String, String> env;
- Throwable t;
-
- public TestResult(String str, int rv, List<String> oList,
- Map<String, String> env, Throwable t) {
- cmd = str;
- exitValue = rv;
- testOutput = oList;
- this.env = env;
- this.t = t;
- }
-
- void assertZero(String message) {
- if (exitValue != 0) {
- System.err.println(this);
- throw new RuntimeException(message);
- }
- }
-
- @Override
- public String toString() {
- StringWriter sw = new StringWriter();
- PrintWriter status = new PrintWriter(sw);
- status.println("Cmd: " + cmd);
- status.println("Return code: " + exitValue);
- status.println("Environment variable:");
- for (String x : env.keySet()) {
- status.println("\t" + x + "=" + env.get(x));
- }
- status.println("Output:");
- for (String x : testOutput) {
- status.println("\t" + x);
- }
- status.println("Exception:");
- status.println(t.getMessage());
- t.printStackTrace(status);
-
- return sw.getBuffer().toString();
- }
- }
-}
--- a/jdk/test/java/lang/invoke/lambda/LambdaAccessControlTest.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/java/lang/invoke/lambda/LambdaAccessControlTest.java Tue Mar 12 18:12:44 2013 -0700
@@ -25,7 +25,7 @@
* @test
* @bug 8003881
* @summary tests Lambda expression with a a security manager at top level
- * @compile -XDignore.symbol.file LambdaAccessControlTest.java
+ * @compile -XDignore.symbol.file LambdaAccessControlTest.java LUtils.java
*
* @run main/othervm LambdaAccessControlTest
*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/invoke/lambda/LambdaClassLoaderSerialization.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2013, 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 8004970
+@summary Lambda serialization in the presence of class loaders
+@author Peter Levart
+*/
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.Arrays;
+
+public class LambdaClassLoaderSerialization {
+
+ public interface SerializableRunnable extends Runnable, Serializable {}
+
+ public static class MyCode implements SerializableRunnable {
+
+ private byte[] serialize(Object o) {
+ ByteArrayOutputStream baos;
+ try (
+ ObjectOutputStream oos =
+ new ObjectOutputStream(baos = new ByteArrayOutputStream())
+ ) {
+ oos.writeObject(o);
+ }
+ catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ return baos.toByteArray();
+ }
+
+ private <T> T deserialize(byte[] bytes) {
+ try (
+ ObjectInputStream ois =
+ new ObjectInputStream(new ByteArrayInputStream(bytes))
+ ) {
+ return (T) ois.readObject();
+ }
+ catch (IOException | ClassNotFoundException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ public void run() {
+ System.out.println(" this: " + this);
+
+ SerializableRunnable deSerializedThis = deserialize(serialize(this));
+ System.out.println(" deSerializedThis: " + deSerializedThis);
+
+ SerializableRunnable runnable = () -> {System.out.println("HELLO");};
+ System.out.println(" runnable: " + runnable);
+
+ SerializableRunnable deSerializedRunnable = deserialize(serialize(runnable));
+ System.out.println("deSerializedRunnable: " + deSerializedRunnable);
+ }
+ }
+
+ public static void main(String[] args) throws Exception {
+ ClassLoader myCl = new MyClassLoader(
+ LambdaClassLoaderSerialization.class.getClassLoader()
+ );
+ Class<?> myCodeClass = Class.forName(
+ LambdaClassLoaderSerialization.class.getName() + "$MyCode",
+ true,
+ myCl
+ );
+ Runnable myCode = (Runnable) myCodeClass.newInstance();
+ myCode.run();
+ }
+
+ static class MyClassLoader extends ClassLoader {
+ MyClassLoader(ClassLoader parent) {
+ super(parent);
+ }
+
+ @Override
+ protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+ if (name.indexOf('.') < 0) {
+ synchronized (getClassLoadingLock(name)) {
+ Class<?> c = findLoadedClass(name);
+ if (c == null) {
+ c = findClass(name);
+ }
+ if (resolve) {
+ resolveClass(c);
+ }
+ return c;
+ }
+ } else {
+ return super.loadClass(name, resolve);
+ }
+ }
+
+ @Override
+ protected Class<?> findClass(String name) throws ClassNotFoundException {
+ String path = name.replace('.', '/').concat(".class");
+ try (InputStream is = getResourceAsStream(path)) {
+ if (is != null) {
+ byte[] bytes = readFully(is);
+ return defineClass(name, bytes, 0, bytes.length);
+ } else {
+ throw new ClassNotFoundException(name);
+ }
+ }
+ catch (IOException e) {
+ throw new ClassNotFoundException(name, e);
+ }
+ }
+
+ static byte[] readFully(InputStream is) throws IOException {
+ byte[] output = {};
+ int pos = 0;
+ while (true) {
+ int bytesToRead;
+ if (pos >= output.length) { // Only expand when there's no room
+ bytesToRead = output.length + 1024;
+ if (output.length < pos + bytesToRead) {
+ output = Arrays.copyOf(output, pos + bytesToRead);
+ }
+ } else {
+ bytesToRead = output.length - pos;
+ }
+ int cc = is.read(output, pos, bytesToRead);
+ if (cc < 0) {
+ if (output.length != pos) {
+ output = Arrays.copyOf(output, pos);
+ }
+ break;
+ }
+ pos += cc;
+ }
+ return output;
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/invoke/lambda/LambdaSerialization.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2013, 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 8004970
+@summary Lambda serialization
+*/
+
+import java.io.*;
+
+public class LambdaSerialization {
+
+ static int assertionCount = 0;
+
+ static void assertTrue(boolean cond) {
+ assertionCount++;
+ if (!cond)
+ throw new AssertionError();
+ }
+
+ public static void main(String[] args) throws Exception {
+ try {
+ // Write lambdas out
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream(baos);
+
+ write(out, z -> "[" + z + "]" );
+ write(out, z -> z + z );
+ write(out, z -> "blah" );
+ out.flush();
+ out.close();
+
+ // Read them back
+ ByteArrayInputStream bais =
+ new ByteArrayInputStream(baos.toByteArray());
+ ObjectInputStream in = new ObjectInputStream(bais);
+ readAssert(in, "[X]");
+ readAssert(in, "XX");
+ readAssert(in, "blah");
+ in.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ throw e;
+ }
+ assertTrue(assertionCount == 3);
+ }
+
+ static void write(ObjectOutput out, LSI lamb) throws IOException {
+ out.writeObject(lamb);
+ }
+
+ static void readAssert(ObjectInputStream in, String expected) throws IOException, ClassNotFoundException {
+ LSI ls = (LSI) in.readObject();
+ String result = ls.convert("X");
+ System.out.printf("Result: %s\n", result);
+ assertTrue(result.equals(expected));
+ }
+}
+
+interface LSI extends Serializable {
+ String convert(String x);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/reflect/OldenCompilingWithDefaults.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2013, 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 8009267
+ * @summary Verify uses of isAnnotationPresent compile under older source versions
+ * @compile -source 1.5 -target 1.5 OldenCompilingWithDefaults.java
+ * @compile -source 1.6 -target 1.6 OldenCompilingWithDefaults.java
+ * @compile -source 1.7 -target 1.7 OldenCompilingWithDefaults.java
+ * @compile OldenCompilingWithDefaults.java
+ */
+
+import java.lang.reflect.*;
+
+public class OldenCompilingWithDefaults {
+ public OldenCompilingWithDefaults(){}
+ static Object f;
+
+ public static void main(String... args) throws Exception {
+ Class<OldenCompilingWithDefaults> clazz = OldenCompilingWithDefaults.class;
+ Package pkg = clazz.getPackage();
+ Constructor<OldenCompilingWithDefaults> ctor = clazz.getConstructor();
+ Method m = clazz.getMethod("main", String[].class);
+ Field f = clazz.getField("f");
+
+ if(clazz.isAnnotationPresent(SuppressWarnings.class) ||
+ pkg.isAnnotationPresent(SuppressWarnings.class) ||
+ ctor.isAnnotationPresent(SuppressWarnings.class) ||
+ m.isAnnotationPresent(SuppressWarnings.class) ||
+ f.isAnnotationPresent(SuppressWarnings.class))
+ System.out.println("An annotation is present.");
+ }
+}
--- a/jdk/test/java/lang/reflect/Parameter/WithParameters.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/java/lang/reflect/Parameter/WithParameters.java Tue Mar 12 18:12:44 2013 -0700
@@ -22,7 +22,6 @@
*/
/*
- * @ignore
* @test
* @compile -parameters WithParameters.java
* @run main WithParameters
@@ -85,8 +84,8 @@
error++;
}
}
- if(parameters[0].toString().equals("int quux")) {
- System.err.println("toString for quux is wrong");
+ if(!parameters[0].toString().equals("final int quux")) {
+ System.err.println("toString for quux is wrong, expected \"final int quux\", got \"" + parameters[0] + "\"");
error++;
}
if(parameters[0].getModifiers() != Modifier.FINAL) {
@@ -101,8 +100,8 @@
System.err.println("getParameterizedType for quux is wrong");
error++;
}
- if(parameters[1].toString().equals("WithParameters$Foo quuux")) {
- System.err.println("toString for quuux is wrong");
+ if(!parameters[1].toString().equals("WithParameters$Foo quuux")) {
+ System.err.println("toString for quuux is wrong, expected \"WithParameters$Foo quuux\", got \"" + parameters[1] + "\"");
error++;
}
if(parameters[1].isVarArgs()) {
@@ -121,8 +120,8 @@
System.err.println("getAnnotations has the wrong annotation");
error++;
}
- if(parameters[2].toString().equals("java.util.List<?> quuux")) {
- System.err.println("toString for l is wrong");
+ if(!parameters[2].toString().equals("java.util.List<?> l")) {
+ System.err.println("toString for l is wrong, expected \"java.util.List<?> l\", got \"" + parameters[2] + "\"");
error++;
}
if(parameters[2].isVarArgs()) {
@@ -149,8 +148,8 @@
error++;
}
}
- if(parameters[3].toString().equals("java.util.List<WithParameters$Foo> l")) {
- System.err.println("toString for l2 is wrong");
+ if(!parameters[3].toString().equals("java.util.List<WithParameters$Foo> l2")) {
+ System.err.println("toString for l2 is wrong, expected \"java.util.List<WithParameters$Foo> l2\", got \"" + parameters[3] + "\"");
error++;
}
if(parameters[3].isVarArgs()) {
@@ -177,8 +176,8 @@
error++;
}
}
- if(parameters[4].toString().equals("java.util.List<? extends WithParameters$Foo> l")) {
- System.err.println("toString for l3 is wrong");
+ if(!parameters[4].toString().equals("java.util.List<? extends WithParameters$Foo> l3")) {
+ System.err.println("toString for l3 is wrong, expected \"java.util.List<? extends WithParameters$Foo> l3\", got \"" + parameters[3] + "\"");
error++;
}
if(parameters[4].isVarArgs()) {
@@ -212,8 +211,8 @@
}
}
}
- if(parameters[5].toString().equals("java.lang.String... rest")) {
- System.err.println("toString for l is wrong");
+ if(!parameters[5].toString().equals("java.lang.String... rest")) {
+ System.err.println("toString for rest is wrong, expected \"java.lang.String... rest\", got \"" + parameters[5] + "\"");
error++;
}
if(!parameters[5].isVarArgs()) {
--- a/jdk/test/java/net/BindException/Test.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/java/net/BindException/Test.java Tue Mar 12 18:12:44 2013 -0700
@@ -46,7 +46,7 @@
static int failures;
static void doTest(Object test[], InetAddress ia1, InetAddress ia2,
- boolean silent) {
+ boolean silent) throws Exception {
String s1_type = (String)test[0];
String s2_type = (String)test[1];
int port = 0;
@@ -64,11 +64,10 @@
boolean failed = false;
Exception failed_exc = null;
+ Socket sock1 = null;
+ ServerSocket ss = null;
+ DatagramSocket dsock1 = null;
try {
- Socket sock1, sock2;
- ServerSocket ss;
- DatagramSocket dsock1, dsock2;
-
/* bind the first socket */
if (s1_type.equals("Socket")) {
@@ -90,16 +89,18 @@
/* bind the second socket */
if (s2_type.equals("Socket")) {
- sock2 = new Socket();
- sock2.bind( new InetSocketAddress(ia2, port));
+ try (Socket sock2 = new Socket()) {
+ sock2.bind( new InetSocketAddress(ia2, port));
+ }
}
if (s2_type.equals("ServerSocket")) {
- ss = new ServerSocket(port, 0, ia2);
+ try (ServerSocket ss2 = new ServerSocket(port, 0, ia2)) { }
}
if (s2_type.equals("DatagramSocket")) {
- dsock2 = new DatagramSocket( new InetSocketAddress(ia2, port) );
+ try (DatagramSocket ds =
+ new DatagramSocket(new InetSocketAddress(ia2, port))) { }
}
} catch (BindException be) {
@@ -107,6 +108,10 @@
} catch (Exception e) {
failed = true;
failed_exc = e;
+ } finally {
+ if (sock1 != null) sock1.close();
+ if (ss != null) ss.close();
+ if (dsock1 != null) dsock1.close();
}
/*
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/net/Socket/HttpProxy.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,281 @@
+/*
+ * Copyright (c) 2010, 2013, 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 6370908
+ * @summary Add support for HTTP_CONNECT proxy in Socket class
+ */
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import static java.lang.System.out;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.ServerSocket;
+import java.net.Socket;
+import sun.net.www.MessageHeader;
+
+public class HttpProxy {
+ final String proxyHost;
+ final int proxyPort;
+ static final int SO_TIMEOUT = 15000;
+
+ public static void main(String[] args) throws Exception {
+ String host;
+ int port;
+ if (args.length == 0) {
+ // Start internal proxy
+ ConnectProxyTunnelServer proxy = new ConnectProxyTunnelServer();
+ proxy.start();
+ host = "localhost";
+ port = proxy.getLocalPort();
+ out.println("Running with internal proxy: " + host + ":" + port);
+ } else if (args.length == 2) {
+ host = args[0];
+ port = Integer.valueOf(args[1]);
+ out.println("Running against specified proxy server: " + host + ":" + port);
+ } else {
+ System.err.println("Usage: java HttpProxy [<proxy host> <proxy port>]");
+ return;
+ }
+
+ HttpProxy p = new HttpProxy(host, port);
+ p.test();
+ }
+
+ public HttpProxy(String proxyHost, int proxyPort) {
+ this.proxyHost = proxyHost;
+ this.proxyPort = proxyPort;
+ }
+
+ void test() throws Exception {
+ InetSocketAddress proxyAddress = new InetSocketAddress(proxyHost, proxyPort);
+ Proxy httpProxy = new Proxy(Proxy.Type.HTTP, proxyAddress);
+
+ try (ServerSocket ss = new ServerSocket(0);
+ Socket sock = new Socket(httpProxy)) {
+ sock.setSoTimeout(SO_TIMEOUT);
+ sock.setTcpNoDelay(false);
+
+ InetSocketAddress externalAddress =
+ new InetSocketAddress(InetAddress.getLocalHost(), ss.getLocalPort());
+
+ out.println("Trying to connect to server socket on " + externalAddress);
+ sock.connect(externalAddress);
+ try (Socket externalSock = ss.accept()) {
+ // perform some simple checks
+ check(sock.isBound(), "Socket is not bound");
+ check(sock.isConnected(), "Socket is not connected");
+ check(!sock.isClosed(), "Socket should not be closed");
+ check(sock.getSoTimeout() == SO_TIMEOUT,
+ "Socket should have a previously set timeout");
+ check(sock.getTcpNoDelay() == false, "NODELAY should be false");
+
+ simpleDataExchange(sock, externalSock);
+ }
+ }
+ }
+
+ static void check(boolean condition, String message) {
+ if (!condition) out.println(message);
+ }
+
+ static Exception unexpected(Exception e) {
+ out.println("Unexcepted Exception: " + e);
+ e.printStackTrace();
+ return e;
+ }
+
+ // performs a simple exchange of data between the two sockets
+ // and throws an exception if there is any problem.
+ void simpleDataExchange(Socket s1, Socket s2) throws Exception {
+ try (final InputStream i1 = s1.getInputStream();
+ final InputStream i2 = s2.getInputStream();
+ final OutputStream o1 = s1.getOutputStream();
+ final OutputStream o2 = s2.getOutputStream()) {
+ startSimpleWriter("simpleWriter1", o1, 100);
+ startSimpleWriter("simpleWriter2", o2, 200);
+ simpleRead(i2, 100);
+ simpleRead(i1, 200);
+ }
+ }
+
+ void startSimpleWriter(String threadName, final OutputStream os, final int start) {
+ (new Thread(new Runnable() {
+ public void run() {
+ try { simpleWrite(os, start); }
+ catch (Exception e) {unexpected(e); }
+ }}, threadName)).start();
+ }
+
+ void simpleWrite(OutputStream os, int start) throws Exception {
+ byte b[] = new byte[2];
+ for (int i=start; i<start+100; i++) {
+ b[0] = (byte) (i / 256);
+ b[1] = (byte) (i % 256);
+ os.write(b);
+ }
+ }
+
+ void simpleRead(InputStream is, int start) throws Exception {
+ byte b[] = new byte [2];
+ for (int i=start; i<start+100; i++) {
+ int x = is.read(b);
+ if (x == 1)
+ x += is.read(b,1,1);
+ if (x!=2)
+ throw new Exception("read error");
+ int r = bytes(b[0], b[1]);
+ if (r != i)
+ throw new Exception("read " + r + " expected " +i);
+ }
+ }
+
+ int bytes(byte b1, byte b2) {
+ int i1 = (int)b1 & 0xFF;
+ int i2 = (int)b2 & 0xFF;
+ return i1 * 256 + i2;
+ }
+
+ static class ConnectProxyTunnelServer extends Thread {
+
+ private final ServerSocket ss;
+
+ public ConnectProxyTunnelServer() throws IOException {
+ ss = new ServerSocket(0);
+ }
+
+ @Override
+ public void run() {
+ try (Socket clientSocket = ss.accept()) {
+ processRequest(clientSocket);
+ } catch (Exception e) {
+ out.println("Proxy Failed: " + e);
+ e.printStackTrace();
+ } finally {
+ try { ss.close(); } catch (IOException x) { unexpected(x); }
+ }
+ }
+
+ /**
+ * Returns the port on which the proxy is accepting connections.
+ */
+ public int getLocalPort() {
+ return ss.getLocalPort();
+ }
+
+ /*
+ * Processes the CONNECT request
+ */
+ private void processRequest(Socket clientSocket) throws Exception {
+ MessageHeader mheader = new MessageHeader(clientSocket.getInputStream());
+ String statusLine = mheader.getValue(0);
+
+ if (!statusLine.startsWith("CONNECT")) {
+ out.println("proxy server: processes only "
+ + "CONNECT method requests, recieved: "
+ + statusLine);
+ return;
+ }
+
+ // retrieve the host and port info from the status-line
+ InetSocketAddress serverAddr = getConnectInfo(statusLine);
+
+ //open socket to the server
+ try (Socket serverSocket = new Socket(serverAddr.getAddress(),
+ serverAddr.getPort())) {
+ Forwarder clientFW = new Forwarder(clientSocket.getInputStream(),
+ serverSocket.getOutputStream());
+ Thread clientForwarderThread = new Thread(clientFW, "ClientForwarder");
+ clientForwarderThread.start();
+ send200(clientSocket);
+ Forwarder serverFW = new Forwarder(serverSocket.getInputStream(),
+ clientSocket.getOutputStream());
+ serverFW.run();
+ clientForwarderThread.join();
+ }
+ }
+
+ private void send200(Socket clientSocket) throws IOException {
+ OutputStream out = clientSocket.getOutputStream();
+ PrintWriter pout = new PrintWriter(out);
+
+ pout.println("HTTP/1.1 200 OK");
+ pout.println();
+ pout.flush();
+ }
+
+ /*
+ * This method retrieves the hostname and port of the tunnel destination
+ * from the request line.
+ * @param connectStr
+ * of the form: <i>CONNECT server-name:server-port HTTP/1.x</i>
+ */
+ static InetSocketAddress getConnectInfo(String connectStr)
+ throws Exception
+ {
+ try {
+ int starti = connectStr.indexOf(' ');
+ int endi = connectStr.lastIndexOf(' ');
+ String connectInfo = connectStr.substring(starti+1, endi).trim();
+ // retrieve server name and port
+ endi = connectInfo.indexOf(':');
+ String name = connectInfo.substring(0, endi);
+ int port = Integer.parseInt(connectInfo.substring(endi+1));
+ return new InetSocketAddress(name, port);
+ } catch (Exception e) {
+ out.println("Proxy recieved a request: " + connectStr);
+ throw unexpected(e);
+ }
+ }
+ }
+
+ /* Reads from the given InputStream and writes to the given OutputStream */
+ static class Forwarder implements Runnable
+ {
+ private final InputStream in;
+ private final OutputStream os;
+
+ Forwarder(InputStream in, OutputStream os) {
+ this.in = in;
+ this.os = os;
+ }
+
+ @Override
+ public void run() {
+ try {
+ byte[] ba = new byte[1024];
+ int count;
+ while ((count = in.read(ba)) != -1) {
+ os.write(ba, 0, count);
+ }
+ } catch (IOException e) {
+ unexpected(e);
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/nio/channels/Selector/RacyDeregister.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2013, 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.
+ */
+
+/*
+ * Portions Copyright (c) 2012 IBM Corporation
+ */
+
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+import java.nio.channels.ServerSocketChannel;
+import java.nio.channels.SocketChannel;
+
+/*
+ * @test
+ * @bug 6429204
+ * @summary SelectionKey.interestOps does not update interest set on Windows.
+ * @author Frank Ding
+ */
+public class RacyDeregister {
+
+ static boolean notified;
+ static final Object selectorLock = new Object();
+ static final Object notifyLock = new Object();
+ /**
+ * null: not terminated
+ * true: passed
+ * false: failed
+ */
+ static volatile Boolean succTermination = null;
+
+ public static void main(String[] args) throws Exception {
+ InetAddress addr = InetAddress.getByName(null);
+ ServerSocketChannel sc = ServerSocketChannel.open();
+ sc.socket().bind(new InetSocketAddress(addr, 0));
+
+ SocketChannel.open(new InetSocketAddress(addr,
+ sc.socket().getLocalPort()));
+
+ SocketChannel accepted = sc.accept();
+ accepted.configureBlocking(false);
+
+ SocketChannel.open(new InetSocketAddress(addr,
+ sc.socket().getLocalPort()));
+ SocketChannel accepted2 = sc.accept();
+ accepted2.configureBlocking(false);
+
+ final Selector sel = Selector.open();
+ SelectionKey key2 = accepted2.register(sel, SelectionKey.OP_READ);
+ final SelectionKey[] key = new SelectionKey[]{
+ accepted.register(sel, SelectionKey.OP_READ)};
+
+
+ // thread that will be changing key[0].interestOps to OP_READ | OP_WRITE
+ new Thread() {
+
+ public void run() {
+ try {
+ for (int k = 0; k < 15; k++) {
+ for (int i = 0; i < 10000; i++) {
+ synchronized (notifyLock) {
+ synchronized (selectorLock) {
+ sel.wakeup();
+ key[0].interestOps(SelectionKey.OP_READ
+ | SelectionKey.OP_WRITE);
+ }
+ notified = false;
+ long beginTime = System.currentTimeMillis();
+ while (true) {
+ notifyLock.wait(5000);
+ if (notified) {
+ break;
+ }
+ long endTime = System.currentTimeMillis();
+ if (endTime - beginTime > 5000) {
+ succTermination = false;
+ // wake up main thread doing select()
+ sel.wakeup();
+ return;
+ }
+ }
+ }
+ }
+ }
+ succTermination = true;
+ // wake up main thread doing select()
+ sel.wakeup();
+ } catch (Exception e) {
+ System.out.println(e);
+ succTermination = true;
+ // wake up main thread doing select()
+ sel.wakeup();
+ }
+ }
+ }.start();
+
+ // main thread will be doing registering/deregistering with the sel
+ while (true) {
+ sel.select();
+ if (Boolean.TRUE.equals(succTermination)) {
+ System.out.println("Test passed");
+ sel.close();
+ sc.close();
+ break;
+ } else if (Boolean.FALSE.equals(succTermination)) {
+ System.out.println("Failed to pass the test");
+ sel.close();
+ sc.close();
+ throw new RuntimeException("Failed to pass the test");
+ }
+ synchronized (selectorLock) {
+ }
+ if (sel.selectedKeys().contains(key[0]) && key[0].isWritable()) {
+ synchronized (notifyLock) {
+ notified = true;
+ notifyLock.notify();
+ key[0].cancel();
+ sel.selectNow();
+ key2 = accepted2.register(sel, SelectionKey.OP_READ);
+ key[0] = accepted.register(sel, SelectionKey.OP_READ);
+ }
+ }
+ key2.cancel();
+ sel.selectedKeys().clear();
+ }
+ }
+}
--- a/jdk/test/java/nio/file/Files/CopyAndMove.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/java/nio/file/Files/CopyAndMove.java Tue Mar 12 18:12:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2013, 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
@@ -22,7 +22,7 @@
*/
/* @test
- * @bug 4313887 6838333 6917021 7006126 6950237
+ * @bug 4313887 6838333 6917021 7006126 6950237 8006645
* @summary Unit test for java.nio.file.Files copy and move methods
* @library ..
* @build CopyAndMove PassThroughFileSystem
@@ -37,6 +37,7 @@
import java.nio.file.attribute.*;
import java.io.*;
import java.util.*;
+import java.util.concurrent.TimeUnit;
public class CopyAndMove {
static final Random rand = new Random();
@@ -94,8 +95,8 @@
// check last modified time if not a symbolic link
if (!attrs1.isSymbolicLink()) {
- long time1 = attrs1.lastModifiedTime().toMillis();
- long time2 = attrs2.lastModifiedTime().toMillis();
+ long time1 = attrs1.lastModifiedTime().to(TimeUnit.SECONDS);
+ long time2 = attrs2.lastModifiedTime().to(TimeUnit.SECONDS);
if (time1 != time2) {
System.err.format("File time for %s is %s\n", attrs1.fileKey(), attrs1.lastModifiedTime());
--- a/jdk/test/java/util/Calendar/JavatimeTest.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/java/util/Calendar/JavatimeTest.java Tue Mar 12 18:12:44 2013 -0700
@@ -23,7 +23,7 @@
/*
*@test
- *@bug 8007520
+ *@bug 8007520 8008254
*@summary Test those bridge methods to/from java.time date/time classes
*/
@@ -53,13 +53,10 @@
int nanos = r.nextInt(NANOS_PER_SECOND);
int nanos_ms = nanos / 1000000 * 1000000; // millis precision
long millis = secs * 1000 + r.nextInt(1000);
-
LocalDateTime ldt = LocalDateTime.ofEpochSecond(secs, nanos, ZoneOffset.UTC);
LocalDateTime ldt_ms = LocalDateTime.ofEpochSecond(secs, nanos_ms, ZoneOffset.UTC);
Instant inst = Instant.ofEpochSecond(secs, nanos);
Instant inst_ms = Instant.ofEpochSecond(secs, nanos_ms);
- //System.out.printf("ms: %16d ns: %10d ldt:[%s]%n", millis, nanos, ldt);
-
///////////// java.util.Date /////////////////////////
Date jud = new java.util.Date(millis);
Instant inst0 = jud.toInstant();
@@ -77,6 +74,8 @@
}
//////////// java.util.GregorianCalendar /////////////
GregorianCalendar cal = new GregorianCalendar();
+ // non-roundtrip of tz name between j.u.tz and j.t.zid
+ cal.setTimeZone(TimeZone.getTimeZone(ZoneId.systemDefault()));
cal.setGregorianChange(new java.util.Date(Long.MIN_VALUE));
cal.setFirstDayOfWeek(Calendar.MONDAY);
cal.setMinimalDaysInFirstWeek(4);
@@ -84,6 +83,9 @@
ZonedDateTime zdt0 = cal.toZonedDateTime();
if (cal.getTimeInMillis() != zdt0.toInstant().toEpochMilli() ||
!cal.equals(GregorianCalendar.from(zdt0))) {
+ System.out.println("cal:" + cal);
+ System.out.println("zdt:" + zdt0);
+ System.out.println("calNew:" + GregorianCalendar.from(zdt0));
System.out.printf("ms: %16d ns: %10d ldt:[%s]%n", millis, nanos, ldt);
throw new RuntimeException("FAILED: gcal -> zdt -> gcal");
}
--- a/jdk/test/java/util/Collections/ReverseOrder.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/java/util/Collections/ReverseOrder.java Tue Mar 12 18:12:44 2013 -0700
@@ -23,23 +23,56 @@
/*
* @test
- * @bug 4593209
+ * @bug 4593209 8001667
* @summary Reverse comparator was subtly broken
* @author Josh bloch
*/
import java.util.*;
+import java.io.*;
public class ReverseOrder {
+ static byte[] serialBytes(Object o) {
+ try {
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(bos);
+ oos.writeObject(o);
+ oos.flush();
+ oos.close();
+ return bos.toByteArray();
+ } catch (Throwable t) {
+ throw new Error(t);
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ static <T> T serialClone(T o) {
+ try {
+ ObjectInputStream ois = new ObjectInputStream
+ (new ByteArrayInputStream(serialBytes(o)));
+ T clone = (T) ois.readObject();
+ return clone;
+ } catch (Throwable t) {
+ throw new Error(t);
+ }
+ }
+
public static void main(String[] args) throws Exception {
Foo[] a = { new Foo(2), new Foo(3), new Foo(1) };
List list = Arrays.asList(a);
- Collections.sort(list, Collections.reverseOrder());
+ Comparator cmp = Collections.reverseOrder();
+ Collections.sort(list, cmp);
Foo[] golden = { new Foo(3), new Foo(2), new Foo(1) };
List goldenList = Arrays.asList(golden);
if (!list.equals(goldenList))
throw new Exception(list.toString());
+
+ Comparator clone = serialClone(cmp);
+ List list2 = Arrays.asList(a);
+ Collections.sort(list2, clone);
+ if (!list2.equals(goldenList))
+ throw new Exception(list.toString());
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/ComparatorsTest.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,353 @@
+/*
+ * Copyright (c) 2012, 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 8001667
+ * @run testng ComparatorsTest
+ */
+
+import java.util.Comparator;
+import java.util.Comparators;
+import java.util.AbstractMap;
+import java.util.Map;
+import org.testng.annotations.Test;
+
+import java.util.function.Function;
+import java.util.function.ToIntFunction;
+import java.util.function.ToLongFunction;
+import java.util.function.ToDoubleFunction;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.assertSame;
+
+/**
+ * Unit tests for helper methods in Comparators
+ */
+@Test(groups = "unit")
+public class ComparatorsTest {
+ private static class Thing {
+ public final int intField;
+ public final long longField;
+ public final double doubleField;
+ public final String stringField;
+
+ private Thing(int intField, long longField, double doubleField, String stringField) {
+ this.intField = intField;
+ this.longField = longField;
+ this.doubleField = doubleField;
+ this.stringField = stringField;
+ }
+
+ public int getIntField() {
+ return intField;
+ }
+
+ public long getLongField() {
+ return longField;
+ }
+
+ public double getDoubleField() {
+ return doubleField;
+ }
+
+ public String getStringField() {
+ return stringField;
+ }
+ }
+
+ private final int[] intValues = { -2, -2, -1, -1, 0, 0, 1, 1, 2, 2 };
+ private final long[] longValues = { -2, -2, -1, -1, 0, 0, 1, 1, 2, 2 };
+ private final double[] doubleValues = { -2, -2, -1, -1, 0, 0, 1, 1, 2, 2 };
+ private final String[] stringValues = { "a", "a", "b", "b", "c", "c", "d", "d", "e", "e" };
+ private final int[] comparisons = { 0, -1, 0, -1, 0, -1, 0, -1, 0 };
+
+ private<T> void assertComparisons(T[] things, Comparator<T> comp, int[] comparisons) {
+ for (int i=0; i<comparisons.length; i++) {
+ assertEquals(comparisons.length + 1, things.length);
+ assertEquals(comparisons[i], comp.compare(things[i], things[i+1]));
+ assertEquals(-comparisons[i], comp.compare(things[i+1], things[i]));
+ }
+ }
+
+ public void testIntComparator() {
+ Thing[] things = new Thing[intValues.length];
+ for (int i=0; i<intValues.length; i++)
+ things[i] = new Thing(intValues[i], 0L, 0.0, null);
+ Comparator<Thing> comp = Comparators.comparing(new ToIntFunction<ComparatorsTest.Thing>() {
+ @Override
+ public int applyAsInt(Thing thing) {
+ return thing.getIntField();
+ }
+ });
+
+ assertComparisons(things, comp, comparisons);
+ }
+
+ public void testLongComparator() {
+ Thing[] things = new Thing[longValues.length];
+ for (int i=0; i<longValues.length; i++)
+ things[i] = new Thing(0, longValues[i], 0.0, null);
+ Comparator<Thing> comp = Comparators.comparing(new ToLongFunction<ComparatorsTest.Thing>() {
+ @Override
+ public long applyAsLong(Thing thing) {
+ return thing.getLongField();
+ }
+ });
+
+ assertComparisons(things, comp, comparisons);
+ }
+
+ public void testDoubleComparator() {
+ Thing[] things = new Thing[doubleValues.length];
+ for (int i=0; i<doubleValues.length; i++)
+ things[i] = new Thing(0, 0L, doubleValues[i], null);
+ Comparator<Thing> comp = Comparators.comparing(new ToDoubleFunction<ComparatorsTest.Thing>() {
+ @Override
+ public double applyAsDouble(Thing thing) {
+ return thing.getDoubleField();
+ }
+ });
+
+ assertComparisons(things, comp, comparisons);
+ }
+
+ public void testComparing() {
+ Thing[] things = new Thing[doubleValues.length];
+ for (int i=0; i<doubleValues.length; i++)
+ things[i] = new Thing(0, 0L, 0.0, stringValues[i]);
+ Comparator<Thing> comp = Comparators.comparing(new Function<Thing, String>() {
+ @Override
+ public String apply(Thing thing) {
+ return thing.getStringField();
+ }
+ });
+
+ assertComparisons(things, comp, comparisons);
+ }
+
+ public void testNaturalOrderComparator() {
+ Comparator<String> comp = Comparators.naturalOrder();
+
+ assertComparisons(stringValues, comp, comparisons);
+ }
+
+ public void testReverseComparator() {
+ Comparator<String> cmpr = Comparators.reverseOrder();
+ Comparator<String> cmp = cmpr.reverseOrder();
+
+ assertEquals(cmp.reverseOrder(), cmpr);
+ assertEquals(0, cmp.compare("a", "a"));
+ assertEquals(0, cmpr.compare("a", "a"));
+ assertTrue(cmp.compare("a", "b") < 0);
+ assertTrue(cmpr.compare("a", "b") > 0);
+ assertTrue(cmp.compare("b", "a") > 0);
+ assertTrue(cmpr.compare("b", "a") < 0);
+ }
+
+ public void testReverseComparator2() {
+ Comparator<String> cmp = (s1, s2) -> s1.length() - s2.length();
+ Comparator<String> cmpr = cmp.reverseOrder();
+
+ assertEquals(cmpr.reverseOrder(), cmp);
+ assertEquals(0, cmp.compare("abc", "def"));
+ assertEquals(0, cmpr.compare("abc", "def"));
+ assertTrue(cmp.compare("abcd", "def") > 0);
+ assertTrue(cmpr.compare("abcd", "def") < 0);
+ assertTrue(cmp.compare("abc", "defg") < 0);
+ assertTrue(cmpr.compare("abc", "defg") > 0);
+ }
+
+ @Test(expectedExceptions=NullPointerException.class)
+ public void testReverseComparatorNPE() {
+ Comparator<String> cmp = Comparators.reverseOrder(null);
+ }
+
+ public void testComposeComparator() {
+ // Longer string in front
+ Comparator<String> first = (s1, s2) -> s2.length() - s1.length();
+ Comparator<String> second = Comparators.naturalOrder();
+ Comparator<String> composed = Comparators.compose(first, second);
+
+ assertTrue(composed.compare("abcdefg", "abcdef") < 0);
+ assertTrue(composed.compare("abcdef", "abcdefg") > 0);
+ assertTrue(composed.compare("abcdef", "abcdef") == 0);
+ assertTrue(composed.compare("abcdef", "ghijkl") < 0);
+ assertTrue(composed.compare("ghijkl", "abcdefg") > 0);
+ }
+
+ private <K, V> void assertPairComparison(K k1, V v1, K k2, V v2,
+ Comparator<Map.Entry<K, V>> ck,
+ Comparator<Map.Entry<K, V>> cv) {
+ final Map.Entry<K, V> p11 = new AbstractMap.SimpleImmutableEntry<>(k1, v1);
+ final Map.Entry<K, V> p12 = new AbstractMap.SimpleImmutableEntry<>(k1, v2);
+ final Map.Entry<K, V> p21 = new AbstractMap.SimpleImmutableEntry<>(k2, v1);
+ final Map.Entry<K, V> p22 = new AbstractMap.SimpleImmutableEntry<>(k2, v2);
+
+ assertTrue(ck.compare(p11, p11) == 0);
+ assertTrue(ck.compare(p12, p11) == 0);
+ assertTrue(ck.compare(p11, p12) == 0);
+ assertTrue(ck.compare(p12, p22) < 0);
+ assertTrue(ck.compare(p12, p21) < 0);
+ assertTrue(ck.compare(p21, p11) > 0);
+ assertTrue(ck.compare(p21, p12) > 0);
+
+ assertTrue(cv.compare(p11, p11) == 0);
+ assertTrue(cv.compare(p12, p11) > 0);
+ assertTrue(cv.compare(p11, p12) < 0);
+ assertTrue(cv.compare(p12, p22) == 0);
+ assertTrue(cv.compare(p12, p21) > 0);
+ assertTrue(cv.compare(p21, p11) == 0);
+ assertTrue(cv.compare(p21, p12) < 0);
+
+ Comparator<Map.Entry<K, V>> cmp = Comparators.compose(ck, cv);
+ assertTrue(cmp.compare(p11, p11) == 0);
+ assertTrue(cmp.compare(p12, p11) > 0);
+ assertTrue(cmp.compare(p11, p12) < 0);
+ assertTrue(cmp.compare(p12, p22) < 0);
+ assertTrue(cmp.compare(p12, p21) < 0);
+ assertTrue(cmp.compare(p21, p11) > 0);
+ assertTrue(cmp.compare(p21, p12) > 0);
+
+ cmp = Comparators.compose(cv, ck);
+ assertTrue(cmp.compare(p11, p11) == 0);
+ assertTrue(cmp.compare(p12, p11) > 0);
+ assertTrue(cmp.compare(p11, p12) < 0);
+ assertTrue(cmp.compare(p12, p22) < 0);
+ assertTrue(cmp.compare(p12, p21) > 0);
+ assertTrue(cmp.compare(p21, p11) > 0);
+ assertTrue(cmp.compare(p21, p12) < 0);
+ }
+
+ public void testKVComparatorable() {
+ assertPairComparison(1, "ABC", 2, "XYZ",
+ Comparators.<Integer, String>naturalOrderKeys(),
+ Comparators.<Integer, String>naturalOrderValues());
+ }
+
+ private static class People {
+ final String firstName;
+ final String lastName;
+ final int age;
+
+ People(String first, String last, int age) {
+ firstName = first;
+ lastName = last;
+ this.age = age;
+ }
+
+ String getFirstName() { return firstName; }
+ String getLastName() { return lastName; }
+ int getAge() { return age; }
+ long getAgeAsLong() { return (long) age; };
+ double getAgeAsDouble() { return (double) age; };
+ }
+
+ private final People people[] = {
+ new People("John", "Doe", 34),
+ new People("Mary", "Doe", 30),
+ new People("Maria", "Doe", 14),
+ new People("Jonah", "Doe", 10),
+ new People("John", "Cook", 54),
+ new People("Mary", "Cook", 50),
+ };
+
+ public void testKVComparators() {
+ // Comparator<People> cmp = Comparators.naturalOrder(); // Should fail to compiler as People is not comparable
+ // We can use simple comparator, but those have been tested above.
+ // Thus choose to do compose for some level of interation.
+ Comparator<People> cmp1 = Comparators.comparing((Function<People, String>) People::getFirstName);
+ Comparator<People> cmp2 = Comparators.comparing((Function<People, String>) People::getLastName);
+ Comparator<People> cmp = Comparators.compose(cmp1, cmp2);
+
+ assertPairComparison(people[0], people[0], people[1], people[1],
+ Comparators.<People, People>byKey(cmp),
+ Comparators.<People, People>byValue(cmp));
+
+ }
+
+ private <T> void assertComparison(Comparator<T> cmp, T less, T greater) {
+ assertTrue(cmp.compare(less, greater) < 0, "less");
+ assertTrue(cmp.compare(less, less) == 0, "equal");
+ assertTrue(cmp.compare(greater, less) > 0, "greater");
+ }
+
+ public void testComparatorDefaultMethods() {
+ Comparator<People> cmp = Comparators.comparing((Function<People, String>) People::getFirstName);
+ Comparator<People> cmp2 = Comparators.comparing((Function<People, String>) People::getLastName);
+ // reverseOrder
+ assertComparison(cmp.reverseOrder(), people[1], people[0]);
+ // thenComparing(Comparator)
+ assertComparison(cmp.thenComparing(cmp2), people[0], people[1]);
+ assertComparison(cmp.thenComparing(cmp2), people[4], people[0]);
+ // thenComparing(Function)
+ assertComparison(cmp.thenComparing(People::getLastName), people[0], people[1]);
+ assertComparison(cmp.thenComparing(People::getLastName), people[4], people[0]);
+ // thenComparing(ToIntFunction)
+ assertComparison(cmp.thenComparing(People::getAge), people[0], people[1]);
+ assertComparison(cmp.thenComparing(People::getAge), people[1], people[5]);
+ // thenComparing(ToLongFunction)
+ assertComparison(cmp.thenComparing(People::getAgeAsLong), people[0], people[1]);
+ assertComparison(cmp.thenComparing(People::getAgeAsLong), people[1], people[5]);
+ // thenComparing(ToDoubleFunction)
+ assertComparison(cmp.thenComparing(People::getAgeAsDouble), people[0], people[1]);
+ assertComparison(cmp.thenComparing(People::getAgeAsDouble), people[1], people[5]);
+ }
+
+ public void testGreaterOf() {
+ // lesser
+ assertSame(Comparators.greaterOf(Comparators.comparing(
+ (Function<People, String>) People::getFirstName))
+ .apply(people[0], people[1]),
+ people[1]);
+ // euqal
+ assertSame(Comparators.greaterOf(Comparators.comparing(
+ (Function<People, String>) People::getLastName))
+ .apply(people[0], people[1]),
+ people[0]);
+ // greater
+ assertSame(Comparators.greaterOf(Comparators.comparing(
+ (ToIntFunction<People>) People::getAge))
+ .apply(people[0], people[1]),
+ people[0]);
+ }
+
+ public void testLesserOf() {
+ // lesser
+ assertSame(Comparators.lesserOf(Comparators.comparing(
+ (Function<People, String>) People::getFirstName))
+ .apply(people[0], people[1]),
+ people[0]);
+ // euqal
+ assertSame(Comparators.lesserOf(Comparators.comparing(
+ (Function<People, String>) People::getLastName))
+ .apply(people[0], people[1]),
+ people[0]);
+ // greater
+ assertSame(Comparators.lesserOf(Comparators.comparing(
+ (ToIntFunction<People>) People::getAge))
+ .apply(people[0], people[1]),
+ people[1]);
+ }
+}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/Locale/Bug8004240.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2013, 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 8004240
+ * @summary Verify that getAdapterPreference returns an unmodifiable list.
+ * @compile -XDignore.symbol.file Bug8004240.java
+ * @run main Bug8004240
+ */
+
+import java.util.List;
+import sun.util.locale.provider.LocaleProviderAdapter;
+
+public class Bug8004240 {
+
+ public static void main(String[] args) {
+ List<LocaleProviderAdapter.Type> types = LocaleProviderAdapter.getAdapterPreference();
+
+ try {
+ types.set(0, null);
+ } catch (UnsupportedOperationException e) {
+ // success
+ return;
+ }
+
+ throw new RuntimeException("LocaleProviderAdapter.getAdapterPrefence() returned a modifiable list.");
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/Map/ToArray.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2013, 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 8008785
+ * @summary Ensure toArray() implementations return correct results.
+ * @author Mike Duigou
+ */
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentSkipListMap;
+
+public class ToArray {
+
+ /**
+ * Number of elements per map.
+ */
+ private static final int TEST_SIZE = 5000;
+
+ private static void realMain(String[] args) throws Throwable {
+ Map<Integer, Long>[] maps = (Map<Integer, Long>[]) new Map[]{
+ new HashMap<>(),
+ new Hashtable<>(),
+ new IdentityHashMap<>(),
+ new LinkedHashMap<>(),
+ new TreeMap<>(),
+ new WeakHashMap<>(),
+ new ConcurrentHashMap<>(),
+ new ConcurrentSkipListMap<>()
+ };
+
+ // for each map type.
+ for (Map<Integer, Long> map : maps) {
+ try {
+ testMap(map);
+ } catch(Exception all) {
+ unexpected("Failed for " + map.getClass().getName(), all);
+ }
+ }
+ }
+
+ private static final Integer[] KEYS = new Integer[TEST_SIZE];
+
+ private static final Long[] VALUES = new Long[TEST_SIZE];
+
+ static {
+ for (int each = 0; each < TEST_SIZE; each++) {
+ KEYS[each] = Integer.valueOf(each);
+ VALUES[each] = Long.valueOf(each + TEST_SIZE);
+ }
+ }
+
+
+ private static void testMap(Map<Integer, Long> map) {
+ System.out.println("Testing " + map.getClass());
+ System.out.flush();
+
+ // Fill the map
+ for (int each = 0; each < TEST_SIZE; each++) {
+ map.put(KEYS[each], VALUES[each]);
+ }
+
+ // check the keys
+ Object[] keys = map.keySet().toArray();
+ Arrays.sort(keys);
+
+ for(int each = 0; each < TEST_SIZE; each++) {
+ check( "unexpected key", keys[each] == KEYS[each]);
+ }
+
+ // check the values
+ Object[] values = map.values().toArray();
+ Arrays.sort(values);
+
+ for(int each = 0; each < TEST_SIZE; each++) {
+ check( "unexpected value", values[each] == VALUES[each]);
+ }
+
+ // check the entries
+ Map.Entry<Integer,Long>[] entries = map.entrySet().toArray(new Map.Entry[TEST_SIZE]);
+ Arrays.sort( entries,new Comparator<Map.Entry<Integer,Long>>() {
+ public int compare(Map.Entry<Integer,Long> o1, Map.Entry<Integer,Long> o2) {
+ return o1.getKey().compareTo(o2.getKey());
+ }});
+
+ for(int each = 0; each < TEST_SIZE; each++) {
+ check( "unexpected entry", entries[each].getKey() == KEYS[each] && entries[each].getValue() == VALUES[each]);
+ }
+ }
+
+ //--------------------- Infrastructure ---------------------------
+ static volatile int passed = 0, failed = 0;
+
+ static void pass() {
+ passed++;
+ }
+
+ static void fail() {
+ failed++;
+ (new Error("Failure")).printStackTrace(System.err);
+ }
+
+ static void fail(String msg) {
+ failed++;
+ (new Error("Failure: " + msg)).printStackTrace(System.err);
+ }
+
+ static void abort() {
+ fail();
+ System.exit(1);
+ }
+
+ static void abort(String msg) {
+ fail(msg);
+ System.exit(1);
+ }
+
+ static void unexpected(String msg, Throwable t) {
+ System.err.println("Unexpected: " + msg);
+ unexpected(t);
+ }
+
+ static void unexpected(Throwable t) {
+ failed++;
+ t.printStackTrace(System.err);
+ }
+
+ static void check(boolean cond) {
+ if (cond) {
+ pass();
+ } else {
+ fail();
+ }
+ }
+
+ static void check(String desc, boolean cond) {
+ if (cond) {
+ pass();
+ } else {
+ fail(desc);
+ }
+ }
+
+ static void equal(Object x, Object y) {
+ if (Objects.equals(x, y)) {
+ pass();
+ } else {
+ fail(x + " not equal to " + y);
+ }
+ }
+
+ public static void main(String[] args) throws Throwable {
+ Thread.currentThread().setName(ToArray.class.getName());
+// Thread.currentThread().setPriority(Thread.MAX_PRIORITY);
+ try {
+ realMain(args);
+ } catch (Throwable t) {
+ unexpected(t);
+ }
+
+ System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
+ if (failed > 0) {
+ throw new Error("Some tests failed");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/concurrent/forkjoin/ThreadLessCommon.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,135 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+/*
+ * @test
+ * @bug 8008378
+ * @summary Basic checks for parallelism 0, and null returning factory
+ * @run main/othervm -Djava.util.concurrent.ForkJoinPool.common.parallelism=0 ThreadLessCommon
+ * @run main/othervm -Djava.util.concurrent.ForkJoinPool.common.threadFactory=ThreadLessCommon$NullForkJoinWorkerThreadFactory ThreadLessCommon
+ * @author Chris Hegarty
+ */
+
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.ForkJoinPool.ForkJoinWorkerThreadFactory;
+import java.util.concurrent.ForkJoinWorkerThread;
+import java.util.concurrent.RecursiveTask;
+
+public class ThreadLessCommon {
+
+ static final int THRESHOLD = 1000;
+ static final boolean debug = true;
+
+ private static void realMain(String[] args) throws Throwable {
+ if (debug) {
+ String pp = System.getProperty(
+ "java.util.concurrent.ForkJoinPool.common.parallelism");
+ System.out.println(
+ "java.util.concurrent.ForkJoinPool.common.parallelism:" + pp);
+ String tf = System.getProperty(
+ "java.util.concurrent.ForkJoinPool.common.threadFactory");
+ System.out.println(
+ "java.util.concurrent.ForkJoinPool.common.threadFactory:" + tf);
+ }
+
+ long from = 0, to = 50000;
+ RecursiveTask<Long> task = new SumTask(from, to, Thread.currentThread());
+ long sum = task.invoke();
+ System.out.printf("%nSum: from [%d] to [%d] = [%d]%n", from, to, sum);
+
+ task.fork();
+ sum = task.join();
+ System.out.printf("%nSum: from [%d] to [%d] = [%d]%n", from, to, sum);
+
+ sum = ForkJoinPool.commonPool().invoke(task.fork());
+ System.out.printf("%nSum: from [%d] to [%d] = [%d]%n", from, to, sum);
+ }
+
+ static class SumTask extends RecursiveTask<Long> {
+ final Thread expectedThread;
+ final long from;
+ final long to;
+ SumTask(long from, long to, Thread thread) {
+ this.from = from; this.to = to; expectedThread = thread;
+ }
+
+ @Override
+ public Long compute() {
+ check(Thread.currentThread() == expectedThread,
+ "Expected " + expectedThread + ", got " + Thread.currentThread());
+ long range = to - from;
+ if (range < THRESHOLD) {
+ long acc = 0;
+ for (long i = from; i <= to; i++)
+ acc = acc + i;
+ return acc;
+ } else {
+ long half = from + range / 2;
+ SumTask t1 = new SumTask(from, half ,expectedThread);
+ SumTask t2 = new SumTask(half+1, to ,expectedThread);
+ if (half % 2 == 0) {
+ t1.fork();
+ return t2.compute() + t1.join();
+ } else {
+ invokeAll(t1, t2);
+ try { return t1.get() + t2.get(); }
+ catch (Exception x) { unexpected(x); return 0L;}
+ }
+ }
+ }
+ }
+
+ public static class NullForkJoinWorkerThreadFactory
+ implements ForkJoinWorkerThreadFactory
+ {
+ @Override
+ public ForkJoinWorkerThread newThread(ForkJoinPool pool) {
+ return null;
+ }
+ }
+
+ //--------------------- Infrastructure ---------------------------
+ static volatile int passed = 0, failed = 0;
+ static void pass() {passed++;}
+ static void fail() {failed++; /*Thread.dumpStack();*/}
+ static void fail(String msg) {System.out.println(msg); fail();}
+ static void unexpected(Throwable t) {failed++; t.printStackTrace();}
+ static void check(boolean cond, String msg) {if (cond) pass(); else fail(msg);}
+ static void equal(Object x, Object y) {
+ if (x == null ? y == null : x.equals(y)) pass();
+ else fail(x + " not equal to " + y);}
+ public static void main(String[] args) throws Throwable {
+ try {realMain(args);} catch (Throwable t) {unexpected(t);}
+ System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
+ if (failed > 0) throw new AssertionError("Some tests failed");}
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/concurrent/forkjoin/ThrowingRunnable.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,85 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+/*
+ * @test
+ * @bug 8008378
+ * @run main/othervm -Djava.util.concurrent.ForkJoinPool.common.exceptionHandler=ThrowingRunnable
+ * ThrowingRunnable
+ * @summary FJP.execute(Runnable), uncaught exception should cause worker thread
+ * to die.
+ * @author Chris Hegarty
+ */
+
+import java.lang.Thread.UncaughtExceptionHandler;
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.Phaser;
+import java.util.concurrent.TimeUnit;
+
+public class ThrowingRunnable implements Runnable, UncaughtExceptionHandler {
+
+ static final Phaser phaser = new Phaser(2);
+
+ private static void realMain(String[] args) throws Throwable {
+ ThrowingRunnable r = new ThrowingRunnable();
+ ForkJoinPool.commonPool().execute(r);
+ phaser.awaitAdvanceInterruptibly(phaser.arrive(), 10, TimeUnit.SECONDS);
+ pass();
+ }
+
+ @Override
+ public void run() {
+ throw new RuntimeException("This is an exception.");
+ }
+
+ @Override
+ public void uncaughtException(Thread t, Throwable e) {
+ pass();
+ phaser.arrive();
+ }
+
+ //--------------------- Infrastructure ---------------------------
+ static volatile int passed = 0, failed = 0;
+ static void pass() {passed++;}
+ static void fail() {failed++; /*Thread.dumpStack();*/}
+ static void fail(String msg) {System.out.println(msg); fail();}
+ static void unexpected(Throwable t) {failed++; t.printStackTrace();}
+ static void check(boolean cond, String msg) {if (cond) pass(); else fail(msg);}
+ static void equal(Object x, Object y) {
+ if (x == null ? y == null : x.equals(y)) pass();
+ else fail(x + " not equal to " + y);}
+ public static void main(String[] args) throws Throwable {
+ try {realMain(args);} catch (Throwable t) {unexpected(t);}
+ System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
+ if (failed > 0) throw new AssertionError("Some tests failed");}
+}
--- a/jdk/test/javax/script/CauseExceptionTest.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/javax/script/CauseExceptionTest.java Tue Mar 12 18:12:44 2013 -0700
@@ -24,7 +24,7 @@
/*
* @test
* @bug 6869617
- * @summary RhinoScriptEngine bug : ScriptException cause not set (with fix)
+ * @summary ScriptEngine bug : ScriptException cause not set (with fix)
*/
import javax.script.*;
@@ -33,12 +33,12 @@
public class CauseExceptionTest {
public static void main(String[] args) throws ScriptException, NoSuchMethodException {
ScriptEngineManager sem = new ScriptEngineManager();
- ScriptEngine engine = sem.getEngineByName("js");
+ ScriptEngine engine = sem.getEngineByName("nashorn");
if (engine == null) {
System.out.println("Warning: No js engine found; test vacuously passes.");
return;
}
- engine.eval("function hello_world() { println('hello world'); throw 'out of here'; } ");
+ engine.eval("function hello_world() { print('hello world'); throw 'out of here'; } ");
Invocable invocable = (Invocable) engine;
try {
invocable.invokeFunction("hello_world", (Object[])null);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/script/ExceptionTest.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2006, 2008, 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 6474943 6705893
+ * @summary Test that script engine exception messages are
+ * available from ScriptException.
+ */
+
+import java.io.*;
+import javax.script.*;
+
+public class ExceptionTest {
+ private static final String ERROR_MSG = "error from JavaScript";
+
+ public static void main(String[] args) throws Exception {
+ ScriptEngineManager m = new ScriptEngineManager();
+ ScriptEngine engine = Helper.getJsEngine(m);
+ if (engine == null) {
+ System.out.println("Warning: No js engine found; test vacuously passes.");
+ return;
+ }
+ engine.put("msg", ERROR_MSG);
+ try {
+ engine.eval("throw new Error(msg);");
+ } catch (ScriptException exp) {
+ if (exp.getMessage().indexOf(ERROR_MSG) == -1) {
+ throw exp;
+ }
+ }
+ try {
+ engine.eval("throw (msg);");
+ } catch (ScriptException exp) {
+ if (exp.getMessage().indexOf(ERROR_MSG) == -1) {
+ throw exp;
+ }
+ }
+ try {
+ CompiledScript scr = ((Compilable)engine).compile("throw new Error(msg);");
+ scr.eval();
+ } catch (ScriptException exp) {
+ if (exp.getMessage().indexOf(ERROR_MSG) == -1) {
+ throw exp;
+ }
+ }
+ try {
+ CompiledScript scr = ((Compilable)engine).compile("throw msg;");
+ scr.eval();
+ } catch (ScriptException exp) {
+ if (exp.getMessage().indexOf(ERROR_MSG) == -1) {
+ throw exp;
+ }
+ }
+ }
+}
--- a/jdk/test/javax/script/GetInterfaceTest.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/javax/script/GetInterfaceTest.java Tue Mar 12 18:12:44 2013 -0700
@@ -22,6 +22,7 @@
*/
/*
+ * @run ignore
* @test
* @bug 6960211
* @summary JavaScript engine allows creation of interface although methods not available.
@@ -32,10 +33,10 @@
public class GetInterfaceTest {
public static void main(String[] args) throws Exception {
ScriptEngineManager manager = new ScriptEngineManager();
- ScriptEngine engine = manager.getEngineByName("js");
+ ScriptEngine engine = manager.getEngineByName("nashorn");
if (engine == null) {
- System.out.println("Warning: No engine engine found; test vacuously passes.");
+ System.out.println("Warning: No js engine engine found; test vacuously passes.");
return;
}
--- a/jdk/test/javax/script/Helper.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/javax/script/Helper.java Tue Mar 12 18:12:44 2013 -0700
@@ -24,13 +24,13 @@
/**
* Helper class to consolidate testing requirements for a js engine.
- * A js engine is required as part of Sun's product JDK.
+ * A js engine is required as part of Oracle's product JDK.
*/
public class Helper {
private Helper() {}; // Don't instantiate
public static ScriptEngine getJsEngine(ScriptEngineManager m) {
- ScriptEngine e = m.getEngineByName("js");
+ ScriptEngine e = m.getEngineByName("nashorn");
if (e == null &&
System.getProperty("java.runtime.name").startsWith("Java(TM)")) {
// A js engine is requied for Sun's product JDK
--- a/jdk/test/javax/script/RhinoExceptionTest.java Mon Mar 04 15:40:12 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2006, 2008, 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 6474943 6705893
- * @summary Test that Rhino exception messages are
- * available from ScriptException.
- */
-
-import java.io.*;
-import javax.script.*;
-
-public class RhinoExceptionTest {
- private static final String ERROR_MSG = "error from JavaScript";
-
- public static void main(String[] args) throws Exception {
- ScriptEngineManager m = new ScriptEngineManager();
- ScriptEngine engine = Helper.getJsEngine(m);
- if (engine == null) {
- System.out.println("Warning: No js engine found; test vacuously passes.");
- return;
- }
- engine.put("msg", ERROR_MSG);
- try {
- engine.eval("throw new Error(msg);");
- } catch (ScriptException exp) {
- if (exp.getMessage().indexOf(ERROR_MSG) == -1) {
- throw exp;
- }
- }
- try {
- engine.eval("throw (msg);");
- } catch (ScriptException exp) {
- if (exp.getMessage().indexOf(ERROR_MSG) == -1) {
- throw exp;
- }
- }
- try {
- CompiledScript scr = ((Compilable)engine).compile("throw new Error(msg);");
- scr.eval();
- } catch (ScriptException exp) {
- if (exp.getMessage().indexOf(ERROR_MSG) == -1) {
- throw exp;
- }
- }
- try {
- CompiledScript scr = ((Compilable)engine).compile("throw msg;");
- scr.eval();
- } catch (ScriptException exp) {
- if (exp.getMessage().indexOf(ERROR_MSG) == -1) {
- throw exp;
- }
- }
- }
-}
--- a/jdk/test/javax/script/StringWriterPrintTest.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/javax/script/StringWriterPrintTest.java Tue Mar 12 18:12:44 2013 -0700
@@ -33,9 +33,9 @@
public class StringWriterPrintTest {
public static void main(String[] args) throws ScriptException {
ScriptEngineManager sem = new ScriptEngineManager();
- ScriptEngine engine = sem.getEngineByName("js");
+ ScriptEngine engine = sem.getEngineByName("nashorn");
if (engine == null) {
- System.out.println("Warning: No js engine found; test vacuously passes.");
+ System.out.println("Warning: No nashorn engine found; test vacuously passes.");
return;
}
StringWriter sw = new StringWriter();
--- a/jdk/test/javax/script/Test3.js Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/javax/script/Test3.js Tue Mar 12 18:12:44 2013 -0700
@@ -1,22 +1,24 @@
+var ScriptContext = javax.script.ScriptContext;
+
if (key == undefined || key != 'engine value') {
throw "unexpected engine scope value";
}
// pre-defined context variable refers to current ScriptContext
-if (context.getAttribute('key', context.GLOBAL_SCOPE) != 'global value') {
+if (context.getAttribute('key', ScriptContext.GLOBAL_SCOPE) != 'global value') {
throw "unexpected global scope value";
}
// change the engine scope value
key = 'new engine value';
-if (context.getAttribute('key', context.GLOBAL_SCOPE) != 'global value') {
+if (context.getAttribute('key', ScriptContext.GLOBAL_SCOPE) != 'global value') {
throw "global scope should not change here";
}
// delete engine scope value
delete key;
-if (key == undefined && key != 'xglobal value') {
+if (key == undefined && key != 'global value') {
throw 'global scope should be visible after engine scope removal';
}
--- a/jdk/test/javax/script/Test5.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/javax/script/Test5.java Tue Mar 12 18:12:44 2013 -0700
@@ -48,16 +48,24 @@
System.out.println("engine scope only");
e.put("count", new Integer(1));
- Reader reader = new FileReader(
- new File(System.getProperty("test.src", "."), "Test5.js"));
- engine.eval(reader,ctxt);
+ try (Reader reader = new FileReader(
+ new File(System.getProperty("test.src", "."), "Test5.js"))) {
+ engine.eval(reader,ctxt);
+ }
+
System.out.println("both scopes");
ctxt.setBindings(g, ScriptContext.GLOBAL_SCOPE);
e.put("count", new Integer(2));
- engine.eval(reader,ctxt);
+ try (Reader reader = new FileReader(
+ new File(System.getProperty("test.src", "."), "Test5.js"))) {
+ engine.eval(reader,ctxt);
+ }
System.out.println("only global");
e.put("count", new Integer(3));
- ctxt.setAttribute("key", null, ScriptContext.ENGINE_SCOPE);
- engine.eval(reader,ctxt);
+ ctxt.removeAttribute("key", ScriptContext.ENGINE_SCOPE);
+ try (Reader reader = new FileReader(
+ new File(System.getProperty("test.src", "."), "Test5.js"))) {
+ engine.eval(reader,ctxt);
+ }
}
}
--- a/jdk/test/javax/script/Test5.js Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/javax/script/Test5.js Tue Mar 12 18:12:44 2013 -0700
@@ -1,6 +1,5 @@
-var key;
-var count;
+var ScriptContext = javax.script.ScriptContext;
print(count);
switch (count) {
@@ -9,7 +8,7 @@
if (key != 'value in engine') {
throw "unexpected engine scope value";
}
- if (context.getAttribute("key", context.GLOBAL_SCOPE ) != null) {
+ if (context.getAttribute("key", ScriptContext.GLOBAL_SCOPE ) != null) {
throw "unexpected global scope value";
}
break;
@@ -19,7 +18,7 @@
if (key != 'value in engine') {
throw "unexpected engine scope value";
}
- if (context.getAttribute("key", context.GLOBAL_SCOPE ) !=
+ if (context.getAttribute("key", ScriptContext.GLOBAL_SCOPE ) !=
"value in global") {
throw "unexpected global scope value";
}
@@ -30,7 +29,7 @@
if (key != 'value in global') {
throw "unexpected global scope value";
}
- if (context.getAttribute("key", context.GLOBAL_SCOPE ) !=
+ if (context.getAttribute("key", ScriptContext.GLOBAL_SCOPE ) !=
"value in global") {
throw "unexpected global scope value";
}
--- a/jdk/test/javax/script/Test6.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/javax/script/Test6.java Tue Mar 12 18:12:44 2013 -0700
@@ -40,11 +40,23 @@
System.out.println("Warning: No js engine found; test vacuously passes.");
return;
}
- Reader reader = new FileReader(
- new File(System.getProperty("test.src", "."), "Test6.js"));
- engine.eval(reader);
+
+ try (Reader reader = new FileReader(
+ new File(System.getProperty("test.src", "."), "Test6.js"))) {
+ engine.eval(reader);
+ }
Object res = engine.get("res");
- CompiledScript scr = ((Compilable)engine).compile(reader);
+
+ CompiledScript scr = null;
+ try (Reader reader = new FileReader(
+ new File(System.getProperty("test.src", "."), "Test6.js"))) {
+ scr = ((Compilable)engine).compile(reader);
+ }
+
+ if (scr == null) {
+ throw new RuntimeException("compilation failed!");
+ }
+
scr.eval();
Object res1 = engine.get("res");
if (! res.equals(res1)) {
--- a/jdk/test/javax/script/Test7.js Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/javax/script/Test7.js Tue Mar 12 18:12:44 2013 -0700
@@ -1,9 +1,14 @@
//this is the first line of Test7.js
var filename;
+try {
+ load("nashorn:mozilla_compat.js");
+} catch (e) {
+ //ignored
+}
importPackage(java.io);
importPackage(java);
var f = new File(filename);
var r = new BufferedReader(new InputStreamReader(new FileInputStream(f)));
-var firstLine = r.readLine() + '';
+var firstLine = r.readLine();
print(firstLine);
--- a/jdk/test/javax/script/UnescapedBracketRegExTest.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/javax/script/UnescapedBracketRegExTest.java Tue Mar 12 18:12:44 2013 -0700
@@ -24,7 +24,7 @@
/*
* @test
* @bug 7012701
- * @summary 7012701 Add a test to check that Rhino's RegExp parser accepts unescaped '['
+ * @summary 7012701 Add a test to check that RegExp parser accepts unescaped '['
*/
import javax.script.*;
@@ -33,9 +33,9 @@
public class UnescapedBracketRegExTest {
public static void main(String[] args) throws ScriptException {
ScriptEngineManager sem = new ScriptEngineManager();
- ScriptEngine engine = sem.getEngineByName("js");
+ ScriptEngine engine = sem.getEngineByName("nashorn");
if (engine == null) {
- System.out.println("Warning: No js engine found; test vacuously passes.");
+ System.out.println("Warning: No nashorn engine found; test vacuously passes.");
return;
}
// the following throws exception
--- a/jdk/test/javax/script/VersionTest.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/javax/script/VersionTest.java Tue Mar 12 18:12:44 2013 -0700
@@ -31,9 +31,7 @@
import java.io.*;
public class VersionTest {
-
- private static final String JS_LANG_VERSION = "1.8";
- private static final String JS_ENGINE_VERSION = "1.7 release 3 PRERELEASE";
+ private static final String JS_LANG_VERSION = "ECMA - 262 Edition 5.1";
public static void main(String[] args) throws Exception {
ScriptEngineManager manager = new ScriptEngineManager();
@@ -48,9 +46,18 @@
JS_LANG_VERSION);
}
String engineVersion = jsengine.getFactory().getEngineVersion();
- if (! engineVersion.equals(JS_ENGINE_VERSION)) {
- throw new RuntimeException("Expected Rhino version is " +
- JS_ENGINE_VERSION);
+ String expectedVersion = getNashornVersion();
+ if (! engineVersion.equals(expectedVersion)) {
+ throw new RuntimeException("Expected version is " + expectedVersion);
+ }
+ }
+
+ private static String getNashornVersion() {
+ try {
+ Class versionClass = Class.forName("jdk.nashorn.internal.runtime.Version");
+ return (String) versionClass.getMethod("version").invoke(null);
+ } catch (Exception e) {
+ return "Version Unknown!";
}
}
}
--- a/jdk/test/javax/security/auth/kerberos/KerberosTixDateTest.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/javax/security/auth/kerberos/KerberosTixDateTest.java Tue Mar 12 18:12:44 2013 -0700
@@ -34,7 +34,7 @@
import javax.security.auth.kerberos.KerberosKey;
import javax.security.auth.kerberos.KerberosPrincipal;
import javax.security.auth.kerberos.KerberosTicket;
-import sun.misc.BASE64Decoder;
+import java.util.Base64;
public class KerberosTixDateTest {
@@ -127,7 +127,7 @@
System.out.println("Testing against KerberosTicket from JDK6...");
byte[] serializedBytes =
- new BASE64Decoder().decodeBuffer(serializedKerberosTix);
+ Base64.getMimeDecoder().decode(serializedKerberosTix);
checkEqualsAndHashCode(serializedBytes, t);
System.out.println("Testing against KerberosTicket from current rel...");
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/text/html/7189299/bug7189299.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2013 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.
+ */
+
+/*
+ * Portions Copyright (c) 2013 IBM Corporation
+ */
+import java.awt.BorderLayout;
+import java.awt.Toolkit;
+
+import java.awt.event.ActionListener;
+import javax.swing.DefaultButtonModel;
+import javax.swing.JEditorPane;
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+import javax.swing.text.StyleConstants;
+import javax.swing.text.StyleContext;
+import javax.swing.text.html.HTMLEditorKit;
+import sun.awt.SunToolkit;
+
+
+/*
+ * @test
+ * @bug 8008289
+ * @summary Shared ButtonModel instance should deregister previous listeners.
+ * @author Frank Ding
+ */
+public class bug7189299 {
+
+ private static JEditorPane html;
+ private static JFrame frame;
+
+ private static void setup() {
+ /**
+ * Note the input type is not restricted to "submit". Types "image",
+ * "checkbox", "radio" have the same problem.
+ */
+ html = new JEditorPane("text/html",
+ "<html><body><form action=\"http://localhost.cgi\">"
+ + "<input type=submit name=submit value=\"submit\"/>"
+ + "</form></body></html>");
+ frame = new JFrame();
+ frame.setLayout(new BorderLayout());
+ frame.add(html, BorderLayout.CENTER);
+ frame.setSize(200, 100);
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ frame.setVisible(true);
+ }
+
+ private static void doTest() {
+ /*
+ * Calling updateComponentTreeUI creates a new FormView instance with
+ * its own associated JButton instance. The same DefaultButtonModel
+ * instance is used for both FormView's.
+ *
+ * The action listeners associated with (the JButton for) the first
+ * FormView should be unregistered from this common DefaultButtonModel,
+ * such that only those for the new FormView remain.
+ */
+ SwingUtilities.updateComponentTreeUI(html);
+ }
+
+ private static void verifySingleDefaultButtonModelListener() {
+ HTMLEditorKit htmlEditorKit = (HTMLEditorKit) html.getEditorKit();
+ StyleContext.NamedStyle style = ((StyleContext.NamedStyle) htmlEditorKit
+ .getInputAttributes());
+ DefaultButtonModel model = ((DefaultButtonModel) style
+ .getAttribute(StyleConstants.ModelAttribute));
+ ActionListener[] listeners = model.getActionListeners();
+ int actionListenerNum = listeners.length;
+ if (actionListenerNum != 1) {
+ throw new RuntimeException(
+ "Expected single ActionListener object registered with "
+ + "DefaultButtonModel; found " + actionListenerNum
+ + " listeners registered.");
+ }
+
+ int changeListenerNum = model.getChangeListeners().length;
+ if (changeListenerNum != 1) {
+ throw new RuntimeException(
+ "Expected at most one ChangeListener object registered "
+ + "with DefaultButtonModel; found " + changeListenerNum
+ + " listeners registered.");
+ }
+ int itemListenerNum = model.getItemListeners().length;
+ if (itemListenerNum != 1) {
+ throw new RuntimeException(
+ "Expected at most one ItemListener object registered "
+ + "with DefaultButtonModel; found " + itemListenerNum
+ + " listeners registered.");
+ }
+ }
+
+ public static void main(String[] args) throws Exception {
+ final SunToolkit toolkit = ((SunToolkit) Toolkit.getDefaultToolkit());
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+
+ @Override
+ public void run() {
+ setup();
+ }
+ });
+ toolkit.realSync();
+ SwingUtilities.invokeAndWait(new Runnable() {
+
+ @Override
+ public void run() {
+ try {
+ verifySingleDefaultButtonModelListener();
+ doTest();
+ verifySingleDefaultButtonModelListener();
+ } finally {
+ frame.dispose();
+ }
+ }
+ });
+ }
+}
--- a/jdk/test/lib/testlibrary/jdk/testlibrary/JdkFinder.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/JdkFinder.java Tue Mar 12 18:12:44 2013 -0700
@@ -38,10 +38,6 @@
}
binPath += File.separatorChar + "bin" + File.separatorChar + executable;
- File toolFile = new File(binPath);
- if (!toolFile.exists()) {
- throw new RuntimeException(binPath + " does not exist");
- }
return binPath;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/awt/datatransfer/SuplementaryCharactersTransferTest.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 2013, 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 6877495
+ @summary JTextField and JTextArea does not support supplementary characters
+ @author Alexander Scherbatiy
+ @run main SuplementaryCharactersTransferTest
+*/
+
+
+import java.io.*;
+import java.util.*;
+import java.awt.*;
+import java.awt.datatransfer.*;
+import sun.awt.datatransfer.*;
+import sun.awt.datatransfer.DataTransferer.ReencodingInputStream;
+
+public class SuplementaryCharactersTransferTest {
+
+ public static final long TEXT_FORMAT = 13;
+
+ public static void main(String[] args) throws Exception {
+
+ DataTransferer dataTransferer = new TestDataTransferer();
+ dataTransferer.registerTextFlavorProperties("UNICODE TEXT", "utf-16le", "\r\n", "2");
+ ByteTransferable transferable = new ByteTransferable();
+ ReencodingInputStream is = dataTransferer.new ReencodingInputStream(transferable.getByteInputStream(), TEXT_FORMAT,
+ DataTransferer.getTextCharset(transferable.getDataFlavor()), transferable);
+
+ byte[] bytes = transferable.getBytes();
+ byte[] result = new byte[bytes.length];
+
+ is.read(result);
+
+ for (int i = 0; i < bytes.length; i++) {
+ if (bytes[i] != result[i]) {
+ throw new RuntimeException("Characters are not equal!");
+ }
+ }
+
+ }
+
+ static class ByteTransferable implements Transferable, ClipboardOwner {
+
+ private final DataFlavor dataFlavor;
+
+ public ByteTransferable() throws Exception {
+ dataFlavor = DataFlavor.getTextPlainUnicodeFlavor();
+ }
+
+ public DataFlavor getDataFlavor() {
+ return dataFlavor;
+ }
+
+ public DataFlavor[] getTransferDataFlavors() {
+ return new DataFlavor[]{dataFlavor};
+ }
+
+ public boolean isDataFlavorSupported(DataFlavor flavor) {
+ return flavor.equals(dataFlavor);
+ }
+
+ public byte[] getBytes() {
+ return new byte[]{97, 0, 64, -40, 32, -36, 98, 0};
+ }
+
+ public InputStream getByteInputStream() {
+ return new ByteArrayInputStream(getBytes());
+ }
+
+ public Object getTransferData(DataFlavor flavor)
+ throws UnsupportedFlavorException, IOException {
+ if (flavor.equals(dataFlavor)) {
+ return getByteInputStream();
+ } else {
+ throw new UnsupportedFlavorException(flavor);
+ }
+ }
+
+ public void lostOwnership(Clipboard clipboard, Transferable contents) {
+ }
+ }
+
+ static class TestDataTransferer extends DataTransferer {
+
+ @Override
+ public String getDefaultUnicodeEncoding() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public boolean isLocaleDependentTextFormat(long format) {
+ return false;
+ }
+
+ @Override
+ public boolean isFileFormat(long format) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public boolean isImageFormat(long format) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ protected Long getFormatForNativeAsLong(String str) {
+ return TEXT_FORMAT;
+ }
+
+ @Override
+ protected String getNativeForFormat(long format) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ protected ByteArrayOutputStream convertFileListToBytes(
+ ArrayList<String> fileList) throws IOException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ protected String[] dragQueryFile(byte[] bytes) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ protected Image platformImageBytesOrStreamToImage(InputStream str,
+ byte[] bytes, long format) throws IOException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ protected byte[] imageToPlatformBytes(Image image, long format)
+ throws IOException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public ToolkitThreadBlockedHandler getToolkitThreadBlockedHandler() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+ }
+}
\ No newline at end of file
--- a/jdk/test/sun/misc/Cleaner/ExitOnThrow.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/sun/misc/Cleaner/ExitOnThrow.java Tue Mar 12 18:12:44 2013 -0700
@@ -28,21 +28,17 @@
public class ExitOnThrow {
- private static volatile boolean ran = false;
-
public static void main(String[] args) throws Exception {
Cleaner.create(new Object(),
new Runnable() {
public void run() {
- ran = true;
throw new RuntimeException("Foo!");
}
});
- while (!ran) {
+ while (true) {
System.gc();
Thread.sleep(100);
}
- System.exit(0);
}
}
--- a/jdk/test/sun/misc/Cleaner/exitOnThrow.sh Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/sun/misc/Cleaner/exitOnThrow.sh Tue Mar 12 18:12:44 2013 -0700
@@ -25,7 +25,7 @@
#
# @test
-# @bug 4954921
+# @bug 4954921 8009259
# @summary Ensure that if a cleaner throws an exception then the VM exits
#
# @build ExitOnThrow
--- a/jdk/test/sun/net/www/protocol/http/HttpOnly.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/sun/net/www/protocol/http/HttpOnly.java Tue Mar 12 18:12:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, 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
@@ -22,7 +22,7 @@
*/
/**
* @test
- * @bug 7095980
+ * @bug 7095980 8007315
* @summary Ensure HttpURLConnection (and supporting APIs) don't expose
* HttpOnly cookies
*/
@@ -52,6 +52,8 @@
* 4) check HttpOnly cookies received by server
* 5) server reply with Set-Cookie containing HttpOnly cookie
* 6) check HttpOnly cookies are not accessible from Http client
+ * 7) check that non-null (empty string) values are returned for
+ scenario where all values are stripped from original key values
*/
public class HttpOnly {
@@ -177,6 +179,36 @@
" value " + val);
}
}
+
+ // TEST 7 : check that header keys containing empty key values don't return null
+ int i = 1;
+ String key = "";
+ String value = "";
+
+ while (true) {
+ key = uc.getHeaderFieldKey(i);
+ value = uc.getHeaderField(i++);
+ if (key == null && value == null)
+ break;
+
+ if (key != null)
+ check(value != null,
+ "Encountered a null value for key value : " + key);
+ }
+
+ // TEST 7.5 similar test but use getHeaderFields
+ respHeaders = uc.getHeaderFields();
+ respEntries = respHeaders.entrySet();
+ for (Map.Entry<String,List<String>> entry : respEntries) {
+ String header = entry.getKey();
+ if (header != null) {
+ List<String> listValues = entry.getValue();
+ for (String value1 : listValues)
+ check(value1 != null,
+ "getHeaderFields returned null values for header:, "
+ + header);
+ }
+ }
}
// HTTP Server
--- a/jdk/test/sun/security/krb5/auto/Context.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/sun/security/krb5/auto/Context.java Tue Mar 12 18:12:44 2013 -0700
@@ -297,6 +297,13 @@
}
/**
+ * Returns the cred inside, if there is one
+ */
+ public GSSCredential cred() {
+ return cred;
+ }
+
+ /**
* Disposes the GSSContext within
* @throws org.ietf.jgss.GSSException
*/
--- a/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java Tue Mar 12 18:12:44 2013 -0700
@@ -55,6 +55,7 @@
import org.ietf.jgss.GSSManager;
import sun.security.jgss.GSSUtil;
import sun.security.krb5.Config;
+import java.util.Base64;
/**
* Basic JGSS/krb5 test with 3 parties: client, server, backend server. Each
@@ -341,12 +342,11 @@
exch.getHttpContext().getAttributes().put("GSSContext", c);
return new com.sun.net.httpserver.Authenticator.Retry(err);
} else { // Later requests
- byte[] token = new sun.misc.BASE64Decoder()
- .decodeBuffer(auth.split(" ")[1]);
+ byte[] token = Base64.getMimeDecoder().decode(auth.split(" ")[1]);
token = c.acceptSecContext(token, 0, token.length);
Headers map = exch.getResponseHeaders();
- map.set (reqHdr, scheme + " " + new sun.misc.BASE64Encoder()
- .encode(token).replaceAll("\\s", ""));
+ map.set (reqHdr, scheme + " " + Base64.getMimeEncoder()
+ .encodeToString(token).replaceAll("\\s", ""));
if (c.isEstablished()) {
return new com.sun.net.httpserver.Authenticator.Success(
new HttpPrincipal(c.getSrcName().toString(), ""));
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/security/krb5/auto/SpnegoLifeTime.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2013, 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 8000653
+ * @summary SPNEGO tests fail at context.getDelegCred().getRemainingInitLifetime(mechOid)
+ * @compile -XDignore.symbol.file SpnegoLifeTime.java
+ * @run main/othervm SpnegoLifeTime
+ */
+
+import org.ietf.jgss.Oid;
+import org.ietf.jgss.GSSCredential;
+import sun.security.jgss.GSSUtil;
+
+public class SpnegoLifeTime {
+
+ public static void main(String[] args) throws Exception {
+
+ Oid oid = GSSUtil.GSS_SPNEGO_MECH_OID;
+ new OneKDC(null).writeJAASConf();
+
+ Context c, s;
+ c = Context.fromJAAS("client");
+ s = Context.fromJAAS("server");
+
+ c.startAsClient(OneKDC.SERVER, oid);
+ c.x().requestCredDeleg(true);
+ s.startAsServer(oid);
+
+ Context.handshake(c, s);
+
+ GSSCredential cred = s.delegated().cred();
+ cred.getRemainingInitLifetime(oid);
+ cred.getUsage(oid);
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/security/provider/PolicyFile/WildcardPrincipalName.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2013, 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 8008908
+ * @summary wildcard principal names are not processed correctly
+ * @run main/othervm/policy=wildcard.policy WildcardPrincipalName
+ */
+
+import java.security.AccessController;
+import java.security.Permission;
+import java.security.Principal;
+import java.security.PrivilegedAction;
+import java.util.HashSet;
+import java.util.PropertyPermission;
+import java.util.Set;
+import javax.security.auth.Subject;
+import javax.security.auth.x500.X500Principal;
+
+public class WildcardPrincipalName {
+
+ public static void main(String[] args) throws Exception {
+
+ X500Principal duke = new X500Principal("CN=Duke");
+ PropertyPermission pp = new PropertyPermission("user.home", "read");
+ RunAsPrivilegedUserAction runAsPrivilegedUserAction
+ = new RunAsPrivilegedUserAction(duke,
+ new CheckPermissionAction(pp));
+ AccessController.doPrivileged(runAsPrivilegedUserAction);
+ System.out.println("test PASSED");
+ }
+
+ private static class RunAsPrivilegedUserAction
+ implements PrivilegedAction<Void> {
+ private final PrivilegedAction<Void> action;
+ private final Principal principal;
+
+ RunAsPrivilegedUserAction(Principal principal,
+ PrivilegedAction<Void> action) {
+ this.principal = principal;
+ this.action = action;
+ }
+
+ @Override public Void run() {
+ Set<Principal> principals = new HashSet<>();
+ Set<Object> publicCredentials = new HashSet<>();
+ Set<Object> privateCredentials = new HashSet<>();
+
+ principals.add(principal);
+ Subject subject = new Subject(true,
+ principals,
+ publicCredentials,
+ privateCredentials);
+
+ Subject.doAsPrivileged(subject, action, null);
+ return null;
+ }
+ }
+
+ private static class CheckPermissionAction
+ implements PrivilegedAction<Void> {
+ private final Permission permission;
+
+ CheckPermissionAction(Permission permission) {
+ this.permission = permission;
+ }
+
+ @Override public Void run() {
+ AccessController.checkPermission(permission);
+ return null;
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/security/provider/PolicyFile/wildcard.policy Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,7 @@
+grant principal javax.security.auth.x500.X500Principal * {
+ permission java.util.PropertyPermission "user.home", "read";
+};
+
+grant {
+ permission javax.security.auth.AuthPermission "doAsPrivileged";
+};
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/MD2InTrustAnchor.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/MD2InTrustAnchor.java Tue Mar 12 18:12:44 2013 -0700
@@ -46,8 +46,7 @@
import java.security.cert.CertificateFactory;
import java.security.spec.*;
import java.security.interfaces.*;
-import sun.misc.BASE64Decoder;
-
+import java.util.Base64;
public class MD2InTrustAnchor {
@@ -238,7 +237,7 @@
if (keyCertStr != null) {
// generate the private key.
PKCS8EncodedKeySpec priKeySpec = new PKCS8EncodedKeySpec(
- new BASE64Decoder().decodeBuffer(keySpecStr));
+ Base64.getMimeDecoder().decode(keySpecStr));
KeyFactory kf = KeyFactory.getInstance("RSA");
RSAPrivateKey priKey =
(RSAPrivateKey)kf.generatePrivate(priKeySpec);
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/TrustTrustedCert.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/TrustTrustedCert.java Tue Mar 12 18:12:44 2013 -0700
@@ -44,7 +44,7 @@
import java.security.cert.*;
import java.security.spec.*;
import java.security.interfaces.*;
-import sun.misc.BASE64Decoder;
+import java.util.Base64;
public class TrustTrustedCert {
@@ -230,7 +230,7 @@
// generate the private key.
PKCS8EncodedKeySpec priKeySpec = new PKCS8EncodedKeySpec(
- new BASE64Decoder().decodeBuffer(targetPrivateKey));
+ Base64.getMimeDecoder().decode(targetPrivateKey));
KeyFactory kf = KeyFactory.getInstance("RSA");
RSAPrivateKey priKey =
(RSAPrivateKey)kf.generatePrivate(priKeySpec);
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/BasicConstraints.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/BasicConstraints.java Tue Mar 12 18:12:44 2013 -0700
@@ -44,7 +44,7 @@
import java.security.interfaces.*;
import java.math.BigInteger;
-import sun.misc.BASE64Decoder;
+import java.util.Base64;
public class BasicConstraints {
@@ -400,11 +400,11 @@
PKCS8EncodedKeySpec priKeySpec = null;
if (isServer) {
priKeySpec = new PKCS8EncodedKeySpec(
- new BASE64Decoder().decodeBuffer(serverPrivateKey));
+ Base64.getMimeDecoder().decode(serverPrivateKey));
is = new ByteArrayInputStream(serverCertStr.getBytes());
} else {
priKeySpec = new PKCS8EncodedKeySpec(
- new BASE64Decoder().decodeBuffer(clientPrivateKey));
+ Base64.getMimeDecoder().decode(clientPrivateKey));
is = new ByteArrayInputStream(clientCertStr.getBytes());
}
KeyFactory kf = KeyFactory.getInstance("RSA");
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/SelfIssuedCert.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/SelfIssuedCert.java Tue Mar 12 18:12:44 2013 -0700
@@ -45,7 +45,7 @@
import java.security.interfaces.*;
import java.math.BigInteger;
-import sun.misc.BASE64Decoder;
+import java.util.Base64;
public class SelfIssuedCert {
@@ -242,7 +242,7 @@
if (keyCertStr != null) {
// generate the private key.
PKCS8EncodedKeySpec priKeySpec = new PKCS8EncodedKeySpec(
- new BASE64Decoder().decodeBuffer(keySpecStr));
+ Base64.getMimeDecoder().decode(keySpecStr));
KeyFactory kf = KeyFactory.getInstance("RSA");
RSAPrivateKey priKey =
(RSAPrivateKey)kf.generatePrivate(priKeySpec);
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ProxyTunnelServer.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ProxyTunnelServer.java Tue Mar 12 18:12:44 2013 -0700
@@ -33,6 +33,7 @@
import javax.net.ssl.*;
import javax.net.ServerSocketFactory;
import sun.net.www.*;
+import java.util.Base64;
public class ProxyTunnelServer extends Thread {
@@ -292,12 +293,12 @@
authInfo.trim();
int ind = authInfo.indexOf(' ');
String recvdUserPlusPass = authInfo.substring(ind + 1).trim();
+
// extract encoded (username:passwd
if (userPlusPass.equals(
- new String(
- (new sun.misc.BASE64Decoder()).
- decodeBuffer(recvdUserPlusPass)
- ))) {
+ new String( Base64.getMimeDecoder()
+ .decode(recvdUserPlusPass))))
+ {
matched = true;
}
} catch (Exception e) {
--- a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketSNISensitive.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketSNISensitive.java Tue Mar 12 18:12:44 2013 -0700
@@ -51,7 +51,7 @@
import java.security.cert.CertificateFactory;
import java.security.spec.*;
import java.security.interfaces.*;
-import sun.misc.BASE64Decoder;
+import java.util.Base64;
public class SSLSocketSNISensitive {
@@ -391,7 +391,7 @@
// generate the private key.
String keySpecStr = keyStrs[i];
PKCS8EncodedKeySpec priKeySpec = new PKCS8EncodedKeySpec(
- new BASE64Decoder().decodeBuffer(keySpecStr));
+ Base64.getMimeDecoder().decode(keySpecStr));
KeyFactory kf = KeyFactory.getInstance("RSA");
RSAPrivateKey priKey =
(RSAPrivateKey)kf.generatePrivate(priKeySpec);
--- a/jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/DisabledShortRSAKeys.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/DisabledShortRSAKeys.java Tue Mar 12 18:12:44 2013 -0700
@@ -53,7 +53,7 @@
import java.security.cert.CertificateFactory;
import java.security.spec.*;
import java.security.interfaces.*;
-import sun.misc.BASE64Decoder;
+import java.util.Base64;
public class DisabledShortRSAKeys {
@@ -244,7 +244,7 @@
if (keyCertStr != null) {
// generate the private key.
PKCS8EncodedKeySpec priKeySpec = new PKCS8EncodedKeySpec(
- new BASE64Decoder().decodeBuffer(keySpecStr));
+ Base64.getMimeDecoder().decode(keySpecStr));
KeyFactory kf = KeyFactory.getInstance("RSA");
RSAPrivateKey priKey =
(RSAPrivateKey)kf.generatePrivate(priKeySpec);
--- a/jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKey512.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKey512.java Tue Mar 12 18:12:44 2013 -0700
@@ -48,7 +48,7 @@
import java.security.cert.CertificateFactory;
import java.security.spec.*;
import java.security.interfaces.*;
-import sun.misc.BASE64Decoder;
+import java.util.Base64;
public class ShortRSAKey512 {
@@ -229,7 +229,7 @@
if (keyCertStr != null) {
// generate the private key.
PKCS8EncodedKeySpec priKeySpec = new PKCS8EncodedKeySpec(
- new BASE64Decoder().decodeBuffer(keySpecStr));
+ Base64.getMimeDecoder().decode(keySpecStr));
KeyFactory kf = KeyFactory.getInstance("RSA");
RSAPrivateKey priKey =
(RSAPrivateKey)kf.generatePrivate(priKeySpec);
--- a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/ProxyTunnelServer.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/ProxyTunnelServer.java Tue Mar 12 18:12:44 2013 -0700
@@ -35,6 +35,7 @@
import javax.net.ssl.*;
import javax.net.ServerSocketFactory;
import sun.net.www.*;
+import java.util.Base64;
public class ProxyTunnelServer extends Thread {
@@ -296,10 +297,9 @@
String recvdUserPlusPass = authInfo.substring(ind + 1).trim();
// extract encoded (username:passwd
if (userPlusPass.equals(
- new String(
- (new sun.misc.BASE64Decoder()).
- decodeBuffer(recvdUserPlusPass)
- ))) {
+ new String( Base64.getMimeDecoder()
+ .decode(recvdUserPlusPass))))
+ {
matched = true;
}
} catch (Exception e) {
--- a/jdk/test/sun/tools/jrunscript/CheckEngine.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/sun/tools/jrunscript/CheckEngine.java Tue Mar 12 18:12:44 2013 -0700
@@ -33,7 +33,7 @@
public static void main(String... args) {
int exitCode = 0;
ScriptEngine engine =
- (new ScriptEngineManager()).getEngineByName("js");
+ (new ScriptEngineManager()).getEngineByName("nashorn");
if (engine == null &&
!(System.getProperty("java.runtime.name").startsWith("Java(TM)"))) {
--- a/jdk/test/sun/tools/jrunscript/jrunscript-DTest.sh Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/sun/tools/jrunscript/jrunscript-DTest.sh Tue Mar 12 18:12:44 2013 -0700
@@ -43,7 +43,7 @@
# to script as java.lang.System property. sysProps is
# jrunscript shell built-in variable for System properties.
-${JRUNSCRIPT} -Djrunscript.foo=bar <<EOF
+${JRUNSCRIPT} -l nashorn -Djrunscript.foo=bar <<EOF
if (sysProps["jrunscript.foo"] == "bar") { println("Passed"); exit(0); }
// unexpected value
println("Unexpected System property value");
--- a/jdk/test/sun/tools/jrunscript/jrunscript-argsTest.sh Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/sun/tools/jrunscript/jrunscript-argsTest.sh Tue Mar 12 18:12:44 2013 -0700
@@ -41,7 +41,7 @@
# we check whether "excess" args are passed as script arguments
-${JRUNSCRIPT} -J-Djava.awt.headless=true -f - hello world <<EOF
+${JRUNSCRIPT} -l nashorn -J-Djava.awt.headless=true -f - hello world <<EOF
if (typeof(arguments) == 'undefined') { println("arguments expected"); exit(1); }
--- a/jdk/test/sun/tools/jrunscript/jrunscript-cpTest.sh Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/sun/tools/jrunscript/jrunscript-cpTest.sh Tue Mar 12 18:12:44 2013 -0700
@@ -46,7 +46,7 @@
# work with jrunscript. Script should be able to
# access Java class "Hello".
-${JRUNSCRIPT} -cp . <<EOF
+${JRUNSCRIPT} -l nashorn -cp . <<EOF
var v;
try { v = new Packages.Hello(); } catch (e) { println(e); exit(1) }
if (v.string != 'hello') { println("Unexpected property value"); exit(1); }
@@ -58,7 +58,7 @@
# -classpath and -cp are synonyms
-${JRUNSCRIPT} -classpath . <<EOF
+${JRUNSCRIPT} -l nashorn -classpath . <<EOF
var v;
try { v = new Packages.Hello(); } catch (e) { println(e); exit(1) }
if (v.string != 'hello') { println("unexpected property value"); exit(1); }
--- a/jdk/test/sun/tools/jrunscript/jrunscript-eTest.sh Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/sun/tools/jrunscript/jrunscript-eTest.sh Tue Mar 12 18:12:44 2013 -0700
@@ -39,21 +39,10 @@
exit 0
fi
-rm -f jrunscript-eTest.out 2>/dev/null
-${JRUNSCRIPT} -J-Djava.awt.headless=true -e "println('hello')" > jrunscript-eTest.out 2>&1
-
-$golden_diff jrunscript-eTest.out ${TESTSRC}/dash-e.out
-if [ $? != 0 ]
-then
- echo "Output of jrunscript -e differ from expected output. Failed."
- rm -f jrunscript-eTest.out 2>/dev/null
- exit 1
-fi
-
# -e option with JavaScript explicitly choosen as language
rm -f jrunscript-eTest.out 2>/dev/null
-${JRUNSCRIPT} -J-Djava.awt.headless=true -l js -e "println('hello')" > jrunscript-eTest.out 2>&1
+${JRUNSCRIPT} -J-Djava.awt.headless=true -l nashorn -e "println('hello')" > jrunscript-eTest.out 2>&1
$golden_diff jrunscript-eTest.out ${TESTSRC}/dash-e.out
if [ $? != 0 ]
--- a/jdk/test/sun/tools/jrunscript/jrunscript-fTest.sh Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/sun/tools/jrunscript/jrunscript-fTest.sh Tue Mar 12 18:12:44 2013 -0700
@@ -39,22 +39,11 @@
exit 0
fi
-rm -f jrunscript-fTest.out 2>/dev/null
-${JRUNSCRIPT} -J-Djava.awt.headless=true -f ${TESTSRC}/hello.js > jrunscript-fTest.out 2>&1
-
-$golden_diff jrunscript-fTest.out ${TESTSRC}/dash-f.out
-if [ $? != 0 ]
-then
- echo "Output of jrunscript -f differ from expected output. Failed."
- rm -f jrunscript-fTest.out 2>/dev/null
- exit 1
-fi
-
# -f option used with JavaScript as language chosen explicitly
# with -l option
rm -f jrunscript-fTest.out 2>/dev/null
-${JRUNSCRIPT} -J-Djava.awt.headless=true -l js -f ${TESTSRC}/hello.js > jrunscript-fTest.out 2>&1
+${JRUNSCRIPT} -J-Djava.awt.headless=true -l nashorn -f ${TESTSRC}/hello.js > jrunscript-fTest.out 2>&1
$golden_diff jrunscript-fTest.out ${TESTSRC}/dash-f.out
if [ $? != 0 ]
--- a/jdk/test/sun/tools/jrunscript/jrunscriptTest.sh Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/sun/tools/jrunscript/jrunscriptTest.sh Tue Mar 12 18:12:44 2013 -0700
@@ -40,7 +40,7 @@
fi
rm -f jrunscriptTest.out 2>/dev/null
-${JRUNSCRIPT} -J-Djava.awt.headless=true > jrunscriptTest.out 2>&1 <<EOF
+${JRUNSCRIPT} -J-Djava.awt.headless=true -l nashorn > jrunscriptTest.out 2>&1 <<EOF
v = 2 + 5;
v *= 5;
v = v + " is the value";
@@ -52,25 +52,7 @@
$golden_diff jrunscriptTest.out ${TESTSRC}/repl.out
if [ $? != 0 ]
then
- echo "Output of jrunscript session differ from expected output. Failed."
- rm -f jrunscriptTest.out 2>/dev/null
- exit 1
-fi
-
-rm -f jrunscriptTest.out 2>/dev/null
-${JRUNSCRIPT} -J-Djava.awt.headless=true -l js > jrunscriptTest.out 2>&1 <<EOF
-v = 2 + 5;
-v *= 5;
-v = v + " is the value";
-if (v != 0) { println('yes v != 0'); }
-java.lang.System.out.println('hello world from script');
-new java.lang.Runnable() { run: function() { println('I am runnable'); }}.run();
-EOF
-
-$golden_diff jrunscriptTest.out ${TESTSRC}/repl.out
-if [ $? != 0 ]
-then
- echo "Output of jrunscript -l js differ from expected output. Failed."
+ echo "Output of jrunscript -l nashorn differ from expected output. Failed."
rm -f jrunscriptTest.out 2>/dev/null
exit 1
fi
--- a/jdk/test/sun/tools/jrunscript/repl.out Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/sun/tools/jrunscript/repl.out Tue Mar 12 18:12:44 2013 -0700
@@ -1,7 +1,7 @@
-js> 7.0
-js> 35.0
-js> 35 is the value
-js> yes v != 0
-js> hello world from script
-js> I am runnable
-js>
\ No newline at end of file
+nashorn> 7
+nashorn> 35.0
+nashorn> 35 is the value
+nashorn> yes v != 0
+nashorn> hello world from script
+nashorn> I am runnable
+nashorn>
\ No newline at end of file
--- a/jdk/test/tools/launcher/I18NJarTest.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/tools/launcher/I18NJarTest.java Tue Mar 12 18:12:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, 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
@@ -52,6 +52,8 @@
private static final File cwd = new File(".");
private static final File dir = new File("\uFF66\uFF67\uFF68\uFF69");
private static final String encoding = System.getProperty("sun.jnu.encoding", "");
+ private static final String LANG = System.getenv("LANG");
+ private static final String LC_ALL = System.getenv("LC_ALL");
public static void main(String... args) throws Exception {
boolean localeAvailable = false;
@@ -63,7 +65,16 @@
}
if (!localeAvailable) {
System.out.println("Warning: locale: " + Locale.JAPAN
- + " not found, test passes vacuosly");
+ + " not found, test passes vacuously");
+ return;
+ }
+ if ("C".equals(LC_ALL) || "C".equals(LANG)) {
+ System.out.println("Warning: The LANG and/or LC_ALL env vars are " +
+ "set to \"C\":\n" +
+ " LANG=" + LANG + "\n" +
+ " LC_ALL=" + LC_ALL + "\n" +
+ "This test requires support for multi-byte filenames.\n" +
+ "Test passes vacuously.");
return;
}
if (encoding.equals("MS932") || encoding.equals("UTF-8")) {
@@ -73,7 +84,7 @@
} else {
System.out.println("Warning: current encoding is " + encoding +
"this test requires MS932 <Ja> or UTF-8," +
- " test passes vacuosly");
+ " test passes vacuously");
return;
}
dir.mkdir();
--- a/jdk/test/tools/launcher/VersionCheck.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/tools/launcher/VersionCheck.java Tue Mar 12 18:12:44 2013 -0700
@@ -74,6 +74,7 @@
"jmap",
"jps",
"jrunscript",
+ "jjs",
"jsadebugd",
"jstack",
"jstat",
--- a/jdk/test/tools/pack200/AttributeTests.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/tools/pack200/AttributeTests.java Tue Mar 12 18:12:44 2013 -0700
@@ -29,7 +29,7 @@
import static java.nio.file.StandardOpenOption.*;
/*
* @test
- * @bug 6746111 8005252
+ * @bug 6746111 8005252 8008262
* @summary tests various classfile format and attribute handling by pack200
* @compile -XDignore.symbol.file Utils.java AttributeTests.java
* @run main AttributeTests
@@ -67,17 +67,7 @@
File testjarFile = new File(cwd, "test" + Utils.JAR_FILE_EXT);
Utils.jar("cvf", testjarFile.getName(), javaClassName);
- // pack using --repack
- File outjarFile = new File(cwd, "out" + Utils.JAR_FILE_EXT);
- scratch.clear();
- scratch.add(Utils.getPack200Cmd());
- scratch.add("--repack");
- scratch.add("--unknown-attribute=error");
- scratch.add(outjarFile.getName());
- scratch.add(testjarFile.getName());
- Utils.runExec(scratch);
-
- Utils.doCompareVerify(testjarFile, outjarFile);
+ Utils.testWithRepack(testjarFile, "--unknown-attribute=error");
}
/*
* this test checks to see if we get the expected strings for output
--- a/jdk/test/tools/pack200/InstructionTests.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/tools/pack200/InstructionTests.java Tue Mar 12 18:12:44 2013 -0700
@@ -26,11 +26,10 @@
import java.util.ArrayList;
import java.util.List;
import static java.nio.file.StandardOpenOption.*;
-import java.util.regex.Pattern;
/*
* @test
- * @bug 8003549
+ * @bug 8003549 8007297
* @summary tests class files instruction formats introduced in JSR-335
* @compile -XDignore.symbol.file Utils.java InstructionTests.java
* @run main InstructionTests
@@ -48,52 +47,34 @@
List<String> scratch = new ArrayList<>();
final String fname = "A";
String javaFileName = fname + Utils.JAVA_FILE_EXT;
- scratch.add("interface IntIterator {");
+ scratch.add("interface I {");
scratch.add(" default void forEach(){}");
scratch.add(" static void next() {}");
scratch.add("}");
- scratch.add("class A implements IntIterator {");
- scratch.add("public void forEach(Object o){");
- scratch.add("IntIterator.super.forEach();");
- scratch.add("IntIterator.next();");
- scratch.add("}");
+ scratch.add("class A implements I {");
+ scratch.add(" public void forEach(Object o){");
+ scratch.add(" I.super.forEach();");
+ scratch.add(" I.next();");
+ scratch.add(" }");
scratch.add("}");
File cwd = new File(".");
File javaFile = new File(cwd, javaFileName);
Files.write(javaFile.toPath(), scratch, Charset.defaultCharset(),
CREATE, TRUNCATE_EXISTING);
- // make sure we have -g so that we compare LVT and LNT entries
+ // -g to compare LVT and LNT entries
Utils.compiler("-g", javaFile.getName());
+ File propsFile = new File("pack.props");
+ scratch.clear();
+ scratch.add("com.sun.java.util.jar.pack.class.format.error=error");
+ scratch.add("pack.unknown.attribute=error");
+ Files.write(propsFile.toPath(), scratch, Charset.defaultCharset(),
+ CREATE, TRUNCATE_EXISTING);
// jar the file up
File testjarFile = new File(cwd, "test" + Utils.JAR_FILE_EXT);
Utils.jar("cvf", testjarFile.getName(), ".");
- // pack using --repack
- File outjarFile = new File(cwd, "out" + Utils.JAR_FILE_EXT);
- scratch.clear();
- scratch.add(Utils.getPack200Cmd());
- scratch.add("-J-ea");
- scratch.add("-J-esa");
- scratch.add("--repack");
- scratch.add(outjarFile.getName());
- scratch.add(testjarFile.getName());
- List<String> output = Utils.runExec(scratch);
- // TODO remove this when we get bc escapes working correctly
- // this test anyhow would fail at that time
- findString("WARNING: Passing.*" + fname + Utils.CLASS_FILE_EXT,
- output);
-
- Utils.doCompareVerify(testjarFile, outjarFile);
- }
-
- static boolean findString(String str, List<String> list) {
- Pattern p = Pattern.compile(str);
- for (String x : list) {
- if (p.matcher(x).matches())
- return true;
- }
- throw new RuntimeException("Error: " + str + " not found in output");
+ Utils.testWithRepack(testjarFile, "--config-file=" + propsFile.getName());
}
}
--- a/jdk/test/tools/pack200/Utils.java Mon Mar 04 15:40:12 2013 +0100
+++ b/jdk/test/tools/pack200/Utils.java Tue Mar 12 18:12:44 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, 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
@@ -315,6 +315,41 @@
}
}
+ static void testWithRepack(File inFile, String... repackOpts) throws IOException {
+ File cwd = new File(".");
+ // pack using --repack in native mode
+ File nativejarFile = new File(cwd, "out-n" + Utils.JAR_FILE_EXT);
+ repack(inFile, nativejarFile, false, repackOpts);
+ doCompareVerify(inFile, nativejarFile);
+
+ // ensure bit compatibility between the unpacker variants
+ File javajarFile = new File(cwd, "out-j" + Utils.JAR_FILE_EXT);
+ repack(inFile, javajarFile, true, repackOpts);
+ doCompareBitWise(javajarFile, nativejarFile);
+ }
+
+ static List<String> repack(File inFile, File outFile,
+ boolean disableNative, String... extraOpts) {
+ List<String> cmdList = new ArrayList<>();
+ cmdList.clear();
+ cmdList.add(Utils.getJavaCmd());
+ cmdList.add("-ea");
+ cmdList.add("-esa");
+ if (disableNative) {
+ cmdList.add("-Dcom.sun.java.util.jar.pack.disable.native=true");
+ }
+ cmdList.add("com.sun.java.util.jar.pack.Driver");
+ cmdList.add("--repack");
+ if (extraOpts != null) {
+ for (String opt: extraOpts) {
+ cmdList.add(opt);
+ }
+ }
+ cmdList.add(outFile.getName());
+ cmdList.add(inFile.getName());
+ return Utils.runExec(cmdList);
+ }
+
// given a jar file foo.jar will write to foo.pack
static void pack(JarFile jarFile, File packFile) throws IOException {
Pack200.Packer packer = Pack200.newPacker();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/vm/verifier/TestStaticIF.java Tue Mar 12 18:12:44 2013 -0700
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2013, 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 8007736
+ * @summary Test static interface method.
+ * @run main/othervm -Xverify:all -XX:-UseSplitVerifier TestStaticIF
+ */
+
+public class TestStaticIF implements StaticMethodInInterface {
+
+ public static void main(String[] args) {
+ System.out.printf("main: %s%n", StaticMethodInInterface.get());
+ }
+}
+
+interface StaticMethodInInterface {
+
+ public static String get() {
+ return "Hello from StaticMethodInInterface.get()";
+ }
+}