Skip to content

D
dragonwell8_jdk

openanolis / dragonwell8_jdk

通知 4
Star 2
Fork 0
D
dragonwell8_jdk
提交 b5d6b146 编写于 作者: L lana
浏览文件
操作

Merge

上级 1853e76a bcca3b51
展开全部 隐藏空白更改
内联 并排
Showing with 14176 addition and 7947 deletion
make/common/Release.gmk
浏览文件 @ b5d6b146
......@@ -348,7 +348,6 @@ TOOLS = \
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 @@ $(NOT_RT_JAR_LIST): FRC
$(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" >> $@
......
make/java/java/FILES_java.gmk
浏览文件 @ b5d6b146
......@@ -257,6 +257,7 @@ JAVA_JAVA_java = \
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 \
......
make/java/zip/Makefile
浏览文件 @ b5d6b146
......@@ -68,6 +68,16 @@ ifeq ($(PLATFORM), solaris)
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
......
make/launchers/Makefile
浏览文件 @ b5d6b146
......@@ -77,6 +77,7 @@ $(call make-launcher, jmap, sun.tools.jmap.JMap, \
-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 \
......
make/sun/cmm/lcms/Makefile
浏览文件 @ b5d6b146
......@@ -28,6 +28,9 @@ PACKAGE = sun.java2d.cmm.lcms
LIBRARY = lcms
PRODUCT = sun
# Use highest level of optimization on this library
OPTIMIZATION_LEVEL = HIGHEST
include $(BUILDDIR)/common/Defs.gmk
#
......
make/sun/cmm/lcms/mapfile-vers
浏览文件 @ b5d6b146
......@@ -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;
......
make/tools/src/build/tools/deps/refs.allowed
浏览文件 @ b5d6b146
......@@ -33,8 +33,3 @@ sun.security.krb5.Realm=sun.security.ssl.krb5.KerberosClientKeyExchangeImpl,comp
#
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
make/tools/src/build/tools/javazic/Gen.java 已删除 100644 → 0
浏览文件 @ 1853e76a
/*
* 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;
}
}
make/tools/src/build/tools/javazic/Main.java 已删除 100644 → 0
浏览文件 @ 1853e76a
/*
* 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);
}
}
make/tools/src/build/tools/javazic/Mappings.java 已删除 100644 → 0
浏览文件 @ 1853e76a
/*
* 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;
}
}
make/tools/src/build/tools/javazic/Rule.java 已删除 100644 → 0
浏览文件 @ 1853e76a
/*
* 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;
}
}
make/tools/src/build/tools/javazic/RuleDay.java 已删除 100644 → 0
浏览文件 @ 1853e76a
/*
* 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);
}
}
make/tools/src/build/tools/javazic/RuleRec.java 已删除 100644 → 0
浏览文件 @ 1853e76a
/*
* 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);
}
}
make/tools/src/build/tools/javazic/Simple.java 已删除 100644 → 0
浏览文件 @ 1853e76a
/*
* 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;
}
}
make/tools/src/build/tools/javazic/Time.java 已删除 100644 → 0
浏览文件 @ 1853e76a
/*
* 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();
}
}
make/tools/src/build/tools/javazic/Timezone.java 已删除 100644 → 0
浏览文件 @ 1853e76a
/*
* 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;
}
}
make/tools/src/build/tools/javazic/Zone.java 已删除 100644 → 0
浏览文件 @ 1853e76a
/*
* 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);
}
}
}
make/tools/src/build/tools/javazic/ZoneRec.java 已删除 100644 → 0
浏览文件 @ 1853e76a
/*
* 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);
}
}
makefiles/CompileLaunchers.gmk
浏览文件 @ b5d6b146
......@@ -311,6 +311,9 @@ $(eval $(call SetupLauncher,jps,\
$(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" }' \
......
makefiles/CompileNativeLibraries.gmk
浏览文件 @ b5d6b146
......@@ -1219,7 +1219,7 @@ ifdef OPENJDK
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 \
......
makefiles/CreateJars.gmk
浏览文件 @ b5d6b146
......@@ -213,28 +213,28 @@ RT_JAR_EXCLUDES += \
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 @@ endif
##########################################################################################
# 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
##########################################################################################
......
makefiles/Images.gmk
浏览文件 @ b5d6b146
......@@ -609,6 +609,7 @@ define create-info-file
$(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
......
makefiles/mapfiles/liblcms/mapfile-vers
浏览文件 @ b5d6b146
......@@ -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;
......
makefiles/profile-rtjar-includes.txt
浏览文件 @ b5d6b146
......@@ -349,6 +349,7 @@ PROFILE_3_RTJAR_INCLUDE_PACKAGES := \
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 @@ PROFILE_3_RTJAR_INCLUDE_PACKAGES := \
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 @@ PROFILE_3_RTJAR_EXCLUDE_TYPES := \
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
......
src/macosx/classes/com/apple/laf/AquaComboBoxUI.java
浏览文件 @ b5d6b146
/*
* 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.border.Border;
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 @@ public class AquaComboBoxUI extends BasicComboBoxUI implements Sizeable {
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();
......
src/macosx/classes/sun/awt/CGraphicsConfig.java
浏览文件 @ b5d6b146
......@@ -53,7 +53,7 @@ public abstract class CGraphicsConfig extends GraphicsConfiguration
@Override
public Rectangle getBounds() {
final Rectangle2D nativeBounds = nativeGetBounds(device.getCoreGraphicsScreen());
final Rectangle2D nativeBounds = nativeGetBounds(device.getCGDisplayID());
return nativeBounds.getBounds(); // does integer rounding
}
......
src/macosx/classes/sun/awt/CGraphicsDevice.java
浏览文件 @ b5d6b146
/*
* 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 @@ public final class CGraphicsDevice extends GraphicsDevice {
}
/**
* 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 @@ public final class CGraphicsDevice extends GraphicsDevice {
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 @@ public final class CGraphicsDevice extends GraphicsDevice {
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 static native double nativeGetYResolution(int displayID);
private native DisplayMode[] nativeGetDisplayModes(int displayID);
private static native Insets nativeGetScreenInsets(int displayID);
}
src/macosx/classes/sun/font/CStrike.java
浏览文件 @ b5d6b146
......@@ -500,7 +500,10 @@ public class CStrike extends FontStrike {
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 @@ public class CStrike extends FontStrike {
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
}
}
}
......
src/macosx/classes/sun/font/CStrikeDisposer.java
浏览文件 @ b5d6b146
......@@ -85,4 +85,6 @@ class CStrikeDisposer extends FontStrikeDisposer {
}
private native void freeNativeScalerContext(long pContext);
protected static native void removeGlyphInfoFromCache(long glyphInfo);
}
src/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java
浏览文件 @ b5d6b146
......@@ -80,10 +80,8 @@ public final class CGLGraphicsConfig extends CGraphicsConfig
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 @@ public final class CGLGraphicsConfig extends CGraphicsConfig
// 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 @@ public final class CGLGraphicsConfig extends CGraphicsConfig
@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 @@ public final class CGLGraphicsConfig extends CGraphicsConfig
@Override
public void addDeviceEventListener(AccelDeviceEventListener l) {
int screen = getDevice().getCoreGraphicsScreen();
AccelDeviceEventNotifier.addListener(l, screen);
int displayID = getDevice().getCGDisplayID();
AccelDeviceEventNotifier.addListener(l, displayID);
}
@Override
......
src/macosx/classes/sun/lwawt/LWComponentPeer.java
浏览文件 @ b5d6b146
......@@ -439,7 +439,7 @@ public abstract class LWComponentPeer<T extends Component, D extends JComponent>
}
@Override
public final Graphics getGraphics() {
public Graphics getGraphics() {
final Graphics g = getOnscreenGraphics();
if (g != null) {
synchronized (getPeerTreeLock()){
......@@ -1227,10 +1227,10 @@ public abstract class LWComponentPeer<T extends Component, D extends JComponent>
}
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 @@ public abstract class LWComponentPeer<T extends Component, D extends JComponent>
}
}
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;
......
src/macosx/classes/sun/lwawt/LWLightweightFramePeer.java 0 → 100644
浏览文件 @ b5d6b146
/*
* 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();
}
}
src/macosx/classes/sun/lwawt/LWToolkit.java
浏览文件 @ b5d6b146
......@@ -218,6 +218,23 @@ public abstract class LWToolkit extends SunToolkit implements Runnable {
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 @@ public abstract class LWToolkit extends SunToolkit implements Runnable {
protected abstract PlatformComponent createPlatformComponent();
protected abstract PlatformComponent createLwPlatformComponent();
protected abstract FileDialogPeer createFileDialogPeer(FileDialog target);
// ---- UTILITY METHODS ---- //
......
src/macosx/classes/sun/lwawt/LWWindowPeer.java
浏览文件 @ b5d6b146
......@@ -48,7 +48,8 @@ public class LWWindowPeer
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 @@ public class LWWindowPeer
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 @@ public class LWWindowPeer
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);
}
......
src/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java
浏览文件 @ b5d6b146
......@@ -128,6 +128,15 @@ final class CDropTargetContextPeer extends SunDropTargetContextPeer {
}
}
@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();
......
src/macosx/classes/sun/lwawt/macosx/CPlatformComponent.java
浏览文件 @ b5d6b146
......@@ -35,7 +35,7 @@ import sun.lwawt.PlatformWindow;
* 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;
......
make/tools/src/build/tools/javazic/DayOfWeek.java → src/macosx/classes/sun/lwawt/macosx/CPlatformLWComponent.java
浏览文件 @ b5d6b146
/*
* Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
* 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
......@@ -23,34 +23,31 @@
* questions.
*/
package build.tools.javazic;
/**
* Day of week enum.
*
* @since 1.6
*/
package sun.lwawt.macosx;
import sun.lwawt.PlatformWindow;
enum DayOfWeek {
SUNDAY("Sun"),
MONDAY("Mon"),
TUESDAY("Tue"),
WEDNESDAY("Wed"),
THURSDAY("Thu"),
FRIDAY("Fri"),
SATURDAY("Sat");
class CPlatformLWComponent extends CPlatformComponent {
private final String abbr;
CPlatformLWComponent() {
super();
}
@Override
public long getPointer() {
return 0;
}
private DayOfWeek(String abbr) {
this.abbr = abbr;
@Override
public void initialize(final PlatformWindow platformWindow) {
}
String getAbbr() {
return abbr;
@Override
public void setBounds(final int x, final int y, final int w, final int h) {
}
int value() {
return ordinal() + 1;
@Override
public void dispose() {
}
}
src/macosx/classes/sun/lwawt/macosx/CPlatformLWView.java 0 → 100644
浏览文件 @ b5d6b146
/*
* 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;
}
}
src/macosx/classes/sun/lwawt/macosx/CPlatformView.java
浏览文件 @ b5d6b146
......@@ -54,8 +54,7 @@ public class CPlatformView extends CFRetainedResource {
}
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 @@ public class CPlatformView extends CFRetainedResource {
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;
}
......
src/macosx/classes/sun/lwawt/macosx/CRobot.java
浏览文件 @ b5d6b146
......@@ -65,7 +65,7 @@ class CRobot implements RobotPeer {
mouseLastX = x;
mouseLastY = y;
mouseEvent(fDevice.getCoreGraphicsScreen(), mouseLastX, mouseLastY,
mouseEvent(fDevice.getCGDisplayID(), mouseLastX, mouseLastY,
mouseButtonsState, true, true);
}
......@@ -79,7 +79,7 @@ class CRobot implements RobotPeer {
public void mousePress(int buttons) {
mouseButtonsState |= buttons;
mouseEvent(fDevice.getCoreGraphicsScreen(), mouseLastX, mouseLastY,
mouseEvent(fDevice.getCGDisplayID(), mouseLastX, mouseLastY,
buttons, true, false);
}
......@@ -93,7 +93,7 @@ class CRobot implements RobotPeer {
public void mouseRelease(int buttons) {
mouseButtonsState &= ~buttons;
mouseEvent(fDevice.getCoreGraphicsScreen(), mouseLastX, mouseLastY,
mouseEvent(fDevice.getCGDisplayID(), mouseLastX, mouseLastY,
buttons, false, false);
}
......@@ -163,7 +163,7 @@ class CRobot implements RobotPeer {
}
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);
......
src/macosx/native/sun/awt/AWTView.m
浏览文件 @ b5d6b146
此差异已折叠。
src/macosx/native/sun/awt/CDropTarget.m
浏览文件 @ b5d6b146
......@@ -390,8 +390,7 @@ extern JNFClassInfo jc_CDropTargetContextPeer;
// 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 {
......
src/macosx/native/sun/awt/CMenu.m
浏览文件 @ b5d6b146
此差异已折叠。
src/macosx/native/sun/awt/CRobot.m
浏览文件 @ b5d6b146
此差异已折叠。
src/share/back/transport.c
浏览文件 @ b5d6b146
此差异已折叠。
src/share/bin/jli_util.h
浏览文件 @ b5d6b146
此差异已折叠。
src/share/bin/parse_manifest.c
浏览文件 @ b5d6b146
此差异已折叠。
src/share/classes/java/net/HttpConnectSocketImpl.java 0 → 100644
浏览文件 @ b5d6b146
此差异已折叠。
src/share/classes/java/net/URL.java
浏览文件 @ b5d6b146
此差异已折叠。
src/share/classes/java/util/Comparators.java 0 → 100644
浏览文件 @ b5d6b146
此差异已折叠。
src/share/classes/java/util/function/BiConsumer.java 0 → 100644
浏览文件 @ b5d6b146
此差异已折叠。
src/share/classes/java/util/function/BiFunction.java 0 → 100644
浏览文件 @ b5d6b146
此差异已折叠。
src/share/classes/java/util/function/BiPredicate.java 0 → 100644
浏览文件 @ b5d6b146
此差异已折叠。
src/share/classes/java/util/function/IntPredicate.java 0 → 100644
浏览文件 @ b5d6b146
此差异已折叠。
src/share/classes/java/util/function/LongPredicate.java 0 → 100644
浏览文件 @ b5d6b146
此差异已折叠。
src/share/classes/java/util/function/ToIntFunction.java 0 → 100644
浏览文件 @ b5d6b146
此差异已折叠。
src/share/classes/sun/awt/LightweightFrame.java 0 → 100644
浏览文件 @ b5d6b146
此差异已折叠。
src/share/classes/sun/swing/JLightweightFrame.java 0 → 100644
浏览文件 @ b5d6b146
此差异已折叠。
src/share/classes/sun/swing/LightweightContent.java 0 → 100644
浏览文件 @ b5d6b146
此差异已折叠。
src/share/native/java/lang/System.c
浏览文件 @ b5d6b146
此差异已折叠。
src/solaris/back/linker_md.c
浏览文件 @ b5d6b146
此差异已折叠。
src/windows/back/linker_md.c
浏览文件 @ b5d6b146
此差异已折叠。
src/windows/bin/java_md.c
浏览文件 @ b5d6b146
此差异已折叠。
test/Makefile
浏览文件 @ b5d6b146
此差异已折叠。
test/ProblemList.txt
浏览文件 @ b5d6b146
此差异已折叠。
test/java/lang/invoke/7087570/Test7087570.java 0 → 100644
浏览文件 @ b5d6b146
此差异已折叠。
test/java/lang/invoke/lambda/LUtils.java 0 → 100644
浏览文件 @ b5d6b146
此差异已折叠。
test/java/lang/reflect/OldenCompilingWithDefaults.java 0 → 100644
浏览文件 @ b5d6b146
此差异已折叠。
test/java/net/Socket/HttpProxy.java 0 → 100644
浏览文件 @ b5d6b146
此差异已折叠。
test/java/nio/channels/Selector/RacyDeregister.java 0 → 100644
浏览文件 @ b5d6b146
此差异已折叠。
test/java/util/ComparatorsTest.java 0 → 100644
浏览文件 @ b5d6b146
此差异已折叠。
test/java/util/Locale/Bug8004240.java 0 → 100644
浏览文件 @ b5d6b146
此差异已折叠。
test/java/util/Map/ToArray.java 0 → 100644
浏览文件 @ b5d6b146
此差异已折叠。
test/java/util/logging/CustomLogManager.java 0 → 100644
浏览文件 @ b5d6b146
此差异已折叠。
test/java/util/logging/SimpleLogManager.java 0 → 100644
浏览文件 @ b5d6b146
此差异已折叠。
test/javax/script/Helper.java
浏览文件 @ b5d6b146
此差异已折叠。
test/javax/script/Test3.js
浏览文件 @ b5d6b146
此差异已折叠。
test/javax/script/Test5.java
浏览文件 @ b5d6b146
此差异已折叠。
test/javax/script/Test5.js
浏览文件 @ b5d6b146
此差异已折叠。
test/javax/script/Test6.java
浏览文件 @ b5d6b146
此差异已折叠。
test/javax/script/Test7.js
浏览文件 @ b5d6b146
此差异已折叠。
test/javax/script/VersionTest.java
浏览文件 @ b5d6b146
此差异已折叠。
test/javax/swing/text/html/7189299/bug7189299.java 0 → 100644
浏览文件 @ b5d6b146
此差异已折叠。
test/sun/security/krb5/auto/SpnegoLifeTime.java 0 → 100644
浏览文件 @ b5d6b146
此差异已折叠。
test/sun/security/provider/PolicyFile/wildcard.policy 0 → 100644
浏览文件 @ b5d6b146
此差异已折叠。
test/sun/tools/jrunscript/repl.out
浏览文件 @ b5d6b146
此差异已折叠。
test/tools/launcher/ToolsOpts.java
浏览文件 @ b5d6b146
此差异已折叠。
test/tools/pack200/Utils.java
浏览文件 @ b5d6b146
此差异已折叠。
test/vm/verifier/TestStaticIF.java 0 → 100644
浏览文件 @ b5d6b146
此差异已折叠。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或