diff --git a/make/docs/Makefile b/make/docs/Makefile
index 567f796bbcedb87c628ad6b0b5831c5934123a58..9a5a1aa29b7579ff5618c7885d65fcebeafa0c56 100644
--- a/make/docs/Makefile
+++ b/make/docs/Makefile
@@ -51,6 +51,7 @@ DEV_DOCS_URL-5 = http://java.sun.com/j2se/1.5.0/docs/index.html
DEV_DOCS_URL-6 = http://download.oracle.com/javase/6/docs/index.html
DEV_DOCS_URL-7 = http://download.oracle.com/javase/7/docs/index.html
DEV_DOCS_URL = $(DEV_DOCS_URL-$(JDK_MINOR_VERSION))
+DOCS_BASE_URL = http://download.oracle.com/javase/7/docs
# Url to Java Language Spec
#JLS3_URL = http://java.sun.com/docs/books/jls/
@@ -205,7 +206,13 @@ COMMON_JAVADOCFLAGS = \
-use \
-keywords \
$(ADDITIONAL_JAVADOCFLAGS)
-ADDITIONAL_JAVADOCFLAGS =
+
+ifdef OPENJDK
+ ADDITIONAL_JAVADOCFLAGS = \
+ -Xdocrootparent $(DOCS_BASE_URL)
+else
+ ADDITIONAL_JAVADOCFLAGS =
+endif
# Draft used for non-fcs documents
JDK_IS_FCS = false
@@ -1142,56 +1149,6 @@ $(SCTPAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SCTPAP
$(prep-target)
$(call PackageFilter,$(SCTPAPI_PKGS))
-#############################################################
-#
-# tracingdocs
-#
-
-ALL_OTHER_TARGETS += tracingdocs
-
-TRACING_DOCDIR := $(JRE_API_DOCSDIR)/tracing
-TRACING2COREAPI := ../$(JDKJRE2COREAPI)
-TRACING_DOCTITLE := Java$(TRADEMARK) Platform Tracing
-TRACING_WINDOWTITLE := Platform Tracing
-TRACING_HEADER := Platform Tracing
-TRACING_BOTTOM := $(call CommonBottom,$(TRACING_FIRST_COPYRIGHT_YEAR))
-# TRACING_PKGS is located in NON_CORE_PKGS.gmk
-
-TRACING_INDEX_HTML = $(TRACING_DOCDIR)/index.html
-TRACING_OPTIONS_FILE = $(DOCSTMPDIR)/tracing.options
-TRACING_PACKAGES_FILE = $(DOCSTMPDIR)/tracing.packages
-
-tracingdocs: $(TRACING_INDEX_HTML)
-
-# Set relative location to core api document root
-$(TRACING_INDEX_HTML): GET2DOCSDIR=$(TRACING2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(TRACING_INDEX_HTML): $(TRACING_OPTIONS_FILE) $(TRACING_PACKAGES_FILE)
- $(prep-javadoc)
- $(call JavadocSummary,$(TRACING_OPTIONS_FILE),$(TRACING_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
- @$(TRACING_OPTIONS_FILE) @$(TRACING_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(TRACING_OPTIONS_FILE):
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionOnly,-nodeprecatedlist) ; \
- $(call OptionPair,-doctitle,$(TRACING_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(TRACING_WINDOWTITLE) $(DRAFT_WINTITLE));\
- $(call OptionPair,-header,$(TRACING_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(TRACING_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-linkoffline,$(TRACING2COREAPI),$(COREAPI_DOCSDIR)/); \
- ) >> $@
-
-# Create a file with the package names in it
-$(TRACING_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(TRACING_PKGS))
- $(prep-target)
- $(call PackageFilter,$(TRACING_PKGS))
-
#############################################################
#
# Get a cache of all the directories
diff --git a/make/docs/NON_CORE_PKGS.gmk b/make/docs/NON_CORE_PKGS.gmk
index 25c79408bdb9a6c1893c0138eebf6f5d8df9ac3b..e8eda9dfd927b9d96eed4fe88971ead26fdfe77c 100644
--- a/make/docs/NON_CORE_PKGS.gmk
+++ b/make/docs/NON_CORE_PKGS.gmk
@@ -88,9 +88,6 @@ SMARTCARDIO_PKGS = javax.smartcardio
SCTPAPI_PKGS = com.sun.nio.sctp
-TRACING_PKGS = com.sun.tracing \
- com.sun.tracing.dtrace
-
# non-core packages in rt.jar
NON_CORE_PKGS = $(DOMAPI_PKGS) \
$(MGMT_PKGS) \
@@ -100,6 +97,5 @@ NON_CORE_PKGS = $(DOMAPI_PKGS) \
$(OLD_JSSE_PKGS) \
$(HTTPSERVER_PKGS) \
$(SMARTCARDIO_PKGS) \
- $(TRACING_PKGS) \
$(SCTPAPI_PKGS)
diff --git a/make/java/java/FILES_java.gmk b/make/java/java/FILES_java.gmk
index b5449106cd7855131df288ba8bbde39fa0576f8f..58c763a3fe5b394e92d887bd15ad9ffb5b877e13 100644
--- a/make/java/java/FILES_java.gmk
+++ b/make/java/java/FILES_java.gmk
@@ -356,6 +356,7 @@ JAVA_JAVA_java = \
java/util/regex/Matcher.java \
java/util/regex/MatchResult.java \
java/util/regex/ASCII.java \
+ java/util/regex/UnicodeProp.java \
java/util/regex/PatternSyntaxException.java \
java/util/prefs/Preferences.java \
java/util/prefs/AbstractPreferences.java \
diff --git a/make/java/java/Makefile b/make/java/java/Makefile
index a51082614d309561949abd04b35f01860f2fe9c5..787d881b6ee05a52d2c59d7d559c39942da51c1f 100644
--- a/make/java/java/Makefile
+++ b/make/java/java/Makefile
@@ -345,30 +345,35 @@ $(GENSRCDIR)/java/lang/CharacterDataLatin1.java \
-template $(CHARACTERDATA)/CharacterDataLatin1.java.template \
-spec $(UNICODEDATA)/UnicodeData.txt \
-specialcasing $(UNICODEDATA)/SpecialCasing.txt \
+ -proplist $(UNICODEDATA)/PropList.txt \
-o $(GENSRCDIR)/java/lang/CharacterDataLatin1.java -string \
-usecharforbyte -latin1 8
$(BOOT_JAVA_CMD) -jar $(GENERATECHARACTER_JARFILE) -plane 0 \
-template $(CHARACTERDATA)/CharacterData00.java.template \
-spec $(UNICODEDATA)/UnicodeData.txt \
-specialcasing $(UNICODEDATA)/SpecialCasing.txt \
+ -proplist $(UNICODEDATA)/PropList.txt \
-o $(GENSRCDIR)/java/lang/CharacterData00.java -string \
-usecharforbyte 11 4 1
$(BOOT_JAVA_CMD) -jar $(GENERATECHARACTER_JARFILE) -plane 1 \
-template $(CHARACTERDATA)/CharacterData01.java.template \
-spec $(UNICODEDATA)/UnicodeData.txt \
-specialcasing $(UNICODEDATA)/SpecialCasing.txt \
+ -proplist $(UNICODEDATA)/PropList.txt \
-o $(GENSRCDIR)/java/lang/CharacterData01.java -string \
-usecharforbyte 11 4 1
$(BOOT_JAVA_CMD) -jar $(GENERATECHARACTER_JARFILE) -plane 2 \
-template $(CHARACTERDATA)/CharacterData02.java.template \
-spec $(UNICODEDATA)/UnicodeData.txt \
-specialcasing $(UNICODEDATA)/SpecialCasing.txt \
+ -proplist $(UNICODEDATA)/PropList.txt \
-o $(GENSRCDIR)/java/lang/CharacterData02.java -string \
-usecharforbyte 11 4 1
$(BOOT_JAVA_CMD) -jar $(GENERATECHARACTER_JARFILE) -plane 14 \
-template $(CHARACTERDATA)/CharacterData0E.java.template \
-spec $(UNICODEDATA)/UnicodeData.txt \
-specialcasing $(UNICODEDATA)/SpecialCasing.txt \
+ -proplist $(UNICODEDATA)/PropList.txt \
-o $(GENSRCDIR)/java/lang/CharacterData0E.java -string \
-usecharforbyte 11 4 1
diff --git a/make/java/nio/FILES_java.gmk b/make/java/nio/FILES_java.gmk
index 34b41d5db380dfab39236afc2c7da79d72ae4e89..d09a966db3802d72e9eb34c67cc06fca8a0772ec 100644
--- a/make/java/nio/FILES_java.gmk
+++ b/make/java/nio/FILES_java.gmk
@@ -71,6 +71,7 @@ FILES_src = \
java/nio/charset/CoderMalfunctionError.java \
java/nio/charset/CodingErrorAction.java \
java/nio/charset/MalformedInputException.java \
+ java/nio/charset/StandardCharset.java \
java/nio/charset/UnmappableCharacterException.java \
\
java/nio/charset/spi/CharsetProvider.java \
diff --git a/make/java/nio/mapfile-linux b/make/java/nio/mapfile-linux
index 7af5388de961e9ec8e2c668fb272581300ed050c..d72244170b9efb8832be07a51a292f7eaf00e7ad 100644
--- a/make/java/nio/mapfile-linux
+++ b/make/java/nio/mapfile-linux
@@ -44,7 +44,6 @@ SUNWprivate_1.1 {
Java_sun_nio_ch_EPollArrayWrapper_interrupt;
Java_sun_nio_ch_EPollArrayWrapper_offsetofData;
Java_sun_nio_ch_EPollArrayWrapper_sizeofEPollEvent;
- Java_sun_nio_ch_EPoll_init;
Java_sun_nio_ch_EPoll_eventSize;
Java_sun_nio_ch_EPoll_eventsOffset;
Java_sun_nio_ch_EPoll_dataOffset;
@@ -129,7 +128,6 @@ SUNWprivate_1.1 {
Java_sun_nio_fs_GnomeFileTypeDetector_probeUsingGio;
Java_sun_nio_fs_GnomeFileTypeDetector_initializeGnomeVfs;
Java_sun_nio_fs_GnomeFileTypeDetector_probeUsingGnomeVfs;
- Java_sun_nio_fs_LinuxWatchService_init;
Java_sun_nio_fs_LinuxWatchService_eventSize;
Java_sun_nio_fs_LinuxWatchService_eventOffsets;
Java_sun_nio_fs_LinuxWatchService_inotifyInit;
diff --git a/make/java/security/Makefile b/make/java/security/Makefile
index fa87a586468c1f4036b587f2c5a27a0b5816ccc3..d06fc91404e79dcddcaee9d60e6690d4f11680a0 100644
--- a/make/java/security/Makefile
+++ b/make/java/security/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1996, 2011 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 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
@@ -44,11 +44,9 @@ PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-solaris
else # PLATFORM
-# Register Microsoft CryptoAPI provider only on (non-64-bit) Windows platform.
+# Register Microsoft CryptoAPI provider only on Windows platform.
ifeq ($(PLATFORM), windows)
- ifneq ($(ARCH_DATA_MODEL), 64)
- PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-windows
- endif
+ PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-windows
endif
endif # PLATFORM
diff --git a/make/jpda/jdwp/jdwp.spec b/make/jpda/jdwp/jdwp.spec
index 86bce315226d5b41663250b592f990999c0c1b62..3f28a918ef4c2dc2f3acb537345d49e0155d293b 100644
--- a/make/jpda/jdwp/jdwp.spec
+++ b/make/jpda/jdwp/jdwp.spec
@@ -2190,7 +2190,8 @@ JDWP "Java(tm) Debug Wire Protocol"
(Out
(byte eventKind "Event kind to request. "
"See JDWP.EventKind "
- "for a complete list of events that can be requested. "
+ "for a complete list of events that can be requested; "
+ "some events may require a capability in order to be requested. "
)
(byte suspendPolicy
"What threads are suspended when this event occurs? "
@@ -2732,6 +2733,8 @@ JDWP "Java(tm) Debug Wire Protocol"
(Alt MonitorContendedEnter=JDWP.EventKind.MONITOR_CONTENDED_ENTER
"Notification that a thread in the target VM is attempting "
"to enter a monitor that is already acquired by another thread. "
+ "Requires canRequestMonitorEvents capability - see "
+ "CapabilitiesNew. "
"Since JDWP version 1.6. "
(int requestID
@@ -2743,6 +2746,8 @@ JDWP "Java(tm) Debug Wire Protocol"
(Alt MonitorContendedEntered=JDWP.EventKind.MONITOR_CONTENDED_ENTERED
"Notification of a thread in the target VM is entering a monitor "
"after waiting for it to be released by another thread. "
+ "Requires canRequestMonitorEvents capability - see "
+ "CapabilitiesNew. "
"
Since JDWP version 1.6. "
(int requestID
@@ -2753,6 +2758,8 @@ JDWP "Java(tm) Debug Wire Protocol"
)
(Alt MonitorWait=JDWP.EventKind.MONITOR_WAIT
"Notification of a thread about to wait on a monitor object. "
+ "Requires canRequestMonitorEvents capability - see "
+ "CapabilitiesNew. "
"
Since JDWP version 1.6. "
(int requestID
@@ -2764,6 +2771,8 @@ JDWP "Java(tm) Debug Wire Protocol"
)
(Alt MonitorWaited=JDWP.EventKind.MONITOR_WAITED
"Notification that a thread in the target VM has finished waiting on "
+ "Requires canRequestMonitorEvents capability - see "
+ "CapabilitiesNew. "
"a monitor object. "
"
Since JDWP version 1.6. "
@@ -3050,9 +3059,9 @@ JDWP "Java(tm) Debug Wire Protocol"
(Constant METHOD_EXIT =41 )
(Constant METHOD_EXIT_WITH_RETURN_VALUE =42 )
(Constant MONITOR_CONTENDED_ENTER =43 )
- (Constant MONITOR_CONTENDED_ENTERED =44 )
- (Constant MONITOR_WAIT =45 )
- (Constant MONITOR_WAITED =46 )
+ (Constant MONITOR_CONTENDED_ENTERED =44 )
+ (Constant MONITOR_WAIT =45 )
+ (Constant MONITOR_WAITED =46 )
(Constant VM_START =90 )
(Constant VM_INIT =90 "obsolete - was used in jvmdi")
(Constant VM_DEATH =99 )
diff --git a/make/sun/javazic/tzdata/VERSION b/make/sun/javazic/tzdata/VERSION
index c19847f5a1183da27fcd45bc6f23451a0e1bfa1f..c52096254ae06c306773c7b3c1030a2d956feeb5 100644
--- a/make/sun/javazic/tzdata/VERSION
+++ b/make/sun/javazic/tzdata/VERSION
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-tzdata2011e
+tzdata2011g
diff --git a/make/sun/javazic/tzdata/africa b/make/sun/javazic/tzdata/africa
index bea5f8157bba583b77f67a6a0377d5da4758e3b0..a43e73ce10b129e6a202fc3eac7704a465086c47 100644
--- a/make/sun/javazic/tzdata/africa
+++ b/make/sun/javazic/tzdata/africa
@@ -234,7 +234,21 @@ Rule Egypt 1989 only - May 6 1:00 1:00 S
Rule Egypt 1990 1994 - May 1 1:00 1:00 S
# IATA (after 1990) says transitions are at 0:00.
# Go with IATA starting in 1995, except correct 1995 entry from 09-30 to 09-29.
-Rule Egypt 1995 max - Apr lastFri 0:00s 1:00 S
+
+# From Alexander Krivenyshev (2011-04-20):
+# "...Egypt's interim cabinet decided on Wednesday to cancel daylight
+# saving time after a poll posted on its website showed the majority of
+# Egyptians would approve the cancellation."
+#
+# Egypt to cancel daylight saving time
+#
+# http://www.almasryalyoum.com/en/node/407168
+#
+# or
+#
+# http://www.worldtimezone.com/dst_news/dst_news_egypt04.html
+#
+Rule Egypt 1995 2010 - Apr lastFri 0:00s 1:00 S
Rule Egypt 1995 2005 - Sep lastThu 23:00s 0 -
# From Steffen Thorsen (2006-09-19):
# The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports:
@@ -335,7 +349,7 @@ Rule Egypt 2008 only - Aug lastThu 23:00s 0 -
Rule Egypt 2009 only - Aug 20 23:00s 0 -
Rule Egypt 2010 only - Aug 11 0:00 0 -
Rule Egypt 2010 only - Sep 10 0:00 1:00 S
-Rule Egypt 2010 max - Sep lastThu 23:00s 0 -
+Rule Egypt 2010 only - Sep lastThu 23:00s 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Cairo 2:05:00 - LMT 1900 Oct
diff --git a/make/sun/javazic/tzdata/europe b/make/sun/javazic/tzdata/europe
index 5b11dfb5122c8304f9974196e755e757a358391b..89bf6c5d3dc7d49481b57bd56ea4f7a15aae8ffe 100644
--- a/make/sun/javazic/tzdata/europe
+++ b/make/sun/javazic/tzdata/europe
@@ -168,7 +168,7 @@
# A monument to Willett was unveiled on 1927-05-21, in an open space in
# a 45-acre wood near Chislehurst, Kent that was purchased by popular
# subscription and open to the public. On the south face of the monolith,
-# designed by G. W. Miller, is the the William Willett Memorial Sundial,
+# designed by G. W. Miller, is the...William Willett Memorial Sundial,
# which is permanently set to Summer Time.
# From Winston Churchill (1934-04-28):
@@ -1808,7 +1808,7 @@ Zone Europe/Oslo 0:43:00 - LMT 1895 Jan 1
#
# All these events predate our cutoff date of 1970. Unless we can
# come up with more definitive info about the timekeeping during the
-# war years it's probably best just do do the following for now:
+# war years it's probably best just do...the following for now:
Link Europe/Oslo Arctic/Longyearbyen
# Poland
diff --git a/make/sun/javazic/tzdata/southamerica b/make/sun/javazic/tzdata/southamerica
index 7afec35d69685225b80e55dadef20ceaaf2df7a4..7717d12d17a4f1ed8d7e63bab9abcab34fece1c2 100644
--- a/make/sun/javazic/tzdata/southamerica
+++ b/make/sun/javazic/tzdata/southamerica
@@ -767,7 +767,7 @@ Zone America/La_Paz -4:32:36 - LMT 1890
#
# As a result of the above Decree I believe the America/Rio_Branco
# timezone shall be modified from UTC-5 to UTC-4 and a new timezone shall
-# be created to represent the the west side of the Para State. I
+# be created to represent the...west side of the Para State. I
# suggest this new timezone be called Santarem as the most
# important/populated city in the affected area.
#
@@ -1365,6 +1365,24 @@ Zone Pacific/Galapagos -5:58:24 - LMT 1931 # Puerto Baquerizo Moreno
# For now, we'll just record the time in Stanley, since we have no
# better info.
+# From Steffen Thorsen (2011-04-01):
+# The Falkland Islands will not turn back clocks this winter, but stay on
+# daylight saving time.
+#
+# One source:
+#
+# http://www.falklandnews.com/public/story.cfm?get=5914&source=3
+#
+#
+# We have gotten this confirmed by a clerk of the legislative assembly:
+# Normally the clocks revert to Local Mean Time (UTC/GMT -4 hours) on the
+# third Sunday of April at 0200hrs and advance to Summer Time (UTC/GMT -3
+# hours) on the first Sunday of September at 0200hrs.
+#
+# IMPORTANT NOTE: During 2011, on a trial basis, the Falkland Islands
+# will not revert to local mean time, but clocks will remain on Summer
+# time (UTC/GMT - 3 hours) throughout the whole of 2011. Any long term
+# change to local time following the trial period will be notified.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Falk 1937 1938 - Sep lastSun 0:00 1:00 S
Rule Falk 1938 1942 - Mar Sun>=19 0:00 0 -
@@ -1376,7 +1394,8 @@ Rule Falk 1984 1985 - Apr lastSun 0:00 0 -
Rule Falk 1984 only - Sep 16 0:00 1:00 S
Rule Falk 1985 2000 - Sep Sun>=9 0:00 1:00 S
Rule Falk 1986 2000 - Apr Sun>=16 0:00 0 -
-Rule Falk 2001 max - Apr Sun>=15 2:00 0 -
+Rule Falk 2001 2010 - Apr Sun>=15 2:00 0 -
+Rule Falk 2012 max - Apr Sun>=15 2:00 0 -
Rule Falk 2001 max - Sep Sun>=1 2:00 1:00 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Atlantic/Stanley -3:51:24 - LMT 1890
diff --git a/make/sun/security/Makefile b/make/sun/security/Makefile
index efff97d7e559d6db817c0dc8ca6bdf8d99e7d1c2..6e03ffbe05db363d23d7873c0bf091d62fca3174 100644
--- a/make/sun/security/Makefile
+++ b/make/sun/security/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 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
@@ -52,12 +52,10 @@ ifeq ($(ARCH_DATA_MODEL), 64)
endif
endif
-# Build Microsoft CryptoAPI provider only on (non-64-bit) Windows platform.
+# Build Microsoft CryptoAPI provider only on Windows platform.
MSCAPI =
ifeq ($(PLATFORM), windows)
- ifneq ($(ARCH_DATA_MODEL), 64)
- MSCAPI = mscapi
- endif
+ MSCAPI = mscapi
endif
# Build in-tree elliptic curve crypto provider only when
diff --git a/make/tools/GenerateCharacter/CharacterData00.java.template b/make/tools/GenerateCharacter/CharacterData00.java.template
index 5a1fd5a6364850e5bc925436616c169c6329b735..8de328869af1ff3361027e492fa3117dd63682ec 100644
--- a/make/tools/GenerateCharacter/CharacterData00.java.template
+++ b/make/tools/GenerateCharacter/CharacterData00.java.template
@@ -73,11 +73,37 @@ class CharacterData00 extends CharacterData {
return props;
}
+ int getPropertiesEx(int ch) {
+ char offset = (char)ch;
+ int props = $$LookupEx(offset);
+ return props;
+ }
+
int getType(int ch) {
int props = getProperties(ch);
return (props & $$maskType);
}
+ boolean isOtherLowercase(int ch) {
+ int props = getPropertiesEx(ch);
+ return (props & $$maskOtherLowercase) != 0;
+ }
+
+ boolean isOtherUppercase(int ch) {
+ int props = getPropertiesEx(ch);
+ return (props & $$maskOtherUppercase) != 0;
+ }
+
+ boolean isOtherAlphabetic(int ch) {
+ int props = getPropertiesEx(ch);
+ return (props & $$maskOtherAlphabetic) != 0;
+ }
+
+ boolean isIdeographic(int ch) {
+ int props = getPropertiesEx(ch);
+ return (props & $$maskIdeographic) != 0;
+ }
+
boolean isJavaIdentifierStart(int ch) {
int props = getProperties(ch);
return ((props & $$maskIdentifierInfo) >= $$lowJavaStart);
diff --git a/make/tools/GenerateCharacter/CharacterData01.java.template b/make/tools/GenerateCharacter/CharacterData01.java.template
index fef710002ca9a64f051d8139a74a3419d474ca16..1245eb13c07b9f75718bf768d7fc5c6e55429782 100644
--- a/make/tools/GenerateCharacter/CharacterData01.java.template
+++ b/make/tools/GenerateCharacter/CharacterData01.java.template
@@ -72,11 +72,37 @@ class CharacterData01 extends CharacterData {
return props;
}
+ int getPropertiesEx(int ch) {
+ char offset = (char)ch;
+ int props = $$LookupEx(offset);
+ return props;
+ }
+
int getType(int ch) {
int props = getProperties(ch);
return (props & $$maskType);
}
+ boolean isOtherLowercase(int ch) {
+ int props = getPropertiesEx(ch);
+ return (props & $$maskOtherLowercase) != 0;
+ }
+
+ boolean isOtherUppercase(int ch) {
+ int props = getPropertiesEx(ch);
+ return (props & $$maskOtherUppercase) != 0;
+ }
+
+ boolean isOtherAlphabetic(int ch) {
+ int props = getPropertiesEx(ch);
+ return (props & $$maskOtherAlphabetic) != 0;
+ }
+
+ boolean isIdeographic(int ch) {
+ int props = getPropertiesEx(ch);
+ return (props & $$maskIdeographic) != 0;
+ }
+
boolean isJavaIdentifierStart(int ch) {
int props = getProperties(ch);
return ((props & $$maskIdentifierInfo) >= $$lowJavaStart);
diff --git a/make/tools/GenerateCharacter/CharacterData02.java.template b/make/tools/GenerateCharacter/CharacterData02.java.template
index 845decc3d1ae38967cb94c662c825419fa9ba9ed..7719e4a62953ed10c51c0383f3c4fac312a8fb09 100644
--- a/make/tools/GenerateCharacter/CharacterData02.java.template
+++ b/make/tools/GenerateCharacter/CharacterData02.java.template
@@ -66,11 +66,37 @@ class CharacterData02 extends CharacterData {
*/
int getProperties(int ch) {
- char offset = (char)ch;
+ char offset = (char)ch;
int props = $$Lookup(offset);
return props;
}
+ int getPropertiesEx(int ch) {
+ char offset = (char)ch;
+ int props = $$LookupEx(offset);
+ return props;
+ }
+
+ boolean isOtherLowercase(int ch) {
+ int props = getPropertiesEx(ch);
+ return (props & $$maskOtherLowercase) != 0;
+ }
+
+ boolean isOtherUppercase(int ch) {
+ int props = getPropertiesEx(ch);
+ return (props & $$maskOtherUppercase) != 0;
+ }
+
+ boolean isOtherAlphabetic(int ch) {
+ int props = getPropertiesEx(ch);
+ return (props & $$maskOtherAlphabetic) != 0;
+ }
+
+ boolean isIdeographic(int ch) {
+ int props = getPropertiesEx(ch);
+ return (props & $$maskIdeographic) != 0;
+ }
+
int getType(int ch) {
int props = getProperties(ch);
return (props & $$maskType);
diff --git a/make/tools/GenerateCharacter/CharacterData0E.java.template b/make/tools/GenerateCharacter/CharacterData0E.java.template
index 12abce182d2b6e270ebc27939b409a911386ea70..15416ffc7ad89b22721efcba0bedb61d814caa2e 100644
--- a/make/tools/GenerateCharacter/CharacterData0E.java.template
+++ b/make/tools/GenerateCharacter/CharacterData0E.java.template
@@ -66,11 +66,37 @@ class CharacterData0E extends CharacterData {
*/
int getProperties(int ch) {
- char offset = (char)ch;
+ char offset = (char)ch;
int props = $$Lookup(offset);
return props;
}
+ int getPropertiesEx(int ch) {
+ char offset = (char)ch;
+ int props = $$LookupEx(offset);
+ return props;
+ }
+
+ boolean isOtherLowercase(int ch) {
+ int props = getPropertiesEx(ch);
+ return (props & $$maskOtherLowercase) != 0;
+ }
+
+ boolean isOtherUppercase(int ch) {
+ int props = getPropertiesEx(ch);
+ return (props & $$maskOtherUppercase) != 0;
+ }
+
+ boolean isOtherAlphabetic(int ch) {
+ int props = getPropertiesEx(ch);
+ return (props & $$maskOtherAlphabetic) != 0;
+ }
+
+ boolean isIdeographic(int ch) {
+ int props = getPropertiesEx(ch);
+ return (props & $$maskIdeographic) != 0;
+ }
+
int getType(int ch) {
int props = getProperties(ch);
return (props & $$maskType);
diff --git a/make/tools/GenerateCharacter/CharacterDataLatin1.java.template b/make/tools/GenerateCharacter/CharacterDataLatin1.java.template
index e4646d16bbe9789728fc5821993ab7df2d223189..ed2e38e6aa6ce057e4ccb3f9960a988a8ebd3b9a 100644
--- a/make/tools/GenerateCharacter/CharacterDataLatin1.java.template
+++ b/make/tools/GenerateCharacter/CharacterDataLatin1.java.template
@@ -67,11 +67,37 @@ class CharacterDataLatin1 extends CharacterData {
*/
int getProperties(int ch) {
- char offset = (char)ch;
+ char offset = (char)ch;
int props = $$Lookup(offset);
return props;
}
+ int getPropertiesEx(int ch) {
+ char offset = (char)ch;
+ int props = $$LookupEx(offset);
+ return props;
+ }
+
+ boolean isOtherLowercase(int ch) {
+ int props = getPropertiesEx(ch);
+ return (props & $$maskOtherLowercase) != 0;
+ }
+
+ boolean isOtherUppercase(int ch) {
+ int props = getPropertiesEx(ch);
+ return (props & $$maskOtherUppercase) != 0;
+ }
+
+ boolean isOtherAlphabetic(int ch) {
+ int props = getPropertiesEx(ch);
+ return (props & $$maskOtherAlphabetic) != 0;
+ }
+
+ boolean isIdeographic(int ch) {
+ int props = getPropertiesEx(ch);
+ return (props & $$maskIdeographic) != 0;
+ }
+
int getType(int ch) {
int props = getProperties(ch);
return (props & $$maskType);
diff --git a/make/tools/UnicodeData/PropList.txt b/make/tools/UnicodeData/PropList.txt
new file mode 100644
index 0000000000000000000000000000000000000000..eeeb81845e3a809f3af5d22e23dec930c4f2d2cf
--- /dev/null
+++ b/make/tools/UnicodeData/PropList.txt
@@ -0,0 +1,1296 @@
+# PropList-6.0.0.txt
+# Date: 2010-08-19, 00:48:28 GMT [MD]
+#
+# Unicode Character Database
+# Copyright (c) 1991-2010 Unicode, Inc.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
+# For documentation, see http://www.unicode.org/reports/tr44/
+
+# ================================================
+
+0009..000D ; White_Space # Cc [5] ..
+0020 ; White_Space # Zs SPACE
+0085 ; White_Space # Cc
+00A0 ; White_Space # Zs NO-BREAK SPACE
+1680 ; White_Space # Zs OGHAM SPACE MARK
+180E ; White_Space # Zs MONGOLIAN VOWEL SEPARATOR
+2000..200A ; White_Space # Zs [11] EN QUAD..HAIR SPACE
+2028 ; White_Space # Zl LINE SEPARATOR
+2029 ; White_Space # Zp PARAGRAPH SEPARATOR
+202F ; White_Space # Zs NARROW NO-BREAK SPACE
+205F ; White_Space # Zs MEDIUM MATHEMATICAL SPACE
+3000 ; White_Space # Zs IDEOGRAPHIC SPACE
+
+# Total code points: 26
+
+# ================================================
+
+200E..200F ; Bidi_Control # Cf [2] LEFT-TO-RIGHT MARK..RIGHT-TO-LEFT MARK
+202A..202E ; Bidi_Control # Cf [5] LEFT-TO-RIGHT EMBEDDING..RIGHT-TO-LEFT OVERRIDE
+
+# Total code points: 7
+
+# ================================================
+
+200C..200D ; Join_Control # Cf [2] ZERO WIDTH NON-JOINER..ZERO WIDTH JOINER
+
+# Total code points: 2
+
+# ================================================
+
+002D ; Dash # Pd HYPHEN-MINUS
+058A ; Dash # Pd ARMENIAN HYPHEN
+05BE ; Dash # Pd HEBREW PUNCTUATION MAQAF
+1400 ; Dash # Pd CANADIAN SYLLABICS HYPHEN
+1806 ; Dash # Pd MONGOLIAN TODO SOFT HYPHEN
+2010..2015 ; Dash # Pd [6] HYPHEN..HORIZONTAL BAR
+2053 ; Dash # Po SWUNG DASH
+207B ; Dash # Sm SUPERSCRIPT MINUS
+208B ; Dash # Sm SUBSCRIPT MINUS
+2212 ; Dash # Sm MINUS SIGN
+2E17 ; Dash # Pd DOUBLE OBLIQUE HYPHEN
+2E1A ; Dash # Pd HYPHEN WITH DIAERESIS
+301C ; Dash # Pd WAVE DASH
+3030 ; Dash # Pd WAVY DASH
+30A0 ; Dash # Pd KATAKANA-HIRAGANA DOUBLE HYPHEN
+FE31..FE32 ; Dash # Pd [2] PRESENTATION FORM FOR VERTICAL EM DASH..PRESENTATION FORM FOR VERTICAL EN DASH
+FE58 ; Dash # Pd SMALL EM DASH
+FE63 ; Dash # Pd SMALL HYPHEN-MINUS
+FF0D ; Dash # Pd FULLWIDTH HYPHEN-MINUS
+
+# Total code points: 25
+
+# ================================================
+
+002D ; Hyphen # Pd HYPHEN-MINUS
+00AD ; Hyphen # Cf SOFT HYPHEN
+058A ; Hyphen # Pd ARMENIAN HYPHEN
+1806 ; Hyphen # Pd MONGOLIAN TODO SOFT HYPHEN
+2010..2011 ; Hyphen # Pd [2] HYPHEN..NON-BREAKING HYPHEN
+2E17 ; Hyphen # Pd DOUBLE OBLIQUE HYPHEN
+30FB ; Hyphen # Po KATAKANA MIDDLE DOT
+FE63 ; Hyphen # Pd SMALL HYPHEN-MINUS
+FF0D ; Hyphen # Pd FULLWIDTH HYPHEN-MINUS
+FF65 ; Hyphen # Po HALFWIDTH KATAKANA MIDDLE DOT
+
+# Total code points: 11
+
+# ================================================
+
+0022 ; Quotation_Mark # Po QUOTATION MARK
+0027 ; Quotation_Mark # Po APOSTROPHE
+00AB ; Quotation_Mark # Pi LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+00BB ; Quotation_Mark # Pf RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+2018 ; Quotation_Mark # Pi LEFT SINGLE QUOTATION MARK
+2019 ; Quotation_Mark # Pf RIGHT SINGLE QUOTATION MARK
+201A ; Quotation_Mark # Ps SINGLE LOW-9 QUOTATION MARK
+201B..201C ; Quotation_Mark # Pi [2] SINGLE HIGH-REVERSED-9 QUOTATION MARK..LEFT DOUBLE QUOTATION MARK
+201D ; Quotation_Mark # Pf RIGHT DOUBLE QUOTATION MARK
+201E ; Quotation_Mark # Ps DOUBLE LOW-9 QUOTATION MARK
+201F ; Quotation_Mark # Pi DOUBLE HIGH-REVERSED-9 QUOTATION MARK
+2039 ; Quotation_Mark # Pi SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+203A ; Quotation_Mark # Pf SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+300C ; Quotation_Mark # Ps LEFT CORNER BRACKET
+300D ; Quotation_Mark # Pe RIGHT CORNER BRACKET
+300E ; Quotation_Mark # Ps LEFT WHITE CORNER BRACKET
+300F ; Quotation_Mark # Pe RIGHT WHITE CORNER BRACKET
+301D ; Quotation_Mark # Ps REVERSED DOUBLE PRIME QUOTATION MARK
+301E..301F ; Quotation_Mark # Pe [2] DOUBLE PRIME QUOTATION MARK..LOW DOUBLE PRIME QUOTATION MARK
+FE41 ; Quotation_Mark # Ps PRESENTATION FORM FOR VERTICAL LEFT CORNER BRACKET
+FE42 ; Quotation_Mark # Pe PRESENTATION FORM FOR VERTICAL RIGHT CORNER BRACKET
+FE43 ; Quotation_Mark # Ps PRESENTATION FORM FOR VERTICAL LEFT WHITE CORNER BRACKET
+FE44 ; Quotation_Mark # Pe PRESENTATION FORM FOR VERTICAL RIGHT WHITE CORNER BRACKET
+FF02 ; Quotation_Mark # Po FULLWIDTH QUOTATION MARK
+FF07 ; Quotation_Mark # Po FULLWIDTH APOSTROPHE
+FF62 ; Quotation_Mark # Ps HALFWIDTH LEFT CORNER BRACKET
+FF63 ; Quotation_Mark # Pe HALFWIDTH RIGHT CORNER BRACKET
+
+# Total code points: 29
+
+# ================================================
+
+0021 ; Terminal_Punctuation # Po EXCLAMATION MARK
+002C ; Terminal_Punctuation # Po COMMA
+002E ; Terminal_Punctuation # Po FULL STOP
+003A..003B ; Terminal_Punctuation # Po [2] COLON..SEMICOLON
+003F ; Terminal_Punctuation # Po QUESTION MARK
+037E ; Terminal_Punctuation # Po GREEK QUESTION MARK
+0387 ; Terminal_Punctuation # Po GREEK ANO TELEIA
+0589 ; Terminal_Punctuation # Po ARMENIAN FULL STOP
+05C3 ; Terminal_Punctuation # Po HEBREW PUNCTUATION SOF PASUQ
+060C ; Terminal_Punctuation # Po ARABIC COMMA
+061B ; Terminal_Punctuation # Po ARABIC SEMICOLON
+061F ; Terminal_Punctuation # Po ARABIC QUESTION MARK
+06D4 ; Terminal_Punctuation # Po ARABIC FULL STOP
+0700..070A ; Terminal_Punctuation # Po [11] SYRIAC END OF PARAGRAPH..SYRIAC CONTRACTION
+070C ; Terminal_Punctuation # Po SYRIAC HARKLEAN METOBELUS
+07F8..07F9 ; Terminal_Punctuation # Po [2] NKO COMMA..NKO EXCLAMATION MARK
+0830..083E ; Terminal_Punctuation # Po [15] SAMARITAN PUNCTUATION NEQUDAA..SAMARITAN PUNCTUATION ANNAAU
+085E ; Terminal_Punctuation # Po MANDAIC PUNCTUATION
+0964..0965 ; Terminal_Punctuation # Po [2] DEVANAGARI DANDA..DEVANAGARI DOUBLE DANDA
+0E5A..0E5B ; Terminal_Punctuation # Po [2] THAI CHARACTER ANGKHANKHU..THAI CHARACTER KHOMUT
+0F08 ; Terminal_Punctuation # Po TIBETAN MARK SBRUL SHAD
+0F0D..0F12 ; Terminal_Punctuation # Po [6] TIBETAN MARK SHAD..TIBETAN MARK RGYA GRAM SHAD
+104A..104B ; Terminal_Punctuation # Po [2] MYANMAR SIGN LITTLE SECTION..MYANMAR SIGN SECTION
+1361..1368 ; Terminal_Punctuation # Po [8] ETHIOPIC WORDSPACE..ETHIOPIC PARAGRAPH SEPARATOR
+166D..166E ; Terminal_Punctuation # Po [2] CANADIAN SYLLABICS CHI SIGN..CANADIAN SYLLABICS FULL STOP
+16EB..16ED ; Terminal_Punctuation # Po [3] RUNIC SINGLE PUNCTUATION..RUNIC CROSS PUNCTUATION
+17D4..17D6 ; Terminal_Punctuation # Po [3] KHMER SIGN KHAN..KHMER SIGN CAMNUC PII KUUH
+17DA ; Terminal_Punctuation # Po KHMER SIGN KOOMUUT
+1802..1805 ; Terminal_Punctuation # Po [4] MONGOLIAN COMMA..MONGOLIAN FOUR DOTS
+1808..1809 ; Terminal_Punctuation # Po [2] MONGOLIAN MANCHU COMMA..MONGOLIAN MANCHU FULL STOP
+1944..1945 ; Terminal_Punctuation # Po [2] LIMBU EXCLAMATION MARK..LIMBU QUESTION MARK
+1AA8..1AAB ; Terminal_Punctuation # Po [4] TAI THAM SIGN KAAN..TAI THAM SIGN SATKAANKUU
+1B5A..1B5B ; Terminal_Punctuation # Po [2] BALINESE PANTI..BALINESE PAMADA
+1B5D..1B5F ; Terminal_Punctuation # Po [3] BALINESE CARIK PAMUNGKAH..BALINESE CARIK PAREREN
+1C3B..1C3F ; Terminal_Punctuation # Po [5] LEPCHA PUNCTUATION TA-ROL..LEPCHA PUNCTUATION TSHOOK
+1C7E..1C7F ; Terminal_Punctuation # Po [2] OL CHIKI PUNCTUATION MUCAAD..OL CHIKI PUNCTUATION DOUBLE MUCAAD
+203C..203D ; Terminal_Punctuation # Po [2] DOUBLE EXCLAMATION MARK..INTERROBANG
+2047..2049 ; Terminal_Punctuation # Po [3] DOUBLE QUESTION MARK..EXCLAMATION QUESTION MARK
+2E2E ; Terminal_Punctuation # Po REVERSED QUESTION MARK
+3001..3002 ; Terminal_Punctuation # Po [2] IDEOGRAPHIC COMMA..IDEOGRAPHIC FULL STOP
+A4FE..A4FF ; Terminal_Punctuation # Po [2] LISU PUNCTUATION COMMA..LISU PUNCTUATION FULL STOP
+A60D..A60F ; Terminal_Punctuation # Po [3] VAI COMMA..VAI QUESTION MARK
+A6F3..A6F7 ; Terminal_Punctuation # Po [5] BAMUM FULL STOP..BAMUM QUESTION MARK
+A876..A877 ; Terminal_Punctuation # Po [2] PHAGS-PA MARK SHAD..PHAGS-PA MARK DOUBLE SHAD
+A8CE..A8CF ; Terminal_Punctuation # Po [2] SAURASHTRA DANDA..SAURASHTRA DOUBLE DANDA
+A92F ; Terminal_Punctuation # Po KAYAH LI SIGN SHYA
+A9C7..A9C9 ; Terminal_Punctuation # Po [3] JAVANESE PADA PANGKAT..JAVANESE PADA LUNGSI
+AA5D..AA5F ; Terminal_Punctuation # Po [3] CHAM PUNCTUATION DANDA..CHAM PUNCTUATION TRIPLE DANDA
+AADF ; Terminal_Punctuation # Po TAI VIET SYMBOL KOI KOI
+ABEB ; Terminal_Punctuation # Po MEETEI MAYEK CHEIKHEI
+FE50..FE52 ; Terminal_Punctuation # Po [3] SMALL COMMA..SMALL FULL STOP
+FE54..FE57 ; Terminal_Punctuation # Po [4] SMALL SEMICOLON..SMALL EXCLAMATION MARK
+FF01 ; Terminal_Punctuation # Po FULLWIDTH EXCLAMATION MARK
+FF0C ; Terminal_Punctuation # Po FULLWIDTH COMMA
+FF0E ; Terminal_Punctuation # Po FULLWIDTH FULL STOP
+FF1A..FF1B ; Terminal_Punctuation # Po [2] FULLWIDTH COLON..FULLWIDTH SEMICOLON
+FF1F ; Terminal_Punctuation # Po FULLWIDTH QUESTION MARK
+FF61 ; Terminal_Punctuation # Po HALFWIDTH IDEOGRAPHIC FULL STOP
+FF64 ; Terminal_Punctuation # Po HALFWIDTH IDEOGRAPHIC COMMA
+1039F ; Terminal_Punctuation # Po UGARITIC WORD DIVIDER
+103D0 ; Terminal_Punctuation # Po OLD PERSIAN WORD DIVIDER
+10857 ; Terminal_Punctuation # Po IMPERIAL ARAMAIC SECTION SIGN
+1091F ; Terminal_Punctuation # Po PHOENICIAN WORD SEPARATOR
+10B3A..10B3F ; Terminal_Punctuation # Po [6] TINY TWO DOTS OVER ONE DOT PUNCTUATION..LARGE ONE RING OVER TWO RINGS PUNCTUATION
+11047..1104D ; Terminal_Punctuation # Po [7] BRAHMI DANDA..BRAHMI PUNCTUATION LOTUS
+110BE..110C1 ; Terminal_Punctuation # Po [4] KAITHI SECTION MARK..KAITHI DOUBLE DANDA
+12470..12473 ; Terminal_Punctuation # Po [4] CUNEIFORM PUNCTUATION SIGN OLD ASSYRIAN WORD DIVIDER..CUNEIFORM PUNCTUATION SIGN DIAGONAL TRICOLON
+
+# Total code points: 169
+
+# ================================================
+
+005E ; Other_Math # Sk CIRCUMFLEX ACCENT
+03D0..03D2 ; Other_Math # L& [3] GREEK BETA SYMBOL..GREEK UPSILON WITH HOOK SYMBOL
+03D5 ; Other_Math # L& GREEK PHI SYMBOL
+03F0..03F1 ; Other_Math # L& [2] GREEK KAPPA SYMBOL..GREEK RHO SYMBOL
+03F4..03F5 ; Other_Math # L& [2] GREEK CAPITAL THETA SYMBOL..GREEK LUNATE EPSILON SYMBOL
+2016 ; Other_Math # Po DOUBLE VERTICAL LINE
+2032..2034 ; Other_Math # Po [3] PRIME..TRIPLE PRIME
+2040 ; Other_Math # Pc CHARACTER TIE
+2061..2064 ; Other_Math # Cf [4] FUNCTION APPLICATION..INVISIBLE PLUS
+207D ; Other_Math # Ps SUPERSCRIPT LEFT PARENTHESIS
+207E ; Other_Math # Pe SUPERSCRIPT RIGHT PARENTHESIS
+208D ; Other_Math # Ps SUBSCRIPT LEFT PARENTHESIS
+208E ; Other_Math # Pe SUBSCRIPT RIGHT PARENTHESIS
+20D0..20DC ; Other_Math # Mn [13] COMBINING LEFT HARPOON ABOVE..COMBINING FOUR DOTS ABOVE
+20E1 ; Other_Math # Mn COMBINING LEFT RIGHT ARROW ABOVE
+20E5..20E6 ; Other_Math # Mn [2] COMBINING REVERSE SOLIDUS OVERLAY..COMBINING DOUBLE VERTICAL STROKE OVERLAY
+20EB..20EF ; Other_Math # Mn [5] COMBINING LONG DOUBLE SOLIDUS OVERLAY..COMBINING RIGHT ARROW BELOW
+2102 ; Other_Math # L& DOUBLE-STRUCK CAPITAL C
+2107 ; Other_Math # L& EULER CONSTANT
+210A..2113 ; Other_Math # L& [10] SCRIPT SMALL G..SCRIPT SMALL L
+2115 ; Other_Math # L& DOUBLE-STRUCK CAPITAL N
+2119..211D ; Other_Math # L& [5] DOUBLE-STRUCK CAPITAL P..DOUBLE-STRUCK CAPITAL R
+2124 ; Other_Math # L& DOUBLE-STRUCK CAPITAL Z
+2128 ; Other_Math # L& BLACK-LETTER CAPITAL Z
+2129 ; Other_Math # So TURNED GREEK SMALL LETTER IOTA
+212C..212D ; Other_Math # L& [2] SCRIPT CAPITAL B..BLACK-LETTER CAPITAL C
+212F..2131 ; Other_Math # L& [3] SCRIPT SMALL E..SCRIPT CAPITAL F
+2133..2134 ; Other_Math # L& [2] SCRIPT CAPITAL M..SCRIPT SMALL O
+2135..2138 ; Other_Math # Lo [4] ALEF SYMBOL..DALET SYMBOL
+213C..213F ; Other_Math # L& [4] DOUBLE-STRUCK SMALL PI..DOUBLE-STRUCK CAPITAL PI
+2145..2149 ; Other_Math # L& [5] DOUBLE-STRUCK ITALIC CAPITAL D..DOUBLE-STRUCK ITALIC SMALL J
+2195..2199 ; Other_Math # So [5] UP DOWN ARROW..SOUTH WEST ARROW
+219C..219F ; Other_Math # So [4] LEFTWARDS WAVE ARROW..UPWARDS TWO HEADED ARROW
+21A1..21A2 ; Other_Math # So [2] DOWNWARDS TWO HEADED ARROW..LEFTWARDS ARROW WITH TAIL
+21A4..21A5 ; Other_Math # So [2] LEFTWARDS ARROW FROM BAR..UPWARDS ARROW FROM BAR
+21A7 ; Other_Math # So DOWNWARDS ARROW FROM BAR
+21A9..21AD ; Other_Math # So [5] LEFTWARDS ARROW WITH HOOK..LEFT RIGHT WAVE ARROW
+21B0..21B1 ; Other_Math # So [2] UPWARDS ARROW WITH TIP LEFTWARDS..UPWARDS ARROW WITH TIP RIGHTWARDS
+21B6..21B7 ; Other_Math # So [2] ANTICLOCKWISE TOP SEMICIRCLE ARROW..CLOCKWISE TOP SEMICIRCLE ARROW
+21BC..21CD ; Other_Math # So [18] LEFTWARDS HARPOON WITH BARB UPWARDS..LEFTWARDS DOUBLE ARROW WITH STROKE
+21D0..21D1 ; Other_Math # So [2] LEFTWARDS DOUBLE ARROW..UPWARDS DOUBLE ARROW
+21D3 ; Other_Math # So DOWNWARDS DOUBLE ARROW
+21D5..21DB ; Other_Math # So [7] UP DOWN DOUBLE ARROW..RIGHTWARDS TRIPLE ARROW
+21DD ; Other_Math # So RIGHTWARDS SQUIGGLE ARROW
+21E4..21E5 ; Other_Math # So [2] LEFTWARDS ARROW TO BAR..RIGHTWARDS ARROW TO BAR
+23B4..23B5 ; Other_Math # So [2] TOP SQUARE BRACKET..BOTTOM SQUARE BRACKET
+23B7 ; Other_Math # So RADICAL SYMBOL BOTTOM
+23D0 ; Other_Math # So VERTICAL LINE EXTENSION
+23E2 ; Other_Math # So WHITE TRAPEZIUM
+25A0..25A1 ; Other_Math # So [2] BLACK SQUARE..WHITE SQUARE
+25AE..25B6 ; Other_Math # So [9] BLACK VERTICAL RECTANGLE..BLACK RIGHT-POINTING TRIANGLE
+25BC..25C0 ; Other_Math # So [5] BLACK DOWN-POINTING TRIANGLE..BLACK LEFT-POINTING TRIANGLE
+25C6..25C7 ; Other_Math # So [2] BLACK DIAMOND..WHITE DIAMOND
+25CA..25CB ; Other_Math # So [2] LOZENGE..WHITE CIRCLE
+25CF..25D3 ; Other_Math # So [5] BLACK CIRCLE..CIRCLE WITH UPPER HALF BLACK
+25E2 ; Other_Math # So BLACK LOWER RIGHT TRIANGLE
+25E4 ; Other_Math # So BLACK UPPER LEFT TRIANGLE
+25E7..25EC ; Other_Math # So [6] SQUARE WITH LEFT HALF BLACK..WHITE UP-POINTING TRIANGLE WITH DOT
+2605..2606 ; Other_Math # So [2] BLACK STAR..WHITE STAR
+2640 ; Other_Math # So FEMALE SIGN
+2642 ; Other_Math # So MALE SIGN
+2660..2663 ; Other_Math # So [4] BLACK SPADE SUIT..BLACK CLUB SUIT
+266D..266E ; Other_Math # So [2] MUSIC FLAT SIGN..MUSIC NATURAL SIGN
+27C5 ; Other_Math # Ps LEFT S-SHAPED BAG DELIMITER
+27C6 ; Other_Math # Pe RIGHT S-SHAPED BAG DELIMITER
+27E6 ; Other_Math # Ps MATHEMATICAL LEFT WHITE SQUARE BRACKET
+27E7 ; Other_Math # Pe MATHEMATICAL RIGHT WHITE SQUARE BRACKET
+27E8 ; Other_Math # Ps MATHEMATICAL LEFT ANGLE BRACKET
+27E9 ; Other_Math # Pe MATHEMATICAL RIGHT ANGLE BRACKET
+27EA ; Other_Math # Ps MATHEMATICAL LEFT DOUBLE ANGLE BRACKET
+27EB ; Other_Math # Pe MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET
+27EC ; Other_Math # Ps MATHEMATICAL LEFT WHITE TORTOISE SHELL BRACKET
+27ED ; Other_Math # Pe MATHEMATICAL RIGHT WHITE TORTOISE SHELL BRACKET
+27EE ; Other_Math # Ps MATHEMATICAL LEFT FLATTENED PARENTHESIS
+27EF ; Other_Math # Pe MATHEMATICAL RIGHT FLATTENED PARENTHESIS
+2983 ; Other_Math # Ps LEFT WHITE CURLY BRACKET
+2984 ; Other_Math # Pe RIGHT WHITE CURLY BRACKET
+2985 ; Other_Math # Ps LEFT WHITE PARENTHESIS
+2986 ; Other_Math # Pe RIGHT WHITE PARENTHESIS
+2987 ; Other_Math # Ps Z NOTATION LEFT IMAGE BRACKET
+2988 ; Other_Math # Pe Z NOTATION RIGHT IMAGE BRACKET
+2989 ; Other_Math # Ps Z NOTATION LEFT BINDING BRACKET
+298A ; Other_Math # Pe Z NOTATION RIGHT BINDING BRACKET
+298B ; Other_Math # Ps LEFT SQUARE BRACKET WITH UNDERBAR
+298C ; Other_Math # Pe RIGHT SQUARE BRACKET WITH UNDERBAR
+298D ; Other_Math # Ps LEFT SQUARE BRACKET WITH TICK IN TOP CORNER
+298E ; Other_Math # Pe RIGHT SQUARE BRACKET WITH TICK IN BOTTOM CORNER
+298F ; Other_Math # Ps LEFT SQUARE BRACKET WITH TICK IN BOTTOM CORNER
+2990 ; Other_Math # Pe RIGHT SQUARE BRACKET WITH TICK IN TOP CORNER
+2991 ; Other_Math # Ps LEFT ANGLE BRACKET WITH DOT
+2992 ; Other_Math # Pe RIGHT ANGLE BRACKET WITH DOT
+2993 ; Other_Math # Ps LEFT ARC LESS-THAN BRACKET
+2994 ; Other_Math # Pe RIGHT ARC GREATER-THAN BRACKET
+2995 ; Other_Math # Ps DOUBLE LEFT ARC GREATER-THAN BRACKET
+2996 ; Other_Math # Pe DOUBLE RIGHT ARC LESS-THAN BRACKET
+2997 ; Other_Math # Ps LEFT BLACK TORTOISE SHELL BRACKET
+2998 ; Other_Math # Pe RIGHT BLACK TORTOISE SHELL BRACKET
+29D8 ; Other_Math # Ps LEFT WIGGLY FENCE
+29D9 ; Other_Math # Pe RIGHT WIGGLY FENCE
+29DA ; Other_Math # Ps LEFT DOUBLE WIGGLY FENCE
+29DB ; Other_Math # Pe RIGHT DOUBLE WIGGLY FENCE
+29FC ; Other_Math # Ps LEFT-POINTING CURVED ANGLE BRACKET
+29FD ; Other_Math # Pe RIGHT-POINTING CURVED ANGLE BRACKET
+FE61 ; Other_Math # Po SMALL ASTERISK
+FE63 ; Other_Math # Pd SMALL HYPHEN-MINUS
+FE68 ; Other_Math # Po SMALL REVERSE SOLIDUS
+FF3C ; Other_Math # Po FULLWIDTH REVERSE SOLIDUS
+FF3E ; Other_Math # Sk FULLWIDTH CIRCUMFLEX ACCENT
+1D400..1D454 ; Other_Math # L& [85] MATHEMATICAL BOLD CAPITAL A..MATHEMATICAL ITALIC SMALL G
+1D456..1D49C ; Other_Math # L& [71] MATHEMATICAL ITALIC SMALL I..MATHEMATICAL SCRIPT CAPITAL A
+1D49E..1D49F ; Other_Math # L& [2] MATHEMATICAL SCRIPT CAPITAL C..MATHEMATICAL SCRIPT CAPITAL D
+1D4A2 ; Other_Math # L& MATHEMATICAL SCRIPT CAPITAL G
+1D4A5..1D4A6 ; Other_Math # L& [2] MATHEMATICAL SCRIPT CAPITAL J..MATHEMATICAL SCRIPT CAPITAL K
+1D4A9..1D4AC ; Other_Math # L& [4] MATHEMATICAL SCRIPT CAPITAL N..MATHEMATICAL SCRIPT CAPITAL Q
+1D4AE..1D4B9 ; Other_Math # L& [12] MATHEMATICAL SCRIPT CAPITAL S..MATHEMATICAL SCRIPT SMALL D
+1D4BB ; Other_Math # L& MATHEMATICAL SCRIPT SMALL F
+1D4BD..1D4C3 ; Other_Math # L& [7] MATHEMATICAL SCRIPT SMALL H..MATHEMATICAL SCRIPT SMALL N
+1D4C5..1D505 ; Other_Math # L& [65] MATHEMATICAL SCRIPT SMALL P..MATHEMATICAL FRAKTUR CAPITAL B
+1D507..1D50A ; Other_Math # L& [4] MATHEMATICAL FRAKTUR CAPITAL D..MATHEMATICAL FRAKTUR CAPITAL G
+1D50D..1D514 ; Other_Math # L& [8] MATHEMATICAL FRAKTUR CAPITAL J..MATHEMATICAL FRAKTUR CAPITAL Q
+1D516..1D51C ; Other_Math # L& [7] MATHEMATICAL FRAKTUR CAPITAL S..MATHEMATICAL FRAKTUR CAPITAL Y
+1D51E..1D539 ; Other_Math # L& [28] MATHEMATICAL FRAKTUR SMALL A..MATHEMATICAL DOUBLE-STRUCK CAPITAL B
+1D53B..1D53E ; Other_Math # L& [4] MATHEMATICAL DOUBLE-STRUCK CAPITAL D..MATHEMATICAL DOUBLE-STRUCK CAPITAL G
+1D540..1D544 ; Other_Math # L& [5] MATHEMATICAL DOUBLE-STRUCK CAPITAL I..MATHEMATICAL DOUBLE-STRUCK CAPITAL M
+1D546 ; Other_Math # L& MATHEMATICAL DOUBLE-STRUCK CAPITAL O
+1D54A..1D550 ; Other_Math # L& [7] MATHEMATICAL DOUBLE-STRUCK CAPITAL S..MATHEMATICAL DOUBLE-STRUCK CAPITAL Y
+1D552..1D6A5 ; Other_Math # L& [340] MATHEMATICAL DOUBLE-STRUCK SMALL A..MATHEMATICAL ITALIC SMALL DOTLESS J
+1D6A8..1D6C0 ; Other_Math # L& [25] MATHEMATICAL BOLD CAPITAL ALPHA..MATHEMATICAL BOLD CAPITAL OMEGA
+1D6C2..1D6DA ; Other_Math # L& [25] MATHEMATICAL BOLD SMALL ALPHA..MATHEMATICAL BOLD SMALL OMEGA
+1D6DC..1D6FA ; Other_Math # L& [31] MATHEMATICAL BOLD EPSILON SYMBOL..MATHEMATICAL ITALIC CAPITAL OMEGA
+1D6FC..1D714 ; Other_Math # L& [25] MATHEMATICAL ITALIC SMALL ALPHA..MATHEMATICAL ITALIC SMALL OMEGA
+1D716..1D734 ; Other_Math # L& [31] MATHEMATICAL ITALIC EPSILON SYMBOL..MATHEMATICAL BOLD ITALIC CAPITAL OMEGA
+1D736..1D74E ; Other_Math # L& [25] MATHEMATICAL BOLD ITALIC SMALL ALPHA..MATHEMATICAL BOLD ITALIC SMALL OMEGA
+1D750..1D76E ; Other_Math # L& [31] MATHEMATICAL BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL SANS-SERIF BOLD CAPITAL OMEGA
+1D770..1D788 ; Other_Math # L& [25] MATHEMATICAL SANS-SERIF BOLD SMALL ALPHA..MATHEMATICAL SANS-SERIF BOLD SMALL OMEGA
+1D78A..1D7A8 ; Other_Math # L& [31] MATHEMATICAL SANS-SERIF BOLD EPSILON SYMBOL..MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMEGA
+1D7AA..1D7C2 ; Other_Math # L& [25] MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ALPHA..MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMEGA
+1D7C4..1D7CB ; Other_Math # L& [8] MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL BOLD SMALL DIGAMMA
+1D7CE..1D7FF ; Other_Math # Nd [50] MATHEMATICAL BOLD DIGIT ZERO..MATHEMATICAL MONOSPACE DIGIT NINE
+
+# Total code points: 1217
+
+# ================================================
+
+0030..0039 ; Hex_Digit # Nd [10] DIGIT ZERO..DIGIT NINE
+0041..0046 ; Hex_Digit # L& [6] LATIN CAPITAL LETTER A..LATIN CAPITAL LETTER F
+0061..0066 ; Hex_Digit # L& [6] LATIN SMALL LETTER A..LATIN SMALL LETTER F
+FF10..FF19 ; Hex_Digit # Nd [10] FULLWIDTH DIGIT ZERO..FULLWIDTH DIGIT NINE
+FF21..FF26 ; Hex_Digit # L& [6] FULLWIDTH LATIN CAPITAL LETTER A..FULLWIDTH LATIN CAPITAL LETTER F
+FF41..FF46 ; Hex_Digit # L& [6] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN SMALL LETTER F
+
+# Total code points: 44
+
+# ================================================
+
+0030..0039 ; ASCII_Hex_Digit # Nd [10] DIGIT ZERO..DIGIT NINE
+0041..0046 ; ASCII_Hex_Digit # L& [6] LATIN CAPITAL LETTER A..LATIN CAPITAL LETTER F
+0061..0066 ; ASCII_Hex_Digit # L& [6] LATIN SMALL LETTER A..LATIN SMALL LETTER F
+
+# Total code points: 22
+
+# ================================================
+
+0345 ; Other_Alphabetic # Mn COMBINING GREEK YPOGEGRAMMENI
+05B0..05BD ; Other_Alphabetic # Mn [14] HEBREW POINT SHEVA..HEBREW POINT METEG
+05BF ; Other_Alphabetic # Mn HEBREW POINT RAFE
+05C1..05C2 ; Other_Alphabetic # Mn [2] HEBREW POINT SHIN DOT..HEBREW POINT SIN DOT
+05C4..05C5 ; Other_Alphabetic # Mn [2] HEBREW MARK UPPER DOT..HEBREW MARK LOWER DOT
+05C7 ; Other_Alphabetic # Mn HEBREW POINT QAMATS QATAN
+0610..061A ; Other_Alphabetic # Mn [11] ARABIC SIGN SALLALLAHOU ALAYHE WASSALLAM..ARABIC SMALL KASRA
+064B..0657 ; Other_Alphabetic # Mn [13] ARABIC FATHATAN..ARABIC INVERTED DAMMA
+0659..065F ; Other_Alphabetic # Mn [7] ARABIC ZWARAKAY..ARABIC WAVY HAMZA BELOW
+0670 ; Other_Alphabetic # Mn ARABIC LETTER SUPERSCRIPT ALEF
+06D6..06DC ; Other_Alphabetic # Mn [7] ARABIC SMALL HIGH LIGATURE SAD WITH LAM WITH ALEF MAKSURA..ARABIC SMALL HIGH SEEN
+06E1..06E4 ; Other_Alphabetic # Mn [4] ARABIC SMALL HIGH DOTLESS HEAD OF KHAH..ARABIC SMALL HIGH MADDA
+06E7..06E8 ; Other_Alphabetic # Mn [2] ARABIC SMALL HIGH YEH..ARABIC SMALL HIGH NOON
+06ED ; Other_Alphabetic # Mn ARABIC SMALL LOW MEEM
+0711 ; Other_Alphabetic # Mn SYRIAC LETTER SUPERSCRIPT ALAPH
+0730..073F ; Other_Alphabetic # Mn [16] SYRIAC PTHAHA ABOVE..SYRIAC RWAHA
+07A6..07B0 ; Other_Alphabetic # Mn [11] THAANA ABAFILI..THAANA SUKUN
+0816..0817 ; Other_Alphabetic # Mn [2] SAMARITAN MARK IN..SAMARITAN MARK IN-ALAF
+081B..0823 ; Other_Alphabetic # Mn [9] SAMARITAN MARK EPENTHETIC YUT..SAMARITAN VOWEL SIGN A
+0825..0827 ; Other_Alphabetic # Mn [3] SAMARITAN VOWEL SIGN SHORT A..SAMARITAN VOWEL SIGN U
+0829..082C ; Other_Alphabetic # Mn [4] SAMARITAN VOWEL SIGN LONG I..SAMARITAN VOWEL SIGN SUKUN
+0900..0902 ; Other_Alphabetic # Mn [3] DEVANAGARI SIGN INVERTED CANDRABINDU..DEVANAGARI SIGN ANUSVARA
+0903 ; Other_Alphabetic # Mc DEVANAGARI SIGN VISARGA
+093A ; Other_Alphabetic # Mn DEVANAGARI VOWEL SIGN OE
+093B ; Other_Alphabetic # Mc DEVANAGARI VOWEL SIGN OOE
+093E..0940 ; Other_Alphabetic # Mc [3] DEVANAGARI VOWEL SIGN AA..DEVANAGARI VOWEL SIGN II
+0941..0948 ; Other_Alphabetic # Mn [8] DEVANAGARI VOWEL SIGN U..DEVANAGARI VOWEL SIGN AI
+0949..094C ; Other_Alphabetic # Mc [4] DEVANAGARI VOWEL SIGN CANDRA O..DEVANAGARI VOWEL SIGN AU
+094E..094F ; Other_Alphabetic # Mc [2] DEVANAGARI VOWEL SIGN PRISHTHAMATRA E..DEVANAGARI VOWEL SIGN AW
+0955..0957 ; Other_Alphabetic # Mn [3] DEVANAGARI VOWEL SIGN CANDRA LONG E..DEVANAGARI VOWEL SIGN UUE
+0962..0963 ; Other_Alphabetic # Mn [2] DEVANAGARI VOWEL SIGN VOCALIC L..DEVANAGARI VOWEL SIGN VOCALIC LL
+0981 ; Other_Alphabetic # Mn BENGALI SIGN CANDRABINDU
+0982..0983 ; Other_Alphabetic # Mc [2] BENGALI SIGN ANUSVARA..BENGALI SIGN VISARGA
+09BE..09C0 ; Other_Alphabetic # Mc [3] BENGALI VOWEL SIGN AA..BENGALI VOWEL SIGN II
+09C1..09C4 ; Other_Alphabetic # Mn [4] BENGALI VOWEL SIGN U..BENGALI VOWEL SIGN VOCALIC RR
+09C7..09C8 ; Other_Alphabetic # Mc [2] BENGALI VOWEL SIGN E..BENGALI VOWEL SIGN AI
+09CB..09CC ; Other_Alphabetic # Mc [2] BENGALI VOWEL SIGN O..BENGALI VOWEL SIGN AU
+09D7 ; Other_Alphabetic # Mc BENGALI AU LENGTH MARK
+09E2..09E3 ; Other_Alphabetic # Mn [2] BENGALI VOWEL SIGN VOCALIC L..BENGALI VOWEL SIGN VOCALIC LL
+0A01..0A02 ; Other_Alphabetic # Mn [2] GURMUKHI SIGN ADAK BINDI..GURMUKHI SIGN BINDI
+0A03 ; Other_Alphabetic # Mc GURMUKHI SIGN VISARGA
+0A3E..0A40 ; Other_Alphabetic # Mc [3] GURMUKHI VOWEL SIGN AA..GURMUKHI VOWEL SIGN II
+0A41..0A42 ; Other_Alphabetic # Mn [2] GURMUKHI VOWEL SIGN U..GURMUKHI VOWEL SIGN UU
+0A47..0A48 ; Other_Alphabetic # Mn [2] GURMUKHI VOWEL SIGN EE..GURMUKHI VOWEL SIGN AI
+0A4B..0A4C ; Other_Alphabetic # Mn [2] GURMUKHI VOWEL SIGN OO..GURMUKHI VOWEL SIGN AU
+0A51 ; Other_Alphabetic # Mn GURMUKHI SIGN UDAAT
+0A70..0A71 ; Other_Alphabetic # Mn [2] GURMUKHI TIPPI..GURMUKHI ADDAK
+0A75 ; Other_Alphabetic # Mn GURMUKHI SIGN YAKASH
+0A81..0A82 ; Other_Alphabetic # Mn [2] GUJARATI SIGN CANDRABINDU..GUJARATI SIGN ANUSVARA
+0A83 ; Other_Alphabetic # Mc GUJARATI SIGN VISARGA
+0ABE..0AC0 ; Other_Alphabetic # Mc [3] GUJARATI VOWEL SIGN AA..GUJARATI VOWEL SIGN II
+0AC1..0AC5 ; Other_Alphabetic # Mn [5] GUJARATI VOWEL SIGN U..GUJARATI VOWEL SIGN CANDRA E
+0AC7..0AC8 ; Other_Alphabetic # Mn [2] GUJARATI VOWEL SIGN E..GUJARATI VOWEL SIGN AI
+0AC9 ; Other_Alphabetic # Mc GUJARATI VOWEL SIGN CANDRA O
+0ACB..0ACC ; Other_Alphabetic # Mc [2] GUJARATI VOWEL SIGN O..GUJARATI VOWEL SIGN AU
+0AE2..0AE3 ; Other_Alphabetic # Mn [2] GUJARATI VOWEL SIGN VOCALIC L..GUJARATI VOWEL SIGN VOCALIC LL
+0B01 ; Other_Alphabetic # Mn ORIYA SIGN CANDRABINDU
+0B02..0B03 ; Other_Alphabetic # Mc [2] ORIYA SIGN ANUSVARA..ORIYA SIGN VISARGA
+0B3E ; Other_Alphabetic # Mc ORIYA VOWEL SIGN AA
+0B3F ; Other_Alphabetic # Mn ORIYA VOWEL SIGN I
+0B40 ; Other_Alphabetic # Mc ORIYA VOWEL SIGN II
+0B41..0B44 ; Other_Alphabetic # Mn [4] ORIYA VOWEL SIGN U..ORIYA VOWEL SIGN VOCALIC RR
+0B47..0B48 ; Other_Alphabetic # Mc [2] ORIYA VOWEL SIGN E..ORIYA VOWEL SIGN AI
+0B4B..0B4C ; Other_Alphabetic # Mc [2] ORIYA VOWEL SIGN O..ORIYA VOWEL SIGN AU
+0B56 ; Other_Alphabetic # Mn ORIYA AI LENGTH MARK
+0B57 ; Other_Alphabetic # Mc ORIYA AU LENGTH MARK
+0B62..0B63 ; Other_Alphabetic # Mn [2] ORIYA VOWEL SIGN VOCALIC L..ORIYA VOWEL SIGN VOCALIC LL
+0B82 ; Other_Alphabetic # Mn TAMIL SIGN ANUSVARA
+0BBE..0BBF ; Other_Alphabetic # Mc [2] TAMIL VOWEL SIGN AA..TAMIL VOWEL SIGN I
+0BC0 ; Other_Alphabetic # Mn TAMIL VOWEL SIGN II
+0BC1..0BC2 ; Other_Alphabetic # Mc [2] TAMIL VOWEL SIGN U..TAMIL VOWEL SIGN UU
+0BC6..0BC8 ; Other_Alphabetic # Mc [3] TAMIL VOWEL SIGN E..TAMIL VOWEL SIGN AI
+0BCA..0BCC ; Other_Alphabetic # Mc [3] TAMIL VOWEL SIGN O..TAMIL VOWEL SIGN AU
+0BD7 ; Other_Alphabetic # Mc TAMIL AU LENGTH MARK
+0C01..0C03 ; Other_Alphabetic # Mc [3] TELUGU SIGN CANDRABINDU..TELUGU SIGN VISARGA
+0C3E..0C40 ; Other_Alphabetic # Mn [3] TELUGU VOWEL SIGN AA..TELUGU VOWEL SIGN II
+0C41..0C44 ; Other_Alphabetic # Mc [4] TELUGU VOWEL SIGN U..TELUGU VOWEL SIGN VOCALIC RR
+0C46..0C48 ; Other_Alphabetic # Mn [3] TELUGU VOWEL SIGN E..TELUGU VOWEL SIGN AI
+0C4A..0C4C ; Other_Alphabetic # Mn [3] TELUGU VOWEL SIGN O..TELUGU VOWEL SIGN AU
+0C55..0C56 ; Other_Alphabetic # Mn [2] TELUGU LENGTH MARK..TELUGU AI LENGTH MARK
+0C62..0C63 ; Other_Alphabetic # Mn [2] TELUGU VOWEL SIGN VOCALIC L..TELUGU VOWEL SIGN VOCALIC LL
+0C82..0C83 ; Other_Alphabetic # Mc [2] KANNADA SIGN ANUSVARA..KANNADA SIGN VISARGA
+0CBE ; Other_Alphabetic # Mc KANNADA VOWEL SIGN AA
+0CBF ; Other_Alphabetic # Mn KANNADA VOWEL SIGN I
+0CC0..0CC4 ; Other_Alphabetic # Mc [5] KANNADA VOWEL SIGN II..KANNADA VOWEL SIGN VOCALIC RR
+0CC6 ; Other_Alphabetic # Mn KANNADA VOWEL SIGN E
+0CC7..0CC8 ; Other_Alphabetic # Mc [2] KANNADA VOWEL SIGN EE..KANNADA VOWEL SIGN AI
+0CCA..0CCB ; Other_Alphabetic # Mc [2] KANNADA VOWEL SIGN O..KANNADA VOWEL SIGN OO
+0CCC ; Other_Alphabetic # Mn KANNADA VOWEL SIGN AU
+0CD5..0CD6 ; Other_Alphabetic # Mc [2] KANNADA LENGTH MARK..KANNADA AI LENGTH MARK
+0CE2..0CE3 ; Other_Alphabetic # Mn [2] KANNADA VOWEL SIGN VOCALIC L..KANNADA VOWEL SIGN VOCALIC LL
+0D02..0D03 ; Other_Alphabetic # Mc [2] MALAYALAM SIGN ANUSVARA..MALAYALAM SIGN VISARGA
+0D3E..0D40 ; Other_Alphabetic # Mc [3] MALAYALAM VOWEL SIGN AA..MALAYALAM VOWEL SIGN II
+0D41..0D44 ; Other_Alphabetic # Mn [4] MALAYALAM VOWEL SIGN U..MALAYALAM VOWEL SIGN VOCALIC RR
+0D46..0D48 ; Other_Alphabetic # Mc [3] MALAYALAM VOWEL SIGN E..MALAYALAM VOWEL SIGN AI
+0D4A..0D4C ; Other_Alphabetic # Mc [3] MALAYALAM VOWEL SIGN O..MALAYALAM VOWEL SIGN AU
+0D57 ; Other_Alphabetic # Mc MALAYALAM AU LENGTH MARK
+0D62..0D63 ; Other_Alphabetic # Mn [2] MALAYALAM VOWEL SIGN VOCALIC L..MALAYALAM VOWEL SIGN VOCALIC LL
+0D82..0D83 ; Other_Alphabetic # Mc [2] SINHALA SIGN ANUSVARAYA..SINHALA SIGN VISARGAYA
+0DCF..0DD1 ; Other_Alphabetic # Mc [3] SINHALA VOWEL SIGN AELA-PILLA..SINHALA VOWEL SIGN DIGA AEDA-PILLA
+0DD2..0DD4 ; Other_Alphabetic # Mn [3] SINHALA VOWEL SIGN KETTI IS-PILLA..SINHALA VOWEL SIGN KETTI PAA-PILLA
+0DD6 ; Other_Alphabetic # Mn SINHALA VOWEL SIGN DIGA PAA-PILLA
+0DD8..0DDF ; Other_Alphabetic # Mc [8] SINHALA VOWEL SIGN GAETTA-PILLA..SINHALA VOWEL SIGN GAYANUKITTA
+0DF2..0DF3 ; Other_Alphabetic # Mc [2] SINHALA VOWEL SIGN DIGA GAETTA-PILLA..SINHALA VOWEL SIGN DIGA GAYANUKITTA
+0E31 ; Other_Alphabetic # Mn THAI CHARACTER MAI HAN-AKAT
+0E34..0E3A ; Other_Alphabetic # Mn [7] THAI CHARACTER SARA I..THAI CHARACTER PHINTHU
+0E4D ; Other_Alphabetic # Mn THAI CHARACTER NIKHAHIT
+0EB1 ; Other_Alphabetic # Mn LAO VOWEL SIGN MAI KAN
+0EB4..0EB9 ; Other_Alphabetic # Mn [6] LAO VOWEL SIGN I..LAO VOWEL SIGN UU
+0EBB..0EBC ; Other_Alphabetic # Mn [2] LAO VOWEL SIGN MAI KON..LAO SEMIVOWEL SIGN LO
+0ECD ; Other_Alphabetic # Mn LAO NIGGAHITA
+0F71..0F7E ; Other_Alphabetic # Mn [14] TIBETAN VOWEL SIGN AA..TIBETAN SIGN RJES SU NGA RO
+0F7F ; Other_Alphabetic # Mc TIBETAN SIGN RNAM BCAD
+0F80..0F81 ; Other_Alphabetic # Mn [2] TIBETAN VOWEL SIGN REVERSED I..TIBETAN VOWEL SIGN REVERSED II
+0F8D..0F97 ; Other_Alphabetic # Mn [11] TIBETAN SUBJOINED SIGN LCE TSA CAN..TIBETAN SUBJOINED LETTER JA
+0F99..0FBC ; Other_Alphabetic # Mn [36] TIBETAN SUBJOINED LETTER NYA..TIBETAN SUBJOINED LETTER FIXED-FORM RA
+102B..102C ; Other_Alphabetic # Mc [2] MYANMAR VOWEL SIGN TALL AA..MYANMAR VOWEL SIGN AA
+102D..1030 ; Other_Alphabetic # Mn [4] MYANMAR VOWEL SIGN I..MYANMAR VOWEL SIGN UU
+1031 ; Other_Alphabetic # Mc MYANMAR VOWEL SIGN E
+1032..1036 ; Other_Alphabetic # Mn [5] MYANMAR VOWEL SIGN AI..MYANMAR SIGN ANUSVARA
+1038 ; Other_Alphabetic # Mc MYANMAR SIGN VISARGA
+103B..103C ; Other_Alphabetic # Mc [2] MYANMAR CONSONANT SIGN MEDIAL YA..MYANMAR CONSONANT SIGN MEDIAL RA
+103D..103E ; Other_Alphabetic # Mn [2] MYANMAR CONSONANT SIGN MEDIAL WA..MYANMAR CONSONANT SIGN MEDIAL HA
+1056..1057 ; Other_Alphabetic # Mc [2] MYANMAR VOWEL SIGN VOCALIC R..MYANMAR VOWEL SIGN VOCALIC RR
+1058..1059 ; Other_Alphabetic # Mn [2] MYANMAR VOWEL SIGN VOCALIC L..MYANMAR VOWEL SIGN VOCALIC LL
+105E..1060 ; Other_Alphabetic # Mn [3] MYANMAR CONSONANT SIGN MON MEDIAL NA..MYANMAR CONSONANT SIGN MON MEDIAL LA
+1062 ; Other_Alphabetic # Mc MYANMAR VOWEL SIGN SGAW KAREN EU
+1067..1068 ; Other_Alphabetic # Mc [2] MYANMAR VOWEL SIGN WESTERN PWO KAREN EU..MYANMAR VOWEL SIGN WESTERN PWO KAREN UE
+1071..1074 ; Other_Alphabetic # Mn [4] MYANMAR VOWEL SIGN GEBA KAREN I..MYANMAR VOWEL SIGN KAYAH EE
+1082 ; Other_Alphabetic # Mn MYANMAR CONSONANT SIGN SHAN MEDIAL WA
+1083..1084 ; Other_Alphabetic # Mc [2] MYANMAR VOWEL SIGN SHAN AA..MYANMAR VOWEL SIGN SHAN E
+1085..1086 ; Other_Alphabetic # Mn [2] MYANMAR VOWEL SIGN SHAN E ABOVE..MYANMAR VOWEL SIGN SHAN FINAL Y
+109C ; Other_Alphabetic # Mc MYANMAR VOWEL SIGN AITON A
+109D ; Other_Alphabetic # Mn MYANMAR VOWEL SIGN AITON AI
+135F ; Other_Alphabetic # Mn ETHIOPIC COMBINING GEMINATION MARK
+1712..1713 ; Other_Alphabetic # Mn [2] TAGALOG VOWEL SIGN I..TAGALOG VOWEL SIGN U
+1732..1733 ; Other_Alphabetic # Mn [2] HANUNOO VOWEL SIGN I..HANUNOO VOWEL SIGN U
+1752..1753 ; Other_Alphabetic # Mn [2] BUHID VOWEL SIGN I..BUHID VOWEL SIGN U
+1772..1773 ; Other_Alphabetic # Mn [2] TAGBANWA VOWEL SIGN I..TAGBANWA VOWEL SIGN U
+17B6 ; Other_Alphabetic # Mc KHMER VOWEL SIGN AA
+17B7..17BD ; Other_Alphabetic # Mn [7] KHMER VOWEL SIGN I..KHMER VOWEL SIGN UA
+17BE..17C5 ; Other_Alphabetic # Mc [8] KHMER VOWEL SIGN OE..KHMER VOWEL SIGN AU
+17C6 ; Other_Alphabetic # Mn KHMER SIGN NIKAHIT
+17C7..17C8 ; Other_Alphabetic # Mc [2] KHMER SIGN REAHMUK..KHMER SIGN YUUKALEAPINTU
+18A9 ; Other_Alphabetic # Mn MONGOLIAN LETTER ALI GALI DAGALGA
+1920..1922 ; Other_Alphabetic # Mn [3] LIMBU VOWEL SIGN A..LIMBU VOWEL SIGN U
+1923..1926 ; Other_Alphabetic # Mc [4] LIMBU VOWEL SIGN EE..LIMBU VOWEL SIGN AU
+1927..1928 ; Other_Alphabetic # Mn [2] LIMBU VOWEL SIGN E..LIMBU VOWEL SIGN O
+1929..192B ; Other_Alphabetic # Mc [3] LIMBU SUBJOINED LETTER YA..LIMBU SUBJOINED LETTER WA
+1930..1931 ; Other_Alphabetic # Mc [2] LIMBU SMALL LETTER KA..LIMBU SMALL LETTER NGA
+1932 ; Other_Alphabetic # Mn LIMBU SMALL LETTER ANUSVARA
+1933..1938 ; Other_Alphabetic # Mc [6] LIMBU SMALL LETTER TA..LIMBU SMALL LETTER LA
+19B0..19C0 ; Other_Alphabetic # Mc [17] NEW TAI LUE VOWEL SIGN VOWEL SHORTENER..NEW TAI LUE VOWEL SIGN IY
+19C8..19C9 ; Other_Alphabetic # Mc [2] NEW TAI LUE TONE MARK-1..NEW TAI LUE TONE MARK-2
+1A17..1A18 ; Other_Alphabetic # Mn [2] BUGINESE VOWEL SIGN I..BUGINESE VOWEL SIGN U
+1A19..1A1B ; Other_Alphabetic # Mc [3] BUGINESE VOWEL SIGN E..BUGINESE VOWEL SIGN AE
+1A55 ; Other_Alphabetic # Mc TAI THAM CONSONANT SIGN MEDIAL RA
+1A56 ; Other_Alphabetic # Mn TAI THAM CONSONANT SIGN MEDIAL LA
+1A57 ; Other_Alphabetic # Mc TAI THAM CONSONANT SIGN LA TANG LAI
+1A58..1A5E ; Other_Alphabetic # Mn [7] TAI THAM SIGN MAI KANG LAI..TAI THAM CONSONANT SIGN SA
+1A61 ; Other_Alphabetic # Mc TAI THAM VOWEL SIGN A
+1A62 ; Other_Alphabetic # Mn TAI THAM VOWEL SIGN MAI SAT
+1A63..1A64 ; Other_Alphabetic # Mc [2] TAI THAM VOWEL SIGN AA..TAI THAM VOWEL SIGN TALL AA
+1A65..1A6C ; Other_Alphabetic # Mn [8] TAI THAM VOWEL SIGN I..TAI THAM VOWEL SIGN OA BELOW
+1A6D..1A72 ; Other_Alphabetic # Mc [6] TAI THAM VOWEL SIGN OY..TAI THAM VOWEL SIGN THAM AI
+1A73..1A74 ; Other_Alphabetic # Mn [2] TAI THAM VOWEL SIGN OA ABOVE..TAI THAM SIGN MAI KANG
+1B00..1B03 ; Other_Alphabetic # Mn [4] BALINESE SIGN ULU RICEM..BALINESE SIGN SURANG
+1B04 ; Other_Alphabetic # Mc BALINESE SIGN BISAH
+1B35 ; Other_Alphabetic # Mc BALINESE VOWEL SIGN TEDUNG
+1B36..1B3A ; Other_Alphabetic # Mn [5] BALINESE VOWEL SIGN ULU..BALINESE VOWEL SIGN RA REPA
+1B3B ; Other_Alphabetic # Mc BALINESE VOWEL SIGN RA REPA TEDUNG
+1B3C ; Other_Alphabetic # Mn BALINESE VOWEL SIGN LA LENGA
+1B3D..1B41 ; Other_Alphabetic # Mc [5] BALINESE VOWEL SIGN LA LENGA TEDUNG..BALINESE VOWEL SIGN TALING REPA TEDUNG
+1B42 ; Other_Alphabetic # Mn BALINESE VOWEL SIGN PEPET
+1B43 ; Other_Alphabetic # Mc BALINESE VOWEL SIGN PEPET TEDUNG
+1B80..1B81 ; Other_Alphabetic # Mn [2] SUNDANESE SIGN PANYECEK..SUNDANESE SIGN PANGLAYAR
+1B82 ; Other_Alphabetic # Mc SUNDANESE SIGN PANGWISAD
+1BA1 ; Other_Alphabetic # Mc SUNDANESE CONSONANT SIGN PAMINGKAL
+1BA2..1BA5 ; Other_Alphabetic # Mn [4] SUNDANESE CONSONANT SIGN PANYAKRA..SUNDANESE VOWEL SIGN PANYUKU
+1BA6..1BA7 ; Other_Alphabetic # Mc [2] SUNDANESE VOWEL SIGN PANAELAENG..SUNDANESE VOWEL SIGN PANOLONG
+1BA8..1BA9 ; Other_Alphabetic # Mn [2] SUNDANESE VOWEL SIGN PAMEPET..SUNDANESE VOWEL SIGN PANEULEUNG
+1BE7 ; Other_Alphabetic # Mc BATAK VOWEL SIGN E
+1BE8..1BE9 ; Other_Alphabetic # Mn [2] BATAK VOWEL SIGN PAKPAK E..BATAK VOWEL SIGN EE
+1BEA..1BEC ; Other_Alphabetic # Mc [3] BATAK VOWEL SIGN I..BATAK VOWEL SIGN O
+1BED ; Other_Alphabetic # Mn BATAK VOWEL SIGN KARO O
+1BEE ; Other_Alphabetic # Mc BATAK VOWEL SIGN U
+1BEF..1BF1 ; Other_Alphabetic # Mn [3] BATAK VOWEL SIGN U FOR SIMALUNGUN SA..BATAK CONSONANT SIGN H
+1C24..1C2B ; Other_Alphabetic # Mc [8] LEPCHA SUBJOINED LETTER YA..LEPCHA VOWEL SIGN UU
+1C2C..1C33 ; Other_Alphabetic # Mn [8] LEPCHA VOWEL SIGN E..LEPCHA CONSONANT SIGN T
+1C34..1C35 ; Other_Alphabetic # Mc [2] LEPCHA CONSONANT SIGN NYIN-DO..LEPCHA CONSONANT SIGN KANG
+1CF2 ; Other_Alphabetic # Mc VEDIC SIGN ARDHAVISARGA
+24B6..24E9 ; Other_Alphabetic # So [52] CIRCLED LATIN CAPITAL LETTER A..CIRCLED LATIN SMALL LETTER Z
+2DE0..2DFF ; Other_Alphabetic # Mn [32] COMBINING CYRILLIC LETTER BE..COMBINING CYRILLIC LETTER IOTIFIED BIG YUS
+A823..A824 ; Other_Alphabetic # Mc [2] SYLOTI NAGRI VOWEL SIGN A..SYLOTI NAGRI VOWEL SIGN I
+A825..A826 ; Other_Alphabetic # Mn [2] SYLOTI NAGRI VOWEL SIGN U..SYLOTI NAGRI VOWEL SIGN E
+A827 ; Other_Alphabetic # Mc SYLOTI NAGRI VOWEL SIGN OO
+A880..A881 ; Other_Alphabetic # Mc [2] SAURASHTRA SIGN ANUSVARA..SAURASHTRA SIGN VISARGA
+A8B4..A8C3 ; Other_Alphabetic # Mc [16] SAURASHTRA CONSONANT SIGN HAARU..SAURASHTRA VOWEL SIGN AU
+A926..A92A ; Other_Alphabetic # Mn [5] KAYAH LI VOWEL UE..KAYAH LI VOWEL O
+A947..A951 ; Other_Alphabetic # Mn [11] REJANG VOWEL SIGN I..REJANG CONSONANT SIGN R
+A952 ; Other_Alphabetic # Mc REJANG CONSONANT SIGN H
+A980..A982 ; Other_Alphabetic # Mn [3] JAVANESE SIGN PANYANGGA..JAVANESE SIGN LAYAR
+A983 ; Other_Alphabetic # Mc JAVANESE SIGN WIGNYAN
+A9B4..A9B5 ; Other_Alphabetic # Mc [2] JAVANESE VOWEL SIGN TARUNG..JAVANESE VOWEL SIGN TOLONG
+A9B6..A9B9 ; Other_Alphabetic # Mn [4] JAVANESE VOWEL SIGN WULU..JAVANESE VOWEL SIGN SUKU MENDUT
+A9BA..A9BB ; Other_Alphabetic # Mc [2] JAVANESE VOWEL SIGN TALING..JAVANESE VOWEL SIGN DIRGA MURE
+A9BC ; Other_Alphabetic # Mn JAVANESE VOWEL SIGN PEPET
+A9BD..A9BF ; Other_Alphabetic # Mc [3] JAVANESE CONSONANT SIGN KERET..JAVANESE CONSONANT SIGN CAKRA
+AA29..AA2E ; Other_Alphabetic # Mn [6] CHAM VOWEL SIGN AA..CHAM VOWEL SIGN OE
+AA2F..AA30 ; Other_Alphabetic # Mc [2] CHAM VOWEL SIGN O..CHAM VOWEL SIGN AI
+AA31..AA32 ; Other_Alphabetic # Mn [2] CHAM VOWEL SIGN AU..CHAM VOWEL SIGN UE
+AA33..AA34 ; Other_Alphabetic # Mc [2] CHAM CONSONANT SIGN YA..CHAM CONSONANT SIGN RA
+AA35..AA36 ; Other_Alphabetic # Mn [2] CHAM CONSONANT SIGN LA..CHAM CONSONANT SIGN WA
+AA43 ; Other_Alphabetic # Mn CHAM CONSONANT SIGN FINAL NG
+AA4C ; Other_Alphabetic # Mn CHAM CONSONANT SIGN FINAL M
+AA4D ; Other_Alphabetic # Mc CHAM CONSONANT SIGN FINAL H
+AAB0 ; Other_Alphabetic # Mn TAI VIET MAI KANG
+AAB2..AAB4 ; Other_Alphabetic # Mn [3] TAI VIET VOWEL I..TAI VIET VOWEL U
+AAB7..AAB8 ; Other_Alphabetic # Mn [2] TAI VIET MAI KHIT..TAI VIET VOWEL IA
+AABE ; Other_Alphabetic # Mn TAI VIET VOWEL AM
+ABE3..ABE4 ; Other_Alphabetic # Mc [2] MEETEI MAYEK VOWEL SIGN ONAP..MEETEI MAYEK VOWEL SIGN INAP
+ABE5 ; Other_Alphabetic # Mn MEETEI MAYEK VOWEL SIGN ANAP
+ABE6..ABE7 ; Other_Alphabetic # Mc [2] MEETEI MAYEK VOWEL SIGN YENAP..MEETEI MAYEK VOWEL SIGN SOUNAP
+ABE8 ; Other_Alphabetic # Mn MEETEI MAYEK VOWEL SIGN UNAP
+ABE9..ABEA ; Other_Alphabetic # Mc [2] MEETEI MAYEK VOWEL SIGN CHEINAP..MEETEI MAYEK VOWEL SIGN NUNG
+FB1E ; Other_Alphabetic # Mn HEBREW POINT JUDEO-SPANISH VARIKA
+10A01..10A03 ; Other_Alphabetic # Mn [3] KHAROSHTHI VOWEL SIGN I..KHAROSHTHI VOWEL SIGN VOCALIC R
+10A05..10A06 ; Other_Alphabetic # Mn [2] KHAROSHTHI VOWEL SIGN E..KHAROSHTHI VOWEL SIGN O
+10A0C..10A0F ; Other_Alphabetic # Mn [4] KHAROSHTHI VOWEL LENGTH MARK..KHAROSHTHI SIGN VISARGA
+11000 ; Other_Alphabetic # Mc BRAHMI SIGN CANDRABINDU
+11001 ; Other_Alphabetic # Mn BRAHMI SIGN ANUSVARA
+11002 ; Other_Alphabetic # Mc BRAHMI SIGN VISARGA
+11038..11045 ; Other_Alphabetic # Mn [14] BRAHMI VOWEL SIGN AA..BRAHMI VOWEL SIGN AU
+11082 ; Other_Alphabetic # Mc KAITHI SIGN VISARGA
+110B0..110B2 ; Other_Alphabetic # Mc [3] KAITHI VOWEL SIGN AA..KAITHI VOWEL SIGN II
+110B3..110B6 ; Other_Alphabetic # Mn [4] KAITHI VOWEL SIGN U..KAITHI VOWEL SIGN AI
+110B7..110B8 ; Other_Alphabetic # Mc [2] KAITHI VOWEL SIGN O..KAITHI VOWEL SIGN AU
+
+# Total code points: 795
+
+# ================================================
+
+3006 ; Ideographic # Lo IDEOGRAPHIC CLOSING MARK
+3007 ; Ideographic # Nl IDEOGRAPHIC NUMBER ZERO
+3021..3029 ; Ideographic # Nl [9] HANGZHOU NUMERAL ONE..HANGZHOU NUMERAL NINE
+3038..303A ; Ideographic # Nl [3] HANGZHOU NUMERAL TEN..HANGZHOU NUMERAL THIRTY
+3400..4DB5 ; Ideographic # Lo [6582] CJK UNIFIED IDEOGRAPH-3400..CJK UNIFIED IDEOGRAPH-4DB5
+4E00..9FCB ; Ideographic # Lo [20940] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FCB
+F900..FA2D ; Ideographic # Lo [302] CJK COMPATIBILITY IDEOGRAPH-F900..CJK COMPATIBILITY IDEOGRAPH-FA2D
+FA30..FA6D ; Ideographic # Lo [62] CJK COMPATIBILITY IDEOGRAPH-FA30..CJK COMPATIBILITY IDEOGRAPH-FA6D
+FA70..FAD9 ; Ideographic # Lo [106] CJK COMPATIBILITY IDEOGRAPH-FA70..CJK COMPATIBILITY IDEOGRAPH-FAD9
+20000..2A6D6 ; Ideographic # Lo [42711] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6D6
+2A700..2B734 ; Ideographic # Lo [4149] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B734
+2B740..2B81D ; Ideographic # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
+2F800..2FA1D ; Ideographic # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D
+
+# Total code points: 75630
+
+# ================================================
+
+005E ; Diacritic # Sk CIRCUMFLEX ACCENT
+0060 ; Diacritic # Sk GRAVE ACCENT
+00A8 ; Diacritic # Sk DIAERESIS
+00AF ; Diacritic # Sk MACRON
+00B4 ; Diacritic # Sk ACUTE ACCENT
+00B7 ; Diacritic # Po MIDDLE DOT
+00B8 ; Diacritic # Sk CEDILLA
+02B0..02C1 ; Diacritic # Lm [18] MODIFIER LETTER SMALL H..MODIFIER LETTER REVERSED GLOTTAL STOP
+02C2..02C5 ; Diacritic # Sk [4] MODIFIER LETTER LEFT ARROWHEAD..MODIFIER LETTER DOWN ARROWHEAD
+02C6..02D1 ; Diacritic # Lm [12] MODIFIER LETTER CIRCUMFLEX ACCENT..MODIFIER LETTER HALF TRIANGULAR COLON
+02D2..02DF ; Diacritic # Sk [14] MODIFIER LETTER CENTRED RIGHT HALF RING..MODIFIER LETTER CROSS ACCENT
+02E0..02E4 ; Diacritic # Lm [5] MODIFIER LETTER SMALL GAMMA..MODIFIER LETTER SMALL REVERSED GLOTTAL STOP
+02E5..02EB ; Diacritic # Sk [7] MODIFIER LETTER EXTRA-HIGH TONE BAR..MODIFIER LETTER YANG DEPARTING TONE MARK
+02EC ; Diacritic # Lm MODIFIER LETTER VOICING
+02ED ; Diacritic # Sk MODIFIER LETTER UNASPIRATED
+02EE ; Diacritic # Lm MODIFIER LETTER DOUBLE APOSTROPHE
+02EF..02FF ; Diacritic # Sk [17] MODIFIER LETTER LOW DOWN ARROWHEAD..MODIFIER LETTER LOW LEFT ARROW
+0300..034E ; Diacritic # Mn [79] COMBINING GRAVE ACCENT..COMBINING UPWARDS ARROW BELOW
+0350..0357 ; Diacritic # Mn [8] COMBINING RIGHT ARROWHEAD ABOVE..COMBINING RIGHT HALF RING ABOVE
+035D..0362 ; Diacritic # Mn [6] COMBINING DOUBLE BREVE..COMBINING DOUBLE RIGHTWARDS ARROW BELOW
+0374 ; Diacritic # Lm GREEK NUMERAL SIGN
+0375 ; Diacritic # Sk GREEK LOWER NUMERAL SIGN
+037A ; Diacritic # Lm GREEK YPOGEGRAMMENI
+0384..0385 ; Diacritic # Sk [2] GREEK TONOS..GREEK DIALYTIKA TONOS
+0483..0487 ; Diacritic # Mn [5] COMBINING CYRILLIC TITLO..COMBINING CYRILLIC POKRYTIE
+0559 ; Diacritic # Lm ARMENIAN MODIFIER LETTER LEFT HALF RING
+0591..05A1 ; Diacritic # Mn [17] HEBREW ACCENT ETNAHTA..HEBREW ACCENT PAZER
+05A3..05BD ; Diacritic # Mn [27] HEBREW ACCENT MUNAH..HEBREW POINT METEG
+05BF ; Diacritic # Mn HEBREW POINT RAFE
+05C1..05C2 ; Diacritic # Mn [2] HEBREW POINT SHIN DOT..HEBREW POINT SIN DOT
+05C4 ; Diacritic # Mn HEBREW MARK UPPER DOT
+064B..0652 ; Diacritic # Mn [8] ARABIC FATHATAN..ARABIC SUKUN
+0657..0658 ; Diacritic # Mn [2] ARABIC INVERTED DAMMA..ARABIC MARK NOON GHUNNA
+06DF..06E0 ; Diacritic # Mn [2] ARABIC SMALL HIGH ROUNDED ZERO..ARABIC SMALL HIGH UPRIGHT RECTANGULAR ZERO
+06E5..06E6 ; Diacritic # Lm [2] ARABIC SMALL WAW..ARABIC SMALL YEH
+06EA..06EC ; Diacritic # Mn [3] ARABIC EMPTY CENTRE LOW STOP..ARABIC ROUNDED HIGH STOP WITH FILLED CENTRE
+0730..074A ; Diacritic # Mn [27] SYRIAC PTHAHA ABOVE..SYRIAC BARREKH
+07A6..07B0 ; Diacritic # Mn [11] THAANA ABAFILI..THAANA SUKUN
+07EB..07F3 ; Diacritic # Mn [9] NKO COMBINING SHORT HIGH TONE..NKO COMBINING DOUBLE DOT ABOVE
+07F4..07F5 ; Diacritic # Lm [2] NKO HIGH TONE APOSTROPHE..NKO LOW TONE APOSTROPHE
+0818..0819 ; Diacritic # Mn [2] SAMARITAN MARK OCCLUSION..SAMARITAN MARK DAGESH
+093C ; Diacritic # Mn DEVANAGARI SIGN NUKTA
+094D ; Diacritic # Mn DEVANAGARI SIGN VIRAMA
+0951..0954 ; Diacritic # Mn [4] DEVANAGARI STRESS SIGN UDATTA..DEVANAGARI ACUTE ACCENT
+0971 ; Diacritic # Lm DEVANAGARI SIGN HIGH SPACING DOT
+09BC ; Diacritic # Mn BENGALI SIGN NUKTA
+09CD ; Diacritic # Mn BENGALI SIGN VIRAMA
+0A3C ; Diacritic # Mn GURMUKHI SIGN NUKTA
+0A4D ; Diacritic # Mn GURMUKHI SIGN VIRAMA
+0ABC ; Diacritic # Mn GUJARATI SIGN NUKTA
+0ACD ; Diacritic # Mn GUJARATI SIGN VIRAMA
+0B3C ; Diacritic # Mn ORIYA SIGN NUKTA
+0B4D ; Diacritic # Mn ORIYA SIGN VIRAMA
+0BCD ; Diacritic # Mn TAMIL SIGN VIRAMA
+0C4D ; Diacritic # Mn TELUGU SIGN VIRAMA
+0CBC ; Diacritic # Mn KANNADA SIGN NUKTA
+0CCD ; Diacritic # Mn KANNADA SIGN VIRAMA
+0D4D ; Diacritic # Mn MALAYALAM SIGN VIRAMA
+0DCA ; Diacritic # Mn SINHALA SIGN AL-LAKUNA
+0E47..0E4C ; Diacritic # Mn [6] THAI CHARACTER MAITAIKHU..THAI CHARACTER THANTHAKHAT
+0E4E ; Diacritic # Mn THAI CHARACTER YAMAKKAN
+0EC8..0ECC ; Diacritic # Mn [5] LAO TONE MAI EK..LAO CANCELLATION MARK
+0F18..0F19 ; Diacritic # Mn [2] TIBETAN ASTROLOGICAL SIGN -KHYUD PA..TIBETAN ASTROLOGICAL SIGN SDONG TSHUGS
+0F35 ; Diacritic # Mn TIBETAN MARK NGAS BZUNG NYI ZLA
+0F37 ; Diacritic # Mn TIBETAN MARK NGAS BZUNG SGOR RTAGS
+0F39 ; Diacritic # Mn TIBETAN MARK TSA -PHRU
+0F3E..0F3F ; Diacritic # Mc [2] TIBETAN SIGN YAR TSHES..TIBETAN SIGN MAR TSHES
+0F82..0F84 ; Diacritic # Mn [3] TIBETAN SIGN NYI ZLA NAA DA..TIBETAN MARK HALANTA
+0F86..0F87 ; Diacritic # Mn [2] TIBETAN SIGN LCI RTAGS..TIBETAN SIGN YANG RTAGS
+0FC6 ; Diacritic # Mn TIBETAN SYMBOL PADMA GDAN
+1037 ; Diacritic # Mn MYANMAR SIGN DOT BELOW
+1039..103A ; Diacritic # Mn [2] MYANMAR SIGN VIRAMA..MYANMAR SIGN ASAT
+1087..108C ; Diacritic # Mc [6] MYANMAR SIGN SHAN TONE-2..MYANMAR SIGN SHAN COUNCIL TONE-3
+108D ; Diacritic # Mn MYANMAR SIGN SHAN COUNCIL EMPHATIC TONE
+108F ; Diacritic # Mc MYANMAR SIGN RUMAI PALAUNG TONE-5
+109A..109B ; Diacritic # Mc [2] MYANMAR SIGN KHAMTI TONE-1..MYANMAR SIGN KHAMTI TONE-3
+17C9..17D3 ; Diacritic # Mn [11] KHMER SIGN MUUSIKATOAN..KHMER SIGN BATHAMASAT
+17DD ; Diacritic # Mn KHMER SIGN ATTHACAN
+1939..193B ; Diacritic # Mn [3] LIMBU SIGN MUKPHRENG..LIMBU SIGN SA-I
+1A75..1A7C ; Diacritic # Mn [8] TAI THAM SIGN TONE-1..TAI THAM SIGN KHUEN-LUE KARAN
+1A7F ; Diacritic # Mn TAI THAM COMBINING CRYPTOGRAMMIC DOT
+1B34 ; Diacritic # Mn BALINESE SIGN REREKAN
+1B44 ; Diacritic # Mc BALINESE ADEG ADEG
+1B6B..1B73 ; Diacritic # Mn [9] BALINESE MUSICAL SYMBOL COMBINING TEGEH..BALINESE MUSICAL SYMBOL COMBINING GONG
+1BAA ; Diacritic # Mc SUNDANESE SIGN PAMAAEH
+1C36..1C37 ; Diacritic # Mn [2] LEPCHA SIGN RAN..LEPCHA SIGN NUKTA
+1C78..1C7D ; Diacritic # Lm [6] OL CHIKI MU TTUDDAG..OL CHIKI AHAD
+1CD0..1CD2 ; Diacritic # Mn [3] VEDIC TONE KARSHANA..VEDIC TONE PRENKHA
+1CD3 ; Diacritic # Po VEDIC SIGN NIHSHVASA
+1CD4..1CE0 ; Diacritic # Mn [13] VEDIC SIGN YAJURVEDIC MIDLINE SVARITA..VEDIC TONE RIGVEDIC KASHMIRI INDEPENDENT SVARITA
+1CE1 ; Diacritic # Mc VEDIC TONE ATHARVAVEDIC INDEPENDENT SVARITA
+1CE2..1CE8 ; Diacritic # Mn [7] VEDIC SIGN VISARGA SVARITA..VEDIC SIGN VISARGA ANUDATTA WITH TAIL
+1CED ; Diacritic # Mn VEDIC SIGN TIRYAK
+1D2C..1D61 ; Diacritic # Lm [54] MODIFIER LETTER CAPITAL A..MODIFIER LETTER SMALL CHI
+1D62..1D6A ; Diacritic # L& [9] LATIN SUBSCRIPT SMALL LETTER I..GREEK SUBSCRIPT SMALL LETTER CHI
+1DC4..1DCF ; Diacritic # Mn [12] COMBINING MACRON-ACUTE..COMBINING ZIGZAG BELOW
+1DFD..1DFF ; Diacritic # Mn [3] COMBINING ALMOST EQUAL TO BELOW..COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW
+1FBD ; Diacritic # Sk GREEK KORONIS
+1FBF..1FC1 ; Diacritic # Sk [3] GREEK PSILI..GREEK DIALYTIKA AND PERISPOMENI
+1FCD..1FCF ; Diacritic # Sk [3] GREEK PSILI AND VARIA..GREEK PSILI AND PERISPOMENI
+1FDD..1FDF ; Diacritic # Sk [3] GREEK DASIA AND VARIA..GREEK DASIA AND PERISPOMENI
+1FED..1FEF ; Diacritic # Sk [3] GREEK DIALYTIKA AND VARIA..GREEK VARIA
+1FFD..1FFE ; Diacritic # Sk [2] GREEK OXIA..GREEK DASIA
+2CEF..2CF1 ; Diacritic # Mn [3] COPTIC COMBINING NI ABOVE..COPTIC COMBINING SPIRITUS LENIS
+2E2F ; Diacritic # Lm VERTICAL TILDE
+302A..302F ; Diacritic # Mn [6] IDEOGRAPHIC LEVEL TONE MARK..HANGUL DOUBLE DOT TONE MARK
+3099..309A ; Diacritic # Mn [2] COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK..COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+309B..309C ; Diacritic # Sk [2] KATAKANA-HIRAGANA VOICED SOUND MARK..KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+30FC ; Diacritic # Lm KATAKANA-HIRAGANA PROLONGED SOUND MARK
+A66F ; Diacritic # Mn COMBINING CYRILLIC VZMET
+A67C..A67D ; Diacritic # Mn [2] COMBINING CYRILLIC KAVYKA..COMBINING CYRILLIC PAYEROK
+A67F ; Diacritic # Lm CYRILLIC PAYEROK
+A6F0..A6F1 ; Diacritic # Mn [2] BAMUM COMBINING MARK KOQNDON..BAMUM COMBINING MARK TUKWENTIS
+A717..A71F ; Diacritic # Lm [9] MODIFIER LETTER DOT VERTICAL BAR..MODIFIER LETTER LOW INVERTED EXCLAMATION MARK
+A720..A721 ; Diacritic # Sk [2] MODIFIER LETTER STRESS AND HIGH TONE..MODIFIER LETTER STRESS AND LOW TONE
+A788 ; Diacritic # Lm MODIFIER LETTER LOW CIRCUMFLEX ACCENT
+A8C4 ; Diacritic # Mn SAURASHTRA SIGN VIRAMA
+A8E0..A8F1 ; Diacritic # Mn [18] COMBINING DEVANAGARI DIGIT ZERO..COMBINING DEVANAGARI SIGN AVAGRAHA
+A92B..A92D ; Diacritic # Mn [3] KAYAH LI TONE PLOPHU..KAYAH LI TONE CALYA PLOPHU
+A92E ; Diacritic # Po KAYAH LI SIGN CWI
+A953 ; Diacritic # Mc REJANG VIRAMA
+A9B3 ; Diacritic # Mn JAVANESE SIGN CECAK TELU
+A9C0 ; Diacritic # Mc JAVANESE PANGKON
+AA7B ; Diacritic # Mc MYANMAR SIGN PAO KAREN TONE
+AABF ; Diacritic # Mn TAI VIET TONE MAI EK
+AAC0 ; Diacritic # Lo TAI VIET TONE MAI NUENG
+AAC1 ; Diacritic # Mn TAI VIET TONE MAI THO
+AAC2 ; Diacritic # Lo TAI VIET TONE MAI SONG
+ABEC ; Diacritic # Mc MEETEI MAYEK LUM IYEK
+ABED ; Diacritic # Mn MEETEI MAYEK APUN IYEK
+FB1E ; Diacritic # Mn HEBREW POINT JUDEO-SPANISH VARIKA
+FE20..FE26 ; Diacritic # Mn [7] COMBINING LIGATURE LEFT HALF..COMBINING CONJOINING MACRON
+FF3E ; Diacritic # Sk FULLWIDTH CIRCUMFLEX ACCENT
+FF40 ; Diacritic # Sk FULLWIDTH GRAVE ACCENT
+FF70 ; Diacritic # Lm HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK
+FF9E..FF9F ; Diacritic # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK
+FFE3 ; Diacritic # Sk FULLWIDTH MACRON
+110B9..110BA ; Diacritic # Mn [2] KAITHI SIGN VIRAMA..KAITHI SIGN NUKTA
+1D167..1D169 ; Diacritic # Mn [3] MUSICAL SYMBOL COMBINING TREMOLO-1..MUSICAL SYMBOL COMBINING TREMOLO-3
+1D16D..1D172 ; Diacritic # Mc [6] MUSICAL SYMBOL COMBINING AUGMENTATION DOT..MUSICAL SYMBOL COMBINING FLAG-5
+1D17B..1D182 ; Diacritic # Mn [8] MUSICAL SYMBOL COMBINING ACCENT..MUSICAL SYMBOL COMBINING LOURE
+1D185..1D18B ; Diacritic # Mn [7] MUSICAL SYMBOL COMBINING DOIT..MUSICAL SYMBOL COMBINING TRIPLE TONGUE
+1D1AA..1D1AD ; Diacritic # Mn [4] MUSICAL SYMBOL COMBINING DOWN BOW..MUSICAL SYMBOL COMBINING SNAP PIZZICATO
+
+# Total code points: 639
+
+# ================================================
+
+00B7 ; Extender # Po MIDDLE DOT
+02D0..02D1 ; Extender # Lm [2] MODIFIER LETTER TRIANGULAR COLON..MODIFIER LETTER HALF TRIANGULAR COLON
+0640 ; Extender # Lm ARABIC TATWEEL
+07FA ; Extender # Lm NKO LAJANYALAN
+0E46 ; Extender # Lm THAI CHARACTER MAIYAMOK
+0EC6 ; Extender # Lm LAO KO LA
+1843 ; Extender # Lm MONGOLIAN LETTER TODO LONG VOWEL SIGN
+1AA7 ; Extender # Lm TAI THAM SIGN MAI YAMOK
+1C36 ; Extender # Mn LEPCHA SIGN RAN
+1C7B ; Extender # Lm OL CHIKI RELAA
+3005 ; Extender # Lm IDEOGRAPHIC ITERATION MARK
+3031..3035 ; Extender # Lm [5] VERTICAL KANA REPEAT MARK..VERTICAL KANA REPEAT MARK LOWER HALF
+309D..309E ; Extender # Lm [2] HIRAGANA ITERATION MARK..HIRAGANA VOICED ITERATION MARK
+30FC..30FE ; Extender # Lm [3] KATAKANA-HIRAGANA PROLONGED SOUND MARK..KATAKANA VOICED ITERATION MARK
+A015 ; Extender # Lm YI SYLLABLE WU
+A60C ; Extender # Lm VAI SYLLABLE LENGTHENER
+A9CF ; Extender # Lm JAVANESE PANGRANGKEP
+AA70 ; Extender # Lm MYANMAR MODIFIER LETTER KHAMTI REDUPLICATION
+AADD ; Extender # Lm TAI VIET SYMBOL SAM
+FF70 ; Extender # Lm HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK
+
+# Total code points: 28
+
+# ================================================
+
+02B0..02B8 ; Other_Lowercase # Lm [9] MODIFIER LETTER SMALL H..MODIFIER LETTER SMALL Y
+02C0..02C1 ; Other_Lowercase # Lm [2] MODIFIER LETTER GLOTTAL STOP..MODIFIER LETTER REVERSED GLOTTAL STOP
+02E0..02E4 ; Other_Lowercase # Lm [5] MODIFIER LETTER SMALL GAMMA..MODIFIER LETTER SMALL REVERSED GLOTTAL STOP
+0345 ; Other_Lowercase # Mn COMBINING GREEK YPOGEGRAMMENI
+037A ; Other_Lowercase # Lm GREEK YPOGEGRAMMENI
+1D2C..1D61 ; Other_Lowercase # Lm [54] MODIFIER LETTER CAPITAL A..MODIFIER LETTER SMALL CHI
+1D78 ; Other_Lowercase # Lm MODIFIER LETTER CYRILLIC EN
+1D9B..1DBF ; Other_Lowercase # Lm [37] MODIFIER LETTER SMALL TURNED ALPHA..MODIFIER LETTER SMALL THETA
+2090..2094 ; Other_Lowercase # Lm [5] LATIN SUBSCRIPT SMALL LETTER A..LATIN SUBSCRIPT SMALL LETTER SCHWA
+2170..217F ; Other_Lowercase # Nl [16] SMALL ROMAN NUMERAL ONE..SMALL ROMAN NUMERAL ONE THOUSAND
+24D0..24E9 ; Other_Lowercase # So [26] CIRCLED LATIN SMALL LETTER A..CIRCLED LATIN SMALL LETTER Z
+2C7D ; Other_Lowercase # Lm MODIFIER LETTER CAPITAL V
+A770 ; Other_Lowercase # Lm MODIFIER LETTER US
+
+# Total code points: 159
+
+# ================================================
+
+2160..216F ; Other_Uppercase # Nl [16] ROMAN NUMERAL ONE..ROMAN NUMERAL ONE THOUSAND
+24B6..24CF ; Other_Uppercase # So [26] CIRCLED LATIN CAPITAL LETTER A..CIRCLED LATIN CAPITAL LETTER Z
+
+# Total code points: 42
+
+# ================================================
+
+FDD0..FDEF ; Noncharacter_Code_Point # Cn [32] ..
+FFFE..FFFF ; Noncharacter_Code_Point # Cn [2] ..
+1FFFE..1FFFF ; Noncharacter_Code_Point # Cn [2] ..
+2FFFE..2FFFF ; Noncharacter_Code_Point # Cn [2] ..
+3FFFE..3FFFF ; Noncharacter_Code_Point # Cn [2] ..
+4FFFE..4FFFF ; Noncharacter_Code_Point # Cn [2] ..
+5FFFE..5FFFF ; Noncharacter_Code_Point # Cn [2] ..
+6FFFE..6FFFF ; Noncharacter_Code_Point # Cn [2] ..
+7FFFE..7FFFF ; Noncharacter_Code_Point # Cn [2] ..
+8FFFE..8FFFF ; Noncharacter_Code_Point # Cn [2] ..
+9FFFE..9FFFF ; Noncharacter_Code_Point # Cn [2] ..
+AFFFE..AFFFF ; Noncharacter_Code_Point # Cn [2] ..
+BFFFE..BFFFF ; Noncharacter_Code_Point # Cn [2] ..
+CFFFE..CFFFF ; Noncharacter_Code_Point # Cn [2] ..
+DFFFE..DFFFF ; Noncharacter_Code_Point # Cn [2] ..
+EFFFE..EFFFF ; Noncharacter_Code_Point # Cn [2] ..
+FFFFE..FFFFF ; Noncharacter_Code_Point # Cn [2] ..
+10FFFE..10FFFF; Noncharacter_Code_Point # Cn [2] ..
+
+# Total code points: 66
+
+# ================================================
+
+09BE ; Other_Grapheme_Extend # Mc BENGALI VOWEL SIGN AA
+09D7 ; Other_Grapheme_Extend # Mc BENGALI AU LENGTH MARK
+0B3E ; Other_Grapheme_Extend # Mc ORIYA VOWEL SIGN AA
+0B57 ; Other_Grapheme_Extend # Mc ORIYA AU LENGTH MARK
+0BBE ; Other_Grapheme_Extend # Mc TAMIL VOWEL SIGN AA
+0BD7 ; Other_Grapheme_Extend # Mc TAMIL AU LENGTH MARK
+0CC2 ; Other_Grapheme_Extend # Mc KANNADA VOWEL SIGN UU
+0CD5..0CD6 ; Other_Grapheme_Extend # Mc [2] KANNADA LENGTH MARK..KANNADA AI LENGTH MARK
+0D3E ; Other_Grapheme_Extend # Mc MALAYALAM VOWEL SIGN AA
+0D57 ; Other_Grapheme_Extend # Mc MALAYALAM AU LENGTH MARK
+0DCF ; Other_Grapheme_Extend # Mc SINHALA VOWEL SIGN AELA-PILLA
+0DDF ; Other_Grapheme_Extend # Mc SINHALA VOWEL SIGN GAYANUKITTA
+200C..200D ; Other_Grapheme_Extend # Cf [2] ZERO WIDTH NON-JOINER..ZERO WIDTH JOINER
+FF9E..FF9F ; Other_Grapheme_Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK
+1D165 ; Other_Grapheme_Extend # Mc MUSICAL SYMBOL COMBINING STEM
+1D16E..1D172 ; Other_Grapheme_Extend # Mc [5] MUSICAL SYMBOL COMBINING FLAG-1..MUSICAL SYMBOL COMBINING FLAG-5
+
+# Total code points: 23
+
+# ================================================
+
+2FF0..2FF1 ; IDS_Binary_Operator # So [2] IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW
+2FF4..2FFB ; IDS_Binary_Operator # So [8] IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND..IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID
+
+# Total code points: 10
+
+# ================================================
+
+2FF2..2FF3 ; IDS_Trinary_Operator # So [2] IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW
+
+# Total code points: 2
+
+# ================================================
+
+2E80..2E99 ; Radical # So [26] CJK RADICAL REPEAT..CJK RADICAL RAP
+2E9B..2EF3 ; Radical # So [89] CJK RADICAL CHOKE..CJK RADICAL C-SIMPLIFIED TURTLE
+2F00..2FD5 ; Radical # So [214] KANGXI RADICAL ONE..KANGXI RADICAL FLUTE
+
+# Total code points: 329
+
+# ================================================
+
+3400..4DB5 ; Unified_Ideograph # Lo [6582] CJK UNIFIED IDEOGRAPH-3400..CJK UNIFIED IDEOGRAPH-4DB5
+4E00..9FCB ; Unified_Ideograph # Lo [20940] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FCB
+FA0E..FA0F ; Unified_Ideograph # Lo [2] CJK COMPATIBILITY IDEOGRAPH-FA0E..CJK COMPATIBILITY IDEOGRAPH-FA0F
+FA11 ; Unified_Ideograph # Lo CJK COMPATIBILITY IDEOGRAPH-FA11
+FA13..FA14 ; Unified_Ideograph # Lo [2] CJK COMPATIBILITY IDEOGRAPH-FA13..CJK COMPATIBILITY IDEOGRAPH-FA14
+FA1F ; Unified_Ideograph # Lo CJK COMPATIBILITY IDEOGRAPH-FA1F
+FA21 ; Unified_Ideograph # Lo CJK COMPATIBILITY IDEOGRAPH-FA21
+FA23..FA24 ; Unified_Ideograph # Lo [2] CJK COMPATIBILITY IDEOGRAPH-FA23..CJK COMPATIBILITY IDEOGRAPH-FA24
+FA27..FA29 ; Unified_Ideograph # Lo [3] CJK COMPATIBILITY IDEOGRAPH-FA27..CJK COMPATIBILITY IDEOGRAPH-FA29
+20000..2A6D6 ; Unified_Ideograph # Lo [42711] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6D6
+2A700..2B734 ; Unified_Ideograph # Lo [4149] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B734
+2B740..2B81D ; Unified_Ideograph # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
+
+# Total code points: 74616
+
+# ================================================
+
+034F ; Other_Default_Ignorable_Code_Point # Mn COMBINING GRAPHEME JOINER
+115F..1160 ; Other_Default_Ignorable_Code_Point # Lo [2] HANGUL CHOSEONG FILLER..HANGUL JUNGSEONG FILLER
+2065..2069 ; Other_Default_Ignorable_Code_Point # Cn [5] ..
+3164 ; Other_Default_Ignorable_Code_Point # Lo HANGUL FILLER
+FFA0 ; Other_Default_Ignorable_Code_Point # Lo HALFWIDTH HANGUL FILLER
+FFF0..FFF8 ; Other_Default_Ignorable_Code_Point # Cn [9] ..
+E0000 ; Other_Default_Ignorable_Code_Point # Cn
+E0002..E001F ; Other_Default_Ignorable_Code_Point # Cn [30] ..
+E0080..E00FF ; Other_Default_Ignorable_Code_Point # Cn [128] ..
+E01F0..E0FFF ; Other_Default_Ignorable_Code_Point # Cn [3600] ..
+
+# Total code points: 3778
+
+# ================================================
+
+0149 ; Deprecated # L& LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
+0673 ; Deprecated # Lo ARABIC LETTER ALEF WITH WAVY HAMZA BELOW
+0F77 ; Deprecated # Mn TIBETAN VOWEL SIGN VOCALIC RR
+0F79 ; Deprecated # Mn TIBETAN VOWEL SIGN VOCALIC LL
+17A3..17A4 ; Deprecated # Lo [2] KHMER INDEPENDENT VOWEL QAQ..KHMER INDEPENDENT VOWEL QAA
+206A..206F ; Deprecated # Cf [6] INHIBIT SYMMETRIC SWAPPING..NOMINAL DIGIT SHAPES
+2329 ; Deprecated # Ps LEFT-POINTING ANGLE BRACKET
+232A ; Deprecated # Pe RIGHT-POINTING ANGLE BRACKET
+E0001 ; Deprecated # Cf LANGUAGE TAG
+E0020..E007F ; Deprecated # Cf [96] TAG SPACE..CANCEL TAG
+
+# Total code points: 111
+
+# ================================================
+
+0069..006A ; Soft_Dotted # L& [2] LATIN SMALL LETTER I..LATIN SMALL LETTER J
+012F ; Soft_Dotted # L& LATIN SMALL LETTER I WITH OGONEK
+0249 ; Soft_Dotted # L& LATIN SMALL LETTER J WITH STROKE
+0268 ; Soft_Dotted # L& LATIN SMALL LETTER I WITH STROKE
+029D ; Soft_Dotted # L& LATIN SMALL LETTER J WITH CROSSED-TAIL
+02B2 ; Soft_Dotted # Lm MODIFIER LETTER SMALL J
+03F3 ; Soft_Dotted # L& GREEK LETTER YOT
+0456 ; Soft_Dotted # L& CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
+0458 ; Soft_Dotted # L& CYRILLIC SMALL LETTER JE
+1D62 ; Soft_Dotted # L& LATIN SUBSCRIPT SMALL LETTER I
+1D96 ; Soft_Dotted # L& LATIN SMALL LETTER I WITH RETROFLEX HOOK
+1DA4 ; Soft_Dotted # Lm MODIFIER LETTER SMALL I WITH STROKE
+1DA8 ; Soft_Dotted # Lm MODIFIER LETTER SMALL J WITH CROSSED-TAIL
+1E2D ; Soft_Dotted # L& LATIN SMALL LETTER I WITH TILDE BELOW
+1ECB ; Soft_Dotted # L& LATIN SMALL LETTER I WITH DOT BELOW
+2071 ; Soft_Dotted # Lm SUPERSCRIPT LATIN SMALL LETTER I
+2148..2149 ; Soft_Dotted # L& [2] DOUBLE-STRUCK ITALIC SMALL I..DOUBLE-STRUCK ITALIC SMALL J
+2C7C ; Soft_Dotted # L& LATIN SUBSCRIPT SMALL LETTER J
+1D422..1D423 ; Soft_Dotted # L& [2] MATHEMATICAL BOLD SMALL I..MATHEMATICAL BOLD SMALL J
+1D456..1D457 ; Soft_Dotted # L& [2] MATHEMATICAL ITALIC SMALL I..MATHEMATICAL ITALIC SMALL J
+1D48A..1D48B ; Soft_Dotted # L& [2] MATHEMATICAL BOLD ITALIC SMALL I..MATHEMATICAL BOLD ITALIC SMALL J
+1D4BE..1D4BF ; Soft_Dotted # L& [2] MATHEMATICAL SCRIPT SMALL I..MATHEMATICAL SCRIPT SMALL J
+1D4F2..1D4F3 ; Soft_Dotted # L& [2] MATHEMATICAL BOLD SCRIPT SMALL I..MATHEMATICAL BOLD SCRIPT SMALL J
+1D526..1D527 ; Soft_Dotted # L& [2] MATHEMATICAL FRAKTUR SMALL I..MATHEMATICAL FRAKTUR SMALL J
+1D55A..1D55B ; Soft_Dotted # L& [2] MATHEMATICAL DOUBLE-STRUCK SMALL I..MATHEMATICAL DOUBLE-STRUCK SMALL J
+1D58E..1D58F ; Soft_Dotted # L& [2] MATHEMATICAL BOLD FRAKTUR SMALL I..MATHEMATICAL BOLD FRAKTUR SMALL J
+1D5C2..1D5C3 ; Soft_Dotted # L& [2] MATHEMATICAL SANS-SERIF SMALL I..MATHEMATICAL SANS-SERIF SMALL J
+1D5F6..1D5F7 ; Soft_Dotted # L& [2] MATHEMATICAL SANS-SERIF BOLD SMALL I..MATHEMATICAL SANS-SERIF BOLD SMALL J
+1D62A..1D62B ; Soft_Dotted # L& [2] MATHEMATICAL SANS-SERIF ITALIC SMALL I..MATHEMATICAL SANS-SERIF ITALIC SMALL J
+1D65E..1D65F ; Soft_Dotted # L& [2] MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL I..MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL J
+1D692..1D693 ; Soft_Dotted # L& [2] MATHEMATICAL MONOSPACE SMALL I..MATHEMATICAL MONOSPACE SMALL J
+
+# Total code points: 46
+
+# ================================================
+
+0E40..0E44 ; Logical_Order_Exception # Lo [5] THAI CHARACTER SARA E..THAI CHARACTER SARA AI MAIMALAI
+0EC0..0EC4 ; Logical_Order_Exception # Lo [5] LAO VOWEL SIGN E..LAO VOWEL SIGN AI
+AAB5..AAB6 ; Logical_Order_Exception # Lo [2] TAI VIET VOWEL E..TAI VIET VOWEL O
+AAB9 ; Logical_Order_Exception # Lo TAI VIET VOWEL UEA
+AABB..AABC ; Logical_Order_Exception # Lo [2] TAI VIET VOWEL AUE..TAI VIET VOWEL AY
+
+# Total code points: 15
+
+# ================================================
+
+2118 ; Other_ID_Start # Sm SCRIPT CAPITAL P
+212E ; Other_ID_Start # So ESTIMATED SYMBOL
+309B..309C ; Other_ID_Start # Sk [2] KATAKANA-HIRAGANA VOICED SOUND MARK..KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+
+# Total code points: 4
+
+# ================================================
+
+00B7 ; Other_ID_Continue # Po MIDDLE DOT
+0387 ; Other_ID_Continue # Po GREEK ANO TELEIA
+1369..1371 ; Other_ID_Continue # No [9] ETHIOPIC DIGIT ONE..ETHIOPIC DIGIT NINE
+19DA ; Other_ID_Continue # No NEW TAI LUE THAM DIGIT ONE
+
+# Total code points: 12
+
+# ================================================
+
+0021 ; STerm # Po EXCLAMATION MARK
+002E ; STerm # Po FULL STOP
+003F ; STerm # Po QUESTION MARK
+055C ; STerm # Po ARMENIAN EXCLAMATION MARK
+055E ; STerm # Po ARMENIAN QUESTION MARK
+0589 ; STerm # Po ARMENIAN FULL STOP
+061F ; STerm # Po ARABIC QUESTION MARK
+06D4 ; STerm # Po ARABIC FULL STOP
+0700..0702 ; STerm # Po [3] SYRIAC END OF PARAGRAPH..SYRIAC SUBLINEAR FULL STOP
+07F9 ; STerm # Po NKO EXCLAMATION MARK
+0964..0965 ; STerm # Po [2] DEVANAGARI DANDA..DEVANAGARI DOUBLE DANDA
+104A..104B ; STerm # Po [2] MYANMAR SIGN LITTLE SECTION..MYANMAR SIGN SECTION
+1362 ; STerm # Po ETHIOPIC FULL STOP
+1367..1368 ; STerm # Po [2] ETHIOPIC QUESTION MARK..ETHIOPIC PARAGRAPH SEPARATOR
+166E ; STerm # Po CANADIAN SYLLABICS FULL STOP
+1735..1736 ; STerm # Po [2] PHILIPPINE SINGLE PUNCTUATION..PHILIPPINE DOUBLE PUNCTUATION
+1803 ; STerm # Po MONGOLIAN FULL STOP
+1809 ; STerm # Po MONGOLIAN MANCHU FULL STOP
+1944..1945 ; STerm # Po [2] LIMBU EXCLAMATION MARK..LIMBU QUESTION MARK
+1AA8..1AAB ; STerm # Po [4] TAI THAM SIGN KAAN..TAI THAM SIGN SATKAANKUU
+1B5A..1B5B ; STerm # Po [2] BALINESE PANTI..BALINESE PAMADA
+1B5E..1B5F ; STerm # Po [2] BALINESE CARIK SIKI..BALINESE CARIK PAREREN
+1C3B..1C3C ; STerm # Po [2] LEPCHA PUNCTUATION TA-ROL..LEPCHA PUNCTUATION NYET THYOOM TA-ROL
+1C7E..1C7F ; STerm # Po [2] OL CHIKI PUNCTUATION MUCAAD..OL CHIKI PUNCTUATION DOUBLE MUCAAD
+203C..203D ; STerm # Po [2] DOUBLE EXCLAMATION MARK..INTERROBANG
+2047..2049 ; STerm # Po [3] DOUBLE QUESTION MARK..EXCLAMATION QUESTION MARK
+2E2E ; STerm # Po REVERSED QUESTION MARK
+3002 ; STerm # Po IDEOGRAPHIC FULL STOP
+A4FF ; STerm # Po LISU PUNCTUATION FULL STOP
+A60E..A60F ; STerm # Po [2] VAI FULL STOP..VAI QUESTION MARK
+A6F3 ; STerm # Po BAMUM FULL STOP
+A6F7 ; STerm # Po BAMUM QUESTION MARK
+A876..A877 ; STerm # Po [2] PHAGS-PA MARK SHAD..PHAGS-PA MARK DOUBLE SHAD
+A8CE..A8CF ; STerm # Po [2] SAURASHTRA DANDA..SAURASHTRA DOUBLE DANDA
+A92F ; STerm # Po KAYAH LI SIGN SHYA
+A9C8..A9C9 ; STerm # Po [2] JAVANESE PADA LINGSA..JAVANESE PADA LUNGSI
+AA5D..AA5F ; STerm # Po [3] CHAM PUNCTUATION DANDA..CHAM PUNCTUATION TRIPLE DANDA
+ABEB ; STerm # Po MEETEI MAYEK CHEIKHEI
+FE52 ; STerm # Po SMALL FULL STOP
+FE56..FE57 ; STerm # Po [2] SMALL QUESTION MARK..SMALL EXCLAMATION MARK
+FF01 ; STerm # Po FULLWIDTH EXCLAMATION MARK
+FF0E ; STerm # Po FULLWIDTH FULL STOP
+FF1F ; STerm # Po FULLWIDTH QUESTION MARK
+FF61 ; STerm # Po HALFWIDTH IDEOGRAPHIC FULL STOP
+10A56..10A57 ; STerm # Po [2] KHAROSHTHI PUNCTUATION DANDA..KHAROSHTHI PUNCTUATION DOUBLE DANDA
+11047..11048 ; STerm # Po [2] BRAHMI DANDA..BRAHMI DOUBLE DANDA
+110BE..110C1 ; STerm # Po [4] KAITHI SECTION MARK..KAITHI DOUBLE DANDA
+
+# Total code points: 76
+
+# ================================================
+
+180B..180D ; Variation_Selector # Mn [3] MONGOLIAN FREE VARIATION SELECTOR ONE..MONGOLIAN FREE VARIATION SELECTOR THREE
+FE00..FE0F ; Variation_Selector # Mn [16] VARIATION SELECTOR-1..VARIATION SELECTOR-16
+E0100..E01EF ; Variation_Selector # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256
+
+# Total code points: 259
+
+# ================================================
+
+0009..000D ; Pattern_White_Space # Cc [5] ..
+0020 ; Pattern_White_Space # Zs SPACE
+0085 ; Pattern_White_Space # Cc
+200E..200F ; Pattern_White_Space # Cf [2] LEFT-TO-RIGHT MARK..RIGHT-TO-LEFT MARK
+2028 ; Pattern_White_Space # Zl LINE SEPARATOR
+2029 ; Pattern_White_Space # Zp PARAGRAPH SEPARATOR
+
+# Total code points: 11
+
+# ================================================
+
+0021..0023 ; Pattern_Syntax # Po [3] EXCLAMATION MARK..NUMBER SIGN
+0024 ; Pattern_Syntax # Sc DOLLAR SIGN
+0025..0027 ; Pattern_Syntax # Po [3] PERCENT SIGN..APOSTROPHE
+0028 ; Pattern_Syntax # Ps LEFT PARENTHESIS
+0029 ; Pattern_Syntax # Pe RIGHT PARENTHESIS
+002A ; Pattern_Syntax # Po ASTERISK
+002B ; Pattern_Syntax # Sm PLUS SIGN
+002C ; Pattern_Syntax # Po COMMA
+002D ; Pattern_Syntax # Pd HYPHEN-MINUS
+002E..002F ; Pattern_Syntax # Po [2] FULL STOP..SOLIDUS
+003A..003B ; Pattern_Syntax # Po [2] COLON..SEMICOLON
+003C..003E ; Pattern_Syntax # Sm [3] LESS-THAN SIGN..GREATER-THAN SIGN
+003F..0040 ; Pattern_Syntax # Po [2] QUESTION MARK..COMMERCIAL AT
+005B ; Pattern_Syntax # Ps LEFT SQUARE BRACKET
+005C ; Pattern_Syntax # Po REVERSE SOLIDUS
+005D ; Pattern_Syntax # Pe RIGHT SQUARE BRACKET
+005E ; Pattern_Syntax # Sk CIRCUMFLEX ACCENT
+0060 ; Pattern_Syntax # Sk GRAVE ACCENT
+007B ; Pattern_Syntax # Ps LEFT CURLY BRACKET
+007C ; Pattern_Syntax # Sm VERTICAL LINE
+007D ; Pattern_Syntax # Pe RIGHT CURLY BRACKET
+007E ; Pattern_Syntax # Sm TILDE
+00A1 ; Pattern_Syntax # Po INVERTED EXCLAMATION MARK
+00A2..00A5 ; Pattern_Syntax # Sc [4] CENT SIGN..YEN SIGN
+00A6..00A7 ; Pattern_Syntax # So [2] BROKEN BAR..SECTION SIGN
+00A9 ; Pattern_Syntax # So COPYRIGHT SIGN
+00AB ; Pattern_Syntax # Pi LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+00AC ; Pattern_Syntax # Sm NOT SIGN
+00AE ; Pattern_Syntax # So REGISTERED SIGN
+00B0 ; Pattern_Syntax # So DEGREE SIGN
+00B1 ; Pattern_Syntax # Sm PLUS-MINUS SIGN
+00B6 ; Pattern_Syntax # So PILCROW SIGN
+00BB ; Pattern_Syntax # Pf RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+00BF ; Pattern_Syntax # Po INVERTED QUESTION MARK
+00D7 ; Pattern_Syntax # Sm MULTIPLICATION SIGN
+00F7 ; Pattern_Syntax # Sm DIVISION SIGN
+2010..2015 ; Pattern_Syntax # Pd [6] HYPHEN..HORIZONTAL BAR
+2016..2017 ; Pattern_Syntax # Po [2] DOUBLE VERTICAL LINE..DOUBLE LOW LINE
+2018 ; Pattern_Syntax # Pi LEFT SINGLE QUOTATION MARK
+2019 ; Pattern_Syntax # Pf RIGHT SINGLE QUOTATION MARK
+201A ; Pattern_Syntax # Ps SINGLE LOW-9 QUOTATION MARK
+201B..201C ; Pattern_Syntax # Pi [2] SINGLE HIGH-REVERSED-9 QUOTATION MARK..LEFT DOUBLE QUOTATION MARK
+201D ; Pattern_Syntax # Pf RIGHT DOUBLE QUOTATION MARK
+201E ; Pattern_Syntax # Ps DOUBLE LOW-9 QUOTATION MARK
+201F ; Pattern_Syntax # Pi DOUBLE HIGH-REVERSED-9 QUOTATION MARK
+2020..2027 ; Pattern_Syntax # Po [8] DAGGER..HYPHENATION POINT
+2030..2038 ; Pattern_Syntax # Po [9] PER MILLE SIGN..CARET
+2039 ; Pattern_Syntax # Pi SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+203A ; Pattern_Syntax # Pf SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+203B..203E ; Pattern_Syntax # Po [4] REFERENCE MARK..OVERLINE
+2041..2043 ; Pattern_Syntax # Po [3] CARET INSERTION POINT..HYPHEN BULLET
+2044 ; Pattern_Syntax # Sm FRACTION SLASH
+2045 ; Pattern_Syntax # Ps LEFT SQUARE BRACKET WITH QUILL
+2046 ; Pattern_Syntax # Pe RIGHT SQUARE BRACKET WITH QUILL
+2047..2051 ; Pattern_Syntax # Po [11] DOUBLE QUESTION MARK..TWO ASTERISKS ALIGNED VERTICALLY
+2052 ; Pattern_Syntax # Sm COMMERCIAL MINUS SIGN
+2053 ; Pattern_Syntax # Po SWUNG DASH
+2055..205E ; Pattern_Syntax # Po [10] FLOWER PUNCTUATION MARK..VERTICAL FOUR DOTS
+2190..2194 ; Pattern_Syntax # Sm [5] LEFTWARDS ARROW..LEFT RIGHT ARROW
+2195..2199 ; Pattern_Syntax # So [5] UP DOWN ARROW..SOUTH WEST ARROW
+219A..219B ; Pattern_Syntax # Sm [2] LEFTWARDS ARROW WITH STROKE..RIGHTWARDS ARROW WITH STROKE
+219C..219F ; Pattern_Syntax # So [4] LEFTWARDS WAVE ARROW..UPWARDS TWO HEADED ARROW
+21A0 ; Pattern_Syntax # Sm RIGHTWARDS TWO HEADED ARROW
+21A1..21A2 ; Pattern_Syntax # So [2] DOWNWARDS TWO HEADED ARROW..LEFTWARDS ARROW WITH TAIL
+21A3 ; Pattern_Syntax # Sm RIGHTWARDS ARROW WITH TAIL
+21A4..21A5 ; Pattern_Syntax # So [2] LEFTWARDS ARROW FROM BAR..UPWARDS ARROW FROM BAR
+21A6 ; Pattern_Syntax # Sm RIGHTWARDS ARROW FROM BAR
+21A7..21AD ; Pattern_Syntax # So [7] DOWNWARDS ARROW FROM BAR..LEFT RIGHT WAVE ARROW
+21AE ; Pattern_Syntax # Sm LEFT RIGHT ARROW WITH STROKE
+21AF..21CD ; Pattern_Syntax # So [31] DOWNWARDS ZIGZAG ARROW..LEFTWARDS DOUBLE ARROW WITH STROKE
+21CE..21CF ; Pattern_Syntax # Sm [2] LEFT RIGHT DOUBLE ARROW WITH STROKE..RIGHTWARDS DOUBLE ARROW WITH STROKE
+21D0..21D1 ; Pattern_Syntax # So [2] LEFTWARDS DOUBLE ARROW..UPWARDS DOUBLE ARROW
+21D2 ; Pattern_Syntax # Sm RIGHTWARDS DOUBLE ARROW
+21D3 ; Pattern_Syntax # So DOWNWARDS DOUBLE ARROW
+21D4 ; Pattern_Syntax # Sm LEFT RIGHT DOUBLE ARROW
+21D5..21F3 ; Pattern_Syntax # So [31] UP DOWN DOUBLE ARROW..UP DOWN WHITE ARROW
+21F4..22FF ; Pattern_Syntax # Sm [268] RIGHT ARROW WITH SMALL CIRCLE..Z NOTATION BAG MEMBERSHIP
+2300..2307 ; Pattern_Syntax # So [8] DIAMETER SIGN..WAVY LINE
+2308..230B ; Pattern_Syntax # Sm [4] LEFT CEILING..RIGHT FLOOR
+230C..231F ; Pattern_Syntax # So [20] BOTTOM RIGHT CROP..BOTTOM RIGHT CORNER
+2320..2321 ; Pattern_Syntax # Sm [2] TOP HALF INTEGRAL..BOTTOM HALF INTEGRAL
+2322..2328 ; Pattern_Syntax # So [7] FROWN..KEYBOARD
+2329 ; Pattern_Syntax # Ps LEFT-POINTING ANGLE BRACKET
+232A ; Pattern_Syntax # Pe RIGHT-POINTING ANGLE BRACKET
+232B..237B ; Pattern_Syntax # So [81] ERASE TO THE LEFT..NOT CHECK MARK
+237C ; Pattern_Syntax # Sm RIGHT ANGLE WITH DOWNWARDS ZIGZAG ARROW
+237D..239A ; Pattern_Syntax # So [30] SHOULDERED OPEN BOX..CLEAR SCREEN SYMBOL
+239B..23B3 ; Pattern_Syntax # Sm [25] LEFT PARENTHESIS UPPER HOOK..SUMMATION BOTTOM
+23B4..23DB ; Pattern_Syntax # So [40] TOP SQUARE BRACKET..FUSE
+23DC..23E1 ; Pattern_Syntax # Sm [6] TOP PARENTHESIS..BOTTOM TORTOISE SHELL BRACKET
+23E2..23F3 ; Pattern_Syntax # So [18] WHITE TRAPEZIUM..HOURGLASS WITH FLOWING SAND
+23F4..23FF ; Pattern_Syntax # Cn [12] ..
+2400..2426 ; Pattern_Syntax # So [39] SYMBOL FOR NULL..SYMBOL FOR SUBSTITUTE FORM TWO
+2427..243F ; Pattern_Syntax # Cn [25] ..
+2440..244A ; Pattern_Syntax # So [11] OCR HOOK..OCR DOUBLE BACKSLASH
+244B..245F ; Pattern_Syntax # Cn [21] ..
+2500..25B6 ; Pattern_Syntax # So [183] BOX DRAWINGS LIGHT HORIZONTAL..BLACK RIGHT-POINTING TRIANGLE
+25B7 ; Pattern_Syntax # Sm WHITE RIGHT-POINTING TRIANGLE
+25B8..25C0 ; Pattern_Syntax # So [9] BLACK RIGHT-POINTING SMALL TRIANGLE..BLACK LEFT-POINTING TRIANGLE
+25C1 ; Pattern_Syntax # Sm WHITE LEFT-POINTING TRIANGLE
+25C2..25F7 ; Pattern_Syntax # So [54] BLACK LEFT-POINTING SMALL TRIANGLE..WHITE CIRCLE WITH UPPER RIGHT QUADRANT
+25F8..25FF ; Pattern_Syntax # Sm [8] UPPER LEFT TRIANGLE..LOWER RIGHT TRIANGLE
+2600..266E ; Pattern_Syntax # So [111] BLACK SUN WITH RAYS..MUSIC NATURAL SIGN
+266F ; Pattern_Syntax # Sm MUSIC SHARP SIGN
+2670..26FF ; Pattern_Syntax # So [144] WEST SYRIAC CROSS..WHITE FLAG WITH HORIZONTAL MIDDLE BLACK STRIPE
+2700 ; Pattern_Syntax # Cn
+2701..2767 ; Pattern_Syntax # So [103] UPPER BLADE SCISSORS..ROTATED FLORAL HEART BULLET
+2768 ; Pattern_Syntax # Ps MEDIUM LEFT PARENTHESIS ORNAMENT
+2769 ; Pattern_Syntax # Pe MEDIUM RIGHT PARENTHESIS ORNAMENT
+276A ; Pattern_Syntax # Ps MEDIUM FLATTENED LEFT PARENTHESIS ORNAMENT
+276B ; Pattern_Syntax # Pe MEDIUM FLATTENED RIGHT PARENTHESIS ORNAMENT
+276C ; Pattern_Syntax # Ps MEDIUM LEFT-POINTING ANGLE BRACKET ORNAMENT
+276D ; Pattern_Syntax # Pe MEDIUM RIGHT-POINTING ANGLE BRACKET ORNAMENT
+276E ; Pattern_Syntax # Ps HEAVY LEFT-POINTING ANGLE QUOTATION MARK ORNAMENT
+276F ; Pattern_Syntax # Pe HEAVY RIGHT-POINTING ANGLE QUOTATION MARK ORNAMENT
+2770 ; Pattern_Syntax # Ps HEAVY LEFT-POINTING ANGLE BRACKET ORNAMENT
+2771 ; Pattern_Syntax # Pe HEAVY RIGHT-POINTING ANGLE BRACKET ORNAMENT
+2772 ; Pattern_Syntax # Ps LIGHT LEFT TORTOISE SHELL BRACKET ORNAMENT
+2773 ; Pattern_Syntax # Pe LIGHT RIGHT TORTOISE SHELL BRACKET ORNAMENT
+2774 ; Pattern_Syntax # Ps MEDIUM LEFT CURLY BRACKET ORNAMENT
+2775 ; Pattern_Syntax # Pe MEDIUM RIGHT CURLY BRACKET ORNAMENT
+2794..27BF ; Pattern_Syntax # So [44] HEAVY WIDE-HEADED RIGHTWARDS ARROW..DOUBLE CURLY LOOP
+27C0..27C4 ; Pattern_Syntax # Sm [5] THREE DIMENSIONAL ANGLE..OPEN SUPERSET
+27C5 ; Pattern_Syntax # Ps LEFT S-SHAPED BAG DELIMITER
+27C6 ; Pattern_Syntax # Pe RIGHT S-SHAPED BAG DELIMITER
+27C7..27CA ; Pattern_Syntax # Sm [4] OR WITH DOT INSIDE..VERTICAL BAR WITH HORIZONTAL STROKE
+27CB ; Pattern_Syntax # Cn
+27CC ; Pattern_Syntax # Sm LONG DIVISION
+27CD ; Pattern_Syntax # Cn
+27CE..27E5 ; Pattern_Syntax # Sm [24] SQUARED LOGICAL AND..WHITE SQUARE WITH RIGHTWARDS TICK
+27E6 ; Pattern_Syntax # Ps MATHEMATICAL LEFT WHITE SQUARE BRACKET
+27E7 ; Pattern_Syntax # Pe MATHEMATICAL RIGHT WHITE SQUARE BRACKET
+27E8 ; Pattern_Syntax # Ps MATHEMATICAL LEFT ANGLE BRACKET
+27E9 ; Pattern_Syntax # Pe MATHEMATICAL RIGHT ANGLE BRACKET
+27EA ; Pattern_Syntax # Ps MATHEMATICAL LEFT DOUBLE ANGLE BRACKET
+27EB ; Pattern_Syntax # Pe MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET
+27EC ; Pattern_Syntax # Ps MATHEMATICAL LEFT WHITE TORTOISE SHELL BRACKET
+27ED ; Pattern_Syntax # Pe MATHEMATICAL RIGHT WHITE TORTOISE SHELL BRACKET
+27EE ; Pattern_Syntax # Ps MATHEMATICAL LEFT FLATTENED PARENTHESIS
+27EF ; Pattern_Syntax # Pe MATHEMATICAL RIGHT FLATTENED PARENTHESIS
+27F0..27FF ; Pattern_Syntax # Sm [16] UPWARDS QUADRUPLE ARROW..LONG RIGHTWARDS SQUIGGLE ARROW
+2800..28FF ; Pattern_Syntax # So [256] BRAILLE PATTERN BLANK..BRAILLE PATTERN DOTS-12345678
+2900..2982 ; Pattern_Syntax # Sm [131] RIGHTWARDS TWO-HEADED ARROW WITH VERTICAL STROKE..Z NOTATION TYPE COLON
+2983 ; Pattern_Syntax # Ps LEFT WHITE CURLY BRACKET
+2984 ; Pattern_Syntax # Pe RIGHT WHITE CURLY BRACKET
+2985 ; Pattern_Syntax # Ps LEFT WHITE PARENTHESIS
+2986 ; Pattern_Syntax # Pe RIGHT WHITE PARENTHESIS
+2987 ; Pattern_Syntax # Ps Z NOTATION LEFT IMAGE BRACKET
+2988 ; Pattern_Syntax # Pe Z NOTATION RIGHT IMAGE BRACKET
+2989 ; Pattern_Syntax # Ps Z NOTATION LEFT BINDING BRACKET
+298A ; Pattern_Syntax # Pe Z NOTATION RIGHT BINDING BRACKET
+298B ; Pattern_Syntax # Ps LEFT SQUARE BRACKET WITH UNDERBAR
+298C ; Pattern_Syntax # Pe RIGHT SQUARE BRACKET WITH UNDERBAR
+298D ; Pattern_Syntax # Ps LEFT SQUARE BRACKET WITH TICK IN TOP CORNER
+298E ; Pattern_Syntax # Pe RIGHT SQUARE BRACKET WITH TICK IN BOTTOM CORNER
+298F ; Pattern_Syntax # Ps LEFT SQUARE BRACKET WITH TICK IN BOTTOM CORNER
+2990 ; Pattern_Syntax # Pe RIGHT SQUARE BRACKET WITH TICK IN TOP CORNER
+2991 ; Pattern_Syntax # Ps LEFT ANGLE BRACKET WITH DOT
+2992 ; Pattern_Syntax # Pe RIGHT ANGLE BRACKET WITH DOT
+2993 ; Pattern_Syntax # Ps LEFT ARC LESS-THAN BRACKET
+2994 ; Pattern_Syntax # Pe RIGHT ARC GREATER-THAN BRACKET
+2995 ; Pattern_Syntax # Ps DOUBLE LEFT ARC GREATER-THAN BRACKET
+2996 ; Pattern_Syntax # Pe DOUBLE RIGHT ARC LESS-THAN BRACKET
+2997 ; Pattern_Syntax # Ps LEFT BLACK TORTOISE SHELL BRACKET
+2998 ; Pattern_Syntax # Pe RIGHT BLACK TORTOISE SHELL BRACKET
+2999..29D7 ; Pattern_Syntax # Sm [63] DOTTED FENCE..BLACK HOURGLASS
+29D8 ; Pattern_Syntax # Ps LEFT WIGGLY FENCE
+29D9 ; Pattern_Syntax # Pe RIGHT WIGGLY FENCE
+29DA ; Pattern_Syntax # Ps LEFT DOUBLE WIGGLY FENCE
+29DB ; Pattern_Syntax # Pe RIGHT DOUBLE WIGGLY FENCE
+29DC..29FB ; Pattern_Syntax # Sm [32] INCOMPLETE INFINITY..TRIPLE PLUS
+29FC ; Pattern_Syntax # Ps LEFT-POINTING CURVED ANGLE BRACKET
+29FD ; Pattern_Syntax # Pe RIGHT-POINTING CURVED ANGLE BRACKET
+29FE..2AFF ; Pattern_Syntax # Sm [258] TINY..N-ARY WHITE VERTICAL BAR
+2B00..2B2F ; Pattern_Syntax # So [48] NORTH EAST WHITE ARROW..WHITE VERTICAL ELLIPSE
+2B30..2B44 ; Pattern_Syntax # Sm [21] LEFT ARROW WITH SMALL CIRCLE..RIGHTWARDS ARROW THROUGH SUPERSET
+2B45..2B46 ; Pattern_Syntax # So [2] LEFTWARDS QUADRUPLE ARROW..RIGHTWARDS QUADRUPLE ARROW
+2B47..2B4C ; Pattern_Syntax # Sm [6] REVERSE TILDE OPERATOR ABOVE RIGHTWARDS ARROW..RIGHTWARDS ARROW ABOVE REVERSE TILDE OPERATOR
+2B4D..2B4F ; Pattern_Syntax # Cn [3] ..
+2B50..2B59 ; Pattern_Syntax # So [10] WHITE MEDIUM STAR..HEAVY CIRCLED SALTIRE
+2B5A..2BFF ; Pattern_Syntax # Cn [166] ..
+2E00..2E01 ; Pattern_Syntax # Po [2] RIGHT ANGLE SUBSTITUTION MARKER..RIGHT ANGLE DOTTED SUBSTITUTION MARKER
+2E02 ; Pattern_Syntax # Pi LEFT SUBSTITUTION BRACKET
+2E03 ; Pattern_Syntax # Pf RIGHT SUBSTITUTION BRACKET
+2E04 ; Pattern_Syntax # Pi LEFT DOTTED SUBSTITUTION BRACKET
+2E05 ; Pattern_Syntax # Pf RIGHT DOTTED SUBSTITUTION BRACKET
+2E06..2E08 ; Pattern_Syntax # Po [3] RAISED INTERPOLATION MARKER..DOTTED TRANSPOSITION MARKER
+2E09 ; Pattern_Syntax # Pi LEFT TRANSPOSITION BRACKET
+2E0A ; Pattern_Syntax # Pf RIGHT TRANSPOSITION BRACKET
+2E0B ; Pattern_Syntax # Po RAISED SQUARE
+2E0C ; Pattern_Syntax # Pi LEFT RAISED OMISSION BRACKET
+2E0D ; Pattern_Syntax # Pf RIGHT RAISED OMISSION BRACKET
+2E0E..2E16 ; Pattern_Syntax # Po [9] EDITORIAL CORONIS..DOTTED RIGHT-POINTING ANGLE
+2E17 ; Pattern_Syntax # Pd DOUBLE OBLIQUE HYPHEN
+2E18..2E19 ; Pattern_Syntax # Po [2] INVERTED INTERROBANG..PALM BRANCH
+2E1A ; Pattern_Syntax # Pd HYPHEN WITH DIAERESIS
+2E1B ; Pattern_Syntax # Po TILDE WITH RING ABOVE
+2E1C ; Pattern_Syntax # Pi LEFT LOW PARAPHRASE BRACKET
+2E1D ; Pattern_Syntax # Pf RIGHT LOW PARAPHRASE BRACKET
+2E1E..2E1F ; Pattern_Syntax # Po [2] TILDE WITH DOT ABOVE..TILDE WITH DOT BELOW
+2E20 ; Pattern_Syntax # Pi LEFT VERTICAL BAR WITH QUILL
+2E21 ; Pattern_Syntax # Pf RIGHT VERTICAL BAR WITH QUILL
+2E22 ; Pattern_Syntax # Ps TOP LEFT HALF BRACKET
+2E23 ; Pattern_Syntax # Pe TOP RIGHT HALF BRACKET
+2E24 ; Pattern_Syntax # Ps BOTTOM LEFT HALF BRACKET
+2E25 ; Pattern_Syntax # Pe BOTTOM RIGHT HALF BRACKET
+2E26 ; Pattern_Syntax # Ps LEFT SIDEWAYS U BRACKET
+2E27 ; Pattern_Syntax # Pe RIGHT SIDEWAYS U BRACKET
+2E28 ; Pattern_Syntax # Ps LEFT DOUBLE PARENTHESIS
+2E29 ; Pattern_Syntax # Pe RIGHT DOUBLE PARENTHESIS
+2E2A..2E2E ; Pattern_Syntax # Po [5] TWO DOTS OVER ONE DOT PUNCTUATION..REVERSED QUESTION MARK
+2E2F ; Pattern_Syntax # Lm VERTICAL TILDE
+2E30..2E31 ; Pattern_Syntax # Po [2] RING POINT..WORD SEPARATOR MIDDLE DOT
+2E32..2E7F ; Pattern_Syntax # Cn [78] ..
+3001..3003 ; Pattern_Syntax # Po [3] IDEOGRAPHIC COMMA..DITTO MARK
+3008 ; Pattern_Syntax # Ps LEFT ANGLE BRACKET
+3009 ; Pattern_Syntax # Pe RIGHT ANGLE BRACKET
+300A ; Pattern_Syntax # Ps LEFT DOUBLE ANGLE BRACKET
+300B ; Pattern_Syntax # Pe RIGHT DOUBLE ANGLE BRACKET
+300C ; Pattern_Syntax # Ps LEFT CORNER BRACKET
+300D ; Pattern_Syntax # Pe RIGHT CORNER BRACKET
+300E ; Pattern_Syntax # Ps LEFT WHITE CORNER BRACKET
+300F ; Pattern_Syntax # Pe RIGHT WHITE CORNER BRACKET
+3010 ; Pattern_Syntax # Ps LEFT BLACK LENTICULAR BRACKET
+3011 ; Pattern_Syntax # Pe RIGHT BLACK LENTICULAR BRACKET
+3012..3013 ; Pattern_Syntax # So [2] POSTAL MARK..GETA MARK
+3014 ; Pattern_Syntax # Ps LEFT TORTOISE SHELL BRACKET
+3015 ; Pattern_Syntax # Pe RIGHT TORTOISE SHELL BRACKET
+3016 ; Pattern_Syntax # Ps LEFT WHITE LENTICULAR BRACKET
+3017 ; Pattern_Syntax # Pe RIGHT WHITE LENTICULAR BRACKET
+3018 ; Pattern_Syntax # Ps LEFT WHITE TORTOISE SHELL BRACKET
+3019 ; Pattern_Syntax # Pe RIGHT WHITE TORTOISE SHELL BRACKET
+301A ; Pattern_Syntax # Ps LEFT WHITE SQUARE BRACKET
+301B ; Pattern_Syntax # Pe RIGHT WHITE SQUARE BRACKET
+301C ; Pattern_Syntax # Pd WAVE DASH
+301D ; Pattern_Syntax # Ps REVERSED DOUBLE PRIME QUOTATION MARK
+301E..301F ; Pattern_Syntax # Pe [2] DOUBLE PRIME QUOTATION MARK..LOW DOUBLE PRIME QUOTATION MARK
+3020 ; Pattern_Syntax # So POSTAL MARK FACE
+3030 ; Pattern_Syntax # Pd WAVY DASH
+FD3E ; Pattern_Syntax # Ps ORNATE LEFT PARENTHESIS
+FD3F ; Pattern_Syntax # Pe ORNATE RIGHT PARENTHESIS
+FE45..FE46 ; Pattern_Syntax # Po [2] SESAME DOT..WHITE SESAME DOT
+
+# Total code points: 2760
+
+# EOF
diff --git a/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java b/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java
index c898259925b3e2c15fa3a6bdf4b3bf050d718bc4..2f7828b6c10c57dcd58d0bd7b8ba85551f09a661 100644
--- a/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java
+++ b/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java
@@ -1,4 +1,3 @@
-
/*
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -34,6 +33,7 @@ import java.io.PrintWriter;
import java.io.BufferedWriter;
import java.io.FileWriter;
import java.io.File;
+import java.util.List;
import build.tools.generatecharacter.CharacterName;
@@ -68,18 +68,17 @@ public class GenerateCharacter {
final static boolean DEBUG = false;
- final static int MAX_UNICODE_VALUE = 0xFFFF;
final static String commandMarker = "$$";
static String ROOT = "";
static String DefaultUnicodeSpecFileName = ROOT + "UnicodeData.txt";
static String DefaultSpecialCasingFileName = ROOT + "SpecialCasing.txt";
+ static String DefaultPropListFileName = ROOT + "PropList.txt";
static String DefaultJavaTemplateFileName = ROOT + "Character.java.template";
static String DefaultJavaOutputFileName = ROOT + "Character.java";
static String DefaultCTemplateFileName = ROOT + "Character.c.template";
static String DefaultCOutputFileName = ROOT + "Character.c";
- static String CharacterDataClassName = "CharacterData";
- static int plane = 0;
+ static int plane = 0;
/* The overall idea is that, in the generated Character class source code,
most character property data is stored in a special multi-level table whose
@@ -105,7 +104,11 @@ public class GenerateCharacter {
entries are short rather than byte).
*/
- /* The character properties are currently encoded into 32 bits in the following manner:
+ /* The character properties are currently encoded into A (32 bits)and B (16 bits)
+ two parts.
+
+ A: the low 32 bits are defined in the following manner:
+
1 bit Mirrored property.
4 bits Bidirectional category (see below) (unused if -nobidi switch specified)
9 bits A signed offset used for converting case .
@@ -148,6 +151,14 @@ public class GenerateCharacter {
will produce the desired numeric value.
5 bits The digit offset (see description of previous field)
5 bits Character type (see below)
+
+ B: the high 16 bits are defined as:
+ 1 bit Other_Lowercase property
+ 1 bit Other_Uppercase property
+ 1 bit Other_Alphabetic property
+ 1 bit Other_Math property
+ 1 bit Ideographic property
+ 1 bit Noncharacter codepoint property
*/
@@ -173,9 +184,22 @@ public class GenerateCharacter {
// case offset are 9 bits
maskCase = 0x01FF,
shiftBidi = 27, maskBidi = 0x78000000,
- shiftMirrored = 31, maskMirrored = 0x80000000,
+ shiftMirrored = 31, //maskMirrored = 0x80000000,
shiftPlane = 16, maskPlane = 0xFF0000;
+ // maskMirrored needs to be long, if up 16-bit
+ private static final long maskMirrored = 0x80000000L;
+
+ // bit masks identify the 16-bit priperty field described above, in B
+ // table
+ private static final long
+ maskOtherLowercase = 0x100000000L,
+ maskOtherUppercase = 0x200000000L,
+ maskOtherAlphabetic = 0x400000000L,
+ maskOtherMath = 0x800000000L,
+ maskIdeographic = 0x1000000000L,
+ maskNoncharacterCP = 0x2000000000L;
+
// Can compare masked values with these to determine
// numeric or lexical types.
public static int
@@ -258,7 +282,7 @@ public class GenerateCharacter {
* The specification file is assumed to contain its data in sorted order by
* character code; as a result, the array passed as an argument to this method
* has its components in the same sorted order, with one entry for each defined
- * Unicode character or character range. (A range is indicated by two consecutive
+ * Unicode character or character range. (A range is indicated by two consecutive
* entries, such that the name of the first entry begins with "<" and ends with
* "First>" and the second entry begins with "<" and ends with "Last>".) This is
* therefore a sparse representation of the character property data.
@@ -282,7 +306,8 @@ public class GenerateCharacter {
* @see GenerateCharacter#buildOne
*/
- static long[] buildMap(UnicodeSpec[] data, SpecialCaseMap[] specialMaps) {
+ static long[] buildMap(UnicodeSpec[] data, SpecialCaseMap[] specialMaps, PropList propList)
+ {
long[] result;
if (bLatin1 == true) {
result = new long[256];
@@ -290,13 +315,13 @@ public class GenerateCharacter {
result = new long[1<<16];
}
int k=0;
- int codePoint = plane<<16;
+ int codePoint = plane<<16;
UnicodeSpec nonCharSpec = new UnicodeSpec();
for (int j = 0; j < data.length && k < result.length; j++) {
if (data[j].codePoint == codePoint) {
result[k] = buildOne(codePoint, data[j], specialMaps);
++k;
- ++codePoint;
+ ++codePoint;
}
else if(data[j].codePoint > codePoint) {
if (data[j].name.endsWith("Last>")) {
@@ -304,7 +329,7 @@ public class GenerateCharacter {
while (codePoint < data[j].codePoint && k < result.length) {
result[k] = buildOne(codePoint, data[j], specialMaps);
++k;
- ++codePoint;
+ ++codePoint;
}
}
else {
@@ -312,15 +337,14 @@ public class GenerateCharacter {
while (codePoint < data[j].codePoint && k < result.length) {
result[k] = buildOne(codePoint, nonCharSpec, specialMaps);
++k;
- ++codePoint;
+ ++codePoint;
}
}
k = data[j].codePoint & 0xFFFF;
- codePoint = data[j].codePoint;
+ codePoint = data[j].codePoint;
result[k] = buildOne(codePoint, data[j], specialMaps);
++k;
- ++codePoint;
-
+ ++codePoint;
}
else {
System.out.println("An error has occured during spec mapping.");
@@ -333,8 +357,17 @@ public class GenerateCharacter {
while (k < result.length) {
result[k] = buildOne(codePoint, nonCharSpec, specialMaps);
++k;
- ++codePoint;
+ ++codePoint;
}
+ // now add all extra supported properties from PropList, to the
+ // upper 16-bit
+ addExProp(result, propList, "Other_Lowercase", maskOtherLowercase);
+ addExProp(result, propList, "Other_Uppercase", maskOtherUppercase);
+ addExProp(result, propList, "Other_Alphabetic", maskOtherAlphabetic);
+ addExProp(result, propList, "Ideographic", maskIdeographic);
+ //addExProp(result, propList, "Other_Math", maskOtherMath);
+ //addExProp(result, propList, "Noncharacter_CodePoint", maskNoncharacterCP);
+
return result;
}
@@ -381,15 +414,15 @@ public class GenerateCharacter {
// record the general category
resultA |= us.generalCategory;
- // record the numeric properties
- NUMERIC: {
+ // record the numeric properties
+ NUMERIC: {
STRANGE: {
int val = 0;
- // c is A-Z
+ // c is A-Z
if ((c >= 0x0041) && (c <= 0x005A)) {
val = c - 0x0041;
resultA |= valueJavaSupradecimal;
- // c is a-z
+ // c is a-z
} else if ((c >= 0x0061) && (c <= 0x007A)) {
val = c - 0x0061;
resultA |= valueJavaSupradecimal;
@@ -428,7 +461,7 @@ public class GenerateCharacter {
resultA |= valueStrangeNumeric;
} // end NUMERIC
- // record case mapping
+ // record case mapping
int offset = 0;
// might have a 1:M mapping
int specialMap = SpecialCaseMap.find(c, specialCaseMaps);
@@ -458,12 +491,12 @@ public class GenerateCharacter {
}
}
if ((us.hasTitleMap() && us.titleMap != us.upperMap) ||
- (bHasUpper && us.hasLowerMap())) {
+ (bHasUpper && us.hasLowerMap())) {
resultA |= maskTitleCase;
}
if (bHasUpper && !us.hasLowerMap() && !us.hasTitleMap() && verbose) {
- System.out.println("Warning: Character " + hex4(c) + " has upper but " +
- "no title case; Java won't know this");
+ System.out.println("Warning: Character " + hex4(c) + " has upper but " +
+ "no title case; Java won't know this");
}
if (offset < minOffsetSeen) minOffsetSeen = offset;
if (offset > maxOffsetSeen) maxOffsetSeen = offset;
@@ -475,8 +508,7 @@ public class GenerateCharacter {
}
resultA |= ((offset & maskCase) << shiftCaseOffset);
-
- // record lexical info about this character
+ // record lexical info about this character
if (us.generalCategory == UnicodeSpec.LOWERCASE_LETTER
|| us.generalCategory == UnicodeSpec.UPPERCASE_LETTER
|| us.generalCategory == UnicodeSpec.TITLECASE_LETTER
@@ -539,6 +571,16 @@ public class GenerateCharacter {
return resultA;
}
+ static void addExProp(long[] map, PropList propList, String prop, long mask) {
+ List cps = propList.codepoints(prop);
+ if (cps != null) {
+ for (Integer cp : cps) {
+ if (cp < map.length)
+ map[cp] |= mask;
+ }
+ }
+ }
+
/**
* This is the heart of the table compression strategy. The inputs are a map
* and a number of bits (size). The map is simply an array of long integer values;
@@ -645,8 +687,8 @@ OUTER: for (int i = 0; i < n; i += m) {
*/
static void generateCharacterClass(String theTemplateFileName,
- String theOutputFileName)
- throws FileNotFoundException, IOException {
+ String theOutputFileName)
+ throws FileNotFoundException, IOException {
BufferedReader in = new BufferedReader(new FileReader(theTemplateFileName));
PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(theOutputFileName)));
out.println(commentStart +
@@ -719,6 +761,9 @@ OUTER: for (int i = 0; i < n; i += m) {
if (x.length() >= 9 && x.substring(0, 7).equals("Lookup(") &&
x.substring(x.length()-1).equals(")") )
return genAccess("A", x.substring(7, x.length()-1), (identifiers ? 2 : 32));
+ if (x.length() >= 11 && x.substring(0, 9).equals("LookupEx(") &&
+ x.substring(x.length()-1).equals(")") )
+ return genAccess("B", x.substring(9, x.length()-1), 16);
if (x.equals("shiftType")) return Long.toString(shiftType);
if (x.equals("shiftIdentifierInfo")) return Long.toString(shiftIdentifierInfo);
if (x.equals("maskIdentifierInfo")) return "0x" + hex8(maskIdentifierInfo);
@@ -731,6 +776,10 @@ OUTER: for (int i = 0; i < n; i += m) {
if (x.equals("maskLowerCase")) return "0x" + hex8(maskLowerCase);
if (x.equals("maskUpperCase")) return "0x" + hex8(maskUpperCase);
if (x.equals("maskTitleCase")) return "0x" + hex8(maskTitleCase);
+ if (x.equals("maskOtherLowercase")) return "0x" + hex4(maskOtherLowercase >> 32);
+ if (x.equals("maskOtherUppercase")) return "0x" + hex4(maskOtherUppercase >> 32);
+ if (x.equals("maskOtherAlphabetic")) return "0x" + hex4(maskOtherAlphabetic >> 32);
+ if (x.equals("maskIdeographic")) return "0x" + hex4(maskIdeographic >> 32);
if (x.equals("valueIgnorable")) return "0x" + hex8(valueIgnorable);
if (x.equals("valueJavaUnicodeStart")) return "0x" + hex8(valueJavaUnicodeStart);
if (x.equals("valueJavaOnlyStart")) return "0x" + hex8(valueJavaOnlyStart);
@@ -899,7 +948,7 @@ OUTER: for (int i = 0; i < n; i += m) {
// If we ever need more than 32 bits to represent the character properties,
// then a table "B" may be needed as well.
- // genTable(result, "B", tables[n - 1], 32, 16, sizes[n - 1], false, 0, true, true, false);
+ genTable(result, "B", tables[n - 1], 32, 16, sizes[n - 1], false, 0, true, true, false);
totalBytes += ((((tables[n - 1].length * (identifiers ? 2 : 32)) + 31) >> 5) << 2);
result.append(commentStart);
@@ -1080,9 +1129,9 @@ OUTER: for (int i = 0; i < n; i += m) {
*/
static void genTable(StringBuffer result, String name,
- long[] table, int extract, int bits, int size,
- boolean preshifted, int shift, boolean hexFormat,
- boolean properties, boolean hexComment) {
+ long[] table, int extract, int bits, int size,
+ boolean preshifted, int shift, boolean hexFormat,
+ boolean properties, boolean hexComment) {
String atype = bits == 1 ? (Csyntax ? "unsigned long" : "int") :
bits == 2 ? (Csyntax ? "unsigned long" : "int") :
@@ -1137,7 +1186,12 @@ OUTER: for (int i = 0; i < n; i += m) {
char ch = '\u0000';
int charsPerEntry = -entriesPerChar;
for (int j=0; j> extract;
+ //long entry = table[j] >> extract;
+ long entry;
+ if ("A".equals(name))
+ entry = (table[j] & 0xffffffffL) >> extract;
+ else
+ entry = (table[j] >> extract);
if (shiftEntries) entry <<= shift;
if (entry >= (1L << bits)) {
FAIL("Entry too big");
@@ -1549,6 +1603,7 @@ OUTER: for (int i = 0; i < n; i += m) {
static String OutputFileName = null;
static String UnicodeSpecFileName = null; // liu
static String SpecialCasingFileName = null;
+ static String PropListFileName = null;
static boolean useCharForByte = false;
static int[] sizes;
static int bins = 0; // liu; if > 0, then perform search
@@ -1668,20 +1723,28 @@ OUTER: for (int i = 0; i < n; i += m) {
SpecialCasingFileName = args[++j];
}
}
- else if (args[j].equals("-plane")) {
- if (j == args.length -1) {
- FAIL("Plane number missing after -plane");
- }
- else {
- plane = Integer.parseInt(args[++j]);
- }
- if (plane > 0) {
- bLatin1 = false;
- }
- }
- else if ("-usecharforbyte".equals(args[j])) {
- useCharForByte = true;
- }
+ else if (args[j].equals("-proplist")) {
+ if (j == args.length -1) {
+ FAIL("File name missing after -proplist");
+ }
+ else {
+ PropListFileName = args[++j];
+ }
+ }
+ else if (args[j].equals("-plane")) {
+ if (j == args.length -1) {
+ FAIL("Plane number missing after -plane");
+ }
+ else {
+ plane = Integer.parseInt(args[++j]);
+ }
+ if (plane > 0) {
+ bLatin1 = false;
+ }
+ }
+ else if ("-usecharforbyte".equals(args[j])) {
+ useCharForByte = true;
+ }
else if (args[j].equals("-latin1")) {
bLatin1 = true;
plane = 0;
@@ -1728,6 +1791,10 @@ OUTER: for (int i = 0; i < n; i += m) {
SpecialCasingFileName = DefaultSpecialCasingFileName;
desc.append(" [-specialcasing " + SpecialCasingFileName + ']');
}
+ if (PropListFileName == null) {
+ PropListFileName = DefaultPropListFileName;
+ desc.append(" [-proplist " + PropListFileName + ']');
+ }
if (TemplateFileName == null) {
TemplateFileName = (Csyntax ? DefaultCTemplateFileName
: DefaultJavaTemplateFileName);
@@ -1877,12 +1944,13 @@ OUTER: for (int i = 0; i < n; i += m) {
try {
UnicodeSpec[] data = UnicodeSpec.readSpecFile(new File(UnicodeSpecFileName), plane);
-
specialCaseMaps = SpecialCaseMap.readSpecFile(new File(SpecialCasingFileName), plane);
+ PropList propList = PropList.readSpecFile(new File(PropListFileName), plane);
+
if (verbose) {
System.out.println(data.length + " items read from Unicode spec file " + UnicodeSpecFileName); // liu
}
- long[] map = buildMap(data, specialCaseMaps);
+ long[] map = buildMap(data, specialCaseMaps, propList);
if (verbose) {
System.err.println("Completed building of initial map");
}
diff --git a/make/tools/src/build/tools/generatecharacter/PropList.java b/make/tools/src/build/tools/generatecharacter/PropList.java
new file mode 100644
index 0000000000000000000000000000000000000000..4591d5d667827ab1767ddeea53ee7b9511633f56
--- /dev/null
+++ b/make/tools/src/build/tools/generatecharacter/PropList.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 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.generatecharacter;
+
+import java.util.regex.*;
+import java.util.*;
+import java.io.*;
+
+/**
+ * A PropList object contains the lists of code points that have
+ * the same Unicode property defined in PropList.txt
+ *
+ * @author Xueming Shen
+ */
+public class PropList {
+
+ public static PropList readSpecFile(File file, int plane)
+ throws IOException
+ {
+ return new PropList(file, plane);
+ }
+
+ public List codepoints(String name) {
+ return propMap.get(name);
+ }
+
+ public Set names() {
+ return propMap.keySet();
+ }
+
+ private Map> propMap =
+ new LinkedHashMap>();
+
+ private PropList(File file, int plane) throws IOException {
+
+ int i, j;
+ BufferedReader sbfr = new BufferedReader(new FileReader(file));
+ Matcher m = Pattern.compile("(\\p{XDigit}+)(?:\\.{2}(\\p{XDigit}+))?\\s*;\\s+(\\w+)\\s+#.*").matcher("");
+ String line = null;
+ int lineNo = 0;
+ while ((line = sbfr.readLine()) != null) {
+ lineNo++;
+ if (line.length() <= 1 || line.charAt(0) == '#') {
+ continue;
+ }
+ m.reset(line);
+ if (m.matches()) {
+ int start = Integer.parseInt(m.group(1), 16);
+ if ((start >> 16) != plane)
+ continue;
+ int end = (m.group(2)==null)?start
+ :Integer.parseInt(m.group(2), 16);
+ String name = m.group(3);
+
+ start &= 0xffff;
+ end &= 0xffff;
+
+ ArrayList list = propMap.get(name);
+ if (list == null) {
+ list = new ArrayList();
+ propMap.put(name, list);
+ }
+ while (start <= end)
+ list.add(start++);
+ } else {
+ System.out.printf("Warning: Unrecognized line %d <%s>%n", lineNo, line);
+ }
+ }
+ sbfr.close();
+
+ //for (String name: propMap.keySet()) {
+ // System.out.printf("%s %d%n", name, propMap.get(name).size());
+ //}
+ }
+
+ public static void main(String[] args) throws IOException {
+ readSpecFile(new File(args[0]), Integer.decode(args[1]));
+ }
+}
diff --git a/src/share/classes/com/sun/rowset/CachedRowSetImpl.java b/src/share/classes/com/sun/rowset/CachedRowSetImpl.java
index 74ac1b2bf238f17cee11352897da34fca1c6bb15..8008049a751239e9b91d5189bf72645b928030df 100644
--- a/src/share/classes/com/sun/rowset/CachedRowSetImpl.java
+++ b/src/share/classes/com/sun/rowset/CachedRowSetImpl.java
@@ -1666,7 +1666,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern
*/
protected void removeCurrentRow() {
((Row)getCurrentRow()).setDeleted();
- rvh.remove(cursorPos);
+ rvh.remove(cursorPos - 1);
--numRows;
}
@@ -6349,7 +6349,6 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern
// this can happen if deleted rows are being shown
if (row.getDeleted() == true) {
removeCurrentRow();
- --numRows;
}
}
diff --git a/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java b/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java
index c9499f1d1a0f528ed61cebc8ba95c1e2f60ce427..5da153d72ea1c4783746e30ae8ac972f771f63e8 100644
--- a/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java
+++ b/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -395,7 +395,13 @@ public class Krb5LoginModule implements LoginModule {
private boolean succeeded = false;
private boolean commitSucceeded = false;
private String username;
+
+ // Encryption keys calculated from password. Assigned when storekey == true
+ // and useKeyTab == false (or true but not found)
private EncryptionKey[] encKeys = null;
+
+ KeyTab ktab = null;
+
private Credentials cred = null;
private PrincipalName principal = null;
@@ -663,28 +669,49 @@ public class Krb5LoginModule implements LoginModule {
(krb5PrincName.toString(),
PrincipalName.KRB_NT_PRINCIPAL);
}
+
+ /*
+ * Before dynamic KeyTab support (6894072), here we check if
+ * the keytab contains keys for the principal. If no, keytab
+ * will not be used and password is prompted for.
+ *
+ * After 6894072, we normally don't check it, and expect the
+ * keys can be populated until a real connection is made. The
+ * check is still done when isInitiator == true, where the keys
+ * will be used right now.
+ *
+ * Probably tricky relations:
+ *
+ * useKeyTab is config flag, but when it's true but the ktab
+ * does not contains keys for principal, we would use password
+ * and keep the flag unchanged (for reuse?). In this method,
+ * we use (ktab != null) to check whether keytab is used.
+ * After this method (and when storeKey == true), we use
+ * (encKeys == null) to check.
+ */
if (useKeyTab) {
- encKeys =
- EncryptionKey.acquireSecretKeys(principal, keyTabName);
-
- if (debug) {
- if (encKeys != null)
- System.out.println
- ("principal's key obtained from the keytab");
- else
- System.out.println
- ("Key for the principal " +
- principal +
- " not available in " +
- ((keyTabName == null) ?
- "default key tab" : keyTabName));
+ ktab = (keyTabName == null)
+ ? KeyTab.getInstance()
+ : KeyTab.getInstance(new File(keyTabName));
+ if (isInitiator) {
+ if (Krb5Util.keysFromJavaxKeyTab(ktab, principal).length
+ == 0) {
+ ktab = null;
+ if (debug) {
+ System.out.println
+ ("Key for the principal " +
+ principal +
+ " not available in " +
+ ((keyTabName == null) ?
+ "default key tab" : keyTabName));
+ }
+ }
}
-
}
KrbAsReqBuilder builder;
- // We can't get the key from the keytab so prompt
- if (encKeys == null) {
+
+ if (ktab == null) {
promptForPass(getPasswdFromSharedState);
builder = new KrbAsReqBuilder(principal, password);
if (isInitiator) {
@@ -693,9 +720,13 @@ public class Krb5LoginModule implements LoginModule {
// updated with PA info
cred = builder.action().getCreds();
}
- encKeys = builder.getKeys();
+ if (storeKey) {
+ encKeys = builder.getKeys();
+ // When encKeys is empty, the login actually fails.
+ // For compatibility, exception is thrown in commit().
+ }
} else {
- builder = new KrbAsReqBuilder(principal, encKeys);
+ builder = new KrbAsReqBuilder(principal, ktab);
if (isInitiator) {
cred = builder.action().getCreds();
}
@@ -705,10 +736,15 @@ public class Krb5LoginModule implements LoginModule {
if (debug) {
System.out.println("principal is " + principal);
HexDumpEncoder hd = new HexDumpEncoder();
- for (int i = 0; i < encKeys.length; i++) {
- System.out.println("EncryptionKey: keyType=" +
- encKeys[i].getEType() + " keyBytes (hex dump)=" +
- hd.encodeBuffer(encKeys[i].getBytes()));
+ if (ktab != null) {
+ System.out.println("Will use keytab");
+ } else if (storeKey) {
+ for (int i = 0; i < encKeys.length; i++) {
+ System.out.println("EncryptionKey: keyType=" +
+ encKeys[i].getEType() +
+ " keyBytes (hex dump)=" +
+ hd.encodeBuffer(encKeys[i].getBytes()));
+ }
}
}
@@ -989,8 +1025,8 @@ public class Krb5LoginModule implements LoginModule {
kerbTicket = Krb5Util.credsToTicket(cred);
}
- if (storeKey) {
- if (encKeys == null || encKeys.length <= 0) {
+ if (storeKey && encKeys != null) {
+ if (encKeys.length == 0) {
succeeded = false;
throw new LoginException("Null Server Key ");
}
@@ -1006,10 +1042,11 @@ public class Krb5LoginModule implements LoginModule {
}
}
- // Let us add the kerbClientPrinc,kerbTicket and kerbKey (if
+ // Let us add the kerbClientPrinc,kerbTicket and KeyTab/KerbKey (if
// storeKey is true)
- if (!princSet.contains(kerbClientPrinc))
+ if (!princSet.contains(kerbClientPrinc)) {
princSet.add(kerbClientPrinc);
+ }
// add the TGT
if (kerbTicket != null) {
@@ -1018,19 +1055,29 @@ public class Krb5LoginModule implements LoginModule {
}
if (storeKey) {
- for (int i = 0; i < kerbKeys.length; i++) {
- if (!privCredSet.contains(kerbKeys[i])) {
- privCredSet.add(kerbKeys[i]);
+ if (encKeys == null) {
+ if (!privCredSet.contains(ktab)) {
+ privCredSet.add(ktab);
+ // Compatibility; also add keys to privCredSet
+ for (KerberosKey key: ktab.getKeys(kerbClientPrinc)) {
+ privCredSet.add(new Krb5Util.KeysFromKeyTab(key));
+ }
}
- encKeys[i].destroy();
- encKeys[i] = null;
- if (debug) {
- System.out.println("Added server's key"
- + kerbKeys[i]);
- System.out.println("\t\t[Krb5LoginModule] " +
- "added Krb5Principal " +
- kerbClientPrinc.toString()
- + " to Subject");
+ } else {
+ for (int i = 0; i < kerbKeys.length; i ++) {
+ if (!privCredSet.contains(kerbKeys[i])) {
+ privCredSet.add(kerbKeys[i]);
+ }
+ encKeys[i].destroy();
+ encKeys[i] = null;
+ if (debug) {
+ System.out.println("Added server's key"
+ + kerbKeys[i]);
+ System.out.println("\t\t[Krb5LoginModule] " +
+ "added Krb5Principal " +
+ kerbClientPrinc.toString()
+ + " to Subject");
+ }
}
}
}
@@ -1106,7 +1153,8 @@ public class Krb5LoginModule implements LoginModule {
while (it.hasNext()) {
Object o = it.next();
if (o instanceof KerberosTicket ||
- o instanceof KerberosKey) {
+ o instanceof KerberosKey ||
+ o instanceof KeyTab) {
it.remove();
}
}
@@ -1161,6 +1209,7 @@ public class Krb5LoginModule implements LoginModule {
} else {
// remove temp results for the next try
encKeys = null;
+ ktab = null;
principal = null;
}
username = null;
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/AccessWatchpointSpec.java b/src/share/classes/com/sun/tools/example/debug/bdi/AccessWatchpointSpec.java
index 9ffd9148827fb02c1337fd52d6ec727e5454724e..09e3f7e681423f0d7fbcff6dc3bf49d7523d91a0 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/AccessWatchpointSpec.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/AccessWatchpointSpec.java
@@ -26,7 +26,6 @@
package com.sun.tools.example.debug.bdi;
import com.sun.jdi.*;
-import com.sun.jdi.request.*;
public class AccessWatchpointSpec extends WatchpointSpec {
@@ -38,6 +37,7 @@ public class AccessWatchpointSpec extends WatchpointSpec {
/**
* The 'refType' is known to match.
*/
+ @Override
void resolve(ReferenceType refType) throws InvalidTypeException,
NoSuchFieldException {
if (!(refType instanceof ClassType)) {
@@ -51,6 +51,7 @@ public class AccessWatchpointSpec extends WatchpointSpec {
.createAccessWatchpointRequest(field));
}
+ @Override
public boolean equals(Object obj) {
return (obj instanceof AccessWatchpointSpec) && super.equals(obj);
}
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/AmbiguousMethodException.java b/src/share/classes/com/sun/tools/example/debug/bdi/AmbiguousMethodException.java
index 0e3d7668d2e017c4579155c156ba70e3c506fe83..667cbb225934a1de1601e627b57c7bd2ff0d2ee5 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/AmbiguousMethodException.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/AmbiguousMethodException.java
@@ -27,6 +27,9 @@ package com.sun.tools.example.debug.bdi;
public class AmbiguousMethodException extends Exception
{
+
+ private static final long serialVersionUID = 7793370943251707514L;
+
public AmbiguousMethodException()
{
super();
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/BreakpointSpec.java b/src/share/classes/com/sun/tools/example/debug/bdi/BreakpointSpec.java
index 798e5907063eca54e4233a0bff07a869b5e0dcd7..541582ef89ae4ef92a2e64a2ed504cedb3faf0ed 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/BreakpointSpec.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/BreakpointSpec.java
@@ -25,30 +25,33 @@
package com.sun.tools.example.debug.bdi;
-import com.sun.jdi.request.*;
-
public abstract class BreakpointSpec extends EventRequestSpec {
BreakpointSpec(EventRequestSpecList specs, ReferenceTypeSpec refSpec) {
super(specs, refSpec);
}
+ @Override
void notifySet(SpecListener listener, SpecEvent evt) {
listener.breakpointSet(evt);
}
+ @Override
void notifyDeferred(SpecListener listener, SpecEvent evt) {
listener.breakpointDeferred(evt);
}
+ @Override
void notifyResolved(SpecListener listener, SpecEvent evt) {
listener.breakpointResolved(evt);
}
+ @Override
void notifyDeleted(SpecListener listener, SpecEvent evt) {
listener.breakpointDeleted(evt);
}
+ @Override
void notifyError(SpecListener listener, SpecErrorEvent evt) {
listener.breakpointError(evt);
}
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/ChildSession.java b/src/share/classes/com/sun/tools/example/debug/bdi/ChildSession.java
index 5d5613c228a2d992a313e638024978f37696c5c0..917b0d8803a22cbe2adabf187c22b7306949fb05 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/ChildSession.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/ChildSession.java
@@ -43,10 +43,6 @@ class ChildSession extends Session {
private BufferedReader out;
private BufferedReader err;
- private InputWriter inputWriter;
- private OutputReader outputReader;
- private OutputReader errorReader;
-
private InputListener input;
private OutputListener output;
private OutputListener error;
@@ -84,6 +80,7 @@ class ChildSession extends Session {
this.error = error;
}
+ @Override
public boolean attach() {
if (!connectToVMProcess()) {
@@ -131,6 +128,7 @@ class ChildSession extends Session {
return true;
}
+ @Override
public void detach() {
//### debug
@@ -242,10 +240,7 @@ class ChildSession extends Session {
this.diagnostics = diagnostics;
}
- public void quit() {
- running = false;
- }
-
+ @Override
public void run() {
try {
int count;
@@ -254,6 +249,7 @@ class ChildSession extends Session {
// Run in Swing event dispatcher thread.
final String chars = new String(buffer, 0, count);
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
output.putString(chars);
}
@@ -264,6 +260,7 @@ class ChildSession extends Session {
} catch (IOException e) {
// Run in Swing event dispatcher thread.
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
diagnostics.putString("IO error reading " +
streamName +
@@ -288,11 +285,7 @@ class ChildSession extends Session {
this.input = input;
}
- public void quit() {
- //### Won't have much effect if blocked on input!
- running = false;
- }
-
+ @Override
public void run() {
String line;
while (running) {
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/EvaluationException.java b/src/share/classes/com/sun/tools/example/debug/bdi/EvaluationException.java
index 211bb5331b3e6590150bd537bf18bc5d86df7ab8..0e0a6b0b4849ad756483ce37d2dc0909329b1c8b 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/EvaluationException.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/EvaluationException.java
@@ -25,4 +25,7 @@
package com.sun.tools.example.debug.bdi;
-public class EvaluationException extends Exception {}
+public class EvaluationException extends Exception {
+
+ private static final long serialVersionUID = 4947109680354951694L;
+}
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/EventRequestSpec.java b/src/share/classes/com/sun/tools/example/debug/bdi/EventRequestSpec.java
index 28412756264bf2839bad003a788241de59eb443d..796d5803b9cde8bc6ede854d155f9dd79c6c918b 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/EventRequestSpec.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/EventRequestSpec.java
@@ -25,8 +25,6 @@
package com.sun.tools.example.debug.bdi;
-import java.util.*;
-
import com.sun.jdi.*;
import com.sun.jdi.request.EventRequest;
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/ExceptionSpec.java b/src/share/classes/com/sun/tools/example/debug/bdi/ExceptionSpec.java
index 8be23905e3c5ec874ee500d55de1dbef24071d20..fa3fcb3de289730362abd888487e96a717d2e9fd 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/ExceptionSpec.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/ExceptionSpec.java
@@ -26,11 +26,6 @@
package com.sun.tools.example.debug.bdi;
import com.sun.jdi.ReferenceType;
-import com.sun.jdi.request.*;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Iterator;
public class ExceptionSpec extends EventRequestSpec {
@@ -45,22 +40,27 @@ public class ExceptionSpec extends EventRequestSpec {
this.notifyUncaught = notifyUncaught;
}
+ @Override
void notifySet(SpecListener listener, SpecEvent evt) {
listener.exceptionInterceptSet(evt);
}
+ @Override
void notifyDeferred(SpecListener listener, SpecEvent evt) {
listener.exceptionInterceptDeferred(evt);
}
+ @Override
void notifyResolved(SpecListener listener, SpecEvent evt) {
listener.exceptionInterceptResolved(evt);
}
+ @Override
void notifyDeleted(SpecListener listener, SpecEvent evt) {
listener.exceptionInterceptDeleted(evt);
}
+ @Override
void notifyError(SpecListener listener, SpecErrorEvent evt) {
listener.exceptionInterceptError(evt);
}
@@ -68,16 +68,19 @@ public class ExceptionSpec extends EventRequestSpec {
/**
* The 'refType' is known to match.
*/
+ @Override
void resolve(ReferenceType refType) {
setRequest(refType.virtualMachine().eventRequestManager()
.createExceptionRequest(refType,
notifyCaught, notifyUncaught));
}
+ @Override
public int hashCode() {
return refSpec.hashCode();
}
+ @Override
public boolean equals(Object obj) {
if (obj instanceof ExceptionSpec) {
ExceptionSpec es = (ExceptionSpec)obj;
@@ -88,6 +91,7 @@ public class ExceptionSpec extends EventRequestSpec {
}
}
+ @Override
public String toString() {
StringBuffer buffer = new StringBuffer("exception catch ");
buffer.append(refSpec.toString());
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/ExecutionManager.java b/src/share/classes/com/sun/tools/example/debug/bdi/ExecutionManager.java
index 7dc60f5d6252e66870e904644eb0c756ce8cb712..35f2075daa921a825c97c11322103feffb56420c 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/ExecutionManager.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/ExecutionManager.java
@@ -26,7 +26,6 @@
package com.sun.tools.example.debug.bdi;
import com.sun.jdi.*;
-import com.sun.jdi.event.*;
import com.sun.jdi.request.*;
import com.sun.jdi.connect.*;
import com.sun.tools.example.debug.expr.ExpressionParser;
@@ -56,7 +55,7 @@ public class ExecutionManager {
// Session Listeners
- Vector sessionListeners = new Vector();
+ ArrayList sessionListeners = new ArrayList();
public void addSessionListener(SessionListener listener) {
sessionListeners.add(listener);
@@ -68,7 +67,7 @@ public class ExecutionManager {
// Spec Listeners
- Vector specListeners = new Vector();
+ ArrayList specListeners = new ArrayList();
public void addSpecListener(SpecListener cl) {
specListeners.add(cl);
@@ -80,7 +79,7 @@ public class ExecutionManager {
// JDI Listeners
- Vector jdiListeners = new Vector();
+ ArrayList jdiListeners = new ArrayList();
/**
* Adds a JDIListener
@@ -105,50 +104,50 @@ public class ExecutionManager {
// App Echo Listeners
- private Vector appEchoListeners = new Vector();
+ private ArrayList appEchoListeners = new ArrayList();
public void addApplicationEchoListener(OutputListener l) {
- appEchoListeners.addElement(l);
+ appEchoListeners.add(l);
}
public void removeApplicationEchoListener(OutputListener l) {
- appEchoListeners.removeElement(l);
+ appEchoListeners.remove(l);
}
// App Output Listeners
- private Vector appOutputListeners = new Vector();
+ private ArrayList appOutputListeners = new ArrayList();
public void addApplicationOutputListener(OutputListener l) {
- appOutputListeners.addElement(l);
+ appOutputListeners.add(l);
}
public void removeApplicationOutputListener(OutputListener l) {
- appOutputListeners.removeElement(l);
+ appOutputListeners.remove(l);
}
// App Error Listeners
- private Vector appErrorListeners = new Vector();
+ private ArrayList appErrorListeners = new ArrayList();
public void addApplicationErrorListener(OutputListener l) {
- appErrorListeners.addElement(l);
+ appErrorListeners.add(l);
}
public void removeApplicationErrorListener(OutputListener l) {
- appErrorListeners.removeElement(l);
+ appErrorListeners.remove(l);
}
// Diagnostic Listeners
- private Vector diagnosticsListeners = new Vector();
+ private ArrayList diagnosticsListeners = new ArrayList();
public void addDiagnosticsListener(OutputListener l) {
- diagnosticsListeners.addElement(l);
+ diagnosticsListeners.add(l);
}
public void removeDiagnosticsListener(OutputListener l) {
- diagnosticsListeners.removeElement(l);
+ diagnosticsListeners.remove(l);
}
/////////// End Listener Registration //////////////
@@ -159,7 +158,9 @@ public class ExecutionManager {
}
void ensureActiveSession() throws NoSessionException {
- if (session == null) throw new NoSessionException();
+ if (session == null) {
+ throw new NoSessionException();
+ }
}
public EventRequestManager eventRequestManager() {
@@ -293,6 +294,7 @@ public class ExecutionManager {
ensureActiveSession();
if (f != null) {
frameGetter = new ExpressionParser.GetFrame() {
+ @Override
public StackFrame get() /* throws IncompatibleThreadStateException */ {
return f;
}
@@ -628,35 +630,35 @@ public class ExecutionManager {
*/
private void notifyInterrupted() {
- Vector l = (Vector)sessionListeners.clone();
+ ArrayList l = new ArrayList(sessionListeners);
EventObject evt = new EventObject(this);
for (int i = 0; i < l.size(); i++) {
- ((SessionListener)l.elementAt(i)).sessionInterrupt(evt);
+ l.get(i).sessionInterrupt(evt);
}
}
private void notifyContinued() {
- Vector l = (Vector)sessionListeners.clone();
+ ArrayList l = new ArrayList(sessionListeners);
EventObject evt = new EventObject(this);
for (int i = 0; i < l.size(); i++) {
- ((SessionListener)l.elementAt(i)).sessionContinue(evt);
+ l.get(i).sessionContinue(evt);
}
}
private void notifySessionStart() {
- Vector l = (Vector)sessionListeners.clone();
+ ArrayList l = new ArrayList(sessionListeners);
EventObject evt = new EventObject(this);
for (int i = 0; i < l.size(); i++) {
- ((SessionListener)l.elementAt(i)).sessionStart(evt);
+ l.get(i).sessionStart(evt);
}
}
private void notifySessionDeath() {
/*** noop for now
- Vector l = (Vector)sessionListeners.clone();
+ ArrayList l = new ArrayList(sessionListeners);
EventObject evt = new EventObject(this);
for (int i = 0; i < l.size(); i++) {
- ((SessionListener)l.elementAt(i)).sessionDeath(evt);
+ ((SessionListener)l.get(i)).sessionDeath(evt);
}
****/
}
@@ -684,6 +686,7 @@ public class ExecutionManager {
}
private InputListener appInput = new InputListener() {
+ @Override
public String getLine() {
// Don't allow reader to be interrupted -- catch and retry.
String line = null;
@@ -703,6 +706,7 @@ public class ExecutionManager {
// Run in Swing event dispatcher thread.
final String input = line;
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
echoInputLine(input);
}
@@ -714,37 +718,40 @@ public class ExecutionManager {
private static String newline = System.getProperty("line.separator");
private void echoInputLine(String line) {
- Vector l = (Vector)appEchoListeners.clone();
+ ArrayList l = new ArrayList(appEchoListeners);
for (int i = 0; i < l.size(); i++) {
- OutputListener ol = (OutputListener)l.elementAt(i);
+ OutputListener ol = l.get(i);
ol.putString(line);
ol.putString(newline);
}
}
private OutputListener appOutput = new OutputListener() {
+ @Override
public void putString(String string) {
- Vector l = (Vector)appOutputListeners.clone();
+ ArrayList l = new ArrayList(appEchoListeners);
for (int i = 0; i < l.size(); i++) {
- ((OutputListener)l.elementAt(i)).putString(string);
+ l.get(i).putString(string);
}
}
};
private OutputListener appError = new OutputListener() {
+ @Override
public void putString(String string) {
- Vector l = (Vector)appErrorListeners.clone();
+ ArrayList l = new ArrayList(appEchoListeners);
for (int i = 0; i < l.size(); i++) {
- ((OutputListener)l.elementAt(i)).putString(string);
+ l.get(i).putString(string);
}
}
};
private OutputListener diagnostics = new OutputListener() {
+ @Override
public void putString(String string) {
- Vector l = (Vector)diagnosticsListeners.clone();
+ ArrayList l = new ArrayList(diagnosticsListeners);
for (int i = 0; i < l.size(); i++) {
- ((OutputListener)l.elementAt(i)).putString(string);
+ l.get(i).putString(string);
}
}
};
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/FrameIndexOutOfBoundsException.java b/src/share/classes/com/sun/tools/example/debug/bdi/FrameIndexOutOfBoundsException.java
index 5f5db5e42063432c5c18f3a7560eadc8d417a7ef..5d70918cb3ba10184909152c91531457bacd75eb 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/FrameIndexOutOfBoundsException.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/FrameIndexOutOfBoundsException.java
@@ -25,4 +25,7 @@
package com.sun.tools.example.debug.bdi;
-public class FrameIndexOutOfBoundsException extends IndexOutOfBoundsException {}
+public class FrameIndexOutOfBoundsException extends IndexOutOfBoundsException {
+
+ private static final long serialVersionUID = -4870148107027371437L;
+}
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/JDIEventSource.java b/src/share/classes/com/sun/tools/example/debug/bdi/JDIEventSource.java
index 5b1a9b0bd8b188fa31d7ef80e589a6e52db2a283..dedc2477e0c8a7cb99c4a2af25dffa29e4ed9fe6 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/JDIEventSource.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/JDIEventSource.java
@@ -28,8 +28,6 @@ package com.sun.tools.example.debug.bdi;
import com.sun.jdi.*;
import com.sun.jdi.event.*;
-import java.util.*;
-
import com.sun.tools.example.debug.event.*;
import javax.swing.SwingUtilities;
@@ -55,6 +53,7 @@ class JDIEventSource extends Thread {
this.queue = session.vm.eventQueue();
}
+ @Override
public void run() {
try {
runLoop();
@@ -78,6 +77,7 @@ class JDIEventSource extends Thread {
//### Gross foul hackery!
private void dispatchEventSet(final AbstractEventSet es) {
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
boolean interrupted = es.suspendedAll();
es.notify(firstListener);
@@ -117,54 +117,65 @@ class JDIEventSource extends Thread {
//### This is a Hack, deal with it
private class FirstListener implements JDIListener {
+ @Override
public void accessWatchpoint(AccessWatchpointEventSet e) {
session.runtime.validateThreadInfo();
wantInterrupt = true;
}
+ @Override
public void classPrepare(ClassPrepareEventSet e) {
wantInterrupt = false;
runtime.resolve(e.getReferenceType());
}
+ @Override
public void classUnload(ClassUnloadEventSet e) {
wantInterrupt = false;
}
+ @Override
public void exception(ExceptionEventSet e) {
wantInterrupt = true;
}
+ @Override
public void locationTrigger(LocationTriggerEventSet e) {
session.runtime.validateThreadInfo();
wantInterrupt = true;
}
+ @Override
public void modificationWatchpoint(ModificationWatchpointEventSet e) {
session.runtime.validateThreadInfo();
wantInterrupt = true;
}
+ @Override
public void threadDeath(ThreadDeathEventSet e) {
wantInterrupt = false;
}
+ @Override
public void threadStart(ThreadStartEventSet e) {
wantInterrupt = false;
}
+ @Override
public void vmDeath(VMDeathEventSet e) {
//### Should have some way to notify user
//### that VM died before the session ended.
wantInterrupt = false;
}
+ @Override
public void vmDisconnect(VMDisconnectEventSet e) {
//### Notify user?
wantInterrupt = false;
session.runtime.endSession();
}
+ @Override
public void vmStart(VMStartEventSet e) {
//### Do we need to do anything with it?
wantInterrupt = false;
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/LineBreakpointSpec.java b/src/share/classes/com/sun/tools/example/debug/bdi/LineBreakpointSpec.java
index b82b386043e1478a4ee1374d0168aac060ad1d28..0a1e0b1cb3d28269adae410e9620c48117bcd8ea 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/LineBreakpointSpec.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/LineBreakpointSpec.java
@@ -26,11 +26,7 @@
package com.sun.tools.example.debug.bdi;
import com.sun.jdi.*;
-import com.sun.jdi.request.*;
-
-import java.util.ArrayList;
import java.util.List;
-import java.util.Iterator;
public class LineBreakpointSpec extends BreakpointSpec {
int lineNumber;
@@ -44,6 +40,7 @@ public class LineBreakpointSpec extends BreakpointSpec {
/**
* The 'refType' is known to match.
*/
+ @Override
void resolve(ReferenceType refType) throws InvalidTypeException,
LineNotFoundException {
if (!(refType instanceof ClassType)) {
@@ -81,10 +78,12 @@ public class LineBreakpointSpec extends BreakpointSpec {
return lineNumber;
}
+ @Override
public int hashCode() {
return refSpec.hashCode() + lineNumber;
}
+ @Override
public boolean equals(Object obj) {
if (obj instanceof LineBreakpointSpec) {
LineBreakpointSpec breakpoint = (LineBreakpointSpec)obj;
@@ -96,6 +95,7 @@ public class LineBreakpointSpec extends BreakpointSpec {
}
}
+ @Override
public String errorMessageFor(Exception e) {
if (e instanceof LineNotFoundException) {
return ("No code at line " + lineNumber() + " in " + refSpec);
@@ -107,6 +107,7 @@ public class LineBreakpointSpec extends BreakpointSpec {
}
}
+ @Override
public String toString() {
StringBuffer buffer = new StringBuffer("breakpoint ");
buffer.append(refSpec.toString());
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/LineNotFoundException.java b/src/share/classes/com/sun/tools/example/debug/bdi/LineNotFoundException.java
index 00ad8d8f7eae3532f9c58fbaea4f621b939ded62..6d906a8b65ca61db9367a234b30bf2a06a353e30 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/LineNotFoundException.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/LineNotFoundException.java
@@ -27,6 +27,9 @@ package com.sun.tools.example.debug.bdi;
public class LineNotFoundException extends Exception
{
+
+ private static final long serialVersionUID = -5630418117861587582L;
+
public LineNotFoundException()
{
super();
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/MalformedMemberNameException.java b/src/share/classes/com/sun/tools/example/debug/bdi/MalformedMemberNameException.java
index 5c6be5d092fc8ac66f1918d2ff9654f7b4a908e7..c73e685f50365780af22857c539eff8fbe08086b 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/MalformedMemberNameException.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/MalformedMemberNameException.java
@@ -26,6 +26,9 @@
package com.sun.tools.example.debug.bdi;
class MalformedMemberNameException extends Exception {
+
+ private static final long serialVersionUID = -7726664097374844485L;
+
public MalformedMemberNameException() {
super();
}
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/MethodBreakpointSpec.java b/src/share/classes/com/sun/tools/example/debug/bdi/MethodBreakpointSpec.java
index 9e265bd08dbce956fd983cc308783cef7fc5868e..7a9748af102b17a2f7bfd10f1ad43b3c36801ba1 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/MethodBreakpointSpec.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/MethodBreakpointSpec.java
@@ -26,11 +26,8 @@
package com.sun.tools.example.debug.bdi;
import com.sun.jdi.*;
-import com.sun.jdi.request.*;
-
import java.util.ArrayList;
import java.util.List;
-import java.util.Iterator;
public class MethodBreakpointSpec extends BreakpointSpec {
String methodId;
@@ -47,6 +44,7 @@ public class MethodBreakpointSpec extends BreakpointSpec {
/**
* The 'refType' is known to match.
*/
+ @Override
void resolve(ReferenceType refType) throws MalformedMemberNameException,
AmbiguousMethodException,
InvalidTypeException,
@@ -80,12 +78,14 @@ public class MethodBreakpointSpec extends BreakpointSpec {
return methodArgs;
}
+ @Override
public int hashCode() {
return refSpec.hashCode() +
((methodId != null) ? methodId.hashCode() : 0) +
((methodArgs != null) ? methodArgs.hashCode() : 0);
}
+ @Override
public boolean equals(Object obj) {
if (obj instanceof MethodBreakpointSpec) {
MethodBreakpointSpec breakpoint = (MethodBreakpointSpec)obj;
@@ -98,6 +98,7 @@ public class MethodBreakpointSpec extends BreakpointSpec {
}
}
+ @Override
public String errorMessageFor(Exception e) {
if (e instanceof AmbiguousMethodException) {
return ("Method " + methodName() + " is overloaded; specify arguments");
@@ -114,6 +115,7 @@ public class MethodBreakpointSpec extends BreakpointSpec {
}
}
+ @Override
public String toString() {
StringBuffer buffer = new StringBuffer("breakpoint ");
buffer.append(refSpec.toString());
@@ -257,7 +259,7 @@ public class MethodBreakpointSpec extends BreakpointSpec {
*/
if ((name.indexOf('.') == -1) || name.startsWith("*.")) {
try {
- List refs = specs.runtime.findClassesMatchingPattern(name);
+ List refs = specs.runtime.findClassesMatchingPattern(name);
if (refs.size() > 0) { //### ambiguity???
name = ((ReferenceType)(refs.get(0))).name();
}
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/MethodNotFoundException.java b/src/share/classes/com/sun/tools/example/debug/bdi/MethodNotFoundException.java
index 8fa2e60b79fdaf83fb2dbd2772906512d0e3cd93..9fd3aa9efc74ee343fafb05fc499352068df8e7e 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/MethodNotFoundException.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/MethodNotFoundException.java
@@ -27,6 +27,8 @@ package com.sun.tools.example.debug.bdi;
public class MethodNotFoundException extends Exception
{
+ private static final long serialVersionUID = -2064968107599632609L;
+
public MethodNotFoundException()
{
super();
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/ModificationWatchpointSpec.java b/src/share/classes/com/sun/tools/example/debug/bdi/ModificationWatchpointSpec.java
index 7816ce698d2464f434dfcf5de3b1f7881ca19ec7..7043d666ec870d4b4aeb845a2479b2cd1bcf9006 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/ModificationWatchpointSpec.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/ModificationWatchpointSpec.java
@@ -26,7 +26,6 @@
package com.sun.tools.example.debug.bdi;
import com.sun.jdi.*;
-import com.sun.jdi.request.*;
public class ModificationWatchpointSpec extends WatchpointSpec {
@@ -38,6 +37,7 @@ public class ModificationWatchpointSpec extends WatchpointSpec {
/**
* The 'refType' is known to match.
*/
+ @Override
void resolve(ReferenceType refType) throws InvalidTypeException,
NoSuchFieldException {
if (!(refType instanceof ClassType)) {
@@ -51,6 +51,7 @@ public class ModificationWatchpointSpec extends WatchpointSpec {
.createModificationWatchpointRequest(field));
}
+ @Override
public boolean equals(Object obj) {
return (obj instanceof ModificationWatchpointSpec) &&
super.equals(obj);
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/NoSessionException.java b/src/share/classes/com/sun/tools/example/debug/bdi/NoSessionException.java
index 9a40b41384617290d5c392f138c3c5095a9f8214..32988ab140b47af28f098cd7276caf8c8c7973c1 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/NoSessionException.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/NoSessionException.java
@@ -25,4 +25,7 @@
package com.sun.tools.example.debug.bdi;
-public class NoSessionException extends Exception {}
+public class NoSessionException extends Exception {
+
+ private static final long serialVersionUID = -7324357828115128603L;
+}
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/NoThreadException.java b/src/share/classes/com/sun/tools/example/debug/bdi/NoThreadException.java
index aa36d667ee0178ad0744c4fc525f43cdd41ff065..460b1a4ba4cdae98d49f9b74e1b562e06d011353 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/NoThreadException.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/NoThreadException.java
@@ -25,4 +25,8 @@
package com.sun.tools.example.debug.bdi;
-public class NoThreadException extends Exception {}
+public class NoThreadException extends Exception {
+
+ private static final long serialVersionUID = 1846613539928921998L;
+
+}
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/PatternReferenceTypeSpec.java b/src/share/classes/com/sun/tools/example/debug/bdi/PatternReferenceTypeSpec.java
index e9bd3f93793662effe8fae2411e274ec6c3c2aeb..4f6d73e8e711ce1fde482416b771bf1c1a29a1c8 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/PatternReferenceTypeSpec.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/PatternReferenceTypeSpec.java
@@ -47,6 +47,7 @@ class PatternReferenceTypeSpec implements ReferenceTypeSpec {
/**
* Does the specified ReferenceType match this spec.
*/
+ @Override
public boolean matches(ReferenceType refType) {
if (isWild) {
return refType.name().endsWith(classId);
@@ -55,10 +56,12 @@ class PatternReferenceTypeSpec implements ReferenceTypeSpec {
}
}
+ @Override
public int hashCode() {
return classId.hashCode();
}
+ @Override
public boolean equals(Object obj) {
if (obj instanceof PatternReferenceTypeSpec) {
PatternReferenceTypeSpec spec = (PatternReferenceTypeSpec)obj;
@@ -89,6 +92,7 @@ class PatternReferenceTypeSpec implements ReferenceTypeSpec {
}
}
+ @Override
public String toString() {
return isWild? "*" + classId : classId;
}
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/ReferenceTypeSpec.java b/src/share/classes/com/sun/tools/example/debug/bdi/ReferenceTypeSpec.java
index e3282b747f179848308662929470cc0c1578e15f..fc478060aaac540cde95c8b5d5c067230264ea45 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/ReferenceTypeSpec.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/ReferenceTypeSpec.java
@@ -33,7 +33,9 @@ interface ReferenceTypeSpec {
*/
boolean matches(ReferenceType refType);
+ @Override
int hashCode();
+ @Override
boolean equals(Object obj);
}
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/Session.java b/src/share/classes/com/sun/tools/example/debug/bdi/Session.java
index 61790af7b32cef3dce43271a3e8c7ce0e382c744..4599cb1ba10fbc1252b25d5a34b46d7112b416be 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/Session.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/Session.java
@@ -27,7 +27,6 @@ package com.sun.tools.example.debug.bdi;
import com.sun.jdi.VirtualMachine;
import com.sun.jdi.VMDisconnectedException;
-import com.sun.jdi.event.EventSet;
/**
* Our repository of what we know about the state of one
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/SourceNameReferenceTypeSpec.java b/src/share/classes/com/sun/tools/example/debug/bdi/SourceNameReferenceTypeSpec.java
index 2b8a1e158dbce87e862bdf5e9a325087d117a0aa..c788f5d0c53765371a94de62d71090b2e84a219f 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/SourceNameReferenceTypeSpec.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/SourceNameReferenceTypeSpec.java
@@ -39,6 +39,7 @@ class SourceNameReferenceTypeSpec implements ReferenceTypeSpec {
/**
* Does the specified ReferenceType match this spec.
*/
+ @Override
public boolean matches(ReferenceType refType) {
try {
if (refType.sourceName().equals(sourceName)) {
@@ -48,9 +49,6 @@ class SourceNameReferenceTypeSpec implements ReferenceTypeSpec {
return true;
} catch(AbsentInformationException exc) {
} catch(ObjectCollectedException exc) {
- } catch(InvalidLineNumberException exc) {
-// } catch(ClassNotPreparedException exc) {
-// -- should not happen, so don't catch this ---
}
}
} catch(AbsentInformationException exc) {
@@ -59,10 +57,12 @@ class SourceNameReferenceTypeSpec implements ReferenceTypeSpec {
return false;
}
+ @Override
public int hashCode() {
return sourceName.hashCode() + linenumber;
}
+ @Override
public boolean equals(Object obj) {
if (obj instanceof SourceNameReferenceTypeSpec) {
SourceNameReferenceTypeSpec spec = (SourceNameReferenceTypeSpec)obj;
@@ -74,6 +74,7 @@ class SourceNameReferenceTypeSpec implements ReferenceTypeSpec {
}
}
+ @Override
public String toString() {
return sourceName + "@" + linenumber;
}
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/SpecErrorEvent.java b/src/share/classes/com/sun/tools/example/debug/bdi/SpecErrorEvent.java
index 86a7575bafa7a0e71ad8f77802c51b56af4fe00b..c6b9f4e78d3c4137b1be8e70b22110709c2c6de4 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/SpecErrorEvent.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/SpecErrorEvent.java
@@ -25,10 +25,9 @@
package com.sun.tools.example.debug.bdi;
-import java.util.EventObject;
-
public class SpecErrorEvent extends SpecEvent {
+ private static final long serialVersionUID = 8162634387866409578L;
private Exception reason;
public SpecErrorEvent(EventRequestSpec eventRequestSpec,
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/SpecEvent.java b/src/share/classes/com/sun/tools/example/debug/bdi/SpecEvent.java
index 6cc1d3a1bfc7c24c275e53597aa557bdacd75ccd..625a263fcefa1c0e6aaba2a7b58ac3bbb218cd3c 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/SpecEvent.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/SpecEvent.java
@@ -31,6 +31,7 @@ import com.sun.jdi.request.EventRequest;
public class SpecEvent extends EventObject {
+ private static final long serialVersionUID = 4820735456787276230L;
private EventRequestSpec eventRequestSpec;
public SpecEvent(EventRequestSpec eventRequestSpec) {
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/ThreadGroupIterator.java b/src/share/classes/com/sun/tools/example/debug/bdi/ThreadGroupIterator.java
index 419a466f70bcd44662a41bedd0c0115a0072ba74..c6ec121d8088be54c801d1bfbec1f8d694323f7e 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/ThreadGroupIterator.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/ThreadGroupIterator.java
@@ -26,7 +26,6 @@
package com.sun.tools.example.debug.bdi;
import com.sun.jdi.ThreadGroupReference;
-import com.sun.jdi.ThreadReference;
import java.util.List;
import java.util.Stack;
import java.util.ArrayList;
@@ -73,10 +72,12 @@ public class ThreadGroupIterator implements Iterator {
}
}
+ @Override
public boolean hasNext() {
return !stack.isEmpty();
}
+ @Override
public ThreadGroupReference next() {
return nextThreadGroup();
}
@@ -87,6 +88,7 @@ public class ThreadGroupIterator implements Iterator {
return tg;
}
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/ThreadInfo.java b/src/share/classes/com/sun/tools/example/debug/bdi/ThreadInfo.java
index 7ced75a40f41a4ecb6dfdbfd3be61cdbed5012f7..b9516c4313f3a52f699bbd628f961fe0cbbf5ece 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/ThreadInfo.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/ThreadInfo.java
@@ -26,9 +26,6 @@
package com.sun.tools.example.debug.bdi;
import com.sun.jdi.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Iterator;
//### Should handle target VM death or connection failure cleanly.
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/ThreadIterator.java b/src/share/classes/com/sun/tools/example/debug/bdi/ThreadIterator.java
index c6b2ce6efd2949610ab617cf627d8610cc7a8e79..6fafd71cd80212bd815e2b2ae4708cfc0dd8ccb1 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/ThreadIterator.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/ThreadIterator.java
@@ -43,6 +43,7 @@ public class ThreadIterator implements Iterator {
tgi = new ThreadGroupIterator(tgl);
}
+ @Override
public boolean hasNext() {
while (it == null || !it.hasNext()) {
if (!tgi.hasNext()) {
@@ -53,6 +54,7 @@ public class ThreadIterator implements Iterator {
return true;
}
+ @Override
public ThreadReference next() {
return it.next();
}
@@ -61,6 +63,7 @@ public class ThreadIterator implements Iterator {
return next();
}
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/Utils.java b/src/share/classes/com/sun/tools/example/debug/bdi/Utils.java
index 81993bf05e8b49058958469185c9eadd7cd72695..d3e0173dc9bdcd71322098dc87f1e2fad20cbbd3 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/Utils.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/Utils.java
@@ -26,9 +26,6 @@
package com.sun.tools.example.debug.bdi; //### does it belong here?
import com.sun.jdi.*;
-import com.sun.tools.jdi.*;
-import java.util.*;
-import java.io.*;
public class Utils {
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/VMLaunchFailureException.java b/src/share/classes/com/sun/tools/example/debug/bdi/VMLaunchFailureException.java
index fcbe82b332cfdd7ccb244d3e42245207743d90de..d0c482c50e0385ee7c220431521eb02a773e5cdf 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/VMLaunchFailureException.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/VMLaunchFailureException.java
@@ -25,4 +25,7 @@
package com.sun.tools.example.debug.bdi;
-public class VMLaunchFailureException extends Exception {}
+public class VMLaunchFailureException extends Exception {
+
+ private static final long serialVersionUID = -2439646729274310108L;
+}
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/VMNotInterruptedException.java b/src/share/classes/com/sun/tools/example/debug/bdi/VMNotInterruptedException.java
index 4ddc5a9fc868c2902f21b79e0741c8bdbda919f4..ef12d6d2446bc0f07f420c8ca8559f6ef2aeaf6c 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/VMNotInterruptedException.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/VMNotInterruptedException.java
@@ -25,4 +25,7 @@
package com.sun.tools.example.debug.bdi;
-public class VMNotInterruptedException extends Exception {}
+public class VMNotInterruptedException extends Exception {
+
+ private static final long serialVersionUID = 8111074582188765600L;
+}
diff --git a/src/share/classes/com/sun/tools/example/debug/bdi/WatchpointSpec.java b/src/share/classes/com/sun/tools/example/debug/bdi/WatchpointSpec.java
index 8414a17340a32484612a886b0cd9f17da4596e6d..469b4230a9a9e4268f6d7080fabf9f14cfcc2a4a 100644
--- a/src/share/classes/com/sun/tools/example/debug/bdi/WatchpointSpec.java
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/WatchpointSpec.java
@@ -25,9 +25,6 @@
package com.sun.tools.example.debug.bdi;
-import com.sun.jdi.*;
-import com.sun.jdi.request.*;
-
public abstract class WatchpointSpec extends EventRequestSpec {
final String fieldId;
@@ -40,31 +37,38 @@ public abstract class WatchpointSpec extends EventRequestSpec {
// }
}
+ @Override
void notifySet(SpecListener listener, SpecEvent evt) {
listener.watchpointSet(evt);
}
+ @Override
void notifyDeferred(SpecListener listener, SpecEvent evt) {
listener.watchpointDeferred(evt);
}
+ @Override
void notifyResolved(SpecListener listener, SpecEvent evt) {
listener.watchpointResolved(evt);
}
+ @Override
void notifyDeleted(SpecListener listener, SpecEvent evt) {
listener.watchpointDeleted(evt);
}
+ @Override
void notifyError(SpecListener listener, SpecErrorEvent evt) {
listener.watchpointError(evt);
}
+ @Override
public int hashCode() {
return refSpec.hashCode() + fieldId.hashCode() +
getClass().hashCode();
}
+ @Override
public boolean equals(Object obj) {
if (obj instanceof WatchpointSpec) {
WatchpointSpec watchpoint = (WatchpointSpec)obj;
@@ -77,6 +81,7 @@ public abstract class WatchpointSpec extends EventRequestSpec {
}
}
+ @Override
public String errorMessageFor(Exception e) {
if (e instanceof NoSuchFieldException) {
return ("No field " + fieldId + " in " + refSpec);
diff --git a/src/share/classes/com/sun/tools/example/debug/event/AbstractEventSet.java b/src/share/classes/com/sun/tools/example/debug/event/AbstractEventSet.java
index 3dedd03463812939ebf513f263ddf420912e50ef..80cbd9a0da83794a2587e527e00c91dbff3d8d2d 100644
--- a/src/share/classes/com/sun/tools/example/debug/event/AbstractEventSet.java
+++ b/src/share/classes/com/sun/tools/example/debug/event/AbstractEventSet.java
@@ -33,6 +33,7 @@ import java.util.*;
public abstract class AbstractEventSet extends EventObject implements EventSet {
+ private static final long serialVersionUID = 2772717574222076977L;
private final EventSet jdiEventSet;
final Event oneEvent;
@@ -81,6 +82,7 @@ public abstract class AbstractEventSet extends EventObject implements EventSet {
// Implement Mirror
+ @Override
public VirtualMachine virtualMachine() {
return jdiEventSet.virtualMachine();
}
@@ -105,10 +107,12 @@ public abstract class AbstractEventSet extends EventObject implements EventSet {
return jdiEventSet.suspendPolicy();
}
+ @Override
public void resume() {
jdiEventSet.resume();
}
+ @Override
public int suspendPolicy() {
return jdiEventSet.suspendPolicy();
}
@@ -128,6 +132,7 @@ public abstract class AbstractEventSet extends EventObject implements EventSet {
/**
* Return an iterator specific to {@link Event} objects.
*/
+ @Override
public EventIterator eventIterator() {
return jdiEventSet.eventIterator();
}
@@ -142,6 +147,7 @@ public abstract class AbstractEventSet extends EventObject implements EventSet {
*
* @return the number of elements in this set (its cardinality).
*/
+ @Override
public int size() {
return jdiEventSet.size();
}
@@ -151,6 +157,7 @@ public abstract class AbstractEventSet extends EventObject implements EventSet {
*
* @return true if this set contains no elements.
*/
+ @Override
public boolean isEmpty() {
return jdiEventSet.isEmpty();
}
@@ -163,6 +170,7 @@ public abstract class AbstractEventSet extends EventObject implements EventSet {
*
* @return true if this set contains the specified element.
*/
+ @Override
public boolean contains(Object o) {
return jdiEventSet.contains(o);
}
@@ -174,6 +182,7 @@ public abstract class AbstractEventSet extends EventObject implements EventSet {
*
* @return an iterator over the elements in this set.
*/
+ @Override
public Iterator iterator() {
return jdiEventSet.iterator();
}
@@ -184,6 +193,7 @@ public abstract class AbstractEventSet extends EventObject implements EventSet {
*
* @return an array containing all of the elements in this set.
*/
+ @Override
public Object[] toArray() {
return jdiEventSet.toArray();
}
@@ -202,6 +212,7 @@ public abstract class AbstractEventSet extends EventObject implements EventSet {
* @throws ArrayStoreException the runtime type of a is not a supertype
* of the runtime type of every element in this set.
*/
+ @Override
public T[] toArray(T a[]) {
return jdiEventSet.toArray(a);
}
@@ -217,6 +228,7 @@ public abstract class AbstractEventSet extends EventObject implements EventSet {
* @return true if this set contains all of the elements of the
* specified collection.
*/
+ @Override
public boolean containsAll(Collection c) {
return jdiEventSet.containsAll(c);
}
@@ -224,21 +236,27 @@ public abstract class AbstractEventSet extends EventObject implements EventSet {
// Make the rest of Set unmodifiable
+ @Override
public boolean add(Event e){
throw new UnsupportedOperationException();
}
+ @Override
public boolean remove(Object o) {
throw new UnsupportedOperationException();
}
+ @Override
public boolean addAll(Collection coll) {
throw new UnsupportedOperationException();
}
+ @Override
public boolean removeAll(Collection coll) {
throw new UnsupportedOperationException();
}
+ @Override
public boolean retainAll(Collection coll) {
throw new UnsupportedOperationException();
}
+ @Override
public void clear() {
throw new UnsupportedOperationException();
}
diff --git a/src/share/classes/com/sun/tools/example/debug/event/AccessWatchpointEventSet.java b/src/share/classes/com/sun/tools/example/debug/event/AccessWatchpointEventSet.java
index 52894615e2bcf59241e53625a3e75bb210f98402..37b73e5c4a279bda4675120644b7a46079408f50 100644
--- a/src/share/classes/com/sun/tools/example/debug/event/AccessWatchpointEventSet.java
+++ b/src/share/classes/com/sun/tools/example/debug/event/AccessWatchpointEventSet.java
@@ -25,15 +25,17 @@
package com.sun.tools.example.debug.event;
-import com.sun.jdi.*;
import com.sun.jdi.event.*;
public class AccessWatchpointEventSet extends WatchpointEventSet {
+ private static final long serialVersionUID = -2620394219156607673L;
+
AccessWatchpointEventSet(EventSet jdiEventSet) {
super(jdiEventSet);
}
+ @Override
public void notify(JDIListener listener) {
listener.accessWatchpoint(this);
}
diff --git a/src/share/classes/com/sun/tools/example/debug/event/ClassPrepareEventSet.java b/src/share/classes/com/sun/tools/example/debug/event/ClassPrepareEventSet.java
index 763e5426eec9cb08945073ae26f59e3b6a688467..69050d3f53a367560d5a01b6b9b4ec65048af4c1 100644
--- a/src/share/classes/com/sun/tools/example/debug/event/ClassPrepareEventSet.java
+++ b/src/share/classes/com/sun/tools/example/debug/event/ClassPrepareEventSet.java
@@ -30,6 +30,8 @@ import com.sun.jdi.event.*;
public class ClassPrepareEventSet extends AbstractEventSet {
+ private static final long serialVersionUID = 5958493423581010491L;
+
ClassPrepareEventSet(EventSet jdiEventSet) {
super(jdiEventSet);
}
@@ -55,6 +57,7 @@ public class ClassPrepareEventSet extends AbstractEventSet {
return ((ClassPrepareEvent)oneEvent).referenceType();
}
+ @Override
public void notify(JDIListener listener) {
listener.classPrepare(this);
}
diff --git a/src/share/classes/com/sun/tools/example/debug/event/ClassUnloadEventSet.java b/src/share/classes/com/sun/tools/example/debug/event/ClassUnloadEventSet.java
index b7f996a5a2b9379f4027b8ead5b7a541f9a72b3c..c043b23b29ad34fbb45e8766b788406388fd45d2 100644
--- a/src/share/classes/com/sun/tools/example/debug/event/ClassUnloadEventSet.java
+++ b/src/share/classes/com/sun/tools/example/debug/event/ClassUnloadEventSet.java
@@ -25,11 +25,12 @@
package com.sun.tools.example.debug.event;
-import com.sun.jdi.*;
import com.sun.jdi.event.*;
public class ClassUnloadEventSet extends AbstractEventSet {
+ private static final long serialVersionUID = 8370341450345835866L;
+
ClassUnloadEventSet(EventSet jdiEventSet) {
super(jdiEventSet);
}
@@ -48,6 +49,7 @@ public class ClassUnloadEventSet extends AbstractEventSet {
return ((ClassUnloadEvent)oneEvent).classSignature();
}
+ @Override
public void notify(JDIListener listener) {
listener.classUnload(this);
}
diff --git a/src/share/classes/com/sun/tools/example/debug/event/ExceptionEventSet.java b/src/share/classes/com/sun/tools/example/debug/event/ExceptionEventSet.java
index d55aab6121ff7e525d9aee81810bece5ad7544b3..c94fa284ae61319615f58368b4da915a262b1db8 100644
--- a/src/share/classes/com/sun/tools/example/debug/event/ExceptionEventSet.java
+++ b/src/share/classes/com/sun/tools/example/debug/event/ExceptionEventSet.java
@@ -30,6 +30,8 @@ import com.sun.jdi.event.*;
public class ExceptionEventSet extends LocatableEventSet {
+ private static final long serialVersionUID = 5328140167954640711L;
+
ExceptionEventSet(EventSet jdiEventSet) {
super(jdiEventSet);
}
@@ -75,6 +77,7 @@ public class ExceptionEventSet extends LocatableEventSet {
return ((ExceptionEvent)oneEvent).catchLocation();
}
+ @Override
public void notify(JDIListener listener) {
listener.exception(this);
}
diff --git a/src/share/classes/com/sun/tools/example/debug/event/JDIAdapter.java b/src/share/classes/com/sun/tools/example/debug/event/JDIAdapter.java
index 3d310604240d737b88f650e33535c8330320bad4..fb3e7a859aa836376da6adcc5b1b303c1029d9e4 100644
--- a/src/share/classes/com/sun/tools/example/debug/event/JDIAdapter.java
+++ b/src/share/classes/com/sun/tools/example/debug/event/JDIAdapter.java
@@ -33,36 +33,47 @@ package com.sun.tools.example.debug.event;
*/
public class JDIAdapter implements JDIListener {
+ @Override
public void accessWatchpoint(AccessWatchpointEventSet e) {
}
+ @Override
public void classPrepare(ClassPrepareEventSet e) {
}
+ @Override
public void classUnload(ClassUnloadEventSet e) {
}
+ @Override
public void exception(ExceptionEventSet e) {
}
+ @Override
public void locationTrigger(LocationTriggerEventSet e) {
}
+ @Override
public void modificationWatchpoint(ModificationWatchpointEventSet e) {
}
+ @Override
public void threadDeath(ThreadDeathEventSet e) {
}
+ @Override
public void threadStart(ThreadStartEventSet e) {
}
+ @Override
public void vmDeath(VMDeathEventSet e) {
}
+ @Override
public void vmDisconnect(VMDisconnectEventSet e) {
}
+ @Override
public void vmStart(VMStartEventSet e) {
}
diff --git a/src/share/classes/com/sun/tools/example/debug/event/LocatableEventSet.java b/src/share/classes/com/sun/tools/example/debug/event/LocatableEventSet.java
index 6e557c419e82b3c1002a544771a83146aff9ded9..303af121e4e65c5cfd6e53bd7189cf3e81e31e49 100644
--- a/src/share/classes/com/sun/tools/example/debug/event/LocatableEventSet.java
+++ b/src/share/classes/com/sun/tools/example/debug/event/LocatableEventSet.java
@@ -33,6 +33,8 @@ import com.sun.jdi.event.*;
*/
public abstract class LocatableEventSet extends AbstractEventSet {
+ private static final long serialVersionUID = 1027131209997915620L;
+
LocatableEventSet(EventSet jdiEventSet) {
super(jdiEventSet);
}
diff --git a/src/share/classes/com/sun/tools/example/debug/event/LocationTriggerEventSet.java b/src/share/classes/com/sun/tools/example/debug/event/LocationTriggerEventSet.java
index 6e5366eae61a64b396730a660931d7662ecf8931..b30bea52bef7a1427c6c85ccf7f9920d2af950d4 100644
--- a/src/share/classes/com/sun/tools/example/debug/event/LocationTriggerEventSet.java
+++ b/src/share/classes/com/sun/tools/example/debug/event/LocationTriggerEventSet.java
@@ -25,15 +25,17 @@
package com.sun.tools.example.debug.event;
-import com.sun.jdi.*;
import com.sun.jdi.event.*;
public class LocationTriggerEventSet extends LocatableEventSet {
+ private static final long serialVersionUID = -3674631710485872487L;
+
LocationTriggerEventSet(EventSet jdiEventSet) {
super(jdiEventSet);
}
+ @Override
public void notify(JDIListener listener) {
listener.locationTrigger(this);
}
diff --git a/src/share/classes/com/sun/tools/example/debug/event/ModificationWatchpointEventSet.java b/src/share/classes/com/sun/tools/example/debug/event/ModificationWatchpointEventSet.java
index d7824b7abf92b6279740be97f89fd39479b32b97..382a8f31b7cd791c8915c123ad6c0fe1d9f68cef 100644
--- a/src/share/classes/com/sun/tools/example/debug/event/ModificationWatchpointEventSet.java
+++ b/src/share/classes/com/sun/tools/example/debug/event/ModificationWatchpointEventSet.java
@@ -30,6 +30,8 @@ import com.sun.jdi.event.*;
public class ModificationWatchpointEventSet extends WatchpointEventSet {
+ private static final long serialVersionUID = -680889300856154719L;
+
ModificationWatchpointEventSet(EventSet jdiEventSet) {
super(jdiEventSet);
}
@@ -42,6 +44,7 @@ public class ModificationWatchpointEventSet extends WatchpointEventSet {
return ((ModificationWatchpointEvent)oneEvent).valueToBe();
}
+ @Override
public void notify(JDIListener listener) {
listener.modificationWatchpoint(this);
}
diff --git a/src/share/classes/com/sun/tools/example/debug/event/ThreadDeathEventSet.java b/src/share/classes/com/sun/tools/example/debug/event/ThreadDeathEventSet.java
index 2e2cc00eea10fd95200c8653add2a02d03effdc0..ad432f77842652f5062ddf3c680ee924d4626b67 100644
--- a/src/share/classes/com/sun/tools/example/debug/event/ThreadDeathEventSet.java
+++ b/src/share/classes/com/sun/tools/example/debug/event/ThreadDeathEventSet.java
@@ -30,6 +30,8 @@ import com.sun.jdi.event.*;
public class ThreadDeathEventSet extends AbstractEventSet {
+ private static final long serialVersionUID = -8801604712308151331L;
+
ThreadDeathEventSet(EventSet jdiEventSet) {
super(jdiEventSet);
}
@@ -44,6 +46,7 @@ public class ThreadDeathEventSet extends AbstractEventSet {
return ((ThreadDeathEvent)oneEvent).thread();
}
+ @Override
public void notify(JDIListener listener) {
listener.threadDeath(this);
}
diff --git a/src/share/classes/com/sun/tools/example/debug/event/ThreadStartEventSet.java b/src/share/classes/com/sun/tools/example/debug/event/ThreadStartEventSet.java
index 8f7ccc6fe3974272a50f3c3398cc8b8858256d33..63b1fb42603b221fe214c9a243f93c4b575ee6a6 100644
--- a/src/share/classes/com/sun/tools/example/debug/event/ThreadStartEventSet.java
+++ b/src/share/classes/com/sun/tools/example/debug/event/ThreadStartEventSet.java
@@ -30,6 +30,8 @@ import com.sun.jdi.event.*;
public class ThreadStartEventSet extends AbstractEventSet {
+ private static final long serialVersionUID = -3802096132294933502L;
+
ThreadStartEventSet(EventSet jdiEventSet) {
super(jdiEventSet);
}
@@ -44,6 +46,7 @@ public class ThreadStartEventSet extends AbstractEventSet {
return ((ThreadStartEvent)oneEvent).thread();
}
+ @Override
public void notify(JDIListener listener) {
listener.threadStart(this);
}
diff --git a/src/share/classes/com/sun/tools/example/debug/event/VMDeathEventSet.java b/src/share/classes/com/sun/tools/example/debug/event/VMDeathEventSet.java
index 963eb8e8e829db0ba6d4d760adf45b90e230bc4c..017f11ff5aedaeab9c5fc06625dfc5069a80fbcf 100644
--- a/src/share/classes/com/sun/tools/example/debug/event/VMDeathEventSet.java
+++ b/src/share/classes/com/sun/tools/example/debug/event/VMDeathEventSet.java
@@ -29,10 +29,13 @@ import com.sun.jdi.event.*;
public class VMDeathEventSet extends AbstractEventSet {
+ private static final long serialVersionUID = 1163097303940092229L;
+
VMDeathEventSet(EventSet jdiEventSet) {
super(jdiEventSet);
}
+ @Override
public void notify(JDIListener listener) {
listener.vmDeath(this);
}
diff --git a/src/share/classes/com/sun/tools/example/debug/event/VMDisconnectEventSet.java b/src/share/classes/com/sun/tools/example/debug/event/VMDisconnectEventSet.java
index d85553095555759b1d3d476ce03d20a9a1da318c..4edf4b872c9e54a3fa6c7d0559b19d96049386a3 100644
--- a/src/share/classes/com/sun/tools/example/debug/event/VMDisconnectEventSet.java
+++ b/src/share/classes/com/sun/tools/example/debug/event/VMDisconnectEventSet.java
@@ -29,10 +29,13 @@ import com.sun.jdi.event.*;
public class VMDisconnectEventSet extends AbstractEventSet {
+ private static final long serialVersionUID = 7968123152344675342L;
+
VMDisconnectEventSet(EventSet jdiEventSet) {
super(jdiEventSet);
}
+ @Override
public void notify(JDIListener listener) {
listener.vmDisconnect(this);
}
diff --git a/src/share/classes/com/sun/tools/example/debug/event/VMStartEventSet.java b/src/share/classes/com/sun/tools/example/debug/event/VMStartEventSet.java
index d04116a44af5ba81d156e408c064a933ab3db6e6..896fa78c36921976c92694eec79b23aefd3a703c 100644
--- a/src/share/classes/com/sun/tools/example/debug/event/VMStartEventSet.java
+++ b/src/share/classes/com/sun/tools/example/debug/event/VMStartEventSet.java
@@ -30,6 +30,8 @@ import com.sun.jdi.event.*;
public class VMStartEventSet extends AbstractEventSet {
+ private static final long serialVersionUID = -3384957227835478191L;
+
VMStartEventSet(EventSet jdiEventSet) {
super(jdiEventSet);
}
@@ -44,6 +46,7 @@ public class VMStartEventSet extends AbstractEventSet {
return ((VMStartEvent)oneEvent).thread();
}
+ @Override
public void notify(JDIListener listener) {
listener.vmStart(this);
}
diff --git a/src/share/classes/com/sun/tools/example/debug/event/WatchpointEventSet.java b/src/share/classes/com/sun/tools/example/debug/event/WatchpointEventSet.java
index 5c4de70100119c41117ef7c52b94595673ee84e6..628f21cb92db65d0052536f97102c7c6f73643d3 100644
--- a/src/share/classes/com/sun/tools/example/debug/event/WatchpointEventSet.java
+++ b/src/share/classes/com/sun/tools/example/debug/event/WatchpointEventSet.java
@@ -30,6 +30,8 @@ import com.sun.jdi.event.*;
public abstract class WatchpointEventSet extends LocatableEventSet {
+ private static final long serialVersionUID = 5606285209703845409L;
+
WatchpointEventSet(EventSet jdiEventSet) {
super(jdiEventSet);
}
diff --git a/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParser.java b/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParser.java
index 3f8d0001a74a01bc4550f38b195a05de972f3c03..c2c79010c6bc0385bd1774f41ce6ea7f9138b974 100644
--- a/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParser.java
+++ b/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParser.java
@@ -27,25 +27,25 @@
package com.sun.tools.example.debug.expr;
import com.sun.jdi.*;
+
import java.util.Stack;
import java.util.List;
import java.util.ArrayList;
-@SuppressWarnings("unchecked")
public class ExpressionParser implements ExpressionParserConstants {
- Stack stack = new Stack();
+ Stack stack = new Stack();
VirtualMachine vm = null;
GetFrame frameGetter = null;
private static GetFrame lastFrameGetter;
private static LValue lastLValue;
LValue peek() {
- return (LValue)stack.peek();
+ return stack.peek();
}
LValue pop() {
- return (LValue)stack.pop();
+ return stack.pop();
}
void push(LValue lval) {
@@ -61,17 +61,14 @@ public class ExpressionParser implements ExpressionParserConstants {
}
public static Value evaluate(String expr, VirtualMachine vm,
- GetFrame frameGetter) throws ParseException,
- InvocationException,
- InvalidTypeException,
- ClassNotLoadedException,
+ GetFrame frameGetter) throws ParseException, InvocationException,
+ InvalidTypeException, ClassNotLoadedException,
IncompatibleThreadStateException {
// TODO StringBufferInputStream is deprecated.
java.io.InputStream in = new java.io.StringBufferInputStream(expr);
ExpressionParser parser = new ExpressionParser(in);
parser.vm = vm;
parser.frameGetter = frameGetter;
- Value value = null;
parser.Expression();
lastFrameGetter = frameGetter;
lastLValue = parser.pop();
@@ -89,8 +86,8 @@ public class ExpressionParser implements ExpressionParserConstants {
try {
parser = new ExpressionParser(new java.io.FileInputStream(args[0]));
} catch (java.io.FileNotFoundException e) {
- System.out.println("Java Parser Version 1.0.2: File " +
- args[0] + " not found.");
+ System.out.println("Java Parser Version 1.0.2: File " + args[0]
+ + " not found.");
return;
}
} else {
@@ -137,8 +134,7 @@ public class ExpressionParser implements ExpressionParserConstants {
jj_consume_token(-1);
throw new ParseException();
}
- label_1:
- while (true) {
+ label_1: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LBRACKET:
;
@@ -189,8 +185,7 @@ public class ExpressionParser implements ExpressionParserConstants {
StringBuffer sb = new StringBuffer();
jj_consume_token(IDENTIFIER);
sb.append(token);
- label_2:
- while (true) {
+ label_2: while (true) {
if (jj_2_1(2)) {
;
} else {
@@ -198,16 +193,18 @@ public class ExpressionParser implements ExpressionParserConstants {
}
jj_consume_token(DOT);
jj_consume_token(IDENTIFIER);
- sb.append('.'); sb.append(token);
- }
- {if (true) return sb.toString();}
+ sb.append('.');
+ sb.append(token);
+ }
+ if (true) {
+ return sb.toString();
+ }
throw new Error("Missing return statement in function");
}
final public void NameList() throws ParseException {
Name();
- label_3:
- while (true) {
+ label_3: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
;
@@ -261,7 +258,9 @@ public class ExpressionParser implements ExpressionParserConstants {
PrimaryExpression();
AssignmentOperator();
Expression();
- LValue exprVal = pop(); pop().setValue(exprVal); push(exprVal);
+ LValue exprVal = pop();
+ pop().setValue(exprVal);
+ push(exprVal);
}
final public void AssignmentOperator() throws ParseException {
@@ -317,13 +316,18 @@ public class ExpressionParser implements ExpressionParserConstants {
Expression();
jj_consume_token(COLON);
ConditionalExpression();
- LValue falseBranch = pop(); LValue trueBranch = pop();
+ LValue falseBranch = pop();
+ LValue trueBranch = pop();
Value cond = pop().interiorGetValue();
if (cond instanceof BooleanValue) {
- push(((BooleanValue)cond).booleanValue()?
- trueBranch : falseBranch);
+ push(((BooleanValue) cond).booleanValue() ? trueBranch
+ : falseBranch);
} else {
- {if (true) throw new ParseException("Condition must be boolean");}
+ {
+ if (true) {
+ throw new ParseException("Condition must be boolean");
+ }
+ }
}
break;
default:
@@ -334,8 +338,7 @@ public class ExpressionParser implements ExpressionParserConstants {
final public void ConditionalOrExpression() throws ParseException {
ConditionalAndExpression();
- label_4:
- while (true) {
+ label_4: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SC_OR:
;
@@ -346,14 +349,17 @@ public class ExpressionParser implements ExpressionParserConstants {
}
jj_consume_token(SC_OR);
ConditionalAndExpression();
- {if (true) throw new ParseException("operation not yet supported");}
+ {
+ if (true) {
+ throw new ParseException("operation not yet supported");
+ }
+ }
}
}
final public void ConditionalAndExpression() throws ParseException {
InclusiveOrExpression();
- label_5:
- while (true) {
+ label_5: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SC_AND:
;
@@ -364,14 +370,17 @@ public class ExpressionParser implements ExpressionParserConstants {
}
jj_consume_token(SC_AND);
InclusiveOrExpression();
- {if (true) throw new ParseException("operation not yet supported");}
+ {
+ if (true) {
+ throw new ParseException("operation not yet supported");
+ }
+ }
}
}
final public void InclusiveOrExpression() throws ParseException {
ExclusiveOrExpression();
- label_6:
- while (true) {
+ label_6: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case BIT_OR:
;
@@ -382,14 +391,17 @@ public class ExpressionParser implements ExpressionParserConstants {
}
jj_consume_token(BIT_OR);
ExclusiveOrExpression();
- {if (true) throw new ParseException("operation not yet supported");}
+ {
+ if (true) {
+ throw new ParseException("operation not yet supported");
+ }
+ }
}
}
final public void ExclusiveOrExpression() throws ParseException {
AndExpression();
- label_7:
- while (true) {
+ label_7: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case XOR:
;
@@ -400,14 +412,17 @@ public class ExpressionParser implements ExpressionParserConstants {
}
jj_consume_token(XOR);
AndExpression();
- {if (true) throw new ParseException("operation not yet supported");}
+ {
+ if (true) {
+ throw new ParseException("operation not yet supported");
+ }
+ }
}
}
final public void AndExpression() throws ParseException {
EqualityExpression();
- label_8:
- while (true) {
+ label_8: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case BIT_AND:
;
@@ -418,15 +433,18 @@ public class ExpressionParser implements ExpressionParserConstants {
}
jj_consume_token(BIT_AND);
EqualityExpression();
- {if (true) throw new ParseException("operation not yet supported");}
+ {
+ if (true) {
+ throw new ParseException("operation not yet supported");
+ }
+ }
}
}
final public void EqualityExpression() throws ParseException {
Token tok;
InstanceOfExpression();
- label_9:
- while (true) {
+ label_9: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case EQ:
case NE:
@@ -460,7 +478,11 @@ public class ExpressionParser implements ExpressionParserConstants {
case INSTANCEOF:
jj_consume_token(INSTANCEOF);
Type();
- {if (true) throw new ParseException("operation not yet supported");}
+ {
+ if (true) {
+ throw new ParseException("operation not yet supported");
+ }
+ }
break;
default:
jj_la1[14] = jj_gen;
@@ -471,8 +493,7 @@ public class ExpressionParser implements ExpressionParserConstants {
final public void RelationalExpression() throws ParseException {
Token tok;
ShiftExpression();
- label_10:
- while (true) {
+ label_10: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case GT:
case LT:
@@ -510,8 +531,7 @@ public class ExpressionParser implements ExpressionParserConstants {
final public void ShiftExpression() throws ParseException {
AdditiveExpression();
- label_11:
- while (true) {
+ label_11: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LSHIFT:
case RSIGNEDSHIFT:
@@ -538,15 +558,18 @@ public class ExpressionParser implements ExpressionParserConstants {
throw new ParseException();
}
AdditiveExpression();
- {if (true) throw new ParseException("operation not yet supported");}
+ {
+ if (true) {
+ throw new ParseException("operation not yet supported");
+ }
+ }
}
}
final public void AdditiveExpression() throws ParseException {
Token tok;
MultiplicativeExpression();
- label_12:
- while (true) {
+ label_12: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case PLUS:
case MINUS:
@@ -577,8 +600,7 @@ public class ExpressionParser implements ExpressionParserConstants {
final public void MultiplicativeExpression() throws ParseException {
Token tok;
UnaryExpression();
- label_13:
- while (true) {
+ label_13: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case STAR:
case SLASH:
@@ -627,7 +649,11 @@ public class ExpressionParser implements ExpressionParserConstants {
throw new ParseException();
}
UnaryExpression();
- {if (true) throw new ParseException("operation not yet supported");}
+ {
+ if (true) {
+ throw new ParseException("operation not yet supported");
+ }
+ }
break;
case INCR:
PreIncrementExpression();
@@ -661,13 +687,21 @@ public class ExpressionParser implements ExpressionParserConstants {
final public void PreIncrementExpression() throws ParseException {
jj_consume_token(INCR);
PrimaryExpression();
- {if (true) throw new ParseException("operation not yet supported");}
+ {
+ if (true) {
+ throw new ParseException("operation not yet supported");
+ }
+ }
}
final public void PreDecrementExpression() throws ParseException {
jj_consume_token(DECR);
PrimaryExpression();
- {if (true) throw new ParseException("operation not yet supported");}
+ {
+ if (true) {
+ throw new ParseException("operation not yet supported");
+ }
+ }
}
final public void UnaryExpressionNotPlusMinus() throws ParseException {
@@ -687,7 +721,11 @@ public class ExpressionParser implements ExpressionParserConstants {
throw new ParseException();
}
UnaryExpression();
- {if (true) throw new ParseException("operation not yet supported");}
+ {
+ if (true) {
+ throw new ParseException("operation not yet supported");
+ }
+ }
break;
default:
jj_la1[26] = jj_gen;
@@ -718,8 +756,10 @@ public class ExpressionParser implements ExpressionParserConstants {
}
}
-// This production is to determine lookahead only. The LOOKAHEAD specifications
-// below are not used, but they are there just to indicate that we know about
+ // This production is to determine lookahead only. The LOOKAHEAD
+ // specifications
+ // below are not used, but they are there just to indicate that we know
+ // about
// this.
final public void CastLookahead() throws ParseException {
if (jj_2_4(2)) {
@@ -792,7 +832,11 @@ public class ExpressionParser implements ExpressionParserConstants {
break;
case DECR:
jj_consume_token(DECR);
- {if (true) throw new ParseException("operation not yet supported");}
+ {
+ if (true) {
+ throw new ParseException("operation not yet supported");
+ }
+ }
break;
default:
jj_la1[30] = jj_gen;
@@ -810,8 +854,7 @@ public class ExpressionParser implements ExpressionParserConstants {
if (jj_2_6(2)) {
jj_consume_token(LPAREN);
PrimitiveType();
- label_14:
- while (true) {
+ label_14: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LBRACKET:
;
@@ -830,8 +873,7 @@ public class ExpressionParser implements ExpressionParserConstants {
case LPAREN:
jj_consume_token(LPAREN);
Name();
- label_15:
- while (true) {
+ label_15: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LBRACKET:
;
@@ -856,8 +898,7 @@ public class ExpressionParser implements ExpressionParserConstants {
final public void PrimaryExpression() throws ParseException {
PrimaryPrefix();
- label_16:
- while (true) {
+ label_16: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LPAREN:
case LBRACKET:
@@ -896,7 +937,11 @@ public class ExpressionParser implements ExpressionParserConstants {
jj_consume_token(SUPER);
jj_consume_token(DOT);
jj_consume_token(IDENTIFIER);
- {if (true) throw new ParseException("operation not yet supported");}
+ {
+ if (true) {
+ throw new ParseException("operation not yet supported");
+ }
+ }
break;
case LPAREN:
jj_consume_token(LPAREN);
@@ -914,7 +959,7 @@ public class ExpressionParser implements ExpressionParserConstants {
}
final public void PrimarySuffix() throws ParseException {
- List argList;
+ List argList;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LBRACKET:
jj_consume_token(LBRACKET);
@@ -992,8 +1037,8 @@ public class ExpressionParser implements ExpressionParserConstants {
jj_consume_token(NULL);
}
- final public List Arguments() throws ParseException {
- List argList = new ArrayList();
+ final public List Arguments() throws ParseException {
+ List argList = new ArrayList();
jj_consume_token(LPAREN);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case FALSE:
@@ -1021,15 +1066,18 @@ public class ExpressionParser implements ExpressionParserConstants {
;
}
jj_consume_token(RPAREN);
- {if (true) return argList;}
+ {
+ if (true) {
+ return argList;
+ }
+ }
throw new Error("Missing return statement in function");
}
- final public void ArgumentList(List argList) throws ParseException {
+ final public void ArgumentList(List argList) throws ParseException {
Expression();
argList.add(pop().interiorGetValue());
- label_17:
- while (true) {
+ label_17: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
;
@@ -1045,7 +1093,8 @@ public class ExpressionParser implements ExpressionParserConstants {
}
final public void AllocationExpression() throws ParseException {
- List argList; String className;
+ List argList;
+ String className;
if (jj_2_7(2)) {
jj_consume_token(NEW);
PrimitiveType();
@@ -1062,7 +1111,11 @@ public class ExpressionParser implements ExpressionParserConstants {
break;
case LBRACKET:
ArrayDimensions();
- {if (true) throw new ParseException("operation not yet supported");}
+ {
+ if (true) {
+ throw new ParseException("operation not yet supported");
+ }
+ }
break;
default:
jj_la1[42] = jj_gen;
@@ -1079,12 +1132,11 @@ public class ExpressionParser implements ExpressionParserConstants {
}
/*
- * The second LOOKAHEAD specification below is to parse to PrimarySuffix
- * if there is an expression between the "[...]".
+ * The second LOOKAHEAD specification below is to parse to PrimarySuffix if
+ * there is an expression between the "[...]".
*/
final public void ArrayDimensions() throws ParseException {
- label_18:
- while (true) {
+ label_18: while (true) {
jj_consume_token(LBRACKET);
Expression();
jj_consume_token(RBRACKET);
@@ -1094,8 +1146,7 @@ public class ExpressionParser implements ExpressionParserConstants {
break label_18;
}
}
- label_19:
- while (true) {
+ label_19: while (true) {
if (jj_2_9(2)) {
;
} else {
@@ -1107,71 +1158,84 @@ public class ExpressionParser implements ExpressionParserConstants {
}
final private boolean jj_2_1(int xla) {
- jj_la = xla; jj_lastpos = jj_scanpos = token;
+ jj_la = xla;
+ jj_lastpos = jj_scanpos = token;
boolean retval = !jj_3_1();
jj_save(0, xla);
return retval;
}
final private boolean jj_2_2(int xla) {
- jj_la = xla; jj_lastpos = jj_scanpos = token;
+ jj_la = xla;
+ jj_lastpos = jj_scanpos = token;
boolean retval = !jj_3_2();
jj_save(1, xla);
return retval;
}
final private boolean jj_2_3(int xla) {
- jj_la = xla; jj_lastpos = jj_scanpos = token;
+ jj_la = xla;
+ jj_lastpos = jj_scanpos = token;
boolean retval = !jj_3_3();
jj_save(2, xla);
return retval;
}
final private boolean jj_2_4(int xla) {
- jj_la = xla; jj_lastpos = jj_scanpos = token;
+ jj_la = xla;
+ jj_lastpos = jj_scanpos = token;
boolean retval = !jj_3_4();
jj_save(3, xla);
return retval;
}
final private boolean jj_2_5(int xla) {
- jj_la = xla; jj_lastpos = jj_scanpos = token;
+ jj_la = xla;
+ jj_lastpos = jj_scanpos = token;
boolean retval = !jj_3_5();
jj_save(4, xla);
return retval;
}
final private boolean jj_2_6(int xla) {
- jj_la = xla; jj_lastpos = jj_scanpos = token;
+ jj_la = xla;
+ jj_lastpos = jj_scanpos = token;
boolean retval = !jj_3_6();
jj_save(5, xla);
return retval;
}
final private boolean jj_2_7(int xla) {
- jj_la = xla; jj_lastpos = jj_scanpos = token;
+ jj_la = xla;
+ jj_lastpos = jj_scanpos = token;
boolean retval = !jj_3_7();
jj_save(6, xla);
return retval;
}
final private boolean jj_2_8(int xla) {
- jj_la = xla; jj_lastpos = jj_scanpos = token;
+ jj_la = xla;
+ jj_lastpos = jj_scanpos = token;
boolean retval = !jj_3_8();
jj_save(7, xla);
return retval;
}
final private boolean jj_2_9(int xla) {
- jj_la = xla; jj_lastpos = jj_scanpos = token;
+ jj_la = xla;
+ jj_lastpos = jj_scanpos = token;
boolean retval = !jj_3_9();
jj_save(8, xla);
return retval;
}
final private boolean jj_3R_154() {
- if (jj_scan_token(INCR)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(INCR)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1180,9 +1244,15 @@ public class ExpressionParser implements ExpressionParserConstants {
xsp = jj_scanpos;
if (jj_3R_154()) {
jj_scanpos = xsp;
- if (jj_3R_155()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_155()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1191,27 +1261,54 @@ public class ExpressionParser implements ExpressionParserConstants {
xsp = jj_scanpos;
if (jj_3_6()) {
jj_scanpos = xsp;
- if (jj_3R_150()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_150()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3_6() {
- if (jj_scan_token(LPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_23()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LPAREN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_23()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_152()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- }
- if (jj_scan_token(RPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_115()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_152()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ }
+ if (jj_scan_token(RPAREN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_115()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1220,45 +1317,86 @@ public class ExpressionParser implements ExpressionParserConstants {
xsp = jj_scanpos;
if (jj_3R_50()) {
jj_scanpos = xsp;
- if (jj_3R_51()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_51()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_50() {
- if (jj_3R_67()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_67()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3_5() {
- if (jj_scan_token(LPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_24()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(LBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LPAREN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_24()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(LBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_149() {
- if (jj_3R_20()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_20()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_151()) jj_scanpos = xsp;
- else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_151()) {
+ jj_scanpos = xsp;
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_41() {
- if (jj_scan_token(LPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_24()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(RPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LPAREN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_24()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(RPAREN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
xsp = jj_scanpos;
if (jj_3R_59()) {
@@ -1275,51 +1413,109 @@ public class ExpressionParser implements ExpressionParserConstants {
jj_scanpos = xsp;
if (jj_3R_65()) {
jj_scanpos = xsp;
- if (jj_3R_66()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_66()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_40() {
- if (jj_scan_token(LPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_24()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(LBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(RBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LPAREN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_24()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(LBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(RBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_123() {
- if (jj_scan_token(LBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(RBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(RBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3_1() {
- if (jj_scan_token(DOT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(IDENTIFIER)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(DOT)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(IDENTIFIER)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3_4() {
- if (jj_scan_token(LPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_23()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LPAREN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_23()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1330,76 +1526,129 @@ public class ExpressionParser implements ExpressionParserConstants {
jj_scanpos = xsp;
if (jj_3R_40()) {
jj_scanpos = xsp;
- if (jj_3R_41()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_41()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3_3() {
- if (jj_3R_22()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_22()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_24() {
- if (jj_scan_token(IDENTIFIER)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(IDENTIFIER)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3_1()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3_1()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
final private boolean jj_3R_147() {
- if (jj_scan_token(BANG)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(BANG)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_142() {
- if (jj_3R_149()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_149()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_122() {
- if (jj_3R_24()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_24()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_49() {
- if (jj_scan_token(DOUBLE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(DOUBLE)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_141() {
- if (jj_3R_148()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_148()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_48() {
- if (jj_scan_token(FLOAT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(FLOAT)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_146() {
- if (jj_scan_token(TILDE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(TILDE)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_47() {
- if (jj_scan_token(LONG)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LONG)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1408,11 +1657,21 @@ public class ExpressionParser implements ExpressionParserConstants {
xsp = jj_scanpos;
if (jj_3R_146()) {
jj_scanpos = xsp;
- if (jj_3R_147()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_115()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_147()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_115()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1423,48 +1682,84 @@ public class ExpressionParser implements ExpressionParserConstants {
jj_scanpos = xsp;
if (jj_3R_141()) {
jj_scanpos = xsp;
- if (jj_3R_142()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_142()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_46() {
- if (jj_scan_token(INT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(INT)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_145() {
- if (jj_scan_token(REM)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(REM)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_45() {
- if (jj_scan_token(SHORT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(SHORT)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_44() {
- if (jj_scan_token(BYTE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(BYTE)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_135() {
- if (jj_scan_token(DECR)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_20()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(DECR)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_20()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_43() {
- if (jj_scan_token(CHAR)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(CHAR)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1485,49 +1780,95 @@ public class ExpressionParser implements ExpressionParserConstants {
jj_scanpos = xsp;
if (jj_3R_48()) {
jj_scanpos = xsp;
- if (jj_3R_49()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_49()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_42() {
- if (jj_scan_token(BOOLEAN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(BOOLEAN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3_9() {
- if (jj_scan_token(LBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(RBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(RBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_121() {
- if (jj_3R_23()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_23()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_144() {
- if (jj_scan_token(SLASH)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(SLASH)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_134() {
- if (jj_scan_token(INCR)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_20()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(INCR)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_20()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1536,62 +1877,105 @@ public class ExpressionParser implements ExpressionParserConstants {
xsp = jj_scanpos;
if (jj_3R_121()) {
jj_scanpos = xsp;
- if (jj_3R_122()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_122()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
while (true) {
xsp = jj_scanpos;
- if (jj_3R_123()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_123()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
final private boolean jj_3R_120() {
- if (jj_scan_token(GE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(GE)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_133() {
- if (jj_scan_token(MINUS)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(MINUS)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_127() {
- if (jj_3R_136()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_136()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_126() {
- if (jj_3R_135()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_135()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_139() {
- if (jj_scan_token(MINUS)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(MINUS)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_125() {
- if (jj_3R_134()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_134()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_132() {
- if (jj_scan_token(PLUS)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(PLUS)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_143() {
- if (jj_scan_token(STAR)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(STAR)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1600,11 +1984,21 @@ public class ExpressionParser implements ExpressionParserConstants {
xsp = jj_scanpos;
if (jj_3R_132()) {
jj_scanpos = xsp;
- if (jj_3R_133()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_115()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_133()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_115()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1617,11 +2011,21 @@ public class ExpressionParser implements ExpressionParserConstants {
jj_scanpos = xsp;
if (jj_3R_126()) {
jj_scanpos = xsp;
- if (jj_3R_127()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_127()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1632,54 +2036,95 @@ public class ExpressionParser implements ExpressionParserConstants {
jj_scanpos = xsp;
if (jj_3R_144()) {
jj_scanpos = xsp;
- if (jj_3R_145()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_115()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_145()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_115()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_131() {
- if (jj_scan_token(RUNSIGNEDSHIFT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(RUNSIGNEDSHIFT)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_119() {
- if (jj_scan_token(LE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LE)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_138() {
- if (jj_scan_token(PLUS)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(PLUS)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_112() {
- if (jj_3R_115()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_115()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_137()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_137()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
final private boolean jj_3R_88() {
- if (jj_3R_86()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_86()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_130() {
- if (jj_scan_token(RSIGNEDSHIFT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(RSIGNEDSHIFT)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1688,29 +2133,51 @@ public class ExpressionParser implements ExpressionParserConstants {
xsp = jj_scanpos;
if (jj_3R_138()) {
jj_scanpos = xsp;
- if (jj_3R_139()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_112()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_139()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_112()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_87() {
- if (jj_3R_82()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_82()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_118() {
- if (jj_scan_token(GT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(GT)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_129() {
- if (jj_scan_token(LSHIFT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LSHIFT)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1721,68 +2188,128 @@ public class ExpressionParser implements ExpressionParserConstants {
jj_scanpos = xsp;
if (jj_3R_130()) {
jj_scanpos = xsp;
- if (jj_3R_131()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_108()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_131()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_108()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_108() {
- if (jj_3R_112()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_112()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_128()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_128()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
final private boolean jj_3_8() {
- if (jj_scan_token(LBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_25()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(RBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_25()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(RBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_86() {
Token xsp;
- if (jj_3_8()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3_8()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
while (true) {
xsp = jj_scanpos;
- if (jj_3_8()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3_8()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
while (true) {
xsp = jj_scanpos;
- if (jj_3_9()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3_9()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
final private boolean jj_3R_117() {
- if (jj_scan_token(LT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LT)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_106() {
- if (jj_3R_108()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_108()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_116()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_116()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
@@ -1796,64 +2323,125 @@ public class ExpressionParser implements ExpressionParserConstants {
jj_scanpos = xsp;
if (jj_3R_119()) {
jj_scanpos = xsp;
- if (jj_3R_120()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_106()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_120()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_106()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_111() {
- if (jj_scan_token(NE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(NE)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_109() {
- if (jj_scan_token(INSTANCEOF)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_114()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(INSTANCEOF)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_114()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_104() {
- if (jj_3R_106()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_106()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_113()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_113()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
final private boolean jj_3R_81() {
- if (jj_scan_token(NEW)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_24()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(NEW)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_24()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
xsp = jj_scanpos;
if (jj_3R_87()) {
jj_scanpos = xsp;
- if (jj_3R_88()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_88()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3_7() {
- if (jj_scan_token(NEW)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_23()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_86()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(NEW)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_23()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_86()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1862,39 +2450,68 @@ public class ExpressionParser implements ExpressionParserConstants {
xsp = jj_scanpos;
if (jj_3_7()) {
jj_scanpos = xsp;
- if (jj_3R_81()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_81()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_97() {
- if (jj_scan_token(COMMA)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_25()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(COMMA)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_25()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_39() {
- if (jj_scan_token(ORASSIGN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(ORASSIGN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_110() {
- if (jj_scan_token(EQ)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(EQ)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_102() {
- if (jj_3R_104()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_104()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_109()) jj_scanpos = xsp;
- else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_109()) {
+ jj_scanpos = xsp;
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1903,117 +2520,209 @@ public class ExpressionParser implements ExpressionParserConstants {
xsp = jj_scanpos;
if (jj_3R_110()) {
jj_scanpos = xsp;
- if (jj_3R_111()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_102()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_111()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_102()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_94() {
- if (jj_3R_25()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_25()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_97()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_97()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
final private boolean jj_3R_89() {
- if (jj_3R_94()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_94()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_38() {
- if (jj_scan_token(XORASSIGN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(XORASSIGN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_82() {
- if (jj_scan_token(LPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LPAREN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_89()) jj_scanpos = xsp;
- else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(RPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_89()) {
+ jj_scanpos = xsp;
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(RPAREN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_105() {
- if (jj_scan_token(BIT_AND)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_100()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(BIT_AND)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_100()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_100() {
- if (jj_3R_102()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_102()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_107()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_107()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
final private boolean jj_3R_37() {
- if (jj_scan_token(ANDASSIGN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(ANDASSIGN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_85() {
- if (jj_scan_token(NULL)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(NULL)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_103() {
- if (jj_scan_token(XOR)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_98()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(XOR)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_98()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_98() {
- if (jj_3R_100()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_100()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_105()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_105()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
final private boolean jj_3R_92() {
- if (jj_scan_token(FALSE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(FALSE)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_36() {
- if (jj_scan_token(RUNSIGNEDSHIFTASSIGN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(RUNSIGNEDSHIFTASSIGN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_91() {
- if (jj_scan_token(TRUE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(TRUE)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -2022,109 +2731,189 @@ public class ExpressionParser implements ExpressionParserConstants {
xsp = jj_scanpos;
if (jj_3R_91()) {
jj_scanpos = xsp;
- if (jj_3R_92()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_92()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_101() {
- if (jj_scan_token(BIT_OR)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_95()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(BIT_OR)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_95()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_95() {
- if (jj_3R_98()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_98()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_103()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_103()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
final private boolean jj_3R_35() {
- if (jj_scan_token(RSIGNEDSHIFTASSIGN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(RSIGNEDSHIFTASSIGN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_80() {
- if (jj_3R_85()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_85()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_66() {
- if (jj_3R_69()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_69()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_79() {
- if (jj_3R_84()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_84()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_78() {
- if (jj_scan_token(STRING_LITERAL)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(STRING_LITERAL)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_99() {
- if (jj_scan_token(SC_AND)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_90()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(SC_AND)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_90()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_90() {
- if (jj_3R_95()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_95()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_101()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_101()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
final private boolean jj_3R_34() {
- if (jj_scan_token(LSHIFTASSIGN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LSHIFTASSIGN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_65() {
- if (jj_scan_token(NEW)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(NEW)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_77() {
- if (jj_scan_token(CHARACTER_LITERAL)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(CHARACTER_LITERAL)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_76() {
- if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(FLOATING_POINT_LITERAL)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_33() {
- if (jj_scan_token(MINUSASSIGN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(MINUSASSIGN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -2141,89 +2930,161 @@ public class ExpressionParser implements ExpressionParserConstants {
jj_scanpos = xsp;
if (jj_3R_79()) {
jj_scanpos = xsp;
- if (jj_3R_80()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_80()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_75() {
- if (jj_scan_token(INTEGER_LITERAL)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(INTEGER_LITERAL)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_96() {
- if (jj_scan_token(SC_OR)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_83()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(SC_OR)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_83()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_83() {
- if (jj_3R_90()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_90()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_99()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_99()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
final private boolean jj_3R_64() {
- if (jj_scan_token(SUPER)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(SUPER)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_32() {
- if (jj_scan_token(PLUSASSIGN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(PLUSASSIGN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_73() {
- if (jj_3R_82()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_82()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_72() {
- if (jj_scan_token(DOT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(IDENTIFIER)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(DOT)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(IDENTIFIER)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_74() {
- if (jj_3R_83()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_83()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_96()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_96()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
final private boolean jj_3R_63() {
- if (jj_scan_token(THIS)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(THIS)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_31() {
- if (jj_scan_token(REMASSIGN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(REMASSIGN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -2234,120 +3095,231 @@ public class ExpressionParser implements ExpressionParserConstants {
jj_scanpos = xsp;
if (jj_3R_72()) {
jj_scanpos = xsp;
- if (jj_3R_73()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_73()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_71() {
- if (jj_scan_token(LBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_25()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(RBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_25()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(RBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_93() {
- if (jj_scan_token(HOOK)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_25()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(COLON)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_68()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(HOOK)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_25()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(COLON)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_68()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_57() {
- if (jj_3R_70()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_70()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_30() {
- if (jj_scan_token(SLASHASSIGN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(SLASHASSIGN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_27() {
- if (jj_3R_58()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_58()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_56() {
- if (jj_scan_token(LPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_25()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(RPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LPAREN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_25()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(RPAREN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_152() {
- if (jj_scan_token(LBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(RBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(RBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_55() {
- if (jj_scan_token(SUPER)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(DOT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(IDENTIFIER)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(SUPER)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(DOT)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(IDENTIFIER)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_29() {
- if (jj_scan_token(STARASSIGN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(STARASSIGN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_68() {
- if (jj_3R_74()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_74()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_93()) jj_scanpos = xsp;
- else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_93()) {
+ jj_scanpos = xsp;
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_54() {
- if (jj_scan_token(THIS)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(THIS)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_62() {
- if (jj_scan_token(IDENTIFIER)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(IDENTIFIER)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_53() {
- if (jj_3R_24()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_24()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_153() {
- if (jj_scan_token(LBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(RBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(RBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -2364,19 +3336,37 @@ public class ExpressionParser implements ExpressionParserConstants {
jj_scanpos = xsp;
if (jj_3R_56()) {
jj_scanpos = xsp;
- if (jj_3R_57()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_57()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_52() {
- if (jj_3R_69()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_69()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -2405,103 +3395,206 @@ public class ExpressionParser implements ExpressionParserConstants {
jj_scanpos = xsp;
if (jj_3R_38()) {
jj_scanpos = xsp;
- if (jj_3R_39()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_39()) {
+ return true;
+ }
+ if (jj_la == 0
+ && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0
+ && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0
+ && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_28() {
- if (jj_scan_token(ASSIGN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(ASSIGN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_61() {
- if (jj_scan_token(LPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LPAREN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3_2() {
- if (jj_3R_20()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_21()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_20()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_21()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_20() {
- if (jj_3R_26()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_26()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_27()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_27()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
final private boolean jj_3R_60() {
- if (jj_scan_token(BANG)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(BANG)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_155() {
- if (jj_scan_token(DECR)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(DECR)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_67() {
- if (jj_3R_20()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_21()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_25()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_20()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_21()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_25()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_150() {
- if (jj_scan_token(LPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_24()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LPAREN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_24()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_153()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- }
- if (jj_scan_token(RPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_136()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_153()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ }
+ if (jj_scan_token(RPAREN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_136()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_59() {
- if (jj_scan_token(TILDE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(TILDE)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_51() {
- if (jj_3R_68()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_68()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -2512,13 +3605,28 @@ public class ExpressionParser implements ExpressionParserConstants {
private Token jj_scanpos, jj_lastpos;
private int jj_la;
public boolean lookingAhead = false;
- private boolean jj_semLA;
private int jj_gen;
final private int[] jj_la1 = new int[44];
- final private int[] jj_la1_0 = {0x8209400,0x0,0x8209400,0x0,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x1000000,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x1000000,0x1000000,0x1000000,0x0,0x0,0x0,};
- final private int[] jj_la1_1 = {0x2014,0x0,0x2014,0x0,0x884480c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x884480c0,0x0,0x0,0x884480c0,0x884480c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x884480c0,0x0,0x88400080,0x400000,0x884480c0,0x0,0x0,0x40,};
- final private int[] jj_la1_2 = {0x8,0x400,0x0,0x2000,0xf00c004e,0x8000,0x100000,0x4000000,0x8000000,0x0,0x0,0x0,0x2400000,0x2400000,0x0,0x1830000,0x1830000,0x0,0x0,0xc0000000,0xc0000000,0x0,0x0,0xc0000000,0xf00c004e,0xc0000,0xc0000,0x4e,0xc004e,0x40,0x30000000,0x30000000,0x400,0x400,0x40,0x4440,0x4e,0x4440,0x6,0x0,0xf00c004e,0x2000,0x440,0x0,};
- final private int[] jj_la1_3 = {0x0,0x0,0x0,0x0,0x0,0xffe00,0x0,0x0,0x0,0x8,0x10,0x4,0x0,0x0,0x0,0x0,0x0,0x1c0,0x1c0,0x0,0x0,0x23,0x23,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+ final private int[] jj_la1_0 = { 0x8209400, 0x0, 0x8209400, 0x0, 0x1000000,
+ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+ 0x0, 0x0, 0x0, 0x0, 0x0, 0x1000000, 0x0, 0x0, 0x1000000, 0x1000000,
+ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1000000, 0x0, 0x1000000,
+ 0x1000000, 0x1000000, 0x0, 0x0, 0x0, };
+ final private int[] jj_la1_1 = { 0x2014, 0x0, 0x2014, 0x0, 0x884480c0, 0x0,
+ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0,
+ 0x0, 0x0, 0x0, 0x0, 0x884480c0, 0x0, 0x0, 0x884480c0, 0x884480c0, 0x0,
+ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x884480c0, 0x0, 0x88400080, 0x400000,
+ 0x884480c0, 0x0, 0x0, 0x40, };
+ final private int[] jj_la1_2 = { 0x8, 0x400, 0x0, 0x2000, 0xf00c004e,
+ 0x8000, 0x100000, 0x4000000, 0x8000000, 0x0, 0x0, 0x0, 0x2400000,
+ 0x2400000, 0x0, 0x1830000, 0x1830000, 0x0, 0x0, 0xc0000000,
+ 0xc0000000, 0x0, 0x0, 0xc0000000, 0xf00c004e, 0xc0000, 0xc0000, 0x4e,
+ 0xc004e, 0x40, 0x30000000, 0x30000000, 0x400, 0x400, 0x40, 0x4440,
+ 0x4e, 0x4440, 0x6, 0x0, 0xf00c004e, 0x2000, 0x440, 0x0, };
+ final private int[] jj_la1_3 = { 0x0, 0x0, 0x0, 0x0, 0x0, 0xffe00, 0x0, 0x0,
+ 0x0, 0x8, 0x10, 0x4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1c0, 0x1c0, 0x0, 0x0,
+ 0x23, 0x23, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, };
final private JJExpressionParserCalls[] jj_2_rtns = new JJExpressionParserCalls[9];
private boolean jj_rescan = false;
private int jj_gc = 0;
@@ -2529,8 +3637,12 @@ public class ExpressionParser implements ExpressionParserConstants {
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 44; i++) jj_la1[i] = -1;
- for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJExpressionParserCalls();
+ for (int i = 0; i < 44; i++) {
+ jj_la1[i] = -1;
+ }
+ for (int i = 0; i < jj_2_rtns.length; i++) {
+ jj_2_rtns[i] = new JJExpressionParserCalls();
+ }
}
public void ReInit(java.io.InputStream stream) {
@@ -2539,8 +3651,12 @@ public class ExpressionParser implements ExpressionParserConstants {
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 44; i++) jj_la1[i] = -1;
- for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJExpressionParserCalls();
+ for (int i = 0; i < 44; i++) {
+ jj_la1[i] = -1;
+ }
+ for (int i = 0; i < jj_2_rtns.length; i++) {
+ jj_2_rtns[i] = new JJExpressionParserCalls();
+ }
}
public ExpressionParser(ExpressionParserTokenManager tm) {
@@ -2548,8 +3664,12 @@ public class ExpressionParser implements ExpressionParserConstants {
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 44; i++) jj_la1[i] = -1;
- for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJExpressionParserCalls();
+ for (int i = 0; i < 44; i++) {
+ jj_la1[i] = -1;
+ }
+ for (int i = 0; i < jj_2_rtns.length; i++) {
+ jj_2_rtns[i] = new JJExpressionParserCalls();
+ }
}
public void ReInit(ExpressionParserTokenManager tm) {
@@ -2557,23 +3677,32 @@ public class ExpressionParser implements ExpressionParserConstants {
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 44; i++) jj_la1[i] = -1;
- for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJExpressionParserCalls();
+ for (int i = 0; i < 44; i++) {
+ jj_la1[i] = -1;
+ }
+ for (int i = 0; i < jj_2_rtns.length; i++) {
+ jj_2_rtns[i] = new JJExpressionParserCalls();
+ }
}
final private Token jj_consume_token(int kind) throws ParseException {
Token oldToken;
- if ((oldToken = token).next != null) token = token.next;
- else token = token.next = token_source.getNextToken();
+ if ((oldToken = token).next != null) {
+ token = token.next;
+ } else {
+ token = token.next = token_source.getNextToken();
+ }
jj_ntk = -1;
if (token.kind == kind) {
jj_gen++;
if (++jj_gc > 100) {
jj_gc = 0;
- for (int i = 0; i < jj_2_rtns.length; i++) {
- JJExpressionParserCalls c = jj_2_rtns[i];
+ for (JJExpressionParserCalls jj_2_rtn : jj_2_rtns) {
+ JJExpressionParserCalls c = jj_2_rtn;
while (c != null) {
- if (c.gen < jj_gen) c.first = null;
+ if (c.gen < jj_gen) {
+ c.first = null;
+ }
c = c.next;
}
}
@@ -2589,7 +3718,8 @@ public class ExpressionParser implements ExpressionParserConstants {
if (jj_scanpos == jj_lastpos) {
jj_la--;
if (jj_scanpos.next == null) {
- jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.getNextToken();
+ jj_lastpos = jj_scanpos = jj_scanpos.next = token_source
+ .getNextToken();
} else {
jj_lastpos = jj_scanpos = jj_scanpos.next;
}
@@ -2597,16 +3727,25 @@ public class ExpressionParser implements ExpressionParserConstants {
jj_scanpos = jj_scanpos.next;
}
if (jj_rescan) {
- int i = 0; Token tok = token;
- while (tok != null && tok != jj_scanpos) { i++; tok = tok.next; }
- if (tok != null) jj_add_error_token(kind, i);
+ int i = 0;
+ Token tok = token;
+ while (tok != null && tok != jj_scanpos) {
+ i++;
+ tok = tok.next;
+ }
+ if (tok != null) {
+ jj_add_error_token(kind, i);
+ }
}
return (jj_scanpos.kind != kind);
}
final public Token getNextToken() {
- if (token.next != null) token = token.next;
- else token = token.next = token_source.getNextToken();
+ if (token.next != null) {
+ token = token.next;
+ } else {
+ token = token.next = token_source.getNextToken();
+ }
jj_ntk = -1;
jj_gen++;
return token;
@@ -2615,27 +3754,33 @@ public class ExpressionParser implements ExpressionParserConstants {
final public Token getToken(int index) {
Token t = lookingAhead ? jj_scanpos : token;
for (int i = 0; i < index; i++) {
- if (t.next != null) t = t.next;
- else t = t.next = token_source.getNextToken();
+ if (t.next != null) {
+ t = t.next;
+ } else {
+ t = t.next = token_source.getNextToken();
+ }
}
return t;
}
final private int jj_ntk() {
- if ((jj_nt=token.next) == null)
+ if ((jj_nt = token.next) == null) {
return (jj_ntk = (token.next=token_source.getNextToken()).kind);
- else
+ } else {
return (jj_ntk = jj_nt.kind);
}
+ }
- private java.util.Vector jj_expentries = new java.util.Vector();
+ private java.util.Vector jj_expentries = new java.util.Vector();
private int[] jj_expentry;
private int jj_kind = -1;
private int[] jj_lasttokens = new int[100];
private int jj_endpos;
private void jj_add_error_token(int kind, int pos) {
- if (pos >= 100) return;
+ if (pos >= 100) {
+ return;
+ }
if (pos == jj_endpos + 1) {
jj_lasttokens[jj_endpos++] = kind;
} else if (jj_endpos != 0) {
@@ -2644,8 +3789,9 @@ public class ExpressionParser implements ExpressionParserConstants {
jj_expentry[i] = jj_lasttokens[i];
}
boolean exists = false;
- for (java.util.Enumeration enum_ = jj_expentries.elements(); enum_.hasMoreElements();) {
- int[] oldentry = (int[])(enum_.nextElement());
+ for (java.util.Enumeration enum_ = jj_expentries.elements(); enum_
+ .hasMoreElements();) {
+ int[] oldentry = (enum_.nextElement());
if (oldentry.length == jj_expentry.length) {
exists = true;
for (int i = 0; i < jj_expentry.length; i++) {
@@ -2654,11 +3800,17 @@ public class ExpressionParser implements ExpressionParserConstants {
break;
}
}
- if (exists) break;
- }
- }
- if (!exists) jj_expentries.addElement(jj_expentry);
- if (pos != 0) jj_lasttokens[(jj_endpos = pos) - 1] = kind;
+ if (exists) {
+ break;
+ }
+ }
+ }
+ if (!exists) {
+ jj_expentries.addElement(jj_expentry);
+ }
+ if (pos != 0) {
+ jj_lasttokens[(jj_endpos = pos) - 1] = kind;
+ }
}
}
@@ -2702,7 +3854,7 @@ public class ExpressionParser implements ExpressionParserConstants {
jj_add_error_token(0, 0);
int[][] exptokseq = new int[jj_expentries.size()][];
for (int i = 0; i < jj_expentries.size(); i++) {
- exptokseq[i] = (int[])jj_expentries.elementAt(i);
+ exptokseq[i] = jj_expentries.elementAt(i);
}
return new ParseException(token, exptokseq, tokenImage);
}
@@ -2719,17 +3871,36 @@ public class ExpressionParser implements ExpressionParserConstants {
JJExpressionParserCalls p = jj_2_rtns[i];
do {
if (p.gen > jj_gen) {
- jj_la = p.arg; jj_lastpos = jj_scanpos = p.first;
+ jj_la = p.arg;
+ jj_lastpos = jj_scanpos = p.first;
switch (i) {
- case 0: jj_3_1(); break;
- case 1: jj_3_2(); break;
- case 2: jj_3_3(); break;
- case 3: jj_3_4(); break;
- case 4: jj_3_5(); break;
- case 5: jj_3_6(); break;
- case 6: jj_3_7(); break;
- case 7: jj_3_8(); break;
- case 8: jj_3_9(); break;
+ case 0:
+ jj_3_1();
+ break;
+ case 1:
+ jj_3_2();
+ break;
+ case 2:
+ jj_3_3();
+ break;
+ case 3:
+ jj_3_4();
+ break;
+ case 4:
+ jj_3_5();
+ break;
+ case 5:
+ jj_3_6();
+ break;
+ case 6:
+ jj_3_7();
+ break;
+ case 7:
+ jj_3_8();
+ break;
+ case 8:
+ jj_3_9();
+ break;
}
}
p = p.next;
@@ -2741,10 +3912,15 @@ public class ExpressionParser implements ExpressionParserConstants {
final private void jj_save(int index, int xla) {
JJExpressionParserCalls p = jj_2_rtns[index];
while (p.gen > jj_gen) {
- if (p.next == null) { p = p.next = new JJExpressionParserCalls(); break; }
+ if (p.next == null) {
+ p = p.next = new JJExpressionParserCalls();
+ break;
+ }
p = p.next;
}
- p.gen = jj_gen + xla - jj_la; p.first = token; p.arg = xla;
+ p.gen = jj_gen + xla - jj_la;
+ p.first = token;
+ p.arg = xla;
}
}
diff --git a/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParserTokenManager.java b/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParserTokenManager.java
index 28472858050a9f90dfb0276eb5576d23d34f8643..9787d5de554dad69ed24ecd67d18373520ed7a90 100644
--- a/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParserTokenManager.java
+++ b/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParserTokenManager.java
@@ -25,10 +25,6 @@
/* Generated By:JavaCC: Do not edit this line. ExpressionParserTokenManager.java */
package com.sun.tools.example.debug.expr;
-import com.sun.jdi.*;
-import java.util.Stack;
-import java.util.List;
-import java.util.ArrayList;
public class ExpressionParserTokenManager implements ExpressionParserConstants
{
@@ -37,15 +33,17 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
switch (pos)
{
case 0:
- if ((active1 & 0x4000L) != 0L)
+ if ((active1 & 0x4000L) != 0L) {
return 4;
+ }
if ((active0 & 0x7fffffffffffe00L) != 0L)
{
jjmatchedKind = 67;
return 28;
}
- if ((active1 & 0x100200000000L) != 0L)
+ if ((active1 & 0x100200000000L) != 0L) {
return 49;
+ }
return -1;
case 1:
if ((active0 & 0x7ffffffbfcffe00L) != 0L)
@@ -57,8 +55,9 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
}
return 28;
}
- if ((active0 & 0x40300000L) != 0L)
+ if ((active0 & 0x40300000L) != 0L) {
return 28;
+ }
return -1;
case 2:
if ((active0 & 0x77fffb3afeffe00L) != 0L)
@@ -70,8 +69,9 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
}
return 28;
}
- if ((active0 & 0x80004c10000000L) != 0L)
+ if ((active0 & 0x80004c10000000L) != 0L) {
return 28;
+ }
return -1;
case 3:
if ((active0 & 0x63bff2b8faf4e00L) != 0L)
@@ -80,8 +80,9 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
jjmatchedPos = 3;
return 28;
}
- if ((active0 & 0x14400902040b000L) != 0L)
+ if ((active0 & 0x14400902040b000L) != 0L) {
return 28;
+ }
return -1;
case 4:
if ((active0 & 0x2235f2b80ac0600L) != 0L)
@@ -93,8 +94,9 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
}
return 28;
}
- if ((active0 & 0x418a0000f034800L) != 0L)
+ if ((active0 & 0x418a0000f034800L) != 0L) {
return 28;
+ }
return -1;
case 5:
if ((active0 & 0x222070a848c0600L) != 0L)
@@ -103,8 +105,9 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
jjmatchedPos = 5;
return 28;
}
- if ((active0 & 0x11582100200000L) != 0L)
+ if ((active0 & 0x11582100200000L) != 0L) {
return 28;
+ }
return -1;
case 6:
if ((active0 & 0x222040a80040200L) != 0L)
@@ -113,8 +116,9 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
jjmatchedPos = 6;
return 28;
}
- if ((active0 & 0x30004880400L) != 0L)
+ if ((active0 & 0x30004880400L) != 0L) {
return 28;
+ }
return -1;
case 7:
if ((active0 & 0x22040a80000000L) != 0L)
@@ -123,8 +127,9 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
jjmatchedPos = 7;
return 28;
}
- if ((active0 & 0x200000000040200L) != 0L)
+ if ((active0 & 0x200000000040200L) != 0L) {
return 28;
+ }
return -1;
case 8:
if ((active0 & 0x2000280000000L) != 0L)
@@ -133,8 +138,9 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
jjmatchedPos = 8;
return 28;
}
- if ((active0 & 0x20040800000000L) != 0L)
+ if ((active0 & 0x20040800000000L) != 0L) {
return 28;
+ }
return -1;
case 9:
if ((active0 & 0x2000000000000L) != 0L)
@@ -143,8 +149,9 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1)
jjmatchedPos = 9;
return 28;
}
- if ((active0 & 0x280000000L) != 0L)
+ if ((active0 & 0x280000000L) != 0L) {
return 28;
+ }
return -1;
case 10:
if ((active0 & 0x2000000000000L) != 0L)
@@ -286,16 +293,19 @@ private final int jjMoveStringLiteralDfa1_0(long active0, long active1)
switch(curChar)
{
case 38:
- if ((active1 & 0x8000000L) != 0L)
+ if ((active1 & 0x8000000L) != 0L) {
return jjStopAtPos(1, 91);
+ }
break;
case 43:
- if ((active1 & 0x10000000L) != 0L)
+ if ((active1 & 0x10000000L) != 0L) {
return jjStopAtPos(1, 92);
+ }
break;
case 45:
- if ((active1 & 0x20000000L) != 0L)
+ if ((active1 & 0x20000000L) != 0L) {
return jjStopAtPos(1, 93);
+ }
break;
case 60:
if ((active1 & 0x4000000000L) != 0L)
@@ -305,30 +315,31 @@ private final int jjMoveStringLiteralDfa1_0(long active0, long active1)
}
return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x2000000000000L);
case 61:
- if ((active1 & 0x400000L) != 0L)
+ if ((active1 & 0x400000L) != 0L) {
return jjStopAtPos(1, 86);
- else if ((active1 & 0x800000L) != 0L)
+ } else if ((active1 & 0x800000L) != 0L) {
return jjStopAtPos(1, 87);
- else if ((active1 & 0x1000000L) != 0L)
+ } else if ((active1 & 0x1000000L) != 0L) {
return jjStopAtPos(1, 88);
- else if ((active1 & 0x2000000L) != 0L)
+ } else if ((active1 & 0x2000000L) != 0L) {
return jjStopAtPos(1, 89);
- else if ((active1 & 0x20000000000L) != 0L)
+ } else if ((active1 & 0x20000000000L) != 0L) {
return jjStopAtPos(1, 105);
- else if ((active1 & 0x40000000000L) != 0L)
+ } else if ((active1 & 0x40000000000L) != 0L) {
return jjStopAtPos(1, 106);
- else if ((active1 & 0x80000000000L) != 0L)
+ } else if ((active1 & 0x80000000000L) != 0L) {
return jjStopAtPos(1, 107);
- else if ((active1 & 0x100000000000L) != 0L)
+ } else if ((active1 & 0x100000000000L) != 0L) {
return jjStopAtPos(1, 108);
- else if ((active1 & 0x200000000000L) != 0L)
+ } else if ((active1 & 0x200000000000L) != 0L) {
return jjStopAtPos(1, 109);
- else if ((active1 & 0x400000000000L) != 0L)
+ } else if ((active1 & 0x400000000000L) != 0L) {
return jjStopAtPos(1, 110);
- else if ((active1 & 0x800000000000L) != 0L)
+ } else if ((active1 & 0x800000000000L) != 0L) {
return jjStopAtPos(1, 111);
- else if ((active1 & 0x1000000000000L) != 0L)
+ } else if ((active1 & 0x1000000000000L) != 0L) {
return jjStopAtPos(1, 112);
+ }
break;
case 62:
if ((active1 & 0x8000000000L) != 0L)
@@ -344,8 +355,9 @@ private final int jjMoveStringLiteralDfa1_0(long active0, long active1)
case 101:
return jjMoveStringLiteralDfa2_0(active0, 0x104000080000L, active1, 0L);
case 102:
- if ((active0 & 0x40000000L) != 0L)
+ if ((active0 & 0x40000000L) != 0L) {
return jjStartNfaWithStates_0(1, 30, 28);
+ }
break;
case 104:
return jjMoveStringLiteralDfa2_0(active0, 0x41c200000008000L, active1, 0L);
@@ -377,8 +389,9 @@ private final int jjMoveStringLiteralDfa1_0(long active0, long active1)
case 121:
return jjMoveStringLiteralDfa2_0(active0, 0x2000000001000L, active1, 0L);
case 124:
- if ((active1 & 0x4000000L) != 0L)
+ if ((active1 & 0x4000000L) != 0L) {
return jjStopAtPos(1, 90);
+ }
break;
default :
break;
@@ -387,8 +400,9 @@ private final int jjMoveStringLiteralDfa1_0(long active0, long active1)
}
private final int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long active1)
{
- if (((active0 &= old0) | (active1 &= old1)) == 0L)
+ if (((active0 &= old0) | (active1 &= old1)) == 0L) {
return jjStartNfa_0(0, old0, old1);
+ }
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(1, active0, active1);
@@ -397,10 +411,11 @@ private final int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1,
switch(curChar)
{
case 61:
- if ((active1 & 0x2000000000000L) != 0L)
+ if ((active1 & 0x2000000000000L) != 0L) {
return jjStopAtPos(2, 113);
- else if ((active1 & 0x4000000000000L) != 0L)
+ } else if ((active1 & 0x4000000000000L) != 0L) {
return jjStopAtPos(2, 114);
+ }
break;
case 62:
if ((active1 & 0x10000000000L) != 0L)
@@ -430,8 +445,9 @@ private final int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1,
case 112:
return jjMoveStringLiteralDfa3_0(active0, 0x800180000000L, active1, 0L);
case 114:
- if ((active0 & 0x10000000L) != 0L)
+ if ((active0 & 0x10000000L) != 0L) {
return jjStartNfaWithStates_0(2, 28, 28);
+ }
return jjMoveStringLiteralDfa3_0(active0, 0x18000000000000L, active1, 0L);
case 115:
return jjMoveStringLiteralDfa3_0(active0, 0x200402200L, active1, 0L);
@@ -445,12 +461,14 @@ private final int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1,
case 117:
return jjMoveStringLiteralDfa3_0(active0, 0x40000000200000L, active1, 0L);
case 119:
- if ((active0 & 0x4000000000L) != 0L)
+ if ((active0 & 0x4000000000L) != 0L) {
return jjStartNfaWithStates_0(2, 38, 28);
+ }
break;
case 121:
- if ((active0 & 0x80000000000000L) != 0L)
+ if ((active0 & 0x80000000000000L) != 0L) {
return jjStartNfaWithStates_0(2, 55, 28);
+ }
break;
default :
break;
@@ -459,8 +477,9 @@ private final int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1,
}
private final int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long active1)
{
- if (((active0 &= old0) | (active1 &= old1)) == 0L)
+ if (((active0 &= old0) | (active1 &= old1)) == 0L) {
return jjStartNfa_0(1, old0, old1);
+ }
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(2, active0, active1);
@@ -469,8 +488,9 @@ private final int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1,
switch(curChar)
{
case 61:
- if ((active1 & 0x8000000000000L) != 0L)
+ if ((active1 & 0x8000000000000L) != 0L) {
return jjStopAtPos(3, 115);
+ }
break;
case 97:
return jjMoveStringLiteralDfa4_0(active0, 0x20000000e080800L, active1, 0L);
@@ -479,44 +499,51 @@ private final int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1,
case 99:
return jjMoveStringLiteralDfa4_0(active0, 0x2000000004000L, active1, 0L);
case 100:
- if ((active0 & 0x100000000000000L) != 0L)
+ if ((active0 & 0x100000000000000L) != 0L) {
return jjStartNfaWithStates_0(3, 56, 28);
+ }
break;
case 101:
- if ((active0 & 0x1000L) != 0L)
+ if ((active0 & 0x1000L) != 0L) {
return jjStartNfaWithStates_0(3, 12, 28);
- else if ((active0 & 0x2000L) != 0L)
+ } else if ((active0 & 0x2000L) != 0L) {
return jjStartNfaWithStates_0(3, 13, 28);
- else if ((active0 & 0x400000L) != 0L)
+ } else if ((active0 & 0x400000L) != 0L) {
return jjStartNfaWithStates_0(3, 22, 28);
- else if ((active0 & 0x40000000000000L) != 0L)
+ } else if ((active0 & 0x40000000000000L) != 0L) {
return jjStartNfaWithStates_0(3, 54, 28);
+ }
return jjMoveStringLiteralDfa4_0(active0, 0x800800800000L, active1, 0L);
case 103:
- if ((active0 & 0x1000000000L) != 0L)
+ if ((active0 & 0x1000000000L) != 0L) {
return jjStartNfaWithStates_0(3, 36, 28);
+ }
break;
case 105:
return jjMoveStringLiteralDfa4_0(active0, 0x2000000000L, active1, 0L);
case 107:
return jjMoveStringLiteralDfa4_0(active0, 0x10000000000L, active1, 0L);
case 108:
- if ((active0 & 0x8000000000L) != 0L)
+ if ((active0 & 0x8000000000L) != 0L) {
return jjStartNfaWithStates_0(3, 39, 28);
+ }
return jjMoveStringLiteralDfa4_0(active0, 0x400080080000400L, active1, 0L);
case 110:
return jjMoveStringLiteralDfa4_0(active0, 0x20000000000000L, active1, 0L);
case 111:
- if ((active0 & 0x20000000L) != 0L)
+ if ((active0 & 0x20000000L) != 0L) {
return jjStartNfaWithStates_0(3, 29, 28);
+ }
return jjMoveStringLiteralDfa4_0(active0, 0x18000100000000L, active1, 0L);
case 114:
- if ((active0 & 0x8000L) != 0L)
+ if ((active0 & 0x8000L) != 0L) {
return jjStartNfaWithStates_0(3, 15, 28);
+ }
return jjMoveStringLiteralDfa4_0(active0, 0x200000000000L, active1, 0L);
case 115:
- if ((active0 & 0x4000000000000L) != 0L)
+ if ((active0 & 0x4000000000000L) != 0L) {
return jjStartNfaWithStates_0(3, 50, 28);
+ }
return jjMoveStringLiteralDfa4_0(active0, 0x1030000L, active1, 0L);
case 116:
return jjMoveStringLiteralDfa4_0(active0, 0x1440200040200L, active1, 0L);
@@ -531,8 +558,9 @@ private final int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1,
}
private final int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long active1)
{
- if (((active0 &= old0) | (active1 &= old1)) == 0L)
+ if (((active0 &= old0) | (active1 &= old1)) == 0L) {
return jjStartNfa_0(2, old0, old1);
+ }
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(3, active0, 0L);
@@ -545,20 +573,23 @@ private final int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1,
case 99:
return jjMoveStringLiteralDfa5_0(active0, 0x1000000000000L);
case 101:
- if ((active0 & 0x1000000L) != 0L)
+ if ((active0 & 0x1000000L) != 0L) {
return jjStartNfaWithStates_0(4, 24, 28);
- else if ((active0 & 0x400000000000000L) != 0L)
+ } else if ((active0 & 0x400000000000000L) != 0L) {
return jjStartNfaWithStates_0(4, 58, 28);
+ }
return jjMoveStringLiteralDfa5_0(active0, 0x40080000400L);
case 104:
- if ((active0 & 0x4000L) != 0L)
+ if ((active0 & 0x4000L) != 0L) {
return jjStartNfaWithStates_0(4, 14, 28);
+ }
return jjMoveStringLiteralDfa5_0(active0, 0x2000000000000L);
case 105:
return jjMoveStringLiteralDfa5_0(active0, 0x480000040000L);
case 107:
- if ((active0 & 0x800L) != 0L)
+ if ((active0 & 0x800L) != 0L) {
return jjStartNfaWithStates_0(4, 11, 28);
+ }
break;
case 108:
if ((active0 & 0x2000000L) != 0L)
@@ -570,20 +601,23 @@ private final int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1,
case 110:
return jjMoveStringLiteralDfa5_0(active0, 0x800000L);
case 114:
- if ((active0 & 0x800000000000L) != 0L)
+ if ((active0 & 0x800000000000L) != 0L) {
return jjStartNfaWithStates_0(4, 47, 28);
+ }
return jjMoveStringLiteralDfa5_0(active0, 0x100900000200L);
case 115:
- if ((active0 & 0x10000L) != 0L)
+ if ((active0 & 0x10000L) != 0L) {
return jjStartNfaWithStates_0(4, 16, 28);
+ }
return jjMoveStringLiteralDfa5_0(active0, 0x20000000000000L);
case 116:
- if ((active0 & 0x20000L) != 0L)
+ if ((active0 & 0x20000L) != 0L) {
return jjStartNfaWithStates_0(4, 17, 28);
- else if ((active0 & 0x8000000L) != 0L)
+ } else if ((active0 & 0x8000000L) != 0L) {
return jjStartNfaWithStates_0(4, 27, 28);
- else if ((active0 & 0x200000000000L) != 0L)
+ } else if ((active0 & 0x200000000000L) != 0L) {
return jjStartNfaWithStates_0(4, 45, 28);
+ }
return jjMoveStringLiteralDfa5_0(active0, 0x200000000000000L);
case 117:
return jjMoveStringLiteralDfa5_0(active0, 0x80000L);
@@ -603,8 +637,9 @@ private final int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1,
}
private final int jjMoveStringLiteralDfa5_0(long old0, long active0)
{
- if (((active0 &= old0)) == 0L)
+ if (((active0 &= old0)) == 0L) {
return jjStartNfa_0(3, old0, 0L);
+ }
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(4, active0, 0L);
@@ -615,26 +650,29 @@ private final int jjMoveStringLiteralDfa5_0(long old0, long active0)
case 97:
return jjMoveStringLiteralDfa6_0(active0, 0x600L);
case 99:
- if ((active0 & 0x80000000000L) != 0L)
+ if ((active0 & 0x80000000000L) != 0L) {
return jjStartNfaWithStates_0(5, 43, 28);
- else if ((active0 & 0x400000000000L) != 0L)
+ } else if ((active0 & 0x400000000000L) != 0L) {
return jjStartNfaWithStates_0(5, 46, 28);
+ }
return jjMoveStringLiteralDfa6_0(active0, 0x40000000000L);
case 100:
return jjMoveStringLiteralDfa6_0(active0, 0x800000L);
case 101:
- if ((active0 & 0x200000L) != 0L)
+ if ((active0 & 0x200000L) != 0L) {
return jjStartNfaWithStates_0(5, 21, 28);
- else if ((active0 & 0x2000000000L) != 0L)
+ } else if ((active0 & 0x2000000000L) != 0L) {
return jjStartNfaWithStates_0(5, 37, 28);
+ }
break;
case 102:
return jjMoveStringLiteralDfa6_0(active0, 0x800000000L);
case 103:
return jjMoveStringLiteralDfa6_0(active0, 0x10000000000L);
case 104:
- if ((active0 & 0x1000000000000L) != 0L)
+ if ((active0 & 0x1000000000000L) != 0L) {
return jjStartNfaWithStates_0(5, 48, 28);
+ }
break;
case 105:
return jjMoveStringLiteralDfa6_0(active0, 0x220000000000000L);
@@ -643,18 +681,21 @@ private final int jjMoveStringLiteralDfa5_0(long old0, long active0)
case 109:
return jjMoveStringLiteralDfa6_0(active0, 0x80000000L);
case 110:
- if ((active0 & 0x100000000000L) != 0L)
+ if ((active0 & 0x100000000000L) != 0L) {
return jjStartNfaWithStates_0(5, 44, 28);
+ }
return jjMoveStringLiteralDfa6_0(active0, 0x200040000L);
case 114:
return jjMoveStringLiteralDfa6_0(active0, 0x2000000000000L);
case 115:
- if ((active0 & 0x10000000000000L) != 0L)
+ if ((active0 & 0x10000000000000L) != 0L) {
return jjStartNfaWithStates_0(5, 52, 28);
+ }
break;
case 116:
- if ((active0 & 0x100000000L) != 0L)
+ if ((active0 & 0x100000000L) != 0L) {
return jjStartNfaWithStates_0(5, 32, 28);
+ }
return jjMoveStringLiteralDfa6_0(active0, 0x20000000000L);
default :
break;
@@ -663,8 +704,9 @@ private final int jjMoveStringLiteralDfa5_0(long old0, long active0)
}
private final int jjMoveStringLiteralDfa6_0(long old0, long active0)
{
- if (((active0 &= old0)) == 0L)
+ if (((active0 &= old0)) == 0L) {
return jjStartNfa_0(4, old0, 0L);
+ }
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(5, active0, 0L);
@@ -677,32 +719,37 @@ private final int jjMoveStringLiteralDfa6_0(long old0, long active0)
case 99:
return jjMoveStringLiteralDfa7_0(active0, 0x200000200L);
case 101:
- if ((active0 & 0x10000000000L) != 0L)
+ if ((active0 & 0x10000000000L) != 0L) {
return jjStartNfaWithStates_0(6, 40, 28);
- else if ((active0 & 0x20000000000L) != 0L)
+ } else if ((active0 & 0x20000000000L) != 0L) {
return jjStartNfaWithStates_0(6, 41, 28);
+ }
return jjMoveStringLiteralDfa7_0(active0, 0x20000080000000L);
case 108:
return jjMoveStringLiteralDfa7_0(active0, 0x200000000000000L);
case 110:
- if ((active0 & 0x400L) != 0L)
+ if ((active0 & 0x400L) != 0L) {
return jjStartNfaWithStates_0(6, 10, 28);
+ }
break;
case 111:
return jjMoveStringLiteralDfa7_0(active0, 0x2000000000000L);
case 115:
- if ((active0 & 0x800000L) != 0L)
+ if ((active0 & 0x800000L) != 0L) {
return jjStartNfaWithStates_0(6, 23, 28);
+ }
break;
case 116:
- if ((active0 & 0x80000L) != 0L)
+ if ((active0 & 0x80000L) != 0L) {
return jjStartNfaWithStates_0(6, 19, 28);
+ }
return jjMoveStringLiteralDfa7_0(active0, 0x40000000000L);
case 117:
return jjMoveStringLiteralDfa7_0(active0, 0x40000L);
case 121:
- if ((active0 & 0x4000000L) != 0L)
+ if ((active0 & 0x4000000L) != 0L) {
return jjStartNfaWithStates_0(6, 26, 28);
+ }
break;
default :
break;
@@ -711,8 +758,9 @@ private final int jjMoveStringLiteralDfa6_0(long old0, long active0)
}
private final int jjMoveStringLiteralDfa7_0(long old0, long active0)
{
- if (((active0 &= old0)) == 0L)
+ if (((active0 &= old0)) == 0L) {
return jjStartNfa_0(5, old0, 0L);
+ }
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(6, active0, 0L);
@@ -723,16 +771,18 @@ private final int jjMoveStringLiteralDfa7_0(long old0, long active0)
case 99:
return jjMoveStringLiteralDfa8_0(active0, 0x800000000L);
case 101:
- if ((active0 & 0x40000L) != 0L)
+ if ((active0 & 0x40000L) != 0L) {
return jjStartNfaWithStates_0(7, 18, 28);
- else if ((active0 & 0x200000000000000L) != 0L)
+ } else if ((active0 & 0x200000000000000L) != 0L) {
return jjStartNfaWithStates_0(7, 57, 28);
+ }
return jjMoveStringLiteralDfa8_0(active0, 0x40200000000L);
case 110:
return jjMoveStringLiteralDfa8_0(active0, 0x22000080000000L);
case 116:
- if ((active0 & 0x200L) != 0L)
+ if ((active0 & 0x200L) != 0L) {
return jjStartNfaWithStates_0(7, 9, 28);
+ }
break;
default :
break;
@@ -741,8 +791,9 @@ private final int jjMoveStringLiteralDfa7_0(long old0, long active0)
}
private final int jjMoveStringLiteralDfa8_0(long old0, long active0)
{
- if (((active0 &= old0)) == 0L)
+ if (((active0 &= old0)) == 0L) {
return jjStartNfa_0(6, old0, 0L);
+ }
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(7, active0, 0L);
@@ -751,20 +802,23 @@ private final int jjMoveStringLiteralDfa8_0(long old0, long active0)
switch(curChar)
{
case 100:
- if ((active0 & 0x40000000000L) != 0L)
+ if ((active0 & 0x40000000000L) != 0L) {
return jjStartNfaWithStates_0(8, 42, 28);
+ }
break;
case 101:
- if ((active0 & 0x800000000L) != 0L)
+ if ((active0 & 0x800000000L) != 0L) {
return jjStartNfaWithStates_0(8, 35, 28);
+ }
break;
case 105:
return jjMoveStringLiteralDfa9_0(active0, 0x2000000000000L);
case 111:
return jjMoveStringLiteralDfa9_0(active0, 0x200000000L);
case 116:
- if ((active0 & 0x20000000000000L) != 0L)
+ if ((active0 & 0x20000000000000L) != 0L) {
return jjStartNfaWithStates_0(8, 53, 28);
+ }
return jjMoveStringLiteralDfa9_0(active0, 0x80000000L);
default :
break;
@@ -773,8 +827,9 @@ private final int jjMoveStringLiteralDfa8_0(long old0, long active0)
}
private final int jjMoveStringLiteralDfa9_0(long old0, long active0)
{
- if (((active0 &= old0)) == 0L)
+ if (((active0 &= old0)) == 0L) {
return jjStartNfa_0(7, old0, 0L);
+ }
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(8, active0, 0L);
@@ -783,12 +838,14 @@ private final int jjMoveStringLiteralDfa9_0(long old0, long active0)
switch(curChar)
{
case 102:
- if ((active0 & 0x200000000L) != 0L)
+ if ((active0 & 0x200000000L) != 0L) {
return jjStartNfaWithStates_0(9, 33, 28);
+ }
break;
case 115:
- if ((active0 & 0x80000000L) != 0L)
+ if ((active0 & 0x80000000L) != 0L) {
return jjStartNfaWithStates_0(9, 31, 28);
+ }
break;
case 122:
return jjMoveStringLiteralDfa10_0(active0, 0x2000000000000L);
@@ -799,8 +856,9 @@ private final int jjMoveStringLiteralDfa9_0(long old0, long active0)
}
private final int jjMoveStringLiteralDfa10_0(long old0, long active0)
{
- if (((active0 &= old0)) == 0L)
+ if (((active0 &= old0)) == 0L) {
return jjStartNfa_0(8, old0, 0L);
+ }
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(9, active0, 0L);
@@ -817,8 +875,9 @@ private final int jjMoveStringLiteralDfa10_0(long old0, long active0)
}
private final int jjMoveStringLiteralDfa11_0(long old0, long active0)
{
- if (((active0 &= old0)) == 0L)
+ if (((active0 &= old0)) == 0L) {
return jjStartNfa_0(9, old0, 0L);
+ }
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(10, active0, 0L);
@@ -827,8 +886,9 @@ private final int jjMoveStringLiteralDfa11_0(long old0, long active0)
switch(curChar)
{
case 100:
- if ((active0 & 0x2000000000000L) != 0L)
+ if ((active0 & 0x2000000000000L) != 0L) {
return jjStartNfaWithStates_0(11, 49, 28);
+ }
break;
default :
break;
@@ -891,320 +951,395 @@ static final long[] jjbitVec8 = {
};
private final int jjMoveNfa_0(int startState, int curPos)
{
- int[] nextStates;
int startsAt = 0;
jjnewStateCnt = 67;
int i = 1;
jjstateSet[0] = startState;
- int j, kind = 0x7fffffff;
+ int kind = 0x7fffffff;
for (;;)
{
- if (++jjround == 0x7fffffff)
+ if (++jjround == 0x7fffffff) {
ReInitRounds();
+ }
if (curChar < 64)
{
long l = 1L << curChar;
- MatchLoop: do
+ //MatchLoop
+ do
{
switch(jjstateSet[--i])
{
case 0:
- if ((0x3ff000000000000L & l) != 0L)
+ if ((0x3ff000000000000L & l) != 0L) {
jjCheckNAddStates(0, 6);
- else if (curChar == 47)
+ } else if (curChar == 47) {
jjAddStates(7, 9);
- else if (curChar == 36)
+ } else if (curChar == 36)
{
- if (kind > 67)
+ if (kind > 67) {
kind = 67;
+ }
jjCheckNAdd(28);
}
- else if (curChar == 34)
+ else if (curChar == 34) {
jjCheckNAddStates(10, 12);
- else if (curChar == 39)
+ } else if (curChar == 39) {
jjAddStates(13, 14);
- else if (curChar == 46)
+ } else if (curChar == 46) {
jjCheckNAdd(4);
+ }
if ((0x3fe000000000000L & l) != 0L)
{
- if (kind > 59)
+ if (kind > 59) {
kind = 59;
+ }
jjCheckNAddTwoStates(1, 2);
}
else if (curChar == 48)
{
- if (kind > 59)
+ if (kind > 59) {
kind = 59;
+ }
jjCheckNAddStates(15, 17);
}
break;
case 49:
- if (curChar == 42)
+ if (curChar == 42) {
jjCheckNAddTwoStates(62, 63);
- else if (curChar == 47)
+ } else if (curChar == 47) {
jjCheckNAddStates(18, 20);
- if (curChar == 42)
+ }
+ if (curChar == 42) {
jjstateSet[jjnewStateCnt++] = 54;
+ }
break;
case 1:
- if ((0x3ff000000000000L & l) == 0L)
+ if ((0x3ff000000000000L & l) == 0L) {
break;
- if (kind > 59)
+ }
+ if (kind > 59) {
kind = 59;
+ }
jjCheckNAddTwoStates(1, 2);
break;
case 3:
- if (curChar == 46)
+ if (curChar == 46) {
jjCheckNAdd(4);
+ }
break;
case 4:
- if ((0x3ff000000000000L & l) == 0L)
+ if ((0x3ff000000000000L & l) == 0L) {
break;
- if (kind > 63)
+ }
+ if (kind > 63) {
kind = 63;
+ }
jjCheckNAddStates(21, 23);
break;
case 6:
- if ((0x280000000000L & l) != 0L)
+ if ((0x280000000000L & l) != 0L) {
jjCheckNAdd(7);
+ }
break;
case 7:
- if ((0x3ff000000000000L & l) == 0L)
+ if ((0x3ff000000000000L & l) == 0L) {
break;
- if (kind > 63)
+ }
+ if (kind > 63) {
kind = 63;
+ }
jjCheckNAddTwoStates(7, 8);
break;
case 9:
- if (curChar == 39)
+ if (curChar == 39) {
jjAddStates(13, 14);
+ }
break;
case 10:
- if ((0xffffff7fffffdbffL & l) != 0L)
+ if ((0xffffff7fffffdbffL & l) != 0L) {
jjCheckNAdd(11);
+ }
break;
case 11:
- if (curChar == 39 && kind > 65)
+ if (curChar == 39 && kind > 65) {
kind = 65;
+ }
break;
case 13:
- if ((0x8400000000L & l) != 0L)
+ if ((0x8400000000L & l) != 0L) {
jjCheckNAdd(11);
+ }
break;
case 14:
- if ((0xff000000000000L & l) != 0L)
+ if ((0xff000000000000L & l) != 0L) {
jjCheckNAddTwoStates(15, 11);
+ }
break;
case 15:
- if ((0xff000000000000L & l) != 0L)
+ if ((0xff000000000000L & l) != 0L) {
jjCheckNAdd(11);
+ }
break;
case 16:
- if ((0xf000000000000L & l) != 0L)
+ if ((0xf000000000000L & l) != 0L) {
jjstateSet[jjnewStateCnt++] = 17;
+ }
break;
case 17:
- if ((0xff000000000000L & l) != 0L)
+ if ((0xff000000000000L & l) != 0L) {
jjCheckNAdd(15);
+ }
break;
case 18:
- if (curChar == 34)
+ if (curChar == 34) {
jjCheckNAddStates(10, 12);
+ }
break;
case 19:
- if ((0xfffffffbffffdbffL & l) != 0L)
+ if ((0xfffffffbffffdbffL & l) != 0L) {
jjCheckNAddStates(10, 12);
+ }
break;
case 21:
- if ((0x8400000000L & l) != 0L)
+ if ((0x8400000000L & l) != 0L) {
jjCheckNAddStates(10, 12);
+ }
break;
case 22:
- if (curChar == 34 && kind > 66)
+ if (curChar == 34 && kind > 66) {
kind = 66;
+ }
break;
case 23:
- if ((0xff000000000000L & l) != 0L)
+ if ((0xff000000000000L & l) != 0L) {
jjCheckNAddStates(24, 27);
+ }
break;
case 24:
- if ((0xff000000000000L & l) != 0L)
+ if ((0xff000000000000L & l) != 0L) {
jjCheckNAddStates(10, 12);
+ }
break;
case 25:
- if ((0xf000000000000L & l) != 0L)
+ if ((0xf000000000000L & l) != 0L) {
jjstateSet[jjnewStateCnt++] = 26;
+ }
break;
case 26:
- if ((0xff000000000000L & l) != 0L)
+ if ((0xff000000000000L & l) != 0L) {
jjCheckNAdd(24);
+ }
break;
case 27:
- if (curChar != 36)
+ if (curChar != 36) {
break;
- if (kind > 67)
+ }
+ if (kind > 67) {
kind = 67;
+ }
jjCheckNAdd(28);
break;
case 28:
- if ((0x3ff001000000000L & l) == 0L)
+ if ((0x3ff001000000000L & l) == 0L) {
break;
- if (kind > 67)
+ }
+ if (kind > 67) {
kind = 67;
+ }
jjCheckNAdd(28);
break;
case 29:
- if ((0x3ff000000000000L & l) != 0L)
+ if ((0x3ff000000000000L & l) != 0L) {
jjCheckNAddStates(0, 6);
+ }
break;
case 30:
- if ((0x3ff000000000000L & l) != 0L)
+ if ((0x3ff000000000000L & l) != 0L) {
jjCheckNAddTwoStates(30, 31);
+ }
break;
case 31:
- if (curChar != 46)
+ if (curChar != 46) {
break;
- if (kind > 63)
+ }
+ if (kind > 63) {
kind = 63;
+ }
jjCheckNAddStates(28, 30);
break;
case 32:
- if ((0x3ff000000000000L & l) == 0L)
+ if ((0x3ff000000000000L & l) == 0L) {
break;
- if (kind > 63)
+ }
+ if (kind > 63) {
kind = 63;
+ }
jjCheckNAddStates(28, 30);
break;
case 34:
- if ((0x280000000000L & l) != 0L)
+ if ((0x280000000000L & l) != 0L) {
jjCheckNAdd(35);
+ }
break;
case 35:
- if ((0x3ff000000000000L & l) == 0L)
+ if ((0x3ff000000000000L & l) == 0L) {
break;
- if (kind > 63)
+ }
+ if (kind > 63) {
kind = 63;
+ }
jjCheckNAddTwoStates(35, 8);
break;
case 36:
- if ((0x3ff000000000000L & l) != 0L)
+ if ((0x3ff000000000000L & l) != 0L) {
jjCheckNAddTwoStates(36, 37);
+ }
break;
case 38:
- if ((0x280000000000L & l) != 0L)
+ if ((0x280000000000L & l) != 0L) {
jjCheckNAdd(39);
+ }
break;
case 39:
- if ((0x3ff000000000000L & l) == 0L)
+ if ((0x3ff000000000000L & l) == 0L) {
break;
- if (kind > 63)
+ }
+ if (kind > 63) {
kind = 63;
+ }
jjCheckNAddTwoStates(39, 8);
break;
case 40:
- if ((0x3ff000000000000L & l) != 0L)
+ if ((0x3ff000000000000L & l) != 0L) {
jjCheckNAddStates(31, 33);
+ }
break;
case 42:
- if ((0x280000000000L & l) != 0L)
+ if ((0x280000000000L & l) != 0L) {
jjCheckNAdd(43);
+ }
break;
case 43:
- if ((0x3ff000000000000L & l) != 0L)
+ if ((0x3ff000000000000L & l) != 0L) {
jjCheckNAddTwoStates(43, 8);
+ }
break;
case 44:
- if (curChar != 48)
+ if (curChar != 48) {
break;
- if (kind > 59)
+ }
+ if (kind > 59) {
kind = 59;
+ }
jjCheckNAddStates(15, 17);
break;
case 46:
- if ((0x3ff000000000000L & l) == 0L)
+ if ((0x3ff000000000000L & l) == 0L) {
break;
- if (kind > 59)
+ }
+ if (kind > 59) {
kind = 59;
+ }
jjCheckNAddTwoStates(46, 2);
break;
case 47:
- if ((0xff000000000000L & l) == 0L)
+ if ((0xff000000000000L & l) == 0L) {
break;
- if (kind > 59)
+ }
+ if (kind > 59) {
kind = 59;
+ }
jjCheckNAddTwoStates(47, 2);
break;
case 48:
- if (curChar == 47)
+ if (curChar == 47) {
jjAddStates(7, 9);
+ }
break;
case 50:
- if ((0xffffffffffffdbffL & l) != 0L)
+ if ((0xffffffffffffdbffL & l) != 0L) {
jjCheckNAddStates(18, 20);
+ }
break;
case 51:
- if ((0x2400L & l) != 0L && kind > 6)
+ if ((0x2400L & l) != 0L && kind > 6) {
kind = 6;
+ }
break;
case 52:
- if (curChar == 10 && kind > 6)
+ if (curChar == 10 && kind > 6) {
kind = 6;
+ }
break;
case 53:
- if (curChar == 13)
+ if (curChar == 13) {
jjstateSet[jjnewStateCnt++] = 52;
+ }
break;
case 54:
- if (curChar == 42)
+ if (curChar == 42) {
jjCheckNAddTwoStates(55, 56);
+ }
break;
case 55:
- if ((0xfffffbffffffffffL & l) != 0L)
+ if ((0xfffffbffffffffffL & l) != 0L) {
jjCheckNAddTwoStates(55, 56);
+ }
break;
case 56:
- if (curChar == 42)
+ if (curChar == 42) {
jjCheckNAddStates(34, 36);
+ }
break;
case 57:
- if ((0xffff7bffffffffffL & l) != 0L)
+ if ((0xffff7bffffffffffL & l) != 0L) {
jjCheckNAddTwoStates(58, 56);
+ }
break;
case 58:
- if ((0xfffffbffffffffffL & l) != 0L)
+ if ((0xfffffbffffffffffL & l) != 0L) {
jjCheckNAddTwoStates(58, 56);
+ }
break;
case 59:
- if (curChar == 47 && kind > 7)
+ if (curChar == 47 && kind > 7) {
kind = 7;
+ }
break;
case 60:
- if (curChar == 42)
+ if (curChar == 42) {
jjstateSet[jjnewStateCnt++] = 54;
+ }
break;
case 61:
- if (curChar == 42)
+ if (curChar == 42) {
jjCheckNAddTwoStates(62, 63);
+ }
break;
case 62:
- if ((0xfffffbffffffffffL & l) != 0L)
+ if ((0xfffffbffffffffffL & l) != 0L) {
jjCheckNAddTwoStates(62, 63);
+ }
break;
case 63:
- if (curChar == 42)
+ if (curChar == 42) {
jjCheckNAddStates(37, 39);
+ }
break;
case 64:
- if ((0xffff7bffffffffffL & l) != 0L)
+ if ((0xffff7bffffffffffL & l) != 0L) {
jjCheckNAddTwoStates(65, 63);
+ }
break;
case 65:
- if ((0xfffffbffffffffffL & l) != 0L)
+ if ((0xfffffbffffffffffL & l) != 0L) {
jjCheckNAddTwoStates(65, 63);
+ }
break;
case 66:
- if (curChar == 47 && kind > 8)
+ if (curChar == 47 && kind > 8) {
kind = 8;
+ }
break;
default : break;
}
@@ -1213,75 +1348,93 @@ private final int jjMoveNfa_0(int startState, int curPos)
else if (curChar < 128)
{
long l = 1L << (curChar & 077);
- MatchLoop: do
+ //MatchLoop
+ do
{
switch(jjstateSet[--i])
{
case 0:
case 28:
- if ((0x7fffffe87fffffeL & l) == 0L)
+ if ((0x7fffffe87fffffeL & l) == 0L) {
break;
- if (kind > 67)
+ }
+ if (kind > 67) {
kind = 67;
+ }
jjCheckNAdd(28);
break;
case 2:
- if ((0x100000001000L & l) != 0L && kind > 59)
+ if ((0x100000001000L & l) != 0L && kind > 59) {
kind = 59;
+ }
break;
case 5:
- if ((0x2000000020L & l) != 0L)
+ if ((0x2000000020L & l) != 0L) {
jjAddStates(40, 41);
+ }
break;
case 8:
- if ((0x5000000050L & l) != 0L && kind > 63)
+ if ((0x5000000050L & l) != 0L && kind > 63) {
kind = 63;
+ }
break;
case 10:
- if ((0xffffffffefffffffL & l) != 0L)
+ if ((0xffffffffefffffffL & l) != 0L) {
jjCheckNAdd(11);
+ }
break;
case 12:
- if (curChar == 92)
+ if (curChar == 92) {
jjAddStates(42, 44);
+ }
break;
case 13:
- if ((0x14404410000000L & l) != 0L)
+ if ((0x14404410000000L & l) != 0L) {
jjCheckNAdd(11);
+ }
break;
case 19:
- if ((0xffffffffefffffffL & l) != 0L)
+ if ((0xffffffffefffffffL & l) != 0L) {
jjCheckNAddStates(10, 12);
+ }
break;
case 20:
- if (curChar == 92)
+ if (curChar == 92) {
jjAddStates(45, 47);
+ }
break;
case 21:
- if ((0x14404410000000L & l) != 0L)
+ if ((0x14404410000000L & l) != 0L) {
jjCheckNAddStates(10, 12);
+ }
break;
case 33:
- if ((0x2000000020L & l) != 0L)
+ if ((0x2000000020L & l) != 0L) {
jjAddStates(48, 49);
+ }
break;
case 37:
- if ((0x2000000020L & l) != 0L)
+ if ((0x2000000020L & l) != 0L) {
jjAddStates(50, 51);
+ }
break;
case 41:
- if ((0x2000000020L & l) != 0L)
+ if ((0x2000000020L & l) != 0L) {
jjAddStates(52, 53);
+ }
break;
case 45:
- if ((0x100000001000000L & l) != 0L)
+ if ((0x100000001000000L & l) != 0L) {
jjCheckNAdd(46);
+ }
break;
case 46:
- if ((0x7e0000007eL & l) == 0L)
+ if ((0x7e0000007eL & l) == 0L) {
break;
- if (kind > 59)
+ }
+ if (kind > 59) {
kind = 59;
+ }
jjCheckNAddTwoStates(46, 2);
break;
case 50:
@@ -1312,47 +1465,57 @@ private final int jjMoveNfa_0(int startState, int curPos)
long l1 = 1L << (hiByte & 077);
int i2 = (curChar & 0xff) >> 6;
long l2 = 1L << (curChar & 077);
- MatchLoop: do
+ //MatchLoop
+ do
{
switch(jjstateSet[--i])
{
case 0:
case 28:
- if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
+ if (!jjCanMove_1(hiByte, i1, i2, l1, l2)) {
break;
- if (kind > 67)
+ }
+ if (kind > 67) {
kind = 67;
+ }
jjCheckNAdd(28);
break;
case 10:
- if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+ if (jjCanMove_0(hiByte, i1, i2, l1, l2)) {
jjstateSet[jjnewStateCnt++] = 11;
+ }
break;
case 19:
- if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+ if (jjCanMove_0(hiByte, i1, i2, l1, l2)) {
jjAddStates(10, 12);
+ }
break;
case 50:
- if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+ if (jjCanMove_0(hiByte, i1, i2, l1, l2)) {
jjAddStates(18, 20);
+ }
break;
case 55:
- if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+ if (jjCanMove_0(hiByte, i1, i2, l1, l2)) {
jjCheckNAddTwoStates(55, 56);
+ }
break;
case 57:
case 58:
- if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+ if (jjCanMove_0(hiByte, i1, i2, l1, l2)) {
jjCheckNAddTwoStates(58, 56);
+ }
break;
case 62:
- if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+ if (jjCanMove_0(hiByte, i1, i2, l1, l2)) {
jjCheckNAddTwoStates(62, 63);
+ }
break;
case 64:
case 65:
- if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+ if (jjCanMove_0(hiByte, i1, i2, l1, l2)) {
jjCheckNAddTwoStates(65, 63);
+ }
break;
default : break;
}
@@ -1365,8 +1528,9 @@ private final int jjMoveNfa_0(int startState, int curPos)
kind = 0x7fffffff;
}
++curPos;
- if ((i = jjnewStateCnt) == (startsAt = 67 - (jjnewStateCnt = startsAt)))
+ if ((i = jjnewStateCnt) == (startsAt = 67 - (jjnewStateCnt = startsAt))) {
return curPos;
+ }
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) { return curPos; }
}
@@ -1384,8 +1548,9 @@ private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, lo
case 0:
return ((jjbitVec2[i2] & l2) != 0L);
default :
- if ((jjbitVec0[i1] & l1) != 0L)
+ if ((jjbitVec0[i1] & l1) != 0L) {
return true;
+ }
return false;
}
}
@@ -1404,8 +1569,9 @@ private static final boolean jjCanMove_1(int hiByte, int i1, int i2, long l1, lo
case 61:
return ((jjbitVec8[i2] & l2) != 0L);
default :
- if ((jjbitVec3[i1] & l1) != 0L)
+ if ((jjbitVec3[i1] & l1) != 0L) {
return true;
+ }
return false;
}
}
@@ -1449,8 +1615,9 @@ private final int[] jjstateSet = new int[134];
protected char curChar;
public ExpressionParserTokenManager(ASCII_UCodeESC_CharStream stream)
{
- if (ASCII_UCodeESC_CharStream.staticFlag)
+ if (ASCII_UCodeESC_CharStream.staticFlag) {
throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
+ }
input_stream = stream;
}
public ExpressionParserTokenManager(ASCII_UCodeESC_CharStream stream, int lexState)
@@ -1469,9 +1636,10 @@ private final void ReInitRounds()
{
int i;
jjround = 0x80000001;
- for (i = 67; i-- > 0;)
+ for (i = 67; i-- > 0;) {
jjrounds[i] = 0x80000000;
}
+}
public void ReInit(ASCII_UCodeESC_CharStream stream, int lexState)
{
ReInit(stream);
@@ -1479,11 +1647,12 @@ public void ReInit(ASCII_UCodeESC_CharStream stream, int lexState)
}
public void SwitchTo(int lexState)
{
- if (lexState >= 1 || lexState < 0)
+ if (lexState >= 1 || lexState < 0) {
throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
- else
+ } else {
curLexState = lexState;
}
+}
private final Token jjFillToken()
{
@@ -1507,7 +1676,6 @@ int jjmatchedKind;
public final Token getNextToken()
{
- int kind;
Token specialToken = null;
Token matchedToken;
int curPos = 0;
@@ -1528,17 +1696,19 @@ public final Token getNextToken()
}
try {
- while (curChar <= 32 && (0x100003600L & (1L << curChar)) != 0L)
+ while (curChar <= 32 && (0x100003600L & (1L << curChar)) != 0L) {
curChar = input_stream.BeginToken();
}
+ }
catch (java.io.IOException e1) { continue EOFLoop; }
jjmatchedKind = 0x7fffffff;
jjmatchedPos = 0;
curPos = jjMoveStringLiteralDfa0_0();
if (jjmatchedKind != 0x7fffffff)
{
- if (jjmatchedPos + 1 < curPos)
+ if (jjmatchedPos + 1 < curPos) {
input_stream.backup(curPos - jjmatchedPos - 1);
+ }
if ((jjtoToken[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L)
{
matchedToken = jjFillToken();
@@ -1550,9 +1720,9 @@ public final Token getNextToken()
if ((jjtoSpecial[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L)
{
matchedToken = jjFillToken();
- if (specialToken == null)
+ if (specialToken == null) {
specialToken = matchedToken;
- else
+ } else
{
matchedToken.specialToken = specialToken;
specialToken = (specialToken.next = matchedToken);
@@ -1572,9 +1742,9 @@ public final Token getNextToken()
if (curChar == '\n' || curChar == '\r') {
error_line++;
error_column = 0;
- }
- else
+ } else {
error_column++;
+ }
}
if (!EOFSeen) {
input_stream.backup(1);
diff --git a/src/share/classes/com/sun/tools/example/debug/expr/LValue.java b/src/share/classes/com/sun/tools/example/debug/expr/LValue.java
index 5dd8cf43d106036a2db180d20d91aafd9b8fe1eb..42ef2963e0b2e8cbe371504a1da3a71806a65721 100644
--- a/src/share/classes/com/sun/tools/example/debug/expr/LValue.java
+++ b/src/share/classes/com/sun/tools/example/debug/expr/LValue.java
@@ -156,6 +156,7 @@ abstract class LValue {
return new LValueArrayElement(interiorGetValue(), index);
}
+ @Override
public String toString() {
try {
return interiorGetValue().toString();
@@ -419,6 +420,7 @@ abstract class LValue {
this.var = var;
}
+ @Override
Value getValue() {
if (jdiValue == null) {
jdiValue = frame.getValue(var);
@@ -426,12 +428,14 @@ abstract class LValue {
return jdiValue;
}
+ @Override
void setValue0(Value val) throws InvalidTypeException,
ClassNotLoadedException {
frame.setValue(var, val);
jdiValue = val;
}
+ @Override
void invokeWith(List arguments) throws ParseException {
throw new ParseException(var.name() + " is not a method");
}
@@ -469,6 +473,7 @@ abstract class LValue {
}
}
+ @Override
Value getValue() throws InvocationException, InvalidTypeException,
ClassNotLoadedException, IncompatibleThreadStateException,
ParseException {
@@ -485,6 +490,7 @@ abstract class LValue {
}
}
+ @Override
void setValue0(Value val) throws ParseException,
InvalidTypeException,
ClassNotLoadedException {
@@ -495,6 +501,7 @@ abstract class LValue {
jdiValue = val;
}
+ @Override
void invokeWith(List arguments) throws ParseException {
if (matchingMethod != null) {
throw new ParseException("Invalid consecutive invocations");
@@ -531,6 +538,7 @@ abstract class LValue {
}
}
+ @Override
Value getValue() throws InvocationException, InvalidTypeException,
ClassNotLoadedException, IncompatibleThreadStateException,
ParseException {
@@ -548,6 +556,7 @@ abstract class LValue {
}
}
+ @Override
void setValue0(Value val)
throws ParseException, InvalidTypeException,
ClassNotLoadedException {
@@ -562,6 +571,7 @@ abstract class LValue {
jdiValue = val;
}
+ @Override
void invokeWith(List arguments) throws ParseException {
if (matchingMethod != null) {
throw new ParseException("Invalid consecutive invocations");
@@ -589,6 +599,7 @@ abstract class LValue {
this.arrayRef = value;
}
+ @Override
Value getValue() {
if (jdiValue == null) {
jdiValue = arrayRef.virtualMachine().mirrorOf(arrayRef.length());
@@ -596,10 +607,12 @@ abstract class LValue {
return jdiValue;
}
+ @Override
void setValue0(Value value) throws ParseException {
throw new ParseException("Cannot set constant: " + value);
}
+ @Override
void invokeWith(List arguments) throws ParseException {
throw new ParseException("Array element is not a method");
}
@@ -618,6 +631,7 @@ abstract class LValue {
this.index = index;
}
+ @Override
Value getValue() {
if (jdiValue == null) {
jdiValue = array.getValue(index);
@@ -625,12 +639,14 @@ abstract class LValue {
return jdiValue;
}
+ @Override
void setValue0(Value val) throws InvalidTypeException,
ClassNotLoadedException {
array.setValue(index, val);
jdiValue = val;
}
+ @Override
void invokeWith(List arguments) throws ParseException {
throw new ParseException("Array element is not a method");
}
@@ -643,6 +659,7 @@ abstract class LValue {
this.value = value;
}
+ @Override
Value getValue() {
if (jdiValue == null) {
jdiValue = value;
@@ -650,10 +667,12 @@ abstract class LValue {
return jdiValue;
}
+ @Override
void setValue0(Value val) throws ParseException {
throw new ParseException("Cannot set constant: " + value);
}
+ @Override
void invokeWith(List arguments) throws ParseException {
throw new ParseException("Constant is not a method");
}
diff --git a/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java b/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java
index bf615935604775e6a821c9803001bd670c284774..8ee53728f028a1baf60b576250d53d1ce26988c0 100644
--- a/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java
+++ b/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java
@@ -37,6 +37,8 @@ package com.sun.tools.example.debug.expr;
*/
public class ParseException extends Exception {
+ private static final long serialVersionUID = 7978489144303647901L;
+
/**
* This constructor is used by the method "generateParseException"
* in the generated parser. Calling this constructor generates
@@ -119,20 +121,21 @@ public class ParseException extends Exception {
* of the final stack trace, and hence the correct error message
* gets displayed.
*/
+ @Override
public String getMessage() {
if (!specialConstructor) {
return super.getMessage();
}
String expected = "";
int maxSize = 0;
- for (int i = 0; i < expectedTokenSequences.length; i++) {
- if (maxSize < expectedTokenSequences[i].length) {
- maxSize = expectedTokenSequences[i].length;
+ for (int[] expectedTokenSequence : expectedTokenSequences) {
+ if (maxSize < expectedTokenSequence.length) {
+ maxSize = expectedTokenSequence.length;
}
- for (int j = 0; j < expectedTokenSequences[i].length; j++) {
- expected += tokenImage[expectedTokenSequences[i][j]] + " ";
+ for (int j = 0; j < expectedTokenSequence.length; j++) {
+ expected += tokenImage[expectedTokenSequence[j]] + " ";
}
- if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) {
+ if (expectedTokenSequence[expectedTokenSequence.length - 1] != 0) {
expected += "...";
}
expected += eol + " ";
@@ -140,7 +143,9 @@ public class ParseException extends Exception {
String retval = "Encountered \"";
Token tok = currentToken.next;
for (int i = 0; i < maxSize; i++) {
- if (i != 0) retval += " ";
+ if (i != 0) {
+ retval += " ";
+ }
if (tok.kind == 0) {
retval += tokenImage[0];
break;
diff --git a/src/share/classes/com/sun/tools/example/debug/expr/Token.java b/src/share/classes/com/sun/tools/example/debug/expr/Token.java
index ea0a9ef33d728f05120b94005aee184f361065b6..534120014f30ff10097003cc56c1c94bda78fff7 100644
--- a/src/share/classes/com/sun/tools/example/debug/expr/Token.java
+++ b/src/share/classes/com/sun/tools/example/debug/expr/Token.java
@@ -78,6 +78,7 @@ public class Token {
/**
* Returns the image.
*/
+ @Override
public final String toString()
{
return image;
diff --git a/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java b/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java
index 2f4365018feda8c80d8e0de198b3b8a8941be6be..16a40df286e38c035a0c9b63ef3c5b357c3b0f17 100644
--- a/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java
+++ b/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java
@@ -32,6 +32,8 @@ public class TokenMgrError extends Error
* Ordinals for various reasons why an Error of this type can be thrown.
*/
+ private static final long serialVersionUID = -6236440836177601522L;
+
/**
* Lexical error occured.
*/
@@ -136,6 +138,7 @@ public class TokenMgrError extends Error
*
* from this method for such cases in the release version of your parser.
*/
+ @Override
public String getMessage() {
return super.getMessage();
}
diff --git a/src/share/classes/com/sun/tools/example/debug/gui/ApplicationTool.java b/src/share/classes/com/sun/tools/example/debug/gui/ApplicationTool.java
index 8eee7c76418f3731874bd9ad345cf95e79f07ffc..e9a4c0b7808ecf57063c00667dee7f6b898d0714 100644
--- a/src/share/classes/com/sun/tools/example/debug/gui/ApplicationTool.java
+++ b/src/share/classes/com/sun/tools/example/debug/gui/ApplicationTool.java
@@ -29,12 +29,12 @@ import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
-import com.sun.jdi.*;
import com.sun.tools.example.debug.bdi.*;
public class ApplicationTool extends JPanel {
- private Environment env;
+ private static final long serialVersionUID = 310966063293205714L;
+
private ExecutionManager runtime;
private TypeScript script;
@@ -45,13 +45,13 @@ public class ApplicationTool extends JPanel {
super(new BorderLayout());
- this.env = env;
this.runtime = env.getExecutionManager();
this.script = new TypeScript(PROMPT, false); // No implicit echo.
this.add(script);
script.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
runtime.sendLineToApplication(script.readln());
}
diff --git a/src/share/classes/com/sun/tools/example/debug/gui/ClassTreeTool.java b/src/share/classes/com/sun/tools/example/debug/gui/ClassTreeTool.java
index abfc86a810b0db22df8ec686c9cb16e402ccb305..945243458bf5ec831de25aa1577334fb215c7093 100644
--- a/src/share/classes/com/sun/tools/example/debug/gui/ClassTreeTool.java
+++ b/src/share/classes/com/sun/tools/example/debug/gui/ClassTreeTool.java
@@ -25,12 +25,10 @@
package com.sun.tools.example.debug.gui;
-import java.io.*;
import java.util.*;
import javax.swing.*;
import javax.swing.tree.*;
-import javax.swing.event.*;
import java.awt.*;
import java.awt.event.*;
@@ -40,6 +38,8 @@ import com.sun.tools.example.debug.bdi.*;
public class ClassTreeTool extends JPanel {
+ private static final long serialVersionUID = 526178912591739259L;
+
private Environment env;
private ExecutionManager runtime;
@@ -49,7 +49,7 @@ public class ClassTreeTool extends JPanel {
private JTree tree;
private DefaultTreeModel treeModel;
private ClassTreeNode root;
- private SearchPath sourcePath;
+// private SearchPath sourcePath;
private CommandInterpreter interpreter;
@@ -87,6 +87,7 @@ public class ClassTreeTool extends JPanel {
******/
MouseListener ml = new MouseAdapter() {
+ @Override
public void mouseClicked(MouseEvent e) {
int selRow = tree.getRowForLocation(e.getX(), e.getY());
TreePath selPath = tree.getPathForLocation(e.getX(), e.getY());
@@ -121,6 +122,7 @@ public class ClassTreeTool extends JPanel {
// SessionListener
+ @Override
public void sessionStart(EventObject e) {
// Get system classes and any others loaded before attaching.
try {
@@ -134,19 +136,24 @@ public class ClassTreeTool extends JPanel {
}
}
+ @Override
public void sessionInterrupt(EventObject e) {}
+ @Override
public void sessionContinue(EventObject e) {}
// JDIListener
+ @Override
public void classPrepare(ClassPrepareEventSet e) {
root.addClass(e.getReferenceType());
}
+ @Override
public void classUnload(ClassUnloadEventSet e) {
root.removeClass(e.getClassName());
}
+ @Override
public void vmDisconnect(VMDisconnectEventSet e) {
// Clear contents of this view.
root = createClassTree(HEADING);
@@ -169,6 +176,7 @@ public class ClassTreeTool extends JPanel {
this.refTy = refTy;
}
+ @Override
public String toString() {
return name;
}
@@ -185,6 +193,7 @@ public class ClassTreeTool extends JPanel {
return (refTy == null);
}
+ @Override
public boolean isLeaf() {
return !isPackage();
}
diff --git a/src/share/classes/com/sun/tools/example/debug/gui/CommandInterpreter.java b/src/share/classes/com/sun/tools/example/debug/gui/CommandInterpreter.java
index 1ff8163b6832670335d4c7dff332012fe115fd73..97ab320bf8be18a516447928778e63e8f8c35371 100644
--- a/src/share/classes/com/sun/tools/example/debug/gui/CommandInterpreter.java
+++ b/src/share/classes/com/sun/tools/example/debug/gui/CommandInterpreter.java
@@ -29,8 +29,6 @@ import java.io.*;
import java.util.*;
import com.sun.jdi.*;
-import com.sun.jdi.request.*;
-
import com.sun.tools.example.debug.bdi.*;
public class CommandInterpreter {
@@ -93,9 +91,9 @@ public class CommandInterpreter {
try {
ThreadReference[] threads = threads();
long threadID = Long.parseLong(id, 16);
- for (int i = 0; i < threads.length; i++) {
- if (threads[i].uniqueID() == threadID) {
- thread = threads[i];
+ for (ThreadReference thread2 : threads) {
+ if (thread2.uniqueID() == threadID) {
+ thread = thread2;
break;
}
}
@@ -239,16 +237,18 @@ public class CommandInterpreter {
for (int i = 0 ; i < tlist.size() ; i++) {
ThreadReference thr = tlist.get(i);
int len = Utils.description(thr).length();
- if (len > maxId)
+ if (len > maxId) {
maxId = len;
+ }
String name = thr.name();
int iDot = name.lastIndexOf('.');
if (iDot >= 0 && name.length() > iDot) {
name = name.substring(iDot + 1);
}
- if (name.length() > maxName)
+ if (name.length() > maxName) {
maxName = name.length();
}
+ }
String maxNumString = String.valueOf(iThread + tlist.size());
int maxNumDigits = maxNumString.length();
for (int i = 0 ; i < tlist.size() ; i++) {
@@ -616,7 +616,6 @@ public class CommandInterpreter {
int cnt = 1;
if (t.hasMoreTokens()) {
String idToken = t.nextToken();
- int n;
try {
cnt = Integer.valueOf(idToken).intValue();
} catch (NumberFormatException e) {
@@ -885,7 +884,6 @@ public class CommandInterpreter {
}
private void commandStop(StringTokenizer t) throws NoSessionException {
- Location bploc;
String token;
if (!t.hasMoreTokens()) {
diff --git a/src/share/classes/com/sun/tools/example/debug/gui/CommandTool.java b/src/share/classes/com/sun/tools/example/debug/gui/CommandTool.java
index 1f47adfcf97968815b6237e7a7c9c82ed10b1a80..42157e4423edca9f0b7f69c078e5b6ba8377983a 100644
--- a/src/share/classes/com/sun/tools/example/debug/gui/CommandTool.java
+++ b/src/share/classes/com/sun/tools/example/debug/gui/CommandTool.java
@@ -40,6 +40,8 @@ import com.sun.tools.example.debug.event.*;
public class CommandTool extends JPanel {
+ private static final long serialVersionUID = 8613516856378346415L;
+
private Environment env;
private ContextManager context;
@@ -68,6 +70,7 @@ public class CommandTool extends JPanel {
// Establish handler for incoming commands.
script.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
interpreter.executeCommand(script.readln());
}
@@ -107,15 +110,17 @@ public class CommandTool extends JPanel {
// JDIListener
+ @Override
public void accessWatchpoint(AccessWatchpointEventSet e) {
setThread(e);
for (EventIterator it = e.eventIterator(); it.hasNext(); ) {
- Event evt = it.nextEvent();
+ it.nextEvent();
diagnostics.putString("Watchpoint hit: " +
locationString(e));
}
}
+ @Override
public void classPrepare(ClassPrepareEventSet e) {
if (context.getVerboseFlag()) {
String name = e.getReferenceType().name();
@@ -123,6 +128,7 @@ public class CommandTool extends JPanel {
}
}
+ @Override
public void classUnload(ClassUnloadEventSet e) {
if (context.getVerboseFlag()) {
diagnostics.putString("Class " + e.getClassName() +
@@ -130,12 +136,14 @@ public class CommandTool extends JPanel {
}
}
+ @Override
public void exception(ExceptionEventSet e) {
setThread(e);
String name = e.getException().referenceType().name();
diagnostics.putString("Exception: " + name);
}
+ @Override
public void locationTrigger(LocationTriggerEventSet e) {
String locString = locationString(e);
setThread(e);
@@ -155,15 +163,17 @@ public class CommandTool extends JPanel {
}
}
+ @Override
public void modificationWatchpoint(ModificationWatchpointEventSet e) {
setThread(e);
for (EventIterator it = e.eventIterator(); it.hasNext(); ) {
- Event evt = it.nextEvent();
+ it.nextEvent();
diagnostics.putString("Watchpoint hit: " +
locationString(e));
}
}
+ @Override
public void threadDeath(ThreadDeathEventSet e) {
if (context.getVerboseFlag()) {
diagnostics.putString("Thread " + e.getThread() +
@@ -171,6 +181,7 @@ public class CommandTool extends JPanel {
}
}
+ @Override
public void threadStart(ThreadStartEventSet e) {
if (context.getVerboseFlag()) {
diagnostics.putString("Thread " + e.getThread() +
@@ -178,16 +189,19 @@ public class CommandTool extends JPanel {
}
}
+ @Override
public void vmDeath(VMDeathEventSet e) {
script.setPrompt(DEFAULT_CMD_PROMPT);
diagnostics.putString("VM exited");
}
+ @Override
public void vmDisconnect(VMDisconnectEventSet e) {
script.setPrompt(DEFAULT_CMD_PROMPT);
diagnostics.putString("Disconnected from VM");
}
+ @Override
public void vmStart(VMStartEventSet e) {
script.setPrompt(DEFAULT_CMD_PROMPT);
diagnostics.putString("VM started");
@@ -195,14 +209,17 @@ public class CommandTool extends JPanel {
// SessionListener
+ @Override
public void sessionStart(EventObject e) {}
+ @Override
public void sessionInterrupt(EventObject e) {
Thread.yield(); // fetch output
diagnostics.putString("VM interrupted by user.");
script.setPrompt(DEFAULT_CMD_PROMPT);
}
+ @Override
public void sessionContinue(EventObject e) {
diagnostics.putString("Execution resumed.");
script.setPrompt(DEFAULT_CMD_PROMPT);
@@ -210,23 +227,28 @@ public class CommandTool extends JPanel {
// SpecListener
+ @Override
public void breakpointSet(SpecEvent e) {
EventRequestSpec spec = e.getEventRequestSpec();
diagnostics.putString("Breakpoint set at " + spec + ".");
}
+ @Override
public void breakpointDeferred(SpecEvent e) {
EventRequestSpec spec = e.getEventRequestSpec();
diagnostics.putString("Breakpoint will be set at " +
spec + " when its class is loaded.");
}
+ @Override
public void breakpointDeleted(SpecEvent e) {
EventRequestSpec spec = e.getEventRequestSpec();
diagnostics.putString("Breakpoint at " + spec.toString() + " deleted.");
}
+ @Override
public void breakpointResolved(SpecEvent e) {
EventRequestSpec spec = e.getEventRequestSpec();
diagnostics.putString("Breakpoint resolved to " + spec.toString() + ".");
}
+ @Override
public void breakpointError(SpecErrorEvent e) {
EventRequestSpec spec = e.getEventRequestSpec();
diagnostics.putString("Deferred breakpoint at " +
@@ -236,25 +258,35 @@ public class CommandTool extends JPanel {
//### Add info for watchpoints and exceptions
+ @Override
public void watchpointSet(SpecEvent e) {
}
+ @Override
public void watchpointDeferred(SpecEvent e) {
}
+ @Override
public void watchpointDeleted(SpecEvent e) {
}
+ @Override
public void watchpointResolved(SpecEvent e) {
}
+ @Override
public void watchpointError(SpecErrorEvent e) {
}
+ @Override
public void exceptionInterceptSet(SpecEvent e) {
}
+ @Override
public void exceptionInterceptDeferred(SpecEvent e) {
}
+ @Override
public void exceptionInterceptDeleted(SpecEvent e) {
}
+ @Override
public void exceptionInterceptResolved(SpecEvent e) {
}
+ @Override
public void exceptionInterceptError(SpecErrorEvent e) {
}
@@ -263,6 +295,7 @@ public class CommandTool extends JPanel {
// If the user selects a new current thread or frame, update prompt.
+ @Override
public void currentFrameChanged(CurrentFrameChangedEvent e) {
// Update prompt only if affect thread is current.
ThreadReference thread = e.getThread();
diff --git a/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java b/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java
index 3765cd76969d7e9e3a5e2dfa74db508564fca7bc..2ce04907ab2979807377738279ae093f66521ff8 100644
--- a/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java
+++ b/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java
@@ -46,7 +46,7 @@ public class ContextManager {
private boolean verbose;
- private Vector contextListeners = new Vector();
+ private ArrayList contextListeners = new ArrayList();
public ContextManager(Environment env) {
classManager = env.getClassManager();
@@ -264,11 +264,11 @@ public class ContextManager {
private void notifyCurrentFrameChanged(ThreadInfo tinfo, int index,
boolean invalidate) {
- Vector l = (Vector)contextListeners.clone();
+ ArrayList l = new ArrayList(contextListeners);
CurrentFrameChangedEvent evt =
new CurrentFrameChangedEvent(this, tinfo, index, invalidate);
for (int i = 0; i < l.size(); i++) {
- ((ContextListener)l.elementAt(i)).currentFrameChanged(evt);
+ l.get(i).currentFrameChanged(evt);
}
}
@@ -277,28 +277,34 @@ public class ContextManager {
// SessionListener
+ @Override
public void sessionStart(EventObject e) {
invalidateCurrentThread();
}
+ @Override
public void sessionInterrupt(EventObject e) {
setCurrentThreadInvalidate(currentThread);
}
+ @Override
public void sessionContinue(EventObject e) {
invalidateCurrentThread();
}
// JDIListener
+ @Override
public void locationTrigger(LocationTriggerEventSet e) {
setCurrentThreadInvalidate(e.getThread());
}
+ @Override
public void exception(ExceptionEventSet e) {
setCurrentThreadInvalidate(e.getThread());
}
+ @Override
public void vmDisconnect(VMDisconnectEventSet e) {
invalidateCurrentThread();
}
diff --git a/src/share/classes/com/sun/tools/example/debug/gui/CurrentFrameChangedEvent.java b/src/share/classes/com/sun/tools/example/debug/gui/CurrentFrameChangedEvent.java
index 5470d0b8e73da98c158f3ba0f11ca7da714382d5..00c827fd3c9f0f1b5a24604c9bef10e447ce5dfa 100644
--- a/src/share/classes/com/sun/tools/example/debug/gui/CurrentFrameChangedEvent.java
+++ b/src/share/classes/com/sun/tools/example/debug/gui/CurrentFrameChangedEvent.java
@@ -31,6 +31,7 @@ import java.util.EventObject;
public class CurrentFrameChangedEvent extends EventObject {
+ private static final long serialVersionUID = 4214479486546762179L;
private ThreadInfo tinfo;
private int index;
private boolean invalidate;
diff --git a/src/share/classes/com/sun/tools/example/debug/gui/Environment.java b/src/share/classes/com/sun/tools/example/debug/gui/Environment.java
index d82c49997212257b4b4494cc325f7ba7ee4a66aa..f9884c7d53d284d9439d3fbe392bbd457b770e42 100644
--- a/src/share/classes/com/sun/tools/example/debug/gui/Environment.java
+++ b/src/share/classes/com/sun/tools/example/debug/gui/Environment.java
@@ -26,8 +26,6 @@
package com.sun.tools.example.debug.gui;
import java.io.*;
-import java.util.*;
-
import com.sun.jdi.*;
import com.sun.tools.example.debug.bdi.*;
diff --git a/src/share/classes/com/sun/tools/example/debug/gui/GUI.java b/src/share/classes/com/sun/tools/example/debug/gui/GUI.java
index 5744c5b9d0b2a59a3b0445800cce776d7670edee..1fa88bb28a907019180afdf7d3ae54cb84c64aa2 100644
--- a/src/share/classes/com/sun/tools/example/debug/gui/GUI.java
+++ b/src/share/classes/com/sun/tools/example/debug/gui/GUI.java
@@ -26,8 +26,6 @@
package com.sun.tools.example.debug.gui;
import java.io.*;
-import java.util.*;
-
import javax.swing.*;
import javax.swing.border.*;
import java.awt.*;
@@ -38,6 +36,7 @@ import com.sun.tools.example.debug.bdi.*;
public class GUI extends JPanel {
+ private static final long serialVersionUID = 3292463234530679091L;
private CommandTool cmdTool;
private ApplicationTool appTool;
//###HACK##
@@ -87,7 +86,7 @@ public class GUI extends JPanel {
threadTreeTool = new ThreadTreeTool(env);
threadTreeTool.setPreferredSize(new java.awt.Dimension(200, 450));
- JTabbedPane treePane = new JTabbedPane(JTabbedPane.BOTTOM);
+ JTabbedPane treePane = new JTabbedPane(SwingConstants.BOTTOM);
treePane.addTab("Source", null, sourceTreeTool);
treePane.addTab("Classes", null, classTreeTool);
treePane.addTab("Threads", null, threadTreeTool);
@@ -139,12 +138,9 @@ public class GUI extends JPanel {
}
public static void main(String argv[]) {
- String remote = null;
String clsName = "";
String progArgs = "";
String javaArgs = "";
- boolean verbose = false; //### Not implemented.
-
final Environment env = new Environment();
JPanel mainPanel = new GUI(env);
@@ -246,13 +242,14 @@ public class GUI extends JPanel {
frame.setContentPane(mainPanel);
frame.addWindowListener(new WindowAdapter() {
+ @Override
public void windowClosing(WindowEvent e) {
env.terminate();
}
});
frame.pack();
- frame.show();
+ frame.setVisible(true);
}
diff --git a/src/share/classes/com/sun/tools/example/debug/gui/JDBFileFilter.java b/src/share/classes/com/sun/tools/example/debug/gui/JDBFileFilter.java
index 577f8d8b1f95f5daef281b91e2cfa9cde410ef9b..3a6f107bbbc667639f2946295a3fd5c7a5641411 100644
--- a/src/share/classes/com/sun/tools/example/debug/gui/JDBFileFilter.java
+++ b/src/share/classes/com/sun/tools/example/debug/gui/JDBFileFilter.java
@@ -28,7 +28,6 @@ package com.sun.tools.example.debug.gui;
import java.io.File;
import java.util.Hashtable;
import java.util.Enumeration;
-import javax.swing.*;
import javax.swing.filechooser.*;
//### Renamed from 'ExampleFileFilter.java' provided with Swing demos.
@@ -93,8 +92,12 @@ public class JDBFileFilter extends FileFilter {
*/
public JDBFileFilter(String extension, String description) {
this();
- if(extension!=null) addExtension(extension);
- if(description!=null) setDescription(description);
+ if(extension!=null) {
+ addExtension(extension);
+ }
+ if(description!=null) {
+ setDescription(description);
+ }
}
/**
@@ -120,11 +123,13 @@ public class JDBFileFilter extends FileFilter {
*/
public JDBFileFilter(String[] filters, String description) {
this();
- for (int i = 0; i < filters.length; i++) {
+ for (String filter : filters) {
// add filters one by one
- addExtension(filters[i]);
+ addExtension(filter);
}
- if(description!=null) setDescription(description);
+ if(description!=null) {
+ setDescription(description);
+ }
}
/**
@@ -136,6 +141,7 @@ public class JDBFileFilter extends FileFilter {
* @see #getExtension
* @see FileFilter#accepts
*/
+ @Override
public boolean accept(File f) {
if(f != null) {
if(f.isDirectory()) {
@@ -196,6 +202,7 @@ public class JDBFileFilter extends FileFilter {
* @see isExtensionListInDescription
* @see FileFilter#getDescription
*/
+ @Override
public String getDescription() {
if(fullDescription == null) {
if(description == null || isExtensionListInDescription()) {
diff --git a/src/share/classes/com/sun/tools/example/debug/gui/JDBMenuBar.java b/src/share/classes/com/sun/tools/example/debug/gui/JDBMenuBar.java
index ee8378386b8a436cfdec2ca2fe8c05f1c28c8ca2..c224b57c4f8a842cce6688d857de97fa4c51667a 100644
--- a/src/share/classes/com/sun/tools/example/debug/gui/JDBMenuBar.java
+++ b/src/share/classes/com/sun/tools/example/debug/gui/JDBMenuBar.java
@@ -31,7 +31,6 @@ import java.awt.event.*;
import java.util.Vector;
import java.util.List;
-import com.sun.jdi.*;
import com.sun.tools.example.debug.bdi.*;
//### This is currently just a placeholder!
@@ -57,6 +56,7 @@ class JDBMenuBar extends JMenuBar {
JMenuItem openItem = new JMenuItem("Open...", 'O');
openItem.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
openCommand();
}
@@ -93,6 +93,7 @@ class JDBMenuBar extends JMenuBar {
JMenuItem monitorItem = new JMenuItem("Monitor Expression...", 'M');
monitorItem.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
monitorCommand();
}
@@ -101,6 +102,7 @@ class JDBMenuBar extends JMenuBar {
JMenuItem unmonitorItem = new JMenuItem("Unmonitor Expression...");
unmonitorItem.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
unmonitorCommand();
}
@@ -110,6 +112,7 @@ class JDBMenuBar extends JMenuBar {
JMenu breakpointMenu = new JMenu("Breakpoint");
JMenuItem stopItem = new JMenuItem("Stop in...", 'S');
stopItem.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
buildBreakpoint();
}
@@ -176,6 +179,7 @@ class JDBMenuBar extends JMenuBar {
mi.setToolTipText(toolTip);
final String cmd = command;
mi.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
interpreter.executeCommand(cmd);
}
diff --git a/src/share/classes/com/sun/tools/example/debug/gui/JDBToolBar.java b/src/share/classes/com/sun/tools/example/debug/gui/JDBToolBar.java
index f73a12d081d23c35f771153175f95bc08147ac2f..02982b9f70bec9122cd102a405242b48f8b50662 100644
--- a/src/share/classes/com/sun/tools/example/debug/gui/JDBToolBar.java
+++ b/src/share/classes/com/sun/tools/example/debug/gui/JDBToolBar.java
@@ -26,10 +26,8 @@
package com.sun.tools.example.debug.gui;
import javax.swing.*;
-import java.awt.*;
import java.awt.event.*;
-import com.sun.jdi.*;
import com.sun.tools.example.debug.bdi.*;
class JDBToolBar extends JToolBar {
@@ -92,6 +90,7 @@ class JDBToolBar extends JToolBar {
button.setToolTipText(toolTip);
final String cmd = command;
button.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
interpreter.executeCommand(cmd);
}
diff --git a/src/share/classes/com/sun/tools/example/debug/gui/LaunchTool.java b/src/share/classes/com/sun/tools/example/debug/gui/LaunchTool.java
index f6456a44960209baae5692b7a7e88c19ede2c920..cb1d77b22feeb65d6d51db0a2a55518f73acaf67 100644
--- a/src/share/classes/com/sun/tools/example/debug/gui/LaunchTool.java
+++ b/src/share/classes/com/sun/tools/example/debug/gui/LaunchTool.java
@@ -29,18 +29,10 @@ import java.util.List;
import java.util.ArrayList;
import java.util.Map;
import java.util.HashMap;
-import java.util.Iterator;
-
-import java.io.IOException;
-
import java.awt.BorderLayout;
-import java.awt.Color;
import java.awt.Container;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-
import javax.swing.*;
import javax.swing.border.Border;
import javax.swing.border.TitledBorder;
@@ -98,6 +90,7 @@ class LaunchTool {
comp.add(panel);
}
+ @Override
String getText() {
return textField.getText();
}
@@ -114,6 +107,7 @@ class LaunchTool {
comp.add(panel);
}
+ @Override
String getText() {
return ((Connector.BooleanArgument)arg)
.stringValueOf(check.getModel().isSelected());
@@ -147,6 +141,7 @@ class LaunchTool {
final boolean[] oked = {false};
JPanel buttonPanel = okCancel( dialog, new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent event) {
if (radioGroup.getSelection() == null) {
JOptionPane.showMessageDialog(dialog,
@@ -162,7 +157,7 @@ class LaunchTool {
} );
content.add(BorderLayout.SOUTH, buttonPanel);
dialog.pack();
- dialog.show();
+ dialog.setVisible(true);
return oked[0] ?
modelToConnector.get(radioGroup.getSelection()) :
@@ -178,7 +173,7 @@ class LaunchTool {
Container content = dialog.getContentPane();
JPanel guts = new JPanel();
Border etched = BorderFactory.createEtchedBorder();
- Border titled = BorderFactory.createTitledBorder(etched,
+ BorderFactory.createTitledBorder(etched,
connector.description(),
TitledBorder.LEFT, TitledBorder.TOP);
guts.setBorder(etched);
@@ -199,6 +194,7 @@ class LaunchTool {
content.add(guts);
JPanel buttonPanel = okCancel( dialog, new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent event) {
for (ArgRep ar : argReps) {
if (!ar.isSpecified()) {
@@ -236,7 +232,7 @@ class LaunchTool {
} );
content.add(BorderLayout.SOUTH, buttonPanel);
dialog.pack();
- dialog.show();
+ dialog.setVisible(true);
}
private JPanel okCancel(final JDialog dialog, ActionListener okListener) {
@@ -247,6 +243,7 @@ class LaunchTool {
buttonPanel.add(cancel);
ok.addActionListener(okListener);
cancel.addActionListener( new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent event) {
dialog.setVisible(false);
dialog.dispose();
diff --git a/src/share/classes/com/sun/tools/example/debug/gui/MonitorListModel.java b/src/share/classes/com/sun/tools/example/debug/gui/MonitorListModel.java
index 91c87a4d74c24511dee5dff57fe1e7ab8f6eb2f7..c46219f4720cc81c4cf75f1a42bf329330e74c9c 100644
--- a/src/share/classes/com/sun/tools/example/debug/gui/MonitorListModel.java
+++ b/src/share/classes/com/sun/tools/example/debug/gui/MonitorListModel.java
@@ -42,10 +42,12 @@ public class MonitorListModel extends AbstractListModel {
//### remove listeners on exit!
}
+ @Override
public Object getElementAt(int index) {
return monitors.get(index);
}
+ @Override
public int getSize() {
return monitors.size();
}
@@ -70,7 +72,7 @@ public class MonitorListModel extends AbstractListModel {
return Collections.unmodifiableList(monitors);
}
- public Iterator iterator() {
+ public Iterator iterator() {
return monitors().iterator();
}
@@ -80,7 +82,8 @@ public class MonitorListModel extends AbstractListModel {
private class MonitorListListener implements ContextListener {
- public void currentFrameChanged(CurrentFrameChangedEvent e) {
+ @Override
+ public void currentFrameChanged(final CurrentFrameChangedEvent e) {
invalidate();
}
}
diff --git a/src/share/classes/com/sun/tools/example/debug/gui/MonitorTool.java b/src/share/classes/com/sun/tools/example/debug/gui/MonitorTool.java
index 21d0fc19bbd92c226194241c8406b992ba7f7186..cf7c10c51c2d7acf96ddba61ef31d9435939e7ee 100644
--- a/src/share/classes/com/sun/tools/example/debug/gui/MonitorTool.java
+++ b/src/share/classes/com/sun/tools/example/debug/gui/MonitorTool.java
@@ -25,15 +25,9 @@
package com.sun.tools.example.debug.gui;
-import java.io.*;
-import java.util.*;
-
import javax.swing.*;
-import javax.swing.tree.*;
import javax.swing.event.*;
import java.awt.*;
-import java.awt.event.*;
-
import com.sun.jdi.*;
import com.sun.tools.example.debug.bdi.*;
import com.sun.tools.example.debug.expr.ExpressionParser;
@@ -41,6 +35,7 @@ import com.sun.tools.example.debug.expr.ParseException;
public class MonitorTool extends JPanel {
+ private static final long serialVersionUID = -645235951031726647L;
private ExecutionManager runtime;
private ContextManager context;
@@ -64,6 +59,7 @@ public class MonitorTool extends JPanel {
}
private class MonitorToolListener implements ListSelectionListener {
+ @Override
public void valueChanged(ListSelectionEvent e) {
int index = list.getSelectedIndex();
if (index != -1) {
@@ -78,6 +74,7 @@ public class MonitorTool extends JPanel {
IncompatibleThreadStateException {
ExpressionParser.GetFrame frameGetter =
new ExpressionParser.GetFrame() {
+ @Override
public StackFrame get()
throws IncompatibleThreadStateException
{
@@ -93,6 +90,7 @@ public class MonitorTool extends JPanel {
private class MonitorRenderer extends DefaultListCellRenderer {
+ @Override
public Component getListCellRendererComponent(JList list,
Object value,
int index,
diff --git a/src/share/classes/com/sun/tools/example/debug/gui/SearchPath.java b/src/share/classes/com/sun/tools/example/debug/gui/SearchPath.java
index e02b8400276ddcf1af679479a236de33833182c4..30905696660817f7ecbfb5d515c1d8911e5bdb97 100644
--- a/src/share/classes/com/sun/tools/example/debug/gui/SearchPath.java
+++ b/src/share/classes/com/sun/tools/example/debug/gui/SearchPath.java
@@ -58,8 +58,8 @@ public class SearchPath {
}
public File resolve(String relativeFileName) {
- for (int i = 0; i < pathArray.length; i++) {
- File path = new File(pathArray[i], relativeFileName);
+ for (String element : pathArray) {
+ File path = new File(element, relativeFileName);
if (path.exists()) {
return path;
}
@@ -76,8 +76,8 @@ public class SearchPath {
// classpath is retained. This is the one that will be
// found if we later do a 'resolve'.
SortedSet s = new TreeSet(); // sorted, no duplicates
- for (int i = 0; i < pathArray.length; i++) {
- File path = new File(pathArray[i], relativeDirName);
+ for (String element : pathArray) {
+ File path = new File(element, relativeDirName);
if (path.exists()) {
String[] childArray = path.list(filter);
if (childArray != null) {
diff --git a/src/share/classes/com/sun/tools/example/debug/gui/SingleLeafTreeSelectionModel.java b/src/share/classes/com/sun/tools/example/debug/gui/SingleLeafTreeSelectionModel.java
index 2d1b2aa07a8c6e3aaa9bf4f5bb9603546800c444..47df28d1168c893d23e26ad9c26ddbb8e55be909 100644
--- a/src/share/classes/com/sun/tools/example/debug/gui/SingleLeafTreeSelectionModel.java
+++ b/src/share/classes/com/sun/tools/example/debug/gui/SingleLeafTreeSelectionModel.java
@@ -25,22 +25,25 @@
package com.sun.tools.example.debug.gui;
-import javax.swing.*;
import javax.swing.tree.*;
public class SingleLeafTreeSelectionModel extends DefaultTreeSelectionModel {
+ private static final long serialVersionUID = -7849105107888117679L;
+
SingleLeafTreeSelectionModel() {
super();
selectionMode = SINGLE_TREE_SELECTION;
}
+ @Override
public void setSelectionPath(TreePath path) {
if(((TreeNode)(path.getLastPathComponent())).isLeaf()) {
super.setSelectionPath(path);
}
}
+ @Override
public void setSelectionPaths(TreePath[] paths) {
// Only look at first path, as all others will be
// ignored anyway in single tree selection mode.
@@ -49,12 +52,14 @@ public class SingleLeafTreeSelectionModel extends DefaultTreeSelectionModel {
}
}
+ @Override
public void addSelectionPath(TreePath path) {
if(((TreeNode)(path.getLastPathComponent())).isLeaf()) {
super.setSelectionPath(path);
}
}
+ @Override
public void addSelectionPaths(TreePath[] paths) {
// Only look at first path, as all others will be
// ignored anyway in single tree selection mode.
diff --git a/src/share/classes/com/sun/tools/example/debug/gui/SourceManager.java b/src/share/classes/com/sun/tools/example/debug/gui/SourceManager.java
index 6e8ae7a292e97910869b27814331ac0e1b44dae3..eda83460e83424ebbdc1af45ab91955f17724e5e 100644
--- a/src/share/classes/com/sun/tools/example/debug/gui/SourceManager.java
+++ b/src/share/classes/com/sun/tools/example/debug/gui/SourceManager.java
@@ -31,7 +31,6 @@ import java.util.*;
import com.sun.jdi.*;
import com.sun.tools.example.debug.event.*;
-import com.sun.tools.example.debug.bdi.*;
/**
* Manage the list of source files.
@@ -45,7 +44,7 @@ public class SourceManager {
private List sourceList;
private SearchPath sourcePath;
- private Vector sourceListeners = new Vector();
+ private ArrayList sourceListeners = new ArrayList();
private Map classToSource = new HashMap();
@@ -79,18 +78,18 @@ public class SourceManager {
}
public void addSourceListener(SourceListener l) {
- sourceListeners.addElement(l);
+ sourceListeners.add(l);
}
public void removeSourceListener(SourceListener l) {
- sourceListeners.removeElement(l);
+ sourceListeners.remove(l);
}
private void notifySourcepathChanged() {
- Vector l = (Vector)sourceListeners.clone();
+ ArrayList l = new ArrayList(sourceListeners);
SourcepathChangedEvent evt = new SourcepathChangedEvent(this);
for (int i = 0; i < l.size(); i++) {
- ((SourceListener)l.elementAt(i)).sourcepathChanged(evt);
+ l.get(i).sourcepathChanged(evt);
}
}
@@ -163,6 +162,7 @@ public class SourceManager {
private class SMClassListener extends JDIAdapter
implements JDIListener {
+ @Override
public void classPrepare(ClassPrepareEventSet e) {
ReferenceType refType = e.getReferenceType();
SourceModel sm = sourceForClass(refType);
@@ -171,6 +171,7 @@ public class SourceManager {
}
}
+ @Override
public void classUnload(ClassUnloadEventSet e) {
//### iterate through looking for (e.getTypeName()).
//### then remove it.
diff --git a/src/share/classes/com/sun/tools/example/debug/gui/SourceModel.java b/src/share/classes/com/sun/tools/example/debug/gui/SourceModel.java
index 4ad47069589e5860757f804c512b52d31cf76870..b65be0b5a2ddbec68a56331bac767ba62bbfcb6e 100644
--- a/src/share/classes/com/sun/tools/example/debug/gui/SourceModel.java
+++ b/src/share/classes/com/sun/tools/example/debug/gui/SourceModel.java
@@ -31,8 +31,6 @@ import java.util.*;
import com.sun.jdi.*;
import com.sun.jdi.request.*;
-import com.sun.tools.example.debug.bdi.*;
-
import javax.swing.*;
/**
@@ -101,6 +99,7 @@ public class SourceModel extends AbstractListModel {
// **** Implement ListModel *****
+ @Override
public Object getElementAt(int index) {
if (sourceLines == null) {
initialize();
@@ -108,6 +107,7 @@ public class SourceModel extends AbstractListModel {
return sourceLines.get(index);
}
+ @Override
public int getSize() {
if (sourceLines == null) {
initialize();
diff --git a/src/share/classes/com/sun/tools/example/debug/gui/SourceTool.java b/src/share/classes/com/sun/tools/example/debug/gui/SourceTool.java
index 0f0c24d83e58bb09b6f35b83c1d8d8772671466a..cecbeaf2479dd006728603cf732cb78b6496c4d6 100644
--- a/src/share/classes/com/sun/tools/example/debug/gui/SourceTool.java
+++ b/src/share/classes/com/sun/tools/example/debug/gui/SourceTool.java
@@ -26,8 +26,6 @@
package com.sun.tools.example.debug.gui;
import java.io.*;
-import java.util.*;
-
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
@@ -35,13 +33,12 @@ import javax.swing.*;
import com.sun.jdi.*;
import com.sun.jdi.request.*;
-import com.sun.tools.example.debug.event.*;
import com.sun.tools.example.debug.bdi.*;
-import java.util.List;
-
public class SourceTool extends JPanel {
+ private static final long serialVersionUID = -5461299294186395257L;
+
private Environment env;
private ExecutionManager runtime;
@@ -99,6 +96,7 @@ public class SourceTool extends JPanel {
// ContextListener
+ @Override
public void currentFrameChanged(CurrentFrameChangedEvent e) {
showSourceContext(e.getThread(), e.getIndex());
}
@@ -108,6 +106,7 @@ public class SourceTool extends JPanel {
// SourceListener
+ @Override
public void sourcepathChanged(SourcepathChangedEvent e) {
// Reload source view if its contents depend
// on the source path.
@@ -120,12 +119,15 @@ public class SourceTool extends JPanel {
// SpecListener
+ @Override
public void breakpointSet(SpecEvent e) {
breakpointResolved(e);
}
+ @Override
public void breakpointDeferred(SpecEvent e) { }
+ @Override
public void breakpointDeleted(SpecEvent e) {
BreakpointRequest req = (BreakpointRequest)e.getEventRequest();
Location loc = req.location();
@@ -139,6 +141,7 @@ public class SourceTool extends JPanel {
}
}
+ @Override
public void breakpointResolved(SpecEvent e) {
BreakpointRequest req = (BreakpointRequest)e.getEventRequest();
Location loc = req.location();
@@ -150,29 +153,40 @@ public class SourceTool extends JPanel {
}
}
+ @Override
public void breakpointError(SpecErrorEvent e) {
breakpointDeleted(e);
}
+ @Override
public void watchpointSet(SpecEvent e) {
}
+ @Override
public void watchpointDeferred(SpecEvent e) {
}
+ @Override
public void watchpointDeleted(SpecEvent e) {
}
+ @Override
public void watchpointResolved(SpecEvent e) {
}
+ @Override
public void watchpointError(SpecErrorEvent e) {
}
+ @Override
public void exceptionInterceptSet(SpecEvent e) {
}
+ @Override
public void exceptionInterceptDeferred(SpecEvent e) {
}
+ @Override
public void exceptionInterceptDeleted(SpecEvent e) {
}
+ @Override
public void exceptionInterceptResolved(SpecEvent e) {
}
+ @Override
public void exceptionInterceptError(SpecErrorEvent e) {
}
}
@@ -269,6 +283,7 @@ public class SourceTool extends JPanel {
private class SourceLineRenderer extends DefaultListCellRenderer {
+ @Override
public Component getListCellRendererComponent(JList list,
Object value,
int index,
@@ -301,6 +316,7 @@ public class SourceTool extends JPanel {
return this;
}
+ @Override
public Dimension getPreferredSize() {
Dimension dim = super.getPreferredSize();
return new Dimension(dim.width, dim.height-5);
@@ -309,6 +325,7 @@ public class SourceTool extends JPanel {
}
private class STMouseListener extends MouseAdapter implements MouseListener {
+ @Override
public void mousePressed(MouseEvent e) {
if (e.isPopupTrigger()) {
showPopupMenu((Component)e.getSource(),
@@ -316,6 +333,7 @@ public class SourceTool extends JPanel {
}
}
+ @Override
public void mouseReleased(MouseEvent e) {
if (e.isPopupTrigger()) {
showPopupMenu((Component)e.getSource(),
@@ -354,6 +372,7 @@ public class SourceTool extends JPanel {
private JMenuItem commandItem(String label, final String cmd) {
JMenuItem item = new JMenuItem(label);
item.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
interpreter.executeCommand(cmd);
}
diff --git a/src/share/classes/com/sun/tools/example/debug/gui/SourceTreeTool.java b/src/share/classes/com/sun/tools/example/debug/gui/SourceTreeTool.java
index e6837e29d5eefed0543ed211b5a0ed7fd112442a..5f572c70896055c20ac161c755db2986333ff51f 100644
--- a/src/share/classes/com/sun/tools/example/debug/gui/SourceTreeTool.java
+++ b/src/share/classes/com/sun/tools/example/debug/gui/SourceTreeTool.java
@@ -30,15 +30,15 @@ import java.util.*;
import javax.swing.*;
import javax.swing.tree.*;
-import javax.swing.event.*;
import java.awt.*;
import java.awt.event.*;
-import com.sun.jdi.*;
import com.sun.tools.example.debug.bdi.*;
public class SourceTreeTool extends JPanel {
+ private static final long serialVersionUID = 3336680912107956419L;
+
private Environment env;
private ExecutionManager runtime;
@@ -81,6 +81,7 @@ public class SourceTreeTool extends JPanel {
******/
MouseListener ml = new MouseAdapter() {
+ @Override
public void mouseClicked(MouseEvent e) {
int selRow = tree.getRowForLocation(e.getX(), e.getY());
TreePath selPath = tree.getPathForLocation(e.getX(), e.getY());
@@ -112,6 +113,7 @@ public class SourceTreeTool extends JPanel {
private class SourceTreeToolListener implements SourceListener {
+ @Override
public void sourcepathChanged(SourcepathChangedEvent e) {
sourcePath = sourceManager.getSourcePath();
root = createDirectoryTree(HEADING);
@@ -121,6 +123,7 @@ public class SourceTreeTool extends JPanel {
}
private static class SourceOrDirectoryFilter implements FilenameFilter {
+ @Override
public boolean accept(File dir, String name) {
return (name.endsWith(".java") ||
new File(dir, name).isDirectory());
@@ -158,6 +161,7 @@ public class SourceTreeTool extends JPanel {
this.isDirectory = isDirectory;
}
+ @Override
public String toString() {
return name;
}
@@ -195,6 +199,7 @@ public class SourceTreeTool extends JPanel {
* Returns the child TreeNode at index
* childIndex.
*/
+ @Override
public TreeNode getChildAt(int childIndex) {
expandIfNeeded();
return children[childIndex];
@@ -204,6 +209,7 @@ public class SourceTreeTool extends JPanel {
* Returns the number of children TreeNodes the receiver
* contains.
*/
+ @Override
public int getChildCount() {
expandIfNeeded();
return children.length;
@@ -212,6 +218,7 @@ public class SourceTreeTool extends JPanel {
/**
* Returns the parent TreeNode of the receiver.
*/
+ @Override
public TreeNode getParent() {
return parent;
}
@@ -221,18 +228,21 @@ public class SourceTreeTool extends JPanel {
* If the receiver does not contain node, -1 will be
* returned.
*/
+ @Override
public int getIndex(TreeNode node) {
expandIfNeeded();
for (int i = 0; i < children.length; i++) {
- if (children[i] == node)
+ if (children[i] == node) {
return i;
}
+ }
return -1;
}
/**
* Returns true if the receiver allows children.
*/
+ @Override
public boolean getAllowsChildren() {
return isDirectory;
}
@@ -240,6 +250,7 @@ public class SourceTreeTool extends JPanel {
/**
* Returns true if the receiver is a leaf.
*/
+ @Override
public boolean isLeaf() {
expandIfNeeded();
return !isDirectory;
@@ -248,13 +259,16 @@ public class SourceTreeTool extends JPanel {
/**
* Returns the children of the receiver as an Enumeration.
*/
+ @Override
public Enumeration children() {
expandIfNeeded();
return new Enumeration() {
int i = 0;
+ @Override
public boolean hasMoreElements() {
return (i < children.length);
}
+ @Override
public Object nextElement() throws NoSuchElementException {
if (i >= children.length) {
throw new NoSuchElementException();
diff --git a/src/share/classes/com/sun/tools/example/debug/gui/SourcepathChangedEvent.java b/src/share/classes/com/sun/tools/example/debug/gui/SourcepathChangedEvent.java
index 53b3f0382f24e2c82473a97c91bde3fe14e0df4e..975571b0dad95dc0db81736eea885055408e43cb 100644
--- a/src/share/classes/com/sun/tools/example/debug/gui/SourcepathChangedEvent.java
+++ b/src/share/classes/com/sun/tools/example/debug/gui/SourcepathChangedEvent.java
@@ -29,6 +29,8 @@ import java.util.EventObject;
public class SourcepathChangedEvent extends EventObject {
+ private static final long serialVersionUID = 8762169481005804121L;
+
public SourcepathChangedEvent(Object source) {
super(source);
}
diff --git a/src/share/classes/com/sun/tools/example/debug/gui/StackTraceTool.java b/src/share/classes/com/sun/tools/example/debug/gui/StackTraceTool.java
index 8d28755778330eb30c2548ff839640dcc6844125..1e3b68eabc684870c02954c01a1d1578e80efb49 100644
--- a/src/share/classes/com/sun/tools/example/debug/gui/StackTraceTool.java
+++ b/src/share/classes/com/sun/tools/example/debug/gui/StackTraceTool.java
@@ -25,21 +25,16 @@
package com.sun.tools.example.debug.gui;
-import java.io.*;
-import java.util.*;
-import java.util.List; // Must import explicitly due to conflict with javax.awt.List
-
import javax.swing.*;
-import javax.swing.tree.*;
import javax.swing.event.*;
import java.awt.*;
-import java.awt.event.*;
-
import com.sun.jdi.*;
import com.sun.tools.example.debug.bdi.*;
public class StackTraceTool extends JPanel {
+ private static final long serialVersionUID = 9140041989427965718L;
+
private Environment env;
private ExecutionManager runtime;
@@ -85,6 +80,7 @@ public class StackTraceTool extends JPanel {
//### I suspect we handle the case badly that the VM is not interrupted.
+ @Override
public void currentFrameChanged(CurrentFrameChangedEvent e) {
// If the current frame of the thread appearing in this
// view is changed, move the selection to track it.
@@ -103,6 +99,7 @@ public class StackTraceTool extends JPanel {
// ListSelectionListener
+ @Override
public void valueChanged(ListSelectionEvent e) {
int index = list.getSelectedIndex();
if (index != -1) {
@@ -117,6 +114,7 @@ public class StackTraceTool extends JPanel {
private class StackFrameRenderer extends DefaultListCellRenderer {
+ @Override
public Component getListCellRendererComponent(JList list,
Object value,
int index,
@@ -174,6 +172,7 @@ public class StackTraceTool extends JPanel {
this.tinfo = tinfo;
}
+ @Override
public Object getElementAt(int index) {
try {
return tinfo == null? null : tinfo.getFrame(index);
@@ -186,6 +185,7 @@ public class StackTraceTool extends JPanel {
}
}
+ @Override
public int getSize() {
try {
return tinfo == null? 1 : tinfo.getFrameCount();
diff --git a/src/share/classes/com/sun/tools/example/debug/gui/ThreadTreeTool.java b/src/share/classes/com/sun/tools/example/debug/gui/ThreadTreeTool.java
index 2aefdc309e63d8e31a80da1c0675e9e70b7a9740..02cf374f0276ebbd1f882d99efe59e52afc311fc 100644
--- a/src/share/classes/com/sun/tools/example/debug/gui/ThreadTreeTool.java
+++ b/src/share/classes/com/sun/tools/example/debug/gui/ThreadTreeTool.java
@@ -25,13 +25,11 @@
package com.sun.tools.example.debug.gui;
-import java.io.*;
import java.util.*;
import java.util.List; // Must import explicitly due to conflict with javax.awt.List
import javax.swing.*;
import javax.swing.tree.*;
-import javax.swing.event.*;
import java.awt.*;
import java.awt.event.*;
@@ -45,6 +43,8 @@ import com.sun.tools.example.debug.bdi.*;
public class ThreadTreeTool extends JPanel {
+ private static final long serialVersionUID = 4168599992853038878L;
+
private Environment env;
private ExecutionManager runtime;
@@ -79,6 +79,7 @@ public class ThreadTreeTool extends JPanel {
tree.setSelectionModel(new SingleLeafTreeSelectionModel());
MouseListener ml = new MouseAdapter() {
+ @Override
public void mouseClicked(MouseEvent e) {
int selRow = tree.getRowForLocation(e.getX(), e.getY());
TreePath selPath = tree.getPathForLocation(e.getX(), e.getY());
@@ -131,6 +132,7 @@ public class ThreadTreeTool extends JPanel {
// SessionListener
+ @Override
public void sessionStart(EventObject e) {
try {
for (ThreadReference thread : runtime.allThreads()) {
@@ -143,20 +145,25 @@ public class ThreadTreeTool extends JPanel {
}
}
+ @Override
public void sessionInterrupt(EventObject e) {}
+ @Override
public void sessionContinue(EventObject e) {}
// JDIListener
+ @Override
public void threadStart(ThreadStartEventSet e) {
root.addThread(e.getThread());
}
+ @Override
public void threadDeath(ThreadDeathEventSet e) {
root.removeThread(e.getThread());
}
+ @Override
public void vmDisconnect(VMDisconnectEventSet e) {
// Clear the contents of this view.
root = createThreadTree(HEADING);
@@ -193,6 +200,7 @@ public class ThreadTreeTool extends JPanel {
}
}
+ @Override
public String toString() {
return description;
}
@@ -213,6 +221,7 @@ public class ThreadTreeTool extends JPanel {
return (thread == null);
}
+ @Override
public boolean isLeaf() {
return !isThreadGroup();
}
diff --git a/src/share/classes/com/sun/tools/example/debug/gui/TypeScript.java b/src/share/classes/com/sun/tools/example/debug/gui/TypeScript.java
index 84c3262e25efcd6b579755ed52e626a6e2628901..c99a4cd9e27c93ecb112b5c756a8b1b6046777b6 100644
--- a/src/share/classes/com/sun/tools/example/debug/gui/TypeScript.java
+++ b/src/share/classes/com/sun/tools/example/debug/gui/TypeScript.java
@@ -28,10 +28,10 @@ package com.sun.tools.example.debug.gui;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
-import javax.swing.border.*;
public class TypeScript extends JPanel {
+ private static final long serialVersionUID = -983704841363534885L;
private JTextArea history;
private JTextField entry;
@@ -41,7 +41,6 @@ public class TypeScript extends JPanel {
private JScrollBar historyHScrollBar;
private boolean echoInput = false;
- private boolean nlPending = false;
private static String newline = System.getProperty("line.separator");
diff --git a/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptOutputListener.java b/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptOutputListener.java
index 6731023760de8486c2db4fea27a773fd89b3fe98..bb3cda6921db52508d4436b3c2544033472ea56c 100644
--- a/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptOutputListener.java
+++ b/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptOutputListener.java
@@ -25,7 +25,6 @@
package com.sun.tools.example.debug.gui;
-import javax.swing.*;
import com.sun.tools.example.debug.bdi.OutputListener;
public class TypeScriptOutputListener implements OutputListener {
@@ -42,10 +41,12 @@ public class TypeScriptOutputListener implements OutputListener {
this.appendNewline = appendNewline;
}
+ @Override
public void putString(String s) {
script.append(s);
- if (appendNewline)
+ if (appendNewline) {
script.newline();
}
+ }
}
diff --git a/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptWriter.java b/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptWriter.java
index 89ca4c32aacc1e274f4cbd65b66d2758e285c716..64b5ec2b4439fddcefa2a4e9068e411b08ea0b1d 100644
--- a/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptWriter.java
+++ b/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptWriter.java
@@ -35,14 +35,17 @@ public class TypeScriptWriter extends Writer {
this.script = script;
}
+ @Override
public void write(char[] cbuf, int off, int len) throws IOException {
script.append(String.valueOf(cbuf, off, len));
}
+ @Override
public void flush() {
script.flush();
}
+ @Override
public void close() {
script.flush();
}
diff --git a/src/share/classes/com/sun/tools/example/debug/tty/AccessWatchpointSpec.java b/src/share/classes/com/sun/tools/example/debug/tty/AccessWatchpointSpec.java
index 1eedd7af593d6ba97777a1ee759d6e8ed34581d5..1b83363d171a221b6f6a7e572cd5a893be115694 100644
--- a/src/share/classes/com/sun/tools/example/debug/tty/AccessWatchpointSpec.java
+++ b/src/share/classes/com/sun/tools/example/debug/tty/AccessWatchpointSpec.java
@@ -38,6 +38,7 @@ class AccessWatchpointSpec extends WatchpointSpec {
/**
* The 'refType' is known to match, return the EventRequest.
*/
+ @Override
EventRequest resolveEventRequest(ReferenceType refType)
throws NoSuchFieldException {
Field field = refType.fieldByName(fieldId);
@@ -48,6 +49,7 @@ class AccessWatchpointSpec extends WatchpointSpec {
return wp;
}
+ @Override
public String toString() {
return MessageOutput.format("watch accesses of",
new Object [] {refSpec.toString(),
diff --git a/src/share/classes/com/sun/tools/example/debug/tty/AmbiguousMethodException.java b/src/share/classes/com/sun/tools/example/debug/tty/AmbiguousMethodException.java
index 9975fa54e612b44cbec0d19068498b367c2f2c69..eb210dd4588ef61e867b6e16baa9d3ba59808c5c 100644
--- a/src/share/classes/com/sun/tools/example/debug/tty/AmbiguousMethodException.java
+++ b/src/share/classes/com/sun/tools/example/debug/tty/AmbiguousMethodException.java
@@ -27,6 +27,8 @@ package com.sun.tools.example.debug.tty;
public class AmbiguousMethodException extends Exception
{
+ private static final long serialVersionUID = -5372629264936918654L;
+
public AmbiguousMethodException()
{
super();
diff --git a/src/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java b/src/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java
index 1105c9e6d3792506587f0f38e5ce2844213a3a4c..ed6c2a10fc57d13c91ed2ad7b35e55c9540def7a 100644
--- a/src/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java
+++ b/src/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java
@@ -30,7 +30,6 @@ import com.sun.jdi.request.*;
import java.util.ArrayList;
import java.util.List;
-import java.util.Iterator;
class BreakpointSpec extends EventRequestSpec {
String methodId;
@@ -58,6 +57,7 @@ class BreakpointSpec extends EventRequestSpec {
/**
* The 'refType' is known to match, return the EventRequest.
*/
+ @Override
EventRequest resolveEventRequest(ReferenceType refType)
throws AmbiguousMethodException,
AbsentInformationException,
@@ -91,12 +91,14 @@ class BreakpointSpec extends EventRequestSpec {
return (methodId != null);
}
+ @Override
public int hashCode() {
return refSpec.hashCode() + lineNumber +
((methodId != null) ? methodId.hashCode() : 0) +
((methodArgs != null) ? methodArgs.hashCode() : 0);
}
+ @Override
public boolean equals(Object obj) {
if (obj instanceof BreakpointSpec) {
BreakpointSpec breakpoint = (BreakpointSpec)obj;
@@ -114,6 +116,7 @@ class BreakpointSpec extends EventRequestSpec {
}
}
+ @Override
String errorMessageFor(Exception e) {
if (e instanceof AmbiguousMethodException) {
return (MessageOutput.format("Method is overloaded; specify arguments",
@@ -140,6 +143,7 @@ class BreakpointSpec extends EventRequestSpec {
}
}
+ @Override
public String toString() {
StringBuffer buffer = new StringBuffer(refSpec.toString());
if (isMethodBreakpoint()) {
diff --git a/src/share/classes/com/sun/tools/example/debug/tty/Commands.java b/src/share/classes/com/sun/tools/example/debug/tty/Commands.java
index 48436c9cc96021d0feb5be1dfeee1fd311c3fad8..14a88267fe6eda8a44451a5f27c6631e8594d440 100644
--- a/src/share/classes/com/sun/tools/example/debug/tty/Commands.java
+++ b/src/share/classes/com/sun/tools/example/debug/tty/Commands.java
@@ -51,6 +51,7 @@ class Commands {
final ThreadInfo threadInfo = ThreadInfo.getCurrentThreadInfo();
final int stackFrame = threadInfo == null? 0 : threadInfo.getCurrentFrameIndex();
Thread thread = new Thread("asynchronous jdb command") {
+ @Override
public void run() {
try {
action();
@@ -95,6 +96,7 @@ class Commands {
final ThreadInfo threadInfo = ThreadInfo.getCurrentThreadInfo();
if ((threadInfo != null) && (threadInfo.getCurrentFrame() != null)) {
frameGetter = new ExpressionParser.GetFrame() {
+ @Override
public StackFrame get() throws IncompatibleThreadStateException {
return threadInfo.getCurrentFrame();
}
@@ -224,7 +226,6 @@ class Commands {
}
void commandClass(StringTokenizer t) {
- List list = Env.vm().allClasses();
if (!t.hasMoreTokens()) {
MessageOutput.println("No class specified.");
@@ -709,6 +710,7 @@ class Commands {
void doKillThread(final ThreadReference threadToKill,
final StringTokenizer tokenizer) {
new AsyncExecution() {
+ @Override
void action() {
doKill(threadToKill, tokenizer);
}
@@ -1118,7 +1120,6 @@ class Commands {
}
void commandStop(StringTokenizer t) {
- Location bploc;
String atIn;
byte suspendPolicy = EventRequest.SUSPEND_ALL;
@@ -1665,6 +1666,7 @@ class Commands {
void commandPrint(final StringTokenizer t, final boolean dumpObject) {
new AsyncExecution() {
+ @Override
void action() {
doPrint(t, dumpObject);
}
@@ -1734,6 +1736,7 @@ class Commands {
void commandLock(final StringTokenizer t) {
new AsyncExecution() {
+ @Override
void action() {
doLock(t);
}
@@ -1809,6 +1812,7 @@ class Commands {
void commandDisableGC(final StringTokenizer t) {
new AsyncExecution() {
+ @Override
void action() {
doDisableGC(t);
}
@@ -1837,6 +1841,7 @@ class Commands {
void commandEnableGC(final StringTokenizer t) {
new AsyncExecution() {
+ @Override
void action() {
doEnableGC(t);
}
@@ -1892,6 +1897,7 @@ class Commands {
}
} else {
new AsyncExecution() {
+ @Override
void action() {
doSave(t);
}
diff --git a/src/share/classes/com/sun/tools/example/debug/tty/Env.java b/src/share/classes/com/sun/tools/example/debug/tty/Env.java
index b664d094dd687bddaceb5a71f6148fa304d9beb5..e39732692ccd6c189d5de723853901aec1025ac3 100644
--- a/src/share/classes/com/sun/tools/example/debug/tty/Env.java
+++ b/src/share/classes/com/sun/tools/example/debug/tty/Env.java
@@ -29,7 +29,6 @@ import com.sun.jdi.*;
import com.sun.jdi.request.StepRequest;
import com.sun.jdi.request.MethodEntryRequest;
import com.sun.jdi.request.MethodExitRequest;
-import com.sun.tools.jdi.*;
import java.util.*;
import java.io.*;
diff --git a/src/share/classes/com/sun/tools/example/debug/tty/EventHandler.java b/src/share/classes/com/sun/tools/example/debug/tty/EventHandler.java
index 0147666d9be06d8c82d2668a43cade5b3950a9d4..31e5035fe8e3588b87d0cfca7957ae2a17397918 100644
--- a/src/share/classes/com/sun/tools/example/debug/tty/EventHandler.java
+++ b/src/share/classes/com/sun/tools/example/debug/tty/EventHandler.java
@@ -27,14 +27,8 @@ package com.sun.tools.example.debug.tty;
import com.sun.jdi.*;
import com.sun.jdi.event.*;
-import com.sun.jdi.request.EventRequestManager;
import com.sun.jdi.request.EventRequest;
-import java.io.PrintStream;
-import java.util.StringTokenizer;
-import java.util.Collection;
-import java.util.Iterator;
-
public class EventHandler implements Runnable {
EventNotifier notifier;
@@ -59,6 +53,7 @@ public class EventHandler implements Runnable {
}
}
+ @Override
public void run() {
EventQueue queue = Env.vm().eventQueue();
while (connected) {
diff --git a/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpec.java b/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpec.java
index 47ae8b4667aef416fffd3d6f9fafd65003d29b50..5c0177b45485717ad2446fd9058933b00292c2ac 100644
--- a/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpec.java
+++ b/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpec.java
@@ -30,9 +30,7 @@ import com.sun.jdi.request.EventRequest;
import com.sun.jdi.request.ExceptionRequest;
import com.sun.jdi.request.ClassPrepareRequest;
import com.sun.jdi.event.ClassPrepareEvent;
-import java.util.List;
import java.util.ArrayList;
-import java.util.Iterator;
abstract class EventRequestSpec {
diff --git a/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpecList.java b/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpecList.java
index 0816b74a0ce5c18e0154d9aa3db3d4299c879d9d..58dc664f0ed5c03a95be86cc503ae511b70122e2 100644
--- a/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpecList.java
+++ b/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpecList.java
@@ -25,15 +25,12 @@
package com.sun.tools.example.debug.tty;
-import com.sun.jdi.*;
import com.sun.jdi.request.EventRequest;
import com.sun.jdi.event.ClassPrepareEvent;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
-import java.util.StringTokenizer;
class EventRequestSpecList {
diff --git a/src/share/classes/com/sun/tools/example/debug/tty/ExceptionSpec.java b/src/share/classes/com/sun/tools/example/debug/tty/ExceptionSpec.java
index b0075061e3d406a883a21fb7798c551607484a1c..f1a3c27272478b5b75f914f004b0207ba1c49407 100644
--- a/src/share/classes/com/sun/tools/example/debug/tty/ExceptionSpec.java
+++ b/src/share/classes/com/sun/tools/example/debug/tty/ExceptionSpec.java
@@ -28,10 +28,6 @@ package com.sun.tools.example.debug.tty;
import com.sun.jdi.ReferenceType;
import com.sun.jdi.request.*;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Iterator;
-
class ExceptionSpec extends EventRequestSpec {
private boolean notifyCaught;
private boolean notifyUncaught;
@@ -51,6 +47,7 @@ class ExceptionSpec extends EventRequestSpec {
/**
* The 'refType' is known to match, return the EventRequest.
*/
+ @Override
EventRequest resolveEventRequest(ReferenceType refType) {
EventRequestManager em = refType.virtualMachine().eventRequestManager();
ExceptionRequest excReq = em.createExceptionRequest(refType,
@@ -68,6 +65,7 @@ class ExceptionSpec extends EventRequestSpec {
return notifyUncaught;
}
+ @Override
public int hashCode() {
//Reference: Effective Java[tm] (Bloch, 2001), Item 8
int result = 17;
@@ -77,6 +75,7 @@ class ExceptionSpec extends EventRequestSpec {
return result;
}
+ @Override
public boolean equals(Object obj) {
if (obj instanceof ExceptionSpec) {
ExceptionSpec es = (ExceptionSpec)obj;
@@ -90,6 +89,7 @@ class ExceptionSpec extends EventRequestSpec {
return false;
}
+ @Override
public String toString() {
String s;
if (notifyCaught && !notifyUncaught) {
diff --git a/src/share/classes/com/sun/tools/example/debug/tty/LineNotFoundException.java b/src/share/classes/com/sun/tools/example/debug/tty/LineNotFoundException.java
index 5fb6a0ea5fa6f0caf238537333ab878baede73aa..442b798aaae224d57f31ba42dd1c59b18cd7339d 100644
--- a/src/share/classes/com/sun/tools/example/debug/tty/LineNotFoundException.java
+++ b/src/share/classes/com/sun/tools/example/debug/tty/LineNotFoundException.java
@@ -27,6 +27,8 @@ package com.sun.tools.example.debug.tty;
public class LineNotFoundException extends Exception
{
+ private static final long serialVersionUID = 3748297722519448995L;
+
public LineNotFoundException()
{
super();
diff --git a/src/share/classes/com/sun/tools/example/debug/tty/MalformedMemberNameException.java b/src/share/classes/com/sun/tools/example/debug/tty/MalformedMemberNameException.java
index dacf7aca78a71a8aa4d7733eadaa3e0a585070b5..3f2bf46c627b5f36174adeddebd868450b5f93a4 100644
--- a/src/share/classes/com/sun/tools/example/debug/tty/MalformedMemberNameException.java
+++ b/src/share/classes/com/sun/tools/example/debug/tty/MalformedMemberNameException.java
@@ -26,6 +26,8 @@
package com.sun.tools.example.debug.tty;
class MalformedMemberNameException extends Exception {
+ private static final long serialVersionUID = 7759071468833196630L;
+
public MalformedMemberNameException() {
super();
}
diff --git a/src/share/classes/com/sun/tools/example/debug/tty/ModificationWatchpointSpec.java b/src/share/classes/com/sun/tools/example/debug/tty/ModificationWatchpointSpec.java
index 05436c7a614496eed0ad77a4848958f8bc1973a7..ee3a63e969487c63e098a08743c742b57e9d06b5 100644
--- a/src/share/classes/com/sun/tools/example/debug/tty/ModificationWatchpointSpec.java
+++ b/src/share/classes/com/sun/tools/example/debug/tty/ModificationWatchpointSpec.java
@@ -38,6 +38,7 @@ class ModificationWatchpointSpec extends WatchpointSpec {
/**
* The 'refType' is known to match, return the EventRequest.
*/
+ @Override
EventRequest resolveEventRequest(ReferenceType refType)
throws NoSuchFieldException {
Field field = refType.fieldByName(fieldId);
@@ -48,6 +49,7 @@ class ModificationWatchpointSpec extends WatchpointSpec {
return wp;
}
+ @Override
public String toString() {
return MessageOutput.format("watch modification of",
new Object [] {refSpec.toString(),
diff --git a/src/share/classes/com/sun/tools/example/debug/tty/PatternReferenceTypeSpec.java b/src/share/classes/com/sun/tools/example/debug/tty/PatternReferenceTypeSpec.java
index b6c01774df4a8881d1c9b51b30854d31fc0906c0..cc4473cefd86958728fc0f14c57130e1f1b2ca25 100644
--- a/src/share/classes/com/sun/tools/example/debug/tty/PatternReferenceTypeSpec.java
+++ b/src/share/classes/com/sun/tools/example/debug/tty/PatternReferenceTypeSpec.java
@@ -55,6 +55,7 @@ class PatternReferenceTypeSpec implements ReferenceTypeSpec {
/**
* Does the specified ReferenceType match this spec.
*/
+ @Override
public boolean matches(ReferenceType refType) {
if (classId.startsWith("*")) {
return refType.name().endsWith(stem);
@@ -65,6 +66,7 @@ class PatternReferenceTypeSpec implements ReferenceTypeSpec {
}
}
+ @Override
public ClassPrepareRequest createPrepareRequest() {
ClassPrepareRequest request =
Env.vm().eventRequestManager().createClassPrepareRequest();
@@ -73,10 +75,12 @@ class PatternReferenceTypeSpec implements ReferenceTypeSpec {
return request;
}
+ @Override
public int hashCode() {
return classId.hashCode();
}
+ @Override
public boolean equals(Object obj) {
if (obj instanceof PatternReferenceTypeSpec) {
PatternReferenceTypeSpec spec = (PatternReferenceTypeSpec)obj;
@@ -125,6 +129,7 @@ class PatternReferenceTypeSpec implements ReferenceTypeSpec {
return true;
}
+ @Override
public String toString() {
return classId;
}
diff --git a/src/share/classes/com/sun/tools/example/debug/tty/ReferenceTypeSpec.java b/src/share/classes/com/sun/tools/example/debug/tty/ReferenceTypeSpec.java
index 6f085b93d1b1701cdd80d4ca428bd9075a064773..0e76be0cb4c5914ca9811c0eac649ff28fa01801 100644
--- a/src/share/classes/com/sun/tools/example/debug/tty/ReferenceTypeSpec.java
+++ b/src/share/classes/com/sun/tools/example/debug/tty/ReferenceTypeSpec.java
@@ -35,7 +35,9 @@ interface ReferenceTypeSpec {
boolean matches(ReferenceType refType);
ClassPrepareRequest createPrepareRequest();
+ @Override
int hashCode();
+ @Override
boolean equals(Object obj);
}
diff --git a/src/share/classes/com/sun/tools/example/debug/tty/SourceMapper.java b/src/share/classes/com/sun/tools/example/debug/tty/SourceMapper.java
index 95f82b539565b8f42c3c097c603317de20d6f943..941f6c24722d447ddd97111b2184b0364f099d1e 100644
--- a/src/share/classes/com/sun/tools/example/debug/tty/SourceMapper.java
+++ b/src/share/classes/com/sun/tools/example/debug/tty/SourceMapper.java
@@ -27,11 +27,8 @@ package com.sun.tools.example.debug.tty;
import com.sun.jdi.Location;
import com.sun.jdi.AbsentInformationException;
-import java.util.Map;
-import java.util.HashMap;
import java.util.List;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.StringTokenizer;
import java.io.*;
diff --git a/src/share/classes/com/sun/tools/example/debug/tty/TTY.java b/src/share/classes/com/sun/tools/example/debug/tty/TTY.java
index c717b6ca4b7a9a4f34704a5d2850b6c3a9fe9d86..6514592d67d71f5317a2d957c7d4fab24a67a57f 100644
--- a/src/share/classes/com/sun/tools/example/debug/tty/TTY.java
+++ b/src/share/classes/com/sun/tools/example/debug/tty/TTY.java
@@ -47,34 +47,43 @@ public class TTY implements EventNotifier {
*/
private static final String progname = "jdb";
+ @Override
public void vmStartEvent(VMStartEvent se) {
Thread.yield(); // fetch output
MessageOutput.lnprint("VM Started:");
}
+ @Override
public void vmDeathEvent(VMDeathEvent e) {
}
+ @Override
public void vmDisconnectEvent(VMDisconnectEvent e) {
}
+ @Override
public void threadStartEvent(ThreadStartEvent e) {
}
+ @Override
public void threadDeathEvent(ThreadDeathEvent e) {
}
+ @Override
public void classPrepareEvent(ClassPrepareEvent e) {
}
+ @Override
public void classUnloadEvent(ClassUnloadEvent e) {
}
+ @Override
public void breakpointEvent(BreakpointEvent be) {
Thread.yield(); // fetch output
MessageOutput.lnprint("Breakpoint hit:");
}
+ @Override
public void fieldWatchEvent(WatchpointEvent fwe) {
Field field = fwe.field();
ObjectReference obj = fwe.object();
@@ -90,11 +99,13 @@ public class TTY implements EventNotifier {
}
}
+ @Override
public void stepEvent(StepEvent se) {
Thread.yield(); // fetch output
MessageOutput.lnprint("Step completed:");
}
+ @Override
public void exceptionEvent(ExceptionEvent ee) {
Thread.yield(); // fetch output
Location catchLocation = ee.catchLocation();
@@ -108,6 +119,7 @@ public class TTY implements EventNotifier {
}
}
+ @Override
public void methodEntryEvent(MethodEntryEvent me) {
Thread.yield(); // fetch output
/*
@@ -125,6 +137,7 @@ public class TTY implements EventNotifier {
}
}
+ @Override
public boolean methodExitEvent(MethodExitEvent me) {
Thread.yield(); // fetch output
/*
@@ -173,6 +186,7 @@ public class TTY implements EventNotifier {
return false;
}
+ @Override
public void vmInterrupted() {
Thread.yield(); // fetch output
printCurrentLocation();
@@ -184,6 +198,7 @@ public class TTY implements EventNotifier {
MessageOutput.printPrompt();
}
+ @Override
public void receivedEvent(Event event) {
}
@@ -317,18 +332,19 @@ public class TTY implements EventNotifier {
// Adapted for use with String[][0].
int low = 0;
int high = commandList.length - 1;
- long i = 0;
while (low <= high) {
int mid = (low + high) >>> 1;
String midVal = commandList[mid][0];
int compare = midVal.compareTo(key);
- if (compare < 0)
+ if (compare < 0) {
low = mid + 1;
- else if (compare > 0)
+ } else if (compare > 0) {
high = mid - 1;
- else
+ }
+ else {
return mid; // key found
}
+ }
return -(low + 1); // key not found.
};
@@ -336,7 +352,9 @@ public class TTY implements EventNotifier {
* Return true if the command is OK when disconnected.
*/
private boolean isDisconnectCmd(int ii) {
- if (ii < 0 || ii >= commandList.length) return false;
+ if (ii < 0 || ii >= commandList.length) {
+ return false;
+ }
return (commandList[ii][1].equals("y"));
}
@@ -344,7 +362,9 @@ public class TTY implements EventNotifier {
* Return true if the command is OK when readonly.
*/
private boolean isReadOnlyCmd(int ii) {
- if (ii < 0 || ii >= commandList.length) return false;
+ if (ii < 0 || ii >= commandList.length) {
+ return false;
+ }
return (commandList[ii][2].equals("y"));
};
diff --git a/src/share/classes/com/sun/tools/example/debug/tty/TTYResources.java b/src/share/classes/com/sun/tools/example/debug/tty/TTYResources.java
index 6193d9ba4c8b2b40c4d0b76575f07a272274e037..f6ba9d74ca71596014a09f18a954b67d3ddc9982 100644
--- a/src/share/classes/com/sun/tools/example/debug/tty/TTYResources.java
+++ b/src/share/classes/com/sun/tools/example/debug/tty/TTYResources.java
@@ -44,6 +44,7 @@ public class TTYResources extends java.util.ListResourceBundle {
*
* @return the contents of this ResourceBundle.
*/
+ @Override
public Object[][] getContents() {
Object[][] temp = new Object[][] {
// NOTE: The value strings in this file containing "{0}" are
diff --git a/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java b/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java
index 5544145981533e3abb6c6ae841c4f67fb3864325..2dcace1c486d05a050729560aa0513d903289785 100644
--- a/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java
+++ b/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java
@@ -44,6 +44,7 @@ public class TTYResources_ja extends java.util.ListResourceBundle {
*
* @return the contents of this ResourceBundle.
*/
+ @Override
public Object[][] getContents() {
Object[][] temp = new Object[][] {
// NOTE: The value strings in this file containing "{0}" are
diff --git a/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java b/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java
index ac948fb9950a181b5ebf30bc4d5d4e939e8fd99e..dc84bdf4f9cbec6693b3ba78d028a96946b46c02 100644
--- a/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java
+++ b/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java
@@ -44,6 +44,7 @@ public class TTYResources_zh_CN extends java.util.ListResourceBundle {
*
* @return the contents of this ResourceBundle.
*/
+ @Override
public Object[][] getContents() {
Object[][] temp = new Object[][] {
// NOTE: The value strings in this file containing "{0}" are
diff --git a/src/share/classes/com/sun/tools/example/debug/tty/ThreadGroupIterator.java b/src/share/classes/com/sun/tools/example/debug/tty/ThreadGroupIterator.java
index 1190c33b42334442a90024891f844055cb95ea4c..dd3ad08106cf6d3b6cf8caf30072078c56ba32c7 100644
--- a/src/share/classes/com/sun/tools/example/debug/tty/ThreadGroupIterator.java
+++ b/src/share/classes/com/sun/tools/example/debug/tty/ThreadGroupIterator.java
@@ -26,7 +26,6 @@
package com.sun.tools.example.debug.tty;
import com.sun.jdi.ThreadGroupReference;
-import com.sun.jdi.ThreadReference;
import java.util.List;
import java.util.Stack;
import java.util.ArrayList;
@@ -70,10 +69,12 @@ class ThreadGroupIterator implements Iterator {
}
}
+ @Override
public boolean hasNext() {
return !stack.isEmpty();
}
+ @Override
public ThreadGroupReference next() {
return nextThreadGroup();
}
@@ -84,6 +85,7 @@ class ThreadGroupIterator implements Iterator {
return tg;
}
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
diff --git a/src/share/classes/com/sun/tools/example/debug/tty/ThreadInfo.java b/src/share/classes/com/sun/tools/example/debug/tty/ThreadInfo.java
index 1432239f6488d1920c34891f5eaaa8e6a40ddd8e..8ac294fbcaf6bc6928d2342b09d007d76f7244c3 100644
--- a/src/share/classes/com/sun/tools/example/debug/tty/ThreadInfo.java
+++ b/src/share/classes/com/sun/tools/example/debug/tty/ThreadInfo.java
@@ -32,8 +32,6 @@ import com.sun.jdi.StackFrame;
import java.util.List;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Iterator;
-import java.io.*;
class ThreadInfo {
// This is a list of all known ThreadInfo objects. It survives
diff --git a/src/share/classes/com/sun/tools/example/debug/tty/ThreadIterator.java b/src/share/classes/com/sun/tools/example/debug/tty/ThreadIterator.java
index 58ec98495e0b415f403fecbb80b6089ffbfa3940..6acb2ea9d099e0aba3250356e677d7dd14a44228 100644
--- a/src/share/classes/com/sun/tools/example/debug/tty/ThreadIterator.java
+++ b/src/share/classes/com/sun/tools/example/debug/tty/ThreadIterator.java
@@ -46,6 +46,7 @@ class ThreadIterator implements Iterator {
tgi = new ThreadGroupIterator();
}
+ @Override
public boolean hasNext() {
while (it == null || !it.hasNext()) {
if (!tgi.hasNext()) {
@@ -56,6 +57,7 @@ class ThreadIterator implements Iterator {
return true;
}
+ @Override
public ThreadReference next() {
return it.next();
}
@@ -64,6 +66,7 @@ class ThreadIterator implements Iterator {
return next();
}
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
diff --git a/src/share/classes/com/sun/tools/example/debug/tty/VMConnection.java b/src/share/classes/com/sun/tools/example/debug/tty/VMConnection.java
index fead3f797882e583162302cda8165e670c9f9445..0b77f9824a2f3735820498d5102ba2b645f77505 100644
--- a/src/share/classes/com/sun/tools/example/debug/tty/VMConnection.java
+++ b/src/share/classes/com/sun/tools/example/debug/tty/VMConnection.java
@@ -28,7 +28,6 @@ package com.sun.tools.example.debug.tty;
import com.sun.jdi.*;
import com.sun.jdi.connect.*;
import com.sun.jdi.request.EventRequestManager;
-import com.sun.jdi.request.ExceptionRequest;
import com.sun.jdi.request.ThreadStartRequest;
import com.sun.jdi.request.ThreadDeathRequest;
@@ -292,6 +291,7 @@ class VMConnection {
*/
private void displayRemoteOutput(final InputStream stream) {
Thread thr = new Thread("output reader") {
+ @Override
public void run() {
try {
dumpStream(stream);
diff --git a/src/share/classes/com/sun/tools/example/debug/tty/VMNotConnectedException.java b/src/share/classes/com/sun/tools/example/debug/tty/VMNotConnectedException.java
index 448561d04d5bf43df1b5d5a95e0bf8169a106b66..780301ca60799c3e85318c5d47ded4c77c29c940 100644
--- a/src/share/classes/com/sun/tools/example/debug/tty/VMNotConnectedException.java
+++ b/src/share/classes/com/sun/tools/example/debug/tty/VMNotConnectedException.java
@@ -27,6 +27,8 @@ package com.sun.tools.example.debug.tty;
public class VMNotConnectedException extends RuntimeException {
+ private static final long serialVersionUID = -7433430494903950165L;
+
public VMNotConnectedException() {
super();
}
diff --git a/src/share/classes/com/sun/tools/example/debug/tty/WatchpointSpec.java b/src/share/classes/com/sun/tools/example/debug/tty/WatchpointSpec.java
index e424c40d62a506d29db2350c41761a3d3abe4cc9..6c7da78f48500deadf73d28d6e3822963ee00969 100644
--- a/src/share/classes/com/sun/tools/example/debug/tty/WatchpointSpec.java
+++ b/src/share/classes/com/sun/tools/example/debug/tty/WatchpointSpec.java
@@ -25,8 +25,6 @@
package com.sun.tools.example.debug.tty;
-import com.sun.jdi.*;
-
abstract class WatchpointSpec extends EventRequestSpec {
final String fieldId;
@@ -39,11 +37,13 @@ abstract class WatchpointSpec extends EventRequestSpec {
}
}
+ @Override
public int hashCode() {
return refSpec.hashCode() + fieldId.hashCode() +
getClass().hashCode();
}
+ @Override
public boolean equals(Object obj) {
if (obj instanceof WatchpointSpec) {
WatchpointSpec watchpoint = (WatchpointSpec)obj;
@@ -56,6 +56,7 @@ abstract class WatchpointSpec extends EventRequestSpec {
}
}
+ @Override
String errorMessageFor(Exception e) {
if (e instanceof NoSuchFieldException) {
return (MessageOutput.format("No field in",
diff --git a/src/share/classes/com/sun/tools/example/trace/EventThread.java b/src/share/classes/com/sun/tools/example/trace/EventThread.java
index 7e729a16b07fce0922e82132be5051c8a2be26e8..229a41689890ac67611a4511d0055709a8ede6c0 100644
--- a/src/share/classes/com/sun/tools/example/trace/EventThread.java
+++ b/src/share/classes/com/sun/tools/example/trace/EventThread.java
@@ -49,7 +49,8 @@ public class EventThread extends Thread {
private boolean vmDied = true; // VMDeath occurred
// Maps ThreadReference to ThreadTrace instances
- private Map traceMap = new HashMap();
+ private Map traceMap =
+ new HashMap<>();
EventThread(VirtualMachine vm, String[] excludes, PrintWriter writer) {
super("event-handler");
@@ -63,6 +64,7 @@ public class EventThread extends Thread {
* As long as we are connected, get event sets off
* the queue and dispatch the events within them.
*/
+ @Override
public void run() {
EventQueue queue = vm.eventQueue();
while (connected) {
@@ -208,7 +210,7 @@ public class EventThread extends Thread {
* creating one if needed.
*/
ThreadTrace threadTrace(ThreadReference thread) {
- ThreadTrace trace = (ThreadTrace)traceMap.get(thread);
+ ThreadTrace trace = traceMap.get(thread);
if (trace == null) {
trace = new ThreadTrace(thread);
traceMap.put(thread, trace);
@@ -297,7 +299,7 @@ public class EventThread extends Thread {
}
void threadDeathEvent(ThreadDeathEvent event) {
- ThreadTrace trace = (ThreadTrace)traceMap.get(event.thread());
+ ThreadTrace trace = traceMap.get(event.thread());
if (trace != null) { // only want threads we care about
trace.threadDeathEvent(event); // Forward event
}
@@ -309,9 +311,8 @@ public class EventThread extends Thread {
*/
private void classPrepareEvent(ClassPrepareEvent event) {
EventRequestManager mgr = vm.eventRequestManager();
- List fields = event.referenceType().visibleFields();
- for (Iterator it = fields.iterator(); it.hasNext(); ) {
- Field field = (Field)it.next();
+ List fields = event.referenceType().visibleFields();
+ for (Field field : fields) {
ModificationWatchpointRequest req =
mgr.createModificationWatchpointRequest(field);
for (int i=0; i arguments =
+ connectorArguments(connector, mainArgs);
try {
return connector.launch(arguments);
} catch (IOException exc) {
@@ -186,10 +186,8 @@ public class Trace {
* Find a com.sun.jdi.CommandLineLaunch connector
*/
LaunchingConnector findLaunchingConnector() {
- List connectors = Bootstrap.virtualMachineManager().allConnectors();
- Iterator iter = connectors.iterator();
- while (iter.hasNext()) {
- Connector connector = (Connector)iter.next();
+ List connectors = Bootstrap.virtualMachineManager().allConnectors();
+ for (Connector connector : connectors) {
if (connector.name().equals("com.sun.jdi.CommandLineLaunch")) {
return (LaunchingConnector)connector;
}
@@ -200,8 +198,8 @@ public class Trace {
/**
* Return the launching connector's arguments.
*/
- Map connectorArguments(LaunchingConnector connector, String mainArgs) {
- Map arguments = connector.defaultArguments();
+ Map connectorArguments(LaunchingConnector connector, String mainArgs) {
+ Map arguments = connector.defaultArguments();
Connector.Argument mainArg =
(Connector.Argument)arguments.get("main");
if (mainArg == null) {
diff --git a/src/share/classes/java/awt/Component.java b/src/share/classes/java/awt/Component.java
index 5b572797d8436ba1dfdb99f90197a2555bc3031a..f577887abe67c4caf7831dd385c71e25909a3427 100644
--- a/src/share/classes/java/awt/Component.java
+++ b/src/share/classes/java/awt/Component.java
@@ -2944,6 +2944,46 @@ public abstract class Component implements ImageObserver, MenuContainer,
}
}
+ /**
+ * Revalidates the component hierarchy up to the nearest validate root.
+ *
+ * This method first invalidates the component hierarchy starting from this
+ * component up to the nearest validate root. Afterwards, the component
+ * hierarchy is validated starting from the nearest validate root.
+ *
+ * This is a convenience method supposed to help application developers
+ * avoid looking for validate roots manually. Basically, it's equivalent to
+ * first calling the {@link #invalidate()} method on this component, and
+ * then calling the {@link #validate()} method on the nearest validate
+ * root.
+ *
+ * @see Container#isValidateRoot
+ * @since 1.7
+ */
+ public void revalidate() {
+ synchronized (getTreeLock()) {
+ invalidate();
+
+ Container root = getContainer();
+ if (root == null) {
+ // There's no parents. Just validate itself.
+ validate();
+ } else {
+ while (!root.isValidateRoot()) {
+ if (root.getContainer() == null) {
+ // If there's no validate roots, we'll validate the
+ // topmost container
+ break;
+ }
+
+ root = root.getContainer();
+ }
+
+ root.validate();
+ }
+ }
+ }
+
/**
* Creates a graphics context for this component. This method will
* return null if this component is currently not
diff --git a/src/share/classes/java/awt/GraphicsDevice.java b/src/share/classes/java/awt/GraphicsDevice.java
index f3b7cd390a66eb540fee829746e22fa384a71de5..b99d7ef8def77620c44dee7ae2bf7fa20292ba32 100644
--- a/src/share/classes/java/awt/GraphicsDevice.java
+++ b/src/share/classes/java/awt/GraphicsDevice.java
@@ -257,6 +257,11 @@ public abstract class GraphicsDevice {
* 1.0f, and the background color alpha is set to 255 (completely opaque).
* These values are not restored when returning to windowed mode.
*
+ * It is unspecified and platform-dependent how decorated windows operate
+ * in full-screen mode. For this reason, it is recommended to turn off
+ * the decorations in a {@code Frame} or {@code Dialog} object by using the
+ * {@code setUndecorated} method.
+ *
* When returning to windowed mode from an exclusive full-screen window,
* any display changes made by calling {@code setDisplayMode} are
* automatically restored to their original state.
@@ -272,6 +277,8 @@ public abstract class GraphicsDevice {
* @see #setDisplayMode
* @see Component#enableInputMethods
* @see Component#setVisible
+ * @see Frame#setUndecorated
+ * @see Dialog#setUndecorated
*
* @since 1.4
*/
diff --git a/src/share/classes/java/awt/RadialGradientPaint.java b/src/share/classes/java/awt/RadialGradientPaint.java
index d2ba4be3ece65214c0edf33d920927d1cc0a8836..c9cc43a8e32cf440305184dbf4b0ec57e2fbd4b4 100644
--- a/src/share/classes/java/awt/RadialGradientPaint.java
+++ b/src/share/classes/java/awt/RadialGradientPaint.java
@@ -49,9 +49,11 @@ import java.beans.ConstructorProperties;
* from the focus point to the circumference will thus span all the gradient
* colors.
*
- * Specifying a focus point outside of the circle's radius will result in the
- * focus being set to the intersection point of the focus-center line and the
- * perimeter of the circle.
+ * Specifying a focus point outside of the radius of the circle will cause
+ * the rings of the gradient pattern to be centered on the point just inside
+ * the edge of the circle in the direction of the focus point.
+ * The rendering will internally use this modified location as if it were
+ * the specified focus point.
*
* The user must provide an array of floats specifying how to distribute the
* colors along the gradient. These values should range from 0.0 to 1.0 and
@@ -621,6 +623,11 @@ public final class RadialGradientPaint extends MultipleGradientPaint {
/**
* Returns a copy of the focus point of the radial gradient.
+ * Note that if the focus point specified when the radial gradient
+ * was constructed lies outside of the radius of the circle, this
+ * method will still return the original focus point even though
+ * the rendering may center the rings of color on a different
+ * point that lies inside the radius.
*
* @return a {@code Point2D} object that is a copy of the focus point
*/
diff --git a/src/share/classes/java/awt/Toolkit.java b/src/share/classes/java/awt/Toolkit.java
index 58a4ddc7b4f15c07c9ec32c7e066d80be3cb6866..6e00e6afdbf260aba46d82a34b09e98b0be903f1 100644
--- a/src/share/classes/java/awt/Toolkit.java
+++ b/src/share/classes/java/awt/Toolkit.java
@@ -1870,11 +1870,15 @@ public abstract class Toolkit {
/**
* Adds the specified property change listener for the named desktop
- * property.
- * If pcl is null, no exception is thrown and no action is performed.
+ * property. When a {@link PropertyChangeListenerProxy} object is added,
+ * its property name is ignored, and the wrapped listener is added.
+ * If {@code name} is {@code null} or {@code pcl} is {@code null},
+ * no exception is thrown and no action is performed.
*
* @param name The name of the property to listen for
* @param pcl The property change listener
+ * @see PropertyChangeSupport#addPropertyChangeListener(String,
+ PropertyChangeListener)
* @since 1.2
*/
public void addPropertyChangeListener(String name, PropertyChangeListener pcl) {
@@ -1883,11 +1887,16 @@ public abstract class Toolkit {
/**
* Removes the specified property change listener for the named
- * desktop property.
- * If pcl is null, no exception is thrown and no action is performed.
+ * desktop property. When a {@link PropertyChangeListenerProxy} object
+ * is removed, its property name is ignored, and
+ * the wrapped listener is removed.
+ * If {@code name} is {@code null} or {@code pcl} is {@code null},
+ * no exception is thrown and no action is performed.
*
* @param name The name of the property to remove
* @param pcl The property change listener
+ * @see PropertyChangeSupport#removePropertyChangeListener(String,
+ PropertyChangeListener)
* @since 1.2
*/
public void removePropertyChangeListener(String name, PropertyChangeListener pcl) {
@@ -1896,12 +1905,15 @@ public abstract class Toolkit {
/**
* Returns an array of all the property change listeners
- * registered on this toolkit.
+ * registered on this toolkit. The returned array
+ * contains {@code PropertyChangeListenerProxy} objects
+ * that associate listeners with the names of desktop properties.
*
- * @return all of this toolkit's PropertyChangeListeners
- * or an empty array if no property change
- * listeners are currently registered
+ * @return all of this toolkit's {@ code PropertyChangeListener}
+ * objects wrapped in {@code PropertyChangeListenerProxy} objects
+ * or an empty array if no listeners are added
*
+ * @see PropertyChangeSupport#getPropertyChangeListeners()
* @since 1.4
*/
public PropertyChangeListener[] getPropertyChangeListeners() {
@@ -1909,13 +1921,15 @@ public abstract class Toolkit {
}
/**
- * Returns an array of all the PropertyChangeListeners
- * associated with the named property.
+ * Returns an array of all property change listeners
+ * associated with the specified name of a desktop property.
*
* @param propertyName the named property
- * @return all of the PropertyChangeListeners associated with
- * the named property or an empty array if no such listeners have
- * been added
+ * @return all of the {@code PropertyChangeListener} objects
+ * associated with the specified name of a desktop property
+ * or an empty array if no such listeners are added
+ *
+ * @see PropertyChangeSupport#getPropertyChangeListeners(String)
* @since 1.4
*/
public PropertyChangeListener[] getPropertyChangeListeners(String propertyName) {
diff --git a/src/share/classes/java/awt/geom/Arc2D.java b/src/share/classes/java/awt/geom/Arc2D.java
index 86653be120ceacfb36b40ab33d987f24e685e69c..802ec5a5297918c34c5389fddb565e6b40666d57 100644
--- a/src/share/classes/java/awt/geom/Arc2D.java
+++ b/src/share/classes/java/awt/geom/Arc2D.java
@@ -681,7 +681,7 @@ public abstract class Arc2D extends RectangularShape {
* @see java.awt.geom.Arc2D.Float
* @see java.awt.geom.Arc2D.Double
*/
- Arc2D() {
+ protected Arc2D() {
this(OPEN);
}
diff --git a/src/share/classes/java/awt/geom/Path2D.java b/src/share/classes/java/awt/geom/Path2D.java
index c84948c8ee9c05ebd354b14bb87d86799e33f398..39f7d992b286837091464ad06d5d1f30a7b18a4e 100644
--- a/src/share/classes/java/awt/geom/Path2D.java
+++ b/src/share/classes/java/awt/geom/Path2D.java
@@ -732,7 +732,7 @@ public abstract class Path2D implements Shape, Cloneable {
*
* @since 1.6
*/
- public PathIterator getPathIterator(AffineTransform at) {
+ public final PathIterator getPathIterator(AffineTransform at) {
if (at == null) {
return new CopyIterator(this);
} else {
@@ -1461,7 +1461,7 @@ public abstract class Path2D implements Shape, Cloneable {
* of this {@code Shape}'s outline
* @since 1.6
*/
- public PathIterator getPathIterator(AffineTransform at) {
+ public final PathIterator getPathIterator(AffineTransform at) {
if (at == null) {
return new CopyIterator(this);
} else {
@@ -2342,8 +2342,8 @@ public abstract class Path2D implements Shape, Cloneable {
*
* @since 1.6
*/
- public PathIterator getPathIterator(AffineTransform at,
- double flatness)
+ public final PathIterator getPathIterator(AffineTransform at,
+ double flatness)
{
return new FlatteningPathIterator(getPathIterator(at), flatness);
}
diff --git a/src/share/classes/java/beans/DefaultPersistenceDelegate.java b/src/share/classes/java/beans/DefaultPersistenceDelegate.java
index 6c33c0ce12f191b9c8f24832681c72fa8b28dbfc..951d97210b00bba74f355b23eab3bd4a7d576f70 100644
--- a/src/share/classes/java/beans/DefaultPersistenceDelegate.java
+++ b/src/share/classes/java/beans/DefaultPersistenceDelegate.java
@@ -26,6 +26,7 @@ package java.beans;
import java.util.*;
import java.lang.reflect.*;
+import java.util.Objects;
import sun.reflect.misc.*;
@@ -181,10 +182,6 @@ public class DefaultPersistenceDelegate extends PersistenceDelegate {
return method;
}
- private static boolean equals(Object o1, Object o2) {
- return (o1 == null) ? (o2 == null) : o1.equals(o2);
- }
-
private void doProperty(Class type, PropertyDescriptor pd, Object oldInstance, Object newInstance, Encoder out) throws Exception {
Method getter = pd.getReadMethod();
Method setter = pd.getWriteMethod();
@@ -195,7 +192,7 @@ public class DefaultPersistenceDelegate extends PersistenceDelegate {
Object oldValue = oldGetExp.getValue();
Object newValue = newGetExp.getValue();
out.writeExpression(oldGetExp);
- if (!equals(newValue, out.get(oldValue))) {
+ if (!Objects.equals(newValue, out.get(oldValue))) {
// Search for a static constant with this value;
Object e = (Object[])pd.getValue("enumerationValues");
if (e instanceof Object[] && Array.getLength(e) % 3 == 0) {
@@ -233,7 +230,7 @@ public class DefaultPersistenceDelegate extends PersistenceDelegate {
Object oldValue = oldGetExp.getValue();
Object newValue = newGetExp.getValue();
out.writeExpression(oldGetExp);
- if (!equals(newValue, out.get(oldValue))) {
+ if (!Objects.equals(newValue, out.get(oldValue))) {
out.writeStatement(new Statement(field, "set", new Object[] { oldInstance, oldValue }));
}
}
diff --git a/src/share/classes/java/beans/MetaData.java b/src/share/classes/java/beans/MetaData.java
index c95a6157948dac8288378668ebca08d92bdbb304..c4ab869e955f15db5c4de1aa862f43dccd3af09d 100644
--- a/src/share/classes/java/beans/MetaData.java
+++ b/src/share/classes/java/beans/MetaData.java
@@ -56,6 +56,8 @@ import javax.swing.plaf.ColorUIResource;
import sun.swing.PrintColorUIResource;
+import java.util.Objects;
+
/*
* Like the Intropector, the MetaData class
* contains meta objects that describe the way
@@ -134,7 +136,7 @@ class ArrayPersistenceDelegate extends PersistenceDelegate {
Object oldValue = oldGetExp.getValue();
Object newValue = newGetExp.getValue();
out.writeExpression(oldGetExp);
- if (!MetaData.equals(newValue, out.get(oldValue))) {
+ if (!Objects.equals(newValue, out.get(oldValue))) {
// System.out.println("Not equal: " + newGetExp + " != " + actualGetExp);
// invokeStatement(Array.class, "set", new Object[]{oldInstance, index, oldValue}, out);
DefaultPersistenceDelegate.invokeStatement(oldInstance, "set", new Object[]{index, oldValue}, out);
@@ -635,7 +637,7 @@ class java_util_List_PersistenceDelegate extends DefaultPersistenceDelegate {
Object oldValue = oldGetExp.getValue();
Object newValue = newGetExp.getValue();
out.writeExpression(oldGetExp);
- if (!MetaData.equals(newValue, out.get(oldValue))) {
+ if (!Objects.equals(newValue, out.get(oldValue))) {
invokeStatement(oldInstance, "set", new Object[]{index, oldValue}, out);
}
}
@@ -675,7 +677,7 @@ class java_util_Map_PersistenceDelegate extends DefaultPersistenceDelegate {
Object oldValue = oldGetExp.getValue();
Object newValue = newGetExp.getValue();
out.writeExpression(oldGetExp);
- if (!MetaData.equals(newValue, out.get(oldValue))) {
+ if (!Objects.equals(newValue, out.get(oldValue))) {
invokeStatement(oldInstance, "put", new Object[]{oldKey, oldValue}, out);
} else if ((newValue == null) && !newMap.containsKey(oldKey)) {
// put oldValue(=null?) if oldKey is absent in newMap
@@ -899,17 +901,17 @@ class java_awt_Component_PersistenceDelegate extends DefaultPersistenceDelegate
if (!(oldInstance instanceof java.awt.Window)) {
Object oldBackground = c.isBackgroundSet() ? c.getBackground() : null;
Object newBackground = c2.isBackgroundSet() ? c2.getBackground() : null;
- if (!MetaData.equals(oldBackground, newBackground)) {
+ if (!Objects.equals(oldBackground, newBackground)) {
invokeStatement(oldInstance, "setBackground", new Object[] { oldBackground }, out);
}
Object oldForeground = c.isForegroundSet() ? c.getForeground() : null;
Object newForeground = c2.isForegroundSet() ? c2.getForeground() : null;
- if (!MetaData.equals(oldForeground, newForeground)) {
+ if (!Objects.equals(oldForeground, newForeground)) {
invokeStatement(oldInstance, "setForeground", new Object[] { oldForeground }, out);
}
Object oldFont = c.isFontSet() ? c.getFont() : null;
Object newFont = c2.isFontSet() ? c2.getFont() : null;
- if (!MetaData.equals(oldFont, newFont)) {
+ if (!Objects.equals(oldFont, newFont)) {
invokeStatement(oldInstance, "setFont", new Object[] { oldFont }, out);
}
}
@@ -1306,10 +1308,6 @@ class MetaData {
internalPersistenceDelegates.put("java.util.RegularEnumSet", new java_util_EnumSet_PersistenceDelegate());
}
- /*pp*/ static boolean equals(Object o1, Object o2) {
- return (o1 == null) ? (o2 == null) : o1.equals(o2);
- }
-
public synchronized static PersistenceDelegate getPersistenceDelegate(Class type) {
if (type == null) {
return nullPersistenceDelegate;
diff --git a/src/share/classes/java/io/File.java b/src/share/classes/java/io/File.java
index 1bfc0c1837e74f1315833021dcdc7d9eb2b973cf..4b9d389a2d0bb74c335838354b2bb5f62c31f9b9 100644
--- a/src/share/classes/java/io/File.java
+++ b/src/share/classes/java/io/File.java
@@ -25,7 +25,6 @@
package java.io;
-import java.beans.ConstructorProperties;
import java.net.URI;
import java.net.URL;
import java.net.MalformedURLException;
@@ -247,7 +246,6 @@ public class File
* @throws NullPointerException
* If the pathname argument is null
*/
- @ConstructorProperties("path")
public File(String pathname) {
if (pathname == null) {
throw new NullPointerException();
diff --git a/src/share/classes/java/lang/ArithmeticException.java b/src/share/classes/java/lang/ArithmeticException.java
index 0d6ed9164ef9ed3d5c7a6d9f76b76bc167c384da..af00777dbcdd2e176162734ab98f1b361dc807c2 100644
--- a/src/share/classes/java/lang/ArithmeticException.java
+++ b/src/share/classes/java/lang/ArithmeticException.java
@@ -32,7 +32,8 @@ package java.lang;
*
* {@code ArithmeticException} objects may be constructed by the
* virtual machine as if {@linkplain Throwable#Throwable(String,
- * Throwable, boolean) suppression were disabled}.
+ * Throwable, boolean, boolean) suppression were disabled and/or the
+ * stack trace was not writable}.
*
* @author unascribed
* @since JDK1.0
diff --git a/src/share/classes/java/lang/Character.java b/src/share/classes/java/lang/Character.java
index e52a83a84b18cc1fa7aff54138d737bd19c09377..216098bd5335bc3579d344bbb70b5578f87fdfc0 100644
--- a/src/share/classes/java/lang/Character.java
+++ b/src/share/classes/java/lang/Character.java
@@ -59,14 +59,14 @@ import java.util.Locale;
*
The {@code char} data type (and therefore the value that a
* {@code Character} object encapsulates) are based on the
* original Unicode specification, which defined characters as
- * fixed-width 16-bit entities. The Unicode standard has since been
+ * fixed-width 16-bit entities. The Unicode Standard has since been
* changed to allow for characters whose representation requires more
* than 16 bits. The range of legal code points is now
* U+0000 to U+10FFFF, known as Unicode scalar value.
* (Refer to the
* definition of the U+n notation in the Unicode
- * standard.)
+ * Standard.)
*
*
The set of characters from U+0000 to U+FFFF is
* sometimes referred to as the Basic Multilingual Plane (BMP).
@@ -5200,7 +5200,8 @@ class Character implements java.io.Serializable, Comparable {
*
* A character is lowercase if its general category type, provided
* by {@code Character.getType(ch)}, is
- * {@code LOWERCASE_LETTER}.
+ * {@code LOWERCASE_LETTER}, or it has contributory property
+ * Other_Lowercase as defined by the Unicode Standard.
*
* The following are examples of lowercase characters:
*
@@ -5235,7 +5236,8 @@ class Character implements java.io.Serializable, Comparable {
*
* A character is lowercase if its general category type, provided
* by {@link Character#getType getType(codePoint)}, is
- * {@code LOWERCASE_LETTER}.
+ * {@code LOWERCASE_LETTER}, or it has contributory property
+ * Other_Lowercase as defined by the Unicode Standard.
*
* The following are examples of lowercase characters:
*
@@ -5257,7 +5259,8 @@ class Character implements java.io.Serializable, Comparable {
* @since 1.5
*/
public static boolean isLowerCase(int codePoint) {
- return getType(codePoint) == Character.LOWERCASE_LETTER;
+ return getType(codePoint) == Character.LOWERCASE_LETTER ||
+ CharacterData.of(codePoint).isOtherLowercase(codePoint);
}
/**
@@ -5265,6 +5268,7 @@ class Character implements java.io.Serializable, Comparable {
*
* A character is uppercase if its general category type, provided by
* {@code Character.getType(ch)}, is {@code UPPERCASE_LETTER}.
+ * or it has contributory property Other_Uppercase as defined by the Unicode Standard.
*
* The following are examples of uppercase characters:
*
@@ -5298,7 +5302,8 @@ class Character implements java.io.Serializable, Comparable {
* Determines if the specified character (Unicode code point) is an uppercase character.
*
* A character is uppercase if its general category type, provided by
- * {@link Character#getType(int) getType(codePoint)}, is {@code UPPERCASE_LETTER}.
+ * {@link Character#getType(int) getType(codePoint)}, is {@code UPPERCASE_LETTER},
+ * or it has contributory property Other_Uppercase as defined by the Unicode Standard.
*
* The following are examples of uppercase characters:
*
@@ -5320,7 +5325,8 @@ class Character implements java.io.Serializable, Comparable {
* @since 1.5
*/
public static boolean isUpperCase(int codePoint) {
- return getType(codePoint) == Character.UPPERCASE_LETTER;
+ return getType(codePoint) == Character.UPPERCASE_LETTER ||
+ CharacterData.of(codePoint).isOtherUppercase(codePoint);
}
/**
@@ -5724,6 +5730,52 @@ class Character implements java.io.Serializable, Comparable {
return isJavaIdentifierPart(ch);
}
+ /**
+ * Determines if the specified character (Unicode code point) is an alphabet.
+ *
+ * A character is considered to be alphabetic if its general category type,
+ * provided by {@link Character#getType(int) getType(codePoint)}, is any of
+ * the following:
+ *
+ * -
UPPERCASE_LETTER
+ * -
LOWERCASE_LETTER
+ * -
TITLECASE_LETTER
+ * -
MODIFIER_LETTER
+ * -
OTHER_LETTER
+ * -
LETTER_NUMBER
+ *
+ * or it has contributory property Other_Alphabetic as defined by the
+ * Unicode Standard.
+ *
+ * @param codePoint the character (Unicode code point) to be tested.
+ * @return true if the character is a Unicode alphabet
+ * character, false otherwise.
+ * @since 1.7
+ */
+ public static boolean isAlphabetic(int codePoint) {
+ return (((((1 << Character.UPPERCASE_LETTER) |
+ (1 << Character.LOWERCASE_LETTER) |
+ (1 << Character.TITLECASE_LETTER) |
+ (1 << Character.MODIFIER_LETTER) |
+ (1 << Character.OTHER_LETTER) |
+ (1 << Character.LETTER_NUMBER)) >> getType(codePoint)) & 1) != 0) ||
+ CharacterData.of(codePoint).isOtherAlphabetic(codePoint);
+ }
+
+ /**
+ * Determines if the specified character (Unicode code point) is a CJKV
+ * (Chinese, Japanese, Korean and Vietnamese) ideograph, as defined by
+ * the Unicode Standard.
+ *
+ * @param codePoint the character (Unicode code point) to be tested.
+ * @return true if the character is a Unicode ideograph
+ * character, false otherwise.
+ * @since 1.7
+ */
+ public static boolean isIdeographic(int codePoint) {
+ return CharacterData.of(codePoint).isIdeographic(codePoint);
+ }
+
/**
* Determines if the specified character is
* permissible as the first character in a Java identifier.
@@ -6430,7 +6482,7 @@ class Character implements java.io.Serializable, Comparable {
/**
* Determines if the specified character is a Unicode space character.
* A character is considered to be a space character if and only if
- * it is specified to be a space character by the Unicode standard. This
+ * it is specified to be a space character by the Unicode Standard. This
* method returns true if the character's general category type is any of
* the following:
*
@@ -6458,7 +6510,7 @@ class Character implements java.io.Serializable, Comparable {
* Determines if the specified character (Unicode code point) is a
* Unicode space character. A character is considered to be a
* space character if and only if it is specified to be a space
- * character by the Unicode standard. This method returns true if
+ * character by the Unicode Standard. This method returns true if
* the character's general category type is any of the following:
*
*
@@ -6908,7 +6960,7 @@ class Character implements java.io.Serializable, Comparable {
* @since 1.4
*/
static char[] toUpperCaseCharArray(int codePoint) {
- // As of Unicode 4.0, 1:M uppercasings only happen in the BMP.
+ // As of Unicode 6.0, 1:M uppercasings only happen in the BMP.
assert isBmpCodePoint(codePoint);
return CharacterData.of(codePoint).toUpperCaseCharArray(codePoint);
}
@@ -6941,7 +6993,7 @@ class Character implements java.io.Serializable, Comparable {
* Note: if the specified character is not assigned a name by
* the UnicodeData file (part of the Unicode Character
* Database maintained by the Unicode Consortium), the returned
- * name is the same as the result of expression
+ * name is the same as the result of expression.
*
* {@code
* Character.UnicodeBlock.of(codePoint).toString().replace('_', ' ')
diff --git a/src/share/classes/java/lang/CharacterData.java b/src/share/classes/java/lang/CharacterData.java
index af86462b071c89a19b3d6acd3dc9c9ac8e5b5d1d..597f98c443a4a50f60d6995f9fd6132502eab2e6 100644
--- a/src/share/classes/java/lang/CharacterData.java
+++ b/src/share/classes/java/lang/CharacterData.java
@@ -46,10 +46,27 @@ abstract class CharacterData {
int toUpperCaseEx(int ch) {
return toUpperCase(ch);
}
+
char[] toUpperCaseCharArray(int ch) {
return null;
}
+ boolean isOtherLowercase(int ch) {
+ return false;
+ }
+
+ boolean isOtherUppercase(int ch) {
+ return false;
+ }
+
+ boolean isOtherAlphabetic(int ch) {
+ return false;
+ }
+
+ boolean isIdeographic(int ch) {
+ return false;
+ }
+
// Character <= 0xff (basic latin) is handled by internal fast-path
// to avoid initializing large tables.
// Note: performance of this "fast-path" code may be sub-optimal
diff --git a/src/share/classes/java/lang/Error.java b/src/share/classes/java/lang/Error.java
index 1c5c50797f497d0e0dd2fc48833bdbeb78be56bb..d18c15f84ce638275ec5e74470bd8f2a73636556 100644
--- a/src/share/classes/java/lang/Error.java
+++ b/src/share/classes/java/lang/Error.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 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
@@ -79,7 +79,7 @@ public class Error extends Throwable {
* @param message the detail message (which is saved for later retrieval
* by the {@link #getMessage()} method).
* @param cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method). (A null value is
+ * {@link #getCause()} method). (A {@code null} value is
* permitted, and indicates that the cause is nonexistent or
* unknown.)
* @since 1.4
@@ -90,13 +90,13 @@ public class Error extends Throwable {
/**
* Constructs a new error with the specified cause and a detail
- * message of (cause==null ? null : cause.toString()) (which
- * typically contains the class and detail message of cause).
+ * message of {@code (cause==null ? null : cause.toString())} (which
+ * typically contains the class and detail message of {@code cause}).
* This constructor is useful for errors that are little more than
* wrappers for other throwables.
*
* @param cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method). (A null value is
+ * {@link #getCause()} method). (A {@code null} value is
* permitted, and indicates that the cause is nonexistent or
* unknown.)
* @since 1.4
@@ -104,4 +104,25 @@ public class Error extends Throwable {
public Error(Throwable cause) {
super(cause);
}
+
+ /**
+ * Constructs a new error with the specified detail message,
+ * cause, suppression enabled or disabled, and writable stack
+ * trace enabled or disabled.
+ *
+ * @param message the detail message.
+ * @param cause the cause. (A {@code null} value is permitted,
+ * and indicates that the cause is nonexistent or unknown.)
+ * @param enableSuppression whether or not suppression is enabled
+ * or disabled
+ * @param writableStackTrace whether or not the stack trace should
+ * be writable
+ *
+ * @since 1.7
+ */
+ protected Error(String message, Throwable cause,
+ boolean enableSuppression,
+ boolean writableStackTrace) {
+ super(message, cause, enableSuppression, writableStackTrace);
+ }
}
diff --git a/src/share/classes/java/lang/Exception.java b/src/share/classes/java/lang/Exception.java
index 944aa052369c03c3244a1a8b1446df3a11407939..0bcbf9cd045faaa88dbf82c5aa505764bd6526a5 100644
--- a/src/share/classes/java/lang/Exception.java
+++ b/src/share/classes/java/lang/Exception.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 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
@@ -101,4 +101,24 @@ public class Exception extends Throwable {
public Exception(Throwable cause) {
super(cause);
}
+
+ /**
+ * Constructs a new exception with the specified detail message,
+ * cause, suppression enabled or disabled, and writable stack
+ * trace enabled or disabled.
+ *
+ * @param message the detail message.
+ * @param cause the cause. (A {@code null} value is permitted,
+ * and indicates that the cause is nonexistent or unknown.)
+ * @param enableSuppression whether or not suppression is enabled
+ * or disabled
+ * @param writableStackTrace whether or not the stack trace should
+ * be writable
+ * @since 1.7
+ */
+ protected Exception(String message, Throwable cause,
+ boolean enableSuppression,
+ boolean writableStackTrace) {
+ super(message, cause, enableSuppression, writableStackTrace);
+ }
}
diff --git a/src/share/classes/java/lang/NullPointerException.java b/src/share/classes/java/lang/NullPointerException.java
index 0472710f23f786c602993b4d8b5f19156d6fa6a9..5b87ec4fd7c96bf2f7e70e68c8d40e9806c2ca75 100644
--- a/src/share/classes/java/lang/NullPointerException.java
+++ b/src/share/classes/java/lang/NullPointerException.java
@@ -43,7 +43,8 @@ package java.lang;
*
* {@code NullPointerException} objects may be constructed by the
* virtual machine as if {@linkplain Throwable#Throwable(String,
- * Throwable, boolean) suppression were disabled}.
+ * Throwable, boolean, boolean) suppression were disabled and/or the
+ * stack trace was not writable}.
*
* @author unascribed
* @since JDK1.0
diff --git a/src/share/classes/java/lang/OutOfMemoryError.java b/src/share/classes/java/lang/OutOfMemoryError.java
index 37b0ae6f47694b47258b72b588a29aa228beba98..0f9df4e2f16519225e69515e7bd162d778346c76 100644
--- a/src/share/classes/java/lang/OutOfMemoryError.java
+++ b/src/share/classes/java/lang/OutOfMemoryError.java
@@ -32,7 +32,8 @@ package java.lang;
*
* {@code OutOfMemoryError} objects may be constructed by the virtual
* machine as if {@linkplain Throwable#Throwable(String, Throwable,
- * boolean) suppression were disabled}.
+ * boolean, boolean) suppression were disabled and/or the stack trace was not
+ * writable}.
*
* @author unascribed
* @since JDK1.0
diff --git a/src/share/classes/java/lang/ProcessBuilder.java b/src/share/classes/java/lang/ProcessBuilder.java
index c580f507d539afaf27262db5c1f51ad41113c453..6caaaeb906d32c24251cb017c313b272e3ba720f 100644
--- a/src/share/classes/java/lang/ProcessBuilder.java
+++ b/src/share/classes/java/lang/ProcessBuilder.java
@@ -938,6 +938,11 @@ public final class ProcessBuilder
* but at the very least the command must be a non-empty list of
* non-null strings.
*
+ * A minimal set of system dependent environment variables may
+ * be required to start a process on some operating systems.
+ * As a result, the subprocess may inherit additional environment variable
+ * settings beyond those in the process builder's {@link #environment()}.
+ *
*
If there is a security manager, its
* {@link SecurityManager#checkExec checkExec}
* method is called with the first component of this object's
diff --git a/src/share/classes/java/lang/Runtime.java b/src/share/classes/java/lang/Runtime.java
index 5e4a1bceaba594ce03239a46c404e1da481309bf..3fc29d08376b69e3395758bf529fed7e5ded2d94 100644
--- a/src/share/classes/java/lang/Runtime.java
+++ b/src/share/classes/java/lang/Runtime.java
@@ -544,6 +544,11 @@ public class Runtime {
*
If envp is null, the subprocess inherits the
* environment settings of the current process.
*
+ *
A minimal set of system dependent environment variables may
+ * be required to start a process on some operating systems.
+ * As a result, the subprocess may inherit additional environment variable
+ * settings beyond those in the specified environment.
+ *
*
{@link ProcessBuilder#start()} is now the preferred way to
* start a process with a modified environment.
*
diff --git a/src/share/classes/java/lang/RuntimeException.java b/src/share/classes/java/lang/RuntimeException.java
index 85c0729dc9f902f6cb1627bcdd7fdc60b5abdb9a..c9731e895a9abfba1bcedd07eca3ed9d9f59daa8 100644
--- a/src/share/classes/java/lang/RuntimeException.java
+++ b/src/share/classes/java/lang/RuntimeException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 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
@@ -95,4 +95,25 @@ public class RuntimeException extends Exception {
public RuntimeException(Throwable cause) {
super(cause);
}
+
+ /**
+ * Constructs a new runtime exception with the specified detail
+ * message, cause, suppression enabled or disabled, and writable
+ * stack trace enabled or disabled.
+ *
+ * @param message the detail message.
+ * @param cause the cause. (A {@code null} value is permitted,
+ * and indicates that the cause is nonexistent or unknown.)
+ * @param enableSuppression whether or not suppression is enabled
+ * or disabled
+ * @param writableStackTrace whether or not the stack trace should
+ * be writable
+ *
+ * @since 1.7
+ */
+ protected RuntimeException(String message, Throwable cause,
+ boolean enableSuppression,
+ boolean writableStackTrace) {
+ super(message, cause, enableSuppression, writableStackTrace);
+ }
}
diff --git a/src/share/classes/java/lang/StringCoding.java b/src/share/classes/java/lang/StringCoding.java
index 95e437df532b52be52100f4f8ef6f6e83dcdf765..95fb45ab659cef93dbd096ce4d82c9b8c86a448f 100644
--- a/src/share/classes/java/lang/StringCoding.java
+++ b/src/share/classes/java/lang/StringCoding.java
@@ -222,13 +222,13 @@ class StringCoding {
off = 0;
}
}
+ cd.onMalformedInput(CodingErrorAction.REPLACE)
+ .onUnmappableCharacter(CodingErrorAction.REPLACE)
+ .reset();
if (cd instanceof ArrayDecoder) {
int clen = ((ArrayDecoder)cd).decode(ba, off, len, ca);
return safeTrim(ca, clen, cs, isTrusted);
} else {
- cd.onMalformedInput(CodingErrorAction.REPLACE)
- .onUnmappableCharacter(CodingErrorAction.REPLACE)
- .reset();
ByteBuffer bb = ByteBuffer.wrap(ba, off, len);
CharBuffer cb = CharBuffer.wrap(ca);
try {
@@ -356,13 +356,13 @@ class StringCoding {
off = 0;
}
}
+ ce.onMalformedInput(CodingErrorAction.REPLACE)
+ .onUnmappableCharacter(CodingErrorAction.REPLACE)
+ .reset();
if (ce instanceof ArrayEncoder) {
int blen = ((ArrayEncoder)ce).encode(ca, off, len, ba);
return safeTrim(ba, blen, cs, isTrusted);
} else {
- ce.onMalformedInput(CodingErrorAction.REPLACE)
- .onUnmappableCharacter(CodingErrorAction.REPLACE)
- .reset();
ByteBuffer bb = ByteBuffer.wrap(ba);
CharBuffer cb = CharBuffer.wrap(ca, off, len);
try {
diff --git a/src/share/classes/java/lang/Throwable.java b/src/share/classes/java/lang/Throwable.java
index 8468ecf0d300d3e27d9f7b8b3152ed4a8e4ad3d4..d70fe26841ab8e6e86d7c95314aa7a86d54e92bc 100644
--- a/src/share/classes/java/lang/Throwable.java
+++ b/src/share/classes/java/lang/Throwable.java
@@ -129,16 +129,41 @@ public class Throwable implements Serializable {
*/
private String detailMessage;
+
+ /**
+ * Holder class to defer initializing sentinel objects only used
+ * for serialization.
+ */
+ private static class SentinelHolder {
+ /**
+ * {@linkplain #setStackTrace(StackTraceElement[]) Setting the
+ * stack trace} to a one-element array containing this sentinel
+ * value indicates future attempts to set the stack trace will be
+ * ignored. The sentinal is equal to the result of calling:
+ * {@code new StackTraceElement("", "", null, Integer.MIN_VALUE)}
+ */
+ public static final StackTraceElement STACK_TRACE_ELEMENT_SENTINEL =
+ new StackTraceElement("", "", null, Integer.MIN_VALUE);
+
+ /**
+ * Sentinel value used in the serial form to indicate an immutable
+ * stack trace.
+ */
+ public static final StackTraceElement[] STACK_TRACE_SENTINEL =
+ new StackTraceElement[] {STACK_TRACE_ELEMENT_SENTINEL};
+ }
+
/**
* A shared value for an empty stack.
*/
- private static final StackTraceElement[] EMPTY_STACK = new StackTraceElement[0];
+ private static final StackTraceElement[] UNASSIGNED_STACK = new StackTraceElement[0];
/*
* To allow Throwable objects to be made immutable and safely
* reused by the JVM, such as OutOfMemoryErrors, fields of
- * Throwable that are writable in response to user actions, cause
- * and suppressedExceptions obey the following protocol:
+ * Throwable that are writable in response to user actions, cause,
+ * stackTrace, and suppressedExceptions obey the following
+ * protocol:
*
* 1) The fields are initialized to a non-null sentinel value
* which indicates the value has logically not been set.
@@ -174,10 +199,15 @@ public class Throwable implements Serializable {
/**
* The stack trace, as returned by {@link #getStackTrace()}.
*
+ * The field is initialized to a zero-length array. A {@code
+ * null} value of this field indicates subsequent calls to {@link
+ * #setStackTrace(StackTraceElement[])} and {@link
+ * #fillInStackTrace()} will be be no-ops.
+ *
* @serial
* @since 1.4
*/
- private StackTraceElement[] stackTrace;
+ private StackTraceElement[] stackTrace = UNASSIGNED_STACK;
// Setting this static field introduces an acceptable
// initialization dependency on a few java.util classes.
@@ -284,24 +314,36 @@ public class Throwable implements Serializable {
/**
* Constructs a new throwable with the specified detail message,
- * cause, and {@linkplain #addSuppressed suppression} enabled or
- * disabled. If suppression is disabled, {@link #getSuppressed}
- * for this object will return a zero-length array and calls to
- * {@link #addSuppressed} that would otherwise append an exception
- * to the suppressed list will have no effect.
+ * cause, {@linkplain #addSuppressed suppression} enabled or
+ * disabled, and writable stack trace enabled or disabled. If
+ * suppression is disabled, {@link #getSuppressed} for this object
+ * will return a zero-length array and calls to {@link
+ * #addSuppressed} that would otherwise append an exception to the
+ * suppressed list will have no effect. If the writable stack
+ * trace is false, this constructor will not call {@link
+ * #fillInStackTrace()}, a {@code null} will be written to the
+ * {@code stackTrace} field, and subsequent calls to {@code
+ * fillInStackTrace} and {@link
+ * #setStackTrace(StackTraceElement[])} will not set the stack
+ * trace. If the writable stack trace is false, {@link
+ * #getStackTrace} will return a zero length array.
*
*
Note that the other constructors of {@code Throwable} treat
- * suppression as being enabled. Subclasses of {@code Throwable}
- * should document any conditions under which suppression is
- * disabled. Disabling of suppression should only occur in
- * exceptional circumstances where special requirements exist,
- * such as a virtual machine reusing exception objects under
- * low-memory situations.
+ * suppression as being enabled and the stack trace as being
+ * writable. Subclasses of {@code Throwable} should document any
+ * conditions under which suppression is disabled and document
+ * conditions under which the stack trace is not writable.
+ * Disabling of suppression should only occur in exceptional
+ * circumstances where special requirements exist, such as a
+ * virtual machine reusing exception objects under low-memory
+ * situations.
*
* @param message the detail message.
* @param cause the cause. (A {@code null} value is permitted,
* and indicates that the cause is nonexistent or unknown.)
* @param enableSuppression whether or not suppression is enabled or disabled
+ * @param writableStackTrace whether or not the stack trace should be
+ * writable
*
* @see OutOfMemoryError
* @see NullPointerException
@@ -309,8 +351,13 @@ public class Throwable implements Serializable {
* @since 1.7
*/
protected Throwable(String message, Throwable cause,
- boolean enableSuppression) {
- fillInStackTrace();
+ boolean enableSuppression,
+ boolean writableStackTrace) {
+ if (writableStackTrace) {
+ fillInStackTrace();
+ } else {
+ stackTrace = null;
+ }
detailMessage = message;
this.cause = cause;
if (!enableSuppression)
@@ -707,10 +754,22 @@ public class Throwable implements Serializable {
* {@code Throwable} object information about the current state of
* the stack frames for the current thread.
*
+ *
If the stack trace of this {@code Throwable} {@linkplain
+ * Throwable#Throwable(String, Throwable, boolean, boolean) is not
+ * writable}, calling this method has no effect.
+ *
* @return a reference to this {@code Throwable} instance.
* @see java.lang.Throwable#printStackTrace()
*/
- public synchronized native Throwable fillInStackTrace();
+ public synchronized Throwable fillInStackTrace() {
+ if (stackTrace != null) {
+ fillInStackTrace(0);
+ stackTrace = UNASSIGNED_STACK;
+ }
+ return this;
+ }
+
+ private native Throwable fillInStackTrace(int dummy);
/**
* Provides programmatic access to the stack trace information printed by
@@ -740,12 +799,15 @@ public class Throwable implements Serializable {
}
private synchronized StackTraceElement[] getOurStackTrace() {
- // Initialize stack trace if this is the first call to this method
- if (stackTrace == null) {
+ // Initialize stack trace field with information from
+ // backtrace if this is the first call to this method
+ if (stackTrace == UNASSIGNED_STACK) {
int depth = getStackTraceDepth();
stackTrace = new StackTraceElement[depth];
for (int i=0; i < depth; i++)
stackTrace[i] = getStackTraceElement(i);
+ } else if (stackTrace == null) {
+ return UNASSIGNED_STACK;
}
return stackTrace;
}
@@ -761,6 +823,11 @@ public class Throwable implements Serializable {
* when a throwable is constructed or deserialized when a throwable is
* read from a serialization stream.
*
+ *
If the stack trace of this {@code Throwable} {@linkplain
+ * Throwable#Throwable(String, Throwable, boolean, boolean) is not
+ * writable}, calling this method has no effect other than
+ * validating its argument.
+ *
* @param stackTrace the stack trace elements to be associated with
* this {@code Throwable}. The specified array is copied by this
* call; changes in the specified array after the method invocation
@@ -768,18 +835,22 @@ public class Throwable implements Serializable {
* trace.
*
* @throws NullPointerException if {@code stackTrace} is
- * {@code null}, or if any of the elements of
+ * {@code null} or if any of the elements of
* {@code stackTrace} are {@code null}
*
* @since 1.4
*/
public void setStackTrace(StackTraceElement[] stackTrace) {
+ // Validate argument
StackTraceElement[] defensiveCopy = stackTrace.clone();
- for (int i = 0; i < defensiveCopy.length; i++)
+ for (int i = 0; i < defensiveCopy.length; i++) {
if (defensiveCopy[i] == null)
throw new NullPointerException("stackTrace[" + i + "]");
+ }
synchronized (this) {
+ if (this.stackTrace == null) // Immutable stack
+ return;
this.stackTrace = defensiveCopy;
}
}
@@ -808,7 +879,11 @@ public class Throwable implements Serializable {
* well-formedness constraints on fields. Null entries and
* self-pointers are not allowed in the list of {@code
* suppressedExceptions}. Null entries are not allowed for stack
- * trace elements.
+ * trace elements. A null stack trace in the serial form results
+ * in a zero-length stack element array. A single-element stack
+ * trace whose entry is equal to {@code new StackTraceElement("",
+ * "", null, Integer.MIN_VALUE)} results in a {@code null} {@code
+ * stackTrace} field.
*
* Note that there are no constraints on the value the {@code
* cause} field can hold; both {@code null} and {@code this} are
@@ -837,26 +912,60 @@ public class Throwable implements Serializable {
suppressedExceptions = suppressed;
} // else a null suppressedExceptions field remains null
+ /*
+ * For zero-length stack traces, use a clone of
+ * UNASSIGNED_STACK rather than UNASSIGNED_STACK itself to
+ * allow identity comparison against UNASSIGNED_STACK in
+ * getOurStackTrace. The identity of UNASSIGNED_STACK in
+ * stackTrace indicates to the getOurStackTrace method that
+ * the stackTrace needs to be constructed from the information
+ * in backtrace.
+ */
if (stackTrace != null) {
- for (StackTraceElement ste : stackTrace) {
- if (ste == null)
- throw new NullPointerException("null StackTraceElement in serial stream. ");
+ if (stackTrace.length == 0) {
+ stackTrace = UNASSIGNED_STACK.clone();
+ } else if (stackTrace.length == 1 &&
+ // Check for the marker of an immutable stack trace
+ SentinelHolder.STACK_TRACE_ELEMENT_SENTINEL.equals(stackTrace[0])) {
+ stackTrace = null;
+ } else { // Verify stack trace elements are non-null.
+ for(StackTraceElement ste : stackTrace) {
+ if (ste == null)
+ throw new NullPointerException("null StackTraceElement in serial stream. ");
+ }
}
} else {
- // A null stackTrace field in the serial form can result from
- // an exception serialized without that field in older JDK releases.
- stackTrace = EMPTY_STACK;
+ // A null stackTrace field in the serial form can result
+ // from an exception serialized without that field in
+ // older JDK releases; treat such exceptions as having
+ // empty stack traces.
+ stackTrace = UNASSIGNED_STACK.clone();
}
-
}
/**
* Write a {@code Throwable} object to a stream.
+ *
+ * A {@code null} stack trace field is represented in the serial
+ * form as a one-element array whose element is equal to {@code
+ * new StackTraceElement("", "", null, Integer.MIN_VALUE)}.
*/
private synchronized void writeObject(ObjectOutputStream s)
throws IOException {
- getOurStackTrace(); // Ensure that stackTrace field is initialized.
- s.defaultWriteObject();
+ // Ensure that the stackTrace field is initialized to a
+ // non-null value, if appropriate. As of JDK 7, a null stack
+ // trace field is a valid value indicating the stack trace
+ // should not be set.
+ getOurStackTrace();
+
+ StackTraceElement[] oldStackTrace = stackTrace;
+ try {
+ if (stackTrace == null)
+ stackTrace = SentinelHolder.STACK_TRACE_SENTINEL;
+ s.defaultWriteObject();
+ } finally {
+ stackTrace = oldStackTrace;
+ }
}
/**
@@ -866,8 +975,8 @@ public class Throwable implements Serializable {
* try}-with-resources statement.
*
*
The suppression behavior is enabled unless disabled
- * {@linkplain #Throwable(String, Throwable, boolean) via a
- * constructor}. When suppression is disabled, this method does
+ * {@linkplain #Throwable(String, Throwable, boolean, boolean) via
+ * a constructor}. When suppression is disabled, this method does
* nothing other than to validate its argument.
*
*
Note that when one exception {@linkplain
@@ -933,8 +1042,8 @@ public class Throwable implements Serializable {
* statement, in order to deliver this exception.
*
* If no exceptions were suppressed or {@linkplain
- * Throwable(String, Throwable, boolean) suppression is disabled},
- * an empty array is returned.
+ * #Throwable(String, Throwable, boolean, boolean) suppression is
+ * disabled}, an empty array is returned.
*
* @return an array containing all of the exceptions that were
* suppressed to deliver this exception.
diff --git a/src/share/classes/java/net/HttpCookie.java b/src/share/classes/java/net/HttpCookie.java
index e5124f9181788a1cd7d472ba29ce491569dfa499..34e60126912c9c1fe55c61657715d620a97b145f 100644
--- a/src/share/classes/java/net/HttpCookie.java
+++ b/src/share/classes/java/net/HttpCookie.java
@@ -34,6 +34,7 @@ import java.util.Date;
import java.lang.NullPointerException; // for javadoc
import java.util.Locale;
+import java.util.Objects;
/**
* An HttpCookie object represents an http cookie, which carries state
@@ -817,7 +818,7 @@ public final class HttpCookie implements Cloneable {
// 3. and have same path (case-sensitive).
return equalsIgnoreCase(getName(), other.getName()) &&
equalsIgnoreCase(getDomain(), other.getDomain()) &&
- equals(getPath(), other.getPath());
+ Objects.equals(getPath(), other.getPath());
}
@@ -1162,14 +1163,6 @@ public final class HttpCookie implements Cloneable {
return false;
}
- private static boolean equals(String s, String t) {
- if (s == t) return true;
- if ((s != null) && (t != null)) {
- return s.equals(t);
- }
- return false;
- }
-
private static boolean startsWithIgnoreCase(String s, String start) {
if (s == null || start == null) return false;
diff --git a/src/share/classes/java/nio/charset/Charset.java b/src/share/classes/java/nio/charset/Charset.java
index 51e21c39b6b079cad17e6f31ba2002b3dfbeb78d..51dbe1504dc4c7f13f7b13ee59e2a36ed8e95880 100644
--- a/src/share/classes/java/nio/charset/Charset.java
+++ b/src/share/classes/java/nio/charset/Charset.java
@@ -143,6 +143,8 @@ import sun.security.action.GetPropertyAction;
*
*
Standard charsets
*
+ *
+ *
* Every implementation of the Java platform is required to support the
* following standard charsets. Consult the release documentation for your
* implementation to see if any other charsets are supported. The behavior
@@ -213,6 +215,8 @@ import sun.security.action.GetPropertyAction;
* determined during virtual-machine startup and typically depends upon the
* locale and charset being used by the underlying operating system.
*
+ * The {@link StandardCharset} class defines constants for each of the
+ * standard charsets.
*
*
Terminology
*
diff --git a/src/share/classes/java/nio/charset/StandardCharset.java b/src/share/classes/java/nio/charset/StandardCharset.java
new file mode 100644
index 0000000000000000000000000000000000000000..edec058bc45d382fb3d2f58f750fe042ed5ee19b
--- /dev/null
+++ b/src/share/classes/java/nio/charset/StandardCharset.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 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 java.nio.charset;
+
+/**
+ * Constant definitions for the standard {@link Charset Charsets}. These
+ * charsets are guaranteed to be available on every implementation of the Java
+ * platform.
+ *
+ * @see Standard Charsets
+ * @since 1.7
+ */
+public final class StandardCharset {
+
+ private StandardCharset() {
+ throw new AssertionError("No java.nio.charset.StandardCharset instances for you!");
+ }
+ /**
+ * Seven-bit ASCII, a.k.a. ISO646-US, a.k.a. the Basic Latin block of the
+ * Unicode character set
+ */
+ public static final Charset US_ASCII = Charset.forName("US-ASCII");
+ /**
+ * ISO Latin Alphabet No. 1, a.k.a. ISO-LATIN-1
+ */
+ public static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1");
+ /**
+ * Eight-bit UCS Transformation Format
+ */
+ public static final Charset UTF_8 = Charset.forName("UTF-8");
+ /**
+ * Sixteen-bit UCS Transformation Format, big-endian byte order
+ */
+ public static final Charset UTF_16BE = Charset.forName("UTF-16BE");
+ /**
+ * Sixteen-bit UCS Transformation Format, little-endian byte order
+ */
+ public static final Charset UTF_16LE = Charset.forName("UTF-16LE");
+ /**
+ * Sixteen-bit UCS Transformation Format, byte order identified by an
+ * optional byte-order mark
+ */
+ public static final Charset UTF_16 = Charset.forName("UTF-16");
+}
diff --git a/src/share/classes/java/nio/file/FileSystem.java b/src/share/classes/java/nio/file/FileSystem.java
index 97dfc4649fc3b7ebfcd69f16bbc01f1da59fe28a..9091f4aae6ea8e08ad00dc250f9197998ed4ee1e 100644
--- a/src/share/classes/java/nio/file/FileSystem.java
+++ b/src/share/classes/java/nio/file/FileSystem.java
@@ -391,6 +391,13 @@ public abstract class FileSystem
* character is used to separate the subpatterns. Groups cannot be nested.
*
*
+ * Leading period/dot characters in file name are
+ * treated as regular characters in match operations. For example,
+ * the {@code "*"} glob pattern matches file name {@code ".login"}.
+ * The {@link Files#isHidden} method may be used to test whether a file
+ * is considered hidden.
+ *
+ *
* All other characters match themselves in an implementation
* dependent manner. This includes characters representing any {@link
* FileSystem#getSeparator name-separators}.
diff --git a/src/share/classes/java/nio/file/Path.java b/src/share/classes/java/nio/file/Path.java
index ccf0c808d61ed3c03d9a6e03a20a92c30b6a9a0b..2d2e977d49de54367f04e09978ccd9fc0a94c54b 100644
--- a/src/share/classes/java/nio/file/Path.java
+++ b/src/share/classes/java/nio/file/Path.java
@@ -72,7 +72,7 @@ import java.util.Iterator;
* directory and is UTF-8 encoded.
*
* Path path = FileSystems.getDefault().getPath("logs", "access.log");
- * BufferReader reader = Files.newBufferedReader(path, Charset.forName("UTF-8"));
+ * BufferReader reader = Files.newBufferedReader(path, StandardCharset.UTF_8);
*
*
* Interoperability
diff --git a/src/share/classes/java/sql/BatchUpdateException.java b/src/share/classes/java/sql/BatchUpdateException.java
index a95e2bfa419a52d76166994be82a4eb65fee8ae5..4fa6241169fc21e37ecf008e735db988c73b1c26 100644
--- a/src/share/classes/java/sql/BatchUpdateException.java
+++ b/src/share/classes/java/sql/BatchUpdateException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 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
@@ -25,6 +25,8 @@
package java.sql;
+import java.util.Arrays;
+
/**
* The subclass of {@link SQLException} thrown when an error
* occurs during a batch update operation. In addition to the
@@ -77,8 +79,7 @@ public class BatchUpdateException extends SQLException {
*/
public BatchUpdateException( String reason, String SQLState, int vendorCode,
int[] updateCounts ) {
- super(reason, SQLState, vendorCode);
- this.updateCounts = updateCounts;
+ this(reason, SQLState, vendorCode, updateCounts, null);
}
/**
@@ -105,8 +106,7 @@ public class BatchUpdateException extends SQLException {
*/
public BatchUpdateException(String reason, String SQLState,
int[] updateCounts) {
- super(reason, SQLState);
- this.updateCounts = updateCounts;
+ this(reason, SQLState, 0, updateCounts, null);
}
/**
@@ -132,8 +132,7 @@ public class BatchUpdateException extends SQLException {
* @since 1.2
*/
public BatchUpdateException(String reason, int[] updateCounts) {
- super(reason);
- this.updateCounts = updateCounts;
+ this(reason, null, 0, updateCounts, null);
}
/**
@@ -156,8 +155,7 @@ public class BatchUpdateException extends SQLException {
* @since 1.2
*/
public BatchUpdateException(int[] updateCounts) {
- super();
- this.updateCounts = updateCounts;
+ this(null, null, 0, updateCounts, null);
}
/**
@@ -172,8 +170,7 @@ public class BatchUpdateException extends SQLException {
* @since 1.2
*/
public BatchUpdateException() {
- super();
- this.updateCounts = null;
+ this(null, null, 0, null, null);
}
/**
@@ -191,8 +188,7 @@ public class BatchUpdateException extends SQLException {
* @since 1.6
*/
public BatchUpdateException(Throwable cause) {
- super(cause);
- this.updateCounts = null;
+ this(null, null, 0, null, cause);
}
/**
@@ -218,8 +214,7 @@ public class BatchUpdateException extends SQLException {
* @since 1.6
*/
public BatchUpdateException(int []updateCounts , Throwable cause) {
- super(cause);
- this.updateCounts = updateCounts;
+ this(null, null, 0, updateCounts, cause);
}
/**
@@ -243,8 +238,7 @@ public class BatchUpdateException extends SQLException {
* @since 1.6
*/
public BatchUpdateException(String reason, int []updateCounts, Throwable cause) {
- super(reason,cause);
- this.updateCounts = updateCounts;
+ this(reason, null, 0, updateCounts, cause);
}
/**
@@ -269,8 +263,7 @@ public class BatchUpdateException extends SQLException {
*/
public BatchUpdateException(String reason, String SQLState,
int []updateCounts, Throwable cause) {
- super(reason,SQLState,cause);
- this.updateCounts = updateCounts;
+ this(reason, SQLState, 0, updateCounts, cause);
}
/**
@@ -297,8 +290,8 @@ public class BatchUpdateException extends SQLException {
*/
public BatchUpdateException(String reason, String SQLState, int vendorCode,
int []updateCounts,Throwable cause) {
- super(reason,SQLState,vendorCode,cause);
- this.updateCounts = updateCounts;
+ super(reason, SQLState, vendorCode, cause);
+ this.updateCounts = (updateCounts == null) ? null : Arrays.copyOf(updateCounts, updateCounts.length);
}
/**
@@ -332,7 +325,7 @@ public class BatchUpdateException extends SQLException {
* @since 1.3
*/
public int[] getUpdateCounts() {
- return updateCounts;
+ return (updateCounts == null) ? null : Arrays.copyOf(updateCounts, updateCounts.length);
}
/**
@@ -340,7 +333,7 @@ public class BatchUpdateException extends SQLException {
* @serial
* @since 1.2
*/
- private int[] updateCounts;
+ private final int[] updateCounts;
private static final long serialVersionUID = 5977529877145521757L;
}
diff --git a/src/share/classes/java/util/AbstractSet.java b/src/share/classes/java/util/AbstractSet.java
index b99da00826dea463d491209d459e758218c284e4..1f1a49c250e4cdf058c12cdaaca3499c195baeb6 100644
--- a/src/share/classes/java/util/AbstractSet.java
+++ b/src/share/classes/java/util/AbstractSet.java
@@ -156,9 +156,11 @@ public abstract class AbstractSet extends AbstractCollection implements Se
* @throws UnsupportedOperationException if the removeAll operation
* is not supported by this set
* @throws ClassCastException if the class of an element of this set
- * is incompatible with the specified collection (optional)
+ * is incompatible with the specified collection
+ * (optional)
* @throws NullPointerException if this set contains a null element and the
- * specified collection does not permit null elements (optional),
+ * specified collection does not permit null elements
+ * (optional),
* or if the specified collection is null
* @see #remove(Object)
* @see #contains(Object)
diff --git a/src/share/classes/java/util/ArrayList.java b/src/share/classes/java/util/ArrayList.java
index 128ec5b5fd864259cabdf53d4d1ce4a06d12f2a5..14b0fbf5599b76189fd30f5d89fa6daeba700814 100644
--- a/src/share/classes/java/util/ArrayList.java
+++ b/src/share/classes/java/util/ArrayList.java
@@ -628,9 +628,11 @@ public class ArrayList extends AbstractList
* @param c collection containing elements to be removed from this list
* @return {@code true} if this list changed as a result of the call
* @throws ClassCastException if the class of an element of this list
- * is incompatible with the specified collection (optional)
+ * is incompatible with the specified collection
+ * (optional)
* @throws NullPointerException if this list contains a null element and the
- * specified collection does not permit null elements (optional),
+ * specified collection does not permit null elements
+ * (optional),
* or if the specified collection is null
* @see Collection#contains(Object)
*/
@@ -646,9 +648,11 @@ public class ArrayList extends AbstractList
* @param c collection containing elements to be retained in this list
* @return {@code true} if this list changed as a result of the call
* @throws ClassCastException if the class of an element of this list
- * is incompatible with the specified collection (optional)
+ * is incompatible with the specified collection
+ * (optional)
* @throws NullPointerException if this list contains a null element and the
- * specified collection does not permit null elements (optional),
+ * specified collection does not permit null elements
+ * (optional),
* or if the specified collection is null
* @see Collection#contains(Object)
*/
diff --git a/src/share/classes/java/util/Collection.java b/src/share/classes/java/util/Collection.java
index 7d0bcdc5aa366753511117e6ccbe6a4e43ca8b59..b8f5869e861ab449d4b91628f9c2292069f553b8 100644
--- a/src/share/classes/java/util/Collection.java
+++ b/src/share/classes/java/util/Collection.java
@@ -60,7 +60,8 @@ package java.util;
* but is not required to, throw the exception if the collection to be added
* is empty.
*
- * Some collection implementations have restrictions on the elements that
+ *
+ * Some collection implementations have restrictions on the elements that
* they may contain. For example, some implementations prohibit null elements,
* and some have restrictions on the types of their elements. Attempting to
* add an ineligible element throws an unchecked exception, typically
@@ -152,9 +153,11 @@ public interface Collection extends Iterable {
* @return true if this collection contains the specified
* element
* @throws ClassCastException if the type of the specified element
- * is incompatible with this collection (optional)
+ * is incompatible with this collection
+ * (optional)
* @throws NullPointerException if the specified element is null and this
- * collection does not permit null elements (optional)
+ * collection does not permit null elements
+ * (optional)
*/
boolean contains(Object o);
@@ -279,9 +282,11 @@ public interface Collection extends Iterable {
* @param o element to be removed from this collection, if present
* @return true if an element was removed as a result of this call
* @throws ClassCastException if the type of the specified element
- * is incompatible with this collection (optional)
+ * is incompatible with this collection
+ * (optional)
* @throws NullPointerException if the specified element is null and this
- * collection does not permit null elements (optional)
+ * collection does not permit null elements
+ * (optional)
* @throws UnsupportedOperationException if the remove operation
* is not supported by this collection
*/
@@ -299,10 +304,13 @@ public interface Collection extends Iterable {
* in the specified collection
* @throws ClassCastException if the types of one or more elements
* in the specified collection are incompatible with this
- * collection (optional)
+ * collection
+ * (optional)
* @throws NullPointerException if the specified collection contains one
* or more null elements and this collection does not permit null
- * elements (optional), or if the specified collection is null
+ * elements
+ * (optional),
+ * or if the specified collection is null.
* @see #contains(Object)
*/
boolean containsAll(Collection c);
@@ -346,10 +354,13 @@ public interface Collection extends Iterable {
* is not supported by this collection
* @throws ClassCastException if the types of one or more elements
* in this collection are incompatible with the specified
- * collection (optional)
+ * collection
+ * (optional)
* @throws NullPointerException if this collection contains one or more
* null elements and the specified collection does not support
- * null elements (optional), or if the specified collection is null
+ * null elements
+ * (optional),
+ * or if the specified collection is null
* @see #remove(Object)
* @see #contains(Object)
*/
@@ -367,10 +378,13 @@ public interface Collection extends Iterable {
* is not supported by this collection
* @throws ClassCastException if the types of one or more elements
* in this collection are incompatible with the specified
- * collection (optional)
+ * collection
+ * (optional)
* @throws NullPointerException if this collection contains one or more
* null elements and the specified collection does not permit null
- * elements (optional), or if the specified collection is null
+ * elements
+ * (optional),
+ * or if the specified collection is null
* @see #remove(Object)
* @see #contains(Object)
*/
diff --git a/src/share/classes/java/util/Collections.java b/src/share/classes/java/util/Collections.java
index 80221c8795b160277be0a21123a4ca7c5ded2c65..d15a4292ddd818065a4570a0c5ba24ed19497724 100644
--- a/src/share/classes/java/util/Collections.java
+++ b/src/share/classes/java/util/Collections.java
@@ -3746,9 +3746,10 @@ public class Collections {
* @throws NullPointerException if either collection is {@code null}.
* @throws NullPointerException if one collection contains a {@code null}
* element and {@code null} is not an eligible element for the other collection.
- * (optional)
+ * (optional)
* @throws ClassCastException if one collection contains an element that is
- * of a type which is ineligible for the other collection. (optional)
+ * of a type which is ineligible for the other collection.
+ * (optional)
* @since 1.5
*/
public static boolean disjoint(Collection c1, Collection c2) {
diff --git a/src/share/classes/java/util/Deque.java b/src/share/classes/java/util/Deque.java
index b5516211be635b87c03d005c2d322643d7fdc9ba..051ae9cca46b7aa99106e6f2083d400f3745e3ae 100644
--- a/src/share/classes/java/util/Deque.java
+++ b/src/share/classes/java/util/Deque.java
@@ -351,9 +351,11 @@ public interface Deque extends Queue {
* @param o element to be removed from this deque, if present
* @return true if an element was removed as a result of this call
* @throws ClassCastException if the class of the specified element
- * is incompatible with this deque (optional)
+ * is incompatible with this deque
+ * (optional)
* @throws NullPointerException if the specified element is null and this
- * deque does not permit null elements (optional)
+ * deque does not permit null elements
+ * (optional)
*/
boolean removeFirstOccurrence(Object o);
@@ -369,9 +371,11 @@ public interface Deque extends Queue {
* @param o element to be removed from this deque, if present
* @return true if an element was removed as a result of this call
* @throws ClassCastException if the class of the specified element
- * is incompatible with this deque (optional)
+ * is incompatible with this deque
+ * (optional)
* @throws NullPointerException if the specified element is null and this
- * deque does not permit null elements (optional)
+ * deque does not permit null elements
+ * (optional)
*/
boolean removeLastOccurrence(Object o);
@@ -527,9 +531,11 @@ public interface Deque extends Queue {
* @param o element to be removed from this deque, if present
* @return true if an element was removed as a result of this call
* @throws ClassCastException if the class of the specified element
- * is incompatible with this deque (optional)
+ * is incompatible with this deque
+ * (optional)
* @throws NullPointerException if the specified element is null and this
- * deque does not permit null elements (optional)
+ * deque does not permit null elements
+ * (optional)
*/
boolean remove(Object o);
@@ -542,9 +548,11 @@ public interface Deque extends Queue {
* @param o element whose presence in this deque is to be tested
* @return true if this deque contains the specified element
* @throws ClassCastException if the type of the specified element
- * is incompatible with this deque (optional)
+ * is incompatible with this deque
+ * (optional)
* @throws NullPointerException if the specified element is null and this
- * deque does not permit null elements (optional)
+ * deque does not permit null elements
+ * (optional)
*/
boolean contains(Object o);
diff --git a/src/share/classes/java/util/List.java b/src/share/classes/java/util/List.java
index 638fcc3a7d1276abb5585f8bee8362465077a9a6..d3d2a1b8947e617c8f51ee4d08663469722c110a 100644
--- a/src/share/classes/java/util/List.java
+++ b/src/share/classes/java/util/List.java
@@ -134,9 +134,11 @@ public interface List extends Collection {
* @param o element whose presence in this list is to be tested
* @return true if this list contains the specified element
* @throws ClassCastException if the type of the specified element
- * is incompatible with this list (optional)
+ * is incompatible with this list
+ * (optional)
* @throws NullPointerException if the specified element is null and this
- * list does not permit null elements (optional)
+ * list does not permit null elements
+ * (optional)
*/
boolean contains(Object o);
@@ -245,9 +247,11 @@ public interface List extends Collection {
* @param o element to be removed from this list, if present
* @return true if this list contained the specified element
* @throws ClassCastException if the type of the specified element
- * is incompatible with this list (optional)
+ * is incompatible with this list
+ * (optional)
* @throws NullPointerException if the specified element is null and this
- * list does not permit null elements (optional)
+ * list does not permit null elements
+ * (optional)
* @throws UnsupportedOperationException if the remove operation
* is not supported by this list
*/
@@ -265,10 +269,13 @@ public interface List extends Collection {
* specified collection
* @throws ClassCastException if the types of one or more elements
* in the specified collection are incompatible with this
- * list (optional)
+ * list
+ * (optional)
* @throws NullPointerException if the specified collection contains one
* or more null elements and this list does not permit null
- * elements (optional), or if the specified collection is null
+ * elements
+ * (optional),
+ * or if the specified collection is null
* @see #contains(Object)
*/
boolean containsAll(Collection c);
@@ -334,9 +341,11 @@ public interface List extends Collection {
* @throws UnsupportedOperationException if the removeAll operation
* is not supported by this list
* @throws ClassCastException if the class of an element of this list
- * is incompatible with the specified collection (optional)
+ * is incompatible with the specified collection
+ * (optional)
* @throws NullPointerException if this list contains a null element and the
- * specified collection does not permit null elements (optional),
+ * specified collection does not permit null elements
+ * (optional),
* or if the specified collection is null
* @see #remove(Object)
* @see #contains(Object)
@@ -354,9 +363,11 @@ public interface List extends Collection {
* @throws UnsupportedOperationException if the retainAll operation
* is not supported by this list
* @throws ClassCastException if the class of an element of this list
- * is incompatible with the specified collection (optional)
+ * is incompatible with the specified collection
+ * (optional)
* @throws NullPointerException if this list contains a null element and the
- * specified collection does not permit null elements (optional),
+ * specified collection does not permit null elements
+ * (optional),
* or if the specified collection is null
* @see #remove(Object)
* @see #contains(Object)
@@ -493,9 +504,11 @@ public interface List extends Collection {
* @return the index of the first occurrence of the specified element in
* this list, or -1 if this list does not contain the element
* @throws ClassCastException if the type of the specified element
- * is incompatible with this list (optional)
+ * is incompatible with this list
+ * (optional)
* @throws NullPointerException if the specified element is null and this
- * list does not permit null elements (optional)
+ * list does not permit null elements
+ * (optional)
*/
int indexOf(Object o);
@@ -510,9 +523,11 @@ public interface List extends Collection {
* @return the index of the last occurrence of the specified element in
* this list, or -1 if this list does not contain the element
* @throws ClassCastException if the type of the specified element
- * is incompatible with this list (optional)
+ * is incompatible with this list
+ * (optional)
* @throws NullPointerException if the specified element is null and this
- * list does not permit null elements (optional)
+ * list does not permit null elements
+ * (optional)
*/
int lastIndexOf(Object o);
diff --git a/src/share/classes/java/util/ListIterator.java b/src/share/classes/java/util/ListIterator.java
index cad6d9bae2fa217be404c5e2461b8ae04b75918a..92859173a561275efec9a5867941d39d370e468b 100644
--- a/src/share/classes/java/util/ListIterator.java
+++ b/src/share/classes/java/util/ListIterator.java
@@ -173,9 +173,9 @@ public interface ListIterator extends Iterator {
/**
* Inserts the specified element into the list (optional operation).
- * The element is inserted immediately before the next element that
- * would be returned by {@link #next}, if any, and after the next
- * element that would be returned by {@link #previous}, if any. (If the
+ * The element is inserted immediately before the element that
+ * would be returned by {@link #next}, if any, and after the element
+ * that would be returned by {@link #previous}, if any. (If the
* list contains no elements, the new element becomes the sole element
* on the list.) The new element is inserted before the implicit
* cursor: a subsequent call to {@code next} would be unaffected, and a
diff --git a/src/share/classes/java/util/Map.java b/src/share/classes/java/util/Map.java
index 2f8f1315c1fe22604a9d9358083ccf247aa0e009..ccdb28813a2f5933cb89c7d0018a3b72c7e79ac6 100644
--- a/src/share/classes/java/util/Map.java
+++ b/src/share/classes/java/util/Map.java
@@ -144,9 +144,11 @@ public interface Map {
* @return true if this map contains a mapping for the specified
* key
* @throws ClassCastException if the key is of an inappropriate type for
- * this map (optional)
+ * this map
+ * (optional)
* @throws NullPointerException if the specified key is null and this map
- * does not permit null keys (optional)
+ * does not permit null keys
+ * (optional)
*/
boolean containsKey(Object key);
@@ -162,9 +164,11 @@ public interface Map {
* @return true if this map maps one or more keys to the
* specified value
* @throws ClassCastException if the value is of an inappropriate type for
- * this map (optional)
+ * this map
+ * (optional)
* @throws NullPointerException if the specified value is null and this
- * map does not permit null values (optional)
+ * map does not permit null values
+ * (optional)
*/
boolean containsValue(Object value);
@@ -187,9 +191,11 @@ public interface Map {
* @return the value to which the specified key is mapped, or
* {@code null} if this map contains no mapping for the key
* @throws ClassCastException if the key is of an inappropriate type for
- * this map (optional)
+ * this map
+ * (optional)
* @throws NullPointerException if the specified key is null and this map
- * does not permit null keys (optional)
+ * does not permit null keys
+ * (optional)
*/
V get(Object key);
@@ -245,9 +251,11 @@ public interface Map {
* @throws UnsupportedOperationException if the remove operation
* is not supported by this map
* @throws ClassCastException if the key is of an inappropriate type for
- * this map (optional)
+ * this map
+ * (optional)
* @throws NullPointerException if the specified key is null and this
- * map does not permit null keys (optional)
+ * map does not permit null keys
+ * (optional)
*/
V remove(Object key);
@@ -466,4 +474,5 @@ public interface Map {
* @see #equals(Object)
*/
int hashCode();
+
}
diff --git a/src/share/classes/java/util/Set.java b/src/share/classes/java/util/Set.java
index 8d54f4f9d455865cd9e1831656c33411604bc36f..004e9708e562c4408f9395781183be546cd9f375 100644
--- a/src/share/classes/java/util/Set.java
+++ b/src/share/classes/java/util/Set.java
@@ -110,9 +110,11 @@ public interface Set extends Collection {
* @param o element whose presence in this set is to be tested
* @return true if this set contains the specified element
* @throws ClassCastException if the type of the specified element
- * is incompatible with this set (optional)
+ * is incompatible with this set
+ * (optional)
* @throws NullPointerException if the specified element is null and this
- * set does not permit null elements (optional)
+ * set does not permit null elements
+ * (optional)
*/
boolean contains(Object o);
@@ -236,9 +238,11 @@ public interface Set extends Collection {
* @param o object to be removed from this set, if present
* @return true if this set contained the specified element
* @throws ClassCastException if the type of the specified element
- * is incompatible with this set (optional)
+ * is incompatible with this set
+ * (optional)
* @throws NullPointerException if the specified element is null and this
- * set does not permit null elements (optional)
+ * set does not permit null elements
+ * (optional)
* @throws UnsupportedOperationException if the remove operation
* is not supported by this set
*/
@@ -257,10 +261,13 @@ public interface Set extends Collection {
* specified collection
* @throws ClassCastException if the types of one or more elements
* in the specified collection are incompatible with this
- * set (optional)
+ * set
+ * (optional)
* @throws NullPointerException if the specified collection contains one
* or more null elements and this set does not permit null
- * elements (optional), or if the specified collection is null
+ * elements
+ * (optional),
+ * or if the specified collection is null
* @see #contains(Object)
*/
boolean containsAll(Collection c);
@@ -302,9 +309,11 @@ public interface Set extends Collection {
* @throws UnsupportedOperationException if the retainAll operation
* is not supported by this set
* @throws ClassCastException if the class of an element of this set
- * is incompatible with the specified collection (optional)
+ * is incompatible with the specified collection
+ * (optional)
* @throws NullPointerException if this set contains a null element and the
- * specified collection does not permit null elements (optional),
+ * specified collection does not permit null elements
+ * (optional),
* or if the specified collection is null
* @see #remove(Object)
*/
@@ -322,9 +331,11 @@ public interface Set extends Collection {
* @throws UnsupportedOperationException if the removeAll operation
* is not supported by this set
* @throws ClassCastException if the class of an element of this set
- * is incompatible with the specified collection (optional)
+ * is incompatible with the specified collection
+ * (optional)
* @throws NullPointerException if this set contains a null element and the
- * specified collection does not permit null elements (optional),
+ * specified collection does not permit null elements
+ * (optional),
* or if the specified collection is null
* @see #remove(Object)
* @see #contains(Object)
diff --git a/src/share/classes/java/util/Vector.java b/src/share/classes/java/util/Vector.java
index 0c89889b19bd13f884183a1386da94db0d2c258a..0d69591abce962f3230d8a4a02af21a505db2443 100644
--- a/src/share/classes/java/util/Vector.java
+++ b/src/share/classes/java/util/Vector.java
@@ -893,10 +893,13 @@ public class Vector
* @return true if this Vector changed as a result of the call
* @throws ClassCastException if the types of one or more elements
* in this vector are incompatible with the specified
- * collection (optional)
+ * collection
+ * (optional)
* @throws NullPointerException if this vector contains one or more null
* elements and the specified collection does not support null
- * elements (optional), or if the specified collection is null
+ * elements
+ * (optional),
+ * or if the specified collection is null
* @since 1.2
*/
public synchronized boolean removeAll(Collection c) {
@@ -913,10 +916,13 @@ public class Vector
* @return true if this Vector changed as a result of the call
* @throws ClassCastException if the types of one or more elements
* in this vector are incompatible with the specified
- * collection (optional)
+ * collection
+ * (optional)
* @throws NullPointerException if this vector contains one or more null
* elements and the specified collection does not support null
- * elements (optional), or if the specified collection is null
+ * elements
+ * (optional),
+ * or if the specified collection is null
* @since 1.2
*/
public synchronized boolean retainAll(Collection c) {
diff --git a/src/share/classes/java/util/concurrent/BlockingDeque.java b/src/share/classes/java/util/concurrent/BlockingDeque.java
index 3134eae8ec5d5c64abc84aebd6968149d49e193e..7f37f7e66ea3ebe4d47f9edd1cbcad350b3622f0 100644
--- a/src/share/classes/java/util/concurrent/BlockingDeque.java
+++ b/src/share/classes/java/util/concurrent/BlockingDeque.java
@@ -400,8 +400,10 @@ public interface BlockingDeque extends BlockingQueue, Deque {
* @param o element to be removed from this deque, if present
* @return true if an element was removed as a result of this call
* @throws ClassCastException if the class of the specified element
- * is incompatible with this deque (optional)
- * @throws NullPointerException if the specified element is null (optional)
+ * is incompatible with this deque
+ * (optional)
+ * @throws NullPointerException if the specified element is null
+ * (optional)
*/
boolean removeFirstOccurrence(Object o);
@@ -416,8 +418,10 @@ public interface BlockingDeque extends BlockingQueue, Deque {
* @param o element to be removed from this deque, if present
* @return true if an element was removed as a result of this call
* @throws ClassCastException if the class of the specified element
- * is incompatible with this deque (optional)
- * @throws NullPointerException if the specified element is null (optional)
+ * is incompatible with this deque
+ * (optional)
+ * @throws NullPointerException if the specified element is null
+ * (optional)
*/
boolean removeLastOccurrence(Object o);
@@ -591,8 +595,10 @@ public interface BlockingDeque extends BlockingQueue, Deque {
* @param o element to be removed from this deque, if present
* @return true if this deque changed as a result of the call
* @throws ClassCastException if the class of the specified element
- * is incompatible with this deque (optional)
- * @throws NullPointerException if the specified element is null (optional)
+ * is incompatible with this deque
+ * (optional)
+ * @throws NullPointerException if the specified element is null
+ * (optional)
*/
boolean remove(Object o);
@@ -604,8 +610,10 @@ public interface BlockingDeque extends BlockingQueue, Deque {
* @param o object to be checked for containment in this deque
* @return true if this deque contains the specified element
* @throws ClassCastException if the class of the specified element
- * is incompatible with this deque (optional)
- * @throws NullPointerException if the specified element is null (optional)
+ * is incompatible with this deque
+ * (optional)
+ * @throws NullPointerException if the specified element is null
+ * (optional)
*/
public boolean contains(Object o);
diff --git a/src/share/classes/java/util/concurrent/BlockingQueue.java b/src/share/classes/java/util/concurrent/BlockingQueue.java
index 9886e6da3c103ed20b321c7ce159a415cf8890ab..4511d27efd76413731a872e9083d7e6eea5e40f4 100644
--- a/src/share/classes/java/util/concurrent/BlockingQueue.java
+++ b/src/share/classes/java/util/concurrent/BlockingQueue.java
@@ -303,8 +303,10 @@ public interface BlockingQueue extends Queue {
* @param o element to be removed from this queue, if present
* @return true if this queue changed as a result of the call
* @throws ClassCastException if the class of the specified element
- * is incompatible with this queue (optional)
- * @throws NullPointerException if the specified element is null (optional)
+ * is incompatible with this queue
+ * (optional)
+ * @throws NullPointerException if the specified element is null
+ * (optional)
*/
boolean remove(Object o);
@@ -316,8 +318,10 @@ public interface BlockingQueue extends Queue {
* @param o object to be checked for containment in this queue
* @return true if this queue contains the specified element
* @throws ClassCastException if the class of the specified element
- * is incompatible with this queue (optional)
- * @throws NullPointerException if the specified element is null (optional)
+ * is incompatible with this queue
+ * (optional)
+ * @throws NullPointerException if the specified element is null
+ * (optional)
*/
public boolean contains(Object o);
diff --git a/src/share/classes/java/util/concurrent/ConcurrentHashMap.java b/src/share/classes/java/util/concurrent/ConcurrentHashMap.java
index c66a82e63054255bd76324bb5ad6fd35d5373041..e82148069b40fb94e2b697c75810fb7ca465ae0b 100644
--- a/src/share/classes/java/util/concurrent/ConcurrentHashMap.java
+++ b/src/share/classes/java/util/concurrent/ConcurrentHashMap.java
@@ -239,7 +239,8 @@ public class ConcurrentHashMap extends AbstractMap
/**
* Gets the ith element of given table (if nonnull) with volatile
- * read semantics.
+ * read semantics. Note: This is manually integrated into a few
+ * performance-sensitive methods to reduce call overhead.
*/
@SuppressWarnings("unchecked")
static final HashEntry entryAt(HashEntry