--- a/.hgtags-top-repo Fri Oct 10 13:29:11 2008 -0700
+++ b/.hgtags-top-repo Wed Jul 05 16:42:37 2017 +0200
@@ -11,3 +11,4 @@
46a989ab932992b2084b946eeb322fa99b9fee6c jdk7-b34
143c1abedb7d3095eff0f9ee5fec9bf48e3490fc jdk7-b35
4b4f5fea8d7d0743f0c30d91fcd9bf9d96e5d2ad jdk7-b36
+744554f5a3290e11c71cd2ddb1aff49e431f9ed0 jdk7-b37
--- a/corba/.hgtags Fri Oct 10 13:29:11 2008 -0700
+++ b/corba/.hgtags Wed Jul 05 16:42:37 2017 +0200
@@ -11,3 +11,4 @@
0a812b9824e5d17b073765d1505594b49ff88a10 jdk7-b34
3867c4d14a5bfdbb37c97b4874ccb0ee5343111c jdk7-b35
0723891eb8d1c27e67c54163af0b4cea05a4e036 jdk7-b36
+59d5848bdedebe91cc2753acce78911bcb4a66db jdk7-b37
--- a/corba/make/common/Defs-windows.gmk Fri Oct 10 13:29:11 2008 -0700
+++ b/corba/make/common/Defs-windows.gmk Wed Jul 05 16:42:37 2017 +0200
@@ -58,11 +58,24 @@
# The following DLL's are considered MS runtime libraries and should
# not to be REBASEd, see deploy/make/common/Release.gmk.
-# msvcrt.dll, msvcr71.dll: Microsoft runtimes
+# msvcrt.dll, msvcrnn.dll [msvcr71 or msvcr80 or msvcr90] : Microsoft runtimes
MS_RUNTIME_LIBRARIES = msvcrt.dll
+MSVCRNN_DLL =
ifeq ($(ARCH_DATA_MODEL), 32)
ifeq ($(COMPILER_VERSION), VS2003)
- MS_RUNTIME_LIBRARIES += msvcr71.dll
+ MSVCRNN_DLL = msvcr71.dll
+ MSVCPNN_DLL = msvcp71.dll
+ MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
+ endif
+ ifeq ($(COMPILER_VERSION), VS2005)
+ MSVCRNN_DLL = msvcr80.dll
+ MSVCPNN_DLL = msvcp80.dll
+ MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
+ endif
+ ifeq ($(COMPILER_VERSION), VS2008)
+ MSVCRNN_DLL = msvcr90.dll
+ MSVCPNN_DLL = msvcp90.dll
+ MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
endif
endif
@@ -148,6 +161,20 @@
CC_LOWER_OPT = -O1
endif
endif
+ ifeq ($(COMPILER_VERSION), VS2008)
+ # Automatic precompiled header option to use (if COMPILE_APPROACH=batch)
+ AUTOMATIC_PCH_OPTION =
+ GX_OPTION = -EHsc
+ ifeq ($(ARCH_DATA_MODEL), 32)
+ CC_HIGHEST_OPT = -O2
+ CC_HIGHER_OPT = -O1
+ CC_LOWER_OPT = -O1
+ else
+ CC_HIGHEST_OPT = -O2
+ CC_HIGHER_OPT = -O1
+ CC_LOWER_OPT = -O1
+ endif
+ endif
CC_NO_OPT = -Od
else # CC_VERSION
# GCC not supported, but left for historical reference...
@@ -179,7 +206,7 @@
# -MTd Use static debug version (better than -MDd, no runtime issues)
# -D_DEBUG Change use of malloc/free/etc to use special debug ones (-MTd)
#
-# NOTE: We also will use /D _STATIC_CPPLIB so we don't need msvcp71.dll
+# NOTE: We also will use /D _STATIC_CPPLIB so we don't need msvcpnn.dll
#
ifeq ($(MS_RUNTIME_STATIC),true)
MS_RUNTIME_OPTION=-MT
@@ -217,7 +244,7 @@
# -YX -Fp/.../foobar.pch Use precompiled headers (try someday?)
# -nologo Don't print out startup message
# /D _STATIC_CPPLIB
- # Use static link for the C++ runtime (so msvcp71.dll not needed)
+ # Use static link for the C++ runtime (so msvcpnn.dll not needed)
#
CFLAGS_COMMON += -Zi -nologo
CFLAGS_OPT = $(POPT)
--- a/corba/make/common/shared/Compiler-msvc.gmk Fri Oct 10 13:29:11 2008 -0700
+++ b/corba/make/common/shared/Compiler-msvc.gmk Wed Jul 05 16:42:37 2017 +0200
@@ -47,24 +47,17 @@
# unset any GNU Make settings of MFLAGS and MAKEFLAGS which may mess up nmake
NMAKE = MFLAGS= MAKEFLAGS= $(COMPILER_PATH)nmake -nologo
+ # Compiler version and type (Always get word after "Version")
+ CC_VER := $(shell $(CC) 2>&1 | $(HEAD) -n 1 | $(SED) 's/.*\(Version.*\)/\1/' | $(NAWK) '{print $$2}')
+
# SDK-64 and MSVC6 put REBASE.EXE in a different places - go figure...
ifeq ($(ARCH_DATA_MODEL), 32)
- CC_VER := $(shell $(CC) 2>&1 | $(HEAD) -n 1 | $(NAWK) '{print $$8}')
LINK_VER := $(shell $(LINK) | $(HEAD) -n 1 | $(NAWK) '{print $$6}')
- CC_TYPE := $(shell $(CC) 2>&1 | $(HEAD) -n 1 | $(NAWK) '{print $$5}')
CC_MAJORVER :=$(call MajorVersion,$(CC_VER))
- REQUIRED_CCTYPE = Optimizing
- REQUIRED_CC_VER = 13.10.3077
- REQUIRED_LINK_VER = 7.10.3077
- ifeq ($(CC_MAJORVER), 12)
- # This should be: CC_VER=12.00.8168 LINK_VER=6.00.8447
- COMPILER_NAME=Visual C++ 6.0 Professional + VC6-SP 3
- COMPILER_VERSION=VC6
- REBASE = $(COMPILER_PATH)rebase
- MTL = $(COMPILER_PATH)midl
- endif
ifeq ($(CC_MAJORVER), 13)
# This should be: CC_VER=13.10.3077 LINK_VER=7.10.3077
+ REQUIRED_CC_VER = 13.10.3077
+ REQUIRED_LINK_VER = 7.10.3077
COMPILER_NAME=Visual Studio .NET 2003 Professional C++
COMPILER_VERSION=VS2003
REBASE = $(COMPILER_PATH)../../Common7/Tools/Bin/rebase
@@ -74,9 +67,10 @@
endif
endif
ifeq ($(CC_MAJORVER), 14)
- # This should be: CC_VER=14.00.0000 LINK_VER=8.00.0000
- # NOTE: This compiler has not been tried yet on 32bit systems
- COMPILER_NAME=Visual Studio .NET 2005
+ # This should be: CC_VER=14.00.50727.42 LINK_VER=8.00.50727.42
+ REQUIRED_CC_VER = 14.00.50727.42
+ REQUIRED_LINK_VER = 8.00.50727.42
+ COMPILER_NAME=Visual Studio 8
COMPILER_VERSION=VS2005
REBASE = $(COMPILER_PATH)../../Common8/Tools/Bin/rebase
MTL = $(COMPILER_PATH)../../Common8/Tools/Bin/midl
@@ -84,10 +78,22 @@
COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
endif
endif
+ ifeq ($(CC_MAJORVER), 15)
+ # This should be: CC_VER=15.00.21022.08 LINK_VER=9.00.21022.08
+ REQUIRED_CC_VER = 15.00.21022.08
+ REQUIRED_LINK_VER = 9.00.21022.08
+ COMPILER_NAME=Visual Studio 9
+ COMPILER_VERSION=VS2008
+ #rebase and midl moved out of Visual Studio into the SDK:
+ REBASE = $(MSDEVTOOLS_PATH)/rebase
+ MTL = $(MSDEVTOOLS_PATH)/midl.exe
+ ifndef COMPILER_PATH
+ COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
+ endif
+ endif
else
- CC_VER := $(shell $(CC) 2>&1 | $(HEAD) -n 1 | $(NAWK) '{print $$7}')
+ # else ARCH_DATA_MODEL is 64
LINK_VER := $(shell $(LINK) | $(HEAD) -n 1 | $(NAWK) '{print $$6}')
- CC_TYPE := $(shell $(CC) 2>&1 | $(HEAD) -n 1 | $(NAWK) '{print $$4}')
CC_MAJORVER :=$(call MajorVersion,$(CC_VER))
CC_MINORVER :=$(call MinorVersion,$(CC_VER))
CC_MICROVER :=$(call MicroVersion,$(CC_VER))
--- a/hotspot/.hgtags Fri Oct 10 13:29:11 2008 -0700
+++ b/hotspot/.hgtags Wed Jul 05 16:42:37 2017 +0200
@@ -11,3 +11,4 @@
5251a9cd8eb8743eee647365bee1c8afdc131556 jdk7-b34
5fa96a5a7e76da7c8dad12486293a0456c2c116c jdk7-b35
e91159f921a58af3698e6479ea1fc5818da66d09 jdk7-b36
+9ee9cf798b59e7d51f8c0a686959f313867a55d6 jdk7-b37
--- a/jaxp/.hgtags Fri Oct 10 13:29:11 2008 -0700
+++ b/jaxp/.hgtags Wed Jul 05 16:42:37 2017 +0200
@@ -11,3 +11,4 @@
01facdf8cabdeaaf68cca037aef56cc5f074897f jdk7-b34
eac46d1eb7f0935ba04f1c7929ec15423fd0309e jdk7-b35
c84ca638db42a8b6b227b4e3b63bca192c5ca634 jdk7-b36
+af49591bc486d82aa04b832257de0d18adc9af52 jdk7-b37
--- a/jaxws/.hgtags Fri Oct 10 13:29:11 2008 -0700
+++ b/jaxws/.hgtags Wed Jul 05 16:42:37 2017 +0200
@@ -11,3 +11,4 @@
7a9f629cd957e3169a1a769f763fe060d078785c jdk7-b34
b0f01c2508b690dd225298edfec70b5e8b8dc367 jdk7-b35
f60187f44a0d62906a5e2f6bd0989b5b24c1ca1e jdk7-b36
+a2a6f9edf761934faf59ea60d7fe7178371302cd jdk7-b37
--- a/jdk/.hgtags Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/.hgtags Wed Jul 05 16:42:37 2017 +0200
@@ -11,3 +11,4 @@
434055a0716ee44bca712ebca02fc04b20e6e288 jdk7-b34
cf4894b78ceb966326e93bf221db0c2d14d59218 jdk7-b35
134fd1a656ea85acd1f97f6700f75029b9b472a0 jdk7-b36
+14f50aee4989b75934d385c56a83da0c23d2f68b jdk7-b37
--- a/jdk/make/com/sun/Makefile Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/make/com/sun/Makefile Wed Jul 05 16:42:37 2017 +0200
@@ -41,7 +41,7 @@
# Omit mirror since it's built with the apt tool.
SUBDIRS = $(SCRIPT_SUBDIR) image security crypto/provider jndi jmx \
java inputmethods org xml rowset net/httpserver net/ssl demo \
- tools jarsigner tracing
+ tools jarsigner tracing servicetag
all build clean clobber::
$(SUBDIRS-loop)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/com/sun/servicetag/Makefile Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,80 @@
+# Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+
+BUILDDIR = ../../..
+PACKAGE = com.sun.servicetag
+PRODUCT = sun
+include $(BUILDDIR)/common/Defs.gmk
+
+#
+# Files to compile
+#
+AUTO_FILES_JAVA_DIRS = com/sun/servicetag
+
+#
+# Rules
+#
+include $(BUILDDIR)/common/Classes.gmk
+
+SERVICETAG_LIBDIR = $(LIBDIR)/servicetag
+SERVICETAG_RESOURCES_DIR = $(CLASSDESTDIR)/com/sun/servicetag/resources
+FILES_copy = $(SERVICETAG_RESOURCES_DIR)/product_registration.xsd \
+ $(SERVICETAG_RESOURCES_DIR)/register.html \
+ $(SERVICETAG_RESOURCES_DIR)/register_ja.html \
+ $(SERVICETAG_RESOURCES_DIR)/register_zh_CN.html \
+ $(SERVICETAG_LIBDIR)/jdk_header.png
+
+# Add all properties files to the FILES_copy list
+SWORDFISH_properties := $(shell \
+ $(CD) $(SHARE_SRC)/classes/com/sun/servicetag/resources; \
+ $(FIND) . -name 'javase_*_swordfish.properties' -print ; \
+ )
+FILES_copy += $(shell \
+ for f in $(SWORDFISH_properties) ; do \
+ echo $(SERVICETAG_RESOURCES_DIR)/$$f ; \
+ done \
+)
+
+
+#
+#OTHER_JAVACFLAGS += -Xlint:unchecked
+
+build: install-servicetag-lib copy-files
+
+copy-files: $(FILES_copy)
+
+$(CLASSBINDIR)/%: $(SHARE_SRC)/classes/%
+ $(install-file)
+
+$(SERVICETAG_LIBDIR)/jdk_header.png: $(SHARE_SRC)/classes/com/sun/servicetag/resources/jdk_header.png
+ $(install-file)
+ $(CHMOD) 444 $@
+
+install-servicetag-lib:
+ @$(RM) -rf $(SERVICETAG_LIBDIR)
+ $(MKDIR) $(SERVICETAG_LIBDIR)
+
+clean clobber::
+ @$(RM) $(FILES_copy)
+
+.PHONY: copy-files
--- a/jdk/make/java/java/FILES_java.gmk Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/make/java/java/FILES_java.gmk Wed Jul 05 16:42:37 2017 +0200
@@ -209,6 +209,7 @@
sun/util/TimeZoneNameUtility.java \
sun/util/calendar/ZoneInfo.java \
sun/util/calendar/ZoneInfoFile.java \
+ sun/util/calendar/TzIDOldMapping.java \
java/util/TooManyListenersException.java \
java/util/Comparator.java \
java/util/Collections.java \
--- a/jdk/make/javax/swing/Makefile Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/make/javax/swing/Makefile Wed Jul 05 16:42:37 2017 +0200
@@ -33,7 +33,7 @@
# Files
#
include FILES.gmk
-AUTO_FILES_JAVA_DIRS = javax/swing sun/swing
+AUTO_FILES_JAVA_DIRS = javax/swing sun/swing com/sun/java/swing
AUTO_JAVA_PRUNE = plaf
SUBDIRS = html32dtd plaf
--- a/jdk/make/sun/javazic/tzdata/VERSION Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/make/sun/javazic/tzdata/VERSION Wed Jul 05 16:42:37 2017 +0200
@@ -21,4 +21,4 @@
# CA 95054 USA or visit www.sun.com if you need additional information or
# have any questions.
#
-tzdata2007h
+tzdata2008e
--- a/jdk/make/sun/javazic/tzdata/africa Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/make/sun/javazic/tzdata/africa Wed Jul 05 16:42:37 2017 +0200
@@ -409,9 +409,63 @@
0:00 - GMT
# Mauritius
+
+# From Steffen Thorsen (2008-06-25):
+# Mauritius plans to observe DST from 2008-11-01 to 2009-03-31 on a trial
+# basis....
+# It seems that Mauritius observed daylight saving time from 1982-10-10 to
+# 1983-03-20 as well, but that was not successful....
+# http://www.timeanddate.com/news/time/mauritius-daylight-saving-time.html
+
+# From Alex Krivenyshev (2008-06-25):
+# http://economicdevelopment.gov.mu/portal/site/Mainhomepage/menuitem.a42b24128104d9845dabddd154508a0c/?content_id=0a7cee8b5d69a110VgnVCM1000000a04a8c0RCRD
+
+# From Arthur David Olson (2008-06-30):
+# The www.timeanddate.com article cited by Steffen Thorsen notes that "A
+# final decision has yet to be made on the times that daylight saving
+# would begin and end on these dates." As a place holder, use midnight.
+
+# From Paul Eggert (2008-06-30):
+# Follow Thorsen on DST in 1982/1983, instead of Shanks & Pottenger.
+
+# From Steffen Thorsen (2008-07-10):
+# According to
+# <a href="http://www.lexpress.mu/display_article.php?news_id=111216">
+# http://www.lexpress.mu/display_article.php?news_id=111216
+# </a>
+# (in French), Mauritius will start and end their DST a few days earlier
+# than previously announced (2008-11-01 to 2009-03-31). The new start
+# date is 2008-10-26 at 02:00 and the new end date is 2009-03-27 (no time
+# given, but it is probably at either 2 or 3 wall clock time).
+#
+# A little strange though, since the article says that they moved the date
+# to align itself with Europe and USA which also change time on that date,
+# but that means they have not paid attention to what happened in
+# USA/Canada last year (DST ends first Sunday in November). I also wonder
+# why that they end on a Friday, instead of aligning with Europe which
+# changes two days later.
+
+# From Alex Krivenyshev (2008-07-11):
+# Seems that English language article "The revival of daylight saving
+# time: Energy conservation?"-# No. 16578 (07/11/2008) was originally
+# published on Monday, June 30, 2008...
+#
+# I guess that article in French "Le gouvernement avance l'introduction
+# de l'heure d'ete" stating that DST in Mauritius starting on October 26
+# and ending on March 27, 2009 is the most recent one.
+# ...
+# <a href="http://www.worldtimezone.com/dst_news/dst_news_mauritius02.html">
+# http://www.worldtimezone.com/dst_news/dst_news_mauritius02.html
+# </a>
+
+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+Rule Mauritius 1982 only - Oct 10 0:00 1:00 S
+Rule Mauritius 1983 only - Mar 21 0:00 0 -
+Rule Mauritius 2008 only - Oct 26 2:00s 1:00 S
+Rule Mauritius 2009 only - Mar 27 2:00s 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis
- 4:00 - MUT # Mauritius Time
+ 4:00 Mauritius MU%sT # Mauritius Time
# Agalega Is, Rodriguez
# no information; probably like Indian/Mauritius
@@ -422,6 +476,77 @@
# Morocco
# See the `europe' file for Spanish Morocco (Africa/Ceuta).
+
+# From Alex Krivenyshev (2008-05-09):
+# Here is an article that Morocco plan to introduce Daylight Saving Time between
+# 1 June, 2008 and 27 September, 2008.
+#
+# "... Morocco is to save energy by adjusting its clock during summer so it will
+# be one hour ahead of GMT between 1 June and 27 September, according to
+# Communication Minister and Gov ernment Spokesman, Khalid Naciri...."
+#
+# <a href="http://www.worldtimezone.net/dst_news/dst_news_morocco01.html">
+# http://www.worldtimezone.net/dst_news/dst_news_morocco01.html
+# </a>
+# OR
+# <a href="http://en.afrik.com/news11892.html">
+# http://en.afrik.com/news11892.html
+# </a>
+
+# From Alex Krivenyshev (2008-05-09):
+# The Morocco time change can be confirmed on Morocco web site Maghreb Arabe Presse:
+# <a href="http://www.map.ma/eng/sections/box3/morocco_shifts_to_da/view">
+# http://www.map.ma/eng/sections/box3/morocco_shifts_to_da/view
+# </a>
+#
+# Morocco shifts to daylight time on June 1st through September 27, Govt.
+# spokesman.
+
+# From Patrice Scattolin (2008-05-09):
+# According to this article:
+# <a href="http://www.avmaroc.com/actualite/heure-dete-comment-a127896.html">
+# http://www.avmaroc.com/actualite/heure-dete-comment-a127896.html
+# </a>
+# (and republished here:
+# <a href="http://www.actu.ma/heure-dete-comment_i127896_0.html">
+# http://www.actu.ma/heure-dete-comment_i127896_0.html
+# </a>
+# )
+# the changes occurs at midnight:
+#
+# saturday night may 31st at midnight (which in french is to be
+# intrepreted as the night between saturday and sunday)
+# sunday night the 28th at midnight
+#
+# Seeing that the 28th is monday, I am guessing that she intends to say
+# the midnight of the 28th which is the midnight between sunday and
+# monday, which jives with other sources that say that it's inclusive
+# june1st to sept 27th.
+#
+# The decision was taken by decree *2-08-224 *but I can't find the decree
+# published on the web.
+#
+# It's also confirmed here:
+# <a href="http://www.maroc.ma/NR/exeres/FACF141F-D910-44B0-B7FA-6E03733425D1.htm">
+# http://www.maroc.ma/NR/exeres/FACF141F-D910-44B0-B7FA-6E03733425D1.htm
+# </a>
+# on a government portal as being between june 1st and sept 27th (not yet
+# posted in english).
+#
+# The following google query will generate many relevant hits:
+# <a href="http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search">
+# http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search
+# </a>
+
+# From Alex Krivenyshev (2008-05-09):
+# Is Western Sahara (part which administrated by Morocco) going to follow
+# Morocco DST changes? Any information? What about other part of
+# Western Sahara - under administration of POLISARIO Front (also named
+# SADR Saharawi Arab Democratic Republic)?
+
+# From Arthur David Olson (2008-05-09):
+# XXX--guess that it is only Morocco for now; guess only 2008 for now.
+
# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Morocco 1939 only - Sep 12 0:00 1:00 S
Rule Morocco 1939 only - Nov 19 0:00 0 -
@@ -438,11 +563,13 @@
Rule Morocco 1977 only - Sep 28 0:00 0 -
Rule Morocco 1978 only - Jun 1 0:00 1:00 S
Rule Morocco 1978 only - Aug 4 0:00 0 -
+Rule Morocco 2008 only - Jun 1 0:00 1:00 S
+Rule Morocco 2008 only - Sep 28 0:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
0:00 Morocco WE%sT 1984 Mar 16
1:00 - CET 1986
- 0:00 - WET
+ 0:00 Morocco WE%sT
# Western Sahara
Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan
-1:00 - WAT 1976 Apr 14
--- a/jdk/make/sun/javazic/tzdata/asia Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/make/sun/javazic/tzdata/asia Wed Jul 05 16:42:37 2017 +0200
@@ -251,6 +251,28 @@
# (could be true), for the moment I am assuming that those two
# counties are mistakes in the astro.com data.
+# From Paul Eggert (2008-02-11):
+# I just now checked Google News for western news sources that talk
+# about China's single time zone, and couldn't find anything before 1986
+# talking about China being in one time zone. (That article was: Jim
+# Mann, "A clumsy embrace for another western custom: China on daylight
+# time--sort of", Los Angeles Times, 1986-05-05. By the way, this
+# article confirms the tz database's data claiming that China began
+# observing daylight saving time in 1986.
+#
+# From Thomas S. Mullaney (2008-02-11):
+# I think you're combining two subjects that need to treated
+# separately: daylight savings (which, you're correct, wasn't
+# implemented until the 1980s) and the unified time zone centered near
+# Beijing (which was implemented in 1949). Briefly, there was also a
+# "Lhasa Time" in Tibet and "Urumqi Time" in Xinjiang. The first was
+# ceased, and the second eventually recognized (again, in the 1980s).
+#
+# From Paul Eggert (2008-06-30):
+# There seems to be a good chance China switched to a single time zone in 1949
+# rather than in 1980 as Shanks & Pottenger have it, but we don't have a
+# reliable documentary source saying so yet, so for now we still go with
+# Shanks & Pottenger.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
# Changbai Time ("Long-white Time", Long-white = Heilongjiang area)
@@ -468,13 +490,13 @@
# India
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Asia/Calcutta 5:53:28 - LMT 1880 # Kolkata
+Zone Asia/Kolkata 5:53:28 - LMT 1880 # Kolkata
5:53:20 - HMT 1941 Oct # Howrah Mean Time?
6:30 - BURT 1942 May 15 # Burma Time
5:30 - IST 1942 Sep
5:30 1:00 IST 1945 Oct 15
5:30 - IST
-# The following are like Asia/Calcutta:
+# The following are like Asia/Kolkata:
# Andaman Is
# Lakshadweep (Laccadive, Minicoy and Amindivi Is)
# Nicobar Is
@@ -599,6 +621,15 @@
# daylight saving time ...
# http://uk.reuters.com/article/oilRpt/idUKBLA65048420070916
#
+# From Roozbeh Pournader (2007-11-05):
+# This is quoted from Official Gazette of the Islamic Republic of
+# Iran, Volume 63, Number 18242, dated Tuesday 1386/6/24
+# [2007-10-16]. I am doing the best translation I can:...
+# The official time of the country will be moved forward for one hour
+# on the 24 hours of the first day of the month of Farvardin and will
+# be changed back to its previous state on the 24 hours of the
+# thirtieth day of Shahrivar.
+#
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Iran 1978 1980 - Mar 21 0:00 1:00 D
Rule Iran 1978 only - Oct 21 0:00 0 S
@@ -673,6 +704,21 @@
#
# So we'll ignore the Economist's claim.
+# From Steffen Thorsen (2008-03-10):
+# The cabinet in Iraq abolished DST last week, according to the following
+# news sources (in Arabic):
+# <a href="http://www.aljeeran.net/wesima_articles/news-20080305-98602.html">
+# http://www.aljeeran.net/wesima_articles/news-20080305-98602.html
+# </a>
+# <a href="http://www.aswataliraq.info/look/article.tpl?id=2047&IdLanguage=17&IdPublication=4&NrArticle=71743&NrIssue=1&NrSection=10">
+# http://www.aswataliraq.info/look/article.tpl?id=2047&IdLanguage=17&IdPublication=4&NrArticle=71743&NrIssue=1&NrSection=10
+# </a>
+#
+# We have published a short article in English about the change:
+# <a href="http://www.timeanddate.com/news/time/iraq-dumps-daylight-saving.html">
+# http://www.timeanddate.com/news/time/iraq-dumps-daylight-saving.html
+# </a>
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Iraq 1982 only - May 1 0:00 1:00 D
Rule Iraq 1982 1984 - Oct 1 0:00 0 S
@@ -683,8 +729,8 @@
# IATA SSIM (1991/1996) says Apr 1 12:01am UTC; guess the `:01' is a typo.
# Shanks & Pottenger say Iraq did not observe DST 1992/1997; ignore this.
#
-Rule Iraq 1991 max - Apr 1 3:00s 1:00 D
-Rule Iraq 1991 max - Oct 1 3:00s 0 S
+Rule Iraq 1991 2007 - Apr 1 3:00s 1:00 D
+Rule Iraq 1991 2007 - Oct 1 3:00s 0 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Baghdad 2:57:40 - LMT 1890
2:57:36 - BMT 1918 # Baghdad Mean Time?
@@ -1374,6 +1420,42 @@
# They decided not to adopt daylight-saving time....
# http://www.mongolnews.mn/index.php?module=unuudur&sec=view&id=15742
+# From Deborah Goldsmith (2008-03-30):
+# We received a bug report claiming that the tz database UTC offset for
+# Asia/Choibalsan (GMT+09:00) is incorrect, and that it should be GMT
+# +08:00 instead. Different sources appear to disagree with the tz
+# database on this, e.g.:
+#
+# <a href="http://www.timeanddate.com/worldclock/city.html?n=1026">
+# http://www.timeanddate.com/worldclock/city.html?n=1026
+# </a>
+# <a href="http://www.worldtimeserver.com/current_time_in_MN.aspx">
+# http://www.worldtimeserver.com/current_time_in_MN.aspx
+# </a>
+#
+# both say GMT+08:00.
+
+# From Steffen Thorsen (2008-03-31):
+# eznis airways, which operates several domestic flights, has a flight
+# schedule here:
+# <a href="http://www.eznis.com/Container.jsp?id=112">
+# http://www.eznis.com/Container.jsp?id=112
+# </a>
+# (click the English flag for English)
+#
+# There it appears that flights between Choibalsan and Ulaanbatar arrive
+# about 1:35 - 1:50 hours later in local clock time, no matter the
+# direction, while Ulaanbaatar-Khvod takes 2 hours in the Eastern
+# direction and 3:35 back, which indicates that Ulaanbatar and Khvod are
+# in different time zones (like we know about), while Choibalsan and
+# Ulaanbatar are in the same time zone (correction needed).
+
+# From Arthur David Olson (2008-05-19):
+# Assume that Choibalsan is indeed offset by 8:00.
+# XXX--in the absence of better information, assume that transition
+# was at the start of 2008-03-31 (the day of Steffen Thorsen's report);
+# this is almost surely wrong.
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Mongol 1983 1984 - Apr 1 0:00 1:00 S
Rule Mongol 1983 only - Oct 1 0:00 0 -
@@ -1409,7 +1491,8 @@
Zone Asia/Choibalsan 7:38:00 - LMT 1905 Aug
7:00 - ULAT 1978
8:00 - ULAT 1983 Apr
- 9:00 Mongol CHO%sT # Choibalsan Time
+ 9:00 Mongol CHO%sT 2008 Mar 31 # Choibalsan Time
+ 8:00 Mongol CHO%sT
# Nepal
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
@@ -1459,10 +1542,32 @@
# The minister told a news conference that the experiment had rather
# shown 8 per cent higher consumption of electricity.
+# From Alex Krivenyshev (2008-05-15):
+#
+# Here is an article that Pakistan plan to introduce Daylight Saving Time
+# on June 1, 2008 for 3 months.
+#
+# "... The federal cabinet on Wednesday announced a new conservation plan to help
+# reduce load shedding by approving the closure of commercial centres at 9pm and
+# moving clocks forward by one hour for the next three months.
+# ...."
+#
+# <a href="http://www.worldtimezone.net/dst_news/dst_news_pakistan01.html">
+# http://www.worldtimezone.net/dst_news/dst_news_pakistan01.html
+# </a>
+# OR
+# <a href="http://www.dailytimes.com.pk/default.asp?page=2008%5C05%5C15%5Cstory_15-5-2008_pg1_4">
+# http://www.dailytimes.com.pk/default.asp?page=2008%5C05%5C15%5Cstory_15-5-2008_pg1_4
+# </a>
+
+# From Arthur David Olson (2008-05-19):
+# XXX--midnight transitions is a guess; 2008 only is a guess.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Pakistan 2002 only - Apr Sun>=2 0:01 1:00 S
Rule Pakistan 2002 only - Oct Sun>=2 0:01 0 -
+Rule Pakistan 2008 only - Jun 1 0:00 1:00 S
+Rule Pakistan 2008 only - Sep 1 0:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Karachi 4:28:12 - LMT 1907
5:30 - IST 1942 Sep
@@ -1700,7 +1805,7 @@
# kept their clocks set five and a half hours ahead of Greenwich Mean
# Time (GMT), in line with neighbor India.
# From Paul Eggert (2006-04-18):
-# People who live in regions under Tamil control can use TZ='Asia/Calcutta',
+# People who live in regions under Tamil control can use [TZ='Asia/Kolkata'],
# as that zone has agreed with the Tamil areas since our cutoff date of 1970.
# From K Sethu (2006-04-25):
@@ -1790,10 +1895,62 @@
# From Paul Eggert (2007-03-29):
# Today the AP reported "Syria will switch to summertime at midnight Thursday."
# http://www.iht.com/articles/ap/2007/03/29/africa/ME-GEN-Syria-Time-Change.php
-# For lack of better info, assume the rule changed to "last Friday in March"
-# this year.
-Rule Syria 2007 max - Mar lastFri 0:00 1:00 S
-Rule Syria 2007 max - Oct 1 0:00 0 -
+Rule Syria 2007 only - Mar lastFri 0:00 1:00 S
+# From Jesper Norgard (2007-10-27):
+# The sister center ICARDA of my work CIMMYT is confirming that Syria DST will
+# not take place 1.st November at 0:00 o'clock but 1.st November at 24:00 or
+# rather Midnight between Thursday and Friday. This does make more sence than
+# having it between Wednesday and Thursday (two workdays in Syria) since the
+# weekend in Syria is not Saturday and Sunday, but Friday and Saturday. So now
+# it is implemented at midnight of the last workday before weekend...
+#
+# From Steffen Thorsen (2007-10-27):
+# Jesper Norgaard Welen wrote:
+#
+# > "Winter local time in Syria will be observed at midnight of Thursday 1
+# > November 2007, and the clock will be put back 1 hour."
+#
+# I found confirmation on this in this gov.sy-article (Arabic):
+# http://wehda.alwehda.gov.sy/_print_veiw.asp?FileName=12521710520070926111247
+#
+# which using Google's translate tools says:
+# Council of Ministers also approved the commencement of work on
+# identifying the winter time as of Friday, 2/11/2007 where the 60th
+# minute delay at midnight Thursday 1/11/2007.
+Rule Syria 2007 only - Nov Fri>=1 0:00 0 -
+
+# From Stephen Colebourne (2008-03-17):
+# For everyone's info, I saw an IATA time zone change for [Syria] for
+# this month (March 2008) in the last day or so...This is the data IATA
+# are now using:
+# Country Time Standard --- DST Start --- --- DST End --- DST
+# Name Zone Variation Time Date Time Date
+# Variation
+# Syrian Arab
+# Republic SY +0200 2200 03APR08 2100 30SEP08 +0300
+# 2200 02APR09 2100 30SEP09 +0300
+# 2200 01APR10 2100 30SEP10 +0300
+
+# From Arthur David Olson (2008-03-17):
+# Here's a link to English-language coverage by the Syrian Arab News
+# Agency (SANA)...
+# <a href="http://www.sana.sy/eng/21/2008/03/11/165173.htm">
+# http://www.sana.sy/eng/21/2008/03/11/165173.htm
+# </a>...which reads (in part) "The Cabinet approved the suggestion of the
+# Ministry of Electricity to begin daylight savings time on Friday April
+# 4th, advancing clocks one hour ahead on midnight of Thursday April 3rd."
+# Since Syria is two hours east of UTC, the 2200 and 2100 transition times
+# shown above match up with midnight in Syria.
+
+# From Arthur David Olson (2008-03-18):
+# My buest guess at a Syrian rule is "the Friday nearest April 1";
+# coding that involves either using a "Mar Fri>=29" construct that old time zone
+# compilers can't handle or having multiple Rules (a la Israel).
+# For now, use "Apr Fri>=1", and go with IATA on a uniform Sep 30 end.
+
+Rule Syria 2008 max - Apr Fri>=1 0:00 1:00 S
+Rule Syria 2008 max - Oct 1 0:00 0 -
+
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Damascus 2:25:12 - LMT 1920 # Dimashq
2:00 Syria EE%sT
@@ -1847,13 +2004,13 @@
# Vietnam
-# From Paul Eggert (1993-11-18):
-# Saigon's official name is Thanh-Pho Ho Chi Minh, but it's too long.
-# We'll stick with the traditional name for now.
+# From Arthur David Olson (2008-03-18):
+# The English-language name of Vietnam's most populous city is "Ho Chi Min City";
+# we use Ho_Chi_Minh below to avoid a name of more than 14 characters.
# From Shanks & Pottenger:
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Asia/Saigon 7:06:40 - LMT 1906 Jun 9
+Zone Asia/Ho_Chi_Minh 7:06:40 - LMT 1906 Jun 9
7:06:20 - SMT 1911 Mar 11 0:01 # Saigon MT?
7:00 - ICT 1912 May
8:00 - ICT 1931 May
--- a/jdk/make/sun/javazic/tzdata/australasia Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/make/sun/javazic/tzdata/australasia Wed Jul 05 16:42:37 2017 +0200
@@ -1368,7 +1368,7 @@
# * Tonga will introduce DST in November
#
# I was given this link by John Letts:
-# <a hef="http://news.bbc.co.uk/hi/english/world/asia-pacific/newsid_424000/424764.stm">
+# <a href="http://news.bbc.co.uk/hi/english/world/asia-pacific/newsid_424000/424764.stm">
# http://news.bbc.co.uk/hi/english/world/asia-pacific/newsid_424000/424764.stm
# </a>
#
@@ -1378,7 +1378,7 @@
# (12 + 1 hour DST).
# From Arthur David Olson (1999-09-20):
-# According to <a href="http://www.tongaonline.com/news/sept1799.html>
+# According to <a href="http://www.tongaonline.com/news/sept1799.html">
# http://www.tongaonline.com/news/sept1799.html
# </a>:
# "Daylight Savings Time will take effect on Oct. 2 through April 15, 2000
--- a/jdk/make/sun/javazic/tzdata/backward Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/make/sun/javazic/tzdata/backward Wed Jul 05 16:42:37 2017 +0200
@@ -46,12 +46,15 @@
Link Asia/Ashgabat Asia/Ashkhabad
Link Asia/Chongqing Asia/Chungking
Link Asia/Dhaka Asia/Dacca
+Link Asia/Kolkata Asia/Calcutta
Link Asia/Macau Asia/Macao
Link Asia/Jerusalem Asia/Tel_Aviv
+Link Asia/Ho_Chi_Minh Asia/Saigon
Link Asia/Thimphu Asia/Thimbu
Link Asia/Makassar Asia/Ujung_Pandang
Link Asia/Ulaanbaatar Asia/Ulan_Bator
Link Atlantic/Faroe Atlantic/Faeroe
+Link Europe/Oslo Atlantic/Jan_Mayen
Link Australia/Sydney Australia/ACT
Link Australia/Sydney Australia/Canberra
Link Australia/Lord_Howe Australia/LHI
--- a/jdk/make/sun/javazic/tzdata/europe Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/make/sun/javazic/tzdata/europe Wed Jul 05 16:42:37 2017 +0200
@@ -479,7 +479,7 @@
Rule EU 1981 max - Mar lastSun 1:00u 1:00 S
Rule EU 1996 max - Oct lastSun 1:00u 0 -
# The most recent directive covers the years starting in 2002. See:
-# <a href="http://europa.eu.int/eur-lex/en/lif/dat/2000/en_300L0084.html"
+# <a href="http://europa.eu.int/eur-lex/en/lif/dat/2000/en_300L0084.html">
# Directive 2000/84/EC of the European Parliament and of the Council
# of 19 January 2001 on summer-time arrangements.
# </a>
@@ -502,9 +502,48 @@
Rule C-Eur 1942 only - Nov 2 2:00s 0 -
Rule C-Eur 1943 only - Mar 29 2:00s 1:00 S
Rule C-Eur 1943 only - Oct 4 2:00s 0 -
-Rule C-Eur 1944 only - Apr 3 2:00s 1:00 S
+Rule C-Eur 1944 1945 - Apr Mon>=1 2:00s 1:00 S
# Whitman gives 1944 Oct 7; go with Shanks & Pottenger.
Rule C-Eur 1944 only - Oct 2 2:00s 0 -
+# From Jesper Norgaard Welen (2008-07-13):
+#
+# I found what is probably a typo of 2:00 which should perhaps be 2:00s
+# in the C-Eur rule from tz database version 2008d (this part was
+# corrected in version 2008d). The circumstancial evidence is simply the
+# tz database itself, as seen below:
+#
+# Zone Europe/Paris 0:09:21 - LMT 1891 Mar 15 0:01
+# 0:00 France WE%sT 1945 Sep 16 3:00
+#
+# Zone Europe/Monaco 0:29:32 - LMT 1891 Mar 15
+# 0:00 France WE%sT 1945 Sep 16 3:00
+#
+# Zone Europe/Belgrade 1:22:00 - LMT 1884
+# 1:00 1:00 CEST 1945 Sep 16 2:00s
+#
+# Rule France 1945 only - Sep 16 3:00 0 -
+# Rule Belgium 1945 only - Sep 16 2:00s 0 -
+# Rule Neth 1945 only - Sep 16 2:00s 0 -
+#
+# The rule line to be changed is:
+#
+# Rule C-Eur 1945 only - Sep 16 2:00 0 -
+#
+# It seems that Paris, Monaco, Rule France, Rule Belgium all agree on
+# 2:00 standard time, e.g. 3:00 local time. However there are no
+# countries that use C-Eur rules in September 1945, so the only items
+# affected are apparently these ficticious zones that translates acronyms
+# CET and MET:
+#
+# Zone CET 1:00 C-Eur CE%sT
+# Zone MET 1:00 C-Eur ME%sT
+#
+# It this is right then the corrected version would look like:
+#
+# Rule C-Eur 1945 only - Sep 16 2:00s 0 -
+#
+# A small step for mankind though 8-)
+Rule C-Eur 1945 only - Sep 16 2:00s 0 -
Rule C-Eur 1977 1980 - Apr Sun>=1 2:00s 1:00 S
Rule C-Eur 1977 only - Sep lastSun 2:00s 0 -
Rule C-Eur 1978 only - Oct 1 2:00s 0 -
@@ -747,7 +786,8 @@
Zone Europe/Sofia 1:33:16 - LMT 1880
1:56:56 - IMT 1894 Nov 30 # Istanbul MT?
2:00 - EET 1942 Nov 2 3:00
- 1:00 C-Eur CE%sT 1945 Apr 2 3:00
+ 1:00 C-Eur CE%sT 1945
+ 1:00 - CET 1945 Apr 2 3:00
2:00 - EET 1979 Mar 31 23:00
2:00 Bulg EE%sT 1982 Sep 26 2:00
2:00 C-Eur EE%sT 1991
@@ -1115,33 +1155,40 @@
# [See tz-link.htm for the URL.]
# From Joerg Schilling (2002-10-23):
-# In 1945, Berlin was switched to Moscow Summer time (GMT+4) by <a
-# href="http://www.dhm.de/lemo/html/biografien/BersarinNikolai/">
+# In 1945, Berlin was switched to Moscow Summer time (GMT+4) by
+# <a href="http://www.dhm.de/lemo/html/biografien/BersarinNikolai/">
# General [Nikolai] Bersarin</a>.
# From Paul Eggert (2003-03-08):
# <a href="http://www.parlament-berlin.de/pds-fraktion.nsf/727459127c8b66ee8525662300459099/defc77cb784f180ac1256c2b0030274b/$FILE/bersarint.pdf">
+# http://www.parlament-berlin.de/pds-fraktion.nsf/727459127c8b66ee8525662300459099/defc77cb784f180ac1256c2b0030274b/$FILE/bersarint.pdf
+# </a>
# says that Bersarin issued an order to use Moscow time on May 20.
# However, Moscow did not observe daylight saving in 1945, so
# this was equivalent to CEMT (GMT+3), not GMT+4.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Germany 1945 only - Apr 2 2:00s 1:00 S
-Rule Germany 1945 only - May 24 2:00 2:00 M # Midsummer
-Rule Germany 1945 only - Sep 24 3:00 1:00 S
-Rule Germany 1945 only - Nov 18 2:00s 0 -
Rule Germany 1946 only - Apr 14 2:00s 1:00 S
Rule Germany 1946 only - Oct 7 2:00s 0 -
Rule Germany 1947 1949 - Oct Sun>=1 2:00s 0 -
-Rule Germany 1947 only - Apr 6 2:00s 1:00 S
+# http://www.ptb.de/de/org/4/44/441/salt.htm says the following transition
+# occurred at 3:00 MEZ, not the 2:00 MEZ given in Shanks & Pottenger.
+# Go with the PTB.
+Rule Germany 1947 only - Apr 6 3:00s 1:00 S
Rule Germany 1947 only - May 11 2:00s 2:00 M
Rule Germany 1947 only - Jun 29 3:00 1:00 S
Rule Germany 1948 only - Apr 18 2:00s 1:00 S
Rule Germany 1949 only - Apr 10 2:00s 1:00 S
+
+Rule SovietZone 1945 only - May 24 2:00 2:00 M # Midsummer
+Rule SovietZone 1945 only - Sep 24 3:00 1:00 S
+Rule SovietZone 1945 only - Nov 18 2:00s 0 -
+
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Europe/Berlin 0:53:28 - LMT 1893 Apr
- 1:00 C-Eur CE%sT 1945 Apr 2 2:00
+ 1:00 C-Eur CE%sT 1945 May 24 2:00
+ 1:00 SovietZone CE%sT 1946
1:00 Germany CE%sT 1980
1:00 EU CE%sT
@@ -1218,7 +1265,7 @@
Zone Europe/Budapest 1:16:20 - LMT 1890 Oct
1:00 C-Eur CE%sT 1918
1:00 Hungary CE%sT 1941 Apr 6 2:00
- 1:00 C-Eur CE%sT 1945 May 1 23:00
+ 1:00 C-Eur CE%sT 1945
1:00 Hungary CE%sT 1980 Sep 28 2:00s
1:00 EU CE%sT
@@ -1736,7 +1783,6 @@
# come up with more definitive info about the timekeeping during the
# war years it's probably best just do do the following for now:
Link Europe/Oslo Arctic/Longyearbyen
-Link Europe/Oslo Atlantic/Jan_Mayen
# Poland
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
@@ -2136,7 +2182,8 @@
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Europe/Belgrade 1:22:00 - LMT 1884
1:00 - CET 1941 Apr 18 23:00
- 1:00 C-Eur CE%sT 1945 May 8 2:00s
+ 1:00 C-Eur CE%sT 1945
+ 1:00 - CET 1945 May 8 2:00s
1:00 1:00 CEST 1945 Sep 16 2:00s
# Metod Kozelj reports that the legal date of
# transition to EU rules was 1982-11-27, for all of Yugoslavia at the time.
--- a/jdk/make/sun/javazic/tzdata/iso3166.tab Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/make/sun/javazic/tzdata/iso3166.tab Wed Jul 05 16:42:37 2017 +0200
@@ -28,7 +28,7 @@
#
# This file contains a table with the following columns:
# 1. ISO 3166-1 alpha-2 country code, current as of
-# ISO 3166-1 Newsletter No. V-12 (2006-09-26). See:
+# ISO 3166-1 Newsletter VI-1 (2007-09-21). See:
# <a href="http://www.iso.org/iso/en/prods-services/iso3166ma/index.html">
# ISO 3166 Maintenance agency (ISO 3166/MA)
# </a>.
@@ -69,6 +69,7 @@
BH Bahrain
BI Burundi
BJ Benin
+BL St Barthelemy
BM Bermuda
BN Brunei
BO Bolivia
@@ -181,6 +182,7 @@
MC Monaco
MD Moldova
ME Montenegro
+MF St Martin (French part)
MG Madagascar
MH Marshall Islands
MK Macedonia
--- a/jdk/make/sun/javazic/tzdata/leapseconds Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/make/sun/javazic/tzdata/leapseconds Wed Jul 05 16:42:37 2017 +0200
@@ -66,8 +66,10 @@
Leap 1997 Jun 30 23:59:60 + S
Leap 1998 Dec 31 23:59:60 + S
Leap 2005 Dec 31 23:59:60 + S
+Leap 2008 Dec 31 23:59:60 + S
# INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS)
+#
# SERVICE INTERNATIONAL DE LA ROTATION TERRESTRE ET DES SYSTEMES DE REFERENCE
#
# SERVICE DE LA ROTATION TERRESTRE
@@ -75,30 +77,38 @@
# 61, Av. de l'Observatoire 75014 PARIS (France)
# Tel. : 33 (0) 1 40 51 22 26
# FAX : 33 (0) 1 40 51 22 91
-# Internet : services.iers@obspm.fr
+# e-mail : services.iers@obspm.fr
+# http://hpiers.obspm.fr/eop-pc
#
-# Paris, 28 June 2007
+# Paris, 4 July 2008
#
-# Bulletin C 34
+# Bulletin C 36
#
# To authorities responsible
# for the measurement and
# distribution of time
#
-# INFORMATION ON UTC - TAI
+# UTC TIME STEP
+# on the 1st of January 2009
+#
+# A positive leap second will be introduced at the end of December 2008.
+# The sequence of dates of the UTC second markers will be:
#
-# NO positive leap second will be introduced at the end of December 2007.
-# The difference between Coordinated Universal Time UTC and the
-# International Atomic Time TAI is :
+# 2008 December 31, 23h 59m 59s
+# 2008 December 31, 23h 59m 60s
+# 2009 January 1, 0h 0m 0s
#
-# from 2006 January 1, 0h UTC, until further notice : UTC-TAI = -33 s
+# The difference between UTC and the International Atomic Time TAI is:
+#
+# from 2006 January 1, 0h UTC, to 2009 January 1 0h UTC : UTC-TAI = - 33s
+# from 2009 January 1, 0h UTC, until further notice : UTC-TAI = - 34s
#
# Leap seconds can be introduced in UTC at the end of the months of December
-# or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every
-# six months, either to announce a time step in UTC, or to confirm that there
+# or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every
+# six months, either to announce a time step in UTC or to confirm that there
# will be no time step at the next possible date.
#
# Daniel GAMBIS
-# Director
+# Head
# Earth Orientation Center of IERS
# Observatoire de Paris, France
--- a/jdk/make/sun/javazic/tzdata/northamerica Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/make/sun/javazic/tzdata/northamerica Wed Jul 05 16:42:37 2017 +0200
@@ -2098,8 +2098,8 @@
# http://www.jonesbahamas.com/?c=45&a=10412
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Bahamas 1964 2006 - Oct lastSun 2:00 0 S
-Rule Bahamas 1964 1986 - Apr lastSun 2:00 1:00 D
+Rule Bahamas 1964 1975 - Oct lastSun 2:00 0 S
+Rule Bahamas 1964 1975 - Apr lastSun 2:00 1:00 D
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Nassau -5:09:24 - LMT 1912 Mar 2
-5:00 Bahamas E%sT 1976
@@ -2209,6 +2209,69 @@
# says Cuban clocks will advance at midnight on March 10.
# For lack of better information, assume Cuba will use US rules,
# except that it switches at midnight standard time as usual.
+#
+# From Steffen Thorsen (2007-10-25):
+# Carlos Alberto Fonseca Arauz informed me that Cuba will end DST one week
+# earlier - on the last Sunday of October, just like in 2006.
+#
+# He supplied these references:
+#
+# http://www.prensalatina.com.mx/article.asp?ID=%7B4CC32C1B-A9F7-42FB-8A07-8631AFC923AF%7D&language=ES
+# http://actualidad.terra.es/sociedad/articulo/cuba_llama_ahorrar_energia_cambio_1957044.htm
+#
+# From Alex Kryvenishev (2007-10-25):
+# Here is also article from Granma (Cuba):
+#
+# [Regira] el Horario Normal desde el [proximo] domingo 28 de octubre
+# http://www.granma.cubaweb.cu/2007/10/24/nacional/artic07.html
+#
+# http://www.worldtimezone.com/dst_news/dst_news_cuba03.html
+
+# From Arthur David Olson (2008-03-09):
+# I'm in Maryland which is now observing United States Eastern Daylight
+# Time. At 9:44 local time I used RealPlayer to listen to
+# <a href="http://media.enet.cu/radioreloj">
+# http://media.enet.cu/radioreloj
+# </a>, a Cuban information station, and heard
+# the time announced as "ocho cuarenta y cuatro" ("eight forty-four"),
+# indicating that Cuba is still on standard time.
+
+# From Steffen Thorsen (2008-03-12):
+# It seems that Cuba will start DST on Sunday, 2007-03-16...
+# It was announced yesterday, according to this source (in Spanish):
+# <a href="http://www.nnc.cubaweb.cu/marzo-2008/cien-1-11-3-08.htm">
+# http://www.nnc.cubaweb.cu/marzo-2008/cien-1-11-3-08.htm
+# </a>
+#
+# Some more background information is posted here:
+# <a href="http://www.timeanddate.com/news/time/cuba-starts-dst-march-16.html">
+# http://www.timeanddate.com/news/time/cuba-starts-dst-march-16.html
+# </a>
+#
+# The article also says that Cuba has been observing DST since 1963,
+# while Shanks (and tzdata) has 1965 as the first date (except in the
+# 1940's). Many other web pages in Cuba also claim that it has been
+# observed since 1963, but with the exception of 1970 - an exception
+# which is not present in tzdata/Shanks. So there is a chance we need to
+# change some historic records as well.
+#
+# One example:
+# <a href="http://www.radiohc.cu/espanol/noticias/mar07/11mar/hor.htm">
+# http://www.radiohc.cu/espanol/noticias/mar07/11mar/hor.htm
+# </a>
+
+# From Jesper Norgaard Welen (2008-03-13):
+# The Cuban time change has just been confirmed on the most authoritative
+# web site, the Granma. Please check out
+# <a href="http://www.granma.cubaweb.cu/2008/03/13/nacional/artic10.html">
+# http://www.granma.cubaweb.cu/2008/03/13/nacional/artic10.html
+# </a>
+#
+# Basically as expected after Steffen Thorsens information, the change
+# will take place midnight between Saturday and Sunday.
+
+# From Arthur David Olson (2008-03-12):
+# Assume Sun>=15 (third Sunday) going forward.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Cuba 1928 only - Jun 10 0:00 1:00 D
@@ -2240,9 +2303,9 @@
Rule Cuba 1998 1999 - Mar lastSun 0:00s 1:00 D
Rule Cuba 1998 2003 - Oct lastSun 0:00s 0 S
Rule Cuba 2000 2006 - Apr Sun>=1 0:00s 1:00 D
-Rule Cuba 2006 only - Oct lastSun 0:00s 0 S
-Rule Cuba 2007 max - Mar Sun>=8 0:00s 1:00 D
-Rule Cuba 2007 max - Nov Sun>=1 0:00s 0 S
+Rule Cuba 2006 max - Oct lastSun 0:00s 0 S
+Rule Cuba 2007 only - Mar Sun>=8 0:00s 1:00 D
+Rule Cuba 2008 max - Mar Sun>=15 0:00s 1:00 D
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Havana -5:29:28 - LMT 1890
@@ -2309,6 +2372,10 @@
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Guadeloupe -4:06:08 - LMT 1911 Jun 8 # Pointe a Pitre
-4:00 - AST
+# St Barthelemy
+Link America/Guadeloupe America/St_Barthelemy
+# St Martin (French part)
+Link America/Guadeloupe America/Marigot
# Guatemala
#
--- a/jdk/make/sun/javazic/tzdata/southamerica Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/make/sun/javazic/tzdata/southamerica Wed Jul 05 16:42:37 2017 +0200
@@ -127,7 +127,11 @@
# which did not result in the switch of a time zone, as they stayed 9 hours
# from the International Date Line.
Rule Arg 1999 only - Oct Sun>=1 0:00 1:00 S
-Rule Arg 2000 only - Mar Sun>=1 0:00 0 -
+# From Paul Eggert (2007-12-28):
+# DST was set to expire on March 5, not March 3, but since it was converted
+# to standard time on March 3 it's more convenient for us to pretend that
+# it ended on March 3.
+Rule Arg 2000 only - Mar 3 0:00 0 -
#
# From Peter Gradelski via Steffen Thorsen (2000-03-01):
# We just checked with our Sao Paulo office and they say the government of
@@ -162,6 +166,30 @@
# This kind of things had always been done this way in Argentina.
# We are still -03:00 all year round in all of the country.
#
+# From Steffen Thorsen (2007-12-21):
+# A user (Leonardo Chaim) reported that Argentina will adopt DST....
+# all of the country (all Zone-entries) are affected. News reports like
+# http://www.lanacion.com.ar/opinion/nota.asp?nota_id=973037 indicate
+# that Argentina will use DST next year as well, from October to
+# March, although exact rules are not given.
+#
+# From Jesper Norgaard Welen (2007-12-26)
+# The last hurdle of Argentina DST is over, the proposal was approved in
+# the lower chamber too (Deputados) with a vote 192 for and 2 against.
+# By the way thanks to Mariano Absatz and Daniel Mario Vega for the link to
+# the original scanned proposal, where the dates and the zero hours are
+# clear and unambiguous...This is the article about final approval:
+# <a href="http://www.lanacion.com.ar/politica/nota.asp?nota_id=973996">
+# http://www.lanacion.com.ar/politica/nota.asp?nota_id=973996
+# </a>
+#
+# From Paul Eggert (2007-12-22):
+# For dates after mid-2008, the following rules are my guesses and
+# are quite possibly wrong, but are more likely than no DST at all.
+Rule Arg 2007 only - Dec 30 0:00 1:00 S
+Rule Arg 2008 max - Mar Sun>=15 0:00 0 -
+Rule Arg 2008 max - Oct Sun>=1 0:00 1:00 S
+
# From Mariano Absatz (2004-05-21):
# Today it was officially published that the Province of Mendoza is changing
# its timezone this winter... starting tomorrow night....
@@ -222,10 +250,80 @@
# http://www.sanjuan.gov.ar/prensa/archivo/000426.html
# http://www.sanjuan.gov.ar/prensa/archivo/000441.html
+# From Alex Krivenyshev (2008-01-17):
+# Here are articles that Argentina Province San Luis is planning to end DST
+# as earlier as upcoming Monday January 21, 2008 or February 2008:
+#
+# Provincia argentina retrasa reloj y marca diferencia con resto del pais
+# (Argentine Province delayed clock and mark difference with the rest of the
+# country)
+# <a href="http://cl.invertia.com/noticias/noticia.aspx?idNoticia=200801171849_EFE_ET4373&idtel">
+# http://cl.invertia.com/noticias/noticia.aspx?idNoticia=200801171849_EFE_ET4373&idtel
+# </a>
+#
+# Es inminente que en San Luis atrasen una hora los relojes
+# (It is imminent in San Luis clocks one hour delay)
+# <a href="http://www.lagaceta.com.ar/vernotae.asp?id_nota=253414">
+# http://www.lagaceta.com.ar/vernotae.asp?id_nota=253414
+# </a>
+#
+# <a href="http://www.worldtimezone.net/dst_news/dst_news_argentina02.html">
+# http://www.worldtimezone.net/dst_news/dst_news_argentina02.html
+# </a>
+
+# From Jesper Norgaard Welen (2008-01-18):
+# The page of the San Luis provincial government
+# <a href="http://www.sanluis.gov.ar/notas.asp?idCanal=0&id=22812">
+# http://www.sanluis.gov.ar/notas.asp?idCanal=0&id=22812
+# </a>
+# confirms what Alex Krivenyshev has earlier sent to the tz
+# emailing list about that San Luis plans to return to standard
+# time much earlier than the rest of the country. It also
+# confirms that upon request the provinces San Juan and Mendoza
+# refused to follow San Luis in this change.
+#
+# The change is supposed to take place Monday the 21.st at 0:00
+# hours. As far as I understand it if this goes ahead, we need
+# a new timezone for San Luis (although there are also documented
+# independent changes in the southamerica file of San Luis in
+# 1990 and 1991 which has not been confirmed).
+
+# From Jesper Norgaard Welen (2008-01-25):
+# Unfortunately the below page has become defunct, about the San Luis
+# time change. Perhaps because it now is part of a group of pages "Most
+# important pages of 2008."
+#
+# You can use
+# <a href="http://www.sanluis.gov.ar/notas.asp?idCanal=8141&id=22834">
+# http://www.sanluis.gov.ar/notas.asp?idCanal=8141&id=22834
+# </a>
+# instead it seems. Or use "Buscador" from the main page of the San Luis
+# government, and fill in "huso" and click OK, and you will get 3 pages
+# from which the first one is identical to the above.
+
+# From Mariano Absatz (2008-01-28):
+# I can confirm that the Province of San Luis (and so far only that
+# province) decided to go back to UTC-3 effective midnight Jan 20th 2008
+# (that is, Monday 21st at 0:00 is the time the clocks were delayed back
+# 1 hour), and they intend to keep UTC-3 as their timezone all year round
+# (that is, unless they change their mind any minute now).
+#
+# So we'll have to add yet another city to 'southamerica' (I think San
+# Luis city is the mos populated city in the Province, so it'd be
+# America/Argentina/San_Luis... of course I can't remember if San Luis's
+# history of particular changes goes along with Mendoza or San Juan :-(
+# (I only remember not being able to collect hard facts about San Luis
+# back in 2004, when these provinces changed to UTC-4 for a few days, I
+# mailed them personally and never got an answer).
+
+# From Paul Eggert (2008-06-30):
# Unless otherwise specified, data are from Shanks & Pottenger through 1992,
# from the IATA otherwise. As noted below, Shanks & Pottenger say that
-# America/Cordoba split into 6 subregions during 1991/1992, but we
-# haven't verified this yet so for now we'll keep it a single region.
+# America/Cordoba split into 6 subregions during 1991/1992, one of which
+# was America/San_Luis, but we haven't verified this yet so for now we'll
+# keep America/Cordoba a single region rather than splitting it into the
+# other 5 subregions.
+
#
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
#
@@ -236,18 +334,16 @@
-4:00 Arg AR%sT 1969 Oct 5
-3:00 Arg AR%sT 1999 Oct 3
-4:00 Arg AR%sT 2000 Mar 3
- -3:00 - ART
+ -3:00 Arg AR%sT
#
# Santa Fe (SF), Entre Rios (ER), Corrientes (CN), Misiones (MN), Chaco (CC),
# Formosa (FM), Salta (SA), Santiago del Estero (SE), Cordoba (CB),
-# San Luis (SL), La Pampa (LP), Neuquen (NQ), Rio Negro (RN)
+# La Pampa (LP), Neuquen (NQ), Rio Negro (RN)
#
# Shanks & Pottenger also make the following claims, which we haven't verified:
# - Formosa switched to -3:00 on 1991-01-07.
# - Misiones switched to -3:00 on 1990-12-29.
# - Chaco switched to -3:00 on 1991-01-04.
-# - San Luis switched to -4:00 on 1990-03-14, then to -3:00 on 1990-10-15,
-# then to -4:00 on 1991-03-01, then to -3:00 on 1991-06-01.
# - Santiago del Estero switched to -4:00 on 1991-04-01,
# then to -3:00 on 1991-04-26.
#
@@ -259,7 +355,7 @@
-4:00 - WART 1991 Oct 20
-3:00 Arg AR%sT 1999 Oct 3
-4:00 Arg AR%sT 2000 Mar 3
- -3:00 - ART
+ -3:00 Arg AR%sT
#
# Tucuman (TM)
Zone America/Argentina/Tucuman -4:20:52 - LMT 1894 Oct 31
@@ -272,7 +368,7 @@
-4:00 Arg AR%sT 2000 Mar 3
-3:00 - ART 2004 Jun 1
-4:00 - WART 2004 Jun 13
- -3:00 - ART
+ -3:00 Arg AR%sT
#
# La Rioja (LR)
Zone America/Argentina/La_Rioja -4:27:24 - LMT 1894 Oct 31
@@ -285,7 +381,7 @@
-4:00 Arg AR%sT 2000 Mar 3
-3:00 - ART 2004 Jun 1
-4:00 - WART 2004 Jun 20
- -3:00 - ART
+ -3:00 Arg AR%sT
#
# San Juan (SJ)
Zone America/Argentina/San_Juan -4:34:04 - LMT 1894 Oct 31
@@ -298,7 +394,7 @@
-4:00 Arg AR%sT 2000 Mar 3
-3:00 - ART 2004 May 31
-4:00 - WART 2004 Jul 25
- -3:00 - ART
+ -3:00 Arg AR%sT
#
# Jujuy (JY)
Zone America/Argentina/Jujuy -4:21:12 - LMT 1894 Oct 31
@@ -312,7 +408,7 @@
-3:00 1:00 ARST 1992
-3:00 Arg AR%sT 1999 Oct 3
-4:00 Arg AR%sT 2000 Mar 3
- -3:00 - ART
+ -3:00 Arg AR%sT
#
# Catamarca (CT), Chubut (CH)
Zone America/Argentina/Catamarca -4:23:08 - LMT 1894 Oct 31
@@ -325,7 +421,7 @@
-4:00 Arg AR%sT 2000 Mar 3
-3:00 - ART 2004 Jun 1
-4:00 - WART 2004 Jun 20
- -3:00 - ART
+ -3:00 Arg AR%sT
#
# Mendoza (MZ)
Zone America/Argentina/Mendoza -4:35:16 - LMT 1894 Oct 31
@@ -342,6 +438,23 @@
-4:00 Arg AR%sT 2000 Mar 3
-3:00 - ART 2004 May 23
-4:00 - WART 2004 Sep 26
+ -3:00 Arg AR%sT
+#
+# San Luis (SL)
+Zone America/Argentina/San_Luis -4:25:24 - LMT 1894 Oct 31
+ -4:16:48 - CMT 1920 May
+ -4:00 - ART 1930 Dec
+ -4:00 Arg AR%sT 1969 Oct 5
+ -3:00 Arg AR%sT 1990
+ -3:00 1:00 ARST 1990 Mar 14
+ -4:00 - WART 1990 Oct 15
+ -4:00 1:00 WARST 1991 Mar 1
+ -4:00 - WART 1991 Jun 1
+ -3:00 - ART 1999 Oct 3
+ -4:00 1:00 WARST 2000 Mar 3
+ -3:00 - ART 2004 May 31
+ -4:00 - WART 2004 Jul 25
+ -3:00 Arg AR%sT 2008 Jan 21
-3:00 - ART
#
# Santa Cruz (SC)
@@ -353,7 +466,7 @@
-4:00 Arg AR%sT 2000 Mar 3
-3:00 - ART 2004 Jun 1
-4:00 - WART 2004 Jun 20
- -3:00 - ART
+ -3:00 Arg AR%sT
#
# Tierra del Fuego, Antartida e Islas del Atlantico Sur (TF)
Zone America/Argentina/Ushuaia -4:33:12 - LMT 1894 Oct 31
@@ -364,7 +477,7 @@
-4:00 Arg AR%sT 2000 Mar 3
-3:00 - ART 2004 May 30
-4:00 - WART 2004 Jun 20
- -3:00 - ART
+ -3:00 Arg AR%sT
# Aruba
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
@@ -450,6 +563,50 @@
# Brazil will start DST on 2007-10-14 00:00 and end on 2008-02-17 00:00:
# http://www.mme.gov.br/site/news/detail.do;jsessionid=BBA06811AFCAAC28F0285210913513DA?newsId=13975
+# From Paul Schulze (2008-06-24):
+# ...by law number 11.662 of April 24, 2008 (published in the "Diario
+# Oficial da Uniao"...) in Brazil there are changes in the timezones,
+# effective today (00:00am at June 24, 2008) as follows:
+#
+# a) The timezone UTC+5 is e[x]tinguished, with all the Acre state and the
+# part of the Amazonas state that had this timezone now being put to the
+# timezone UTC+4
+# b) The whole Para state now is put at timezone UTC+3, instead of just
+# part of it, as was before.
+#
+# This change follows a proposal of senator Tiao Viana of Acre state, that
+# proposed it due to concerns about open television channels displaying
+# programs inappropriate to youths in the states that had the timezone
+# UTC+5 too early in the night. In the occasion, some more corrections
+# were proposed, trying to unify the timezones of any given state. This
+# change modifies timezone rules defined in decree 2.784 of 18 June,
+# 1913.
+
+# From Rodrigo Severo (2008-06-24):
+# Just correcting the URL:
+# <a href="https://www.in.gov.br/imprensa/visualiza/index.jsp?jornal=3Ddo&secao=3D1&pagina=3D1&data=3D25/04/2008">
+# https://www.in.gov.br/imprensa/visualiza/index.jsp?jornal=3Ddo&secao=3D1&pagina=3D1&data=3D25/04/2008
+# </a>
+#
+# 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
+# suggest this new timezone be called Santarem as the most
+# important/populated city in the affected area.
+#
+# This new timezone would be the same as the Rio_Branco timezone up to
+# the 2008/06/24 change which would be to UTC-3 instead of UTC-4.
+
+# From Alex Krivenyshev (2008-06-24):
+# This is a quick reference page for New and Old Brazil Time Zones map.
+# <a href="http://www.worldtimezone.com/brazil-time-new-old.php">
+# http://www.worldtimezone.com/brazil-time-new-old.php
+# </a>
+#
+# - 4 time zones replaced by 3 time zones-eliminating time zone UTC- 05
+# (state Acre and the part of the Amazonas will be UTC/GMT- 04) - western
+# part of Par state is moving to one timezone UTC- 03 (from UTC -04).
+
# From Paul Eggert (2002-10-10):
# The official decrees referenced below are mostly taken from
# <a href="http://pcdsh01.on.br/DecHV.html">
@@ -572,13 +729,13 @@
Rule Brazil 2000 2001 - Oct Sun>=8 0:00 1:00 S
Rule Brazil 2001 2006 - Feb Sun>=15 0:00 0 -
# Decree 4,399 (2002-10-01) repeals DST in AL, CE, MA, PB, PE, PI, RN, SE.
-# <a href="http://www.presidencia.gov.br/CCIVIL/decreto/2002/D4399.htm"></a>
+# <a href="http://www.presidencia.gov.br/CCIVIL/decreto/2002/D4399.htm">4,399</a>
Rule Brazil 2002 only - Nov 3 0:00 1:00 S
# Decree 4,844 (2003-09-24; corrected 2003-09-26) repeals DST in BA, MT, TO.
-# <a href="http://www.presidencia.gov.br/CCIVIL/decreto/2003/D4844.htm"></a>
+# <a href="http://www.presidencia.gov.br/CCIVIL/decreto/2003/D4844.htm">4,844</a>
Rule Brazil 2003 only - Oct 19 0:00 1:00 S
# Decree 5,223 (2004-10-01) reestablishes DST in MT.
-# <a href="http://www.planalto.gov.br/ccivil_03/_Ato2004-2006/2004/Decreto/D5223.htm"></a>
+# <a href="http://www.planalto.gov.br/ccivil_03/_Ato2004-2006/2004/Decreto/D5223.htm">5,223</a>
Rule Brazil 2004 only - Nov 2 0:00 1:00 S
# Decree <a href="http://pcdsh01.on.br/DecHV5539.gif">5,539</a> (2005-09-19),
# adopted by the same states as before.
@@ -587,9 +744,8 @@
# adopted by the same states as before.
Rule Brazil 2006 only - Nov 5 0:00 1:00 S
Rule Brazil 2007 only - Feb 25 0:00 0 -
-# (Decree number not yet known)
-# http://www.brasil.gov.br/noticias/ultimas_noticias/horario_verao070920/
-# (2007-09-20) after a heads-up from Steffen Thorsen:
+# Decree <a href="http://pcdsh01.on.br/DecHV6212.gif">6,212</a> (2007-09-26),
+# adopted by the same states as before.
Rule Brazil 2007 max - Oct Sun>=8 0:00 1:00 S
Rule Brazil 2008 max - Feb Sun>=15 0:00 0 -
# The latest ruleset listed above says that the following states observe DST:
@@ -597,7 +753,6 @@
# For dates after mid-2008, the above rules with TO="max" are guesses
# and are quite possibly wrong, but are more likely than no DST at all.
-
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
#
# Fernando de Noronha (administratively part of PE)
@@ -623,6 +778,13 @@
-3:00 Brazil BR%sT 1988 Sep 12
-3:00 - BRT
#
+# west Para (PA)
+# West Para includes Altamira, Oribidos, Prainha, Oriximina, and Santarem.
+Zone America/Santarem -3:38:48 - LMT 1914
+ -4:00 Brazil AM%sT 1988 Sep 12
+ -4:00 - AMT 2008 Jun 24 00:00
+ -3:00 - BRT
+#
# Maranhao (MA), Piaui (PI), Ceara (CE), Rio Grande do Norte (RN),
# Paraiba (PB)
Zone America/Fortaleza -2:34:00 - LMT 1914
@@ -685,8 +847,7 @@
-4:00 - AMT 2004 Oct 1
-4:00 Brazil AM%sT
#
-# west Para (PA), Rondonia (RO)
-# West Para includes Altamira, Oribidos, Prainha, Oriximina, and Santarem.
+# Rondonia (RO)
Zone America/Porto_Velho -4:15:36 - LMT 1914
-4:00 Brazil AM%sT 1988 Sep 12
-4:00 - AMT
@@ -713,13 +874,14 @@
-5:00 Brazil AC%sT 1988 Sep 12
-5:00 - ACT 1993 Sep 28
-5:00 Brazil AC%sT 1994 Sep 22
- -5:00 - ACT
+ -5:00 - ACT 2008 Jun 24 00:00
+ -4:00 - AMT
#
# Acre (AC)
Zone America/Rio_Branco -4:31:12 - LMT 1914
-5:00 Brazil AC%sT 1988 Sep 12
- -5:00 - ACT
-
+ -5:00 - ACT 2008 Jun 24 00:00
+ -4:00 - AMT
# Chile
@@ -753,6 +915,26 @@
# America/Santiago. The pre-1980 Pacific/Easter data are dubious,
# but we have no other source.
+# From German Poo-Caaman~o (2008-03-03):
+# Due to drought, Chile extends Daylight Time in three weeks. This
+# is one-time change (Saturday 3/29 at 24:00 for America/Santiago
+# and Saturday 3/29 at 22:00 for Pacific/Easter)
+# The Supreme Decree is located at
+# <a href="http://www.shoa.cl/servicios/supremo316.pdf">
+# http://www.shoa.cl/servicios/supremo316.pdf
+# </a>
+# and the instructions for 2008 are located in:
+# <a href="http://www.horaoficial.cl/cambio.htm">
+# http://www.horaoficial.cl/cambio.htm
+# </a>.
+
+# From Jose Miguel Garrido (2008-03-05):
+# ...
+# You could see the announces of the change on
+# <a href="http://www.shoa.cl/noticias/2008/04hora/hora.htm">
+# http://www.shoa.cl/noticias/2008/04hora/hora.htm
+# </a>.
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Chile 1927 1932 - Sep 1 0:00 1:00 S
Rule Chile 1928 1932 - Apr 1 0:00 0 -
@@ -783,7 +965,11 @@
Rule Chile 1998 only - Sep 27 4:00u 1:00 S
Rule Chile 1999 only - Apr 4 3:00u 0 -
Rule Chile 1999 max - Oct Sun>=9 4:00u 1:00 S
-Rule Chile 2000 max - Mar Sun>=9 3:00u 0 -
+Rule Chile 2000 2007 - Mar Sun>=9 3:00u 0 -
+# N.B.: the end of March 29 in Chile is March 30 in Universal time,
+# which is used below in specifying the transition.
+Rule Chile 2008 only - Mar 30 3:00u 0 -
+Rule Chile 2009 max - Mar Sun>=9 3:00u 0 -
# IATA SSIM anomalies: (1992-02) says 1992-03-14;
# (1996-09) says 1998-03-08. Ignore these.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
@@ -1129,19 +1315,17 @@
# Venezuela
#
-# From Kiraz Janicke (2007-09-25), in
-# http://www.venezuelanalysis.com/analysis/2645:
-# The proposal ... involves turning the clock back half an hour from
-# +4.00 Greenwich Mean Time (GMT), to +4.30GMT, the time zone
-# Venezuela had until December 31, 1964, when the current time zone
-# was adopted. The change was due to take place on September 17 and
-# then on September 24, but has since been postponed until December
-# 31, to allow for compliance with international organizations, such
-# as the International Office of Weights and Measures.
+# From John Stainforth (2007-11-28):
+# ... the change for Venezuela originally expected for 2007-12-31 has
+# been brought forward to 2007-12-09. The official announcement was
+# published today in the "Gaceta Oficial de la Republica Bolivariana
+# de Venezuela, numero 38.819" (official document for all laws or
+# resolution publication)
+# http://www.globovision.com/news.php?nid=72208
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Caracas -4:27:44 - LMT 1890
-4:27:40 - CMT 1912 Feb 12 # Caracas Mean Time?
-4:30 - VET 1965 # Venezuela Time
- -4:00 - VET 2008
+ -4:00 - VET 2007 Dec 9 03:00
-4:30 - VET
--- a/jdk/make/sun/javazic/tzdata/zone.tab Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/make/sun/javazic/tzdata/zone.tab Wed Jul 05 16:42:37 2017 +0200
@@ -64,7 +64,8 @@
AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Terre Adelie
AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I
AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF)
-AR -3124-06411 America/Argentina/Cordoba most locations (CB, CC, CN, ER, FM, LP, MN, NQ, RN, SA, SE, SF, SL)
+AR -3124-06411 America/Argentina/Cordoba most locations (CB, CC, CN, ER, FM, LP, MN, NQ, RN, SA, SE, SF)
+AR -3319-06621 America/Argentina/San_Luis San Luis (SL)
AR -2411-06518 America/Argentina/Jujuy Jujuy (JY)
AR -2649-06513 America/Argentina/Tucuman Tucuman (TM)
AR -2828-06547 America/Argentina/Catamarca Catamarca (CT), Chubut (CH)
@@ -99,6 +100,7 @@
BH +2623+05035 Asia/Bahrain
BI -0323+02922 Africa/Bujumbura
BJ +0629+00237 Africa/Porto-Novo
+BL +1753-06251 America/St_Barthelemy
BM +3217-06446 Atlantic/Bermuda
BN +0456+11455 Asia/Brunei
BO -1630-06809 America/La_Paz
@@ -112,7 +114,8 @@
BR -2332-04637 America/Sao_Paulo S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS)
BR -2027-05437 America/Campo_Grande Mato Grosso do Sul
BR -1535-05605 America/Cuiaba Mato Grosso
-BR -0846-06354 America/Porto_Velho W Para, Rondonia
+BR -0226-05452 America/Santarem W Para
+BR -0846-06354 America/Porto_Velho Rondonia
BR +0249-06040 America/Boa_Vista Roraima
BR -0308-06001 America/Manaus E Amazonas
BR -0640-06952 America/Eirunepe W Amazonas
@@ -230,7 +233,7 @@
IE +5320-00615 Europe/Dublin
IL +3146+03514 Asia/Jerusalem
IM +5409-00428 Europe/Isle_of_Man
-IN +2232+08822 Asia/Calcutta
+IN +2232+08822 Asia/Kolkata
IO -0720+07225 Indian/Chagos
IQ +3321+04425 Asia/Baghdad
IR +3540+05126 Asia/Tehran
@@ -272,6 +275,7 @@
MC +4342+00723 Europe/Monaco
MD +4700+02850 Europe/Chisinau
ME +4226+01916 Europe/Podgorica
+MF +1804-06305 America/Marigot
MG -1855+04731 Indian/Antananarivo
MH +0709+17112 Pacific/Majuro most locations
MH +0905+16720 Pacific/Kwajalein Kwajalein
@@ -361,8 +365,7 @@
SG +0117+10351 Asia/Singapore
SH -1555-00542 Atlantic/St_Helena
SI +4603+01431 Europe/Ljubljana
-SJ +7800+01600 Arctic/Longyearbyen Svalbard
-SJ +7059-00805 Atlantic/Jan_Mayen Jan Mayen
+SJ +7800+01600 Arctic/Longyearbyen
SK +4809+01707 Europe/Bratislava
SL +0830-01315 Africa/Freetown
SM +4355+01228 Europe/San_Marino
@@ -432,7 +435,7 @@
VE +1030-06656 America/Caracas
VG +1827-06437 America/Tortola
VI +1821-06456 America/St_Thomas
-VN +1045+10640 Asia/Saigon
+VN +1045+10640 Asia/Ho_Chi_Minh
VU -1740+16825 Pacific/Efate
WF -1318-17610 Pacific/Wallis
WS -1350-17144 Pacific/Apia
--- a/jdk/make/sun/net/spi/Makefile Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/make/sun/net/spi/Makefile Wed Jul 05 16:42:37 2017 +0200
@@ -23,10 +23,6 @@
# have any questions.
#
-#
-# Makefile for building com/sun
-#
-
BUILDDIR = ../../..
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/sun/net/spi/nameservice/Makefile Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/make/sun/net/spi/nameservice/Makefile Wed Jul 05 16:42:37 2017 +0200
@@ -23,10 +23,6 @@
# have any questions.
#
-#
-# Makefile for building com/sun
-#
-
BUILDDIR = ../../../..
include $(BUILDDIR)/common/Defs.gmk
--- a/jdk/make/sun/net/spi/nameservice/dns/Makefile Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/make/sun/net/spi/nameservice/dns/Makefile Wed Jul 05 16:42:37 2017 +0200
@@ -24,7 +24,7 @@
#
#
-# Makefile for building JNDI service provider toolkit
+# Makefile for building JNDI DNS name service provider
#
BUILDDIR = ../../../../..
--- a/jdk/make/tools/Makefile Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/make/tools/Makefile Wed Jul 05 16:42:37 2017 +0200
@@ -32,7 +32,6 @@
SUBDIRS = \
addjsum \
- auto_multi \
buildmetaindex \
commentchecker \
compile_font_config \
--- a/jdk/make/tools/auto_multi/Makefile Fri Oct 10 13:29:11 2008 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-#
-# Copyright 1998-2005 Sun Microsystems, Inc. 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. Sun designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
-#
-
-#
-# Makefile for building the automulti tool
-#
-
-BUILDDIR = ../..
-PACKAGE = build.tools.automulti
-PRODUCT = tools
-PROGRAM = automulti
-include $(BUILDDIR)/common/Defs.gmk
-
-BUILDTOOL_SOURCE_ROOT = $(BUILDDIR)/tools/src
-BUILDTOOL_MAIN = $(PKGDIR)/AutoMulti.java
-
-#
-# Build tool jar rules.
-#
-include $(BUILDDIR)/common/BuildToolJar.gmk
-
--- a/jdk/make/tools/src/build/tools/automulti/AutoMulti.java Fri Oct 10 13:29:11 2008 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,458 +0,0 @@
-/*
- * Copyright 1998-2001 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package build.tools.automulti;
-
-import java.lang.reflect.*;
-import java.util.*;
-import java.io.*;
-
-/**
- * Automatically generates the Multiplexing UI classes
- * for Swing.
- * <p>
- * To use, type 'java AutoMulti <plafdir> <prefix>' where <plafdir>
- * is the directory containing the source for Swing's UI classes and
- * <prefix> is the package prefix to use before ".swing.plaf.multi".
- * For example:
- *
- * <pre>
- * cd TEST
- * ../../../../build/solaris-sparc/bin/java AutoMulti ../../../../src/share/classes/javax/swing/plaf javax
- * </pre>
- *
- * AutoMulti will scour the plaf directory for *UI.java files and
- * generate Multi*UI.java files that do the multiplexing thing.
- * <p>
- * NOTE: This tool depends upon the existence of <plafdir> and on the
- * compiled classes from <plafdir> being somewhere in the class path.
- *
- * @author Willie Walker
- */
-public class AutoMulti {
- static String importLines;
-
- /**
- * A silly list of parameter names to use. Skips "i" because we use
- * it as a 'for' loop counter. If you want to get fancy, please feel
- * to change how parameter names are obtained. This will break if
- * someone decides to create a UI method that takes more than 8
- * parameters. Which one is a bug (this breaking or having a method
- * with more than eight parameters) is a subjective thing.
- */
- public static String[] paramNames = {"a","b","c","d","e","f","g","h"};
-
- /**
- * Removes the package names (e.g., javax.swing) from the name.
- */
- public static String unqualifyName(String name) {
- StringTokenizer parser = new StringTokenizer(name,".");
- String unqualifiedName = null;
- while (parser.hasMoreTokens()) {
- unqualifiedName = parser.nextToken();
- }
- return removeDollars(unqualifiedName);
- }
-
- /**
- * Strips the extension from the filename.
- */
- public static String stripExtension(String name) {
- StringTokenizer parser = new StringTokenizer(name,".");
- return parser.nextToken();
- }
-
- /**
- * Adds some spaces.
- */
- public static void indent(StringBuffer s, int i) {
- while (i > 0) {
- s.append(" ");
- i--;
- }
- }
-
- /**
- * Spits out all the beginning stuff.
- */
- public static StringBuffer createPreamble(String prefixName) {
- StringBuffer s = new StringBuffer();
- s.append("/*\n");
- s.append(" *\n");
- s.append(" * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.\n");
- s.append(" * \n");
- s.append(" * This software is the proprietary information of Sun Microsystems, Inc. \n");
- s.append(" * Use is subject to license terms.\n");
- s.append(" * \n");
- s.append(" */\n");
- s.append("package " + prefixName + ".swing.plaf.multi;\n");
- s.append("\n");
- return s;
- }
-
- /**
- * Replaces 'Xxx$Yyy' with "Xxx'. Used by addImport because you
- * can't import nested classes directly.
- */
- public static String removeNestedClassName(String s) {
- int dollarPosition = s.indexOf('$');
-
- if (dollarPosition >= 0) { // s contains '$'
- StringBuffer sb = new StringBuffer(s);
- sb.setLength(dollarPosition);
- return sb.toString();
- } else { // no '$'
- return s;
- }
- }
-
- /**
- * Replaces '$' with ".'. Needed for printing inner class names
- * for argument and return types.
- */
- public static String removeDollars(String s) {
- int dollarPosition = s.indexOf('$');
-
- if (dollarPosition >= 0) { // s contains '$'
- StringBuffer sb = new StringBuffer(s);
- while (dollarPosition >= 0) {
- //XXX: will there ever be more than one '$'?
- sb.replace(dollarPosition, dollarPosition+1, ".");
- dollarPosition = sb.indexOf("$", dollarPosition);
- }
- return sb.toString();
- } else { // no $
- return s;
- }
- }
-
- /**
- * Adds an import line to the String.
- */
- public static void addImport(String s, Class theClass) {
- if (!theClass.isPrimitive() && (theClass != Object.class)) {
- String className = removeNestedClassName(theClass.getName());
- String importLine = new String("import " + className + ";\n");
- if (importLines.indexOf(importLine) == -1) {
- importLines += importLine;
- }
- }
- }
-
- /**
- * Spits out the class header information.
- */
- public static void addHeader(StringBuffer s, String className) {
- s.append("/**\n");
- s.append(" * A multiplexing UI used to combine <code>" + className + "</code>s.\n");
- s.append(" * \n");
- s.append(" * <p>This file was automatically generated by AutoMulti.\n");
- s.append(" *\n");
- s.append(" * @author Otto Multey\n"); // Get it? I crack myself up.
- s.append(" */\n");
- s.append("public class Multi" + className + " extends " + className + " {\n");
- s.append("\n");
- s.append(" /**\n");
- s.append(" * The vector containing the real UIs. This is populated \n");
- s.append(" * in the call to <code>createUI</code>, and can be obtained by calling\n");
- s.append(" * the <code>getUIs</code> method. The first element is guaranteed to be the real UI \n");
- s.append(" * obtained from the default look and feel.\n");
- s.append(" */\n");
- s.append(" protected Vector uis = new Vector();\n");
- s.append("\n");
- s.append("////////////////////\n");
- s.append("// Common UI methods\n");
- s.append("////////////////////\n");
- s.append("\n");
- s.append(" /**\n");
- s.append(" * Returns the list of UIs associated with this multiplexing UI. This \n");
- s.append(" * allows processing of the UIs by an application aware of multiplexing \n");
- s.append(" * UIs on components.\n");
- s.append(" */\n");
- s.append(" public ComponentUI[] getUIs() {\n");
- s.append(" return MultiLookAndFeel.uisToArray(uis);\n");
- s.append(" }\n");
- }
-
- /**
- * Prints out the code for a method. This is pretty specific to the
- * Multiplexing UI code, so don't get any fancy ideas.
- */
- public static void addMethod(StringBuffer s, Method m, String origName, String className) {
-
- // Get the method name and the return type. Be a little careful about arrays.
- //
- String methodName = unqualifyName(m.getName());
- String returnType;
- if (!m.getReturnType().isArray()) {
- returnType = unqualifyName(m.getReturnType().toString());
- addImport(importLines,m.getReturnType());
- } else {
- returnType = unqualifyName(m.getReturnType().getComponentType().toString())
- + "[]";
- addImport(importLines,m.getReturnType().getComponentType());
- }
-
- // Print the javadoc
- //
- s.append("\n");
- if (methodName.equals("createUI")) {
- s.append(" /**\n");
- s.append(" * Returns a multiplexing UI instance if any of the auxiliary\n");
- s.append(" * <code>LookAndFeel</code>s supports this UI. Otherwise, just returns the \n");
- s.append(" * UI object obtained from the default <code>LookAndFeel</code>.\n");
- s.append(" */\n");
- } else if (!returnType.equals("void")) {
- s.append(" /**\n");
- s.append(" * Invokes the <code>" + methodName + "</code> method on each UI handled by this object.\n");
- s.append(" * \n");
- s.append(" * @return the value obtained from the first UI, which is\n");
- s.append(" * the UI obtained from the default <code>LookAndFeel</code>\n");
- s.append(" */\n");
- } else {
- s.append(" /**\n");
- s.append(" * Invokes the <code>" + methodName
- + "</code> method on each UI handled by this object.\n");
- s.append(" */\n");
- }
-
- // Print the method signature
- //
- s.append(" public");
- if (Modifier.isStatic(m.getModifiers())) {
- s.append(" static");
- }
- s.append(" " + returnType);
- s.append(" " + methodName);
- s.append("(");
-
- Class[] params = m.getParameterTypes();
- Class temp;
- String braces;
- for (int i = 0; i < params.length; i++) {
- if (i > 0) {
- s.append(", ");
- }
- temp = params[i];
- braces = new String("");
- while (temp.isArray()) {
- braces += "[]";
- temp = temp.getComponentType();
- }
- s.append(unqualifyName(temp.getName()) + braces + " " + paramNames[i]);
- addImport(importLines,temp);
- }
- s.append(")");
-
- // Don't forget about exceptions
- //
- Class exceptions[] = m.getExceptionTypes();
- String throwsString = new String("");
-
- if (exceptions.length > 0) {
- s.append("\n");
- indent(s,12);
- s.append("throws ");
- for (int i = 0; i < exceptions.length; i++) {
- if (i > 0) {
- s.append(", ");
- }
- s.append(unqualifyName(exceptions[i].getName()));
- addImport(importLines,exceptions[i]);
- }
- }
- s.append(throwsString + " {\n");
-
- // Now print out the contents of the method. We do a special thing
- // for the createUI method, another thing if the method returns 'void'
- // and a third thing if we don't do either of the first two. If
- // you want to squash this down, feel free.
- //
- if (methodName.equals("createUI")) {
- indent(s,8);
- s.append("ComponentUI mui = new Multi" + origName + "();\n");
- indent(s,8);
- s.append("return MultiLookAndFeel.createUIs(mui,\n");
- indent(s,42);
- s.append("((Multi" + origName +") mui).uis,\n");
- indent(s,42);
- for (int i = 0; i < params.length; i++) {
- if (i > 0) {
- s.append(",");
- }
- s.append(paramNames[i]);
- }
- s.append(");\n");
- } else if (!returnType.equals("void")) {
- indent(s,8);
- s.append(returnType + " returnValue = \n");
- indent(s,12);
- s.append("((" + className + ") (uis.elementAt(0)))."
- + methodName + "(");
- for (int i = 0; i < params.length; i++) {
- if (i > 0) {
- s.append(",");
- }
- s.append(paramNames[i]);
- }
- s.append(");\n");
- indent(s,8);
- s.append("for (int i = 1; i < uis.size(); i++) {\n");
- indent(s,12);
- s.append("((" + className + ") (uis.elementAt(i)))."
- + methodName + "(");
- for (int i = 0; i < params.length; i++) {
- if (i > 0) {
- s.append(",");
- }
- s.append(paramNames[i]);
- }
- s.append(");\n");
- indent(s,8);
- s.append("}\n");
- indent(s,8);
- s.append("return returnValue;\n");
- } else {
- indent(s,8);
- s.append("for (int i = 0; i < uis.size(); i++) {\n");
- indent(s,12);
- s.append("((" + className + ") (uis.elementAt(i)))."
- + methodName + "(");
- for (int i = 0; i < params.length; i++) {
- if (i > 0) {
- s.append(",");
- }
- s.append(paramNames[i]);
- }
- s.append(");\n");
- indent(s,8);
- s.append("}\n");
- }
- indent(s,4);
- s.append("}\n");
- }
-
- /**
- * Takes a plaf class name (e.g., "MenuUI") and generates the corresponding
- * Multiplexing UI Java source code (e.g., "MultiMenuUI.java").
- */
- public static void generateFile(String prefixName, String className) {
- try {
- FileOutputStream fos;
- PrintWriter outFile;
-
- importLines = new String();
- importLines += new String("import java.util.Vector;\n");
-
- StringBuffer body = new StringBuffer();
- Class wee = Class.forName(prefixName + ".swing.plaf." + className);
- String weeName = unqualifyName(wee.getName());
- addImport(importLines,wee);
- while (!weeName.equals("Object")) {
- body.append("\n");
- body.append("////////////////////\n");
- body.append("// " + weeName + " methods\n");
- body.append("////////////////////\n");
- Method[] methods = wee.getDeclaredMethods();
- for (int i=0; i < methods.length; i++) {
- if (Modifier.isPublic(methods[i].getModifiers())) {
- addMethod(body,methods[i],className,weeName);
- }
- }
- wee = wee.getSuperclass();
- weeName = unqualifyName(wee.getName());
- addImport(importLines,wee);
- }
-
- fos = new FileOutputStream("Multi" + className + ".java");
- outFile = new PrintWriter(fos);
- StringBuffer outText = createPreamble(prefixName);
- outText.append(importLines.toString() + "\n");
- addHeader(outText,className);
- outText.append(body.toString());
- outText.append("}\n");
- outFile.write(outText.toString());
- outFile.flush();
- outFile.close();
- } catch (Exception e) {
- System.err.println(e);
- }
- }
-
- /**
- * D'Oh! Something bad happened.
- */
- public static void usage(String s) throws IOException {
- System.err.println("Usage: AutoMulti <plafdir> [com.sun]");
- throw new IllegalArgumentException(s);
- }
-
- /**
- * Takes the plaf directory name and generates the multiplexing UI
- * source code.
- */
- public static void main(String[] args) throws IOException {
-
- if (args.length < 1) {
- usage("");
- }
-
- String dirName = args[0];
- File dir = new File(dirName);
- if (!dir.isDirectory()) {
- System.err.println("No such directory: " + dirName);
- usage("");
- }
-
- String prefixName;
- if (args.length > 1) {
- prefixName = args[1];
- } else {
- prefixName = "com.sun.java";
- }
-
- String plafUIs[] = dir.list(new UIJavaFilter());
- for (int i = 0; i < plafUIs.length; i++) {
- generateFile(prefixName,stripExtension(plafUIs[i]));
- }
- }
-}
-
-/**
- * Only accepts file names of the form *UI.java. The one exception
- * is not accepting ComponentUI.java because we don't need to generate
- * a multiplexing class for it.
- */
-class UIJavaFilter implements FilenameFilter {
- public boolean accept(File dir, String name) {
- if (name.equals("ComponentUI.java")) {
- return false;
- } else if (name.endsWith("UI.java")) {
- return true;
- } else {
- return false;
- }
- }
-}
--- a/jdk/make/tools/src/build/tools/automulti/README.txt Fri Oct 10 13:29:11 2008 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-AutoMulti is the tool that automatically generates the
-Multi*UI classes for the Multiplexing look and feel.
-Instructions for using it are in AutoMulti.java.
-
-TestALFGenerator is a tool (a variation of AutoMulti)
-that automatically generates an auxiliary look and
-feel that you can use to test the Multiplexing look
-and feel. The TestALF look and feel implements every
-method by printing the message "In the xxx method of
-the TextALFYyyUI class." and, except in the case of
-createUI, returning something meaningless (since,
-except in the case of createUI, the return value is
-ignored).
-
-TestALFLookAndFeel.java is the only non-auto-generated
-file for the TestALF L&F. If you specify a package
-argument to TestALFGenerator, you'll have to change
-the code in TestALFLookAndFeel.java to reflect the
-package name.
-
-To test any application with the TestALF, make sure the
-compiled TestALF classes are in the class path. Then add
-this to the <JDK_HOME>/lib/swing.properties file (which
-you'll probably have to create):
-
-swing.auxiliarylaf=TestALFLookAndFeel
-
-E.g., if you're running SwingSet2 against your solaris
-build, then you'd create/edit the swing.properties file
-in <wsdir>/build/solaris-sparc/lib.
-
-Then run any app. You'll see lots of thrilling "In the
-Xxxx method of the Yyy class" messages. If you get anything
-else (especially an exception), then you've found a bug.
-Probably in the default look and feel.
-
--- a/jdk/make/tools/src/build/tools/automulti/TestALFGenerator.java Fri Oct 10 13:29:11 2008 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,401 +0,0 @@
-/*
- * Copyright 2001 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package build.tools.automulti;
-
-import java.lang.reflect.*;
-import java.util.*;
-import java.io.*;
-
-/**
- * Automatically generates an auxiliary look and feel to be
- * used for testing the Multiplexing look and feel.
- * <p>
- * To use, type 'java TestALFGenerator <plafdir> [<package>]' where <plafdir>
- * is the directory containing the source for Swing's UI classes.
- * <package> is an optional argument that specifies the package
- * of the TestALF classes. If it's omitted, the classes are in
- * the default package.
- * For example:
- *
- * <pre>
- * ../../../../build/solaris-sparc/bin/java TestALFGenerator ../../../../src/share/classes/javax/swing/plaf com.myco.myalaf
- * </pre>
- *
- * TestALFGenerator will scour the plaf directory for *UI.java files and
- * generate TestALF*UI.java files.
- * <p>
- * NOTE: This tool depends upon the existence of <plafdir> and on the
- * compiled classes from <plafdir> being somewhere in the class path.
- *
- * @author Willie Walker
- */
-public class TestALFGenerator {
- static String importLines;
- static String packageName;
- static String classPrefix = "TestALF";
-
- /**
- * A silly list of parameter names to use. Skips "i" because we use
- * it as a 'for' loop counter. If you want to get fancy, please feel
- * to change how parameter names are obtained. This will break if
- * someone decides to create a UI method that takes more than 8
- * parameters. Which one is a bug (this breaking or having a method
- * with more than eight parameters) is a subjective thing.
- */
- public static String[] paramNames = {"a","b","c","d","e","f","g","h"};
-
- /**
- * Removes the package names (e.g., javax.swing) from the name.
- */
- public static String unqualifyName(String name) {
- StringTokenizer parser = new StringTokenizer(name,".");
- String unqualifiedName = null;
- while (parser.hasMoreTokens()) {
- unqualifiedName = parser.nextToken();
- }
- return removeDollars(unqualifiedName);
- }
-
- /**
- * Strips the extension from the filename.
- */
- public static String stripExtension(String name) {
- StringTokenizer parser = new StringTokenizer(name,".");
- return parser.nextToken();
- }
-
- /**
- * Adds some spaces.
- */
- public static void indent(StringBuffer s, int i) {
- while (i > 0) {
- s.append(" ");
- i--;
- }
- }
-
- /**
- * Spits out all the beginning stuff.
- */
- public static StringBuffer createPreamble(String prefixName) {
- StringBuffer s = new StringBuffer();
- s.append("/*\n");
- s.append(" *\n");
- s.append(" * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.\n");
- s.append(" * \n");
- s.append(" * This software is the proprietary information of Sun Microsystems, Inc. \n");
- s.append(" * Use is subject to license terms.\n");
- s.append(" * \n");
- s.append(" */\n");
- if (packageName != null) {
- s.append("package " + packageName + ";\n");
- s.append("\n");
- }
- return s;
- }
-
- /**
- * Replaces 'Xxx$Yyy' with "Xxx'. Used by addImport because you
- * can't import nested classes directly.
- */
- public static String removeNestedClassName(String s) {
- int dollarPosition = s.indexOf('$');
-
- if (dollarPosition >= 0) { // s contains '$'
- StringBuffer sb = new StringBuffer(s);
- sb.setLength(dollarPosition);
- return sb.toString();
- } else { // no '$'
- return s;
- }
- }
-
- /**
- * Replaces '$' with ".'. Needed for printing inner class names
- * for argument and return types.
- */
- public static String removeDollars(String s) {
- int dollarPosition = s.indexOf('$');
-
- if (dollarPosition >= 0) { // s contains '$'
- StringBuffer sb = new StringBuffer(s);
- while (dollarPosition >= 0) {
- //XXX: will there ever be more than one '$'?
- sb.replace(dollarPosition, dollarPosition+1, ".");
- dollarPosition = sb.indexOf("$", dollarPosition);
- }
- return sb.toString();
- } else { // no $
- return s;
- }
- }
-
- /**
- * Adds an import line to the String.
- */
- public static void addImport(String s, Class theClass) {
- if (!theClass.isPrimitive() && (theClass != Object.class)) {
- String className = removeNestedClassName(theClass.getName());
- String importLine = new String("import " + className + ";\n");
- if (importLines.indexOf(importLine) == -1) {
- importLines += importLine;
- }
- }
- }
-
- /**
- * Spits out the class header information.
- */
- public static void addHeader(StringBuffer s, String className) {
- s.append("/**\n");
- s.append(" * An auxiliary UI for <code>" + className + "</code>s.\n");
- s.append(" * \n");
- s.append(" * <p>This file was automatically generated by TestALFGenerator.\n");
- s.append(" *\n");
- s.append(" * @author Otto Multey\n"); // Get it? I crack myself up.
- s.append(" */\n");
- s.append("public class " + classPrefix + className + " extends " + className + " {\n");
- s.append("\n");
- }
-
- /**
- * Prints out the code for a method.
- */
- public static void addMethod(StringBuffer s, Method m, String origName, String className) {
-
- // Get the method name and the return type. Be a little careful about arrays.
- //
- String methodName = unqualifyName(m.getName());
- String returnType;
-
- if (!m.getReturnType().isArray()) {
- returnType = unqualifyName(m.getReturnType().toString());
- addImport(importLines,m.getReturnType());
- } else {
- returnType = unqualifyName(m.getReturnType().getComponentType().toString())
- + "[]";
- addImport(importLines,m.getReturnType().getComponentType());
- }
-
- // Print the javadoc
- //
- s.append("\n");
-
- if (methodName.equals("createUI")) {
- s.append(" /**\n");
- s.append(" * Returns a UI object for this component.\n");
- s.append(" */\n");
- } else {
- s.append(" /**\n");
- s.append(" * Prints a message saying this method has been invoked.\n");
- s.append(" */\n");
- }
-
- // Print the method signature
- //
- s.append(" public");
- if (Modifier.isStatic(m.getModifiers())) {
- s.append(" static");
- }
- s.append(" " + returnType);
- s.append(" " + methodName);
- s.append("(");
-
- Class[] params = m.getParameterTypes();
- Class temp;
- String braces;
- for (int i = 0; i < params.length; i++) {
- if (i > 0) {
- s.append(", ");
- }
- temp = params[i];
- braces = new String("");
- while (temp.isArray()) {
- braces += "[]";
- temp = temp.getComponentType();
- }
- s.append(unqualifyName(temp.getName()) + braces + " " + paramNames[i]);
- addImport(importLines,temp);
- }
- s.append(")");
-
- // Don't forget about exceptions
- //
- Class exceptions[] = m.getExceptionTypes();
- String throwsString = new String("");
-
- if (exceptions.length > 0) {
- s.append("\n");
- indent(s,12);
- s.append("throws ");
- for (int i = 0; i < exceptions.length; i++) {
- if (i > 0) {
- s.append(", ");
- }
- s.append(unqualifyName(exceptions[i].getName()));
- addImport(importLines,exceptions[i]);
- }
- }
- s.append(throwsString + " {\n");
-
- // Now print out the contents of the method.
- indent(s,8);
- s.append("System.out.println(\"In the " + methodName
- + " method of the "
- + classPrefix + origName + " class.\");\n");
- if (methodName.equals("createUI")) {
- indent(s,8);
- s.append("return ui;\n");
- } else {
- // If we have to return something, do so.
- if (!returnType.equals("void")) {
- Class rType = m.getReturnType();
- indent(s,8);
- if (!rType.isPrimitive()) {
- s.append("return null;\n");
- } else if (rType == Boolean.TYPE) {
- s.append("return false;\n");
- } else if (rType == Character.TYPE) {
- s.append("return '0';\n");
- } else { // byte, short, int, long, float, or double
- s.append("return 0;\n");
- }
- }
- }
-
- indent(s,4);
- s.append("}\n");
- }
-
- /**
- * Takes a plaf class name (e.g., "MenuUI") and generates the corresponding
- * TestALF UI Java source code (e.g., "TestALFMenuUI.java").
- */
- public static void generateFile(String prefixName, String className) {
- try {
- FileOutputStream fos;
- PrintWriter outFile;
-
- importLines = new String();
- importLines += new String("import java.util.Vector;\n");
-
- StringBuffer body = new StringBuffer();
- Class wee = Class.forName(prefixName + ".swing.plaf." + className);
- String weeName = unqualifyName(wee.getName());
- String thisClassName = classPrefix + className;
- addImport(importLines,wee);
-
- // Declare and initialize the shared UI object.
- body.append("\n");
- body.append("////////////////////\n");
- body.append("// Shared UI object\n");
- body.append("////////////////////\n");
- body.append("private final static " + thisClassName
- + " ui = new " + thisClassName + "();\n");
-
- while (!weeName.equals("Object")) {
- body.append("\n");
- body.append("////////////////////\n");
- body.append("// " + weeName + " methods\n");
- body.append("////////////////////\n");
- Method[] methods = wee.getDeclaredMethods();
- for (int i=0; i < methods.length; i++) {
- if (Modifier.isPublic(methods[i].getModifiers())) {
- addMethod(body,methods[i],className,weeName);
- }
- }
- wee = wee.getSuperclass();
- weeName = unqualifyName(wee.getName());
- addImport(importLines,wee);
- }
-
- fos = new FileOutputStream(classPrefix + className + ".java");
- outFile = new PrintWriter(fos);
- StringBuffer outText = createPreamble(prefixName);
- outText.append(importLines.toString() + "\n");
- addHeader(outText,className);
- outText.append(body.toString());
- outText.append("}\n");
- outFile.write(outText.toString());
- outFile.flush();
- outFile.close();
- } catch (Exception e) {
- System.err.println(e);
- }
- }
-
- /**
- * D'Oh! Something bad happened.
- */
- public static void usage(String s) throws IOException {
- System.err.println("Usage: java TestALFGenerator <plafdir> [<packageName>]");
- throw new IllegalArgumentException(s);
- }
-
- /**
- * Takes the plaf directory name and generates the TestALF UI
- * source code.
- */
- public static void main(String[] args) throws IOException {
-
- if (args.length < 1) {
- usage("");
- }
-
- String dirName = args[0];
- File dir = new File(dirName);
- if (!dir.isDirectory()) {
- System.err.println("No such directory: " + dirName);
- usage("");
- }
-
- if (args.length > 1) {
- packageName = args[1];
- }
-
- String plafUIs[] = dir.list(new UIJavaFilter());
- for (int i = 0; i < plafUIs.length; i++) {
- generateFile("javax",stripExtension(plafUIs[i]));
- }
- }
-}
-
-/**
- * Only accepts file names of the form *UI.java. The one exception
- * is not accepting ComponentUI.java because we don't need to generate
- * a TestALF class for it.
- */
-class UIJavaFilter implements FilenameFilter {
- public boolean accept(File dir, String name) {
- if (name.equals("ComponentUI.java")) {
- return false;
- } else if (name.endsWith("UI.java")) {
- return true;
- } else {
- return false;
- }
- }
-}
--- a/jdk/make/tools/src/build/tools/automulti/TestALFLookAndFeel.java Fri Oct 10 13:29:11 2008 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,182 +0,0 @@
-/*
- * Copyright 2001 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-//package com.myco.myalaf; //search for myalaf for other refs to package name
-
-
-package build.tools.automulti;
-
-import java.util.Vector;
-import java.lang.reflect.Method;
-import javax.swing.*;
-import javax.swing.plaf.*;
-
-/**
- * <p>An auxiliary look and feel used for testing the Multiplexing
- * look and feel.
- * <p>
- *
- * @see UIManager#addAuxiliaryLookAndFeel
- * @see javax.swing.plaf.multi
- *
- * @author Kathy Walrath
- * @author Will Walker
- */
-public class TestALFLookAndFeel extends LookAndFeel {
-
-//////////////////////////////
-// LookAndFeel methods
-//////////////////////////////
-
- /**
- * Returns a string, suitable for use in menus,
- * that identifies this look and feel.
- *
- * @return a string such as "Test Auxiliary Look and Feel"
- */
- public String getName() {
- return "Test Auxiliary Look and Feel";
- }
-
- /**
- * Returns a string, suitable for use by applications/services,
- * that identifies this look and feel.
- *
- * @return "TestALF"
- */
- public String getID() {
- return "TestALF";
- }
-
- /**
- * Returns a one-line description of this look and feel.
- *
- * @return a descriptive string such as "Allows multiple UI instances per component instance"
- */
- public String getDescription() {
- return "Allows multiple UI instances per component instance";
- }
-
- /**
- * Returns <code>false</code>;
- * this look and feel is not native to any platform.
- *
- * @return <code>false</code>
- */
- public boolean isNativeLookAndFeel() {
- return false;
- }
-
- /**
- * Returns <code>true</code>;
- * every platform permits this look and feel.
- *
- * @return <code>true</code>
- */
- public boolean isSupportedLookAndFeel() {
- return true;
- }
-
- /**
- * Creates, initializes, and returns
- * the look and feel specific defaults.
- * For this look and feel,
- * the defaults consist solely of
- * mappings of UI class IDs
- * (such as "ButtonUI")
- * to <code>ComponentUI</code> class names
- * (such as "com.myco.myalaf.MultiButtonUI").
- *
- * @return an initialized <code>UIDefaults</code> object
- * @see javax.swing.JComponent#getUIClassID
- */
- public UIDefaults getDefaults() {
- System.out.println("In the TestALFLookAndFeel getDefaults method.");
- UIDefaults table = new TestALFUIDefaults();
- //String prefix = "com.myco.myalaf.TestALF";
- String prefix = "TestALF";
- Object[] uiDefaults = {
- "ButtonUI", prefix + "ButtonUI",
- "CheckBoxMenuItemUI", prefix + "MenuItemUI",
- "CheckBoxUI", prefix + "ButtonUI",
- "ColorChooserUI", prefix + "ColorChooserUI",
- "ComboBoxUI", prefix + "ComboBoxUI",
- "DesktopIconUI", prefix + "DesktopIconUI",
- "DesktopPaneUI", prefix + "DesktopPaneUI",
- "EditorPaneUI", prefix + "TextUI",
- "FileChooserUI", prefix + "FileChooserUI",
- "FormattedTextFieldUI", prefix + "TextUI",
- "InternalFrameUI", prefix + "InternalFrameUI",
- "LabelUI", prefix + "LabelUI",
- "ListUI", prefix + "ListUI",
- "MenuBarUI", prefix + "MenuBarUI",
- "MenuItemUI", prefix + "MenuItemUI",
- "MenuUI", prefix + "MenuItemUI",
- "OptionPaneUI", prefix + "OptionPaneUI",
- "PanelUI", prefix + "PanelUI",
- "PasswordFieldUI", prefix + "TextUI",
- "PopupMenuSeparatorUI", prefix + "SeparatorUI",
- "PopupMenuUI", prefix + "PopupMenuUI",
- "ProgressBarUI", prefix + "ProgressBarUI",
- "RadioButtonMenuItemUI", prefix + "MenuItemUI",
- "RadioButtonUI", prefix + "ButtonUI",
- "RootPaneUI", prefix + "RootPaneUI",
- "ScrollBarUI", prefix + "ScrollBarUI",
- "ScrollPaneUI", prefix + "ScrollPaneUI",
- "SeparatorUI", prefix + "SeparatorUI",
- "SliderUI", prefix + "SliderUI",
- "SpinnerUI", prefix + "SpinnerUI",
- "SplitPaneUI", prefix + "SplitPaneUI",
- "TabbedPaneUI", prefix + "TabbedPaneUI",
- "TableHeaderUI", prefix + "TableHeaderUI",
- "TableUI", prefix + "TableUI",
- "TextAreaUI", prefix + "TextUI",
- "TextFieldUI", prefix + "TextUI",
- "TextPaneUI", prefix + "TextUI",
- "ToggleButtonUI", prefix + "ButtonUI",
- "ToolBarSeparatorUI", prefix + "SeparatorUI",
- "ToolBarUI", prefix + "ToolBarUI",
- "ToolTipUI", prefix + "ToolTipUI",
- "TreeUI", prefix + "TreeUI",
- "ViewportUI", prefix + "ViewportUI",
- };
-
- table.putDefaults(uiDefaults);
- return table;
- }
-
-}
-
-/**
- * We want the Test auxiliary look and feel to be quiet and fallback
- * gracefully if it cannot find a UI. This class overrides the
- * getUIError method of UIDefaults, which is the method that
- * emits error messages when it cannot find a UI class in the
- * LAF.
- */
-class TestALFUIDefaults extends UIDefaults {
- protected void getUIError(String msg) {
- System.err.println("Test auxiliary L&F: " + msg);
- }
-}
--- a/jdk/src/share/bin/emessages.h Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/bin/emessages.h Wed Jul 05 16:42:37 2017 +0200
@@ -50,11 +50,6 @@
#define JAR_ERROR2 "Error: Unable to access jarfile %s"
#define JAR_ERROR3 "Error: Invalid or corrupt jarfile %s"
-#define CLS_ERROR1 "Error: Could not find the main class %s.\n" JNI_ERROR
-#define CLS_ERROR2 "Error: Failed to load Main Class: %s\n%s"
-#define CLS_ERROR3 "Error: No main method found in specified class.\n" GEN_ERROR
-#define CLS_ERROR4 "Error: Main method not public\n" GEN_ERROR
-
#define CFG_WARN1 "Warning: %s VM not supported; %s VM will be used"
#define CFG_WARN2 "Warning: No leading - on line %d of `%s'"
#define CFG_WARN3 "Warning: Missing VM type on line %d of `%s'"
--- a/jdk/src/share/bin/java.c Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/bin/java.c Wed Jul 05 16:42:37 2017 +0200
@@ -102,8 +102,7 @@
InvocationFunctions *ifn);
static jstring NewPlatformString(JNIEnv *env, char *s);
static jobjectArray NewPlatformStringArray(JNIEnv *env, char **strv, int strc);
-static jclass LoadClass(JNIEnv *env, char *name);
-static jstring GetMainClassName(JNIEnv *env, char *jarname);
+static jclass LoadMainClass(JNIEnv *env, jboolean isJar, char *name);
static void TranslateApplicationArgs(int jargc, const char **jargv, int *pargc, char ***pargv);
static jboolean AddApplicationOptions(int cpathc, const char **cpathv);
@@ -301,6 +300,22 @@
}
+#define CHECK_EXCEPTION_NULL_LEAVE(e) \
+ if ((*env)->ExceptionOccurred(env)) { \
+ JLI_ReportExceptionDescription(env); \
+ goto leave; \
+ } \
+ if ((e) == NULL) { \
+ JLI_ReportErrorMessage(JNI_ERROR); \
+ goto leave; \
+ }
+
+#define CHECK_EXCEPTION_LEAVE(rv) \
+ if ((*env)->ExceptionOccurred(env)) { \
+ JLI_ReportExceptionDescription(env); \
+ ret = (rv); \
+ goto leave; \
+ }
int JNICALL
JavaMain(void * _args)
@@ -321,9 +336,7 @@
int ret = 0;
jlong start, end;
-
/* Initialize the virtual machine */
-
start = CounterGet();
if (!InitializeJVM(&vm, &env, &ifn)) {
JLI_ReportErrorMessage(JVM_ERROR1);
@@ -332,11 +345,7 @@
if (printVersion || showVersion) {
PrintJavaVersion(env, showVersion);
- if ((*env)->ExceptionOccurred(env)) {
- JLI_ReportExceptionDescription(env);
- JLI_ReportErrorMessage(JNI_ERROR);
- goto leave;
- }
+ CHECK_EXCEPTION_LEAVE(0);
if (printVersion) {
ret = 0;
goto leave;
@@ -346,11 +355,7 @@
/* If the user specified neither a class name nor a JAR file */
if (printXUsage || printUsage || (jarfile == 0 && classname == 0)) {
PrintUsage(env, printXUsage);
- if ((*env)->ExceptionOccurred(env)) {
- JLI_ReportExceptionDescription(env);
- JLI_ReportErrorMessage(JNI_ERROR);
- ret=1;
- }
+ CHECK_EXCEPTION_LEAVE(1);
goto leave;
}
@@ -395,99 +400,25 @@
* the environment (and remove these comments).
*/
if (jarfile != 0) {
- mainClassName = GetMainClassName(env, jarfile);
- if ((*env)->ExceptionOccurred(env)) {
- JLI_ReportExceptionDescription(env);
- JLI_ReportErrorMessage(JNI_ERROR);
- goto leave;
- }
- if (mainClassName == NULL) {
- JLI_ReportErrorMessage(JAR_ERROR1,jarfile, GEN_ERROR);
- goto leave;
- }
- classname = (char *)(*env)->GetStringUTFChars(env, mainClassName, 0);
- if (classname == NULL) {
- JLI_ReportExceptionDescription(env);
- JLI_ReportErrorMessage(JNI_ERROR);
- goto leave;
- }
- mainClass = LoadClass(env, classname);
- if(mainClass == NULL) { /* exception occured */
- JLI_ReportExceptionDescription(env);
- JLI_ReportErrorMessage(CLS_ERROR1, classname);
- goto leave;
- }
- (*env)->ReleaseStringUTFChars(env, mainClassName, classname);
+ mainClass = LoadMainClass(env, JNI_TRUE, jarfile);
} else {
- mainClassName = NewPlatformString(env, classname);
- if (mainClassName == NULL) {
- JLI_ReportErrorMessage(CLS_ERROR2, classname, GEN_ERROR);
- goto leave;
- }
- classname = (char *)(*env)->GetStringUTFChars(env, mainClassName, 0);
- if (classname == NULL) {
- JLI_ReportExceptionDescription(env);
- JLI_ReportErrorMessage(JNI_ERROR);
- goto leave;
- }
- mainClass = LoadClass(env, classname);
- if(mainClass == NULL) { /* exception occured */
- JLI_ReportExceptionDescription(env);
- JLI_ReportErrorMessage(CLS_ERROR1, classname);
- goto leave;
- }
- (*env)->ReleaseStringUTFChars(env, mainClassName, classname);
+ mainClass = LoadMainClass(env, JNI_FALSE, classname);
}
+ CHECK_EXCEPTION_NULL_LEAVE(mainClass);
- /* Get the application's main method */
+ /*
+ * The LoadMainClass not only loads the main class, it will also ensure
+ * that the main method's signature is correct, therefore further checking
+ * is not required. The main method is invoked here so that extraneous java
+ * stacks are not in the application stack trace.
+ */
mainID = (*env)->GetStaticMethodID(env, mainClass, "main",
"([Ljava/lang/String;)V");
- if (mainID == NULL) {
- if ((*env)->ExceptionOccurred(env)) {
- JLI_ReportExceptionDescription(env);
- JLI_ReportErrorMessage(JNI_ERROR);
- } else {
- JLI_ReportErrorMessage(CLS_ERROR3);
- }
- goto leave;
- }
-
- { /* Make sure the main method is public */
- jint mods;
- jmethodID mid;
- jobject obj = (*env)->ToReflectedMethod(env, mainClass,
- mainID, JNI_TRUE);
-
- if( obj == NULL) { /* exception occurred */
- JLI_ReportExceptionDescription(env);
- JLI_ReportErrorMessage(JNI_ERROR);
- goto leave;
- }
-
- mid =
- (*env)->GetMethodID(env,
- (*env)->GetObjectClass(env, obj),
- "getModifiers", "()I");
- if ((*env)->ExceptionOccurred(env)) {
- JLI_ReportExceptionDescription(env);
- JLI_ReportErrorMessage(JNI_ERROR);
- goto leave;
- }
-
- mods = (*env)->CallIntMethod(env, obj, mid);
- if ((mods & 1) == 0) { /* if (!Modifier.isPublic(mods)) ... */
- JLI_ReportErrorMessage(CLS_ERROR4);
- goto leave;
- }
- }
+ CHECK_EXCEPTION_NULL_LEAVE(mainID);
/* Build argument array */
mainArgs = NewPlatformStringArray(env, argv, argc);
- if (mainArgs == NULL) {
- JLI_ReportExceptionDescription(env);
- JLI_ReportErrorMessage(JNI_ERROR);
- goto leave;
- }
+ CHECK_EXCEPTION_NULL_LEAVE(mainArgs);
/* Invoke main method. */
(*env)->CallStaticVoidMethod(env, mainClass, mainID, mainArgs);
@@ -498,8 +429,9 @@
*/
ret = (*env)->ExceptionOccurred(env) == NULL ? 0 : 1;
+leave:
/*
- * Detach the main thread so that it appears to have ended when
+ * Always detach the main thread so that it appears to have ended when
* the application's main method exits. This will invoke the
* uncaught exception handler machinery if main threw an
* exception. An uncaught exception handler cannot change the
@@ -508,10 +440,7 @@
if ((*vm)->DetachCurrentThread(vm) != 0) {
JLI_ReportErrorMessage(JVM_ERROR2);
ret = 1;
- goto leave;
}
-
- leave:
/*
* Wait for all non-daemon threads to end, then destroy the VM.
* This will actually create a trivial new Java waiter thread
@@ -525,7 +454,6 @@
return ret;
}
-
/*
* Checks the command line options to find which JVM type was
* specified. If no command line option was given for the JVM type,
@@ -1159,7 +1087,7 @@
if (propname) {
jclass cls;
jmethodID mid;
- NULL_CHECK0 (cls = (*env)->FindClass(env, "java/lang/System"));
+ NULL_CHECK0 (cls = FindBootStrapClass(env, "java/lang/System"));
NULL_CHECK0 (mid = (*env)->GetStaticMethodID(
env, cls,
"getProperty",
@@ -1174,7 +1102,7 @@
static jboolean isEncodingSupported(JNIEnv *env, jstring enc) {
jclass cls;
jmethodID mid;
- NULL_CHECK0 (cls = (*env)->FindClass(env, "java/nio/charset/Charset"));
+ NULL_CHECK0 (cls = FindBootStrapClass(env, "java/nio/charset/Charset"));
NULL_CHECK0 (mid = (*env)->GetStaticMethodID(
env, cls,
"isSupported",
@@ -1203,8 +1131,8 @@
jstring str = 0;
(*env)->SetByteArrayRegion(env, ary, 0, len, (jbyte *)s);
if (!(*env)->ExceptionOccurred(env)) {
+ NULL_CHECK0(cls = FindBootStrapClass(env, "java/lang/String"));
if (isEncodingSupported(env, enc) == JNI_TRUE) {
- NULL_CHECK0(cls = (*env)->FindClass(env, "java/lang/String"));
NULL_CHECK0(mid = (*env)->GetMethodID(env, cls, "<init>",
"([BLjava/lang/String;)V"));
str = (*env)->NewObject(env, cls, mid, ary, enc);
@@ -1215,7 +1143,6 @@
the encoding name, in which the StringCoding class will
pickup the iso-8859-1 as the fallback converter for us.
*/
- NULL_CHECK0(cls = (*env)->FindClass(env, "java/lang/String"));
NULL_CHECK0(mid = (*env)->GetMethodID(env, cls, "<init>",
"([B)V"));
str = (*env)->NewObject(env, cls, mid, ary);
@@ -1238,7 +1165,7 @@
jarray ary;
int i;
- NULL_CHECK0(cls = (*env)->FindClass(env, "java/lang/String"));
+ NULL_CHECK0(cls = FindBootStrapClass(env, "java/lang/String"));
NULL_CHECK0(ary = (*env)->NewObjectArray(env, strc, cls, 0));
for (i = 0; i < strc; i++) {
jstring str = NewPlatformString(env, *strv++);
@@ -1250,25 +1177,26 @@
}
/*
- * Loads a class, convert the '.' to '/'.
+ * Loads a class and verifies that the main class is present and it is ok to
+ * call it for more details refer to the java implementation.
*/
static jclass
-LoadClass(JNIEnv *env, char *name)
+LoadMainClass(JNIEnv *env, jboolean isJar, char *name)
{
- char *buf = JLI_MemAlloc(JLI_StrLen(name) + 1);
- char *s = buf, *t = name, c;
jclass cls;
+ jmethodID mid;
+ jstring str;
+ jobject result;
jlong start, end;
- if (JLI_IsTraceLauncher())
+ if (JLI_IsTraceLauncher()) {
start = CounterGet();
-
- do {
- c = *t++;
- *s++ = (c == '.') ? '/' : c;
- } while (c != '\0');
- cls = (*env)->FindClass(env, buf);
- JLI_MemFree(buf);
+ }
+ NULL_CHECK0(cls = FindBootStrapClass(env, "sun/launcher/LauncherHelper"));
+ NULL_CHECK0(mid = (*env)->GetStaticMethodID(env, cls, "checkAndLoadMain",
+ "(ZZLjava/lang/String;)Ljava/lang/Object;"));
+ str = (*env)->NewStringUTF(env, name);
+ result = (*env)->CallStaticObjectMethod(env, cls, mid, JNI_TRUE, isJar, str);
if (JLI_IsTraceLauncher()) {
end = CounterGet();
@@ -1277,49 +1205,9 @@
printf("----_JAVA_LAUNCHER_DEBUG----\n");
}
- return cls;
+ return (jclass)result;
}
-
-/*
- * Returns the main class name for the specified jar file.
- */
-static jstring
-GetMainClassName(JNIEnv *env, char *jarname)
-{
-#define MAIN_CLASS "Main-Class"
- jclass cls;
- jmethodID mid;
- jobject jar, man, attr;
- jstring str, result = 0;
-
- NULL_CHECK0(cls = (*env)->FindClass(env, "java/util/jar/JarFile"));
- NULL_CHECK0(mid = (*env)->GetMethodID(env, cls, "<init>",
- "(Ljava/lang/String;)V"));
- NULL_CHECK0(str = NewPlatformString(env, jarname));
- NULL_CHECK0(jar = (*env)->NewObject(env, cls, mid, str));
- NULL_CHECK0(mid = (*env)->GetMethodID(env, cls, "getManifest",
- "()Ljava/util/jar/Manifest;"));
- man = (*env)->CallObjectMethod(env, jar, mid);
- if (man != 0) {
- NULL_CHECK0(mid = (*env)->GetMethodID(env,
- (*env)->GetObjectClass(env, man),
- "getMainAttributes",
- "()Ljava/util/jar/Attributes;"));
- attr = (*env)->CallObjectMethod(env, man, mid);
- if (attr != 0) {
- NULL_CHECK0(mid = (*env)->GetMethodID(env,
- (*env)->GetObjectClass(env, attr),
- "getValue",
- "(Ljava/lang/String;)Ljava/lang/String;"));
- NULL_CHECK0(str = NewPlatformString(env, MAIN_CLASS));
- result = (*env)->CallObjectMethod(env, attr, mid, str);
- }
- }
- return result;
-}
-
-
/*
* For tools, convert command line args thus:
* javac -cp foo:foo/"*" -J-ms32m ...
@@ -1522,7 +1410,7 @@
jclass ver;
jmethodID print;
- NULL_CHECK(ver = (*env)->FindClass(env, "sun/misc/Version"));
+ NULL_CHECK(ver = FindBootStrapClass(env, "sun/misc/Version"));
NULL_CHECK(print = (*env)->GetStaticMethodID(env,
ver,
(extraLF == JNI_TRUE) ? "println" : "print",
@@ -1534,7 +1422,7 @@
}
/*
- * Prints default usage or the Xusage message, see sun.launcher.LauncherHelp.java
+ * Prints default usage or the Xusage message, see sun.launcher.LauncherHelper.java
*/
static void
PrintUsage(JNIEnv* env, jboolean doXUsage)
@@ -1544,7 +1432,7 @@
jstring jprogname, vm1, vm2;
int i;
- NULL_CHECK(cls = (*env)->FindClass(env, "sun/launcher/LauncherHelp"));
+ NULL_CHECK(cls = FindBootStrapClass(env, "sun/launcher/LauncherHelper"));
if (doXUsage) {
--- a/jdk/src/share/bin/java.h Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/bin/java.h Wed Jul 05 16:42:37 2017 +0200
@@ -180,4 +180,16 @@
*/
void InitLauncher(jboolean javaw);
+/*
+ * This allows for finding classes from the VM's bootstrap class loader directly,
+ * FindClass uses the application class loader internally, this will cause
+ * unnecessary searching of the classpath for the required classes.
+ *
+ */
+typedef jclass (JNICALL FindClassFromBootLoader_t(JNIEnv *env,
+ const char *name,
+ jboolean init,
+ jobject loader,
+ jboolean throwError));
+jclass FindBootStrapClass(JNIEnv *env, const char *classname);
#endif /* _JAVA_H_ */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/beans/WeakCache.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.beans;
+
+import java.lang.ref.Reference;
+import java.lang.ref.WeakReference;
+
+import java.util.Map;
+import java.util.WeakHashMap;
+
+/**
+ * A hashtable-based cache with weak keys and weak values.
+ * An entry in the map will be automatically removed
+ * when its key is no longer in the ordinary use.
+ * A value will be automatically removed as well
+ * when it is no longer in the ordinary use.
+ *
+ * @since 1.7
+ *
+ * @author Sergey A. Malenkov
+ */
+public final class WeakCache<K, V> {
+ private final Map<K, Reference<V>> map = new WeakHashMap<K, Reference<V>>();
+
+ /**
+ * Returns a value to which the specified {@code key} is mapped,
+ * or {@code null} if this map contains no mapping for the {@code key}.
+ *
+ * @param key the key whose associated value is returned
+ * @return a value to which the specified {@code key} is mapped
+ */
+ public V get(K key) {
+ Reference<V> reference = this.map.get(key);
+ if (reference == null) {
+ return null;
+ }
+ V value = reference.get();
+ if (value == null) {
+ this.map.remove(key);
+ }
+ return value;
+ }
+
+ /**
+ * Associates the specified {@code value} with the specified {@code key}.
+ * Removes the mapping for the specified {@code key} from this cache
+ * if it is present and the specified {@code value} is {@code null}.
+ * If the cache previously contained a mapping for the {@code key},
+ * the old value is replaced by the specified {@code value}.
+ *
+ * @param key the key with which the specified value is associated
+ * @param value the value to be associated with the specified key
+ */
+ public void put(K key, V value) {
+ if (value != null) {
+ this.map.put(key, new WeakReference<V>(value));
+ }
+ else {
+ this.map.remove(key);
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/java/swing/SwingUtilities3.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,178 @@
+/*
+ * Copyright 2002-2007 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.java.swing;
+
+import sun.awt.EventQueueDelegate;
+import sun.awt.AppContext;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.awt.AWTEvent;
+import java.awt.EventQueue;
+import java.awt.Component;
+import javax.swing.JComponent;
+import javax.swing.RepaintManager;
+
+/**
+ * A collection of utility methods for Swing.
+ * <p>
+ * <b>WARNING:</b> While this class is public, it should not be treated as
+ * public API and its API may change in incompatable ways between dot dot
+ * releases and even patch releases. You should not rely on this class even
+ * existing.
+ *
+ * This is a second part of sun.swing.SwingUtilities2. It is required
+ * to provide services for JavaFX applets.
+ *
+ */
+public class SwingUtilities3 {
+ /**
+ * The {@code clientProperty} key for delegate {@code RepaintManager}
+ */
+ private static final Object DELEGATE_REPAINT_MANAGER_KEY =
+ new StringBuilder("DelegateRepaintManagerKey");
+
+ /**
+ * Registers delegate RepaintManager for {@code JComponent}.
+ */
+ public static void setDelegateRepaintManager(JComponent component,
+ RepaintManager repaintManager) {
+ /* setting up flag in AppContext to speed up lookups in case
+ * there are no delegate RepaintManagers used.
+ */
+ AppContext.getAppContext().put(DELEGATE_REPAINT_MANAGER_KEY,
+ Boolean.TRUE);
+
+ component.putClientProperty(DELEGATE_REPAINT_MANAGER_KEY,
+ repaintManager);
+ }
+
+ /**
+ * Returns delegate {@code RepaintManager} for {@code component} hierarchy.
+ */
+ public static RepaintManager getDelegateRepaintManager(Component
+ component) {
+ RepaintManager delegate = null;
+ if (Boolean.TRUE == AppContext.getAppContext().get(
+ DELEGATE_REPAINT_MANAGER_KEY)) {
+ while (delegate == null && component != null) {
+ while (component != null
+ && ! (component instanceof JComponent)) {
+ component = component.getParent();
+ }
+ if (component != null) {
+ delegate = (RepaintManager)
+ ((JComponent) component)
+ .getClientProperty(DELEGATE_REPAINT_MANAGER_KEY);
+ component = component.getParent();
+ }
+
+ }
+ }
+ return delegate;
+ }
+
+ /*
+ * We use maps to avoid reflection. Hopefully it should perform better
+ * this way.
+ */
+ public static void setEventQueueDelegate(
+ Map<String, Map<String, Object>> map) {
+ EventQueueDelegate.setDelegate(new EventQueueDelegateFromMap(map));
+ }
+
+ private static class EventQueueDelegateFromMap
+ implements EventQueueDelegate.Delegate {
+ private final AWTEvent[] afterDispatchEventArgument;
+ private final Object[] afterDispatchHandleArgument;
+ private final Callable<Void> afterDispatchCallable;
+
+ private final AWTEvent[] beforeDispatchEventArgument;
+ private final Callable<Object> beforeDispatchCallable;
+
+ private final EventQueue[] getNextEventEventQueueArgument;
+ private final Callable<AWTEvent> getNextEventCallable;
+
+ @SuppressWarnings("unchecked")
+ public EventQueueDelegateFromMap(Map<String, Map<String, Object>> objectMap) {
+ Map<String, Object> methodMap = objectMap.get("afterDispatch");
+ afterDispatchEventArgument = (AWTEvent[]) methodMap.get("event");
+ afterDispatchHandleArgument = (Object[]) methodMap.get("handle");
+ afterDispatchCallable = (Callable<Void>) methodMap.get("method");
+
+ methodMap = objectMap.get("beforeDispatch");
+ beforeDispatchEventArgument = (AWTEvent[]) methodMap.get("event");
+ beforeDispatchCallable = (Callable<Object>) methodMap.get("method");
+
+ methodMap = objectMap.get("getNextEvent");
+ getNextEventEventQueueArgument =
+ (EventQueue[]) methodMap.get("eventQueue");
+ getNextEventCallable = (Callable<AWTEvent>) methodMap.get("method");
+ }
+
+ @Override
+ public void afterDispatch(AWTEvent event, Object handle) throws InterruptedException {
+ afterDispatchEventArgument[0] = event;
+ afterDispatchHandleArgument[0] = handle;
+ try {
+ afterDispatchCallable.call();
+ } catch (InterruptedException e) {
+ throw e;
+ } catch (RuntimeException e) {
+ throw e;
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ public Object beforeDispatch(AWTEvent event) throws InterruptedException {
+ beforeDispatchEventArgument[0] = event;
+ try {
+ return beforeDispatchCallable.call();
+ } catch (InterruptedException e) {
+ throw e;
+ } catch (RuntimeException e) {
+ throw e;
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ public AWTEvent getNextEvent(EventQueue eventQueue) throws InterruptedException {
+ getNextEventEventQueueArgument[0] = eventQueue;
+ try {
+ return getNextEventCallable.call();
+ } catch (InterruptedException e) {
+ throw e;
+ } catch (RuntimeException e) {
+ throw e;
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+}
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKColorChooserPanel.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKColorChooserPanel.java Wed Jul 05 16:42:37 2017 +0200
@@ -442,7 +442,10 @@
}
if (updateModel) {
- getColorSelectionModel().setSelectedColor(color);
+ ColorSelectionModel model = getColorSelectionModel();
+ if (model != null) {
+ model.setSelectedColor(color);
+ }
}
triangle.setColor(hue, saturation, brightness);
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java Wed Jul 05 16:42:37 2017 +0200
@@ -770,33 +770,56 @@
JComponent maximizeButton = findChild(titlePane, "InternalFrameTitlePane.maximizeButton");
JComponent closeButton = findChild(titlePane, "InternalFrameTitlePane.closeButton");
- int buttonGap = 0;
-
Insets button_border = (Insets)gm.get("button_border");
Dimension buttonDim = calculateButtonSize(titlePane);
- int x = getInt("left_titlebar_edge");
int y = (button_border != null) ? button_border.top : 0;
+ if (titlePaneParent.getComponentOrientation().isLeftToRight()) {
+ int x = getInt("left_titlebar_edge");
- menuButton.setBounds(x, y, buttonDim.width, buttonDim.height);
+ menuButton.setBounds(x, y, buttonDim.width, buttonDim.height);
- x = w - buttonDim.width - getInt("right_titlebar_edge");
- if (button_border != null) {
- x -= button_border.right;
- }
+ x = w - buttonDim.width - getInt("right_titlebar_edge");
+ if (button_border != null) {
+ x -= button_border.right;
+ }
+
+ if (frame.isClosable()) {
+ closeButton.setBounds(x, y, buttonDim.width, buttonDim.height);
+ x -= buttonDim.width;
+ }
+
+ if (frame.isMaximizable()) {
+ maximizeButton.setBounds(x, y, buttonDim.width, buttonDim.height);
+ x -= buttonDim.width;
+ }
- if (frame.isClosable()) {
- closeButton.setBounds(x, y, buttonDim.width, buttonDim.height);
- x -= (buttonDim.width + buttonGap);
- }
+ if (frame.isIconifiable()) {
+ minimizeButton.setBounds(x, y, buttonDim.width, buttonDim.height);
+ }
+ } else {
+ int x = w - buttonDim.width - getInt("right_titlebar_edge");
+
+ menuButton.setBounds(x, y, buttonDim.width, buttonDim.height);
+
+ x = getInt("left_titlebar_edge");
+ if (button_border != null) {
+ x += button_border.left;
+ }
- if (frame.isMaximizable()) {
- maximizeButton.setBounds(x, y, buttonDim.width, buttonDim.height);
- x -= (buttonDim.width + buttonGap);
- }
+ if (frame.isClosable()) {
+ closeButton.setBounds(x, y, buttonDim.width, buttonDim.height);
+ x += buttonDim.width;
+ }
- if (frame.isIconifiable()) {
- minimizeButton.setBounds(x, y, buttonDim.width, buttonDim.height);
+ if (frame.isMaximizable()) {
+ maximizeButton.setBounds(x, y, buttonDim.width, buttonDim.height);
+ x += buttonDim.width;
+ }
+
+ if (frame.isIconifiable()) {
+ minimizeButton.setBounds(x, y, buttonDim.width, buttonDim.height);
+ }
}
}
} // end TitlePaneLayout
@@ -973,10 +996,8 @@
String title = jif.getTitle();
if (title != null) {
FontMetrics fm = SwingUtilities2.getFontMetrics(jif, g);
- if (jif.getComponentOrientation().isLeftToRight()) {
- title = SwingUtilities2.clipStringIfNecessary(jif, fm, title,
- calculateTitleTextWidth(g, jif));
- }
+ title = SwingUtilities2.clipStringIfNecessary(jif, fm, title,
+ calculateTitleArea(jif).width);
g.setColor(color);
SwingUtilities2.drawString(jif, g, title, x, y + fm.getAscent());
}
@@ -1010,9 +1031,10 @@
JComponent titlePane = findChild(jif, "InternalFrame.northPane");
Dimension buttonDim = calculateButtonSize(titlePane);
Insets title_border = (Insets)frameGeometry.get("title_border");
- Rectangle r = new Rectangle();
+ Insets button_border = (Insets)getFrameGeometry().get("button_border");
- r.x = getInt("left_titlebar_edge") + buttonDim.width;
+ Rectangle r = new Rectangle();
+ r.x = getInt("left_titlebar_edge");
r.y = 0;
r.height = titlePane.getHeight();
if (title_border != null) {
@@ -1021,15 +1043,36 @@
r.height -= (title_border.top + title_border.bottom);
}
- r.width = titlePane.getWidth() - r.x - getInt("right_titlebar_edge");
- if (jif.isClosable()) {
- r.width -= buttonDim.width;
- }
- if (jif.isMaximizable()) {
- r.width -= buttonDim.width;
- }
- if (jif.isIconifiable()) {
- r.width -= buttonDim.width;
+ if (titlePane.getParent().getComponentOrientation().isLeftToRight()) {
+ r.x += buttonDim.width;
+ if (button_border != null) {
+ r.x += button_border.left;
+ }
+ r.width = titlePane.getWidth() - r.x - getInt("right_titlebar_edge");
+ if (jif.isClosable()) {
+ r.width -= buttonDim.width;
+ }
+ if (jif.isMaximizable()) {
+ r.width -= buttonDim.width;
+ }
+ if (jif.isIconifiable()) {
+ r.width -= buttonDim.width;
+ }
+ } else {
+ if (jif.isClosable()) {
+ r.x += buttonDim.width;
+ }
+ if (jif.isMaximizable()) {
+ r.x += buttonDim.width;
+ }
+ if (jif.isIconifiable()) {
+ r.x += buttonDim.width;
+ }
+ r.width = titlePane.getWidth() - r.x - getInt("right_titlebar_edge")
+ - buttonDim.width;
+ if (button_border != null) {
+ r.x -= button_border.right;
+ }
}
if (title_border != null) {
r.width -= title_border.right;
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/DesktopProperty.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/DesktopProperty.java Wed Jul 05 16:42:37 2017 +0200
@@ -49,8 +49,7 @@
/**
* ReferenceQueue of unreferenced WeakPCLs.
*/
- private static ReferenceQueue queue;
-
+ private static ReferenceQueue<DesktopProperty> queue;
/**
* PropertyChangeListener attached to the Toolkit.
@@ -76,7 +75,7 @@
static {
- queue = new ReferenceQueue();
+ queue = new ReferenceQueue<DesktopProperty>();
}
/**
@@ -117,8 +116,8 @@
XPStyle.invalidateStyle();
}
Frame appFrames[] = Frame.getFrames();
- for (int j=0; j < appFrames.length; j++) {
- updateWindowUI(appFrames[j]);
+ for (Frame appFrame : appFrames) {
+ updateWindowUI(appFrame);
}
}
@@ -128,8 +127,8 @@
private static void updateWindowUI(Window window) {
SwingUtilities.updateComponentTreeUI(window);
Window ownedWins[] = window.getOwnedWindows();
- for (int i=0; i < ownedWins.length; i++) {
- updateWindowUI(ownedWins[i]);
+ for (Window ownedWin : ownedWins) {
+ updateWindowUI(ownedWin);
}
}
@@ -270,13 +269,13 @@
* is handled via a WeakReference so as not to pin down the
* DesktopProperty.
*/
- private static class WeakPCL extends WeakReference
+ private static class WeakPCL extends WeakReference<DesktopProperty>
implements PropertyChangeListener {
private Toolkit kit;
private String key;
private LookAndFeel laf;
- WeakPCL(Object target, Toolkit kit, String key, LookAndFeel laf) {
+ WeakPCL(DesktopProperty target, Toolkit kit, String key, LookAndFeel laf) {
super(target, queue);
this.kit = kit;
this.key = key;
@@ -284,7 +283,7 @@
}
public void propertyChange(PropertyChangeEvent pce) {
- DesktopProperty property = (DesktopProperty)get();
+ DesktopProperty property = get();
if (property == null || laf != UIManager.getLookAndFeel()) {
// The property was GC'ed, we're no longer interested in
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopManager.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopManager.java Wed Jul 05 16:42:37 2017 +0200
@@ -96,7 +96,7 @@
}
} catch (PropertyVetoException e) {}
if (f != currentFrame) {
- currentFrameRef = new WeakReference(f);
+ currentFrameRef = new WeakReference<JInternalFrame>(f);
}
}
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -983,7 +983,7 @@
} else if (s.equals("componentOrientation")) {
ComponentOrientation o = (ComponentOrientation)e.getNewValue();
JFileChooser cc = (JFileChooser)e.getSource();
- if (o != (ComponentOrientation)e.getOldValue()) {
+ if (o != e.getOldValue()) {
cc.applyComponentOrientation(o);
}
} else if (s.equals("ancestor")) {
@@ -1123,7 +1123,7 @@
* Data model for a type-face selection combo-box.
*/
protected class DirectoryComboBoxModel extends AbstractListModel implements ComboBoxModel {
- Vector directories = new Vector();
+ Vector<File> directories = new Vector<File>();
int[] depths = null;
File selectedDirectory = null;
JFileChooser chooser = getFileChooser();
@@ -1162,7 +1162,7 @@
// Get the canonical (full) path. This has the side
// benefit of removing extraneous chars from the path,
// for example /foo/bar/ becomes /foo/bar
- File canonical = null;
+ File canonical;
try {
canonical = directory.getCanonicalFile();
} catch (IOException e) {
@@ -1175,7 +1175,7 @@
File sf = useShellFolder ? ShellFolder.getShellFolder(canonical)
: canonical;
File f = sf;
- Vector path = new Vector(10);
+ Vector<File> path = new Vector<File>(10);
do {
path.addElement(f);
} while ((f = f.getParentFile()) != null);
@@ -1183,7 +1183,7 @@
int pathCount = path.size();
// Insert chain at appropriate place in vector
for (int i = 0; i < pathCount; i++) {
- f = (File)path.get(i);
+ f = path.get(i);
if (directories.contains(f)) {
int topIndex = directories.indexOf(f);
for (int j = i-1; j >= 0; j--) {
@@ -1202,12 +1202,12 @@
private void calculateDepths() {
depths = new int[directories.size()];
for (int i = 0; i < depths.length; i++) {
- File dir = (File)directories.get(i);
+ File dir = directories.get(i);
File parent = dir.getParentFile();
depths[i] = 0;
if (parent != null) {
for (int j = i-1; j >= 0; j--) {
- if (parent.equals((File)directories.get(j))) {
+ if (parent.equals(directories.get(j))) {
depths[i] = depths[j] + 1;
break;
}
@@ -1306,8 +1306,8 @@
FileFilter currentFilter = getFileChooser().getFileFilter();
boolean found = false;
if(currentFilter != null) {
- for(int i=0; i < filters.length; i++) {
- if(filters[i] == currentFilter) {
+ for (FileFilter filter : filters) {
+ if (filter == currentFilter) {
found = true;
}
}
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameTitlePane.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameTitlePane.java Wed Jul 05 16:42:37 2017 +0200
@@ -137,25 +137,46 @@
int baseline = (getHeight() + fm.getAscent() - fm.getLeading() -
fm.getDescent()) / 2;
- int titleX;
- Rectangle r = new Rectangle(0, 0, 0, 0);
- if (frame.isIconifiable()) r = iconButton.getBounds();
- else if (frame.isMaximizable()) r = maxButton.getBounds();
- else if (frame.isClosable()) r = closeButton.getBounds();
- int titleW;
+ Rectangle lastIconBounds = new Rectangle(0, 0, 0, 0);
+ if (frame.isIconifiable()) {
+ lastIconBounds = iconButton.getBounds();
+ } else if (frame.isMaximizable()) {
+ lastIconBounds = maxButton.getBounds();
+ } else if (frame.isClosable()) {
+ lastIconBounds = closeButton.getBounds();
+ }
- if(WindowsGraphicsUtils.isLeftToRight(frame) ) {
- if (r.x == 0) r.x = frame.getWidth()-frame.getInsets().right;
- titleX = systemLabel.getX() + systemLabel.getWidth() + 2;
- if (xp != null) {
- titleX += 2;
- }
- titleW = r.x - titleX - 3;
- title = getTitle(frame.getTitle(), fm, titleW);
+ int titleX;
+ int titleW;
+ int gap = 2;
+ if (WindowsGraphicsUtils.isLeftToRight(frame)) {
+ if (lastIconBounds.x == 0) { // There are no icons
+ lastIconBounds.x = frame.getWidth() - frame.getInsets().right;
+ }
+ titleX = systemLabel.getX() + systemLabel.getWidth() + gap;
+ if (xp != null) {
+ titleX += 2;
+ }
+ titleW = lastIconBounds.x - titleX - gap;
} else {
- titleX = systemLabel.getX() - 2
- - SwingUtilities2.stringWidth(frame,fm,title);
+ if (lastIconBounds.x == 0) { // There are no icons
+ lastIconBounds.x = frame.getInsets().left;
+ }
+ titleW = SwingUtilities2.stringWidth(frame, fm, title);
+ int minTitleX = lastIconBounds.x + lastIconBounds.width + gap;
+ if (xp != null) {
+ minTitleX += 2;
+ }
+ int availableWidth = systemLabel.getX() - gap - minTitleX;
+ if (availableWidth > titleW) {
+ titleX = systemLabel.getX() - gap - titleW;
+ } else {
+ titleX = minTitleX;
+ titleW = availableWidth;
+ }
}
+ title = getTitle(frame.getTitle(), fm, titleW);
+
if (xp != null) {
String shadowType = null;
if (isSelected) {
@@ -258,8 +279,8 @@
g.fillRect(0, 0, w, h);
}
Icon icon = getIcon();
- int iconWidth = 0;
- int iconHeight = 0;
+ int iconWidth;
+ int iconHeight;
if (icon != null &&
(iconWidth = icon.getIconWidth()) > 0 &&
(iconHeight = icon.getIconHeight()) > 0) {
@@ -304,18 +325,18 @@
}
protected void addSystemMenuItems(JPopupMenu menu) {
- JMenuItem mi = (JMenuItem)menu.add(restoreAction);
+ JMenuItem mi = menu.add(restoreAction);
mi.setMnemonic('R');
- mi = (JMenuItem)menu.add(moveAction);
+ mi = menu.add(moveAction);
mi.setMnemonic('M');
- mi = (JMenuItem)menu.add(sizeAction);
+ mi = menu.add(sizeAction);
mi.setMnemonic('S');
- mi = (JMenuItem)menu.add(iconifyAction);
+ mi = menu.add(iconifyAction);
mi.setMnemonic('n');
- mi = (JMenuItem)menu.add(maximizeAction);
+ mi = menu.add(maximizeAction);
mi.setMnemonic('x');
systemPopupMenu.add(new JSeparator());
- mi = (JMenuItem)menu.add(closeAction);
+ mi = menu.add(closeAction);
mi.setMnemonic('C');
}
@@ -441,7 +462,7 @@
public class WindowsPropertyChangeHandler extends PropertyChangeHandler {
public void propertyChange(PropertyChangeEvent evt) {
- String prop = (String)evt.getPropertyName();
+ String prop = evt.getPropertyName();
// Update the internal frame icon for the system menu.
if (JInternalFrame.FRAME_ICON_PROPERTY.equals(prop) &&
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -369,21 +369,21 @@
*/
private static class Grid {
private static final int BUFFER_SIZE = 64;
- private static HashMap map;
+ private static HashMap<String, WeakReference<Grid>> map;
private BufferedImage image;
static {
- map = new HashMap();
+ map = new HashMap<String, WeakReference<Grid>>();
}
public static Grid getGrid(Color fg, Color bg) {
String key = fg.getRGB() + " " + bg.getRGB();
- WeakReference ref = (WeakReference)map.get(key);
- Grid grid = (ref == null) ? null : (Grid)ref.get();
+ WeakReference<Grid> ref = map.get(key);
+ Grid grid = (ref == null) ? null : ref.get();
if (grid == null) {
grid = new Grid(fg, bg);
- map.put(key, new WeakReference(grid));
+ map.put(key, new WeakReference<Grid>(grid));
}
return grid;
}
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTabbedPaneUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTabbedPaneUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -53,13 +53,13 @@
* Keys to use for forward focus traversal when the JComponent is
* managing focus.
*/
- private static Set managingFocusForwardTraversalKeys;
+ private static Set<KeyStroke> managingFocusForwardTraversalKeys;
/**
* Keys to use for backward focus traversal when the JComponent is
* managing focus.
*/
- private static Set managingFocusBackwardTraversalKeys;
+ private static Set<KeyStroke> managingFocusBackwardTraversalKeys;
private boolean contentOpaque = true;
@@ -69,13 +69,13 @@
// focus forward traversal key
if (managingFocusForwardTraversalKeys==null) {
- managingFocusForwardTraversalKeys = new HashSet();
+ managingFocusForwardTraversalKeys = new HashSet<KeyStroke>();
managingFocusForwardTraversalKeys.add(KeyStroke.getKeyStroke(KeyEvent.VK_TAB, 0));
}
tabPane.setFocusTraversalKeys(KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS, managingFocusForwardTraversalKeys);
// focus backward traversal key
if (managingFocusBackwardTraversalKeys==null) {
- managingFocusBackwardTraversalKeys = new HashSet();
+ managingFocusBackwardTraversalKeys = new HashSet<KeyStroke>();
managingFocusBackwardTraversalKeys.add( KeyStroke.getKeyStroke(KeyEvent.VK_TAB, InputEvent.SHIFT_MASK));
}
tabPane.setFocusTraversalKeys(KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS, managingFocusBackwardTraversalKeys);
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -124,7 +124,7 @@
setIcon(null);
sortIcon = null;
SortOrder sortOrder =
- getColumnSortOrder(header.getTable(), column);
+ getColumnSortOrder(table, column);
if (sortOrder != null) {
switch (sortOrder) {
case ASCENDING:
--- a/jdk/src/share/classes/com/sun/jmx/mbeanserver/Introspector.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/jmx/mbeanserver/Introspector.java Wed Jul 05 16:42:37 2017 +0200
@@ -228,7 +228,15 @@
// to generate the appropriate exception.
}
if (c != null) {
- MXBeanMappingFactory factory = MXBeanMappingFactory.forInterface(c);
+ MXBeanMappingFactory factory;
+ try {
+ factory = MXBeanMappingFactory.forInterface(c);
+ } catch (IllegalArgumentException e) {
+ NotCompliantMBeanException ncmbe =
+ new NotCompliantMBeanException(e.getMessage());
+ ncmbe.initCause(e);
+ throw ncmbe;
+ }
return new MXBeanSupport(mbean, c, factory);
}
checkCompliance(mbeanClass);
--- a/jdk/src/share/classes/com/sun/jmx/mbeanserver/MXBeanSupport.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/jmx/mbeanserver/MXBeanSupport.java Wed Jul 05 16:42:37 2017 +0200
@@ -36,7 +36,6 @@
import javax.management.NotCompliantMBeanException;
import javax.management.ObjectName;
import javax.management.openmbean.MXBeanMappingFactory;
-import javax.management.openmbean.MXBeanMappingFactoryClass;
/**
* Base class for MXBeans.
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/Init.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/Init.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,12 +20,9 @@
*/
package com.sun.org.apache.xml.internal.security;
-
-
import java.io.InputStream;
import java.security.AccessController;
import java.security.PrivilegedAction;
-
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -51,7 +48,7 @@
* done by calling {@link Init#init} which should be done in any static block
* of the files of this library. We ensure that this call is only executed once.
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public final class Init {
@@ -113,20 +110,19 @@
dbf.setValidating(false);
DocumentBuilder db = dbf.newDocumentBuilder();
-
// We don't allow users to override the Apache XML Security
// configuration in the JRE. Users should use the standard security
// provider mechanism instead if implementing their own
// transform or canonicalization algorithms.
- // String cfile = System.getProperty("com.sun.org.apache.xml.internal.security.resource.config");
- // InputStream is =
- // Class.forName("com.sun.org.apache.xml.internal.security.Init")
- // .getResourceAsStream(cfile != null ? cfile : "resource/config.xml");
+ // InputStream is = Class.forName("com.sun.org.apache.xml.internal.security.Init").getResourceAsStream("resource/config.xml");
InputStream is = (InputStream) AccessController.doPrivileged(
new PrivilegedAction() {
public Object run() {
+// String cfile = System.getProperty
+// ("com.sun.org.apache.xml.internal.security.resource.config");
return getClass().getResourceAsStream
- ("resource/config.xml");
+// (cfile != null ? cfile : "resource/config.xml");
+ ("resource/config.xml");
}
});
@@ -167,7 +163,7 @@
//
// if (tag.equals("ResourceBundles")){
// XX_configure_i18n_start = System.currentTimeMillis();
-// Element resource=(Element)el;
+// Element resource=(Element)el;
// /* configure internationalization */
// Attr langAttr = resource.getAttributeNode("defaultLanguageCode");
// Attr countryAttr = resource.getAttributeNode("defaultCountryCode");
@@ -202,11 +198,11 @@
if (currMeth.getDeclaringClass().getName()
.equals(JAVACLASS)) {
- log.log(java.util.logging.Level.FINE, currMeth.getDeclaringClass().toString());
+ log.log(java.util.logging.Level.FINE, currMeth.getDe claringClass().toString());
}
}*/
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Canonicalizer.register(" + URI + ", "
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Canonicalizer.register(" + URI + ", "
+ JAVACLASS + ")");
Canonicalizer.register(URI, JAVACLASS);
} catch (ClassNotFoundException e) {
@@ -233,9 +229,8 @@
"JAVACLASS");
try {
Class.forName(JAVACLASS);
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Transform.register(" + URI + ", " + JAVACLASS
- + ")");
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Transform.register(" + URI + ", " + JAVACLASS + ")");
Transform.register(URI, JAVACLASS);
} catch (ClassNotFoundException e) {
Object exArgs[] = { URI, JAVACLASS };
@@ -284,12 +279,11 @@
//
// if (currMeth.getDeclaringClass().getName()
// .equals(JAVACLASS)) {
-// log.log(java.util.logging.Level.FINE, currMeth.getDeclaringClass().toString());
+// log.log(java.util.logging.Level.FINE, currMeth.getDe claringClass().toString());
// }
// }
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "SignatureAlgorithm.register(" + URI + ", "
- + JAVACLASS + ")");
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "SignatureAlgorithm.register(" + URI + ", " + JAVACLASS + ")");
SignatureAlgorithm.register(URI, JAVACLASS);
} catch (ClassNotFoundException e) {
Object exArgs[] = { URI, JAVACLASS };
@@ -320,13 +314,11 @@
"DESCRIPTION");
if ((Description != null) && (Description.length() > 0)) {
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Register Resolver: " + JAVACLASS + ": "
- + Description);
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Register Resolver: " + JAVACLASS + ": " + Description);
} else {
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Register Resolver: " + JAVACLASS
- + ": For unknown purposes");
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Register Resolver: " + JAVACLASS + ": For unknown purposes");
}
try {
ResourceResolver.register(JAVACLASS);
@@ -359,13 +351,11 @@
"DESCRIPTION");
if ((Description != null) && (Description.length() > 0)) {
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Register Resolver: " + JAVACLASS + ": "
- + Description);
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Register Resolver: " + JAVACLASS + ": " + Description);
} else {
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Register Resolver: " + JAVACLASS
- + ": For unknown purposes");
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Register Resolver: " + JAVACLASS + ": For unknown purposes");
}
KeyResolver.register(JAVACLASS);
@@ -376,8 +366,8 @@
if (tag.equals("PrefixMappings")){
XX_configure_reg_prefixes_start = System.currentTimeMillis();
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Now I try to bind prefixes:");
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Now I try to bind prefixes:");
Element[] nl = XMLUtils.selectNodes(el.getFirstChild(), CONF_NS,"PrefixMapping");
@@ -386,8 +376,8 @@
"namespace");
String prefix = nl[i].getAttributeNS(null,
"prefix");
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Now I try to bind " + prefix + " to " + namespace);
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Now I try to bind " + prefix + " to " + namespace);
com.sun.org.apache.xml.internal.security.utils.ElementProxy
.setDefaultPrefix(namespace, prefix);
}
@@ -398,19 +388,19 @@
long XX_init_end = System.currentTimeMillis();
//J-
- if (true) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "XX_init " + ((int)(XX_init_end - XX_init_start)) + " ms");
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_prng " + ((int)(XX_prng_end - XX_prng_start)) + " ms");
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_parsing " + ((int)(XX_parsing_end - XX_parsing_start)) + " ms");
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_configure_i18n " + ((int)(XX_configure_i18n_end- XX_configure_i18n_start)) + " ms");
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_configure_reg_c14n " + ((int)(XX_configure_reg_c14n_end- XX_configure_reg_c14n_start)) + " ms");
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_configure_reg_jcemapper " + ((int)(XX_configure_reg_jcemapper_end- XX_configure_reg_jcemapper_start)) + " ms");
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_configure_reg_keyInfo " + ((int)(XX_configure_reg_keyInfo_end- XX_configure_reg_keyInfo_start)) + " ms");
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_configure_reg_keyResolver " + ((int)(XX_configure_reg_keyResolver_end- XX_configure_reg_keyResolver_start)) + " ms");
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_configure_reg_prefixes " + ((int)(XX_configure_reg_prefixes_end- XX_configure_reg_prefixes_start)) + " ms");
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_configure_reg_resourceresolver " + ((int)(XX_configure_reg_resourceresolver_end- XX_configure_reg_resourceresolver_start)) + " ms");
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_configure_reg_sigalgos " + ((int)(XX_configure_reg_sigalgos_end- XX_configure_reg_sigalgos_start)) + " ms");
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " XX_configure_reg_transforms " + ((int)(XX_configure_reg_transforms_end- XX_configure_reg_transforms_start)) + " ms");
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "XX_init " + ((int)(XX_init_end - XX_init_start)) + " ms");
+ log.log(java.util.logging.Level.FINE, " XX_prng " + ((int)(XX_prng_end - XX_prng_start)) + " ms");
+ log.log(java.util.logging.Level.FINE, " XX_parsing " + ((int)(XX_parsing_end - XX_parsing_start)) + " ms");
+ log.log(java.util.logging.Level.FINE, " XX_configure_i18n " + ((int)(XX_configure_i18n_end- XX_configure_i18n_start)) + " ms");
+ log.log(java.util.logging.Level.FINE, " XX_configure_reg_c14n " + ((int)(XX_configure_reg_c14n_end- XX_configure_reg_c14n_start)) + " ms");
+ log.log(java.util.logging.Level.FINE, " XX_configure_reg_jcemapper " + ((int)(XX_configure_reg_jcemapper_end- XX_configure_reg_jcemapper_start)) + " ms");
+ log.log(java.util.logging.Level.FINE, " XX_configure_reg_keyInfo " + ((int)(XX_configure_reg_keyInfo_end- XX_configure_reg_keyInfo_start)) + " ms");
+ log.log(java.util.logging.Level.FINE, " XX_configure_reg_keyResolver " + ((int)(XX_configure_reg_keyResolver_end- XX_configure_reg_keyResolver_start)) + " ms");
+ log.log(java.util.logging.Level.FINE, " XX_configure_reg_prefixes " + ((int)(XX_configure_reg_prefixes_end- XX_configure_reg_prefixes_start)) + " ms");
+ log.log(java.util.logging.Level.FINE, " XX_configure_reg_resourceresolver " + ((int)(XX_configure_reg_resourceresolver_end- XX_configure_reg_resourceresolver_start)) + " ms");
+ log.log(java.util.logging.Level.FINE, " XX_configure_reg_sigalgos " + ((int)(XX_configure_reg_sigalgos_end- XX_configure_reg_sigalgos_start)) + " ms");
+ log.log(java.util.logging.Level.FINE, " XX_configure_reg_transforms " + ((int)(XX_configure_reg_transforms_end- XX_configure_reg_transforms_start)) + " ms");
}
} catch (Exception e) {
log.log(java.util.logging.Level.SEVERE, "Bad: ", e);
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/Algorithm.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/Algorithm.java Wed Jul 05 16:42:37 2017 +0200
@@ -24,7 +24,7 @@
import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityException;
import com.sun.org.apache.xml.internal.security.utils.Constants;
-import com.sun.org.apache.xml.internal.security.utils.ElementProxy;
+import com.sun.org.apache.xml.internal.security.utils.SignatureElementProxy;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -33,11 +33,7 @@
* The Algorithm class which stores the Algorithm URI as a string.
*
*/
-public abstract class Algorithm extends ElementProxy {
-
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
- java.util.logging.Logger.getLogger(Algorithm.class.getName());
+public abstract class Algorithm extends SignatureElementProxy {
/**
*
@@ -79,7 +75,7 @@
*/
protected void setAlgorithmURI(String algorithmURI) {
- if ((this._state == MODE_CREATE) && (algorithmURI != null)) {
+ if ( (algorithmURI != null)) {
this._constructionElement.setAttributeNS(null, Constants._ATT_ALGORITHM,
algorithmURI);
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java Wed Jul 05 16:42:37 2017 +0200
@@ -35,7 +35,7 @@
/**
* This class maps algorithm identifier URIs to JAVA JCE class names.
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class JCEMapper {
@@ -45,9 +45,9 @@
- private static Map uriToJCEName = new HashMap();
+ private static Map uriToJCEName;
- private static Map algorithmsMap = new HashMap();
+ private static Map algorithmsMap;
private static String providerName = null;
/**
@@ -63,6 +63,8 @@
static void loadAlgorithms( Element algorithmsEl) {
Element[] algorithms = XMLUtils.selectNodes(algorithmsEl.getFirstChild(),Init.CONF_NS,"Algorithm");
+ uriToJCEName = new HashMap( algorithms.length * 2);
+ algorithmsMap = new HashMap( algorithms.length * 2);
for (int i = 0 ;i < algorithms.length ;i ++) {
Element el = algorithms[i];
String id = el.getAttribute("URI");
@@ -70,6 +72,7 @@
uriToJCEName.put(id, jceName);
algorithmsMap.put(id, new Algorithm(el));
}
+
}
static Algorithm getAlgorithmMapping(String algoURI) {
@@ -84,8 +87,8 @@
*
*/
public static String translateURItoJCEID(String AlgorithmURI) {
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Request for URI " + AlgorithmURI);
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Request for URI " + AlgorithmURI);
String jceName = (String) uriToJCEName.get(AlgorithmURI);
return jceName;
@@ -100,8 +103,8 @@
*
*/
public static String getAlgorithmClassFromURI(String AlgorithmURI) {
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Request for URI " + AlgorithmURI);
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Request for URI " + AlgorithmURI);
return ((Algorithm) algorithmsMap.get(AlgorithmURI)).algorithmClass;
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/MessageDigestAlgorithm.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/MessageDigestAlgorithm.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,10 +20,10 @@
*/
package com.sun.org.apache.xml.internal.security.algorithms;
-
-
import java.security.MessageDigest;
import java.security.NoSuchProviderException;
+import java.util.HashMap;
+import java.util.Map;
import com.sun.org.apache.xml.internal.security.signature.XMLSignatureException;
import com.sun.org.apache.xml.internal.security.utils.Constants;
@@ -41,11 +41,6 @@
*/
public class MessageDigestAlgorithm extends Algorithm {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
- java.util.logging.Logger.getLogger(
- MessageDigestAlgorithm.class.getName());
-
/** Message Digest - NOT RECOMMENDED MD5*/
public static final String ALGO_ID_DIGEST_NOT_RECOMMENDED_MD5 = Constants.MoreAlgorithmsSpecNS + "md5";
/** Digest - Required SHA1*/
@@ -76,6 +71,12 @@
this.algorithm = messageDigest;
}
+ static ThreadLocal instances=new ThreadLocal() {
+ protected Object initialValue() {
+ return new HashMap();
+ };
+ };
+
/**
* Factory method for constructing a message digest algorithm by name.
*
@@ -86,8 +87,15 @@
*/
public static MessageDigestAlgorithm getInstance(
Document doc, String algorithmURI) throws XMLSignatureException {
+ MessageDigest md = getDigestInstance(algorithmURI);
+ return new MessageDigestAlgorithm(doc, md, algorithmURI);
+ }
- String algorithmID = JCEMapper.translateURItoJCEID(algorithmURI);
+private static MessageDigest getDigestInstance(String algorithmURI) throws XMLSignatureException {
+ MessageDigest result=(MessageDigest) ((Map)instances.get()).get(algorithmURI);
+ if (result!=null)
+ return result;
+ String algorithmID = JCEMapper.translateURItoJCEID(algorithmURI);
if (algorithmID == null) {
Object[] exArgs = { algorithmURI };
@@ -113,8 +121,9 @@
throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs);
}
- return new MessageDigestAlgorithm(doc, md, algorithmURI);
- }
+ ((Map)instances.get()).put(algorithmURI, md);
+ return md;
+}
/**
* Returns the actual {@link java.security.MessageDigest} algorithm object
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java Wed Jul 05 16:42:37 2017 +0200
@@ -25,6 +25,7 @@
import java.security.SecureRandom;
import java.security.spec.AlgorithmParameterSpec;
import java.util.HashMap;
+import java.util.Map;
import com.sun.org.apache.xml.internal.security.algorithms.implementations.IntegrityHmac;
import com.sun.org.apache.xml.internal.security.exceptions.AlgorithmAlreadyRegisteredException;
@@ -52,9 +53,35 @@
/** All available algorithm classes are registered here */
static HashMap _algorithmHash = null;
+ static ThreadLocal instancesSigning=new ThreadLocal() {
+ protected Object initialValue() {
+ return new HashMap();
+ };
+ };
+
+ static ThreadLocal instancesVerify=new ThreadLocal() {
+ protected Object initialValue() {
+ return new HashMap();
+ };
+ };
+
+ static ThreadLocal keysSigning=new ThreadLocal() {
+ protected Object initialValue() {
+ return new HashMap();
+ };
+ };
+ static ThreadLocal keysVerify=new ThreadLocal() {
+ protected Object initialValue() {
+ return new HashMap();
+ };
+ };
+// boolean isForSigning=false;
+
/** Field _signatureAlgorithm */
protected SignatureAlgorithmSpi _signatureAlgorithm = null;
+ private String algorithmURI;
+
/**
* Constructor SignatureAlgorithm
*
@@ -64,18 +91,49 @@
*/
public SignatureAlgorithm(Document doc, String algorithmURI)
throws XMLSecurityException {
+ super(doc, algorithmURI);
+ this.algorithmURI = algorithmURI;
+ }
- super(doc, algorithmURI);
- try {
+ private void initializeAlgorithm(boolean isForSigning) throws XMLSignatureException {
+ if (_signatureAlgorithm!=null) {
+ return;
+ }
+ _signatureAlgorithm=isForSigning ? getInstanceForSigning(algorithmURI) : getInstanceForVerify(algorithmURI);
+ this._signatureAlgorithm
+ .engineGetContextFromElement(this._constructionElement);
+ }
+ private static SignatureAlgorithmSpi getInstanceForSigning(String algorithmURI) throws XMLSignatureException {
+ SignatureAlgorithmSpi result=(SignatureAlgorithmSpi) ((Map)instancesSigning.get()).get(algorithmURI);
+ if (result!=null) {
+ result.reset();
+ return result;
+ }
+ result=buildSigner(algorithmURI, result);
+ ((Map)instancesSigning.get()).put(algorithmURI,result);
+ return result;
+ }
+ private static SignatureAlgorithmSpi getInstanceForVerify(String algorithmURI) throws XMLSignatureException {
+ SignatureAlgorithmSpi result=(SignatureAlgorithmSpi) ((Map)instancesVerify.get()).get(algorithmURI);
+ if (result!=null) {
+ result.reset();
+ return result;
+ }
+ result=buildSigner(algorithmURI, result);
+ ((Map)instancesVerify.get()).put(algorithmURI,result);
+ return result;
+ }
+
+ private static SignatureAlgorithmSpi buildSigner(String algorithmURI, SignatureAlgorithmSpi result) throws XMLSignatureException {
+ try {
Class implementingClass =
SignatureAlgorithm.getImplementingClass(algorithmURI);
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Create URI \"" + algorithmURI + "\" class \""
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Create URI \"" + algorithmURI + "\" class \""
+ implementingClass + "\"");
-
- this._signatureAlgorithm =
- (SignatureAlgorithmSpi) implementingClass.newInstance();
+ result=(SignatureAlgorithmSpi) implementingClass.newInstance();
+ return result;
} catch (IllegalAccessException ex) {
Object exArgs[] = { algorithmURI, ex.getMessage() };
@@ -92,7 +150,7 @@
throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs,
ex);
}
- }
+}
/**
* Constructor SignatureAlgorithm
@@ -107,7 +165,8 @@
throws XMLSecurityException {
this(doc, algorithmURI);
-
+ this.algorithmURI=algorithmURI;
+ initializeAlgorithm(true);
this._signatureAlgorithm.engineSetHMACOutputLength(HMACOutputLength);
((IntegrityHmac)this._signatureAlgorithm)
.engineAddContextToElement(this._constructionElement);
@@ -124,37 +183,7 @@
throws XMLSecurityException {
super(element, BaseURI);
-
- String algorithmURI = this.getURI();
-
- try {
- Class implementingClass =
- SignatureAlgorithm.getImplementingClass(algorithmURI);
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Create URI \"" + algorithmURI + "\" class \""
- + implementingClass + "\"");
-
- this._signatureAlgorithm =
- (SignatureAlgorithmSpi) implementingClass.newInstance();
-
- this._signatureAlgorithm
- .engineGetContextFromElement(this._constructionElement);
- } catch (IllegalAccessException ex) {
- Object exArgs[] = { algorithmURI, ex.getMessage() };
-
- throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs,
- ex);
- } catch (InstantiationException ex) {
- Object exArgs[] = { algorithmURI, ex.getMessage() };
-
- throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs,
- ex);
- } catch (NullPointerException ex) {
- Object exArgs[] = { algorithmURI, ex.getMessage() };
-
- throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs,
- ex);
- }
+ algorithmURI = this.getURI();
}
/**
@@ -175,7 +204,12 @@
* @return the result of the {@link java.security.Signature#getAlgorithm} method
*/
public String getJCEAlgorithmString() {
- return this._signatureAlgorithm.engineGetJCEAlgorithmString();
+ try {
+ return getInstanceForVerify(algorithmURI).engineGetJCEAlgorithmString();
+ } catch (XMLSignatureException e) {
+ //Ignore.
+ return null;
+ }
}
/**
@@ -184,7 +218,11 @@
* @return The Provider of this Signature Alogrithm
*/
public String getJCEProviderName() {
- return this._signatureAlgorithm.engineGetJCEProviderName();
+ try {
+ return getInstanceForVerify(algorithmURI).engineGetJCEProviderName();
+ } catch (XMLSignatureException e) {
+ return null;
+ }
}
/**
@@ -231,7 +269,13 @@
* @throws XMLSignatureException
*/
public void initSign(Key signingKey) throws XMLSignatureException {
- this._signatureAlgorithm.engineInitSign(signingKey);
+ initializeAlgorithm(true);
+ Map map=(Map)keysSigning.get();
+ if (map.get(this.algorithmURI)==signingKey) {
+ return;
+ }
+ map.put(this.algorithmURI,signingKey);
+ this._signatureAlgorithm.engineInitSign(signingKey);
}
/**
@@ -244,6 +288,7 @@
*/
public void initSign(Key signingKey, SecureRandom secureRandom)
throws XMLSignatureException {
+ initializeAlgorithm(true);
this._signatureAlgorithm.engineInitSign(signingKey, secureRandom);
}
@@ -258,6 +303,7 @@
public void initSign(
Key signingKey, AlgorithmParameterSpec algorithmParameterSpec)
throws XMLSignatureException {
+ initializeAlgorithm(true);
this._signatureAlgorithm.engineInitSign(signingKey,
algorithmParameterSpec);
}
@@ -282,7 +328,13 @@
* @throws XMLSignatureException
*/
public void initVerify(Key verificationKey) throws XMLSignatureException {
- this._signatureAlgorithm.engineInitVerify(verificationKey);
+ initializeAlgorithm(false);
+ Map map=(Map)keysVerify.get();
+ if (map.get(this.algorithmURI)==verificationKey) {
+ return;
+ }
+ map.put(this.algorithmURI,verificationKey);
+ this._signatureAlgorithm.engineInitVerify(verificationKey);
}
/**
@@ -320,7 +372,7 @@
.getLogger(SignatureAlgorithm.class.getName());
}
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Init() called");
+ log.log(java.util.logging.Level.FINE, "Init() called");
if (!SignatureAlgorithm._alreadyInitialized) {
SignatureAlgorithm._algorithmHash = new HashMap(10);
@@ -340,8 +392,8 @@
throws AlgorithmAlreadyRegisteredException,XMLSignatureException {
{
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Try to register " + algorithmURI + " " + implementingClass);
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Try to register " + algorithmURI + " " + implementingClass);
// are we already registered?
Class registeredClassClass =
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithmSpi.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithmSpi.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,27 +20,20 @@
*/
package com.sun.org.apache.xml.internal.security.algorithms;
-
-
import java.security.Key;
import java.security.SecureRandom;
import java.security.spec.AlgorithmParameterSpec;
import com.sun.org.apache.xml.internal.security.signature.XMLSignatureException;
-import org.w3c.dom.Document;
import org.w3c.dom.Element;
/**
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public abstract class SignatureAlgorithmSpi {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
- java.util.logging.Logger.getLogger(SignatureAlgorithmSpi.class.getName());
-
/**
* Returns the URI representation of <code>Transformation algorithm</code>
*
@@ -167,20 +160,6 @@
protected abstract void engineSetParameter(AlgorithmParameterSpec params)
throws XMLSignatureException;
- /** Field _doc */
- Document _doc = null;
-
- /**
- * Method engineSetDocument
- *
- * @param doc
- */
- protected void engineSetDocument(Document doc) {
- this._doc = doc;
- }
-
- /** Field _constructionElement */
- Element _constructionElement = null;
/**
* Method engineGetContextFromElement
@@ -188,7 +167,6 @@
* @param element
*/
protected void engineGetContextFromElement(Element element) {
- this._constructionElement = element;
}
/**
@@ -199,4 +177,7 @@
*/
protected abstract void engineSetHMACOutputLength(int HMACOutputLength)
throws XMLSignatureException;
+
+ public void reset() {
+ }
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/IntegrityHmac.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/IntegrityHmac.java Wed Jul 05 16:42:37 2017 +0200
@@ -45,7 +45,7 @@
/**
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
@@ -74,8 +74,8 @@
public IntegrityHmac() throws XMLSignatureException {
String algorithmID = JCEMapper.translateURItoJCEID(this.engineGetURI());
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Created IntegrityHmacSHA1 using " + algorithmID);
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Created IntegrityHmacSHA1 using " + algorithmID);
try {
this._macAlgorithm = Mac.getInstance(algorithmID);
@@ -99,6 +99,10 @@
throw new XMLSignatureException("empty");
}
+ public void reset() {
+ _HMACOutputLength=0;
+ }
+
/**
* Proxy method for {@link java.security.Signature#verify(byte[])}
* which is executed on the internal {@link java.security.Signature} object.
@@ -145,7 +149,20 @@
try {
this._macAlgorithm.init(secretKey);
} catch (InvalidKeyException ex) {
- throw new XMLSignatureException("empty", ex);
+ // reinstantiate Mac object to work around bug in JDK
+ // see: http://bugs.sun.com/view_bug.do?bug_id=4953555
+ Mac mac = this._macAlgorithm;
+ try {
+ this._macAlgorithm = Mac.getInstance
+ (_macAlgorithm.getAlgorithm());
+ } catch (Exception e) {
+ // this shouldn't occur, but if it does, restore previous Mac
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Exception when reinstantiating Mac:" + e);
+ }
+ this._macAlgorithm = mac;
+ }
+ throw new XMLSignatureException("empty", ex);
}
}
@@ -323,7 +340,7 @@
*/
protected String engineGetJCEAlgorithmString() {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "engineGetJCEAlgorithmString()");
+ log.log(java.util.logging.Level.FINE, "engineGetJCEAlgorithmString()");
return this._macAlgorithm.getAlgorithm();
}
@@ -397,7 +414,8 @@
/**
* Class IntegrityHmacSHA1
*
- * @author $Author: raul $
+ * @author $Author: mullan $
+ * @version $Revision: 1.5 $
*/
public static class IntegrityHmacSHA1 extends IntegrityHmac {
@@ -423,7 +441,8 @@
/**
* Class IntegrityHmacSHA256
*
- * @author $Author: raul $
+ * @author $Author: mullan $
+ * @version $Revision: 1.5 $
*/
public static class IntegrityHmacSHA256 extends IntegrityHmac {
@@ -449,7 +468,8 @@
/**
* Class IntegrityHmacSHA384
*
- * @author $Author: raul $
+ * @author $Author: mullan $
+ * @version $Revision: 1.5 $
*/
public static class IntegrityHmacSHA384 extends IntegrityHmac {
@@ -475,7 +495,8 @@
/**
* Class IntegrityHmacSHA512
*
- * @author $Author: raul $
+ * @author $Author: mullan $
+ * @version $Revision: 1.5 $
*/
public static class IntegrityHmacSHA512 extends IntegrityHmac {
@@ -501,7 +522,8 @@
/**
* Class IntegrityHmacRIPEMD160
*
- * @author $Author: raul $
+ * @author $Author: mullan $
+ * @version $Revision: 1.5 $
*/
public static class IntegrityHmacRIPEMD160 extends IntegrityHmac {
@@ -527,7 +549,8 @@
/**
* Class IntegrityHmacMD5
*
- * @author $Author: raul $
+ * @author $Author: mullan $
+ * @version $Revision: 1.5 $
*/
public static class IntegrityHmacMD5 extends IntegrityHmac {
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureBaseRSA.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureBaseRSA.java Wed Jul 05 16:42:37 2017 +0200
@@ -3,7 +3,7 @@
* DO NOT REMOVE OR ALTER!
*/
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2007 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,8 +20,6 @@
*/
package com.sun.org.apache.xml.internal.security.algorithms.implementations;
-
-
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
import java.security.Key;
@@ -38,329 +36,344 @@
import com.sun.org.apache.xml.internal.security.signature.XMLSignature;
import com.sun.org.apache.xml.internal.security.signature.XMLSignatureException;
-
/**
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public abstract class SignatureBaseRSA extends SignatureAlgorithmSpi {
- /** {@link java.util.logging} logging facility */
+ /** {@link java.util.logging} logging facility */
static java.util.logging.Logger log =
- java.util.logging.Logger.getLogger(SignatureBaseRSA.class.getName());
+ java.util.logging.Logger.getLogger
+ (SignatureBaseRSA.class.getName());
+
+ /** @inheritDoc */
+ public abstract String engineGetURI();
+
+ /** Field algorithm */
+ private java.security.Signature _signatureAlgorithm = null;
+
+ /**
+ * Constructor SignatureRSA
+ *
+ * @throws XMLSignatureException
+ */
+ public SignatureBaseRSA() throws XMLSignatureException {
+
+ String algorithmID = JCEMapper.translateURItoJCEID(this.engineGetURI());
+
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Created SignatureRSA using " + algorithmID);
+ String provider=JCEMapper.getProviderId();
+ try {
+ if (provider==null) {
+ this._signatureAlgorithm = Signature.getInstance(algorithmID);
+ } else {
+ this._signatureAlgorithm = Signature.getInstance(algorithmID,provider);
+ }
+ } catch (java.security.NoSuchAlgorithmException ex) {
+ Object[] exArgs = { algorithmID, ex.getLocalizedMessage() };
+
+ throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs);
+ } catch (NoSuchProviderException ex) {
+ Object[] exArgs = { algorithmID, ex.getLocalizedMessage() };
+
+ throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs);
+ }
+ }
+
+ /** @inheritDoc */
+ protected void engineSetParameter(AlgorithmParameterSpec params)
+ throws XMLSignatureException {
+
+ try {
+ this._signatureAlgorithm.setParameter(params);
+ } catch (InvalidAlgorithmParameterException ex) {
+ throw new XMLSignatureException("empty", ex);
+ }
+ }
+
+ /** @inheritDoc */
+ protected boolean engineVerify(byte[] signature)
+ throws XMLSignatureException {
+
+ try {
+ return this._signatureAlgorithm.verify(signature);
+ } catch (SignatureException ex) {
+ throw new XMLSignatureException("empty", ex);
+ }
+ }
+
+ /** @inheritDoc */
+ protected void engineInitVerify(Key publicKey) throws XMLSignatureException {
+
+ if (!(publicKey instanceof PublicKey)) {
+ String supplied = publicKey.getClass().getName();
+ String needed = PublicKey.class.getName();
+ Object exArgs[] = { supplied, needed };
+
+ throw new XMLSignatureException
+ ("algorithms.WrongKeyForThisOperation", exArgs);
+ }
+
+ try {
+ this._signatureAlgorithm.initVerify((PublicKey) publicKey);
+ } catch (InvalidKeyException ex) {
+ // reinstantiate Signature object to work around bug in JDK
+ // see: http://bugs.sun.com/view_bug.do?bug_id=4953555
+ Signature sig = this._signatureAlgorithm;
+ try {
+ this._signatureAlgorithm = Signature.getInstance
+ (_signatureAlgorithm.getAlgorithm());
+ } catch (Exception e) {
+ // this shouldn't occur, but if it does, restore previous
+ // Signature
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Exception when reinstantiating Signature:" + e);
+ }
+ this._signatureAlgorithm = sig;
+ }
+ throw new XMLSignatureException("empty", ex);
+ }
+ }
+
+ /** @inheritDoc */
+ protected byte[] engineSign() throws XMLSignatureException {
+ try {
+ return this._signatureAlgorithm.sign();
+ } catch (SignatureException ex) {
+ throw new XMLSignatureException("empty", ex);
+ }
+ }
+
+ /** @inheritDoc */
+ protected void engineInitSign(Key privateKey, SecureRandom secureRandom)
+ throws XMLSignatureException {
+
+ if (!(privateKey instanceof PrivateKey)) {
+ String supplied = privateKey.getClass().getName();
+ String needed = PrivateKey.class.getName();
+ Object exArgs[] = { supplied, needed };
+
+ throw new XMLSignatureException
+ ("algorithms.WrongKeyForThisOperation", exArgs);
+ }
+
+ try {
+ this._signatureAlgorithm.initSign
+ ((PrivateKey) privateKey, secureRandom);
+ } catch (InvalidKeyException ex) {
+ throw new XMLSignatureException("empty", ex);
+ }
+ }
+
+ /** @inheritDoc */
+ protected void engineInitSign(Key privateKey) throws XMLSignatureException {
+
+ if (!(privateKey instanceof PrivateKey)) {
+ String supplied = privateKey.getClass().getName();
+ String needed = PrivateKey.class.getName();
+ Object exArgs[] = { supplied, needed };
+
+ throw new XMLSignatureException
+ ("algorithms.WrongKeyForThisOperation", exArgs);
+ }
+
+ try {
+ this._signatureAlgorithm.initSign((PrivateKey) privateKey);
+ } catch (InvalidKeyException ex) {
+ throw new XMLSignatureException("empty", ex);
+ }
+ }
+
+ /** @inheritDoc */
+ protected void engineUpdate(byte[] input) throws XMLSignatureException {
+ try {
+ this._signatureAlgorithm.update(input);
+ } catch (SignatureException ex) {
+ throw new XMLSignatureException("empty", ex);
+ }
+ }
+
+ /** @inheritDoc */
+ protected void engineUpdate(byte input) throws XMLSignatureException {
+ try {
+ this._signatureAlgorithm.update(input);
+ } catch (SignatureException ex) {
+ throw new XMLSignatureException("empty", ex);
+ }
+ }
/** @inheritDoc */
- public abstract String engineGetURI();
-
- /** Field algorithm */
- private java.security.Signature _signatureAlgorithm = null;
-
- /**
- * Constructor SignatureRSA
- *
- * @throws XMLSignatureException
- */
- public SignatureBaseRSA() throws XMLSignatureException {
-
- String algorithmID = JCEMapper.translateURItoJCEID(this.engineGetURI());
-
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Created SignatureDSA using " + algorithmID);
- String provider=JCEMapper.getProviderId();
- try {
- if (provider==null) {
- this._signatureAlgorithm = Signature.getInstance(algorithmID);
- } else {
- this._signatureAlgorithm = Signature.getInstance(algorithmID,provider);
- }
- } catch (java.security.NoSuchAlgorithmException ex) {
- Object[] exArgs = { algorithmID,
- ex.getLocalizedMessage() };
-
- throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs);
- } catch (NoSuchProviderException ex) {
- Object[] exArgs = { algorithmID,
- ex.getLocalizedMessage() };
-
- throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs);
+ protected void engineUpdate(byte buf[], int offset, int len)
+ throws XMLSignatureException {
+ try {
+ this._signatureAlgorithm.update(buf, offset, len);
+ } catch (SignatureException ex) {
+ throw new XMLSignatureException("empty", ex);
}
- }
-
- /** @inheritDoc */
- protected void engineSetParameter(AlgorithmParameterSpec params)
- throws XMLSignatureException {
+ }
- try {
- this._signatureAlgorithm.setParameter(params);
- } catch (InvalidAlgorithmParameterException ex) {
- throw new XMLSignatureException("empty", ex);
- }
- }
+ /** @inheritDoc */
+ protected String engineGetJCEAlgorithmString() {
+ return this._signatureAlgorithm.getAlgorithm();
+ }
- /** @inheritDoc */
- protected boolean engineVerify(byte[] signature)
- throws XMLSignatureException {
+ /** @inheritDoc */
+ protected String engineGetJCEProviderName() {
+ return this._signatureAlgorithm.getProvider().getName();
+ }
- try {
- return this._signatureAlgorithm.verify(signature);
- } catch (SignatureException ex) {
- throw new XMLSignatureException("empty", ex);
- }
- }
+ /** @inheritDoc */
+ protected void engineSetHMACOutputLength(int HMACOutputLength)
+ throws XMLSignatureException {
+ throw new XMLSignatureException
+ ("algorithms.HMACOutputLengthOnlyForHMAC");
+ }
- /** @inheritDoc */
- protected void engineInitVerify(Key publicKey) throws XMLSignatureException {
-
- if (!(publicKey instanceof PublicKey)) {
- String supplied = publicKey.getClass().getName();
- String needed = PublicKey.class.getName();
- Object exArgs[] = { supplied, needed };
-
- throw new XMLSignatureException("algorithms.WrongKeyForThisOperation",
- exArgs);
- }
+ /** @inheritDoc */
+ protected void engineInitSign(
+ Key signingKey, AlgorithmParameterSpec algorithmParameterSpec)
+ throws XMLSignatureException {
+ throw new XMLSignatureException(
+ "algorithms.CannotUseAlgorithmParameterSpecOnRSA");
+ }
- try {
- this._signatureAlgorithm.initVerify((PublicKey) publicKey);
- } catch (InvalidKeyException ex) {
- throw new XMLSignatureException("empty", ex);
- }
- }
-
- /** @inheritDoc */
- protected byte[] engineSign() throws XMLSignatureException {
-
- try {
- return this._signatureAlgorithm.sign();
- } catch (SignatureException ex) {
- throw new XMLSignatureException("empty", ex);
- }
- }
+ /**
+ * Class SignatureRSASHA1
+ *
+ * @author $Author: mullan $
+ * @version $Revision: 1.5 $
+ */
+ public static class SignatureRSASHA1 extends SignatureBaseRSA {
- /** @inheritDoc */
- protected void engineInitSign(Key privateKey, SecureRandom secureRandom)
- throws XMLSignatureException {
-
- if (!(privateKey instanceof PrivateKey)) {
- String supplied = privateKey.getClass().getName();
- String needed = PrivateKey.class.getName();
- Object exArgs[] = { supplied, needed };
+ /**
+ * Constructor SignatureRSASHA1
+ *
+ * @throws XMLSignatureException
+ */
+ public SignatureRSASHA1() throws XMLSignatureException {
+ super();
+ }
- throw new XMLSignatureException("algorithms.WrongKeyForThisOperation",
- exArgs);
- }
-
- try {
- this._signatureAlgorithm.initSign((PrivateKey) privateKey,
- secureRandom);
- } catch (InvalidKeyException ex) {
- throw new XMLSignatureException("empty", ex);
- }
- }
+ /** @inheritDoc */
+ public String engineGetURI() {
+ return XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA1;
+ }
+ }
- /** @inheritDoc */
- protected void engineInitSign(Key privateKey) throws XMLSignatureException {
-
- if (!(privateKey instanceof PrivateKey)) {
- String supplied = privateKey.getClass().getName();
- String needed = PrivateKey.class.getName();
- Object exArgs[] = { supplied, needed };
-
- throw new XMLSignatureException("algorithms.WrongKeyForThisOperation",
- exArgs);
- }
-
- try {
- this._signatureAlgorithm.initSign((PrivateKey) privateKey);
- } catch (InvalidKeyException ex) {
- throw new XMLSignatureException("empty", ex);
- }
- }
+ /**
+ * Class SignatureRSASHA256
+ *
+ * @author $Author: mullan $
+ * @version $Revision: 1.5 $
+ */
+ public static class SignatureRSASHA256 extends SignatureBaseRSA {
- /** @inheritDoc */
- protected void engineUpdate(byte[] input) throws XMLSignatureException {
-
- try {
- this._signatureAlgorithm.update(input);
- } catch (SignatureException ex) {
- throw new XMLSignatureException("empty", ex);
- }
- }
+ /**
+ * Constructor SignatureRSASHA256
+ *
+ * @throws XMLSignatureException
+ */
+ public SignatureRSASHA256() throws XMLSignatureException {
+ super();
+ }
- /** @inheritDoc */
- protected void engineUpdate(byte input) throws XMLSignatureException {
-
- try {
- this._signatureAlgorithm.update(input);
- } catch (SignatureException ex) {
- throw new XMLSignatureException("empty", ex);
- }
- }
-
- /** @inheritDoc */
- protected void engineUpdate(byte buf[], int offset, int len)
- throws XMLSignatureException {
+ /** @inheritDoc */
+ public String engineGetURI() {
+ return XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA256;
+ }
+ }
- try {
- this._signatureAlgorithm.update(buf, offset, len);
- } catch (SignatureException ex) {
- throw new XMLSignatureException("empty", ex);
- }
- }
-
- /** @inheritDoc */
- protected String engineGetJCEAlgorithmString() {
- return this._signatureAlgorithm.getAlgorithm();
- }
-
- /** @inheritDoc */
- protected String engineGetJCEProviderName() {
- return this._signatureAlgorithm.getProvider().getName();
- }
+ /**
+ * Class SignatureRSASHA384
+ *
+ * @author $Author: mullan $
+ * @version $Revision: 1.5 $
+ */
+ public static class SignatureRSASHA384 extends SignatureBaseRSA {
- /** @inheritDoc */
- protected void engineSetHMACOutputLength(int HMACOutputLength)
- throws XMLSignatureException {
- throw new XMLSignatureException("algorithms.HMACOutputLengthOnlyForHMAC");
- }
+ /**
+ * Constructor SignatureRSASHA384
+ *
+ * @throws XMLSignatureException
+ */
+ public SignatureRSASHA384() throws XMLSignatureException {
+ super();
+ }
- /** @inheritDoc */
- protected void engineInitSign(
- Key signingKey, AlgorithmParameterSpec algorithmParameterSpec)
- throws XMLSignatureException {
- throw new XMLSignatureException(
- "algorithms.CannotUseAlgorithmParameterSpecOnRSA");
- }
-
- /**
- * Class SignatureRSASHA1
- *
- * @author $Author: raul $
- */
- public static class SignatureRSASHA1 extends SignatureBaseRSA {
+ /** @inheritDoc */
+ public String engineGetURI() {
+ return XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA384;
+ }
+ }
- /**
- * Constructor SignatureRSASHA1
- *
- * @throws XMLSignatureException
- */
- public SignatureRSASHA1() throws XMLSignatureException {
- super();
- }
-
- /** @inheritDoc */
- public String engineGetURI() {
- return XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA1;
- }
- }
-
- /**
- * Class SignatureRSASHA256
- *
- * @author $Author: raul $
- */
- public static class SignatureRSASHA256 extends SignatureBaseRSA {
+ /**
+ * Class SignatureRSASHA512
+ *
+ * @author $Author: mullan $
+ * @version $Revision: 1.5 $
+ */
+ public static class SignatureRSASHA512 extends SignatureBaseRSA {
- /**
- * Constructor SignatureRSASHA256
- *
- * @throws XMLSignatureException
- */
- public SignatureRSASHA256() throws XMLSignatureException {
- super();
- }
+ /**
+ * Constructor SignatureRSASHA512
+ *
+ * @throws XMLSignatureException
+ */
+ public SignatureRSASHA512() throws XMLSignatureException {
+ super();
+ }
- /** @inheritDoc */
- public String engineGetURI() {
- return XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA256;
- }
- }
-
- /**
- * Class SignatureRSASHA384
- *
- * @author $Author: raul $
- */
- public static class SignatureRSASHA384 extends SignatureBaseRSA {
+ /** @inheritDoc */
+ public String engineGetURI() {
+ return XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA512;
+ }
+ }
- /**
- * Constructor SignatureRSASHA384
- *
- * @throws XMLSignatureException
- */
- public SignatureRSASHA384() throws XMLSignatureException {
- super();
- }
-
- /** @inheritDoc */
- public String engineGetURI() {
- return XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA384;
- }
- }
+ /**
+ * Class SignatureRSARIPEMD160
+ *
+ * @author $Author: mullan $
+ * @version $Revision: 1.5 $
+ */
+ public static class SignatureRSARIPEMD160 extends SignatureBaseRSA {
- /**
- * Class SignatureRSASHA512
- *
- * @author $Author: raul $
- */
- public static class SignatureRSASHA512 extends SignatureBaseRSA {
+ /**
+ * Constructor SignatureRSARIPEMD160
+ *
+ * @throws XMLSignatureException
+ */
+ public SignatureRSARIPEMD160() throws XMLSignatureException {
+ super();
+ }
- /**
- * Constructor SignatureRSASHA512
- *
- * @throws XMLSignatureException
- */
- public SignatureRSASHA512() throws XMLSignatureException {
- super();
- }
-
- /** @inheritDoc */
- public String engineGetURI() {
- return XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA512;
- }
- }
+ /** @inheritDoc */
+ public String engineGetURI() {
+ return XMLSignature.ALGO_ID_SIGNATURE_RSA_RIPEMD160;
+ }
+ }
- /**
- * Class SignatureRSARIPEMD160
- *
- * @author $Author: raul $
- */
- public static class SignatureRSARIPEMD160 extends SignatureBaseRSA {
-
- /**
- * Constructor SignatureRSARIPEMD160
- *
- * @throws XMLSignatureException
- */
- public SignatureRSARIPEMD160() throws XMLSignatureException {
- super();
- }
-
- /** @inheritDoc */
- public String engineGetURI() {
- return XMLSignature.ALGO_ID_SIGNATURE_RSA_RIPEMD160;
- }
- }
+ /**
+ * Class SignatureRSAMD5
+ *
+ * @author $Author: mullan $
+ * @version $Revision: 1.5 $
+ */
+ public static class SignatureRSAMD5 extends SignatureBaseRSA {
- /**
- * Class SignatureRSAMD5
- *
- * @author $Author: raul $
- */
- public static class SignatureRSAMD5 extends SignatureBaseRSA {
+ /**
+ * Constructor SignatureRSAMD5
+ *
+ * @throws XMLSignatureException
+ */
+ public SignatureRSAMD5() throws XMLSignatureException {
+ super();
+ }
- /**
- * Constructor SignatureRSAMD5
- *
- * @throws XMLSignatureException
- */
- public SignatureRSAMD5() throws XMLSignatureException {
- super();
- }
-
- /** @inheritDoc */
- public String engineGetURI() {
- return XMLSignature.ALGO_ID_SIGNATURE_NOT_RECOMMENDED_RSA_MD5;
- }
- }
+ /** @inheritDoc */
+ public String engineGetURI() {
+ return XMLSignature.ALGO_ID_SIGNATURE_NOT_RECOMMENDED_RSA_MD5;
+ }
+ }
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureDSA.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureDSA.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,8 +20,6 @@
*/
package com.sun.org.apache.xml.internal.security.algorithms.implementations;
-
-
import java.io.IOException;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
@@ -39,342 +37,359 @@
import com.sun.org.apache.xml.internal.security.utils.Base64;
import com.sun.org.apache.xml.internal.security.utils.Constants;
-
/**
*
- * @author $Author: vishal $
+ * @author $Author: mullan $
*/
public class SignatureDSA extends SignatureAlgorithmSpi {
- /** {@link java.util.logging} logging facility */
+ /** {@link java.util.logging} logging facility */
static java.util.logging.Logger log =
java.util.logging.Logger.getLogger(SignatureDSA.class.getName());
- /** Field _URI */
- public static final String _URI = Constants.SignatureSpecNS + "dsa-sha1";
+ /** Field _URI */
+ public static final String _URI = Constants.SignatureSpecNS + "dsa-sha1";
- /** Field algorithm */
- private java.security.Signature _signatureAlgorithm = null;
+ /** Field algorithm */
+ private java.security.Signature _signatureAlgorithm = null;
- /**
- * Method engineGetURI
- *
- * @inheritDoc
- */
- protected String engineGetURI() {
- return SignatureDSA._URI;
- }
+ /**
+ * Method engineGetURI
+ *
+ * @inheritDoc
+ */
+ protected String engineGetURI() {
+ return SignatureDSA._URI;
+ }
- /**
- * Constructor SignatureDSA
- *
- * @throws XMLSignatureException
- */
- public SignatureDSA() throws XMLSignatureException {
+ /**
+ * Constructor SignatureDSA
+ *
+ * @throws XMLSignatureException
+ */
+ public SignatureDSA() throws XMLSignatureException {
- String algorithmID = JCEMapper.translateURItoJCEID(SignatureDSA._URI);
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Created SignatureDSA using " + algorithmID);
+ String algorithmID = JCEMapper.translateURItoJCEID(SignatureDSA._URI);
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Created SignatureDSA using " + algorithmID);
- try {
- this._signatureAlgorithm = Signature.getInstance(algorithmID);
- } catch (java.security.NoSuchAlgorithmException ex) {
- Object[] exArgs = { algorithmID,
- ex.getLocalizedMessage() };
-
- throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs);
- }
- }
+ String provider = JCEMapper.getProviderId();
+ try {
+ if (provider == null) {
+ this._signatureAlgorithm = Signature.getInstance(algorithmID);
+ } else {
+ this._signatureAlgorithm =
+ Signature.getInstance(algorithmID, provider);
+ }
+ } catch (java.security.NoSuchAlgorithmException ex) {
+ Object[] exArgs = { algorithmID, ex.getLocalizedMessage() };
+ throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs);
+ } catch (java.security.NoSuchProviderException ex) {
+ Object[] exArgs = { algorithmID, ex.getLocalizedMessage() };
+ throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs);
+ }
+ }
- /**
- * @inheritDoc
- */
- protected void engineSetParameter(AlgorithmParameterSpec params)
- throws XMLSignatureException {
+ /**
+ * @inheritDoc
+ */
+ protected void engineSetParameter(AlgorithmParameterSpec params)
+ throws XMLSignatureException {
- try {
- this._signatureAlgorithm.setParameter(params);
- } catch (InvalidAlgorithmParameterException ex) {
- throw new XMLSignatureException("empty", ex);
- }
- }
+ try {
+ this._signatureAlgorithm.setParameter(params);
+ } catch (InvalidAlgorithmParameterException ex) {
+ throw new XMLSignatureException("empty", ex);
+ }
+ }
- /**
- * @inheritDoc
- */
- protected boolean engineVerify(byte[] signature)
+ /**
+ * @inheritDoc
+ */
+ protected boolean engineVerify(byte[] signature)
throws XMLSignatureException {
- try {
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Called DSA.verify() on " + Base64.encode(signature));
+ try {
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Called DSA.verify() on " + Base64.encode(signature));
- byte[] jcebytes = SignatureDSA.convertXMLDSIGtoASN1(signature);
+ byte[] jcebytes = SignatureDSA.convertXMLDSIGtoASN1(signature);
- return this._signatureAlgorithm.verify(jcebytes);
- } catch (SignatureException ex) {
- throw new XMLSignatureException("empty", ex);
- } catch (IOException ex) {
- throw new XMLSignatureException("empty", ex);
- }
- }
+ return this._signatureAlgorithm.verify(jcebytes);
+ } catch (SignatureException ex) {
+ throw new XMLSignatureException("empty", ex);
+ } catch (IOException ex) {
+ throw new XMLSignatureException("empty", ex);
+ }
+ }
- /**
- * @inheritDoc
- */
- protected void engineInitVerify(Key publicKey) throws XMLSignatureException {
+ /**
+ * @inheritDoc
+ */
+ protected void engineInitVerify(Key publicKey) throws XMLSignatureException {
- if (!(publicKey instanceof PublicKey)) {
- String supplied = publicKey.getClass().getName();
- String needed = PublicKey.class.getName();
- Object exArgs[] = { supplied, needed };
+ if (!(publicKey instanceof PublicKey)) {
+ String supplied = publicKey.getClass().getName();
+ String needed = PublicKey.class.getName();
+ Object exArgs[] = { supplied, needed };
- throw new XMLSignatureException("algorithms.WrongKeyForThisOperation",
- exArgs);
- }
+ throw new XMLSignatureException
+ ("algorithms.WrongKeyForThisOperation", exArgs);
+ }
- try {
- this._signatureAlgorithm.initVerify((PublicKey) publicKey);
- } catch (InvalidKeyException ex) {
- throw new XMLSignatureException("empty", ex);
- }
- }
-
- /**
- * @inheritDoc
- */
- protected byte[] engineSign() throws XMLSignatureException {
+ try {
+ this._signatureAlgorithm.initVerify((PublicKey) publicKey);
+ } catch (InvalidKeyException ex) {
+ // reinstantiate Signature object to work around bug in JDK
+ // see: http://bugs.sun.com/view_bug.do?bug_id=4953555
+ Signature sig = this._signatureAlgorithm;
+ try {
+ this._signatureAlgorithm = Signature.getInstance
+ (_signatureAlgorithm.getAlgorithm());
+ } catch (Exception e) {
+ // this shouldn't occur, but if it does, restore previous
+ // Signature
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Exception when reinstantiating Signature:" + e);
+ }
+ this._signatureAlgorithm = sig;
+ }
+ throw new XMLSignatureException("empty", ex);
+ }
+ }
- try {
- byte jcebytes[] = this._signatureAlgorithm.sign();
+ /**
+ * @inheritDoc
+ */
+ protected byte[] engineSign() throws XMLSignatureException {
+
+ try {
+ byte jcebytes[] = this._signatureAlgorithm.sign();
- return SignatureDSA.convertASN1toXMLDSIG(jcebytes);
- } catch (IOException ex) {
- throw new XMLSignatureException("empty", ex);
- } catch (SignatureException ex) {
- throw new XMLSignatureException("empty", ex);
- }
- }
+ return SignatureDSA.convertASN1toXMLDSIG(jcebytes);
+ } catch (IOException ex) {
+ throw new XMLSignatureException("empty", ex);
+ } catch (SignatureException ex) {
+ throw new XMLSignatureException("empty", ex);
+ }
+ }
- /**
- * @inheritDoc
- */
- protected void engineInitSign(Key privateKey, SecureRandom secureRandom)
+ /**
+ * @inheritDoc
+ */
+ protected void engineInitSign(Key privateKey, SecureRandom secureRandom)
throws XMLSignatureException {
- if (!(privateKey instanceof PrivateKey)) {
- String supplied = privateKey.getClass().getName();
- String needed = PrivateKey.class.getName();
- Object exArgs[] = { supplied, needed };
+ if (!(privateKey instanceof PrivateKey)) {
+ String supplied = privateKey.getClass().getName();
+ String needed = PrivateKey.class.getName();
+ Object exArgs[] = { supplied, needed };
- throw new XMLSignatureException("algorithms.WrongKeyForThisOperation",
- exArgs);
- }
+ throw new XMLSignatureException
+ ("algorithms.WrongKeyForThisOperation", exArgs);
+ }
- try {
- this._signatureAlgorithm.initSign((PrivateKey) privateKey,
+ try {
+ this._signatureAlgorithm.initSign((PrivateKey) privateKey,
secureRandom);
- } catch (InvalidKeyException ex) {
- throw new XMLSignatureException("empty", ex);
- }
- }
+ } catch (InvalidKeyException ex) {
+ throw new XMLSignatureException("empty", ex);
+ }
+ }
- /**
- * @inheritDoc
- */
- protected void engineInitSign(Key privateKey) throws XMLSignatureException {
+ /**
+ * @inheritDoc
+ */
+ protected void engineInitSign(Key privateKey) throws XMLSignatureException {
- if (!(privateKey instanceof PrivateKey)) {
- String supplied = privateKey.getClass().getName();
- String needed = PrivateKey.class.getName();
- Object exArgs[] = { supplied, needed };
+ if (!(privateKey instanceof PrivateKey)) {
+ String supplied = privateKey.getClass().getName();
+ String needed = PrivateKey.class.getName();
+ Object exArgs[] = { supplied, needed };
- throw new XMLSignatureException("algorithms.WrongKeyForThisOperation",
- exArgs);
- }
+ throw new XMLSignatureException
+ ("algorithms.WrongKeyForThisOperation", exArgs);
+ }
- try {
- this._signatureAlgorithm.initSign((PrivateKey) privateKey);
- } catch (InvalidKeyException ex) {
- throw new XMLSignatureException("empty", ex);
- }
- }
+ try {
+ this._signatureAlgorithm.initSign((PrivateKey) privateKey);
+ } catch (InvalidKeyException ex) {
+ throw new XMLSignatureException("empty", ex);
+ }
+ }
- /**
- * @inheritDoc
- */
- protected void engineUpdate(byte[] input) throws XMLSignatureException {
-
- try {
- this._signatureAlgorithm.update(input);
- } catch (SignatureException ex) {
- throw new XMLSignatureException("empty", ex);
- }
- }
+ /**
+ * @inheritDoc
+ */
+ protected void engineUpdate(byte[] input) throws XMLSignatureException {
+ try {
+ this._signatureAlgorithm.update(input);
+ } catch (SignatureException ex) {
+ throw new XMLSignatureException("empty", ex);
+ }
+ }
- /**
- * @inheritDoc
- */
- protected void engineUpdate(byte input) throws XMLSignatureException {
-
- try {
- this._signatureAlgorithm.update(input);
- } catch (SignatureException ex) {
- throw new XMLSignatureException("empty", ex);
- }
- }
+ /**
+ * @inheritDoc
+ */
+ protected void engineUpdate(byte input) throws XMLSignatureException {
+ try {
+ this._signatureAlgorithm.update(input);
+ } catch (SignatureException ex) {
+ throw new XMLSignatureException("empty", ex);
+ }
+ }
- /**
- * @inheritDoc
- */
- protected void engineUpdate(byte buf[], int offset, int len)
- throws XMLSignatureException {
-
- try {
- this._signatureAlgorithm.update(buf, offset, len);
- } catch (SignatureException ex) {
- throw new XMLSignatureException("empty", ex);
- }
- }
+ /**
+ * @inheritDoc
+ */
+ protected void engineUpdate(byte buf[], int offset, int len)
+ throws XMLSignatureException {
+ try {
+ this._signatureAlgorithm.update(buf, offset, len);
+ } catch (SignatureException ex) {
+ throw new XMLSignatureException("empty", ex);
+ }
+ }
- /**
- * Method engineGetJCEAlgorithmString
- *
- * @inheritDoc
- */
- protected String engineGetJCEAlgorithmString() {
- return this._signatureAlgorithm.getAlgorithm();
- }
+ /**
+ * Method engineGetJCEAlgorithmString
+ *
+ * @inheritDoc
+ */
+ protected String engineGetJCEAlgorithmString() {
+ return this._signatureAlgorithm.getAlgorithm();
+ }
- /**
- * Method engineGetJCEProviderName
- *
- * @inheritDoc
- */
- protected String engineGetJCEProviderName() {
- return this._signatureAlgorithm.getProvider().getName();
- }
-
+ /**
+ * Method engineGetJCEProviderName
+ *
+ * @inheritDoc
+ */
+ protected String engineGetJCEProviderName() {
+ return this._signatureAlgorithm.getProvider().getName();
+ }
- /**
- * Converts an ASN.1 DSA value to a XML Signature DSA Value.
- *
- * The JAVA JCE DSA Signature algorithm creates ASN.1 encoded (r,s) value
- * pairs; the XML Signature requires the core BigInteger values.
- *
- * @param asn1Bytes
- * @return the decode bytes
- *
- * @throws IOException
- * @see <A HREF="http://www.w3.org/TR/xmldsig-core/#dsa-sha1">6.4.1 DSA</A>
- */
- private static byte[] convertASN1toXMLDSIG(byte asn1Bytes[])
+ /**
+ * Converts an ASN.1 DSA value to a XML Signature DSA Value.
+ *
+ * The JAVA JCE DSA Signature algorithm creates ASN.1 encoded (r,s) value
+ * pairs; the XML Signature requires the core BigInteger values.
+ *
+ * @param asn1Bytes
+ * @return the decode bytes
+ *
+ * @throws IOException
+ * @see <A HREF="http://www.w3.org/TR/xmldsig-core/#dsa-sha1">6.4.1 DSA</A>
+ */
+ private static byte[] convertASN1toXMLDSIG(byte asn1Bytes[])
throws IOException {
- byte rLength = asn1Bytes[3];
- int i;
+ byte rLength = asn1Bytes[3];
+ int i;
- for (i = rLength; (i > 0) && (asn1Bytes[(4 + rLength) - i] == 0); i--);
+ for (i = rLength; (i > 0) && (asn1Bytes[(4 + rLength) - i] == 0); i--);
- byte sLength = asn1Bytes[5 + rLength];
- int j;
+ byte sLength = asn1Bytes[5 + rLength];
+ int j;
- for (j = sLength;
+ for (j = sLength;
(j > 0) && (asn1Bytes[(6 + rLength + sLength) - j] == 0); j--);
- if ((asn1Bytes[0] != 48) || (asn1Bytes[1] != asn1Bytes.length - 2)
+ if ((asn1Bytes[0] != 48) || (asn1Bytes[1] != asn1Bytes.length - 2)
|| (asn1Bytes[2] != 2) || (i > 20)
|| (asn1Bytes[4 + rLength] != 2) || (j > 20)) {
- throw new IOException("Invalid ASN.1 format of DSA signature");
- }
- byte xmldsigBytes[] = new byte[40];
+ throw new IOException("Invalid ASN.1 format of DSA signature");
+ }
+ byte xmldsigBytes[] = new byte[40];
- System.arraycopy(asn1Bytes, (4 + rLength) - i, xmldsigBytes, 20 - i,
+ System.arraycopy(asn1Bytes, (4 + rLength) - i, xmldsigBytes, 20 - i,
i);
- System.arraycopy(asn1Bytes, (6 + rLength + sLength) - j, xmldsigBytes,
+ System.arraycopy(asn1Bytes, (6 + rLength + sLength) - j, xmldsigBytes,
40 - j, j);
- return xmldsigBytes;
- }
+ return xmldsigBytes;
+ }
- /**
- * Converts a XML Signature DSA Value to an ASN.1 DSA value.
- *
- * The JAVA JCE DSA Signature algorithm creates ASN.1 encoded (r,s) value
- * pairs; the XML Signature requires the core BigInteger values.
- *
- * @param xmldsigBytes
- * @return the encoded ASN.1 bytes
- *
- * @throws IOException
- * @see <A HREF="http://www.w3.org/TR/xmldsig-core/#dsa-sha1">6.4.1 DSA</A>
- */
- private static byte[] convertXMLDSIGtoASN1(byte xmldsigBytes[])
+ /**
+ * Converts a XML Signature DSA Value to an ASN.1 DSA value.
+ *
+ * The JAVA JCE DSA Signature algorithm creates ASN.1 encoded (r,s) value
+ * pairs; the XML Signature requires the core BigInteger values.
+ *
+ * @param xmldsigBytes
+ * @return the encoded ASN.1 bytes
+ *
+ * @throws IOException
+ * @see <A HREF="http://www.w3.org/TR/xmldsig-core/#dsa-sha1">6.4.1 DSA</A>
+ */
+ private static byte[] convertXMLDSIGtoASN1(byte xmldsigBytes[])
throws IOException {
- if (xmldsigBytes.length != 40) {
- throw new IOException("Invalid XMLDSIG format of DSA signature");
- }
+ if (xmldsigBytes.length != 40) {
+ throw new IOException("Invalid XMLDSIG format of DSA signature");
+ }
- int i;
+ int i;
- for (i = 20; (i > 0) && (xmldsigBytes[20 - i] == 0); i--);
+ for (i = 20; (i > 0) && (xmldsigBytes[20 - i] == 0); i--);
- int j = i;
+ int j = i;
- if (xmldsigBytes[20 - i] < 0) {
+ if (xmldsigBytes[20 - i] < 0) {
j += 1;
- }
+ }
- int k;
+ int k;
- for (k = 20; (k > 0) && (xmldsigBytes[40 - k] == 0); k--);
+ for (k = 20; (k > 0) && (xmldsigBytes[40 - k] == 0); k--);
- int l = k;
+ int l = k;
- if (xmldsigBytes[40 - k] < 0) {
- l += 1;
- }
+ if (xmldsigBytes[40 - k] < 0) {
+ l += 1;
+ }
- byte asn1Bytes[] = new byte[6 + j + l];
+ byte asn1Bytes[] = new byte[6 + j + l];
- asn1Bytes[0] = 48;
- asn1Bytes[1] = (byte) (4 + j + l);
- asn1Bytes[2] = 2;
- asn1Bytes[3] = (byte) j;
+ asn1Bytes[0] = 48;
+ asn1Bytes[1] = (byte) (4 + j + l);
+ asn1Bytes[2] = 2;
+ asn1Bytes[3] = (byte) j;
- System.arraycopy(xmldsigBytes, 20 - i, asn1Bytes, (4 + j) - i, i);
+ System.arraycopy(xmldsigBytes, 20 - i, asn1Bytes, (4 + j) - i, i);
- asn1Bytes[4 + j] = 2;
- asn1Bytes[5 + j] = (byte) l;
+ asn1Bytes[4 + j] = 2;
+ asn1Bytes[5 + j] = (byte) l;
- System.arraycopy(xmldsigBytes, 40 - k, asn1Bytes, (6 + j + l) - k, k);
+ System.arraycopy(xmldsigBytes, 40 - k, asn1Bytes, (6 + j + l) - k, k);
- return asn1Bytes;
- }
+ return asn1Bytes;
+ }
- /**
- * Method engineSetHMACOutputLength
- *
- * @param HMACOutputLength
- * @throws XMLSignatureException
- */
- protected void engineSetHMACOutputLength(int HMACOutputLength)
- throws XMLSignatureException {
- throw new XMLSignatureException("algorithms.HMACOutputLengthOnlyForHMAC");
- }
+ /**
+ * Method engineSetHMACOutputLength
+ *
+ * @param HMACOutputLength
+ * @throws XMLSignatureException
+ */
+ protected void engineSetHMACOutputLength(int HMACOutputLength)
+ throws XMLSignatureException {
+ throw new XMLSignatureException(
+ "algorithms.HMACOutputLengthOnlyForHMAC");
+ }
- /**
- * Method engineInitSign
- *
- * @param signingKey
- * @param algorithmParameterSpec
- * @throws XMLSignatureException
- */
- protected void engineInitSign(
- Key signingKey, AlgorithmParameterSpec algorithmParameterSpec)
- throws XMLSignatureException {
- throw new XMLSignatureException(
- "algorithms.CannotUseAlgorithmParameterSpecOnDSA");
- }
+ /**
+ * Method engineInitSign
+ *
+ * @param signingKey
+ * @param algorithmParameterSpec
+ * @throws XMLSignatureException
+ */
+ protected void engineInitSign(
+ Key signingKey, AlgorithmParameterSpec algorithmParameterSpec)
+ throws XMLSignatureException {
+ throw new XMLSignatureException(
+ "algorithms.CannotUseAlgorithmParameterSpecOnDSA");
+ }
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureECDSA.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,384 @@
+/*
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
+ */
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package com.sun.org.apache.xml.internal.security.algorithms.implementations;
+
+
+
+import java.io.IOException;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.Key;
+import java.security.NoSuchProviderException;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.SecureRandom;
+import java.security.Signature;
+import java.security.SignatureException;
+import java.security.spec.AlgorithmParameterSpec;
+
+import com.sun.org.apache.xml.internal.security.algorithms.JCEMapper;
+import com.sun.org.apache.xml.internal.security.algorithms.SignatureAlgorithmSpi;
+import com.sun.org.apache.xml.internal.security.signature.XMLSignature;
+import com.sun.org.apache.xml.internal.security.signature.XMLSignatureException;
+import com.sun.org.apache.xml.internal.security.utils.Base64;
+
+
+/**
+ *
+ * @author $Author: mullan $
+ */
+public abstract class SignatureECDSA extends SignatureAlgorithmSpi {
+
+ /** {@link java.util.logging} logging facility */
+ static java.util.logging.Logger log =
+ java.util.logging.Logger.getLogger(SignatureECDSA.class.getName());
+
+ /** @inheritDoc */
+ public abstract String engineGetURI();
+
+ /** Field algorithm */
+ private java.security.Signature _signatureAlgorithm = null;
+
+ /**
+ * Converts an ASN.1 ECDSA value to a XML Signature ECDSA Value.
+ *
+ * The JAVA JCE ECDSA Signature algorithm creates ASN.1 encoded (r,s) value
+ * pairs; the XML Signature requires the core BigInteger values.
+ *
+ * @param asn1Bytes
+ * @return the decode bytes
+ *
+ * @throws IOException
+ * @see <A HREF="http://www.w3.org/TR/xmldsig-core/#dsa-sha1">6.4.1 DSA</A>
+ * @see <A HREF="ftp://ftp.rfc-editor.org/in-notes/rfc4050.txt">3.3. ECDSA Signatures</A>
+ */
+ private static byte[] convertASN1toXMLDSIG(byte asn1Bytes[])
+ throws IOException {
+
+ byte rLength = asn1Bytes[3];
+ int i;
+
+ for (i = rLength; (i > 0) && (asn1Bytes[(4 + rLength) - i] == 0); i--);
+
+ byte sLength = asn1Bytes[5 + rLength];
+ int j;
+
+ for (j = sLength;
+ (j > 0) && (asn1Bytes[(6 + rLength + sLength) - j] == 0); j--);
+
+ if ((asn1Bytes[0] != 48) || (asn1Bytes[1] != asn1Bytes.length - 2)
+ || (asn1Bytes[2] != 2) || (i > 24)
+ || (asn1Bytes[4 + rLength] != 2) || (j > 24)) {
+ throw new IOException("Invalid ASN.1 format of ECDSA signature");
+ }
+ byte xmldsigBytes[] = new byte[48];
+
+ System.arraycopy(asn1Bytes, (4 + rLength) - i, xmldsigBytes, 24 - i,
+ i);
+ System.arraycopy(asn1Bytes, (6 + rLength + sLength) - j, xmldsigBytes,
+ 48 - j, j);
+
+ return xmldsigBytes;
+ }
+
+ /**
+ * Converts a XML Signature ECDSA Value to an ASN.1 DSA value.
+ *
+ * The JAVA JCE ECDSA Signature algorithm creates ASN.1 encoded (r,s) value
+ * pairs; the XML Signature requires the core BigInteger values.
+ *
+ * @param xmldsigBytes
+ * @return the encoded ASN.1 bytes
+ *
+ * @throws IOException
+ * @see <A HREF="http://www.w3.org/TR/xmldsig-core/#dsa-sha1">6.4.1 DSA</A>
+ * @see <A HREF="ftp://ftp.rfc-editor.org/in-notes/rfc4050.txt">3.3. ECDSA Signatures</A>
+ */
+ private static byte[] convertXMLDSIGtoASN1(byte xmldsigBytes[])
+ throws IOException {
+
+ if (xmldsigBytes.length != 48) {
+ throw new IOException("Invalid XMLDSIG format of ECDSA signature");
+ }
+
+ int i;
+
+ for (i = 24; (i > 0) && (xmldsigBytes[24 - i] == 0); i--);
+
+ int j = i;
+
+ if (xmldsigBytes[24 - i] < 0) {
+ j += 1;
+ }
+
+ int k;
+
+ for (k = 24; (k > 0) && (xmldsigBytes[48 - k] == 0); k--);
+
+ int l = k;
+
+ if (xmldsigBytes[48 - k] < 0) {
+ l += 1;
+ }
+
+ byte asn1Bytes[] = new byte[6 + j + l];
+
+ asn1Bytes[0] = 48;
+ asn1Bytes[1] = (byte) (4 + j + l);
+ asn1Bytes[2] = 2;
+ asn1Bytes[3] = (byte) j;
+
+ System.arraycopy(xmldsigBytes, 24 - i, asn1Bytes, (4 + j) - i, i);
+
+ asn1Bytes[4 + j] = 2;
+ asn1Bytes[5 + j] = (byte) l;
+
+ System.arraycopy(xmldsigBytes, 48 - k, asn1Bytes, (6 + j + l) - k, k);
+
+ return asn1Bytes;
+ }
+
+ /**
+ * Constructor SignatureRSA
+ *
+ * @throws XMLSignatureException
+ */
+ public SignatureECDSA() throws XMLSignatureException {
+
+ String algorithmID = JCEMapper.translateURItoJCEID(this.engineGetURI());
+
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Created SignatureECDSA using " + algorithmID);
+ String provider=JCEMapper.getProviderId();
+ try {
+ if (provider==null) {
+ this._signatureAlgorithm = Signature.getInstance(algorithmID);
+ } else {
+ this._signatureAlgorithm = Signature.getInstance(algorithmID,provider);
+ }
+ } catch (java.security.NoSuchAlgorithmException ex) {
+ Object[] exArgs = { algorithmID,
+ ex.getLocalizedMessage() };
+
+ throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs);
+ } catch (NoSuchProviderException ex) {
+ Object[] exArgs = { algorithmID,
+ ex.getLocalizedMessage() };
+
+ throw new XMLSignatureException("algorithms.NoSuchAlgorithm", exArgs);
+ }
+ }
+
+ /** @inheritDoc */
+ protected void engineSetParameter(AlgorithmParameterSpec params)
+ throws XMLSignatureException {
+
+ try {
+ this._signatureAlgorithm.setParameter(params);
+ } catch (InvalidAlgorithmParameterException ex) {
+ throw new XMLSignatureException("empty", ex);
+ }
+ }
+
+ /** @inheritDoc */
+ protected boolean engineVerify(byte[] signature)
+ throws XMLSignatureException {
+
+ try {
+ byte[] jcebytes = SignatureECDSA.convertXMLDSIGtoASN1(signature);
+
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Called ECDSA.verify() on " + Base64.encode(signature));
+
+ return this._signatureAlgorithm.verify(jcebytes);
+ } catch (SignatureException ex) {
+ throw new XMLSignatureException("empty", ex);
+ } catch (IOException ex) {
+ throw new XMLSignatureException("empty", ex);
+ }
+ }
+
+ /** @inheritDoc */
+ protected void engineInitVerify(Key publicKey) throws XMLSignatureException {
+
+ if (!(publicKey instanceof PublicKey)) {
+ String supplied = publicKey.getClass().getName();
+ String needed = PublicKey.class.getName();
+ Object exArgs[] = { supplied, needed };
+
+ throw new XMLSignatureException("algorithms.WrongKeyForThisOperation",
+ exArgs);
+ }
+
+ try {
+ this._signatureAlgorithm.initVerify((PublicKey) publicKey);
+ } catch (InvalidKeyException ex) {
+ // reinstantiate Signature object to work around bug in JDK
+ // see: http://bugs.sun.com/view_bug.do?bug_id=4953555
+ Signature sig = this._signatureAlgorithm;
+ try {
+ this._signatureAlgorithm = Signature.getInstance
+ (_signatureAlgorithm.getAlgorithm());
+ } catch (Exception e) {
+ // this shouldn't occur, but if it does, restore previous
+ // Signature
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Exception when reinstantiating Signature:" + e);
+ }
+ this._signatureAlgorithm = sig;
+ }
+ throw new XMLSignatureException("empty", ex);
+ }
+ }
+
+ /** @inheritDoc */
+ protected byte[] engineSign() throws XMLSignatureException {
+
+ try {
+ byte jcebytes[] = this._signatureAlgorithm.sign();
+
+ return SignatureECDSA.convertASN1toXMLDSIG(jcebytes);
+ } catch (SignatureException ex) {
+ throw new XMLSignatureException("empty", ex);
+ } catch (IOException ex) {
+ throw new XMLSignatureException("empty", ex);
+ }
+ }
+
+ /** @inheritDoc */
+ protected void engineInitSign(Key privateKey, SecureRandom secureRandom)
+ throws XMLSignatureException {
+
+ if (!(privateKey instanceof PrivateKey)) {
+ String supplied = privateKey.getClass().getName();
+ String needed = PrivateKey.class.getName();
+ Object exArgs[] = { supplied, needed };
+
+ throw new XMLSignatureException("algorithms.WrongKeyForThisOperation",
+ exArgs);
+ }
+
+ try {
+ this._signatureAlgorithm.initSign((PrivateKey) privateKey,
+ secureRandom);
+ } catch (InvalidKeyException ex) {
+ throw new XMLSignatureException("empty", ex);
+ }
+ }
+
+ /** @inheritDoc */
+ protected void engineInitSign(Key privateKey) throws XMLSignatureException {
+
+ if (!(privateKey instanceof PrivateKey)) {
+ String supplied = privateKey.getClass().getName();
+ String needed = PrivateKey.class.getName();
+ Object exArgs[] = { supplied, needed };
+
+ throw new XMLSignatureException("algorithms.WrongKeyForThisOperation",
+ exArgs);
+ }
+
+ try {
+ this._signatureAlgorithm.initSign((PrivateKey) privateKey);
+ } catch (InvalidKeyException ex) {
+ throw new XMLSignatureException("empty", ex);
+ }
+ }
+
+ /** @inheritDoc */
+ protected void engineUpdate(byte[] input) throws XMLSignatureException {
+
+ try {
+ this._signatureAlgorithm.update(input);
+ } catch (SignatureException ex) {
+ throw new XMLSignatureException("empty", ex);
+ }
+ }
+
+ /** @inheritDoc */
+ protected void engineUpdate(byte input) throws XMLSignatureException {
+
+ try {
+ this._signatureAlgorithm.update(input);
+ } catch (SignatureException ex) {
+ throw new XMLSignatureException("empty", ex);
+ }
+ }
+
+ /** @inheritDoc */
+ protected void engineUpdate(byte buf[], int offset, int len)
+ throws XMLSignatureException {
+
+ try {
+ this._signatureAlgorithm.update(buf, offset, len);
+ } catch (SignatureException ex) {
+ throw new XMLSignatureException("empty", ex);
+ }
+ }
+
+ /** @inheritDoc */
+ protected String engineGetJCEAlgorithmString() {
+ return this._signatureAlgorithm.getAlgorithm();
+ }
+
+ /** @inheritDoc */
+ protected String engineGetJCEProviderName() {
+ return this._signatureAlgorithm.getProvider().getName();
+ }
+
+ /** @inheritDoc */
+ protected void engineSetHMACOutputLength(int HMACOutputLength)
+ throws XMLSignatureException {
+ throw new XMLSignatureException("algorithms.HMACOutputLengthOnlyForHMAC");
+ }
+
+ /** @inheritDoc */
+ protected void engineInitSign(
+ Key signingKey, AlgorithmParameterSpec algorithmParameterSpec)
+ throws XMLSignatureException {
+ throw new XMLSignatureException(
+ "algorithms.CannotUseAlgorithmParameterSpecOnRSA");
+ }
+
+ /**
+ * Class SignatureRSASHA1
+ *
+ * @author $Author: mullan $
+ * @version $Revision: 1.2 $
+ */
+ public static class SignatureECDSASHA1 extends SignatureECDSA {
+
+ /**
+ * Constructor SignatureRSASHA1
+ *
+ * @throws XMLSignatureException
+ */
+ public SignatureECDSASHA1() throws XMLSignatureException {
+ super();
+ }
+
+ /** @inheritDoc */
+ public String engineGetURI() {
+ return XMLSignature.ALGO_ID_SIGNATURE_ECDSA_SHA1;
+ }
+ }
+
+}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizationException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizationException.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java Wed Jul 05 16:42:37 2017 +0200
@@ -3,7 +3,7 @@
* DO NOT REMOVE OR ALTER!
*/
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2008 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,8 +20,6 @@
*/
package com.sun.org.apache.xml.internal.security.c14n;
-
-
import java.io.ByteArrayInputStream;
import java.io.OutputStream;
import java.util.HashMap;
@@ -37,318 +35,326 @@
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
-
/**
*
- *
* @author Christian Geuer-Pollmann
*/
public class Canonicalizer {
- //J-
- /** The output encoding of canonicalized data */
- public static final String ENCODING = "UTF8";
-
+ /** The output encoding of canonicalized data */
+ public static final String ENCODING = "UTF8";
- /**
- * XPath Expresion for selecting every node and continuos comments joined in only one node
+ /**
+ * XPath Expresion for selecting every node and continuous comments joined
+ * in only one node
*/
- public static final String XPATH_C14N_WITH_COMMENTS_SINGLE_NODE = "(.//. | .//@* | .//namespace::*)";
+ public static final String XPATH_C14N_WITH_COMMENTS_SINGLE_NODE =
+ "(.//. | .//@* | .//namespace::*)";
-
- /**
+ /**
* The URL defined in XML-SEC Rec for inclusive c14n <b>without</b> comments.
*/
- public static final String ALGO_ID_C14N_OMIT_COMMENTS = "http://www.w3.org/TR/2001/REC-xml-c14n-20010315";
- /**
- * The URL defined in XML-SEC Rec for inclusive c14n <b>with</b> comments.
- */
- public static final String ALGO_ID_C14N_WITH_COMMENTS = ALGO_ID_C14N_OMIT_COMMENTS + "#WithComments";
- /**
- * The URL defined in XML-SEC Rec for exclusive c14n <b>without</b> comments.
- */
- public static final String ALGO_ID_C14N_EXCL_OMIT_COMMENTS = "http://www.w3.org/2001/10/xml-exc-c14n#";
- /**
- * The URL defined in XML-SEC Rec for exclusive c14n <b>with</b> comments.
- */
- public static final String ALGO_ID_C14N_EXCL_WITH_COMMENTS = ALGO_ID_C14N_EXCL_OMIT_COMMENTS + "WithComments";
-
- static boolean _alreadyInitialized = false;
- static Map _canonicalizerHash = null;
-
- protected CanonicalizerSpi canonicalizerSpi = null;
- //J+
+ public static final String ALGO_ID_C14N_OMIT_COMMENTS =
+ "http://www.w3.org/TR/2001/REC-xml-c14n-20010315";
+ /**
+ * The URL defined in XML-SEC Rec for inclusive c14n <b>with</b> comments.
+ */
+ public static final String ALGO_ID_C14N_WITH_COMMENTS =
+ ALGO_ID_C14N_OMIT_COMMENTS + "#WithComments";
+ /**
+ * The URL defined in XML-SEC Rec for exclusive c14n <b>without</b> comments.
+ */
+ public static final String ALGO_ID_C14N_EXCL_OMIT_COMMENTS =
+ "http://www.w3.org/2001/10/xml-exc-c14n#";
+ /**
+ * The URL defined in XML-SEC Rec for exclusive c14n <b>with</b> comments.
+ */
+ public static final String ALGO_ID_C14N_EXCL_WITH_COMMENTS =
+ ALGO_ID_C14N_EXCL_OMIT_COMMENTS + "WithComments";
+ /**
+ * The URI for inclusive c14n 1.1 <b>without</b> comments.
+ */
+ public static final String ALGO_ID_C14N11_OMIT_COMMENTS =
+ "http://www.w3.org/2006/12/xml-c14n11";
+ /**
+ * The URI for inclusive c14n 1.1 <b>with</b> comments.
+ */
+ public static final String ALGO_ID_C14N11_WITH_COMMENTS =
+ ALGO_ID_C14N11_OMIT_COMMENTS + "#WithComments";
- /**
- * Method init
- *
- */
- public static void init() {
+ static boolean _alreadyInitialized = false;
+ static Map _canonicalizerHash = null;
+
+ protected CanonicalizerSpi canonicalizerSpi = null;
+
+ /**
+ * Method init
+ *
+ */
+ public static void init() {
- if (!Canonicalizer._alreadyInitialized) {
- Canonicalizer._canonicalizerHash = new HashMap(10);
- Canonicalizer._alreadyInitialized = true;
- }
- }
+ if (!Canonicalizer._alreadyInitialized) {
+ Canonicalizer._canonicalizerHash = new HashMap(10);
+ Canonicalizer._alreadyInitialized = true;
+ }
+ }
- /**
- * Constructor Canonicalizer
- *
- * @param algorithmURI
- * @throws InvalidCanonicalizerException
- */
- private Canonicalizer(String algorithmURI)
+ /**
+ * Constructor Canonicalizer
+ *
+ * @param algorithmURI
+ * @throws InvalidCanonicalizerException
+ */
+ private Canonicalizer(String algorithmURI)
throws InvalidCanonicalizerException {
- try {
- Class implementingClass = getImplementingClass(algorithmURI);
+ try {
+ Class implementingClass = getImplementingClass(algorithmURI);
- this.canonicalizerSpi =
- (CanonicalizerSpi) implementingClass.newInstance();
- this.canonicalizerSpi.reset=true;
- } catch (Exception e) {
- Object exArgs[] = { algorithmURI };
+ this.canonicalizerSpi =
+ (CanonicalizerSpi) implementingClass.newInstance();
+ this.canonicalizerSpi.reset=true;
+ } catch (Exception e) {
+ Object exArgs[] = { algorithmURI };
- throw new InvalidCanonicalizerException(
- "signature.Canonicalizer.UnknownCanonicalizer", exArgs);
- }
- }
+ throw new InvalidCanonicalizerException(
+ "signature.Canonicalizer.UnknownCanonicalizer", exArgs);
+ }
+ }
- /**
- * Method getInstance
- *
- * @param algorithmURI
- * @return a Conicicalizer instance ready for the job
- * @throws InvalidCanonicalizerException
- */
- public static final Canonicalizer getInstance(String algorithmURI)
+ /**
+ * Method getInstance
+ *
+ * @param algorithmURI
+ * @return a Conicicalizer instance ready for the job
+ * @throws InvalidCanonicalizerException
+ */
+ public static final Canonicalizer getInstance(String algorithmURI)
throws InvalidCanonicalizerException {
- Canonicalizer c14nizer = new Canonicalizer(algorithmURI);
+ Canonicalizer c14nizer = new Canonicalizer(algorithmURI);
- return c14nizer;
- }
+ return c14nizer;
+ }
- /**
- * Method register
- *
- * @param algorithmURI
- * @param implementingClass
- * @throws AlgorithmAlreadyRegisteredException
- */
- public static void register(String algorithmURI, String implementingClass)
+ /**
+ * Method register
+ *
+ * @param algorithmURI
+ * @param implementingClass
+ * @throws AlgorithmAlreadyRegisteredException
+ */
+ public static void register(String algorithmURI, String implementingClass)
throws AlgorithmAlreadyRegisteredException {
- // check whether URI is already registered
- Class registeredClass = getImplementingClass(algorithmURI);
+ // check whether URI is already registered
+ Class registeredClass = getImplementingClass(algorithmURI);
- if (registeredClass != null) {
- Object exArgs[] = { algorithmURI, registeredClass };
+ if (registeredClass != null) {
+ Object exArgs[] = { algorithmURI, registeredClass };
- throw new AlgorithmAlreadyRegisteredException(
- "algorithm.alreadyRegistered", exArgs);
- }
+ throw new AlgorithmAlreadyRegisteredException(
+ "algorithm.alreadyRegistered", exArgs);
+ }
- try {
- _canonicalizerHash.put(algorithmURI, Class.forName(implementingClass));
+ try {
+ _canonicalizerHash.put(algorithmURI, Class.forName(implementingClass));
} catch (ClassNotFoundException e) {
- throw new RuntimeException("c14n class not found");
+ throw new RuntimeException("c14n class not found");
}
- }
+ }
- /**
- * Method getURI
- *
- * @return the URI defined for this c14n instance.
- */
- public final String getURI() {
- return this.canonicalizerSpi.engineGetURI();
- }
+ /**
+ * Method getURI
+ *
+ * @return the URI defined for this c14n instance.
+ */
+ public final String getURI() {
+ return this.canonicalizerSpi.engineGetURI();
+ }
- /**
- * Method getIncludeComments
- *
- * @return true if the c14n respect the comments.
- */
- public boolean getIncludeComments() {
- return this.canonicalizerSpi.engineGetIncludeComments();
- }
+ /**
+ * Method getIncludeComments
+ *
+ * @return true if the c14n respect the comments.
+ */
+ public boolean getIncludeComments() {
+ return this.canonicalizerSpi.engineGetIncludeComments();
+ }
- /**
- * This method tries to canonicalize the given bytes. It's possible to even
- * canonicalize non-wellformed sequences if they are well-formed after being
- * wrapped with a <CODE>>a<...>/a<</CODE>.
- *
- * @param inputBytes
- * @return the result of the conicalization.
- * @throws CanonicalizationException
- * @throws java.io.IOException
- * @throws javax.xml.parsers.ParserConfigurationException
- * @throws org.xml.sax.SAXException
- */
- public byte[] canonicalize(byte[] inputBytes)
+ /**
+ * This method tries to canonicalize the given bytes. It's possible to even
+ * canonicalize non-wellformed sequences if they are well-formed after being
+ * wrapped with a <CODE>>a<...>/a<</CODE>.
+ *
+ * @param inputBytes
+ * @return the result of the conicalization.
+ * @throws CanonicalizationException
+ * @throws java.io.IOException
+ * @throws javax.xml.parsers.ParserConfigurationException
+ * @throws org.xml.sax.SAXException
+ */
+ public byte[] canonicalize(byte[] inputBytes)
throws javax.xml.parsers.ParserConfigurationException,
java.io.IOException, org.xml.sax.SAXException,
CanonicalizationException {
- ByteArrayInputStream bais = new ByteArrayInputStream(inputBytes);
- InputSource in = new InputSource(bais);
- DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
+ ByteArrayInputStream bais = new ByteArrayInputStream(inputBytes);
+ InputSource in = new InputSource(bais);
+ DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
- dfactory.setNamespaceAware(true);
+ dfactory.setNamespaceAware(true);
- // needs to validate for ID attribute nomalization
- dfactory.setValidating(true);
+ // needs to validate for ID attribute nomalization
+ dfactory.setValidating(true);
- DocumentBuilder db = dfactory.newDocumentBuilder();
+ DocumentBuilder db = dfactory.newDocumentBuilder();
- /*
- * for some of the test vectors from the specification,
- * there has to be a validatin parser for ID attributes, default
- * attribute values, NMTOKENS, etc.
- * Unfortunaltely, the test vectors do use different DTDs or
- * even no DTD. So Xerces 1.3.1 fires many warnings about using
- * ErrorHandlers.
- *
- * Text from the spec:
- *
- * The input octet stream MUST contain a well-formed XML document,
- * but the input need not be validated. However, the attribute
- * value normalization and entity reference resolution MUST be
- * performed in accordance with the behaviors of a validating
- * XML processor. As well, nodes for default attributes (declared
- * in the ATTLIST with an AttValue but not specified) are created
- * in each element. Thus, the declarations in the document type
- * declaration are used to help create the canonical form, even
- * though the document type declaration is not retained in the
- * canonical form.
- *
- */
- db.setErrorHandler(new com.sun.org.apache.xml.internal.security.utils
- .IgnoreAllErrorHandler());
+ /*
+ * for some of the test vectors from the specification,
+ * there has to be a validatin parser for ID attributes, default
+ * attribute values, NMTOKENS, etc.
+ * Unfortunaltely, the test vectors do use different DTDs or
+ * even no DTD. So Xerces 1.3.1 fires many warnings about using
+ * ErrorHandlers.
+ *
+ * Text from the spec:
+ *
+ * The input octet stream MUST contain a well-formed XML document,
+ * but the input need not be validated. However, the attribute
+ * value normalization and entity reference resolution MUST be
+ * performed in accordance with the behaviors of a validating
+ * XML processor. As well, nodes for default attributes (declared
+ * in the ATTLIST with an AttValue but not specified) are created
+ * in each element. Thus, the declarations in the document type
+ * declaration are used to help create the canonical form, even
+ * though the document type declaration is not retained in the
+ * canonical form.
+ *
+ */
+ db.setErrorHandler(new com.sun.org.apache.xml.internal.security.utils
+ .IgnoreAllErrorHandler());
- Document document = db.parse(in);
- byte result[] = this.canonicalizeSubtree(document);
+ Document document = db.parse(in);
+ byte result[] = this.canonicalizeSubtree(document);
- return result;
- }
+ return result;
+ }
- /**
- * Canonicalizes the subtree rooted by <CODE>node</CODE>.
- *
- * @param node The node to canicalize
- * @return the result of the c14n.
- *
- * @throws CanonicalizationException
- */
- public byte[] canonicalizeSubtree(Node node)
+ /**
+ * Canonicalizes the subtree rooted by <CODE>node</CODE>.
+ *
+ * @param node The node to canicalize
+ * @return the result of the c14n.
+ *
+ * @throws CanonicalizationException
+ */
+ public byte[] canonicalizeSubtree(Node node)
throws CanonicalizationException {
- return this.canonicalizerSpi.engineCanonicalizeSubTree(node);
- }
+ return this.canonicalizerSpi.engineCanonicalizeSubTree(node);
+ }
- /**
- * Canonicalizes the subtree rooted by <CODE>node</CODE>.
- *
- * @param node
- * @param inclusiveNamespaces
- * @return the result of the c14n.
- * @throws CanonicalizationException
- */
- public byte[] canonicalizeSubtree(Node node, String inclusiveNamespaces)
+ /**
+ * Canonicalizes the subtree rooted by <CODE>node</CODE>.
+ *
+ * @param node
+ * @param inclusiveNamespaces
+ * @return the result of the c14n.
+ * @throws CanonicalizationException
+ */
+ public byte[] canonicalizeSubtree(Node node, String inclusiveNamespaces)
throws CanonicalizationException {
- return this.canonicalizerSpi.engineCanonicalizeSubTree(node,
+ return this.canonicalizerSpi.engineCanonicalizeSubTree(node,
inclusiveNamespaces);
- }
+ }
- /**
- * Canonicalizes an XPath node set. The <CODE>xpathNodeSet</CODE> is treated
- * as a list of XPath nodes, not as a list of subtrees.
- *
- * @param xpathNodeSet
- * @return the result of the c14n.
- * @throws CanonicalizationException
- */
- public byte[] canonicalizeXPathNodeSet(NodeList xpathNodeSet)
+ /**
+ * Canonicalizes an XPath node set. The <CODE>xpathNodeSet</CODE> is treated
+ * as a list of XPath nodes, not as a list of subtrees.
+ *
+ * @param xpathNodeSet
+ * @return the result of the c14n.
+ * @throws CanonicalizationException
+ */
+ public byte[] canonicalizeXPathNodeSet(NodeList xpathNodeSet)
throws CanonicalizationException {
- return this.canonicalizerSpi.engineCanonicalizeXPathNodeSet(xpathNodeSet);
- }
+ return this.canonicalizerSpi.engineCanonicalizeXPathNodeSet(xpathNodeSet);
+ }
- /**
- * Canonicalizes an XPath node set. The <CODE>xpathNodeSet</CODE> is treated
- * as a list of XPath nodes, not as a list of subtrees.
- *
- * @param xpathNodeSet
- * @param inclusiveNamespaces
- * @return the result of the c14n.
- * @throws CanonicalizationException
- */
- public byte[] canonicalizeXPathNodeSet(
+ /**
+ * Canonicalizes an XPath node set. The <CODE>xpathNodeSet</CODE> is treated
+ * as a list of XPath nodes, not as a list of subtrees.
+ *
+ * @param xpathNodeSet
+ * @param inclusiveNamespaces
+ * @return the result of the c14n.
+ * @throws CanonicalizationException
+ */
+ public byte[] canonicalizeXPathNodeSet(
NodeList xpathNodeSet, String inclusiveNamespaces)
throws CanonicalizationException {
- return this.canonicalizerSpi.engineCanonicalizeXPathNodeSet(xpathNodeSet,
+ return this.canonicalizerSpi.engineCanonicalizeXPathNodeSet(xpathNodeSet,
inclusiveNamespaces);
- }
+ }
- /**
- * Canonicalizes an XPath node set.
- *
- * @param xpathNodeSet
- * @return the result of the c14n.
- * @throws CanonicalizationException
- */
- public byte[] canonicalizeXPathNodeSet(Set xpathNodeSet)
+ /**
+ * Canonicalizes an XPath node set.
+ *
+ * @param xpathNodeSet
+ * @return the result of the c14n.
+ * @throws CanonicalizationException
+ */
+ public byte[] canonicalizeXPathNodeSet(Set xpathNodeSet)
throws CanonicalizationException {
- return this.canonicalizerSpi.engineCanonicalizeXPathNodeSet(xpathNodeSet);
- }
+ return this.canonicalizerSpi.engineCanonicalizeXPathNodeSet(xpathNodeSet);
+ }
- /**
- * Canonicalizes an XPath node set.
- *
- * @param xpathNodeSet
- * @param inclusiveNamespaces
- * @return the result of the c14n.
- * @throws CanonicalizationException
- */
- public byte[] canonicalizeXPathNodeSet(
- Set xpathNodeSet, String inclusiveNamespaces)
- throws CanonicalizationException {
- return this.canonicalizerSpi.engineCanonicalizeXPathNodeSet(xpathNodeSet,
- inclusiveNamespaces);
- }
+ /**
+ * Canonicalizes an XPath node set.
+ *
+ * @param xpathNodeSet
+ * @param inclusiveNamespaces
+ * @return the result of the c14n.
+ * @throws CanonicalizationException
+ */
+ public byte[] canonicalizeXPathNodeSet(Set xpathNodeSet,
+ String inclusiveNamespaces) throws CanonicalizationException {
+ return this.canonicalizerSpi.engineCanonicalizeXPathNodeSet(xpathNodeSet,
+ inclusiveNamespaces);
+ }
- /**
- * Sets the writter where the cannocalization ends. ByteArrayOutputStream if
- * none is setted.
- * @param os
- */
- public void setWriter(OutputStream os) {
- this.canonicalizerSpi.setWriter(os);
- }
+ /**
+ * Sets the writer where the canonicalization ends. ByteArrayOutputStream
+ * if none is set.
+ * @param os
+ */
+ public void setWriter(OutputStream os) {
+ this.canonicalizerSpi.setWriter(os);
+ }
- /**
- * Returns the name of the implementing {@link CanonicalizerSpi} class
- *
- * @return the name of the implementing {@link CanonicalizerSpi} class
- */
- public String getImplementingCanonicalizerClass() {
- return this.canonicalizerSpi.getClass().getName();
- }
+ /**
+ * Returns the name of the implementing {@link CanonicalizerSpi} class
+ *
+ * @return the name of the implementing {@link CanonicalizerSpi} class
+ */
+ public String getImplementingCanonicalizerClass() {
+ return this.canonicalizerSpi.getClass().getName();
+ }
- /**
- * Method getImplementingClass
- *
- * @param URI
- * @return the name of the class that implements the give URI
- */
- private static Class getImplementingClass(String URI) {
- return (Class) _canonicalizerHash.get(URI);
- }
+ /**
+ * Method getImplementingClass
+ *
+ * @param URI
+ * @return the name of the class that implements the given URI
+ */
+ private static Class getImplementingClass(String URI) {
+ return (Class) _canonicalizerHash.get(URI);
+ }
- /**
- * Set the canonicalizator behaviour to not reset.
- *
- */
- public void notReset() {
- this.canonicalizerSpi.reset=false;
- }
+ /**
+ * Set the canonicalizer behaviour to not reset.
+ */
+ public void notReset() {
+ this.canonicalizerSpi.reset = false;
+ }
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/InvalidCanonicalizerException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/InvalidCanonicalizerException.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/AttrCompare.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/AttrCompare.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -21,17 +20,17 @@
*/
package com.sun.org.apache.xml.internal.security.c14n.helper;
-
-
import com.sun.org.apache.xml.internal.security.utils.Constants;
import org.w3c.dom.Attr;
-
+import java.io.Serializable;
+import java.util.Comparator;
/**
* Compares two attributes based on the C14n specification.
*
* <UL>
- * <LI>Namespace nodes have a lesser document order position than attribute nodes.
+ * <LI>Namespace nodes have a lesser document order position than attribute
+ * nodes.
* <LI> An element's namespace nodes are sorted lexicographically by
* local name (the default namespace node, if one exists, has no
* local name and is therefore lexicographically least).
@@ -40,104 +39,89 @@
* key (an empty namespace URI is lexicographically least).
* </UL>
*
- * $todo$ Should we implement java.util.Comparator and import java.util.Arrays to use Arrays.sort(intarray);
* @author Christian Geuer-Pollmann
*/
-public class AttrCompare implements java.util.Comparator {
+public class AttrCompare implements Comparator, Serializable {
- private final int ATTR0_BEFORE_ATTR1 = -1;
- private final int ATTR1_BEFORE_ATTR0 = 1;
+ private final static long serialVersionUID = -7113259629930576230L;
+ private final static int ATTR0_BEFORE_ATTR1 = -1;
+ private final static int ATTR1_BEFORE_ATTR0 = 1;
+ private final static String XMLNS=Constants.NamespaceSpecNS;
- private final static String XMLNS=Constants.NamespaceSpecNS;
- /**
- * Compares two attributes based on the C14n specification.
- *
- * <UL>
- * <LI>Namespace nodes have a lesser document order position than attribute nodes.
- * <LI> An element's namespace nodes are sorted lexicographically by
- * local name (the default namespace node, if one exists, has no
- * local name and is therefore lexicographically least).
- * <LI> An element's attribute nodes are sorted lexicographically with
- * namespace URI as the primary key and local name as the secondary
- * key (an empty namespace URI is lexicographically least).
- * </UL>
- *
- * @param obj0 casted Attr
- * @param obj1 casted Attr
- * @return returns a negative integer, zero, or a positive integer as obj0 is less than, equal to, or greater than obj1
- *
- */
- public int compare(Object obj0, Object obj1) {
+ /**
+ * Compares two attributes based on the C14n specification.
+ *
+ * <UL>
+ * <LI>Namespace nodes have a lesser document order position than
+ * attribute nodes.
+ * <LI> An element's namespace nodes are sorted lexicographically by
+ * local name (the default namespace node, if one exists, has no
+ * local name and is therefore lexicographically least).
+ * <LI> An element's attribute nodes are sorted lexicographically with
+ * namespace URI as the primary key and local name as the secondary
+ * key (an empty namespace URI is lexicographically least).
+ * </UL>
+ *
+ * @param obj0 casted Attr
+ * @param obj1 casted Attr
+ * @return returns a negative integer, zero, or a positive integer as
+ * obj0 is less than, equal to, or greater than obj1
+ *
+ */
+ public int compare(Object obj0, Object obj1) {
- Attr attr0 = (Attr) obj0;
- Attr attr1 = (Attr) obj1;
- String namespaceURI0 = attr0.getNamespaceURI();
- String namespaceURI1 = attr1.getNamespaceURI();
+ Attr attr0 = (Attr) obj0;
+ Attr attr1 = (Attr) obj1;
+ String namespaceURI0 = attr0.getNamespaceURI();
+ String namespaceURI1 = attr1.getNamespaceURI();
- boolean isNamespaceAttr0 =
- XMLNS.equals(namespaceURI0);
- boolean isNamespaceAttr1 =
- XMLNS.equals(namespaceURI1);
+ boolean isNamespaceAttr0 = XMLNS==namespaceURI0;
+ boolean isNamespaceAttr1 = XMLNS==namespaceURI1;
- if (isNamespaceAttr0) {
- if (isNamespaceAttr1) {
-
- // both are namespaces
- String localname0 = attr0.getLocalName();
- String localname1 = attr1.getLocalName();
+ if (isNamespaceAttr0) {
+ if (isNamespaceAttr1) {
+ // both are namespaces
+ String localname0 = attr0.getLocalName();
+ String localname1 = attr1.getLocalName();
- if (localname0.equals("xmlns")) {
- localname0 = "";
- }
+ if (localname0.equals("xmlns")) {
+ localname0 = "";
+ }
- if (localname1.equals("xmlns")) {
- localname1 = "";
- }
+ if (localname1.equals("xmlns")) {
+ localname1 = "";
+ }
- return localname0.compareTo(localname1);
- }
- // attr0 is a namespace, attr1 is not
- return ATTR0_BEFORE_ATTR1;
+ return localname0.compareTo(localname1);
+ }
+ // attr0 is a namespace, attr1 is not
+ return ATTR0_BEFORE_ATTR1;
+ }
- }
- if (isNamespaceAttr1) {
-
+ if (isNamespaceAttr1) {
// attr1 is a namespace, attr0 is not
return ATTR1_BEFORE_ATTR0;
- }
-
- // none is a namespae
+ }
- if (namespaceURI0 == null) {
- if (namespaceURI1 == null) {
- /*
- String localName0 = attr0.getLocalName();
- String localName1 = attr1.getLocalName();
- return localName0.compareTo(localName1);
- */
-
+ // none is a namespace
+ if (namespaceURI0 == null) {
+ if (namespaceURI1 == null) {
String name0 = attr0.getName();
String name1 = attr1.getName();
return name0.compareTo(name1);
+ }
+ return ATTR0_BEFORE_ATTR1;
}
- return ATTR0_BEFORE_ATTR1;
- }
- if (namespaceURI1 == null) {
- return ATTR1_BEFORE_ATTR0;
- }
- int a = namespaceURI0.compareTo(namespaceURI1);
+ if (namespaceURI1 == null) {
+ return ATTR1_BEFORE_ATTR0;
+ }
- if (a != 0) {
- return a;
- }
- /*
- String localName0 = ;
- String localName1 =;*/
+ int a = namespaceURI0.compareTo(namespaceURI1);
+ if (a != 0) {
+ return a;
+ }
- return (attr0.getLocalName())
- .compareTo( attr1.getLocalName());
-
- }
-
+ return (attr0.getLocalName()).compareTo(attr1.getLocalName());
+ }
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,684 @@
+/*
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
+ */
+/*
+ * Copyright 2008 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package com.sun.org.apache.xml.internal.security.c14n.implementations;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import javax.xml.parsers.ParserConfigurationException;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.xml.sax.SAXException;
+
+import java.util.logging.Logger;
+import java.util.logging.Logger;
+import com.sun.org.apache.xml.internal.security.c14n.CanonicalizationException;
+import com.sun.org.apache.xml.internal.security.c14n.helper.C14nHelper;
+import com.sun.org.apache.xml.internal.security.signature.XMLSignatureInput;
+import com.sun.org.apache.xml.internal.security.utils.Constants;
+import com.sun.org.apache.xml.internal.security.utils.XMLUtils;
+
+/**
+ * Implements <A HREF="http://www.w3.org/TR/2008/PR-xml-c14n11-20080129/">
+ * Canonical XML Version 1.1</A>, a W3C Proposed Recommendation from 29
+ * January 2008.
+ *
+ * @author Sean Mullan
+ * @author Raul Benito
+ * @version $Revision: 1.2 $
+ */
+public abstract class Canonicalizer11 extends CanonicalizerBase {
+ boolean firstCall = true;
+ final SortedSet result = new TreeSet(COMPARE);
+ static final String XMLNS_URI = Constants.NamespaceSpecNS;
+ static final String XML_LANG_URI = Constants.XML_LANG_SPACE_SpecNS;
+
+ static Logger log = Logger.getLogger(Canonicalizer11.class.getName());
+
+ static class XmlAttrStack {
+ int currentLevel = 0;
+ int lastlevel = 0;
+ XmlsStackElement cur;
+ static class XmlsStackElement {
+ int level;
+ boolean rendered = false;
+ List nodes = new ArrayList();
+ };
+ List levels = new ArrayList();
+ void push(int level) {
+ currentLevel = level;
+ if (currentLevel == -1)
+ return;
+ cur = null;
+ while (lastlevel >= currentLevel) {
+ levels.remove(levels.size() - 1);
+ if (levels.size() == 0) {
+ lastlevel = 0;
+ return;
+ }
+ lastlevel=((XmlsStackElement)levels.get(levels.size()-1)).level;
+ }
+ }
+ void addXmlnsAttr(Attr n) {
+ if (cur == null) {
+ cur = new XmlsStackElement();
+ cur.level = currentLevel;
+ levels.add(cur);
+ lastlevel = currentLevel;
+ }
+ cur.nodes.add(n);
+ }
+ void getXmlnsAttr(Collection col) {
+ if (cur == null) {
+ cur = new XmlsStackElement();
+ cur.level = currentLevel;
+ lastlevel = currentLevel;
+ levels.add(cur);
+ }
+ int size = levels.size() - 2;
+ boolean parentRendered = false;
+ XmlsStackElement e = null;
+ if (size == -1) {
+ parentRendered = true;
+ } else {
+ e = (XmlsStackElement) levels.get(size);
+ if (e.rendered && e.level+1 == currentLevel)
+ parentRendered = true;
+ }
+ if (parentRendered) {
+ col.addAll(cur.nodes);
+ cur.rendered = true;
+ return;
+ }
+
+ Map loa = new HashMap();
+ List baseAttrs = new ArrayList();
+ boolean successiveOmitted = true;
+ for (;size>=0;size--) {
+ e = (XmlsStackElement) levels.get(size);
+ if (e.rendered) {
+ successiveOmitted = false;
+ }
+ Iterator it = e.nodes.iterator();
+ while (it.hasNext() && successiveOmitted) {
+ Attr n = (Attr) it.next();
+ if (n.getLocalName().equals("base")) {
+ if (!e.rendered) {
+ baseAttrs.add(n);
+ }
+ } else if (!loa.containsKey(n.getName()))
+ loa.put(n.getName(), n);
+ }
+ }
+ if (!baseAttrs.isEmpty()) {
+ Iterator it = cur.nodes.iterator();
+ String base = null;
+ Attr baseAttr = null;
+ while (it.hasNext()) {
+ Attr n = (Attr) it.next();
+ if (n.getLocalName().equals("base")) {
+ base = n.getValue();
+ baseAttr = n;
+ break;
+ }
+ }
+ it = baseAttrs.iterator();
+ while (it.hasNext()) {
+ Attr n = (Attr) it.next();
+ if (base == null) {
+ base = n.getValue();
+ baseAttr = n;
+ } else {
+ try {
+ base = joinURI(n.getValue(), base);
+ } catch (URISyntaxException ue) {
+ ue.printStackTrace();
+ }
+ }
+ }
+ if (base != null && base.length() != 0) {
+ baseAttr.setValue(base);
+ col.add(baseAttr);
+ }
+ }
+
+ cur.rendered = true;
+ col.addAll(loa.values());
+ }
+ };
+ XmlAttrStack xmlattrStack = new XmlAttrStack();
+
+ /**
+ * Constructor Canonicalizer11
+ *
+ * @param includeComments
+ */
+ public Canonicalizer11(boolean includeComments) {
+ super(includeComments);
+ }
+
+ /**
+ * Returns the Attr[]s to be outputted for the given element.
+ * <br>
+ * The code of this method is a copy of {@link #handleAttributes(Element,
+ * NameSpaceSymbTable)},
+ * whereas it takes into account that subtree-c14n is -- well --
+ * subtree-based.
+ * So if the element in question isRoot of c14n, it's parent is not in the
+ * node set, as well as all other ancestors.
+ *
+ * @param E
+ * @param ns
+ * @return the Attr[]s to be outputted
+ * @throws CanonicalizationException
+ */
+ Iterator handleAttributesSubtree(Element E, NameSpaceSymbTable ns)
+ throws CanonicalizationException {
+ if (!E.hasAttributes() && !firstCall) {
+ return null;
+ }
+ // result will contain the attrs which have to be outputted
+ final SortedSet result = this.result;
+ result.clear();
+ NamedNodeMap attrs = E.getAttributes();
+ int attrsLength = attrs.getLength();
+
+ for (int i = 0; i < attrsLength; i++) {
+ Attr N = (Attr) attrs.item(i);
+ String NUri = N.getNamespaceURI();
+
+ if (XMLNS_URI != NUri) {
+ // It's not a namespace attr node. Add to the result and
+ // continue.
+ result.add(N);
+ continue;
+ }
+
+ String NName = N.getLocalName();
+ String NValue = N.getValue();
+ if (XML.equals(NName)
+ && XML_LANG_URI.equals(NValue)) {
+ // The default mapping for xml must not be output.
+ continue;
+ }
+
+ Node n = ns.addMappingAndRender(NName, NValue, N);
+
+ if (n != null) {
+ // Render the ns definition
+ result.add(n);
+ if (C14nHelper.namespaceIsRelative(N)) {
+ Object exArgs[] = {E.getTagName(), NName, N.getNodeValue()};
+ throw new CanonicalizationException(
+ "c14n.Canonicalizer.RelativeNamespace", exArgs);
+ }
+ }
+ }
+
+ if (firstCall) {
+ // It is the first node of the subtree
+ // Obtain all the namespaces defined in the parents, and added
+ // to the output.
+ ns.getUnrenderedNodes(result);
+ // output the attributes in the xml namespace.
+ xmlattrStack.getXmlnsAttr(result);
+ firstCall = false;
+ }
+
+ return result.iterator();
+ }
+
+ /**
+ * Returns the Attr[]s to be outputted for the given element.
+ * <br>
+ * IMPORTANT: This method expects to work on a modified DOM tree, i.e. a
+ * DOM which has been prepared using
+ * {@link com.sun.org.apache.xml.internal.security.utils.XMLUtils#circumventBug2650(
+ * org.w3c.dom.Document)}.
+ *
+ * @param E
+ * @param ns
+ * @return the Attr[]s to be outputted
+ * @throws CanonicalizationException
+ */
+ Iterator handleAttributes(Element E, NameSpaceSymbTable ns)
+ throws CanonicalizationException {
+ // result will contain the attrs which have to be output
+ xmlattrStack.push(ns.getLevel());
+ boolean isRealVisible = isVisibleDO(E, ns.getLevel()) == 1;
+ NamedNodeMap attrs = null;
+ int attrsLength = 0;
+ if (E.hasAttributes()) {
+ attrs = E.getAttributes();
+ attrsLength = attrs.getLength();
+ }
+
+ SortedSet result = this.result;
+ result.clear();
+
+ for (int i = 0; i < attrsLength; i++) {
+ Attr N = (Attr) attrs.item(i);
+ String NUri = N.getNamespaceURI();
+
+ if (XMLNS_URI != NUri) {
+ // A non namespace definition node.
+ if (XML_LANG_URI == NUri) {
+ if (N.getLocalName().equals("id")) {
+ if (isRealVisible) {
+ // treat xml:id like any other attribute
+ // (emit it, but don't inherit it)
+ result.add(N);
+ }
+ } else {
+ xmlattrStack.addXmlnsAttr(N);
+ }
+ } else if (isRealVisible) {
+ // The node is visible add the attribute to the list of
+ // output attributes.
+ result.add(N);
+ }
+ // keep working
+ continue;
+ }
+
+ String NName = N.getLocalName();
+ String NValue = N.getValue();
+ if ("xml".equals(NName)
+ && XML_LANG_URI.equals(NValue)) {
+ /* except omit namespace node with local name xml, which defines
+ * the xml prefix, if its string value is
+ * http://www.w3.org/XML/1998/namespace.
+ */
+ continue;
+ }
+ // add the prefix binding to the ns symb table.
+ // ns.addInclusiveMapping(NName,NValue,N,isRealVisible);
+ if (isVisible(N)) {
+ if (!isRealVisible && ns.removeMappingIfRender(NName)) {
+ continue;
+ }
+ // The xpath select this node output it if needed.
+ // Node n = ns.addMappingAndRenderXNodeSet
+ // (NName, NValue, N, isRealVisible);
+ Node n = ns.addMappingAndRender(NName, NValue, N);
+ if (n != null) {
+ result.add(n);
+ if (C14nHelper.namespaceIsRelative(N)) {
+ Object exArgs[] =
+ { E.getTagName(), NName, N.getNodeValue() };
+ throw new CanonicalizationException(
+ "c14n.Canonicalizer.RelativeNamespace", exArgs);
+ }
+ }
+ } else {
+ if (isRealVisible && NName != XMLNS) {
+ ns.removeMapping(NName);
+ } else {
+ ns.addMapping(NName, NValue, N);
+ }
+ }
+ }
+ if (isRealVisible) {
+ // The element is visible, handle the xmlns definition
+ Attr xmlns = E.getAttributeNodeNS(XMLNS_URI, XMLNS);
+ Node n = null;
+ if (xmlns == null) {
+ // No xmlns def just get the already defined.
+ n = ns.getMapping(XMLNS);
+ } else if (!isVisible(xmlns)) {
+ // There is a defn but the xmlns is not selected by the xpath.
+ // then xmlns=""
+ n = ns.addMappingAndRender(XMLNS, "", nullNode);
+ }
+ // output the xmlns def if needed.
+ if (n != null) {
+ result.add(n);
+ }
+ // Float all xml:* attributes of the unselected parent elements to
+ // this one. addXmlAttributes(E,result);
+ xmlattrStack.getXmlnsAttr(result);
+ ns.getUnrenderedNodes(result);
+ }
+
+ return result.iterator();
+ }
+
+ /**
+ * Always throws a CanonicalizationException because this is inclusive c14n.
+ *
+ * @param xpathNodeSet
+ * @param inclusiveNamespaces
+ * @return none it always fails
+ * @throws CanonicalizationException always
+ */
+ public byte[] engineCanonicalizeXPathNodeSet(Set xpathNodeSet,
+ String inclusiveNamespaces) throws CanonicalizationException {
+ throw new CanonicalizationException(
+ "c14n.Canonicalizer.UnsupportedOperation");
+ }
+
+ /**
+ * Always throws a CanonicalizationException because this is inclusive c14n.
+ *
+ * @param rootNode
+ * @param inclusiveNamespaces
+ * @return none it always fails
+ * @throws CanonicalizationException
+ */
+ public byte[] engineCanonicalizeSubTree(Node rootNode,
+ String inclusiveNamespaces) throws CanonicalizationException {
+ throw new CanonicalizationException(
+ "c14n.Canonicalizer.UnsupportedOperation");
+ }
+
+ void circumventBugIfNeeded(XMLSignatureInput input)
+ throws CanonicalizationException, ParserConfigurationException,
+ IOException, SAXException {
+ if (!input.isNeedsToBeExpanded())
+ return;
+ Document doc = null;
+ if (input.getSubNode() != null) {
+ doc = XMLUtils.getOwnerDocument(input.getSubNode());
+ } else {
+ doc = XMLUtils.getOwnerDocument(input.getNodeSet());
+ }
+ XMLUtils.circumventBug2650(doc);
+ }
+
+ void handleParent(Element e, NameSpaceSymbTable ns) {
+ if (!e.hasAttributes()) {
+ return;
+ }
+ xmlattrStack.push(-1);
+ NamedNodeMap attrs = e.getAttributes();
+ int attrsLength = attrs.getLength();
+ for (int i = 0; i < attrsLength; i++) {
+ Attr N = (Attr) attrs.item(i);
+ if (Constants.NamespaceSpecNS != N.getNamespaceURI()) {
+ // Not a namespace definition, ignore.
+ if (XML_LANG_URI == N.getNamespaceURI()) {
+ xmlattrStack.addXmlnsAttr(N);
+ }
+ continue;
+ }
+
+ String NName = N.getLocalName();
+ String NValue = N.getNodeValue();
+ if (XML.equals(NName)
+ && Constants.XML_LANG_SPACE_SpecNS.equals(NValue)) {
+ continue;
+ }
+ ns.addMapping(NName,NValue,N);
+ }
+ }
+
+ private static String joinURI(String baseURI, String relativeURI)
+ throws URISyntaxException {
+ String bscheme = null;
+ String bauthority = null;
+ String bpath = "";
+ String bquery = null;
+ String bfragment = null; // Is this correct?
+
+ // pre-parse the baseURI
+ if (baseURI != null) {
+ if (baseURI.endsWith("..")) {
+ baseURI = baseURI + "/";
+ }
+ URI base = new URI(baseURI);
+ bscheme = base.getScheme();
+ bauthority = base.getAuthority();
+ bpath = base.getPath();
+ bquery = base.getQuery();
+ bfragment = base.getFragment();
+ }
+
+ URI r = new URI(relativeURI);
+ String rscheme = r.getScheme();
+ String rauthority = r.getAuthority();
+ String rpath = r.getPath();
+ String rquery = r.getQuery();
+ String rfragment = null;
+
+ String tscheme, tauthority, tpath, tquery, tfragment;
+ if (rscheme != null && rscheme.equals(bscheme)) {
+ rscheme = null;
+ }
+ if (rscheme != null) {
+ tscheme = rscheme;
+ tauthority = rauthority;
+ tpath = removeDotSegments(rpath);
+ tquery = rquery;
+ } else {
+ if (rauthority != null) {
+ tauthority = rauthority;
+ tpath = removeDotSegments(rpath);
+ tquery = rquery;
+ } else {
+ if (rpath.length() == 0) {
+ tpath = bpath;
+ if (rquery != null) {
+ tquery = rquery;
+ } else {
+ tquery = bquery;
+ }
+ } else {
+ if (rpath.startsWith("/")) {
+ tpath = removeDotSegments(rpath);
+ } else {
+ if (bauthority != null && bpath.length() == 0) {
+ tpath = "/" + rpath;
+ } else {
+ int last = bpath.lastIndexOf('/');
+ if (last == -1) {
+ tpath = rpath;
+ } else {
+ tpath = bpath.substring(0, last+1) + rpath;
+ }
+ }
+ tpath = removeDotSegments(tpath);
+ }
+ tquery = rquery;
+ }
+ tauthority = bauthority;
+ }
+ tscheme = bscheme;
+ }
+ tfragment = rfragment;
+ return new URI(tscheme, tauthority, tpath, tquery, tfragment).toString();
+ }
+
+ private static String removeDotSegments(String path) {
+
+ log.log(java.util.logging.Level.FINE, "STEP OUTPUT BUFFER\t\tINPUT BUFFER");
+
+ // 1. The input buffer is initialized with the now-appended path
+ // components then replace occurrences of "//" in the input buffer
+ // with "/" until no more occurrences of "//" are in the input buffer.
+ String input = path;
+ while (input.indexOf("//") > -1) {
+ input = input.replaceAll("//", "/");
+ }
+
+ // Initialize the output buffer with the empty string.
+ StringBuffer output = new StringBuffer();
+
+ // If the input buffer starts with a root slash "/" then move this
+ // character to the output buffer.
+ if (input.charAt(0) == '/') {
+ output.append("/");
+ input = input.substring(1);
+ }
+
+ printStep("1 ", output.toString(), input);
+
+ // While the input buffer is not empty, loop as follows
+ while (input.length() != 0) {
+ // 2A. If the input buffer begins with a prefix of "./",
+ // then remove that prefix from the input buffer
+ // else if the input buffer begins with a prefix of "../", then
+ // if also the output does not contain the root slash "/" only,
+ // then move this prefix to the end of the output buffer else
+ // remove that prefix
+ if (input.startsWith("./")) {
+ input = input.substring(2);
+ printStep("2A", output.toString(), input);
+ } else if (input.startsWith("../")) {
+ input = input.substring(3);
+ if (!output.toString().equals("/")) {
+ output.append("../");
+ }
+ printStep("2A", output.toString(), input);
+ // 2B. if the input buffer begins with a prefix of "/./" or "/.",
+ // where "." is a complete path segment, then replace that prefix
+ // with "/" in the input buffer; otherwise,
+ } else if (input.startsWith("/./")) {
+ input = input.substring(2);
+ printStep("2B", output.toString(), input);
+ } else if (input.equals("/.")) {
+ // FIXME: what is complete path segment?
+ input = input.replaceFirst("/.", "/");
+ printStep("2B", output.toString(), input);
+ // 2C. if the input buffer begins with a prefix of "/../" or "/..",
+ // where ".." is a complete path segment, then replace that prefix
+ // with "/" in the input buffer and if also the output buffer is
+ // empty, last segment in the output buffer equals "../" or "..",
+ // where ".." is a complete path segment, then append ".." or "/.."
+ // for the latter case respectively to the output buffer else
+ // remove the last segment and its preceding "/" (if any) from the
+ // output buffer and if hereby the first character in the output
+ // buffer was removed and it was not the root slash then delete a
+ // leading slash from the input buffer; otherwise,
+ } else if (input.startsWith("/../")) {
+ input = input.substring(3);
+ if (output.length() == 0) {
+ output.append("/");
+ } else if (output.toString().endsWith("../")) {
+ output.append("..");
+ } else if (output.toString().endsWith("..")) {
+ output.append("/..");
+ } else {
+ int index = output.lastIndexOf("/");
+ if (index == -1) {
+ output = new StringBuffer();
+ if (input.charAt(0) == '/') {
+ input = input.substring(1);
+ }
+ } else {
+ output = output.delete(index, output.length());
+ }
+ }
+ printStep("2C", output.toString(), input);
+ } else if (input.equals("/..")) {
+ // FIXME: what is complete path segment?
+ input = input.replaceFirst("/..", "/");
+ if (output.length() == 0) {
+ output.append("/");
+ } else if (output.toString().endsWith("../")) {
+ output.append("..");
+ } else if (output.toString().endsWith("..")) {
+ output.append("/..");
+ } else {
+ int index = output.lastIndexOf("/");
+ if (index == -1) {
+ output = new StringBuffer();
+ if (input.charAt(0) == '/') {
+ input = input.substring(1);
+ }
+ } else {
+ output = output.delete(index, output.length());
+ }
+ }
+ printStep("2C", output.toString(), input);
+ // 2D. if the input buffer consists only of ".", then remove
+ // that from the input buffer else if the input buffer consists
+ // only of ".." and if the output buffer does not contain only
+ // the root slash "/", then move the ".." to the output buffer
+ // else delte it.; otherwise,
+ } else if (input.equals(".")) {
+ input = "";
+ printStep("2D", output.toString(), input);
+ } else if (input.equals("..")) {
+ if (!output.toString().equals("/"))
+ output.append("..");
+ input = "";
+ printStep("2D", output.toString(), input);
+ // 2E. move the first path segment (if any) in the input buffer
+ // to the end of the output buffer, including the initial "/"
+ // character (if any) and any subsequent characters up to, but not
+ // including, the next "/" character or the end of the input buffer.
+ } else {
+ int end = -1;
+ int begin = input.indexOf('/');
+ if (begin == 0) {
+ end = input.indexOf('/', 1);
+ } else {
+ end = begin;
+ begin = 0;
+ }
+ String segment;
+ if (end == -1) {
+ segment = input.substring(begin);
+ input = "";
+ } else {
+ segment = input.substring(begin, end);
+ input = input.substring(end);
+ }
+ output.append(segment);
+ printStep("2E", output.toString(), input);
+ }
+ }
+
+ // 3. Finally, if the only or last segment of the output buffer is
+ // "..", where ".." is a complete path segment not followed by a slash
+ // then append a slash "/". The output buffer is returned as the result
+ // of remove_dot_segments
+ if (output.toString().endsWith("..")) {
+ output.append("/");
+ printStep("3 ", output.toString(), input);
+ }
+
+ return output.toString();
+ }
+
+ private static void printStep(String step, String output, String input) {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, " " + step + ": " + output);
+ if (output.length() == 0) {
+ log.log(java.util.logging.Level.FINE, "\t\t\t\t" + input);
+ } else {
+ log.log(java.util.logging.Level.FINE, "\t\t\t" + input);
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11_OmitComments.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,41 @@
+/*
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
+ */
+/*
+ * Copyright 2008 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package com.sun.org.apache.xml.internal.security.c14n.implementations;
+
+import com.sun.org.apache.xml.internal.security.c14n.Canonicalizer;
+
+/**
+ * @author Sean Mullan
+ */
+public class Canonicalizer11_OmitComments extends Canonicalizer11 {
+
+ public Canonicalizer11_OmitComments() {
+ super(false);
+ }
+
+ public final String engineGetURI() {
+ return Canonicalizer.ALGO_ID_C14N11_OMIT_COMMENTS;
+ }
+
+ public final boolean engineGetIncludeComments() {
+ return false;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11_WithComments.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,41 @@
+/*
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
+ */
+/*
+ * Copyright 2008 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package com.sun.org.apache.xml.internal.security.c14n.implementations;
+
+import com.sun.org.apache.xml.internal.security.c14n.Canonicalizer;
+
+/**
+ * @author Sean Mullan
+ */
+public class Canonicalizer11_WithComments extends Canonicalizer11 {
+
+ public Canonicalizer11_WithComments() {
+ super(true);
+ }
+
+ public final String engineGetURI() {
+ return Canonicalizer.ALGO_ID_C14N11_WITH_COMMENTS;
+ }
+
+ public final boolean engineGetIncludeComments() {
+ return true;
+ }
+}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -23,20 +22,30 @@
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
+import javax.xml.parsers.ParserConfigurationException;
+
import com.sun.org.apache.xml.internal.security.c14n.CanonicalizationException;
import com.sun.org.apache.xml.internal.security.c14n.helper.C14nHelper;
+import com.sun.org.apache.xml.internal.security.signature.XMLSignatureInput;
import com.sun.org.apache.xml.internal.security.utils.Constants;
+import com.sun.org.apache.xml.internal.security.utils.XMLUtils;
import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
+import org.xml.sax.SAXException;
/**
@@ -44,13 +53,92 @@
* XML Version 1.0</A>, a W3C Recommendation from 15 March 2001.
*
* @author Christian Geuer-Pollmann <geuerp@apache.org>
+ * @version $Revision: 1.5 $
*/
public abstract class Canonicalizer20010315 extends CanonicalizerBase {
boolean firstCall=true;
final SortedSet result= new TreeSet(COMPARE);
static final String XMLNS_URI=Constants.NamespaceSpecNS;
static final String XML_LANG_URI=Constants.XML_LANG_SPACE_SpecNS;
- /**
+ static class XmlAttrStack {
+ int currentLevel=0;
+ int lastlevel=0;
+ XmlsStackElement cur;
+ static class XmlsStackElement {
+ int level;
+ boolean rendered=false;
+ List nodes=new ArrayList();
+ };
+ List levels=new ArrayList();
+ void push(int level) {
+ currentLevel=level;
+ if (currentLevel==-1)
+ return;
+ cur=null;
+ while (lastlevel>=currentLevel) {
+ levels.remove(levels.size()-1);
+ if (levels.size()==0) {
+ lastlevel=0;
+ return;
+ }
+ lastlevel=((XmlsStackElement)levels.get(levels.size()-1)).level;
+ }
+ }
+ void addXmlnsAttr(Attr n) {
+ if (cur==null) {
+ cur=new XmlsStackElement();
+ cur.level=currentLevel;
+ levels.add(cur);
+ lastlevel=currentLevel;
+ }
+ cur.nodes.add(n);
+ }
+ void getXmlnsAttr(Collection col) {
+ int size=levels.size()-1;
+ if (cur==null) {
+ cur=new XmlsStackElement();
+ cur.level=currentLevel;
+ lastlevel=currentLevel;
+ levels.add(cur);
+ }
+ boolean parentRendered=false;
+ XmlsStackElement e=null;
+ if (size==-1) {
+ parentRendered=true;
+ } else {
+ e=(XmlsStackElement)levels.get(size);
+ if (e.rendered && e.level+1==currentLevel)
+ parentRendered=true;
+
+ }
+ if (parentRendered) {
+ col.addAll(cur.nodes);
+ cur.rendered=true;
+ return;
+ }
+
+ Map loa = new HashMap();
+ for (;size>=0;size--) {
+ e=(XmlsStackElement)levels.get(size);
+ Iterator it=e.nodes.iterator();
+ while (it.hasNext()) {
+ Attr n=(Attr)it.next();
+ if (!loa.containsKey(n.getName()))
+ loa.put(n.getName(),n);
+ }
+ //if (e.rendered)
+ //break;
+
+ };
+ //cur.nodes.clear();
+ //cur.nodes.addAll(loa.values());
+ cur.rendered=true;
+ col.addAll(loa.values());
+ }
+
+ }
+ XmlAttrStack xmlattrStack=new XmlAttrStack();
+ /**
* Constructor Canonicalizer20010315
*
* @param includeComments
@@ -86,16 +174,16 @@
for (int i = 0; i < attrsLength; i++) {
Attr N = (Attr) attrs.item(i);
- String NName=N.getLocalName();
- String NValue=N.getValue();
String NUri =N.getNamespaceURI();
- if (!XMLNS_URI.equals(NUri)) {
+ if (XMLNS_URI!=NUri) {
//It's not a namespace attr node. Add to the result and continue.
result.add(N);
continue;
}
+ String NName=N.getLocalName();
+ String NValue=N.getValue();
if (XML.equals(NName)
&& XML_LANG_URI.equals(NValue)) {
//The default mapping for xml must not be output.
@@ -120,65 +208,14 @@
//Obtain all the namespaces defined in the parents, and added to the output.
ns.getUnrenderedNodes(result);
//output the attributes in the xml namespace.
- addXmlAttributesSubtree(E, result);
- firstCall=false;
+ xmlattrStack.getXmlnsAttr(result);
+ firstCall=false;
}
return result.iterator();
}
/**
- * Float the xml:* attributes of the parent nodes to the root node of c14n
- * @param E the root node.
- * @param result the xml:* attributes to output.
- */
- private void addXmlAttributesSubtree(Element E, SortedSet result) {
- // E is in the node-set
- Node parent = E.getParentNode();
- Map loa = new HashMap();
-
- if ((parent != null) && (parent.getNodeType() == Node.ELEMENT_NODE)) {
-
- // parent element is not in node set
- for (Node ancestor = parent;
- (ancestor != null)
- && (ancestor.getNodeType() == Node.ELEMENT_NODE);
- ancestor = ancestor.getParentNode()) {
- Element el=((Element) ancestor);
- if (!el.hasAttributes()) {
- continue;
- }
- // for all ancestor elements
- NamedNodeMap ancestorAttrs = el.getAttributes();
-
- for (int i = 0; i < ancestorAttrs.getLength(); i++) {
- // for all attributes in the ancestor element
- Attr currentAncestorAttr = (Attr) ancestorAttrs.item(i);
-
- if (XML_LANG_URI.equals(
- currentAncestorAttr.getNamespaceURI())) {
-
- // do we have an xml:* ?
- if (!E.hasAttributeNS(
- XML_LANG_URI,
- currentAncestorAttr.getLocalName())) {
-
- // the xml:* attr is not in E
- if (!loa.containsKey(currentAncestorAttr.getName())) {
- loa.put(currentAncestorAttr.getName(),
- currentAncestorAttr);
- }
- }
- }
- }
- }
- }
-
- result.addAll( loa.values());
-
- }
-
- /**
* Returns the Attr[]s to be outputted for the given element.
* <br>
* IMPORTANT: This method expects to work on a modified DOM tree, i.e. a DOM which has
@@ -192,7 +229,8 @@
*/
Iterator handleAttributes(Element E, NameSpaceSymbTable ns ) throws CanonicalizationException {
// result will contain the attrs which have to be outputted
- boolean isRealVisible=isVisible(E);
+ xmlattrStack.push(ns.getLevel());
+ boolean isRealVisible=isVisibleDO(E,ns.getLevel())==1;
NamedNodeMap attrs = null;
int attrsLength = 0;
if (E.hasAttributes()) {
@@ -204,16 +242,15 @@
SortedSet result = this.result;
result.clear();
-
for (int i = 0; i < attrsLength; i++) {
Attr N = (Attr) attrs.item(i);
- String NName=N.getLocalName();
- String NValue=N.getValue();
String NUri =N.getNamespaceURI();
- if (!XMLNS_URI.equals(NUri)) {
+ if (XMLNS_URI!=NUri) {
//A non namespace definition node.
- if (isRealVisible){
+ if (XML_LANG_URI==NUri) {
+ xmlattrStack.addXmlnsAttr(N);
+ } else if (isRealVisible){
//The node is visible add the attribute to the list of output attributes.
result.add(N);
}
@@ -221,7 +258,8 @@
continue;
}
-
+ String NName=N.getLocalName();
+ String NValue=N.getValue();
if ("xml".equals(NName)
&& XML_LANG_URI.equals(NValue)) {
/* except omit namespace node with local name xml, which defines
@@ -232,16 +270,26 @@
//add the prefix binding to the ns symb table.
//ns.addInclusiveMapping(NName,NValue,N,isRealVisible);
if (isVisible(N)) {
- //The xpath select this node output it if needed.
- Node n=ns.addMappingAndRenderXNodeSet(NName,NValue,N,isRealVisible);
- if (n!=null) {
+ if (!isRealVisible && ns.removeMappingIfRender(NName)) {
+ continue;
+ }
+ //The xpath select this node output it if needed.
+ //Node n=ns.addMappingAndRenderXNodeSet(NName,NValue,N,isRealVisible);
+ Node n=ns.addMappingAndRender(NName,NValue,N);
+ if (n!=null) {
result.add(n);
if (C14nHelper.namespaceIsRelative(N)) {
Object exArgs[] = { E.getTagName(), NName, N.getNodeValue() };
throw new CanonicalizationException(
"c14n.Canonicalizer.RelativeNamespace", exArgs);
- }
- }
+ }
+ }
+ } else {
+ if (isRealVisible && NName!=XMLNS) {
+ ns.removeMapping(NName);
+ } else {
+ ns.addMapping(NName,NValue,N);
+ }
}
}
if (isRealVisible) {
@@ -254,85 +302,22 @@
} else if ( !isVisible(xmlns)) {
//There is a definition but the xmlns is not selected by the xpath.
//then xmlns=""
- n=ns.addMappingAndRenderXNodeSet(XMLNS,"",nullNode,true);
+ n=ns.addMappingAndRender(XMLNS,"",nullNode);
}
//output the xmlns def if needed.
if (n!=null) {
result.add(n);
}
//Float all xml:* attributes of the unselected parent elements to this one.
- addXmlAttributes(E,result);
+ //addXmlAttributes(E,result);
+ xmlattrStack.getXmlnsAttr(result);
+ ns.getUnrenderedNodes(result);
+
}
return result.iterator();
}
/**
- * Float the xml:* attributes of the unselected parent nodes to the ciurrent node.
- * @param E
- * @param result
- */
- private void addXmlAttributes(Element E, SortedSet result) {
- /* The processing of an element node E MUST be modified slightly when an
- * XPath node-set is given as input and the element's parent is omitted
- * from the node-set. The method for processing the attribute axis of an
- * element E in the node-set is enhanced. All element nodes along E's
- * ancestor axis are examined for nearest occurrences of attributes in
- * the xml namespace, such as xml:lang and xml:space (whether or not they
- * are in the node-set). From this list of attributes, remove any that are
- * in E's attribute axis (whether or not they are in the node-set). Then,
- * lexicographically merge this attribute list with the nodes of E's
- * attribute axis that are in the node-set. The result of visiting the
- * attribute axis is computed by processing the attribute nodes in this
- * merged attribute list.
- */
-
- // E is in the node-set
- Node parent = E.getParentNode();
- Map loa = new HashMap();
-
- if ((parent != null) && (parent.getNodeType() == Node.ELEMENT_NODE)
- &&!isVisible(parent)) {
-
- // parent element is not in node set
- for (Node ancestor = parent;
- (ancestor != null)
- && (ancestor.getNodeType() == Node.ELEMENT_NODE);
- ancestor = ancestor.getParentNode()) {
- Element el=((Element) ancestor);
- if (!el.hasAttributes()) {
- continue;
- }
- // for all ancestor elements
- NamedNodeMap ancestorAttrs =el.getAttributes();
-
- for (int i = 0; i < ancestorAttrs.getLength(); i++) {
-
- // for all attributes in the ancestor element
- Attr currentAncestorAttr = (Attr) ancestorAttrs.item(i);
-
- if (XML_LANG_URI.equals(
- currentAncestorAttr.getNamespaceURI())) {
-
- // do we have an xml:* ?
- if (!E.hasAttributeNS(
- XML_LANG_URI,
- currentAncestorAttr.getLocalName())) {
-
- // the xml:* attr is not in E
- if (!loa.containsKey(currentAncestorAttr.getName())) {
- loa.put(currentAncestorAttr.getName(),
- currentAncestorAttr);
- }
- }
- }
- }
- }
- }
- result.addAll(loa.values());
-
-}
-
- /**
* Always throws a CanonicalizationException because this is inclusive c14n.
*
* @param xpathNodeSet
@@ -363,4 +348,43 @@
throw new CanonicalizationException(
"c14n.Canonicalizer.UnsupportedOperation");
}
+ void circumventBugIfNeeded(XMLSignatureInput input) throws CanonicalizationException, ParserConfigurationException, IOException, SAXException {
+ if (!input.isNeedsToBeExpanded())
+ return;
+ Document doc = null;
+ if (input.getSubNode() != null) {
+ doc=XMLUtils.getOwnerDocument(input.getSubNode());
+ } else {
+ doc=XMLUtils.getOwnerDocument(input.getNodeSet());
+ }
+ XMLUtils.circumventBug2650(doc);
+
+ }
+
+ void handleParent(Element e, NameSpaceSymbTable ns) {
+ if (!e.hasAttributes()) {
+ return;
+ }
+ xmlattrStack.push(-1);
+ NamedNodeMap attrs = e.getAttributes();
+ int attrsLength = attrs.getLength();
+ for (int i = 0; i < attrsLength; i++) {
+ Attr N = (Attr) attrs.item(i);
+ if (Constants.NamespaceSpecNS!=N.getNamespaceURI()) {
+ //Not a namespace definition, ignore.
+ if (XML_LANG_URI==N.getNamespaceURI()) {
+ xmlattrStack.addXmlnsAttr(N);
+ }
+ continue;
+ }
+
+ String NName=N.getLocalName();
+ String NValue=N.getNodeValue();
+ if (XML.equals(NName)
+ && Constants.XML_LANG_SPACE_SpecNS.equals(NValue)) {
+ continue;
+ }
+ ns.addMapping(NName,NValue,N);
+ }
+ }
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -21,20 +20,26 @@
*/
package com.sun.org.apache.xml.internal.security.c14n.implementations;
+import java.io.IOException;
import java.util.Iterator;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
+import javax.xml.parsers.ParserConfigurationException;
+
import com.sun.org.apache.xml.internal.security.c14n.CanonicalizationException;
import com.sun.org.apache.xml.internal.security.c14n.helper.C14nHelper;
import com.sun.org.apache.xml.internal.security.signature.XMLSignatureInput;
import com.sun.org.apache.xml.internal.security.transforms.params.InclusiveNamespaces;
import com.sun.org.apache.xml.internal.security.utils.Constants;
+import com.sun.org.apache.xml.internal.security.utils.XMLUtils;
import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
+import org.xml.sax.SAXException;
/**
* Implements " <A
* HREF="http://www.w3.org/TR/2002/REC-xml-exc-c14n-20020718/">Exclusive XML
@@ -47,6 +52,7 @@
* <i>THIS </i> implementation is a complete rewrite of the algorithm.
*
* @author Christian Geuer-Pollmann <geuerp@apache.org>
+ * @version $Revision: 1.5 $
* @see <a href="http://www.w3.org/TR/2002/REC-xml-exc-c14n-20020718/ Exclusive#">
* XML Canonicalization, Version 1.0</a>
*/
@@ -55,7 +61,7 @@
* This Set contains the names (Strings like "xmlns" or "xmlns:foo") of
* the inclusive namespaces.
*/
- TreeSet _inclusiveNSSet = null;
+ TreeSet _inclusiveNSSet = new TreeSet();
static final String XMLNS_URI=Constants.NamespaceSpecNS;
final SortedSet result = new TreeSet(COMPARE);
/**
@@ -143,10 +149,8 @@
for (int i = 0; i < attrsLength; i++) {
Attr N = (Attr) attrs.item(i);
- String NName=N.getLocalName();
- String NNodeValue=N.getNodeValue();
- if (!XMLNS_URI.equals(N.getNamespaceURI())) {
+ if (XMLNS_URI!=N.getNamespaceURI()) {
//Not a namespace definition.
//The Element is output element, add his prefix(if used) to visibyUtilized
String prefix = N.getPrefix();
@@ -157,6 +161,8 @@
result.add(N);
continue;
}
+ String NName=N.getLocalName();
+ String NNodeValue=N.getNodeValue();
if (ns.addMapping(NName, NNodeValue,N)) {
//New definition check if it is relative.
@@ -168,17 +174,17 @@
}
}
}
-
+ String prefix;
if (E.getNamespaceURI() != null) {
- String prefix = E.getPrefix();
+ prefix = E.getPrefix();
if ((prefix == null) || (prefix.length() == 0)) {
- visiblyUtilized.add(XMLNS);
- } else {
- visiblyUtilized.add(prefix);
+ prefix=XMLNS;
}
+
} else {
- visiblyUtilized.add(XMLNS);
+ prefix=XMLNS;
}
+ visiblyUtilized.add(prefix);
//This can be optimezed by I don't have time
Iterator it=visiblyUtilized.iterator();
@@ -211,12 +217,6 @@
}
- /** @inheritDoc */
- public byte[] engineCanonicalizeXPathNodeSet(Set xpathNodeSet
- ) throws CanonicalizationException {
- return engineCanonicalizeXPathNodeSet(xpathNodeSet,"");
- }
-
/**
* @inheritDoc
* @param E
@@ -236,21 +236,20 @@
//The prefix visibly utilized(in the attribute or in the name) in the element
Set visiblyUtilized =null;
//It's the output selected.
- boolean isOutputElement = isVisible(E);
+ boolean isOutputElement=isVisibleDO(E,ns.getLevel())==1;
if (isOutputElement) {
visiblyUtilized = (Set) this._inclusiveNSSet.clone();
}
for (int i = 0; i < attrsLength; i++) {
Attr N = (Attr) attrs.item(i);
- String NName=N.getLocalName();
- String NNodeValue=N.getNodeValue();
- if ( !isVisible(N) ) {
- //The node is not in the nodeset(if there is a nodeset)
- continue;
- }
+
- if (!XMLNS_URI.equals(N.getNamespaceURI())) {
+ if (XMLNS_URI!=N.getNamespaceURI()) {
+ if ( !isVisible(N) ) {
+ //The node is not in the nodeset(if there is a nodeset)
+ continue;
+ }
//Not a namespace definition.
if (isOutputElement) {
//The Element is output element, add his prefix(if used) to visibyUtilized
@@ -263,6 +262,25 @@
}
continue;
}
+ String NName=N.getLocalName();
+ if (isOutputElement && !isVisible(N) && NName!=XMLNS) {
+ ns.removeMappingIfNotRender(NName);
+ continue;
+ }
+ String NNodeValue=N.getNodeValue();
+
+ if (!isOutputElement && isVisible(N) && _inclusiveNSSet.contains(NName) && !ns.removeMappingIfRender(NName)) {
+ Node n=ns.addMappingAndRender(NName,NNodeValue,N);
+ if (n!=null) {
+ result.add(n);
+ if (C14nHelper.namespaceIsRelative(N)) {
+ Object exArgs[] = { E.getTagName(), NName, N.getNodeValue() };
+ throw new CanonicalizationException(
+ "c14n.Canonicalizer.RelativeNamespace", exArgs);
+ }
+ }
+ }
+
if (ns.addMapping(NName, NNodeValue,N)) {
@@ -306,18 +324,20 @@
}
result.add(key);
}
- } else /*if (_circunvented)*/ {
- Iterator it=this._inclusiveNSSet.iterator();
- while (it.hasNext()) {
- String s=(String)it.next();
- Attr key=ns.getMappingWithoutRendered(s);
- if (key==null) {
- continue;
- }
- result.add(key);
- }
}
return result.iterator();
}
+ void circumventBugIfNeeded(XMLSignatureInput input) throws CanonicalizationException, ParserConfigurationException, IOException, SAXException {
+ if (!input.isNeedsToBeExpanded() || _inclusiveNSSet.isEmpty())
+ return;
+ Document doc = null;
+ if (input.getSubNode() != null) {
+ doc=XMLUtils.getOwnerDocument(input.getSubNode());
+ } else {
+ doc=XMLUtils.getOwnerDocument(input.getNodeSet());
+ }
+
+ XMLUtils.circumventBug2650(doc);
+ }
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java Wed Jul 05 16:42:37 2017 +0200
@@ -28,6 +28,7 @@
/**
* Class Canonicalizer20010315ExclWithComments
*
+ * @version $Revision: 1.5 $
*/
public class Canonicalizer20010315ExclWithComments
extends Canonicalizer20010315Excl {
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315WithComments.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315WithComments.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java Wed Jul 05 16:42:37 2017 +0200
@@ -27,9 +27,11 @@
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
+import java.util.Map;
import java.util.Set;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -45,7 +47,6 @@
import com.sun.org.apache.xml.internal.security.utils.XMLUtils;
import org.w3c.dom.Attr;
import org.w3c.dom.Comment;
-import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -57,6 +58,7 @@
* Abstract base class for canonicalization algorithms.
*
* @author Christian Geuer-Pollmann <geuerp@apache.org>
+ * @version $Revision: 1.5 $
*/
public abstract class CanonicalizerBase extends CanonicalizerSpi {
//Constants to be outputed, In char array form, so
@@ -123,6 +125,18 @@
return engineCanonicalizeSubTree(rootNode,(Node)null);
}
/**
+ * Method engineCanonicalizeXPathNodeSet
+ * @inheritDoc
+ * @param xpathNodeSet
+ * @throws CanonicalizationException
+ */
+ public byte[] engineCanonicalizeXPathNodeSet(Set xpathNodeSet)
+ throws CanonicalizationException {
+ this._xpathNodeSet = xpathNodeSet;
+ return engineCanonicalizeXPathNodeSetInternal(XMLUtils.getOwnerDocument(this._xpathNodeSet));
+ }
+
+ /**
* Canonicalizes a Subtree node.
* @param input the root of the subtree to canicalize
* @return The canonicalize stream.
@@ -143,15 +157,8 @@
return bytes;
} else if (input.isNodeSet()) {
nodeFilter=input.getNodeFilters();
- Document doc = null;
- if (input.getSubNode() != null) {
- doc=XMLUtils.getOwnerDocument(input.getSubNode());
- } else {
- doc=XMLUtils.getOwnerDocument(input.getNodeSet());
- }
- if (input.isNeedsToBeExpanded()) {
- XMLUtils.circumventBug2650(doc);
- }
+
+ circumventBugIfNeeded(input);
if (input.getSubNode() != null) {
bytes = engineCanonicalizeXPathNodeSetInternal(input.getSubNode());
@@ -173,6 +180,13 @@
}
}
/**
+ * @param _writer The _writer to set.
+ */
+ public void setWriter(OutputStream _writer) {
+ this._writer = _writer;
+ }
+
+ /**
* Canonicalizes a Subtree node.
*
* @param rootNode
@@ -187,11 +201,13 @@
this._excludeNode = excludeNode;
try {
NameSpaceSymbTable ns=new NameSpaceSymbTable();
+ int nodeLevel=NODE_BEFORE_DOCUMENT_ELEMENT;
if (rootNode instanceof Element) {
//Fills the nssymbtable with the definitions of the parent of the root subnode
getParentNameSpaces((Element)rootNode,ns);
+ nodeLevel=NODE_NOT_BEFORE_OR_AFTER_DOCUMENT_ELEMENT;
}
- this.canonicalizeSubTree(rootNode,ns,rootNode);
+ this.canonicalizeSubTree(rootNode,ns,rootNode,nodeLevel);
this._writer.close();
if (this._writer instanceof ByteArrayOutputStream) {
byte []result=((ByteArrayOutputStream)this._writer).toByteArray();
@@ -199,6 +215,12 @@
((ByteArrayOutputStream)this._writer).reset();
}
return result;
+ } else if (this._writer instanceof UnsyncByteArrayOutputStream) {
+ byte []result=((UnsyncByteArrayOutputStream)this._writer).toByteArray();
+ if (reset) {
+ ((UnsyncByteArrayOutputStream)this._writer).reset();
+ }
+ return result;
}
return null;
@@ -219,13 +241,17 @@
* @throws CanonicalizationException
* @throws IOException
*/
- final void canonicalizeSubTree(Node currentNode, NameSpaceSymbTable ns,Node endnode)
+ final void canonicalizeSubTree(Node currentNode, NameSpaceSymbTable ns,Node endnode,
+ int documentLevel)
throws CanonicalizationException, IOException {
+ if (isVisibleInt(currentNode)==-1)
+ return;
Node sibling=null;
Node parentNode=null;
final OutputStream writer=this._writer;
final Node excludeNode=this._excludeNode;
final boolean includeComments=this._includeComments;
+ Map cache=new HashMap();
do {
switch (currentNode.getNodeType()) {
@@ -242,18 +268,17 @@
case Node.DOCUMENT_FRAGMENT_NODE :
case Node.DOCUMENT_NODE :
ns.outputNodePush();
- //currentNode = currentNode.getFirstChild();
sibling= currentNode.getFirstChild();
break;
case Node.COMMENT_NODE :
if (includeComments) {
- outputCommentToWriter((Comment) currentNode, writer);
+ outputCommentToWriter((Comment) currentNode, writer, documentLevel);
}
break;
case Node.PROCESSING_INSTRUCTION_NODE :
- outputPItoWriter((ProcessingInstruction) currentNode, writer);
+ outputPItoWriter((ProcessingInstruction) currentNode, writer, documentLevel);
break;
case Node.TEXT_NODE :
@@ -262,6 +287,7 @@
break;
case Node.ELEMENT_NODE :
+ documentLevel=NODE_NOT_BEFORE_OR_AFTER_DOCUMENT_ELEMENT;
if (currentNode==excludeNode) {
break;
}
@@ -270,27 +296,27 @@
ns.outputNodePush();
writer.write('<');
String name=currentElement.getTagName();
- writeStringToUtf8(name,writer);
+ UtfHelpper.writeByte(name,writer,cache);
Iterator attrs = this.handleAttributesSubtree(currentElement,ns);
if (attrs!=null) {
//we output all Attrs which are available
while (attrs.hasNext()) {
Attr attr = (Attr) attrs.next();
- outputAttrToWriter(attr.getNodeName(),attr.getNodeValue(), writer);
+ outputAttrToWriter(attr.getNodeName(),attr.getNodeValue(), writer,cache);
}
}
writer.write('>');
sibling= currentNode.getFirstChild();
if (sibling==null) {
writer.write(_END_TAG);
- writeStringToUtf8(name,writer);
+ UtfHelpper.writeStringToUtf8(name,writer);
writer.write('>');
//We fineshed with this level, pop to the previous definitions.
ns.outputNodePop();
- if (parentNode != null) {
+ if (parentNode != null) {
sibling= currentNode.getNextSibling();
- }
+ }
} else {
parentNode=currentElement;
}
@@ -298,7 +324,7 @@
}
while (sibling==null && parentNode!=null) {
writer.write(_END_TAG);
- writeStringToUtf8(((Element)parentNode).getTagName(),writer);
+ UtfHelpper.writeByte(((Element)parentNode).getTagName(),writer,cache);
writer.write('>');
//We fineshed with this level, pop to the previous definitions.
ns.outputNodePop();
@@ -307,6 +333,7 @@
sibling=parentNode.getNextSibling();
parentNode=parentNode.getParentNode();
if (!(parentNode instanceof Element)) {
+ documentLevel=NODE_AFTER_DOCUMENT_ELEMENT;
parentNode=null;
}
}
@@ -317,47 +344,8 @@
} while(true);
}
- /**
- * Checks whether a Comment or ProcessingInstruction is before or after the
- * document element. This is needed for prepending or appending "\n"s.
- *
- * @param currentNode comment or pi to check
- * @return NODE_BEFORE_DOCUMENT_ELEMENT, NODE_NOT_BEFORE_OR_AFTER_DOCUMENT_ELEMENT or NODE_AFTER_DOCUMENT_ELEMENT
- * @see #NODE_BEFORE_DOCUMENT_ELEMENT
- * @see #NODE_NOT_BEFORE_OR_AFTER_DOCUMENT_ELEMENT
- * @see #NODE_AFTER_DOCUMENT_ELEMENT
- */
- final static int getPositionRelativeToDocumentElement(Node currentNode) {
-
- if ((currentNode == null) ||
- (currentNode.getParentNode().getNodeType() != Node.DOCUMENT_NODE) ) {
- return CanonicalizerBase.NODE_NOT_BEFORE_OR_AFTER_DOCUMENT_ELEMENT;
- }
- Element documentElement = currentNode.getOwnerDocument().getDocumentElement();
- if ( (documentElement == null) || (documentElement == currentNode) ){
- return CanonicalizerBase.NODE_NOT_BEFORE_OR_AFTER_DOCUMENT_ELEMENT;
- }
- for (Node x = currentNode; x != null; x = x.getNextSibling()) {
- if (x == documentElement) {
- return CanonicalizerBase.NODE_BEFORE_DOCUMENT_ELEMENT;
- }
- }
- return CanonicalizerBase.NODE_AFTER_DOCUMENT_ELEMENT;
- }
-
- /**
- * Method engineCanonicalizeXPathNodeSet
- * @inheritDoc
- * @param xpathNodeSet
- * @throws CanonicalizationException
- */
- public byte[] engineCanonicalizeXPathNodeSet(Set xpathNodeSet)
- throws CanonicalizationException {
- this._xpathNodeSet = xpathNodeSet;
- return engineCanonicalizeXPathNodeSetInternal(XMLUtils.getOwnerDocument(this._xpathNodeSet));
- }
private byte[] engineCanonicalizeXPathNodeSetInternal(Node doc)
throws CanonicalizationException {
@@ -370,6 +358,12 @@
((ByteArrayOutputStream)this._writer).reset();
}
return sol;
+ } else if (this._writer instanceof UnsyncByteArrayOutputStream) {
+ byte []result=((UnsyncByteArrayOutputStream)this._writer).toByteArray();
+ if (reset) {
+ ((UnsyncByteArrayOutputStream)this._writer).reset();
+ }
+ return result;
}
return null;
} catch (UnsupportedEncodingException ex) {
@@ -390,11 +384,17 @@
*/
final void canonicalizeXPathNodeSet(Node currentNode,Node endnode )
throws CanonicalizationException, IOException {
- boolean currentNodeIsVisible = false;
- NameSpaceSymbTable ns=new NameSpaceSymbTable();
+ if (isVisibleInt(currentNode)==-1)
+ return;
+ boolean currentNodeIsVisible = false;
+ NameSpaceSymbTable ns=new NameSpaceSymbTable();
+ if (currentNode instanceof Element)
+ getParentNameSpaces((Element)currentNode,ns);
Node sibling=null;
Node parentNode=null;
OutputStream writer=this._writer;
+ int documentLevel=NODE_BEFORE_DOCUMENT_ELEMENT;
+ Map cache=new HashMap();
do {
switch (currentNode.getNodeType()) {
@@ -416,14 +416,14 @@
break;
case Node.COMMENT_NODE :
- if (this._includeComments && isVisible(currentNode)) {
- outputCommentToWriter((Comment) currentNode, writer);
+ if (this._includeComments && (isVisibleDO(currentNode,ns.getLevel())==1)) {
+ outputCommentToWriter((Comment) currentNode, writer, documentLevel);
}
break;
case Node.PROCESSING_INSTRUCTION_NODE :
if (isVisible(currentNode))
- outputPItoWriter((ProcessingInstruction) currentNode, writer);
+ outputPItoWriter((ProcessingInstruction) currentNode, writer, documentLevel);
break;
case Node.TEXT_NODE :
@@ -436,12 +436,6 @@
|| (nextSibling.getNodeType()
== Node.CDATA_SECTION_NODE));
nextSibling = nextSibling.getNextSibling()) {
- /* The XPath data model allows to select only the first of a
- * sequence of mixed text and CDATA nodes. But we must output
- * them all, so we must search:
- *
- * @see http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6329
- */
outputTextToWriter(nextSibling.getNodeValue(), writer);
currentNode=nextSibling;
sibling=currentNode.getNextSibling();
@@ -451,15 +445,21 @@
break;
case Node.ELEMENT_NODE :
+ documentLevel=NODE_NOT_BEFORE_OR_AFTER_DOCUMENT_ELEMENT;
Element currentElement = (Element) currentNode;
//Add a level to the nssymbtable. So latter can be pop-back.
String name=null;
- currentNodeIsVisible=isVisible(currentNode);
+ int i=isVisibleDO(currentNode,ns.getLevel());
+ if (i==-1) {
+ sibling= currentNode.getNextSibling();
+ break;
+ }
+ currentNodeIsVisible=(i==1);
if (currentNodeIsVisible) {
ns.outputNodePush();
writer.write('<');
name=currentElement.getTagName();
- writeStringToUtf8(name,writer);
+ UtfHelpper.writeByte(name,writer,cache);
} else {
ns.push();
}
@@ -469,7 +469,7 @@
//we output all Attrs which are available
while (attrs.hasNext()) {
Attr attr = (Attr) attrs.next();
- outputAttrToWriter(attr.getNodeName(),attr.getNodeValue(), writer);
+ outputAttrToWriter(attr.getNodeName(),attr.getNodeValue(), writer,cache);
}
}
if (currentNodeIsVisible) {
@@ -480,7 +480,7 @@
if (sibling==null) {
if (currentNodeIsVisible) {
writer.write(_END_TAG);
- writeStringToUtf8(name,writer);
+ UtfHelpper.writeByte(name,writer,cache);
writer.write('>');
//We fineshed with this level, pop to the previous definitions.
ns.outputNodePop();
@@ -498,7 +498,7 @@
while (sibling==null && parentNode!=null) {
if (isVisible(parentNode)) {
writer.write(_END_TAG);
- writeStringToUtf8(((Element)parentNode).getTagName(),writer);
+ UtfHelpper.writeByte(((Element)parentNode).getTagName(),writer,cache);
writer.write('>');
//We fineshed with this level, pop to the previous definitions.
ns.outputNodePop();
@@ -511,6 +511,7 @@
parentNode=parentNode.getParentNode();
if (!(parentNode instanceof Element)) {
parentNode=null;
+ documentLevel=NODE_AFTER_DOCUMENT_ELEMENT;
}
}
if (sibling==null)
@@ -519,12 +520,38 @@
sibling=currentNode.getNextSibling();
} while(true);
}
+ int isVisibleDO(Node currentNode,int level) {
+ if (nodeFilter!=null) {
+ Iterator it=nodeFilter.iterator();
+ while (it.hasNext()) {
+ int i=((NodeFilter)it.next()).isNodeIncludeDO(currentNode,level);
+ if (i!=1)
+ return i;
+ }
+ }
+ if ((this._xpathNodeSet!=null) && !this._xpathNodeSet.contains(currentNode))
+ return 0;
+ return 1;
+ }
+ int isVisibleInt(Node currentNode) {
+ if (nodeFilter!=null) {
+ Iterator it=nodeFilter.iterator();
+ while (it.hasNext()) {
+ int i=((NodeFilter)it.next()).isNodeInclude(currentNode);
+ if (i!=1)
+ return i;
+ }
+ }
+ if ((this._xpathNodeSet!=null) && !this._xpathNodeSet.contains(currentNode))
+ return 0;
+ return 1;
+ }
boolean isVisible(Node currentNode) {
if (nodeFilter!=null) {
Iterator it=nodeFilter.iterator();
while (it.hasNext()) {
- if (!((NodeFilter)it.next()).isNodeInclude(currentNode))
+ if (((NodeFilter)it.next()).isNodeInclude(currentNode)!=1)
return false;
}
}
@@ -533,19 +560,42 @@
return true;
}
+ void handleParent(Element e,NameSpaceSymbTable ns) {
+ if (!e.hasAttributes()) {
+ return;
+ }
+ NamedNodeMap attrs = e.getAttributes();
+ int attrsLength = attrs.getLength();
+ for (int i = 0; i < attrsLength; i++) {
+ Attr N = (Attr) attrs.item(i);
+ if (Constants.NamespaceSpecNS!=N.getNamespaceURI()) {
+ //Not a namespace definition, ignore.
+ continue;
+ }
+
+ String NName=N.getLocalName();
+ String NValue=N.getNodeValue();
+ if (XML.equals(NName)
+ && Constants.XML_LANG_SPACE_SpecNS.equals(NValue)) {
+ continue;
+ }
+ ns.addMapping(NName,NValue,N);
+ }
+ }
+
/**
* Adds to ns the definitons from the parent elements of el
* @param el
* @param ns
*/
- final static void getParentNameSpaces(Element el,NameSpaceSymbTable ns) {
- List parents=new ArrayList();
+ final void getParentNameSpaces(Element el,NameSpaceSymbTable ns) {
+ List parents=new ArrayList(10);
Node n1=el.getParentNode();
if (!(n1 instanceof Element)) {
return;
}
//Obtain all the parents of the elemnt
- Element parent=(Element) el.getParentNode();
+ Element parent=(Element) n1;
while (parent!=null) {
parents.add(parent);
Node n=parent.getParentNode();
@@ -557,28 +607,9 @@
//Visit them in reverse order.
ListIterator it=parents.listIterator(parents.size());
while (it.hasPrevious()) {
- Element ele=(Element)it.previous();
- if (!ele.hasAttributes()) {
- continue;
+ Element ele=(Element)it.previous();
+ handleParent(ele, ns);
}
- NamedNodeMap attrs = ele.getAttributes();
- int attrsLength = attrs.getLength();
- for (int i = 0; i < attrsLength; i++) {
- Attr N = (Attr) attrs.item(i);
- if (!Constants.NamespaceSpecNS.equals(N.getNamespaceURI())) {
- //Not a namespace definition, ignore.
- continue;
- }
-
- String NName=N.getLocalName();
- String NValue=N.getNodeValue();
- if (XML.equals(NName)
- && Constants.XML_LANG_SPACE_SpecNS.equals(NValue)) {
- continue;
- }
- ns.addMapping(NName,NValue,N);
- }
- }
Attr nsprefix;
if (((nsprefix=ns.getMappingWithoutRendered("xmlns"))!=null)
&& "".equals(nsprefix.getValue())) {
@@ -586,269 +617,6 @@
}
}
/**
- * Outputs an Attribute to the internal Writer.
- *
- * The string value of the node is modified by replacing
- * <UL>
- * <LI>all ampersands (&) with <CODE>&amp;</CODE></LI>
- * <LI>all open angle brackets (<) with <CODE>&lt;</CODE></LI>
- * <LI>all quotation mark characters with <CODE>&quot;</CODE></LI>
- * <LI>and the whitespace characters <CODE>#x9</CODE>, #xA, and #xD, with character
- * references. The character references are written in uppercase
- * hexadecimal with no leading zeroes (for example, <CODE>#xD</CODE> is represented
- * by the character reference <CODE>&#xD;</CODE>)</LI>
- * </UL>
- *
- * @param name
- * @param value
- * @param writer
- * @throws IOException
- */
- static final void outputAttrToWriter(final String name, final String value, final OutputStream writer) throws IOException {
- writer.write(' ');
- writeStringToUtf8(name,writer);
- writer.write(equalsStr);
- byte []toWrite;
- final int length = value.length();
- for (int i=0;i < length; i++) {
- char c = value.charAt(i);
-
- switch (c) {
-
- case '&' :
- toWrite=_AMP_;
- //writer.write(_AMP_);
- break;
-
- case '<' :
- toWrite=_LT_;
- //writer.write(_LT_);
- break;
-
- case '"' :
- toWrite=_QUOT_;
- //writer.write(_QUOT_);
- break;
-
- case 0x09 : // '\t'
- toWrite=__X9_;
- //writer.write(__X9_);
- break;
-
- case 0x0A : // '\n'
- toWrite=__XA_;
- //writer.write(__XA_);
- break;
-
- case 0x0D : // '\r'
- toWrite=__XD_;
- //writer.write(__XD_);
- break;
-
- default :
- writeCharToUtf8(c,writer);
- //this._writer.write(c);
- continue;
- }
- writer.write(toWrite);
- }
-
- writer.write('\"');
- }
-
- final static void writeCharToUtf8(final char c,final OutputStream out) throws IOException{
- char ch;
- if (/*(c >= 0x0001) &&*/ (c <= 0x007F)) {
- out.write(c);
- return;
- }
- int bias;
- int write;
- if (c > 0x07FF) {
- ch=(char)(c>>>12);
- write=0xE0;
- if (ch>0) {
- write |= ( ch & 0x0F);
- }
- out.write(write);
- write=0x80;
- bias=0x3F;
- } else {
- write=0xC0;
- bias=0x1F;
- }
- ch=(char)(c>>>6);
- if (ch>0) {
- write|= (ch & bias);
- }
- out.write(write);
- out.write(0x80 | ((c) & 0x3F));
-
- }
-
- final static void writeStringToUtf8(final String str,final OutputStream out) throws IOException{
- final int length=str.length();
- int i=0;
- char c;
- while (i<length) {
- c=str.charAt(i++);
- if (/*(c >= 0x0001) &&*/ (c <= 0x007F)) {
- out.write(c);
- continue;
- }
- char ch;
- int bias;
- int write;
- if (c > 0x07FF) {
- ch=(char)(c>>>12);
- write=0xE0;
- if (ch>0) {
- write |= ( ch & 0x0F);
- }
- out.write(write);
- write=0x80;
- bias=0x3F;
- } else {
- write=0xC0;
- bias=0x1F;
- }
- ch=(char)(c>>>6);
- if (ch>0) {
- write|= (ch & bias);
- }
- out.write(write);
- out.write(0x80 | ((c) & 0x3F));
- continue;
-
- }
-
- }
- /**
- * Outputs a PI to the internal Writer.
- *
- * @param currentPI
- * @param writer where to write the things
- * @throws IOException
- */
- static final void outputPItoWriter(ProcessingInstruction currentPI, OutputStream writer) throws IOException {
- final int position = getPositionRelativeToDocumentElement(currentPI);
-
- if (position == NODE_AFTER_DOCUMENT_ELEMENT) {
- writer.write('\n');
- }
- writer.write(_BEGIN_PI);
-
- final String target = currentPI.getTarget();
- int length = target.length();
-
- for (int i = 0; i < length; i++) {
- char c=target.charAt(i);
- if (c==0x0D) {
- writer.write(__XD_);
- } else {
- writeCharToUtf8(c,writer);
- }
- }
-
- final String data = currentPI.getData();
-
- length = data.length();
-
- if (length > 0) {
- writer.write(' ');
-
- for (int i = 0; i < length; i++) {
- char c=data.charAt(i);
- if (c==0x0D) {
- writer.write(__XD_);
- } else {
- writeCharToUtf8(c,writer);
- }
- }
- }
-
- writer.write(_END_PI);
- if (position == NODE_BEFORE_DOCUMENT_ELEMENT) {
- writer.write('\n');
- }
- }
-
- /**
- * Method outputCommentToWriter
- *
- * @param currentComment
- * @param writer writer where to write the things
- * @throws IOException
- */
- static final void outputCommentToWriter(Comment currentComment, OutputStream writer) throws IOException {
- final int position = getPositionRelativeToDocumentElement(currentComment);
- if (position == NODE_AFTER_DOCUMENT_ELEMENT) {
- writer.write('\n');
- }
- writer.write(_BEGIN_COMM);
-
- final String data = currentComment.getData();
- final int length = data.length();
-
- for (int i = 0; i < length; i++) {
- char c=data.charAt(i);
- if (c==0x0D) {
- writer.write(__XD_);
- } else {
- writeCharToUtf8(c,writer);
- }
- }
-
- writer.write(_END_COMM);
- if (position == NODE_BEFORE_DOCUMENT_ELEMENT) {
- writer.write('\n');
- }
- }
-
- /**
- * Outputs a Text of CDATA section to the internal Writer.
- *
- * @param text
- * @param writer writer where to write the things
- * @throws IOException
- */
- static final void outputTextToWriter(final String text, final OutputStream writer) throws IOException {
- final int length = text.length();
- byte []toWrite;
- for (int i = 0; i < length; i++) {
- char c = text.charAt(i);
-
- switch (c) {
-
- case '&' :
- toWrite=_AMP_;
- //writer.write(_AMP_);
- break;
-
- case '<' :
- toWrite=_LT_;
- //writer.write(_LT_);
- break;
-
- case '>' :
- toWrite=_GT_;
- //writer.write(_GT_);
- break;
-
- case 0xD :
- toWrite=__XD_;
- //writer.write(__XD_);
- break;
-
- default :
- writeCharToUtf8(c,writer);
- continue;
- }
- writer.write(toWrite);
- }
- }
-
- /**
* Obtain the attributes to output for this node in XPathNodeSet c14n.
*
* @param E
@@ -870,13 +638,207 @@
abstract Iterator handleAttributesSubtree(Element E, NameSpaceSymbTable ns)
throws CanonicalizationException;
+ abstract void circumventBugIfNeeded(XMLSignatureInput input) throws CanonicalizationException, ParserConfigurationException, IOException, SAXException;
+ /**
+ * Outputs an Attribute to the internal Writer.
+ *
+ * The string value of the node is modified by replacing
+ * <UL>
+ * <LI>all ampersands (&) with <CODE>&amp;</CODE></LI>
+ * <LI>all open angle brackets (<) with <CODE>&lt;</CODE></LI>
+ * <LI>all quotation mark characters with <CODE>&quot;</CODE></LI>
+ * <LI>and the whitespace characters <CODE>#x9</CODE>, #xA, and #xD, with character
+ * references. The character references are written in uppercase
+ * hexadecimal with no leading zeroes (for example, <CODE>#xD</CODE> is represented
+ * by the character reference <CODE>&#xD;</CODE>)</LI>
+ * </UL>
+ *
+ * @param name
+ * @param value
+ * @param writer
+ * @throws IOException
+ */
+ static final void outputAttrToWriter(final String name, final String value, final OutputStream writer,
+ final Map cache) throws IOException {
+ writer.write(' ');
+ UtfHelpper.writeByte(name,writer,cache);
+ writer.write(equalsStr);
+ byte []toWrite;
+ final int length = value.length();
+ int i=0;
+ while (i < length) {
+ char c = value.charAt(i++);
+
+ switch (c) {
+
+ case '&' :
+ toWrite=_AMP_;
+ break;
+
+ case '<' :
+ toWrite=_LT_;
+ break;
+
+ case '"' :
+ toWrite=_QUOT_;
+ break;
+
+ case 0x09 : // '\t'
+ toWrite=__X9_;
+ break;
+
+ case 0x0A : // '\n'
+ toWrite=__XA_;
+ break;
+
+ case 0x0D : // '\r'
+ toWrite=__XD_;
+ break;
+
+ default :
+ if (c < 0x80 ) {
+ writer.write(c);
+ } else {
+ UtfHelpper.writeCharToUtf8(c,writer);
+ };
+ continue;
+ }
+ writer.write(toWrite);
+ }
+
+ writer.write('\"');
+ }
+
+ /**
+ * Outputs a PI to the internal Writer.
+ *
+ * @param currentPI
+ * @param writer where to write the things
+ * @throws IOException
+ */
+ static final void outputPItoWriter(ProcessingInstruction currentPI, OutputStream writer,int position) throws IOException {
+
+ if (position == NODE_AFTER_DOCUMENT_ELEMENT) {
+ writer.write('\n');
+ }
+ writer.write(_BEGIN_PI);
+
+ final String target = currentPI.getTarget();
+ int length = target.length();
- /**
- * @param _writer The _writer to set.
- */
- public void setWriter(OutputStream _writer) {
- this._writer = _writer;
- }
+ for (int i = 0; i < length; i++) {
+ char c=target.charAt(i);
+ if (c==0x0D) {
+ writer.write(__XD_);
+ } else {
+ if (c < 0x80) {
+ writer.write(c);
+ } else {
+ UtfHelpper.writeCharToUtf8(c,writer);
+ };
+ }
+ }
+
+ final String data = currentPI.getData();
+
+ length = data.length();
+
+ if (length > 0) {
+ writer.write(' ');
+
+ for (int i = 0; i < length; i++) {
+ char c=data.charAt(i);
+ if (c==0x0D) {
+ writer.write(__XD_);
+ } else {
+ UtfHelpper.writeCharToUtf8(c,writer);
+ }
+ }
+ }
+
+ writer.write(_END_PI);
+ if (position == NODE_BEFORE_DOCUMENT_ELEMENT) {
+ writer.write('\n');
+ }
+ }
+
+ /**
+ * Method outputCommentToWriter
+ *
+ * @param currentComment
+ * @param writer writer where to write the things
+ * @throws IOException
+ */
+ static final void outputCommentToWriter(Comment currentComment, OutputStream writer,int position) throws IOException {
+ if (position == NODE_AFTER_DOCUMENT_ELEMENT) {
+ writer.write('\n');
+ }
+ writer.write(_BEGIN_COMM);
+
+ final String data = currentComment.getData();
+ final int length = data.length();
+
+ for (int i = 0; i < length; i++) {
+ char c=data.charAt(i);
+ if (c==0x0D) {
+ writer.write(__XD_);
+ } else {
+ if (c < 0x80) {
+ writer.write(c);
+ } else {
+ UtfHelpper.writeCharToUtf8(c,writer);
+ };
+ }
+ }
+
+ writer.write(_END_COMM);
+ if (position == NODE_BEFORE_DOCUMENT_ELEMENT) {
+ writer.write('\n');
+ }
+ }
+
+ /**
+ * Outputs a Text of CDATA section to the internal Writer.
+ *
+ * @param text
+ * @param writer writer where to write the things
+ * @throws IOException
+ */
+ static final void outputTextToWriter(final String text, final OutputStream writer) throws IOException {
+ final int length = text.length();
+ byte []toWrite;
+ for (int i = 0; i < length; i++) {
+ char c = text.charAt(i);
+
+ switch (c) {
+
+ case '&' :
+ toWrite=_AMP_;
+ break;
+
+ case '<' :
+ toWrite=_LT_;
+ break;
+
+ case '>' :
+ toWrite=_GT_;
+ break;
+
+ case 0xD :
+ toWrite=__XD_;
+ break;
+
+ default :
+ if (c < 0x80) {
+ writer.write(c);
+ } else {
+ UtfHelpper.writeCharToUtf8(c,writer);
+ };
+ continue;
+ }
+ writer.write(toWrite);
+ }
+ }
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/NameSpaceSymbTable.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/NameSpaceSymbTable.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,16 +20,10 @@
*/
package com.sun.org.apache.xml.internal.security.c14n.implementations;
-import java.lang.reflect.Array;
-import java.util.AbstractList;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
-
import org.w3c.dom.Attr;
@@ -46,21 +40,26 @@
public class NameSpaceSymbTable {
/**The map betwen prefix-> entry table. */
- SymbMap symb = new SymbMap();
+ SymbMap symb;
/**The level of nameSpaces (for Inclusive visibility).*/
int nameSpaces=0;
/**The stacks for removing the definitions when doing pop.*/
- List level = new ArrayList();
+ List level;
boolean cloned=true;
static final String XMLNS="xmlns";
+ final static SymbMap initialMap=new SymbMap();
+ static {
+ NameSpaceSymbEntry ne=new NameSpaceSymbEntry("",null,true,XMLNS);
+ ne.lastrendered="";
+ initialMap.put(XMLNS,ne);
+ }
/**
* Default constractor
**/
public NameSpaceSymbTable() {
+ level = new ArrayList(10);
//Insert the default binding for xmlns.
- NameSpaceSymbEntry ne=new NameSpaceSymbEntry("",null,true);
- ne.lastrendered="";
- symb.put(XMLNS,ne);
+ symb=(SymbMap) initialMap.clone();
}
/**
@@ -75,8 +74,14 @@
NameSpaceSymbEntry n=(NameSpaceSymbEntry)(it.next());
//put them rendered?
if ((!n.rendered) && (n.n!=null)) {
+ n=(NameSpaceSymbEntry) n.clone();
+ needsClone();
+ symb.put(n.prefix,n);
+ n.lastrendered=n.uri;
+ n.rendered=true;
+
result.add(n.n);
- n.rendered=true;
+
}
}
}
@@ -104,10 +109,6 @@
**/
public void push() {
//Put the number of namespace definitions in the stack.
- /**if (cloned) {
- Object ob[]= {symb,cloned ? symb : null};
- level.add(ob);
- } **/
level.add(null);
cloned=false;
}
@@ -124,7 +125,7 @@
if (size==0) {
cloned=false;
} else
- cloned=(level.get(size-1)!=symb);
+ cloned=(level.get(size-1)!=symb);
} else {
cloned=false;
}
@@ -134,8 +135,7 @@
final void needsClone() {
if (!cloned) {
- level.remove(level.size()-1);
- level.add(symb);
+ level.set(level.size()-1,symb);
symb=(SymbMap) symb.clone();
cloned=true;
}
@@ -200,7 +200,7 @@
return false;
}
//Creates and entry in the table for this new definition.
- NameSpaceSymbEntry ne=new NameSpaceSymbEntry(uri,n,false);
+ NameSpaceSymbEntry ne=new NameSpaceSymbEntry(uri,n,false,prefix);
needsClone();
symb.put(prefix, ne);
if (ob != null) {
@@ -238,7 +238,7 @@
return null;
}
- NameSpaceSymbEntry ne=new NameSpaceSymbEntry(uri,n,true);
+ NameSpaceSymbEntry ne=new NameSpaceSymbEntry(uri,n,true,prefix);
ne.lastrendered=uri;
needsClone();
symb.put(prefix, ne);
@@ -251,53 +251,38 @@
}
return ne.n;
}
- /**
- * Adds & gets(if needed) the attribute node that defines the binding for the prefix.
- * Take on account if the rules of rendering in the inclusive c14n.
- * For inclusive c14n.
- * @param prefix the prefix to obtain the attribute.
- * @param outputNode the container element is an output element.
- * @param uri the Uri of the definition
- * @param n the attribute that have the definition
- * @return null if there is no need to render the prefix. Otherwise the node of
- * definition.
- **/
- public Node addMappingAndRenderXNodeSet(String prefix, String uri,Attr n,boolean outputNode) {
+
+ public int getLevel() {
+ // TODO Auto-generated method stub
+ return level.size();
+ }
+
+ public void removeMapping(String prefix) {
NameSpaceSymbEntry ob = symb.get(prefix);
- int visibleNameSpaces=nameSpaces;
- if ((ob!=null) && uri.equals(ob.uri)) {
- if (!ob.rendered) {
- ob=(NameSpaceSymbEntry)ob.clone();
- needsClone();
- symb.put(prefix,ob);
- ob.rendered=true;
- ob.level=visibleNameSpaces;
- return ob.n;
- }
- ob=(NameSpaceSymbEntry)ob.clone();
+
+ if (ob!=null) {
+ needsClone();
+ symb.put(prefix,null);
+ }
+ }
+
+ public void removeMappingIfNotRender(String prefix) {
+ NameSpaceSymbEntry ob = symb.get(prefix);
+
+ if (ob!=null && !ob.rendered) {
needsClone();
- symb.put(prefix,ob);
- if (outputNode && (((visibleNameSpaces-ob.level)<2) || XMLNS.equals(prefix)) ) {
- ob.level=visibleNameSpaces;
- return null; //Already rendered, just return nulll
- }
- ob.level=visibleNameSpaces;
- return ob.n;
- }
+ symb.put(prefix,null);
+ }
+ }
- NameSpaceSymbEntry ne=new NameSpaceSymbEntry(uri,n,true);
- ne.level=nameSpaces;
- ne.rendered=true;
- needsClone();
- symb.put(prefix, ne);
- if (ob != null) {
- ne.lastrendered=ob.lastrendered;
+ public boolean removeMappingIfRender(String prefix) {
+ NameSpaceSymbEntry ob = symb.get(prefix);
- if ((ob.lastrendered!=null)&& (ob.lastrendered.equals(uri))) {
- ne.rendered=true;
- }
- }
- return ne.n;
+ if (ob!=null && ob.rendered) {
+ needsClone();
+ symb.put(prefix,null);
+ }
+ return false;
}
}
@@ -305,10 +290,11 @@
* The internal structure of NameSpaceSymbTable.
**/
class NameSpaceSymbEntry implements Cloneable {
- NameSpaceSymbEntry(String name,Attr n,boolean rendered) {
+ NameSpaceSymbEntry(String name,Attr n,boolean rendered,String prefix) {
this.uri=name;
this.rendered=rendered;
this.n=n;
+ this.prefix=prefix;
}
/** @inheritDoc */
public Object clone() {
@@ -320,6 +306,7 @@
}
/** The level where the definition was rendered(Only for inclusive) */
int level=0;
+ String prefix;
/**The URI that the prefix defines */
String uri;
/**The last output in the URI for this prefix (This for speed reason).*/
@@ -330,53 +317,57 @@
Attr n;
};
-class SymbMap implements Cloneable{
- int free=23;
- NameSpaceSymbEntry[] entries=new NameSpaceSymbEntry[free];
- String[] keys=new String[free];
-
- void put(String key, NameSpaceSymbEntry value) {
+class SymbMap implements Cloneable {
+ int free=23;
+ NameSpaceSymbEntry[] entries;
+ String[] keys;
+ SymbMap() {
+ entries=new NameSpaceSymbEntry[free];
+ keys=new String[free];
+ }
+ void put(String key, NameSpaceSymbEntry value) {
int index = index(key);
- Object oldKey = keys[index];
- keys[index] = key;
- entries[index] = value;
+ Object oldKey = keys[index];
+ keys[index] = key;
+ entries[index] = value;
if (oldKey==null || !oldKey.equals(key)) {
- if (--free == 0) {
- free=entries.length;
- int newCapacity = free<<2;
- rehash(newCapacity);
- }
+ if (--free == 0) {
+ free=entries.length;
+ int newCapacity = free<<2;
+ rehash(newCapacity);
+ }
}
}
List entrySet() {
- List a=new ArrayList();
- for (int i=0;i<entries.length;i++) {
- if ((entries[i]!=null) && !("".equals(entries[i]))) {
- a.add(entries[i]);
- }
- }
- return a;
+ List a=new ArrayList();
+ for (int i=0;i<entries.length;i++) {
+ if ((entries[i]!=null) && !("".equals(entries[i].uri))) {
+ a.add(entries[i]);
+ }
}
-
+ return a;
+ }
- protected int index(Object obj) {
+ protected int index(Object obj) {
Object[] set = keys;
- int length = set.length;
- //abs of index
+ int length = set.length;
+ //abs of index
int index = (obj.hashCode() & 0x7fffffff) % length;
Object cur = set[index];
if (cur == null || (cur.equals( obj))) {
- return index;
+ return index;
}
+ length=length-1;
do {
- index=index==length? 0:++index;
- cur = set[index];
+ index=index==length? 0:++index;
+ cur = set[index];
} while (cur != null && (!cur.equals(obj)));
return index;
}
- /**
+
+ /**
* rehashes the map to the new capacity.
*
* @param newCapacity an <code>int</code> value
@@ -384,37 +375,38 @@
protected void rehash(int newCapacity) {
int oldCapacity = keys.length;
String oldKeys[] = keys;
- NameSpaceSymbEntry oldVals[] = entries;
+ NameSpaceSymbEntry oldVals[] = entries;
- keys = new String[newCapacity];
- entries = new NameSpaceSymbEntry[newCapacity];
+ keys = new String[newCapacity];
+ entries = new NameSpaceSymbEntry[newCapacity];
for (int i = oldCapacity; i-- > 0;) {
if(oldKeys[i] != null) {
String o = oldKeys[i];
int index = index(o);
- keys[index] = o;
- entries[index] = oldVals[i];
+ keys[index] = o;
+ entries[index] = oldVals[i];
}
}
}
- NameSpaceSymbEntry get(String key) {
- return entries[index(key)];
- }
- protected Object clone() {
- // TODO Auto-generated method stub
- try {
- SymbMap copy=(SymbMap) super.clone();
- copy.entries=new NameSpaceSymbEntry[entries.length];
- System.arraycopy(entries,0,copy.entries,0,entries.length);
- copy.keys=new String[keys.length];
- System.arraycopy(keys,0,copy.keys,0,keys.length);
+
+ NameSpaceSymbEntry get(String key) {
+ return entries[index(key)];
+ }
- return copy;
- } catch (CloneNotSupportedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- return null;
+ protected Object clone() {
+ try {
+ SymbMap copy=(SymbMap) super.clone();
+ copy.entries=new NameSpaceSymbEntry[entries.length];
+ System.arraycopy(entries,0,copy.entries,0,entries.length);
+ copy.keys=new String[keys.length];
+ System.arraycopy(keys,0,copy.keys,0,keys.length);
+
+ return copy;
+ } catch (CloneNotSupportedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
}
+ return null;
+ }
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/UtfHelpper.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,155 @@
+package com.sun.org.apache.xml.internal.security.c14n.implementations;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Map;
+
+public class UtfHelpper {
+
+ final static void writeByte(final String str,final OutputStream out,Map cache) throws IOException {
+ byte []result=(byte[]) cache.get(str);
+ if (result==null) {
+ result=getStringInUtf8(str);
+ cache.put(str,result);
+ }
+
+ out.write(result);
+
+ }
+
+ final static void writeCharToUtf8(final char c,final OutputStream out) throws IOException{
+ if (c < 0x80) {
+ out.write(c);
+ return;
+ }
+ if ((c >= 0xD800 && c <= 0xDBFF) || (c >= 0xDC00 && c <= 0xDFFF) ){
+ //No Surrogates in sun java
+ out.write(0x3f);
+ return;
+ }
+ int bias;
+ int write;
+ char ch;
+ if (c > 0x07FF) {
+ ch=(char)(c>>>12);
+ write=0xE0;
+ if (ch>0) {
+ write |= ( ch & 0x0F);
+ }
+ out.write(write);
+ write=0x80;
+ bias=0x3F;
+ } else {
+ write=0xC0;
+ bias=0x1F;
+ }
+ ch=(char)(c>>>6);
+ if (ch>0) {
+ write|= (ch & bias);
+ }
+ out.write(write);
+ out.write(0x80 | ((c) & 0x3F));
+
+ }
+
+ final static void writeStringToUtf8(final String str,final OutputStream out) throws IOException{
+ final int length=str.length();
+ int i=0;
+ char c;
+ while (i<length) {
+ c=str.charAt(i++);
+ if (c < 0x80) {
+ out.write(c);
+ continue;
+ }
+ if ((c >= 0xD800 && c <= 0xDBFF) || (c >= 0xDC00 && c <= 0xDFFF) ){
+ //No Surrogates in sun java
+ out.write(0x3f);
+ continue;
+ }
+ char ch;
+ int bias;
+ int write;
+ if (c > 0x07FF) {
+ ch=(char)(c>>>12);
+ write=0xE0;
+ if (ch>0) {
+ write |= ( ch & 0x0F);
+ }
+ out.write(write);
+ write=0x80;
+ bias=0x3F;
+ } else {
+ write=0xC0;
+ bias=0x1F;
+ }
+ ch=(char)(c>>>6);
+ if (ch>0) {
+ write|= (ch & bias);
+ }
+ out.write(write);
+ out.write(0x80 | ((c) & 0x3F));
+
+ }
+
+ }
+ public final static byte[] getStringInUtf8(final String str) {
+ final int length=str.length();
+ boolean expanded=false;
+ byte []result=new byte[length];
+ int i=0;
+ int out=0;
+ char c;
+ while (i<length) {
+ c=str.charAt(i++);
+ if ( c < 0x80 ) {
+ result[out++]=(byte)c;
+ continue;
+ }
+ if ((c >= 0xD800 && c <= 0xDBFF) || (c >= 0xDC00 && c <= 0xDFFF) ){
+ //No Surrogates in sun java
+ result[out++]=0x3f;
+
+ continue;
+ }
+ if (!expanded) {
+ byte newResult[]=new byte[3*length];
+ System.arraycopy(result, 0, newResult, 0, out);
+ result=newResult;
+ expanded=true;
+ }
+ char ch;
+ int bias;
+ byte write;
+ if (c > 0x07FF) {
+ ch=(char)(c>>>12);
+ write=(byte)0xE0;
+ if (ch>0) {
+ write |= ( ch & 0x0F);
+ }
+ result[out++]=write;
+ write=(byte)0x80;
+ bias=0x3F;
+ } else {
+ write=(byte)0xC0;
+ bias=0x1F;
+ }
+ ch=(char)(c>>>6);
+ if (ch>0) {
+ write|= (ch & bias);
+ }
+ result[out++]=write;
+ result[out++]=(byte)(0x80 | ((c) & 0x3F));/**/
+
+ }
+ if (expanded) {
+ byte newResult[]=new byte[out];
+ System.arraycopy(result, 0, newResult, 0, out);
+ result=newResult;
+ }
+ return result;
+ }
+
+
+
+}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipher.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipher.java Wed Jul 05 16:42:37 2017 +0200
@@ -22,6 +22,7 @@
import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
import java.io.IOException;
import java.io.StringReader;
import java.io.UnsupportedEncodingException;
@@ -30,6 +31,7 @@
import java.security.Key;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -204,7 +206,7 @@
* @since 1.0.
*/
private XMLCipher() {
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Constructing XMLCipher...");
+ logger.log(java.util.logging.Level.FINE, "Constructing XMLCipher...");
_factory = new Factory();
_serializer = new Serializer();
@@ -266,7 +268,7 @@
public static XMLCipher getInstance(String transformation) throws
XMLEncryptionException {
// sanity checks
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Getting XMLCipher...");
+ logger.log(java.util.logging.Level.FINE, "Getting XMLCipher...");
if (null == transformation)
logger.log(java.util.logging.Level.SEVERE, "Transformation unexpectedly null...");
if(!isValidEncryptionAlgorithm(transformation))
@@ -294,7 +296,7 @@
try {
instance._contextCipher = Cipher.getInstance(jceAlgorithm);
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "cihper.algoritm = " +
+ logger.log(java.util.logging.Level.FINE, "cihper.algoritm = " +
instance._contextCipher.getAlgorithm());
} catch (NoSuchAlgorithmException nsae) {
throw new XMLEncryptionException("empty", nsae);
@@ -305,49 +307,6 @@
return (instance);
}
- public static XMLCipher getInstance(String transformation,Cipher cipher) throws
- XMLEncryptionException {
- // sanity checks
- logger.log(java.util.logging.Level.FINE, "Getting XMLCipher...");
- if (null == transformation)
- logger.log(java.util.logging.Level.SEVERE, "Transformation unexpectedly null...");
- if(!isValidEncryptionAlgorithm(transformation))
- logger.log(java.util.logging.Level.WARNING, "Algorithm non-standard, expected one of " + ENC_ALGORITHMS);
-
- XMLCipher instance = new XMLCipher();
-
- instance._algorithm = transformation;
- instance._key = null;
- instance._kek = null;
-
-
- /* Create a canonicaliser - used when serialising DOM to octets
- * prior to encryption (and for the reverse) */
-
- try {
- instance._canon = Canonicalizer.getInstance
- (Canonicalizer.ALGO_ID_C14N_WITH_COMMENTS);
-
- } catch (InvalidCanonicalizerException ice) {
- throw new XMLEncryptionException("empty", ice);
- }
-
- String jceAlgorithm = JCEMapper.translateURItoJCEID(transformation);
-
- try {
- instance._contextCipher = cipher;
- //Cipher.getInstance(jceAlgorithm);
- logger.log(java.util.logging.Level.FINE, "cihper.algoritm = " +
- instance._contextCipher.getAlgorithm());
- }catch(Exception ex) {
- throw new XMLEncryptionException("empty", ex);
- }
-
- return (instance);
- }
-
-
-
/**
* Returns an <code>XMLCipher</code> that implements the specified
* transformation, operates on the specified context document and serializes
@@ -380,6 +339,45 @@
return instance;
}
+ public static XMLCipher getInstance(String transformation,Cipher cipher) throws XMLEncryptionException {
+ // sanity checks
+ logger.log(java.util.logging.Level.FINE, "Getting XMLCipher...");
+ if (null == transformation)
+ logger.log(java.util.logging.Level.SEVERE, "Transformation unexpectedly null...");
+ if(!isValidEncryptionAlgorithm(transformation))
+ logger.log(java.util.logging.Level.WARNING, "Algorithm non-standard, expected one of " + ENC_ALGORITHMS);
+
+ XMLCipher instance = new XMLCipher();
+
+ instance._algorithm = transformation;
+ instance._key = null;
+ instance._kek = null;
+
+
+ /* Create a canonicaliser - used when serialising DOM to octets
+ * prior to encryption (and for the reverse) */
+
+ try {
+ instance._canon = Canonicalizer.getInstance
+ (Canonicalizer.ALGO_ID_C14N_WITH_COMMENTS);
+
+ } catch (InvalidCanonicalizerException ice) {
+ throw new XMLEncryptionException("empty", ice);
+ }
+
+ String jceAlgorithm = JCEMapper.translateURItoJCEID(transformation);
+
+ try {
+ instance._contextCipher = cipher;
+ //Cipher.getInstance(jceAlgorithm);
+ logger.log(java.util.logging.Level.FINE, "cihper.algoritm = " +
+ instance._contextCipher.getAlgorithm());
+ }catch(Exception ex) {
+ throw new XMLEncryptionException("empty", ex);
+ }
+
+ return (instance);
+ }
/**
* Returns an <code>XMLCipher</code> that implements the specified
@@ -396,7 +394,7 @@
public static XMLCipher getProviderInstance(String transformation, String provider)
throws XMLEncryptionException {
// sanity checks
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Getting XMLCipher...");
+ logger.log(java.util.logging.Level.FINE, "Getting XMLCipher...");
if (null == transformation)
logger.log(java.util.logging.Level.SEVERE, "Transformation unexpectedly null...");
if(null == provider)
@@ -429,9 +427,9 @@
instance._contextCipher = Cipher.getInstance(jceAlgorithm, provider);
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "cipher._algorithm = " +
+ logger.log(java.util.logging.Level.FINE, "cipher._algorithm = " +
instance._contextCipher.getAlgorithm());
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "provider.name = " + provider);
+ logger.log(java.util.logging.Level.FINE, "provider.name = " + provider);
} catch (NoSuchAlgorithmException nsae) {
throw new XMLEncryptionException("empty", nsae);
} catch (NoSuchProviderException nspre) {
@@ -490,7 +488,7 @@
public static XMLCipher getInstance()
throws XMLEncryptionException {
// sanity checks
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Getting XMLCipher for no transformation...");
+ logger.log(java.util.logging.Level.FINE, "Getting XMLCipher for no transformation...");
XMLCipher instance = new XMLCipher();
@@ -532,7 +530,7 @@
throws XMLEncryptionException {
// sanity checks
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Getting XMLCipher, provider but no transformation");
+ logger.log(java.util.logging.Level.FINE, "Getting XMLCipher, provider but no transformation");
if(null == provider)
logger.log(java.util.logging.Level.SEVERE, "Provider unexpectedly null..");
if("" == provider)
@@ -578,7 +576,7 @@
*/
public void init(int opmode, Key key) throws XMLEncryptionException {
// sanity checks
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Initializing XMLCipher...");
+ logger.log(java.util.logging.Level.FINE, "Initializing XMLCipher...");
_ek = null;
_ed = null;
@@ -586,18 +584,18 @@
switch (opmode) {
case ENCRYPT_MODE :
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "opmode = ENCRYPT_MODE");
+ logger.log(java.util.logging.Level.FINE, "opmode = ENCRYPT_MODE");
_ed = createEncryptedData(CipherData.VALUE_TYPE, "NO VALUE YET");
break;
case DECRYPT_MODE :
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "opmode = DECRYPT_MODE");
+ logger.log(java.util.logging.Level.FINE, "opmode = DECRYPT_MODE");
break;
case WRAP_MODE :
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "opmode = WRAP_MODE");
+ logger.log(java.util.logging.Level.FINE, "opmode = WRAP_MODE");
_ek = createEncryptedKey(CipherData.VALUE_TYPE, "NO VALUE YET");
break;
case UNWRAP_MODE :
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "opmode = UNWRAP_MODE");
+ logger.log(java.util.logging.Level.FINE, "opmode = UNWRAP_MODE");
break;
default :
logger.log(java.util.logging.Level.SEVERE, "Mode unexpectedly invalid");
@@ -622,7 +620,7 @@
public EncryptedData getEncryptedData() {
// Sanity checks
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Returning EncryptedData");
+ logger.log(java.util.logging.Level.FINE, "Returning EncryptedData");
return _ed;
}
@@ -640,7 +638,7 @@
public EncryptedKey getEncryptedKey() {
// Sanity checks
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Returning EncryptedKey");
+ logger.log(java.util.logging.Level.FINE, "Returning EncryptedKey");
return _ek;
}
@@ -750,11 +748,11 @@
*/
private Document encryptElement(Element element) throws Exception{
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Encrypting element...");
+ logger.log(java.util.logging.Level.FINE, "Encrypting element...");
if(null == element)
logger.log(java.util.logging.Level.SEVERE, "Element unexpectedly null...");
if(_cipherMode != ENCRYPT_MODE)
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "XMLCipher unexpectedly not in ENCRYPT_MODE...");
+ logger.log(java.util.logging.Level.FINE, "XMLCipher unexpectedly not in ENCRYPT_MODE...");
if (_algorithm == null) {
throw new XMLEncryptionException("XMLCipher instance without transformation specified");
@@ -785,11 +783,11 @@
*/
private Document encryptElementContent(Element element) throws
/* XMLEncryption */Exception {
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Encrypting element content...");
+ logger.log(java.util.logging.Level.FINE, "Encrypting element content...");
if(null == element)
logger.log(java.util.logging.Level.SEVERE, "Element unexpectedly null...");
if(_cipherMode != ENCRYPT_MODE)
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "XMLCipher unexpectedly not in ENCRYPT_MODE...");
+ logger.log(java.util.logging.Level.FINE, "XMLCipher unexpectedly not in ENCRYPT_MODE...");
if (_algorithm == null) {
throw new XMLEncryptionException("XMLCipher instance without transformation specified");
@@ -815,7 +813,7 @@
*/
public Document doFinal(Document context, Document source) throws
/* XMLEncryption */Exception {
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Processing source document...");
+ logger.log(java.util.logging.Level.FINE, "Processing source document...");
if(null == context)
logger.log(java.util.logging.Level.SEVERE, "Context document unexpectedly null...");
if(null == source)
@@ -855,7 +853,7 @@
*/
public Document doFinal(Document context, Element element) throws
/* XMLEncryption */Exception {
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Processing source element...");
+ logger.log(java.util.logging.Level.FINE, "Processing source element...");
if(null == context)
logger.log(java.util.logging.Level.SEVERE, "Context document unexpectedly null...");
if(null == element)
@@ -898,7 +896,7 @@
*/
public Document doFinal(Document context, Element element, boolean content)
throws /* XMLEncryption*/ Exception {
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Processing source element...");
+ logger.log(java.util.logging.Level.FINE, "Processing source element...");
if(null == context)
logger.log(java.util.logging.Level.SEVERE, "Context document unexpectedly null...");
if(null == element)
@@ -954,6 +952,34 @@
/**
* Returns an <code>EncryptedData</code> interface. Use this operation if
+ * you want to have full control over the serialization of the element
+ * or element content.
+ *
+ * This does not change the source document in any way.
+ *
+ * @param context the context <code>Document</code>.
+ * @param type a URI identifying type information about the plaintext form
+ * of the encrypted content (may be <code>null</code>)
+ * @param serializedData the serialized data
+ * @return the <code>EncryptedData</code>
+ * @throws Exception
+ */
+ public EncryptedData encryptData(Document context, String type,
+ InputStream serializedData) throws Exception {
+
+ logger.log(java.util.logging.Level.FINE, "Encrypting element...");
+ if (null == context)
+ logger.log(java.util.logging.Level.SEVERE, "Context document unexpectedly null...");
+ if (null == serializedData)
+ logger.log(java.util.logging.Level.SEVERE, "Serialized data unexpectedly null...");
+ if (_cipherMode != ENCRYPT_MODE)
+ logger.log(java.util.logging.Level.FINE, "XMLCipher unexpectedly not in ENCRYPT_MODE...");
+
+ return encryptData(context, null, type, serializedData);
+ }
+
+ /**
+ * Returns an <code>EncryptedData</code> interface. Use this operation if
* you want to have full control over the contents of the
* <code>EncryptedData</code> structure.
*
@@ -966,160 +992,60 @@
* @return the <code>EncryptedData</code>
* @throws Exception
*/
- public EncryptedData encryptData(Document context, Element element, boolean contentMode) throws
- /* XMLEncryption */ Exception {
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Encrypting element...");
- if (null == context)
- logger.log(java.util.logging.Level.SEVERE, "Context document unexpectedly null...");
- if (null == element)
- logger.log(java.util.logging.Level.SEVERE, "Element unexpectedly null...");
- if (_cipherMode != ENCRYPT_MODE)
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "XMLCipher unexpectedly not in ENCRYPT_MODE...");
-
- _contextDocument = context;
-
- if (_algorithm == null) {
- throw new XMLEncryptionException("XMLCipher instance without transformation specified");
- }
-
- String serializedOctets = null;
- if (contentMode) {
- NodeList children = element.getChildNodes();
- if ((null != children)) {
- serializedOctets = _serializer.serialize(children);
- } else {
- Object exArgs[] = { "Element has no content." };
- throw new XMLEncryptionException("empty", exArgs);
- }
- } else {
- serializedOctets = _serializer.serialize(element);
- }
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Serialized octets:\n" + serializedOctets);
-
- byte[] encryptedBytes = null;
-
- // Now create the working cipher if none was created already
- Cipher c;
- if (_contextCipher == null) {
- String jceAlgorithm =
- JCEMapper.translateURItoJCEID(_algorithm);
-
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "alg = " + jceAlgorithm);
-
- try {
- if (_requestedJCEProvider == null)
- c = Cipher.getInstance(jceAlgorithm);
- else
- c = Cipher.getInstance(jceAlgorithm, _requestedJCEProvider);
- } catch (NoSuchAlgorithmException nsae) {
- throw new XMLEncryptionException("empty", nsae);
- } catch (NoSuchProviderException nspre) {
- throw new XMLEncryptionException("empty", nspre);
- } catch (NoSuchPaddingException nspae) {
- throw new XMLEncryptionException("empty", nspae);
- }
- }
- else {
- c = _contextCipher;
- }
- // Now perform the encryption
-
- try {
- // Should internally generate an IV
- // todo - allow user to set an IV
- c.init(_cipherMode, _key);
- } catch (InvalidKeyException ike) {
- throw new XMLEncryptionException("empty", ike);
- }
-
- try {
- encryptedBytes =
- c.doFinal(serializedOctets.getBytes("UTF-8"));
-
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Expected cipher.outputSize = " +
- Integer.toString(c.getOutputSize(
- serializedOctets.getBytes().length)));
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Actual cipher.outputSize = " +
- Integer.toString(encryptedBytes.length));
- } catch (IllegalStateException ise) {
- throw new XMLEncryptionException("empty", ise);
- } catch (IllegalBlockSizeException ibse) {
- throw new XMLEncryptionException("empty", ibse);
- } catch (BadPaddingException bpe) {
- throw new XMLEncryptionException("empty", bpe);
- } catch (UnsupportedEncodingException uee) {
- throw new XMLEncryptionException("empty", uee);
- }
-
- // Now build up to a properly XML Encryption encoded octet stream
- // IvParameterSpec iv;
-
- byte[] iv = c.getIV();
- byte[] finalEncryptedBytes =
- new byte[iv.length + encryptedBytes.length];
- System.arraycopy(iv, 0, finalEncryptedBytes, 0,
- iv.length);
- System.arraycopy(encryptedBytes, 0, finalEncryptedBytes,
- iv.length,
- encryptedBytes.length);
-
- String base64EncodedEncryptedOctets = Base64.encode(finalEncryptedBytes);
-
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Encrypted octets:\n" + base64EncodedEncryptedOctets);
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Encrypted octets length = " +
- base64EncodedEncryptedOctets.length());
-
- try {
- CipherData cd = _ed.getCipherData();
- CipherValue cv = cd.getCipherValue();
- // cv.setValue(base64EncodedEncryptedOctets.getBytes());
- cv.setValue(base64EncodedEncryptedOctets);
-
- if (contentMode) {
- _ed.setType(
- new URI(EncryptionConstants.TYPE_CONTENT).toString());
- } else {
- _ed.setType(
- new URI(EncryptionConstants.TYPE_ELEMENT).toString());
- }
- EncryptionMethod method =
- _factory.newEncryptionMethod(new URI(_algorithm).toString());
- _ed.setEncryptionMethod(method);
- } catch (URI.MalformedURIException mfue) {
- throw new XMLEncryptionException("empty", mfue);
- }
- return (_ed);
- }
-
-
-
- public EncryptedData encryptData(Document context, byte [] serializedOctets, boolean contentMode) throws
- /* XMLEncryption */ Exception {
+ public EncryptedData encryptData(
+ Document context, Element element, boolean contentMode)
+ throws /* XMLEncryption */ Exception {
+
logger.log(java.util.logging.Level.FINE, "Encrypting element...");
if (null == context)
logger.log(java.util.logging.Level.SEVERE, "Context document unexpectedly null...");
- if (null == serializedOctets)
- logger.log(java.util.logging.Level.SEVERE, "Canonicalized Data is unexpectedly null...");
+ if (null == element)
+ logger.log(java.util.logging.Level.SEVERE, "Element unexpectedly null...");
if (_cipherMode != ENCRYPT_MODE)
logger.log(java.util.logging.Level.FINE, "XMLCipher unexpectedly not in ENCRYPT_MODE...");
+ if (contentMode) {
+ return encryptData
+ (context, element, EncryptionConstants.TYPE_CONTENT, null);
+ } else {
+ return encryptData
+ (context, element, EncryptionConstants.TYPE_ELEMENT, null);
+ }
+ }
+
+ private EncryptedData encryptData(
+ Document context, Element element, String type,
+ InputStream serializedData) throws /* XMLEncryption */ Exception {
+
_contextDocument = context;
if (_algorithm == null) {
- throw new XMLEncryptionException("XMLCipher instance without transformation specified");
+ throw new XMLEncryptionException
+ ("XMLCipher instance without transformation specified");
}
-
- logger.log(java.util.logging.Level.FINE, "Serialized octets:\n" + serializedOctets);
+ String serializedOctets = null;
+ if (serializedData == null) {
+ if (type == EncryptionConstants.TYPE_CONTENT) {
+ NodeList children = element.getChildNodes();
+ if (null != children) {
+ serializedOctets = _serializer.serialize(children);
+ } else {
+ Object exArgs[] = { "Element has no content." };
+ throw new XMLEncryptionException("empty", exArgs);
+ }
+ } else {
+ serializedOctets = _serializer.serialize(element);
+ }
+ logger.log(java.util.logging.Level.FINE, "Serialized octets:\n" + serializedOctets);
+ }
byte[] encryptedBytes = null;
// Now create the working cipher if none was created already
Cipher c;
if (_contextCipher == null) {
- String jceAlgorithm =
- JCEMapper.translateURItoJCEID(_algorithm);
-
+ String jceAlgorithm = JCEMapper.translateURItoJCEID(_algorithm);
logger.log(java.util.logging.Level.FINE, "alg = " + jceAlgorithm);
try {
@@ -1148,41 +1074,47 @@
}
try {
- encryptedBytes =
- c.doFinal(serializedOctets);
-
- logger.log(java.util.logging.Level.FINE, "Expected cipher.outputSize = " +
+ if (serializedData != null) {
+ int numBytes;
+ byte[] buf = new byte[8192];
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ while ((numBytes = serializedData.read(buf)) != -1) {
+ byte[] data = c.update(buf, 0, numBytes);
+ baos.write(data);
+ }
+ baos.write(c.doFinal());
+ encryptedBytes = baos.toByteArray();
+ } else {
+ encryptedBytes = c.doFinal(serializedOctets.getBytes("UTF-8"));
+ logger.log(java.util.logging.Level.FINE, "Expected cipher.outputSize = " +
Integer.toString(c.getOutputSize(
- serializedOctets.length)));
+ serializedOctets.getBytes().length)));
+ }
logger.log(java.util.logging.Level.FINE, "Actual cipher.outputSize = " +
- Integer.toString(encryptedBytes.length));
+ Integer.toString(encryptedBytes.length));
} catch (IllegalStateException ise) {
throw new XMLEncryptionException("empty", ise);
} catch (IllegalBlockSizeException ibse) {
throw new XMLEncryptionException("empty", ibse);
} catch (BadPaddingException bpe) {
throw new XMLEncryptionException("empty", bpe);
- } catch (Exception uee) {
+ } catch (UnsupportedEncodingException uee) {
throw new XMLEncryptionException("empty", uee);
}
// Now build up to a properly XML Encryption encoded octet stream
// IvParameterSpec iv;
-
byte[] iv = c.getIV();
byte[] finalEncryptedBytes =
new byte[iv.length + encryptedBytes.length];
- System.arraycopy(iv, 0, finalEncryptedBytes, 0,
- iv.length);
- System.arraycopy(encryptedBytes, 0, finalEncryptedBytes,
- iv.length,
- encryptedBytes.length);
-
+ System.arraycopy(iv, 0, finalEncryptedBytes, 0, iv.length);
+ System.arraycopy(encryptedBytes, 0, finalEncryptedBytes, iv.length,
+ encryptedBytes.length);
String base64EncodedEncryptedOctets = Base64.encode(finalEncryptedBytes);
logger.log(java.util.logging.Level.FINE, "Encrypted octets:\n" + base64EncodedEncryptedOctets);
logger.log(java.util.logging.Level.FINE, "Encrypted octets length = " +
- base64EncodedEncryptedOctets.length());
+ base64EncodedEncryptedOctets.length());
try {
CipherData cd = _ed.getCipherData();
@@ -1190,15 +1122,11 @@
// cv.setValue(base64EncodedEncryptedOctets.getBytes());
cv.setValue(base64EncodedEncryptedOctets);
- if (contentMode) {
- _ed.setType(
- new URI(EncryptionConstants.TYPE_CONTENT).toString());
- } else {
- _ed.setType(
- new URI(EncryptionConstants.TYPE_ELEMENT).toString());
+ if (type != null) {
+ _ed.setType(new URI(type).toString());
}
EncryptionMethod method =
- _factory.newEncryptionMethod(new URI(_algorithm).toString());
+ _factory.newEncryptionMethod(new URI(_algorithm).toString());
_ed.setEncryptionMethod(method);
} catch (URI.MalformedURIException mfue) {
throw new XMLEncryptionException("empty", mfue);
@@ -1206,7 +1134,6 @@
return (_ed);
}
-
/**
* Returns an <code>EncryptedData</code> interface. Use this operation if
* you want to load an <code>EncryptedData</code> structure from a DOM
@@ -1219,7 +1146,7 @@
*/
public EncryptedData loadEncryptedData(Document context, Element element)
throws XMLEncryptionException {
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Loading encrypted element...");
+ logger.log(java.util.logging.Level.FINE, "Loading encrypted element...");
if(null == context)
logger.log(java.util.logging.Level.SEVERE, "Context document unexpectedly null...");
if(null == element)
@@ -1246,13 +1173,13 @@
public EncryptedKey loadEncryptedKey(Document context, Element element)
throws XMLEncryptionException {
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Loading encrypted key...");
+ logger.log(java.util.logging.Level.FINE, "Loading encrypted key...");
if(null == context)
logger.log(java.util.logging.Level.SEVERE, "Context document unexpectedly null...");
if(null == element)
logger.log(java.util.logging.Level.SEVERE, "Element unexpectedly null...");
if(_cipherMode != UNWRAP_MODE && _cipherMode != DECRYPT_MODE)
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "XMLCipher unexpectedly not in UNWRAP_MODE or DECRYPT_MODE...");
+ logger.log(java.util.logging.Level.FINE, "XMLCipher unexpectedly not in UNWRAP_MODE or DECRYPT_MODE...");
_contextDocument = context;
_ek = _factory.newEncryptedKey(element);
@@ -1290,12 +1217,12 @@
public EncryptedKey encryptKey(Document doc, Key key) throws
XMLEncryptionException {
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Encrypting key ...");
+ logger.log(java.util.logging.Level.FINE, "Encrypting key ...");
if(null == key)
logger.log(java.util.logging.Level.SEVERE, "Key unexpectedly null...");
if(_cipherMode != WRAP_MODE)
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "XMLCipher unexpectedly not in WRAP_MODE...");
+ logger.log(java.util.logging.Level.FINE, "XMLCipher unexpectedly not in WRAP_MODE...");
if (_algorithm == null) {
@@ -1313,7 +1240,7 @@
String jceAlgorithm =
JCEMapper.translateURItoJCEID(_algorithm);
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "alg = " + jceAlgorithm);
+ logger.log(java.util.logging.Level.FINE, "alg = " + jceAlgorithm);
try {
if (_requestedJCEProvider == null)
@@ -1345,8 +1272,8 @@
String base64EncodedEncryptedOctets = Base64.encode(encryptedBytes);
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Encrypted key octets:\n" + base64EncodedEncryptedOctets);
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Encrypted key octets length = " +
+ logger.log(java.util.logging.Level.FINE, "Encrypted key octets:\n" + base64EncodedEncryptedOctets);
+ logger.log(java.util.logging.Level.FINE, "Encrypted key octets length = " +
base64EncodedEncryptedOctets.length());
CipherValue cv = _ek.getCipherData().getCipherValue();
@@ -1376,10 +1303,10 @@
public Key decryptKey(EncryptedKey encryptedKey, String algorithm) throws
XMLEncryptionException {
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Decrypting key from previously loaded EncryptedKey...");
+ logger.log(java.util.logging.Level.FINE, "Decrypting key from previously loaded EncryptedKey...");
if(_cipherMode != UNWRAP_MODE)
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "XMLCipher unexpectedly not in UNWRAP_MODE...");
+ logger.log(java.util.logging.Level.FINE, "XMLCipher unexpectedly not in UNWRAP_MODE...");
if (algorithm == null) {
throw new XMLEncryptionException("Cannot decrypt a key without knowing the algorithm");
@@ -1387,7 +1314,7 @@
if (_key == null) {
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Trying to find a KEK via key resolvers");
+ logger.log(java.util.logging.Level.FINE, "Trying to find a KEK via key resolvers");
KeyInfo ki = encryptedKey.getKeyInfo();
if (ki != null) {
@@ -1418,7 +1345,7 @@
JCEMapper.translateURItoJCEID(
encryptedKey.getEncryptionMethod().getAlgorithm());
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "JCE Algorithm = " + jceAlgorithm);
+ logger.log(java.util.logging.Level.FINE, "JCE Algorithm = " + jceAlgorithm);
try {
if (_requestedJCEProvider == null)
@@ -1448,7 +1375,7 @@
throw new XMLEncryptionException("empty", nsae);
}
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Decryption of key type " + algorithm + " OK");
+ logger.log(java.util.logging.Level.FINE, "Decryption of key type " + algorithm + " OK");
return ret;
@@ -1478,14 +1405,9 @@
*
* @param node the <code>Node</code> to clear.
*/
- private void removeContent(Node node) {
- NodeList list = node.getChildNodes();
- if (list.getLength() > 0) {
- Node n = list.item(0);
- if (null != n) {
- n.getParentNode().removeChild(n);
- }
- removeContent(node);
+ private static void removeContent(Node node) {
+ while (node.hasChildNodes()) {
+ node.removeChild(node.getFirstChild());
}
}
@@ -1499,7 +1421,7 @@
private Document decryptElement(Element element) throws
XMLEncryptionException {
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Decrypting element...");
+ logger.log(java.util.logging.Level.FINE, "Decrypting element...");
if(_cipherMode != DECRYPT_MODE)
logger.log(java.util.logging.Level.SEVERE, "XMLCipher unexpectedly not in DECRYPT_MODE...");
@@ -1512,7 +1434,7 @@
}
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Decrypted octets:\n" + octets);
+ logger.log(java.util.logging.Level.FINE, "Decrypted octets:\n" + octets);
Node sourceParent = element.getParentNode();
@@ -1573,7 +1495,7 @@
public byte[] decryptToByteArray(Element element)
throws XMLEncryptionException {
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Decrypting to ByteArray...");
+ logger.log(java.util.logging.Level.FINE, "Decrypting to ByteArray...");
if(_cipherMode != DECRYPT_MODE)
logger.log(java.util.logging.Level.SEVERE, "XMLCipher unexpectedly not in DECRYPT_MODE...");
@@ -2226,7 +2148,7 @@
AgreementMethod newAgreementMethod(Element element) throws
XMLEncryptionException {
if (null == element) {
- //complain
+ throw new NullPointerException("element is null");
}
String algorithm = element.getAttributeNS(null,
@@ -2292,7 +2214,7 @@
CipherData newCipherData(Element element) throws
XMLEncryptionException {
if (null == element) {
- // complain
+ throw new NullPointerException("element is null");
}
int type = 0;
@@ -2352,7 +2274,7 @@
(Element) transformsElements.item(0);
if (transformsElement != null) {
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Creating a DSIG based Transforms element");
+ logger.log(java.util.logging.Level.FINE, "Creating a DSIG based Transforms element");
try {
result.setTransforms(new TransformsImpl(transformsElement));
}
@@ -2411,34 +2333,28 @@
XMLEncryptionException {
EncryptedData result = null;
- NodeList dataElements = element.getElementsByTagNameNS(
- EncryptionConstants.EncryptionSpecNS,
- EncryptionConstants._TAG_CIPHERDATA);
-
- // Need to get the last CipherData found, as earlier ones will
- // be for elements in the KeyInfo lists
+ NodeList dataElements = element.getElementsByTagNameNS(
+ EncryptionConstants.EncryptionSpecNS,
+ EncryptionConstants._TAG_CIPHERDATA);
+
+ // Need to get the last CipherData found, as earlier ones will
+ // be for elements in the KeyInfo lists
Element dataElement =
- (Element) dataElements.item(dataElements.getLength() - 1);
+ (Element) dataElements.item(dataElements.getLength() - 1);
CipherData data = newCipherData(dataElement);
result = newEncryptedData(data);
- try {
- result.setId(element.getAttributeNS(
- null, EncryptionConstants._ATT_ID));
- result.setType(new URI(
- element.getAttributeNS(
- null, EncryptionConstants._ATT_TYPE)).toString());
- result.setMimeType(element.getAttributeNS(
- null, EncryptionConstants._ATT_MIMETYPE));
- result.setEncoding(new URI(
- element.getAttributeNS(
- null, Constants._ATT_ENCODING)).toString());
- } catch (URI.MalformedURIException mfue) {
- // do nothing
- }
+ result.setId(element.getAttributeNS(
+ null, EncryptionConstants._ATT_ID));
+ result.setType(
+ element.getAttributeNS(null, EncryptionConstants._ATT_TYPE));
+ result.setMimeType(element.getAttributeNS(
+ null, EncryptionConstants._ATT_MIMETYPE));
+ result.setEncoding(
+ element.getAttributeNS(null, Constants._ATT_ENCODING));
Element encryptionMethodElement =
(Element) element.getElementsByTagNameNS(
@@ -2450,18 +2366,18 @@
}
// BFL 16/7/03 - simple implementation
- // TODO: Work out how to handle relative URI
+ // TODO: Work out how to handle relative URI
Element keyInfoElement =
(Element) element.getElementsByTagNameNS(
Constants.SignatureSpecNS, Constants._TAG_KEYINFO).item(0);
if (null != keyInfoElement) {
- try {
- result.setKeyInfo(new KeyInfo(keyInfoElement, null));
- } catch (XMLSecurityException xse) {
- throw new XMLEncryptionException("Error loading Key Info",
- xse);
- }
+ try {
+ result.setKeyInfo(new KeyInfo(keyInfoElement, null));
+ } catch (XMLSecurityException xse) {
+ throw new XMLEncryptionException("Error loading Key Info",
+ xse);
+ }
}
// TODO: Implement
@@ -2511,31 +2427,25 @@
EncryptedKey newEncryptedKey(Element element) throws
XMLEncryptionException {
EncryptedKey result = null;
- NodeList dataElements = element.getElementsByTagNameNS(
- EncryptionConstants.EncryptionSpecNS,
- EncryptionConstants._TAG_CIPHERDATA);
+ NodeList dataElements = element.getElementsByTagNameNS(
+ EncryptionConstants.EncryptionSpecNS,
+ EncryptionConstants._TAG_CIPHERDATA);
Element dataElement =
- (Element) dataElements.item(dataElements.getLength() - 1);
+ (Element) dataElements.item(dataElements.getLength() - 1);
CipherData data = newCipherData(dataElement);
result = newEncryptedKey(data);
- try {
- result.setId(element.getAttributeNS(
- null, EncryptionConstants._ATT_ID));
- result.setType(new URI(
- element.getAttributeNS(
- null, EncryptionConstants._ATT_TYPE)).toString());
- result.setMimeType(element.getAttributeNS(
- null, EncryptionConstants._ATT_MIMETYPE));
- result.setEncoding(new URI(
- element.getAttributeNS(
- null, Constants._ATT_ENCODING)).toString());
- result.setRecipient(element.getAttributeNS(
- null, EncryptionConstants._ATT_RECIPIENT));
- } catch (URI.MalformedURIException mfue) {
- // do nothing
- }
+ result.setId(element.getAttributeNS(
+ null, EncryptionConstants._ATT_ID));
+ result.setType(
+ element.getAttributeNS(null, EncryptionConstants._ATT_TYPE));
+ result.setMimeType(element.getAttributeNS(
+ null, EncryptionConstants._ATT_MIMETYPE));
+ result.setEncoding(
+ element.getAttributeNS(null, Constants._ATT_ENCODING));
+ result.setRecipient(element.getAttributeNS(
+ null, EncryptionConstants._ATT_RECIPIENT));
Element encryptionMethodElement =
(Element) element.getElementsByTagNameNS(
@@ -2550,12 +2460,12 @@
(Element) element.getElementsByTagNameNS(
Constants.SignatureSpecNS, Constants._TAG_KEYINFO).item(0);
if (null != keyInfoElement) {
- try {
- result.setKeyInfo(new KeyInfo(keyInfoElement, null));
- } catch (XMLSecurityException xse) {
- throw new XMLEncryptionException("Error loading Key Info",
- xse);
- }
+ try {
+ result.setKeyInfo(new KeyInfo(keyInfoElement, null));
+ } catch (XMLSecurityException xse) {
+ throw new XMLEncryptionException
+ ("Error loading Key Info", xse);
+ }
}
// TODO: Implement
@@ -2581,7 +2491,8 @@
EncryptionConstants.EncryptionSpecNS,
EncryptionConstants._TAG_CARRIEDKEYNAME).item(0);
if (null != carriedNameElement) {
- result.setCarriedName(carriedNameElement.getNodeValue());
+ result.setCarriedName
+ (carriedNameElement.getFirstChild().getNodeValue());
}
return (result);
@@ -2680,13 +2591,8 @@
EncryptionProperty newEncryptionProperty(Element element) {
EncryptionProperty result = newEncryptionProperty();
- try {
- result.setTarget(new URI(
- element.getAttributeNS(
- null, EncryptionConstants._ATT_TARGET)).toString());
- } catch (URI.MalformedURIException mfue) {
- // do nothing
- }
+ result.setTarget(
+ element.getAttributeNS(null, EncryptionConstants._ATT_TARGET));
result.setId(element.getAttributeNS(
null, EncryptionConstants._ATT_ID));
// TODO: Make this lot work...
@@ -2943,7 +2849,7 @@
} catch (URI.MalformedURIException mfue) {
//complain
}
- algorithm = tmpAlgorithm.toString();
+ algorithmURI = tmpAlgorithm.toString();
}
// <element name="AgreementMethod" type="xenc:AgreementMethodType"/>
@@ -3183,7 +3089,7 @@
_contextDocument, EncryptionConstants.EncryptionSpecNS,
EncryptionConstants._TAG_CIPHERVALUE);
result.appendChild(_contextDocument.createTextNode(
- new String(cipherValue)));
+ cipherValue));
return (result);
}
@@ -3247,8 +3153,7 @@
}
if (null != super.getType()) {
result.setAttributeNS(
- null, EncryptionConstants._ATT_TYPE,
- super.getType().toString());
+ null, EncryptionConstants._ATT_TYPE, super.getType());
}
if (null != super.getMimeType()) {
result.setAttributeNS(
@@ -3258,7 +3163,7 @@
if (null != super.getEncoding()) {
result.setAttributeNS(
null, EncryptionConstants._ATT_ENCODING,
- super.getEncoding().toString());
+ super.getEncoding());
}
if (null != super.getEncryptionMethod()) {
result.appendChild(((EncryptionMethodImpl)
@@ -3383,8 +3288,7 @@
}
if (null != super.getType()) {
result.setAttributeNS(
- null, EncryptionConstants._ATT_TYPE,
- super.getType().toString());
+ null, EncryptionConstants._ATT_TYPE, super.getType());
}
if (null != super.getMimeType()) {
result.setAttributeNS(null,
@@ -3392,7 +3296,7 @@
}
if (null != super.getEncoding()) {
result.setAttributeNS(null, Constants._ATT_ENCODING,
- super.getEncoding().toString());
+ super.getEncoding());
}
if (null != getRecipient()) {
result.setAttributeNS(null,
@@ -3468,13 +3372,17 @@
* @param type
*/
public void setType(String type) {
- URI tmpType = null;
- try {
- tmpType = new URI(type);
- } catch (URI.MalformedURIException mfue) {
- // complain
+ if (type == null || type.length() == 0) {
+ this.type = null;
+ } else {
+ URI tmpType = null;
+ try {
+ tmpType = new URI(type);
+ } catch (URI.MalformedURIException mfue) {
+ // complain
+ }
+ this.type = tmpType.toString();
}
- this.type = tmpType.toString();
}
/**
*
@@ -3502,13 +3410,17 @@
* @param encoding
*/
public void setEncoding(String encoding) {
- URI tmpEncoding = null;
- try {
- tmpEncoding = new URI(encoding);
- } catch (URI.MalformedURIException mfue) {
- // complain
+ if (encoding == null || encoding.length() == 0) {
+ this.encoding = null;
+ } else {
+ URI tmpEncoding = null;
+ try {
+ tmpEncoding = new URI(encoding);
+ } catch (URI.MalformedURIException mfue) {
+ // complain
+ }
+ this.encoding = tmpEncoding.toString();
}
- this.encoding = tmpEncoding.toString();
}
/**
*
@@ -3635,7 +3547,7 @@
_contextDocument, EncryptionConstants.EncryptionSpecNS,
EncryptionConstants._TAG_ENCRYPTIONMETHOD);
result.setAttributeNS(null, EncryptionConstants._ATT_ALGORITHM,
- algorithm.toString());
+ algorithm);
if (keySize > 0) {
result.appendChild(
ElementProxy.createElementForFamily(_contextDocument,
@@ -3735,8 +3647,7 @@
private class EncryptionPropertyImpl implements EncryptionProperty {
private String target = null;
private String id = null;
- private String attributeName = null;
- private String attributeValue = null;
+ private HashMap attributeMap = new HashMap();
private List encryptionInformation = null;
/**
@@ -3752,13 +3663,24 @@
}
/** @inheritDoc */
public void setTarget(String target) {
- URI tmpTarget = null;
- try {
- tmpTarget = new URI(target);
- } catch (URI.MalformedURIException mfue) {
- // complain
+ if (target == null || target.length() == 0) {
+ this.target = null;
+ } else if (target.startsWith("#")) {
+ /*
+ * This is a same document URI reference. Do not parse,
+ * because com.sun.org.apache.xml.internal.utils.URI considers this an
+ * illegal URI because it has no scheme.
+ */
+ this.target = target;
+ } else {
+ URI tmpTarget = null;
+ try {
+ tmpTarget = new URI(target);
+ } catch (URI.MalformedURIException mfue) {
+ // complain
+ }
+ this.target = tmpTarget.toString();
}
- this.target = tmpTarget.toString();
}
/** @inheritDoc */
public String getId() {
@@ -3770,12 +3692,11 @@
}
/** @inheritDoc */
public String getAttribute(String attribute) {
- return (attributeValue);
+ return (String) attributeMap.get(attribute);
}
/** @inheritDoc */
public void setAttribute(String attribute, String value) {
- attributeName = attribute;
- attributeValue = value;
+ attributeMap.put(attribute, value);
}
/** @inheritDoc */
public Iterator getEncryptionInformation() {
@@ -3805,7 +3726,7 @@
EncryptionConstants._TAG_ENCRYPTIONPROPERTY);
if (null != target) {
result.setAttributeNS(null, EncryptionConstants._ATT_TARGET,
- target.toString());
+ target);
}
if (null != id) {
result.setAttributeNS(null, EncryptionConstants._ATT_ID,
@@ -3839,7 +3760,13 @@
* @param doc
*/
public TransformsImpl(Document doc) {
- super(doc);
+ if (doc == null) {
+ throw new RuntimeException("Document is null");
+ }
+
+ this._doc = doc;
+ this._constructionElement = createElementForFamilyLocal(this._doc,
+ this.getBaseNamespace(), this.getBaseLocalName());
}
/**
*
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherInput.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherInput.java Wed Jul 05 16:42:37 2017 +0200
@@ -108,84 +108,78 @@
return null;
}
- /**
- * Internal method to get bytes in decryption mode
+ /**
+ * Internal method to get bytes in decryption mode
* @return the decripted bytes
* @throws XMLEncryptionException
- */
+ */
+ private byte[] getDecryptBytes() throws XMLEncryptionException {
- private byte[] getDecryptBytes() throws XMLEncryptionException {
-
- String base64EncodedEncryptedOctets = null;
+ String base64EncodedEncryptedOctets = null;
if (_cipherData.getDataType() == CipherData.REFERENCE_TYPE) {
- // Fun time!
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Found a reference type CipherData");
- CipherReference cr = _cipherData.getCipherReference();
+ // Fun time!
+ logger.log(java.util.logging.Level.FINE, "Found a reference type CipherData");
+ CipherReference cr = _cipherData.getCipherReference();
- // Need to wrap the uri in an Attribute node so that we can
- // Pass to the resource resolvers
+ // Need to wrap the uri in an Attribute node so that we can
+ // Pass to the resource resolvers
- Attr uriAttr = cr.getURIAsAttr();
- XMLSignatureInput input = null;
+ Attr uriAttr = cr.getURIAsAttr();
+ XMLSignatureInput input = null;
- try {
- ResourceResolver resolver =
- ResourceResolver.getInstance(uriAttr, null);
- input = resolver.resolve(uriAttr, null);
- } catch (ResourceResolverException ex) {
- throw new XMLEncryptionException("empty", ex);
- }
+ try {
+ ResourceResolver resolver =
+ ResourceResolver.getInstance(uriAttr, null);
+ input = resolver.resolve(uriAttr, null);
+ } catch (ResourceResolverException ex) {
+ throw new XMLEncryptionException("empty", ex);
+ }
- if (input != null) {
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Managed to resolve URI \"" + cr.getURI() + "\"");
- }
- else {
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Failed to resolve URI \"" + cr.getURI() + "\"");
- }
+ if (input != null) {
+ logger.log(java.util.logging.Level.FINE, "Managed to resolve URI \"" + cr.getURI() + "\"");
+ } else {
+ logger.log(java.util.logging.Level.FINE, "Failed to resolve URI \"" + cr.getURI() + "\"");
+ }
- // Lets see if there are any transforms
- Transforms transforms = cr.getTransforms();
- if (transforms != null) {
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Have transforms in cipher reference");
- try {
- com.sun.org.apache.xml.internal.security.transforms.Transforms dsTransforms =
- transforms.getDSTransforms();
- input = dsTransforms.performTransforms(input);
- } catch (TransformationException ex) {
- throw new XMLEncryptionException("empty", ex);
- }
- }
+ // Lets see if there are any transforms
+ Transforms transforms = cr.getTransforms();
+ if (transforms != null) {
+ logger.log(java.util.logging.Level.FINE, "Have transforms in cipher reference");
+ try {
+ com.sun.org.apache.xml.internal.security.transforms.Transforms dsTransforms =
+ transforms.getDSTransforms();
+ input = dsTransforms.performTransforms(input);
+ } catch (TransformationException ex) {
+ throw new XMLEncryptionException("empty", ex);
+ }
+ }
- try {
- return input.getBytes();
- }
- catch (IOException ex) {
- throw new XMLEncryptionException("empty", ex);
- } catch (CanonicalizationException ex) {
- throw new XMLEncryptionException("empty", ex);
- }
+ try {
+ return input.getBytes();
+ } catch (IOException ex) {
+ throw new XMLEncryptionException("empty", ex);
+ } catch (CanonicalizationException ex) {
+ throw new XMLEncryptionException("empty", ex);
+ }
- // retrieve the cipher text
+ // retrieve the cipher text
} else if (_cipherData.getDataType() == CipherData.VALUE_TYPE) {
- CipherValue cv = _cipherData.getCipherValue();
- base64EncodedEncryptedOctets = new String(cv.getValue());
+ base64EncodedEncryptedOctets =
+ _cipherData.getCipherValue().getValue();
} else {
- throw new XMLEncryptionException("CipherData.getDataType() returned unexpected value");
- }
+ throw new XMLEncryptionException("CipherData.getDataType() returned unexpected value");
+ }
- if (logger.isLoggable(java.util.logging.Level.FINE)) logger.log(java.util.logging.Level.FINE, "Encrypted octets:\n" + base64EncodedEncryptedOctets);
+ logger.log(java.util.logging.Level.FINE, "Encrypted octets:\n" + base64EncodedEncryptedOctets);
byte[] encryptedBytes = null;
-
try {
- encryptedBytes = Base64.decode(base64EncodedEncryptedOctets);
+ encryptedBytes = Base64.decode(base64EncodedEncryptedOctets);
} catch (Base64DecodingException bde) {
throw new XMLEncryptionException("empty", bde);
}
- return (encryptedBytes);
-
- }
-
+ return (encryptedBytes);
+ }
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/ContentHandlerAlreadyRegisteredException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/ContentHandlerAlreadyRegisteredException.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -28,7 +27,7 @@
/**
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class ContentHandlerAlreadyRegisteredException
extends XMLSecurityException {
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java Wed Jul 05 16:42:37 2017 +0200
@@ -25,6 +25,8 @@
import java.security.PublicKey;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
import java.util.List;
import javax.crypto.SecretKey;
@@ -88,15 +90,22 @@
* The <CODE>containsXXX()</CODE> methods return <I>whether</I> the KeyInfo
* contains the corresponding type.
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class KeyInfo extends SignatureElementProxy {
/** {@link java.util.logging} logging facility */
static java.util.logging.Logger log =
java.util.logging.Logger.getLogger(KeyInfo.class.getName());
+ List x509Datas=null;
+ List encryptedKeys=null;
-
+ static final List nullList;
+ static {
+ List list = new ArrayList();
+ list.add(null);
+ nullList = Collections.unmodifiableList(list);
+ }
/**
* Constructor KeyInfo
@@ -108,7 +117,6 @@
XMLUtils.addReturnToElement(this._constructionElement);
-
}
/**
@@ -119,8 +127,8 @@
* @throws XMLSecurityException
*/
public KeyInfo(Element element, String BaseURI) throws XMLSecurityException {
-
super(element, BaseURI);
+ // _storageResolvers.add(null);
}
@@ -131,7 +139,7 @@
*/
public void setId(String Id) {
- if ((this._state == MODE_SIGN) && (Id != null)) {
+ if ((Id != null)) {
this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
IdResolver.registerElementById(this._constructionElement, Id);
}
@@ -162,10 +170,8 @@
*/
public void add(KeyName keyname) {
- if (this._state == MODE_SIGN) {
this._constructionElement.appendChild(keyname.getElement());
XMLUtils.addReturnToElement(this._constructionElement);
- }
}
/**
@@ -219,11 +225,8 @@
* @param keyvalue
*/
public void add(KeyValue keyvalue) {
-
- if (this._state == MODE_SIGN) {
this._constructionElement.appendChild(keyvalue.getElement());
XMLUtils.addReturnToElement(this._constructionElement);
- }
}
/**
@@ -241,11 +244,8 @@
* @param mgmtdata
*/
public void add(MgmtData mgmtdata) {
-
- if (this._state == MODE_SIGN) {
this._constructionElement.appendChild(mgmtdata.getElement());
XMLUtils.addReturnToElement(this._constructionElement);
- }
}
/**
@@ -254,11 +254,8 @@
* @param pgpdata
*/
public void add(PGPData pgpdata) {
-
- if (this._state == MODE_SIGN) {
this._constructionElement.appendChild(pgpdata.getElement());
XMLUtils.addReturnToElement(this._constructionElement);
- }
}
/**
@@ -279,11 +276,8 @@
* @param retrievalmethod
*/
public void add(RetrievalMethod retrievalmethod) {
-
- if (this._state == MODE_SIGN) {
this._constructionElement.appendChild(retrievalmethod.getElement());
XMLUtils.addReturnToElement(this._constructionElement);
- }
}
/**
@@ -292,11 +286,8 @@
* @param spkidata
*/
public void add(SPKIData spkidata) {
-
- if (this._state == MODE_SIGN) {
this._constructionElement.appendChild(spkidata.getElement());
XMLUtils.addReturnToElement(this._constructionElement);
- }
}
/**
@@ -305,11 +296,11 @@
* @param x509data
*/
public void add(X509Data x509data) {
-
- if (this._state == MODE_SIGN) {
+ if (x509Datas==null)
+ x509Datas=new ArrayList();
+ x509Datas.add(x509data);
this._constructionElement.appendChild(x509data.getElement());
XMLUtils.addReturnToElement(this._constructionElement);
- }
}
/**
@@ -321,12 +312,11 @@
public void add(EncryptedKey encryptedKey)
throws XMLEncryptionException {
-
- if (this._state == MODE_SIGN) {
+ if (encryptedKeys==null)
+ encryptedKeys=new ArrayList();
+ encryptedKeys.add(encryptedKey);
XMLCipher cipher = XMLCipher.getInstance();
this._constructionElement.appendChild(cipher.martial(encryptedKey));
- }
-
}
/**
@@ -335,11 +325,8 @@
* @param element
*/
public void addUnknownElement(Element element) {
-
- if (this._state == MODE_SIGN) {
this._constructionElement.appendChild(element);
XMLUtils.addReturnToElement(this._constructionElement);
- }
}
/**
@@ -403,6 +390,9 @@
*@return the number of the X509Data tags
*/
public int lengthX509Data() {
+ if (x509Datas!=null) {
+ return x509Datas.size();
+ }
return this.length(Constants.SignatureSpecNS, Constants._TAG_X509DATA);
}
@@ -550,7 +540,9 @@
* @throws XMLSecurityException
*/
public X509Data itemX509Data(int i) throws XMLSecurityException {
-
+ if (x509Datas!=null) {
+ return (X509Data) x509Datas.get(i);
+ }
Element e = XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
Constants._TAG_X509DATA,i);
@@ -569,7 +561,9 @@
*/
public EncryptedKey itemEncryptedKey(int i) throws XMLSecurityException {
-
+ if (encryptedKeys!=null) {
+ return (EncryptedKey) encryptedKeys.get(i);
+ }
Element e =
XMLUtils.selectXencNode(this._constructionElement.getFirstChild(),
EncryptionConstants._TAG_ENCRYPTEDKEY,i);
@@ -707,20 +701,20 @@
PublicKey pk = this.getPublicKeyFromInternalResolvers();
if (pk != null) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "I could find a key using the per-KeyInfo key resolvers");
+ log.log(java.util.logging.Level.FINE, "I could find a key using the per-KeyInfo key resolvers");
return pk;
}
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "I couldn't find a key using the per-KeyInfo key resolvers");
+ log.log(java.util.logging.Level.FINE, "I couldn't find a key using the per-KeyInfo key resolvers");
pk = this.getPublicKeyFromStaticResolvers();
if (pk != null) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "I could find a key using the system-wide key resolvers");
+ log.log(java.util.logging.Level.FINE, "I could find a key using the system-wide key resolvers");
return pk;
}
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "I couldn't find a key using the system-wide key resolvers");
+ log.log(java.util.logging.Level.FINE, "I couldn't find a key using the system-wide key resolvers");
return null;
}
@@ -732,46 +726,29 @@
* @throws KeyResolverException
*/
PublicKey getPublicKeyFromStaticResolvers() throws KeyResolverException {
-
- for (int i = 0; i < KeyResolver.length(); i++) {
- KeyResolver keyResolver = KeyResolver.item(i);
+ int length=KeyResolver.length();
+ int storageLength=this._storageResolvers.size();
+ Iterator it= KeyResolver.iterator();
+ for (int i = 0; i < length; i++) {
+ KeyResolverSpi keyResolver = (KeyResolverSpi) it.next();
Node currentChild=this._constructionElement.getFirstChild();
+ String uri= this.getBaseURI();
while (currentChild!=null) {
if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
- if (this._storageResolvers.size() == 0) {
-
- // if we do not have storage resolvers, we verify with null
- StorageResolver storage = null;
-
- if (keyResolver.canResolve((Element) currentChild,
- this.getBaseURI(), storage)) {
- PublicKey pk =
- keyResolver.resolvePublicKey((Element) currentChild,
- this.getBaseURI(),
- storage);
-
- if (pk != null) {
- return pk;
- }
- }
- } else {
- for (int k = 0; k < this._storageResolvers.size(); k++) {
+ for (int k = 0; k < storageLength; k++) {
StorageResolver storage =
(StorageResolver) this._storageResolvers.get(k);
- if (keyResolver.canResolve((Element) currentChild,
- this.getBaseURI(), storage)) {
- PublicKey pk =
- keyResolver.resolvePublicKey((Element) currentChild,
- this.getBaseURI(),
+ PublicKey pk =
+ keyResolver.engineLookupAndResolvePublicKey((Element) currentChild,
+ uri,
storage);
- if (pk != null) {
- return pk;
- }
+ if (pk != null) {
+ KeyResolver.hit(it);
+ return pk;
}
}
- }
}
currentChild=currentChild.getNextSibling();
}
@@ -786,50 +763,27 @@
* @throws KeyResolverException
*/
PublicKey getPublicKeyFromInternalResolvers() throws KeyResolverException {
-
- for (int i = 0; i < this.lengthInternalKeyResolver(); i++) {
+ int length=lengthInternalKeyResolver();
+ int storageLength=this._storageResolvers.size();
+ for (int i = 0; i < length; i++) {
KeyResolverSpi keyResolver = this.itemInternalKeyResolver(i);
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Try " + keyResolver.getClass().getName());
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Try " + keyResolver.getClass().getName());
Node currentChild=this._constructionElement.getFirstChild();
+ String uri=this.getBaseURI();
while (currentChild!=null) {
if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
- if (this._storageResolvers.size() == 0) {
-
- // if we do not have storage resolvers, we verify with null
- StorageResolver storage = null;
-
- if (keyResolver.engineCanResolve((Element) currentChild,
- this.getBaseURI(),
- storage)) {
- PublicKey pk =
- keyResolver
- .engineResolvePublicKey((Element) currentChild, this
- .getBaseURI(), storage);
+ for (int k = 0; k < storageLength; k++) {
+ StorageResolver storage =
+ (StorageResolver) this._storageResolvers.get(k);
+ PublicKey pk = keyResolver
+ .engineLookupAndResolvePublicKey((Element) currentChild, uri, storage);
if (pk != null) {
- return pk;
+ return pk;
}
}
- } else {
- for (int k = 0; k < this._storageResolvers.size(); k++) {
- StorageResolver storage =
- (StorageResolver) this._storageResolvers.get(k);
-
- if (keyResolver.engineCanResolve((Element) currentChild,
- this.getBaseURI(),
- storage)) {
- PublicKey pk = keyResolver
- .engineResolvePublicKey((Element) currentChild, this
- .getBaseURI(), storage);
-
- if (pk != null) {
- return pk;
- }
- }
- }
- }
}
currentChild=currentChild.getNextSibling();
}
@@ -850,12 +804,12 @@
X509Certificate cert = this.getX509CertificateFromInternalResolvers();
if (cert != null) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE,
+ log.log(java.util.logging.Level.FINE,
"I could find a X509Certificate using the per-KeyInfo key resolvers");
return cert;
}
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE,
+ log.log(java.util.logging.Level.FINE,
"I couldn't find a X509Certificate using the per-KeyInfo key resolvers");
@@ -863,12 +817,12 @@
cert = this.getX509CertificateFromStaticResolvers();
if (cert != null) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE,
+ log.log(java.util.logging.Level.FINE,
"I could find a X509Certificate using the system-wide key resolvers");
return cert;
}
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE,
+ log.log(java.util.logging.Level.FINE,
"I couldn't find a X509Certificate using the system-wide key resolvers");
@@ -885,53 +839,44 @@
*/
X509Certificate getX509CertificateFromStaticResolvers()
throws KeyResolverException {
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Start getX509CertificateFromStaticResolvers() with "
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Start getX509CertificateFromStaticResolvers() with "
+ KeyResolver.length() + " resolvers");
-
- for (int i = 0; i < KeyResolver.length(); i++) {
- KeyResolver keyResolver = KeyResolver.item(i);
- Node currentChild=this._constructionElement.getFirstChild();
- while (currentChild!=null) {
- if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
- if (this._storageResolvers.size() == 0) {
-
- // if we do not have storage resolvers, we verify with null
- StorageResolver storage = null;
+ String uri=this.getBaseURI();
+ int length= KeyResolver.length();
+ int storageLength=this._storageResolvers.size();
+ Iterator it = KeyResolver.iterator();
+ for (int i = 0; i <length; i++) {
+ KeyResolverSpi keyResolver = (KeyResolverSpi) it.next();
+ X509Certificate cert= applyCurrentResolver(uri, storageLength, keyResolver);
+ if (cert!=null) {
+ KeyResolver.hit(it);
+ return cert;
+ }
+ }
+ return null;
+ }
- if (keyResolver.canResolve((Element) currentChild,
- this.getBaseURI(), storage)) {
- X509Certificate cert =
- keyResolver
- .resolveX509Certificate((Element) currentChild, this
- .getBaseURI(), storage);
+ private X509Certificate applyCurrentResolver(String uri, int storageLength, KeyResolverSpi keyResolver) throws KeyResolverException {
+ Node currentChild=this._constructionElement.getFirstChild();
+ while (currentChild!=null) {
+ if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
+ for (int k = 0; k < storageLength; k++) {
+ StorageResolver storage =
+ (StorageResolver) this._storageResolvers.get(k);
- if (cert != null) {
- return cert;
- }
- }
- } else {
- for (int k = 0; k < this._storageResolvers.size(); k++) {
- StorageResolver storage =
- (StorageResolver) this._storageResolvers.get(k);
+ X509Certificate cert = keyResolver
+ .engineLookupResolveX509Certificate((Element) currentChild, uri,
+ storage);
- if (keyResolver.canResolve((Element) currentChild,
- this.getBaseURI(), storage)) {
- X509Certificate cert = keyResolver
- .resolveX509Certificate((Element) currentChild, this
- .getBaseURI(), storage);
-
- if (cert != null) {
- return cert;
- }
- }
+ if (cert != null) {
+ return cert;
}
}
}
currentChild=currentChild.getNextSibling();
}
- }
- return null;
+ return null;
}
/**
@@ -942,55 +887,18 @@
*/
X509Certificate getX509CertificateFromInternalResolvers()
throws KeyResolverException {
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Start getX509CertificateFromInternalResolvers() with "
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Start getX509CertificateFromInternalResolvers() with "
+ this.lengthInternalKeyResolver() + " resolvers");
-
+ String uri=this.getBaseURI();
+ int storageLength=this._storageResolvers.size();
for (int i = 0; i < this.lengthInternalKeyResolver(); i++) {
KeyResolverSpi keyResolver = this.itemInternalKeyResolver(i);
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Try " + keyResolver.getClass().getName());
-
- Node currentChild=this._constructionElement.getFirstChild();
- while (currentChild!=null) {
- if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
- if (this._storageResolvers.size() == 0) {
-
- // if we do not have storage resolvers, we verify with null
- StorageResolver storage = null;
-
- if (keyResolver.engineCanResolve((Element) currentChild,
- this.getBaseURI(),
- storage)) {
- X509Certificate cert =
- keyResolver.engineResolveX509Certificate(
- (Element) currentChild, this.getBaseURI(), storage);
-
- if (cert != null) {
- return cert;
- }
- }
- } else {
- for (int k = 0; k < this._storageResolvers.size(); k++) {
- StorageResolver storage =
- (StorageResolver) this._storageResolvers.get(k);
-
- if (keyResolver.engineCanResolve((Element) currentChild,
- this.getBaseURI(),
- storage)) {
- X509Certificate cert =
- keyResolver.engineResolveX509Certificate(
- (Element) currentChild, this.getBaseURI(),
- storage);
-
- if (cert != null) {
- return cert;
- }
- }
- }
- }
- }
- currentChild=currentChild.getNextSibling();
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Try " + keyResolver.getClass().getName());
+ X509Certificate cert= applyCurrentResolver(uri, storageLength, keyResolver);
+ if (cert!=null) {
+ return cert;
}
}
@@ -1006,21 +914,21 @@
SecretKey sk = this.getSecretKeyFromInternalResolvers();
if (sk != null) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "I could find a secret key using the per-KeyInfo key resolvers");
+ log.log(java.util.logging.Level.FINE, "I could find a secret key using the per-KeyInfo key resolvers");
return sk;
}
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "I couldn't find a secret key using the per-KeyInfo key resolvers");
+ log.log(java.util.logging.Level.FINE, "I couldn't find a secret key using the per-KeyInfo key resolvers");
sk = this.getSecretKeyFromStaticResolvers();
if (sk != null) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "I could find a secret key using the system-wide key resolvers");
+ log.log(java.util.logging.Level.FINE, "I could find a secret key using the system-wide key resolvers");
return sk;
}
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "I couldn't find a secret key using the system-wide key resolvers");
+ log.log(java.util.logging.Level.FINE, "I couldn't find a secret key using the system-wide key resolvers");
return null;
@@ -1034,47 +942,29 @@
*/
SecretKey getSecretKeyFromStaticResolvers() throws KeyResolverException {
-
- for (int i = 0; i < KeyResolver.length(); i++) {
- KeyResolver keyResolver = KeyResolver.item(i);
+ final int length=KeyResolver.length();
+ int storageLength=this._storageResolvers.size();
+ Iterator it = KeyResolver.iterator();
+ for (int i = 0; i < length; i++) {
+ KeyResolverSpi keyResolver = (KeyResolverSpi) it.next();
Node currentChild=this._constructionElement.getFirstChild();
+ String uri=this.getBaseURI();
while (currentChild!=null) {
if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
- if (this._storageResolvers.size() == 0) {
-
- // if we do not have storage resolvers, we verify with null
- StorageResolver storage = null;
+ for (int k = 0; k < storageLength; k++) {
+ StorageResolver storage =
+ (StorageResolver) this._storageResolvers.get(k);
- if (keyResolver.canResolve((Element) currentChild,
- this.getBaseURI(), storage)) {
- SecretKey sk =
- keyResolver.resolveSecretKey((Element) currentChild,
- this.getBaseURI(),
- storage);
+ SecretKey sk =
+ keyResolver.engineLookupAndResolveSecretKey((Element) currentChild,
+ uri,
+ storage);
if (sk != null) {
return sk;
}
}
- } else {
- for (int k = 0; k < this._storageResolvers.size(); k++) {
- StorageResolver storage =
- (StorageResolver) this._storageResolvers.get(k);
-
- if (keyResolver.canResolve((Element) currentChild,
- this.getBaseURI(), storage)) {
- SecretKey sk =
- keyResolver.resolveSecretKey((Element) currentChild,
- this.getBaseURI(),
- storage);
-
- if (sk != null) {
- return sk;
- }
- }
- }
- }
}
currentChild=currentChild.getNextSibling();
}
@@ -1090,51 +980,28 @@
*/
SecretKey getSecretKeyFromInternalResolvers() throws KeyResolverException {
-
+ int storageLength=this._storageResolvers.size();
for (int i = 0; i < this.lengthInternalKeyResolver(); i++) {
KeyResolverSpi keyResolver = this.itemInternalKeyResolver(i);
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Try " + keyResolver.getClass().getName());
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Try " + keyResolver.getClass().getName());
Node currentChild=this._constructionElement.getFirstChild();
+ String uri=this.getBaseURI();
while (currentChild!=null) {
if (currentChild.getNodeType() == Node.ELEMENT_NODE) {
- if (this._storageResolvers.size() == 0) {
-
- // if we do not have storage resolvers, we verify with null
- StorageResolver storage = null;
+ for (int k = 0; k < storageLength; k++) {
+ StorageResolver storage =
+ (StorageResolver) this._storageResolvers.get(k);
- if (keyResolver.engineCanResolve((Element) currentChild,
- this.getBaseURI(),
- storage)) {
- SecretKey sk =
- keyResolver
- .engineResolveSecretKey((Element) currentChild, this
- .getBaseURI(), storage);
+ SecretKey sk = keyResolver
+ .engineLookupAndResolveSecretKey((Element) currentChild, uri, storage);
if (sk != null) {
return sk;
}
- }
- } else {
- for (int k = 0; k < this._storageResolvers.size(); k++) {
- StorageResolver storage =
- (StorageResolver) this._storageResolvers.get(k);
-
- if (keyResolver.engineCanResolve((Element) currentChild,
- this.getBaseURI(),
- storage)) {
- SecretKey sk = keyResolver
- .engineResolveSecretKey((Element) currentChild, this
- .getBaseURI(), storage);
-
- if (sk != null) {
- return sk;
- }
- }
- }
- }
- }
+ }
+ }
currentChild=currentChild.getNextSibling();
}
}
@@ -1145,7 +1012,7 @@
/**
* Stores the individual (per-KeyInfo) {@link KeyResolver}s
*/
- List _internalKeyResolvers = new ArrayList();
+ List _internalKeyResolvers = null;
/**
* This method is used to add a custom {@link KeyResolverSpi} to a KeyInfo
@@ -1154,6 +1021,9 @@
* @param realKeyResolver
*/
public void registerInternalKeyResolver(KeyResolverSpi realKeyResolver) {
+ if (_internalKeyResolvers==null) {
+ _internalKeyResolvers=new ArrayList();
+ }
this._internalKeyResolvers.add(realKeyResolver);
}
@@ -1162,6 +1032,8 @@
* @return the length of the key
*/
int lengthInternalKeyResolver() {
+ if (_internalKeyResolvers==null)
+ return 0;
return this._internalKeyResolvers.size();
}
@@ -1176,7 +1048,7 @@
}
/** Field _storageResolvers */
- List _storageResolvers = new ArrayList();
+ List _storageResolvers = nullList;
/**
* Method addStorageResolver
@@ -1184,19 +1056,11 @@
* @param storageResolver
*/
public void addStorageResolver(StorageResolver storageResolver) {
-
- if (storageResolver != null) {
+ if (_storageResolvers == nullList ){
+ _storageResolvers=new ArrayList();
+ }
this._storageResolvers.add(storageResolver);
- }
- }
- /**
- * Method getStorageResolvers
- *
- * @return the internalStorages
- */
- List getStorageResolvers() {
- return this._storageResolvers;
}
//J-
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyUtils.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyUtils.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -36,7 +35,7 @@
/**
* Utility class for for <CODE>com.sun.org.apache.xml.internal.security.keys</CODE> package.
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class KeyUtils {
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyInfoContent.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyInfoContent.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -28,7 +27,7 @@
/**
* Empty interface just to identify Elements that can be cildren of ds:KeyInfo.
*
- * @author $Author: blautenb $
+ * @author $Author: mullan $
*/
public interface KeyInfoContent {
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyName.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyName.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,25 +20,18 @@
*/
package com.sun.org.apache.xml.internal.security.keys.content;
-
-
import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityException;
import com.sun.org.apache.xml.internal.security.utils.Constants;
import com.sun.org.apache.xml.internal.security.utils.SignatureElementProxy;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-
/**
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class KeyName extends SignatureElementProxy implements KeyInfoContent {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
- java.util.logging.Logger.getLogger(KeyName.class.getName());
-
/**
* Constructor KeyName
*
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyValue.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyValue.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,11 +20,8 @@
*/
package com.sun.org.apache.xml.internal.security.keys.content;
-
-
import java.security.PublicKey;
-
import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityException;
import com.sun.org.apache.xml.internal.security.keys.content.keyvalues.DSAKeyValue;
import com.sun.org.apache.xml.internal.security.keys.content.keyvalues.RSAKeyValue;
@@ -34,140 +31,131 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-
/**
* The KeyValue element contains a single public key that may be useful in
* validating the signature. Structured formats for defining DSA (REQUIRED)
* and RSA (RECOMMENDED) public keys are defined in Signature Algorithms
* (section 6.4). The KeyValue element may include externally defined public
- * keys values represented as PCDATA or element types from an external namespace.
+ * keys values represented as PCDATA or element types from an external
+ * namespace.
*
- * @author $Author: vishal $
+ * @author $Author: mullan $
*/
public class KeyValue extends SignatureElementProxy implements KeyInfoContent {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
- java.util.logging.Logger.getLogger(KeyValue.class.getName());
+ /**
+ * Constructor KeyValue
+ *
+ * @param doc
+ * @param dsaKeyValue
+ */
+ public KeyValue(Document doc, DSAKeyValue dsaKeyValue) {
- /**
- * Constructor KeyValue
- *
- * @param doc
- * @param dsaKeyValue
- */
- public KeyValue(Document doc, DSAKeyValue dsaKeyValue) {
-
- super(doc);
+ super(doc);
- XMLUtils.addReturnToElement(this._constructionElement);
- this._constructionElement.appendChild(dsaKeyValue.getElement());
- XMLUtils.addReturnToElement(this._constructionElement);
- }
+ XMLUtils.addReturnToElement(this._constructionElement);
+ this._constructionElement.appendChild(dsaKeyValue.getElement());
+ XMLUtils.addReturnToElement(this._constructionElement);
+ }
- /**
- * Constructor KeyValue
- *
- * @param doc
- * @param rsaKeyValue
- */
- public KeyValue(Document doc, RSAKeyValue rsaKeyValue) {
+ /**
+ * Constructor KeyValue
+ *
+ * @param doc
+ * @param rsaKeyValue
+ */
+ public KeyValue(Document doc, RSAKeyValue rsaKeyValue) {
- super(doc);
+ super(doc);
- XMLUtils.addReturnToElement(this._constructionElement);
- this._constructionElement.appendChild(rsaKeyValue.getElement());
- XMLUtils.addReturnToElement(this._constructionElement);
- }
+ XMLUtils.addReturnToElement(this._constructionElement);
+ this._constructionElement.appendChild(rsaKeyValue.getElement());
+ XMLUtils.addReturnToElement(this._constructionElement);
+ }
- /**
- * Constructor KeyValue
- *
- * @param doc
- * @param unknownKeyValue
- */
- public KeyValue(Document doc, Element unknownKeyValue) {
+ /**
+ * Constructor KeyValue
+ *
+ * @param doc
+ * @param unknownKeyValue
+ */
+ public KeyValue(Document doc, Element unknownKeyValue) {
- super(doc);
+ super(doc);
- XMLUtils.addReturnToElement(this._constructionElement);
- this._constructionElement.appendChild(unknownKeyValue);
- XMLUtils.addReturnToElement(this._constructionElement);
- }
+ XMLUtils.addReturnToElement(this._constructionElement);
+ this._constructionElement.appendChild(unknownKeyValue);
+ XMLUtils.addReturnToElement(this._constructionElement);
+ }
- /**
- * Constructor KeyValue
- *
- * @param doc
- * @param pk
- */
- public KeyValue(Document doc, PublicKey pk) {
+ /**
+ * Constructor KeyValue
+ *
+ * @param doc
+ * @param pk
+ */
+ public KeyValue(Document doc, PublicKey pk) {
- super(doc);
+ super(doc);
- XMLUtils.addReturnToElement(this._constructionElement);
+ XMLUtils.addReturnToElement(this._constructionElement);
- if (pk instanceof java.security.interfaces.DSAPublicKey) {
- DSAKeyValue dsa = new DSAKeyValue(this._doc, pk);
+ if (pk instanceof java.security.interfaces.DSAPublicKey) {
+ DSAKeyValue dsa = new DSAKeyValue(this._doc, pk);
- this._constructionElement.appendChild(dsa.getElement());
- XMLUtils.addReturnToElement(this._constructionElement);
- } else if (pk instanceof java.security.interfaces.RSAPublicKey) {
- RSAKeyValue rsa = new RSAKeyValue(this._doc, pk);
+ this._constructionElement.appendChild(dsa.getElement());
+ XMLUtils.addReturnToElement(this._constructionElement);
+ } else if (pk instanceof java.security.interfaces.RSAPublicKey) {
+ RSAKeyValue rsa = new RSAKeyValue(this._doc, pk);
- this._constructionElement.appendChild(rsa.getElement());
- XMLUtils.addReturnToElement(this._constructionElement);
- }
- }
+ this._constructionElement.appendChild(rsa.getElement());
+ XMLUtils.addReturnToElement(this._constructionElement);
+ }
+ }
- /**
- * Constructor KeyValue
- *
- * @param element
- * @param BaseURI
- * @throws XMLSecurityException
- */
- public KeyValue(Element element, String BaseURI)
+ /**
+ * Constructor KeyValue
+ *
+ * @param element
+ * @param BaseURI
+ * @throws XMLSecurityException
+ */
+ public KeyValue(Element element, String BaseURI)
throws XMLSecurityException {
- super(element, BaseURI);
- }
+ super(element, BaseURI);
+ }
- /**
- * Method getPublicKey
- *
- * @return the public key
- * @throws XMLSecurityException
- */
- public PublicKey getPublicKey() throws XMLSecurityException {
-
+ /**
+ * Method getPublicKey
+ *
+ * @return the public key
+ * @throws XMLSecurityException
+ */
+ public PublicKey getPublicKey() throws XMLSecurityException {
- Element rsa = XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
- Constants._TAG_RSAKEYVALUE,0);
+ Element rsa = XMLUtils.selectDsNode
+ (this._constructionElement.getFirstChild(),
+ Constants._TAG_RSAKEYVALUE,0);
- if (rsa != null) {
- RSAKeyValue kv = new RSAKeyValue(rsa,
- this._baseURI);
-
+ if (rsa != null) {
+ RSAKeyValue kv = new RSAKeyValue(rsa, this._baseURI);
return kv.getPublicKey();
- }
+ }
- Element dsa = XMLUtils.selectDsNode(this._constructionElement,
- Constants._TAG_DSAKEYVALUE,0);
-
+ Element dsa = XMLUtils.selectDsNode
+ (this._constructionElement.getFirstChild(),
+ Constants._TAG_DSAKEYVALUE,0);
- if (dsa != null) {
- DSAKeyValue kv = new DSAKeyValue(dsa,
- this._baseURI);
-
+ if (dsa != null) {
+ DSAKeyValue kv = new DSAKeyValue(dsa, this._baseURI);
return kv.getPublicKey();
- }
-
+ }
- return null;
- }
+ return null;
+ }
- /** @inheritDoc */
- public String getBaseLocalName() {
- return Constants._TAG_KEYVALUE;
- }
+ /** @inheritDoc */
+ public String getBaseLocalName() {
+ return Constants._TAG_KEYVALUE;
+ }
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/MgmtData.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/MgmtData.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,25 +20,18 @@
*/
package com.sun.org.apache.xml.internal.security.keys.content;
-
-
import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityException;
import com.sun.org.apache.xml.internal.security.utils.Constants;
import com.sun.org.apache.xml.internal.security.utils.SignatureElementProxy;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-
/**
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class MgmtData extends SignatureElementProxy implements KeyInfoContent {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
- java.util.logging.Logger.getLogger(MgmtData.class.getName());
-
/**
* Constructor MgmtData
*
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/PGPData.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/PGPData.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,25 +20,18 @@
*/
package com.sun.org.apache.xml.internal.security.keys.content;
-
-
import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityException;
import com.sun.org.apache.xml.internal.security.utils.Constants;
import com.sun.org.apache.xml.internal.security.utils.SignatureElementProxy;
import org.w3c.dom.Element;
-
/**
*
- * @author $Author: raul $
+ * @author $Author: mullan $
* $todo$ Implement
*/
public class PGPData extends SignatureElementProxy implements KeyInfoContent {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
- java.util.logging.Logger.getLogger(PGPData.class.getName());
-
/**
* Constructor PGPData
*
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/RetrievalMethod.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/RetrievalMethod.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,9 +20,6 @@
*/
package com.sun.org.apache.xml.internal.security.keys.content;
-
-
-
import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityException;
import com.sun.org.apache.xml.internal.security.signature.XMLSignatureException;
import com.sun.org.apache.xml.internal.security.transforms.Transforms;
@@ -33,17 +30,13 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-
/**
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class RetrievalMethod extends SignatureElementProxy
implements KeyInfoContent {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
- java.util.logging.Logger.getLogger(RetrievalMethod.class.getName());
//J-
/** DSA retrieval */
public static final String TYPE_DSA = Constants.SignatureSpecNS + "DSAKeyValue";
@@ -133,7 +126,7 @@
try {
Element transformsElem =
- XMLUtils.selectDsNode(this._constructionElement,
+ XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
Constants
._TAG_TRANSFORMS, 0);
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/SPKIData.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/SPKIData.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,25 +20,18 @@
*/
package com.sun.org.apache.xml.internal.security.keys.content;
-
-
import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityException;
import com.sun.org.apache.xml.internal.security.utils.Constants;
import com.sun.org.apache.xml.internal.security.utils.SignatureElementProxy;
import org.w3c.dom.Element;
-
/**
*
- * @author $Author: raul $
+ * @author $Author: mullan $
* $todo$ implement
*/
public class SPKIData extends SignatureElementProxy implements KeyInfoContent {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
- java.util.logging.Logger.getLogger(SPKIData.class.getName());
-
/**
* Constructor SPKIData
*
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/X509Data.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/X509Data.java Wed Jul 05 16:42:37 2017 +0200
@@ -41,7 +41,7 @@
/**
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class X509Data extends SignatureElementProxy implements KeyInfoContent {
@@ -72,60 +72,17 @@
throws XMLSecurityException {
super(element, BaseURI);
-
- boolean noElements=true;
Node sibling=this._constructionElement.getFirstChild();
while (sibling!=null) {
if (sibling.getNodeType()!=Node.ELEMENT_NODE) {
sibling=sibling.getNextSibling();
continue;
}
- noElements=false;
- Element currentElem = (Element) sibling;
- sibling=sibling.getNextSibling();
- String localname = currentElem.getLocalName();
-
- if (currentElem.getNamespaceURI().equals(Constants.SignatureSpecNS)) {
- if (localname.equals(Constants._TAG_X509ISSUERSERIAL)) {
- XMLX509IssuerSerial is = new XMLX509IssuerSerial(currentElem,
- BaseURI);
-
- this.add(is);
- } else if (localname.equals(Constants._TAG_X509SKI)) {
- XMLX509SKI ski = new XMLX509SKI(currentElem, BaseURI);
-
- this.add(ski);
- } else if (localname.equals(Constants._TAG_X509SUBJECTNAME)) {
- XMLX509SubjectName sn = new XMLX509SubjectName(currentElem,
- BaseURI);
-
- this.add(sn);
- } else if (localname.equals(Constants._TAG_X509CERTIFICATE)) {
- XMLX509Certificate cert = new XMLX509Certificate(currentElem,
- BaseURI);
-
- this.add(cert);
- } else if (localname.equals(Constants._TAG_X509CRL)) {
- XMLX509CRL crl = new XMLX509CRL(currentElem, BaseURI);
-
- this.add(crl);
- } else {
- log.log(java.util.logging.Level.WARNING, "Found a " + currentElem.getTagName() + " element in "
- + Constants._TAG_X509DATA);
- this.addUnknownElement(currentElem);
- }
- } else {
- log.log(java.util.logging.Level.WARNING, "Found a " + currentElem.getTagName() + " element in "
- + Constants._TAG_X509DATA);
- this.addUnknownElement(currentElem);
- }
+ return;
}
- if (noElements) {
- Object exArgs[] = { "Elements", Constants._TAG_X509DATA };
-
- throw new XMLSecurityException("xml.WrongContent", exArgs);
- }
-
+ /* No Elements found */
+ Object exArgs[] = { "Elements", Constants._TAG_X509DATA };
+ throw new XMLSecurityException("xml.WrongContent", exArgs);
}
/**
@@ -169,11 +126,9 @@
*/
public void add(XMLX509IssuerSerial xmlX509IssuerSerial) {
- if (this._state == MODE_SIGN) {
this._constructionElement
.appendChild(xmlX509IssuerSerial.getElement());
XMLUtils.addReturnToElement(this._constructionElement);
- }
}
/**
@@ -202,11 +157,8 @@
* @param xmlX509SKI
*/
public void add(XMLX509SKI xmlX509SKI) {
-
- if (this._state == MODE_SIGN) {
this._constructionElement.appendChild(xmlX509SKI.getElement());
XMLUtils.addReturnToElement(this._constructionElement);
- }
}
/**
@@ -233,11 +185,8 @@
* @param xmlX509SubjectName
*/
public void add(XMLX509SubjectName xmlX509SubjectName) {
-
- if (this._state == MODE_SIGN) {
this._constructionElement.appendChild(xmlX509SubjectName.getElement());
XMLUtils.addReturnToElement(this._constructionElement);
- }
}
/**
@@ -266,11 +215,8 @@
* @param xmlX509Certificate
*/
public void add(XMLX509Certificate xmlX509Certificate) {
-
- if (this._state == MODE_SIGN) {
this._constructionElement.appendChild(xmlX509Certificate.getElement());
XMLUtils.addReturnToElement(this._constructionElement);
- }
}
/**
@@ -288,11 +234,8 @@
* @param xmlX509CRL
*/
public void add(XMLX509CRL xmlX509CRL) {
-
- if (this._state == MODE_SIGN) {
this._constructionElement.appendChild(xmlX509CRL.getElement());
XMLUtils.addReturnToElement(this._constructionElement);
- }
}
/**
@@ -301,11 +244,8 @@
* @param element
*/
public void addUnknownElement(Element element) {
-
- if (this._state == MODE_SIGN) {
this._constructionElement.appendChild(element);
XMLUtils.addReturnToElement(this._constructionElement);
- }
}
/**
@@ -479,7 +419,7 @@
* TODO implement
**/
public Element itemUnknownElement(int i) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "itemUnknownElement not implemented:"+i);
+ log.log(java.util.logging.Level.FINE, "itemUnknownElement not implemented:"+i);
return null;
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/DSAKeyValue.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/DSAKeyValue.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,8 +20,6 @@
*/
package com.sun.org.apache.xml.internal.security.keys.content.keyvalues;
-
-
import java.math.BigInteger;
import java.security.Key;
import java.security.KeyFactory;
@@ -39,18 +37,13 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-
/**
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class DSAKeyValue extends SignatureElementProxy
implements KeyValueContent {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
- java.util.logging.Logger.getLogger(DSAKeyValue.class.getName());
-
/**
* Constructor DSAKeyValue
*
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/KeyValueContent.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/KeyValueContent.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -32,7 +31,7 @@
*
*
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*
*/
public interface KeyValueContent {
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/RSAKeyValue.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/RSAKeyValue.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,8 +20,6 @@
*/
package com.sun.org.apache.xml.internal.security.keys.content.keyvalues;
-
-
import java.math.BigInteger;
import java.security.Key;
import java.security.KeyFactory;
@@ -39,19 +37,13 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-
/**
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class RSAKeyValue extends SignatureElementProxy
implements KeyValueContent {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
- java.util.logging.Logger.getLogger(
- RSAKeyValue.class.getName());
-
/**
* Constructor RSAKeyValue
*
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509CRL.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509CRL.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,30 +20,20 @@
*/
package com.sun.org.apache.xml.internal.security.keys.content.x509;
-
-
import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityException;
import com.sun.org.apache.xml.internal.security.utils.Constants;
import com.sun.org.apache.xml.internal.security.utils.SignatureElementProxy;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-
/**
*
- *
- *
- *
- * @author $Author: raul $
+ * @author $Author: mullan $
*
*/
public class XMLX509CRL extends SignatureElementProxy
implements XMLX509DataContent {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
- java.util.logging.Logger.getLogger(XMLX509CRL.class.getName());
-
/**
* Constructor XMLX509CRL
*
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509Certificate.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509Certificate.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,8 +20,6 @@
*/
package com.sun.org.apache.xml.internal.security.keys.content.x509;
-
-
import java.io.ByteArrayInputStream;
import java.security.PublicKey;
import java.security.cert.CertificateException;
@@ -34,18 +32,13 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-
/**
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class XMLX509Certificate extends SignatureElementProxy
implements XMLX509DataContent {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
- java.util.logging.Logger.getLogger(XMLX509Certificate.class.getName());
-
/** Field JCA_CERT_ID */
public static final String JCA_CERT_ID = "X.509";
@@ -146,23 +139,25 @@
return null;
}
- /** @inheritDoc */
- public boolean equals(Object obj) {
-
- try {
- if (!obj.getClass().getName().equals(this.getClass().getName())) {
- return false;
- }
+ /** @inheritDoc */
+ public boolean equals(Object obj) {
- XMLX509Certificate other = (XMLX509Certificate) obj;
+ if (obj == null) {
+ return false;
+ }
+ if (!this.getClass().getName().equals(obj.getClass().getName())) {
+ return false;
+ }
+ XMLX509Certificate other = (XMLX509Certificate) obj;
+ try {
- /** $todo$ or should be create X509Certificates and use the equals() from the Certs */
- return java.security.MessageDigest.isEqual(other.getCertificateBytes(),
- this.getCertificateBytes());
- } catch (XMLSecurityException ex) {
- return false;
- }
- }
+ /** $todo$ or should be create X509Certificates and use the equals() from the Certs */
+ return java.security.MessageDigest.isEqual
+ (other.getCertificateBytes(), this.getCertificateBytes());
+ } catch (XMLSecurityException ex) {
+ return false;
+ }
+ }
/** @inheritDoc */
public String getBaseLocalName() {
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509DataContent.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509DataContent.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -28,7 +27,7 @@
/**
* Just used for tagging contents that are allowed inside a ds:X509Data Element.
*
- * @author $Author: blautenb $
+ * @author $Author: mullan $
*/
public interface XMLX509DataContent {
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509IssuerSerial.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509IssuerSerial.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,8 +20,6 @@
*/
package com.sun.org.apache.xml.internal.security.keys.content.x509;
-
-
import java.math.BigInteger;
import java.security.cert.X509Certificate;
@@ -33,148 +31,139 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-
/**
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class XMLX509IssuerSerial extends SignatureElementProxy
implements XMLX509DataContent {
- /** {@link java.util.logging} logging facility */
+ /** {@link java.util.logging} logging facility */
static java.util.logging.Logger log =
java.util.logging.Logger.getLogger(
XMLX509IssuerSerial.class.getName());
- /**
- * Constructor XMLX509IssuerSerial
- *
- * @param element
- * @param BaseURI
- * @throws XMLSecurityException
- */
- public XMLX509IssuerSerial(Element element, String BaseURI)
+ /**
+ * Constructor XMLX509IssuerSerial
+ *
+ * @param element
+ * @param baseURI
+ * @throws XMLSecurityException
+ */
+ public XMLX509IssuerSerial(Element element, String baseURI)
throws XMLSecurityException {
- super(element, BaseURI);
- }
+ super(element, baseURI);
+ }
- /**
- * Constructor XMLX509IssuerSerial
- *
- * @param doc
- * @param X509IssuerName
- * @param X509SerialNumber
- */
- public XMLX509IssuerSerial(Document doc, String X509IssuerName,
- BigInteger X509SerialNumber) {
+ /**
+ * Constructor XMLX509IssuerSerial
+ *
+ * @param doc
+ * @param x509IssuerName
+ * @param x509SerialNumber
+ */
+ public XMLX509IssuerSerial(Document doc, String x509IssuerName,
+ BigInteger x509SerialNumber) {
- super(doc);
-
- XMLUtils.addReturnToElement(this._constructionElement);
- this.addTextElement(X509IssuerName, Constants._TAG_X509ISSUERNAME);
- XMLUtils.addReturnToElement(this._constructionElement);
- this.addTextElement(X509SerialNumber.toString(), Constants._TAG_X509SERIALNUMBER);
- }
+ super(doc);
+ XMLUtils.addReturnToElement(this._constructionElement);
+ addTextElement(x509IssuerName, Constants._TAG_X509ISSUERNAME);
+ addTextElement(x509SerialNumber.toString(), Constants._TAG_X509SERIALNUMBER);
+ }
- /**
- * Constructor XMLX509IssuerSerial
- *
- * @param doc
- * @param X509IssuerName
- * @param X509SerialNumber
- */
- public XMLX509IssuerSerial(Document doc, String X509IssuerName,
- String X509SerialNumber) {
- this(doc, X509IssuerName, new BigInteger(X509SerialNumber));
- }
+ /**
+ * Constructor XMLX509IssuerSerial
+ *
+ * @param doc
+ * @param x509IssuerName
+ * @param x509SerialNumber
+ */
+ public XMLX509IssuerSerial(Document doc, String x509IssuerName,
+ String x509SerialNumber) {
+ this(doc, x509IssuerName, new BigInteger(x509SerialNumber));
+ }
- /**
- * Constructor XMLX509IssuerSerial
- *
- * @param doc
- * @param X509IssuerName
- * @param X509SerialNumber
- */
- public XMLX509IssuerSerial(Document doc, String X509IssuerName,
- int X509SerialNumber) {
- this(doc, X509IssuerName,
- new BigInteger(Integer.toString(X509SerialNumber)));
- }
+ /**
+ * Constructor XMLX509IssuerSerial
+ *
+ * @param doc
+ * @param x509IssuerName
+ * @param x509SerialNumber
+ */
+ public XMLX509IssuerSerial(Document doc, String x509IssuerName,
+ int x509SerialNumber) {
+ this(doc, x509IssuerName,
+ new BigInteger(Integer.toString(x509SerialNumber)));
+ }
- /**
- * Constructor XMLX509IssuerSerial
- *
- * @param doc
- * @param x509certificate
- */
- public XMLX509IssuerSerial(Document doc, X509Certificate x509certificate) {
+ /**
+ * Constructor XMLX509IssuerSerial
+ *
+ * @param doc
+ * @param x509certificate
+ */
+ public XMLX509IssuerSerial(Document doc, X509Certificate x509certificate) {
- this(doc,
- RFC2253Parser.normalize(x509certificate.getIssuerDN().getName()),
- x509certificate.getSerialNumber());
- }
+ this(doc,
+ RFC2253Parser.normalize(x509certificate.getIssuerDN().getName()),
+ x509certificate.getSerialNumber());
+ }
- /**
- * Method getSerialNumber
- *
- *
- * @return the serial number
- */
- public BigInteger getSerialNumber() {
+ /**
+ * Method getSerialNumber
+ *
+ * @return the serial number
+ */
+ public BigInteger getSerialNumber() {
- String text =
- this.getTextFromChildElement(Constants._TAG_X509SERIALNUMBER,
- Constants.SignatureSpecNS);
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "In dem X509SerialNumber wurde gefunden: " + text);
+ String text = this.getTextFromChildElement
+ (Constants._TAG_X509SERIALNUMBER, Constants.SignatureSpecNS);
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "X509SerialNumber text: " + text);
- return new BigInteger(text);
- }
+ return new BigInteger(text);
+ }
- /**
- * Method getSerialNumberInteger
- *
- *
- * @return the serial number as plain int
- */
- public int getSerialNumberInteger() {
- return this.getSerialNumber().intValue();
- }
+ /**
+ * Method getSerialNumberInteger
+ *
+ * @return the serial number as plain int
+ */
+ public int getSerialNumberInteger() {
+ return this.getSerialNumber().intValue();
+ }
- /**
- * Method getIssuerName
- *
- *
- * @return the issuer name
- */
- public String getIssuerName() {
+ /**
+ * Method getIssuerName
+ *
+ * @return the issuer name
+ */
+ public String getIssuerName() {
- return RFC2253Parser
- .normalize(this
- .getTextFromChildElement(Constants._TAG_X509ISSUERNAME,
- Constants.SignatureSpecNS));
- }
+ return RFC2253Parser
+ .normalize(this
+ .getTextFromChildElement(Constants._TAG_X509ISSUERNAME,
+ Constants.SignatureSpecNS));
+ }
- /** @inheritDoc */
- public boolean equals(Object obj) {
+ /** @inheritDoc */
+ public boolean equals(Object obj) {
- if (!obj.getClass().getName().equals(this.getClass().getName())) {
- return false;
- }
+ if (obj == null) {
+ return false;
+ }
+ if (!this.getClass().getName().equals(obj.getClass().getName())) {
+ return false;
+ }
- XMLX509IssuerSerial other = (XMLX509IssuerSerial) obj;
-
+ XMLX509IssuerSerial other = (XMLX509IssuerSerial) obj;
- if (other.getSerialNumber().equals(this.getSerialNumber())
- && other.getIssuerName().equals(this.getIssuerName())) {
- return true;
- }
+ return this.getSerialNumber().equals(other.getSerialNumber())
+ && this.getIssuerName().equals(other.getIssuerName());
+ }
- return false;
- }
-
- /** @inheritDoc */
- public String getBaseLocalName() {
- return Constants._TAG_X509ISSUERSERIAL;
- }
+ /** @inheritDoc */
+ public String getBaseLocalName() {
+ return Constants._TAG_X509ISSUERSERIAL;
+ }
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509SKI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509SKI.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,8 +20,6 @@
*/
package com.sun.org.apache.xml.internal.security.keys.content.x509;
-
-
import java.io.IOException;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -36,192 +34,143 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import sun.security.util.DerValue;
-
-
/**
* Handles SubjectKeyIdentifier (SKI) for X.509v3.
*
- * @author $Author: raul $
- * @see <A HREF="http://java.sun.com/products/jdk/1.2/docs/api/java/security/cert/X509Extension.html">Interface X509Extension</A>
+ * @author $Author: mullan $
+ * @see <A HREF="http://java.sun.com/j2se/1.5.0/docs/api/java/security/cert/X509Extension.html">Interface X509Extension</A>
*/
public class XMLX509SKI extends SignatureElementProxy
implements XMLX509DataContent {
- /** {@link java.util.logging} logging facility */
+ /** {@link java.util.logging} logging facility */
static java.util.logging.Logger log =
java.util.logging.Logger.getLogger(XMLX509SKI.class.getName());
- /**
- * <CODE>SubjectKeyIdentifier (id-ce-subjectKeyIdentifier) (2.5.29.14)</CODE>:
- * This extension identifies the public key being certified. It enables
- * distinct keys used by the same subject to be differentiated
- * (e.g., as key updating occurs).
- * <BR />
- * A key identifer shall be unique with respect to all key identifiers
- * for the subject with which it is used. This extension is always non-critical.
- */
- public static final String SKI_OID = "2.5.29.14";
-
- /**
- * Constructor X509SKI
- *
- * @param doc
- * @param skiBytes
- */
- public XMLX509SKI(Document doc, byte[] skiBytes) {
+ /**
+ * <CODE>SubjectKeyIdentifier (id-ce-subjectKeyIdentifier) (2.5.29.14)</CODE>:
+ * This extension identifies the public key being certified. It enables
+ * distinct keys used by the same subject to be differentiated
+ * (e.g., as key updating occurs).
+ * <BR />
+ * A key identifer shall be unique with respect to all key identifiers
+ * for the subject with which it is used. This extension is always non-critical.
+ */
+ public static final String SKI_OID = "2.5.29.14";
- super(doc);
-
- this.addBase64Text(skiBytes);
- }
+ /**
+ * Constructor X509SKI
+ *
+ * @param doc
+ * @param skiBytes
+ */
+ public XMLX509SKI(Document doc, byte[] skiBytes) {
+ super(doc);
+ this.addBase64Text(skiBytes);
+ }
- /**
- * Constructor XMLX509SKI
- *
- * @param doc
- * @param x509certificate
- * @throws XMLSecurityException
- */
- public XMLX509SKI(Document doc, X509Certificate x509certificate)
+ /**
+ * Constructor XMLX509SKI
+ *
+ * @param doc
+ * @param x509certificate
+ * @throws XMLSecurityException
+ */
+ public XMLX509SKI(Document doc, X509Certificate x509certificate)
throws XMLSecurityException {
-
- super(doc);
-
- this.addBase64Text(XMLX509SKI.getSKIBytesFromCert(x509certificate));
- }
+ super(doc);
+ this.addBase64Text(XMLX509SKI.getSKIBytesFromCert(x509certificate));
+ }
- /**
- * Constructor XMLX509SKI
- *
- * @param element
- * @param BaseURI
- * @throws XMLSecurityException
- */
- public XMLX509SKI(Element element, String BaseURI)
+ /**
+ * Constructor XMLX509SKI
+ *
+ * @param element
+ * @param BaseURI
+ * @throws XMLSecurityException
+ */
+ public XMLX509SKI(Element element, String BaseURI)
throws XMLSecurityException {
- super(element, BaseURI);
- }
-
- /**
- * Method getSKIBytes
- *
- * @return the skibytes
- * @throws XMLSecurityException
- */
- public byte[] getSKIBytes() throws XMLSecurityException {
- return this.getBytesFromTextChild();
- }
+ super(element, BaseURI);
+ }
- /**
- * Method getSKIBytesFromCert
- *
- * @param cert
- * @return sky bytes from the given certificate
- *
- * @throws XMLSecurityException
- * @see java.security.cert.X509Extension#getExtensionValue(java.lang.String)
- */
- public static byte[] getSKIBytesFromCert(X509Certificate cert)
- throws XMLSecurityException {
+ /**
+ * Method getSKIBytes
+ *
+ * @return the skibytes
+ * @throws XMLSecurityException
+ */
+ public byte[] getSKIBytes() throws XMLSecurityException {
+ return this.getBytesFromTextChild();
+ }
- try {
+ /**
+ * Method getSKIBytesFromCert
+ *
+ * @param cert
+ * @return ski bytes from the given certificate
+ *
+ * @throws XMLSecurityException
+ * @see java.security.cert.X509Extension#getExtensionValue(java.lang.String)
+ */
+ public static byte[] getSKIBytesFromCert(X509Certificate cert)
+ throws XMLSecurityException {
- /*
- * Gets the DER-encoded OCTET string for the extension value (extnValue)
- * identified by the passed-in oid String. The oid string is
- * represented by a set of positive whole numbers separated by periods.
- */
- byte[] derEncodedValue = cert.getExtensionValue(XMLX509SKI.SKI_OID);
-
- if (cert.getVersion() < 3) {
+ if (cert.getVersion() < 3) {
Object exArgs[] = { new Integer(cert.getVersion()) };
-
throw new XMLSecurityException("certificate.noSki.lowVersion",
exArgs);
- }
+ }
- byte[] extensionValue = null;
+ /*
+ * Gets the DER-encoded OCTET string for the extension value
+ * (extnValue) identified by the passed-in oid String. The oid
+ * string is represented by a set of positive whole numbers
+ * separated by periods.
+ */
+ byte[] extensionValue = cert.getExtensionValue(XMLX509SKI.SKI_OID);
+ if (extensionValue == null) {
+ throw new XMLSecurityException("certificate.noSki.null");
+ }
- /**
- * Use sun.security.util.DerValue if it is present.
- */
- try {
- DerValue dervalue = new DerValue(derEncodedValue);
- if (dervalue == null) {
- throw new XMLSecurityException("certificate.noSki.null");
- }
- if (dervalue.tag != DerValue.tag_OctetString) {
- throw new XMLSecurityException("certificate.noSki.notOctetString");
- }
- extensionValue = dervalue.getOctetString();
- } catch (NoClassDefFoundError e) {
- }
+ /**
+ * Strip away first four bytes from the extensionValue
+ * The first two bytes are the tag and length of the extensionValue
+ * OCTET STRING, and the next two bytes are the tag and length of
+ * the skid OCTET STRING.
+ */
+ byte skidValue[] = new byte[extensionValue.length - 4];
+
+ System.arraycopy(extensionValue, 4, skidValue, 0, skidValue.length);
+
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Base64 of SKI is " + Base64.encode(skidValue));
+ }
- /**
- * Fall back to org.bouncycastle.asn1.DERInputStream
- */
- if (extensionValue == null) {
- try {
- Class clazz = Class.forName("org.bouncycastle.asn1.DERInputStream");
- if (clazz != null) {
- Constructor constructor = clazz.getConstructor(new Class[]{InputStream.class});
- InputStream is = (InputStream) constructor.newInstance(new Object[]{new ByteArrayInputStream(derEncodedValue)});
- Method method = clazz.getMethod("readObject", new Class[]{});
- Object obj = method.invoke(is, new Object[]{});
- if (obj == null) {
- throw new XMLSecurityException("certificate.noSki.null");
- }
- Class clazz2 = Class.forName("org.bouncycastle.asn1.ASN1OctetString");
- if (!clazz2.isInstance(obj)) {
- throw new XMLSecurityException("certificate.noSki.notOctetString");
- }
- Method method2 = clazz2.getMethod("getOctets", new Class[]{});
- extensionValue = (byte[]) method2.invoke(obj, new Object[]{});
- }
- } catch (Throwable t) {
- }
- }
+ return skidValue;
+ }
- /**
- * Strip away first two bytes from the DerValue (tag and length)
- */
- byte abyte0[] = new byte[extensionValue.length - 2];
+ /** @inheritDoc */
+ public boolean equals(Object obj) {
+ if (obj == null) {
+ return false;
+ }
+ if (!this.getClass().getName().equals(obj.getClass().getName())) {
+ return false;
+ }
- System.arraycopy(extensionValue, 2, abyte0, 0, abyte0.length);
+ XMLX509SKI other = (XMLX509SKI) obj;
- /*
- byte abyte0[] = new byte[derEncodedValue.length - 4];
- System.arraycopy(derEncodedValue, 4, abyte0, 0, abyte0.length);
- */
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Base64 of SKI is " + Base64.encode(abyte0));
-
- return abyte0;
- } catch (IOException ex) {
- throw new XMLSecurityException("generic.EmptyMessage", ex);
- }
- }
-
- /** @inheritDoc */
- public boolean equals(Object obj) {
+ try {
+ return java.security.MessageDigest.isEqual(other.getSKIBytes(),
+ this.getSKIBytes());
+ } catch (XMLSecurityException ex) {
+ return false;
+ }
+ }
- if (!obj.getClass().getName().equals(this.getClass().getName())) {
- return false;
- }
-
- XMLX509SKI other = (XMLX509SKI) obj;
-
- try {
- return java.security.MessageDigest.isEqual(other.getSKIBytes(),
- this.getSKIBytes());
- } catch (XMLSecurityException ex) {
- return false;
- }
- }
-
- /** @inheritDoc */
- public String getBaseLocalName() {
- return Constants._TAG_X509SKI;
- }
+ /** @inheritDoc */
+ public String getBaseLocalName() {
+ return Constants._TAG_X509SKI;
+ }
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509SubjectName.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509SubjectName.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,8 +20,6 @@
*/
package com.sun.org.apache.xml.internal.security.keys.content.x509;
-
-
import java.security.cert.X509Certificate;
import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityException;
@@ -33,15 +31,11 @@
/**
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class XMLX509SubjectName extends SignatureElementProxy
implements XMLX509DataContent {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
- java.util.logging.Logger.getLogger(XMLX509SubjectName.class.getName());
-
/**
* Constructor X509SubjectName
*
@@ -88,23 +82,21 @@
return RFC2253Parser.normalize(this.getTextFromTextChild());
}
- /** @inheritDoc */
- public boolean equals(Object obj) {
-
- if (!obj.getClass().getName().equals(this.getClass().getName())) {
- return false;
- }
+ /** @inheritDoc */
+ public boolean equals(Object obj) {
+ if (obj == null) {
+ return false;
+ }
- XMLX509SubjectName other = (XMLX509SubjectName) obj;
- String otherSubject = other.getSubjectName();
- String thisSubject = this.getSubjectName();
+ if (!this.getClass().getName().equals(obj.getClass().getName())) {
+ return false;
+ }
- if (otherSubject.equals(thisSubject)) {
- return true;
- }
+ XMLX509SubjectName other = (XMLX509SubjectName) obj;
+ String otherSubject = other.getSubjectName();
+ String thisSubject = this.getSubjectName();
- return false;
-
+ return thisSubject.equals(otherSubject);
}
/** @inheritDoc */
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/InvalidKeyResolverException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/InvalidKeyResolverException.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -29,7 +28,7 @@
/**
*
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class InvalidKeyResolverException extends XMLSecurityException {
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -26,6 +25,7 @@
import java.security.PublicKey;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
import javax.crypto.SecretKey;
@@ -39,7 +39,8 @@
* KeyResolver is factory class for subclass of KeyResolverSpi that
* represent child element of KeyInfo.
*
- * @author $Author: raul $
+ * @author $Author: mullan $
+ * @version %I%, %G%
*/
public class KeyResolver {
@@ -72,6 +73,7 @@
InstantiationException {
this._resolverSpi =
(KeyResolverSpi) Class.forName(className).newInstance();
+ this._resolverSpi.setGlobalResolver(true);
}
/**
@@ -83,21 +85,17 @@
return KeyResolver._resolverVector.size();
}
- /**
- * Method item
- *
- * @param i
- * @return the number i resolver registerd
- * @throws KeyResolverException
- */
- public static KeyResolver item(int i) throws KeyResolverException {
-
- KeyResolver resolver = (KeyResolver) KeyResolver._resolverVector.get(i);
- if (resolver==null) {
- throw new KeyResolverException("utils.resolver.noClass");
- }
-
- return resolver;
+ public static void hit(Iterator hintI) {
+ ResolverIterator hint = (ResolverIterator) hintI;
+ int i = hint.i;
+ if (i!=1 && hint.res ==_resolverVector) {
+ List resolverVector=(List)((ArrayList)_resolverVector).clone();
+ Object ob=resolverVector.remove(i-1);
+ resolverVector.add(0,ob);
+ _resolverVector=resolverVector;
+ } else {
+ //System.out.println("KeyResolver hitting");
+ }
}
/**
@@ -106,17 +104,19 @@
* @param element
* @param BaseURI
* @param storage
- * @return the instance that happends to implement the thing.
+ * @return The certificate represented by the element.
*
* @throws KeyResolverException
*/
- public static final KeyResolver getInstance(
+ public static final X509Certificate getX509Certificate(
Element element, String BaseURI, StorageResolver storage)
throws KeyResolverException {
- for (int i = 0; i < KeyResolver._resolverVector.size(); i++) {
+ // use the old vector to not be hit by updates
+ List resolverVector = KeyResolver._resolverVector;
+ for (int i = 0; i < resolverVector.size(); i++) {
KeyResolver resolver=
- (KeyResolver) KeyResolver._resolverVector.get(i);
+ (KeyResolver) resolverVector.get(i);
if (resolver==null) {
Object exArgs[] = {
@@ -127,11 +127,63 @@
throw new KeyResolverException("utils.resolver.noClass", exArgs);
}
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "check resolvability by class " + resolver.getClass());
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "check resolvability by class " + resolver.getClass());
+
+ X509Certificate cert=resolver.resolveX509Certificate(element, BaseURI, storage);
+ if (cert!=null) {
+ return cert;
+ }
+ }
+
+ Object exArgs[] = {
+ (((element != null) && (element.getNodeType() == Node.ELEMENT_NODE))
+ ? element.getTagName()
+ : "null") };
- if (resolver.canResolve(element, BaseURI, storage)) {
- return resolver;
+ throw new KeyResolverException("utils.resolver.noClass", exArgs);
+ }
+ /**
+ * Method getInstance
+ *
+ * @param element
+ * @param BaseURI
+ * @param storage
+ * @return the public key contained in the element
+ *
+ * @throws KeyResolverException
+ */
+ public static final PublicKey getPublicKey(
+ Element element, String BaseURI, StorageResolver storage)
+ throws KeyResolverException {
+
+ List resolverVector = KeyResolver._resolverVector;
+ for (int i = 0; i < resolverVector.size(); i++) {
+ KeyResolver resolver=
+ (KeyResolver) resolverVector.get(i);
+
+ if (resolver==null) {
+ Object exArgs[] = {
+ (((element != null)
+ && (element.getNodeType() == Node.ELEMENT_NODE))
+ ? element.getTagName()
+ : "null") };
+
+ throw new KeyResolverException("utils.resolver.noClass", exArgs);
+ }
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "check resolvability by class " + resolver.getClass());
+
+ PublicKey cert=resolver.resolvePublicKey(element, BaseURI, storage);
+ if (cert!=null) {
+ if (i!=0 && resolverVector==_resolverVector) {
+ //update resolver.
+ resolverVector=(List)((ArrayList)_resolverVector).clone();
+ Object ob=resolverVector.remove(i);
+ resolverVector.add(0,ob);
+ _resolverVector=resolverVector;
+ }
+ return cert;
}
}
@@ -182,34 +234,6 @@
KeyResolver._resolverVector.add(0, className);
}
- /*
- * Method resolve
- *
- * @param element
- *
- * @throws KeyResolverException
- */
-
- /**
- * Method resolveStatic
- *
- * @param element
- * @param BaseURI
- * @param storage
- * @return resolve from the static register an element
- *
- * @throws KeyResolverException
- */
- public static PublicKey resolveStatic(
- Element element, String BaseURI, StorageResolver storage)
- throws KeyResolverException {
-
- KeyResolver myResolver = KeyResolver.getInstance(element, BaseURI,
- storage);
-
- return myResolver.resolvePublicKey(element, BaseURI, storage);
- }
-
/**
* Method resolve
*
@@ -223,7 +247,7 @@
public PublicKey resolvePublicKey(
Element element, String BaseURI, StorageResolver storage)
throws KeyResolverException {
- return this._resolverSpi.engineResolvePublicKey(element, BaseURI, storage);
+ return this._resolverSpi.engineLookupAndResolvePublicKey(element, BaseURI, storage);
}
/**
@@ -239,7 +263,7 @@
public X509Certificate resolveX509Certificate(
Element element, String BaseURI, StorageResolver storage)
throws KeyResolverException {
- return this._resolverSpi.engineResolveX509Certificate(element, BaseURI,
+ return this._resolverSpi.engineLookupResolveX509Certificate(element, BaseURI,
storage);
}
@@ -253,7 +277,7 @@
public SecretKey resolveSecretKey(
Element element, String BaseURI, StorageResolver storage)
throws KeyResolverException {
- return this._resolverSpi.engineResolveSecretKey(element, BaseURI,
+ return this._resolverSpi.engineLookupAndResolveSecretKey(element, BaseURI,
storage);
}
@@ -277,14 +301,6 @@
return this._resolverSpi.engineGetProperty(key);
}
- /**
- * Method getPropertyKeys
- *
- * @return the properties key registerd in this resolver
- */
- public String[] getPropertyKeys() {
- return this._resolverSpi.engineGetPropertyKeys();
- }
/**
* Method understandsProperty
@@ -296,18 +312,6 @@
return this._resolverSpi.understandsProperty(propertyToTest);
}
- /**
- * Method canResolve
- *
- * @param element
- * @param BaseURI
- * @param storage
- * @return true if can resolve the key in the element
- */
- public boolean canResolve(Element element, String BaseURI,
- StorageResolver storage) {
- return this._resolverSpi.engineCanResolve(element, BaseURI, storage);
- }
/**
* Method resolverClassName
@@ -317,4 +321,37 @@
public String resolverClassName() {
return this._resolverSpi.getClass().getName();
}
+
+ static class ResolverIterator implements Iterator {
+ List res;
+ Iterator it;
+ int i;
+ public ResolverIterator(List list) {
+ res = list;
+ it = res.iterator();
+ }
+ public boolean hasNext() {
+ // TODO Auto-generated method stub
+ return it.hasNext();
+ }
+
+ public Object next() {
+ i++;
+ KeyResolver resolver = (KeyResolver) it.next();
+ if (resolver==null) {
+ throw new RuntimeException("utils.resolver.noClass");
+ }
+
+ return resolver._resolverSpi;
+ }
+
+ public void remove() {
+ // TODO Auto-generated method stub
+
+ }
+
+ };
+ public static Iterator iterator() {
+ return new ResolverIterator(_resolverVector);
+ }
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverException.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -31,7 +30,7 @@
*
*
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*
*/
public class KeyResolverException extends XMLSecurityException {
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverSpi.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverSpi.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,17 +20,15 @@
*/
package com.sun.org.apache.xml.internal.security.keys.keyresolver;
-
-
import java.security.PublicKey;
import java.security.cert.X509Certificate;
+import java.util.HashMap;
import javax.crypto.SecretKey;
import com.sun.org.apache.xml.internal.security.keys.storage.StorageResolver;
import org.w3c.dom.Element;
-
/**
* This class is abstract class for a child KeyInfo Elemnet.
*
@@ -41,14 +39,10 @@
* JAVACLASS="MyPackage.MyKeyValueImpl"//gt;
* </PRE>
*
- * @author $Author: raul $
+ * @author $Author: mullan $
+ * @version $Revision: 1.5 $
*/
public abstract class KeyResolverSpi {
-
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
- java.util.logging.Logger.getLogger(KeyResolverSpi.class.getName());
-
/**
* This method helps the {@link com.sun.org.apache.xml.internal.security.utils.resolver.ResourceResolver} to decide whether a
* {@link com.sun.org.apache.xml.internal.security.utils.resolver.ResourceResolverSpi} is able to perform the requested action.
@@ -56,10 +50,28 @@
* @param element
* @param BaseURI
* @param storage
- * @return true if can resolve the key in the element
+ * @return
*/
- abstract public boolean engineCanResolve(Element element, String BaseURI,
- StorageResolver storage);
+ public boolean engineCanResolve(Element element, String BaseURI,
+ StorageResolver storage) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * Method engineResolvePublicKey
+ *
+ * @param element
+ * @param BaseURI
+ * @param storage
+ * @return resolved public key from the registered from the element.
+ *
+ * @throws KeyResolverException
+ */
+ public PublicKey engineResolvePublicKey(
+ Element element, String BaseURI, StorageResolver storage)
+ throws KeyResolverException {
+ throw new UnsupportedOperationException();
+ };
/**
* Method engineResolvePublicKey
@@ -71,9 +83,44 @@
*
* @throws KeyResolverException
*/
- abstract public PublicKey engineResolvePublicKey(
+ public PublicKey engineLookupAndResolvePublicKey(
Element element, String BaseURI, StorageResolver storage)
- throws KeyResolverException;
+ throws KeyResolverException {
+ KeyResolverSpi tmp = cloneIfNeeded();
+ if (!tmp.engineCanResolve(element, BaseURI, storage))
+ return null;
+ return tmp.engineResolvePublicKey(element, BaseURI, storage);
+ }
+
+ private KeyResolverSpi cloneIfNeeded() throws KeyResolverException {
+ KeyResolverSpi tmp=this;
+ if (globalResolver) {
+ try {
+ tmp = (KeyResolverSpi) getClass().newInstance();
+ } catch (InstantiationException e) {
+ throw new KeyResolverException("",e);
+ } catch (IllegalAccessException e) {
+ throw new KeyResolverException("",e);
+ }
+ }
+ return tmp;
+ }
+
+ /**
+ * Method engineResolveCertificate
+ *
+ * @param element
+ * @param BaseURI
+ * @param storage
+ * @return resolved X509Certificate key from the registered from the elements
+ *
+ * @throws KeyResolverException
+ */
+ public X509Certificate engineResolveX509Certificate(
+ Element element, String BaseURI, StorageResolver storage)
+ throws KeyResolverException{
+ throw new UnsupportedOperationException();
+ };
/**
* Method engineResolveCertificate
@@ -85,9 +132,30 @@
*
* @throws KeyResolverException
*/
- abstract public X509Certificate engineResolveX509Certificate(
+ public X509Certificate engineLookupResolveX509Certificate(
Element element, String BaseURI, StorageResolver storage)
- throws KeyResolverException;
+ throws KeyResolverException {
+ KeyResolverSpi tmp = cloneIfNeeded();
+ if (!tmp.engineCanResolve(element, BaseURI, storage))
+ return null;
+ return tmp.engineResolveX509Certificate(element, BaseURI, storage);
+
+ }
+ /**
+ * Method engineResolveSecretKey
+ *
+ * @param element
+ * @param BaseURI
+ * @param storage
+ * @return resolved SecretKey key from the registered from the elements
+ *
+ * @throws KeyResolverException
+ */
+ public SecretKey engineResolveSecretKey(
+ Element element, String BaseURI, StorageResolver storage)
+ throws KeyResolverException{
+ throw new UnsupportedOperationException();
+ };
/**
* Method engineResolveSecretKey
@@ -99,12 +167,19 @@
*
* @throws KeyResolverException
*/
- abstract public SecretKey engineResolveSecretKey(
+ public SecretKey engineLookupAndResolveSecretKey(
Element element, String BaseURI, StorageResolver storage)
- throws KeyResolverException;
+ throws KeyResolverException {
+ KeyResolverSpi tmp = cloneIfNeeded();
+ if (!tmp.engineCanResolve(element, BaseURI, storage))
+ return null;
+ return tmp.engineResolveSecretKey(element, BaseURI, storage);
+ }
/** Field _properties */
- protected java.util.Map _properties = new java.util.HashMap(10);
+ protected java.util.Map _properties = null;
+
+ protected boolean globalResolver=false;
/**
* Method engineSetProperty
@@ -113,19 +188,8 @@
* @param value
*/
public void engineSetProperty(String key, String value) {
-
- java.util.Iterator i = this._properties.keySet().iterator();
-
- while (i.hasNext()) {
- String c = (String) i.next();
-
- if (c.equals(key)) {
- key = c;
-
- break;
- }
- }
-
+ if (_properties==null)
+ _properties=new HashMap();
this._properties.put(key, value);
}
@@ -136,49 +200,26 @@
* @return obtain the property appointed by key
*/
public String engineGetProperty(String key) {
-
- java.util.Iterator i = this._properties.keySet().iterator();
-
- while (i.hasNext()) {
- String c = (String) i.next();
-
- if (c.equals(key)) {
- key = c;
-
- break;
- }
- }
+ if (_properties==null)
+ return null;
return (String) this._properties.get(key);
}
/**
- * Method engineGetPropertyKeys
- *
- * @return the keys of properties known by this resolver
- */
- public String[] engineGetPropertyKeys() {
- return new String[0];
- }
-
- /**
* Method understandsProperty
*
* @param propertyToTest
* @return true if understood the property
*/
public boolean understandsProperty(String propertyToTest) {
-
- String[] understood = this.engineGetPropertyKeys();
+ if (_properties==null)
+ return false;
- if (understood != null) {
- for (int i = 0; i < understood.length; i++) {
- if (understood[i].equals(propertyToTest)) {
- return true;
- }
- }
- }
+ return this._properties.get(propertyToTest)!=null;
+ }
+ public void setGlobalResolver(boolean globalResolver) {
+ this.globalResolver = globalResolver;
+ }
- return false;
- }
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/DSAKeyValueResolver.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/DSAKeyValueResolver.java Wed Jul 05 16:42:37 2017 +0200
@@ -37,46 +37,10 @@
/**
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class DSAKeyValueResolver extends KeyResolverSpi {
- /** Field _dsaKeyElement */
- private Element _dsaKeyElement = null;
-
- /** @inheritDoc */
- public boolean engineCanResolve(Element element, String BaseURI,
- StorageResolver storage) {
-
- if (element == null) {
- return false;
- }
-
- boolean isKeyValue = XMLUtils.elementIsInSignatureSpace(element,
- Constants._TAG_KEYVALUE);
- boolean isDSAKeyValue = XMLUtils.elementIsInSignatureSpace(element,
- Constants._TAG_DSAKEYVALUE);
-
- if (isKeyValue) {
-
- this._dsaKeyElement =
- XMLUtils.selectDsNode(element.getFirstChild(),Constants._TAG_DSAKEYVALUE,0);
-
- if (this._dsaKeyElement != null) {
- return true;
- }
- } else if (isDSAKeyValue) {
-
- // this trick is needed to allow the RetrievalMethodResolver to eat a
- // ds:DSAKeyValue directly (without KeyValue)
- this._dsaKeyElement = element;
-
- return true;
- }
-
- return false;
- }
-
/**
* Method engineResolvePublicKey
*
@@ -85,20 +49,30 @@
* @param storage
* @return null if no {@link PublicKey} could be obtained
*/
- public PublicKey engineResolvePublicKey(
+ public PublicKey engineLookupAndResolvePublicKey(
Element element, String BaseURI, StorageResolver storage) {
+ if (element == null) {
+ return null;
+ }
+ Element dsaKeyElement=null;
+ boolean isKeyValue = XMLUtils.elementIsInSignatureSpace(element,
+ Constants._TAG_KEYVALUE);
+ if (isKeyValue) {
+ dsaKeyElement =
+ XMLUtils.selectDsNode(element.getFirstChild(),Constants._TAG_DSAKEYVALUE,0);
+ } else if (XMLUtils.elementIsInSignatureSpace(element,
+ Constants._TAG_DSAKEYVALUE)) {
+ // this trick is needed to allow the RetrievalMethodResolver to eat a
+ // ds:DSAKeyValue directly (without KeyValue)
+ dsaKeyElement = element;
+ }
- if (this._dsaKeyElement == null) {
- boolean weCanResolve = this.engineCanResolve(element, BaseURI,
- storage);
-
- if (!weCanResolve || (this._dsaKeyElement == null)) {
- return null;
- }
+ if (dsaKeyElement == null) {
+ return null;
}
try {
- DSAKeyValue dsaKeyValue = new DSAKeyValue(this._dsaKeyElement,
+ DSAKeyValue dsaKeyValue = new DSAKeyValue(dsaKeyElement,
BaseURI);
PublicKey pk = dsaKeyValue.getPublicKey();
@@ -112,13 +86,13 @@
/** @inheritDoc */
- public X509Certificate engineResolveX509Certificate(
+ public X509Certificate engineLookupResolveX509Certificate(
Element element, String BaseURI, StorageResolver storage) {
return null;
}
/** @inheritDoc */
- public javax.crypto.SecretKey engineResolveSecretKey(
+ public javax.crypto.SecretKey engineLookupAndResolveSecretKey(
Element element, String BaseURI, StorageResolver storage){
return null;
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/EncryptedKeyResolver.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/EncryptedKeyResolver.java Wed Jul 05 16:42:37 2017 +0200
@@ -56,7 +56,6 @@
RSAKeyValueResolver.class.getName());
- Key _key;
Key _kek;
String _algorithm;
@@ -66,7 +65,6 @@
* @param algorithm
*/
public EncryptedKeyResolver(String algorithm) {
- _key = null;
_kek = null;
_algorithm=algorithm;
}
@@ -78,64 +76,49 @@
*/
public EncryptedKeyResolver(String algorithm, Key kek) {
- _key = null;
_algorithm = algorithm;
_kek = kek;
}
- /**
- * Method engineCanResolve
- *
- * @param element
- * @param BaseURI
- * @param storage
- * @return true if can resolve the key in the element
- *
- */
-
- public boolean engineCanResolve(Element element, String BaseURI,
- StorageResolver storage) {
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "EncryptedKeyResolver - Can I resolve " + element.getTagName());
-
- if (element == null) {
- return false;
- }
-
- boolean isEncryptedKey = XMLUtils.elementIsInEncryptionSpace(element,
- EncryptionConstants._TAG_ENCRYPTEDKEY);
-
- if (isEncryptedKey) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Passed an Encrypted Key");
- try {
- XMLCipher cipher = XMLCipher.getInstance();
- cipher.init(XMLCipher.UNWRAP_MODE, _kek);
- EncryptedKey ek = cipher.loadEncryptedKey(element);
- _key = cipher.decryptKey(ek, _algorithm);
- }
- catch (Exception e) {}
- }
-
- return (_key != null);
- }
-
/** @inheritDoc */
- public PublicKey engineResolvePublicKey(
+ public PublicKey engineLookupAndResolvePublicKey(
Element element, String BaseURI, StorageResolver storage) {
return null;
}
/** @inheritDoc */
- public X509Certificate engineResolveX509Certificate(
+ public X509Certificate engineLookupResolveX509Certificate(
Element element, String BaseURI, StorageResolver storage) {
return null;
}
/** @inheritDoc */
- public javax.crypto.SecretKey engineResolveSecretKey(
+ public javax.crypto.SecretKey engineLookupAndResolveSecretKey(
Element element, String BaseURI, StorageResolver storage) {
- return (SecretKey) _key;
+ SecretKey key=null;
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "EncryptedKeyResolver - Can I resolve " + element.getTagName());
+
+ if (element == null) {
+ return null;
+ }
+
+ boolean isEncryptedKey = XMLUtils.elementIsInEncryptionSpace(element,
+ EncryptionConstants._TAG_ENCRYPTEDKEY);
+
+ if (isEncryptedKey) {
+ log.log(java.util.logging.Level.FINE, "Passed an Encrypted Key");
+ try {
+ XMLCipher cipher = XMLCipher.getInstance();
+ cipher.init(XMLCipher.UNWRAP_MODE, _kek);
+ EncryptedKey ek = cipher.loadEncryptedKey(element);
+ key = (SecretKey) cipher.decryptKey(ek, _algorithm);
+ }
+ catch (Exception e) {}
+ }
+
+ return key;
}
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RSAKeyValueResolver.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RSAKeyValueResolver.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -38,7 +37,7 @@
/**
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class RSAKeyValueResolver extends KeyResolverSpi {
@@ -48,75 +47,55 @@
RSAKeyValueResolver.class.getName());
/** Field _rsaKeyElement */
- private Element _rsaKeyElement = null;
+
/** @inheritDoc */
- public boolean engineCanResolve(Element element, String BaseURI,
- StorageResolver storage) {
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Can I resolve " + element.getTagName());
-
+ public PublicKey engineLookupAndResolvePublicKey(
+ Element element, String BaseURI, StorageResolver storage) {
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Can I resolve " + element.getTagName());
if (element == null) {
- return false;
+ return null;
}
- boolean isKeyValue = XMLUtils.elementIsInSignatureSpace(element,
- Constants._TAG_KEYVALUE);
- boolean isRSAKeyValue = XMLUtils.elementIsInSignatureSpace(element,
- Constants._TAG_RSAKEYVALUE);
-
- if (isKeyValue) {
- this._rsaKeyElement = XMLUtils.selectDsNode(element.getFirstChild(),
- Constants._TAG_RSAKEYVALUE, 0);
-
- if (this._rsaKeyElement != null) {
- return true;
- }
- } else if (isRSAKeyValue) {
-
+ boolean isKeyValue = XMLUtils.elementIsInSignatureSpace(element,
+ Constants._TAG_KEYVALUE);
+ Element rsaKeyElement=null;
+ if (isKeyValue) {
+ rsaKeyElement = XMLUtils.selectDsNode(element.getFirstChild(),
+ Constants._TAG_RSAKEYVALUE, 0);
+ } else if (XMLUtils.elementIsInSignatureSpace(element,
+ Constants._TAG_RSAKEYVALUE)) {
// this trick is needed to allow the RetrievalMethodResolver to eat a
// ds:RSAKeyValue directly (without KeyValue)
- this._rsaKeyElement = element;
-
- return true;
- }
-
- return false;
- }
+ rsaKeyElement = element;
+ }
- /** @inheritDoc */
- public PublicKey engineResolvePublicKey(
- Element element, String BaseURI, StorageResolver storage) {
- if (this._rsaKeyElement == null) {
- boolean weCanResolve = this.engineCanResolve(element, BaseURI,
- storage);
-
- if (!weCanResolve || (this._rsaKeyElement == null)) {
- return null;
- }
+ if (rsaKeyElement == null) {
+ return null;
}
try {
- RSAKeyValue rsaKeyValue = new RSAKeyValue(this._rsaKeyElement,
+ RSAKeyValue rsaKeyValue = new RSAKeyValue(rsaKeyElement,
BaseURI);
return rsaKeyValue.getPublicKey();
} catch (XMLSecurityException ex) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "XMLSecurityException", ex);
+ log.log(java.util.logging.Level.FINE, "XMLSecurityException", ex);
}
return null;
}
/** @inheritDoc */
- public X509Certificate engineResolveX509Certificate(
+ public X509Certificate engineLookupResolveX509Certificate(
Element element, String BaseURI, StorageResolver storage) {
return null;
}
/** @inheritDoc */
- public javax.crypto.SecretKey engineResolveSecretKey(
+ public javax.crypto.SecretKey engineLookupAndResolveSecretKey(
Element element, String BaseURI, StorageResolver storage) {
return null;
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java Wed Jul 05 16:42:37 2017 +0200
@@ -28,7 +28,15 @@
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Set;
+import javax.xml.parsers.ParserConfigurationException;
+
+import com.sun.org.apache.xml.internal.security.c14n.CanonicalizationException;
import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityException;
import com.sun.org.apache.xml.internal.security.keys.content.RetrievalMethod;
import com.sun.org.apache.xml.internal.security.keys.content.x509.XMLX509Certificate;
@@ -44,6 +52,7 @@
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+import org.xml.sax.SAXException;
/**
@@ -55,7 +64,7 @@
* RetrievalMethodResolver cannot handle itself, resolving of the extracted
* element is delegated back to the KeyResolver mechanism.
*
- * @author $Author: raul $
+ * @author $Author: mullan $ modified by Dave Garcia
*/
public class RetrievalMethodResolver extends KeyResolverSpi {
@@ -65,26 +74,6 @@
RetrievalMethodResolver.class.getName());
/**
- * Method engineCanResolve
- * @inheritDoc
- * @param element
- * @param BaseURI
- * @param storage
- *
- */
- public boolean engineCanResolve(Element element, String BaseURI,
- StorageResolver storage) {
-
- if
- (!XMLUtils.elementIsInSignatureSpace(element,
- Constants._TAG_RETRIEVALMETHOD)) {
- return false;
- }
-
- return true;
- }
-
- /**
* Method engineResolvePublicKey
* @inheritDoc
* @param element
@@ -92,82 +81,59 @@
* @param storage
*
*/
- public PublicKey engineResolvePublicKey(
+ public PublicKey engineLookupAndResolvePublicKey(
Element element, String BaseURI, StorageResolver storage)
{
+ if (!XMLUtils.elementIsInSignatureSpace(element,
+ Constants._TAG_RETRIEVALMETHOD)) {
+ return null;
+ }
try {
- RetrievalMethod rm = new RetrievalMethod(element, BaseURI);
- Attr uri = rm.getURIAttr();
-
- // type can be null because it's optional
- String type = rm.getType();
- Transforms transforms = rm.getTransforms();
- ResourceResolver resRes = ResourceResolver.getInstance(uri, BaseURI);
-
- if (resRes != null) {
- XMLSignatureInput resource = resRes.resolve(uri, BaseURI);
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Before applying Transforms, resource has "
- + resource.getBytes().length + "bytes");
-
- if (transforms != null) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "We have Transforms");
-
- resource = transforms.performTransforms(resource);
- }
- if (true) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "After applying Transforms, resource has "
- + resource.getBytes().length + "bytes");
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Resolved to resource " + resource.getSourceURI());
- }
-
- byte inputBytes[] = resource.getBytes();
-
- if ((type != null) && type.equals(RetrievalMethod.TYPE_RAWX509)) {
+ //Create a retrieval method over the given element
+ RetrievalMethod rm = new RetrievalMethod(element, BaseURI);
+ String type = rm.getType();
+ XMLSignatureInput resource=resolveInput(rm,BaseURI);
+ if (RetrievalMethod.TYPE_RAWX509.equals(type)) {
+ //a raw certificate, direct parsing is done!
+ X509Certificate cert=getRawCertificate(resource);
+ if (cert != null) {
+ return cert.getPublicKey();
+ }
+ return null;
+ };
+ Element e = obtainRefrenceElement(resource);
+ return resolveKey(e,BaseURI,storage);
+ } catch (XMLSecurityException ex) {
+ log.log(java.util.logging.Level.FINE, "XMLSecurityException", ex);
+ } catch (CertificateException ex) {
+ log.log(java.util.logging.Level.FINE, "CertificateException", ex);
+ } catch (IOException ex) {
+ log.log(java.util.logging.Level.FINE, "IOException", ex);
+ } catch (ParserConfigurationException e) {
+ log.log(java.util.logging.Level.FINE, "ParserConfigurationException", e);
+ } catch (SAXException e) {
+ log.log(java.util.logging.Level.FINE, "SAXException", e);
+ }
+ return null;
+ }
- // if the resource stores a raw certificate, we have to handle it
- CertificateFactory certFact =
- CertificateFactory
- .getInstance(XMLX509Certificate.JCA_CERT_ID);
- X509Certificate cert =
- (X509Certificate) certFact
- .generateCertificate(new ByteArrayInputStream(inputBytes));
-
- if (cert != null) {
- return cert.getPublicKey();
- }
- } else {
-
- // otherwise, we parse the resource, create an Element and delegate
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "we have to parse " + inputBytes.length + " bytes");
-
- Element e = this.getDocFromBytes(inputBytes);
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Now we have a {" + e.getNamespaceURI() + "}"
- + e.getLocalName() + " Element");
-
- if (e != null) {
- KeyResolver newKeyResolver = KeyResolver.getInstance(getFirstElementChild(e),
- BaseURI, storage);
-
- if (newKeyResolver != null) {
- return newKeyResolver.resolvePublicKey(getFirstElementChild(e), BaseURI,
- storage);
- }
- }
- }
- }
- } catch (XMLSecurityException ex) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "XMLSecurityException", ex);
- } catch (CertificateException ex) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "CertificateException", ex);
- } catch (IOException ex) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "IOException", ex);
- }
-
- return null;
+ static private Element obtainRefrenceElement(XMLSignatureInput resource) throws CanonicalizationException, ParserConfigurationException, IOException, SAXException, KeyResolverException {
+ Element e;
+ if (resource.isElement()){
+ e=(Element) resource.getSubNode();
+ } else if (resource.isNodeSet()) {
+ //Retrieved resource is a nodeSet
+ e=getDocumentElement(resource.getNodeSet());
+ } else {
+ //Retrieved resource is an inputStream
+ byte inputBytes[] = resource.getBytes();
+ e = getDocFromBytes(inputBytes);
+ //otherwise, we parse the resource, create an Element and delegate
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "we have to parse " + inputBytes.length + " bytes");
+ }
+ return e;
}
/**
@@ -178,85 +144,100 @@
* @param storage
*
*/
- public X509Certificate engineResolveX509Certificate(
+ public X509Certificate engineLookupResolveX509Certificate(
Element element, String BaseURI, StorageResolver storage)
{
-
- try {
- RetrievalMethod rm = new RetrievalMethod(element, BaseURI);
- Attr uri = rm.getURIAttr();
- Transforms transforms = rm.getTransforms();
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Asked to resolve URI " + uri);
-
- ResourceResolver resRes = ResourceResolver.getInstance(uri, BaseURI);
-
- if (resRes != null) {
- XMLSignatureInput resource = resRes.resolve(uri, BaseURI);
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Before applying Transforms, resource has "
- + resource.getBytes().length + "bytes");
+ if (!XMLUtils.elementIsInSignatureSpace(element,
+ Constants._TAG_RETRIEVALMETHOD)) {
+ return null;
+ }
- if (transforms != null) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "We have Transforms");
-
- resource = transforms.performTransforms(resource);
- }
-
- if (true) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "After applying Transforms, resource has "
- + resource.getBytes().length + "bytes");
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Resolved to resource " + resource.getSourceURI());
- }
-
- byte inputBytes[] = resource.getBytes();
-
- if ((rm.getType() != null)
- && rm.getType().equals(RetrievalMethod.TYPE_RAWX509)) {
+ try {
+ RetrievalMethod rm = new RetrievalMethod(element, BaseURI);
+ String type = rm.getType();
+ XMLSignatureInput resource=resolveInput(rm,BaseURI);
+ if (RetrievalMethod.TYPE_RAWX509.equals(type)) {
+ X509Certificate cert=getRawCertificate(resource);
+ return cert;
+ }
+ Element e = obtainRefrenceElement(resource);
+ return resolveCertificate(e,BaseURI,storage);
+ } catch (XMLSecurityException ex) {
+ log.log(java.util.logging.Level.FINE, "XMLSecurityException", ex);
+ } catch (CertificateException ex) {
+ log.log(java.util.logging.Level.FINE, "CertificateException", ex);
+ } catch (IOException ex) {
+ log.log(java.util.logging.Level.FINE, "IOException", ex);
+ } catch (ParserConfigurationException e) {
+ log.log(java.util.logging.Level.FINE, "ParserConfigurationException", e);
+ } catch (SAXException e) {
+ log.log(java.util.logging.Level.FINE, "SAXException", e);
+ }
+ return null;
+ }
- // if the resource stores a raw certificate, we have to handle it
- CertificateFactory certFact =
- CertificateFactory
- .getInstance(XMLX509Certificate.JCA_CERT_ID);
- X509Certificate cert =
- (X509Certificate) certFact
- .generateCertificate(new ByteArrayInputStream(inputBytes));
-
- if (cert != null) {
- return cert;
- }
- } else {
-
- // otherwise, we parse the resource, create an Element and delegate
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "we have to parse " + inputBytes.length + " bytes");
-
- Element e = this.getDocFromBytes(inputBytes);
+ /**
+ * Retrieves a x509Certificate from the given information
+ * @param e
+ * @param BaseURI
+ * @param storage
+ * @return
+ * @throws KeyResolverException
+ */
+ static private X509Certificate resolveCertificate(Element e,String BaseURI,StorageResolver storage) throws KeyResolverException{
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Now we have a {" + e.getNamespaceURI() + "}"+ e.getLocalName() + " Element");
+ //An element has been provided
+ if (e != null) {
+ return KeyResolver.getX509Certificate(e,BaseURI, storage);
+ }
+ return null;
+ }
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Now we have a {" + e.getNamespaceURI() + "}"
- + e.getLocalName() + " Element");
-
- if (e != null) {
- KeyResolver newKeyResolver = KeyResolver.getInstance(getFirstElementChild(e),
- BaseURI, storage);
-
- if (newKeyResolver != null) {
- return newKeyResolver.resolveX509Certificate(getFirstElementChild(e), BaseURI,
- storage);
+ /**
+ * Retrieves a x509Certificate from the given information
+ * @param e
+ * @param BaseURI
+ * @param storage
+ * @return
+ * @throws KeyResolverException
+ */
+ static private PublicKey resolveKey(Element e,String BaseURI,StorageResolver storage) throws KeyResolverException{
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Now we have a {" + e.getNamespaceURI() + "}"+ e.getLocalName() + " Element");
+ //An element has been provided
+ if (e != null) {
+ return KeyResolver.getPublicKey(e,BaseURI, storage);
}
- }
- }
- }
- } catch (XMLSecurityException ex) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "XMLSecurityException", ex);
- } catch (CertificateException ex) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "CertificateException", ex);
- } catch (IOException ex) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "IOException", ex);
- }
+ return null;
+ }
- return null;
+ static private X509Certificate getRawCertificate(XMLSignatureInput resource) throws CanonicalizationException, IOException, CertificateException{
+ byte inputBytes[] = resource.getBytes();
+ // if the resource stores a raw certificate, we have to handle it
+ CertificateFactory certFact =CertificateFactory.getInstance(XMLX509Certificate.JCA_CERT_ID);
+ X509Certificate cert =(X509Certificate) certFact.generateCertificate(new ByteArrayInputStream(inputBytes));
+ return cert;
+ }
+ /**
+ * Resolves the input from the given retrieval method
+ * @return
+ * @throws XMLSecurityException
+ */
+ static private XMLSignatureInput resolveInput(RetrievalMethod rm,String BaseURI) throws XMLSecurityException{
+ Attr uri = rm.getURIAttr();
+ //Apply the trnasforms
+ Transforms transforms = rm.getTransforms();
+ ResourceResolver resRes = ResourceResolver.getInstance(uri, BaseURI);
+ if (resRes != null) {
+ XMLSignatureInput resource = resRes.resolve(uri, BaseURI);
+ if (transforms != null) {
+ log.log(java.util.logging.Level.FINE, "We have Transforms");
+ resource = transforms.performTransforms(resource);
+ }
+ return resource;
+ }
+ return null;
}
/**
@@ -266,18 +247,13 @@
* @return the Document Element after parsing bytes
* @throws KeyResolverException if something goes wrong
*/
- Element getDocFromBytes(byte[] bytes) throws KeyResolverException {
-
+ static Element getDocFromBytes(byte[] bytes) throws KeyResolverException {
try {
- javax.xml.parsers.DocumentBuilderFactory dbf =
- javax.xml.parsers.DocumentBuilderFactory.newInstance();
-
+ javax.xml.parsers.DocumentBuilderFactory dbf =javax.xml.parsers.DocumentBuilderFactory.newInstance();
dbf.setNamespaceAware(true);
-
javax.xml.parsers.DocumentBuilder db = dbf.newDocumentBuilder();
org.w3c.dom.Document doc =
db.parse(new java.io.ByteArrayInputStream(bytes));
-
return doc.getDocumentElement();
} catch (org.xml.sax.SAXException ex) {
throw new KeyResolverException("empty", ex);
@@ -296,16 +272,43 @@
* @param storage
*
*/
- public javax.crypto.SecretKey engineResolveSecretKey(
+ public javax.crypto.SecretKey engineLookupAndResolveSecretKey(
Element element, String BaseURI, StorageResolver storage)
{
return null;
}
- static Element getFirstElementChild(Element e){
- Node n=e.getFirstChild();
- while (n!=null && n.getNodeType()!=Node.ELEMENT_NODE) {
- n=n.getNextSibling();
- }
- return (Element)n;
+
+ static Element getDocumentElement(Set set) {
+ Iterator it=set.iterator();
+ Element e=null;
+ while (it.hasNext()) {
+ Node currentNode=(Node)it.next();
+ if (currentNode instanceof Element) {
+ e=(Element)currentNode;
+ break;
+ }
+
+ }
+ List parents=new ArrayList(10);
+
+ //Obtain all the parents of the elemnt
+ do {
+ parents.add(e);
+ Node n=e.getParentNode();
+ if (!(n instanceof Element )) {
+ break;
+ }
+ e=(Element)n;
+ } while (e!=null);
+ //Visit them in reverse order.
+ ListIterator it2=parents.listIterator(parents.size()-1);
+ Element ele=null;
+ while (it2.hasPrevious()) {
+ ele=(Element)it2.previous();
+ if (set.contains(ele)) {
+ return ele;
+ }
+ }
+ return null;
}
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509CertificateResolver.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509CertificateResolver.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -41,7 +40,7 @@
* Resolves Certificates which are directly contained inside a
* <CODE>ds:X509Certificate</CODE> Element.
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class X509CertificateResolver extends KeyResolverSpi {
@@ -49,47 +48,7 @@
static java.util.logging.Logger log =
java.util.logging.Logger.getLogger(X509CertificateResolver.class.getName());
- /** Field _dsaKeyElement */
- Element[] _x509CertKeyElements = null;
- /**
- * Method engineCanResolve
- * @inheritDoc
- * @param element
- * @param BaseURI
- * @param storage
- *
- */
- public boolean engineCanResolve(Element element, String BaseURI,
- StorageResolver storage) {
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Can I resolve " + element.getTagName() + "?");
-
- if (!XMLUtils.elementIsInSignatureSpace(element,
- Constants._TAG_X509DATA)) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "I can't");
-
- return false;
- }
-
-
- this._x509CertKeyElements = XMLUtils.selectDsNodes(element.getFirstChild(),
- Constants._TAG_X509CERTIFICATE);
-
- if ((this._x509CertKeyElements != null)
- && (this._x509CertKeyElements.length > 0)) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Yes Sir, I can");
-
- return true;
- }
-
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "I can't");
-
- return false;
- }
-
- /** Field _x509certObject[] */
- XMLX509Certificate _x509certObject[] = null;
/**
* Method engineResolvePublicKey
@@ -100,11 +59,11 @@
*
* @throws KeyResolverException
*/
- public PublicKey engineResolvePublicKey(
+ public PublicKey engineLookupAndResolvePublicKey(
Element element, String BaseURI, StorageResolver storage)
throws KeyResolverException {
- X509Certificate cert = this.engineResolveX509Certificate(element,
+ X509Certificate cert = this.engineLookupResolveX509Certificate(element,
BaseURI, storage);
if (cert != null) {
@@ -123,43 +82,33 @@
*
* @throws KeyResolverException
*/
- public X509Certificate engineResolveX509Certificate(
+ public X509Certificate engineLookupResolveX509Certificate(
Element element, String BaseURI, StorageResolver storage)
throws KeyResolverException {
try {
- if ((this._x509CertKeyElements == null)
- || (this._x509CertKeyElements.length == 0)) {
- boolean weCanResolve = this.engineCanResolve(element, BaseURI,
- storage);
-
- if (!weCanResolve || (this._x509CertKeyElements == null)
- || (this._x509CertKeyElements.length == 0)) {
- return null;
- }
+ Element[] els=XMLUtils.selectDsNodes(element.getFirstChild(),
+ Constants._TAG_X509CERTIFICATE);
+ if ((els == null) || (els.length == 0)) {
+ Element el=XMLUtils.selectDsNode(element.getFirstChild(),
+ Constants._TAG_X509DATA,0);
+ if (el!=null) {
+ return engineLookupResolveX509Certificate(el, BaseURI, storage);
+ }
+ return null;
}
- this._x509certObject =
- new XMLX509Certificate[this._x509CertKeyElements.length];
-
// populate Object array
- for (int i = 0; i < this._x509CertKeyElements.length; i++) {
- this._x509certObject[i] =
- new XMLX509Certificate(this._x509CertKeyElements[i]
- , BaseURI);
- }
-
- for (int i = 0; i < this._x509certObject.length; i++) {
- X509Certificate cert = this._x509certObject[i].getX509Certificate();
-
- if (cert != null) {
- return cert;
+ for (int i = 0; i < els.length; i++) {
+ XMLX509Certificate xmlCert=new XMLX509Certificate(els[i], BaseURI);
+ X509Certificate cert = xmlCert.getX509Certificate();
+ if (cert!=null) {
+ return cert;
}
}
-
return null;
} catch (XMLSecurityException ex) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "XMLSecurityException", ex);
+ log.log(java.util.logging.Level.FINE, "XMLSecurityException", ex);
throw new KeyResolverException("generic.EmptyMessage", ex);
}
@@ -173,7 +122,7 @@
* @param storage
*
*/
- public javax.crypto.SecretKey engineResolveSecretKey(
+ public javax.crypto.SecretKey engineLookupAndResolveSecretKey(
Element element, String BaseURI, StorageResolver storage)
{
return null;
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -39,7 +38,7 @@
/**
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class X509IssuerSerialResolver extends KeyResolverSpi {
@@ -48,44 +47,13 @@
java.util.logging.Logger.getLogger(
X509IssuerSerialResolver.class.getName());
- /** @inheritDoc */
- public boolean engineCanResolve(Element element, String BaseURI,
- StorageResolver storage) {
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Can I resolve " + element.getTagName() + "?");
-
- X509Data x509data = null;
- try {
- x509data = new X509Data(element, BaseURI);
- } catch (XMLSignatureException ex) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "I can't");
-
- return false;
- } catch (XMLSecurityException ex) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "I can't");
-
- return false;
- }
-
- if (x509data == null) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "I can't");
- return false;
- }
-
- if (x509data.containsIssuerSerial()) {
- return true;
- }
-
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "I can't");
- return false;
- }
/** @inheritDoc */
- public PublicKey engineResolvePublicKey(
+ public PublicKey engineLookupAndResolvePublicKey(
Element element, String BaseURI, StorageResolver storage)
throws KeyResolverException {
- X509Certificate cert = this.engineResolveX509Certificate(element,
+ X509Certificate cert = this.engineLookupResolveX509Certificate(element,
BaseURI, storage);
if (cert != null) {
@@ -96,10 +64,31 @@
}
/** @inheritDoc */
- public X509Certificate engineResolveX509Certificate(
+ public X509Certificate engineLookupResolveX509Certificate(
Element element, String BaseURI, StorageResolver storage)
throws KeyResolverException {
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Can I resolve " + element.getTagName() + "?");
+ X509Data x509data = null;
+ try {
+ x509data = new X509Data(element, BaseURI);
+ } catch (XMLSignatureException ex) {
+ log.log(java.util.logging.Level.FINE, "I can't");
+ return null;
+ } catch (XMLSecurityException ex) {
+ log.log(java.util.logging.Level.FINE, "I can't");
+ return null;
+ }
+
+ if (x509data == null) {
+ log.log(java.util.logging.Level.FINE, "I can't");
+ return null;
+ }
+
+ if (!x509data.containsIssuerSerial()) {
+ return null;
+ }
try {
if (storage == null) {
Object exArgs[] = { Constants._TAG_X509ISSUERSERIAL };
@@ -107,53 +96,52 @@
new KeyResolverException("KeyResolver.needStorageResolver",
exArgs);
- if (log.isLoggable(java.util.logging.Level.INFO)) log.log(java.util.logging.Level.INFO, "", ex);
+ log.log(java.util.logging.Level.INFO, "", ex);
throw ex;
}
- X509Data x509data = new X509Data(element, BaseURI);
int noOfISS = x509data.lengthIssuerSerial();
while (storage.hasNext()) {
X509Certificate cert = storage.next();
XMLX509IssuerSerial certSerial = new XMLX509IssuerSerial(element.getOwnerDocument(), cert);
- if (true) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Found Certificate Issuer: "
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Found Certificate Issuer: "
+ certSerial.getIssuerName());
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Found Certificate Serial: "
+ log.log(java.util.logging.Level.FINE, "Found Certificate Serial: "
+ certSerial.getSerialNumber().toString());
}
for (int i=0; i<noOfISS; i++) {
XMLX509IssuerSerial xmliss = x509data.itemIssuerSerial(i);
- if (true) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Found Element Issuer: "
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Found Element Issuer: "
+ xmliss.getIssuerName());
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Found Element Serial: "
+ log.log(java.util.logging.Level.FINE, "Found Element Serial: "
+ xmliss.getSerialNumber().toString());
}
if (certSerial.equals(xmliss)) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "match !!! ");
+ log.log(java.util.logging.Level.FINE, "match !!! ");
return cert;
}
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "no match...");
+ log.log(java.util.logging.Level.FINE, "no match...");
}
}
return null;
} catch (XMLSecurityException ex) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "XMLSecurityException", ex);
+ log.log(java.util.logging.Level.FINE, "XMLSecurityException", ex);
throw new KeyResolverException("generic.EmptyMessage", ex);
}
}
/** @inheritDoc */
- public javax.crypto.SecretKey engineResolveSecretKey(
+ public javax.crypto.SecretKey engineLookupAndResolveSecretKey(
Element element, String BaseURI, StorageResolver storage) {
return null;
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SKIResolver.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SKIResolver.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -40,7 +39,7 @@
/**
*
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class X509SKIResolver extends KeyResolverSpi {
@@ -48,50 +47,6 @@
static java.util.logging.Logger log =
java.util.logging.Logger.getLogger(X509SKIResolver.class.getName());
- /** Field _x509childNodes */
- private Element _x509childNodes[] = null;
-
- /** Field _x509childObject[] */
- private XMLX509SKI _x509childObject[] = null;
-
- /**
- * Method engineCanResolve
- * @inheritDoc
- * @param element
- * @param BaseURI
- * @param storage
- *
- */
- public boolean engineCanResolve(Element element, String BaseURI,
- StorageResolver storage) {
- if (true) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Can I resolve " + element.getTagName() + "?");
- }
-
- if (!XMLUtils.elementIsInSignatureSpace(element,
- Constants._TAG_X509DATA)) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "I can't");
-
- return false;
- }
-
-
-
-
- this._x509childNodes = XMLUtils.selectDsNodes(element,
- Constants._TAG_X509SKI);
-
- if ((this._x509childNodes != null)
- && (this._x509childNodes.length > 0)) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Yes Sir, I can");
-
- return true;
- }
-
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "I can't");
-
- return false;
- }
/**
* Method engineResolvePublicKey
@@ -102,11 +57,11 @@
* @return null if no {@link PublicKey} could be obtained
* @throws KeyResolverException
*/
- public PublicKey engineResolvePublicKey(
+ public PublicKey engineLookupAndResolvePublicKey(
Element element, String BaseURI, StorageResolver storage)
throws KeyResolverException {
- X509Certificate cert = this.engineResolveX509Certificate(element,
+ X509Certificate cert = this.engineLookupResolveX509Certificate(element,
BaseURI, storage);
if (cert != null) {
@@ -125,46 +80,55 @@
*
* @throws KeyResolverException
*/
- public X509Certificate engineResolveX509Certificate(
+ public X509Certificate engineLookupResolveX509Certificate(
Element element, String BaseURI, StorageResolver storage)
throws KeyResolverException {
-
- try {
- if (this._x509childNodes == null) {
- boolean weCanResolve = this.engineCanResolve(element, BaseURI,
- storage);
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Can I resolve " + element.getTagName() + "?");
+ }
+ if (!XMLUtils.elementIsInSignatureSpace(element,
+ Constants._TAG_X509DATA)) {
+ log.log(java.util.logging.Level.FINE, "I can't");
+ return null;
+ }
+ /** Field _x509childObject[] */
+ XMLX509SKI x509childObject[] = null;
- if (!weCanResolve || (this._x509childNodes == null)) {
- return null;
- }
- }
+ Element x509childNodes[] = null;
+ x509childNodes = XMLUtils.selectDsNodes(element.getFirstChild(),
+ Constants._TAG_X509SKI);
+ if (!((x509childNodes != null)
+ && (x509childNodes.length > 0))) {
+ log.log(java.util.logging.Level.FINE, "I can't");
+ return null;
+ }
+ try {
if (storage == null) {
Object exArgs[] = { Constants._TAG_X509SKI };
KeyResolverException ex =
new KeyResolverException("KeyResolver.needStorageResolver",
exArgs);
- if (log.isLoggable(java.util.logging.Level.INFO)) log.log(java.util.logging.Level.INFO, "", ex);
+ log.log(java.util.logging.Level.INFO, "", ex);
throw ex;
}
- this._x509childObject =
- new XMLX509SKI[this._x509childNodes.length];
+ x509childObject = new XMLX509SKI[x509childNodes.length];
- for (int i = 0; i < this._x509childNodes.length; i++) {
- this._x509childObject[i] =
- new XMLX509SKI(this._x509childNodes[i], BaseURI);
+ for (int i = 0; i < x509childNodes.length; i++) {
+ x509childObject[i] =
+ new XMLX509SKI(x509childNodes[i], BaseURI);
}
while (storage.hasNext()) {
X509Certificate cert = storage.next();
XMLX509SKI certSKI = new XMLX509SKI(element.getOwnerDocument(), cert);
- for (int i = 0; i < this._x509childObject.length; i++) {
- if (certSKI.equals(this._x509childObject[i])) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Return PublicKey from "
+ for (int i = 0; i < x509childObject.length; i++) {
+ if (certSKI.equals(x509childObject[i])) {
+ log.log(java.util.logging.Level.FINE, "Return PublicKey from "
+ cert.getSubjectDN().getName());
return cert;
@@ -186,7 +150,7 @@
* @param storage
*
*/
- public javax.crypto.SecretKey engineResolveSecretKey(
+ public javax.crypto.SecretKey engineLookupAndResolveSecretKey(
Element element, String BaseURI, StorageResolver storage)
{
return null;
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SubjectNameResolver.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SubjectNameResolver.java Wed Jul 05 16:42:37 2017 +0200
@@ -38,7 +38,7 @@
/**
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class X509SubjectNameResolver extends KeyResolverSpi {
@@ -47,50 +47,6 @@
java.util.logging.Logger.getLogger(
X509SubjectNameResolver.class.getName());
- /** Field _x509childNodes */
- private Element[] _x509childNodes = null;
-
- /** Field _x509childObject[] */
- private XMLX509SubjectName _x509childObject[] = null;
-
- /**
- * Method engineCanResolve
- * @inheritDoc
- * @param element
- * @param BaseURI
- * @param storage
- *
- */
- public boolean engineCanResolve(Element element, String BaseURI,
- StorageResolver storage) {
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Can I resolve " + element.getTagName() + "?");
-
-
- if (!XMLUtils.elementIsInSignatureSpace(element,
- Constants._TAG_X509DATA) ) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "I can't");
-
- return false;
- }
-
-
-
- this._x509childNodes = XMLUtils.selectDsNodes(element,
- Constants._TAG_X509SUBJECTNAME);
-
- if ((this._x509childNodes != null)
- && (this._x509childNodes.length > 0)) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Yes Sir, I can");
-
- return true;
- }
-
-
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "I can't");
-
- return false;
- }
/**
* Method engineResolvePublicKey
@@ -101,11 +57,11 @@
* @return null if no {@link PublicKey} could be obtained
* @throws KeyResolverException
*/
- public PublicKey engineResolvePublicKey(
+ public PublicKey engineLookupAndResolvePublicKey(
Element element, String BaseURI, StorageResolver storage)
throws KeyResolverException {
- X509Certificate cert = this.engineResolveX509Certificate(element,
+ X509Certificate cert = this.engineLookupResolveX509Certificate(element,
BaseURI, storage);
if (cert != null) {
@@ -124,37 +80,46 @@
*
* @throws KeyResolverException
*/
- public X509Certificate engineResolveX509Certificate(
+ public X509Certificate engineLookupResolveX509Certificate(
Element element, String BaseURI, StorageResolver storage)
throws KeyResolverException {
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Can I resolve " + element.getTagName() + "?");
+ Element[] x509childNodes = null;
+ XMLX509SubjectName x509childObject[] = null;
+
+ if (!XMLUtils.elementIsInSignatureSpace(element,
+ Constants._TAG_X509DATA) ) {
+ log.log(java.util.logging.Level.FINE, "I can't");
+ return null;
+ }
+ x509childNodes = XMLUtils.selectDsNodes(element.getFirstChild(),
+ Constants._TAG_X509SUBJECTNAME);
+
+ if (!((x509childNodes != null)
+ && (x509childNodes.length > 0))) {
+ log.log(java.util.logging.Level.FINE, "I can't");
+ return null;
+ }
try {
- if (this._x509childNodes == null) {
- boolean weCanResolve = this.engineCanResolve(element, BaseURI,
- storage);
-
- if (!weCanResolve || (this._x509childNodes == null)) {
- return null;
- }
- }
-
if (storage == null) {
Object exArgs[] = { Constants._TAG_X509SUBJECTNAME };
KeyResolverException ex =
new KeyResolverException("KeyResolver.needStorageResolver",
exArgs);
- if (log.isLoggable(java.util.logging.Level.INFO)) log.log(java.util.logging.Level.INFO, "", ex);
+ log.log(java.util.logging.Level.INFO, "", ex);
throw ex;
}
- this._x509childObject =
- new XMLX509SubjectName[this._x509childNodes.length];
+ x509childObject =
+ new XMLX509SubjectName[x509childNodes.length];
- for (int i = 0; i < this._x509childNodes.length; i++) {
- this._x509childObject[i] =
- new XMLX509SubjectName(this._x509childNodes[i],
+ for (int i = 0; i < x509childNodes.length; i++) {
+ x509childObject[i] =
+ new XMLX509SubjectName(x509childNodes[i],
BaseURI);
}
@@ -163,24 +128,24 @@
XMLX509SubjectName certSN =
new XMLX509SubjectName(element.getOwnerDocument(), cert);
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Found Certificate SN: " + certSN.getSubjectName());
+ log.log(java.util.logging.Level.FINE, "Found Certificate SN: " + certSN.getSubjectName());
- for (int i = 0; i < this._x509childObject.length; i++) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Found Element SN: "
- + this._x509childObject[i].getSubjectName());
+ for (int i = 0; i < x509childObject.length; i++) {
+ log.log(java.util.logging.Level.FINE, "Found Element SN: "
+ + x509childObject[i].getSubjectName());
- if (certSN.equals(this._x509childObject[i])) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "match !!! ");
+ if (certSN.equals(x509childObject[i])) {
+ log.log(java.util.logging.Level.FINE, "match !!! ");
return cert;
}
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "no match...");
+ log.log(java.util.logging.Level.FINE, "no match...");
}
}
return null;
} catch (XMLSecurityException ex) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "XMLSecurityException", ex);
+ log.log(java.util.logging.Level.FINE, "XMLSecurityException", ex);
throw new KeyResolverException("generic.EmptyMessage", ex);
}
@@ -194,7 +159,7 @@
* @param storage
*
*/
- public javax.crypto.SecretKey engineResolveSecretKey(
+ public javax.crypto.SecretKey engineLookupAndResolveSecretKey(
Element element, String BaseURI, StorageResolver storage)
{
return null;
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolver.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolver.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -21,8 +20,6 @@
*/
package com.sun.org.apache.xml.internal.security.keys.storage;
-
-
import java.security.KeyStore;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
@@ -36,7 +33,7 @@
/**
* This class collects customized resolvers for Certificates.
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class StorageResolver {
@@ -45,7 +42,7 @@
java.util.logging.Logger.getLogger(StorageResolver.class.getName());
/** Field _storageResolvers */
- List _storageResolvers = new ArrayList();
+ List _storageResolvers = null;
/** Field _iterator */
Iterator _iterator = null;
@@ -71,7 +68,8 @@
* @param resolver
*/
public void add(StorageResolverSpi resolver) {
-
+ if (_storageResolvers==null)
+ _storageResolvers=new ArrayList();
this._storageResolvers.add(resolver);
this._iterator = null;
@@ -126,6 +124,8 @@
public Iterator getIterator() {
if (this._iterator == null) {
+ if (_storageResolvers==null)
+ _storageResolvers=new ArrayList();
this._iterator = new StorageResolverIterator(this._storageResolvers.iterator());
}
@@ -140,6 +140,8 @@
public boolean hasNext() {
if (this._iterator == null) {
+ if (_storageResolvers==null)
+ _storageResolvers=new ArrayList();
this._iterator = new StorageResolverIterator(this._storageResolvers.iterator());
}
@@ -158,15 +160,13 @@
/**
* Class StorageResolverIterator
*
- * @author $Author: raul $
+ * @author $Author: mullan $
+ * @version $Revision: 1.5 $
*/
- class StorageResolverIterator implements Iterator {
+ static class StorageResolverIterator implements Iterator {
/** Field _resolvers */
- Iterator _resolvers = null;
-
- /** Field _currentResolver */
- int _currentResolver = 0;
+ Iterator _resolvers = null;
/**
* Constructor FilesystemIterator
@@ -179,17 +179,16 @@
/** @inheritDoc */
public boolean hasNext() {
- return _resolvers.hasNext();
+ return _resolvers.hasNext();
}
/** @inheritDoc */
public Object next() {
- return _resolvers.next();
+ return _resolvers.next();
}
/**
* Method remove
- *
*/
public void remove() {
throw new UnsupportedOperationException(
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverException.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -28,7 +27,7 @@
/**
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class StorageResolverException extends XMLSecurityException {
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverSpi.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverSpi.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -28,7 +27,7 @@
/**
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public abstract class StorageResolverSpi {
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -21,8 +20,6 @@
*/
package com.sun.org.apache.xml.internal.security.keys.storage.implementations;
-
-
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -40,12 +37,11 @@
import com.sun.org.apache.xml.internal.security.keys.storage.StorageResolverSpi;
import com.sun.org.apache.xml.internal.security.utils.Base64;
-
/**
* This {@link StorageResolverSpi} makes all raw (binary) {@link X509Certificate}s
* which reside as files in a single directory available to the {@link com.sun.org.apache.xml.internal.security.keys.storage.StorageResolver}.
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class CertsInFilesystemDirectoryResolver extends StorageResolverSpi {
@@ -131,20 +127,20 @@
dn = cert.getSubjectDN().getName();
added = true;
} catch (FileNotFoundException ex) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Could not add certificate from file " + filename, ex);
+ log.log(java.util.logging.Level.FINE, "Could not add certificate from file " + filename, ex);
} catch (IOException ex) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Could not add certificate from file " + filename, ex);
+ log.log(java.util.logging.Level.FINE, "Could not add certificate from file " + filename, ex);
} catch (CertificateNotYetValidException ex) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Could not add certificate from file " + filename, ex);
+ log.log(java.util.logging.Level.FINE, "Could not add certificate from file " + filename, ex);
} catch (CertificateExpiredException ex) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Could not add certificate from file " + filename, ex);
+ log.log(java.util.logging.Level.FINE, "Could not add certificate from file " + filename, ex);
} catch (CertificateException ex) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Could not add certificate from file " + filename, ex);
+ log.log(java.util.logging.Level.FINE, "Could not add certificate from file " + filename, ex);
}
if (added) {
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Added certificate: " + dn);
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Added certificate: " + dn);
}
}
}
@@ -157,9 +153,10 @@
/**
* Class FilesystemIterator
*
- * @author $Author: raul $
+ * @author $Author: mullan $
+ * @version $Revision: 1.5 $
*/
- class FilesystemIterator implements Iterator {
+ private static class FilesystemIterator implements Iterator {
/** Field _certs */
List _certs = null;
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/KeyStoreResolver.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/KeyStoreResolver.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -21,8 +20,6 @@
*/
package com.sun.org.apache.xml.internal.security.keys.storage.implementations;
-
-
import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.cert.X509Certificate;
@@ -37,7 +34,7 @@
* Makes the Certificates from a JAVA {@link KeyStore} object available to the
* {@link com.sun.org.apache.xml.internal.security.keys.storage.StorageResolver}.
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class KeyStoreResolver extends StorageResolverSpi {
@@ -66,9 +63,10 @@
/**
* Class KeyStoreIterator
*
- * @author $Author: raul $
+ * @author $Author: mullan $
+ * @version $Revision: 1.5 $
*/
- class KeyStoreIterator implements Iterator {
+ static class KeyStoreIterator implements Iterator {
/** Field _keyStore */
KeyStore _keyStore = null;
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/SingleCertificateResolver.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/SingleCertificateResolver.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -21,8 +20,6 @@
*/
package com.sun.org.apache.xml.internal.security.keys.storage.implementations;
-
-
import java.security.cert.X509Certificate;
import java.util.Iterator;
@@ -33,7 +30,7 @@
* This {@link StorageResolverSpi} makes a single {@link X509Certificate}
* available to the {@link com.sun.org.apache.xml.internal.security.keys.storage.StorageResolver}.
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class SingleCertificateResolver extends StorageResolverSpi {
@@ -61,9 +58,10 @@
/**
* Class InternalIterator
*
- * @author $Author: raul $
+ * @author $Author: mullan $
+ * @version $Revision: 1.5 $
*/
- class InternalIterator implements Iterator {
+ static class InternalIterator implements Iterator {
/** Field _alreadyReturned */
boolean _alreadyReturned = false;
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/config.dtd Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/config.dtd Wed Jul 05 16:42:37 2017 +0200
@@ -1,73 +1,73 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!ELEMENT Configuration (CanonicalizationMethods , TransformAlgorithms , JCEAlgorithmMappings , Log4J , ResourceBundles , UnitTests , ResourceResolvers , KeyResolvers)>
-
-<!ATTLIST Configuration xmlns CDATA #FIXED 'http://www.xmlsecurity.org/NS/#configuration'
-target CDATA #IMPLIED>
-<!ELEMENT CanonicalizationMethods (CanonicalizationMethod+)>
-
-<!ATTLIST CanonicalizationMethods JAVACLASS CDATA #FIXED 'com.sun.org.apache.xml.internal.security.c14n.Canonicalizer' >
-<!ELEMENT CanonicalizationMethod EMPTY>
-
-<!ATTLIST CanonicalizationMethod URI CDATA #REQUIRED
- JAVACLASS CDATA #REQUIRED >
-<!ELEMENT TransformAlgorithms (TransformAlgorithm+)>
-
-<!ATTLIST TransformAlgorithms JAVACLASS CDATA #FIXED 'com.sun.org.apache.xml.internal.security.transforms.Transform' >
-<!ELEMENT TransformAlgorithm EMPTY>
-
-<!ATTLIST TransformAlgorithm URI CDATA #REQUIRED
- JAVACLASS CDATA #REQUIRED >
-<!ELEMENT JCEAlgorithmMappings (Providers , Algorithms)>
-
-<!ELEMENT Providers (Provider+)>
-
-<!ELEMENT Provider EMPTY>
-
-<!ATTLIST Provider Id ID #REQUIRED
- Class CDATA #REQUIRED
- Info CDATA #IMPLIED
- ProviderURL CDATA #IMPLIED >
-<!ELEMENT Algorithms (Algorithm+)>
-
-<!ELEMENT Algorithm (ProviderAlgo+)>
-
-<!ATTLIST Algorithm URI CDATA #REQUIRED
- Description CDATA #IMPLIED
- AlgorithmClass CDATA #IMPLIED >
-<!ELEMENT ProviderAlgo EMPTY>
-
-<!ATTLIST ProviderAlgo ProviderId IDREF #REQUIRED
- JCEName CDATA #REQUIRED
- JCEAlias CDATA #IMPLIED >
-<!ELEMENT Log4J EMPTY>
-
-<!ATTLIST Log4J configFile CDATA 'data/log4j.xml' >
-<!ELEMENT ResourceBundles (ResourceBundle+)>
-
-<!ATTLIST ResourceBundles defaultLanguageCode CDATA 'de'
- defaultCountryCode CDATA 'DE' >
-<!ELEMENT ResourceBundle EMPTY>
-
-<!ATTLIST ResourceBundle LanguageCode CDATA #REQUIRED
- CountryCode CDATA #REQUIRED
- LOCATION CDATA #REQUIRED >
-<!ELEMENT UnitTests (UnitTest+)>
-
-<!ATTLIST UnitTests JAVACLASS CDATA #FIXED 'com.sun.org.apache.xml.internal.security.test.AllTests' >
-<!ELEMENT ResourceResolvers (Resolver+)>
-
-<!ELEMENT Resolver EMPTY>
-
-<!ATTLIST Resolver JAVACLASS CDATA #REQUIRED
- DESCRIPTION CDATA #IMPLIED >
-<!ELEMENT KeyResolvers (KeyResolver+)>
-<!ATTLIST KeyResolvers JAVACLASS CDATA #FIXED 'com.sun.org.apache.xml.internal.security.keys.KeyResolver' >
-
-<!ELEMENT KeyResolver EMPTY>
-
-<!ATTLIST KeyResolver URI CDATA #REQUIRED
- JAVACLASS CDATA #REQUIRED >
-<!ELEMENT UnitTest (#PCDATA)>
-
-<!ATTLIST UnitTest JAVACLASS CDATA #REQUIRED >
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!ELEMENT Configuration (CanonicalizationMethods , TransformAlgorithms , JCEAlgorithmMappings , Log4J , ResourceBundles , UnitTests , ResourceResolvers , KeyResolvers)>
+
+<!ATTLIST Configuration xmlns CDATA #FIXED 'http://www.xmlsecurity.org/NS/#configuration'
+target CDATA #IMPLIED>
+<!ELEMENT CanonicalizationMethods (CanonicalizationMethod+)>
+
+<!ATTLIST CanonicalizationMethods JAVACLASS CDATA #FIXED 'com.sun.org.apache.xml.internal.security.c14n.Canonicalizer' >
+<!ELEMENT CanonicalizationMethod EMPTY>
+
+<!ATTLIST CanonicalizationMethod URI CDATA #REQUIRED
+ JAVACLASS CDATA #REQUIRED >
+<!ELEMENT TransformAlgorithms (TransformAlgorithm+)>
+
+<!ATTLIST TransformAlgorithms JAVACLASS CDATA #FIXED 'com.sun.org.apache.xml.internal.security.transforms.Transform' >
+<!ELEMENT TransformAlgorithm EMPTY>
+
+<!ATTLIST TransformAlgorithm URI CDATA #REQUIRED
+ JAVACLASS CDATA #REQUIRED >
+<!ELEMENT JCEAlgorithmMappings (Providers , Algorithms)>
+
+<!ELEMENT Providers (Provider+)>
+
+<!ELEMENT Provider EMPTY>
+
+<!ATTLIST Provider Id ID #REQUIRED
+ Class CDATA #REQUIRED
+ Info CDATA #IMPLIED
+ ProviderURL CDATA #IMPLIED >
+<!ELEMENT Algorithms (Algorithm+)>
+
+<!ELEMENT Algorithm (ProviderAlgo+)>
+
+<!ATTLIST Algorithm URI CDATA #REQUIRED
+ Description CDATA #IMPLIED
+ AlgorithmClass CDATA #IMPLIED >
+<!ELEMENT ProviderAlgo EMPTY>
+
+<!ATTLIST ProviderAlgo ProviderId IDREF #REQUIRED
+ JCEName CDATA #REQUIRED
+ JCEAlias CDATA #IMPLIED >
+<!ELEMENT Log4J EMPTY>
+
+<!ATTLIST Log4J configFile CDATA 'data/log4j.xml' >
+<!ELEMENT ResourceBundles (ResourceBundle+)>
+
+<!ATTLIST ResourceBundles defaultLanguageCode CDATA 'de'
+ defaultCountryCode CDATA 'DE' >
+<!ELEMENT ResourceBundle EMPTY>
+
+<!ATTLIST ResourceBundle LanguageCode CDATA #REQUIRED
+ CountryCode CDATA #REQUIRED
+ LOCATION CDATA #REQUIRED >
+<!ELEMENT UnitTests (UnitTest+)>
+
+<!ATTLIST UnitTests JAVACLASS CDATA #FIXED 'com.sun.org.apache.xml.internal.security.test.AllTests' >
+<!ELEMENT ResourceResolvers (Resolver+)>
+
+<!ELEMENT Resolver EMPTY>
+
+<!ATTLIST Resolver JAVACLASS CDATA #REQUIRED
+ DESCRIPTION CDATA #IMPLIED >
+<!ELEMENT KeyResolvers (KeyResolver+)>
+<!ATTLIST KeyResolvers JAVACLASS CDATA #FIXED 'com.sun.org.apache.xml.internal.security.keys.KeyResolver' >
+
+<!ELEMENT KeyResolver EMPTY>
+
+<!ATTLIST KeyResolver URI CDATA #REQUIRED
+ JAVACLASS CDATA #REQUIRED >
+<!ELEMENT UnitTest (#PCDATA)>
+
+<!ATTLIST UnitTest JAVACLASS CDATA #REQUIRED >
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/config.xml Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/config.xml Wed Jul 05 16:42:37 2017 +0200
@@ -1,380 +1,399 @@
-<?xml version="1.0"?>
-<!--
-<!DOCTYPE Configuration SYSTEM "config.dtd">
--->
-<!-- This configuration file is used for configuration of the com.sun.org.apache.xml.internal.security package -->
-<Configuration target="com.sun.org.apache.xml.internal.security" xmlns="http://www.xmlsecurity.org/NS/#configuration">
- <CanonicalizationMethods>
- <CanonicalizationMethod URI="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"
- JAVACLASS="com.sun.org.apache.xml.internal.security.c14n.implementations.Canonicalizer20010315OmitComments" />
- <CanonicalizationMethod URI="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"
- JAVACLASS="com.sun.org.apache.xml.internal.security.c14n.implementations.Canonicalizer20010315WithComments" />
-
- <CanonicalizationMethod URI="http://www.w3.org/2001/10/xml-exc-c14n#"
- JAVACLASS="com.sun.org.apache.xml.internal.security.c14n.implementations.Canonicalizer20010315ExclOmitComments"/>
- <CanonicalizationMethod URI="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"
- JAVACLASS="com.sun.org.apache.xml.internal.security.c14n.implementations.Canonicalizer20010315ExclWithComments"/>
- </CanonicalizationMethods>
- <TransformAlgorithms>
- <!-- Base64 -->
- <TransformAlgorithm URI="http://www.w3.org/2000/09/xmldsig#base64"
- JAVACLASS="com.sun.org.apache.xml.internal.security.transforms.implementations.TransformBase64Decode" />
- <!-- c14n omitting comments -->
- <TransformAlgorithm URI="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"
- JAVACLASS="com.sun.org.apache.xml.internal.security.transforms.implementations.TransformC14N" />
- <!-- c14n with comments -->
- <TransformAlgorithm URI="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"
- JAVACLASS="com.sun.org.apache.xml.internal.security.transforms.implementations.TransformC14NWithComments" />
- <!-- exclusive c14n omitting comments -->
- <TransformAlgorithm URI="http://www.w3.org/2001/10/xml-exc-c14n#"
- JAVACLASS="com.sun.org.apache.xml.internal.security.transforms.implementations.TransformC14NExclusive" />
- <!-- exclusive c14n with comments -->
- <TransformAlgorithm URI="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"
- JAVACLASS="com.sun.org.apache.xml.internal.security.transforms.implementations.TransformC14NExclusiveWithComments" />
-
- <!-- XPath transform -->
- <TransformAlgorithm URI="http://www.w3.org/TR/1999/REC-xpath-19991116"
- JAVACLASS="com.sun.org.apache.xml.internal.security.transforms.implementations.TransformXPath" />
- <!-- enveloped signature -->
- <TransformAlgorithm URI="http://www.w3.org/2000/09/xmldsig#enveloped-signature"
- JAVACLASS="com.sun.org.apache.xml.internal.security.transforms.implementations.TransformEnvelopedSignature" />
- <!-- XSLT -->
- <TransformAlgorithm URI="http://www.w3.org/TR/1999/REC-xslt-19991116"
- JAVACLASS="com.sun.org.apache.xml.internal.security.transforms.implementations.TransformXSLT" />
- <!-- XPath version 2 -->
- <TransformAlgorithm URI="http://www.w3.org/2002/04/xmldsig-filter2"
- JAVACLASS="com.sun.org.apache.xml.internal.security.transforms.implementations.TransformXPath2Filter" />
- <!-- XPath version 2b -->
- <TransformAlgorithm URI="http://www.w3.org/2002/06/xmldsig-filter2"
- JAVACLASS="com.sun.org.apache.xml.internal.security.transforms.implementations.TransformXPath2Filter" />
- </TransformAlgorithms>
- <SignatureAlgorithms>
- <SignatureAlgorithm URI="http://www.w3.org/2000/09/xmldsig#dsa-sha1"
- JAVACLASS="com.sun.org.apache.xml.internal.security.algorithms.implementations.SignatureDSA" />
- <SignatureAlgorithm URI="http://www.w3.org/2000/09/xmldsig#rsa-sha1"
- JAVACLASS="com.sun.org.apache.xml.internal.security.algorithms.implementations.SignatureBaseRSA$SignatureRSASHA1" />
- <SignatureAlgorithm URI="http://www.w3.org/2000/09/xmldsig#hmac-sha1"
- JAVACLASS="com.sun.org.apache.xml.internal.security.algorithms.implementations.IntegrityHmac$IntegrityHmacSHA1" />
-
- <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"
- JAVACLASS="com.sun.org.apache.xml.internal.security.algorithms.implementations.SignatureBaseRSA$SignatureRSAMD5" />
- <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"
- JAVACLASS="com.sun.org.apache.xml.internal.security.algorithms.implementations.SignatureBaseRSA$SignatureRSARIPEMD160" />
- <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"
- JAVACLASS="com.sun.org.apache.xml.internal.security.algorithms.implementations.SignatureBaseRSA$SignatureRSASHA256" />
- <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"
- JAVACLASS="com.sun.org.apache.xml.internal.security.algorithms.implementations.SignatureBaseRSA$SignatureRSASHA384" />
- <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"
- JAVACLASS="com.sun.org.apache.xml.internal.security.algorithms.implementations.SignatureBaseRSA$SignatureRSASHA512" />
-
- <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-md5"
- JAVACLASS="com.sun.org.apache.xml.internal.security.algorithms.implementations.IntegrityHmac$IntegrityHmacMD5" />
- <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-ripemd160"
- JAVACLASS="com.sun.org.apache.xml.internal.security.algorithms.implementations.IntegrityHmac$IntegrityHmacRIPEMD160" />
- <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-sha256"
- JAVACLASS="com.sun.org.apache.xml.internal.security.algorithms.implementations.IntegrityHmac$IntegrityHmacSHA256" />
- <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-sha384"
- JAVACLASS="com.sun.org.apache.xml.internal.security.algorithms.implementations.IntegrityHmac$IntegrityHmacSHA384" />
- <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-sha512"
- JAVACLASS="com.sun.org.apache.xml.internal.security.algorithms.implementations.IntegrityHmac$IntegrityHmacSHA512" />
- </SignatureAlgorithms>
- <JCEAlgorithmMappings>
- <Algorithms>
- <!-- MessageDigest Algorithms -->
- <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#md5"
- Description="MD5 message digest from RFC 1321"
- AlgorithmClass="MessageDigest"
- RequirementLevel="NOT RECOMMENDED"
- SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
- JCEName="MD5"/>
-
- <Algorithm URI="http://www.w3.org/2001/04/xmlenc#ripemd160"
- Description="RIPEMD-160 message digest"
- AlgorithmClass="MessageDigest"
- RequirementLevel="OPTIONAL"
- JCEName="RIPEMD160"/>
-
- <Algorithm URI="http://www.w3.org/2000/09/xmldsig#sha1"
- Description="SHA-1 message digest"
- AlgorithmClass="MessageDigest"
- RequirementLevel="REQUIRED"
- JCEName="SHA-1"/>
-
- <Algorithm URI="http://www.w3.org/2001/04/xmlenc#sha256"
- Description="SHA-1 message digest with 256 bit"
- AlgorithmClass="MessageDigest"
- RequirementLevel="RECOMMENDED"
- JCEName="SHA-256"/>
-
- <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#sha384"
- Description="SHA message digest with 384 bit"
- AlgorithmClass="MessageDigest"
- RequirementLevel="OPTIONAL"
- SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
- JCEName="SHA-384"/>
-
- <Algorithm URI="http://www.w3.org/2001/04/xmlenc#sha512"
- Description="SHA-1 message digest with 512 bit"
- AlgorithmClass="MessageDigest"
- RequirementLevel="OPTIONAL"
- JCEName="SHA-512"/>
-
- <!-- Signature Algorithms -->
- <Algorithm URI="http://www.w3.org/2000/09/xmldsig#dsa-sha1"
- Description="Digital Signature Algorithm with SHA-1 message digest"
- AlgorithmClass="Signature"
- RequirementLevel="REQUIRED"
- JCEName="SHA1withDSA"/>
-
- <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"
- Description="RSA Signature with MD5 message digest"
- AlgorithmClass="Signature"
- RequirementLevel="NOT RECOMMENDED"
- SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
- JCEName="MD5withRSA"/>
-
- <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"
- Description="RSA Signature with RIPEMD-160 message digest"
- AlgorithmClass="Signature"
- RequirementLevel="OPTIONAL"
- SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
- JCEName="RIPEMD160withRSA"/>
-
- <Algorithm URI="http://www.w3.org/2000/09/xmldsig#rsa-sha1"
- Description="RSA Signature with SHA-1 message digest"
- AlgorithmClass="Signature"
- RequirementLevel="RECOMMENDED"
- JCEName="SHA1withRSA"/>
-
- <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"
- Description="RSA Signature with SHA-256 message digest"
- AlgorithmClass="Signature"
- RequirementLevel="OPTIONAL"
- SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
- JCEName="SHA256withRSA"/>
-
- <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"
- Description="RSA Signature with SHA-384 message digest"
- AlgorithmClass="Signature"
- RequirementLevel="OPTIONAL"
- SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
- JCEName="SHA384withRSA"/>
-
- <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"
- Description="RSA Signature with SHA-512 message digest"
- AlgorithmClass="Signature"
- RequirementLevel="OPTIONAL"
- SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
- JCEName="SHA512withRSA"/>
-
- <!-- MAC Algorithms -->
- <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-md5"
- Description="Message Authentication code using MD5"
- AlgorithmClass="Mac"
- RequirementLevel="NOT RECOMMENDED"
- SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
- JCEName="HmacMD5"/>
-
- <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-ripemd160"
- Description="Message Authentication code using RIPEMD-160"
- AlgorithmClass="Mac"
- RequirementLevel="OPTIONAL"
- SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
- JCEName="HMACRIPEMD160"/>
-
- <Algorithm URI="http://www.w3.org/2000/09/xmldsig#hmac-sha1"
- Description="Message Authentication code using SHA1"
- AlgorithmClass="Mac"
- RequirementLevel="REQUIRED"
- JCEName="HmacSHA1"/>
-
- <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-sha256"
- Description="Message Authentication code using SHA-256"
- AlgorithmClass="Mac"
- RequirementLevel="OPTIONAL"
- SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
- JCEName="HmacSHA256"/>
-
- <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-sha384"
- Description="Message Authentication code using SHA-384"
- AlgorithmClass="Mac"
- RequirementLevel="OPTIONAL"
- SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
- JCEName="HmacSHA384"/>
-
- <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-sha512"
- Description="Message Authentication code using SHA-512"
- AlgorithmClass="Mac"
- RequirementLevel="OPTIONAL"
- SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
- JCEName="HmacSHA512"/>
-
- <!-- Block encryption Algorithms -->
- <Algorithm URI="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"
- Description="Block encryption using Triple-DES"
- AlgorithmClass="BlockEncryption"
- RequirementLevel="REQUIRED"
- KeyLength="192"
- RequiredKey="DESede"
- JCEName="DESede/CBC/ISO10126Padding"/>
-
- <Algorithm URI="http://www.w3.org/2001/04/xmlenc#aes128-cbc"
- Description="Block encryption using AES with a key length of 128 bit"
- AlgorithmClass="BlockEncryption"
- RequirementLevel="REQUIRED"
- KeyLength="128"
- RequiredKey="AES"
- JCEName="AES/CBC/ISO10126Padding"/>
-
- <Algorithm URI="http://www.w3.org/2001/04/xmlenc#aes192-cbc"
- Description="Block encryption using AES with a key length of 192 bit"
- AlgorithmClass="BlockEncryption"
- RequirementLevel="OPTIONAL"
- KeyLength="192"
- RequiredKey="AES"
- JCEName="AES/CBC/ISO10126Padding"/>
-
- <Algorithm URI="http://www.w3.org/2001/04/xmlenc#aes256-cbc"
- Description="Block encryption using AES with a key length of 256 bit"
- AlgorithmClass="BlockEncryption"
- RequirementLevel="REQUIRED"
- KeyLength="256"
- RequiredKey="AES"
- JCEName="AES/CBC/ISO10126Padding"/>
-
- <Algorithm URI="http://www.w3.org/2001/04/xmlenc#rsa-1_5"
- Description="Key Transport RSA-v1.5"
- AlgorithmClass="KeyTransport"
- RequirementLevel="REQUIRED"
- RequiredKey="RSA"
- JCEName="RSA/ECB/PKCS1Padding"/>
-
- <Algorithm URI="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"
- Description="Key Transport RSA-OAEP"
- AlgorithmClass="KeyTransport"
- RequirementLevel="REQUIRED"
- RequiredKey="RSA"
- JCEName="RSA/ECB/OAEPWithSHA1AndMGF1Padding"/>
-
- <Algorithm URI="http://www.w3.org/2001/04/xmlenc#dh"
- Description="Key Agreement Diffie-Hellman"
- AlgorithmClass="KeyAgreement"
- RequirementLevel="OPTIONAL"/>
-
- <Algorithm URI="http://www.w3.org/2001/04/xmlenc#kw-tripledes"
- Description="Symmetric Key Wrap using Triple DES"
- AlgorithmClass="SymmetricKeyWrap"
- RequirementLevel="REQUIRED"
- KeyLength="192"
- RequiredKey="DESede"
- JCEName="DESedeWrap"/>
-
- <Algorithm URI="http://www.w3.org/2001/04/xmlenc#kw-aes128"
- Description="Symmetric Key Wrap using AES with a key length of 128 bit"
- AlgorithmClass="SymmetricKeyWrap"
- RequirementLevel="REQUIRED"
- KeyLength="128"
- RequiredKey="AES"
- JCEName="AESWrap"/>
-
- <Algorithm URI="http://www.w3.org/2001/04/xmlenc#kw-aes192"
- Description="Symmetric Key Wrap using AES with a key length of 192 bit"
- AlgorithmClass="SymmetricKeyWrap"
- RequirementLevel="OPTIONAL"
- KeyLength="192"
- RequiredKey="AES"
- JCEName="AESWrap"/>
-
- <Algorithm URI="http://www.w3.org/2001/04/xmlenc#kw-aes256"
- Description="Symmetric Key Wrap using AES with a key length of 256 bit"
- AlgorithmClass="SymmetricKeyWrap"
- RequirementLevel="REQUIRED"
- KeyLength="256"
- RequiredKey="AES"
- JCEName="AESWrap"/>
-
- </Algorithms>
- </JCEAlgorithmMappings>
- <ResourceBundles defaultLanguageCode="en" defaultCountryCode="US">
- <ResourceBundle LanguageCode="en"
- CountryCode="US"
- LOCATION="com.sun.org.apache.xml.internal.security/resource/xmlsecurity_en.properties" />
- <ResourceBundle LanguageCode="de"
- CountryCode="DE"
- LOCATION="com.sun.org.apache.xml.internal.security/resource/xmlsecurity_de.properties" />
- </ResourceBundles>
- <ResourceResolvers>
- <Resolver JAVACLASS="com.sun.org.apache.xml.internal.security.utils.resolver.implementations.ResolverDirectHTTP"
- DESCRIPTION="A simple resolver for requests to HTTP space" />
- <Resolver JAVACLASS="com.sun.org.apache.xml.internal.security.utils.resolver.implementations.ResolverLocalFilesystem"
- DESCRIPTION="A simple resolver for requests to the local file system" />
- <Resolver JAVACLASS="com.sun.org.apache.xml.internal.security.utils.resolver.implementations.ResolverFragment"
- DESCRIPTION="A simple resolver for requests of same-document URIs" />
- <Resolver JAVACLASS="com.sun.org.apache.xml.internal.security.utils.resolver.implementations.ResolverXPointer"
- DESCRIPTION="A simple resolver for requests of XPointer fragents" />
- </ResourceResolvers>
- <!-- <defaultLocale languageCode="en" countryCode="US" /> -->
- <KeyInfo>
- <ContentHandler LOCALNAME="KeyName"
- NAMESPACE="http://www.w3.org/2000/09/xmldsig#"
- JAVACLASS="com.sun.org.apache.xml.internal.security.keys.content.KeyName" />
- <ContentHandler LOCALNAME="KeyValue"
- NAMESPACE="http://www.w3.org/2000/09/xmldsig#"
- JAVACLASS="com.sun.org.apache.xml.internal.security.keys.content.KeyValue" />
- <ContentHandler LOCALNAME="RetrievalMethod"
- NAMESPACE="http://www.w3.org/2000/09/xmldsig#"
- JAVACLASS="com.sun.org.apache.xml.internal.security.keys.content.RetrievalMethod" />
- <ContentHandler LOCALNAME="X509Data"
- NAMESPACE="http://www.w3.org/2000/09/xmldsig#"
- JAVACLASS="com.sun.org.apache.xml.internal.security.keys.content.X509Data" />
- <ContentHandler LOCALNAME="PGPData"
- NAMESPACE="http://www.w3.org/2000/09/xmldsig#"
- JAVACLASS="com.sun.org.apache.xml.internal.security.keys.content.PGPData" />
- <ContentHandler LOCALNAME="SPKIData"
- NAMESPACE="http://www.w3.org/2000/09/xmldsig#"
- JAVACLASS="com.sun.org.apache.xml.internal.security.keys.content.SPKIData" />
- <ContentHandler LOCALNAME="MgmtData"
- NAMESPACE="http://www.w3.org/2000/09/xmldsig#"
- JAVACLASS="com.sun.org.apache.xml.internal.security.keys.content.MgmtData" />
- </KeyInfo>
- <KeyResolver>
- <!-- This section contains a list of KeyResolvers that are available in
- every KeyInfo object -->
- <Resolver JAVACLASS="com.sun.org.apache.xml.internal.security.keys.keyresolver.implementations.RSAKeyValueResolver"
- DESCRIPTION="Can extract RSA public keys" />
- <Resolver JAVACLASS="com.sun.org.apache.xml.internal.security.keys.keyresolver.implementations.DSAKeyValueResolver"
- DESCRIPTION="Can extract DSA public keys" />
- <Resolver JAVACLASS="com.sun.org.apache.xml.internal.security.keys.keyresolver.implementations.X509CertificateResolver"
- DESCRIPTION="Can extract public keys from X509 certificates" />
- <Resolver JAVACLASS="com.sun.org.apache.xml.internal.security.keys.keyresolver.implementations.X509SKIResolver"
- DESCRIPTION="Uses an X509v3 SubjectKeyIdentifier extension to retrieve a certificate from the storages" />
- <Resolver JAVACLASS="com.sun.org.apache.xml.internal.security.keys.keyresolver.implementations.RetrievalMethodResolver"
- DESCRIPTION="Resolves keys and certificates using ResourceResolvers" />
- <Resolver JAVACLASS="com.sun.org.apache.xml.internal.security.keys.keyresolver.implementations.X509SubjectNameResolver"
- DESCRIPTION="Uses an X509 SubjectName to retrieve a certificate from the storages" />
- <Resolver JAVACLASS="com.sun.org.apache.xml.internal.security.keys.keyresolver.implementations.X509IssuerSerialResolver"
- DESCRIPTION="Uses an X509 IssuerName and IssuerSerial to retrieve a certificate from the storages" />
- </KeyResolver>
-
- <PrefixMappings>
- <!-- Many classes create Elements which are in a specific namespace;
- here, the prefixes for these namespaces are defined. But this
- can also be overwritten using the ElementProxy#setDefaultPrefix()
- method. You can even set all prefixes to "" so that the corresponding
- elements are created using the default namespace -->
- <PrefixMapping namespace="http://www.w3.org/2000/09/xmldsig#"
- prefix="ds" />
- <PrefixMapping namespace="http://www.w3.org/2001/04/xmlenc#"
- prefix="xenc" />
- <PrefixMapping namespace="http://www.xmlsecurity.org/experimental#"
- prefix="experimental" />
- <PrefixMapping namespace="http://www.w3.org/2002/04/xmldsig-filter2"
- prefix="dsig-xpath-old" />
- <PrefixMapping namespace="http://www.w3.org/2002/06/xmldsig-filter2"
- prefix="dsig-xpath" />
- <PrefixMapping namespace="http://www.w3.org/2001/10/xml-exc-c14n#"
- prefix="ec" />
- <PrefixMapping namespace="http://www.nue.et-inf.uni-siegen.de/~geuer-pollmann/#xpathFilter"
- prefix="xx" />
- </PrefixMappings>
-</Configuration>
+<?xml version="1.0"?>
+<!--
+<!DOCTYPE Configuration SYSTEM "config.dtd">
+-->
+<!-- This configuration file is used for configuration of the com.sun.org.apache.xml.internal.security package -->
+<Configuration target="com.sun.org.apache.xml.internal.security" xmlns="http://www.xmlsecurity.org/NS/#configuration">
+ <CanonicalizationMethods>
+ <CanonicalizationMethod URI="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.c14n.implementations.Canonicalizer20010315OmitComments" />
+ <CanonicalizationMethod URI="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.c14n.implementations.Canonicalizer20010315WithComments" />
+
+ <CanonicalizationMethod URI="http://www.w3.org/2001/10/xml-exc-c14n#"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.c14n.implementations.Canonicalizer20010315ExclOmitComments"/>
+ <CanonicalizationMethod URI="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.c14n.implementations.Canonicalizer20010315ExclWithComments"/>
+ <CanonicalizationMethod URI="http://www.w3.org/2006/12/xml-c14n11"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.c14n.implementations.Canonicalizer11_OmitComments"/>
+ <CanonicalizationMethod URI="http://www.w3.org/2006/12/xml-c14n11#WithComments"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.c14n.implementations.Canonicalizer11_WithComments"/>
+ </CanonicalizationMethods>
+ <TransformAlgorithms>
+ <!-- Base64 -->
+ <TransformAlgorithm URI="http://www.w3.org/2000/09/xmldsig#base64"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.transforms.implementations.TransformBase64Decode" />
+ <!-- c14n omitting comments -->
+ <TransformAlgorithm URI="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.transforms.implementations.TransformC14N" />
+ <!-- c14n with comments -->
+ <TransformAlgorithm URI="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.transforms.implementations.TransformC14NWithComments" />
+ <!-- c14n 1.1 omitting comments -->
+ <TransformAlgorithm URI="http://www.w3.org/2006/12/xml-c14n11"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.transforms.implementations.TransformC14N11" />
+ <!-- c14n 1.1 with comments -->
+ <TransformAlgorithm URI="http://www.w3.org/2006/12/xml-c14n11#WithComments"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.transforms.implementations.TransformC14N11_WithComments" />
+ <!-- exclusive c14n omitting comments -->
+ <TransformAlgorithm URI="http://www.w3.org/2001/10/xml-exc-c14n#"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.transforms.implementations.TransformC14NExclusive" />
+ <!-- exclusive c14n with comments -->
+ <TransformAlgorithm URI="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.transforms.implementations.TransformC14NExclusiveWithComments" />
+
+ <!-- XPath transform -->
+ <TransformAlgorithm URI="http://www.w3.org/TR/1999/REC-xpath-19991116"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.transforms.implementations.TransformXPath" />
+ <!-- enveloped signature -->
+ <TransformAlgorithm URI="http://www.w3.org/2000/09/xmldsig#enveloped-signature"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.transforms.implementations.TransformEnvelopedSignature" />
+ <!-- XSLT -->
+ <TransformAlgorithm URI="http://www.w3.org/TR/1999/REC-xslt-19991116"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.transforms.implementations.TransformXSLT" />
+ <!-- XPath version 2 -->
+ <TransformAlgorithm URI="http://www.w3.org/2002/04/xmldsig-filter2"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.transforms.implementations.TransformXPath2Filter" />
+ <!-- XPath version 2b -->
+ <TransformAlgorithm URI="http://www.w3.org/2002/06/xmldsig-filter2"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.transforms.implementations.TransformXPath2Filter" />
+ </TransformAlgorithms>
+ <SignatureAlgorithms>
+ <SignatureAlgorithm URI="http://www.w3.org/2000/09/xmldsig#dsa-sha1"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.algorithms.implementations.SignatureDSA" />
+ <SignatureAlgorithm URI="http://www.w3.org/2000/09/xmldsig#rsa-sha1"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.algorithms.implementations.SignatureBaseRSA$SignatureRSASHA1" />
+ <SignatureAlgorithm URI="http://www.w3.org/2000/09/xmldsig#hmac-sha1"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.algorithms.implementations.IntegrityHmac$IntegrityHmacSHA1" />
+
+ <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.algorithms.implementations.SignatureBaseRSA$SignatureRSAMD5" />
+ <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.algorithms.implementations.SignatureBaseRSA$SignatureRSARIPEMD160" />
+ <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.algorithms.implementations.SignatureBaseRSA$SignatureRSASHA256" />
+ <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.algorithms.implementations.SignatureBaseRSA$SignatureRSASHA384" />
+ <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.algorithms.implementations.SignatureBaseRSA$SignatureRSASHA512" />
+ <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.algorithms.implementations.SignatureECDSA$SignatureECDSASHA1" />
+
+ <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-md5"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.algorithms.implementations.IntegrityHmac$IntegrityHmacMD5" />
+ <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-ripemd160"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.algorithms.implementations.IntegrityHmac$IntegrityHmacRIPEMD160" />
+ <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-sha256"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.algorithms.implementations.IntegrityHmac$IntegrityHmacSHA256" />
+ <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-sha384"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.algorithms.implementations.IntegrityHmac$IntegrityHmacSHA384" />
+ <SignatureAlgorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-sha512"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.algorithms.implementations.IntegrityHmac$IntegrityHmacSHA512" />
+ </SignatureAlgorithms>
+ <JCEAlgorithmMappings>
+ <Algorithms>
+ <!-- MessageDigest Algorithms -->
+ <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#md5"
+ Description="MD5 message digest from RFC 1321"
+ AlgorithmClass="MessageDigest"
+ RequirementLevel="NOT RECOMMENDED"
+ SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
+ JCEName="MD5"/>
+
+ <Algorithm URI="http://www.w3.org/2001/04/xmlenc#ripemd160"
+ Description="RIPEMD-160 message digest"
+ AlgorithmClass="MessageDigest"
+ RequirementLevel="OPTIONAL"
+ JCEName="RIPEMD160"/>
+
+ <Algorithm URI="http://www.w3.org/2000/09/xmldsig#sha1"
+ Description="SHA-1 message digest"
+ AlgorithmClass="MessageDigest"
+ RequirementLevel="REQUIRED"
+ JCEName="SHA-1"/>
+
+ <Algorithm URI="http://www.w3.org/2001/04/xmlenc#sha256"
+ Description="SHA-1 message digest with 256 bit"
+ AlgorithmClass="MessageDigest"
+ RequirementLevel="RECOMMENDED"
+ JCEName="SHA-256"/>
+
+ <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#sha384"
+ Description="SHA message digest with 384 bit"
+ AlgorithmClass="MessageDigest"
+ RequirementLevel="OPTIONAL"
+ SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
+ JCEName="SHA-384"/>
+
+ <Algorithm URI="http://www.w3.org/2001/04/xmlenc#sha512"
+ Description="SHA-1 message digest with 512 bit"
+ AlgorithmClass="MessageDigest"
+ RequirementLevel="OPTIONAL"
+ JCEName="SHA-512"/>
+
+ <!-- Signature Algorithms -->
+ <Algorithm URI="http://www.w3.org/2000/09/xmldsig#dsa-sha1"
+ Description="Digital Signature Algorithm with SHA-1 message digest"
+ AlgorithmClass="Signature"
+ RequirementLevel="REQUIRED"
+ JCEName="SHA1withDSA"/>
+
+ <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"
+ Description="RSA Signature with MD5 message digest"
+ AlgorithmClass="Signature"
+ RequirementLevel="NOT RECOMMENDED"
+ SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
+ JCEName="MD5withRSA"/>
+
+ <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"
+ Description="RSA Signature with RIPEMD-160 message digest"
+ AlgorithmClass="Signature"
+ RequirementLevel="OPTIONAL"
+ SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
+ JCEName="RIPEMD160withRSA"/>
+
+ <Algorithm URI="http://www.w3.org/2000/09/xmldsig#rsa-sha1"
+ Description="RSA Signature with SHA-1 message digest"
+ AlgorithmClass="Signature"
+ RequirementLevel="RECOMMENDED"
+ JCEName="SHA1withRSA"/>
+
+ <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"
+ Description="RSA Signature with SHA-256 message digest"
+ AlgorithmClass="Signature"
+ RequirementLevel="OPTIONAL"
+ SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
+ JCEName="SHA256withRSA"/>
+
+ <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"
+ Description="RSA Signature with SHA-384 message digest"
+ AlgorithmClass="Signature"
+ RequirementLevel="OPTIONAL"
+ SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
+ JCEName="SHA384withRSA"/>
+
+ <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"
+ Description="RSA Signature with SHA-512 message digest"
+ AlgorithmClass="Signature"
+ RequirementLevel="OPTIONAL"
+ SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
+ JCEName="SHA512withRSA"/>
+
+ <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"
+ Description="ECDSA Signature with SHA-1 message digest"
+ AlgorithmClass="Signature"
+ RequirementLevel="OPTIONAL"
+ SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
+ JCEName="ECDSAwithSHA1"/>
+
+ <!-- MAC Algorithms -->
+ <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-md5"
+ Description="Message Authentication code using MD5"
+ AlgorithmClass="Mac"
+ RequirementLevel="NOT RECOMMENDED"
+ SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
+ JCEName="HmacMD5"/>
+
+ <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-ripemd160"
+ Description="Message Authentication code using RIPEMD-160"
+ AlgorithmClass="Mac"
+ RequirementLevel="OPTIONAL"
+ SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
+ JCEName="HMACRIPEMD160"/>
+
+ <Algorithm URI="http://www.w3.org/2000/09/xmldsig#hmac-sha1"
+ Description="Message Authentication code using SHA1"
+ AlgorithmClass="Mac"
+ RequirementLevel="REQUIRED"
+ JCEName="HmacSHA1"/>
+
+ <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-sha256"
+ Description="Message Authentication code using SHA-256"
+ AlgorithmClass="Mac"
+ RequirementLevel="OPTIONAL"
+ SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
+ JCEName="HmacSHA256"/>
+
+ <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-sha384"
+ Description="Message Authentication code using SHA-384"
+ AlgorithmClass="Mac"
+ RequirementLevel="OPTIONAL"
+ SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
+ JCEName="HmacSHA384"/>
+
+ <Algorithm URI="http://www.w3.org/2001/04/xmldsig-more#hmac-sha512"
+ Description="Message Authentication code using SHA-512"
+ AlgorithmClass="Mac"
+ RequirementLevel="OPTIONAL"
+ SpecificationURL="http://www.ietf.org/internet-drafts/draft-eastlake-xmldsig-uri-02.txt"
+ JCEName="HmacSHA512"/>
+
+ <!-- Block encryption Algorithms -->
+ <Algorithm URI="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"
+ Description="Block encryption using Triple-DES"
+ AlgorithmClass="BlockEncryption"
+ RequirementLevel="REQUIRED"
+ KeyLength="192"
+ RequiredKey="DESede"
+ JCEName="DESede/CBC/ISO10126Padding"/>
+
+ <Algorithm URI="http://www.w3.org/2001/04/xmlenc#aes128-cbc"
+ Description="Block encryption using AES with a key length of 128 bit"
+ AlgorithmClass="BlockEncryption"
+ RequirementLevel="REQUIRED"
+ KeyLength="128"
+ RequiredKey="AES"
+ JCEName="AES/CBC/ISO10126Padding"/>
+
+ <Algorithm URI="http://www.w3.org/2001/04/xmlenc#aes192-cbc"
+ Description="Block encryption using AES with a key length of 192 bit"
+ AlgorithmClass="BlockEncryption"
+ RequirementLevel="OPTIONAL"
+ KeyLength="192"
+ RequiredKey="AES"
+ JCEName="AES/CBC/ISO10126Padding"/>
+
+ <Algorithm URI="http://www.w3.org/2001/04/xmlenc#aes256-cbc"
+ Description="Block encryption using AES with a key length of 256 bit"
+ AlgorithmClass="BlockEncryption"
+ RequirementLevel="REQUIRED"
+ KeyLength="256"
+ RequiredKey="AES"
+ JCEName="AES/CBC/ISO10126Padding"/>
+
+ <Algorithm URI="http://www.w3.org/2001/04/xmlenc#rsa-1_5"
+ Description="Key Transport RSA-v1.5"
+ AlgorithmClass="KeyTransport"
+ RequirementLevel="REQUIRED"
+ RequiredKey="RSA"
+ JCEName="RSA/ECB/PKCS1Padding"/>
+
+ <Algorithm URI="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"
+ Description="Key Transport RSA-OAEP"
+ AlgorithmClass="KeyTransport"
+ RequirementLevel="REQUIRED"
+ RequiredKey="RSA"
+ JCEName="RSA/ECB/OAEPWithSHA1AndMGF1Padding"/>
+
+ <Algorithm URI="http://www.w3.org/2001/04/xmlenc#dh"
+ Description="Key Agreement Diffie-Hellman"
+ AlgorithmClass="KeyAgreement"
+ RequirementLevel="OPTIONAL"/>
+
+ <Algorithm URI="http://www.w3.org/2001/04/xmlenc#kw-tripledes"
+ Description="Symmetric Key Wrap using Triple DES"
+ AlgorithmClass="SymmetricKeyWrap"
+ RequirementLevel="REQUIRED"
+ KeyLength="192"
+ RequiredKey="DESede"
+ JCEName="DESedeWrap"/>
+
+ <Algorithm URI="http://www.w3.org/2001/04/xmlenc#kw-aes128"
+ Description="Symmetric Key Wrap using AES with a key length of 128 bit"
+ AlgorithmClass="SymmetricKeyWrap"
+ RequirementLevel="REQUIRED"
+ KeyLength="128"
+ RequiredKey="AES"
+ JCEName="AESWrap"/>
+
+ <Algorithm URI="http://www.w3.org/2001/04/xmlenc#kw-aes192"
+ Description="Symmetric Key Wrap using AES with a key length of 192 bit"
+ AlgorithmClass="SymmetricKeyWrap"
+ RequirementLevel="OPTIONAL"
+ KeyLength="192"
+ RequiredKey="AES"
+ JCEName="AESWrap"/>
+
+ <Algorithm URI="http://www.w3.org/2001/04/xmlenc#kw-aes256"
+ Description="Symmetric Key Wrap using AES with a key length of 256 bit"
+ AlgorithmClass="SymmetricKeyWrap"
+ RequirementLevel="REQUIRED"
+ KeyLength="256"
+ RequiredKey="AES"
+ JCEName="AESWrap"/>
+
+ </Algorithms>
+ </JCEAlgorithmMappings>
+ <ResourceBundles defaultLanguageCode="en" defaultCountryCode="US">
+ <ResourceBundle LanguageCode="en"
+ CountryCode="US"
+ LOCATION="com.sun.org.apache.xml.internal.security/resource/xmlsecurity_en.properties" />
+ <ResourceBundle LanguageCode="de"
+ CountryCode="DE"
+ LOCATION="com.sun.org.apache.xml.internal.security/resource/xmlsecurity_de.properties" />
+ </ResourceBundles>
+ <ResourceResolvers>
+ <Resolver JAVACLASS="com.sun.org.apache.xml.internal.security.utils.resolver.implementations.ResolverDirectHTTP"
+ DESCRIPTION="A simple resolver for requests to HTTP space" />
+ <Resolver JAVACLASS="com.sun.org.apache.xml.internal.security.utils.resolver.implementations.ResolverLocalFilesystem"
+ DESCRIPTION="A simple resolver for requests to the local file system" />
+ <Resolver JAVACLASS="com.sun.org.apache.xml.internal.security.utils.resolver.implementations.ResolverFragment"
+ DESCRIPTION="A simple resolver for requests of same-document URIs" />
+ <Resolver JAVACLASS="com.sun.org.apache.xml.internal.security.utils.resolver.implementations.ResolverXPointer"
+ DESCRIPTION="A simple resolver for requests of XPointer fragents" />
+ </ResourceResolvers>
+ <!-- <defaultLocale languageCode="en" countryCode="US" /> -->
+ <KeyInfo>
+ <ContentHandler LOCALNAME="KeyName"
+ NAMESPACE="http://www.w3.org/2000/09/xmldsig#"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.keys.content.KeyName" />
+ <ContentHandler LOCALNAME="KeyValue"
+ NAMESPACE="http://www.w3.org/2000/09/xmldsig#"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.keys.content.KeyValue" />
+ <ContentHandler LOCALNAME="RetrievalMethod"
+ NAMESPACE="http://www.w3.org/2000/09/xmldsig#"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.keys.content.RetrievalMethod" />
+ <ContentHandler LOCALNAME="X509Data"
+ NAMESPACE="http://www.w3.org/2000/09/xmldsig#"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.keys.content.X509Data" />
+ <ContentHandler LOCALNAME="PGPData"
+ NAMESPACE="http://www.w3.org/2000/09/xmldsig#"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.keys.content.PGPData" />
+ <ContentHandler LOCALNAME="SPKIData"
+ NAMESPACE="http://www.w3.org/2000/09/xmldsig#"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.keys.content.SPKIData" />
+ <ContentHandler LOCALNAME="MgmtData"
+ NAMESPACE="http://www.w3.org/2000/09/xmldsig#"
+ JAVACLASS="com.sun.org.apache.xml.internal.security.keys.content.MgmtData" />
+ </KeyInfo>
+ <KeyResolver>
+ <!-- This section contains a list of KeyResolvers that are available in
+ every KeyInfo object -->
+ <Resolver JAVACLASS="com.sun.org.apache.xml.internal.security.keys.keyresolver.implementations.RSAKeyValueResolver"
+ DESCRIPTION="Can extract RSA public keys" />
+ <Resolver JAVACLASS="com.sun.org.apache.xml.internal.security.keys.keyresolver.implementations.DSAKeyValueResolver"
+ DESCRIPTION="Can extract DSA public keys" />
+ <Resolver JAVACLASS="com.sun.org.apache.xml.internal.security.keys.keyresolver.implementations.X509CertificateResolver"
+ DESCRIPTION="Can extract public keys from X509 certificates" />
+ <Resolver JAVACLASS="com.sun.org.apache.xml.internal.security.keys.keyresolver.implementations.X509SKIResolver"
+ DESCRIPTION="Uses an X509v3 SubjectKeyIdentifier extension to retrieve a certificate from the storages" />
+ <Resolver JAVACLASS="com.sun.org.apache.xml.internal.security.keys.keyresolver.implementations.RetrievalMethodResolver"
+ DESCRIPTION="Resolves keys and certificates using ResourceResolvers" />
+ <Resolver JAVACLASS="com.sun.org.apache.xml.internal.security.keys.keyresolver.implementations.X509SubjectNameResolver"
+ DESCRIPTION="Uses an X509 SubjectName to retrieve a certificate from the storages" />
+ <Resolver JAVACLASS="com.sun.org.apache.xml.internal.security.keys.keyresolver.implementations.X509IssuerSerialResolver"
+ DESCRIPTION="Uses an X509 IssuerName and IssuerSerial to retrieve a certificate from the storages" />
+ </KeyResolver>
+
+ <PrefixMappings>
+ <!-- Many classes create Elements which are in a specific namespace;
+ here, the prefixes for these namespaces are defined. But this
+ can also be overwritten using the ElementProxy#setDefaultPrefix()
+ method. You can even set all prefixes to "" so that the corresponding
+ elements are created using the default namespace -->
+ <PrefixMapping namespace="http://www.w3.org/2000/09/xmldsig#"
+ prefix="ds" />
+ <PrefixMapping namespace="http://www.w3.org/2001/04/xmlenc#"
+ prefix="xenc" />
+ <PrefixMapping namespace="http://www.xmlsecurity.org/experimental#"
+ prefix="experimental" />
+ <PrefixMapping namespace="http://www.w3.org/2002/04/xmldsig-filter2"
+ prefix="dsig-xpath-old" />
+ <PrefixMapping namespace="http://www.w3.org/2002/06/xmldsig-filter2"
+ prefix="dsig-xpath" />
+ <PrefixMapping namespace="http://www.w3.org/2001/10/xml-exc-c14n#"
+ prefix="ec" />
+ <PrefixMapping namespace="http://www.nue.et-inf.uni-siegen.de/~geuer-pollmann/#xpathFilter"
+ prefix="xx" />
+ </PrefixMappings>
+</Configuration>
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/etsi.xsd Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/etsi.xsd Wed Jul 05 16:42:37 2017 +0200
@@ -1,347 +1,347 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XML Spy v4.3 U (http://www.xmlspy.com) by XMLSpy v4 (Altova) -->
-<xsd:schema targetNamespace="http://uri.etsi.org/01903/v1.1.1#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/01903/v1.1.1#" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" elementFormDefault="qualified" xsi:schemaLocation="http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd">
- <xsd:element name="Any" type="AnyType"/>
- <xsd:complexType name="AnyType" mixed="true">
- <xsd:sequence>
- <xsd:any namespace="##any"/>
- </xsd:sequence>
- <xsd:anyAttribute namespace="##any"/>
- </xsd:complexType>
- <xsd:element name="ObjectIdentifier" type="ObjectIdentifierType"/>
- <xsd:complexType name="ObjectIdentifierType">
- <xsd:sequence>
- <xsd:element name="Identifier" type="IdentifierType"/>
- <xsd:element name="Description" type="xsd:string" minOccurs="0"/>
- <xsd:element name="DocumentationReferences" type="DocumentationReferencesType" minOccurs="0"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="IdentifierType">
- <xsd:simpleContent>
- <xsd:extension base="xsd:anyURI">
- <xsd:attribute name="Qualifier" type="QualifierType" use="optional"/>
- </xsd:extension>
- </xsd:simpleContent>
- </xsd:complexType>
- <xsd:simpleType name="QualifierType">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="OIDAsURI"/>
- <xsd:enumeration value="OIDAsURN"/>
- </xsd:restriction>
- </xsd:simpleType>
- <xsd:complexType name="DocumentationReferencesType">
- <xsd:sequence maxOccurs="unbounded">
- <xsd:element name="DocumentationReference" type="xsd:anyURI"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:element name="EncapsulatedPKIData" type="EncapsulatedPKIDataType"/>
- <xsd:complexType name="EncapsulatedPKIDataType">
- <xsd:simpleContent>
- <xsd:extension base="xsd:base64Binary">
- <xsd:attribute name="Id" type="xsd:ID" use="optional"/>
- </xsd:extension>
- </xsd:simpleContent>
- </xsd:complexType>
- <xsd:element name="TimeStamp" type="TimeStampType"/>
- <xsd:complexType name="TimeStampType">
- <xsd:sequence>
- <xsd:element name="HashDataInfo" type="HashDataInfoType" maxOccurs="unbounded"/>
- <xsd:choice>
- <xsd:element name="EncapsulatedTimeStamp" type="EncapsulatedPKIDataType"/>
- <xsd:element name="XMLTimeStamp" type="AnyType"/>
- </xsd:choice>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="HashDataInfoType">
- <xsd:sequence>
- <xsd:element name="Transforms" type="ds:TransformsType" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="uri" type="xsd:anyURI" use="required"/>
- </xsd:complexType>
- <xsd:element name="QualifyingProperties" type="QualifyingPropertiesType"/>
- <xsd:complexType name="QualifyingPropertiesType">
- <xsd:sequence>
- <xsd:element name="SignedProperties" type="SignedPropertiesType" minOccurs="0"/>
- <xsd:element name="UnsignedProperties" type="UnsignedPropertiesType" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="Target" type="xsd:anyURI" use="required"/>
- <xsd:attribute name="Id" type="xsd:ID" use="optional"/>
- </xsd:complexType>
- <xsd:element name="SignedProperties" type="SignedPropertiesType"/>
- <xsd:complexType name="SignedPropertiesType">
- <xsd:sequence>
- <xsd:element name="SignedSignatureProperties" type="SignedSignaturePropertiesType"/>
- <xsd:element name="SignedDataObjectProperties" type="SignedDataObjectPropertiesType" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="Id" type="xsd:ID" use="optional"/>
- </xsd:complexType>
- <xsd:element name="UnsignedProperties" type="UnsignedPropertiesType"/>
- <xsd:complexType name="UnsignedPropertiesType">
- <xsd:sequence>
- <xsd:element name="UnsignedSignatureProperties" type="UnsignedSignaturePropertiesType" minOccurs="0"/>
- <xsd:element name="UnsignedDataObjectProperties" type="UnsignedDataObjectPropertiesType" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="Id" type="xsd:ID" use="optional"/>
- </xsd:complexType>
- <xsd:element name="SignedSignatureProperties" type="SignedSignaturePropertiesType"/>
- <xsd:complexType name="SignedSignaturePropertiesType">
- <xsd:sequence>
- <xsd:element name="SigningTime" type="xsd:dateTime"/>
- <xsd:element name="SigningCertificate" type="CertIDListType"/>
- <xsd:element name="SignaturePolicyIdentifier" type="SignaturePolicyIdentifierType"/>
- <xsd:element name="SignatureProductionPlace" type="SignatureProductionPlaceType" minOccurs="0"/>
- <xsd:element name="SignerRole" type="SignerRoleType" minOccurs="0"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:element name="SignedDataObjectProperties" type="SignedDataObjectPropertiesType"/>
- <xsd:complexType name="SignedDataObjectPropertiesType">
- <xsd:sequence>
- <xsd:element name="DataObjectFormat" type="DataObjectFormatType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="CommitmentTypeIndication" type="CommitmentTypeIndicationType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="AllDataObjectsTimeStamp" type="TimeStampType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="IndividualDataObjectsTimeStamp" type="TimeStampType" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:element name="UnsignedSignatureProperties" type="UnsignedSignaturePropertiesType"/>
- <xsd:complexType name="UnsignedSignaturePropertiesType">
- <xsd:sequence>
- <xsd:element name="CounterSignature" type="CounterSignatureType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="SignatureTimeStamp" type="TimeStampType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="CompleteCertificateRefs" type="CompleteCertificateRefsType" minOccurs="0"/>
- <xsd:element name="CompleteRevocationRefs" type="CompleteRevocationRefsType" minOccurs="0"/>
- <xsd:choice>
- <xsd:element name="SigAndRefsTimeStamp" type="TimeStampType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="RefsOnlyTimeStamp" type="TimeStampType" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:choice>
- <xsd:element name="CertificateValues" type="CertificateValuesType" minOccurs="0"/>
- <xsd:element name="RevocationValues" type="RevocationValuesType" minOccurs="0"/>
- <xsd:element name="ArchiveTimeStamp" type="TimeStampType" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:element name="UnsignedDataObjectProperties" type="UnsignedDataObjectPropertiesType"/>
- <xsd:complexType name="UnsignedDataObjectPropertiesType">
- <xsd:sequence>
- <xsd:element name="UnsignedDataObjectProperty" type="AnyType" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:element name="QualifyingPropertiesReference" type="QualifyingPropertiesReferenceType"/>
- <xsd:complexType name="QualifyingPropertiesReferenceType">
- <xsd:sequence>
- <xsd:element name="Transforms" type="ds:TransformsType" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="URI" type="xsd:anyURI" use="required"/>
- <xsd:attribute name="Id" type="xsd:ID" use="optional"/>
- </xsd:complexType>
- <xsd:element name="SigningTime" type="xsd:dateTime"/>
- <xsd:element name="SigningCertificate" type="CertIDListType"/>
- <xsd:complexType name="CertIDListType">
- <xsd:sequence>
- <xsd:element name="Cert" type="CertIDType" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="CertIDType">
- <xsd:sequence>
- <xsd:element name="CertDigest" type="DigestAlgAndValueType"/>
- <xsd:element name="IssuerSerial" type="ds:X509IssuerSerialType"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="DigestAlgAndValueType">
- <xsd:sequence>
- <xsd:element name="DigestMethod" type="ds:DigestMethodType"/>
- <xsd:element name="DigestValue" type="ds:DigestValueType"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:element name="SignaturePolicyIdentifier" type="SignaturePolicyIdentifierType"/>
- <xsd:complexType name="SignaturePolicyIdentifierType">
- <xsd:choice>
- <xsd:element name="SignaturePolicyId" type="SignaturePolicyIdType"/>
- <xsd:element name="SignaturePolicyImplied"/>
- </xsd:choice>
- </xsd:complexType>
- <xsd:complexType name="SignaturePolicyIdType">
- <xsd:sequence>
- <xsd:element name="SigPolicyId" type="ObjectIdentifierType"/>
- <xsd:element ref="ds:Transforms" minOccurs="0"/>
- <xsd:element name="SigPolicyHash" type="DigestAlgAndValueType"/>
- <xsd:element name="SigPolicyQualifiers" type="SigPolicyQualifiersListType" minOccurs="0"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="SigPolicyQualifiersListType">
- <xsd:sequence>
- <xsd:element name="SigPolicyQualifier" type="AnyType" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:element name="SPURI" type="xsd:anyURI"/>
- <xsd:element name="SPUserNotice" type="SPUserNoticeType"/>
- <xsd:complexType name="SPUserNoticeType">
- <xsd:sequence>
- <xsd:element name="NoticeRef" type="NoticeReferenceType" minOccurs="0"/>
- <xsd:element name="ExplicitText" type="xsd:string" minOccurs="0"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="NoticeReferenceType">
- <xsd:sequence>
- <xsd:element name="Organization" type="xsd:string"/>
- <xsd:element name="NoticeNumbers" type="IntegerListType"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="IntegerListType">
- <xsd:sequence>
- <xsd:element name="int" type="xsd:integer" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:element name="CounterSignature" type="CounterSignatureType"/>
- <xsd:complexType name="CounterSignatureType">
- <xsd:sequence>
- <xsd:element ref="ds:Signature"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:element name="DataObjectFormat" type="DataObjectFormatType"/>
- <xsd:complexType name="DataObjectFormatType">
- <xsd:sequence>
- <xsd:element name="Description" type="xsd:string" minOccurs="0"/>
- <xsd:element name="ObjectIdentifier" type="ObjectIdentifierType" minOccurs="0"/>
- <xsd:element name="MimeType" type="xsd:string" minOccurs="0"/>
- <xsd:element name="Encoding" type="xsd:anyURI" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="ObjectReference" type="xsd:anyURI" use="required"/>
- </xsd:complexType>
- <xsd:element name="CommitmentTypeIndication" type="CommitmentTypeIndicationType"/>
- <xsd:complexType name="CommitmentTypeIndicationType">
- <xsd:sequence>
- <xsd:element name="CommitmentTypeId" type="ObjectIdentifierType"/>
- <xsd:choice>
- <xsd:element name="ObjectReference" type="xsd:anyURI" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="AllSignedDataObjects"/>
- </xsd:choice>
- <xsd:element name="CommitmentTypeQualifiers" type="CommitmentTypeQualifiersListType" minOccurs="0"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="CommitmentTypeQualifiersListType">
- <xsd:sequence>
- <xsd:element name="CommitmentTypeQualifier" type="AnyType" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:element name="SignatureProductionPlace" type="SignatureProductionPlaceType"/>
- <xsd:complexType name="SignatureProductionPlaceType">
- <xsd:sequence>
- <xsd:element name="City" type="xsd:string" minOccurs="0"/>
- <xsd:element name="StateOrProvince" type="xsd:string" minOccurs="0"/>
- <xsd:element name="PostalCode" type="xsd:string" minOccurs="0"/>
- <xsd:element name="CountryName" type="xsd:string" minOccurs="0"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:element name="SignerRole" type="SignerRoleType"/>
- <xsd:complexType name="SignerRoleType">
- <xsd:sequence>
- <xsd:element name="ClaimedRoles" type="ClaimedRolesListType" minOccurs="0"/>
- <xsd:element name="CertifiedRoles" type="CertifiedRolesListType" minOccurs="0"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="ClaimedRolesListType">
- <xsd:sequence>
- <xsd:element name="ClaimedRole" type="AnyType" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="CertifiedRolesListType">
- <xsd:sequence>
- <xsd:element name="CertifiedRole" type="EncapsulatedPKIDataType" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:element name="AllDataObjectsTimeStamp" type="TimeStampType"/>
- <xsd:element name="IndividualDataObjectsTimeStamp" type="TimeStampType"/>
- <xsd:element name="SignatureTimeStamp" type="TimeStampType"/>
- <xsd:element name="CompleteCertificateRefs" type="CompleteCertificateRefsType"/>
- <xsd:complexType name="CompleteCertificateRefsType">
- <xsd:sequence>
- <xsd:element name="CertRefs" type="CertIDListType"/>
- </xsd:sequence>
- <xsd:attribute name="Id" type="xsd:ID" use="optional"/>
- </xsd:complexType>
- <xsd:element name="CompleteRevocationRefs" type="CompleteRevocationRefsType"/>
- <xsd:complexType name="CompleteRevocationRefsType">
- <xsd:sequence>
- <xsd:element name="CRLRefs" type="CRLRefsType" minOccurs="0"/>
- <xsd:element name="OCSPRefs" type="OCSPRefsType" minOccurs="0"/>
- <xsd:element name="OtherRefs" type="OtherCertStatusRefsType" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="Id" type="xsd:ID" use="optional"/>
- </xsd:complexType>
- <xsd:complexType name="CRLRefsType">
- <xsd:sequence>
- <xsd:element name="CRLRef" type="CRLRefType" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="CRLRefType">
- <xsd:sequence>
- <xsd:element name="DigestAlgAndValue" type="DigestAlgAndValueType"/>
- <xsd:element name="CRLIdentifier" type="CRLIdentifierType" minOccurs="0"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="CRLIdentifierType">
- <xsd:sequence>
- <xsd:element name="Issuer" type="xsd:string"/>
- <xsd:element name="IssueTime" type="xsd:dateTime"/>
- <xsd:element name="Number" type="xsd:integer" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="URI" type="xsd:anyURI" use="optional"/>
- </xsd:complexType>
- <xsd:complexType name="OCSPRefsType">
- <xsd:sequence>
- <xsd:element name="OCSPRef" type="OCSPRefType" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="OCSPRefType">
- <xsd:sequence>
- <xsd:element name="OCSPIdentifier" type="OCSPIdentifierType"/>
- <xsd:element name="DigestAlgAndValue" type="DigestAlgAndValueType" minOccurs="0"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="OCSPIdentifierType">
- <xsd:sequence>
- <xsd:element name="ResponderID" type="xsd:string"/>
- <xsd:element name="ProducedAt" type="xsd:dateTime"/>
- </xsd:sequence>
- <xsd:attribute name="URI" type="xsd:anyURI" use="optional"/>
- </xsd:complexType>
- <xsd:complexType name="OtherCertStatusRefsType">
- <xsd:sequence>
- <xsd:element name="OtherRef" type="AnyType" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:element name="SigAndRefsTimeStamp" type="TimeStampType"/>
- <xsd:element name="RefsOnlyTimeStamp" type="TimeStampType"/>
- <xsd:element name="CertificateValues" type="CertificateValuesType"/>
- <xsd:complexType name="CertificateValuesType">
- <xsd:choice minOccurs="0" maxOccurs="unbounded">
- <xsd:element name="EncapsulatedX509Certificate" type="EncapsulatedPKIDataType"/>
- <xsd:element name="OtherCertificate" type="AnyType"/>
- </xsd:choice>
- <xsd:attribute name="Id" type="xsd:ID" use="optional"/>
- </xsd:complexType>
- <xsd:element name="RevocationValues" type="RevocationValuesType"/>
- <xsd:complexType name="RevocationValuesType">
- <xsd:sequence>
- <xsd:element name="CRLValues" type="CRLValuesType" minOccurs="0"/>
- <xsd:element name="OCSPValues" type="OCSPValuesType" minOccurs="0"/>
- <xsd:element name="OtherValues" type="OtherCertStatusValuesType" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="Id" type="xsd:ID" use="optional"/>
- </xsd:complexType>
- <xsd:complexType name="CRLValuesType">
- <xsd:sequence>
- <xsd:element name="EncapsulatedCRLValue" type="EncapsulatedPKIDataType" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="OCSPValuesType">
- <xsd:sequence>
- <xsd:element name="EncapsulatedOCSPValue" type="EncapsulatedPKIDataType" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="OtherCertStatusValuesType">
- <xsd:sequence>
- <xsd:element name="OtherValue" type="AnyType" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:element name="ArchiveTimeStamp" type="TimeStampType"/>
-</xsd:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- edited with XML Spy v4.3 U (http://www.xmlspy.com) by XMLSpy v4 (Altova) -->
+<xsd:schema targetNamespace="http://uri.etsi.org/01903/v1.1.1#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/01903/v1.1.1#" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" elementFormDefault="qualified" xsi:schemaLocation="http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd">
+ <xsd:element name="Any" type="AnyType"/>
+ <xsd:complexType name="AnyType" mixed="true">
+ <xsd:sequence>
+ <xsd:any namespace="##any"/>
+ </xsd:sequence>
+ <xsd:anyAttribute namespace="##any"/>
+ </xsd:complexType>
+ <xsd:element name="ObjectIdentifier" type="ObjectIdentifierType"/>
+ <xsd:complexType name="ObjectIdentifierType">
+ <xsd:sequence>
+ <xsd:element name="Identifier" type="IdentifierType"/>
+ <xsd:element name="Description" type="xsd:string" minOccurs="0"/>
+ <xsd:element name="DocumentationReferences" type="DocumentationReferencesType" minOccurs="0"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="IdentifierType">
+ <xsd:simpleContent>
+ <xsd:extension base="xsd:anyURI">
+ <xsd:attribute name="Qualifier" type="QualifierType" use="optional"/>
+ </xsd:extension>
+ </xsd:simpleContent>
+ </xsd:complexType>
+ <xsd:simpleType name="QualifierType">
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="OIDAsURI"/>
+ <xsd:enumeration value="OIDAsURN"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+ <xsd:complexType name="DocumentationReferencesType">
+ <xsd:sequence maxOccurs="unbounded">
+ <xsd:element name="DocumentationReference" type="xsd:anyURI"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:element name="EncapsulatedPKIData" type="EncapsulatedPKIDataType"/>
+ <xsd:complexType name="EncapsulatedPKIDataType">
+ <xsd:simpleContent>
+ <xsd:extension base="xsd:base64Binary">
+ <xsd:attribute name="Id" type="xsd:ID" use="optional"/>
+ </xsd:extension>
+ </xsd:simpleContent>
+ </xsd:complexType>
+ <xsd:element name="TimeStamp" type="TimeStampType"/>
+ <xsd:complexType name="TimeStampType">
+ <xsd:sequence>
+ <xsd:element name="HashDataInfo" type="HashDataInfoType" maxOccurs="unbounded"/>
+ <xsd:choice>
+ <xsd:element name="EncapsulatedTimeStamp" type="EncapsulatedPKIDataType"/>
+ <xsd:element name="XMLTimeStamp" type="AnyType"/>
+ </xsd:choice>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="HashDataInfoType">
+ <xsd:sequence>
+ <xsd:element name="Transforms" type="ds:TransformsType" minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="uri" type="xsd:anyURI" use="required"/>
+ </xsd:complexType>
+ <xsd:element name="QualifyingProperties" type="QualifyingPropertiesType"/>
+ <xsd:complexType name="QualifyingPropertiesType">
+ <xsd:sequence>
+ <xsd:element name="SignedProperties" type="SignedPropertiesType" minOccurs="0"/>
+ <xsd:element name="UnsignedProperties" type="UnsignedPropertiesType" minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="Target" type="xsd:anyURI" use="required"/>
+ <xsd:attribute name="Id" type="xsd:ID" use="optional"/>
+ </xsd:complexType>
+ <xsd:element name="SignedProperties" type="SignedPropertiesType"/>
+ <xsd:complexType name="SignedPropertiesType">
+ <xsd:sequence>
+ <xsd:element name="SignedSignatureProperties" type="SignedSignaturePropertiesType"/>
+ <xsd:element name="SignedDataObjectProperties" type="SignedDataObjectPropertiesType" minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="Id" type="xsd:ID" use="optional"/>
+ </xsd:complexType>
+ <xsd:element name="UnsignedProperties" type="UnsignedPropertiesType"/>
+ <xsd:complexType name="UnsignedPropertiesType">
+ <xsd:sequence>
+ <xsd:element name="UnsignedSignatureProperties" type="UnsignedSignaturePropertiesType" minOccurs="0"/>
+ <xsd:element name="UnsignedDataObjectProperties" type="UnsignedDataObjectPropertiesType" minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="Id" type="xsd:ID" use="optional"/>
+ </xsd:complexType>
+ <xsd:element name="SignedSignatureProperties" type="SignedSignaturePropertiesType"/>
+ <xsd:complexType name="SignedSignaturePropertiesType">
+ <xsd:sequence>
+ <xsd:element name="SigningTime" type="xsd:dateTime"/>
+ <xsd:element name="SigningCertificate" type="CertIDListType"/>
+ <xsd:element name="SignaturePolicyIdentifier" type="SignaturePolicyIdentifierType"/>
+ <xsd:element name="SignatureProductionPlace" type="SignatureProductionPlaceType" minOccurs="0"/>
+ <xsd:element name="SignerRole" type="SignerRoleType" minOccurs="0"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:element name="SignedDataObjectProperties" type="SignedDataObjectPropertiesType"/>
+ <xsd:complexType name="SignedDataObjectPropertiesType">
+ <xsd:sequence>
+ <xsd:element name="DataObjectFormat" type="DataObjectFormatType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="CommitmentTypeIndication" type="CommitmentTypeIndicationType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="AllDataObjectsTimeStamp" type="TimeStampType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="IndividualDataObjectsTimeStamp" type="TimeStampType" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:element name="UnsignedSignatureProperties" type="UnsignedSignaturePropertiesType"/>
+ <xsd:complexType name="UnsignedSignaturePropertiesType">
+ <xsd:sequence>
+ <xsd:element name="CounterSignature" type="CounterSignatureType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="SignatureTimeStamp" type="TimeStampType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="CompleteCertificateRefs" type="CompleteCertificateRefsType" minOccurs="0"/>
+ <xsd:element name="CompleteRevocationRefs" type="CompleteRevocationRefsType" minOccurs="0"/>
+ <xsd:choice>
+ <xsd:element name="SigAndRefsTimeStamp" type="TimeStampType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="RefsOnlyTimeStamp" type="TimeStampType" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:choice>
+ <xsd:element name="CertificateValues" type="CertificateValuesType" minOccurs="0"/>
+ <xsd:element name="RevocationValues" type="RevocationValuesType" minOccurs="0"/>
+ <xsd:element name="ArchiveTimeStamp" type="TimeStampType" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:element name="UnsignedDataObjectProperties" type="UnsignedDataObjectPropertiesType"/>
+ <xsd:complexType name="UnsignedDataObjectPropertiesType">
+ <xsd:sequence>
+ <xsd:element name="UnsignedDataObjectProperty" type="AnyType" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:element name="QualifyingPropertiesReference" type="QualifyingPropertiesReferenceType"/>
+ <xsd:complexType name="QualifyingPropertiesReferenceType">
+ <xsd:sequence>
+ <xsd:element name="Transforms" type="ds:TransformsType" minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="URI" type="xsd:anyURI" use="required"/>
+ <xsd:attribute name="Id" type="xsd:ID" use="optional"/>
+ </xsd:complexType>
+ <xsd:element name="SigningTime" type="xsd:dateTime"/>
+ <xsd:element name="SigningCertificate" type="CertIDListType"/>
+ <xsd:complexType name="CertIDListType">
+ <xsd:sequence>
+ <xsd:element name="Cert" type="CertIDType" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="CertIDType">
+ <xsd:sequence>
+ <xsd:element name="CertDigest" type="DigestAlgAndValueType"/>
+ <xsd:element name="IssuerSerial" type="ds:X509IssuerSerialType"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="DigestAlgAndValueType">
+ <xsd:sequence>
+ <xsd:element name="DigestMethod" type="ds:DigestMethodType"/>
+ <xsd:element name="DigestValue" type="ds:DigestValueType"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:element name="SignaturePolicyIdentifier" type="SignaturePolicyIdentifierType"/>
+ <xsd:complexType name="SignaturePolicyIdentifierType">
+ <xsd:choice>
+ <xsd:element name="SignaturePolicyId" type="SignaturePolicyIdType"/>
+ <xsd:element name="SignaturePolicyImplied"/>
+ </xsd:choice>
+ </xsd:complexType>
+ <xsd:complexType name="SignaturePolicyIdType">
+ <xsd:sequence>
+ <xsd:element name="SigPolicyId" type="ObjectIdentifierType"/>
+ <xsd:element ref="ds:Transforms" minOccurs="0"/>
+ <xsd:element name="SigPolicyHash" type="DigestAlgAndValueType"/>
+ <xsd:element name="SigPolicyQualifiers" type="SigPolicyQualifiersListType" minOccurs="0"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="SigPolicyQualifiersListType">
+ <xsd:sequence>
+ <xsd:element name="SigPolicyQualifier" type="AnyType" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:element name="SPURI" type="xsd:anyURI"/>
+ <xsd:element name="SPUserNotice" type="SPUserNoticeType"/>
+ <xsd:complexType name="SPUserNoticeType">
+ <xsd:sequence>
+ <xsd:element name="NoticeRef" type="NoticeReferenceType" minOccurs="0"/>
+ <xsd:element name="ExplicitText" type="xsd:string" minOccurs="0"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="NoticeReferenceType">
+ <xsd:sequence>
+ <xsd:element name="Organization" type="xsd:string"/>
+ <xsd:element name="NoticeNumbers" type="IntegerListType"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="IntegerListType">
+ <xsd:sequence>
+ <xsd:element name="int" type="xsd:integer" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:element name="CounterSignature" type="CounterSignatureType"/>
+ <xsd:complexType name="CounterSignatureType">
+ <xsd:sequence>
+ <xsd:element ref="ds:Signature"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:element name="DataObjectFormat" type="DataObjectFormatType"/>
+ <xsd:complexType name="DataObjectFormatType">
+ <xsd:sequence>
+ <xsd:element name="Description" type="xsd:string" minOccurs="0"/>
+ <xsd:element name="ObjectIdentifier" type="ObjectIdentifierType" minOccurs="0"/>
+ <xsd:element name="MimeType" type="xsd:string" minOccurs="0"/>
+ <xsd:element name="Encoding" type="xsd:anyURI" minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="ObjectReference" type="xsd:anyURI" use="required"/>
+ </xsd:complexType>
+ <xsd:element name="CommitmentTypeIndication" type="CommitmentTypeIndicationType"/>
+ <xsd:complexType name="CommitmentTypeIndicationType">
+ <xsd:sequence>
+ <xsd:element name="CommitmentTypeId" type="ObjectIdentifierType"/>
+ <xsd:choice>
+ <xsd:element name="ObjectReference" type="xsd:anyURI" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="AllSignedDataObjects"/>
+ </xsd:choice>
+ <xsd:element name="CommitmentTypeQualifiers" type="CommitmentTypeQualifiersListType" minOccurs="0"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="CommitmentTypeQualifiersListType">
+ <xsd:sequence>
+ <xsd:element name="CommitmentTypeQualifier" type="AnyType" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:element name="SignatureProductionPlace" type="SignatureProductionPlaceType"/>
+ <xsd:complexType name="SignatureProductionPlaceType">
+ <xsd:sequence>
+ <xsd:element name="City" type="xsd:string" minOccurs="0"/>
+ <xsd:element name="StateOrProvince" type="xsd:string" minOccurs="0"/>
+ <xsd:element name="PostalCode" type="xsd:string" minOccurs="0"/>
+ <xsd:element name="CountryName" type="xsd:string" minOccurs="0"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:element name="SignerRole" type="SignerRoleType"/>
+ <xsd:complexType name="SignerRoleType">
+ <xsd:sequence>
+ <xsd:element name="ClaimedRoles" type="ClaimedRolesListType" minOccurs="0"/>
+ <xsd:element name="CertifiedRoles" type="CertifiedRolesListType" minOccurs="0"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="ClaimedRolesListType">
+ <xsd:sequence>
+ <xsd:element name="ClaimedRole" type="AnyType" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="CertifiedRolesListType">
+ <xsd:sequence>
+ <xsd:element name="CertifiedRole" type="EncapsulatedPKIDataType" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:element name="AllDataObjectsTimeStamp" type="TimeStampType"/>
+ <xsd:element name="IndividualDataObjectsTimeStamp" type="TimeStampType"/>
+ <xsd:element name="SignatureTimeStamp" type="TimeStampType"/>
+ <xsd:element name="CompleteCertificateRefs" type="CompleteCertificateRefsType"/>
+ <xsd:complexType name="CompleteCertificateRefsType">
+ <xsd:sequence>
+ <xsd:element name="CertRefs" type="CertIDListType"/>
+ </xsd:sequence>
+ <xsd:attribute name="Id" type="xsd:ID" use="optional"/>
+ </xsd:complexType>
+ <xsd:element name="CompleteRevocationRefs" type="CompleteRevocationRefsType"/>
+ <xsd:complexType name="CompleteRevocationRefsType">
+ <xsd:sequence>
+ <xsd:element name="CRLRefs" type="CRLRefsType" minOccurs="0"/>
+ <xsd:element name="OCSPRefs" type="OCSPRefsType" minOccurs="0"/>
+ <xsd:element name="OtherRefs" type="OtherCertStatusRefsType" minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="Id" type="xsd:ID" use="optional"/>
+ </xsd:complexType>
+ <xsd:complexType name="CRLRefsType">
+ <xsd:sequence>
+ <xsd:element name="CRLRef" type="CRLRefType" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="CRLRefType">
+ <xsd:sequence>
+ <xsd:element name="DigestAlgAndValue" type="DigestAlgAndValueType"/>
+ <xsd:element name="CRLIdentifier" type="CRLIdentifierType" minOccurs="0"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="CRLIdentifierType">
+ <xsd:sequence>
+ <xsd:element name="Issuer" type="xsd:string"/>
+ <xsd:element name="IssueTime" type="xsd:dateTime"/>
+ <xsd:element name="Number" type="xsd:integer" minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="URI" type="xsd:anyURI" use="optional"/>
+ </xsd:complexType>
+ <xsd:complexType name="OCSPRefsType">
+ <xsd:sequence>
+ <xsd:element name="OCSPRef" type="OCSPRefType" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="OCSPRefType">
+ <xsd:sequence>
+ <xsd:element name="OCSPIdentifier" type="OCSPIdentifierType"/>
+ <xsd:element name="DigestAlgAndValue" type="DigestAlgAndValueType" minOccurs="0"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="OCSPIdentifierType">
+ <xsd:sequence>
+ <xsd:element name="ResponderID" type="xsd:string"/>
+ <xsd:element name="ProducedAt" type="xsd:dateTime"/>
+ </xsd:sequence>
+ <xsd:attribute name="URI" type="xsd:anyURI" use="optional"/>
+ </xsd:complexType>
+ <xsd:complexType name="OtherCertStatusRefsType">
+ <xsd:sequence>
+ <xsd:element name="OtherRef" type="AnyType" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:element name="SigAndRefsTimeStamp" type="TimeStampType"/>
+ <xsd:element name="RefsOnlyTimeStamp" type="TimeStampType"/>
+ <xsd:element name="CertificateValues" type="CertificateValuesType"/>
+ <xsd:complexType name="CertificateValuesType">
+ <xsd:choice minOccurs="0" maxOccurs="unbounded">
+ <xsd:element name="EncapsulatedX509Certificate" type="EncapsulatedPKIDataType"/>
+ <xsd:element name="OtherCertificate" type="AnyType"/>
+ </xsd:choice>
+ <xsd:attribute name="Id" type="xsd:ID" use="optional"/>
+ </xsd:complexType>
+ <xsd:element name="RevocationValues" type="RevocationValuesType"/>
+ <xsd:complexType name="RevocationValuesType">
+ <xsd:sequence>
+ <xsd:element name="CRLValues" type="CRLValuesType" minOccurs="0"/>
+ <xsd:element name="OCSPValues" type="OCSPValuesType" minOccurs="0"/>
+ <xsd:element name="OtherValues" type="OtherCertStatusValuesType" minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="Id" type="xsd:ID" use="optional"/>
+ </xsd:complexType>
+ <xsd:complexType name="CRLValuesType">
+ <xsd:sequence>
+ <xsd:element name="EncapsulatedCRLValue" type="EncapsulatedPKIDataType" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="OCSPValuesType">
+ <xsd:sequence>
+ <xsd:element name="EncapsulatedOCSPValue" type="EncapsulatedPKIDataType" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="OtherCertStatusValuesType">
+ <xsd:sequence>
+ <xsd:element name="OtherValue" type="AnyType" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:element name="ArchiveTimeStamp" type="TimeStampType"/>
+</xsd:schema>
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/xmldsig-core-schema.dtd Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/xmldsig-core-schema.dtd Wed Jul 05 16:42:37 2017 +0200
@@ -3,7 +3,7 @@
Joseph Reagle $last changed 20001215$
http://www.w3.org/2000/09/xmldsig#
- $Revision: 1.1 $ on $Date: 2002/02/08 20:32:26 $ by $Author: reagle $
+ $Revision: 1.6 $ on $Date: 2008/07/24 16:15:03 $ by $Author: mullan $
Copyright 2001 The Internet Society and W3C (Massachusetts Institute
of Technology, Institut National de Recherche en Informatique et en
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/xmldsig-core-schema.xsd Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/xmldsig-core-schema.xsd Wed Jul 05 16:42:37 2017 +0200
@@ -11,7 +11,7 @@
<!-- Schema for XML Signatures
http://www.w3.org/2000/09/xmldsig#
- $Revision: 1.1 $ on $Date: 2002/02/08 20:32:26 $ by $Author: reagle $
+ $Revision: 1.6 $ on $Date: 2008/07/24 16:15:03 $ by $Author: mullan $
Copyright 2001 The Internet Society and W3C (Massachusetts Institute
of Technology, Institut National de Recherche en Informatique et en
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties Wed Jul 05 16:42:37 2017 +0200
@@ -1,123 +1,123 @@
-algorithm.alreadyRegistered = URI {0} already assigned to class {1}
-algorithm.classDoesNotExist = Cannot register URI {0} to class {1} because this class does not exist in CLASSPATH
-algorithm.ClassDoesNotExist = Class {0} does not exist
-algorithm.extendsWrongClass = Cannot register URI {0} to class {1} because it does not extend {2}
-algorithms.CannotUseAlgorithmParameterSpecOnDSA = Sorry, but you cannot use a AlgorithmParameterSpec object for creating DSA signatures.
-algorithms.CannotUseAlgorithmParameterSpecOnRSA = Sorry, but you cannot use a AlgorithmParameterSpec object for creating RSA signatures.
-algorithms.CannotUseSecureRandomOnMAC = Sorry, but you cannot use a SecureRandom object for creating MACs.
-algorithms.HMACOutputLengthOnlyForHMAC = A HMACOutputLength can only be specified for HMAC integrity algorithms
-algorithms.NoSuchAlgorithm = The requested algorithm {0} does not exist. Original Message was: {1}
-algorithms.NoSuchMap = The algorithm URI "{0}" could not be mapped to a JCE algorithm
-algorithms.NoSuchProvider = The specified Provider {0} does not exist. Original Message was: {1}
-algorithms.operationOnlyVerification = A public key can only used for verification of a signature.
-algorithms.WrongKeyForThisOperation = Sorry, you supplied the wrong key type for this operation! You supplied a {0} but a {1} is needed.
-attributeValueIllegal = The attribute {0} has value {1} but must be {2}
-c14n.Canonicalizer.Exception = Exception during Canonicalization: Original Message was {0}
-c14n.Canonicalizer.IllegalNode = Illegal node type {0}, node name was {1}
-c14n.Canonicalizer.NoSuchCanonicalizer = No canonicalizer found with URI {0}
-c14n.Canonicalizer.ParserConfigurationException = ParserConfigurationException during Canonicalization: Original Message was {0}
-c14n.Canonicalizer.RelativeNamespace = Element {0} has a relative namespace: {1}="{2}"
-c14n.Canonicalizer.SAXException = SAXException during Canonicalization: Original Message was {0}
-c14n.Canonicalizer.TraversalNotSupported = This DOM document does not support Traversal {0}
-c14n.Canonicalizer.UnsupportedEncoding = Unsupported encoding {0}
-c14n.Canonicalizer.UnsupportedOperation = This canonicalizer does not support this operation
-c14n.XMLUtils.circumventBug2650forgotten = The tree has not been prepared for canonicalization using XMLUtils#circumventBug2650(Document)
-certificate.noSki.lowVersion = Certificate cannot contain a SubjectKeyIdentifier because it is only X509v{0}
-certificate.noSki.notOctetString = Certificates SubjectKeyIdentifier is not a OctetString
-certificate.noSki.null = Certificate does not contain a SubjectKeyIdentifier
-defaultNamespaceCannotBeSetHere = Default namespace cannot be set here
-ElementProxy.nullElement = Cannot create an ElementProxy from a null argument
-empty = {0}
-encryption.algorithmCannotBeUsedForEncryptedData = encryption.algorithmCannotBeUsedForEncryptedData {0}
-encryption.algorithmCannotEatInitParams = encryption.algorithmCannotEatInitParams
-encryption.algorithmCannotEncryptDecrypt = encryption.algorithmCannotEncryptDecrypt
-encryption.algorithmCannotWrapUnWrap = encryption.algorithmCannotWrapUnWrap
-encryption.ExplicitKeySizeMismatch = The xenc:KeySize element requests a key size of {0} bit but the algorithm implements {1} bit
-encryption.nonceLongerThanDecryptedPlaintext = The given nonce is longer than the available plaintext. I Cannot strip away this.
-encryption.RSAOAEP.dataHashWrong = data hash wrong
-encryption.RSAOAEP.dataStartWrong = data wrong start {0}
-encryption.RSAOAEP.dataTooShort = data too short
-encryption.RSAPKCS15.blockTruncated = block truncated
-encryption.RSAPKCS15.noDataInBlock = no data in block
-encryption.RSAPKCS15.unknownBlockType = unknown block type
-encryption.nokey = No Key Encryption Key loaded and cannot determine using key resolvers
-endorsed.jdk1.4.0 = Since it seems that nobody reads our installation notes, we must do it in the exception messages. Hope you read them. You did NOT use the endorsed mechanism from JDK 1.4 properly; look at <http://xml.apache.org/security/Java/installation.html> how to solve this problem.
-errorMessages.InvalidDigestValueException = INVALID signature -- check reference resolution.
-errorMessages.InvalidSignatureValueException = INVALID signature -- core validation failed.
-errorMessages.IOException = Other file I/O and similar exceptions.
-errorMessages.MissingKeyFailureException = Cannot verify because of missing public key. Provide it via addResource and try again.
-errorMessages.MissingResourceFailureException = Cannot verify because of unresolved references. Provide it via addResource and try again.
-errorMessages.NoSuchAlgorithmException = Unknown Algorithm {0}
-errorMessages.NotYetImplementedException = Functionality not yet there.
-errorMessages.XMLSignatureException = Verification failed for some other reason.
-decoding.divisible.four = It should be divisible by four
-decoding.general = Error while decoding
-FileKeyStorageImpl.addToDefaultFromRemoteNotImplemented = Method addToDefaultFromRemote() not yet implemented.
-FileKeyStorageImpl.NoCert.Context = Not found such a X509Certificate including context {0}
-FileKeyStorageImpl.NoCert.IssNameSerNo = Not found such a X509Certificate with IssuerName {0} and serial number {1}
-FileKeyStorageImpl.NoCert.SubjName = Not found such a X509Certificate including SubjectName {0}
-generic.dontHaveConstructionElement = I do not have a construction Element
-generic.EmptyMessage = {0}
-generic.NotYetImplemented = {0} Not YET implemented ;-((
-java.security.InvalidKeyException = Invalid key
-java.security.NoSuchProviderException = Unknown or unsupported provider
-java.security.UnknownKeyType = Unknown or unsupported key type {0}
-KeyInfo.needKeyResolver = More than one keyResovler have to be registered
-KeyInfo.nokey = Cannot get key from {0}
-KeyInfo.noKey = Cannot get the public key
-KeyInfo.wrongNumberOfObject = Need {0} keyObjects
-KeyInfo.wrongUse = This object was made for getting {0}
-keyResolver.alreadyRegistered = {1} class has already been registered for {0}
-KeyResolver.needStorageResolver = Need a StorageResolver to retrieve a Certificate from a {0}
-KeyResoverSpiImpl.cannotGetCert = Cannot get the Certificate that include or in {1} in implement class {0}
-KeyResoverSpiImpl.elementGeneration = Cannot make {1} element in implement class {0}
-KeyResoverSpiImpl.getPoublicKey = Cannot get the public key from implement class {0}
-KeyResoverSpiImpl.InvalidElement = Cannot set (2) Element in implement class {0}
-KeyResoverSpiImpl.keyStore = KeyStorage error in implement class {0}
-KeyResoverSpiImpl.need.Element = {1} type of Element is needed in implement class {0}
-KeyResoverSpiImpl.wrongCRLElement = Cannot make CRL from {1} in implement class {0}
-KeyResoverSpiImpl.wrongKeyObject = Need {1} type of KeyObject for generation Element in implement class{0}
-KeyResoverSpiImpl.wrongNumberOfObject = Need {1} keyObject in implement class {0}
-KeyStore.alreadyRegistered = {0} Class has already been registered for {1}
-KeyStore.register = {1} type class register error in class {0}
-KeyStore.registerStore.register = Registeration error for type {0}
-KeyValue.IllegalArgument = Cannot create a {0} from {1}
-namespacePrefixAlreadyUsedByOtherURI = Namespace prefix {0} already used by other URI {1}
-notYetInitialized = The module {0} is not yet initialized
-prefix.AlreadyAssigned = You want to assign {0} as prefix for namespace {1} but it is already assigned for {2}
-signature.Canonicalizer.UnknownCanonicalizer = Unknown canonicalizer. No handler installed for URI {0}
-signature.DSA.invalidFormat = Invalid ASN.1 encoding of the DSA signature
-signature.Generation.signBeforeGetValue = You have to XMLSignature.sign(java.security.PrivateKey) first
-signature.signaturePropertyHasNoTarget = The Target attribute of the SignatureProperty must be set
-signature.Transform.ErrorDuringTransform = A {1} was thrown during the {0} transform
-signature.Transform.NotYetImplemented = Transform {0} not yet implemented
-signature.Transform.NullPointerTransform = Null pointer as URI. Programming bug?
-signature.Transform.UnknownTransform = Unknown transformation. No handler installed for URI {0}
-signature.Transform.node = Current Node: {0}
-signature.Transform.nodeAndType = Current Node: {0}, type: {1}
-signature.Util.BignumNonPositive = bigInteger.signum() must be positive
-signature.Util.NonTextNode = Not a text node
-signature.Util.TooManyChilds = Too many childs of Type {0} in {1}
-signature.Verification.certificateError = Certificate error
-signature.Verification.IndexOutOfBounds = Index {0} illegal. We only have {1} References
-signature.Verification.internalError = Internal error
-signature.Verification.InvalidDigestOrReference = Invalid digest of reference {0}
-signature.Verification.keyStore = KeyStore error
-signature.Verification.MissingID = Cannot resolve element with ID {0}
-signature.Verification.MissingResources = Cannot resolve external resource {0}
-signature.Verification.NoSignatureElement = Input document contains no {0} Element in namespace {1}
-signature.Verification.Reference.NoInput = The Reference for URI {0} has no XMLSignatureInput
-signature.Verification.SignatureError = Signature error
-signature.XMLSignatureInput.MissingConstuctor = Cannot construct a XMLSignatureInput from class {0}
-signature.XMLSignatureInput.SerializeDOM = Input initialized with DOM Element. Use Canonicalization to serialize it
-signature.XMLSignatureInput.nodesetReference = Unable to convert to nodeset the reference
-transform.Init.IllegalContextArgument = Invalid context argument of class {0}. Must be String, org.w3c.dom.NodeList or java.io.InputStream.
-transform.init.NotInitialized =
-transform.init.wrongURI = Initialized with wrong URI. How could this happen? We implement {0} but {1} was used during initialization
-utils.Base64.IllegalBitlength = Illegal byte length; Data to be decoded must be a multiple of 4
-Base64Decoding = Error while decoding
-utils.resolver.noClass = Could not find a resolver for URI {0} and Base {1}
-xml.WrongContent = Cannot find {0} in {1}
-xml.WrongElement = Cannot create a {0} from a {1} element
-xpath.funcHere.documentsDiffer = The XPath is not in the same document as the context node
-xpath.funcHere.noXPathContext = Try to evaluate an XPath which uses the here() function but XPath is not inside an ds:XPath Element. XPath was : {0}
+algorithm.alreadyRegistered = URI {0} already assigned to class {1}
+algorithm.classDoesNotExist = Cannot register URI {0} to class {1} because this class does not exist in CLASSPATH
+algorithm.ClassDoesNotExist = Class {0} does not exist
+algorithm.extendsWrongClass = Cannot register URI {0} to class {1} because it does not extend {2}
+algorithms.CannotUseAlgorithmParameterSpecOnDSA = Sorry, but you cannot use a AlgorithmParameterSpec object for creating DSA signatures.
+algorithms.CannotUseAlgorithmParameterSpecOnRSA = Sorry, but you cannot use a AlgorithmParameterSpec object for creating RSA signatures.
+algorithms.CannotUseSecureRandomOnMAC = Sorry, but you cannot use a SecureRandom object for creating MACs.
+algorithms.HMACOutputLengthOnlyForHMAC = A HMACOutputLength can only be specified for HMAC integrity algorithms
+algorithms.NoSuchAlgorithm = The requested algorithm {0} does not exist. Original Message was: {1}
+algorithms.NoSuchMap = The algorithm URI "{0}" could not be mapped to a JCE algorithm
+algorithms.NoSuchProvider = The specified Provider {0} does not exist. Original Message was: {1}
+algorithms.operationOnlyVerification = A public key can only used for verification of a signature.
+algorithms.WrongKeyForThisOperation = Sorry, you supplied the wrong key type for this operation! You supplied a {0} but a {1} is needed.
+attributeValueIllegal = The attribute {0} has value {1} but must be {2}
+c14n.Canonicalizer.Exception = Exception during Canonicalization: Original Message was {0}
+c14n.Canonicalizer.IllegalNode = Illegal node type {0}, node name was {1}
+c14n.Canonicalizer.NoSuchCanonicalizer = No canonicalizer found with URI {0}
+c14n.Canonicalizer.ParserConfigurationException = ParserConfigurationException during Canonicalization: Original Message was {0}
+c14n.Canonicalizer.RelativeNamespace = Element {0} has a relative namespace: {1}="{2}"
+c14n.Canonicalizer.SAXException = SAXException during Canonicalization: Original Message was {0}
+c14n.Canonicalizer.TraversalNotSupported = This DOM document does not support Traversal {0}
+c14n.Canonicalizer.UnsupportedEncoding = Unsupported encoding {0}
+c14n.Canonicalizer.UnsupportedOperation = This canonicalizer does not support this operation
+c14n.XMLUtils.circumventBug2650forgotten = The tree has not been prepared for canonicalization using XMLUtils#circumventBug2650(Document)
+certificate.noSki.lowVersion = Certificate cannot contain a SubjectKeyIdentifier because it is only X509v{0}
+certificate.noSki.notOctetString = Certificates SubjectKeyIdentifier is not a OctetString
+certificate.noSki.null = Certificate does not contain a SubjectKeyIdentifier
+defaultNamespaceCannotBeSetHere = Default namespace cannot be set here
+ElementProxy.nullElement = Cannot create an ElementProxy from a null argument
+empty = {0}
+encryption.algorithmCannotBeUsedForEncryptedData = encryption.algorithmCannotBeUsedForEncryptedData {0}
+encryption.algorithmCannotEatInitParams = encryption.algorithmCannotEatInitParams
+encryption.algorithmCannotEncryptDecrypt = encryption.algorithmCannotEncryptDecrypt
+encryption.algorithmCannotWrapUnWrap = encryption.algorithmCannotWrapUnWrap
+encryption.ExplicitKeySizeMismatch = The xenc:KeySize element requests a key size of {0} bit but the algorithm implements {1} bit
+encryption.nonceLongerThanDecryptedPlaintext = The given nonce is longer than the available plaintext. I Cannot strip away this.
+encryption.RSAOAEP.dataHashWrong = data hash wrong
+encryption.RSAOAEP.dataStartWrong = data wrong start {0}
+encryption.RSAOAEP.dataTooShort = data too short
+encryption.RSAPKCS15.blockTruncated = block truncated
+encryption.RSAPKCS15.noDataInBlock = no data in block
+encryption.RSAPKCS15.unknownBlockType = unknown block type
+encryption.nokey = No Key Encryption Key loaded and cannot determine using key resolvers
+endorsed.jdk1.4.0 = Since it seems that nobody reads our installation notes, we must do it in the exception messages. Hope you read them. You did NOT use the endorsed mechanism from JDK 1.4 properly; look at <http://xml.apache.org/security/Java/installation.html> how to solve this problem.
+errorMessages.InvalidDigestValueException = INVALID signature -- check reference resolution.
+errorMessages.InvalidSignatureValueException = INVALID signature -- core validation failed.
+errorMessages.IOException = Other file I/O and similar exceptions.
+errorMessages.MissingKeyFailureException = Cannot verify because of missing public key. Provide it via addResource and try again.
+errorMessages.MissingResourceFailureException = Cannot verify because of unresolved references. Provide it via addResource and try again.
+errorMessages.NoSuchAlgorithmException = Unknown Algorithm {0}
+errorMessages.NotYetImplementedException = Functionality not yet there.
+errorMessages.XMLSignatureException = Verification failed for some other reason.
+decoding.divisible.four = It should be divisible by four
+decoding.general = Error while decoding
+FileKeyStorageImpl.addToDefaultFromRemoteNotImplemented = Method addToDefaultFromRemote() not yet implemented.
+FileKeyStorageImpl.NoCert.Context = Not found such a X509Certificate including context {0}
+FileKeyStorageImpl.NoCert.IssNameSerNo = Not found such a X509Certificate with IssuerName {0} and serial number {1}
+FileKeyStorageImpl.NoCert.SubjName = Not found such a X509Certificate including SubjectName {0}
+generic.dontHaveConstructionElement = I do not have a construction Element
+generic.EmptyMessage = {0}
+generic.NotYetImplemented = {0} Not YET implemented ;-((
+java.security.InvalidKeyException = Invalid key
+java.security.NoSuchProviderException = Unknown or unsupported provider
+java.security.UnknownKeyType = Unknown or unsupported key type {0}
+KeyInfo.needKeyResolver = More than one keyResovler have to be registered
+KeyInfo.nokey = Cannot get key from {0}
+KeyInfo.noKey = Cannot get the public key
+KeyInfo.wrongNumberOfObject = Need {0} keyObjects
+KeyInfo.wrongUse = This object was made for getting {0}
+keyResolver.alreadyRegistered = {1} class has already been registered for {0}
+KeyResolver.needStorageResolver = Need a StorageResolver to retrieve a Certificate from a {0}
+KeyResoverSpiImpl.cannotGetCert = Cannot get the Certificate that include or in {1} in implement class {0}
+KeyResoverSpiImpl.elementGeneration = Cannot make {1} element in implement class {0}
+KeyResoverSpiImpl.getPoublicKey = Cannot get the public key from implement class {0}
+KeyResoverSpiImpl.InvalidElement = Cannot set (2) Element in implement class {0}
+KeyResoverSpiImpl.keyStore = KeyStorage error in implement class {0}
+KeyResoverSpiImpl.need.Element = {1} type of Element is needed in implement class {0}
+KeyResoverSpiImpl.wrongCRLElement = Cannot make CRL from {1} in implement class {0}
+KeyResoverSpiImpl.wrongKeyObject = Need {1} type of KeyObject for generation Element in implement class{0}
+KeyResoverSpiImpl.wrongNumberOfObject = Need {1} keyObject in implement class {0}
+KeyStore.alreadyRegistered = {0} Class has already been registered for {1}
+KeyStore.register = {1} type class register error in class {0}
+KeyStore.registerStore.register = Registeration error for type {0}
+KeyValue.IllegalArgument = Cannot create a {0} from {1}
+namespacePrefixAlreadyUsedByOtherURI = Namespace prefix {0} already used by other URI {1}
+notYetInitialized = The module {0} is not yet initialized
+prefix.AlreadyAssigned = You want to assign {0} as prefix for namespace {1} but it is already assigned for {2}
+signature.Canonicalizer.UnknownCanonicalizer = Unknown canonicalizer. No handler installed for URI {0}
+signature.DSA.invalidFormat = Invalid ASN.1 encoding of the DSA signature
+signature.Generation.signBeforeGetValue = You have to XMLSignature.sign(java.security.PrivateKey) first
+signature.signaturePropertyHasNoTarget = The Target attribute of the SignatureProperty must be set
+signature.Transform.ErrorDuringTransform = A {1} was thrown during the {0} transform
+signature.Transform.NotYetImplemented = Transform {0} not yet implemented
+signature.Transform.NullPointerTransform = Null pointer as URI. Programming bug?
+signature.Transform.UnknownTransform = Unknown transformation. No handler installed for URI {0}
+signature.Transform.node = Current Node: {0}
+signature.Transform.nodeAndType = Current Node: {0}, type: {1}
+signature.Util.BignumNonPositive = bigInteger.signum() must be positive
+signature.Util.NonTextNode = Not a text node
+signature.Util.TooManyChilds = Too many childs of Type {0} in {1}
+signature.Verification.certificateError = Certificate error
+signature.Verification.IndexOutOfBounds = Index {0} illegal. We only have {1} References
+signature.Verification.internalError = Internal error
+signature.Verification.InvalidDigestOrReference = Invalid digest of reference {0}
+signature.Verification.keyStore = KeyStore error
+signature.Verification.MissingID = Cannot resolve element with ID {0}
+signature.Verification.MissingResources = Cannot resolve external resource {0}
+signature.Verification.NoSignatureElement = Input document contains no {0} Element in namespace {1}
+signature.Verification.Reference.NoInput = The Reference for URI {0} has no XMLSignatureInput
+signature.Verification.SignatureError = Signature error
+signature.XMLSignatureInput.MissingConstuctor = Cannot construct a XMLSignatureInput from class {0}
+signature.XMLSignatureInput.SerializeDOM = Input initialized with DOM Element. Use Canonicalization to serialize it
+signature.XMLSignatureInput.nodesetReference = Unable to convert to nodeset the reference
+transform.Init.IllegalContextArgument = Invalid context argument of class {0}. Must be String, org.w3c.dom.NodeList or java.io.InputStream.
+transform.init.NotInitialized =
+transform.init.wrongURI = Initialized with wrong URI. How could this happen? We implement {0} but {1} was used during initialization
+utils.Base64.IllegalBitlength = Illegal byte length; Data to be decoded must be a multiple of 4
+Base64Decoding = Error while decoding
+utils.resolver.noClass = Could not find a resolver for URI {0} and Base {1}
+xml.WrongContent = Cannot find {0} in {1}
+xml.WrongElement = Cannot create a {0} from a {1} element
+xpath.funcHere.documentsDiffer = The XPath is not in the same document as the context node
+xpath.funcHere.noXPathContext = Try to evaluate an XPath which uses the here() function but XPath is not inside an ds:XPath Element. XPath was : {0}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidDigestValueException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidDigestValueException.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidSignatureValueException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidSignatureValueException.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java Wed Jul 05 16:42:37 2017 +0200
@@ -68,14 +68,11 @@
/** Field verificationResults[] */
private boolean verificationResults[] = null;
- /** Field _signedContents */
- List _signedContents = new ArrayList();
-
/** Field _resolverProperties */
- HashMap _resolverProperties = new HashMap(10);
+ HashMap _resolverProperties = null;
/** Field _perManifestResolvers */
- List _perManifestResolvers = new ArrayList();
+ List _perManifestResolvers = null;
/**
* Consturts {@link Manifest}
@@ -144,8 +141,6 @@
String BaseURI, String referenceURI, Transforms transforms, String digestURI, String ReferenceId, String ReferenceType)
throws XMLSignatureException {
- if (this._state == MODE_SIGN) {
-
// the this._doc is handed implicitly by the this.getOwnerDocument()
Reference ref = new Reference(this._doc, BaseURI, referenceURI, this,
transforms, digestURI);
@@ -164,7 +159,6 @@
// add the Element of the Reference object to the Manifest/SignedInfo
this._constructionElement.appendChild(ref.getElement());
XMLUtils.addReturnToElement(this._constructionElement);
- }
}
/**
@@ -178,7 +172,6 @@
public void generateDigestValues()
throws XMLSignatureException, ReferenceNotInitializedException {
- if (this._state == MODE_SIGN) {
for (int i = 0; i < this.getLength(); i++) {
// update the cached Reference object, the Element content is automatically updated
@@ -186,7 +179,6 @@
currentRef.generateDigestValue();
}
- }
}
/**
@@ -208,11 +200,6 @@
*/
public Reference item(int i) throws XMLSecurityException {
- if (this._state == MODE_SIGN) {
-
- // we already have real objects
- return (Reference) this._references.get(i);
- }
if (this._references.get(i) == null) {
// not yet constructed, so _we_ have to
@@ -232,7 +219,7 @@
*/
public void setId(String Id) {
- if ((this._state == MODE_SIGN) && (Id != null)) {
+ if (Id != null) {
this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
IdResolver.registerElementById(this._constructionElement, Id);
}
@@ -294,9 +281,9 @@
XMLUtils.selectDsNodes(this._constructionElement.getFirstChild(),
Constants._TAG_REFERENCE);
}
- if (true) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "verify " +_referencesEl.length + " References");
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "I am " + (followManifests
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "verify " +_referencesEl.length + " References");
+ log.log(java.util.logging.Level.FINE, "I am " + (followManifests
? ""
: "not") + " requested to follow nested Manifests");
}
@@ -325,13 +312,13 @@
if (!currentRefVerified) {
verify = false;
}
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "The Reference has Type " + currentRef.getType());
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "The Reference has Type " + currentRef.getType());
// was verification successful till now and do we want to verify the Manifest?
if (verify && followManifests
&& currentRef.typeIsReferenceToManifest()) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "We have to follow a nested Manifest");
+ log.log(java.util.logging.Level.FINE, "We have to follow a nested Manifest");
try {
XMLSignatureInput signedManifestNodes =
@@ -381,7 +368,7 @@
log.log(java.util.logging.Level.WARNING, "The nested Manifest was invalid (bad)");
} else {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "The nested Manifest was valid (good)");
+ log.log(java.util.logging.Level.FINE, "The nested Manifest was valid (good)");
}
} catch (IOException ex) {
throw new ReferenceNotInitializedException("empty", ex);
@@ -458,9 +445,13 @@
*/
public void addResourceResolver(ResourceResolver resolver) {
- if (resolver != null) {
- this._perManifestResolvers.add(resolver);
+ if (resolver == null) {
+ return;
}
+ if (_perManifestResolvers==null)
+ _perManifestResolvers = new ArrayList();
+ this._perManifestResolvers.add(resolver);
+
}
/**
@@ -470,9 +461,13 @@
*/
public void addResourceResolver(ResourceResolverSpi resolverSpi) {
- if (resolverSpi != null) {
- this._perManifestResolvers.add(new ResourceResolver(resolverSpi));
+ if (resolverSpi == null) {
+ return;
}
+ if (_perManifestResolvers==null)
+ _perManifestResolvers = new ArrayList();
+ this._perManifestResolvers.add(new ResourceResolver(resolverSpi));
+
}
/**
@@ -483,6 +478,9 @@
* @param value the value
*/
public void setResolverProperty(String key, String value) {
+ if (_resolverProperties==null) {
+ _resolverProperties=new HashMap(10);
+ }
this._resolverProperties.put(key, value);
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/MissingResourceFailureException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/MissingResourceFailureException.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/NodeFilter.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/NodeFilter.java Wed Jul 05 16:42:37 2017 +0200
@@ -31,8 +31,23 @@
/**
* Tells if a node must be outputed in c14n.
* @param n
- * @return true if node must be outputed, false otherwise.
+ * @return 1 if the node should be outputed.
+ * 0 if node must not be outputed,
+ * -1 if the node and all it's child must not be output.
+ *
*/
- public boolean isNodeInclude(Node n);
+ public int isNodeInclude(Node n);
+ /**
+ * Tells if a node must be outputed in a c14n.
+ * The caller must assured that this method is always call
+ * in document order. The implementations can use this
+ * restriction to optimize the transformation.
+ * @param n
+ * @param level the relative level in the tree
+ * @return 1 if the node should be outputed.
+ * 0 if node must not be outputed,
+ * -1 if the node and all it's child must not be output.
+ */
+ public int isNodeIncludeDO(Node n, int level);
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/ObjectContainer.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/ObjectContainer.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,8 +20,6 @@
*/
package com.sun.org.apache.xml.internal.security.signature;
-
-
import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityException;
import com.sun.org.apache.xml.internal.security.utils.Constants;
import com.sun.org.apache.xml.internal.security.utils.IdResolver;
@@ -35,16 +33,11 @@
* Handles <code><ds:Object></code> elements
* <code>Object<code> {@link Element} supply facility which can contain any kind data
*
- *
* @author Christian Geuer-Pollmann
* $todo$ if we remove childen, the boolean values are not updated
*/
public class ObjectContainer extends SignatureElementProxy {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
- java.util.logging.Logger.getLogger(ObjectContainer.class.getName());
-
/**
* Constructs {@link ObjectContainer}
*
@@ -75,7 +68,7 @@
*/
public void setId(String Id) {
- if ((this._state == MODE_SIGN) && (Id != null)) {
+ if ((Id != null)) {
this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
IdResolver.registerElementById(this._constructionElement, Id);
}
@@ -97,7 +90,7 @@
*/
public void setMimeType(String MimeType) {
- if ((this._state == MODE_SIGN) && (MimeType != null)) {
+ if ( (MimeType != null)) {
this._constructionElement.setAttributeNS(null, Constants._ATT_MIMETYPE,
MimeType);
}
@@ -119,7 +112,7 @@
*/
public void setEncoding(String Encoding) {
- if ((this._state == MODE_SIGN) && (Encoding != null)) {
+ if ((Encoding != null)) {
this._constructionElement.setAttributeNS(null, Constants._ATT_ENCODING,
Encoding);
}
@@ -135,18 +128,16 @@
}
/**
- * Adds childe Node
+ * Adds child Node
*
- * @param node childe Node
+ * @param node child Node
* @return the new node in the tree.
*/
public Node appendChild(Node node) {
Node result = null;
- if (this._state == MODE_SIGN) {
- result = this._constructionElement.appendChild(node);
- }
+ result = this._constructionElement.appendChild(node);
return result;
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Reference.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Reference.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -25,6 +24,8 @@
import java.io.IOException;
import java.io.OutputStream;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.HashSet;
import java.util.Set;
@@ -102,6 +103,32 @@
*/
public class Reference extends SignatureElementProxy {
+ /**
+ * Look up useC14N11 system property. If true, an explicit C14N11 transform
+ * will be added if necessary when generating the signature. See section
+ * 3.1.1 of http://www.w3.org/2007/xmlsec/Drafts/xmldsig-core/ for more info.
+ */
+ private static boolean useC14N11 =
+ AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
+ public Boolean run() {
+ return Boolean.getBoolean
+ ("com.sun.org.apache.xml.internal.security.useC14N11");
+ }
+ });
+
+/*
+ static {
+ try {
+ useC14N11 = Boolean.getBoolean("com.sun.org.apache.xml.internal.security.useC14N11");
+ } catch (Exception e) {
+ // ignore exceptions
+ }
+ }
+*/
+
+ /** Field CacheSignedNodes */
+ public final static boolean CacheSignedNodes = false;
+
/** {@link java.util.logging} logging facility */
static java.util.logging.Logger log =
java.util.logging.Logger.getLogger(Reference.class.getName());
@@ -118,6 +145,12 @@
XMLSignatureInput _transformsOutput;
//J+
+private Transforms transforms;
+
+private Element digestMethodElem;
+
+private Element digestValueElement;
+
/**
* Constructor Reference
*
@@ -148,6 +181,7 @@
// this._manifest.appendChild(this._doc.createTextNode("\n"));
if (transforms != null) {
+ this.transforms=transforms;
this._constructionElement.appendChild(transforms.getElement());
XMLUtils.addReturnToElement(this._constructionElement);
}
@@ -156,11 +190,12 @@
MessageDigestAlgorithm.getInstance(this._doc,
messageDigestAlgorithm);
- this._constructionElement.appendChild(mda.getElement());
+ digestMethodElem=mda.getElement();
+ this._constructionElement.appendChild(digestMethodElem);
XMLUtils.addReturnToElement(this._constructionElement);
}
{
- Element digestValueElement =
+ digestValueElement =
XMLUtils.createElementInSignatureSpace(this._doc,
Constants._TAG_DIGESTVALUE);
@@ -182,7 +217,15 @@
throws XMLSecurityException {
super(element, BaseURI);
-
+ this._baseURI=BaseURI;
+ Element el=XMLUtils.getNextElement(element.getFirstChild());
+ if (Constants._TAG_TRANSFORMS.equals(el.getLocalName()) &&
+ Constants.SignatureSpecNS.equals(el.getNamespaceURI())) {
+ transforms = new Transforms(el,this._baseURI);
+ el=XMLUtils.getNextElement(el.getNextSibling());
+ }
+ digestMethodElem = el;
+ digestValueElement =XMLUtils.getNextElement(digestMethodElem.getNextSibling());;
this._manifest = manifest;
}
@@ -197,9 +240,6 @@
public MessageDigestAlgorithm getMessageDigestAlgorithm()
throws XMLSignatureException {
- Element digestMethodElem = XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
- Constants._TAG_DIGESTMETHOD,0);
-
if (digestMethodElem == null) {
return null;
}
@@ -221,7 +261,7 @@
*/
public void setURI(String URI) {
- if ((this._state == MODE_SIGN) && (URI != null)) {
+ if ( URI != null) {
this._constructionElement.setAttributeNS(null, Constants._ATT_URI,
URI);
}
@@ -243,7 +283,7 @@
*/
public void setId(String Id) {
- if ((this._state == MODE_SIGN) && (Id != null)) {
+ if ( Id != null ) {
this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
IdResolver.registerElementById(this._constructionElement, Id);
}
@@ -265,7 +305,7 @@
*/
public void setType(String Type) {
- if ((this._state == MODE_SIGN) && (Type != null)) {
+ if (Type != null) {
this._constructionElement.setAttributeNS(null, Constants._ATT_TYPE,
Type);
}
@@ -291,8 +331,7 @@
*/
public boolean typeIsReferenceToObject() {
- if ((this.getType() != null)
- && this.getType().equals(Reference.OBJECT_URI)) {
+ if (Reference.OBJECT_URI.equals(this.getType())) {
return true;
}
@@ -309,8 +348,7 @@
*/
public boolean typeIsReferenceToManifest() {
- if ((this.getType() != null)
- && this.getType().equals(Reference.MANIFEST_URI)) {
+ if (Reference.MANIFEST_URI.equals(this.getType())) {
return true;
}
@@ -324,10 +362,6 @@
*/
private void setDigestValueElement(byte[] digestValue)
{
-
- if (this._state == MODE_SIGN) {
- Element digestValueElement =XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
- Constants._TAG_DIGESTVALUE,0);
Node n=digestValueElement.getFirstChild();
while (n!=null) {
digestValueElement.removeChild(n);
@@ -338,7 +372,6 @@
Text t = this._doc.createTextNode(base64codedValue);
digestValueElement.appendChild(t);
- }
}
/**
@@ -349,11 +382,7 @@
*/
public void generateDigestValue()
throws XMLSignatureException, ReferenceNotInitializedException {
-
- if (this._state == MODE_SIGN) {
-
- this.setDigestValueElement(this.calculateDigest());
- }
+ this.setDigestValueElement(this.calculateDigest(false));
}
/**
@@ -608,9 +637,12 @@
* but only preserve the octets, the memory footprint is dramatically
* reduced.
*/
+ if (!Reference.CacheSignedNodes) {
- this._transformsOutput = output;
+ this._transformsOutput = output;//new XMLSignatureInput(output.getBytes());
+ //this._transformsOutput.setSourceURI(output.getSourceURI());
+ }
return output;
} catch (XMLSecurityException ex) {
throw new ReferenceNotInitializedException("empty", ex);
@@ -630,16 +662,7 @@
throws XMLSignatureException, InvalidTransformException,
TransformationException, XMLSecurityException {
- Element transformsElement = XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
- Constants._TAG_TRANSFORMS,0);
-
- if (transformsElement != null) {
- Transforms transforms = new Transforms(transformsElement,
- this._baseURI);
-
- return transforms;
- }
- return null;
+ return transforms;
}
/**
@@ -667,13 +690,14 @@
/**
- * Method resolverResult
+ * Method calculateDigest
*
+ * @param validating true if validating the reference
* @return reference Calculate the digest of this reference.
* @throws ReferenceNotInitializedException
* @throws XMLSignatureException
*/
- private byte[] calculateDigest()
+ private byte[] calculateDigest(boolean validating)
throws ReferenceNotInitializedException, XMLSignatureException {
try {
@@ -684,7 +708,20 @@
DigesterOutputStream diOs=new DigesterOutputStream(mda);
OutputStream os=new UnsyncBufferedOutputStream(diOs);
XMLSignatureInput output=this.dereferenceURIandPerformTransforms(os);
- output.updateOutputStream(os);
+ // if signing and c14n11 property == true explicitly add
+ // C14N11 transform if needed
+ if (this.useC14N11 && !validating &&
+ !output.isOutputStreamSet() && !output.isOctetStream()) {
+ if (transforms == null) {
+ transforms = new Transforms(this._doc);
+ this._constructionElement.insertBefore
+ (transforms.getElement(), digestMethodElem);
+ }
+ transforms.addTransform(Transforms.TRANSFORM_C14N11_OMIT_COMMENTS);
+ output.updateOutputStream(os, true);
+ } else {
+ output.updateOutputStream(os);
+ }
os.flush();
//this.getReferencedBytes(diOs);
//mda.update(data);
@@ -694,7 +731,7 @@
throw new ReferenceNotInitializedException("empty", ex);
} catch (IOException ex) {
throw new ReferenceNotInitializedException("empty", ex);
- }
+ }
}
/**
@@ -702,12 +739,10 @@
*
* @return the digest value.
* @throws Base64DecodingException if Reference contains no proper base64 encoded data.
- * @throws XMLSecurityException if the Reference does not contain a DigestValue element
+ * @throws XMLSecurityException if the Reference does not contain a DigestValue element
*/
public byte[] getDigestValue() throws Base64DecodingException, XMLSecurityException {
- Element digestValueElem = XMLUtils.selectDsNode(this._constructionElement.getFirstChild()
- ,Constants._TAG_DIGESTVALUE,0);
- if (digestValueElem == null) {
+ if (digestValueElement == null) {
// The required element is not in the XML!
Object[] exArgs ={ Constants._TAG_DIGESTVALUE,
Constants.SignatureSpecNS };
@@ -715,7 +750,7 @@
"signature.Verification.NoSignatureElement",
exArgs);
}
- byte[] elemDig = Base64.decode(digestValueElem);
+ byte[] elemDig = Base64.decode(digestValueElement);
return elemDig;
}
@@ -731,13 +766,15 @@
throws ReferenceNotInitializedException, XMLSecurityException {
byte[] elemDig = this.getDigestValue();
- byte[] calcDig = this.calculateDigest();
+ byte[] calcDig = this.calculateDigest(true);
boolean equal = MessageDigestAlgorithm.isEqual(elemDig, calcDig);
if (!equal) {
log.log(java.util.logging.Level.WARNING, "Verification failed for URI \"" + this.getURI() + "\"");
+ log.log(java.util.logging.Level.WARNING, "Expected Digest: " + Base64.encode(elemDig));
+ log.log(java.util.logging.Level.WARNING, "Actual Digest: " + Base64.encode(calcDig));
} else {
- if (log.isLoggable(java.util.logging.Level.INFO)) log.log(java.util.logging.Level.INFO, "Verification successful for URI \"" + this.getURI() + "\"");
+ log.log(java.util.logging.Level.INFO, "Verification successful for URI \"" + this.getURI() + "\"");
}
return equal;
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/ReferenceNotInitializedException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/ReferenceNotInitializedException.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperties.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperties.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,8 +20,6 @@
*/
package com.sun.org.apache.xml.internal.security.signature;
-
-
import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityException;
import com.sun.org.apache.xml.internal.security.utils.Constants;
import com.sun.org.apache.xml.internal.security.utils.IdResolver;
@@ -42,10 +40,6 @@
*/
public class SignatureProperties extends SignatureElementProxy {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
- java.util.logging.Logger.getLogger(SignatureProperties.class.getName());
-
/**
* Constructor SignatureProperties
*
@@ -115,7 +109,7 @@
*/
public void setId(String Id) {
- if ((this._state == MODE_SIGN) && (Id != null)) {
+ if ((Id != null)) {
this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
IdResolver.registerElementById(this._constructionElement, Id);
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperty.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperty.java Wed Jul 05 16:42:37 2017 +0200
@@ -30,18 +30,13 @@
/**
* Handles <code><ds:SignatureProperty></code> elements
- * Addittional information item concerning the generation of the signature(s) can
+ * Additional information item concerning the generation of the signature(s) can
* be placed in this Element
*
* @author Christian Geuer-Pollmann
*/
public class SignatureProperty extends SignatureElementProxy {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
- java.util.logging.Logger.getLogger(
- SignatureProperty.class.getName());
-
/**
* Constructs{@link SignatureProperty} using specified <code>Target</code> attribute
*
@@ -85,7 +80,7 @@
*/
public void setId(String Id) {
- if ((this._state == MODE_SIGN) && (Id != null)) {
+ if ((Id != null)) {
this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
IdResolver.registerElementById(this._constructionElement, Id);
}
@@ -107,7 +102,7 @@
*/
public void setTarget(String Target) {
- if ((this._state == MODE_SIGN) && (Target != null)) {
+ if ((Target != null)) {
this._constructionElement.setAttributeNS(null, Constants._ATT_TARGET, Target);
}
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignedInfo.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignedInfo.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,12 +20,9 @@
*/
package com.sun.org.apache.xml.internal.security.signature;
-
-
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.OutputStream;
-
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
import javax.xml.parsers.ParserConfigurationException;
@@ -43,165 +40,174 @@
import org.w3c.dom.Node;
import org.xml.sax.SAXException;
-
/**
* Handles <code><ds:SignedInfo></code> elements
* This <code>SignedInfo<code> element includes the canonicalization algorithm,
- * a signature algorithm, and one or more references
+ * a signature algorithm, and one or more references.
+ *
* @author Christian Geuer-Pollmann
*/
public class SignedInfo extends Manifest {
- /** Field _signatureAlgorithm */
- private SignatureAlgorithm _signatureAlgorithm = null;
+ /** Field _signatureAlgorithm */
+ private SignatureAlgorithm _signatureAlgorithm = null;
- /** Field _c14nizedBytes */
- private byte[] _c14nizedBytes = null;
+ /** Field _c14nizedBytes */
+ private byte[] _c14nizedBytes = null;
+
+ private Element c14nMethod;
+ private Element signatureMethod;
- /**
- * Overwrites {@link Manifest#addDocument} because it creates another Element.
- *
- * @param doc the {@link Document} in which <code>XMLsignature</code> will be placed
- * @throws XMLSecurityException
- */
- public SignedInfo(Document doc) throws XMLSecurityException {
- this(doc, XMLSignature.ALGO_ID_SIGNATURE_DSA, Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS);
- }
+ /**
+ * Overwrites {@link Manifest#addDocument} because it creates another
+ * Element.
+ *
+ * @param doc the {@link Document} in which <code>XMLsignature</code> will
+ * be placed
+ * @throws XMLSecurityException
+ */
+ public SignedInfo(Document doc) throws XMLSecurityException {
+ this(doc, XMLSignature.ALGO_ID_SIGNATURE_DSA,
+ Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS);
+ }
- /**
- * Constructs {@link SignedInfo} using given Canoicaliztion algorithm and Signature algorithm
- *
- * @param doc <code>SignedInfo</code> is placed in this document
- * @param CanonicalizationMethodURI URI representation of the Canonicalization method
- * @param SignatureMethodURI URI representation of the Digest and Signature algorithm
- * @throws XMLSecurityException
- */
- public SignedInfo(
- Document doc, String SignatureMethodURI, String CanonicalizationMethodURI)
+ /**
+ * Constructs {@link SignedInfo} using given Canonicalization algorithm and
+ * Signature algorithm.
+ *
+ * @param doc <code>SignedInfo</code> is placed in this document
+ * @param signatureMethodURI URI representation of the Digest and
+ * Signature algorithm
+ * @param canonicalizationMethodURI URI representation of the
+ * Canonicalization method
+ * @throws XMLSecurityException
+ */
+ public SignedInfo(Document doc, String signatureMethodURI,
+ String canonicalizationMethodURI)
throws XMLSecurityException {
- this(doc, SignatureMethodURI, 0, CanonicalizationMethodURI);
- }
+ this(doc, signatureMethodURI, 0, canonicalizationMethodURI);
+ }
- /**
- * Constructor SignedInfo
- *
- * @param doc
- * @param CanonicalizationMethodURI
- * @param SignatureMethodURI
- * @param HMACOutputLength
- * @throws XMLSecurityException
- */
- public SignedInfo(
- Document doc, String SignatureMethodURI, int HMACOutputLength, String CanonicalizationMethodURI)
+ /**
+ * Constructor SignedInfo
+ *
+ * @param doc <code>SignedInfo</code> is placed in this document
+ * @param signatureMethodURI URI representation of the Digest and
+ * Signature algorithm
+ * @param hMACOutputLength
+ * @param canonicalizationMethodURI URI representation of the
+ * Canonicalization method
+ * @throws XMLSecurityException
+ */
+ public SignedInfo(Document doc, String signatureMethodURI,
+ int hMACOutputLength, String canonicalizationMethodURI)
throws XMLSecurityException {
- super(doc);
+ super(doc);
- // XMLUtils.addReturnToElement(this._constructionElement);
- {
- Element canonElem = XMLUtils.createElementInSignatureSpace(this._doc,
+ c14nMethod = XMLUtils.createElementInSignatureSpace(this._doc,
Constants._TAG_CANONICALIZATIONMETHOD);
- canonElem.setAttributeNS(null, Constants._ATT_ALGORITHM,
- CanonicalizationMethodURI);
- this._constructionElement.appendChild(canonElem);
- XMLUtils.addReturnToElement(this._constructionElement);
- }
- {
- if (HMACOutputLength > 0) {
+ c14nMethod.setAttributeNS(null, Constants._ATT_ALGORITHM,
+ canonicalizationMethodURI);
+ this._constructionElement.appendChild(c14nMethod);
+ XMLUtils.addReturnToElement(this._constructionElement);
+
+ if (hMACOutputLength > 0) {
this._signatureAlgorithm = new SignatureAlgorithm(this._doc,
- SignatureMethodURI, HMACOutputLength);
- } else {
+ signatureMethodURI, hMACOutputLength);
+ } else {
this._signatureAlgorithm = new SignatureAlgorithm(this._doc,
- SignatureMethodURI);
- }
+ signatureMethodURI);
+ }
- this._constructionElement
- .appendChild(this._signatureAlgorithm.getElement());
- XMLUtils.addReturnToElement(this._constructionElement);
- }
- }
+ signatureMethod = this._signatureAlgorithm.getElement();
+ this._constructionElement.appendChild(signatureMethod);
+ XMLUtils.addReturnToElement(this._constructionElement);
+ }
- /**
- * @param doc
- * @param SignatureMethodElem
- * @param CanonicalizationMethodElem
- * @throws XMLSecurityException
- */
- public SignedInfo(
- Document doc, Element SignatureMethodElem, Element CanonicalizationMethodElem)
- throws XMLSecurityException {
+ /**
+ * @param doc
+ * @param signatureMethodElem
+ * @param canonicalizationMethodElem
+ * @throws XMLSecurityException
+ */
+ public SignedInfo(Document doc, Element signatureMethodElem,
+ Element canonicalizationMethodElem) throws XMLSecurityException {
- super(doc);
-
- this._constructionElement.appendChild(CanonicalizationMethodElem);
- XMLUtils.addReturnToElement(this._constructionElement);
+ super(doc);
+ // Check this?
+ this.c14nMethod = canonicalizationMethodElem;
+ this._constructionElement.appendChild(c14nMethod);
+ XMLUtils.addReturnToElement(this._constructionElement);
- this._signatureAlgorithm = new SignatureAlgorithm(SignatureMethodElem, null);
+ this._signatureAlgorithm =
+ new SignatureAlgorithm(signatureMethodElem, null);
- this._constructionElement
- .appendChild(this._signatureAlgorithm.getElement());
- XMLUtils.addReturnToElement(this._constructionElement);
- }
+ signatureMethod = this._signatureAlgorithm.getElement();
+ this._constructionElement.appendChild(signatureMethod);
+
+ XMLUtils.addReturnToElement(this._constructionElement);
+ }
- /**
- * Build a {@link SignedInfo} from an {@link Element}
- *
- * @param element <code>SignedInfo</code>
- * @param BaseURI the URI of the resource where the XML instance was stored
- * @throws XMLSecurityException
- * @see <A HREF="http://lists.w3.org/Archives/Public/w3c-ietf-xmldsig/2001OctDec/0033.html">Question</A>
- * @see <A HREF="http://lists.w3.org/Archives/Public/w3c-ietf-xmldsig/2001OctDec/0054.html">Answer</A>
- */
- public SignedInfo(Element element, String BaseURI)
+ /**
+ * Build a {@link SignedInfo} from an {@link Element}
+ *
+ * @param element <code>SignedInfo</code>
+ * @param baseURI the URI of the resource where the XML instance was stored
+ * @throws XMLSecurityException
+ * @see <A HREF="http://lists.w3.org/Archives/Public/w3c-ietf-xmldsig/2001OctDec/0033.html">Question</A>
+ * @see <A HREF="http://lists.w3.org/Archives/Public/w3c-ietf-xmldsig/2001OctDec/0054.html">Answer</A>
+ */
+ public SignedInfo(Element element, String baseURI)
throws XMLSecurityException {
- // Parse the Reference children and Id attribute in the Manifest
- super(element, BaseURI);
+ // Parse the Reference children and Id attribute in the Manifest
+ super(element, baseURI);
- /* canonicalize ds:SignedInfo, reparse it into a new document
- * and replace the original not-canonicalized ds:SignedInfo by
- * the re-parsed canonicalized one.
- */
- String c14nMethodURI=this.getCanonicalizationMethodURI();
- if (!(c14nMethodURI.equals("http://www.w3.org/TR/2001/REC-xml-c14n-20010315") ||
- c14nMethodURI.equals("http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments") ||
- c14nMethodURI.equals("http://www.w3.org/2001/10/xml-exc-c14n#") ||
- c14nMethodURI.equals("http://www.w3.org/2001/10/xml-exc-c14n#WithComments"))) {
- //The c14n is not a secure one and can rewrite the URIs or like that reparse the SignedInfo to be sure
- try {
- Canonicalizer c14nizer =
- Canonicalizer.getInstance(this.getCanonicalizationMethodURI());
-
- this._c14nizedBytes =
- c14nizer.canonicalizeSubtree(this._constructionElement);
- javax.xml.parsers.DocumentBuilderFactory dbf =
- javax.xml.parsers.DocumentBuilderFactory.newInstance();
+ /* canonicalize ds:SignedInfo, reparse it into a new document
+ * and replace the original not-canonicalized ds:SignedInfo by
+ * the re-parsed canonicalized one.
+ */
+ c14nMethod = XMLUtils.getNextElement(element.getFirstChild());
+ String c14nMethodURI = this.getCanonicalizationMethodURI();
+ if (!(c14nMethodURI.equals(Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS) ||
+ c14nMethodURI.equals(Canonicalizer.ALGO_ID_C14N_WITH_COMMENTS) ||
+ c14nMethodURI.equals(Canonicalizer.ALGO_ID_C14N_EXCL_OMIT_COMMENTS) ||
+ c14nMethodURI.equals(Canonicalizer.ALGO_ID_C14N_EXCL_WITH_COMMENTS))) {
+ // the c14n is not a secure one and can rewrite the URIs or like
+ // that reparse the SignedInfo to be sure
+ try {
+ Canonicalizer c14nizer =
+ Canonicalizer.getInstance(this.getCanonicalizationMethodURI());
- dbf.setNamespaceAware(true);
+ this._c14nizedBytes =
+ c14nizer.canonicalizeSubtree(this._constructionElement);
+ javax.xml.parsers.DocumentBuilderFactory dbf =
+ javax.xml.parsers.DocumentBuilderFactory.newInstance();
+ dbf.setNamespaceAware(true);
+ javax.xml.parsers.DocumentBuilder db = dbf.newDocumentBuilder();
+ org.w3c.dom.Document newdoc =
+ db.parse(new ByteArrayInputStream(this._c14nizedBytes));
+ Node imported =
+ this._doc.importNode(newdoc.getDocumentElement(), true);
- javax.xml.parsers.DocumentBuilder db = dbf.newDocumentBuilder();
- org.w3c.dom.Document newdoc =
- db.parse(new ByteArrayInputStream(this._c14nizedBytes));
- Node imported = this._doc.importNode(newdoc.getDocumentElement(),
- true);
-
- this._constructionElement.getParentNode().replaceChild(imported,
- this._constructionElement);
+ this._constructionElement.getParentNode().replaceChild(imported,
+ this._constructionElement);
- this._constructionElement = (Element) imported;
- } catch (ParserConfigurationException ex) {
- throw new XMLSecurityException("empty", ex);
- } catch (IOException ex) {
- throw new XMLSecurityException("empty", ex);
- } catch (SAXException ex) {
- throw new XMLSecurityException("empty", ex);
- }
- }
- this._signatureAlgorithm =
- new SignatureAlgorithm(this.getSignatureMethodElement(),
- this.getBaseURI());
- }
+ this._constructionElement = (Element) imported;
+ } catch (ParserConfigurationException ex) {
+ throw new XMLSecurityException("empty", ex);
+ } catch (IOException ex) {
+ throw new XMLSecurityException("empty", ex);
+ } catch (SAXException ex) {
+ throw new XMLSecurityException("empty", ex);
+ }
+ }
+ signatureMethod = XMLUtils.getNextElement(c14nMethod.getNextSibling());
+ this._signatureAlgorithm =
+ new SignatureAlgorithm(signatureMethod, this.getBaseURI());
+ }
/**
* Tests core validation process
@@ -294,12 +300,8 @@
*/
public String getCanonicalizationMethodURI() {
- Element el= XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
- Constants._TAG_CANONICALIZATIONMETHOD,0);
- if (el==null) {
- return null;
- }
- return el.getAttributeNS(null, Constants._ATT_ALGORITHM);
+
+ return c14nMethod.getAttributeNS(null, Constants._ATT_ALGORITHM);
}
/**
@@ -324,8 +326,7 @@
*
*/
public Element getSignatureMethodElement() {
- return XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
- Constants._TAG_SIGNATUREMETHOD,0);
+ return signatureMethod;
}
/**
@@ -343,6 +344,9 @@
.getJCEAlgorithmString());
}
+ protected SignatureAlgorithm getSignatureAlgorithm() {
+ return _signatureAlgorithm;
+ }
/**
* Method getBaseLocalName
* @inheritDoc
@@ -354,21 +358,16 @@
public String getInclusiveNamespaces() {
- Element el= XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
- Constants._TAG_CANONICALIZATIONMETHOD,0);
- if (el==null) {
- return null;
- }
+
- String c14nMethodURI = el.getAttributeNS(null, Constants._ATT_ALGORITHM);
+ String c14nMethodURI = c14nMethod.getAttributeNS(null, Constants._ATT_ALGORITHM);
if(!(c14nMethodURI.equals("http://www.w3.org/2001/10/xml-exc-c14n#") ||
c14nMethodURI.equals("http://www.w3.org/2001/10/xml-exc-c14n#WithComments"))) {
return null;
}
- Element inclusiveElement = XMLUtils.selectNode(
- el.getFirstChild(),InclusiveNamespaces.ExclusiveCanonicalizationNamespace,
- InclusiveNamespaces._TAG_EC_INCLUSIVENAMESPACES,0);
+ Element inclusiveElement = XMLUtils.getNextElement(
+ c14nMethod.getFirstChild());
if(inclusiveElement != null)
{
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignature.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignature.java Wed Jul 05 16:42:37 2017 +0200
@@ -75,7 +75,7 @@
* <li>sign and checkSignatureValue methods are used to sign and validate the
* signature. </li></ul>
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public final class XMLSignature extends SignatureElementProxy {
@@ -115,6 +115,10 @@
public static final String ALGO_ID_MAC_HMAC_SHA384 = Constants.MoreAlgorithmsSpecNS + "hmac-sha384";
/** HMAC - Optional HMAC-SHA512 */
public static final String ALGO_ID_MAC_HMAC_SHA512 = Constants.MoreAlgorithmsSpecNS + "hmac-sha512";
+ /**Signature - Optional ECDSAwithSHA1 */
+ public static final String ALGO_ID_SIGNATURE_ECDSA_SHA1 = "http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1";
+
+
//J+
/** ds:Signature.ds:SignedInfo element */
@@ -130,6 +134,8 @@
*/
private boolean _followManifestsDuringValidation = false;
+private Element signatureValueElement;
+
/**
* This creates a new <CODE>ds:Signature</CODE> Element and adds an empty
* <CODE>ds:SignedInfo</CODE>.
@@ -195,6 +201,15 @@
super(doc);
+ String xmlnsDsPrefix =
+ getDefaultPrefixBindings(Constants.SignatureSpecNS);
+ if (xmlnsDsPrefix == null) {
+ this._constructionElement.setAttributeNS
+ (Constants.NamespaceSpecNS, "xmlns", Constants.SignatureSpecNS);
+ } else {
+ this._constructionElement.setAttributeNS
+ (Constants.NamespaceSpecNS, xmlnsDsPrefix, Constants.SignatureSpecNS);
+ }
XMLUtils.addReturnToElement(this._constructionElement);
this._baseURI = BaseURI;
@@ -206,7 +221,7 @@
XMLUtils.addReturnToElement(this._constructionElement);
// create an empty SignatureValue; this is filled by setSignatureValueElement
- Element signatureValueElement =
+ signatureValueElement =
XMLUtils.createElementInSignatureSpace(this._doc,
Constants._TAG_SIGNATUREVALUE);
@@ -227,6 +242,15 @@
super(doc);
+ String xmlnsDsPrefix =
+ getDefaultPrefixBindings(Constants.SignatureSpecNS);
+ if (xmlnsDsPrefix == null) {
+ this._constructionElement.setAttributeNS
+ (Constants.NamespaceSpecNS, "xmlns", Constants.SignatureSpecNS);
+ } else {
+ this._constructionElement.setAttributeNS
+ (Constants.NamespaceSpecNS, xmlnsDsPrefix, Constants.SignatureSpecNS);
+ }
XMLUtils.addReturnToElement(this._constructionElement);
this._baseURI = BaseURI;
@@ -236,7 +260,7 @@
XMLUtils.addReturnToElement(this._constructionElement);
// create an empty SignatureValue; this is filled by setSignatureValueElement
- Element signatureValueElement =
+ signatureValueElement =
XMLUtils.createElementInSignatureSpace(this._doc,
Constants._TAG_SIGNATUREVALUE);
@@ -259,8 +283,8 @@
super(element, BaseURI);
// check out SignedInfo child
- Element signedInfoElem = XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
- Constants._TAG_SIGNEDINFO,0);
+ Element signedInfoElem = XMLUtils.getNextElement(element.getFirstChild());// XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
+ //Constants._TAG_SIGNEDINFO,0);
// check to see if it is there
if (signedInfoElem == null) {
@@ -274,8 +298,8 @@
this._signedInfo = new SignedInfo(signedInfoElem, BaseURI);
// check out SignatureValue child
- Element signatureValueElement = XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
- Constants._TAG_SIGNATUREVALUE,0);
+ this.signatureValueElement =XMLUtils.getNextElement(signedInfoElem.getNextSibling()); //XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
+ // Constants._TAG_SIGNATUREVALUE,0);
// check to see if it exists
if (signatureValueElement == null) {
@@ -286,11 +310,12 @@
}
// <element ref="ds:KeyInfo" minOccurs="0"/>
- Element keyInfoElem =XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
- Constants._TAG_KEYINFO,0);
+ Element keyInfoElem = XMLUtils.getNextElement(signatureValueElement.getNextSibling());//XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
+ // Constants._TAG_KEYINFO,0);
// If it exists use it, but it's not mandatory
- if (keyInfoElem != null) {
+ if ((keyInfoElem != null) && (keyInfoElem.getNamespaceURI().equals(Constants.SignatureSpecNS) &&
+ keyInfoElem.getLocalName().equals(Constants._TAG_KEYINFO)) ) {
this._keyInfo = new KeyInfo(keyInfoElem, BaseURI);
}
}
@@ -302,7 +327,7 @@
*/
public void setId(String Id) {
- if ((this._state == MODE_SIGN) && (Id != null)) {
+ if ( (Id != null)) {
this._constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
IdResolver.registerElementById(this._constructionElement, Id);
}
@@ -336,9 +361,7 @@
public byte[] getSignatureValue() throws XMLSignatureException {
try {
- Element signatureValueElem = XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
- Constants._TAG_SIGNATUREVALUE,0);
- byte[] signatureValue = Base64.decode(signatureValueElem);
+ byte[] signatureValue = Base64.decode(signatureValueElement);
return signatureValue;
} catch (Base64DecodingException ex) {
@@ -346,33 +369,28 @@
}
}
- /**
- * Base64 encodes and sets the bytes as the content of the SignatureValue
- * Node.
- *
- * @param bytes bytes to be used by SignatureValue before Base64 encoding
- */
- private void setSignatureValueElement(byte[] bytes)
- {
+ /**
+ * Base64 encodes and sets the bytes as the content of the SignatureValue
+ * Node.
+ *
+ * @param bytes bytes to be used by SignatureValue before Base64 encoding
+ */
+ private void setSignatureValueElement(byte[] bytes) {
- if (this._state == MODE_SIGN) {
- Element signatureValueElem = XMLUtils.selectDsNode(this._constructionElement.getFirstChild(),
- Constants._TAG_SIGNATUREVALUE,0);
- while (signatureValueElem.hasChildNodes()) {
- signatureValueElem.removeChild(signatureValueElem.getFirstChild());
- }
+ while (signatureValueElement.hasChildNodes()) {
+ signatureValueElement.removeChild
+ (signatureValueElement.getFirstChild());
+ }
- String base64codedValue = Base64.encode(bytes);
+ String base64codedValue = Base64.encode(bytes);
- if (base64codedValue.length() > 76) {
+ if (base64codedValue.length() > 76 && !XMLUtils.ignoreLineBreaks()) {
base64codedValue = "\n" + base64codedValue + "\n";
- }
+ }
- Text t = this._doc.createTextNode(base64codedValue);
-
- signatureValueElem.appendChild(t);
- }
- }
+ Text t = this._doc.createTextNode(base64codedValue);
+ signatureValueElement.appendChild(t);
+ }
/**
* Returns the KeyInfo child. If we are in signing mode and the KeyInfo
@@ -385,7 +403,7 @@
public KeyInfo getKeyInfo() {
// check to see if we are signing and if we have to create a keyinfo
- if ((this._state == MODE_SIGN) && (this._keyInfo == null)) {
+ if ( (this._keyInfo == null)) {
// create the KeyInfo
this._keyInfo = new KeyInfo(this._doc);
@@ -401,8 +419,7 @@
// add it before the object
this._constructionElement.insertBefore(keyInfoElement,
firstObject);
- this._constructionElement
- .insertBefore(this._doc.createTextNode("\n"), firstObject);
+ XMLUtils.addReturnBeforeChild(this._constructionElement, firstObject);
} else {
// add it as the last element to the signature
@@ -425,17 +442,17 @@
public void appendObject(ObjectContainer object)
throws XMLSignatureException {
- try {
- if (this._state != MODE_SIGN) {
- throw new XMLSignatureException(
- "signature.operationOnlyBeforeSign");
- }
+ //try {
+ //if (this._state != MODE_SIGN) {
+ // throw new XMLSignatureException(
+ // "signature.operationOnlyBeforeSign");
+ //}
this._constructionElement.appendChild(object.getElement());
XMLUtils.addReturnToElement(this._constructionElement);
- } catch (XMLSecurityException ex) {
- throw new XMLSignatureException("empty", ex);
- }
+ //} catch (XMLSecurityException ex) {
+ // throw new XMLSignatureException("empty", ex);
+ //}
}
/**
@@ -481,23 +498,13 @@
}
try {
- if (this._state == MODE_SIGN) {
-
- // XMLUtils.indentSignature(this._constructionElement, " ", 0);
- // get the SignatureMethodElement
- Element signatureMethodElement =
- this._signedInfo.getSignatureMethodElement();
-
+ // if (this._state == MODE_SIGN) {
//Create a SignatureAlgorithm object
- SignatureAlgorithm sa =
- new SignatureAlgorithm(signatureMethodElement,
- this.getBaseURI());
-
+ SignedInfo si = this.getSignedInfo();
+ SignatureAlgorithm sa = si.getSignatureAlgorithm();
// initialize SignatureAlgorithm for signing
sa.initSign(signingKey);
- SignedInfo si = this.getSignedInfo();
-
// generate digest values for all References in this SignedInfo
si.generateDigestValues();
OutputStream so=new UnsyncBufferedOutputStream(new SignerOutputStream(sa));
@@ -513,7 +520,7 @@
// set them on the SignateValue element
this.setSignatureValueElement(jcebytes);
- }
+ //}
} catch (CanonicalizationException ex) {
throw new XMLSignatureException("empty", ex);
} catch (InvalidCanonicalizerException ex) {
@@ -584,50 +591,45 @@
throw new XMLSignatureException("empty", exArgs);
}
-
// all references inside the signedinfo need to be dereferenced and
// digested again to see if the outcome matches the stored value in the
// SignedInfo.
// If _followManifestsDuringValidation is true it will do the same for
// References inside a Manifest.
try {
- if (!this.getSignedInfo()
- .verify(this._followManifestsDuringValidation)) {
- return false;
- }
-
+ SignedInfo si=this.getSignedInfo();
//create a SignatureAlgorithms from the SignatureMethod inside
//SignedInfo. This is used to validate the signature.
- SignatureAlgorithm sa =
- new SignatureAlgorithm(this.getSignedInfo()
- .getSignatureMethodElement(), this.getBaseURI());
- if (true) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "SignatureMethodURI = " + sa.getAlgorithmURI());
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "jceSigAlgorithm = " + sa.getJCEAlgorithmString());
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "jceSigProvider = " + sa.getJCEProviderName());
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "PublicKey = " + pk);
+ SignatureAlgorithm sa =si.getSignatureAlgorithm();
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "SignatureMethodURI = " + sa.getAlgorithmURI());
+ log.log(java.util.logging.Level.FINE, "jceSigAlgorithm = " + sa.getJCEAlgorithmString());
+ log.log(java.util.logging.Level.FINE, "jceSigProvider = " + sa.getJCEProviderName());
+ log.log(java.util.logging.Level.FINE, "PublicKey = " + pk);
}
sa.initVerify(pk);
// Get the canonicalized (normalized) SignedInfo
SignerOutputStream so=new SignerOutputStream(sa);
OutputStream bos=new UnsyncBufferedOutputStream(so);
- this._signedInfo.signInOctectStream(bos);
+ si.signInOctectStream(bos);
try {
- bos.close();
- } catch (IOException e) {
- //Imposible
- }
+ bos.close();
+ } catch (IOException e) {
+ //Imposible
+ }
//retrieve the byte[] from the stored signature
byte sigBytes[] = this.getSignatureValue();
-
//Have SignatureAlgorithm sign the input bytes and compare them to the
//bytes that were stored in the signature.
- boolean verify = sa.verify(sigBytes);
+ if (!sa.verify(sigBytes)) {
+ log.log(java.util.logging.Level.WARNING, "Signature verification failed.");
+ return false;
+ }
- return verify;
+ return si.verify(this._followManifestsDuringValidation);
} catch (XMLSecurityException ex) {
throw new XMLSignatureException("empty", ex);
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureException.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,9 +2,8 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2008 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,8 +20,6 @@
*/
package com.sun.org.apache.xml.internal.security.signature;
-
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -39,7 +36,9 @@
import javax.xml.parsers.ParserConfigurationException;
import com.sun.org.apache.xml.internal.security.c14n.CanonicalizationException;
+import com.sun.org.apache.xml.internal.security.c14n.implementations.CanonicalizerBase;
import com.sun.org.apache.xml.internal.security.c14n.implementations.Canonicalizer20010315OmitComments;
+import com.sun.org.apache.xml.internal.security.c14n.implementations.Canonicalizer11_OmitComments;
import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityRuntimeException;
import com.sun.org.apache.xml.internal.security.utils.JavaUtils;
import com.sun.org.apache.xml.internal.security.utils.XMLUtils;
@@ -47,463 +46,483 @@
import org.w3c.dom.Node;
import org.xml.sax.SAXException;
-
/**
* Class XMLSignatureInput
*
* @author Christian Geuer-Pollmann
* $todo$ check whether an XMLSignatureInput can be _both_, octet stream _and_ node set?
*/
-public class XMLSignatureInput implements Cloneable {
- static java.util.logging.Logger log =
- java.util.logging.Logger.getLogger(XMLSignatureInput.class.getName());
+public class XMLSignatureInput implements Cloneable {
+ static java.util.logging.Logger log =
+ java.util.logging.Logger.getLogger
+ (XMLSignatureInput.class.getName());
- /*
+ /*
* The XMLSignature Input can be either:
* A byteArray like with/or without InputStream.
- * Or a nodeSet like defined either:
- * * as a collection of nodes
- * * or as subnode excluding or not commets and excluding or
- * not other nodes.
- */
- /**
- * Some InputStreams do not support the {@link java.io.InputStream#reset}
- * method, so we read it in completely and work on our Proxy.
- */
- InputStream _inputOctetStreamProxy = null;
- /**
- * The original NodeSet for this XMLSignatureInput
- */
- Set _inputNodeSet = null;
- /**
- * The original Element
- */
- Node _subNode=null;
- /**
- * Exclude Node *for enveloped transformations*
- */
- Node excludeNode=null;
- /**
- *
- */
- boolean excludeComments=false;
+ * Or a nodeSet like defined either:
+ * * as a collection of nodes
+ * * or as subnode excluding or not commets and excluding or
+ * not other nodes.
+ */
- boolean isNodeSet=false;
- /**
- * A cached bytes
- */
- byte []bytes=null;
+ /**
+ * Some InputStreams do not support the {@link java.io.InputStream#reset}
+ * method, so we read it in completely and work on our Proxy.
+ */
+ InputStream _inputOctetStreamProxy = null;
+ /**
+ * The original NodeSet for this XMLSignatureInput
+ */
+ Set _inputNodeSet = null;
+ /**
+ * The original Element
+ */
+ Node _subNode=null;
+ /**
+ * Exclude Node *for enveloped transformations*
+ */
+ Node excludeNode=null;
+ /**
+ *
+ */
+ boolean excludeComments=false;
- /**
- * Some Transforms may require explicit MIME type, charset (IANA registered "character set"), or other such information concerning the data they are receiving from an earlier Transform or the source data, although no Transform algorithm specified in this document needs such explicit information. Such data characteristics are provided as parameters to the Transform algorithm and should be described in the specification for the algorithm.
- */
- private String _MIMEType = null;
+ boolean isNodeSet=false;
+ /**
+ * A cached bytes
+ */
+ byte []bytes=null;
+
+ /**
+ * Some Transforms may require explicit MIME type, charset (IANA registered "character set"), or other such information concerning the data they are receiving from an earlier Transform or the source data, although no Transform algorithm specified in this document needs such explicit information. Such data characteristics are provided as parameters to the Transform algorithm and should be described in the specification for the algorithm.
+ */
+ private String _MIMEType = null;
- /**
- * Field _SourceURI
- */
- private String _SourceURI = null;
+ /**
+ * Field _SourceURI
+ */
+ private String _SourceURI = null;
+
+ /**
+ * Node Filter list.
+ */
+ List nodeFilters=new ArrayList();
- /**
- * Node Filter list.
- */
- List nodeFilters=new ArrayList();
+ boolean needsToBeExpanded=false;
+ OutputStream outputStream=null;
- boolean needsToBeExpanded=false;
- /**
- * Check if the structured is needed to be circumbented.
- * @return true if so.
- */
- public boolean isNeedsToBeExpanded() {
- return needsToBeExpanded;
- }
+ /**
+ * Check if the structured is needed to be circumbented.
+ * @return true if so.
+ */
+ public boolean isNeedsToBeExpanded() {
+ return needsToBeExpanded;
+ }
- /**
- * Set if the structured is needed to be circumbented.
- * @param needsToBeExpanded true if so.
- */
- public void setNeedsToBeExpanded(boolean needsToBeExpanded) {
+ /**
+ * Set if the structured is needed to be circumbented.
+ * @param needsToBeExpanded true if so.
+ */
+ public void setNeedsToBeExpanded(boolean needsToBeExpanded) {
this.needsToBeExpanded = needsToBeExpanded;
- }
- OutputStream outputStream=null;
+ }
- /**
- * Construct a XMLSignatureInput from an octet array.
- * <p>
- * This is a comfort method, which internally converts the byte[] array into an InputStream
- * <p>NOTE: no defensive copy</p>
- * @param inputOctets an octet array which including XML document or node
- */
- public XMLSignatureInput(byte[] inputOctets) {
+ /**
+ * Construct a XMLSignatureInput from an octet array.
+ * <p>
+ * This is a comfort method, which internally converts the byte[] array into
+ * an InputStream
+ * <p>NOTE: no defensive copy</p>
+ * @param inputOctets an octet array which including XML document or node
+ */
+ public XMLSignatureInput(byte[] inputOctets) {
- // NO defensive copy
+ // NO defensive copy
- //this._inputOctetStreamProxy = new ByteArrayInputStream(inputOctets);
- this.bytes=inputOctets;
- }
-
+ //this._inputOctetStreamProxy = new ByteArrayInputStream(inputOctets);
+ this.bytes=inputOctets;
+ }
- /**
- * Constructs a <code>XMLSignatureInput</code> from an octet stream. The
- * stream is directly read.
- *
- * @param inputOctetStream
- */
- public XMLSignatureInput(InputStream inputOctetStream) {
- this._inputOctetStreamProxy=inputOctetStream;
+ /**
+ * Constructs a <code>XMLSignatureInput</code> from an octet stream. The
+ * stream is directly read.
+ *
+ * @param inputOctetStream
+ */
+ public XMLSignatureInput(InputStream inputOctetStream) {
+ this._inputOctetStreamProxy=inputOctetStream;
- //this(JavaUtils.getBytesFromStream(inputOctetStream));
-
- }
+ //this(JavaUtils.getBytesFromStream(inputOctetStream));
+ }
- /**
- * Construct a XMLSignatureInput from a String.
- * <p>
- * This is a comfort method, which internally converts the String into a byte[] array using the {@link java.lang.String#getBytes()} method.
- * @deprecated
- * @param inputStr the input String which including XML document or node
- */
- public XMLSignatureInput(String inputStr) {
- this(inputStr.getBytes());
- }
+ /**
+ * Construct a XMLSignatureInput from a String.
+ * <p>
+ * This is a comfort method, which internally converts the String into a byte
+ * [] array using the {@link java.lang.String#getBytes()} method.
+ * @deprecated
+ * @param inputStr the input String which including XML document or node
+ */
+ public XMLSignatureInput(String inputStr) {
+ this(inputStr.getBytes());
+ }
- /**
- * Construct a XMLSignatureInput from a String with a given encoding.
- * <p>
- * This is a comfort method, which internally converts the String into a byte[] array using the {@link java.lang.String#getBytes()} method.
- *
- * @deprecated
- * @param inputStr the input String with encoding <code>encoding</code>
- * @param encoding the encoding of <code>inputStr</code>
- * @throws UnsupportedEncodingException
- */
- public XMLSignatureInput(String inputStr, String encoding)
+ /**
+ * Construct a XMLSignatureInput from a String with a given encoding.
+ * <p>
+ * This is a comfort method, which internally converts the String into a byte
+ * [] array using the {@link java.lang.String#getBytes()} method.
+ *
+ * @deprecated
+ * @param inputStr the input String with encoding <code>encoding</code>
+ * @param encoding the encoding of <code>inputStr</code>
+ * @throws UnsupportedEncodingException
+ */
+ public XMLSignatureInput(String inputStr, String encoding)
throws UnsupportedEncodingException {
- this(inputStr.getBytes(encoding));
- }
+ this(inputStr.getBytes(encoding));
+ }
- /**
- * Construct a XMLSignatureInput from a subtree rooted by rootNode. This
- * method included the node and <I>all</I> his descendants in the output.
- *
- * @param rootNode
- */
- public XMLSignatureInput(Node rootNode)
- {
- this._subNode = rootNode;
- }
+ /**
+ * Construct a XMLSignatureInput from a subtree rooted by rootNode. This
+ * method included the node and <I>all</I> his descendants in the output.
+ *
+ * @param rootNode
+ */
+ public XMLSignatureInput(Node rootNode)
+ {
+ this._subNode = rootNode;
+ }
- /**
- * Constructor XMLSignatureInput
- *
- * @param inputNodeSet
- * @param usedXPathAPI
- */
- public XMLSignatureInput(Set inputNodeSet) {
- this._inputNodeSet = inputNodeSet;
- }
+ /**
+ * Constructor XMLSignatureInput
+ *
+ * @param inputNodeSet
+ * @param usedXPathAPI
+ */
+ public XMLSignatureInput(Set inputNodeSet) {
+ this._inputNodeSet = inputNodeSet;
+ }
- /**
- * Returns the node set from input which was specified as the parameter of {@link XMLSignatureInput} constructor
- *
- * @return the node set
- * @throws SAXException
- * @throws IOException
- * @throws ParserConfigurationException
- * @throws CanonicalizationException
- * @throws CanonicalizationException
- * @throws IOException
- * @throws ParserConfigurationException
- * @throws SAXException
- */
- public Set getNodeSet() throws CanonicalizationException, ParserConfigurationException, IOException, SAXException {
- return getNodeSet(false);
- }
- /**
- * Returns the node set from input which was specified as the parameter of {@link XMLSignatureInput} constructor
- * @param circunvent
- *
- * @return the node set
- * @throws SAXException
- * @throws IOException
- * @throws ParserConfigurationException
- * @throws CanonicalizationException
- * @throws CanonicalizationException
- * @throws IOException
- * @throws ParserConfigurationException
- * @throws SAXException
- */
- public Set getNodeSet(boolean circunvent)
+ /**
+ * Returns the node set from input which was specified as the parameter of
+ * {@link XMLSignatureInput} constructor
+ *
+ * @return the node set
+ * @throws SAXException
+ * @throws IOException
+ * @throws ParserConfigurationException
+ * @throws CanonicalizationException
+ */
+ public Set getNodeSet() throws CanonicalizationException,
+ ParserConfigurationException, IOException, SAXException {
+ return getNodeSet(false);
+ }
+
+ /**
+ * Returns the node set from input which was specified as the parameter of
+ * {@link XMLSignatureInput} constructor
+ * @param circumvent
+ *
+ * @return the node set
+ * @throws SAXException
+ * @throws IOException
+ * @throws ParserConfigurationException
+ * @throws CanonicalizationException
+ */
+ public Set getNodeSet(boolean circumvent)
throws ParserConfigurationException, IOException, SAXException,
CanonicalizationException {
- if (this._inputNodeSet!=null) {
- return this._inputNodeSet;
- }
- if (this.isElement()) {
+ if (this._inputNodeSet!=null) {
+ return this._inputNodeSet;
+ }
+ if ((this._inputOctetStreamProxy==null)&& (this._subNode!=null) ) {
- if (circunvent) {
- XMLUtils.circumventBug2650(XMLUtils.getOwnerDocument(_subNode));
+ if (circumvent) {
+ XMLUtils.circumventBug2650(XMLUtils.getOwnerDocument(_subNode));
}
this._inputNodeSet = new HashSet();
XMLUtils.getSet(_subNode,this._inputNodeSet, excludeNode, this.excludeComments);
- return this._inputNodeSet;
- }
- else if (this.isOctetStream()) {
- convertToNodes();
- HashSet result=new HashSet();
- XMLUtils.getSet(_subNode, result,null,false);
+ return this._inputNodeSet;
+ } else if (this.isOctetStream()) {
+ convertToNodes();
+ HashSet result=new HashSet();
+ XMLUtils.getSet(_subNode, result,null,false);
//this._inputNodeSet=result;
return result;
- }
+ }
- throw new RuntimeException(
- "getNodeSet() called but no input data present");
- }
+ throw new RuntimeException(
+ "getNodeSet() called but no input data present");
+ }
- /**
- * Returns the Octect stream(byte Stream) from input which was specified as the parameter of {@link XMLSignatureInput} constructor
- *
- * @return the Octect stream(byte Stream) from input which was specified as the parameter of {@link XMLSignatureInput} constructor
- * @throws IOException
- */
- public InputStream getOctetStream()
- throws IOException {
+ /**
+ * Returns the Octect stream(byte Stream) from input which was specified as
+ * the parameter of {@link XMLSignatureInput} constructor
+ *
+ * @return the Octect stream(byte Stream) from input which was specified as
+ * the parameter of {@link XMLSignatureInput} constructor
+ * @throws IOException
+ */
+ public InputStream getOctetStream() throws IOException {
- return getResetableInputStream();
+ return getResetableInputStream();
+ }
- }
- /**
+ /**
* @return real octect stream
*/
public InputStream getOctetStreamReal () {
- return this._inputOctetStreamProxy;
- }
- /**
- * Returns the byte array from input which was specified as the parameter of {@link XMLSignatureInput} constructor
- *
- * @return the byte[] from input which was specified as the parameter of {@link XMLSignatureInput} constructor
- *
- * @throws CanonicalizationException
- * @throws IOException
- */
- public byte[] getBytes()
- throws IOException, CanonicalizationException {
- if (bytes!=null) {
- return bytes;
- }
- InputStream is = getResetableInputStream();
- if (is!=null) {
- //reseatable can read again bytes.
- if (bytes==null) {
- is.reset();
- bytes=JavaUtils.getBytesFromStream(is);
- }
- return bytes;
- }
- Canonicalizer20010315OmitComments c14nizer =
- new Canonicalizer20010315OmitComments();
+ return this._inputOctetStreamProxy;
+ }
+
+ /**
+ * Returns the byte array from input which was specified as the parameter of
+ * {@link XMLSignatureInput} constructor
+ *
+ * @return the byte[] from input which was specified as the parameter of
+ * {@link XMLSignatureInput} constructor
+ *
+ * @throws CanonicalizationException
+ * @throws IOException
+ */
+ public byte[] getBytes() throws IOException, CanonicalizationException {
+ if (bytes!=null) {
+ return bytes;
+ }
+ InputStream is = getResetableInputStream();
+ if (is!=null) {
+ //resetable can read again bytes.
+ if (bytes==null) {
+ is.reset();
+ bytes=JavaUtils.getBytesFromStream(is);
+ }
+ return bytes;
+ }
+ Canonicalizer20010315OmitComments c14nizer =
+ new Canonicalizer20010315OmitComments();
bytes=c14nizer.engineCanonicalize(this);
return bytes;
- }
-
+ }
- /**
- * Determines if the object has been set up with a Node set
- *
- * @return true is the object has been set up with a Node set
- */
- public boolean isNodeSet() {
- return (( (this._inputOctetStreamProxy == null)
+ /**
+ * Determines if the object has been set up with a Node set
+ *
+ * @return true if the object has been set up with a Node set
+ */
+ public boolean isNodeSet() {
+ return (( (this._inputOctetStreamProxy == null)
&& (this._inputNodeSet != null) ) || isNodeSet);
- }
- /**
- * Determines if the object has been set up with an Element
- *
- * @return true is the object has been set up with a Node set
- */
- public boolean isElement() {
- return ((this._inputOctetStreamProxy==null)&& (this._subNode!=null)
- && (this._inputNodeSet==null) && !isNodeSet
- );
- }
+ }
+
+ /**
+ * Determines if the object has been set up with an Element
+ *
+ * @return true if the object has been set up with a Node set
+ */
+ public boolean isElement() {
+ return ((this._inputOctetStreamProxy==null)&& (this._subNode!=null)
+ && (this._inputNodeSet==null) && !isNodeSet);
+ }
- /**
- * Determines if the object has been set up with an octet stream
- *
- * @return true is the object has been set up with an octet stream
- */
- public boolean isOctetStream() {
- return ( ((this._inputOctetStreamProxy != null) || bytes!=null)
+ /**
+ * Determines if the object has been set up with an octet stream
+ *
+ * @return true if the object has been set up with an octet stream
+ */
+ public boolean isOctetStream() {
+ return ( ((this._inputOctetStreamProxy != null) || bytes!=null)
&& ((this._inputNodeSet == null) && _subNode ==null));
- }
+ }
- /**
- * Determines if the object has been set up with a ByteArray
- *
- * @return true is the object has been set up with an octet stream
- */
- public boolean isByteArray() {
- return ( (bytes!=null)
+ /**
+ * Determines if {@link #setOutputStream} has been called with a
+ * non-null OutputStream.
+ *
+ * @return true if {@link #setOutputStream} has been called with a
+ * non-null OutputStream
+ */
+ public boolean isOutputStreamSet() {
+ return outputStream != null;
+ }
+
+ /**
+ * Determines if the object has been set up with a ByteArray
+ *
+ * @return true is the object has been set up with an octet stream
+ */
+ public boolean isByteArray() {
+ return ( (bytes!=null)
&& ((this._inputNodeSet == null) && _subNode ==null));
- }
-
- /**
- * Is the object correctly set up?
- *
- * @return true if the object has been set up correctly
- */
- public boolean isInitialized() {
- return (this.isOctetStream() || this.isNodeSet());
- }
+ }
- /**
- * Returns MIMEType
- *
- * @return MIMEType
- */
- public String getMIMEType() {
- return this._MIMEType;
- }
+ /**
+ * Is the object correctly set up?
+ *
+ * @return true if the object has been set up correctly
+ */
+ public boolean isInitialized() {
+ return (this.isOctetStream() || this.isNodeSet());
+ }
- /**
- * Sets MIMEType
- *
- * @param MIMEType
- */
- public void setMIMEType(String MIMEType) {
- this._MIMEType = MIMEType;
- }
+ /**
+ * Returns MIMEType
+ *
+ * @return MIMEType
+ */
+ public String getMIMEType() {
+ return this._MIMEType;
+ }
- /**
- * Return SourceURI
- *
- * @return SourceURI
- */
- public String getSourceURI() {
- return this._SourceURI;
- }
+ /**
+ * Sets MIMEType
+ *
+ * @param MIMEType
+ */
+ public void setMIMEType(String MIMEType) {
+ this._MIMEType = MIMEType;
+ }
- /**
- * Sets SourceURI
- *
- * @param SourceURI
- */
- public void setSourceURI(String SourceURI) {
- this._SourceURI = SourceURI;
- }
-
+ /**
+ * Return SourceURI
+ *
+ * @return SourceURI
+ */
+ public String getSourceURI() {
+ return this._SourceURI;
+ }
- /**
- * Method toString
- * @inheritDoc
- *
- */
- public String toString() {
+ /**
+ * Sets SourceURI
+ *
+ * @param SourceURI
+ */
+ public void setSourceURI(String SourceURI) {
+ this._SourceURI = SourceURI;
+ }
- if (this.isNodeSet()) {
- return "XMLSignatureInput/NodeSet/" + this._inputNodeSet.size()
+ /**
+ * Method toString
+ * @inheritDoc
+ */
+ public String toString() {
+ if (this.isNodeSet()) {
+ return "XMLSignatureInput/NodeSet/" + this._inputNodeSet.size()
+ " nodes/" + this.getSourceURI();
- }
- if (this.isElement()) {
- return "XMLSignatureInput/Element/" + this._subNode
- + " exclude "+ this.excludeNode + " comments:" +
- this.excludeComments
- +"/" + this.getSourceURI();
- }
- try {
+ }
+ if (this.isElement()) {
+ return "XMLSignatureInput/Element/" + this._subNode
+ + " exclude "+ this.excludeNode + " comments:" +
+ this.excludeComments +"/" + this.getSourceURI();
+ }
+ try {
return "XMLSignatureInput/OctetStream/" + this.getBytes().length
+ " octets/" + this.getSourceURI();
- } catch (Exception ex) {
+ } catch (IOException iex) {
return "XMLSignatureInput/OctetStream//" + this.getSourceURI();
- }
-
- }
-
- /**
- * Method getHTMLRepresentation
- *
- * @throws XMLSignatureException
- * @return The HTML representation for this XMLSignature
- */
- public String getHTMLRepresentation() throws XMLSignatureException {
+ } catch (CanonicalizationException cex) {
+ return "XMLSignatureInput/OctetStream//" + this.getSourceURI();
+ }
+ }
- XMLSignatureInputDebugger db = new XMLSignatureInputDebugger(this);
+ /**
+ * Method getHTMLRepresentation
+ *
+ * @throws XMLSignatureException
+ * @return The HTML representation for this XMLSignature
+ */
+ public String getHTMLRepresentation() throws XMLSignatureException {
- return db.getHTMLRepresentation();
- }
+ XMLSignatureInputDebugger db = new XMLSignatureInputDebugger(this);
- /**
- * Method getHTMLRepresentation
- *
- * @param inclusiveNamespaces
- * @throws XMLSignatureException
- * @return The HTML representation for this XMLSignature
- */
- public String getHTMLRepresentation(Set inclusiveNamespaces)
+ return db.getHTMLRepresentation();
+ }
+
+ /**
+ * Method getHTMLRepresentation
+ *
+ * @param inclusiveNamespaces
+ * @throws XMLSignatureException
+ * @return The HTML representation for this XMLSignature
+ */
+ public String getHTMLRepresentation(Set inclusiveNamespaces)
throws XMLSignatureException {
- XMLSignatureInputDebugger db = new XMLSignatureInputDebugger( this,
+ XMLSignatureInputDebugger db = new XMLSignatureInputDebugger( this,
inclusiveNamespaces);
- return db.getHTMLRepresentation();
- }
+ return db.getHTMLRepresentation();
+ }
- /**
- * Gets the exclude node of this XMLSignatureInput
- * @return Returns the excludeNode.
- */
+ /**
+ * Gets the exclude node of this XMLSignatureInput
+ * @return Returns the excludeNode.
+ */
public Node getExcludeNode() {
- return excludeNode;
+ return excludeNode;
}
/**
* Sets the exclude node of this XMLSignatureInput
* @param excludeNode The excludeNode to set.
*/
- public void setExcludeNode(Node excludeNode) {
- this.excludeNode = excludeNode;
- }
+ public void setExcludeNode(Node excludeNode) {
+ this.excludeNode = excludeNode;
+ }
- /**
- * Gets the node of this XMLSignatureInput
- * @return The excludeNode set.
- */
- public Node getSubNode() {
- return _subNode;
- }
- /**
- * @return Returns the excludeComments.
- */
- public boolean isExcludeComments() {
+ /**
+ * Gets the node of this XMLSignatureInput
+ * @return The excludeNode set.
+ */
+ public Node getSubNode() {
+ return _subNode;
+ }
+
+ /**
+ * @return Returns the excludeComments.
+ */
+ public boolean isExcludeComments() {
return excludeComments;
- }
- /**
- * @param excludeComments The excludeComments to set.
- */
- public void setExcludeComments(boolean excludeComments) {
+ }
+
+ /**
+ * @param excludeComments The excludeComments to set.
+ */
+ public void setExcludeComments(boolean excludeComments) {
this.excludeComments = excludeComments;
- }
+ }
- /**
- * @param diOs
- * @throws IOException
- * @throws CanonicalizationException
- */
- public void updateOutputStream(OutputStream diOs) throws CanonicalizationException, IOException {
+ /**
+ * @param diOs
+ * @throws IOException
+ * @throws CanonicalizationException
+ */
+ public void updateOutputStream(OutputStream diOs)
+ throws CanonicalizationException, IOException {
+ updateOutputStream(diOs, false);
+ }
+
+ public void updateOutputStream(OutputStream diOs, boolean c14n11)
+ throws CanonicalizationException, IOException {
if (diOs==outputStream) {
- return;
+ return;
}
if (bytes!=null) {
diOs.write(bytes);
return;
- }else if (_inputOctetStreamProxy==null) {
- Canonicalizer20010315OmitComments c14nizer =
- new Canonicalizer20010315OmitComments();
- c14nizer.setWriter(diOs);
+ } else if (_inputOctetStreamProxy==null) {
+ CanonicalizerBase c14nizer = null;
+ if (c14n11) {
+ c14nizer = new Canonicalizer11_OmitComments();
+ } else {
+ c14nizer = new Canonicalizer20010315OmitComments();
+ }
+ c14nizer.setWriter(diOs);
c14nizer.engineCanonicalize(this);
return;
- } else {
+ } else {
InputStream is = getResetableInputStream();
if (bytes!=null) {
//already read write it, can be rea.
@@ -516,25 +535,22 @@
while ((num=is.read(bytesT))>0) {
diOs.write(bytesT,0,num);
}
-
- }
-
}
-
+ }
- /**
- * @param os
- */
- public void setOutputStream(OutputStream os) {
- outputStream=os;
+ /**
+ * @param os
+ */
+ public void setOutputStream(OutputStream os) {
+ outputStream=os;
+ }
- }
protected InputStream getResetableInputStream() throws IOException{
if ((_inputOctetStreamProxy instanceof ByteArrayInputStream) ) {
if (!_inputOctetStreamProxy.markSupported()) {
throw new RuntimeException("Accepted as Markable but not truly been"+_inputOctetStreamProxy);
}
- return _inputOctetStreamProxy;
+ return _inputOctetStreamProxy;
}
if (bytes!=null) {
_inputOctetStreamProxy=new ByteArrayInputStream(bytes);
@@ -543,7 +559,7 @@
if (_inputOctetStreamProxy ==null)
return null;
if (_inputOctetStreamProxy.markSupported()) {
- if (log.isLoggable(java.util.logging.Level.INFO)) log.log(java.util.logging.Level.INFO, "Mark Suported but not used as reset");
+ log.log(java.util.logging.Level.INFO, "Mark Suported but not used as reset");
}
bytes=JavaUtils.getBytesFromStream(_inputOctetStreamProxy);
_inputOctetStreamProxy.close();
@@ -551,66 +567,63 @@
return _inputOctetStreamProxy;
}
-
- /**
- * @param filter
- */
- public void addNodeFilter(NodeFilter filter) {
- if (isOctetStream()) {
- try {
- convertToNodes();
- } catch (Exception e) {
- throw new XMLSecurityRuntimeException("signature.XMLSignatureInput.nodesetReference",e);
- }
- }
- nodeFilters.add(filter);
-
+ /**
+ * @param filter
+ */
+ public void addNodeFilter(NodeFilter filter) {
+ if (isOctetStream()) {
+ try {
+ convertToNodes();
+ } catch (Exception e) {
+ throw new XMLSecurityRuntimeException("signature.XMLSignatureInput.nodesetReference",e);
+ }
}
+ nodeFilters.add(filter);
+ }
- /**
- * @return the node filters
- */
- public List getNodeFilters() {
- // TODO Auto-generated method stub
- return nodeFilters;
- }
+ /**
+ * @return the node filters
+ */
+ public List getNodeFilters() {
+ // TODO Auto-generated method stub
+ return nodeFilters;
+ }
- /**
- * @param b
- */
- public void setNodeSet(boolean b) {
- isNodeSet=b;
+ /**
+ * @param b
+ */
+ public void setNodeSet(boolean b) {
+ isNodeSet=b;
+ }
- }
-
- void convertToNodes() throws CanonicalizationException, ParserConfigurationException, IOException, SAXException{
- DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
+ void convertToNodes() throws CanonicalizationException,
+ ParserConfigurationException, IOException, SAXException {
+ DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
dfactory.setValidating(false);
dfactory.setNamespaceAware(true);
DocumentBuilder db = dfactory.newDocumentBuilder();
// select all nodes, also the comments.
try {
- db.setErrorHandler(new com.sun.org.apache.xml.internal.security.utils
- .IgnoreAllErrorHandler());
+ db.setErrorHandler(new com.sun.org.apache.xml.internal.security.utils
+ .IgnoreAllErrorHandler());
- Document doc = db.parse(this.getOctetStream());
+ Document doc = db.parse(this.getOctetStream());
- XMLUtils.circumventBug2650(doc);
- this._subNode=doc.getDocumentElement();
+ this._subNode=doc.getDocumentElement();
} catch (SAXException ex) {
- // if a not-wellformed nodeset exists, put a container around it...
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ // if a not-wellformed nodeset exists, put a container around it...
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
- baos.write("<container>".getBytes());
- baos.write(this.getBytes());
- baos.write("</container>".getBytes());
+ baos.write("<container>".getBytes());
+ baos.write(this.getBytes());
+ baos.write("</container>".getBytes());
- byte result[] = baos.toByteArray();
- Document document = db.parse(new ByteArrayInputStream(result));
- this._subNode=document.getDocumentElement().getFirstChild().getFirstChild();
+ byte result[] = baos.toByteArray();
+ Document document = db.parse(new ByteArrayInputStream(result));
+ this._subNode=document.getDocumentElement().getFirstChild().getFirstChild();
}
this._inputOctetStreamProxy=null;
this.bytes=null;
- }
+ }
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInputDebugger.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInputDebugger.java Wed Jul 05 16:42:37 2017 +0200
@@ -39,7 +39,8 @@
/**
* Class XMLSignatureInputDebugger
*
- * @author $Author: raul $
+ * @author $Author: mullan $
+ * @version $Revision: 1.3 $
*/
public class XMLSignatureInputDebugger {
@@ -599,23 +600,23 @@
length = data.length();
- if ((data != null) && (length > 0)) {
- this._writer.write(" ");
+ if (length > 0) {
+ this._writer.write(" ");
- for (int i = 0; i < length; i++) {
- char c = data.charAt(i);
+ for (int i = 0; i < length; i++) {
+ char c = data.charAt(i);
- switch (c) {
+ switch (c) {
- case 0x0D:
- this._writer.write("&#xD;");
- break;
+ case 0x0D:
+ this._writer.write("&#xD;");
+ break;
- default:
- this._writer.write(c);
- break;
- }
+ default:
+ this._writer.write(c);
+ break;
}
+ }
}
this._writer.write("?>");
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/InvalidTransformException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/InvalidTransformException.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,14 +20,11 @@
*/
package com.sun.org.apache.xml.internal.security.transforms;
-
-
import java.io.IOException;
import java.io.OutputStream;
-import java.util.HashMap;
import java.security.AccessController;
import java.security.PrivilegedAction;
-
+import java.util.HashMap;
import javax.xml.parsers.ParserConfigurationException;
import com.sun.org.apache.xml.internal.security.c14n.CanonicalizationException;
@@ -38,17 +35,17 @@
import com.sun.org.apache.xml.internal.security.utils.Constants;
import com.sun.org.apache.xml.internal.security.utils.HelperNodeList;
import com.sun.org.apache.xml.internal.security.utils.SignatureElementProxy;
+import com.sun.org.apache.xml.internal.security.utils.XMLUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
-
/**
* Implements the behaviour of the <code>ds:Transform</code> element.
*
- * This <code>Transform</code>(Factory) class role as the Factory and Proxy of
- * implemanting class that have the functionality of <a
+ * This <code>Transform</code>(Factory) class acts as the Factory and Proxy of
+ * the implementing class that supports the functionality of <a
* href=http://www.w3.org/TR/xmldsig-core/#sec-TransformAlg>a Transform
* algorithm</a>.
* Implements the Factory and Proxy pattern for ds:Transform algorithms.
@@ -60,326 +57,314 @@
*/
public final class Transform extends SignatureElementProxy {
- /** {@link java.util.logging} logging facility */
+ /** {@link java.util.logging} logging facility */
static java.util.logging.Logger log =
java.util.logging.Logger.getLogger(Transform.class.getName());
- /** Field _alreadyInitialized */
- static boolean _alreadyInitialized = false;
+ /** Field _alreadyInitialized */
+ private static boolean alreadyInitialized = false;
- /** All available Transform classes are registered here */
- static HashMap _transformHash = null;
+ /** All available Transform classes are registered here */
+ private static HashMap transformClassHash = null;
- /** Field transformSpi */
- protected TransformSpi transformSpi = null;
+ private static HashMap transformSpiHash = new HashMap();
+
+ private TransformSpi transformSpi = null;
- /**
- * Constructs {@link Transform}
- *
- * @param doc the {@link Document} in which <code>Transform</code> will be placed
- * @param algorithmURI URI representation of
- * <code>Transform algorithm</code> will be specified as parameter of
- * {@link #getInstance(Document, String)}, when generate. </br>
- * @param contextNodes the child node list of <code>Transform</code> element
- * @throws InvalidTransformException
- */
- public Transform(Document doc, String algorithmURI, NodeList contextNodes)
- throws InvalidTransformException {
+ /**
+ * Constructs {@link Transform}
+ *
+ * @param doc the {@link Document} in which <code>Transform</code> will be
+ * placed
+ * @param algorithmURI URI representation of
+ * <code>Transform algorithm</code> which will be specified as parameter of
+ * {@link #getInstance(Document, String)}, when generated. </br>
+ * @param contextNodes the child node list of <code>Transform</code> element
+ * @throws InvalidTransformException
+ */
+ public Transform(Document doc, String algorithmURI, NodeList contextNodes)
+ throws InvalidTransformException {
- super(doc);
-
- try {
- this._constructionElement.setAttributeNS(null, Constants._ATT_ALGORITHM,
- algorithmURI);
+ super(doc);
- Class implementingClass =
- Transform.getImplementingClass(algorithmURI);
+ this._constructionElement.setAttributeNS
+ (null, Constants._ATT_ALGORITHM, algorithmURI);
- if(implementingClass == null) {
+ transformSpi = getTransformSpi(algorithmURI);
+ if (transformSpi == null) {
Object exArgs[] = { algorithmURI };
-
throw new InvalidTransformException(
"signature.Transform.UnknownTransform", exArgs);
- }
- if (true) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Create URI \"" + algorithmURI + "\" class \""
- + implementingClass + "\"");
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "The NodeList is " + contextNodes);
- }
+ }
- // create the custom Transform object
- this.transformSpi =
- (TransformSpi) implementingClass.newInstance();
-
- this.transformSpi.setTransform(this);
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Create URI \"" + algorithmURI + "\" class \""
+ + transformSpi.getClass() + "\"");
+ log.log(java.util.logging.Level.FINE, "The NodeList is " + contextNodes);
+ }
- // give it to the current document
- if (contextNodes != null) {
- /*
- while (contextNodes.getLength() > 0) {
- this._constructionElement.appendChild(contextNodes.item(0));
+ // give it to the current document
+ if (contextNodes != null) {
+ for (int i = 0; i < contextNodes.getLength(); i++) {
+ this._constructionElement.appendChild
+ (contextNodes.item(i).cloneNode(true));
}
- */
-
- for (int i = 0; i < contextNodes.getLength(); i++) {
- this._constructionElement.appendChild(contextNodes.item(i).cloneNode(true));
- }
-
- }
- } catch (IllegalAccessException ex) {
- Object exArgs[] = { algorithmURI };
+ }
+ }
- throw new InvalidTransformException(
- "signature.Transform.UnknownTransform", exArgs, ex);
- } catch (InstantiationException ex) {
- Object exArgs[] = { algorithmURI };
+ /**
+ * This constructor can only be called from the {@link Transforms} object,
+ * so it's protected.
+ *
+ * @param element <code>ds:Transform</code> element
+ * @param BaseURI the URI of the resource where the XML instance was stored
+ * @throws InvalidTransformException
+ * @throws TransformationException
+ * @throws XMLSecurityException
+ */
+ public Transform(Element element, String BaseURI)
+ throws InvalidTransformException, TransformationException,
+ XMLSecurityException {
- throw new InvalidTransformException(
- "signature.Transform.UnknownTransform", exArgs, ex);
- }
- }
+ super(element, BaseURI);
- /**
- * This constructor can only be called from the {@link Transforms} object, so
- * it's protected.
- *
- * @param element <code>ds:Transform</code> element
- * @param BaseURI the URI of the resource where the XML instance was stored
- * @throws InvalidTransformException
- * @throws TransformationException
- * @throws XMLSecurityException
- */
- public Transform(Element element, String BaseURI)
- throws InvalidTransformException, TransformationException,
- XMLSecurityException {
+ // retrieve Algorithm Attribute from ds:Transform
+ String algorithmURI = element.getAttributeNS(null, Constants._ATT_ALGORITHM);
- super(element, BaseURI);
-
- // retrieve Algorithm Attribute from ds:Transform
- String AlgorithmURI = element.getAttributeNS(null, Constants._ATT_ALGORITHM);
+ if (algorithmURI == null || algorithmURI.length() == 0) {
+ Object exArgs[] = { Constants._ATT_ALGORITHM,
+ Constants._TAG_TRANSFORM };
+ throw new TransformationException("xml.WrongContent", exArgs);
+ }
- if ((AlgorithmURI == null) || (AlgorithmURI.length() == 0)) {
- Object exArgs[] = { Constants._ATT_ALGORITHM,
- Constants._TAG_TRANSFORM };
-
- throw new TransformationException("xml.WrongContent", exArgs);
- }
-
- try {
- Class implementingClass = (Class) _transformHash.get(AlgorithmURI);
- this.transformSpi =
- (TransformSpi) implementingClass.newInstance();
+ transformSpi = getTransformSpi(algorithmURI);
+ if (transformSpi == null) {
+ Object exArgs[] = { algorithmURI };
+ throw new InvalidTransformException(
+ "signature.Transform.UnknownTransform", exArgs);
+ }
+ }
- this.transformSpi.setTransform(this);
- } catch (IllegalAccessException e) {
- Object exArgs[] = { AlgorithmURI };
-
- throw new InvalidTransformException(
- "signature.Transform.UnknownTransform", exArgs);
- } catch (InstantiationException e) {
- Object exArgs[] = { AlgorithmURI };
-
- throw new InvalidTransformException(
- "signature.Transform.UnknownTransform", exArgs);
- } catch (NullPointerException e) {
- Object exArgs[] = { AlgorithmURI };
+ /**
+ * Generates a Transform object that implements the specified
+ * <code>Transform algorithm</code> URI.
+ *
+ * @param algorithmURI <code>Transform algorithm</code> URI representation,
+ * such as specified in
+ * <a href=http://www.w3.org/TR/xmldsig-core/#sec-TransformAlg>Transform algorithm </a>
+ * @param doc the proxy {@link Document}
+ * @return <code>{@link Transform}</code> object
+ * @throws InvalidTransformException
+ */
+ public static Transform getInstance(
+ Document doc, String algorithmURI) throws InvalidTransformException {
+ return getInstance(doc, algorithmURI, (NodeList) null);
+ }
- throw new InvalidTransformException(
- "signature.Transform.UnknownTransform", exArgs);
- }
- }
-
- /**
- * Generates a Transform object that implements the specified <code>Transform algorithm</code> URI.
- *
- * @param algorithmURI <code>Transform algorithm</code> URI representation, such as specified in <a href=http://www.w3.org/TR/xmldsig-core/#sec-TransformAlg>Transform algorithm </a>
- * @param doc the proxy {@link Document}
- * @return <code>{@link Transform}</code> object
- * @throws InvalidTransformException
- */
- public static final Transform getInstance(
- Document doc, String algorithmURI) throws InvalidTransformException {
- return Transform.getInstance(doc, algorithmURI, (NodeList) null);
- }
+ /**
+ * Generates a Transform object that implements the specified
+ * <code>Transform algorithm</code> URI.
+ *
+ * @param algorithmURI <code>Transform algorithm</code> URI representation,
+ * such as specified in
+ * <a href=http://www.w3.org/TR/xmldsig-core/#sec-TransformAlg>Transform algorithm </a>
+ * @param contextChild the child element of <code>Transform</code> element
+ * @param doc the proxy {@link Document}
+ * @return <code>{@link Transform}</code> object
+ * @throws InvalidTransformException
+ */
+ public static Transform getInstance(
+ Document doc, String algorithmURI, Element contextChild)
+ throws InvalidTransformException {
- /**
- * Generates a Transform object that implements the specified <code>Transform algorithm</code> URI.
- *
- * @param algorithmURI <code>Transform algorithm</code> URI representation, such as specified in <a href=http://www.w3.org/TR/xmldsig-core/#sec-TransformAlg>Transform algorithm </a>
- * @param contextChild the child element of <code>Transform</code> element
- * @param doc the proxy {@link Document}
- * @return <code>{@link Transform}</code> object
- * @throws InvalidTransformException
- */
- public static final Transform getInstance(
- Document doc, String algorithmURI, Element contextChild)
- throws InvalidTransformException {
+ HelperNodeList contextNodes = new HelperNodeList();
- HelperNodeList contextNodes = new HelperNodeList();
+ XMLUtils.addReturnToElement(doc, contextNodes);
+ contextNodes.appendChild(contextChild);
+ XMLUtils.addReturnToElement(doc, contextNodes);
- contextNodes.appendChild(doc.createTextNode("\n"));
- contextNodes.appendChild(contextChild);
- contextNodes.appendChild(doc.createTextNode("\n"));
-
- return Transform.getInstance(doc, algorithmURI, contextNodes);
- }
+ return getInstance(doc, algorithmURI, contextNodes);
+ }
- /**
- * Generates a Transform object that implements the specified <code>Transform algorithm</code> URI.
- *
- * @param algorithmURI <code>Transform algorithm</code> URI form, such as specified in <a href=http://www.w3.org/TR/xmldsig-core/#sec-TransformAlg>Transform algorithm </a>
- * @param contextNodes the child node list of <code>Transform</code> element
- * @param doc the proxy {@link Document}
- * @return <code>{@link Transform}</code> object
- * @throws InvalidTransformException
- */
- public static final Transform getInstance(
- Document doc, String algorithmURI, NodeList contextNodes)
- throws InvalidTransformException {
- return new Transform(doc, algorithmURI, contextNodes);
- }
-
- /**
- * Initalizes for this {@link Transform}
- *
- */
- public static void init() {
+ /**
+ * Generates a Transform object that implements the specified
+ * <code>Transform algorithm</code> URI.
+ *
+ * @param algorithmURI <code>Transform algorithm</code> URI form, such as
+ * specified in <a href=http://www.w3.org/TR/xmldsig-core/#sec-TransformAlg>
+ * Transform algorithm </a>
+ * @param contextNodes the child node list of <code>Transform</code> element
+ * @param doc the proxy {@link Document}
+ * @return <code>{@link Transform}</code> object
+ * @throws InvalidTransformException
+ */
+ public static Transform getInstance(
+ Document doc, String algorithmURI, NodeList contextNodes)
+ throws InvalidTransformException {
+ return new Transform(doc, algorithmURI, contextNodes);
+ }
- if (!_alreadyInitialized) {
- _transformHash = new HashMap(10);
- _alreadyInitialized = true;
- }
- }
+ /**
+ * Initalizes for this {@link Transform}.
+ */
+ public static void init() {
+ if (!alreadyInitialized) {
+ transformClassHash = new HashMap(10);
+ alreadyInitialized = true;
+ }
+ }
- /**
- * Registers implementing class of the Transform algorithm with algorithmURI
- *
- * @param algorithmURI algorithmURI URI representation of <code>Transform algorithm</code>
- * will be specified as parameter of {@link #getInstance(Document, String)}, when generate. </br>
- * @param implementingClass <code>implementingClass</code> the implementing class of {@link TransformSpi}
- * @throws AlgorithmAlreadyRegisteredException if specified algorithmURI is already registered
- */
- public static void register(String algorithmURI, String implementingClass)
- throws AlgorithmAlreadyRegisteredException {
+ /**
+ * Registers implementing class of the Transform algorithm with algorithmURI
+ *
+ * @param algorithmURI algorithmURI URI representation of
+ * <code>Transform algorithm</code> will be specified as parameter of
+ * {@link #getInstance(Document, String)}, when generate. </br>
+ * @param implementingClass <code>implementingClass</code> the implementing
+ * class of {@link TransformSpi}
+ * @throws AlgorithmAlreadyRegisteredException if specified algorithmURI
+ * is already registered
+ */
+ public static void register(String algorithmURI, String implementingClass)
+ throws AlgorithmAlreadyRegisteredException {
- {
-
- // are we already registered?
- Class registeredClass = Transform.getImplementingClass(algorithmURI);
-
- if ((registeredClass != null) ) {
+ // are we already registered?
+ Class registeredClass = getImplementingClass(algorithmURI);
+ if ((registeredClass != null) ) {
Object exArgs[] = { algorithmURI, registeredClass };
-
throw new AlgorithmAlreadyRegisteredException(
"algorithm.alreadyRegistered", exArgs);
- }
+ }
- ClassLoader cl = (ClassLoader) AccessController.doPrivileged(
- new PrivilegedAction() {
- public Object run() {
- return Thread.currentThread().getContextClassLoader();
- }
- });
+ ClassLoader cl = (ClassLoader) AccessController.doPrivileged(
+ new PrivilegedAction() {
+ public Object run() {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
- try {
- Transform._transformHash.put
- (algorithmURI, Class.forName(implementingClass, true, cl));
- } catch (ClassNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- }
+ try {
+ transformClassHash.put
+ (algorithmURI, Class.forName(implementingClass, true, cl));
+ } catch (ClassNotFoundException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ /**
+ * Returns the URI representation of Transformation algorithm
+ *
+ * @return the URI representation of Transformation algorithm
+ */
+ public String getURI() {
+ return this._constructionElement.getAttributeNS
+ (null, Constants._ATT_ALGORITHM);
+ }
- /**
- * Returns the URI representation of Transformation algorithm
- *
- * @return the URI representation of Transformation algorithm
- */
- public final String getURI() {
- return this._constructionElement.getAttributeNS(null, Constants._ATT_ALGORITHM);
- }
+ /**
+ * Transforms the input, and generates {@link XMLSignatureInput} as output.
+ *
+ * @param input input {@link XMLSignatureInput} which can supplied Octet
+ * Stream and NodeSet as Input of Transformation
+ * @return the {@link XMLSignatureInput} class as the result of
+ * transformation
+ * @throws CanonicalizationException
+ * @throws IOException
+ * @throws InvalidCanonicalizerException
+ * @throws TransformationException
+ */
+ public XMLSignatureInput performTransform(XMLSignatureInput input)
+ throws IOException, CanonicalizationException,
+ InvalidCanonicalizerException, TransformationException {
- /**
- * Transforms the input, and generats {@link XMLSignatureInput} as output.
- * @param input input {@link XMLSignatureInput} which can supplied Octect Stream and NodeSet as Input of Transformation
- *
- * @return the {@link XMLSignatureInput} class as the result of transformation
- * @throws CanonicalizationException
- * @throws IOException
- * @throws InvalidCanonicalizerException
- * @throws TransformationException
- */
- public XMLSignatureInput performTransform(XMLSignatureInput input)
- throws IOException, CanonicalizationException,
- InvalidCanonicalizerException, TransformationException {
+ XMLSignatureInput result = null;
- XMLSignatureInput result = null;
+ try {
+ result = transformSpi.enginePerformTransform(input, this);
+ } catch (ParserConfigurationException ex) {
+ Object exArgs[] = { this.getURI(), "ParserConfigurationException" };
+ throw new CanonicalizationException(
+ "signature.Transform.ErrorDuringTransform", exArgs, ex);
+ } catch (SAXException ex) {
+ Object exArgs[] = { this.getURI(), "SAXException" };
+ throw new CanonicalizationException(
+ "signature.Transform.ErrorDuringTransform", exArgs, ex);
+ }
- try {
- result = transformSpi.enginePerformTransform(input);
- } catch (ParserConfigurationException ex) {
- Object exArgs[] = { this.getURI(), "ParserConfigurationException" };
-
- throw new CanonicalizationException(
- "signature.Transform.ErrorDuringTransform", exArgs, ex);
- } catch (SAXException ex) {
- Object exArgs[] = { this.getURI(), "SAXException" };
+ return result;
+ }
- throw new CanonicalizationException(
- "signature.Transform.ErrorDuringTransform", exArgs, ex);
- }
-
- return result;
- }
+ /**
+ * Transforms the input, and generates {@link XMLSignatureInput} as output.
+ *
+ * @param input input {@link XMLSignatureInput} which can supplied Octet
+ * Stream and NodeSet as Input of Transformation
+ * @param os where to output the result of the last transformation
+ * @return the {@link XMLSignatureInput} class as the result of
+ * transformation
+ * @throws CanonicalizationException
+ * @throws IOException
+ * @throws InvalidCanonicalizerException
+ * @throws TransformationException
+ */
+ public XMLSignatureInput performTransform(XMLSignatureInput input,
+ OutputStream os) throws IOException, CanonicalizationException,
+ InvalidCanonicalizerException, TransformationException {
- /**
- * Transforms the input, and generats {@link XMLSignatureInput} as output.
- * @param input input {@link XMLSignatureInput} which can supplied Octect Stream and NodeSet as Input of Transformation
- * @param os where to output the result of the last transformation
- *
- * @return the {@link XMLSignatureInput} class as the result of transformation
- * @throws CanonicalizationException
- * @throws IOException
- * @throws InvalidCanonicalizerException
- * @throws TransformationException
- */
- public XMLSignatureInput performTransform(XMLSignatureInput input, OutputStream os)
- throws IOException, CanonicalizationException,
- InvalidCanonicalizerException, TransformationException {
+ XMLSignatureInput result = null;
- XMLSignatureInput result = null;
+ try {
+ result = transformSpi.enginePerformTransform(input, os, this);
+ } catch (ParserConfigurationException ex) {
+ Object exArgs[] = { this.getURI(), "ParserConfigurationException" };
+ throw new CanonicalizationException(
+ "signature.Transform.ErrorDuringTransform", exArgs, ex);
+ } catch (SAXException ex) {
+ Object exArgs[] = { this.getURI(), "SAXException" };
+ throw new CanonicalizationException(
+ "signature.Transform.ErrorDuringTransform", exArgs, ex);
+ }
- try {
- result = transformSpi.enginePerformTransform(input,os);
- } catch (ParserConfigurationException ex) {
- Object exArgs[] = { this.getURI(), "ParserConfigurationException" };
+ return result;
+ }
- throw new CanonicalizationException(
- "signature.Transform.ErrorDuringTransform", exArgs, ex);
- } catch (SAXException ex) {
- Object exArgs[] = { this.getURI(), "SAXException" };
-
- throw new CanonicalizationException(
- "signature.Transform.ErrorDuringTransform", exArgs, ex);
- }
-
- return result;
- }
+ /**
+ * Method getImplementingClass
+ *
+ * @param URI
+ * @return The name of the class implementing the URI.
+ */
+ private static Class getImplementingClass(String URI) {
+ return (Class) transformClassHash.get(URI);
+ }
- /**
- * Method getImplementingClass
- *
- * @param URI
- * @return The name of the class implementing the URI.
- */
- private static Class getImplementingClass(String URI) {
- return (Class)Transform._transformHash.get(URI);
- }
+ private static TransformSpi getTransformSpi(String URI)
+ throws InvalidTransformException {
+ try {
+ Object value = transformSpiHash.get(URI);
+ if (value != null) {
+ return (TransformSpi) value;
+ }
+ Class cl = (Class) transformClassHash.get(URI);
+ if (cl != null) {
+ TransformSpi tr = (TransformSpi) cl.newInstance();
+ transformSpiHash.put(URI, tr);
+ return tr;
+ }
+ } catch (InstantiationException ex) {
+ Object exArgs[] = { URI };
+ throw new InvalidTransformException(
+ "signature.Transform.UnknownTransform", exArgs, ex);
+ } catch (IllegalAccessException ex) {
+ Object exArgs[] = { URI };
+ throw new InvalidTransformException(
+ "signature.Transform.UnknownTransform", exArgs, ex);
+ }
+ return null;
+ }
-
- /** @inheritDoc */
- public String getBaseLocalName() {
- return Constants._TAG_TRANSFORM;
- }
+ /** @inheritDoc */
+ public String getBaseLocalName() {
+ return Constants._TAG_TRANSFORM;
+ }
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformParam.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformParam.java Wed Jul 05 16:42:37 2017 +0200
@@ -23,7 +23,7 @@
/**
*
- * @author $Author: blautenb $
+ * @author $Author: mullan $
*/
public interface TransformParam {
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformSpi.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformSpi.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -21,11 +20,8 @@
*/
package com.sun.org.apache.xml.internal.security.transforms;
-
-
import java.io.IOException;
import java.io.OutputStream;
-
import javax.xml.parsers.ParserConfigurationException;
import com.sun.org.apache.xml.internal.security.c14n.CanonicalizationException;
@@ -33,68 +29,109 @@
import com.sun.org.apache.xml.internal.security.signature.XMLSignatureInput;
import org.xml.sax.SAXException;
-
/**
* Base class which all Transform algorithms extend. The common methods that
- * have to be overridden are the {@link #enginePerformTransform(XMLSignatureInput)} method.
+ * have to be overridden are the
+ * {@link #enginePerformTransform(XMLSignatureInput, Transform)} method.
*
* @author Christian Geuer-Pollmann
*/
public abstract class TransformSpi {
-
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
- java.util.logging.Logger.getLogger(TransformSpi.class.getName());
-
- protected Transform _transformObject = null;
- protected void setTransform(Transform transform) {
- this._transformObject = transform;
- }
+ /**
+ * For API compatibility not thread safe.
+ * @deprecated
+ */
+ protected Transform _transformObject = null;
+ /**
+ * Set the transform object.
+ * Depeprecated For API compatibility.
+ * @param transform the Transform
+ * @deprecated
+ */
+ protected void setTransform(Transform transform) {
+ this._transformObject = transform;
+ }
+ /**
+ * The mega method which MUST be implemented by the Transformation Algorithm.
+ *
+ * @param input {@link XMLSignatureInput} as the input of transformation
+ * @param os where to output this transformation.
+ * @param _transformObject the Transform
+ * @return {@link XMLSignatureInput} as the result of transformation
+ * @throws CanonicalizationException
+ * @throws IOException
+ * @throws InvalidCanonicalizerException
+ * @throws ParserConfigurationException
+ * @throws SAXException
+ * @throws TransformationException
+ */
+ protected XMLSignatureInput enginePerformTransform(
+ XMLSignatureInput input, OutputStream os, Transform _transformObject)
+ throws IOException,
+ CanonicalizationException, InvalidCanonicalizerException,
+ TransformationException, ParserConfigurationException,
+ SAXException {
+ return enginePerformTransform(input, _transformObject);
+ }
+ /**
+ * The mega method which MUST be implemented by the Transformation Algorithm.
+ * In order to be compatible with preexisting Transform implementations,
+ * by default this implementation invokes the deprecated, thread-unsafe
+ * methods. Subclasses should override this with a thread-safe
+ * implementation.
+ *
+ * @param input {@link XMLSignatureInput} as the input of transformation
+ * @param _transformObject the Transform
+ * @return {@link XMLSignatureInput} as the result of transformation
+ * @throws CanonicalizationException
+ * @throws IOException
+ * @throws InvalidCanonicalizerException
+ * @throws ParserConfigurationException
+ * @throws SAXException
+ * @throws TransformationException
+ */
+ protected XMLSignatureInput enginePerformTransform(
+ XMLSignatureInput input, Transform _transformObject)
+ throws IOException,
+ CanonicalizationException, InvalidCanonicalizerException,
+ TransformationException, ParserConfigurationException,
+ SAXException {
+ //Default implementation overide with a much better
+ try {
+ TransformSpi tmp = (TransformSpi) getClass().newInstance();
+ tmp.setTransform(_transformObject);
+ return tmp.enginePerformTransform(input);
+ } catch (InstantiationException e) {
+ throw new TransformationException("",e);
+ } catch (IllegalAccessException e) {
+ throw new TransformationException("",e);
+ }
+ }
- /**
- * The mega method which MUST be implemented by the Transformation Algorithm.
- *
- * @param input {@link XMLSignatureInput} as the input of transformation
- * @param os where to output this transformation.
- * @return {@link XMLSignatureInput} as the result of transformation
- * @throws CanonicalizationException
- * @throws IOException
- * @throws InvalidCanonicalizerException
- * @throws ParserConfigurationException
- * @throws SAXException
- * @throws TransformationException
- */
- protected XMLSignatureInput enginePerformTransform(
- XMLSignatureInput input, OutputStream os)
- throws IOException,
- CanonicalizationException, InvalidCanonicalizerException,
- TransformationException, ParserConfigurationException,
- SAXException {
- return enginePerformTransform(input);
- }
- /**
- * The mega method which MUST be implemented by the Transformation Algorithm.
- *
- * @param input {@link XMLSignatureInput} as the input of transformation
- * @return {@link XMLSignatureInput} as the result of transformation
- * @throws CanonicalizationException
- * @throws IOException
- * @throws InvalidCanonicalizerException
- * @throws ParserConfigurationException
- * @throws SAXException
- * @throws TransformationException
- */
- protected abstract XMLSignatureInput enginePerformTransform(
- XMLSignatureInput input)
- throws IOException,
- CanonicalizationException, InvalidCanonicalizerException,
- TransformationException, ParserConfigurationException,
- SAXException;
-
- /**
- * Returns the URI representation of <code>Transformation algorithm</code>
- *
- * @return the URI representation of <code>Transformation algorithm</code>
- */
- protected abstract String engineGetURI();
+ /**
+ * The mega method which MUST be implemented by the Transformation Algorithm.
+ * @deprecated
+ * @param input {@link XMLSignatureInput} as the input of transformation
+ * @return {@link XMLSignatureInput} as the result of transformation
+ * @throws CanonicalizationException
+ * @throws IOException
+ * @throws InvalidCanonicalizerException
+ * @throws ParserConfigurationException
+ * @throws SAXException
+ * @throws TransformationException
+ */
+ protected XMLSignatureInput enginePerformTransform(
+ XMLSignatureInput input)
+ throws IOException,
+ CanonicalizationException, InvalidCanonicalizerException,
+ TransformationException, ParserConfigurationException,
+ SAXException {
+ throw new UnsupportedOperationException();
+ }
+ /**
+ * Returns the URI representation of <code>Transformation algorithm</code>
+ *
+ * @return the URI representation of <code>Transformation algorithm</code>
+ */
+ protected abstract String engineGetURI();
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformationException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformationException.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transforms.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transforms.java Wed Jul 05 16:42:37 2017 +0200
@@ -3,7 +3,7 @@
* DO NOT REMOVE OR ALTER!
*/
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2008 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,8 +20,6 @@
*/
package com.sun.org.apache.xml.internal.security.transforms;
-
-
import java.io.IOException;
import java.io.OutputStream;
@@ -39,11 +37,13 @@
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
-
/**
- * Holder of the {@link com.sun.org.apache.xml.internal.security.transforms.Transform} steps to be performed on the data.
- * The input to the first Transform is the result of dereferencing the <code>URI</code> attribute of the <code>Reference</code> element.
- * The output from the last Transform is the input for the <code>DigestMethod algorithm</code>
+ * Holder of the {@link com.sun.org.apache.xml.internal.security.transforms.Transform} steps to
+ * be performed on the data.
+ * The input to the first Transform is the result of dereferencing the
+ * <code>URI</code> attribute of the <code>Reference</code> element.
+ * The output from the last Transform is the input for the
+ * <code>DigestMethod algorithm</code>
*
* @author Christian Geuer-Pollmann
* @see Transform
@@ -51,252 +51,273 @@
*/
public class Transforms extends SignatureElementProxy {
- /** {@link java.util.logging} logging facility */
+ /** {@link java.util.logging} logging facility */
static java.util.logging.Logger log =
java.util.logging.Logger.getLogger(Transforms.class.getName());
- //J-
- /** Canonicalization - Required Canonical XML (omits comments) */
- public static final String TRANSFORM_C14N_OMIT_COMMENTS = Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS;
- /** Canonicalization - Recommended Canonical XML with Comments */
- public static final String TRANSFORM_C14N_WITH_COMMENTS = Canonicalizer.ALGO_ID_C14N_WITH_COMMENTS;
- /** Canonicalization - Required Exclusive Canonicalization (omits comments) */
- public static final String TRANSFORM_C14N_EXCL_OMIT_COMMENTS = Canonicalizer.ALGO_ID_C14N_EXCL_OMIT_COMMENTS;
- /** Canonicalization - Recommended Exclusive Canonicalization with Comments */
- public static final String TRANSFORM_C14N_EXCL_WITH_COMMENTS = Canonicalizer.ALGO_ID_C14N_EXCL_WITH_COMMENTS;
- /** Transform - Optional XSLT */
- public static final String TRANSFORM_XSLT = "http://www.w3.org/TR/1999/REC-xslt-19991116";
- /** Transform - Required base64 decoding */
- public static final String TRANSFORM_BASE64_DECODE = Constants.SignatureSpecNS + "base64";
- /** Transform - Recommended XPath */
- public static final String TRANSFORM_XPATH = "http://www.w3.org/TR/1999/REC-xpath-19991116";
- /** Transform - Required Enveloped Signature */
- public static final String TRANSFORM_ENVELOPED_SIGNATURE = Constants.SignatureSpecNS + "enveloped-signature";
- /** Transform - XPointer */
- public static final String TRANSFORM_XPOINTER = "http://www.w3.org/TR/2001/WD-xptr-20010108";
- /** Transform - XPath Filter v2.0 */
- public static final String TRANSFORM_XPATH2FILTER04 = "http://www.w3.org/2002/04/xmldsig-filter2";
- /** Transform - XPath Filter */
- public static final String TRANSFORM_XPATH2FILTER = "http://www.w3.org/2002/06/xmldsig-filter2";
- /** Transform - XPath Filter CHGP private*/
- public static final String TRANSFORM_XPATHFILTERCHGP = "http://www.nue.et-inf.uni-siegen.de/~geuer-pollmann/#xpathFilter";
- //J+
- Element []transforms;
- /**
- * Consturcts {@link Transforms}
- *
- * @param doc the {@link Document} in which <code>XMLsignature</code> will be placed
- */
- public Transforms(Document doc) {
+ /** Canonicalization - Required Canonical XML (omits comments) */
+ public static final String TRANSFORM_C14N_OMIT_COMMENTS
+ = Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS;
+ /** Canonicalization - Recommended Canonical XML with Comments */
+ public static final String TRANSFORM_C14N_WITH_COMMENTS
+ = Canonicalizer.ALGO_ID_C14N_WITH_COMMENTS;
+ /** Canonicalization - Required Canonical XML 1.1 (omits comments) */
+ public static final String TRANSFORM_C14N11_OMIT_COMMENTS
+ = Canonicalizer.ALGO_ID_C14N11_OMIT_COMMENTS;
+ /** Canonicalization - Recommended Canonical XML 1.1 with Comments */
+ public static final String TRANSFORM_C14N11_WITH_COMMENTS
+ = Canonicalizer.ALGO_ID_C14N11_WITH_COMMENTS;
+ /** Canonicalization - Required Exclusive Canonicalization (omits comments) */
+ public static final String TRANSFORM_C14N_EXCL_OMIT_COMMENTS
+ = Canonicalizer.ALGO_ID_C14N_EXCL_OMIT_COMMENTS;
+ /** Canonicalization - Recommended Exclusive Canonicalization with Comments */
+ public static final String TRANSFORM_C14N_EXCL_WITH_COMMENTS
+ = Canonicalizer.ALGO_ID_C14N_EXCL_WITH_COMMENTS;
+ /** Transform - Optional XSLT */
+ public static final String TRANSFORM_XSLT
+ = "http://www.w3.org/TR/1999/REC-xslt-19991116";
+ /** Transform - Required base64 decoding */
+ public static final String TRANSFORM_BASE64_DECODE
+ = Constants.SignatureSpecNS + "base64";
+ /** Transform - Recommended XPath */
+ public static final String TRANSFORM_XPATH
+ = "http://www.w3.org/TR/1999/REC-xpath-19991116";
+ /** Transform - Required Enveloped Signature */
+ public static final String TRANSFORM_ENVELOPED_SIGNATURE
+ = Constants.SignatureSpecNS + "enveloped-signature";
+ /** Transform - XPointer */
+ public static final String TRANSFORM_XPOINTER
+ = "http://www.w3.org/TR/2001/WD-xptr-20010108";
+ /** Transform - XPath Filter v2.0 */
+ public static final String TRANSFORM_XPATH2FILTER04
+ = "http://www.w3.org/2002/04/xmldsig-filter2";
+ /** Transform - XPath Filter */
+ public static final String TRANSFORM_XPATH2FILTER
+ = "http://www.w3.org/2002/06/xmldsig-filter2";
+ /** Transform - XPath Filter CHGP private */
+ public static final String TRANSFORM_XPATHFILTERCHGP
+ = "http://www.nue.et-inf.uni-siegen.de/~geuer-pollmann/#xpathFilter";
- super(doc);
+ Element []transforms;
- XMLUtils.addReturnToElement(this._constructionElement);
- }
+ protected Transforms() { };
- /**
- * Consturcts {@link Transforms} from {@link Element} which is <code>Transforms</code> Element
- *
- * @param element is <code>Transforms</code> element
- * @param BaseURI the URI where the XML instance was stored
- * @throws DOMException
- * @throws InvalidTransformException
- * @throws TransformationException
- * @throws XMLSecurityException
- * @throws XMLSignatureException
- */
- public Transforms(Element element, String BaseURI)
+ /**
+ * Constructs {@link Transforms}.
+ *
+ * @param doc the {@link Document} in which <code>XMLSignature</code> will
+ * be placed
+ */
+ public Transforms(Document doc) {
+ super(doc);
+ XMLUtils.addReturnToElement(this._constructionElement);
+ }
+
+ /**
+ * Constructs {@link Transforms} from {@link Element} which is
+ * <code>Transforms</code> Element
+ *
+ * @param element is <code>Transforms</code> element
+ * @param BaseURI the URI where the XML instance was stored
+ * @throws DOMException
+ * @throws InvalidTransformException
+ * @throws TransformationException
+ * @throws XMLSecurityException
+ * @throws XMLSignatureException
+ */
+ public Transforms(Element element, String BaseURI)
throws DOMException, XMLSignatureException,
InvalidTransformException, TransformationException,
XMLSecurityException {
- super(element, BaseURI);
+ super(element, BaseURI);
- int numberOfTransformElems = this.getLength();
+ int numberOfTransformElems = this.getLength();
- if (numberOfTransformElems == 0) {
+ if (numberOfTransformElems == 0) {
- // At least ont Transform element must be present. Bad.
- Object exArgs[] = { Constants._TAG_TRANSFORM,
- Constants._TAG_TRANSFORMS };
+ // At least one Transform element must be present. Bad.
+ Object exArgs[] = { Constants._TAG_TRANSFORM,
+ Constants._TAG_TRANSFORMS };
- throw new TransformationException("xml.WrongContent", exArgs);
- }
- }
+ throw new TransformationException("xml.WrongContent", exArgs);
+ }
+ }
- /**
- * Adds the <code>Transform</code> with the specified <code>Transform algorithm URI</code>
- *
- * @param transformURI the URI form of transform that indicates which transformation is applied to data
- * @throws TransformationException
- */
- public void addTransform(String transformURI)
+ /**
+ * Adds the <code>Transform</code> with the specified <code>Transform
+ * algorithm URI</code>
+ *
+ * @param transformURI the URI form of transform that indicates which
+ * transformation is applied to data
+ * @throws TransformationException
+ */
+ public void addTransform(String transformURI)
throws TransformationException {
- try {
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Transforms.addTransform(" + transformURI + ")");
+ try {
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Transforms.addTransform(" + transformURI + ")");
- Transform transform = Transform.getInstance(this._doc, transformURI);
+ Transform transform =
+ Transform.getInstance(this._doc, transformURI);
- this.addTransform(transform);
- } catch (InvalidTransformException ex) {
- throw new TransformationException("empty", ex);
- }
- }
+ this.addTransform(transform);
+ } catch (InvalidTransformException ex) {
+ throw new TransformationException("empty", ex);
+ }
+ }
- /**
- * Adds the <code>Transform</code> with the specified <code>Transform algorithm URI</code>
- *
- * @param transformURI the URI form of transform that indicates which transformation is applied to data
- * @param contextElement
- * @throws TransformationException
- * @see Transform#getInstance(Document doc, String algorithmURI, Element childElement)
- */
- public void addTransform(String transformURI, Element contextElement)
+ /**
+ * Adds the <code>Transform</code> with the specified <code>Transform
+ * algorithm URI</code>
+ *
+ * @param transformURI the URI form of transform that indicates which
+ * transformation is applied to data
+ * @param contextElement
+ * @throws TransformationException
+ * @see Transform#getInstance(Document doc, String algorithmURI, Element childElement)
+ */
+ public void addTransform(String transformURI, Element contextElement)
throws TransformationException {
- try {
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Transforms.addTransform(" + transformURI + ")");
+ try {
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Transforms.addTransform(" + transformURI + ")");
- Transform transform = Transform.getInstance(this._doc, transformURI,
- contextElement);
+ Transform transform =
+ Transform.getInstance(this._doc, transformURI, contextElement);
- this.addTransform(transform);
- } catch (InvalidTransformException ex) {
- throw new TransformationException("empty", ex);
- }
- }
+ this.addTransform(transform);
+ } catch (InvalidTransformException ex) {
+ throw new TransformationException("empty", ex);
+ }
+ }
- /**
- * Adds the <code>Transform</code> with the specified <code>Transform algorithm URI</code>
- *
- * @param transformURI the URI form of transform that indicates which transformation is applied to data
- * @param contextNodes
- * @throws TransformationException
- * @see Transform#getInstance(Document doc, String algorithmURI, NodeList contextNodes)
- */
- public void addTransform(String transformURI, NodeList contextNodes)
+ /**
+ * Adds the <code>Transform</code> with the specified <code>Transform
+ * algorithm URI</code>.
+ *
+ * @param transformURI the URI form of transform that indicates which
+ * transformation is applied to data
+ * @param contextNodes
+ * @throws TransformationException
+ * @see Transform#getInstance(Document doc, String algorithmURI, NodeList contextNodes)
+ */
+ public void addTransform(String transformURI, NodeList contextNodes)
throws TransformationException {
- try {
- Transform transform = Transform.getInstance(this._doc, transformURI,
- contextNodes);
-
- this.addTransform(transform);
- } catch (InvalidTransformException ex) {
- throw new TransformationException("empty", ex);
- }
- }
+ try {
+ Transform transform =
+ Transform.getInstance(this._doc, transformURI, contextNodes);
+ this.addTransform(transform);
+ } catch (InvalidTransformException ex) {
+ throw new TransformationException("empty", ex);
+ }
+ }
- /**
- * Adds a user-provided Transform step.
- *
- * @param transform {@link Transform} object
- */
- private void addTransform(Transform transform) {
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Transforms.addTransform(" + transform.getURI() + ")");
+ /**
+ * Adds a user-provided Transform step.
+ *
+ * @param transform {@link Transform} object
+ */
+ private void addTransform(Transform transform) {
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Transforms.addTransform(" + transform.getURI() + ")");
- Element transformElement = transform.getElement();
+ Element transformElement = transform.getElement();
- this._constructionElement.appendChild(transformElement);
- XMLUtils.addReturnToElement(this._constructionElement);
- }
+ this._constructionElement.appendChild(transformElement);
+ XMLUtils.addReturnToElement(this._constructionElement);
+ }
- /**
- * Applies all included <code>Transform</code>s to xmlSignatureInput and returns the result of these transformations.
- *
- * @param xmlSignatureInput the input for the <code>Transform</code>s
- * @return the result of the <code>Transforms</code>
- * @throws TransformationException
- */
- public XMLSignatureInput performTransforms(
- XMLSignatureInput xmlSignatureInput) throws TransformationException {
- return performTransforms(xmlSignatureInput,null);
- }
+ /**
+ * Applies all included <code>Transform</code>s to xmlSignatureInput and
+ * returns the result of these transformations.
+ *
+ * @param xmlSignatureInput the input for the <code>Transform</code>s
+ * @return the result of the <code>Transforms</code>
+ * @throws TransformationException
+ */
+ public XMLSignatureInput performTransforms(
+ XMLSignatureInput xmlSignatureInput) throws TransformationException {
+ return performTransforms(xmlSignatureInput, null);
+ }
- /**
- * Applies all included <code>Transform</code>s to xmlSignatureInput and returns the result of these transformations.
- *
- * @param xmlSignatureInput the input for the <code>Transform</code>s
- * @param os where to output the last transformation.
- * @return the result of the <code>Transforms</code>
- * @throws TransformationException
- */
+ /**
+ * Applies all included <code>Transform</code>s to xmlSignatureInput and
+ * returns the result of these transformations.
+ *
+ * @param xmlSignatureInput the input for the <code>Transform</code>s
+ * @param os where to output the last transformation.
+ * @return the result of the <code>Transforms</code>
+ * @throws TransformationException
+ */
public XMLSignatureInput performTransforms(
- XMLSignatureInput xmlSignatureInput,OutputStream os) throws TransformationException {
+ XMLSignatureInput xmlSignatureInput, OutputStream os)
+ throws TransformationException {
- try {
- int last=this.getLength()-1;
- for (int i = 0; i < last; i++) {
- Transform t = this.item(i);
- if (true) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Preform the (" + i + ")th " + t.getURI() + " transform");
+ try {
+ int last=this.getLength()-1;
+ for (int i = 0; i < last; i++) {
+ Transform t = this.item(i);
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Perform the (" + i + ")th " + t.getURI()
+ + " transform");
+ }
+ xmlSignatureInput = t.performTransform(xmlSignatureInput);
}
- xmlSignatureInput = t.performTransform(xmlSignatureInput);
- }
- if (last>=0) {
- Transform t = this.item(last);
- xmlSignatureInput = t.performTransform(xmlSignatureInput, os);
- }
-
+ if (last>=0) {
+ Transform t = this.item(last);
+ xmlSignatureInput = t.performTransform(xmlSignatureInput, os);
+ }
- return xmlSignatureInput;
- } catch (IOException ex) {
- throw new TransformationException("empty", ex);
- // } catch (ParserConfigurationException ex) { throw new TransformationException("empty", ex);
- // } catch (SAXException ex) { throw new TransformationException("empty", ex);
- } catch (CanonicalizationException ex) {
- throw new TransformationException("empty", ex);
- } catch (InvalidCanonicalizerException ex) {
- throw new TransformationException("empty", ex);
- }
- }
+ return xmlSignatureInput;
+ } catch (IOException ex) {
+ throw new TransformationException("empty", ex);
+ } catch (CanonicalizationException ex) {
+ throw new TransformationException("empty", ex);
+ } catch (InvalidCanonicalizerException ex) {
+ throw new TransformationException("empty", ex);
+ }
+ }
- /**
- * Return the nonnegative number of transformations.
- *
- * @return the number of transformations
- */
- public int getLength()
- {
- /*Element nscontext = XMLUtils.createDSctx(this._doc, "ds",
- Constants.SignatureSpecNS);
- NodeList transformElems =
- XPathAPI.selectNodeList(this._constructionElement,
- "./ds:Transform", nscontext);
- return transformElems.getLength();*/
- if (transforms==null) {
- transforms=XMLUtils.selectDsNodes(this._constructionElement.getFirstChild(),
- "Transform");
- }
- return transforms.length;
- }
+ /**
+ * Return the nonnegative number of transformations.
+ *
+ * @return the number of transformations
+ */
+ public int getLength()
+ {
+ if (transforms == null) {
+ transforms = XMLUtils.selectDsNodes
+ (this._constructionElement.getFirstChild(), "Transform");
+ }
+ return transforms.length;
+ }
- /**
- * Return the <it>i</it><sup>th</sup> <code>{@link Transform}</code>.
- * Valid <code>i</code> values are 0 to <code>{@link #getLength}-1</code>.
- *
- * @param i index of {@link Transform} to return
- * @return the <it>i</it><sup>th</sup> transforms
- * @throws TransformationException
- */
- public Transform item(int i) throws TransformationException {
+ /**
+ * Return the <it>i</it><sup>th</sup> <code>{@link Transform}</code>.
+ * Valid <code>i</code> values are 0 to <code>{@link #getLength}-1</code>.
+ *
+ * @param i index of {@link Transform} to return
+ * @return the <it>i</it><sup>th</sup> Transform
+ * @throws TransformationException
+ */
+ public Transform item(int i) throws TransformationException {
- try {
- if (transforms==null) {
- transforms=XMLUtils.selectDsNodes(this._constructionElement.getFirstChild(),
- "Transform");
- }
- return new Transform(transforms[i], this._baseURI);
- } catch (XMLSecurityException ex) {
- throw new TransformationException("empty", ex);
- }
- }
+ try {
+ if (transforms == null) {
+ transforms = XMLUtils.selectDsNodes
+ (this._constructionElement.getFirstChild(), "Transform");
+ }
+ return new Transform(transforms[i], this._baseURI);
+ } catch (XMLSecurityException ex) {
+ throw new TransformationException("empty", ex);
+ }
+ }
- /** @inheritDoc */
- public String getBaseLocalName() {
- return Constants._TAG_TRANSFORMS;
- }
+ /** @inheritDoc */
+ public String getBaseLocalName() {
+ return Constants._TAG_TRANSFORMS;
+ }
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/FuncHereContext.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/FuncHereContext.java Wed Jul 05 16:42:37 2017 +0200
@@ -62,7 +62,7 @@
* -scott
* </PRE>
*
- * @author $Author: raul $
+ * @author $Author: mullan $
* @see com.sun.org.apache.xml.internal.security.transforms.implementations.FuncHere
* @see com.sun.org.apache.xml.internal.security.utils.XPathFuncHereAPI
* @see <A HREF="http://www.w3.org/Signature/Drafts/xmldsig-core/Overview.html#function-here">XML Signature - The here() function</A>
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformBase64Decode.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformBase64Decode.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -33,6 +32,7 @@
import com.sun.org.apache.xml.internal.security.c14n.CanonicalizationException;
import com.sun.org.apache.xml.internal.security.exceptions.Base64DecodingException;
import com.sun.org.apache.xml.internal.security.signature.XMLSignatureInput;
+import com.sun.org.apache.xml.internal.security.transforms.Transform;
import com.sun.org.apache.xml.internal.security.transforms.TransformSpi;
import com.sun.org.apache.xml.internal.security.transforms.TransformationException;
import com.sun.org.apache.xml.internal.security.transforms.Transforms;
@@ -43,7 +43,6 @@
import org.w3c.dom.Text;
import org.xml.sax.SAXException;
-
/**
* Implements the <CODE>http://www.w3.org/2000/09/xmldsig#base64</CODE> decoding
* transform.
@@ -95,13 +94,15 @@
* @throws IOException
* @throws TransformationException
*/
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input)
+ protected XMLSignatureInput enginePerformTransform
+ (XMLSignatureInput input, Transform _transformObject)
throws IOException, CanonicalizationException,
TransformationException {
- return enginePerformTransform(input,null);
+ return enginePerformTransform(input, null, _transformObject);
}
+
protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input,
- OutputStream os)
+ OutputStream os, Transform _transformObject)
throws IOException, CanonicalizationException,
TransformationException {
try {
@@ -116,7 +117,7 @@
byte[] decodedBytes = Base64.decode(sb.toString());
return new XMLSignatureInput(decodedBytes);
}
- Base64.decode(sb.toString().getBytes(),os);
+ Base64.decode(sb.toString(),os);
XMLSignatureInput output=new XMLSignatureInput((byte[])null);
output.setOutputStream(os);
return output;
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,17 +20,15 @@
*/
package com.sun.org.apache.xml.internal.security.transforms.implementations;
-
-
import java.io.OutputStream;
import com.sun.org.apache.xml.internal.security.c14n.CanonicalizationException;
import com.sun.org.apache.xml.internal.security.c14n.implementations.Canonicalizer20010315OmitComments;
import com.sun.org.apache.xml.internal.security.signature.XMLSignatureInput;
+import com.sun.org.apache.xml.internal.security.transforms.Transform;
import com.sun.org.apache.xml.internal.security.transforms.TransformSpi;
import com.sun.org.apache.xml.internal.security.transforms.Transforms;
-
/**
* Implements the <CODE>http://www.w3.org/TR/2001/REC-xml-c14n-20010315</CODE>
* transform.
@@ -54,18 +52,19 @@
/**
* @inheritDoc
*/
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input)
+ protected XMLSignatureInput enginePerformTransform
+ (XMLSignatureInput input, Transform _transformObject)
throws CanonicalizationException {
- return enginePerformTransform(input,null);
+ return enginePerformTransform(input, null, _transformObject);
}
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input,OutputStream os)
+
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input,OutputStream os, Transform _transformObject)
throws CanonicalizationException {
Canonicalizer20010315OmitComments c14n = new Canonicalizer20010315OmitComments();
if (os!=null) {
c14n.setWriter(os);
}
byte[] result = null;
- input.setNeedsToBeExpanded(true);
result=c14n.engineCanonicalize(input);
XMLSignatureInput output=new XMLSignatureInput(result);
if (os!=null) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N11.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,65 @@
+/*
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
+ */
+/*
+ * Copyright 2008 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package com.sun.org.apache.xml.internal.security.transforms.implementations;
+
+import java.io.OutputStream;
+
+import com.sun.org.apache.xml.internal.security.c14n.CanonicalizationException;
+import com.sun.org.apache.xml.internal.security.c14n.implementations.Canonicalizer11_OmitComments;
+import com.sun.org.apache.xml.internal.security.signature.XMLSignatureInput;
+import com.sun.org.apache.xml.internal.security.transforms.Transform;
+import com.sun.org.apache.xml.internal.security.transforms.TransformSpi;
+import com.sun.org.apache.xml.internal.security.transforms.Transforms;
+
+/**
+ * Implements the <CODE>http://www.w3.org/2006/12/xml-c14n11</CODE>
+ * (C14N 1.1) transform.
+ *
+ * @author Sean Mullan
+ */
+public class TransformC14N11 extends TransformSpi {
+
+ protected String engineGetURI() {
+ return Transforms.TRANSFORM_C14N11_OMIT_COMMENTS;
+ }
+
+ protected XMLSignatureInput enginePerformTransform
+ (XMLSignatureInput input, Transform transform)
+ throws CanonicalizationException {
+ return enginePerformTransform(input, null, transform);
+ }
+
+ protected XMLSignatureInput enginePerformTransform
+ (XMLSignatureInput input, OutputStream os, Transform transform)
+ throws CanonicalizationException {
+ Canonicalizer11_OmitComments c14n = new Canonicalizer11_OmitComments();
+ if (os != null) {
+ c14n.setWriter(os);
+ }
+ byte[] result = null;
+ result = c14n.engineCanonicalize(input);
+ XMLSignatureInput output = new XMLSignatureInput(result);
+ if (os != null) {
+ output.setOutputStream(os);
+ }
+ return output;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N11_WithComments.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,67 @@
+/*
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
+ */
+/*
+ * Copyright 2008 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package com.sun.org.apache.xml.internal.security.transforms.implementations;
+
+import java.io.OutputStream;
+
+import com.sun.org.apache.xml.internal.security.c14n.CanonicalizationException;
+import com.sun.org.apache.xml.internal.security.c14n.implementations.Canonicalizer11_WithComments;
+import com.sun.org.apache.xml.internal.security.signature.XMLSignatureInput;
+import com.sun.org.apache.xml.internal.security.transforms.Transform;
+import com.sun.org.apache.xml.internal.security.transforms.TransformSpi;
+import com.sun.org.apache.xml.internal.security.transforms.Transforms;
+
+/**
+ * Implements the <CODE>http://www.w3.org/2006/12/xml-c14n-11#WithComments</CODE>
+ * (C14N 1.1 With Comments) transform.
+ *
+ * @author Sean Mullan
+ */
+public class TransformC14N11_WithComments extends TransformSpi {
+
+ protected String engineGetURI() {
+ return Transforms.TRANSFORM_C14N11_WITH_COMMENTS;
+ }
+
+ protected XMLSignatureInput enginePerformTransform
+ (XMLSignatureInput input, Transform transform)
+ throws CanonicalizationException {
+ return enginePerformTransform(input, null, transform);
+ }
+
+ protected XMLSignatureInput enginePerformTransform
+ (XMLSignatureInput input, OutputStream os, Transform transform)
+ throws CanonicalizationException {
+
+ Canonicalizer11_WithComments c14n = new Canonicalizer11_WithComments();
+ if (os != null) {
+ c14n.setWriter(os);
+ }
+
+ byte[] result = null;
+ result = c14n.engineCanonicalize(input);
+ XMLSignatureInput output = new XMLSignatureInput(result);
+ if (os != null) {
+ output.setOutputStream(os);
+ }
+ return output;
+ }
+}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusive.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusive.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,25 +20,24 @@
*/
package com.sun.org.apache.xml.internal.security.transforms.implementations;
-
-
import java.io.OutputStream;
import com.sun.org.apache.xml.internal.security.c14n.CanonicalizationException;
import com.sun.org.apache.xml.internal.security.c14n.implementations.Canonicalizer20010315ExclOmitComments;
import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityException;
import com.sun.org.apache.xml.internal.security.signature.XMLSignatureInput;
+import com.sun.org.apache.xml.internal.security.transforms.Transform;
import com.sun.org.apache.xml.internal.security.transforms.TransformSpi;
import com.sun.org.apache.xml.internal.security.transforms.Transforms;
import com.sun.org.apache.xml.internal.security.transforms.params.InclusiveNamespaces;
import com.sun.org.apache.xml.internal.security.utils.XMLUtils;
import org.w3c.dom.Element;
-
/**
* Class TransformC14NExclusive
*
- * @author $Author: raul $
+ * @author $Author: mullan $
+ * @version $Revision: 1.5 $
*/
public class TransformC14NExclusive extends TransformSpi {
@@ -46,7 +45,6 @@
public static final String implementedTransformURI =
Transforms.TRANSFORM_C14N_EXCL_OMIT_COMMENTS;
-
/**
* Method engineGetURI
*
@@ -63,27 +61,29 @@
* @return the transformed of the input
* @throws CanonicalizationException
*/
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input)
+ protected XMLSignatureInput enginePerformTransform
+ (XMLSignatureInput input, Transform _transformObject)
throws CanonicalizationException {
- return enginePerformTransform(input,null);
+ return enginePerformTransform(input, null, _transformObject);
}
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input,OutputStream os)
+
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input,OutputStream os, Transform _transformObject)
throws CanonicalizationException {
try {
String inclusiveNamespaces = null;
- if (this._transformObject
+ if (_transformObject
.length(InclusiveNamespaces
.ExclusiveCanonicalizationNamespace, InclusiveNamespaces
._TAG_EC_INCLUSIVENAMESPACES) == 1) {
Element inclusiveElement =
XMLUtils.selectNode(
- this._transformObject.getElement().getFirstChild(),
+ _transformObject.getElement().getFirstChild(),
InclusiveNamespaces.ExclusiveCanonicalizationNamespace,
InclusiveNamespaces._TAG_EC_INCLUSIVENAMESPACES,0);
inclusiveNamespaces = new InclusiveNamespaces(inclusiveElement,
- this._transformObject.getBaseURI()).getInclusiveNamespaces();
+ _transformObject.getBaseURI()).getInclusiveNamespaces();
}
Canonicalizer20010315ExclOmitComments c14n =
@@ -92,7 +92,6 @@
c14n.setWriter(os);
}
byte []result;
- input.setNeedsToBeExpanded(true);
result =c14n.engineCanonicalize(input, inclusiveNamespaces);
XMLSignatureInput output=new XMLSignatureInput(result);
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusiveWithComments.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusiveWithComments.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,21 +20,19 @@
*/
package com.sun.org.apache.xml.internal.security.transforms.implementations;
-
-
import java.io.OutputStream;
import com.sun.org.apache.xml.internal.security.c14n.CanonicalizationException;
import com.sun.org.apache.xml.internal.security.c14n.implementations.Canonicalizer20010315ExclWithComments;
import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityException;
import com.sun.org.apache.xml.internal.security.signature.XMLSignatureInput;
+import com.sun.org.apache.xml.internal.security.transforms.Transform;
import com.sun.org.apache.xml.internal.security.transforms.TransformSpi;
import com.sun.org.apache.xml.internal.security.transforms.Transforms;
import com.sun.org.apache.xml.internal.security.transforms.params.InclusiveNamespaces;
import com.sun.org.apache.xml.internal.security.utils.XMLUtils;
import org.w3c.dom.Element;
-
/**
* Implements the <CODE>http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments</CODE>
* transform.
@@ -47,7 +45,6 @@
public static final String implementedTransformURI =
Transforms.TRANSFORM_C14N_EXCL_WITH_COMMENTS;
-
/**
* Method engineGetURI
*@inheritDoc
@@ -60,27 +57,29 @@
/**
* @inheritDoc
*/
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input)
+ protected XMLSignatureInput enginePerformTransform
+ (XMLSignatureInput input, Transform _transformObject)
throws CanonicalizationException {
- return enginePerformTransform(input,null);
+ return enginePerformTransform(input, null, _transformObject);
}
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input,OutputStream os)
+
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input,OutputStream os, Transform _transformObject)
throws CanonicalizationException {
try {
String inclusiveNamespaces = null;
- if (this._transformObject
+ if (_transformObject
.length(InclusiveNamespaces
.ExclusiveCanonicalizationNamespace, InclusiveNamespaces
._TAG_EC_INCLUSIVENAMESPACES) == 1) {
Element inclusiveElement =
XMLUtils.selectNode(
- this._transformObject.getElement().getFirstChild(),
+ _transformObject.getElement().getFirstChild(),
InclusiveNamespaces.ExclusiveCanonicalizationNamespace,
InclusiveNamespaces._TAG_EC_INCLUSIVENAMESPACES,0);
inclusiveNamespaces = new InclusiveNamespaces(inclusiveElement,
- this._transformObject.getBaseURI()).getInclusiveNamespaces();
+ _transformObject.getBaseURI()).getInclusiveNamespaces();
}
Canonicalizer20010315ExclWithComments c14n =
@@ -88,7 +87,6 @@
if (os!=null) {
c14n.setWriter( os);
}
- input.setNeedsToBeExpanded(true);
byte []result;
result =c14n.engineCanonicalize(input, inclusiveNamespaces);
XMLSignatureInput output=new XMLSignatureInput(result);
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NWithComments.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NWithComments.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,17 +20,15 @@
*/
package com.sun.org.apache.xml.internal.security.transforms.implementations;
-
-
import java.io.OutputStream;
import com.sun.org.apache.xml.internal.security.c14n.CanonicalizationException;
import com.sun.org.apache.xml.internal.security.c14n.implementations.Canonicalizer20010315WithComments;
import com.sun.org.apache.xml.internal.security.signature.XMLSignatureInput;
+import com.sun.org.apache.xml.internal.security.transforms.Transform;
import com.sun.org.apache.xml.internal.security.transforms.TransformSpi;
import com.sun.org.apache.xml.internal.security.transforms.Transforms;
-
/**
* Implements the <CODE>http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments</CODE>
* transform.
@@ -43,18 +41,20 @@
public static final String implementedTransformURI =
Transforms.TRANSFORM_C14N_WITH_COMMENTS;
-
/** @inheritDoc */
protected String engineGetURI() {
return implementedTransformURI;
}
+
/** @inheritDoc */
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input)
- throws CanonicalizationException {
- return enginePerformTransform(input,null);
+ protected XMLSignatureInput enginePerformTransform
+ (XMLSignatureInput input, Transform _transformObject)
+ throws CanonicalizationException {
+ return enginePerformTransform(input, null, _transformObject);
}
+
/** @inheritDoc */
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input,OutputStream os)
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input,OutputStream os, Transform _transformObject)
throws CanonicalizationException {
Canonicalizer20010315WithComments c14n = new Canonicalizer20010315WithComments();
@@ -63,7 +63,6 @@
}
byte[] result = null;
- input.setNeedsToBeExpanded(true);
result=c14n.engineCanonicalize(input);
XMLSignatureInput output=new XMLSignatureInput(result);
if (os!=null) {
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformEnvelopedSignature.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformEnvelopedSignature.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,10 +20,9 @@
*/
package com.sun.org.apache.xml.internal.security.transforms.implementations;
-
-
import com.sun.org.apache.xml.internal.security.signature.NodeFilter;
import com.sun.org.apache.xml.internal.security.signature.XMLSignatureInput;
+import com.sun.org.apache.xml.internal.security.transforms.Transform;
import com.sun.org.apache.xml.internal.security.transforms.TransformSpi;
import com.sun.org.apache.xml.internal.security.transforms.TransformationException;
import com.sun.org.apache.xml.internal.security.transforms.Transforms;
@@ -32,7 +31,6 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-
/**
* Implements the <CODE>http://www.w3.org/2000/09/xmldsig#enveloped-signature</CODE>
* transform.
@@ -57,7 +55,7 @@
/**
* @inheritDoc
*/
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input)
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, Transform _transformObject)
throws TransformationException {
@@ -74,14 +72,7 @@
* (including comments) in the node-set representing the octet stream.
*/
- /*
- if (input.isOctetStream()) {
- input.setNodesetXPath(Canonicalizer.XPATH_C14N_WITH_COMMENTS);
- }
- */
-
- Element transformElement = this._transformObject.getElement();
- Node signatureElement = transformElement;
+ Node signatureElement = _transformObject.getElement();
signatureElement = searchSignatureElement(signatureElement);
@@ -124,18 +115,24 @@
}
return signatureElement;
}
- class EnvelopedNodeFilter implements NodeFilter {
+ static class EnvelopedNodeFilter implements NodeFilter {
Node exclude;
EnvelopedNodeFilter(Node n) {
- exclude=n;
+ exclude=n;
}
- /**
- * @see com.sun.org.apache.xml.internal.security.signature.NodeFilter#isNodeInclude(org.w3c.dom.Node)
- */
- public boolean isNodeInclude(Node n) {
- // TODO Optimize me.
- return !XMLUtils.isDescendantOrSelf(exclude,n);
- }
-
+ public int isNodeIncludeDO(Node n, int level) {
+ if ((n==exclude))
+ return -1;
+ return 1;
+ }
+ /**
+ * @see com.sun.org.apache.xml.internal.security.signature.NodeFilter#isNodeInclude(org.w3c.dom.Node)
+ */
+ public int isNodeInclude(Node n) {
+ if ((n==exclude) || XMLUtils.isDescendantOrSelf(exclude,n))
+ return -1;
+ return 1;
+ //return !XMLUtils.isDescendantOrSelf(exclude,n);
+ }
}
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,13 +20,12 @@
*/
package com.sun.org.apache.xml.internal.security.transforms.implementations;
-
-
import javax.xml.transform.TransformerException;
import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityRuntimeException;
import com.sun.org.apache.xml.internal.security.signature.NodeFilter;
import com.sun.org.apache.xml.internal.security.signature.XMLSignatureInput;
+import com.sun.org.apache.xml.internal.security.transforms.Transform;
import com.sun.org.apache.xml.internal.security.transforms.TransformSpi;
import com.sun.org.apache.xml.internal.security.transforms.TransformationException;
import com.sun.org.apache.xml.internal.security.transforms.Transforms;
@@ -40,7 +39,6 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-
/**
* Class TransformXPath
*
@@ -53,15 +51,10 @@
*/
public class TransformXPath extends TransformSpi {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
- java.util.logging.Logger.getLogger(TransformXPath.class.getName());
-
/** Field implementedTransformURI */
public static final String implementedTransformURI =
Transforms.TRANSFORM_XPATH;
-
/**
* Method engineGetURI
*
@@ -78,7 +71,7 @@
*
* @throws TransformationException
*/
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input)
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, Transform _transformObject)
throws TransformationException {
try {
@@ -94,12 +87,12 @@
* The evaluation of this expression includes all of the document's nodes
* (including comments) in the node-set representing the octet stream.
*/
- CachedXPathAPIHolder.setDoc(this._transformObject.getElement().getOwnerDocument());
+ CachedXPathAPIHolder.setDoc(_transformObject.getElement().getOwnerDocument());
Element xpathElement =XMLUtils.selectDsNode(
- this._transformObject.getElement().getFirstChild(),
+ _transformObject.getElement().getFirstChild(),
Constants._TAG_XPATH,0);
if (xpathElement == null) {
@@ -129,42 +122,47 @@
* @return true if needs to be circunvent for bug.
*/
private boolean needsCircunvent(String str) {
- return true;
- //return str.contains("namespace");
-
+ //return true;
+ //return false;
+ return (str.indexOf("namespace") != -1) || (str.indexOf("name()") != -1);
}
- class XPathNodeFilter implements NodeFilter {
- PrefixResolverDefault prefixResolver;
- CachedXPathFuncHereAPI xPathFuncHereAPI =
- new CachedXPathFuncHereAPI(CachedXPathAPIHolder.getCachedXPathAPI());
- ;
+
+ static class XPathNodeFilter implements NodeFilter {
+ PrefixResolverDefault prefixResolver;
+ CachedXPathFuncHereAPI xPathFuncHereAPI =
+ new CachedXPathFuncHereAPI(CachedXPathAPIHolder.getCachedXPathAPI());
Node xpathnode;
String str;
XPathNodeFilter(Element xpathElement,
Node xpathnode, String str) {
- this.xpathnode=xpathnode;
- this.str=str;
- prefixResolver =new PrefixResolverDefault(xpathElement);
+ this.xpathnode=xpathnode;
+ this.str=str;
+ prefixResolver =new PrefixResolverDefault(xpathElement);
}
-
- /**
- * @see com.sun.org.apache.xml.internal.security.signature.NodeFilter#isNodeInclude(org.w3c.dom.Node)
- */
- public boolean isNodeInclude(Node currentNode) {
- XObject includeInResult;
- try {
- includeInResult = xPathFuncHereAPI.eval(currentNode,
- xpathnode, str,prefixResolver);
- return includeInResult.bool();
- } catch (TransformerException e) {
+ /**
+ * @see com.sun.org.apache.xml.internal.security.signature.NodeFilter#isNodeInclude(org.w3c.dom.Node)
+ */
+ public int isNodeInclude(Node currentNode) {
+ XObject includeInResult;
+ try {
+ includeInResult = xPathFuncHereAPI.eval(currentNode,
+ xpathnode, str,prefixResolver);
+ if (includeInResult.bool())
+ return 1;
+ return 0;
+ } catch (TransformerException e) {
Object[] eArgs = {currentNode};
- throw new XMLSecurityRuntimeException("signature.Transform.node", eArgs, e);
- }
- catch (Exception e) {
+ throw new XMLSecurityRuntimeException
+ ("signature.Transform.node", eArgs, e);
+ } catch (Exception e) {
Object[] eArgs = {currentNode, new Short(currentNode.getNodeType())};
- throw new XMLSecurityRuntimeException("signature.Transform.nodeAndType",eArgs, e);
- }
- }
+ throw new XMLSecurityRuntimeException
+ ("signature.Transform.nodeAndType",eArgs, e);
+ }
+ }
+ public int isNodeIncludeDO(Node n, int level) {
+ return isNodeInclude(n);
+ }
}
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath2Filter.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath2Filter.java Wed Jul 05 16:42:37 2017 +0200
@@ -24,7 +24,10 @@
import java.io.IOException;
import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
@@ -34,6 +37,7 @@
import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityException;
import com.sun.org.apache.xml.internal.security.signature.NodeFilter;
import com.sun.org.apache.xml.internal.security.signature.XMLSignatureInput;
+import com.sun.org.apache.xml.internal.security.transforms.Transform;
import com.sun.org.apache.xml.internal.security.transforms.TransformSpi;
import com.sun.org.apache.xml.internal.security.transforms.TransformationException;
import com.sun.org.apache.xml.internal.security.transforms.Transforms;
@@ -88,9 +92,9 @@
*
* @throws TransformationException
*/
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input)
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, Transform _transformObject)
throws TransformationException {
- CachedXPathAPIHolder.setDoc(this._transformObject.getElement().getOwnerDocument());
+ CachedXPathAPIHolder.setDoc(_transformObject.getElement().getOwnerDocument());
try {
List unionNodes=new ArrayList();
List substractNodes=new ArrayList();
@@ -101,7 +105,7 @@
Element []xpathElements =XMLUtils.selectNodes(
- this._transformObject.getElement().getFirstChild(),
+ _transformObject.getElement().getFirstChild(),
XPath2FilterContainer.XPathFilter2NS,
XPath2FilterContainer._TAG_XPATH2);
int noOfSteps = xpathElements.length;
@@ -122,7 +126,7 @@
for (int i = 0; i < noOfSteps; i++) {
Element xpathElement =XMLUtils.selectNode(
- this._transformObject.getElement().getFirstChild(),
+ _transformObject.getElement().getFirstChild(),
XPath2FilterContainer.XPathFilter2NS,
XPath2FilterContainer._TAG_XPATH2,i);
XPath2FilterContainer xpathContainer =
@@ -143,9 +147,9 @@
}
}
- input.setNeedsToBeExpanded(true);
- input.addNodeFilter(new XPath2NodeFilter(unionNodes,substractNodes,intersectNodes));
+ input.addNodeFilter(new XPath2NodeFilter(convertNodeListToSet(unionNodes),
+ convertNodeListToSet(substractNodes),convertNodeListToSet(intersectNodes)));
input.setNodeSet(true);
return input;
} catch (TransformerException ex) {
@@ -166,37 +170,110 @@
throw new TransformationException("empty", ex);
}
}
+ static Set convertNodeListToSet(List l){
+ Set result=new HashSet();
+ for (int j=0;j<l.size();j++) {
+ NodeList rootNodes=(NodeList) l.get(j);
+ int length = rootNodes.getLength();
+
+ for (int i = 0; i < length; i++) {
+ Node rootNode = rootNodes.item(i);
+ result.add(rootNode);
+
+ }
+
+ }
+ return result;
+ }
}
class XPath2NodeFilter implements NodeFilter {
- XPath2NodeFilter(List unionNodes, List substractNodes,
- List intersectNodes) {
+ boolean hasUnionNodes;
+ boolean hasSubstractNodes;
+ boolean hasIntersectNodes;
+ XPath2NodeFilter(Set unionNodes, Set substractNodes,
+ Set intersectNodes) {
this.unionNodes=unionNodes;
+ hasUnionNodes=!unionNodes.isEmpty();
this.substractNodes=substractNodes;
+ hasSubstractNodes=!substractNodes.isEmpty();
this.intersectNodes=intersectNodes;
+ hasIntersectNodes=!intersectNodes.isEmpty();
}
- List unionNodes=new ArrayList();
- List substractNodes=new ArrayList();
- List intersectNodes=new ArrayList();
+ Set unionNodes;
+ Set substractNodes;
+ Set intersectNodes;
/**
* @see com.sun.org.apache.xml.internal.security.signature.NodeFilter#isNodeInclude(org.w3c.dom.Node)
*/
- public boolean isNodeInclude(Node currentNode) {
- boolean notIncluded=false;
- if (rooted(currentNode,substractNodes)) {
- notIncluded=true;
- } else if (!rooted(currentNode,intersectNodes)) {
- notIncluded=true;
- }
- if (notIncluded && rooted(currentNode,unionNodes)) {
- notIncluded=false;
+ public int isNodeInclude(Node currentNode) {
+ int result=1;
+
+ if (hasSubstractNodes && rooted(currentNode, substractNodes)) {
+ result = -1;
+ } else if (hasIntersectNodes && !rooted(currentNode, intersectNodes)) {
+ result = 0;
}
- return !notIncluded;
+ //TODO OPTIMIZE
+ if (result==1)
+ return 1;
+ if (hasUnionNodes) {
+ if (rooted(currentNode, unionNodes)) {
+ return 1;
+ }
+ result=0;
+ }
+ return result;
}
+ int inSubstract=-1;
+ int inIntersect=-1;
+ int inUnion=-1;
+ public int isNodeIncludeDO(Node n, int level) {
+ int result=1;
+ if (hasSubstractNodes) {
+ if ((inSubstract==-1) || (level<=inSubstract)) {
+ if (inList(n, substractNodes)) {
+ inSubstract=level;
+ } else {
+ inSubstract=-1;
+ }
+ }
+ if (inSubstract!=-1){
+ result=-1;
+ }
+ }
+ if (result!=-1){
+ if (hasIntersectNodes) {
+ if ((inIntersect==-1) || (level<=inIntersect)) {
+ if (!inList(n, intersectNodes)) {
+ inIntersect=-1;
+ result=0;
+ } else {
+ inIntersect=level;
+ }
+ }
+ }
+ }
+
+ if (level<=inUnion)
+ inUnion=-1;
+ if (result==1)
+ return 1;
+ if (hasUnionNodes) {
+ if ((inUnion==-1) && inList(n, unionNodes)) {
+ inUnion=level;
+ }
+ if (inUnion!=-1)
+ return 1;
+ result=0;
+ }
+
+ return result;
+ }
/**
* Method rooted
@@ -205,20 +282,28 @@
*
* @return if rooted bye the rootnodes
*/
- boolean rooted(Node currentNode, List nodeList ) {
- for (int j=0;j<nodeList.size();j++) {
- NodeList rootNodes=(NodeList) nodeList.get(j);
- int length = rootNodes.getLength();
-
- for (int i = 0; i < length; i++) {
- Node rootNode = rootNodes.item(i);
-
- if (XMLUtils.isDescendantOrSelf(rootNode,currentNode)) {
- return true;
- }
- }
-
+ static boolean rooted(Node currentNode, Set nodeList ) {
+ if (nodeList.contains(currentNode)) {
+ return true;
+ }
+ Iterator it=nodeList.iterator();
+ while (it.hasNext()) {
+ Node rootNode = (Node) it.next();
+ if (XMLUtils.isDescendantOrSelf(rootNode,currentNode)) {
+ return true;
+ }
}
return false;
}
+
+ /**
+ * Method rooted
+ * @param currentNode
+ * @param nodeList
+ *
+ * @return if rooted bye the rootnodes
+ */
+ static boolean inList(Node currentNode, Set nodeList ) {
+ return nodeList.contains(currentNode);
+ }
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPointer.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPointer.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -25,6 +24,7 @@
import com.sun.org.apache.xml.internal.security.signature.XMLSignatureInput;
+import com.sun.org.apache.xml.internal.security.transforms.Transform;
import com.sun.org.apache.xml.internal.security.transforms.TransformSpi;
import com.sun.org.apache.xml.internal.security.transforms.TransformationException;
import com.sun.org.apache.xml.internal.security.transforms.Transforms;
@@ -56,7 +56,7 @@
* @throws TransformationException
*
*/
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input)
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, Transform _transformObject)
throws TransformationException {
Object exArgs[] = { implementedTransformURI };
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXSLT.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXSLT.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,9 +2,8 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2007 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,14 +20,12 @@
*/
package com.sun.org.apache.xml.internal.security.transforms.implementations;
-
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
+import java.lang.reflect.Method;
-import javax.xml.XMLConstants;
import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerConfigurationException;
@@ -40,13 +37,13 @@
import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityException;
import com.sun.org.apache.xml.internal.security.signature.XMLSignatureInput;
+import com.sun.org.apache.xml.internal.security.transforms.Transform;
import com.sun.org.apache.xml.internal.security.transforms.TransformSpi;
import com.sun.org.apache.xml.internal.security.transforms.TransformationException;
import com.sun.org.apache.xml.internal.security.transforms.Transforms;
import com.sun.org.apache.xml.internal.security.utils.XMLUtils;
import org.w3c.dom.Element;
-
/**
* Class TransformXSLT
*
@@ -65,6 +62,17 @@
static final String defaultXSLTSpecNSprefix = "xslt";
static final String XSLTSTYLESHEET = "stylesheet";
+ // check for secure processing feature
+ private static Class xClass = null;
+ static {
+ try {
+ xClass = Class.forName("javax.xml.XMLConstants");
+ } catch (Exception e) {}
+ }
+
+ static java.util.logging.Logger log =
+ java.util.logging.Logger.getLogger(
+ TransformXSLT.class.getName());
/**
* Method engineGetURI
@@ -83,16 +91,22 @@
* @throws IOException
* @throws TransformationException
*/
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input)
+ protected XMLSignatureInput enginePerformTransform
+ (XMLSignatureInput input, Transform _transformObject)
throws IOException,
TransformationException {
- return enginePerformTransform(input,null);
+ return enginePerformTransform(input, null, _transformObject);
}
- protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input,OutputStream baos)
+
+ protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input,OutputStream baos, Transform _transformObject)
throws IOException,
TransformationException {
+ if (xClass == null) {
+ Object exArgs[] = { "SECURE_PROCESSING_FEATURE not supported" };
+ throw new TransformationException("generic.EmptyMessage", exArgs);
+ }
try {
- Element transformElement = this._transformObject.getElement();
+ Element transformElement = _transformObject.getElement();
Element _xsltElement =
XMLUtils.selectNode(transformElement.getFirstChild(),
@@ -105,8 +119,10 @@
}
TransformerFactory tFactory = TransformerFactory.newInstance();
+ Class c = tFactory.getClass();
+ Method m = c.getMethod("setFeature", new Class[] {String.class, boolean.class});
// Process XSLT stylesheets in a secure manner
- tFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+ m.invoke(tFactory, new Object[] {"http://javax.xml.XMLConstants/feature/secure-processing", Boolean.TRUE});
/*
* This transform requires an octet stream as input. If the actual
@@ -139,12 +155,25 @@
}
Transformer transformer = tFactory.newTransformer(stylesheet);
+
+ // Force Xalan to use \n as line separator on all OSes. This
+ // avoids OS specific signature validation failures due to line
+ // separator differences in the transformed output. Unfortunately,
+ // this is not a standard JAXP property so will not work with non-Xalan
+ // implementations.
+ try {
+ transformer.setOutputProperty
+ ("{http://xml.apache.org/xalan}line-separator", "\n");
+ } catch (Exception e) {
+ log.log(java.util.logging.Level.WARNING, "Unable to set Xalan line-separator property: "
+ + e.getMessage());
+ }
+
if (baos==null) {
- ByteArrayOutputStream baos1 = new ByteArrayOutputStream();
- StreamResult outputTarget = new StreamResult(baos1);
- transformer.transform(xmlSource, outputTarget);
- return new XMLSignatureInput(baos1.toByteArray());
-
+ ByteArrayOutputStream baos1 = new ByteArrayOutputStream();
+ StreamResult outputTarget = new StreamResult(baos1);
+ transformer.transform(xmlSource, outputTarget);
+ return new XMLSignatureInput(baos1.toByteArray());
}
StreamResult outputTarget = new StreamResult(baos);
@@ -164,6 +193,18 @@
Object exArgs[] = { ex.getMessage() };
throw new TransformationException("generic.EmptyMessage", exArgs, ex);
+ } catch (NoSuchMethodException ex) {
+ Object exArgs[] = { ex.getMessage() };
+
+ throw new TransformationException("generic.EmptyMessage", exArgs, ex);
+ } catch (IllegalAccessException ex) {
+ Object exArgs[] = { ex.getMessage() };
+
+ throw new TransformationException("generic.EmptyMessage", exArgs, ex);
+ } catch (java.lang.reflect.InvocationTargetException ex) {
+ Object exArgs[] = { ex.getMessage() };
+
+ throw new TransformationException("generic.EmptyMessage", exArgs, ex);
}
}
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer.java Wed Jul 05 16:42:37 2017 +0200
@@ -26,6 +26,7 @@
import com.sun.org.apache.xml.internal.security.transforms.TransformParam;
import com.sun.org.apache.xml.internal.security.utils.ElementProxy;
import com.sun.org.apache.xml.internal.security.utils.HelperNodeList;
+import com.sun.org.apache.xml.internal.security.utils.XMLUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -36,7 +37,7 @@
* Implements the parameters for the <A
* HREF="http://www.w3.org/TR/xmldsig-filter2/">XPath Filter v2.0</A>.
*
- * @author $Author: raul $
+ * @author $Author: mullan $
* @see <A HREF="http://www.w3.org/TR/xmldsig-filter2/">XPath Filter v2.0 (TR)</A>
* @see <A HREF="http://www.w3.org/Signature/Drafts/xmldsig-xfilter2/">XPath Filter v2.0 (editors copy)</A>
*/
@@ -188,7 +189,7 @@
HelperNodeList nl = new HelperNodeList();
- nl.appendChild(doc.createTextNode("\n"));
+ XMLUtils.addReturnToElement(doc, nl);
for (int i = 0; i < params.length; i++) {
String type = params[i][0];
@@ -207,7 +208,7 @@
XPath2FilterContainer c = new XPath2FilterContainer(doc, xpath, type);
nl.appendChild(c.getElement());
- nl.appendChild(doc.createTextNode("\n"));
+ XMLUtils.addReturnToElement(doc, nl);
}
return nl;
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer04.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer04.java Wed Jul 05 16:42:37 2017 +0200
@@ -25,6 +25,7 @@
import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityException;
import com.sun.org.apache.xml.internal.security.transforms.TransformParam;
import com.sun.org.apache.xml.internal.security.utils.ElementProxy;
+import com.sun.org.apache.xml.internal.security.utils.XMLUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -35,7 +36,7 @@
* Implements the parameters for the <A
* HREF="http://www.w3.org/TR/xmldsig-filter2/">XPath Filter v2.0</A>.
*
- * @author $Author: raul $
+ * @author $Author: mullan $
* @see <A HREF="http://www.w3.org/TR/xmldsig-filter2/">XPath Filter v2.0 (TR)</A>
* @see <A HREF="http://www.w3.org/Signature/Drafts/xmldsig-xfilter2/">XPath Filter v2.0 (editors copy)</A>
*/
@@ -87,8 +88,9 @@
if ((xpath2filter.length() > 2)
&& (!Character.isWhitespace(xpath2filter.charAt(0)))) {
- this._constructionElement.appendChild(doc.createTextNode("\n"
- + xpath2filter + "\n"));
+ XMLUtils.addReturnToElement(this._constructionElement);
+ this._constructionElement.appendChild(doc.createTextNode(xpath2filter));
+ XMLUtils.addReturnToElement(this._constructionElement);
} else {
this._constructionElement
.appendChild(doc.createTextNode(xpath2filter));
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPathFilterCHGPContainer.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPathFilterCHGPContainer.java Wed Jul 05 16:42:37 2017 +0200
@@ -36,7 +36,7 @@
* Implements the parameters for a custom Transform which has a better performance
* thatn the xfilter2.
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class XPathFilterCHGPContainer extends ElementProxy
implements TransformParam {
@@ -104,7 +104,7 @@
includeButSearchElem
.appendChild(this._doc
.createTextNode(indentXPathText(includeButSearch)));
- this._constructionElement.appendChild(doc.createTextNode("\n"));
+ XMLUtils.addReturnToElement(this._constructionElement);
this._constructionElement.appendChild(includeButSearchElem);
}
@@ -118,7 +118,7 @@
excludeButSearchElem
.appendChild(this._doc
.createTextNode(indentXPathText(excludeButSearch)));
- this._constructionElement.appendChild(doc.createTextNode("\n"));
+ XMLUtils.addReturnToElement(this._constructionElement);
this._constructionElement.appendChild(excludeButSearchElem);
}
@@ -129,11 +129,11 @@
excludeElem
.appendChild(this._doc.createTextNode(indentXPathText(exclude)));
- this._constructionElement.appendChild(doc.createTextNode("\n"));
+ XMLUtils.addReturnToElement(this._constructionElement);
this._constructionElement.appendChild(excludeElem);
}
- this._constructionElement.appendChild(doc.createTextNode("\n"));
+ XMLUtils.addReturnToElement(this._constructionElement);
}
/**
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/Base64.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/Base64.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,24 +20,17 @@
*/
package com.sun.org.apache.xml.internal.security.utils;
-
-
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.StringReader;
import java.math.BigInteger;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
import com.sun.org.apache.xml.internal.security.exceptions.Base64DecodingException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.Text;
-import org.xml.sax.InputSource;
/**
@@ -53,17 +46,10 @@
*/
public class Base64 {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
- java.util.logging.Logger.getLogger(Base64.class.getName());
-
/** Field BASE64DEFAULTLENGTH */
public static final int BASE64DEFAULTLENGTH = 76;
- /** Field _base64length */
- static int _base64length = Base64.BASE64DEFAULTLENGTH;
-
private Base64() {
// we don't allow instantiation
}
@@ -79,7 +65,7 @@
* @param bitlen <code>int<code> the desired length in bits of the representation
* @return a byte array with <code>bitlen</code> bits of <code>big</code>
*/
- static byte[] getBytes(BigInteger big, int bitlen) {
+ static final byte[] getBytes(BigInteger big, int bitlen) {
//round bitlen
bitlen = ((bitlen + 7) >> 3) << 3;
@@ -121,7 +107,7 @@
* @param big
* @return String with Base64 encoding
*/
- public static String encode(BigInteger big) {
+ public static final String encode(BigInteger big) {
return encode(getBytes(big, big.bitLength()));
}
@@ -136,7 +122,7 @@
* @param bitlen <code>int<code> the desired length in bits of the representation
* @return a byte array with <code>bitlen</code> bits of <code>big</code>
*/
- public static byte[] encode(BigInteger big, int bitlen) {
+ public static final byte[] encode(BigInteger big, int bitlen) {
//round bitlen
bitlen = ((bitlen + 7) >> 3) << 3;
@@ -179,7 +165,7 @@
* @return the biginter obtained from the node
* @throws Base64DecodingException
*/
- public static BigInteger decodeBigIntegerFromElement(Element element) throws Base64DecodingException
+ public static final BigInteger decodeBigIntegerFromElement(Element element) throws Base64DecodingException
{
return new BigInteger(1, Base64.decode(element));
}
@@ -191,7 +177,7 @@
* @return the biginter obtained from the text node
* @throws Base64DecodingException
*/
- public static BigInteger decodeBigIntegerFromText(Text text) throws Base64DecodingException
+ public static final BigInteger decodeBigIntegerFromText(Text text) throws Base64DecodingException
{
return new BigInteger(1, Base64.decode(text.getData()));
}
@@ -203,7 +189,7 @@
* @param element
* @param biginteger
*/
- public static void fillElementWithBigInteger(Element element,
+ public static final void fillElementWithBigInteger(Element element,
BigInteger biginteger) {
String encodedInt = encode(biginteger);
@@ -229,7 +215,7 @@
* $todo$ not tested yet
* @throws Base64DecodingException
*/
- public static byte[] decode(Element element) throws Base64DecodingException {
+ public static final byte[] decode(Element element) throws Base64DecodingException {
Node sibling = element.getFirstChild();
StringBuffer sb = new StringBuffer();
@@ -255,7 +241,7 @@
* @return an Element with the base64 encoded in the text.
*
*/
- public static Element encodeToElement(Document doc, String localName,
+ public static final Element encodeToElement(Document doc, String localName,
byte[] bytes) {
Element el = XMLUtils.createElementInSignatureSpace(doc, localName);
@@ -275,20 +261,23 @@
* @throws Base64DecodingException
*
*/
- public static byte[] decode(byte[] base64) throws Base64DecodingException {
- return decodeInternal(base64);
+ public final static byte[] decode(byte[] base64) throws Base64DecodingException {
+ return decodeInternal(base64, -1);
}
/**
- * Encode a byte array and fold lines at the standard 76th character.
+ * Encode a byte array and fold lines at the standard 76th character unless
+ * ignore line breaks property is set.
*
* @param binaryData <code>byte[]<code> to be base64 encoded
* @return the <code>String<code> with encoded data
*/
- public static String encode(byte[] binaryData) {
- return encode(binaryData,BASE64DEFAULTLENGTH);
+ public static final String encode(byte[] binaryData) {
+ return XMLUtils.ignoreLineBreaks()
+ ? encode(binaryData, Integer.MAX_VALUE)
+ : encode(binaryData, BASE64DEFAULTLENGTH);
}
/**
@@ -302,7 +291,7 @@
* @throws IOException
* @throws Base64DecodingException
*/
- public static byte[] decode(BufferedReader reader)
+ public final static byte[] decode(BufferedReader reader)
throws IOException, Base64DecodingException {
UnsyncByteArrayOutputStream baos = new UnsyncByteArrayOutputStream();
@@ -317,28 +306,6 @@
return baos.toByteArray();
}
- /**
- * Method main
- *
- *
- * @param args
- *
- * @throws Exception
- */
- public static void main(String[] args) throws Exception {
-
- DocumentBuilderFactory docBuilderFactory =
- DocumentBuilderFactory.newInstance();
- DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
- String testString1 =
- "<container><base64 value=\"Should be 'Hallo'\">SGFsbG8=</base64></container>";
- InputSource inputSource = new InputSource(new StringReader(testString1));
- Document doc = docBuilder.parse(inputSource);
- Element base64Elem =
- (Element) doc.getDocumentElement().getChildNodes().item(0);
-
- System.out.println(new String(decode(base64Elem)));
- }
static private final int BASELENGTH = 255;
static private final int LOOKUPLENGTH = 64;
static private final int TWENTYFOURBITGROUP = 24;
@@ -347,7 +314,6 @@
static private final int FOURBYTE = 4;
static private final int SIGN = -128;
static private final char PAD = '=';
- static private final boolean fDebug = false;
static final private byte [] base64Alphabet = new byte[BASELENGTH];
static final private char [] lookUpBase64Alphabet = new char[LOOKUPLENGTH];
@@ -406,7 +372,7 @@
* @param length <code>int<code> length of wrapped lines; No wrapping if less than 4.
* @return a <code>String</code> with encoded data
*/
- public static String encode(byte[] binaryData,int length) {
+ public static final String encode(byte[] binaryData,int length) {
if (length<4) {
length=Integer.MAX_VALUE;
@@ -434,9 +400,7 @@
int encodedIndex = 0;
int dataIndex = 0;
int i = 0;
- if (fDebug) {
- System.out.println("number of triplets = " + numberTriplets );
- }
+
for (int line = 0; line < numberLines; line++) {
for (int quartet = 0; quartet < 19; quartet++) {
@@ -444,9 +408,6 @@
b2 = binaryData[dataIndex++];
b3 = binaryData[dataIndex++];
- if (fDebug) {
- System.out.println( "b1= " + b1 +", b2= " + b2 + ", b3= " + b3 );
- }
l = (byte)(b2 & 0x0f);
k = (byte)(b1 & 0x03);
@@ -456,11 +417,6 @@
byte val2 = ((b2 & SIGN)==0)?(byte)(b2>>4):(byte)((b2)>>4^0xf0);
byte val3 = ((b3 & SIGN)==0)?(byte)(b3>>6):(byte)((b3)>>6^0xfc);
- if (fDebug) {
- System.out.println( "val2 = " + val2 );
- System.out.println( "k4 = " + (k<<4));
- System.out.println( "vak = " + (val2 | (k<<4)));
- }
encodedData[encodedIndex++] = lookUpBase64Alphabet[ val1 ];
encodedData[encodedIndex++] = lookUpBase64Alphabet[ val2 | ( k<<4 )];
@@ -477,9 +433,6 @@
b2 = binaryData[dataIndex++];
b3 = binaryData[dataIndex++];
- if (fDebug) {
- System.out.println( "b1= " + b1 +", b2= " + b2 + ", b3= " + b3 );
- }
l = (byte)(b2 & 0x0f);
k = (byte)(b1 & 0x03);
@@ -489,11 +442,6 @@
byte val2 = ((b2 & SIGN)==0)?(byte)(b2>>4):(byte)((b2)>>4^0xf0);
byte val3 = ((b3 & SIGN)==0)?(byte)(b3>>6):(byte)((b3)>>6^0xfc);
- if (fDebug) {
- System.out.println( "val2 = " + val2 );
- System.out.println( "k4 = " + (k<<4));
- System.out.println( "vak = " + (val2 | (k<<4)));
- }
encodedData[encodedIndex++] = lookUpBase64Alphabet[ val1 ];
encodedData[encodedIndex++] = lookUpBase64Alphabet[ val2 | ( k<<4 )];
@@ -505,11 +453,7 @@
if (fewerThan24bits == EIGHTBIT) {
b1 = binaryData[dataIndex];
k = (byte) ( b1 &0x03 );
- if (fDebug) {
- System.out.println("b1=" + b1);
- System.out.println("b1<<2 = " + (b1>>2) );
- }
- byte val1 = ((b1 & SIGN)==0)?(byte)(b1>>2):(byte)((b1)>>2^0xc0);
+ byte val1 = ((b1 & SIGN)==0)?(byte)(b1>>2):(byte)((b1)>>2^0xc0);
encodedData[encodedIndex++] = lookUpBase64Alphabet[ val1 ];
encodedData[encodedIndex++] = lookUpBase64Alphabet[ k<<4 ];
encodedData[encodedIndex++] = PAD;
@@ -534,23 +478,38 @@
return new String(encodedData);
}
- /**
- * Decodes Base64 data into octects
- *
- * @param encoded Byte array containing Base64 data
- * @return Array containind decoded data.
- * @throws Base64DecodingException
- */
- public final static byte[] decode(String encoded) throws Base64DecodingException {
+ /**
+ * Decodes Base64 data into octects
+ *
+ * @param encoded String containing base64 encoded data
+ * @return byte array containing the decoded data
+ * @throws Base64DecodingException if there is a problem decoding the data
+ */
+ public final static byte[] decode(String encoded) throws Base64DecodingException {
+
+ if (encoded == null)
+ return null;
+ byte []bytes=new byte[encoded.length()];
+ int len=getBytesInternal(encoded, bytes);
+ return decodeInternal(bytes, len);
+ }
- if (encoded == null)
- return null;
+ protected static final int getBytesInternal(String s,byte[] result) {
+ int length=s.length();
- return decodeInternal(encoded.getBytes());
- }
- protected final static byte[] decodeInternal(byte[] base64Data) throws Base64DecodingException {
+ int newSize=0;
+ for (int i = 0; i < length; i++) {
+ byte dataS=(byte)s.charAt(i);
+ if (!isWhiteSpace(dataS))
+ result[newSize++] = dataS;
+ }
+ return newSize;
+
+ }
+ protected final static byte[] decodeInternal(byte[] base64Data, int len) throws Base64DecodingException {
// remove white spaces
- int len = removeWhiteSpace(base64Data);
+ if (len==-1)
+ len = removeWhiteSpace(base64Data);
if (len%FOURBYTE != 0) {
throw new Base64DecodingException("decoding.divisible.four");
@@ -629,7 +588,20 @@
}
return decodedData;
}
-
+ /**
+ * Decodes Base64 data into outputstream
+ *
+ * @param base64Data String containing Base64 data
+ * @param os the outputstream
+ * @throws IOException
+ * @throws Base64DecodingException
+ */
+ public final static void decode(String base64Data,
+ OutputStream os) throws Base64DecodingException, IOException {
+ byte[] bytes=new byte[base64Data.length()];
+ int len=getBytesInternal(base64Data, bytes);
+ decode(bytes,os,len);
+ }
/**
* Decodes Base64 data into outputstream
*
@@ -640,8 +612,14 @@
*/
public final static void decode(byte[] base64Data,
OutputStream os) throws Base64DecodingException, IOException {
- // remove white spaces
- int len = removeWhiteSpace(base64Data);
+ decode(base64Data,os,-1);
+ }
+ protected final static void decode(byte[] base64Data,
+ OutputStream os,int len) throws Base64DecodingException, IOException {
+
+ // remove white spaces
+ if (len==-1)
+ len = removeWhiteSpace(base64Data);
if (len%FOURBYTE != 0) {
throw new Base64DecodingException("decoding.divisible.four");
@@ -798,7 +776,7 @@
* @param data the byte array of base64 data (with WS)
* @return the new length
*/
- protected static int removeWhiteSpace(byte[] data) {
+ protected static final int removeWhiteSpace(byte[] data) {
if (data == null)
return 0;
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/CachedXPathAPIHolder.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/CachedXPathAPIHolder.java Wed Jul 05 16:42:37 2017 +0200
@@ -23,35 +23,33 @@
import com.sun.org.apache.xpath.internal.CachedXPathAPI;
import org.w3c.dom.Document;
-
/**
* @author Raul Benito
*/
public class CachedXPathAPIHolder {
- static java.util.logging.Logger log =
- java.util.logging.Logger.getLogger(CachedXPathAPIHolder.class.getName());
static ThreadLocal local=new ThreadLocal();
static ThreadLocal localDoc=new ThreadLocal();
- /**
- * Sets the doc for the xpath transformation. Resets the cache if needed
- * @param doc
- */
- public static void setDoc(Document doc) {
- if (localDoc.get()!=doc) {
+ /**
+ * Sets the doc for the xpath transformation. Resets the cache if needed
+ * @param doc
+ */
+ public static void setDoc(Document doc) {
+ if (localDoc.get()!=doc) {
CachedXPathAPI cx=(CachedXPathAPI)local.get();
if (cx==null) {
- cx=new CachedXPathAPI();
- local.set(cx);
- localDoc.set(doc);
- return;
+ cx=new CachedXPathAPI();
+ local.set(cx);
+ localDoc.set(doc);
+ return;
}
//Different docs reset.
cx.getXPathContext().reset();
localDoc.set(doc);
}
- }
+ }
+
/**
* @return the cachexpathapi for this thread
*/
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/CachedXPathFuncHereAPI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/CachedXPathFuncHereAPI.java Wed Jul 05 16:42:37 2017 +0200
@@ -45,7 +45,7 @@
/**
*
- * @author $Author: dims $
+ * @author $Author: mullan $
*/
public class CachedXPathFuncHereAPI {
@@ -291,6 +291,7 @@
.getDocumentElement()
: namespaceNode);
+ // only check if string points to different object (for performance)
if (str!=xpathStr) {
if (str.indexOf("here()")>0) {
_context.reset();
@@ -340,6 +341,7 @@
// XPathContext should be done away with.)
// Create the XPath object.
//String str = CachedXPathFuncHereAPI.getStrFromNode(xpathnode);
+ // only check if string points to different object (for performance)
if (str!=xpathStr) {
if (str.indexOf("here()")>0) {
_context.reset();
@@ -421,7 +423,7 @@
private static void fixupFunctionTable() {
boolean installed = false;
- if (log.isLoggable(java.util.logging.Level.INFO)) log.log(java.util.logging.Level.INFO, "Registering Here function");
+ log.log(java.util.logging.Level.INFO, "Registering Here function");
/**
* Try to register our here() implementation as internal function.
*/
@@ -434,7 +436,7 @@
installed = true;
}
} catch (Throwable t) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Error installing function using the static installFunction method", t);
+ log.log(java.util.logging.Level.FINE, "Error installing function using the static installFunction method", t);
}
if(!installed) {
try {
@@ -445,15 +447,15 @@
installFunction.invoke(_funcTable, params);
installed = true;
} catch (Throwable t) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Error installing function using the static installFunction method", t);
+ log.log(java.util.logging.Level.FINE, "Error installing function using the static installFunction method", t);
}
}
- if (true) {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
if (installed) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Registered class " + FuncHere.class.getName()
+ log.log(java.util.logging.Level.FINE, "Registered class " + FuncHere.class.getName()
+ " for XPath function 'here()' function in internal table");
} else {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Unable to register class " + FuncHere.class.getName()
+ log.log(java.util.logging.Level.FINE, "Unable to register class " + FuncHere.class.getName()
+ " for XPath function 'here()' function in internal table");
}
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/Constants.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/Constants.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,11 +20,8 @@
*/
package com.sun.org.apache.xml.internal.security.utils;
-
-
import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityException;
-
/**
* Provides all constants and some translation functions for i18n.
*
@@ -32,14 +29,10 @@
* <A HREF="http://www.w3.org/TR/xmldsig-core/#sec-TransformAlg">XML
* Signature specification</A>.
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class Constants {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
- java.util.logging.Logger.getLogger(Constants.class.getName());
-
/** Field configurationFile */
public static final String configurationFile = "data/websig.conf";
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/DigesterOutputStream.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/DigesterOutputStream.java Wed Jul 05 16:42:37 2017 +0200
@@ -3,7 +3,7 @@
* DO NOT REMOVE OR ALTER!
*/
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2008 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -29,34 +29,40 @@
*
*/
public class DigesterOutputStream extends ByteArrayOutputStream {
- final static byte none[]="error".getBytes();
final MessageDigestAlgorithm mda;
- /**
- * @param mda
- */
- public DigesterOutputStream(MessageDigestAlgorithm mda) {
+ static java.util.logging.Logger log =
+ java.util.logging.Logger.getLogger
+ (DigesterOutputStream.class.getName());
+
+ /**
+ * @param mda
+ */
+ public DigesterOutputStream(MessageDigestAlgorithm mda) {
this.mda=mda;
- }
+ }
/** @inheritDoc */
- public byte[] toByteArray() {
- return none;
- }
+ public void write(byte[] arg0) {
+ write(arg0, 0, arg0.length);
+ }
- /** @inheritDoc */
- public void write(byte[] arg0) {
- mda.update(arg0);
- }
+ /** @inheritDoc */
+ public void write(int arg0) {
+ mda.update((byte)arg0);
+ }
/** @inheritDoc */
- public void write(int arg0) {
- mda.update((byte)arg0);
+ public void write(byte[] arg0, int arg1, int arg2) {
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Pre-digested input:");
+ StringBuffer sb = new StringBuffer(arg2);
+ for (int i=arg1; i<(arg1+arg2); i++) {
+ sb.append((char) arg0[i]);
+ }
+ log.log(java.util.logging.Level.FINE, sb.toString());
}
-
- /** @inheritDoc */
- public void write(byte[] arg0, int arg1, int arg2) {
- mda.update(arg0, arg1, arg2);
- }
+ mda.update(arg0, arg1, arg2);
+ }
/**
* @return the digest value
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementChecker.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,17 @@
+package com.sun.org.apache.xml.internal.security.utils;
+
+import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityException;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+public interface ElementChecker {
+ /**
+ * Check that the elemnt is the one expect
+ *
+ * @throws XMLSecurityException
+ */
+ public void guaranteeThatElementInCorrectSpace(ElementProxy expected, Element actual)
+ throws XMLSecurityException;
+
+ public boolean isNamespaceElement(Node el, String type, String ns);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementCheckerImpl.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,60 @@
+package com.sun.org.apache.xml.internal.security.utils;
+
+import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityException;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+public abstract class ElementCheckerImpl implements ElementChecker {
+ public boolean isNamespaceElement(Node el, String type, String ns) {
+ if ((el == null) ||
+ ns!=el.getNamespaceURI() || !el.getLocalName().equals(type)){
+ return false;
+ }
+
+ return true;
+ }
+ /** A checker for DOM that interns NS */
+ public static class InternedNsChecker extends ElementCheckerImpl{
+ public void guaranteeThatElementInCorrectSpace(ElementProxy expected,
+ Element actual) throws XMLSecurityException {
+
+ String localnameSHOULDBE = expected.getBaseLocalName();
+ String namespaceSHOULDBE = expected.getBaseNamespace();
+
+ String localnameIS = actual.getLocalName();
+ String namespaceIS = actual.getNamespaceURI();
+ if ((namespaceSHOULDBE!=namespaceIS) ||
+ !localnameSHOULDBE.equals(localnameIS) ) {
+ Object exArgs[] = { namespaceIS +":"+ localnameIS,
+ namespaceSHOULDBE +":"+ localnameSHOULDBE};
+ throw new XMLSecurityException("xml.WrongElement", exArgs);
+ }
+ }
+ }
+
+ /** A checker for DOM that interns NS */
+ public static class FullChecker extends ElementCheckerImpl {
+ public void guaranteeThatElementInCorrectSpace(ElementProxy expected,
+ Element actual) throws XMLSecurityException {
+
+ String localnameSHOULDBE = expected.getBaseLocalName();
+ String namespaceSHOULDBE = expected.getBaseNamespace();
+
+ String localnameIS = actual.getLocalName();
+ String namespaceIS = actual.getNamespaceURI();
+ if ((!namespaceSHOULDBE.equals(namespaceIS)) ||
+ !localnameSHOULDBE.equals(localnameIS) ) {
+ Object exArgs[] = { namespaceIS +":"+ localnameIS,
+ namespaceSHOULDBE +":"+ localnameSHOULDBE};
+ throw new XMLSecurityException("xml.WrongElement", exArgs);
+ }
+ }
+ }
+
+ /** An empty checker if schema checking is used */
+ public static class EmptyChecker extends ElementCheckerImpl {
+ public void guaranteeThatElementInCorrectSpace(ElementProxy expected,
+ Element actual) throws XMLSecurityException {
+ }
+ }
+}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java Wed Jul 05 16:42:37 2017 +0200
@@ -3,7 +3,7 @@
* DO NOT REMOVE OR ALTER!
*/
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2008 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -46,26 +46,6 @@
/** {@link java.util.logging} logging facility */
static java.util.logging.Logger log =
java.util.logging.Logger.getLogger(ElementProxy.class.getName());
- //J-
- /** The element has been created by the code **/
- public static final int MODE_CREATE = 0;
- /** The element has been readed from a DOM tree by the code **/
- public static final int MODE_PROCESS = 1;
- /** The element isn't known if it is readen or created **/
- public static final int MODE_UNKNOWN = 2;
-
- /** The element is going to be signed **/
- public static final int MODE_SIGN = MODE_CREATE;
- /** The element is going to be verified **/
- public static final int MODE_VERIFY = MODE_PROCESS;
-
- /** The element is going to be encrypted **/
- public static final int MODE_ENCRYPT = MODE_CREATE;
- /** The element is going to be decrypted **/
- public static final int MODE_DECRYPT = MODE_PROCESS;
-
- protected int _state = MODE_UNKNOWN;
- //J+
/**
* Returns the namespace of the Elements of the sub-class.
@@ -95,11 +75,6 @@
*
*/
public ElementProxy() {
-
- this._doc = null;
- this._state = ElementProxy.MODE_UNKNOWN;
- this._baseURI = null;
- this._constructionElement = null;
}
/**
@@ -108,18 +83,43 @@
* @param doc
*/
public ElementProxy(Document doc) {
-
- this();
-
if (doc == null) {
throw new RuntimeException("Document is null");
}
this._doc = doc;
- this._state = ElementProxy.MODE_CREATE;
- this._constructionElement = ElementProxy.createElementForFamily(this._doc,
- this.getBaseNamespace(), this.getBaseLocalName());
+ this._constructionElement = createElementForFamilyLocal(this._doc,
+ this.getBaseNamespace(), this.getBaseLocalName());
}
+ protected Element createElementForFamilyLocal(Document doc, String namespace,
+ String localName) {
+ Element result = null;
+ if (namespace == null) {
+ result = doc.createElementNS(null, localName);
+ } else {
+ String baseName=this.getBaseNamespace();
+ String prefix=ElementProxy.getDefaultPrefix(baseName);
+ if ((prefix == null) || (prefix.length() == 0)) {
+ result = doc.createElementNS(namespace, localName);
+
+ result.setAttributeNS(Constants.NamespaceSpecNS, "xmlns",
+ namespace);
+ } else {
+ String tagName=null;
+ String defaultPrefixNaming=ElementProxy.getDefaultPrefixBindings(baseName);
+ StringBuffer sb=new StringBuffer(prefix);
+ sb.append(':');
+ sb.append(localName);
+ tagName=sb.toString();
+ result = doc.createElementNS(namespace, tagName );
+
+ result.setAttributeNS(Constants.NamespaceSpecNS, defaultPrefixNaming,
+ namespace);
+ }
+ }
+ return result;
+}
+
/**
* This method creates an Element in a given namespace with a given localname.
@@ -150,7 +150,7 @@
} else {
result = doc.createElementNS(namespace, prefix + ":" + localName);
- result.setAttributeNS(Constants.NamespaceSpecNS, "xmlns:" + prefix,
+ result.setAttributeNS(Constants.NamespaceSpecNS, ElementProxy.getDefaultPrefixBindings(namespace),
namespace);
}
}
@@ -171,15 +171,12 @@
if (element == null) {
throw new XMLSecurityException("ElementProxy.nullElement");
}
- if (true) {
- }
- if (true) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "setElement(" + element.getTagName() + ", \"" + BaseURI + "\"");
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "setElement(" + element.getTagName() + ", \"" + BaseURI + "\"");
}
this._doc = element.getOwnerDocument();
- this._state = ElementProxy.MODE_PROCESS;
this._constructionElement = element;
this._baseURI = BaseURI;
}
@@ -193,20 +190,16 @@
*/
public ElementProxy(Element element, String BaseURI)
throws XMLSecurityException {
-
- this();
-
if (element == null) {
throw new XMLSecurityException("ElementProxy.nullElement");
}
- if (true) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "setElement(\"" + element.getTagName() + "\", \"" + BaseURI
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "setElement(\"" + element.getTagName() + "\", \"" + BaseURI
+ "\")");
}
this._doc = element.getOwnerDocument();
- this._state = ElementProxy.MODE_PROCESS;
this._constructionElement = element;
this._baseURI = BaseURI;
@@ -256,25 +249,18 @@
return this._baseURI;
}
+ static ElementChecker checker = new ElementCheckerImpl.InternedNsChecker();
+
/**
* Method guaranteeThatElementInCorrectSpace
*
* @throws XMLSecurityException
*/
- public void guaranteeThatElementInCorrectSpace()
+ void guaranteeThatElementInCorrectSpace()
throws XMLSecurityException {
- String localnameSHOULDBE = this.getBaseLocalName();
- String namespaceSHOULDBE = this.getBaseNamespace();
+ checker.guaranteeThatElementInCorrectSpace(this,this._constructionElement);
- String localnameIS = this._constructionElement.getLocalName();
- String namespaceIS = this._constructionElement.getNamespaceURI();
- if ( !localnameSHOULDBE.equals(localnameIS) ||
- !namespaceSHOULDBE.equals(namespaceIS)) {
- Object exArgs[] = { namespaceIS +":"+ localnameIS,
- namespaceSHOULDBE +":"+ localnameSHOULDBE};
- throw new XMLSecurityException("xml.WrongElement", exArgs);
- }
}
/**
@@ -308,7 +294,9 @@
Element e = Base64.encodeToElement(this._doc, localname, bytes);
this._constructionElement.appendChild(e);
- this._constructionElement.appendChild(this._doc.createTextNode("\n"));
+ if (!XMLUtils.ignoreLineBreaks()) {
+ this._constructionElement.appendChild(this._doc.createTextNode("\n"));
+ }
}
}
@@ -336,8 +324,9 @@
public void addBase64Text(byte[] bytes) {
if (bytes != null) {
- Text t = this._doc.createTextNode("\n" + Base64.encode(bytes) + "\n");
-
+ Text t = XMLUtils.ignoreLineBreaks()
+ ? this._doc.createTextNode(Base64.encode(bytes))
+ : this._doc.createTextNode("\n" + Base64.encode(bytes) + "\n");
this._constructionElement.appendChild(t);
}
}
@@ -375,7 +364,7 @@
/**
* Method getBytesFromChildElement
- *
+ * @deprecated
* @param localname
* @param namespace
* @return the bytes
@@ -416,28 +405,24 @@
/**
* Method getBytesFromTextChild
*
- * @return The base64 bytes from the first text child of this element
+ * @return The base64 bytes from the text children of this element
* @throws XMLSecurityException
*/
public byte[] getBytesFromTextChild() throws XMLSecurityException {
-
- Text t = (Text)this._constructionElement.getFirstChild();
-
-
- return Base64.decode(t.getData());
+ return Base64.decode
+ (XMLUtils.getFullTextChildrenFromElement(this._constructionElement));
}
/**
* Method getTextFromTextChild
*
- * @return the Text obtained concatening all the the text nodes of this element
+ * @return the Text obtained by concatenating all the text nodes of this
+ * element
*/
public String getTextFromTextChild() {
return XMLUtils.getFullTextChildrenFromElement(this._constructionElement);
}
-
-
/**
* Method length
*
@@ -451,7 +436,7 @@
while (sibling!=null) {
if (localname.equals(sibling.getLocalName())
&&
- namespace.equals(sibling.getNamespaceURI())) {
+ namespace==sibling.getNamespaceURI() ) {
number++;
}
sibling=sibling.getNextSibling();
@@ -509,39 +494,49 @@
/** Field _prefixMappings */
static HashMap _prefixMappings = new HashMap();
+ static HashMap _prefixMappingsBindings = new HashMap();
- /**
- * Method setDefaultPrefix
- *
- * @param namespace
- * @param prefix
- * @throws XMLSecurityException
- */
- public static void setDefaultPrefix(String namespace, String prefix)
- throws XMLSecurityException {
+ /**
+ * Method setDefaultPrefix
+ *
+ * @param namespace
+ * @param prefix
+ * @throws XMLSecurityException
+ */
+ public static void setDefaultPrefix(String namespace, String prefix)
+ throws XMLSecurityException {
if (ElementProxy._prefixMappings.containsValue(prefix)) {
- Object storedNamespace=ElementProxy._prefixMappings.get(namespace);
- if (!storedNamespace.equals(prefix)) {
+ Object storedNamespace=ElementProxy._prefixMappings.get(namespace);
+ if (!storedNamespace.equals(prefix)) {
Object exArgs[] = { prefix, namespace, storedNamespace };
throw new XMLSecurityException("prefix.AlreadyAssigned", exArgs);
- }
- }
- ElementProxy._prefixMappings.put(namespace, prefix);
+ }
+ }
+ if (Constants.SignatureSpecNS.equals(namespace)) {
+ XMLUtils.dsPrefix=prefix;
+ }
+ ElementProxy._prefixMappings.put(namespace, prefix.intern());
+ if (prefix.length() == 0) {
+ ElementProxy._prefixMappingsBindings.put(namespace, "xmlns");
+ } else {
+ ElementProxy._prefixMappingsBindings.put(namespace, ("xmlns:"+prefix).intern());
+ }
}
- /**
- * Method getDefaultPrefix
- *
- * @param namespace
- * @return the default prefix bind to this element.
- */
- public static String getDefaultPrefix(String namespace) {
+ /**
+ * Method getDefaultPrefix
+ *
+ * @param namespace
+ * @return the default prefix bind to this element.
+ */
+ public static String getDefaultPrefix(String namespace) {
+ return (String) ElementProxy._prefixMappings.get(namespace);
+ }
- String prefix = (String) ElementProxy._prefixMappings.get(namespace);
-
- return prefix;
- }
+ public static String getDefaultPrefixBindings(String namespace) {
+ return (String) ElementProxy._prefixMappingsBindings.get(namespace);
+ }
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionConstants.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionConstants.java Wed Jul 05 16:42:37 2017 +0200
@@ -27,7 +27,7 @@
/**
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class EncryptionConstants {
//J-
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionElementProxy.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionElementProxy.java Wed Jul 05 16:42:37 2017 +0200
@@ -31,7 +31,7 @@
* This is the base object for all objects which map directly to an Element from
* the xenc spec.
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public abstract class EncryptionElementProxy extends ElementProxy {
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/HelperNodeList.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/HelperNodeList.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -21,30 +20,21 @@
*/
package com.sun.org.apache.xml.internal.security.utils;
-
-
import java.util.ArrayList;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-
/**
*
- *
* @author Christian Geuer-Pollmann
*
*/
public class HelperNodeList implements NodeList {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
- java.util.logging.Logger.getLogger(HelperNodeList.class.getName());
-
/** Field nodes */
ArrayList nodes = new ArrayList(20);
-
boolean _allNodesMustHaveSameParent = false;
/**
@@ -70,7 +60,7 @@
*/
public Node item(int index) {
- // if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "item(" + index + ") of " + this.getLength() + " nodes");
+ // log.log(java.util.logging.Level.FINE, "item(" + index + ") of " + this.getLength() + " nodes");
return (Node) nodes.get(index);
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,18 +20,13 @@
*/
package com.sun.org.apache.xml.internal.security.utils;
-
-
import java.text.MessageFormat;
import java.util.Locale;
import java.util.ResourceBundle;
-
/**
* The Internationalization (I18N) pack.
*
- *
- *
* @author Christian Geuer-Pollmann
*/
public class I18n {
@@ -50,8 +45,8 @@
/** Field resourceBundle */
private static ResourceBundle resourceBundle =
- ResourceBundle.getBundle
- (Constants.exceptionMessagesResourceBundleBase, Locale.US);
+ ResourceBundle.getBundle
+ (Constants.exceptionMessagesResourceBundleBase, Locale.US);
/** Field alreadyInitialized */
private static boolean alreadyInitialized = false;
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,18 +20,16 @@
*/
package com.sun.org.apache.xml.internal.security.utils;
-
-
+import java.lang.ref.WeakReference;
+import java.util.Arrays;
+import java.util.WeakHashMap;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
-import java.util.Arrays;
-import java.util.WeakHashMap;
-import java.lang.ref.WeakReference;
-
/**
* Purpose of this class is to enable the XML Parser to keep track of ID
@@ -45,193 +43,242 @@
* ID: We know that all <CODE>@Id</CODE> attributes in an Element from the XML
* Signature namespace are of type <CODE>ID</CODE>.
*
- * @author $Author: raul $
+ * @author $Author: mullan $
* @see <A HREF="http://www.xml.com/lpt/a/2001/11/07/id.html">"Identity Crisis" on xml.com</A>
*/
public class IdResolver {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
+ /** {@link java.util.logging} logging facility */
+ private static java.util.logging.Logger log =
java.util.logging.Logger.getLogger(IdResolver.class.getName());
- static WeakHashMap docMap = new WeakHashMap();
+ private static WeakHashMap docMap = new WeakHashMap();
- /**
- * Constructor IdResolver
- *
- */
- private IdResolver() {
-
- // we don't allow instantiation
- }
+ /**
+ * Constructor IdResolver
+ *
+ */
+ private IdResolver() {
+ // we don't allow instantiation
+ }
- /**
- * Method registerElementById
- *
- * @param element
- * @param idValue
- */
- public static void registerElementById(Element element, String idValue) {
- Document doc = element.getOwnerDocument();
- WeakHashMap elementMap = (WeakHashMap) docMap.get(doc);
- if(elementMap == null) {
- elementMap = new WeakHashMap();
- docMap.put(doc, elementMap);
- }
- elementMap.put(idValue, new WeakReference(element));
- }
+ /**
+ * Method registerElementById
+ *
+ * @param element the element to register
+ * @param idValue the value of the ID attribute
+ */
+ public static void registerElementById(Element element, String idValue) {
+ Document doc = element.getOwnerDocument();
+ WeakHashMap elementMap = (WeakHashMap) docMap.get(doc);
+ if(elementMap == null) {
+ elementMap = new WeakHashMap();
+ docMap.put(doc, elementMap);
+ }
+ elementMap.put(idValue, new WeakReference(element));
+ }
- /**
- * Method registerElementById
- *
- * @param element
- * @param id
- */
- public static void registerElementById(Element element, Attr id) {
- IdResolver.registerElementById(element, id.getNodeValue());
- }
+ /**
+ * Method registerElementById
+ *
+ * @param element the element to register
+ * @param id the ID attribute
+ */
+ public static void registerElementById(Element element, Attr id) {
+ IdResolver.registerElementById(element, id.getNodeValue());
+ }
- /**
- * Method getElementById
- *
- * @param doc
- * @param id
- * @return the element obtained by the Id, or null if it is not found.
- */
- public static Element getElementById(Document doc, String id) {
+ /**
+ * Method getElementById
+ *
+ * @param doc the document
+ * @param id the value of the ID
+ * @return the element obtained by the id, or null if it is not found.
+ */
+ public static Element getElementById(Document doc, String id) {
- Element result = null;
+ Element result = IdResolver.getElementByIdType(doc, id);
- result = IdResolver.getElementByIdType(doc, id);
-
- if (result != null) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE,
+ if (result != null) {
+ log.log(java.util.logging.Level.FINE,
"I could find an Element using the simple getElementByIdType method: "
+ result.getTagName());
- return result;
- }
+ return result;
+ }
- result = IdResolver.getElementByIdUsingDOM(doc, id);
+ result = IdResolver.getElementByIdUsingDOM(doc, id);
- if (result != null) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE,
+ if (result != null) {
+ log.log(java.util.logging.Level.FINE,
"I could find an Element using the simple getElementByIdUsingDOM method: "
+ result.getTagName());
- return result;
- }
- // this must be done so that Xalan can catch ALL namespaces
- //XMLUtils.circumventBug2650(doc);
- result = IdResolver.getElementBySearching(doc, id);
+ return result;
+ }
+ // this must be done so that Xalan can catch ALL namespaces
+ //XMLUtils.circumventBug2650(doc);
+ result = IdResolver.getElementBySearching(doc, id);
- if (result != null) {
- IdResolver.registerElementById(result, id);
+ if (result != null) {
+ IdResolver.registerElementById(result, id);
- return result;
- }
+ return result;
+ }
- return null;
- }
+ return null;
+ }
/**
* Method getElementByIdUsingDOM
*
- * @param doc
- * @param id
- * @return the element obtained by the Id, or null if it is not found.
+ * @param doc the document
+ * @param id the value of the ID
+ * @return the element obtained by the id, or null if it is not found.
*/
private static Element getElementByIdUsingDOM(Document doc, String id) {
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "getElementByIdUsingDOM() Search for ID " + id);
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "getElementByIdUsingDOM() Search for ID " + id);
return doc.getElementById(id);
}
- /**
- * Method getElementByIdType
- *
- * @param doc
- * @param id
- * @return the element obtained by the Id, or null if it is not found.
- */
- private static Element getElementByIdType(Document doc, String id) {
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "getElementByIdType() Search for ID " + id);
- WeakHashMap elementMap = (WeakHashMap) docMap.get(doc);
- if (elementMap != null) {
- WeakReference weakReference = (WeakReference) elementMap.get(id);
- if (weakReference != null)
- {
+ /**
+ * Method getElementByIdType
+ *
+ * @param doc the document
+ * @param id the value of the ID
+ * @return the element obtained by the id, or null if it is not found.
+ */
+ private static Element getElementByIdType(Document doc, String id) {
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "getElementByIdType() Search for ID " + id);
+ WeakHashMap elementMap = (WeakHashMap) docMap.get(doc);
+ if (elementMap != null) {
+ WeakReference weakReference = (WeakReference) elementMap.get(id);
+ if (weakReference != null) {
return (Element) weakReference.get();
- }
- }
- return null;
- }
+ }
+ }
+ return null;
+ }
+
+ private static java.util.List names;
+ private static int namesLength;
+ static {
+ String namespaces[]={
+ Constants.SignatureSpecNS,
+ EncryptionConstants.EncryptionSpecNS,
+ "http://schemas.xmlsoap.org/soap/security/2000-12",
+ "http://www.w3.org/2002/03/xkms#",
+ "urn:oasis:names:tc:SAML:1.0:assertion",
+ "urn:oasis:names:tc:SAML:1.0:protocol"
+ };
+ names = Arrays.asList(namespaces);
+ namesLength = names.size();
+ }
- static java.util.List names;
- static {
- String namespaces[]={ Constants.SignatureSpecNS,
- EncryptionConstants.EncryptionSpecNS,
- "http://schemas.xmlsoap.org/soap/security/2000-12",
- "http://www.w3.org/2002/03/xkms#"
- };
- names=Arrays.asList(namespaces);
- }
+ private static Element getElementBySearching(Node root,String id) {
+ Element []els=new Element[namesLength + 1];
+ getEl(root,id,els);
+ for (int i=0;i<els.length;i++) {
+ if (els[i]!=null) {
+ return els[i];
+ }
+ }
+ return null;
+ }
+
+ private static int getEl(Node currentNode,String id,Element []els) {
+ Node sibling=null;
+ Node parentNode=null;
+ do {
+ switch (currentNode.getNodeType()) {
+ case Node.DOCUMENT_FRAGMENT_NODE :
+ case Node.DOCUMENT_NODE :
+ sibling= currentNode.getFirstChild();
+ break;
- private static Element getElementBySearching(Node root,String id) {
- Element []els=new Element[5];
- getElementBySearching(root,id,els);
- for (int i=0;i<els.length;i++) {
- if (els[i]!=null) {
- return els[i];
- }
- }
- return null;
+ case Node.ELEMENT_NODE :
+ Element currentElement = (Element) currentNode;
+ if (isElement(currentElement, id, els)==1)
+ return 1;
+ sibling= currentNode.getFirstChild();
+ if (sibling==null) {
+ if (parentNode != null) {
+ sibling= currentNode.getNextSibling();
+ }
+ } else {
+ parentNode=currentElement;
+ }
+ break;
+ } while (sibling==null && parentNode!=null) {
+ sibling=parentNode.getNextSibling();
+ parentNode=parentNode.getParentNode();
+ if (!(parentNode instanceof Element)) {
+ parentNode=null;
+ }
+ }
+ if (sibling==null)
+ return 1;
+ currentNode=sibling;
+ sibling=currentNode.getNextSibling();
+ } while(true);
+
+ }
+ public static int isElement(Element el, String id,Element[] els) {
+ if (!el.hasAttributes()) {
+ return 0;
+ }
+ NamedNodeMap ns=el.getAttributes();
+ int elementIndex=names.indexOf(el.getNamespaceURI());
+ elementIndex=(elementIndex<0) ? namesLength : elementIndex;
+ for (int length=ns.getLength(), i=0; i<length; i++) {
+ Attr n=(Attr)ns.item(i);
+ String s=n.getNamespaceURI();
- }
- private static int getElementBySearching(Node root,String id,Element []els) {
- switch (root.getNodeType()) {
- case Node.ELEMENT_NODE:
- Element el=(Element)root;
- if (el.hasAttributes()) {
- int index=names.indexOf(el.getNamespaceURI());
- if (index<0) {
- index=4;
- }
- if (el.getAttribute("Id").equals(id)) {
- els[index]=el;
- if (index==0) {
- return 1;
- }
- } else if ( el.getAttribute("id").equals(id) ) {
- if (index!=2) {
- index=4;
- }
- els[index]=el;
- } else if ( el.getAttribute("ID").equals(id) ) {
- if (index!=3) {
- index=4;
- }
- els[index]=el;
- } else if ((index==3)&&(
- el.getAttribute("OriginalRequestID").equals(id) ||
- el.getAttribute("RequestID").equals(id) ||
- el.getAttribute("ResponseID" ).equals(id))) {
- els[3]=el;
- }
- }
- case Node.DOCUMENT_NODE:
- Node sibling=root.getFirstChild();
- while (sibling!=null) {
- if (getElementBySearching(sibling,id,els)==1)
+ int index=s==null ? elementIndex : names.indexOf(n.getNamespaceURI());
+ index=(index<0) ? namesLength : index;
+ String name=n.getLocalName();
+ if (name.length()>2)
+ continue;
+ String value=n.getNodeValue();
+ if (name.charAt(0)=='I') {
+ char ch=name.charAt(1);
+ if (ch=='d' && value.equals(id)) {
+ els[index]=el;
+ if (index==0) {
return 1;
- sibling=sibling.getNextSibling();
+ }
+ } else if (ch=='D' &&value.endsWith(id)) {
+ if (index!=3) {
+ index=namesLength;
+ }
+ els[index]=el;
+ }
+ } else if ( "id".equals(name) && value.equals(id) ) {
+ if (index!=2) {
+ index=namesLength;
}
- }
- return 0;
- }
-
+ els[index]=el;
+ }
+ }
+ //For an element namespace search for importants
+ if ((elementIndex==3)&&(
+ el.getAttribute("OriginalRequestID").equals(id) ||
+ el.getAttribute("RequestID").equals(id) ||
+ el.getAttribute("ResponseID").equals(id))) {
+ els[3]=el;
+ } else if ((elementIndex==4)&&(
+ el.getAttribute("AssertionID").equals(id))) {
+ els[4]=el;
+ } else if ((elementIndex==5)&&(
+ el.getAttribute("RequestID").equals(id) ||
+ el.getAttribute("ResponseID").equals(id))) {
+ els[5]=el;
+ }
+ return 0;
+ }
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/JavaUtils.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/JavaUtils.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,8 +20,6 @@
*/
package com.sun.org.apache.xml.internal.security.utils;
-
-
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -29,99 +27,105 @@
import java.io.IOException;
import java.io.InputStream;
-
/**
* A collection of different, general-purpose methods for JAVA-specific things
* @author Christian Geuer-Pollmann
- *
*/
public class JavaUtils {
- /** {@link java.util.logging} logging facility */
+ /** {@link java.util.logging} logging facility */
static java.util.logging.Logger log =
java.util.logging.Logger.getLogger(JavaUtils.class.getName());
- private JavaUtils() {
- // we don't allow instantiation
- }
- /**
- * Method getBytesFromFile
- *
- * @param fileName
- * @return the bytes readed from the file
- *
- * @throws FileNotFoundException
- * @throws IOException
- */
- public static byte[] getBytesFromFile(String fileName)
- throws FileNotFoundException, IOException {
+ private JavaUtils() {
+ // we don't allow instantiation
+ }
- byte refBytes[] = null;
+ /**
+ * Method getBytesFromFile
+ *
+ * @param fileName
+ * @return the bytes readed from the file
+ *
+ * @throws FileNotFoundException
+ * @throws IOException
+ */
+ public static byte[] getBytesFromFile(String fileName)
+ throws FileNotFoundException, IOException {
+
+ byte refBytes[] = null;
- {
- FileInputStream fisRef = new FileInputStream(fileName);
- UnsyncByteArrayOutputStream baos = new UnsyncByteArrayOutputStream();
- byte buf[] = new byte[1024];
- int len;
+ FileInputStream fisRef = new FileInputStream(fileName);
+ try {
+ UnsyncByteArrayOutputStream baos = new UnsyncByteArrayOutputStream();
+ byte buf[] = new byte[1024];
+ int len;
- while ((len = fisRef.read(buf)) > 0) {
- baos.write(buf, 0, len);
- }
+ while ((len = fisRef.read(buf)) > 0) {
+ baos.write(buf, 0, len);
+ }
- refBytes = baos.toByteArray();
- }
+ refBytes = baos.toByteArray();
+ } finally {
+ fisRef.close();
+ }
- return refBytes;
- }
+ return refBytes;
+ }
- /**
- * Method writeBytesToFilename
- *
- * @param filename
- * @param bytes
- */
- public static void writeBytesToFilename(String filename, byte[] bytes) {
+ /**
+ * Method writeBytesToFilename
+ *
+ * @param filename
+ * @param bytes
+ */
+ public static void writeBytesToFilename(String filename, byte[] bytes) {
- try {
- if (filename != null && bytes != null) {
- File f = new File(filename);
+ FileOutputStream fos = null;
+ try {
+ if (filename != null && bytes != null) {
+ File f = new File(filename);
- FileOutputStream fos = new FileOutputStream(f);
+ fos = new FileOutputStream(f);
- fos.write(bytes);
- fos.close();
- } else {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "writeBytesToFilename got null byte[] pointed");
- }
- } catch (Exception ex) {}
- }
+ fos.write(bytes);
+ fos.close();
+ } else {
+ log.log(java.util.logging.Level.FINE, "writeBytesToFilename got null byte[] pointed");
+ }
+ } catch (IOException ex) {
+ if (fos != null) {
+ try {
+ fos.close();
+ } catch (IOException ioe) {}
+ }
+ }
+ }
- /**
- * This method reads all bytes from the given InputStream till EOF and returns
- * them as a byte array.
- *
- * @param inputStream
- * @return the bytes readed from the stream
- *
- * @throws FileNotFoundException
- * @throws IOException
- */
- public static byte[] getBytesFromStream(InputStream inputStream) throws IOException {
-
- byte refBytes[] = null;
+ /**
+ * This method reads all bytes from the given InputStream till EOF and
+ * returns them as a byte array.
+ *
+ * @param inputStream
+ * @return the bytes readed from the stream
+ *
+ * @throws FileNotFoundException
+ * @throws IOException
+ */
+ public static byte[] getBytesFromStream(InputStream inputStream)
+ throws IOException {
- {
- UnsyncByteArrayOutputStream baos = new UnsyncByteArrayOutputStream();
- byte buf[] = new byte[1024];
- int len;
+ byte refBytes[] = null;
- while ((len = inputStream.read(buf)) > 0) {
+ UnsyncByteArrayOutputStream baos = new UnsyncByteArrayOutputStream();
+ byte buf[] = new byte[1024];
+ int len;
+
+ while ((len = inputStream.read(buf)) > 0) {
baos.write(buf, 0, len);
- }
+ }
- refBytes = baos.toByteArray();
- }
-
- return refBytes;
- }
+ refBytes = baos.toByteArray();
+ return refBytes;
+ }
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/RFC2253Parser.java Wed Jul 05 16:42:37 2017 +0200
@@ -28,7 +28,7 @@
/**
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class RFC2253Parser {
@@ -158,7 +158,13 @@
return str;
}
String attrType = normalizeAT(str.substring(0, i));
- String attrValue = normalizeV(str.substring(i + 1));
+ // only normalize if value is a String
+ String attrValue = null;
+ if (attrType.charAt(0) >= '0' && attrType.charAt(0) <= '9') {
+ attrValue = str.substring(i + 1);
+ } else {
+ attrValue = normalizeV(str.substring(i + 1));
+ }
return attrType + "=" + attrValue;
@@ -474,7 +480,7 @@
static String trim(String str) {
String trimed = str.trim();
- int i = str.indexOf(trimed.substring(0)) + trimed.length();
+ int i = str.indexOf(trimed) + trimed.length();
if ((str.length() > i) && trimed.endsWith("\\")
&&!trimed.endsWith("\\\\")) {
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/SignatureElementProxy.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/SignatureElementProxy.java Wed Jul 05 16:42:37 2017 +0200
@@ -30,19 +30,25 @@
/**
* Class SignatureElementProxy
*
- * @author $Author: raul $
+ * @author $Author: mullan $
+ * @version $Revision: 1.5 $
*/
public abstract class SignatureElementProxy extends ElementProxy {
-
+ protected SignatureElementProxy() {
+ };
/**
* Constructor SignatureElementProxy
*
* @param doc
*/
public SignatureElementProxy(Document doc) {
- super(doc);
- //this._constructionElement.setAttributeNS(Constants.NamespaceSpecNS,"xmlns:ds",
- // Constants.SignatureSpecNS);
+ if (doc == null) {
+ throw new RuntimeException("Document is null");
+ }
+
+ this._doc = doc;
+ this._constructionElement = XMLUtils.createElementInSignatureSpace(this._doc,
+ this.getBaseLocalName());
}
/**
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/SignerOutputStream.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/SignerOutputStream.java Wed Jul 05 16:42:37 2017 +0200
@@ -3,7 +3,7 @@
* DO NOT REMOVE OR ALTER!
*/
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2008 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -30,8 +30,11 @@
*
*/
public class SignerOutputStream extends ByteArrayOutputStream {
- final static byte none[]="error".getBytes();
final SignatureAlgorithm sa;
+ static java.util.logging.Logger log =
+ java.util.logging.Logger.getLogger
+ (SignerOutputStream.class.getName());
+
/**
* @param sa
*/
@@ -40,21 +43,18 @@
}
/** @inheritDoc */
- public byte[] toByteArray() {
- return none;
- }
-
- /** @inheritDoc */
public void write(byte[] arg0) {
+ super.write(arg0, 0, arg0.length);
try {
- sa.update(arg0);
- } catch (XMLSignatureException e) {
+ sa.update(arg0);
+ } catch (XMLSignatureException e) {
throw new RuntimeException(""+e);
- }
+ }
}
/** @inheritDoc */
public void write(int arg0) {
+ super.write(arg0);
try {
sa.update((byte)arg0);
} catch (XMLSignatureException e) {
@@ -64,12 +64,19 @@
/** @inheritDoc */
public void write(byte[] arg0, int arg1, int arg2) {
+ super.write(arg0, arg1, arg2);
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+ log.log(java.util.logging.Level.FINE, "Canonicalized SignedInfo:");
+ StringBuffer sb = new StringBuffer(arg2);
+ for (int i=arg1; i<(arg1+arg2); i++) {
+ sb.append((char) arg0[i]);
+ }
+ log.log(java.util.logging.Level.FINE, sb.toString());
+ }
try {
sa.update(arg0,arg1,arg2);
} catch (XMLSignatureException e) {
throw new RuntimeException(""+e);
}
}
-
-
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncBufferedOutputStream.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncBufferedOutputStream.java Wed Jul 05 16:42:37 2017 +0200
@@ -30,14 +30,21 @@
*/
public class UnsyncBufferedOutputStream extends OutputStream {
final OutputStream out;
+
+ final byte[] buf;
static final int size=8*1024;
- final byte[] buf=new byte[size];
+ private static ThreadLocal bufCahce = new ThreadLocal() {
+ protected synchronized Object initialValue() {
+ return new byte[size];
+ }
+ };
int pointer=0;
/**
* Creates a buffered output stream without synchronization
* @param out the outputstream to buffer
*/
public UnsyncBufferedOutputStream(OutputStream out) {
+ buf=(byte[])bufCahce.get();
this.out=out;
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,17 +20,25 @@
*/
package com.sun.org.apache.xml.internal.security.utils;
-import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
/**
* A simple Unsynced ByteArryOutputStream
* @author raul
*
*/
-public class UnsyncByteArrayOutputStream extends ByteArrayOutputStream {
- int size=4*1024;
- byte []buf=new byte[size];
- int pos;
+public class UnsyncByteArrayOutputStream extends OutputStream {
+ private static ThreadLocal bufCahce = new ThreadLocal() {
+ protected synchronized Object initialValue() {
+ return new byte[8*1024];
+ }
+ };
+ byte[] buf;
+ int size=8*1024;//buf.length;
+ int pos=0;
+ public UnsyncByteArrayOutputStream() {
+ buf=(byte[])bufCahce.get();
+ }
/** @inheritDoc */
public void write(byte[] arg0) {
int newPos=pos+arg0.length;
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -25,8 +24,12 @@
import java.io.IOException;
import java.io.OutputStream;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.Map;
import java.util.Set;
import com.sun.org.apache.xml.internal.security.c14n.CanonicalizationException;
@@ -49,6 +52,14 @@
*/
public class XMLUtils {
+ private static boolean ignoreLineBreaks =
+ AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
+ public Boolean run() {
+ return Boolean.getBoolean
+ ("com.sun.org.apache.xml.internal.security.ignoreLineBreaks");
+ }
+ });
+
/**
* Constructor XMLUtils
*
@@ -57,7 +68,13 @@
// we don't allow instantiation
}
+ public static Element getNextElement(Node el) {
+ while ((el!=null) && (el.getNodeType()!=Node.ELEMENT_NODE)) {
+ el=el.getNextSibling();
+ }
+ return (Element)el;
+ }
/**
* @param rootNode
@@ -212,6 +229,8 @@
}
+ static String dsPrefix=null;
+ static Map namePrefixes=new HashMap();
/**
* Creates an Element in the XML Signature specification namespace.
*
@@ -226,28 +245,20 @@
throw new RuntimeException("Document is null");
}
- String ds = Constants.getSignatureSpecNSprefix();
-
- if ((ds == null) || (ds.length() == 0)) {
- Element element = doc.createElementNS(Constants.SignatureSpecNS,
- elementName);
-
- element.setAttributeNS(Constants.NamespaceSpecNS, "xmlns",
- Constants.SignatureSpecNS);
-
- return element;
+ if ((dsPrefix == null) || (dsPrefix.length() == 0)) {
+ return doc.createElementNS(Constants.SignatureSpecNS, elementName);
}
- Element element = doc.createElementNS(Constants.SignatureSpecNS,
- ds + ":" + elementName);
-
- element.setAttributeNS(Constants.NamespaceSpecNS, "xmlns:" + ds,
- Constants.SignatureSpecNS);
-
- return element;
-
+ String namePrefix=(String) namePrefixes.get(elementName);
+ if (namePrefix==null) {
+ StringBuffer tag=new StringBuffer(dsPrefix);
+ tag.append(':');
+ tag.append(elementName);
+ namePrefix=tag.toString();
+ namePrefixes.put(elementName,namePrefix);
+ }
+ return doc.createElementNS(Constants.SignatureSpecNS, namePrefix);
}
-
/**
* Returns true if the element is in XML Signature namespace and the local
* name equals the supplied one.
@@ -258,17 +269,7 @@
*/
public static boolean elementIsInSignatureSpace(Element element,
String localName) {
-
- if ((element == null) ||
- !Constants.SignatureSpecNS.equals(element.getNamespaceURI()) ){
- return false;
- }
-
- if (!element.getLocalName().equals(localName)) {
- return false;
- }
-
- return true;
+ return ElementProxy.checker.isNamespaceElement(element, localName, Constants.SignatureSpecNS);
}
/**
@@ -281,18 +282,7 @@
*/
public static boolean elementIsInEncryptionSpace(Element element,
String localName) {
-
- if ((element == null) ||
- !EncryptionConstants.EncryptionSpecNS.equals(element.getNamespaceURI())
- ){
- return false;
- }
-
- if (!element.getLocalName().equals(localName)) {
- return false;
- }
-
- return true;
+ return ElementProxy.checker.isNamespaceElement(element, localName, EncryptionConstants.EncryptionSpecNS);
}
/**
@@ -352,32 +342,28 @@
+ (npe == null ? "" : npe.getMessage()) + "\"");
}
-
-
- /**
- * Method createDSctx
- *
- * @param doc
- * @param prefix
- * @param namespace
- * @return the element.
- */
- public static Element createDSctx(Document doc, String prefix,
- String namespace) {
+ /**
+ * Method createDSctx
+ *
+ * @param doc
+ * @param prefix
+ * @param namespace
+ * @return the element.
+ */
+ public static Element createDSctx(Document doc, String prefix,
+ String namespace) {
- if ((prefix == null) || (prefix.trim().length() == 0)) {
- throw new IllegalArgumentException("You must supply a prefix");
- }
+ if ((prefix == null) || (prefix.trim().length() == 0)) {
+ throw new IllegalArgumentException("You must supply a prefix");
+ }
- Element ctx = doc.createElementNS(null, "namespaceContext");
+ Element ctx = doc.createElementNS(null, "namespaceContext");
- ctx.setAttributeNS(Constants.NamespaceSpecNS, "xmlns:" + prefix.trim(),
- namespace);
+ ctx.setAttributeNS(Constants.NamespaceSpecNS, "xmlns:" + prefix.trim(),
+ namespace);
- return ctx;
- }
-
-
+ return ctx;
+ }
/**
* Method addReturnToElement
@@ -386,9 +372,23 @@
*/
public static void addReturnToElement(Element e) {
- Document doc = e.getOwnerDocument();
+ if (!ignoreLineBreaks) {
+ Document doc = e.getOwnerDocument();
+ e.appendChild(doc.createTextNode("\n"));
+ }
+ }
- e.appendChild(doc.createTextNode("\n"));
+ public static void addReturnToElement(Document doc, HelperNodeList nl) {
+ if (!ignoreLineBreaks) {
+ nl.appendChild(doc.createTextNode("\n"));
+ }
+ }
+
+ public static void addReturnBeforeChild(Element e, Node child) {
+ if (!ignoreLineBreaks) {
+ Document doc = e.getOwnerDocument();
+ e.insertBefore(doc.createTextNode("\n"), child);
+ }
}
/**
@@ -470,7 +470,7 @@
for (int i = 0; i < attributesLength; i++) {
Attr currentAttr = (Attr) attributes.item(i);
- if (!namespaceNs.equals(currentAttr.getNamespaceURI()))
+ if (namespaceNs!=currentAttr.getNamespaceURI())
continue;
if (childElement.hasAttributeNS(namespaceNs,
currentAttr.getLocalName())) {
@@ -511,8 +511,7 @@
*/
public static Element selectDsNode(Node sibling, String nodeName, int number) {
while (sibling!=null) {
- if (nodeName.equals(sibling.getLocalName())
- && Constants.SignatureSpecNS.equals(sibling.getNamespaceURI())) {
+ if (ElementProxy.checker.isNamespaceElement(sibling, nodeName, Constants.SignatureSpecNS )) {
if (number==0){
return (Element)sibling;
}
@@ -532,8 +531,7 @@
public static Element selectXencNode(Node sibling, String nodeName, int number) {
while (sibling!=null) {
- if (nodeName.equals(sibling.getLocalName())
- && EncryptionConstants.EncryptionSpecNS.equals(sibling.getNamespaceURI())) {
+ if (ElementProxy.checker.isNamespaceElement(sibling, nodeName, EncryptionConstants.EncryptionSpecNS )) {
if (number==0){
return (Element)sibling;
}
@@ -591,8 +589,7 @@
*/
public static Element selectNode(Node sibling, String uri,String nodeName, int number) {
while (sibling!=null) {
- if (nodeName.equals(sibling.getLocalName())
- && uri.equals(sibling.getNamespaceURI())) {
+ if (ElementProxy.checker.isNamespaceElement(sibling, nodeName, uri)) {
if (number==0){
return (Element)sibling;
}
@@ -611,7 +608,6 @@
public static Element[] selectDsNodes(Node sibling,String nodeName) {
return selectNodes(sibling,Constants.SignatureSpecNS,nodeName);
}
-
/**
* @param sibling
* @param uri
@@ -624,8 +620,7 @@
int curr=0;
//List list=new ArrayList();
while (sibling!=null) {
- if (nodeName.equals(sibling.getLocalName())
- && uri.equals(sibling.getNamespaceURI())) {
+ if (ElementProxy.checker.isNamespaceElement(sibling, nodeName, uri)) {
a[curr++]=(Element)sibling;
if (size<=curr) {
int cursize= size<<2;
@@ -694,4 +689,8 @@
}
}
}
+
+ public static boolean ignoreLineBreaks() {
+ return ignoreLineBreaks;
+ }
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XPathFuncHereAPI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XPathFuncHereAPI.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -53,7 +52,7 @@
* XPaths using the low-level API, and then just use the XPaths
* over and over.
*
- * @author $Author: raul $
+ * @author $Author: mullan $
* @see <a href="http://www.w3.org/TR/xpath">XPath Specification</a>
*/
public class XPathFuncHereAPI {
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -21,8 +20,6 @@
*/
package com.sun.org.apache.xml.internal.security.utils.resolver;
-
-
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -30,7 +27,6 @@
import com.sun.org.apache.xml.internal.security.signature.XMLSignatureInput;
import org.w3c.dom.Attr;
-
/**
* During reference validation, we have to retrieve resources from somewhere.
* This is done by retrieving a Resolver. The resolver needs two arguments: The
@@ -48,7 +44,7 @@
* <LI> Die erste Implementierung, die die Aufgabe erf??llt, f??hrt die Aufl??sung durch.
* </UL>
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class ResourceResolver {
@@ -62,8 +58,7 @@
/** these are the system-wide resolvers */
static List _resolverVector = null;
- /** Field _individualResolverVector */
- List _individualResolverVector = null;
+ static boolean allThreadSafeInList=true;
/** Field transformSpi */
protected ResourceResolverSpi _resolverSpi = null;
@@ -92,6 +87,7 @@
this._resolverSpi = resourceResolver;
}
+
/**
* Method getInstance
*
@@ -107,13 +103,32 @@
for (int i = 0; i < length; i++) {
ResourceResolver resolver =
(ResourceResolver) ResourceResolver._resolverVector.get(i);
+ ResourceResolver resolverTmp=null;
+ try {
+ resolverTmp = allThreadSafeInList || resolver._resolverSpi.engineIsThreadSafe() ? resolver :
+ new ResourceResolver((ResourceResolverSpi)resolver._resolverSpi.getClass().newInstance());
+ } catch (InstantiationException e) {
+ throw new ResourceResolverException("",e,uri,BaseURI);
+ } catch (IllegalAccessException e) {
+ throw new ResourceResolverException("",e,uri,BaseURI);
+ }
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "check resolvability by class " + resolver._resolverSpi.getClass().getName());
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "check resolvability by class " + resolver.getClass().getName());
+ if ((resolver != null) && resolverTmp.canResolve(uri, BaseURI)) {
+ if (i!=0) {
+ //update resolver.
+ //System.out.println("Swaping");
+ List resolverVector=(List)((ArrayList)_resolverVector).clone();
+ resolverVector.remove(i);
+ resolverVector.add(0,resolver);
+ _resolverVector=resolverVector;
+ } else {
+ //System.out.println("hitting");
+ }
- if ((resolver != null) && resolver.canResolve(uri, BaseURI)) {
- return resolver;
+ return resolverTmp;
}
}
@@ -137,9 +152,10 @@
public static final ResourceResolver getInstance(
Attr uri, String BaseURI, List individualResolvers)
throws ResourceResolverException {
- if (true) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "I was asked to create a ResourceResolver and got " + individualResolvers.size());
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, " extra resolvers to my existing " + ResourceResolver._resolverVector.size() + " system-wide resolvers");
+ if (log.isLoggable(java.util.logging.Level.FINE)) {
+
+ log.log(java.util.logging.Level.FINE, "I was asked to create a ResourceResolver and got " + (individualResolvers==null? 0 : individualResolvers.size()) );
+ log.log(java.util.logging.Level.FINE, " extra resolvers to my existing " + ResourceResolver._resolverVector.size() + " system-wide resolvers");
}
// first check the individual Resolvers
@@ -151,8 +167,8 @@
if (resolver != null) {
String currentClass = resolver._resolverSpi.getClass().getName();
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "check resolvability by class " + currentClass);
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "check resolvability by class " + currentClass);
if (resolver.canResolve(uri, BaseURI)) {
return resolver;
@@ -175,39 +191,46 @@
}
}
- /**
- * Method register
- *
- * @param className
- */
- public static void register(String className) {
- ResourceResolver resolver = null;
+ /**
+ * Registers a ResourceResolverSpi class. This method logs a warning if
+ * the class cannot be registered.
+ *
+ * @param className the name of the ResourceResolverSpi class to be
+ * registered
+ */
+ public static void register(String className) {
+ register(className, false);
+ }
+ /**
+ * Registers a ResourceResolverSpi class at the beginning of the provider
+ * list. This method logs a warning if the class cannot be registered.
+ *
+ * @param className the name of the ResourceResolverSpi class to be
+ * registered
+ */
+ public static void registerAtStart(String className) {
+ register(className, true);
+ }
+
+ private static void register(String className, boolean start) {
try {
- resolver = new ResourceResolver(className);
- ResourceResolver._resolverVector.add(resolver);
+ ResourceResolver resolver = new ResourceResolver(className);
+ if (start) {
+ ResourceResolver._resolverVector.add(0, resolver);
+ log.log(java.util.logging.Level.FINE, "registered resolver");
+ } else {
+ ResourceResolver._resolverVector.add(resolver);
+ }
+ if (!resolver._resolverSpi.engineIsThreadSafe()) {
+ allThreadSafeInList=false;
+ }
} catch (Exception e) {
-// Object exArgs[] = { ((uri != null)
-// ? uri.getNodeValue()
-// : "null"), BaseURI };
-//
-// throw new ResourceResolverException("utils.resolver.noClass",
-// exArgs, e, uri, BaseURI);
- log.log(java.util.logging.Level.WARNING, "Error loading resolver " + className +" disabling it");
+ log.log(java.util.logging.Level.WARNING, "Error loading resolver " + className +" disabling it");
} catch (NoClassDefFoundError e) {
- log.log(java.util.logging.Level.WARNING, "Error loading resolver " + className +" disabling it");
+ log.log(java.util.logging.Level.WARNING, "Error loading resolver " + className +" disabling it");
}
-
- }
-
- /**
- * Method registerAtStart
- *
- * @param className
- */
- public static void registerAtStart(String className) {
- ResourceResolver._resolverVector.add(0, className);
- }
+ }
/**
* Method resolve
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverException.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -31,7 +30,7 @@
* This Exception is thrown if something related to the
* {@link com.sun.org.apache.xml.internal.security.utils.resolver.ResourceResolver} goes wrong.
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class ResourceResolverException extends XMLSecurityException {
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverSpi.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverSpi.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -22,6 +21,7 @@
package com.sun.org.apache.xml.internal.security.utils.resolver;
+import java.util.HashMap;
import java.util.Map;
import com.sun.org.apache.xml.internal.security.signature.XMLSignatureInput;
@@ -31,7 +31,7 @@
/**
* During reference validation, we have to retrieve resources from somewhere.
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public abstract class ResourceResolverSpi {
@@ -41,7 +41,7 @@
ResourceResolverSpi.class.getName());
/** Field _properties */
- protected java.util.Map _properties = new java.util.HashMap(10);
+ protected java.util.Map _properties = null;
/**
* This is the workhorse method used to resolve resources.
@@ -62,19 +62,9 @@
* @param value
*/
public void engineSetProperty(String key, String value) {
-
- java.util.Iterator i = this._properties.keySet().iterator();
-
- while (i.hasNext()) {
- String c = (String) i.next();
-
- if (c.equals(key)) {
- key = c;
-
- break;
- }
- }
-
+ if (_properties==null) {
+ _properties=new HashMap();
+ }
this._properties.put(key, value);
}
@@ -85,19 +75,9 @@
* @return the value of the property
*/
public String engineGetProperty(String key) {
-
- java.util.Iterator i = this._properties.keySet().iterator();
-
- while (i.hasNext()) {
- String c = (String) i.next();
-
- if (c.equals(key)) {
- key = c;
-
- break;
- }
- }
-
+ if (_properties==null) {
+ return null;
+ }
return (String) this._properties.get(key);
}
@@ -106,9 +86,22 @@
* @param properties
*/
public void engineAddProperies(Map properties) {
- this._properties.putAll(properties);
+ if (properties!=null) {
+ if (_properties==null) {
+ _properties=new HashMap();
+ }
+ this._properties.putAll(properties);
+ }
}
-
+ /**
+ * Tells if the implementation does can be reused by several threads safely.
+ * It normally means that the implemantation does not have any member, or there is
+ * member change betwen engineCanResolve & engineResolve invocations. Or it mantians all
+ * member info in ThreadLocal methods.
+ */
+ public boolean engineIsThreadSafe() {
+ return false;
+ }
/**
* This method helps the {@link ResourceResolver} to decide whether a
* {@link ResourceResolverSpi} is able to perform the requested action.
@@ -174,8 +167,8 @@
&& (ch3 != '/'));
if (isDosFilename) {
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Found DOS filename: " + str);
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Found DOS filename: " + str);
}
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverAnonymous.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverAnonymous.java Wed Jul 05 16:42:37 2017 +0200
@@ -32,14 +32,10 @@
/**
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class ResolverAnonymous extends ResourceResolverSpi {
- /** {@link java.util.logging} logging facility */
- static java.util.logging.Logger log =
- java.util.logging.Logger.getLogger(
- ResolverAnonymous.class.getName());
private XMLSignatureInput _input = null;
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverDirectHTTP.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverDirectHTTP.java Wed Jul 05 16:42:37 2017 +0200
@@ -2,7 +2,6 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
@@ -67,11 +66,12 @@
ResolverDirectHTTP.class.getName());
/** Field properties[] */
- static final String properties[] = { "http.proxy.host", "http.proxy.port",
- "http.proxy.username",
- "http.proxy.password",
- "http.basic.username",
- "http.basic.password" };
+ private static final String properties[] =
+ { "http.proxy.host", "http.proxy.port",
+ "http.proxy.username",
+ "http.proxy.password",
+ "http.basic.username",
+ "http.basic.password" };
/** Field HttpProxyHost */
private static final int HttpProxyHost = 0;
@@ -91,6 +91,9 @@
/** Field HttpProxyPass */
private static final int HttpBasicPass = 5;
+ public boolean engineIsThreadSafe() {
+ return true;
+ }
/**
* Method resolve
*
@@ -117,15 +120,14 @@
useProxy = true;
}
- // switch on proxy usage
String oldProxySet = null;
String oldProxyHost = null;
String oldProxyPort = null;
+ // switch on proxy usage
if (useProxy) {
if (log.isLoggable(java.util.logging.Level.FINE)) {
- log.log(java.util.logging.Level.FINE,
- "Use of HTTP proxy enabled: " + proxyHost + ":"
- + proxyPort);
+ log.log(java.util.logging.Level.FINE, "Use of HTTP proxy enabled: " + proxyHost + ":"
+ + proxyPort);
}
oldProxySet = System.getProperty("http.proxySet");
oldProxyHost = System.getProperty("http.proxyHost");
@@ -215,11 +217,8 @@
summarized += read;
}
- if (log.isLoggable(java.util.logging.Level.FINE)) {
- log.log(java.util.logging.Level.FINE,
- "Fetched " + summarized + " bytes from URI "
- + uriNew.toString());
- }
+ log.log(java.util.logging.Level.FINE, "Fetched " + summarized + " bytes from URI "
+ + uriNew.toString());
XMLSignatureInput result = new XMLSignatureInput(baos.toByteArray());
@@ -253,39 +252,36 @@
*/
public boolean engineCanResolve(Attr uri, String BaseURI) {
if (uri == null) {
- if (log.isLoggable(java.util.logging.Level.FINE)) {
- log.log(java.util.logging.Level.FINE, "quick fail, uri == null");
- }
+ log.log(java.util.logging.Level.FINE, "quick fail, uri == null");
+
return false;
}
String uriNodeValue = uri.getNodeValue();
if (uriNodeValue.equals("") || (uriNodeValue.charAt(0)=='#')) {
- if (log.isLoggable(java.util.logging.Level.FINE)) {
- log.log(java.util.logging.Level.FINE,
- "quick fail for empty URIs and local ones");
- }
+ log.log(java.util.logging.Level.FINE, "quick fail for empty URIs and local ones");
+
return false;
}
if (log.isLoggable(java.util.logging.Level.FINE)) {
- log.log(java.util.logging.Level.FINE,
- "I was asked whether I can resolve " + uriNodeValue);
+ log.log(java.util.logging.Level.FINE, "I was asked whether I can resolve " + uriNodeValue);
}
+
if ( uriNodeValue.startsWith("http:") ||
- BaseURI.startsWith("http:")) {
+ (BaseURI!=null && BaseURI.startsWith("http:") )) {
if (log.isLoggable(java.util.logging.Level.FINE)) {
- log.log(java.util.logging.Level.FINE,
- "I state that I can resolve " + uriNodeValue);
+ log.log(java.util.logging.Level.FINE, "I state that I can resolve " + uriNodeValue);
}
+
return true;
}
if (log.isLoggable(java.util.logging.Level.FINE)) {
- log.log(java.util.logging.Level.FINE,
- "I state that I can't resolve " + uriNodeValue);
+ log.log(java.util.logging.Level.FINE, "I state that I can't resolve " + uriNodeValue);
}
+
return false;
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverFragment.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverFragment.java Wed Jul 05 16:42:37 2017 +0200
@@ -34,7 +34,7 @@
/**
* This resolver is used for resolving same-document URIs like URI="" of URI="#id".
*
- * @author $Author: dims $
+ * @author $Author: mullan $
* @see <A HREF="http://www.w3.org/TR/xmldsig-core/#sec-ReferenceProcessingModel">The Reference processing model in the XML Signature spec</A>
* @see <A HREF="http://www.w3.org/TR/xmldsig-core/#sec-Same-Document">Same-Document URI-References in the XML Signature spec</A>
* @see <A HREF="http://www.ietf.org/rfc/rfc2396.txt">Section 4.2 of RFC 2396</A>
@@ -45,7 +45,9 @@
static java.util.logging.Logger log =
java.util.logging.Logger.getLogger(
ResolverFragment.class.getName());
-
+ public boolean engineIsThreadSafe() {
+ return true;
+ }
/**
* Method engineResolve
*
@@ -72,7 +74,7 @@
* resource containing the signature
*/
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "ResolverFragment with empty URI (means complete document)");
+ log.log(java.util.logging.Level.FINE, "ResolverFragment with empty URI (means complete document)");
selectedElem = doc;
} else {
@@ -93,14 +95,14 @@
throw new ResourceResolverException(
"signature.Verification.MissingID", exArgs, uri, BaseURI);
}
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Try to catch an Element with ID " + id + " and Element was " + selectedElem);
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Try to catch an Element with ID " + id + " and Element was " + selectedElem);
}
XMLSignatureInput result = new XMLSignatureInput(selectedElem);
result.setExcludeComments(true);
- //if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "We return a nodeset with " + resultSet.size() + " nodes");
+ //log.log(java.util.logging.Level.FINE, "We return a nodeset with " + resultSet.size() + " nodes");
result.setMIMEType("text/xml");
result.setSourceURI((BaseURI != null) ? BaseURI.concat(uri.getNodeValue()) :
uri.getNodeValue());
@@ -117,21 +119,24 @@
public boolean engineCanResolve(Attr uri, String BaseURI) {
if (uri == null) {
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Quick fail for null uri");
+ log.log(java.util.logging.Level.FINE, "Quick fail for null uri");
return false;
}
String uriNodeValue = uri.getNodeValue();
- if (uriNodeValue.equals("")
- || ((uriNodeValue.charAt(0)=='#')
- &&!uriNodeValue.startsWith("#xpointer("))) {
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "State I can resolve reference: \"" + uriNodeValue + "\"");
+ if (uriNodeValue.equals("") ||
+ (
+ (uriNodeValue.charAt(0)=='#')
+ && !((uriNodeValue.charAt(1)=='x') && uriNodeValue.startsWith("#xpointer("))
+ )
+ ){
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "State I can resolve reference: \"" + uriNodeValue + "\"");
return true;
}
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Do not seem to be able to resolve reference: \"" + uriNodeValue + "\"");
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Do not seem to be able to resolve reference: \"" + uriNodeValue + "\"");
return false;
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverLocalFilesystem.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverLocalFilesystem.java Wed Jul 05 16:42:37 2017 +0200
@@ -20,8 +20,6 @@
*/
package com.sun.org.apache.xml.internal.security.utils.resolver.implementations;
-
-
import java.io.FileInputStream;
import com.sun.org.apache.xml.internal.utils.URI;
@@ -30,11 +28,10 @@
import com.sun.org.apache.xml.internal.security.utils.resolver.ResourceResolverSpi;
import org.w3c.dom.Attr;
-
/**
* A simple ResourceResolver for requests into the local filesystem.
*
- * @author $Author: raul $
+ * @author $Author: mullan $
*/
public class ResolverLocalFilesystem extends ResourceResolverSpi {
@@ -43,6 +40,9 @@
java.util.logging.Logger.getLogger(
ResolverLocalFilesystem.class.getName());
+ public boolean engineIsThreadSafe() {
+ return true;
+ }
/**
* @inheritDoc
*/
@@ -50,7 +50,7 @@
throws ResourceResolverException {
try {
- URI uriNew = new URI(new URI(BaseURI), uri.getNodeValue());
+ URI uriNew = getNewURI(uri.getNodeValue(), BaseURI);
// if the URI contains a fragment, ignore it
URI uriNewNoFrag = new URI(uriNew);
@@ -72,6 +72,7 @@
}
}
+ private static int FILE_URI_LENGTH="file:/".length();
/**
* Method translateUriToFilename
*
@@ -80,7 +81,7 @@
*/
private static String translateUriToFilename(String uri) {
- String subStr = uri.substring("file:/".length());
+ String subStr = uri.substring(FILE_URI_LENGTH);
if (subStr.indexOf("%20") > -1)
{
@@ -121,26 +122,36 @@
String uriNodeValue = uri.getNodeValue();
- if (uriNodeValue.equals("") || (uriNodeValue.charAt(0)=='#')) {
+ if (uriNodeValue.equals("") || (uriNodeValue.charAt(0)=='#') ||
+ uriNodeValue.startsWith("http:")) {
return false;
}
try {
//URI uriNew = new URI(new URI(BaseURI), uri.getNodeValue());
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "I was asked whether I can resolve " + uriNodeValue/*uriNew.toString()*/);
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "I was asked whether I can resolve " + uriNodeValue/*uriNew.toString()*/);
if ( uriNodeValue.startsWith("file:") ||
BaseURI.startsWith("file:")/*uriNew.getScheme().equals("file")*/) {
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "I state that I can resolve " + uriNodeValue/*uriNew.toString()*/);
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "I state that I can resolve " + uriNodeValue/*uriNew.toString()*/);
return true;
}
} catch (Exception e) {}
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "But I can't");
+ log.log(java.util.logging.Level.FINE, "But I can't");
return false;
}
+
+ private static URI getNewURI(String uri, String BaseURI)
+ throws URI.MalformedURIException {
+
+ if ((BaseURI == null) || "".equals(BaseURI)) {
+ return new URI(uri);
+ }
+ return new URI(new URI(BaseURI), uri);
+ }
}
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverXPointer.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverXPointer.java Wed Jul 05 16:42:37 2017 +0200
@@ -44,7 +44,7 @@
* nodes of the parse tree (all descendants, plus all attributes,
* plus all namespaces nodes).
*
- * @author $Author: dims $
+ * @author $Author: mullan $
*/
public class ResolverXPointer extends ResourceResolverSpi {
@@ -53,6 +53,9 @@
java.util.logging.Logger.getLogger(
ResolverXPointer.class.getName());
+ public boolean engineIsThreadSafe() {
+ return true;
+ }
/**
* @inheritDoc
*/
@@ -70,7 +73,7 @@
String id = getXPointerId(uriStr);
resultNode =IdResolver.getElementById(doc, id);
- // if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Use #xpointer(id('" + id + "')) on element " + selectedElem);
+ // log.log(java.util.logging.Level.FINE, "Use #xpointer(id('" + id + "')) on element " + selectedElem);
if (resultNode == null) {
Object exArgs[] = { id };
@@ -148,14 +151,14 @@
uri.length()
- 2);
- // if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "idPlusDelim=" + idPlusDelim);
+ // log.log(java.util.logging.Level.FINE, "idPlusDelim=" + idPlusDelim);
int idLen=idPlusDelim.length() -1;
if (((idPlusDelim.charAt(0) == '"') && (idPlusDelim
.charAt(idLen) == '"')) || ((idPlusDelim
.charAt(0) == '\'') && (idPlusDelim
.charAt(idLen) == '\''))) {
- if (true)
- if (log.isLoggable(java.util.logging.Level.FINE)) log.log(java.util.logging.Level.FINE, "Id="
+ if (log.isLoggable(java.util.logging.Level.FINE))
+ log.log(java.util.logging.Level.FINE, "Id="
+ idPlusDelim.substring(1, idLen));
return true;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/servicetag/BrowserSupport.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,199 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.servicetag;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
+import java.io.IOException;
+import java.net.URI;
+
+/**
+ * BrowserSupport class.
+ *
+ * The implementation of the com.sun.servicetag API needs to be
+ * compiled with JDK 5 as well since the consumer of this API
+ * may require to support JDK 5 (e.g. NetBeans).
+ *
+ * The Desktop.browse() method can be backported in this class
+ * if needed. The current implementation only supports JDK 6.
+ */
+class BrowserSupport {
+ private static boolean isBrowseSupported = false;
+ private static Method browseMethod = null;
+ private static Object desktop = null;
+ private static volatile Boolean result = false;
+
+
+ private static void initX() {
+ if (desktop != null) {
+ return;
+ }
+ boolean supported = false;
+ Method browseM = null;
+ Object desktopObj = null;
+ try {
+ // Determine if java.awt.Desktop is supported
+ Class<?> desktopCls = Class.forName("java.awt.Desktop", true, null);
+ Method getDesktopM = desktopCls.getMethod("getDesktop");
+ browseM = desktopCls.getMethod("browse", URI.class);
+
+ Class<?> actionCls = Class.forName("java.awt.Desktop$Action", true, null);
+ final Method isDesktopSupportedMethod = desktopCls.getMethod("isDesktopSupported");
+ Method isSupportedMethod = desktopCls.getMethod("isSupported", actionCls);
+ Field browseField = actionCls.getField("BROWSE");
+ // isDesktopSupported calls getDefaultToolkit which can block
+ // infinitely, see 6636099 for details, to workaround we call
+ // in a thread and time it out, noting that the issue is specific
+ // to X11, it does not hurt for Windows.
+ Thread xthread = new Thread() {
+ public void run() {
+ try {
+ // support only if Desktop.isDesktopSupported() and
+ // Desktop.isSupported(Desktop.Action.BROWSE) return true.
+ result = (Boolean) isDesktopSupportedMethod.invoke(null);
+ } catch (IllegalAccessException e) {
+ // should never reach here
+ InternalError x =
+ new InternalError("Desktop.getDesktop() method not found");
+ x.initCause(e);
+ } catch (InvocationTargetException e) {
+ // browser not supported
+ if (Util.isVerbose()) {
+ e.printStackTrace();
+ }
+ }
+ }
+ };
+ // set it to daemon, so that the vm will exit.
+ xthread.setDaemon(true);
+ xthread.start();
+ try {
+ xthread.join(5 * 1000);
+ } catch (InterruptedException ie) {
+ // ignore the exception
+ }
+ if (result.booleanValue()) {
+ desktopObj = getDesktopM.invoke(null);
+ result = (Boolean) isSupportedMethod.invoke(desktopObj, browseField.get(null));
+ supported = result.booleanValue();
+ }
+ } catch (ClassNotFoundException e) {
+ // browser not supported
+ if (Util.isVerbose()) {
+ e.printStackTrace();
+ }
+ } catch (NoSuchMethodException e) {
+ // browser not supported
+ if (Util.isVerbose()) {
+ e.printStackTrace();
+ }
+ } catch (NoSuchFieldException e) {
+ // browser not supported
+ if (Util.isVerbose()) {
+ e.printStackTrace();
+ }
+ } catch (IllegalAccessException e) {
+ // should never reach here
+ InternalError x =
+ new InternalError("Desktop.getDesktop() method not found");
+ x.initCause(e);
+ throw x;
+ } catch (InvocationTargetException e) {
+ // browser not supported
+ if (Util.isVerbose()) {
+ e.printStackTrace();
+ }
+ }
+ isBrowseSupported = supported;
+ browseMethod = browseM;
+ desktop = desktopObj;
+ }
+
+ static boolean isSupported() {
+ initX();
+ return isBrowseSupported;
+ }
+
+ /**
+ * Launches the default browser to display a {@code URI}.
+ * If the default browser is not able to handle the specified
+ * {@code URI}, the application registered for handling
+ * {@code URIs} of the specified type is invoked. The application
+ * is determined from the protocol and path of the {@code URI}, as
+ * defined by the {@code URI} class.
+ * <p>
+ * This method calls the Desktop.getDesktop().browse() method.
+ * <p>
+ * @param uri the URI to be displayed in the user default browser
+ *
+ * @throws NullPointerException if {@code uri} is {@code null}
+ * @throws UnsupportedOperationException if the current platform
+ * does not support the {@link Desktop.Action#BROWSE} action
+ * @throws IOException if the user default browser is not found,
+ * or it fails to be launched, or the default handler application
+ * failed to be launched
+ * @throws IllegalArgumentException if the necessary permissions
+ * are not available and the URI can not be converted to a {@code URL}
+ */
+ static void browse(URI uri) throws IOException {
+ if (uri == null) {
+ throw new NullPointerException("null uri");
+ }
+ if (!isSupported()) {
+ throw new UnsupportedOperationException("Browse operation is not supported");
+ }
+
+ // Call Desktop.browse() method
+ try {
+ if (Util.isVerbose()) {
+ System.out.println("desktop: " + desktop + ":browsing..." + uri);
+ }
+ browseMethod.invoke(desktop, uri);
+ } catch (IllegalAccessException e) {
+ // should never reach here
+ InternalError x =
+ new InternalError("Desktop.getDesktop() method not found");
+ x.initCause(e);
+ throw x;
+ } catch (InvocationTargetException e) {
+ Throwable x = e.getCause();
+ if (x != null) {
+ if (x instanceof UnsupportedOperationException) {
+ throw (UnsupportedOperationException) x;
+ } else if (x instanceof IllegalArgumentException) {
+ throw (IllegalArgumentException) x;
+ } else if (x instanceof IOException) {
+ throw (IOException) x;
+ } else if (x instanceof SecurityException) {
+ throw (SecurityException) x;
+ } else {
+ // ignore
+ }
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/servicetag/Installer.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,965 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.servicetag;
+
+import java.io.*;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Properties;
+import java.util.Set;
+import java.util.List;
+import java.util.ArrayList;
+import static com.sun.servicetag.Util.*;
+
+/**
+ * Service Tag Installer for Java SE.
+ */
+public class Installer {
+ // System properties for testing
+ private static String SVCTAG_DIR_PATH =
+ "servicetag.dir.path";
+ private static String SVCTAG_ENABLE_REGISTRATION =
+ "servicetag.registration.enabled";
+ private final static String SUN_VENDOR = "Sun Microsystems";
+ private final static String REGISTRATION_XML = "registration.xml";
+ private final static String SERVICE_TAG_FILE = "servicetag";
+ private final static String REGISTRATION_HTML_NAME = "register";
+
+ private final static Locale[] knownSupportedLocales =
+ new Locale[] { Locale.ENGLISH,
+ Locale.JAPANESE,
+ Locale.SIMPLIFIED_CHINESE};
+
+ private final static String javaHome = System.getProperty("java.home");
+ private static File svcTagDir;
+ private static File serviceTagFile;
+ private static File regXmlFile;
+ private static RegistrationData registration;
+ private static boolean supportRegistration;
+ private static String registerHtmlParent;
+ private static Set<Locale> supportedLocales = new HashSet<Locale>();
+ private static Properties swordfishProps = null;
+ private static String[] jreArchs = null;
+ static {
+ String dir = System.getProperty(SVCTAG_DIR_PATH);
+ if (dir == null) {
+ svcTagDir = new File(getJrePath(), "lib" + File.separator + SERVICE_TAG_FILE);
+ } else {
+ svcTagDir = new File(dir);
+ }
+ serviceTagFile = new File(svcTagDir, SERVICE_TAG_FILE);
+ regXmlFile = new File(svcTagDir, REGISTRATION_XML);
+ if (System.getProperty(SVCTAG_ENABLE_REGISTRATION) == null) {
+ supportRegistration = isJdk();
+ } else {
+ supportRegistration = true;
+ }
+ }
+
+ private Installer() {
+ }
+
+ // Implementation of ServiceTag.getJavaServiceTag(String) method
+ static ServiceTag getJavaServiceTag(String source) throws IOException {
+ if (!System.getProperty("java.vendor").startsWith(SUN_VENDOR)) {
+ // Products bundling this implementation may run on
+ // Mac OS which is not a Sun JDK
+ return null;
+ }
+ boolean cleanup = false;
+ try {
+ // Check if we have the swordfish entries for this JRE version
+ if (loadSwordfishEntries() == null) {
+ return null;
+ }
+
+ ServiceTag st = getJavaServiceTag();
+ // Check if the service tag created by this bundle owner
+ if (st != null && st.getSource().equals(source)) {
+ // Install the system service tag if supported
+ // stclient may be installed after the service tag creation
+ if (Registry.isSupported()) {
+ installSystemServiceTag();
+ }
+ return st;
+ }
+
+ // in case any exception thrown during the cleanup
+ cleanup = true;
+
+ // re-create a new one for this bundle owner
+ // first delete the registration data
+ deleteRegistrationData();
+ cleanup = false;
+
+ // create service tag and generate new register.html pages
+ return createServiceTag(source);
+ } finally {
+ if (cleanup) {
+ if (regXmlFile.exists()) {
+ regXmlFile.delete();
+ }
+ if (serviceTagFile.exists()) {
+ serviceTagFile.delete();
+ }
+ }
+ }
+ }
+
+ /**
+ * Returns the Java SE registration data located in
+ * the <JRE>/lib/servicetag/registration.xml by default.
+ *
+ * @throws IllegalArgumentException if the registration data
+ * is of invalid format.
+ */
+ private static synchronized RegistrationData getRegistrationData()
+ throws IOException {
+ if (registration != null) {
+ return registration;
+ }
+ if (regXmlFile.exists()) {
+ BufferedInputStream in = null;
+ try {
+ in = new BufferedInputStream(new FileInputStream(regXmlFile));
+ registration = RegistrationData.loadFromXML(in);
+ } catch (IllegalArgumentException ex) {
+ System.err.println("Error: Bad registration data \"" +
+ regXmlFile + "\":" + ex.getMessage());
+ throw ex;
+ } finally {
+ if (in != null) {
+ in.close();
+ }
+ }
+ } else {
+ registration = new RegistrationData();
+ }
+ return registration;
+ }
+
+ /**
+ * Write the registration data to the registration.xml file.
+ *
+ * The offline registration page has to be regenerated with
+ * the new registration data.
+ *
+ * @throws java.io.IOException
+ */
+ private static synchronized void writeRegistrationXml()
+ throws IOException {
+ if (!svcTagDir.exists()) {
+ // This check is for NetBeans or other products that
+ // bundles this com.sun.servicetag implementation for
+ // pre-6u5 release.
+ if (!svcTagDir.mkdir()) {
+ throw new IOException("Failed to create directory: " + svcTagDir);
+ }
+ }
+
+ // regenerate the new offline registration page
+ deleteRegistrationHtmlPage();
+ getRegistrationHtmlPage();
+
+ BufferedOutputStream out = null;
+ try {
+ out = new BufferedOutputStream(new FileOutputStream(regXmlFile));
+ getRegistrationData().storeToXML(out);
+ } catch (IllegalArgumentException ex) {
+ System.err.println("Error: Bad registration data \"" +
+ regXmlFile + "\":" + ex.getMessage());
+ throw ex;
+ } finally {
+ if (out != null) {
+ out.close();
+ }
+ }
+ }
+
+ /**
+ * Returns the instance urn(s) stored in the servicetag file
+ * or empty set if file not exists.
+ */
+ private static Set<String> getInstalledURNs() throws IOException {
+ Set<String> urnSet = new HashSet<String>();
+ if (serviceTagFile.exists()) {
+ BufferedReader in = null;
+ try {
+ in = new BufferedReader(new FileReader(serviceTagFile));
+ String urn;
+ while ((urn = in.readLine()) != null) {
+ urn = urn.trim();
+ if (urn.length() > 0) {
+ urnSet.add(urn);
+ }
+ }
+ } finally {
+ if (in != null) {
+ in.close();
+ }
+ }
+ }
+ return urnSet;
+ }
+
+ /**
+ * Return the Java SE service tag(s) if it exists.
+ * Typically only one Java SE service tag but it could have two for
+ * Solaris 32-bit and 64-bit on the same install directory.
+ *
+ * @return the service tag(s) for Java SE
+ */
+ private static ServiceTag[] getJavaServiceTagArray() throws IOException {
+ RegistrationData regData = getRegistrationData();
+ Set<ServiceTag> svcTags = regData.getServiceTags();
+ Set<ServiceTag> result = new HashSet<ServiceTag>();
+
+ Properties props = loadSwordfishEntries();
+ String jdkUrn = props.getProperty("servicetag.jdk.urn");
+ String jreUrn = props.getProperty("servicetag.jre.urn");
+ for (ServiceTag st : svcTags) {
+ if (st.getProductURN().equals(jdkUrn) ||
+ st.getProductURN().equals(jreUrn)) {
+ result.add(st);
+ }
+ }
+ return result.toArray(new ServiceTag[0]);
+ }
+
+ /**
+ * Returns the Java SE service tag for this running platform;
+ * or null if not exist.
+ * This method will return the 64-bit service tag if the JDK
+ * supports both 32-bit and 64-bit if already created.
+ */
+ private static ServiceTag getJavaServiceTag() throws IOException {
+ String definedId = getProductDefinedId();
+ for (ServiceTag st : getJavaServiceTagArray()) {
+ if (st.getProductDefinedInstanceID().equals(definedId)) {
+ return st;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Create a service tag for Java SE and install in the system
+ * service tag registry if supported.
+ *
+ * A registration data <JRE>/lib/servicetag/registration.xml
+ * will be created to storeToXML the XML entry for Java SE service tag.
+ * If the system supports service tags, this method will install
+ * the Java SE service tag in the system service tag registry and
+ * its <tt>instance_urn</tt> will be stored to <JRE>/lib/servicetag/servicetag.
+ *
+ * If <JRE>/lib/servicetag/registration.xml exists but is not installed
+ * in the system service tag registry (i.e. servicetag doesn't exist),
+ * this method will install it as described above.
+ *
+ * If the system supports service tag, stclient will be used
+ * to create the Java SE service tag.
+ *
+ * A Solaris 32-bit and 64-bit JDK will be installed in the same
+ * directory but the registration.xml will have 2 service tags.
+ * The servicetag file will also contain 2 instance_urns for that case.
+ */
+ private static ServiceTag createServiceTag(String svcTagSource)
+ throws IOException {
+ // determine if a new service tag is needed to be created
+ ServiceTag newSvcTag = null;
+ if (getJavaServiceTag() == null) {
+ newSvcTag = newServiceTag(svcTagSource);
+ }
+
+ // Add the new service tag in the registration data
+ if (newSvcTag != null) {
+ RegistrationData regData = getRegistrationData();
+
+ // Add the service tag to the registration data in JDK/JRE
+ newSvcTag = regData.addServiceTag(newSvcTag);
+
+ // add if there is a service tag for the OS
+ ServiceTag osTag = SolarisServiceTag.getServiceTag();
+ if (osTag != null && regData.getServiceTag(osTag.getInstanceURN()) == null) {
+ regData.addServiceTag(osTag);
+ }
+ // write to the registration.xml
+ writeRegistrationXml();
+ }
+
+ // Install the system service tag if supported
+ if (Registry.isSupported()) {
+ installSystemServiceTag();
+ }
+ return newSvcTag;
+ }
+
+ private static void installSystemServiceTag() throws IOException {
+ // only install the service tag in the registry if
+ // it has permission to write the servicetag file.
+ if ((!serviceTagFile.exists() && !svcTagDir.canWrite()) ||
+ (serviceTagFile.exists() && !serviceTagFile.canWrite())) {
+ return;
+ }
+
+ Set<String> urns = getInstalledURNs();
+ ServiceTag[] javaSvcTags = getJavaServiceTagArray();
+ if (urns.size() < javaSvcTags.length) {
+ for (ServiceTag st : javaSvcTags) {
+ // Add the service tag in the system service tag registry
+ // if not installed
+ String instanceURN = st.getInstanceURN();
+ if (!urns.contains(instanceURN)) {
+ Registry.getSystemRegistry().addServiceTag(st);
+ }
+ }
+ }
+ writeInstalledUrns();
+ }
+
+ private static ServiceTag newServiceTag(String svcTagSource) throws IOException {
+ // Load the swoRDFish information for the service tag creation
+ Properties props = loadSwordfishEntries();
+
+ // Determine the product URN and name
+ String productURN;
+ String productName;
+
+ if (isJdk()) {
+ // <HOME>/jre exists which implies it's a JDK
+ productURN = props.getProperty("servicetag.jdk.urn");
+ productName = props.getProperty("servicetag.jdk.name");
+ } else {
+ // Otherwise, it's a JRE
+ productURN = props.getProperty("servicetag.jre.urn");
+ productName = props.getProperty("servicetag.jre.name");
+ }
+
+ return ServiceTag.newInstance(ServiceTag.generateInstanceURN(),
+ productName,
+ System.getProperty("java.version"),
+ productURN,
+ props.getProperty("servicetag.parent.name"),
+ props.getProperty("servicetag.parent.urn"),
+ getProductDefinedId(),
+ SUN_VENDOR,
+ System.getProperty("os.arch"),
+ getZoneName(),
+ svcTagSource);
+ }
+
+ /**
+ * Delete the registration data, the offline registration pages and
+ * the service tags in the system service tag registry if installed.
+ *
+ * The registration.xml and servicetag file will be removed.
+ */
+ private static synchronized void deleteRegistrationData()
+ throws IOException {
+ try {
+ // delete the offline registration page
+ deleteRegistrationHtmlPage();
+
+ // Remove the service tag from the system ST registry if exists
+ Set<String> urns = getInstalledURNs();
+ if (urns.size() > 0 && Registry.isSupported()) {
+ for (String u : urns) {
+ Registry.getSystemRegistry().removeServiceTag(u);
+ }
+ }
+ registration = null;
+ } finally {
+ // Delete the registration.xml and servicetag files if exists
+ if (regXmlFile.exists()) {
+ if (!regXmlFile.delete()) {
+ throw new IOException("Failed to delete " + regXmlFile);
+ }
+ }
+ if (serviceTagFile.exists()) {
+ if (!serviceTagFile.delete()) {
+ throw new IOException("Failed to delete " + serviceTagFile);
+ }
+ }
+ }
+ }
+
+ /**
+ * Updates the registration data to contain one single service tag
+ * for the running Java runtime.
+ */
+ private static synchronized void updateRegistrationData(String svcTagSource)
+ throws IOException {
+ RegistrationData regData = getRegistrationData();
+ ServiceTag curSvcTag = newServiceTag(svcTagSource);
+
+ ServiceTag[] javaSvcTags = getJavaServiceTagArray();
+ Set<String> urns = getInstalledURNs();
+ for (ServiceTag st : javaSvcTags) {
+ if (!st.getProductDefinedInstanceID().equals(curSvcTag.getProductDefinedInstanceID())) {
+ String instanceURN = st.getInstanceURN();
+ regData.removeServiceTag(instanceURN);
+
+ // remove it from the system service tag registry if exists
+ if (urns.contains(instanceURN) && Registry.isSupported()) {
+ Registry.getSystemRegistry().removeServiceTag(instanceURN);
+ }
+ }
+ }
+ writeRegistrationXml();
+ writeInstalledUrns();
+ }
+
+ private static void writeInstalledUrns() throws IOException {
+ // if the Registry is not supported,
+ // remove the servicetag file
+ if (!Registry.isSupported() && serviceTagFile.exists()) {
+ serviceTagFile.delete();
+ return;
+ }
+
+ PrintWriter out = null;
+ try {
+ out = new PrintWriter(serviceTagFile);
+
+ ServiceTag[] javaSvcTags = getJavaServiceTagArray();
+ for (ServiceTag st : javaSvcTags) {
+ // Write the instance_run to the servicetag file
+ String instanceURN = st.getInstanceURN();
+ out.println(instanceURN);
+ }
+ } finally {
+ if (out != null) {
+ out.close();
+ }
+ }
+ }
+
+ /**
+ * Load the values associated with the swoRDFish metadata entries
+ * for Java SE. The swoRDFish metadata entries are different for
+ * different release.
+ *
+ * @param version Version of Java SE
+ */
+ private static synchronized Properties loadSwordfishEntries() throws IOException {
+ if (swordfishProps != null) {
+ return swordfishProps;
+ }
+
+ // The version string for Java SE 6 is 1.6.0
+ // We just need the minor number in the version string
+ int version = Util.getJdkVersion();
+
+ String filename = "/com/sun/servicetag/resources/javase_" +
+ version + "_swordfish.properties";
+ InputStream in = Installer.class.getClass().getResourceAsStream(filename);
+ if (in == null) {
+ return null;
+ }
+ swordfishProps = new Properties();
+ try {
+ swordfishProps.load(in);
+ } finally {
+ in.close();
+ }
+ return swordfishProps;
+ }
+
+ /**
+ * Returns the product defined instance ID for Java SE.
+ * It is a list of comma-separated name/value pairs:
+ * "id=<full-version> <arch> [<arch>]*"
+ * "dir=<java.home system property value>"
+ *
+ * where <full-version> is the full version string of the JRE,
+ * <arch> is the architecture that the runtime supports
+ * (i.e. "sparc", "sparcv9", "i386", "amd64" (ISA list))
+ *
+ * For Solaris, it can be dual mode that can support both
+ * 32-bit and 64-bit. the "id" will be set to
+ * "1.6.0_03-b02 sparc sparcv9"
+ *
+ * The "dir" property is included in the service tag to enable
+ * the Service Tag software to determine if a service tag for
+ * Java SE is invalid and perform appropriate service tag
+ * cleanup if necessary. See RFE# 6574781 Service Tags Enhancement.
+ *
+ */
+ private static String getProductDefinedId() {
+ StringBuilder definedId = new StringBuilder();
+ definedId.append("id=");
+ definedId.append(System.getProperty("java.runtime.version"));
+
+ String[] archs = getJreArchs();
+ for (String name : archs) {
+ definedId.append(" " + name);
+ }
+
+ String location = ",dir=" + javaHome;
+ if ((definedId.length() + location.length()) < 256) {
+ definedId.append(",dir=");
+ definedId.append(javaHome);
+ } else {
+ // if it exceeds the limit, we will not include the location
+ if (isVerbose()) {
+ System.err.println("Warning: Product defined instance ID exceeds the field limit:");
+ }
+ }
+
+ return definedId.toString();
+ }
+
+ /**
+ * Returns the architectures that the runtime supports
+ * (i.e. "sparc", "sparcv9", "i386", "amd64" (ISA list))
+ * The directory name where libjava.so is located.
+ *
+ * On Windows, returns the "os.arch" system property value.
+ */
+ private synchronized static String[] getJreArchs() {
+ if (jreArchs != null) {
+ return jreArchs;
+ }
+
+ Set<String> archs = new HashSet<String>();
+
+ String os = System.getProperty("os.name");
+ if (os.equals("SunOS") || os.equals("Linux")) {
+ // Traverse the directories under <JRE>/lib.
+ // If <JRE>/lib/<arch>/libjava.so exists, add <arch>
+ // to the product defined ID
+ File dir = new File(getJrePath() + File.separator + "lib");
+ if (dir.isDirectory()) {
+ String[] children = dir.list();
+ for (String name : children) {
+ File f = new File(dir, name + File.separator + "libjava.so");
+ if (f.exists()) {
+ archs.add(name);
+ }
+ }
+ }
+ } else {
+ // Windows - append the os.arch
+ archs.add(System.getProperty("os.arch"));
+ }
+ jreArchs = archs.toArray(new String[0]);
+ return jreArchs;
+ }
+
+ /**
+ * Return the zonename if zone is supported; otherwise, return
+ * "global".
+ */
+ private static String getZoneName() throws IOException {
+ String zonename = "global";
+
+ String command = "/usr/bin/zonename";
+ File f = new File(command);
+ // com.sun.servicetag package has to be compiled with JDK 5 as well
+ // JDK 5 doesn't support the File.canExecute() method.
+ // Risk not checking isExecute() for the zonename command is very low.
+ if (f.exists()) {
+ ProcessBuilder pb = new ProcessBuilder(command);
+ Process p = pb.start();
+ String output = commandOutput(p);
+ if (p.exitValue() == 0) {
+ zonename = output.trim();
+ }
+
+ }
+ return zonename;
+ }
+
+ private synchronized static String getRegisterHtmlParent() throws IOException {
+ if (registerHtmlParent == null) {
+ File htmlDir; // register.html is put under the JDK directory
+ if (getJrePath().endsWith(File.separator + "jre")) {
+ htmlDir = new File(getJrePath(), "..");
+ } else {
+ // j2se non-image build
+ htmlDir = new File(getJrePath());
+ }
+
+ // initialize the supported locales
+ initSupportedLocales(htmlDir);
+
+ // Determine the location of the offline registration page
+ String path = System.getProperty(SVCTAG_DIR_PATH);
+ if (path == null) {
+ // Default is <JDK>/register.html
+ registerHtmlParent = htmlDir.getCanonicalPath();
+ } else {
+ File f = new File(path);
+ registerHtmlParent = f.getCanonicalPath();
+ if (!f.isDirectory()) {
+ throw new InternalError("Path " + path + " set in \"" +
+ SVCTAG_DIR_PATH + "\" property is not a directory");
+ }
+ }
+ }
+ return registerHtmlParent;
+ }
+
+ /**
+ * Returns the File object of the offline registration page localized
+ * for the default locale in the JDK directory.
+ */
+ static synchronized File getRegistrationHtmlPage() throws IOException {
+ if (!supportRegistration) {
+ // No register.html page generated if JRE
+ return null;
+ }
+
+ String parent = getRegisterHtmlParent();
+
+ // check if the offline registration page is already generated
+ File f = new File(parent, REGISTRATION_HTML_NAME + ".html");
+ if (!f.exists()) {
+ // Generate the localized version of the offline registration Page
+ generateRegisterHtml(parent);
+ }
+
+ String name = REGISTRATION_HTML_NAME;
+ Locale locale = getDefaultLocale();
+ if (!locale.equals(Locale.ENGLISH) && supportedLocales.contains(locale)) {
+ // if the locale is not English and is supported by JDK
+ // set to the appropriate offline registration page;
+ // otherwise,set to register.html.
+ name = REGISTRATION_HTML_NAME + "_" + locale.toString();
+ }
+ File htmlFile = new File(parent, name + ".html");
+ if (isVerbose()) {
+ System.out.print("Offline registration page: " + htmlFile);
+ System.out.println((htmlFile.exists() ?
+ "" : " not exist. Use register.html"));
+ }
+ if (htmlFile.exists()) {
+ return htmlFile;
+ } else {
+ return new File(parent,
+ REGISTRATION_HTML_NAME + ".html");
+ }
+ }
+
+ private static Locale getDefaultLocale() {
+ List<Locale> candidateLocales = getCandidateLocales(Locale.getDefault());
+ for (Locale l : candidateLocales) {
+ if (supportedLocales.contains(l)) {
+ return l;
+ }
+ }
+ return Locale.getDefault();
+ }
+
+ private static List<Locale> getCandidateLocales(Locale locale) {
+ String language = locale.getLanguage();
+ String country = locale.getCountry();
+ String variant = locale.getVariant();
+
+ List<Locale> locales = new ArrayList<Locale>(3);
+ if (variant.length() > 0) {
+ locales.add(locale);
+ }
+ if (country.length() > 0) {
+ locales.add((locales.size() == 0) ?
+ locale : new Locale(language, country, ""));
+ }
+ if (language.length() > 0) {
+ locales.add((locales.size() == 0) ?
+ locale : new Locale(language, "", ""));
+ }
+ return locales;
+ }
+
+ // Remove the offline registration pages
+ private static void deleteRegistrationHtmlPage() throws IOException {
+ String parent = getRegisterHtmlParent();
+ if (parent == null) {
+ return;
+ }
+
+ for (Locale locale : supportedLocales) {
+ String name = REGISTRATION_HTML_NAME;
+ if (!locale.equals(Locale.ENGLISH)) {
+ name += "_" + locale.toString();
+ }
+ File f = new File(parent, name + ".html");
+ if (f.exists()) {
+ if (!f.delete()) {
+ throw new IOException("Failed to delete " + f);
+ }
+ }
+ }
+ }
+
+ private static void initSupportedLocales(File jdkDir) {
+ if (supportedLocales.isEmpty()) {
+ // initialize with the known supported locales
+ for (Locale l : knownSupportedLocales) {
+ supportedLocales.add(l);
+ }
+ }
+
+ // Determine unknown supported locales if any
+ // by finding the localized version of README.html
+ // This prepares if a new locale in JDK is supported in
+ // e.g. in the OpenSource world
+ FilenameFilter ff = new FilenameFilter() {
+ public boolean accept(File dir, String name) {
+ String fname = name.toLowerCase();
+ if (fname.startsWith("readme") && fname.endsWith(".html")) {
+ return true;
+ }
+ return false;
+ }
+ };
+
+ String[] readmes = jdkDir.list(ff);
+ for (String name : readmes) {
+ String basename = name.substring(0, name.length() - ".html".length());
+ String[] ss = basename.split("_");
+ switch (ss.length) {
+ case 1:
+ // English version
+ break;
+ case 2:
+ supportedLocales.add(new Locale(ss[1]));
+ break;
+ case 3:
+ supportedLocales.add(new Locale(ss[1], ss[2]));
+ break;
+ default:
+ // ignore
+ break;
+ }
+ }
+ if (isVerbose()) {
+ System.out.println("Supported locales: ");
+ for (Locale l : supportedLocales) {
+ System.out.println(l);
+ }
+ }
+ }
+
+ private static final String JDK_HEADER_PNG_KEY = "@@JDK_HEADER_PNG@@";
+ private static final String JDK_VERSION_KEY = "@@JDK_VERSION@@";
+ private static final String REGISTRATION_URL_KEY = "@@REGISTRATION_URL@@";
+ private static final String REGISTRATION_PAYLOAD_KEY = "@@REGISTRATION_PAYLOAD@@";
+
+ @SuppressWarnings("unchecked")
+ private static void generateRegisterHtml(String parent) throws IOException {
+ int version = Util.getJdkVersion();
+ int update = Util.getUpdateVersion();
+ String jdkVersion = "Version " + version;
+ if (update > 0) {
+ // product name is not translated
+ jdkVersion += " Update " + update;
+ }
+ RegistrationData regData = getRegistrationData();
+ // Make sure it uses the canonical path before getting the URI.
+ File img = new File(svcTagDir.getCanonicalPath(), "jdk_header.png");
+ String headerImageSrc = img.toURI().toString();
+
+ // Format the registration data in one single line
+ StringBuilder payload = new StringBuilder();
+ String xml = regData.toString().replaceAll("\"", "%22");
+ BufferedReader reader = new BufferedReader(new StringReader(xml));
+ try {
+ String line = null;
+ while ((line = reader.readLine()) != null) {
+ payload.append(line.trim());
+ }
+ } finally {
+ reader.close();
+ }
+
+ String resourceFilename = "/com/sun/servicetag/resources/register";
+ for (Locale locale : supportedLocales) {
+ String name = REGISTRATION_HTML_NAME;
+ String resource = resourceFilename;
+ if (!locale.equals(Locale.ENGLISH)) {
+ name += "_" + locale.toString();
+ resource += "_" + locale.toString();
+ }
+ File f = new File(parent, name + ".html");
+ InputStream in = null;
+ BufferedReader br = null;
+ PrintWriter pw = null;
+ String registerURL = SunConnection.
+ getRegistrationURL(regData.getRegistrationURN(),
+ locale,
+ String.valueOf(version)).toString();
+ try {
+ in = Installer.class.getClass().getResourceAsStream(resource + ".html");
+ if (in == null) {
+ // if the resource file is missing
+ if (isVerbose()) {
+ System.out.println("Missing resouce file: " + resource + ".html");
+ }
+ continue;
+ }
+ if (isVerbose()) {
+ System.out.println("Generating " + f + " from " + resource + ".html");
+ }
+
+ br = new BufferedReader(new InputStreamReader(in, "UTF-8"));
+ pw = new PrintWriter(f, "UTF-8");
+ String line = null;
+ while ((line = br.readLine()) != null) {
+ String output = line;
+ if (line.contains(JDK_VERSION_KEY)) {
+ output = line.replace(JDK_VERSION_KEY, jdkVersion);
+ } else if (line.contains(JDK_HEADER_PNG_KEY)) {
+ output = line.replace(JDK_HEADER_PNG_KEY, headerImageSrc);
+ } else if (line.contains(REGISTRATION_URL_KEY)) {
+ output = line.replace(REGISTRATION_URL_KEY, registerURL);
+ } else if (line.contains(REGISTRATION_PAYLOAD_KEY)) {
+ output = line.replace(REGISTRATION_PAYLOAD_KEY, payload.toString());
+ }
+ pw.println(output);
+ }
+ f.setReadOnly();
+ pw.flush();
+ } finally {
+ if (pw != null) {
+ pw.close();
+ }
+ if (in != null) {
+ in.close();
+ }
+ if (br!= null) {
+ br.close();
+ }
+ }
+ }
+ }
+
+ private static final int MAX_SOURCE_LEN = 63;
+
+ /**
+ * A utility class to create a service tag for Java SE.
+ * <p>
+ * <b>Usage:</b><br>
+ * <blockquote><tt>
+ * <JAVA_HOME>/bin/java com.sun.servicetag.Installer
+ * </tt></blockquote>
+ * <p>
+ */
+ public static void main(String[] args) {
+ String source = "Manual ";
+ String runtimeName = System.getProperty("java.runtime.name");
+ if (runtimeName.startsWith("OpenJDK")) {
+ source = "OpenJDK ";
+ }
+ source += System.getProperty("java.runtime.version");
+ if (source.length() > MAX_SOURCE_LEN) {
+ source = source.substring(0, MAX_SOURCE_LEN);
+ }
+
+ // Parse the options (arguments starting with "-" )
+ boolean delete = false;
+ boolean update = false;
+ boolean register = false;
+ int count = 0;
+ while (count < args.length) {
+ String arg = args[count];
+ if (arg.trim().length() == 0) {
+ // skip empty arguments
+ count++;
+ continue;
+ }
+
+ if (arg.equals("-source")) {
+ source = args[++count];
+ } else if (arg.equals("-delete")) {
+ delete = true;
+ } else if (arg.equals("-register")) {
+ register = true;
+ } else {
+ usage();
+ return;
+ }
+ count++;
+ }
+ try {
+ if (delete) {
+ deleteRegistrationData();
+ } else {
+ ServiceTag[] javaSvcTags = getJavaServiceTagArray();
+ String[] archs = getJreArchs();
+ if (javaSvcTags.length > archs.length) {
+ // 64-bit has been uninstalled
+ // so remove the service tag
+ updateRegistrationData(source);
+ } else {
+ // create the service tag
+ createServiceTag(source);
+ }
+ }
+
+ if (register) {
+ // Registration is only supported by JDK
+ // For testing purpose, override with a "servicetag.enable.registration" property
+
+ RegistrationData regData = getRegistrationData();
+ if (supportRegistration && !regData.getServiceTags().isEmpty()) {
+ SunConnection.register(regData,
+ getDefaultLocale(),
+ String.valueOf(Util.getJdkVersion()));
+ }
+ }
+ System.exit(0);
+ } catch (IOException e) {
+ System.err.println("I/O Error: " + e.getMessage());
+ if (isVerbose()) {
+ e.printStackTrace();
+ }
+ } catch (IllegalArgumentException ex) {
+ if (isVerbose()) {
+ ex.printStackTrace();
+ }
+ } catch (Exception e) {
+ System.err.println("Error: " + e.getMessage());
+ if (isVerbose()) {
+ e.printStackTrace();
+ }
+ }
+ System.exit(1);
+ }
+
+ private static void usage() {
+ System.out.println("Usage:");
+ System.out.print(" " + Installer.class.getName());
+ System.out.println(" [-delete|-source <source>|-register]");
+ System.out.println(" to create a service tag for the Java platform");
+ System.out.println("");
+ System.out.println("Internal Options:");
+ System.out.println(" -source: to specify the source of the service tag to be created");
+ System.out.println(" -delete: to delete the service tag ");
+ System.out.println(" -register: to register the JDK");
+ System.out.println(" -help: to print this help message");
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/servicetag/LinuxSystemEnvironment.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,193 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.servicetag;
+
+// This class is a copy of the com.sun.scn.servicetags.LinuxSystemEnvironment
+// class from the Sun Connection source.
+//
+// The Service Tags team maintains the latest version of the implementation
+// for system environment data collection. JDK will include a copy of
+// the most recent released version for a JDK release. We rename
+// the package to com.sun.servicetag so that the Sun Connection
+// product always uses the latest version from the com.sun.scn.servicetags
+// package. JDK and users of the com.sun.servicetag API
+// (e.g. NetBeans and SunStudio) will use the version in JDK.
+//
+// So we keep this class in src/share/classes instead of src/<os>/classes.
+
+import java.io.*;
+
+/**
+ * Linux implementation of the SystemEnvironment class.
+ */
+class LinuxSystemEnvironment extends SystemEnvironment {
+ LinuxSystemEnvironment() {
+ setHostId(getLinuxHostId());
+ setSystemModel(getCommandOutput("/bin/uname", "-i"));
+ setSystemManufacturer(getLinuxSystemManufacturer());
+ setCpuManufacturer(getLinuxCpuManufacturer());
+ setSerialNumber(getLinuxSN());
+ }
+ private String dmiInfo = null;
+
+ private static final int SN = 1;
+ private static final int SYS = 2;
+ private static final int CPU = 3;
+
+ private String getLinuxHostId() {
+ String output = getCommandOutput("/usr/bin/hostid");
+ // trim off the leading 0x
+ if (output.startsWith("0x")) {
+ output = output.substring(2);
+ }
+ return output;
+ }
+
+ /**
+ * Tries to obtain and return the cpu manufacturer.
+ * @return The cpu manufacturer (an empty string if not found or an error occurred)
+ */
+ private String getLinuxCpuManufacturer() {
+ String tmp = getLinuxPSNInfo(CPU);
+ if (tmp.length() > 0) {
+ return tmp;
+ }
+
+ String contents = getFileContent("/proc/cpuinfo");
+ for (String line : contents.split("\n")) {
+ if (line.contains("vendor_id")) {
+ String[] ss = line.split(":", 2);
+ if (ss.length > 1) {
+ return ss[1].trim();
+ }
+ }
+ }
+
+ // returns an empty string if it can't be found or an error happened
+ return getLinuxDMIInfo("dmi type 4", "manufacturer");
+ }
+
+
+ /**
+ * Tries to obtain and return the system manufacturer.
+ * @return The system manufacturer (an empty string if not found or an error occurred)
+ */
+ private String getLinuxSystemManufacturer() {
+ String tmp = getLinuxPSNInfo(SYS);
+ if (tmp.length() > 0) {
+ return tmp;
+ }
+
+ // returns an empty string if it can't be found or an error happened
+ return getLinuxDMIInfo("dmi type 1", "manufacturer");
+ }
+
+ /**
+ * Tries to obtain and return the serial number of the system.
+ * @return The serial number (an empty string if not found or an error occurred)
+ */
+ private String getLinuxSN() {
+ String tmp = getLinuxPSNInfo(SN);
+ if (tmp.length() > 0) {
+ return tmp;
+ }
+
+ // returns an empty string if it can't be found or an error happened
+ return getLinuxDMIInfo("dmi type 1", "serial number");
+ }
+
+ private String getLinuxPSNInfo(int target) {
+ // try to read from the psn file if it exists
+ String contents = getFileContent("/var/run/psn");
+ String[] ss = contents.split("\n");
+ if (target <= ss.length) {
+ return ss[target-1];
+ }
+
+ // default case is to return ""
+ return "";
+ }
+
+ // reads from dmidecode with the given type and target
+ // returns an empty string if nothing was found or an error occurred
+ //
+ // Sample output segment:
+ // Handle 0x0001
+ // DMI type 1, 25 bytes.
+ // System Information
+ // Manufacturer: System manufacturer
+ // Product Name: System Product Name
+ // Version: System Version
+ // Serial Number: System Serial Number
+ // UUID: 3091D719-B25B-D911-959D-6D1B12C7686E
+ // Wake-up Type: Power Switch
+
+ private synchronized String getLinuxDMIInfo(String dmiType, String target) {
+ // only try to get dmidecode information once, after that, we can
+ // reuse the output
+ if (dmiInfo == null) {
+ Thread dmidecodeThread = new Thread() {
+ public void run() {
+ dmiInfo = getCommandOutput("/usr/sbin/dmidecode");
+ }
+ };
+ dmidecodeThread.start();
+
+ try {
+ dmidecodeThread.join(2000);
+ if (dmidecodeThread.isAlive()) {
+ dmidecodeThread.interrupt();
+ dmiInfo = "";
+ }
+ } catch (InterruptedException ie) {
+ dmidecodeThread.interrupt();
+ }
+ }
+
+ if (dmiInfo.length() == 0) {
+ return "";
+ }
+ boolean dmiFlag = false;
+ for (String s : dmiInfo.split("\n")) {
+ String line = s.toLowerCase();
+ if (dmiFlag) {
+ if (line.contains(target)) {
+ String key = target + ":";
+ int indx = line.indexOf(key) + key.length();
+ if (line.contains(key) && indx < line.length()) {
+ return line.substring(indx).trim();
+ }
+ String[] ss = line.split(":");
+ return ss[ss.length-1];
+ }
+ } else if (line.contains(dmiType)) {
+ dmiFlag = true;
+ }
+ }
+ return "";
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/servicetag/RegistrationData.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,475 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.servicetag;
+
+import java.io.*;
+import java.net.UnknownHostException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+
+import static com.sun.servicetag.RegistrationDocument.*;
+
+/**
+ * A {@code RegistrationData} object is a container of one or more
+ * {@link #getServiceTags service tags} that identify the
+ * components for product registration.
+ * Each {@code RegistrationData} object has a {@link #getRegistrationURN
+ * uniform resource name} (URN) as its identifier.
+ * <a name="EnvMap"></a>
+ * It also has an <i>environment map</i> with
+ * the following elements:
+ * <blockquote>
+ * <table border=0>
+ * <tr>
+ * <td><tt>hostname</tt></td>
+ * <td>Hostname of the system</td>
+ * <td>e.g. woody</td>
+ * </tr>
+ * <tr>
+ * <td><tt>hostId</tt></td>
+ * <td>Host ID of the system</td>
+ * <td>e.g. 83abc1ab</td>
+ * </tr>
+ * <tr>
+ * <td><tt>osName</tt></td>
+ * <td>Operating system name</td>
+ * <td> e.g. SunOS</td>
+ * </tr>
+ * <tr>
+ * <td><tt>osVersion</tt></td>
+ * <td>Operating system version</td>
+ * <td> e.g. 5.10</td>
+ * </tr>
+ * <tr>
+ * <td><tt>osArchitecture</tt></td>
+ * <td>Operating system architecture</td>
+ * <td> e.g. sparc</td>
+ * </tr>
+ * <tr>
+ * <td><tt>systemModel</tt></td>
+ * <td>System model</td>
+ * <td> e.g. SUNW,Sun-Fire-V440</td>
+ * </tr>
+ * <tr>
+ * <td><tt>systemManufacturer</tt></td>
+ * <td>System manufacturer</td>
+ * <td> e.g. Sun Microsystems</td>
+ * </tr>
+ * <tr>
+ * <td><tt>cpuManufacturer</tt></td>
+ * <td>CPU manufacturer</td>
+ * <td> e.g. Sun Microsystems</td>
+ * </tr>
+ * <tr>
+ * <td><tt>serialNumber</tt></td>
+ * <td>System serial number</td>
+ * <td> e.g. BEL078932</td>
+ * </tr>
+ * </table>
+ * </blockquote>
+ * The <tt>hostname</tt> and <tt>osName</tt> element must have a non-empty value.
+ * If an element is not available on a system and their value will be
+ * empty.
+ * <p>
+ * <a name="XMLSchema">
+ * <b>Registration XML Schema</b></a>
+ * <p>
+ * A {@code RegistrationData} object can be {@link #loadFromXML loaded} from
+ * and {@link #storeToXML stored} into an XML file in the format described
+ * by the
+ * <a href="https://sn-tools.central.sun.com/twiki/pub/ServiceTags/RegistrationRelayService/product_registration.xsd">
+ * registration data schema</a>. The registration data schema is defined by the
+ * Service Tags Technology.
+ * <p>
+ * Typically the registration data is constructed at installation time
+ * and stored in an XML file for later service tag lookup or registration.
+ *
+ * <p>
+ * <b>Example Usage</b>
+ * <p>
+ * The examples below show how the {@code RegistrationData} can be
+ * used for product registration.
+ * Exception handling is not shown in these examples for clarity.
+ * <ol>
+ * <li>This example shows how the JDK creates a JDK service tag, installs it
+ * in the system service tag registry and adds it to the registration data.
+ * <br>
+ * <blockquote><pre>
+ * // create a service tag object with an instance_urn
+ * ServiceTag st = ServiceTag.newInstance(ServiceTag.generateInstanceURN(),
+ * ....);
+ * // Adds to the system service tag registry if supported
+ * if (Registry.isSupported()) {
+ * Registry.getSystemRegistry().addServiceTag(st);
+ * }
+ *
+ * // add to the registration data
+ * RegistrationData registration = new RegistrationData();
+ * registration.addServiceTag(st);
+ * </pre></blockquote>
+ * </li>
+ * <li>At this point, the registration data is ready to
+ * send to Sun Connection for registration. This example shows how to register
+ * the JDK via the <i>Registration Relay Service</i>.
+ * <p>
+ * There are several registration services for Sun Connection. For example,
+ * the <a href="https://sn-tools.central.sun.com/twiki/bin/view/ServiceTags/RegistrationRelayService">
+ * Registration Relay Service</a> is a web application interface that
+ * processes the registration data payload sent via HTTP post
+ * and hosts the registration user interface for a specified
+ * registration URL. Refer to the
+ * Registration Relay Service Specification for details.
+ * <p>
+ * <blockquote><pre>
+ * // Open the connection to the URL of the registration service
+ * HttpsURLConnection con = (HttpsURLConnection) url.openConnection();
+ * con.setDoInput(true);
+ * con.setDoOutput(true);
+ * con.setUseCaches(false);
+ * con.setAllowUserInteraction(false);
+ * con.setRequestMethod("POST");
+ * con.setRequestProperty("Content-Type", "text/xml;charset=\"utf-8\"");
+ * con.connect();
+ *
+ * // send the registration data to the registration service
+ * OutputStream out = con.getOutputStream();
+ * registration.storeToXML(out);
+ * out.close();
+ * </pre></blockquote>
+ * </li>
+ * <li>This example shows how to store the registration data in an XML file.
+ * for later service tag lookup or registration.
+ * <br>
+ * <blockquote><pre>
+ * BufferedOutputStream out = new BufferedOutputStream(
+ * new FileOutputStream(""<JAVA_HOME>/lib/servicetag/registration.xml"));
+ * registration.storeToXML(out);
+ * out.close();
+ * </pre></blockquote>
+ * </li>
+ * <li>This example shows how to install service tags that are in the
+ * registration data in the system service tag registry when determined
+ * to be available. The system service tag registry might not have existed
+ * when the registration data was constructed.
+ * <br>
+ * <blockquote><pre>
+ * if (Registry.isSupported()) {
+ * Set<ServiceTag> svctags = registration.getServiceTags();
+ * for (ServiceTag st : svctags) {
+ * Registry.getSystemRegistry().addServiceTag(st);
+ * }
+ * }
+ * </pre></blockquote>
+ * </li>
+ * </ol>
+ *
+ * @see <a href="https://sunconnection.sun.com/inventory">Sun Connection Inventory Channel</a>
+ */
+public class RegistrationData {
+ private final Map<String, String> environment = initEnvironment();
+ private final Map<String, ServiceTag> svcTagMap =
+ new LinkedHashMap<String, ServiceTag>();
+ private final String urn;
+
+ /**
+ * Creates a {@code RegistrationData} object with a generated
+ * {@link #getRegistrationURN registration URN}.
+ * The following keys in the {@link #getEnvironmentMap environment map}
+ * will be initialized for the configuration of the
+ * running system:
+ * <blockquote>
+ * <tt>hostname</tt>, <tt>osName</tt>, <tt>osVersion</tt> and
+ * <tt>osArchitecture</tt>
+ * </blockquote>
+ * and the value of other keys may be empty.
+ */
+ public RegistrationData() {
+ this(Util.generateURN());
+ SystemEnvironment sysEnv = SystemEnvironment.getSystemEnvironment();
+ setEnvironment(ST_NODE_HOSTNAME, sysEnv.getHostname());
+ setEnvironment(ST_NODE_HOST_ID, sysEnv.getHostId());
+ setEnvironment(ST_NODE_OS_NAME, sysEnv.getOsName());
+ setEnvironment(ST_NODE_OS_VERSION, sysEnv.getOsVersion());
+ setEnvironment(ST_NODE_OS_ARCH, sysEnv.getOsArchitecture());
+ setEnvironment(ST_NODE_SYSTEM_MODEL, sysEnv.getSystemModel());
+ setEnvironment(ST_NODE_SYSTEM_MANUFACTURER, sysEnv.getSystemManufacturer());
+ setEnvironment(ST_NODE_CPU_MANUFACTURER, sysEnv.getCpuManufacturer());
+ setEnvironment(ST_NODE_SERIAL_NUMBER, sysEnv.getSerialNumber());
+ }
+
+ // package private
+ RegistrationData(String urn) {
+ this.urn = urn;
+ }
+
+ private Map<String, String> initEnvironment() {
+ Map<String, String> map = new LinkedHashMap<String, String>();
+ map.put(ST_NODE_HOSTNAME, "");
+ map.put(ST_NODE_HOST_ID, "");
+ map.put(ST_NODE_OS_NAME, "");
+ map.put(ST_NODE_OS_VERSION, "");
+ map.put(ST_NODE_OS_ARCH, "");
+ map.put(ST_NODE_SYSTEM_MODEL, "");
+ map.put(ST_NODE_SYSTEM_MANUFACTURER, "");
+ map.put(ST_NODE_CPU_MANUFACTURER, "");
+ map.put(ST_NODE_SERIAL_NUMBER, "");
+ return map;
+ }
+
+ /**
+ * Returns the uniform resource name of this registration data
+ * in this format:
+ * <tt>urn:st:<32-char {@link java.util.UUID uuid}></tt>
+ *
+ * @return the URN of this registration data.
+ */
+ public String getRegistrationURN() {
+ return urn;
+ }
+
+ /**
+ * Returns a map containing the environment information for this
+ * registration data. See the set of <a href="#EnvMap">keys</a>
+ * in the environment map. Subsequent update to the environment
+ * map via the {@link #setEnvironment setEnvironment} method will not be reflected
+ * in the returned map.
+ *
+ * @return an environment map for this registration data.
+ */
+ public Map<String, String> getEnvironmentMap() {
+ return new LinkedHashMap<String,String>(environment);
+ }
+
+ /**
+ * Sets an element of the specified {@code name} in the environment map
+ * with the given {@code value}.
+ *
+ * @throws IllegalArgumentException if {@code name} is not a valid key
+ * in the environment map, or {@code value} is not valid.
+ */
+ public void setEnvironment(String name, String value) {
+ if (name == null) {
+ throw new NullPointerException("name is null");
+ }
+ if (value == null) {
+ throw new NullPointerException("value is null");
+ }
+ if (environment.containsKey(name)) {
+ if (name.equals(ST_NODE_HOSTNAME) || name.equals(ST_NODE_OS_NAME)) {
+ if (value.length() == 0) {
+ throw new IllegalArgumentException("\"" +
+ name + "\" requires non-empty value.");
+ }
+ }
+ environment.put(name, value);
+ } else {
+ throw new IllegalArgumentException("\"" +
+ name + "\" is not an environment element.");
+ }
+ }
+
+ /**
+ * Returns all service tags in this registration data.
+ *
+ * @return a {@link Set Set} of the service tags
+ * in this registration data.
+ */
+ public Set<ServiceTag> getServiceTags() {
+ return new HashSet<ServiceTag>(svcTagMap.values());
+ }
+
+ /**
+ * Adds a service tag to this registration data.
+ * If the given service tag has an empty <tt>instance_urn</tt>,
+ * this method will generate a URN and place it in the copy
+ * of the service tag in this registration data.
+ * This method will return the {@code ServiceTag} object
+ * added to this registration data.
+ *
+ * @param st {@code ServiceTag} object to be added.
+ * @return a {@code ServiceTag} object added to this registration data.
+ *
+ * @throws IllegalArgumentException if
+ * a service tag of the same {@link ServiceTag#getInstanceURN
+ * <tt>instance_urn</tt>} already exists in the registry.
+ */
+ public synchronized ServiceTag addServiceTag(ServiceTag st) {
+ ServiceTag svcTag = ServiceTag.newInstanceWithUrnTimestamp(st);
+
+ String instanceURN = svcTag.getInstanceURN();
+ if (svcTagMap.containsKey(instanceURN)) {
+ throw new IllegalArgumentException("Instance_urn = " + instanceURN +
+ " already exists in the registration data.");
+ } else {
+ svcTagMap.put(instanceURN, svcTag);
+ }
+ return svcTag;
+ }
+
+ /**
+ * Returns a service tag of the given <tt>instance_urn</tt> in this registration
+ * data.
+ *
+ * @param instanceURN the <tt>instance_urn</tt> of the service tag
+ * @return the {@code ServiceTag} object of the given <tt>instance_urn</tt>
+ * if exists; otherwise return {@code null}.
+ */
+ public synchronized ServiceTag getServiceTag(String instanceURN) {
+ if (instanceURN == null) {
+ throw new NullPointerException("instanceURN is null");
+ }
+ return svcTagMap.get(instanceURN);
+ }
+
+ /**
+ * Removes a service tag of the given <tt>instance_urn</tt> from this
+ * registration data.
+ *
+ * @param instanceURN the <tt>instance_urn</tt> of
+ * the service tag to be removed.
+ *
+ * @return the removed {@code ServiceTag} object;
+ * or {@code null} if the service tag does not exist in this
+ * registration data.
+ */
+ public synchronized ServiceTag removeServiceTag(String instanceURN) {
+ if (instanceURN == null) {
+ throw new NullPointerException("instanceURN is null");
+ }
+
+ ServiceTag svcTag = null;
+ if (svcTagMap.containsKey(instanceURN)) {
+ svcTag = svcTagMap.remove(instanceURN);
+ }
+ return svcTag;
+ }
+
+ /**
+ * Updates the <tt>product_defined_instance_id</tt> in the service tag
+ * of the given <tt>instance_urn</tt> in this registration data.
+ *
+ * @param instanceURN the <tt>instance_urn</tt> of the service tag to be updated.
+ * @param productDefinedInstanceID the value of the
+ * <tt>product_defined_instance_id</tt> to be set.
+ *
+ * @return the updated {@code ServiceTag} object;
+ * or {@code null} if the service tag does not exist in this
+ * registration data.
+ */
+ public synchronized ServiceTag updateServiceTag(String instanceURN,
+ String productDefinedInstanceID) {
+ ServiceTag svcTag = getServiceTag(instanceURN);
+ if (svcTag == null) {
+ return null;
+ }
+
+ svcTag = ServiceTag.newInstanceWithUrnTimestamp(svcTag);
+ // update the product defined instance ID field
+ svcTag.setProductDefinedInstanceID(productDefinedInstanceID);
+ svcTagMap.put(instanceURN, svcTag);
+ return svcTag;
+ }
+
+ /**
+ * Reads the registration data from the XML document on the
+ * specified input stream. The XML document must be
+ * in the format described by the <a href="#XMLSchema">
+ * registration data schema</a>.
+ * The specified stream is closed after this method returns.
+ *
+ * @param in the input stream from which to read the XML document.
+ * @return a {@code RegistrationData} object read from the input
+ * stream.
+ *
+ * @throws IllegalArgumentException if the input stream
+ * contains an invalid registration data.
+ *
+ * @throws IOException if an error occurred when reading from the input stream.
+ */
+ public static RegistrationData loadFromXML(InputStream in) throws IOException {
+ try {
+ return RegistrationDocument.load(in);
+ } finally {
+ in.close();
+ }
+ }
+
+ /**
+ * Writes the registration data to the specified output stream
+ * in the format described by the <a href="#XMLSchema">
+ * registration data schema</a> with "UTF-8" encoding.
+ * The specified stream remains open after this method returns.
+ *
+ * @param os the output stream on which to write the XML document.
+ *
+ * @throws IOException if an error occurred when writing to the output stream.
+ */
+ public void storeToXML(OutputStream os) throws IOException {
+ RegistrationDocument.store(os, this);
+ os.flush();
+ }
+
+ /**
+ * Returns a newly allocated byte array containing the registration
+ * data in XML format.
+ *
+ * @return a newly allocated byte array containing the registration
+ * data in XML format.
+ */
+ public byte[] toXML() {
+ try {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ storeToXML(out);
+ return out.toByteArray();
+ } catch (IOException e) {
+ // should not reach here
+ return new byte[0];
+ }
+ }
+
+ /**
+ * Returns a string representation of this registration data in XML
+ * format.
+ *
+ * @return a string representation of this registration data in XML
+ * format.
+ */
+ @Override
+ public String toString() {
+ try {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ storeToXML(out);
+ return out.toString("UTF-8");
+ } catch (IOException e) {
+ // should not reach here
+ return "Error creating the return string.";
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/servicetag/RegistrationDocument.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,368 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.servicetag;
+
+import java.io.*;
+import java.net.URL;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+import org.xml.sax.InputSource;
+
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
+
+// For write operation
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+/**
+ * XML Support Class for Product Registration.
+ */
+class RegistrationDocument {
+
+ private static final String REGISTRATION_DATA_SCHEMA =
+ "/com/sun/servicetag/resources/product_registration.xsd";
+ private static final String REGISTRATION_DATA_VERSION = "1.0";
+ private static final String SERVICE_TAG_VERSION = "1.0";
+ final static String ST_NODE_REGISTRATION_DATA = "registration_data";
+ final static String ST_ATTR_REGISTRATION_VERSION = "version";
+ final static String ST_NODE_ENVIRONMENT = "environment";
+ final static String ST_NODE_HOSTNAME = "hostname";
+ final static String ST_NODE_HOST_ID = "hostId";
+ final static String ST_NODE_OS_NAME = "osName";
+ final static String ST_NODE_OS_VERSION = "osVersion";
+ final static String ST_NODE_OS_ARCH = "osArchitecture";
+ final static String ST_NODE_SYSTEM_MODEL = "systemModel";
+ final static String ST_NODE_SYSTEM_MANUFACTURER = "systemManufacturer";
+ final static String ST_NODE_CPU_MANUFACTURER = "cpuManufacturer";
+ final static String ST_NODE_SERIAL_NUMBER = "serialNumber";
+ final static String ST_NODE_REGISTRY = "registry";
+ final static String ST_ATTR_REGISTRY_URN = "urn";
+ final static String ST_ATTR_REGISTRY_VERSION = "version";
+ final static String ST_NODE_SERVICE_TAG = "service_tag";
+ final static String ST_NODE_INSTANCE_URN = "instance_urn";
+ final static String ST_NODE_PRODUCT_NAME = "product_name";
+ final static String ST_NODE_PRODUCT_VERSION = "product_version";
+ final static String ST_NODE_PRODUCT_URN = "product_urn";
+ final static String ST_NODE_PRODUCT_PARENT_URN = "product_parent_urn";
+ final static String ST_NODE_PRODUCT_PARENT = "product_parent";
+ final static String ST_NODE_PRODUCT_DEFINED_INST_ID = "product_defined_inst_id";
+ final static String ST_NODE_PRODUCT_VENDOR = "product_vendor";
+ final static String ST_NODE_PLATFORM_ARCH = "platform_arch";
+ final static String ST_NODE_TIMESTAMP = "timestamp";
+ final static String ST_NODE_CONTAINER = "container";
+ final static String ST_NODE_SOURCE = "source";
+ final static String ST_NODE_INSTALLER_UID = "installer_uid";
+
+ static RegistrationData load(InputStream in) throws IOException {
+ Document document = initializeDocument(in);
+
+ // Gets the registration URN
+ Element root = getRegistrationDataRoot(document);
+ Element registryRoot =
+ getSingletonElementFromRoot(root, ST_NODE_REGISTRY);
+ String urn = registryRoot.getAttribute(ST_ATTR_REGISTRY_URN);
+
+ // Construct a new RegistrationData object from the DOM tree
+ // Initialize the environment map and service tags
+ RegistrationData regData = new RegistrationData(urn);
+ addServiceTags(registryRoot, regData);
+
+ Element envRoot = getSingletonElementFromRoot(root, ST_NODE_ENVIRONMENT);
+ buildEnvironmentMap(envRoot, regData);
+ return regData;
+ }
+
+ static void store(OutputStream os, RegistrationData registration)
+ throws IOException {
+ // create a new document with the root node
+ Document document = initializeDocument();
+
+ // create the nodes for the environment map and the service tags
+ // in the registration data
+ addEnvironmentNodes(document,
+ registration.getEnvironmentMap());
+ addServiceTagRegistry(document,
+ registration.getRegistrationURN(),
+ registration.getServiceTags());
+ transform(document, os);
+ }
+
+ // initialize a document from an input stream
+ private static Document initializeDocument(InputStream in) throws IOException {
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ try {
+ // XML schema for validation
+ SchemaFactory sf = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+ URL xsdUrl = RegistrationDocument.class.getResource(REGISTRATION_DATA_SCHEMA);
+ Schema schema = sf.newSchema(xsdUrl);
+ Validator validator = schema.newValidator();
+
+ DocumentBuilder builder = factory.newDocumentBuilder();
+ Document doc = builder.parse(new InputSource(in));
+ validator.validate(new DOMSource(doc));
+ return doc;
+ } catch (SAXException sxe) {
+ IllegalArgumentException e = new IllegalArgumentException("Error generated in parsing");
+ e.initCause(sxe);
+ throw e;
+ } catch (ParserConfigurationException pce) {
+ // Parser with specific options can't be built
+ // should not reach here
+ InternalError x = new InternalError("Error in creating the new document");
+ x.initCause(pce);
+ throw x;
+ }
+ }
+
+ // initialize a new document for the registration data
+ private static Document initializeDocument() throws IOException {
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ try {
+ DocumentBuilder builder = factory.newDocumentBuilder();
+ Document doc = builder.newDocument();
+
+ // initialize the document with the registration_data root
+ Element root = doc.createElement(ST_NODE_REGISTRATION_DATA);
+ doc.appendChild(root);
+ root.setAttribute(ST_ATTR_REGISTRATION_VERSION, REGISTRATION_DATA_VERSION);
+
+ return doc;
+ } catch (ParserConfigurationException pce) {
+ // Parser with specified options can't be built
+ // should not reach here
+ InternalError x = new InternalError("Error in creating the new document");
+ x.initCause(pce);
+ throw x;
+ }
+ }
+
+ // Transform the current DOM tree with the given output stream.
+ private static void transform(Document document, OutputStream os) {
+ try {
+ // Use a Transformer for output
+ TransformerFactory tFactory = TransformerFactory.newInstance();
+ tFactory.setAttribute("indent-number", new Integer(3));
+
+ Transformer transformer = tFactory.newTransformer();
+
+ transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+ transformer.setOutputProperty(OutputKeys.METHOD, "xml");
+ transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+ transformer.setOutputProperty(OutputKeys.STANDALONE, "yes");
+ transformer.transform(new DOMSource(document),
+ new StreamResult(new BufferedWriter(new OutputStreamWriter(os, "UTF-8"))));
+ } catch (UnsupportedEncodingException ue) {
+ // Should not reach here
+ InternalError x = new InternalError("Error generated during transformation");
+ x.initCause(ue);
+ throw x;
+ } catch (TransformerConfigurationException tce) {
+ // Error generated by the parser
+ // Should not reach here
+ InternalError x = new InternalError("Error in creating the new document");
+ x.initCause(tce);
+ throw x;
+ } catch (TransformerException te) {
+ // Error generated by the transformer
+ InternalError x = new InternalError("Error generated during transformation");
+ x.initCause(te);
+ throw x;
+ }
+ }
+
+ private static void addServiceTagRegistry(Document document,
+ String registryURN,
+ Set<ServiceTag> svcTags) {
+ // add service tag registry node and its attributes
+ Element reg = document.createElement(ST_NODE_REGISTRY);
+ reg.setAttribute(ST_ATTR_REGISTRY_URN, registryURN);
+ reg.setAttribute(ST_ATTR_REGISTRY_VERSION, SERVICE_TAG_VERSION);
+
+ Element root = getRegistrationDataRoot(document);
+ root.appendChild(reg);
+
+ // adds the elements for the service tags
+ for (ServiceTag st : svcTags) {
+ addServiceTagElement(document, reg, st);
+ }
+ }
+
+ private static void addServiceTagElement(Document document,
+ Element registryRoot,
+ ServiceTag st) {
+ Element svcTag = document.createElement(ST_NODE_SERVICE_TAG);
+ registryRoot.appendChild(svcTag);
+ addChildElement(document, svcTag,
+ ST_NODE_INSTANCE_URN, st.getInstanceURN());
+ addChildElement(document, svcTag,
+ ST_NODE_PRODUCT_NAME, st.getProductName());
+ addChildElement(document, svcTag,
+ ST_NODE_PRODUCT_VERSION, st.getProductVersion());
+ addChildElement(document, svcTag,
+ ST_NODE_PRODUCT_URN, st.getProductURN());
+ addChildElement(document, svcTag,
+ ST_NODE_PRODUCT_PARENT_URN, st.getProductParentURN());
+ addChildElement(document, svcTag,
+ ST_NODE_PRODUCT_PARENT, st.getProductParent());
+ addChildElement(document, svcTag,
+ ST_NODE_PRODUCT_DEFINED_INST_ID,
+ st.getProductDefinedInstanceID());
+ addChildElement(document, svcTag,
+ ST_NODE_PRODUCT_VENDOR, st.getProductVendor());
+ addChildElement(document, svcTag,
+ ST_NODE_PLATFORM_ARCH, st.getPlatformArch());
+ addChildElement(document, svcTag,
+ ST_NODE_TIMESTAMP, Util.formatTimestamp(st.getTimestamp()));
+ addChildElement(document, svcTag,
+ ST_NODE_CONTAINER, st.getContainer());
+ addChildElement(document, svcTag,
+ ST_NODE_SOURCE, st.getSource());
+ addChildElement(document, svcTag,
+ ST_NODE_INSTALLER_UID,
+ String.valueOf(st.getInstallerUID()));
+ }
+
+ private static void addChildElement(Document document, Element root,
+ String element, String text) {
+ Element node = document.createElement(element);
+ node.appendChild(document.createTextNode(text));
+ root.appendChild(node);
+ }
+
+ // Constructs service tags from the document
+ private static void addServiceTags(Element registryRoot,
+ RegistrationData registration) {
+ NodeList children = registryRoot.getElementsByTagName(ST_NODE_SERVICE_TAG);
+ int length = (children == null ? 0 : children.getLength());
+ for (int i = 0; i < length; i++) {
+ Element svcTagElement = (Element) children.item(i);
+ ServiceTag st = getServiceTag(svcTagElement);
+ registration.addServiceTag(st);
+ }
+ }
+
+ // build environment map from the document
+ private static void buildEnvironmentMap(Element envRoot,
+ RegistrationData registration) {
+ registration.setEnvironment(ST_NODE_HOSTNAME, getTextValue(envRoot, ST_NODE_HOSTNAME));
+ registration.setEnvironment(ST_NODE_HOST_ID, getTextValue(envRoot, ST_NODE_HOST_ID));
+ registration.setEnvironment(ST_NODE_OS_NAME, getTextValue(envRoot, ST_NODE_OS_NAME));
+ registration.setEnvironment(ST_NODE_OS_VERSION, getTextValue(envRoot, ST_NODE_OS_VERSION));
+ registration.setEnvironment(ST_NODE_OS_ARCH, getTextValue(envRoot, ST_NODE_OS_ARCH));
+ registration.setEnvironment(ST_NODE_SYSTEM_MODEL, getTextValue(envRoot, ST_NODE_SYSTEM_MODEL));
+ registration.setEnvironment(ST_NODE_SYSTEM_MANUFACTURER, getTextValue(envRoot, ST_NODE_SYSTEM_MANUFACTURER));
+ registration.setEnvironment(ST_NODE_CPU_MANUFACTURER, getTextValue(envRoot, ST_NODE_CPU_MANUFACTURER));
+ registration.setEnvironment(ST_NODE_SERIAL_NUMBER, getTextValue(envRoot, ST_NODE_SERIAL_NUMBER));
+ }
+
+ // add the nodes representing the environment map in the document
+ private static void addEnvironmentNodes(Document document,
+ Map<String, String> envMap) {
+ Element root = getRegistrationDataRoot(document);
+ Element env = document.createElement(ST_NODE_ENVIRONMENT);
+ root.appendChild(env);
+ Set<Map.Entry<String, String>> keys = envMap.entrySet();
+ for (Map.Entry<String, String> entry : keys) {
+ addChildElement(document, env, entry.getKey(), entry.getValue());
+ }
+ }
+
+ private static Element getRegistrationDataRoot(Document doc) {
+ Element root = doc.getDocumentElement();
+ if (!root.getNodeName().equals(ST_NODE_REGISTRATION_DATA)) {
+ throw new IllegalArgumentException("Not a " +
+ ST_NODE_REGISTRATION_DATA +
+ " node \"" + root.getNodeName() + "\"");
+ }
+ return root;
+ }
+
+ private static Element getSingletonElementFromRoot(Element root, String name) {
+ NodeList children = root.getElementsByTagName(name);
+ int length = (children == null ? 0 : children.getLength());
+ if (length != 1) {
+ throw new IllegalArgumentException("Invalid number of " + name +
+ " nodes = " + length);
+ }
+ Element e = (Element) children.item(0);
+ if (!e.getNodeName().equals(name)) {
+ throw new IllegalArgumentException("Not a " + name +
+ " node \"" + e.getNodeName() + "\"");
+ }
+ return e;
+ }
+
+ // Constructs one ServiceTag instance from a service tag element root
+ private static ServiceTag getServiceTag(Element svcTagElement) {
+ return new ServiceTag(
+ getTextValue(svcTagElement, ST_NODE_INSTANCE_URN),
+ getTextValue(svcTagElement, ST_NODE_PRODUCT_NAME),
+ getTextValue(svcTagElement, ST_NODE_PRODUCT_VERSION),
+ getTextValue(svcTagElement, ST_NODE_PRODUCT_URN),
+ getTextValue(svcTagElement, ST_NODE_PRODUCT_PARENT),
+ getTextValue(svcTagElement, ST_NODE_PRODUCT_PARENT_URN),
+ getTextValue(svcTagElement, ST_NODE_PRODUCT_DEFINED_INST_ID),
+ getTextValue(svcTagElement, ST_NODE_PRODUCT_VENDOR),
+ getTextValue(svcTagElement, ST_NODE_PLATFORM_ARCH),
+ getTextValue(svcTagElement, ST_NODE_CONTAINER),
+ getTextValue(svcTagElement, ST_NODE_SOURCE),
+ Util.getIntValue(getTextValue(svcTagElement, ST_NODE_INSTALLER_UID)),
+ Util.parseTimestamp(getTextValue(svcTagElement, ST_NODE_TIMESTAMP))
+ );
+ }
+
+ private static String getTextValue(Element e, String tagName) {
+ String value = "";
+ NodeList nl = e.getElementsByTagName(tagName);
+ if (nl != null && nl.getLength() > 0) {
+ Element el = (Element) nl.item(0);
+ Node node = el.getFirstChild();
+ if (node != null) {
+ value = node.getNodeValue();
+ }
+ }
+ return value;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/servicetag/Registry.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,552 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.servicetag;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
+import static com.sun.servicetag.Util.*;
+import static com.sun.servicetag.RegistrationDocument.*;
+
+/**
+ * A service tag registry is a XML-based registry containing
+ * the list of {@link ServiceTag service tags} installed in the system.
+ * The {@code Registry} class provides interfaces
+ * to add, remove, update, and get a service tag from a service tag
+ * registry.
+ * This {@code Registry} class may not be supported
+ * on all systems. The {@link #isSupported} method
+ * can be called to determine if it is supported.
+ * <p>
+ * A registry may implement restrictions to only allow certain users
+ * to {@link #updateServiceTag update} and
+ * to {@link #removeServiceTag remove} a service tag record. Typically,
+ * only the owner of the service tag, the owner of the registry
+ * and superuser are authorized to update or remove a service tag in
+ * the registry.
+ *
+ * @see <a href="https://sn-tools.central.sun.com/twiki/bin/view/ServiceTags/ServiceTagDevGuideHelper">
+ * Service Tag User Guide</a>
+ */
+public class Registry {
+
+ private static final String STCLIENT_SOLARIS = "/usr/bin/stclient";
+ private static final String STCLIENT_LINUX = "/opt/sun/servicetag/bin/stclient";
+ // stclient exit value (see sthelper.h)
+ private static final int ST_ERR_NOT_AUTH = 245;
+ private static final int ST_ERR_REC_NOT_FOUND = 225;
+
+ // The stclient output has to be an exported interface
+ private static final String INSTANCE_URN_DESC = "Product instance URN=";
+ private static boolean initialized = false;
+ private static boolean supportsHelperClass = true; // default
+ private static File stclient = null;
+ private static String stclientPath = null;
+ private static Registry registry = new Registry();
+
+ // System properties for testing
+ private static String SVCTAG_STCLIENT_CMD = "servicetag.stclient.cmd";
+ private static String SVCTAG_STHELPER_SUPPORTED = "servicetag.sthelper.supported";
+
+ private Registry() {
+ }
+
+ private synchronized static String getSTclient() {
+ if (!initialized) {
+ // the system property always overrides the default setting
+ if (System.getProperty(SVCTAG_STHELPER_SUPPORTED) != null) {
+ supportsHelperClass = Boolean.getBoolean(SVCTAG_STHELPER_SUPPORTED);
+ }
+
+ // This is only used for testing
+ stclientPath = System.getProperty(SVCTAG_STCLIENT_CMD);
+ if (stclientPath != null) {
+ return stclientPath;
+ }
+
+ // Initialization to determine the platform's stclient pathname
+ String os = System.getProperty("os.name");
+ if (os.equals("SunOS")) {
+ stclient = new File(STCLIENT_SOLARIS);
+ } else if (os.equals("Linux")) {
+ stclient = new File(STCLIENT_LINUX);
+ } else if (os.startsWith("Windows")) {
+ stclient = getWindowsStClientFile();
+ } else {
+ if (isVerbose()) {
+ System.out.println("Running on non-Sun JDK");
+ }
+ }
+ initialized = true;
+ }
+
+ // com.sun.servicetag package has to be compiled with JDK 5 as well
+ // JDK 5 doesn't support the File.canExecute() method.
+ // Risk not checking isExecute() for the stclient command is very low.
+
+ if (stclientPath == null && stclient != null && stclient.exists()) {
+ stclientPath = stclient.getAbsolutePath();
+ }
+ return stclientPath;
+ }
+
+ /**
+ * Returns the system service tag registry. The {@code Registry} class
+ * may not be supported on some platforms; use the {@link #isSupported}
+ * method to determine if it is supported.
+ *
+ * @return the {@code Registry} object for the system service tag registry.
+ *
+ * @throws UnsupportedOperationException if the {@code Registry} class is
+ * not supported.
+ */
+ public static Registry getSystemRegistry() {
+ if (isSupported()) {
+ return registry;
+ } else {
+ throw new UnsupportedOperationException("Registry class is not supported");
+ }
+ }
+
+ /**
+ * Returns {@code true} if the {@code Registry} class is supported on this system.
+ *
+ * @return {@code true} if the {@code Registry} class is supported;
+ * otherwise, return {@code false}.
+ */
+ public static boolean isSupported() {
+ return (getSTclient() != null && supportsHelperClass);
+ }
+
+ private static List<String> getCommandList() {
+ // Set up the arguments to call stclient
+ List<String> command = new ArrayList<String>();
+ if (System.getProperty(SVCTAG_STCLIENT_CMD) != null) {
+ // This is for jtreg testing use. This will be set to something
+ // like:
+ // $JAVA_HOME/bin/java -cp $TEST_DIR \
+ // -Dstclient.registry.path=$TEST_DIR/registry.xml \
+ // SvcTagClient
+ //
+ // On Windows, the JAVA_HOME and TEST_DIR path could contain
+ // space e.g. c:\Program Files\Java\jdk1.6.0_05\bin\java.
+ // The SVCTAG_STCLIENT_CMD must be set with a list of
+ // space-separated parameters. If a parameter contains spaces,
+ // it must be quoted with '"'.
+
+ String cmd = getSTclient();
+ int len = cmd.length();
+ int i = 0;
+ while (i < len) {
+ char separator = ' ';
+ if (cmd.charAt(i) == '"') {
+ separator = '"';
+ i++;
+ }
+ // look for the separator or matched the closing '"'
+ int j;
+ for (j = i+1; j < len; j++) {
+ if (cmd.charAt(j) == separator) {
+ break;
+ }
+ }
+
+ if (i == j-1) {
+ // add an empty parameter
+ command.add("\"\"");
+ } else {
+ // double quotes and space are not included
+ command.add(cmd.substring(i,j));
+ }
+
+ // skip spaces
+ for (i = j+1; i < len; i++) {
+ if (!Character.isSpaceChar(cmd.charAt(i))) {
+ break;
+ }
+ }
+ }
+ if (isVerbose()) {
+ System.out.println("Command list:");
+ for (String s : command) {
+ System.out.println(s);
+ }
+ }
+ } else {
+ command.add(getSTclient());
+ }
+ return command;
+ }
+
+ // Returns null if the service tag record not found;
+ // or throw UnauthorizedAccessException or IOException
+ // based on the exitValue.
+ private static ServiceTag checkReturnError(int exitValue,
+ String output,
+ ServiceTag st) throws IOException {
+ switch (exitValue) {
+ case ST_ERR_REC_NOT_FOUND:
+ return null;
+ case ST_ERR_NOT_AUTH:
+ if (st != null) {
+ throw new UnauthorizedAccessException(
+ "Not authorized to access " + st.getInstanceURN() +
+ " installer_uid=" + st.getInstallerUID());
+ } else {
+ throw new UnauthorizedAccessException(
+ "Not authorized:" + output);
+ }
+ default:
+ throw new IOException("stclient exits with error" +
+ " (" + exitValue + ")\n" + output);
+ }
+ }
+
+ /**
+ * Adds a service tag to this registry.
+ * If the given service tag has an empty <tt>instance_urn</tt>,
+ * this helper class will generate a URN and place it in the
+ * copy of the service tag in this registry.
+ * This method will return the {@code ServiceTag} representing
+ * the service tag entry to this registry.
+ *
+ * @param st {@code ServiceTag} object
+ * @return a {@code ServiceTag} object representing the service tag
+ * entry to this registry.
+ *
+ * @throws IllegalArgumentException if a service tag of the same
+ * <tt>instance_urn</tt> already exists in this registry.
+ *
+ * @throws java.io.IOException if an I/O error occurs in this operation.
+ */
+ public ServiceTag addServiceTag(ServiceTag st) throws IOException {
+ List<String> command = getCommandList();
+ command.add("-a");
+ if (st.getInstanceURN().length() > 0) {
+ ServiceTag sysSvcTag = getServiceTag(st.getInstanceURN());
+ if (sysSvcTag != null) {
+ throw new IllegalArgumentException("Instance_urn = " +
+ st.getInstanceURN() + " already exists");
+ }
+ command.add("-i");
+ command.add(st.getInstanceURN());
+ }
+ command.add("-p");
+ command.add(st.getProductName());
+ command.add("-e");
+ command.add(st.getProductVersion());
+ command.add("-t");
+ command.add(st.getProductURN());
+ if (st.getProductParentURN().length() > 0) {
+ command.add("-F");
+ command.add(st.getProductParentURN());
+ }
+ command.add("-P");
+ command.add(st.getProductParent());
+ if (st.getProductDefinedInstanceID().length() > 0) {
+ command.add("-I");
+ command.add(st.getProductDefinedInstanceID());
+ }
+ command.add("-m");
+ command.add(st.getProductVendor());
+ command.add("-A");
+ command.add(st.getPlatformArch());
+ command.add("-z");
+ command.add(st.getContainer());
+ command.add("-S");
+ command.add(st.getSource());
+
+ BufferedReader in = null;
+ try {
+ ProcessBuilder pb = new ProcessBuilder(command);
+ Process p = pb.start();
+ String output = commandOutput(p);
+ if (isVerbose()) {
+ System.out.println("Output from stclient -a command:");
+ System.out.println(output);
+ }
+ String urn = "";
+ if (p.exitValue() == 0) {
+ // Obtain the instance urn from the stclient output
+ in = new BufferedReader(new StringReader(output));
+ String line = null;
+ while ((line = in.readLine()) != null) {
+ line = line.trim();
+ if (line.startsWith(INSTANCE_URN_DESC)) {
+ urn = line.substring(INSTANCE_URN_DESC.length());
+ break;
+ }
+ }
+ if (urn.length() == 0) {
+ throw new IOException("Error in creating service tag:\n" +
+ output);
+ }
+ return getServiceTag(urn);
+ } else {
+ return checkReturnError(p.exitValue(), output, st);
+ }
+ } finally {
+ if (in != null) {
+ in.close();
+ }
+ }
+ }
+
+ /**
+ * Removes a service tag of the given <tt>instance_urn</tt> from this
+ * registry.
+ *
+ * @param instanceURN the <tt>instance_urn</tt> of the service tag
+ * to be removed.
+ *
+ * @return the {@code ServiceTag} object removed from this registry;
+ * or {@code null} if the service tag does not exist in this registry.
+ *
+ * @throws UnauthorizedAccessException if the user is not authorized to
+ * remove the service tag of the given <tt>instance_urn</tt>
+ * from this registry.
+ *
+ * @throws java.io.IOException if an I/O error occurs in this operation.
+ */
+ public ServiceTag removeServiceTag(String instanceURN) throws IOException {
+ ServiceTag st = getServiceTag(instanceURN);
+ if (st == null) {
+ return null;
+ }
+
+ List<String> command = getCommandList();
+ command.add("-d");
+ command.add("-i");
+ command.add(instanceURN);
+
+ ProcessBuilder pb = new ProcessBuilder(command);
+ Process p = pb.start();
+ String output = commandOutput(p);
+ if (isVerbose()) {
+ System.out.println("Output from stclient -d command:");
+ System.out.println(output);
+ }
+ if (p.exitValue() == 0) {
+ return st;
+ } else {
+ return checkReturnError(p.exitValue(), output, st);
+ }
+ }
+
+ /**
+ * Updates the <tt>product_defined_instance_id</tt> in the service tag
+ * of the specified <tt>instance_urn</tt> in this registry.
+ *
+ * @param instanceURN the <tt>instance_urn</tt> of the service tag to be updated.
+ * @param productDefinedInstanceID the value of the
+ * <tt>product_defined_instance_id</tt> to be set.
+ *
+ * @return the updated {@code ServiceTag} object;
+ * or {@code null} if the service tag does not exist in this
+ * registry.
+ *
+ * @throws UnauthorizedAccessException if the user is not authorized to
+ * update the service tag from this registry.
+ *
+ * @throws IOException if an I/O error occurs in this operation.
+ */
+ public ServiceTag updateServiceTag(String instanceURN,
+ String productDefinedInstanceID)
+ throws IOException {
+ ServiceTag svcTag = getServiceTag(instanceURN);
+ if (svcTag == null) {
+ return null;
+ }
+
+ List<String> command = getCommandList();
+ command.add("-u");
+ command.add("-i");
+ command.add(instanceURN);
+ command.add("-I");
+ if (productDefinedInstanceID.length() > 0) {
+ command.add(productDefinedInstanceID);
+ } else {
+ command.add("\"\"");
+ }
+
+ ProcessBuilder pb = new ProcessBuilder(command);
+ Process p = pb.start();
+ String output = commandOutput(p);
+ if (isVerbose()) {
+ System.out.println("Output from stclient -u command:");
+ System.out.println(output);
+ }
+
+ if (p.exitValue() == 0) {
+ return getServiceTag(instanceURN);
+ } else {
+ return checkReturnError(p.exitValue(), output, svcTag);
+ }
+ }
+
+ /**
+ * Returns a {@code ServiceTag} object of the given <tt>instance_urn</tt>
+ * in this registry.
+ *
+ * @param instanceURN the <tt>instance_urn</tt> of the service tag
+ * @return a {@code ServiceTag} object of the given <tt>instance_urn</tt>
+ * in this registry; or {@code null} if not found.
+ *
+ * @throws java.io.IOException if an I/O error occurs in this operation.
+ */
+ public ServiceTag getServiceTag(String instanceURN) throws IOException {
+ if (instanceURN == null) {
+ throw new NullPointerException("instanceURN is null");
+ }
+
+ List<String> command = getCommandList();
+ command.add("-g");
+ command.add("-i");
+ command.add(instanceURN);
+
+ ProcessBuilder pb = new ProcessBuilder(command);
+ Process p = pb.start();
+ String output = commandOutput(p);
+ if (isVerbose()) {
+ System.out.println("Output from stclient -g command:");
+ System.out.println(output);
+ }
+ if (p.exitValue() == 0) {
+ return parseServiceTag(output);
+ } else {
+ return checkReturnError(p.exitValue(), output, null);
+ }
+ }
+
+ private ServiceTag parseServiceTag(String output) throws IOException {
+ BufferedReader in = null;
+ try {
+ Properties props = new Properties();
+ // parse the service tag output from stclient
+ in = new BufferedReader(new StringReader(output));
+ String line = null;
+ while ((line = in.readLine()) != null) {
+ if ((line = line.trim()).length() > 0) {
+ String[] ss = line.trim().split("=", 2);
+ if (ss.length == 2) {
+ props.setProperty(ss[0].trim(), ss[1].trim());
+ } else {
+ props.setProperty(ss[0].trim(), "");
+ }
+ }
+ }
+
+ String urn = props.getProperty(ST_NODE_INSTANCE_URN);
+ String productName = props.getProperty(ST_NODE_PRODUCT_NAME);
+ String productVersion = props.getProperty(ST_NODE_PRODUCT_VERSION);
+ String productURN = props.getProperty(ST_NODE_PRODUCT_URN);
+ String productParent = props.getProperty(ST_NODE_PRODUCT_PARENT);
+ String productParentURN = props.getProperty(ST_NODE_PRODUCT_PARENT_URN);
+ String productDefinedInstanceID =
+ props.getProperty(ST_NODE_PRODUCT_DEFINED_INST_ID);
+ String productVendor = props.getProperty(ST_NODE_PRODUCT_VENDOR);
+ String platformArch = props.getProperty(ST_NODE_PLATFORM_ARCH);
+ String container = props.getProperty(ST_NODE_CONTAINER);
+ String source = props.getProperty(ST_NODE_SOURCE);
+ int installerUID =
+ Util.getIntValue(props.getProperty(ST_NODE_INSTALLER_UID));
+ Date timestamp =
+ Util.parseTimestamp(props.getProperty(ST_NODE_TIMESTAMP));
+
+ return new ServiceTag(urn,
+ productName,
+ productVersion,
+ productURN,
+ productParent,
+ productParentURN,
+ productDefinedInstanceID,
+ productVendor,
+ platformArch,
+ container,
+ source,
+ installerUID,
+ timestamp);
+ } finally {
+ if (in != null) {
+ in.close();
+ }
+ }
+
+ }
+
+ /**
+ * Returns the service tags of the specified
+ * <tt>product_urn</tt> in this registry.
+ *
+ * @param productURN the <tt>product_urn</tt> to look up
+ * @return a {@code Set} of {@code ServiceTag} objects
+ * of the specified <tt>product_urn</tt> in this registry.
+ *
+ * @throws java.io.IOException if an I/O error occurs in this operation.
+ */
+ public Set<ServiceTag> findServiceTags(String productURN) throws IOException {
+ if (productURN == null) {
+ throw new NullPointerException("productURN is null");
+ }
+
+ List<String> command = getCommandList();
+ command.add("-f");
+ command.add("-t");
+ command.add(productURN);
+
+ BufferedReader in = null;
+ try {
+ ProcessBuilder pb = new ProcessBuilder(command);
+ Process p = pb.start();
+ String output = commandOutput(p);
+
+ Set<ServiceTag> instances = new HashSet<ServiceTag>();
+ if (p.exitValue() == 0) {
+ // parse the service tag output from stclient
+ in = new BufferedReader(new StringReader(output));
+ String line = null;
+ while ((line = in.readLine()) != null) {
+ String s = line.trim();
+ if (s.startsWith("urn:st:")) {
+ instances.add(getServiceTag(s));
+ }
+ }
+ } else {
+ checkReturnError(p.exitValue(), output, null);
+ }
+ return instances;
+ } finally {
+ if (in != null) {
+ in.close();
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/servicetag/ServiceTag.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,634 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.servicetag;
+
+import java.util.Date;
+import java.io.IOException;
+import static com.sun.servicetag.RegistrationDocument.*;
+
+/**
+ * A service tag is an XML-based data structure that identifies a product or
+ * a component on a system. The service tag schema is defined by the
+ * Service Tags Technology. The location of the DTD file is platform dependent.
+ * On Solaris, see <tt>/usr/share/lib/xml/dtd/servicetag.dtd</tt>.
+ * <p>
+ * A valid {@code ServiceTag} instance must comply to the service tag schema
+ * and contain the following fields:
+ * <ul>
+ * <li>{@link #getInstanceURN <tt>instance_urn</tt>}</li>
+ * <li>{@link #getProductName <tt>product_name</tt>}</li>
+ * <li>{@link #getProductVersion <tt>product_version</tt>}</li>
+ * <li>{@link #getProductURN <tt>product_urn</tt>}</li>
+ * <li>{@link #getProductParent <tt>product_parent</tt>}</li>
+ * <li>{@link #getProductParentURN <tt>product_parent_urn</tt>}</li>
+ * <li>{@link #getProductDefinedInstanceID <tt>product_defined_inst_id</tt>}</li>
+ * <li>{@link #getProductVendor <tt>product_vendor</tt>}</li>
+ * <li>{@link #getPlatformArch <tt>platform_arch</tt>}</li>
+ * <li>{@link #getContainer <tt>container</tt>}</li>
+ * <li>{@link #getSource <tt>source</tt>}</li>
+ * <li>{@link #getInstallerUID <tt>installer_uid</tt>}</li>
+ * <li>{@link #getTimestamp <tt>timestamp</tt>}</li>
+ * </ul>
+ *
+ * The <tt>instance_urn</tt> can be specified when a {@code ServiceTag}
+ * object is created, or it can be generated when it is added to
+ * a {@link RegistrationData} object, or {@link Registry
+ * system service tag registry}. The <tt>installer_uid</tt> and
+ * <tt>timestamp</tt> are set when a {@code ServiceTag} object
+ * is added to a {@link RegistrationData} object, or {@link Registry
+ * system service tag registry}.
+ *
+ * @see <a href="https://sunconnection.sun.com/FAQ/sc_faq.html">Service Tags FAQ</a>
+ */
+public class ServiceTag {
+
+ private String instanceURN;
+ private String productName;
+ private String productVersion;
+ private String productURN;
+ private String productParent;
+ private String productParentURN;
+ private String productDefinedInstanceID;
+ private String productVendor;
+ private String platformArch;
+ private String container;
+ private String source;
+ private int installerUID;
+ private Date timestamp;
+
+ // Service Tag Field Lengths (defined in sthelper.h)
+ // Since the constants defined in sthelper.h includes the null-terminated
+ // character, so minus 1 from the sthelper.h defined values.
+ private final int MAX_URN_LEN = 256 - 1;
+ private final int MAX_PRODUCT_NAME_LEN = 256 - 1;
+ private final int MAX_PRODUCT_VERSION_LEN = 64 - 1;
+ private final int MAX_PRODUCT_PARENT_LEN = 256 - 1;
+ private final int MAX_PRODUCT_VENDOR_LEN = 64 - 1;
+ private final int MAX_PLATFORM_ARCH_LEN = 64 - 1;
+ private final int MAX_CONTAINER_LEN = 64 - 1;
+ private final int MAX_SOURCE_LEN = 64 - 1;
+
+ // private constructors
+ private ServiceTag() {
+ }
+ // package private
+ ServiceTag(String instanceURN,
+ String productName,
+ String productVersion,
+ String productURN,
+ String productParent,
+ String productParentURN,
+ String productDefinedInstanceID,
+ String productVendor,
+ String platformArch,
+ String container,
+ String source,
+ int installerUID,
+ Date timestamp) {
+ setInstanceURN(instanceURN);
+ setProductName(productName);
+ setProductVersion(productVersion);
+ setProductURN(productURN);
+ setProductParentURN(productParentURN);
+ setProductParent(productParent);
+ setProductDefinedInstanceID(productDefinedInstanceID);
+ setProductVendor(productVendor);
+ setPlatformArch(platformArch);
+ setContainer(container);
+ setSource(source);
+ setInstallerUID(installerUID);
+ setTimestamp(timestamp);
+ }
+
+ /**
+ * Creates a service tag object with no <tt>instance_urn</tt>.
+ *
+ * @param productName the name of the product.
+ * @param productVersion the version of the product.
+ * @param productURN the uniform resource name of the product
+ * @param productParent the name of the product's parent.
+ * @param productParentURN the uniform resource name of the product's parent.
+ * @param productDefinedInstanceID the instance identifier.
+ * @param productVendor the vendor of the product.
+ * @param platformArch the operating system architecture.
+ * @param container the container of the product.
+ * @param source the source of the product.
+ *
+ * @throws IllegalArgumentException if any value of the input fields
+ * does not conform to the service tag XML schema.
+ */
+ public static ServiceTag newInstance(String productName,
+ String productVersion,
+ String productURN,
+ String productParent,
+ String productParentURN,
+ String productDefinedInstanceID,
+ String productVendor,
+ String platformArch,
+ String container,
+ String source) {
+ return new ServiceTag("", /* empty instance_urn */
+ productName,
+ productVersion,
+ productURN,
+ productParent,
+ productParentURN,
+ productDefinedInstanceID,
+ productVendor,
+ platformArch,
+ container,
+ source,
+ -1,
+ null);
+ }
+
+ /**
+ * Creates a service tag object with a specified <tt>instance_urn</tt>.
+ *
+ * @param instanceURN the uniform resource name of this instance.
+ * @param productName the name of the product.
+ * @param productVersion the version of the product.
+ * @param productURN the uniform resource name of the product
+ * @param productParent the name of the product's parent.
+ * @param productParentURN the uniform resource name of the product's parent.
+ * @param productDefinedInstanceID the instance identifier.
+ * @param productVendor the vendor of the product.
+ * @param platformArch the operating system architecture.
+ * @param container the container of the product.
+ * @param source the source of the product.
+ *
+ * @throws IllegalArgumentException if any value of the input fields
+ * does not conform to the service tag XML schema.
+ */
+ public static ServiceTag newInstance(String instanceURN,
+ String productName,
+ String productVersion,
+ String productURN,
+ String productParent,
+ String productParentURN,
+ String productDefinedInstanceID,
+ String productVendor,
+ String platformArch,
+ String container,
+ String source) {
+ return new ServiceTag(instanceURN,
+ productName,
+ productVersion,
+ productURN,
+ productParent,
+ productParentURN,
+ productDefinedInstanceID,
+ productVendor,
+ platformArch,
+ container,
+ source,
+ -1,
+ null);
+ }
+
+ // Creates a copy of the ServiceTag instance
+ // with instance_urn and timestamp initialized
+ static ServiceTag newInstanceWithUrnTimestamp(ServiceTag st) {
+ String instanceURN =
+ (st.getInstanceURN().length() == 0 ? Util.generateURN() :
+ st.getInstanceURN());
+ ServiceTag svcTag = new ServiceTag(instanceURN,
+ st.getProductName(),
+ st.getProductVersion(),
+ st.getProductURN(),
+ st.getProductParent(),
+ st.getProductParentURN(),
+ st.getProductDefinedInstanceID(),
+ st.getProductVendor(),
+ st.getPlatformArch(),
+ st.getContainer(),
+ st.getSource(),
+ st.getInstallerUID(),
+ new Date());
+ return svcTag;
+ }
+
+ /**
+ * Returns a uniform resource name (URN) in this format:
+ * <blockquote>
+ * "<tt>urn:st:<32-char {@link java.util.UUID uuid}></tt>"
+ * </blockquote>
+ * @return a URN.
+ */
+ public static String generateInstanceURN() {
+ return Util.generateURN();
+ }
+
+ /**
+ * Returns the uniform resource name of this service tag instance.
+ *
+ * @return the <tt>instance_urn</tt> of this service tag.
+ */
+ public String getInstanceURN() {
+ return instanceURN;
+ }
+
+ /**
+ * Returns the name of the product.
+ *
+ * @return the product name.
+ */
+ public String getProductName() {
+ return productName;
+ }
+
+ /**
+ * Returns the version of the product.
+ *
+ * @return the product version.
+ */
+ public String getProductVersion() {
+ return productVersion;
+ }
+
+ /**
+ * Returns the uniform resource name of the product.
+ *
+ * @return the product URN.
+ */
+ public String getProductURN() {
+ return productURN;
+ }
+
+ /**
+ * Returns the uniform resource name of the product's parent.
+ *
+ * @return the product's parent URN.
+ */
+ public String getProductParentURN() {
+ return productParentURN;
+ }
+
+ /**
+ * Returns the name of the product's parent.
+ *
+ * @return the product's parent name.
+ */
+ public String getProductParent() {
+ return productParent;
+ }
+
+ /**
+ * Returns the identifier defined for this product instance.
+ *
+ * @return the identifier defined for this product instance.
+ */
+ public String getProductDefinedInstanceID() {
+ return productDefinedInstanceID;
+ }
+
+ /**
+ * Returns the vendor of the product.
+ *
+ * @return the product vendor.
+ */
+ public String getProductVendor() {
+ return productVendor;
+ }
+
+ /**
+ * Returns the platform architecture on which the product
+ * is running on.
+ *
+ * @return the platform architecture on which the product is running on.
+ */
+ public String getPlatformArch() {
+ return platformArch;
+ }
+
+ /**
+ * Returns the timestamp. This timestamp is set when this service tag
+ * is added to or updated in a {@code RegistrationData} object or
+ * the system service tag registry.
+ * This method may return {@code null}.
+ *
+ * @return timestamp when this service tag
+ * is added to or updated in a {@code RegistrationData} object or
+ * the system service tag registry, or {@code null}.
+ */
+ public Date getTimestamp() {
+ if (timestamp != null) {
+ return (Date) timestamp.clone();
+ } else {
+ return null;
+ }
+ }
+
+
+ /**
+ * Returns the container of the product.
+ *
+ * @return the container of the product.
+ */
+ public String getContainer() {
+ return container;
+ }
+
+ /**
+ * Returns the source of this service tag.
+ *
+ * @return source of this service tag.
+ */
+ public String getSource() {
+ return source;
+ }
+
+ /**
+ * Returns the UID. The UID is set when this service tag
+ * is added to or updated in the system service tag registry.
+ * This is platform dependent whose default value is {@code -1}.
+ * When this service tag is added to a {@code RegistrationData},
+ * the UID is not set.
+ *
+ * @return the UID of whom this service tag
+ * is added to or updated in the system service tag registry,
+ * or {@code -1}.
+ */
+ public int getInstallerUID() {
+ return installerUID;
+ }
+
+ // The following setter methods are used to validate the
+ // input field when constructing a ServiceTag instance
+
+ private void setInstanceURN(String instanceURN) {
+ if (instanceURN == null) {
+ throw new NullPointerException("Parameter instanceURN cannot be null");
+ }
+ if (instanceURN.length() > MAX_URN_LEN) {
+ throw new IllegalArgumentException("instanceURN \"" + instanceURN +
+ "\" exceeds maximum length " + MAX_URN_LEN);
+ }
+ this.instanceURN = instanceURN;
+ }
+
+ private void setProductName(String productName) {
+ if (productName == null) {
+ throw new NullPointerException("Parameter productName cannot be null");
+ }
+ if (productName.length() == 0) {
+ throw new IllegalArgumentException("product name cannot be empty");
+ }
+ if (productName.length() > MAX_PRODUCT_NAME_LEN) {
+ throw new IllegalArgumentException("productName \"" + productName +
+ "\" exceeds maximum length " + MAX_PRODUCT_NAME_LEN);
+ }
+ this.productName = productName;
+ }
+
+ private void setProductVersion(String productVersion) {
+ if (productVersion == null) {
+ throw new NullPointerException("Parameter productVersion cannot be null");
+ }
+
+ if (productVersion.length() == 0) {
+ throw new IllegalArgumentException("product version cannot be empty");
+ }
+ if (productVersion.length() > MAX_PRODUCT_VERSION_LEN) {
+ throw new IllegalArgumentException("productVersion \"" +
+ productVersion + "\" exceeds maximum length " +
+ MAX_PRODUCT_VERSION_LEN);
+ }
+ this.productVersion = productVersion;
+ }
+
+ private void setProductURN(String productURN) {
+ if (productURN == null) {
+ throw new NullPointerException("Parameter productURN cannot be null");
+ }
+ if (productURN.length() == 0) {
+ throw new IllegalArgumentException("product URN cannot be empty");
+ }
+ if (productURN.length() > MAX_URN_LEN) {
+ throw new IllegalArgumentException("productURN \"" + productURN +
+ "\" exceeds maximum length " + MAX_URN_LEN);
+ }
+ this.productURN = productURN;
+ }
+
+ private void setProductParentURN(String productParentURN) {
+ if (productParentURN == null) {
+ throw new NullPointerException("Parameter productParentURN cannot be null");
+ }
+ // optional field - can be empty
+ if (productParentURN.length() > MAX_URN_LEN) {
+ throw new IllegalArgumentException("productParentURN \"" +
+ productParentURN + "\" exceeds maximum length " +
+ MAX_URN_LEN);
+ }
+ this.productParentURN = productParentURN;
+ }
+
+ private void setProductParent(String productParent) {
+ if (productParent == null) {
+ throw new NullPointerException("Parameter productParent cannot be null");
+ }
+ if (productParent.length() == 0) {
+ throw new IllegalArgumentException("product parent cannot be empty");
+ }
+ if (productParent.length() > MAX_PRODUCT_PARENT_LEN) {
+ throw new IllegalArgumentException("productParent \"" +
+ productParent + "\" exceeds maximum length " +
+ MAX_PRODUCT_PARENT_LEN);
+ }
+ this.productParent = productParent;
+ }
+
+ void setProductDefinedInstanceID(String productDefinedInstanceID) {
+ if (productDefinedInstanceID == null) {
+ throw new NullPointerException("Parameter productDefinedInstanceID cannot be null");
+ }
+ if (productDefinedInstanceID.length() > MAX_URN_LEN) {
+ throw new IllegalArgumentException("productDefinedInstanceID \"" +
+ productDefinedInstanceID + "\" exceeds maximum length " +
+ MAX_URN_LEN);
+ }
+ // optional field - can be empty
+ this.productDefinedInstanceID = productDefinedInstanceID;
+ }
+
+ private void setProductVendor(String productVendor) {
+ if (productVendor == null) {
+ throw new NullPointerException("Parameter productVendor cannot be null");
+ }
+ if (productVendor.length() == 0) {
+ throw new IllegalArgumentException("product vendor cannot be empty");
+ }
+ if (productVendor.length() > MAX_PRODUCT_VENDOR_LEN) {
+ throw new IllegalArgumentException("productVendor \"" +
+ productVendor + "\" exceeds maximum length " +
+ MAX_PRODUCT_VENDOR_LEN);
+ }
+ this.productVendor = productVendor;
+ }
+
+ private void setPlatformArch(String platformArch) {
+ if (platformArch == null) {
+ throw new NullPointerException("Parameter platformArch cannot be null");
+ }
+ if (platformArch.length() == 0) {
+ throw new IllegalArgumentException("platform architecture cannot be empty");
+ }
+ if (platformArch.length() > MAX_PLATFORM_ARCH_LEN) {
+ throw new IllegalArgumentException("platformArch \"" +
+ platformArch + "\" exceeds maximum length " +
+ MAX_PLATFORM_ARCH_LEN);
+ }
+ this.platformArch = platformArch;
+ }
+
+ private void setTimestamp(Date timestamp) {
+ // can be null
+ this.timestamp = timestamp;
+ }
+
+ private void setContainer(String container) {
+ if (container == null) {
+ throw new NullPointerException("Parameter container cannot be null");
+ }
+ if (container.length() == 0) {
+ throw new IllegalArgumentException("container cannot be empty");
+ }
+ if (container.length() > MAX_CONTAINER_LEN) {
+ throw new IllegalArgumentException("container \"" +
+ container + "\" exceeds maximum length " +
+ MAX_CONTAINER_LEN);
+ }
+ this.container = container;
+ }
+
+ private void setSource(String source) {
+ if (source == null) {
+ throw new NullPointerException("Parameter source cannot be null");
+ }
+ if (source.length() == 0) {
+ throw new IllegalArgumentException("source cannot be empty");
+ }
+ if (source.length() > MAX_SOURCE_LEN) {
+ throw new IllegalArgumentException("source \"" + source +
+ "\" exceeds maximum length " + MAX_SOURCE_LEN);
+ }
+ this.source = source;
+ }
+
+ private void setInstallerUID(int installerUID) {
+ this.installerUID = installerUID;
+ }
+
+ /**
+ * Compares this service tag to the specified object.
+ * The result is {@code true} if and only if the argument is
+ * not {@code null} and is a {@code ServiceTag} object whose
+ * <tt>instance_urn</tt> is the same as the
+ * <tt>instance_urn</tt> of this service tag.
+ *
+ * @return {@code true} if this service tag is the same as
+ * the specified object.
+ */
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == null || !(obj instanceof ServiceTag)) {
+ return false;
+ }
+ ServiceTag st = (ServiceTag) obj;
+ if (st == this) {
+ return true;
+ }
+ return st.getInstanceURN().equals(getInstanceURN());
+ }
+
+ /**
+ * Returns the hash code value for this service tag.
+ * @return the hash code value for this service tag.
+ */
+ @Override
+ public int hashCode() {
+ int hash = 7;
+ hash = 19 * hash + (this.instanceURN != null ? this.instanceURN.hashCode() : 0);
+ return hash;
+ }
+
+ /**
+ * Returns the string representation of this service tag.
+ * The format is implementation specific.
+ *
+ * @return the string representation of this service tag.
+ */
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append(ST_NODE_INSTANCE_URN).append("=").append(instanceURN).append("\n");
+ sb.append(ST_NODE_PRODUCT_NAME).append("=").append(productName).append("\n");
+ sb.append(ST_NODE_PRODUCT_VERSION).append("=").append(productVersion).append("\n");
+ sb.append(ST_NODE_PRODUCT_URN).append("=").append(productURN).append("\n");
+ sb.append(ST_NODE_PRODUCT_PARENT_URN).append("=").append(productParentURN).append("\n");
+ sb.append(ST_NODE_PRODUCT_PARENT).append("=").append(productParent).append("\n");
+ sb.append(ST_NODE_PRODUCT_DEFINED_INST_ID).append("=").append(productDefinedInstanceID).append("\n");
+ sb.append(ST_NODE_PRODUCT_VENDOR).append("=").append(productVendor).append("\n");
+ sb.append(ST_NODE_PLATFORM_ARCH).append("=").append(platformArch).append("\n");
+ sb.append(ST_NODE_TIMESTAMP).append("=").append(Util.formatTimestamp(timestamp)).append("\n");
+ sb.append(ST_NODE_CONTAINER).append("=").append(container).append("\n");
+ sb.append(ST_NODE_SOURCE).append("=").append(source).append("\n");
+ sb.append(ST_NODE_INSTALLER_UID).append("=").append(String.valueOf(installerUID)).append("\n");
+ return sb.toString();
+ }
+
+
+ /**
+ * Returns the {@link ServiceTag} instance for the running Java
+ * platform. The {@link ServiceTag#setSource source} field
+ * of the {@code ServiceTag} will be set to the given {@code source}.
+ * This method will return {@code null} if there is no service tag
+ * for the running Java platform.
+ * <p>
+ * This method is designed for Sun software that bundles the JDK
+ * or the JRE to use. It is recommended that the {@code source}
+ * string contains information about the bundling software
+ * such as the name and the version of the software bundle,
+ * for example,
+ * <blockquote>
+ * <tt>NetBeans IDE 6.0 with JDK 6 Update 5 Bundle</tt>
+ * </blockquote>
+ * in a NetBeans/JDK bundle.
+ * <p>
+ * At the first time to call this method the application
+ * is required to have the write permission to the installed
+ * directory of this running JDK or JRE instance.
+ *
+ * @param source the source that bundles the JDK or the JRE.
+ * @return a {@code ServiceTag} object for the Java platform,
+ * or {@code null} if not supported.
+ * @throws IOException if an error occurs in this operation.
+ */
+ public static ServiceTag getJavaServiceTag(String source) throws IOException {
+ return Installer.getJavaServiceTag(source);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/servicetag/SolarisServiceTag.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.servicetag;
+
+import java.io.IOException;
+import java.util.Set;
+
+/**
+ * Utility class to obtain the service tag for the Solaris Operating System.
+ */
+class SolarisServiceTag {
+ private final static String[] SolarisProductURNs = new String[] {
+ "urn:uuid:a7a38948-2bd5-11d6-98ce-9d3ac1c0cfd7", /* Solaris 8 */
+ "urn:uuid:4f82caac-36f3-11d6-866b-85f428ef944e", /* Solaris 9 */
+ "urn:uuid:a19de03b-48bc-11d9-9607-080020a9ed93", /* Solaris 9 sparc */
+ "urn:uuid:4c35c45b-4955-11d9-9607-080020a9ed93", /* Solaris 9 x86 */
+ "urn:uuid:5005588c-36f3-11d6-9cec-fc96f718e113", /* Solaris 10 */
+ "urn:uuid:6df19e63-7ef5-11db-a4bd-080020a9ed93" /* Solaris 11 */
+ };
+
+ /**
+ * Returns null if not found.
+ *
+ * There is only one service tag for the operating system.
+ */
+ static ServiceTag getServiceTag() throws IOException {
+ if (Registry.isSupported()) {
+ Registry streg = Registry.getSystemRegistry();
+ for (String parentURN : SolarisProductURNs) {
+ Set<ServiceTag> instances = streg.findServiceTags(parentURN);
+ for (ServiceTag st : instances) {
+ // there should have only one service tag for the OS
+ return st;
+ }
+ }
+ }
+ return null;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/servicetag/SolarisSystemEnvironment.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,158 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.servicetag;
+
+// This class is a copy of the com.sun.scn.servicetags.SolarisSystemEnvironment
+// class from the Sun Connection source.
+//
+// The Service Tags team maintains the latest version of the implementation
+// for system environment data collection. JDK will include a copy of
+// the most recent released version for a JDK release. We rename
+// the package to com.sun.servicetag so that the Sun Connection
+// product always uses the latest version from the com.sun.scn.servicetags
+// package. JDK and users of the com.sun.servicetag API
+// (e.g. NetBeans and SunStudio) will use the version in JDK.
+//
+// So we keep this class in src/share/classes instead of src/<os>/classes.
+
+import java.io.*;
+
+/**
+ * Solaris implementation of the SystemEnvironment class.
+ */
+class SolarisSystemEnvironment extends SystemEnvironment {
+ SolarisSystemEnvironment() {
+ setHostId(getCommandOutput("/usr/bin/hostid"));
+ setSystemModel(getCommandOutput("/usr/bin/uname", "-i"));
+ setSystemManufacturer(getSolarisSystemManufacturer());
+ setCpuManufacturer(getSolarisCpuManufacturer());
+ setSerialNumber(getSolarisSN());
+ }
+
+ /**
+ * Tries to obtain the cpu manufacturer.
+ * @return The cpu manufacturer (an empty string if not found or an error occurred)
+ */
+ private String getSolarisCpuManufacturer() {
+ // not fully accurate, this could be another manufacturer (fujitsu for example)
+ if ("sparc".equalsIgnoreCase(System.getProperty("os.arch"))) {
+ return "Sun Microsystems, Inc";
+ }
+
+ // if we're here, then we'll try smbios (type 3)
+ return getSmbiosData("3", "Manufacturer: ");
+ }
+
+ /**
+ * Tries to obtain the system manufacturer.
+ * @return The system manufacturer (an empty string if not found or an error occurred)
+ */
+ private String getSolarisSystemManufacturer() {
+ // not fully accurate, this could be another manufacturer (fujitsu for example)
+ if ("sparc".equalsIgnoreCase(System.getProperty("os.arch"))) {
+ return "Sun Microsystems, Inc";
+ }
+
+ // if we're here, then we'll try smbios (type 1)
+ return getSmbiosData("1", "Manufacturer: ");
+ }
+
+ /**
+ * Tries to obtain the serial number.
+ * @return The serial number (empty string if not found or an error occurred)
+ */
+ private String getSolarisSN() {
+ // try to read from the psn file if it exists
+ String tmp = getFileContent("/var/run/psn");
+ if (tmp.length() > 0) {
+ return tmp.trim();
+ }
+
+ // if we're here, then we'll try sneep
+ String tmpSN = getSneepSN();
+ if (tmpSN.length() > 0) {
+ return tmpSN;
+ }
+
+ // if we're here, then we'll try smbios (type 1)
+ tmpSN = getSmbiosData("1", "Serial Number: ");
+ if (tmpSN.length() > 0) {
+ return tmpSN;
+ }
+
+ // if we're here, then we'll try smbios (type 3)
+ tmpSN = getSmbiosData("3", "Serial Number: ");
+ if (tmpSN.length() > 0) {
+ return tmpSN;
+ }
+
+ // give up and return
+ return "";
+ }
+
+ // Sample smbios output segment:
+ // ID SIZE TYPE
+ // 1 150 SMB_TYPE_SYSTEM (system information)
+ //
+ // Manufacturer: Sun Microsystems
+ // Product: Sun Fire X4600
+ // Version: To Be Filled By O.E.M.
+ // Serial Number: 00:14:4F:45:0C:2A
+ private String getSmbiosData(String type, String target) {
+ String output = getCommandOutput("/usr/sbin/smbios", "-t", type);
+ for (String s : output.split("\n")) {
+ if (s.contains(target)) {
+ int indx = s.indexOf(target) + target.length();
+ if (indx < s.length()) {
+ String tmp = s.substring(indx).trim();
+ String lowerCaseStr = tmp.toLowerCase();
+ if (!lowerCaseStr.startsWith("not available")
+ && !lowerCaseStr.startsWith("to be filled by o.e.m")) {
+ return tmp;
+ }
+ }
+ }
+ }
+
+ return "";
+ }
+
+ private String getSneepSN() {
+ String basedir = getCommandOutput("pkgparam","SUNWsneep","BASEDIR");
+ File f = new File(basedir + "/bin/sneep");
+ if (f.exists()) {
+ String sneepSN = getCommandOutput(basedir + "/bin/sneep");
+ if (sneepSN.equalsIgnoreCase("unknown")) {
+ return "";
+ } else {
+ return sneepSN;
+ }
+ } else {
+ return "";
+ }
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/servicetag/SunConnection.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,299 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.servicetag;
+
+import java.io.*;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.io.OutputStreamWriter;
+import java.util.Locale;
+import javax.net.ssl.HttpsURLConnection;
+
+/**
+ * Sun Connection Class for Product Registration.
+ *
+ * Registration Web Application Interface
+ * 1) POST the product registry to the output stream of the registration
+ * relay service.
+ * 2) Open the webapp URL from a browser with the following parameters:
+ * registry-urn
+ * product=jdk
+ * locale=<default-locale>
+ * version=<version>
+ *
+ * @see https://sn-tools.central.sun.com/twiki/pub/ServiceTags/RegistrationRelayService/
+ *
+ */
+class SunConnection {
+
+ private static String JDK_REGISTRATION_URL = "https://inventory.sun.com/";
+ private static String SANDBOX_TESTING_URL = "https://inventory-beta.sun.com/";
+ private static String REGISTRATION_WEB_PATH = "RegistrationWeb/register";
+
+ // System properties for testing
+ private static String SVCTAG_REGISTER_TESTING = "servicetag.register.testing";
+ private static String SVCTAG_REGISTRATION_URL = "servicetag.registration.url";
+ private static String SVCTAG_CONNECTION_TIMEOUT = "servicetag.connection.timeout";
+
+ private SunConnection() {
+ }
+
+ /**
+ * Returns a URL for JDK registration interfacing with the Sun Connection
+ * registration relay service in this form:
+ * <registration-url>/<registry_urn>?product=jdk&locale=<locale>
+ *
+ * The <registration-url> can be overridden by an environment
+ * variable or a system property.
+ *
+ * 1) "servicetag.register.testing" system property to switch to the
+ * Sun Connection registration sandbox testing.
+ * 2) "servicetag.registration.url" system property to override
+ * the URL
+ * 3) Default production URL
+ *
+ */
+ static URL getRegistrationURL(String registrationURN, Locale locale, String version) {
+ String url = System.getProperty(SVCTAG_REGISTRATION_URL);
+ if (url == null) {
+ if (System.getProperty(SVCTAG_REGISTER_TESTING) != null) {
+ url = SANDBOX_TESTING_URL;
+ } else {
+ url = JDK_REGISTRATION_URL;
+ }
+ }
+ url += REGISTRATION_WEB_PATH;
+
+ // trim whitespaces
+ url = url.trim();
+ if (url.length() == 0) {
+ throw new InternalError("Empty registration url set");
+ }
+
+ // Add the registry_urn in the URL's query
+ String registerURL = rewriteURL(url, registrationURN, locale, version);
+ try {
+ return new URL(registerURL);
+ } catch (MalformedURLException ex) {
+ // should never reach here
+ InternalError x =
+ new InternalError(ex.getMessage());
+ x.initCause(ex);
+ throw x;
+ }
+ }
+
+ private static String rewriteURL(String url, String registryURN, Locale locale, String version) {
+ StringBuilder sb = new StringBuilder(url.trim());
+ int len = sb.length();
+ if (sb.charAt(len-1) != '/') {
+ sb.append('/');
+ }
+ sb.append(registryURN);
+ sb.append("?");
+ sb.append("product=jdk");
+ sb.append("&");
+ sb.append("locale=").append(locale.toString());
+ sb.append("&");
+ sb.append("version=").append(version);
+ return sb.toString();
+ }
+
+ /**
+ * Registers all products in the given product registry. If it fails
+ * to post the service tag registry, open the browser with the offline
+ * registration page.
+ *
+ * @param regData registration data to be posted to the Sun Connection
+ * for registration.
+ * @param locale Locale
+ * @param version JDK version
+ *
+ * @throws IOException if I/O error occurs in this operation
+ */
+ public static void register(RegistrationData regData,
+ Locale locale,
+ String version) throws IOException {
+ // Gets the URL for SunConnection registration relay service
+ URL url = getRegistrationURL(regData.getRegistrationURN(),
+ locale,
+ version);
+
+ // Post the Product Registry to Sun Connection
+ boolean succeed = postRegistrationData(url, regData);
+ if (succeed) {
+ // service tags posted successfully
+ // now prompt for registration
+ openBrowser(url);
+ } else {
+ // open browser with the offline registration page
+ openOfflineRegisterPage();
+ }
+ }
+
+ /**
+ * Opens a browser for JDK product registration.
+ * @param url Registration Webapp URL
+ */
+ private static void openBrowser(URL url) throws IOException {
+ if (!BrowserSupport.isSupported()) {
+ if (Util.isVerbose()) {
+ System.out.println("Browser is not supported");
+ }
+ return;
+ }
+
+ try {
+ BrowserSupport.browse(url.toURI());
+ } catch (URISyntaxException ex) {
+ InternalError x = new InternalError("Error in registering: " + ex.getMessage());
+ x.initCause(ex);
+ throw x;
+ } catch (IllegalArgumentException ex) {
+ if (Util.isVerbose()) {
+ ex.printStackTrace();
+ }
+ } catch (UnsupportedOperationException ex) {
+ // ignore if not supported
+ if (Util.isVerbose()) {
+ ex.printStackTrace();
+ }
+ }
+ }
+
+ /**
+ * POST service tag registry to Sun Connection
+ * @param loc the URL of the webapp to handle the POST request
+ * @param streg the Service Tag registry
+ * @return true if posting succeeds; otherwise, false.
+ */
+ private static boolean postRegistrationData(URL url,
+ RegistrationData registration) {
+ try {
+ HttpsURLConnection con = (HttpsURLConnection) url.openConnection();
+ con.setDoInput(true);
+ con.setDoOutput(true);
+ con.setUseCaches(false);
+ con.setAllowUserInteraction(false);
+
+ // default 10 seconds timeout
+ String timeout = System.getProperty(SVCTAG_CONNECTION_TIMEOUT, "10");
+ con.setConnectTimeout(Util.getIntValue(timeout) * 1000);
+
+ if (Util.isVerbose()) {
+ System.out.println("Connecting to post registration data at " + url);
+ }
+
+ con.setRequestMethod("POST");
+ con.setRequestProperty("Content-Type", "text/xml;charset=\"utf-8\"");
+ con.connect();
+
+ OutputStream out = con.getOutputStream();
+ registration.storeToXML(out);
+ out.flush();
+ out.close();
+
+ int returnCode = con.getResponseCode();
+ if (Util.isVerbose()) {
+ System.out.println("POST return status = " + returnCode);
+ printReturnData(con, returnCode);
+ }
+ return (returnCode == HttpURLConnection.HTTP_OK);
+ } catch (MalformedURLException me) {
+ // should never reach here
+ InternalError x = new InternalError("Error in registering: " + me.getMessage());
+ x.initCause(me);
+ throw x;
+ } catch (Exception ioe) {
+ // SocketTimeoutException, IOException or UnknownHostException
+ if (Util.isVerbose()) {
+ ioe.printStackTrace();
+ }
+ return false;
+ }
+ }
+
+ /**
+ * Opens the offline registratioin page in the browser.
+ *
+ */
+ private static void openOfflineRegisterPage()
+ throws IOException {
+ if (!BrowserSupport.isSupported()) {
+ if (Util.isVerbose()) {
+ System.out.println("Browser is not supported");
+ }
+ return;
+ }
+
+ File registerPage = Installer.getRegistrationHtmlPage();
+ try {
+ BrowserSupport.browse(registerPage.toURI());
+ } catch (FileNotFoundException ex) {
+ // should never reach here
+ InternalError x =
+ new InternalError("Error in launching " + registerPage + ": " + ex.getMessage());
+ x.initCause(ex);
+ throw x;
+ } catch (IllegalArgumentException ex) {
+ if (Util.isVerbose()) {
+ ex.printStackTrace();
+ }
+ } catch (UnsupportedOperationException ex) {
+ // ignore if not supported
+ if (Util.isVerbose()) {
+ ex.printStackTrace();
+ }
+ }
+ }
+
+ private static void printReturnData(HttpURLConnection con, int returnCode)
+ throws IOException {
+ BufferedReader reader = null;
+ try {
+ if (returnCode < 400) {
+ reader = new BufferedReader(
+ new InputStreamReader(con.getInputStream()));
+ } else {
+ reader = new BufferedReader(
+ new InputStreamReader(con.getErrorStream()));
+ }
+ StringBuilder sb = new StringBuilder();
+ String line;
+ while ((line = reader.readLine()) != null) {
+ sb.append(line).append("\n");
+ }
+ System.out.println("Response is : ");
+ System.out.println(sb.toString());
+ } finally {
+ if (reader != null) {
+ reader.close();
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/servicetag/SystemEnvironment.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,338 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.servicetag;
+
+// This class is a copy of the com.sun.scn.servicetags.SystemEnvironment
+// class from the Sun Connection source.
+//
+// The Service Tags team maintains the latest version of the implementation
+// for system environment data collection. JDK will include a copy of
+// the most recent released version for a JDK release. We rename
+// the package to com.sun.servicetag so that the Sun Connection
+// product always uses the latest version from the com.sun.scn.servicetags
+// package. JDK and users of the com.sun.servicetag API
+// (e.g. NetBeans and SunStudio) will use the version in JDK.
+
+import java.io.*;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+/**
+ * SystemEnvironment class collects the environment data with the
+ * best effort from the underlying platform.
+ */
+public class SystemEnvironment {
+ private String hostname;
+ private String hostId;
+ private String osName;
+ private String osVersion;
+ private String osArchitecture;
+ private String systemModel;
+ private String systemManufacturer;
+ private String cpuManufacturer;
+ private String serialNumber;
+ private static SystemEnvironment sysEnv = null;
+
+ public static synchronized SystemEnvironment getSystemEnvironment() {
+ if (sysEnv == null) {
+ String os = System.getProperty("os.name");
+ if (os.equals("SunOS")) {
+ sysEnv = new SolarisSystemEnvironment();
+ } else if (os.equals("Linux")) {
+ sysEnv = new LinuxSystemEnvironment();
+ } else if (os.startsWith("Windows")) {
+ sysEnv = new WindowsSystemEnvironment();
+ } else {
+ sysEnv = new SystemEnvironment();
+ }
+ }
+ return sysEnv;
+ }
+
+ // package-private
+ SystemEnvironment() {
+ try {
+ this.hostname = InetAddress.getLocalHost().getHostName();
+ } catch (UnknownHostException ex) {
+ this.hostname = "Unknown host";
+ }
+ this.hostId = "";
+ this.osName = System.getProperty("os.name");
+ this.osVersion = System.getProperty("os.version");
+ this.osArchitecture = System.getProperty("os.arch");
+ this.systemModel = "";
+ this.systemManufacturer = "";
+ this.cpuManufacturer = "";
+ this.serialNumber = "";
+ }
+
+
+ /**
+ * Sets the hostname.
+ * @param hostname The hostname to set.
+ */
+ public void setHostname(String hostname) {
+ this.hostname = hostname;
+ }
+
+ /**
+ * Sets the OS name.
+ * @param osName The osName to set.
+ */
+ public void setOsName(String osName) {
+ this.osName = osName;
+ }
+
+ /**
+ * Sets the OS version.
+ * @param osVersion The osVersion to set.
+ */
+ public void setOsVersion(String osVersion) {
+ this.osVersion = osVersion;
+ }
+
+ /**
+ * Sets the OS architecture.
+ * @param osArchitecture The osArchitecture to set.
+ */
+ public void setOsArchitecture(String osArchitecture) {
+ this.osArchitecture = osArchitecture;
+ }
+
+ /**
+ * Sets the system model.
+ * @param systemModel The systemModel to set.
+ */
+ public void setSystemModel(String systemModel) {
+ this.systemModel = systemModel;
+ }
+
+ /**
+ * Sets the system manufacturer.
+ * @param systemManufacturer The systemManufacturer to set.
+ */
+ public void setSystemManufacturer(String systemManufacturer) {
+ this.systemManufacturer = systemManufacturer;
+ }
+
+ /**
+ * Sets the cpu manufacturer.
+ * @param cpuManufacturer The cpuManufacturer to set.
+ */
+ public void setCpuManufacturer(String cpuManufacturer) {
+ this.cpuManufacturer = cpuManufacturer;
+ }
+
+ /**
+ * Sets the serial number.
+ * @param serialNumber The serialNumber to set.
+ */
+ public void setSerialNumber(String serialNumber) {
+ this.serialNumber = serialNumber;
+ }
+
+ /**
+ * Sets the hostid. Truncates to a max length of 16 chars.
+ * @param hostId The hostid to set.
+ */
+ public void setHostId(String hostId) {
+ if (hostId == null || hostId.equals("null")) {
+ hostId = "";
+ }
+ if (hostId.length() > 16) {
+ hostId = hostId.substring(0,16);
+ }
+ this.hostId = hostId;
+ }
+
+ /**
+ * Returns the hostname.
+ * @return The hostname.
+ */
+ public String getHostname() {
+ return hostname;
+ }
+
+ /**
+ * Returns the osName.
+ * @return The osName.
+ */
+ public String getOsName() {
+ return osName;
+ }
+
+ /**
+ * Returns the osVersion.
+ * @return The osVersion.
+ */
+ public String getOsVersion() {
+ return osVersion;
+ }
+
+ /**
+ * Returns the osArchitecture.
+ * @return The osArchitecture.
+ */
+ public String getOsArchitecture() {
+ return osArchitecture;
+ }
+
+ /**
+ * Returns the systemModel.
+ * @return The systemModel.
+ */
+ public String getSystemModel() {
+ return systemModel;
+ }
+
+ /**
+ * Returns the systemManufacturer.
+ * @return The systemManufacturer.
+ */
+ public String getSystemManufacturer() {
+ return systemManufacturer;
+ }
+
+ /**
+ * Returns the serialNumber.
+ * @return The serialNumber.
+ */
+ public String getSerialNumber() {
+ return serialNumber;
+ }
+
+ /**
+ * Returns the hostId.
+ * @return The hostId.
+ */
+ public String getHostId() {
+ return hostId;
+ }
+
+ /**
+ * Returns the cpuManufacturer.
+ * @return The cpuManufacturer.
+ */
+ public String getCpuManufacturer() {
+ return cpuManufacturer;
+ }
+
+ protected String getCommandOutput(String... command) {
+ StringBuilder sb = new StringBuilder();
+ BufferedReader br = null;
+ Process p = null;
+ try {
+ ProcessBuilder pb = new ProcessBuilder(command);
+ p = pb.start();
+ p.waitFor();
+
+ if (p.exitValue() == 0) {
+ br = new BufferedReader(new InputStreamReader(p.getInputStream()));
+ String line = null;
+ while ((line = br.readLine()) != null) {
+ line = line.trim();
+ if (line.length() > 0) {
+ if (sb.length() > 0) {
+ sb.append("\n");
+ }
+ sb.append(line);
+ }
+ }
+ }
+ return sb.toString();
+ } catch (InterruptedException ie) {
+ // in case the command hangs
+ if (p != null) {
+ p.destroy();
+ }
+ return "";
+ } catch (Exception e) {
+ // ignore exception
+ return "";
+ } finally {
+ if (p != null) {
+ try {
+ p.getErrorStream().close();
+ } catch (IOException e) {
+ // ignore
+ }
+ try {
+ p.getInputStream().close();
+ } catch (IOException e) {
+ // ignore
+ }
+ try {
+ p.getOutputStream().close();
+ } catch (IOException e) {
+ // ignore
+ }
+ p = null;
+ }
+ if (br != null) {
+ try {
+ br.close();
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+ }
+ }
+
+ protected String getFileContent(String filename) {
+ File f = new File(filename);
+ if (!f.exists()) {
+ return "";
+ }
+
+ StringBuilder sb = new StringBuilder();
+ BufferedReader br = null;
+ try {
+ br = new BufferedReader(new FileReader(f));
+ String line = null;
+ while ((line = br.readLine()) != null) {
+ line = line.trim();
+ if (line.length() > 0) {
+ if (sb.length() > 0) {
+ sb.append("\n");
+ }
+ sb.append(line);
+ }
+ }
+ return sb.toString();
+ } catch (Exception e) {
+ // ignore exception
+ return "";
+ } finally {
+ if (br != null) {
+ try {
+ br.close();
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/servicetag/UnauthorizedAccessException.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.servicetag;
+
+/**
+ * Thrown if the user is not authorized to
+ * {@link Registry#updateServiceTag update} or
+ * {@link Registry#removeServiceTag remove}
+ * a service tag from a {@link Registry}.
+ */
+public class UnauthorizedAccessException extends RuntimeException {
+
+ /**
+ * Constructs an <code>UnauthorizedAccessException</code> object
+ * without detail message.
+ */
+ public UnauthorizedAccessException() {
+ }
+
+
+ /**
+ * Constructs an <code>UnauthorizedAccessException</code> object
+ * with the specified detail message.
+ *
+ * @param msg the detail message.
+ */
+ public UnauthorizedAccessException(String msg) {
+ super(msg);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/servicetag/Util.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,336 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.servicetag;
+
+import java.io.*;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.text.ParseException;
+import java.util.TimeZone;
+import java.util.UUID;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+// Utility class for com.sun.servicetag package
+class Util {
+ private static boolean verbose = (System.getProperty("servicetag.verbose") != null);
+ private static String jrepath = null;
+ private static final String REGKEY_TAIL =
+ "microsoft\\windows\\currentversion\\app paths\\stclient.exe";
+ private static final String STCLIENT_TAIL = "sun\\servicetag\\stclient.exe";
+ private static final String WIN32_STCLIENT =
+ "c:\\Program Files (x86)\\" + STCLIENT_TAIL;
+
+ // for debugging and tracing
+ static boolean isVerbose() {
+ return verbose;
+ }
+
+ /**
+ * Gets the pathname of JRE in the running platform
+ * This can be a JDK or JRE.
+ */
+ static synchronized String getJrePath() {
+ if (jrepath == null) {
+ // Determine the JRE path by checking the existence of
+ // <HOME>/jre/lib and <HOME>/lib.
+ String javaHome = System.getProperty("java.home");
+ jrepath = javaHome + File.separator + "jre";
+ File f = new File(jrepath, "lib");
+ if (!f.exists()) {
+ // java.home usually points to the JRE path
+ jrepath = javaHome;
+ }
+ }
+ return jrepath;
+ }
+
+ /**
+ * Tests if the running platform is a JDK.
+ */
+ static boolean isJdk() {
+ // <HOME>/jre exists which implies it's a JDK
+ return getJrePath().endsWith(File.separator + "jre");
+ }
+
+ /**
+ * Generates the URN string of "urn:st" namespace
+ */
+ static String generateURN() {
+ return "urn:st:" + UUID.randomUUID().toString();
+ }
+
+ static int getIntValue(String value) {
+ try {
+ return Integer.parseInt(value);
+ } catch (NumberFormatException e) {
+ throw new IllegalArgumentException("\"" + value + "\"" +
+ " expected to be an integer");
+ }
+ }
+
+ /**
+ * Formats the Date into a timestamp string in YYYY-MM-dd HH:mm:ss GMT.
+ * @param timestamp Date
+ * @return a string representation of the timestamp
+ * in the YYYY-MM-dd HH:mm:ss GMT format.
+ */
+ static String formatTimestamp(Date timestamp) {
+ if (timestamp == null) {
+ return "[No timestamp]";
+ }
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z");
+ df.setTimeZone(TimeZone.getTimeZone("GMT"));
+ return df.format(timestamp);
+ }
+
+ /**
+ * Parses a timestamp string in YYYY-MM-dd HH:mm:ss GMT format.
+ * @param timestamp Timestamp in the YYYY-MM-dd HH:mm:ss GMT format.
+ * @return Date
+ */
+ static Date parseTimestamp(String timestamp) {
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z");
+ df.setTimeZone(TimeZone.getTimeZone("GMT"));
+ try {
+ return df.parse(timestamp);
+ } catch (ParseException e) {
+ // should not reach here
+ e.printStackTrace();
+ return new Date();
+ }
+ }
+
+ static String commandOutput(Process p) throws IOException {
+ Reader r = null;
+ Reader err = null;
+ try {
+ r = new InputStreamReader(p.getInputStream());
+ err = new InputStreamReader(p.getErrorStream());
+ String output = commandOutput(r);
+ String errorMsg = commandOutput(err);
+ p.waitFor();
+ return output + errorMsg.trim();
+ } catch (InterruptedException e) {
+ if (isVerbose()) {
+ e.printStackTrace();
+ }
+ return e.getMessage();
+ } finally {
+ if (r != null) {
+ r.close();
+ }
+ if (err != null) {
+ err.close();
+ }
+ }
+ }
+
+ static String commandOutput(Reader r) throws IOException {
+ StringBuilder sb = new StringBuilder();
+ int c;
+ while ((c = r.read()) > 0) {
+ if (c != '\r') {
+ sb.append((char) c);
+ }
+ }
+ return sb.toString();
+ }
+
+ static int getJdkVersion() {
+ parseVersion();
+ return jdkVersion;
+ }
+
+ static int getUpdateVersion() {
+ parseVersion();
+ return jdkUpdate;
+ }
+
+ private static int jdkVersion = 0;
+ private static int jdkUpdate = 0;
+ private static synchronized void parseVersion() {
+ if (jdkVersion > 0) {
+ return;
+ }
+
+ // parse java.runtime.version
+ // valid format of the version string is:
+ // n.n.n[_uu[c]][-<identifer>]-bxx
+ String cs = System.getProperty("java.runtime.version");
+ if (cs.length() >= 5 &&
+ Character.isDigit(cs.charAt(0)) && cs.charAt(1) == '.' &&
+ Character.isDigit(cs.charAt(2)) && cs.charAt(3) == '.' &&
+ Character.isDigit(cs.charAt(4))) {
+ jdkVersion = Character.digit(cs.charAt(2), 10);
+ cs = cs.substring(5, cs.length());
+ if (cs.charAt(0) == '_' && cs.length() >= 3 &&
+ Character.isDigit(cs.charAt(1)) &&
+ Character.isDigit(cs.charAt(2))) {
+ int nextChar = 3;
+ try {
+ String uu = cs.substring(1, 3);
+ jdkUpdate = Integer.valueOf(uu).intValue();
+ } catch (NumberFormatException e) {
+ // not conforming to the naming convention
+ return;
+ }
+ }
+ } else {
+ throw new InternalError("Invalid java.runtime.version" + cs);
+ }
+ }
+
+ /**
+ * Returns this java string as a null-terminated byte array
+ */
+ private static byte[] stringToByteArray(String str) {
+ return (str + "\u0000").getBytes();
+ }
+
+ /**
+ * Converts a null-terminated byte array to java string
+ */
+ private static String byteArrayToString(byte[] array) {
+ return new String(array, 0, array.length -1);
+ }
+
+ /**
+ * Gets the stclient path using a well known location from
+ * the Windows platform Registry, ensuring the path returned
+ * by the registry is really the one we are looking for,
+ * otherwise it will return null.
+ */
+ private static File getWindowsStClientFile(boolean wow64) {
+ File out = null;
+ String regKey = (wow64 == true)
+ ? "software\\Wow6432Node\\" + REGKEY_TAIL
+ : "software\\" + REGKEY_TAIL;
+ String keyName = "" ; // use the default key
+ String path = getRegistryKey(regKey, keyName);
+ if (path != null
+ && (new File(path)).exists()
+ && path.toLowerCase().endsWith(STCLIENT_TAIL.toLowerCase())) {
+ out = new File(path);
+ }
+ if (isVerbose()) {
+ System.out.println("stclient=" + out);
+ }
+ return out;
+ }
+
+ /**
+ * Finds a stclient in 32 and 64 bit environments, first by querying
+ * the windows registry, if not then get the well known paths for
+ * 64bit see http://support.microsoft.com/kb/896459
+ */
+
+ static File getWindowsStClientFile() {
+ File stclient = null;
+ if (System.getProperty("os.arch").equals("x86")) {
+ // try to get the default entry
+ stclient = getWindowsStClientFile(false);
+ if (stclient != null) {
+ return stclient;
+ }
+ } else { // we are on 64-bit system
+ // try the wow64 area
+ stclient = getWindowsStClientFile(true);
+ if (stclient != null) {
+ return stclient;
+ }
+ // try the default hard coded path, maybe wow64 registry is missing
+ stclient = new File(WIN32_STCLIENT);
+ if (stclient.canExecute()) {
+ if (isVerbose()) {
+ System.out.println("stclient(default)=" + stclient);
+ }
+ return stclient;
+ }
+ }
+ if (isVerbose()) {
+ System.out.println("stclient not found");
+ }
+ return null;
+ }
+
+ /**
+ * This uses reflection to access a private java windows registry
+ * interface, any changes to that Class must be appropriately adjusted.
+ * Returns a null if unsuccessful.
+ */
+ private static String getRegistryKey(String regKey, String keyName) {
+ String out = null;
+ try {
+ Class<?> clazz = Class.forName("java.util.prefs.WindowsPreferences");
+
+ // Get the registry methods
+ Method winRegOpenKeyM = clazz.getDeclaredMethod("WindowsRegOpenKey",
+ int.class, byte[].class, int.class);
+ winRegOpenKeyM.setAccessible(true);
+
+ Method winRegCloseKeyM = clazz.getDeclaredMethod("WindowsRegCloseKey",
+ int.class);
+ winRegCloseKeyM.setAccessible(true);
+
+ Method winRegQueryValueM = clazz.getDeclaredMethod("WindowsRegQueryValueEx",
+ int.class, byte[].class);
+ winRegQueryValueM.setAccessible(true);
+
+ // Get all the constants we need
+ int HKLM = getValueFromStaticField("HKEY_LOCAL_MACHINE", clazz);
+ int KEY_READ = getValueFromStaticField("KEY_READ", clazz);
+ int ERROR_CODE = getValueFromStaticField("ERROR_CODE", clazz);
+ int NATIVE_HANDLE = getValueFromStaticField("NATIVE_HANDLE", clazz);
+ int ERROR_SUCCESS = getValueFromStaticField("ERROR_SUCCESS", clazz);
+
+ // Convert keys
+ byte[] reg = stringToByteArray(regKey);
+ byte[] key = stringToByteArray(keyName);
+
+ // Open the registry
+ int[] result = (int[]) winRegOpenKeyM.invoke(null, HKLM, reg, KEY_READ);
+
+ if (result[ERROR_CODE] == ERROR_SUCCESS) {
+ byte[] stvalue = (byte[]) winRegQueryValueM.invoke(null,
+ result[NATIVE_HANDLE], key);
+ out = byteArrayToString(stvalue);
+ winRegCloseKeyM.invoke(null, result[NATIVE_HANDLE]);
+ }
+ } catch (Exception ex) {
+ if (isVerbose()) {
+ ex.printStackTrace();
+ }
+ }
+ return out;
+ }
+
+ private static int getValueFromStaticField(String fldName, Class<?> klass) throws Exception {
+ Field f = klass.getDeclaredField(fldName);
+ f.setAccessible(true);
+ return f.getInt(null);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/servicetag/WindowsSystemEnvironment.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.servicetag;
+
+// This class is a copy of the com.sun.scn.servicetags.WindowsSystemEnvironment
+// class from the Sun Connection source.
+//
+// The Service Tags team maintains the latest version of the implementation
+// for system environment data collection. JDK will include a copy of
+// the most recent released version for a JDK release. We rename
+// the package to com.sun.servicetag so that the Sun Connection
+// product always uses the latest version from the com.sun.scn.servicetags
+// package. JDK and users of the com.sun.servicetag API
+// (e.g. NetBeans and SunStudio) will use the version in JDK.
+//
+// So we keep this class in src/share/classes instead of src/<os>/classes.
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Windows implementation of the SystemEnvironment class.
+ */
+class WindowsSystemEnvironment extends SystemEnvironment {
+ WindowsSystemEnvironment() {
+ super();
+
+ // run a call to make sure things are initialized
+ // ignore the first call result as the system may
+ // give inconsistent data on the first invocation ever
+ getWmicResult("computersystem", "get", "model");
+
+ setSystemModel(getWmicResult("computersystem", "get", "model"));
+ setSystemManufacturer(getWmicResult("computersystem", "get", "manufacturer"));
+ setSerialNumber(getWmicResult("bios", "get", "serialnumber"));
+
+ String cpuMfr = getWmicResult("cpu", "get", "manufacturer");
+ // this isn't as good an option, but if we couldn't get anything
+ // from wmic, try the processor_identifier
+ if (cpuMfr.length() == 0) {
+ String procId = System.getenv("processor_identifer");
+ if (procId != null) {
+ String[] s = procId.split(",");
+ cpuMfr = s[s.length - 1].trim();
+ }
+ }
+ setCpuManufacturer(cpuMfr);
+
+ // try to remove the temp file that gets created from running wmic cmds
+ try {
+ // look in the current working directory
+ File f = new File("TempWmicBatchFile.bat");
+ if (f.exists()) {
+ f.delete();
+ }
+ } catch (Exception e) {
+ // ignore the exception
+ }
+ }
+
+
+ /**
+ * This method invokes wmic outside of the normal environment
+ * collection routines.
+ *
+ * An initial call to wmic can be costly in terms of time.
+ *
+ * <code>
+ * Details of why the first call is costly can be found at:
+ *
+ * http://support.microsoft.com/kb/290216/en-us
+ *
+ * "When you run the Wmic.exe utility for the first time, the utility
+ * compiles its .mof files into the repository. To save time during
+ * Windows installation, this operation takes place as necessary."
+ * </code>
+ */
+ private String getWmicResult(String alias, String verb, String property) {
+ String res = "";
+ BufferedReader in = null;
+ try {
+ ProcessBuilder pb = new ProcessBuilder("cmd", "/C", "WMIC", alias, verb, property);
+ Process p = pb.start();
+ // need this for executing windows commands (at least
+ // needed for executing wmic command)
+ BufferedWriter bw = new BufferedWriter(
+ new OutputStreamWriter(p.getOutputStream()));
+ bw.write(13);
+ bw.flush();
+ bw.close();
+
+ p.waitFor();
+ if (p.exitValue() == 0) {
+ in = new BufferedReader(new InputStreamReader(p.getInputStream()));
+ String line = null;
+ while ((line = in.readLine()) != null) {
+ line = line.trim();
+ if (line.length() == 0) {
+ continue;
+ }
+ res = line;
+ }
+ // return the *last* line read
+ return res;
+ }
+
+ } catch (Exception e) {
+ // ignore the exception
+ } finally {
+ if (in != null) {
+ try {
+ in.close();
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+ }
+ return res.trim();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/servicetag/package.html Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,71 @@
+CTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html>
+<head>
+<!--
+Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+particular file as subject to the "Classpath" exception as provided
+by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+CA 95054 USA or visit www.sun.com if you need additional information or
+have any questions.
+
+-->
+
+</head>
+<body bgcolor="white">
+
+This package contains classes that allow the creation
+and manipulation of service tags.
+This com.sun.servicetag package is intended for
+<b>Sun internal use</b> only.
+<p>
+<dl>
+<dt><b>Service Tag</b></dt>
+<dd>A service tag is an XML-based data structure that contains identifying
+information about an instance of a product or component on a system.
+</dd>
+</dl>
+<dl>
+<dt><b>Service Tag Registry</b></dt>
+<dd>A service tag registry is a XML-based registry that contains
+the service tags of all the tagged components on a system. The
+service tag registry is present on systems that have the
+Service Tags software installed.
+</dd>
+</dl>
+<dl>
+<dt><b>Registration Data</b></dt>
+<dd>A registration data is a container of one or more
+service tags that identify the
+components for product registration and will be used to interface
+with the Sun Connection registration services.
+</dd>
+</dl>
+
+This package contains the methods to create service tags, set up the
+registration data for product registration, add service tags to and
+remove them from the system service tag registry.
+<p>
+All methods defined in this package will throw {@code NullPointerException}
+if {@code null} is passed in any input parameter unless it is stated otherwise.
+In addition, they are multi-thread safe.
+</body>
+</html>
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/servicetag/resources/Putback-Notes.txt Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,25 @@
+README for auto-generating of the offline registration page.
+
+1. register.html is defined by the xDesign team.
+
+2. Before putback in the workspace, we need to modify the
+ register.html to contain the following:
+
+ (a) replace the pathname of the jdk_header.png image to
+ <img src="@@JDK_HEADER_PNG@@" ....>
+
+ (b) replace the product name from:
+ Java Development Kit Version 6 Update 5 (e.g.)
+ to:
+ Java Development Kit @@JDK_VERSION@@
+
+ (c) replace the form action for the "Register My JDK" button with:
+
+ <form name="form1" method="post" action="@@REGISTRATION_URL@@" enctype="text/xml">
+
+ (d) Add this input in the form for posting data after
+ the <form name=....> line:
+
+ <input type="hidden" name="servicetag_payload" value="@@REGISTRATION_PAYLOAD@@">
+
+3. The jdk_header.png is located under <JRE>/lib/servicetag directory.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/servicetag/resources/javase_5_swordfish.properties Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,29 @@
+# Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+
+servicetag.jdk.urn = urn:uuid:d5bed446-05f2-42ed-ba0a-153105a52413
+servicetag.jdk.name = J2SE 5.0 Development Kit
+servicetag.jre.urn = urn:uuid:5c6686aa-fd05-46a6-ba3e-700e2d5f7043
+servicetag.jre.name = J2SE 5.0 Runtime Environment
+servicetag.parent.urn = urn:uuid:f3c20172-557a-11d7-93d0-d6a41ea318df
+servicetag.parent.name = Java 2 Platform, Standard Edition 5.0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/servicetag/resources/javase_6_swordfish.properties Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,29 @@
+# Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+
+servicetag.jdk.urn = urn:uuid:b58ef9a8-5ae8-11db-a023-080020a9ed93
+servicetag.jdk.name = Java SE 6 Development Kit
+servicetag.jre.urn = urn:uuid:92d1de8c-1e59-42c6-a280-1c379526bcbc
+servicetag.jre.name = Java SE 6 Runtime Environment
+servicetag.parent.urn = urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3
+servicetag.parent.name = Java Platform Standard Edition 6 (Java SE 6)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/servicetag/resources/javase_7_swordfish.properties Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,29 @@
+# Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+
+servicetag.jdk.urn = JSEZ9-007-ZZZZ
+servicetag.jdk.name = Java SE 7 Development Kit
+servicetag.jre.urn = JSERE-007-ZZZZ
+servicetag.jre.name = Java SE 7 Runtime Environment
+servicetag.parent.urn = urn:uuid:dc1704fe-264f-11dc-9482-080020a9ed93
+servicetag.parent.name = Java Platform Standard Edition 7 (Java SE 7)
Binary file jdk/src/share/classes/com/sun/servicetag/resources/jdk_header.png has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/servicetag/resources/product_registration.xsd Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,301 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+<xs:element name="registration_data">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="environment"
+ minOccurs="1"
+ maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="hostname"
+ minOccurs='1'
+ maxOccurs='1'/>
+ <xs:element ref="hostId"
+ minOccurs='1'
+ maxOccurs='1'/>
+ <xs:element ref="osName"
+ minOccurs='1'
+ maxOccurs='1'/>
+ <xs:element ref="osVersion"
+ minOccurs='1'
+ maxOccurs='1'/>
+ <xs:element ref="osArchitecture"
+ minOccurs='1'
+ maxOccurs='1'/>
+ <xs:element ref="systemModel"
+ minOccurs='1'
+ maxOccurs='1'/>
+ <xs:element ref="systemManufacturer"
+ minOccurs='1'
+ maxOccurs='1'/>
+ <xs:element ref="cpuManufacturer"
+ minOccurs='1'
+ maxOccurs='1'/>
+ <xs:element ref="serialNumber"
+ minOccurs='1'
+ maxOccurs='1'/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="registry"
+ minOccurs="1"
+ maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="service_tag"
+ minOccurs="0"
+ maxOccurs="1024">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="instance_urn"
+ minOccurs='1'
+ maxOccurs='1'/>
+ <xs:element ref="product_name"
+ minOccurs='1'
+ maxOccurs='1'/>
+ <xs:element ref="product_version"
+ minOccurs='1'
+ maxOccurs='1'/>
+ <xs:element ref="product_urn"
+ minOccurs='1'
+ maxOccurs='1'/>
+ <xs:element ref="product_parent_urn"
+ minOccurs='1'
+ maxOccurs='1'/>
+ <xs:element ref="product_parent"
+ minOccurs='1'
+ maxOccurs='1'/>
+ <xs:element ref="product_defined_inst_id"
+ minOccurs='1'
+ maxOccurs='1'/>
+ <xs:element ref="product_vendor"
+ minOccurs='1'
+ maxOccurs='1'/>
+ <xs:element ref="platform_arch"
+ minOccurs='1'
+ maxOccurs='1'/>
+ <xs:element ref="timestamp"
+ minOccurs='1'
+ maxOccurs='1'/>
+ <xs:element ref="container"
+ minOccurs='1'
+ maxOccurs='1'/>
+ <xs:element ref="source"
+ minOccurs='1'
+ maxOccurs='1'/>
+ <xs:element ref="installer_uid"
+ minOccurs='1'
+ maxOccurs='1'/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="urn"
+ type="xs:string"
+ use="required"/>
+ <xs:attribute name="version"
+ type="xs:string"
+ use="required"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="version"
+ type="xs:string"
+ use="required"/>
+ </xs:complexType>
+</xs:element>
+
+ <!-- definition of simple elements -->
+ <xs:element name="hostname">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:minLength value="1"/>
+ <xs:maxLength value="255"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+
+ <xs:element name="hostId">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:minLength value="0"/>
+ <xs:maxLength value="16"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+
+ <xs:element name="osName">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:minLength value="1"/>
+ <xs:maxLength value="256"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+
+ <xs:element name="osVersion">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:minLength value="0"/>
+ <xs:maxLength value="50"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+
+ <xs:element name="osArchitecture">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:minLength value="0"/>
+ <xs:maxLength value="256"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+
+ <xs:element name="systemModel">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:minLength value="0"/>
+ <xs:maxLength value="50"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+
+ <xs:element name="systemManufacturer">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:minLength value="0"/>
+ <xs:maxLength value="50"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+
+ <xs:element name="cpuManufacturer">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:minLength value="0"/>
+ <xs:maxLength value="50"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+
+ <xs:element name="serialNumber">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:minLength value="0"/>
+ <xs:maxLength value="256"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+
+ <xs:element name="instance_urn">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:minLength value="1"/>
+ <xs:maxLength value="255"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+
+ <xs:element name="product_name">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:maxLength value="255"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+
+ <xs:element name="product_version">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:maxLength value="63"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+
+ <xs:element name="product_urn">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:minLength value="1"/>
+ <xs:maxLength value="255"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+
+ <xs:element name="product_parent_urn">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:minLength value="0"/>
+ <xs:maxLength value="255"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+
+ <xs:element name="product_parent">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:minLength value="1"/>
+ <xs:maxLength value="255"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+
+ <xs:element name="product_defined_inst_id">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:minLength value="0"/>
+ <xs:maxLength value="255"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+
+ <xs:element name="product_vendor">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:minLength value="1"/>
+ <xs:maxLength value="63"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+
+ <xs:element name="platform_arch">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:minLength value="1"/>
+ <xs:maxLength value="63"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+
+ <xs:element name="timestamp">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:maxLength value="24"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+
+ <xs:element name="container">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:maxLength value="63"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+
+ <xs:element name="source">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:maxLength value="63"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+
+ <xs:element name="installer_uid">
+ <xs:simpleType>
+ <xs:restriction base="xs:integer">
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+
+</xs:schema>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/servicetag/resources/register.html Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,105 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Register your JDK</title>
+
+<!--
+Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+particular file as subject to the "Classpath" exception as provided
+by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+CA 95054 USA or visit www.sun.com if you need additional information or
+have any questions.
+-->
+
+<style type="text/css">
+<!--
+.style1 {font-family: Arial, Helvetica, sans-serif}
+.style3 {font-family: Arial, Helvetica, sans-serif; font-size: small; }
+input.buttonblue,input.defbutton{ background: #3F6580;border-right:1px solid #304C60;border-bottom:1px solid #304C60;border-left:1px solid #BACDD9;border-top:1px solid #BACDD9; font-weight:bold; color:#FFFFFF; font-size:.8em; height:1.9em}
+input.buttonblue:hover{color:#fbe249;}
+a:link,a.named:visited{color:#3E6B8A}
+a:hover{text-decoration:underline}
+a{text-decoration:none}
+a:visited,a:visited code{color:#917E9C}
+-->
+</style>
+</head>
+
+<body>
+<table width="813" border="0" cellpadding="3" cellspacing="0">
+ <tr>
+ <td width="7" height="78"> </td>
+ <td width="794" align="left" valign="top">
+ <img src="@@JDK_HEADER_PNG@@" width="783" height="63"></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td><p class="style1">Thank you for installing the
+ <strong> Java Development Kit @@JDK_VERSION@@ </strong>
+ from Sun Microsystems. </p>
+ <p class="style1">Registering your product will give you the following benefits:</p>
+ <ul class="style1">
+ <li> Notification of new versions, patches, and updates</li>
+ <li> Special offers on Sun developer products, services and training </li>
+ <li> Access to early releases and documentation </li>
+ </ul>
+ <p class="style1">Product registration is FREE, quick and easy!</p>
+ <blockquote>
+ <p class="style1">All you need is a Sun Developer Network or other Sun Online account. If you don't already have one, you will be prompted to create one. </p>
+ <table width="708" border="0" cellspacing="0" cellpadding="3">
+ <tr valign="top">
+ <td width="126" height="35">
+ <form name="form1" method="post" action="@@REGISTRATION_URL@@" enctype="text/xml">
+ <input type="hidden" name="servicetag_payload" value="@@REGISTRATION_PAYLOAD@@">
+ <input type="submit" name="Submit"border="0" class="buttonblue" onmouseover="this.style.color='#fbe249';" onmouseout="this.style.color='#FFF';" value="Register My JDK">
+ </form></td>
+ <td width="570"><span class="style3">You need to be connected to the Internet to register this Sun product. </span></td>
+ </tr>
+ </table>
+ </blockquote>
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td bgcolor="#f1f7df">
+ <p class="style3">Sun Microsystems, Inc. respects your privacy.
+ We will use your personal information for communications
+ and management of your Sun Online Account, the services
+ and applications you access using your Sun Online Account,
+ and the products and systems you register with your Sun Online Account.</p>
+ <p class="style3">For more information on the data that will be collected as
+ part of the registration process and how it will be managed <br>
+ see <a href="http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html">http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html</a>. <br>
+ <br>
+ For more information on Sun's Privacy Policy see <a href="http://www.sun.com/privacy/">http://www.sun.com/privacy/</a> or contact <a class="moz-txt-link-rfc2396E" href="mailto:privacy@sun.com">privacy@sun.com.</a></p></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td> </td>
+ </tr>
+</table>
+</body>
+</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/servicetag/resources/register_ja.html Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,91 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.or
+g/TR/html4/loose.dtd">
+<html><head>
+
+
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>JDK 製品登録</title>
+
+<!--
+Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+particular file as subject to the "Classpath" exception as provided
+by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+CA 95054 USA or visit www.sun.com if you need additional information or
+have any questions.
+-->
+
+<style type="text/css">
+<!--
+.style1 {font-family: Arial, Helvetica, sans-serif}
+.style3 {font-family: Arial, Helvetica, sans-serif; font-size: small; }
+input.buttonblue,input.defbutton{ background: #3F6580;border-right:1px solid #304C60;border-bottom:1px solid #304C60;border-left:1px solid #BACDD9;border-top:1px solid #BACDD9; font-weight:bold; color:#FFFFFF; font-size:.8em; height:1.9em}
+input.buttonblue:hover{color:#fbe249;}
+a:link,a.named:visited{color:#3E6B8A}
+a:hover{text-decoration:underline}
+a{text-decoration:none}
+a:visited,a:visited code{color:#917E9C}
+-->
+</style></head><body>
+<table border="0" cellpadding="3" cellspacing="0" width="813">
+ <tbody><tr>
+ <td height="78" width="7"> </td>
+ <td align="left" valign="top" width="794"><img src="@@JDK_HEADER_PNG@@" height="63" width="783"></td>
+ </tr>
+ <tr>
+ <td> </td>
+
+ <td><p class="style1">Sun Microsystems の<strong> Java Development Kit @@JDK_VERSION@@ </strong>をインストールしていただき、ありがとうございます。 </p>
+ <p class="style1">製品登録をすると、次のような特典を受けることができます。</p>
+ <ul class="style1">
+ <li> 最新のバージョン、パッチ、および更新についての通知</li>
+ <li> Sun の開発者向け製品、サービス、およびトレーニングの特別販売 </li>
+ <li> アーリーリリースおよびドキュメントへのアクセス </li>
+ </ul>
+ <p class="style1">製品登録は無料であり、迅速で簡単です。</p>
+ <blockquote>
+ <p class="style1">必要になるのは、Sun 開発者向けネットワークアカウントまたはその他の Sun オンラインアカウントだけです。 まだアカウントがない場合は、アカウントの作成が求められます。 </p>
+ <table width="708" border="0" cellspacing="0" cellpadding="3">
+ <tr valign="top">
+ <td width="126" height="35"><form name="form1" method="post" action="@@REGISTRATION_URL@@" enctype="text/xml">
+ <input type="hidden" name="servicetag_payload" value="@@REGISTRATION_PAYLOAD@@">
+ <input type="submit" name="Submit"border="0" class="buttonblue" onmouseover="this.style.color='#fbe249';" onmouseout="this.style.color='#FFF';" value="JDK 製品登録">
+ </form></td>
+ <td width="570"><span class="style3">この Sun 製品を登録するには、インターネットに接続している必要があります。 </span></td>
+ </tr>
+ </table>
+ </blockquote>
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td bgcolor="#f1f7df">
+ <p class="style3">Sun Microsystems, Inc. は、お客様のプライバシーを尊重します。 お客様の個人情報は、お客様の Sun オンラインアカウント、お客様が Sun オンラインアカウントを使用してアクセスするサービスとアプリケーション、およびお客様が Sun オンラインアカウントで登録する製品とシステムの通信と管理に使用します。</p>
+ <p class="style3">登録の際に収集されるデータや、それらがどのように管理されるかについての詳細は、<br><a href="http://java.sun.com/javase/ja/registration/JDKRegistrationPrivacy.html">http://java.sun.com/javase/ja/registration/JDKRegistrationPrivacy.html</a> を参照してください。 <br> <br> Sun のプライバシーポリシーについての詳細は、<a href="http://jp.sun.com/privacy/">http://jp.sun.com/privacy/</a> を参照するか、<a class="moz-txt-link-rfc2396E" href="http://jp.sun.com/cgi-bin/contact/comment.cgi?url=http://jp.sun.com/privacy/">お問い合わせフォーム</a>からお問い合わせください。</p></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td> </td>
+ </tr>
+</table>
+</body>
+</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/com/sun/servicetag/resources/register_zh_CN.html Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,92 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>注册您的 JDK</title>
+
+<!--
+Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+particular file as subject to the "Classpath" exception as provided
+by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+CA 95054 USA or visit www.sun.com if you need additional information or
+have any questions.
+-->
+
+<style type="text/css">
+<!--
+.style1 {font-family: Arial, Helvetica, sans-serif}
+.style3 {font-family: Arial, Helvetica, sans-serif; font-size: small; }
+input.buttonblue,input.defbutton{ background: #3F6580;border-right:1px solid #304C60;border-bottom:1px solid #304C60;border-left:1px solid #BACDD9;border-top:1px solid #BACDD9; font-weight:bold; color:#FFFFFF; font-size:.8em; height:1.9em}
+input.buttonblue:hover{color:#fbe249;}
+a:link,a.named:visited{color:#3E6B8A}
+a:hover{text-decoration:underline}
+a{text-decoration:none}
+a:visited,a:visited code{color:#917E9C}
+-->
+</style></head><body>
+<table border="0" cellpadding="3" cellspacing="0" width="813">
+ <tbody><tr>
+ <td height="78" width="7"> </td>
+ <td align="left" valign="top" width="794"><img src="@@JDK_HEADER_PNG@@" height="63" width="783"></td>
+ </tr>
+
+ <tr>
+ <td> </td>
+
+<td><p class="style1">感谢您安装 Sun Microsystems 的 <strong>Java Development Kit @@JDK_VERSION@@</strong>。 </p>
+<p class="style1">注册产品后您将获得如下增值服务：</p>
+ <ul class="style1">
+<li> 获得新版本、修补程序和更新的通知服务</li>
+<li> 获得有关 Sun 开发者产品、服务和培训的优惠 </li>
+<li> 获得对早期版本和文档的访问权限 </li>
+ </ul>
+<p class="style1">产品注册是免费的，即快速又轻松！</p>
+ <blockquote>
+<p class="style1">您需要具有 Sun 开发者网络或其他 Sun 联机帐户。如果您没有，系统将提示您创建一个。 </p>
+ <table width="708" border="0" cellspacing="0" cellpadding="3">
+ <tr valign="top">
+ <td width="126" height="35"><form name="form1" method="post" action="@@REGISTRATION_URL@@" enctype="text/xml">
+ <input type="hidden" name="servicetag_payload" value="@@REGISTRATION_PAYLOAD@@">
+<input type="submit" name="Submit"border="0" class="buttonblue" onmouseover="this.style.color='#fbe249';" onmouseout="this.style.color='#FFF';" value="注册我的 JDK">
+ </form></td>
+<td width="570"><span class="style3">您需要连接到 Internet 来注册此 Sun 产品。 </span></td>
+ </tr>
+ </table>
+ </blockquote>
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td bgcolor="#f1f7df">
+ <p class="style3">Sun Microsystems, Inc. 尊重您的隐私。我们会将您的个人信息用于通信和 Sun 联机帐户的管理、Sun 联机帐户访问的服务和应用程序以及用于使用 Sun 联机帐户注册的产品和系统。</p>
+<p class="style3">有关注册过程中收集的数据以及这些数据的管理方式的更多信息，<br>请访问 <a href="http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html">http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html</a>。<br> <br>有关 Sun 隐私政策的更多信息，请访问 <a href="http://www.sun.com/privacy/">http://www.sun.com/privacy/</a> 或与 <a class="moz-txt-link-rfc2396E" href="mailto:privacy@sun.com">privacy@sun.com</a> 联系。</p></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td> </td>
+ </tr>
+</table>
+</body>
+</html>
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties Wed Jul 05 16:42:37 2017 +0200
@@ -101,30 +101,41 @@
ColorChooser.sampleText=Sample Text Sample Text
ColorChooser.swatchesNameText=Swatches
ColorChooser.swatchesMnemonic=83
-ColorChooser.swatchesDisplayedMnemonicIndex=0
ColorChooser.swatchesRecentText=Recent:
-ColorChooser.hsbNameText=HSB
# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
# constant, and an index into the text to render the mnemonic as. The
# mnemonic is xxxMnemonic and the index of the character to underline is
# xxxDisplayedMnemonicIndex.
-ColorChooser.hsbMnemonic=72
-ColorChooser.hsbDisplayedMnemonicIndex=0
-ColorChooser.hsbHueText=H
-ColorChooser.hsbSaturationText=S
-ColorChooser.hsbBrightnessText=B
-ColorChooser.hsbRedText=R
-ColorChooser.hsbGreenText=G
-ColorChooser.hsbBlueText=B
+ColorChooser.hsvNameText=HSV
+ColorChooser.hsvMnemonic=72
+ColorChooser.hsvHueText=Hue
+ColorChooser.hsvSaturationText=Saturation
+ColorChooser.hsvValueText=Value
+ColorChooser.hsvTransparencyText=Transparency
+ColorChooser.hslNameText=HSL
+ColorChooser.hslMnemonic=76
+ColorChooser.hslHueText=Hue
+ColorChooser.hslSaturationText=Saturation
+ColorChooser.hslLightnessText=Lightness
+ColorChooser.hslTransparencyText=Transparency
ColorChooser.rgbNameText=RGB
ColorChooser.rgbMnemonic=71
-ColorChooser.rgbDisplayedMnemonicIndex=1
ColorChooser.rgbRedText=Red
ColorChooser.rgbRedMnemonic=68
ColorChooser.rgbGreenText=Green
ColorChooser.rgbGreenMnemonic=78
ColorChooser.rgbBlueText=Blue
ColorChooser.rgbBlueMnemonic=66
+ColorChooser.rgbAlphaText=Alpha
+ColorChooser.rgbHexCodeText=Color Code
+ColorChooser.rgbHexCodeMnemonic=67
+ColorChooser.cmykNameText=CMYK
+ColorChooser.cmykMnemonic=77
+ColorChooser.cmykCyanText=Cyan
+ColorChooser.cmykMagentaText=Magenta
+ColorChooser.cmykYellowText=Yellow
+ColorChooser.cmykBlackText=Black
+ColorChooser.cmykAlphaText=Alpha
############ OPTION PANE STRINGS #############
# Mnemonic keys correspond to KeyEvent.VK_XXX constant
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties Wed Jul 05 16:42:37 2017 +0200
@@ -101,30 +101,41 @@
ColorChooser.sampleText=Beispieltext Beispieltext
ColorChooser.swatchesNameText=Muster
ColorChooser.swatchesMnemonic=77
-ColorChooser.swatchesDisplayedMnemonicIndex=0
ColorChooser.swatchesRecentText=Aktuell:
-ColorChooser.hsbNameText=HSB
# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
# constant, and an index into the text to render the mnemonic as. The
# mnemonic is xxxMnemonic and the index of the character to underline is
# xxxDisplayedMnemonicIndex.
-ColorChooser.hsbMnemonic=72
-ColorChooser.hsbDisplayedMnemonicIndex=0
-ColorChooser.hsbHueText=H
-ColorChooser.hsbSaturationText=S
-ColorChooser.hsbBrightnessText=B
-ColorChooser.hsbRedText=R
-ColorChooser.hsbGreenText=G
-ColorChooser.hsbBlueText=B
+ColorChooser.hsvNameText=HSV
+ColorChooser.hsvMnemonic=72
+ColorChooser.hsvHueText=Hue
+ColorChooser.hsvSaturationText=Saturation
+ColorChooser.hsvValueText=Value
+ColorChooser.hsvTransparencyText=Transparency
+ColorChooser.hslNameText=HSL
+ColorChooser.hslMnemonic=76
+ColorChooser.hslHueText=Hue
+ColorChooser.hslSaturationText=Saturation
+ColorChooser.hslLightnessText=Lightness
+ColorChooser.hslTransparencyText=Transparency
ColorChooser.rgbNameText=RGB
ColorChooser.rgbMnemonic=71
-ColorChooser.rgbDisplayedMnemonicIndex=1
ColorChooser.rgbRedText=Rot
ColorChooser.rgbRedMnemonic=82
ColorChooser.rgbGreenText=Gr\u00fcn
ColorChooser.rgbGreenMnemonic=78
ColorChooser.rgbBlueText=Blau
ColorChooser.rgbBlueMnemonic=66
+ColorChooser.rgbAlphaText=Alpha
+ColorChooser.rgbHexCodeText=Color Code
+ColorChooser.rgbHexCodeMnemonic=67
+ColorChooser.cmykNameText=CMYK
+ColorChooser.cmykMnemonic=77
+ColorChooser.cmykCyanText=Cyan
+ColorChooser.cmykMagentaText=Magenta
+ColorChooser.cmykYellowText=Yellow
+ColorChooser.cmykBlackText=Black
+ColorChooser.cmykAlphaText=Alpha
############ OPTION PANE STRINGS #############
# Mnemonic keys correspond to KeyEvent.VK_XXX constant
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties Wed Jul 05 16:42:37 2017 +0200
@@ -101,30 +101,41 @@
ColorChooser.sampleText=Texto de ejemplo Texto de ejemplo
ColorChooser.swatchesNameText=Muestras
ColorChooser.swatchesMnemonic=77
-ColorChooser.swatchesDisplayedMnemonicIndex=0
ColorChooser.swatchesRecentText=Reciente:
-ColorChooser.hsbNameText=HSB
# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
# constant, and an index into the text to render the mnemonic as. The
# mnemonic is xxxMnemonic and the index of the character to underline is
# xxxDisplayedMnemonicIndex.
-ColorChooser.hsbMnemonic=72
-ColorChooser.hsbDisplayedMnemonicIndex=0
-ColorChooser.hsbHueText=H
-ColorChooser.hsbSaturationText=S
-ColorChooser.hsbBrightnessText=B
-ColorChooser.hsbRedText=R
-ColorChooser.hsbGreenText=V
-ColorChooser.hsbBlueText=A
+ColorChooser.hsvNameText=HSV
+ColorChooser.hsvMnemonic=72
+ColorChooser.hsvHueText=Hue
+ColorChooser.hsvSaturationText=Saturation
+ColorChooser.hsvValueText=Value
+ColorChooser.hsvTransparencyText=Transparency
+ColorChooser.hslNameText=HSL
+ColorChooser.hslMnemonic=76
+ColorChooser.hslHueText=Hue
+ColorChooser.hslSaturationText=Saturation
+ColorChooser.hslLightnessText=Lightness
+ColorChooser.hslTransparencyText=Transparency
ColorChooser.rgbNameText=RGB
ColorChooser.rgbMnemonic=71
-ColorChooser.rgbDisplayedMnemonicIndex=1
ColorChooser.rgbRedText=Rojo
ColorChooser.rgbRedMnemonic=74
ColorChooser.rgbGreenText=Verde
ColorChooser.rgbGreenMnemonic=86
ColorChooser.rgbBlueText=Azul
ColorChooser.rgbBlueMnemonic=76
+ColorChooser.rgbAlphaText=Alpha
+ColorChooser.rgbHexCodeText=Color Code
+ColorChooser.rgbHexCodeMnemonic=67
+ColorChooser.cmykNameText=CMYK
+ColorChooser.cmykMnemonic=77
+ColorChooser.cmykCyanText=Cyan
+ColorChooser.cmykMagentaText=Magenta
+ColorChooser.cmykYellowText=Yellow
+ColorChooser.cmykBlackText=Black
+ColorChooser.cmykAlphaText=Alpha
############ OPTION PANE STRINGS #############
# Mnemonic keys correspond to KeyEvent.VK_XXX constant
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties Wed Jul 05 16:42:37 2017 +0200
@@ -101,30 +101,41 @@
ColorChooser.sampleText=Echantillon de texte Echantillon de texte
ColorChooser.swatchesNameText=Echantillons
ColorChooser.swatchesMnemonic=69
-ColorChooser.swatchesDisplayedMnemonicIndex=0
ColorChooser.swatchesRecentText=Dernier :
-ColorChooser.hsbNameText=HSB
# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
# constant, and an index into the text to render the mnemonic as. The
# mnemonic is xxxMnemonic and the index of the character to underline is
# xxxDisplayedMnemonicIndex.
-ColorChooser.hsbMnemonic=72
-ColorChooser.hsbDisplayedMnemonicIndex=0
-ColorChooser.hsbHueText=H
-ColorChooser.hsbSaturationText=S
-ColorChooser.hsbBrightnessText=B
-ColorChooser.hsbRedText=R
-ColorChooser.hsbGreenText=V
-ColorChooser.hsbBlueText=B
+ColorChooser.hsvNameText=HSV
+ColorChooser.hsvMnemonic=72
+ColorChooser.hsvHueText=Hue
+ColorChooser.hsvSaturationText=Saturation
+ColorChooser.hsvValueText=Value
+ColorChooser.hsvTransparencyText=Transparency
+ColorChooser.hslNameText=HSL
+ColorChooser.hslMnemonic=76
+ColorChooser.hslHueText=Hue
+ColorChooser.hslSaturationText=Saturation
+ColorChooser.hslLightnessText=Lightness
+ColorChooser.hslTransparencyText=Transparency
ColorChooser.rgbNameText=RVB
ColorChooser.rgbMnemonic=86
-ColorChooser.rgbDisplayedMnemonicIndex=1
ColorChooser.rgbRedText=Rouge
ColorChooser.rgbRedMnemonic=71
ColorChooser.rgbGreenText=Vert
ColorChooser.rgbGreenMnemonic=84
ColorChooser.rgbBlueText=Bleu
ColorChooser.rgbBlueMnemonic=66
+ColorChooser.rgbAlphaText=Alpha
+ColorChooser.rgbHexCodeText=Color Code
+ColorChooser.rgbHexCodeMnemonic=67
+ColorChooser.cmykNameText=CMYK
+ColorChooser.cmykMnemonic=77
+ColorChooser.cmykCyanText=Cyan
+ColorChooser.cmykMagentaText=Magenta
+ColorChooser.cmykYellowText=Yellow
+ColorChooser.cmykBlackText=Black
+ColorChooser.cmykAlphaText=Alpha
############ OPTION PANE STRINGS #############
# Mnemonic keys correspond to KeyEvent.VK_XXX constant
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties Wed Jul 05 16:42:37 2017 +0200
@@ -101,30 +101,41 @@
ColorChooser.sampleText=Testo di prova Testo di prova
ColorChooser.swatchesNameText=Colori campione
ColorChooser.swatchesMnemonic=67
-ColorChooser.swatchesDisplayedMnemonicIndex=0
ColorChooser.swatchesRecentText=Recenti:
-ColorChooser.hsbNameText=HSB
# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
# constant, and an index into the text to render the mnemonic as. The
# mnemonic is xxxMnemonic and the index of the character to underline is
# xxxDisplayedMnemonicIndex.
-ColorChooser.hsbMnemonic=72
-ColorChooser.hsbDisplayedMnemonicIndex=0
-ColorChooser.hsbHueText=H
-ColorChooser.hsbSaturationText=S
-ColorChooser.hsbBrightnessText=B
-ColorChooser.hsbRedText=R
-ColorChooser.hsbGreenText=G
-ColorChooser.hsbBlueText=B
+ColorChooser.hsvNameText=HSV
+ColorChooser.hsvMnemonic=72
+ColorChooser.hsvHueText=Hue
+ColorChooser.hsvSaturationText=Saturation
+ColorChooser.hsvValueText=Value
+ColorChooser.hsvTransparencyText=Transparency
+ColorChooser.hslNameText=HSL
+ColorChooser.hslMnemonic=76
+ColorChooser.hslHueText=Hue
+ColorChooser.hslSaturationText=Saturation
+ColorChooser.hslLightnessText=Lightness
+ColorChooser.hslTransparencyText=Transparency
ColorChooser.rgbNameText=RGB
ColorChooser.rgbMnemonic=71
-ColorChooser.rgbDisplayedMnemonicIndex=1
ColorChooser.rgbRedText=Rosso
ColorChooser.rgbRedMnemonic=79
ColorChooser.rgbGreenText=Verde
ColorChooser.rgbGreenMnemonic=69
ColorChooser.rgbBlueText=Blu
ColorChooser.rgbBlueMnemonic=66
+ColorChooser.rgbAlphaText=Alpha
+ColorChooser.rgbHexCodeText=Color Code
+ColorChooser.rgbHexCodeMnemonic=67
+ColorChooser.cmykNameText=CMYK
+ColorChooser.cmykMnemonic=77
+ColorChooser.cmykCyanText=Cyan
+ColorChooser.cmykMagentaText=Magenta
+ColorChooser.cmykYellowText=Yellow
+ColorChooser.cmykBlackText=Black
+ColorChooser.cmykAlphaText=Alpha
############ OPTION PANE STRINGS #############
# Mnemonic keys correspond to KeyEvent.VK_XXX constant
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties Wed Jul 05 16:42:37 2017 +0200
@@ -101,30 +101,41 @@
ColorChooser.sampleText=\u30b5\u30f3\u30d7\u30eb\u30c6\u30ad\u30b9\u30c8 \u30b5\u30f3\u30d7\u30eb\u30c6\u30ad\u30b9\u30c8
ColorChooser.swatchesNameText=\u30b5\u30f3\u30d7\u30eb(S)
ColorChooser.swatchesMnemonic=83
-ColorChooser.swatchesDisplayedMnemonicIndex=5
ColorChooser.swatchesRecentText=\u6700\u65b0:
-ColorChooser.hsbNameText=HSB
# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
# constant, and an index into the text to render the mnemonic as. The
# mnemonic is xxxMnemonic and the index of the character to underline is
# xxxDisplayedMnemonicIndex.
-ColorChooser.hsbMnemonic=72
-ColorChooser.hsbDisplayedMnemonicIndex=0
-ColorChooser.hsbHueText=H
-ColorChooser.hsbSaturationText=S
-ColorChooser.hsbBrightnessText=B
-ColorChooser.hsbRedText=R
-ColorChooser.hsbGreenText=G
-ColorChooser.hsbBlueText=B
+ColorChooser.hsvNameText=HSV
+ColorChooser.hsvMnemonic=72
+ColorChooser.hsvHueText=Hue
+ColorChooser.hsvSaturationText=Saturation
+ColorChooser.hsvValueText=Value
+ColorChooser.hsvTransparencyText=Transparency
+ColorChooser.hslNameText=HSL
+ColorChooser.hslMnemonic=76
+ColorChooser.hslHueText=Hue
+ColorChooser.hslSaturationText=Saturation
+ColorChooser.hslLightnessText=Lightness
+ColorChooser.hslTransparencyText=Transparency
ColorChooser.rgbNameText=RGB
ColorChooser.rgbMnemonic=71
-ColorChooser.rgbDisplayedMnemonicIndex=1
ColorChooser.rgbRedText=\u8d64(D)
ColorChooser.rgbRedMnemonic=68
ColorChooser.rgbGreenText=\u7dd1(N)
ColorChooser.rgbGreenMnemonic=78
ColorChooser.rgbBlueText=\u9752(B)
ColorChooser.rgbBlueMnemonic=66
+ColorChooser.rgbAlphaText=Alpha
+ColorChooser.rgbHexCodeText=Color Code
+ColorChooser.rgbHexCodeMnemonic=67
+ColorChooser.cmykNameText=CMYK
+ColorChooser.cmykMnemonic=77
+ColorChooser.cmykCyanText=Cyan
+ColorChooser.cmykMagentaText=Magenta
+ColorChooser.cmykYellowText=Yellow
+ColorChooser.cmykBlackText=Black
+ColorChooser.cmykAlphaText=Alpha
############ OPTION PANE STRINGS #############
# Mnemonic keys correspond to KeyEvent.VK_XXX constant
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties Wed Jul 05 16:42:37 2017 +0200
@@ -101,30 +101,41 @@
ColorChooser.sampleText=\uc0d8\ud50c \ud14d\uc2a4\ud2b8 \uc0d8\ud50c \ud14d\uc2a4\ud2b8
ColorChooser.swatchesNameText=\uacac\ubcf8(S)
ColorChooser.swatchesMnemonic=83
-ColorChooser.swatchesDisplayedMnemonicIndex=3
ColorChooser.swatchesRecentText=\ucd5c\uadfc \ubaa9\ub85d:
-ColorChooser.hsbNameText=HSB
# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
# constant, and an index into the text to render the mnemonic as. The
# mnemonic is xxxMnemonic and the index of the character to underline is
# xxxDisplayedMnemonicIndex.
-ColorChooser.hsbMnemonic=72
-ColorChooser.hsbDisplayedMnemonicIndex=0
-ColorChooser.hsbHueText=H
-ColorChooser.hsbSaturationText=S
-ColorChooser.hsbBrightnessText=B
-ColorChooser.hsbRedText=R
-ColorChooser.hsbGreenText=G
-ColorChooser.hsbBlueText=B
+ColorChooser.hsvNameText=HSV
+ColorChooser.hsvMnemonic=72
+ColorChooser.hsvHueText=Hue
+ColorChooser.hsvSaturationText=Saturation
+ColorChooser.hsvValueText=Value
+ColorChooser.hsvTransparencyText=Transparency
+ColorChooser.hslNameText=HSL
+ColorChooser.hslMnemonic=76
+ColorChooser.hslHueText=Hue
+ColorChooser.hslSaturationText=Saturation
+ColorChooser.hslLightnessText=Lightness
+ColorChooser.hslTransparencyText=Transparency
ColorChooser.rgbNameText=RGB
ColorChooser.rgbMnemonic=71
-ColorChooser.rgbDisplayedMnemonicIndex=1
ColorChooser.rgbRedText=\ube68\uac04\uc0c9(D)
ColorChooser.rgbRedMnemonic=68
ColorChooser.rgbGreenText=\ub179\uc0c9(N)
ColorChooser.rgbGreenMnemonic=78
ColorChooser.rgbBlueText=\ud30c\ub780\uc0c9(B)
ColorChooser.rgbBlueMnemonic=66
+ColorChooser.rgbAlphaText=Alpha
+ColorChooser.rgbHexCodeText=Color Code
+ColorChooser.rgbHexCodeMnemonic=67
+ColorChooser.cmykNameText=CMYK
+ColorChooser.cmykMnemonic=77
+ColorChooser.cmykCyanText=Cyan
+ColorChooser.cmykMagentaText=Magenta
+ColorChooser.cmykYellowText=Yellow
+ColorChooser.cmykBlackText=Black
+ColorChooser.cmykAlphaText=Alpha
############ OPTION PANE STRINGS #############
# Mnemonic keys correspond to KeyEvent.VK_XXX constant
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties Wed Jul 05 16:42:37 2017 +0200
@@ -101,30 +101,41 @@
ColorChooser.sampleText=Exempeltext Exempeltext
ColorChooser.swatchesNameText=Prov
ColorChooser.swatchesMnemonic=80
-ColorChooser.swatchesDisplayedMnemonicIndex=0
ColorChooser.swatchesRecentText=Tidigare:
-ColorChooser.hsbNameText=HSB
# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
# constant, and an index into the text to render the mnemonic as. The
# mnemonic is xxxMnemonic and the index of the character to underline is
# xxxDisplayedMnemonicIndex.
-ColorChooser.hsbMnemonic=72
-ColorChooser.hsbDisplayedMnemonicIndex=0
-ColorChooser.hsbHueText=H
-ColorChooser.hsbSaturationText=S
-ColorChooser.hsbBrightnessText=B
-ColorChooser.hsbRedText=R
-ColorChooser.hsbGreenText=G
-ColorChooser.hsbBlueText=B
+ColorChooser.hsvNameText=HSV
+ColorChooser.hsvMnemonic=72
+ColorChooser.hsvHueText=Hue
+ColorChooser.hsvSaturationText=Saturation
+ColorChooser.hsvValueText=Value
+ColorChooser.hsvTransparencyText=Transparency
+ColorChooser.hslNameText=HSL
+ColorChooser.hslMnemonic=76
+ColorChooser.hslHueText=Hue
+ColorChooser.hslSaturationText=Saturation
+ColorChooser.hslLightnessText=Lightness
+ColorChooser.hslTransparencyText=Transparency
ColorChooser.rgbNameText=RGB
ColorChooser.rgbMnemonic=71
-ColorChooser.rgbDisplayedMnemonicIndex=1
ColorChooser.rgbRedText=R\u00f6d
ColorChooser.rgbRedMnemonic=82
ColorChooser.rgbGreenText=Gr\u00f6n
ColorChooser.rgbGreenMnemonic=71
ColorChooser.rgbBlueText=Bl\u00e5
ColorChooser.rgbBlueMnemonic=66
+ColorChooser.rgbAlphaText=Alpha
+ColorChooser.rgbHexCodeText=Color Code
+ColorChooser.rgbHexCodeMnemonic=67
+ColorChooser.cmykNameText=CMYK
+ColorChooser.cmykMnemonic=77
+ColorChooser.cmykCyanText=Cyan
+ColorChooser.cmykMagentaText=Magenta
+ColorChooser.cmykYellowText=Yellow
+ColorChooser.cmykBlackText=Black
+ColorChooser.cmykAlphaText=Alpha
############ OPTION PANE STRINGS #############
# Mnemonic keys correspond to KeyEvent.VK_XXX constant
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties Wed Jul 05 16:42:37 2017 +0200
@@ -101,30 +101,41 @@
ColorChooser.sampleText=\u6837\u54c1\u6587\u672c \u6837\u54c1\u6587\u672c
ColorChooser.swatchesNameText=\u6837\u54c1(S)
ColorChooser.swatchesMnemonic=83
-ColorChooser.swatchesDisplayedMnemonicIndex=3
ColorChooser.swatchesRecentText=\u6700\u8fd1:
-ColorChooser.hsbNameText=HSB
# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
# constant, and an index into the text to render the mnemonic as. The
# mnemonic is xxxMnemonic and the index of the character to underline is
# xxxDisplayedMnemonicIndex.
-ColorChooser.hsbMnemonic=72
-ColorChooser.hsbDisplayedMnemonicIndex=0
-ColorChooser.hsbHueText=H
-ColorChooser.hsbSaturationText=S
-ColorChooser.hsbBrightnessText=B
-ColorChooser.hsbRedText=R
-ColorChooser.hsbGreenText=G
-ColorChooser.hsbBlueText=B
+ColorChooser.hsvNameText=HSV
+ColorChooser.hsvMnemonic=72
+ColorChooser.hsvHueText=Hue
+ColorChooser.hsvSaturationText=Saturation
+ColorChooser.hsvValueText=Value
+ColorChooser.hsvTransparencyText=Transparency
+ColorChooser.hslNameText=HSL
+ColorChooser.hslMnemonic=76
+ColorChooser.hslHueText=Hue
+ColorChooser.hslSaturationText=Saturation
+ColorChooser.hslLightnessText=Lightness
+ColorChooser.hslTransparencyText=Transparency
ColorChooser.rgbNameText=RGB
ColorChooser.rgbMnemonic=71
-ColorChooser.rgbDisplayedMnemonicIndex=1
ColorChooser.rgbRedText=\u7ea2
ColorChooser.rgbRedMnemonic=68
ColorChooser.rgbGreenText=\u7eff
ColorChooser.rgbGreenMnemonic=78
ColorChooser.rgbBlueText=\u84dd
ColorChooser.rgbBlueMnemonic=66
+ColorChooser.rgbAlphaText=Alpha
+ColorChooser.rgbHexCodeText=Color Code
+ColorChooser.rgbHexCodeMnemonic=67
+ColorChooser.cmykNameText=CMYK
+ColorChooser.cmykMnemonic=77
+ColorChooser.cmykCyanText=Cyan
+ColorChooser.cmykMagentaText=Magenta
+ColorChooser.cmykYellowText=Yellow
+ColorChooser.cmykBlackText=Black
+ColorChooser.cmykAlphaText=Alpha
############ OPTION PANE STRINGS #############
# Mnemonic keys correspond to KeyEvent.VK_XXX constant
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties Wed Jul 05 16:42:37 2017 +0200
@@ -101,30 +101,41 @@
ColorChooser.sampleText=\u7bc4\u4f8b\u6587\u5b57 \u7bc4\u4f8b\u6587\u5b57
ColorChooser.swatchesNameText=\u8abf\u8272\u677f(S)
ColorChooser.swatchesMnemonic=83
-ColorChooser.swatchesDisplayedMnemonicIndex=4
ColorChooser.swatchesRecentText=\u6700\u65b0\u9078\u64c7:
-ColorChooser.hsbNameText=HSB
# Each of the ColorChooser types can define a mnemonic, as a KeyEvent.VK_XXX
# constant, and an index into the text to render the mnemonic as. The
# mnemonic is xxxMnemonic and the index of the character to underline is
# xxxDisplayedMnemonicIndex.
-ColorChooser.hsbMnemonic=72
-ColorChooser.hsbDisplayedMnemonicIndex=0
-ColorChooser.hsbHueText=H
-ColorChooser.hsbSaturationText=S
-ColorChooser.hsbBrightnessText=B
-ColorChooser.hsbRedText=R
-ColorChooser.hsbGreenText=G
-ColorChooser.hsbBlueText=B
+ColorChooser.hsvNameText=HSV
+ColorChooser.hsvMnemonic=72
+ColorChooser.hsvHueText=Hue
+ColorChooser.hsvSaturationText=Saturation
+ColorChooser.hsvValueText=Value
+ColorChooser.hsvTransparencyText=Transparency
+ColorChooser.hslNameText=HSL
+ColorChooser.hslMnemonic=76
+ColorChooser.hslHueText=Hue
+ColorChooser.hslSaturationText=Saturation
+ColorChooser.hslLightnessText=Lightness
+ColorChooser.hslTransparencyText=Transparency
ColorChooser.rgbNameText=RGB
ColorChooser.rgbMnemonic=71
-ColorChooser.rgbDisplayedMnemonicIndex=1
ColorChooser.rgbRedText=\u7d05\u8272(D)
ColorChooser.rgbRedMnemonic=68
ColorChooser.rgbGreenText=\u7da0\u8272(N)
ColorChooser.rgbGreenMnemonic=78
ColorChooser.rgbBlueText=\u85cd\u8272(B)
ColorChooser.rgbBlueMnemonic=66
+ColorChooser.rgbAlphaText=Alpha
+ColorChooser.rgbHexCodeText=Color Code
+ColorChooser.rgbHexCodeMnemonic=67
+ColorChooser.cmykNameText=CMYK
+ColorChooser.cmykMnemonic=77
+ColorChooser.cmykCyanText=Cyan
+ColorChooser.cmykMagentaText=Magenta
+ColorChooser.cmykYellowText=Yellow
+ColorChooser.cmykBlackText=Black
+ColorChooser.cmykAlphaText=Alpha
############ OPTION PANE STRINGS #############
# Mnemonic keys correspond to KeyEvent.VK_XXX constant
--- a/jdk/src/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java Wed Jul 05 16:42:37 2017 +0200
@@ -61,7 +61,8 @@
private ThreadGroupReference threadGroup;
// This is cached only while this one thread is suspended. Each time
- // the thread is resumed, we clear this and start with a fresh one.
+ // the thread is resumed, we abandon the current cache object and
+ // create a new intialized one.
private static class LocalCache {
JDWP.ThreadReference.Status status = null;
List<StackFrame> frames = null;
@@ -74,6 +75,28 @@
boolean triedCurrentContended = false;
}
+ /*
+ * The localCache instance var is set by resetLocalCache to an initialized
+ * object as shown above. This occurs when the ThreadReference
+ * object is created, and when the mirrored thread is resumed.
+ * The fields are then filled in by the relevant methods as they
+ * are called. A problem can occur if resetLocalCache is called
+ * (ie, a resume() is executed) at certain points in the execution
+ * of some of these methods - see 6751643. To avoid this, each
+ * method that wants to use this cache must make a local copy of
+ * this variable and use that. This means that each invocation of
+ * these methods will use a copy of the cache object that was in
+ * effect at the point that the copy was made; if a racy resume
+ * occurs, it won't affect the method's local copy. This means that
+ * the values returned by these calls may not match the state of
+ * the debuggee at the time the caller gets the values. EG,
+ * frameCount() is called and comes up with 5 frames. But before
+ * it returns this, a resume of the debuggee thread is executed in a
+ * different debugger thread. The thread is resumed and running at
+ * the time that the value 5 is returned. Or even worse, the thread
+ * could be suspended again and have a different number of frames, eg, 24,
+ * but this call will still return 5.
+ */
private LocalCache localCache;
private void resetLocalCache() {
@@ -129,8 +152,9 @@
}
/**
- * Note that we only cache the name string while suspended because
- * it can change via Thread.setName arbitrarily
+ * Note that we only cache the name string while the entire VM is suspended
+ * because the name can change via Thread.setName arbitrarily while this
+ * thread is running.
*/
public String name() {
String name = null;
@@ -240,19 +264,20 @@
}
private JDWP.ThreadReference.Status jdwpStatus() {
- JDWP.ThreadReference.Status myStatus = localCache.status;
+ LocalCache snapshot = localCache;
+ JDWP.ThreadReference.Status myStatus = snapshot.status;
try {
if (myStatus == null) {
myStatus = JDWP.ThreadReference.Status.process(vm, this);
if ((myStatus.suspendStatus & SUSPEND_STATUS_SUSPENDED) != 0) {
// thread is suspended, we can cache the status.
- localCache.status = myStatus;
+ snapshot.status = myStatus;
}
}
} catch (JDWPException exc) {
throw exc.toJDIException();
}
- return myStatus;
+ return myStatus;
}
public int status() {
@@ -304,9 +329,10 @@
}
public int frameCount() throws IncompatibleThreadStateException {
+ LocalCache snapshot = localCache;
try {
- if (localCache.frameCount == -1) {
- localCache.frameCount = JDWP.ThreadReference.FrameCount
+ if (snapshot.frameCount == -1) {
+ snapshot.frameCount = JDWP.ThreadReference.FrameCount
.process(vm, this).frameCount;
}
} catch (JDWPException exc) {
@@ -318,7 +344,7 @@
throw exc.toJDIException();
}
}
- return localCache.frameCount;
+ return snapshot.frameCount;
}
public List<StackFrame> frames() throws IncompatibleThreadStateException {
@@ -335,22 +361,22 @@
* local is known to be non-null. Should only be called from
* a sync method.
*/
- private boolean isSubrange(LocalCache localCache,
+ private boolean isSubrange(LocalCache snapshot,
int start, int length) {
- if (start < localCache.framesStart) {
+ if (start < snapshot.framesStart) {
return false;
}
if (length == -1) {
- return (localCache.framesLength == -1);
+ return (snapshot.framesLength == -1);
}
- if (localCache.framesLength == -1) {
- if ((start + length) > (localCache.framesStart +
- localCache.frames.size())) {
+ if (snapshot.framesLength == -1) {
+ if ((start + length) > (snapshot.framesStart +
+ snapshot.frames.size())) {
throw new IndexOutOfBoundsException();
}
return true;
}
- return ((start + length) <= (localCache.framesStart + localCache.framesLength));
+ return ((start + length) <= (snapshot.framesStart + snapshot.framesLength));
}
public List<StackFrame> frames(int start, int length)
@@ -371,14 +397,14 @@
// Lock must be held while creating stack frames so if that two threads
// do this at the same time, one won't clobber the subset created by the other.
-
+ LocalCache snapshot = localCache;
try {
- if (localCache.frames == null || !isSubrange(localCache, start, length)) {
+ if (snapshot.frames == null || !isSubrange(snapshot, start, length)) {
JDWP.ThreadReference.Frames.Frame[] jdwpFrames
= JDWP.ThreadReference.Frames.
process(vm, this, start, length).frames;
int count = jdwpFrames.length;
- localCache.frames = new ArrayList<StackFrame>(count);
+ snapshot.frames = new ArrayList<StackFrame>(count);
for (int i = 0; i<count; i++) {
if (jdwpFrames[i].location == null) {
@@ -388,20 +414,20 @@
jdwpFrames[i].frameID,
jdwpFrames[i].location);
// Add to the frame list
- localCache.frames.add(frame);
+ snapshot.frames.add(frame);
}
- localCache.framesStart = start;
- localCache.framesLength = length;
- return Collections.unmodifiableList(localCache.frames);
+ snapshot.framesStart = start;
+ snapshot.framesLength = length;
+ return Collections.unmodifiableList(snapshot.frames);
} else {
- int fromIndex = start - localCache.framesStart;
+ int fromIndex = start - snapshot.framesStart;
int toIndex;
if (length == -1) {
- toIndex = localCache.frames.size() - fromIndex;
+ toIndex = snapshot.frames.size() - fromIndex;
} else {
toIndex = fromIndex + length;
}
- return Collections.unmodifiableList(localCache.frames.subList(fromIndex, toIndex));
+ return Collections.unmodifiableList(snapshot.frames.subList(fromIndex, toIndex));
}
} catch (JDWPException exc) {
switch (exc.errorCode()) {
@@ -415,15 +441,16 @@
}
public List<ObjectReference> ownedMonitors() throws IncompatibleThreadStateException {
+ LocalCache snapshot = localCache;
try {
- if (localCache.ownedMonitors == null) {
- localCache.ownedMonitors = Arrays.asList(
+ if (snapshot.ownedMonitors == null) {
+ snapshot.ownedMonitors = Arrays.asList(
(ObjectReference[])JDWP.ThreadReference.OwnedMonitors.
process(vm, this).owned);
if ((vm.traceFlags & vm.TRACE_OBJREFS) != 0) {
vm.printTrace(description() +
" temporarily caching owned monitors"+
- " (count = " + localCache.ownedMonitors.size() + ")");
+ " (count = " + snapshot.ownedMonitors.size() + ")");
}
}
} catch (JDWPException exc) {
@@ -435,54 +462,57 @@
throw exc.toJDIException();
}
}
- return localCache.ownedMonitors;
+ return snapshot.ownedMonitors;
}
public ObjectReference currentContendedMonitor()
throws IncompatibleThreadStateException {
+ LocalCache snapshot = localCache;
try {
- if (localCache.contendedMonitor == null &&
- !localCache.triedCurrentContended) {
- localCache.contendedMonitor = JDWP.ThreadReference.CurrentContendedMonitor.
+ if (snapshot.contendedMonitor == null &&
+ !snapshot.triedCurrentContended) {
+ snapshot.contendedMonitor = JDWP.ThreadReference.CurrentContendedMonitor.
process(vm, this).monitor;
- localCache.triedCurrentContended = true;
- if ((localCache.contendedMonitor != null) &&
+ snapshot.triedCurrentContended = true;
+ if ((snapshot.contendedMonitor != null) &&
((vm.traceFlags & vm.TRACE_OBJREFS) != 0)) {
vm.printTrace(description() +
" temporarily caching contended monitor"+
- " (id = " + localCache.contendedMonitor.uniqueID() + ")");
+ " (id = " + snapshot.contendedMonitor.uniqueID() + ")");
}
}
} catch (JDWPException exc) {
switch (exc.errorCode()) {
+ case JDWP.Error.THREAD_NOT_SUSPENDED:
case JDWP.Error.INVALID_THREAD: /* zombie */
throw new IncompatibleThreadStateException();
default:
throw exc.toJDIException();
}
}
- return localCache.contendedMonitor;
+ return snapshot.contendedMonitor;
}
public List<MonitorInfo> ownedMonitorsAndFrames() throws IncompatibleThreadStateException {
+ LocalCache snapshot = localCache;
try {
- if (localCache.ownedMonitorsInfo == null) {
+ if (snapshot.ownedMonitorsInfo == null) {
JDWP.ThreadReference.OwnedMonitorsStackDepthInfo.monitor[] minfo;
minfo = JDWP.ThreadReference.OwnedMonitorsStackDepthInfo.process(vm, this).owned;
- localCache.ownedMonitorsInfo = new ArrayList<MonitorInfo>(minfo.length);
+ snapshot.ownedMonitorsInfo = new ArrayList<MonitorInfo>(minfo.length);
for (int i=0; i < minfo.length; i++) {
JDWP.ThreadReference.OwnedMonitorsStackDepthInfo.monitor mi =
minfo[i];
MonitorInfo mon = new MonitorInfoImpl(vm, minfo[i].monitor, this, minfo[i].stack_depth);
- localCache.ownedMonitorsInfo.add(mon);
+ snapshot.ownedMonitorsInfo.add(mon);
}
if ((vm.traceFlags & vm.TRACE_OBJREFS) != 0) {
vm.printTrace(description() +
" temporarily caching owned monitors"+
- " (count = " + localCache.ownedMonitorsInfo.size() + ")");
+ " (count = " + snapshot.ownedMonitorsInfo.size() + ")");
}
}
@@ -495,7 +525,7 @@
throw exc.toJDIException();
}
}
- return localCache.ownedMonitorsInfo;
+ return snapshot.ownedMonitorsInfo;
}
public void popFrames(StackFrame frame) throws IncompatibleThreadStateException {
--- a/jdk/src/share/classes/java/awt/EventDispatchThread.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/awt/EventDispatchThread.java Wed Jul 05 16:42:37 2017 +0200
@@ -39,6 +39,7 @@
import java.util.logging.*;
import sun.awt.dnd.SunDragSourceContextPeer;
+import sun.awt.EventQueueDelegate;
/**
* EventDispatchThread is a package-private AWT class which takes
@@ -243,10 +244,16 @@
try {
AWTEvent event;
boolean eventOK;
+ EventQueueDelegate.Delegate delegate =
+ EventQueueDelegate.getDelegate();
do {
- event = (id == ANY_EVENT)
- ? theQueue.getNextEvent()
- : theQueue.getNextEvent(id);
+ if (delegate != null && id == ANY_EVENT) {
+ event = delegate.getNextEvent(theQueue);
+ } else {
+ event = (id == ANY_EVENT)
+ ? theQueue.getNextEvent()
+ : theQueue.getNextEvent(id);
+ }
eventOK = true;
synchronized (eventFilters) {
@@ -272,7 +279,14 @@
eventLog.log(Level.FINEST, "Dispatching: " + event);
}
+ Object handle = null;
+ if (delegate != null) {
+ handle = delegate.beforeDispatch(event);
+ }
theQueue.dispatchEvent(event);
+ if (delegate != null) {
+ delegate.afterDispatch(event, handle);
+ }
return true;
}
catch (ThreadDeath death) {
--- a/jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java Wed Jul 05 16:42:37 2017 +0200
@@ -298,7 +298,7 @@
oldL = (EventListener[])MethodUtil.invoke(m, oldInstance, new Object[]{});
newL = (EventListener[])MethodUtil.invoke(m, newInstance, new Object[]{});
}
- catch (Throwable e2) {
+ catch (Exception e2) {
try {
Method m = type.getMethod("getListeners", new Class[]{Class.class});
oldL = (EventListener[])MethodUtil.invoke(m, oldInstance, new Object[]{listenerType});
--- a/jdk/src/share/classes/java/beans/EventHandler.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/beans/EventHandler.java Wed Jul 05 16:42:37 2017 +0200
@@ -404,7 +404,7 @@
Object newTarget = MethodUtil.invoke(getter, target, new Object[]{});
return applyGetters(newTarget, rest);
}
- catch (Throwable e) {
+ catch (Exception e) {
throw new RuntimeException("Failed to call method: " + first +
" on " + target, e);
}
--- a/jdk/src/share/classes/java/beans/MetaData.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/beans/MetaData.java Wed Jul 05 16:42:37 2017 +0200
@@ -650,7 +650,7 @@
// Remove the new elements.
// Do this first otherwise we undo the adding work.
if (newMap != null) {
- for ( Object newKey : newMap.keySet() ) {
+ for (Object newKey : newMap.keySet().toArray()) {
// PENDING: This "key" is not in the right environment.
if (!oldMap.containsKey(newKey)) {
invokeStatement(oldInstance, "remove", new Object[]{newKey}, out);
@@ -986,14 +986,20 @@
// null to defined values after the Windows are made visible -
// special case them for now.
if (!(oldInstance instanceof java.awt.Window)) {
- String[] fieldNames = new String[]{"background", "foreground", "font"};
- for(int i = 0; i < fieldNames.length; i++) {
- String name = fieldNames[i];
- Object oldValue = ReflectionUtils.getPrivateField(oldInstance, java.awt.Component.class, name, out.getExceptionListener());
- Object newValue = (newInstance == null) ? null : ReflectionUtils.getPrivateField(newInstance, java.awt.Component.class, name, out.getExceptionListener());
- if (oldValue != null && !oldValue.equals(newValue)) {
- invokeStatement(oldInstance, "set" + NameGenerator.capitalize(name), new Object[]{oldValue}, out);
- }
+ Object oldBackground = c.isBackgroundSet() ? c.getBackground() : null;
+ Object newBackground = c2.isBackgroundSet() ? c2.getBackground() : null;
+ if (!MetaData.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)) {
+ 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)) {
+ invokeStatement(oldInstance, "setFont", new Object[] { oldFont }, out);
}
}
@@ -1104,26 +1110,30 @@
// BorderLayout
class java_awt_BorderLayout_PersistenceDelegate extends DefaultPersistenceDelegate {
+ private static final String[] CONSTRAINTS = {
+ BorderLayout.NORTH,
+ BorderLayout.SOUTH,
+ BorderLayout.EAST,
+ BorderLayout.WEST,
+ BorderLayout.CENTER,
+ BorderLayout.PAGE_START,
+ BorderLayout.PAGE_END,
+ BorderLayout.LINE_START,
+ BorderLayout.LINE_END,
+ };
+ @Override
protected void initialize(Class<?> type, Object oldInstance,
Object newInstance, Encoder out) {
super.initialize(type, oldInstance, newInstance, out);
- String[] locations = {"north", "south", "east", "west", "center"};
- String[] names = {java.awt.BorderLayout.NORTH, java.awt.BorderLayout.SOUTH,
- java.awt.BorderLayout.EAST, java.awt.BorderLayout.WEST,
- java.awt.BorderLayout.CENTER};
- for(int i = 0; i < locations.length; i++) {
- Object oldC = ReflectionUtils.getPrivateField(oldInstance,
- java.awt.BorderLayout.class,
- locations[i],
- out.getExceptionListener());
- Object newC = ReflectionUtils.getPrivateField(newInstance,
- java.awt.BorderLayout.class,
- locations[i],
- out.getExceptionListener());
+ BorderLayout oldLayout = (BorderLayout) oldInstance;
+ BorderLayout newLayout = (BorderLayout) newInstance;
+ for (String constraints : CONSTRAINTS) {
+ Object oldC = oldLayout.getLayoutComponent(constraints);
+ Object newC = newLayout.getLayoutComponent(constraints);
// Pending, assume any existing elements are OK.
if (oldC != null && newC == null) {
invokeStatement(oldInstance, "addLayoutComponent",
- new Object[]{oldC, names[i]}, out);
+ new Object[] { oldC, constraints }, out);
}
}
}
--- a/jdk/src/share/classes/java/beans/PropertyChangeSupport.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/beans/PropertyChangeSupport.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,12 +34,49 @@
/**
* This is a utility class that can be used by beans that support bound
- * properties. You can use an instance of this class as a member field
- * of your bean and delegate various work to it.
+ * properties. It manages a list of listeners and dispatches
+ * {@link PropertyChangeEvent}s to them. You can use an instance of this class
+ * as a member field of your bean and delegate these types of work to it.
+ * The {@link PropertyChangeListener} can be registered for all properties
+ * or for a property specified by name.
+ * <p>
+ * Here is an example of {@code PropertyChangeSupport} usage that follows
+ * the rules and recommendations laid out in the JavaBeans™ specification:
+ * <pre>
+ * public class MyBean {
+ * private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
+ *
+ * public void addPropertyChangeListener(PropertyChangeListener listener) {
+ * this.pcs.addPropertyChangeListener(listener);
+ * }
*
+ * public void removePropertyChangeListener(PropertyChangeListener listener) {
+ * this.pcs.removePropertyChangeListener(listener);
+ * }
+ *
+ * private String value;
+ *
+ * public String getValue() {
+ * return this.value;
+ * }
+ *
+ * public void setValue(String newValue) {
+ * String oldValue = this.value;
+ * this.value = newValue;
+ * this.pcs.firePropertyChange("value", oldValue, newValue);
+ * }
+ *
+ * [...]
+ * }
+ * </pre>
+ * <p>
+ * A {@code PropertyChangeSupport} instance is thread-safe.
+ * <p>
* This class is serializable. When it is serialized it will save
* (and restore) any listeners that are themselves serializable. Any
* non-serializable listeners will be skipped during serialization.
+ *
+ * @see VetoableChangeSupport
*/
public class PropertyChangeSupport implements Serializable {
private PropertyChangeListenerMap map = new PropertyChangeListenerMap();
@@ -208,91 +245,91 @@
}
/**
- * Report a bound property update to any registered listeners.
- * No event is fired if old and new are equal and non-null.
- *
+ * Reports a bound property update to listeners
+ * that have been registered to track updates of
+ * all properties or a property with the specified name.
+ * <p>
+ * No event is fired if old and new values are equal and non-null.
* <p>
* This is merely a convenience wrapper around the more general
- * firePropertyChange method that takes {@code
- * PropertyChangeEvent} value.
+ * {@link #firePropertyChange(PropertyChangeEvent)} method.
*
- * @param propertyName The programmatic name of the property
- * that was changed.
- * @param oldValue The old value of the property.
- * @param newValue The new value of the property.
+ * @param propertyName the programmatic name of the property that was changed
+ * @param oldValue the old value of the property
+ * @param newValue the new value of the property
*/
- public void firePropertyChange(String propertyName,
- Object oldValue, Object newValue) {
- if (oldValue != null && newValue != null && oldValue.equals(newValue)) {
- return;
+ public void firePropertyChange(String propertyName, Object oldValue, Object newValue) {
+ if (oldValue == null || newValue == null || !oldValue.equals(newValue)) {
+ firePropertyChange(new PropertyChangeEvent(this.source, propertyName, oldValue, newValue));
}
- firePropertyChange(new PropertyChangeEvent(source, propertyName,
- oldValue, newValue));
}
/**
- * Report an int bound property update to any registered listeners.
- * No event is fired if old and new are equal.
+ * Reports an integer bound property update to listeners
+ * that have been registered to track updates of
+ * all properties or a property with the specified name.
+ * <p>
+ * No event is fired if old and new values are equal.
* <p>
* This is merely a convenience wrapper around the more general
- * firePropertyChange method that takes Object values.
+ * {@link #firePropertyChange(String, Object, Object)} method.
*
- * @param propertyName The programmatic name of the property
- * that was changed.
- * @param oldValue The old value of the property.
- * @param newValue The new value of the property.
+ * @param propertyName the programmatic name of the property that was changed
+ * @param oldValue the old value of the property
+ * @param newValue the new value of the property
*/
- public void firePropertyChange(String propertyName,
- int oldValue, int newValue) {
- if (oldValue == newValue) {
- return;
+ public void firePropertyChange(String propertyName, int oldValue, int newValue) {
+ if (oldValue != newValue) {
+ firePropertyChange(propertyName, Integer.valueOf(oldValue), Integer.valueOf(newValue));
}
- firePropertyChange(propertyName, Integer.valueOf(oldValue), Integer.valueOf(newValue));
}
/**
- * Report a boolean bound property update to any registered listeners.
- * No event is fired if old and new are equal.
+ * Reports a boolean bound property update to listeners
+ * that have been registered to track updates of
+ * all properties or a property with the specified name.
+ * <p>
+ * No event is fired if old and new values are equal.
* <p>
* This is merely a convenience wrapper around the more general
- * firePropertyChange method that takes Object values.
+ * {@link #firePropertyChange(String, Object, Object)} method.
*
- * @param propertyName The programmatic name of the property
- * that was changed.
- * @param oldValue The old value of the property.
- * @param newValue The new value of the property.
+ * @param propertyName the programmatic name of the property that was changed
+ * @param oldValue the old value of the property
+ * @param newValue the new value of the property
*/
- public void firePropertyChange(String propertyName,
- boolean oldValue, boolean newValue) {
- if (oldValue == newValue) {
- return;
+ public void firePropertyChange(String propertyName, boolean oldValue, boolean newValue) {
+ if (oldValue != newValue) {
+ firePropertyChange(propertyName, Boolean.valueOf(oldValue), Boolean.valueOf(newValue));
}
- firePropertyChange(propertyName, Boolean.valueOf(oldValue), Boolean.valueOf(newValue));
}
/**
- * Fire an existing PropertyChangeEvent to any registered listeners.
- * No event is fired if the given event's old and new values are
- * equal and non-null.
- * @param evt The PropertyChangeEvent object.
+ * Fires a property change event to listeners
+ * that have been registered to track updates of
+ * all properties or a property with the specified name.
+ * <p>
+ * No event is fired if the given event's old and new values are equal and non-null.
+ *
+ * @param event the {@code PropertyChangeEvent} to be fired
*/
- public void firePropertyChange(PropertyChangeEvent evt) {
- Object oldValue = evt.getOldValue();
- Object newValue = evt.getNewValue();
- String propertyName = evt.getPropertyName();
- if (oldValue != null && newValue != null && oldValue.equals(newValue)) {
- return;
+ public void firePropertyChange(PropertyChangeEvent event) {
+ Object oldValue = event.getOldValue();
+ Object newValue = event.getNewValue();
+ if (oldValue == null || newValue == null || !oldValue.equals(newValue)) {
+ String name = event.getPropertyName();
+
+ PropertyChangeListener[] common = this.map.get(null);
+ PropertyChangeListener[] named = (name != null)
+ ? this.map.get(name)
+ : null;
+
+ fire(common, event);
+ fire(named, event);
}
- PropertyChangeListener[] common = this.map.get(null);
- PropertyChangeListener[] named = (propertyName != null)
- ? this.map.get(propertyName)
- : null;
-
- fire(common, evt);
- fire(named, evt);
}
- private void fire(PropertyChangeListener[] listeners, PropertyChangeEvent event) {
+ private static void fire(PropertyChangeListener[] listeners, PropertyChangeEvent event) {
if (listeners != null) {
for (PropertyChangeListener listener : listeners) {
listener.propertyChange(event);
@@ -301,78 +338,69 @@
}
/**
- * Report a bound indexed property update to any registered
- * listeners.
+ * Reports a bound indexed property update to listeners
+ * that have been registered to track updates of
+ * all properties or a property with the specified name.
* <p>
- * No event is fired if old and new values are equal
- * and non-null.
- *
+ * No event is fired if old and new values are equal and non-null.
* <p>
* This is merely a convenience wrapper around the more general
- * firePropertyChange method that takes {@code PropertyChangeEvent} value.
+ * {@link #firePropertyChange(PropertyChangeEvent)} method.
*
- * @param propertyName The programmatic name of the property that
- * was changed.
- * @param index index of the property element that was changed.
- * @param oldValue The old value of the property.
- * @param newValue The new value of the property.
+ * @param propertyName the programmatic name of the property that was changed
+ * @param index the index of the property element that was changed
+ * @param oldValue the old value of the property
+ * @param newValue the new value of the property
* @since 1.5
*/
- public void fireIndexedPropertyChange(String propertyName, int index,
- Object oldValue, Object newValue) {
- firePropertyChange(new IndexedPropertyChangeEvent
- (source, propertyName, oldValue, newValue, index));
+ public void fireIndexedPropertyChange(String propertyName, int index, Object oldValue, Object newValue) {
+ if (oldValue == null || newValue == null || !oldValue.equals(newValue)) {
+ firePropertyChange(new IndexedPropertyChangeEvent(source, propertyName, oldValue, newValue, index));
+ }
}
/**
- * Report an <code>int</code> bound indexed property update to any registered
- * listeners.
+ * Reports an integer bound indexed property update to listeners
+ * that have been registered to track updates of
+ * all properties or a property with the specified name.
* <p>
* No event is fired if old and new values are equal.
* <p>
* This is merely a convenience wrapper around the more general
- * fireIndexedPropertyChange method which takes Object values.
+ * {@link #fireIndexedPropertyChange(String, int, Object, Object)} method.
*
- * @param propertyName The programmatic name of the property that
- * was changed.
- * @param index index of the property element that was changed.
- * @param oldValue The old value of the property.
- * @param newValue The new value of the property.
+ * @param propertyName the programmatic name of the property that was changed
+ * @param index the index of the property element that was changed
+ * @param oldValue the old value of the property
+ * @param newValue the new value of the property
* @since 1.5
*/
- public void fireIndexedPropertyChange(String propertyName, int index,
- int oldValue, int newValue) {
- if (oldValue == newValue) {
- return;
+ public void fireIndexedPropertyChange(String propertyName, int index, int oldValue, int newValue) {
+ if (oldValue != newValue) {
+ fireIndexedPropertyChange(propertyName, index, Integer.valueOf(oldValue), Integer.valueOf(newValue));
}
- fireIndexedPropertyChange(propertyName, index,
- Integer.valueOf(oldValue),
- Integer.valueOf(newValue));
}
/**
- * Report a <code>boolean</code> bound indexed property update to any
- * registered listeners.
+ * Reports a boolean bound indexed property update to listeners
+ * that have been registered to track updates of
+ * all properties or a property with the specified name.
* <p>
* No event is fired if old and new values are equal.
* <p>
* This is merely a convenience wrapper around the more general
- * fireIndexedPropertyChange method which takes Object values.
+ * {@link #fireIndexedPropertyChange(String, int, Object, Object)} method.
*
- * @param propertyName The programmatic name of the property that
- * was changed.
- * @param index index of the property element that was changed.
- * @param oldValue The old value of the property.
- * @param newValue The new value of the property.
+ * @param propertyName the programmatic name of the property that was changed
+ * @param index the index of the property element that was changed
+ * @param oldValue the old value of the property
+ * @param newValue the new value of the property
* @since 1.5
*/
- public void fireIndexedPropertyChange(String propertyName, int index,
- boolean oldValue, boolean newValue) {
- if (oldValue == newValue) {
- return;
+ public void fireIndexedPropertyChange(String propertyName, int index, boolean oldValue, boolean newValue) {
+ if (oldValue != newValue) {
+ fireIndexedPropertyChange(propertyName, index, Boolean.valueOf(oldValue), Boolean.valueOf(newValue));
}
- fireIndexedPropertyChange(propertyName, index, Boolean.valueOf(oldValue),
- Boolean.valueOf(newValue));
}
/**
--- a/jdk/src/share/classes/java/beans/PropertyEditor.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/beans/PropertyEditor.java Wed Jul 05 16:42:37 2017 +0200
@@ -204,20 +204,21 @@
//----------------------------------------------------------------------
/**
- * Register a listener for the PropertyChange event. When a
- * PropertyEditor changes its value it should fire a PropertyChange
- * event on all registered PropertyChangeListeners, specifying the
- * null value for the property name and itself as the source.
+ * Adds a listener for the value change.
+ * When the property editor changes its value
+ * it should fire a {@link PropertyChangeEvent}
+ * on all registered {@link PropertyChangeListener}s,
+ * specifying the {@code null} value for the property name
+ * and itself as the source.
*
- * @param listener An object to be invoked when a PropertyChange
- * event is fired.
+ * @param listener the {@link PropertyChangeListener} to add
*/
void addPropertyChangeListener(PropertyChangeListener listener);
/**
- * Remove a listener for the PropertyChange event.
+ * Removes a listener for the value change.
*
- * @param listener The PropertyChange listener to be removed.
+ * @param listener the {@link PropertyChangeListener} to remove
*/
void removePropertyChangeListener(PropertyChangeListener listener);
--- a/jdk/src/share/classes/java/beans/PropertyEditorManager.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/beans/PropertyEditorManager.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc. 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,7 @@
package java.beans;
+import com.sun.beans.WeakCache;
import sun.beans.editors.*;
/**
@@ -55,32 +56,30 @@
public class PropertyEditorManager {
/**
- * Register an editor class to be used to edit values of
- * a given target class.
- *
- * <p>First, if there is a security manager, its <code>checkPropertiesAccess</code>
- * method is called. This could result in a SecurityException.
+ * Registers an editor class to edit values of the given target class.
+ * If the editor class is {@code null},
+ * then any existing definition will be removed.
+ * Thus this method can be used to cancel the registration.
+ * The registration is canceled automatically
+ * if either the target or editor class is unloaded.
+ * <p>
+ * If there is a security manager, its {@code checkPropertiesAccess}
+ * method is called. This could result in a {@linkplain SecurityException}.
*
- * @param targetType the Class object of the type to be edited
- * @param editorClass the Class object of the editor class. If
- * this is null, then any existing definition will be removed.
- * @exception SecurityException if a security manager exists and its
- * <code>checkPropertiesAccess</code> method doesn't allow setting
- * of system properties.
+ * @param targetType the class object of the type to be edited
+ * @param editorClass the class object of the editor class
+ * @throws SecurityException if a security manager exists and
+ * its {@code checkPropertiesAccess} method
+ * doesn't allow setting of system properties
+ *
* @see SecurityManager#checkPropertiesAccess
*/
-
- public static void registerEditor(Class<?> targetType, Class<?> editorClass) {
+ public static synchronized void registerEditor(Class<?> targetType, Class<?> editorClass) {
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
sm.checkPropertiesAccess();
}
- initialize();
- if (editorClass == null) {
- registry.remove(targetType);
- } else {
- registry.put(targetType, editorClass);
- }
+ registry.put(targetType, editorClass);
}
/**
@@ -90,10 +89,8 @@
* @return An editor object for the given target class.
* The result is null if no suitable editor can be found.
*/
-
public static synchronized PropertyEditor findEditor(Class<?> targetType) {
- initialize();
- Class editorClass = (Class)registry.get(targetType);
+ Class editorClass = registry.get(targetType);
if (editorClass != null) {
try {
Object o = editorClass.newInstance();
@@ -143,10 +140,7 @@
* e.g. Sun implementation initially sets to {"sun.beans.editors"}.
*/
public static synchronized String[] getEditorSearchPath() {
- // Return a copy of the searchPath.
- String result[] = new String[searchPath.length];
- System.arraycopy(searchPath, 0, result, 0, searchPath.length);
- return result;
+ return searchPath.clone();
}
/**
@@ -162,23 +156,22 @@
* of system properties.
* @see SecurityManager#checkPropertiesAccess
*/
-
- public static synchronized void setEditorSearchPath(String path[]) {
+ public static synchronized void setEditorSearchPath(String[] path) {
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
sm.checkPropertiesAccess();
}
- if (path == null) {
- path = new String[0];
- }
- searchPath = path;
+ searchPath = (path != null)
+ ? path.clone()
+ : EMPTY;
}
- private static synchronized void initialize() {
- if (registry != null) {
- return;
- }
- registry = new java.util.Hashtable();
+ private static String[] searchPath = { "sun.beans.editors" };
+ private static final String[] EMPTY = {};
+ private static final WeakCache<Class<?>, Class<?>> registry;
+
+ static {
+ registry = new WeakCache<Class<?>, Class<?>>();
registry.put(Byte.TYPE, ByteEditor.class);
registry.put(Short.TYPE, ShortEditor.class);
registry.put(Integer.TYPE, IntegerEditor.class);
@@ -187,7 +180,4 @@
registry.put(Float.TYPE, FloatEditor.class);
registry.put(Double.TYPE, DoubleEditor.class);
}
-
- private static String[] searchPath = { "sun.beans.editors" };
- private static java.util.Hashtable registry;
}
--- a/jdk/src/share/classes/java/beans/PropertyEditorSupport.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/beans/PropertyEditorSupport.java Wed Jul 05 16:42:37 2017 +0200
@@ -233,11 +233,20 @@
//----------------------------------------------------------------------
/**
- * Register a listener for the PropertyChange event. The class will
- * fire a PropertyChange value whenever the value is updated.
+ * Adds a listener for the value change.
+ * When the property editor changes its value
+ * it should fire a {@link PropertyChangeEvent}
+ * on all registered {@link PropertyChangeListener}s,
+ * specifying the {@code null} value for the property name.
+ * If the source property is set,
+ * it should be used as the source of the event.
+ * <p>
+ * The same listener object may be added more than once,
+ * and will be called as many times as it is added.
+ * If {@code listener} is {@code null},
+ * no exception is thrown and no action is taken.
*
- * @param listener An object to be invoked when a PropertyChange
- * event is fired.
+ * @param listener the {@link PropertyChangeListener} to add
*/
public synchronized void addPropertyChangeListener(
PropertyChangeListener listener) {
@@ -248,9 +257,14 @@
}
/**
- * Remove a listener for the PropertyChange event.
+ * Removes a listener for the value change.
+ * <p>
+ * If the same listener was added more than once,
+ * it will be notified one less time after being removed.
+ * If {@code listener} is {@code null}, or was never added,
+ * no exception is thrown and no action is taken.
*
- * @param listener The PropertyChange listener to be removed.
+ * @param listener the {@link PropertyChangeListener} to remove
*/
public synchronized void removePropertyChangeListener(
PropertyChangeListener listener) {
--- a/jdk/src/share/classes/java/beans/VetoableChangeSupport.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/beans/VetoableChangeSupport.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,12 +34,49 @@
/**
* This is a utility class that can be used by beans that support constrained
- * properties. You can use an instance of this class as a member field
- * of your bean and delegate various work to it.
+ * properties. It manages a list of listeners and dispatches
+ * {@link PropertyChangeEvent}s to them. You can use an instance of this class
+ * as a member field of your bean and delegate these types of work to it.
+ * The {@link VetoableChangeListener} can be registered for all properties
+ * or for a property specified by name.
+ * <p>
+ * Here is an example of {@code VetoableChangeSupport} usage that follows
+ * the rules and recommendations laid out in the JavaBeans™ specification:
+ * <pre>
+ * public class MyBean {
+ * private final VetoableChangeSupport vcs = new VetoableChangeSupport(this);
+ *
+ * public void addVetoableChangeListener(VetoableChangeListener listener) {
+ * this.vcs.addVetoableChangeListener(listener);
+ * }
*
+ * public void removeVetoableChangeListener(VetoableChangeListener listener) {
+ * this.vcs.removeVetoableChangeListener(listener);
+ * }
+ *
+ * private String value;
+ *
+ * public String getValue() {
+ * return this.value;
+ * }
+ *
+ * public void setValue(String newValue) throws PropertyVetoException {
+ * String oldValue = this.value;
+ * this.vcs.fireVetoableChange("value", oldValue, newValue);
+ * this.value = newValue;
+ * }
+ *
+ * [...]
+ * }
+ * </pre>
+ * <p>
+ * A {@code VetoableChangeSupport} instance is thread-safe.
+ * <p>
* This class is serializable. When it is serialized it will save
* (and restore) any listeners that are themselves serializable. Any
* non-serializable listeners will be skipped during serialization.
+ *
+ * @see PropertyChangeSupport
*/
public class VetoableChangeSupport implements Serializable {
private VetoableChangeListenerMap map = new VetoableChangeListenerMap();
@@ -208,126 +245,149 @@
}
/**
- * Report a vetoable property update to any registered listeners. If
- * anyone vetos the change, then fire a new event reverting everyone to
- * the old value and then rethrow the PropertyVetoException.
+ * Reports a constrained property update to listeners
+ * that have been registered to track updates of
+ * all properties or a property with the specified name.
* <p>
- * No event is fired if old and new are equal and non-null.
+ * Any listener can throw a {@code PropertyVetoException} to veto the update.
+ * If one of the listeners vetoes the update, this method passes
+ * a new "undo" {@code PropertyChangeEvent} that reverts to the old value
+ * to all listeners that already confirmed this update
+ * and throws the {@code PropertyVetoException} again.
+ * <p>
+ * No event is fired if old and new values are equal and non-null.
+ * <p>
+ * This is merely a convenience wrapper around the more general
+ * {@link #fireVetoableChange(PropertyChangeEvent)} method.
*
- * @param propertyName The programmatic name of the property
- * that is about to change..
- * @param oldValue The old value of the property.
- * @param newValue The new value of the property.
- * @exception PropertyVetoException if the recipient wishes the property
- * change to be rolled back.
+ * @param propertyName the programmatic name of the property that is about to change
+ * @param oldValue the old value of the property
+ * @param newValue the new value of the property
+ * @throws PropertyVetoException if one of listeners vetoes the property update
*/
- public void fireVetoableChange(String propertyName,
- Object oldValue, Object newValue)
- throws PropertyVetoException {
- if (oldValue != null && newValue != null && oldValue.equals(newValue)) {
- return;
+ public void fireVetoableChange(String propertyName, Object oldValue, Object newValue)
+ throws PropertyVetoException {
+ if (oldValue == null || newValue == null || !oldValue.equals(newValue)) {
+ fireVetoableChange(new PropertyChangeEvent(this.source, propertyName, oldValue, newValue));
}
- PropertyChangeEvent evt = new PropertyChangeEvent(source, propertyName,
- oldValue, newValue);
- fireVetoableChange(evt);
}
/**
- * Report a int vetoable property update to any registered listeners.
- * No event is fired if old and new are equal.
+ * Reports an integer constrained property update to listeners
+ * that have been registered to track updates of
+ * all properties or a property with the specified name.
+ * <p>
+ * Any listener can throw a {@code PropertyVetoException} to veto the update.
+ * If one of the listeners vetoes the update, this method passes
+ * a new "undo" {@code PropertyChangeEvent} that reverts to the old value
+ * to all listeners that already confirmed this update
+ * and throws the {@code PropertyVetoException} again.
+ * <p>
+ * No event is fired if old and new values are equal.
* <p>
* This is merely a convenience wrapper around the more general
- * fireVetoableChange method that takes Object values.
+ * {@link #fireVetoableChange(String, Object, Object)} method.
*
- * @param propertyName The programmatic name of the property
- * that is about to change.
- * @param oldValue The old value of the property.
- * @param newValue The new value of the property.
+ * @param propertyName the programmatic name of the property that is about to change
+ * @param oldValue the old value of the property
+ * @param newValue the new value of the property
+ * @throws PropertyVetoException if one of listeners vetoes the property update
*/
- public void fireVetoableChange(String propertyName,
- int oldValue, int newValue)
- throws PropertyVetoException {
- if (oldValue == newValue) {
- return;
+ public void fireVetoableChange(String propertyName, int oldValue, int newValue)
+ throws PropertyVetoException {
+ if (oldValue != newValue) {
+ fireVetoableChange(propertyName, Integer.valueOf(oldValue), Integer.valueOf(newValue));
}
- fireVetoableChange(propertyName, Integer.valueOf(oldValue), Integer.valueOf(newValue));
}
/**
- * Report a boolean vetoable property update to any registered listeners.
- * No event is fired if old and new are equal.
+ * Reports a boolean constrained property update to listeners
+ * that have been registered to track updates of
+ * all properties or a property with the specified name.
+ * <p>
+ * Any listener can throw a {@code PropertyVetoException} to veto the update.
+ * If one of the listeners vetoes the update, this method passes
+ * a new "undo" {@code PropertyChangeEvent} that reverts to the old value
+ * to all listeners that already confirmed this update
+ * and throws the {@code PropertyVetoException} again.
+ * <p>
+ * No event is fired if old and new values are equal.
* <p>
* This is merely a convenience wrapper around the more general
- * fireVetoableChange method that takes Object values.
+ * {@link #fireVetoableChange(String, Object, Object)} method.
*
- * @param propertyName The programmatic name of the property
- * that is about to change.
- * @param oldValue The old value of the property.
- * @param newValue The new value of the property.
+ * @param propertyName the programmatic name of the property that is about to change
+ * @param oldValue the old value of the property
+ * @param newValue the new value of the property
+ * @throws PropertyVetoException if one of listeners vetoes the property update
*/
- public void fireVetoableChange(String propertyName,
- boolean oldValue, boolean newValue)
- throws PropertyVetoException {
- if (oldValue == newValue) {
- return;
+ public void fireVetoableChange(String propertyName, boolean oldValue, boolean newValue)
+ throws PropertyVetoException {
+ if (oldValue != newValue) {
+ fireVetoableChange(propertyName, Boolean.valueOf(oldValue), Boolean.valueOf(newValue));
}
- fireVetoableChange(propertyName, Boolean.valueOf(oldValue), Boolean.valueOf(newValue));
}
/**
- * Fire a vetoable property update to any registered listeners. If
- * anyone vetos the change, then fire a new event reverting everyone to
- * the old value and then rethrow the PropertyVetoException.
+ * Fires a property change event to listeners
+ * that have been registered to track updates of
+ * all properties or a property with the specified name.
* <p>
- * No event is fired if old and new are equal and non-null.
+ * Any listener can throw a {@code PropertyVetoException} to veto the update.
+ * If one of the listeners vetoes the update, this method passes
+ * a new "undo" {@code PropertyChangeEvent} that reverts to the old value
+ * to all listeners that already confirmed this update
+ * and throws the {@code PropertyVetoException} again.
+ * <p>
+ * No event is fired if the given event's old and new values are equal and non-null.
*
- * @param evt The PropertyChangeEvent to be fired.
- * @exception PropertyVetoException if the recipient wishes the property
- * change to be rolled back.
+ * @param event the {@code PropertyChangeEvent} to be fired
+ * @throws PropertyVetoException if one of listeners vetoes the property update
*/
- public void fireVetoableChange(PropertyChangeEvent evt)
- throws PropertyVetoException {
+ public void fireVetoableChange(PropertyChangeEvent event)
+ throws PropertyVetoException {
+ Object oldValue = event.getOldValue();
+ Object newValue = event.getNewValue();
+ if (oldValue == null || newValue == null || !oldValue.equals(newValue)) {
+ String name = event.getPropertyName();
- Object oldValue = evt.getOldValue();
- Object newValue = evt.getNewValue();
- String propertyName = evt.getPropertyName();
- if (oldValue != null && newValue != null && oldValue.equals(newValue)) {
- return;
- }
- VetoableChangeListener[] common = this.map.get(null);
- VetoableChangeListener[] named = (propertyName != null)
- ? this.map.get(propertyName)
- : null;
- fire(common, evt);
- fire(named, evt);
- }
+ VetoableChangeListener[] common = this.map.get(null);
+ VetoableChangeListener[] named = (name != null)
+ ? this.map.get(name)
+ : null;
- private void fire(VetoableChangeListener[] listeners, PropertyChangeEvent event) throws PropertyVetoException {
- if (listeners != null) {
- VetoableChangeListener current = null;
- try {
- for (VetoableChangeListener listener : listeners) {
- current = listener;
- listener.vetoableChange(event);
- }
- } catch (PropertyVetoException veto) {
- // Create an event to revert everyone to the old value.
- event = new PropertyChangeEvent( this.source,
- event.getPropertyName(),
- event.getNewValue(),
- event.getOldValue() );
- for (VetoableChangeListener listener : listeners) {
- if (current == listener) {
- break;
- }
- try {
- listener.vetoableChange(event);
- } catch (PropertyVetoException ex) {
- // We just ignore exceptions that occur during reversions.
+ VetoableChangeListener[] listeners;
+ if (common == null) {
+ listeners = named;
+ }
+ else if (named == null) {
+ listeners = common;
+ }
+ else {
+ listeners = new VetoableChangeListener[common.length + named.length];
+ System.arraycopy(common, 0, listeners, 0, common.length);
+ System.arraycopy(named, 0, listeners, common.length, named.length);
+ }
+ if (listeners != null) {
+ int current = 0;
+ try {
+ while (current < listeners.length) {
+ listeners[current].vetoableChange(event);
+ current++;
}
}
- // And now rethrow the PropertyVetoException.
- throw veto;
+ catch (PropertyVetoException veto) {
+ event = new PropertyChangeEvent(this.source, name, newValue, oldValue);
+ for (int i = 0; i < current; i++) {
+ try {
+ listeners[i].vetoableChange(event);
+ }
+ catch (PropertyVetoException exception) {
+ // ignore exceptions that occur during rolling back
+ }
+ }
+ throw veto; // rethrow the veto exception
+ }
}
}
}
--- a/jdk/src/share/classes/java/io/CharConversionException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/io/CharConversionException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc. 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
@@ -33,6 +33,8 @@
public class CharConversionException
extends java.io.IOException
{
+ private static final long serialVersionUID = -8680016352018427031L;
+
/**
* This provides no detailed message.
*/
--- a/jdk/src/share/classes/java/io/EOFException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/io/EOFException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2000 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,8 @@
*/
public
class EOFException extends IOException {
+ private static final long serialVersionUID = 6433858223774886977L;
+
/**
* Constructs an <code>EOFException</code> with <code>null</code>
* as its error detail message.
--- a/jdk/src/share/classes/java/io/FileNotFoundException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/io/FileNotFoundException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,7 @@
*/
public class FileNotFoundException extends IOException {
+ private static final long serialVersionUID = -897856973823710492L;
/**
* Constructs a <code>FileNotFoundException</code> with
--- a/jdk/src/share/classes/java/io/InterruptedIOException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/io/InterruptedIOException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2000 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,8 @@
*/
public
class InterruptedIOException extends IOException {
+ private static final long serialVersionUID = 4020568460727500567L;
+
/**
* Constructs an <code>InterruptedIOException</code> with
* <code>null</code> as its error detail message.
--- a/jdk/src/share/classes/java/io/SyncFailedException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/io/SyncFailedException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,8 @@
* @since JDK1.1
*/
public class SyncFailedException extends IOException {
+ private static final long serialVersionUID = -2353342684412443330L;
+
/**
* Constructs an SyncFailedException with a detail message.
* A detail message is a String that describes this particular exception.
--- a/jdk/src/share/classes/java/io/UTFDataFormatException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/io/UTFDataFormatException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -44,6 +44,8 @@
*/
public
class UTFDataFormatException extends IOException {
+ private static final long serialVersionUID = 420743449228280612L;
+
/**
* Constructs a <code>UTFDataFormatException</code> with
* <code>null</code> as its error detail message.
--- a/jdk/src/share/classes/java/io/UnsupportedEncodingException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/io/UnsupportedEncodingException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc. 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
@@ -33,6 +33,8 @@
public class UnsupportedEncodingException
extends IOException
{
+ private static final long serialVersionUID = -4274276298326136670L;
+
/**
* Constructs an UnsupportedEncodingException without a detail message.
*/
--- a/jdk/src/share/classes/java/lang/AbstractMethodError.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/AbstractMethodError.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. 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
@@ -37,6 +37,8 @@
*/
public
class AbstractMethodError extends IncompatibleClassChangeError {
+ private static final long serialVersionUID = -1654391082989018462L;
+
/**
* Constructs an <code>AbstractMethodError</code> with no detail message.
*/
--- a/jdk/src/share/classes/java/lang/ArithmeticException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/ArithmeticException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,8 @@
*/
public
class ArithmeticException extends RuntimeException {
+ private static final long serialVersionUID = 2256477558314496007L;
+
/**
* Constructs an <code>ArithmeticException</code> with no detail
* message.
--- a/jdk/src/share/classes/java/lang/ArrayIndexOutOfBoundsException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/ArrayIndexOutOfBoundsException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,8 @@
*/
public
class ArrayIndexOutOfBoundsException extends IndexOutOfBoundsException {
+ private static final long serialVersionUID = -5116101128118950844L;
+
/**
* Constructs an <code>ArrayIndexOutOfBoundsException</code> with no
* detail message.
--- a/jdk/src/share/classes/java/lang/ArrayStoreException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/ArrayStoreException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. 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
@@ -39,6 +39,8 @@
*/
public
class ArrayStoreException extends RuntimeException {
+ private static final long serialVersionUID = -4522193890499838241L;
+
/**
* Constructs an <code>ArrayStoreException</code> with no detail message.
*/
--- a/jdk/src/share/classes/java/lang/AssertionError.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/AssertionError.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -43,6 +43,8 @@
* @since 1.4
*/
public class AssertionError extends Error {
+ private static final long serialVersionUID = -5013299493970297370L;
+
/**
* Constructs an AssertionError with no detail message.
*/
--- a/jdk/src/share/classes/java/lang/ClassCastException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/ClassCastException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. 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
@@ -39,6 +39,8 @@
*/
public
class ClassCastException extends RuntimeException {
+ private static final long serialVersionUID = -9223365651070458532L;
+
/**
* Constructs a <code>ClassCastException</code> with no detail message.
*/
--- a/jdk/src/share/classes/java/lang/ClassCircularityError.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/ClassCircularityError.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. 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
@@ -33,6 +33,8 @@
* @since JDK1.0
*/
public class ClassCircularityError extends LinkageError {
+ private static final long serialVersionUID = 1054362542914539689L;
+
/**
* Constructs a {@code ClassCircularityError} with no detail message.
*/
--- a/jdk/src/share/classes/java/lang/ClassFormatError.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/ClassFormatError.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,8 @@
*/
public
class ClassFormatError extends LinkageError {
+ private static final long serialVersionUID = -8420114879011949195L;
+
/**
* Constructs a <code>ClassFormatError</code> with no detail message.
*/
--- a/jdk/src/share/classes/java/lang/CloneNotSupportedException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/CloneNotSupportedException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -43,6 +43,8 @@
public
class CloneNotSupportedException extends Exception {
+ private static final long serialVersionUID = 5195511250079656443L;
+
/**
* Constructs a <code>CloneNotSupportedException</code> with no
* detail message.
--- a/jdk/src/share/classes/java/lang/EnumConstantNotPresentException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/EnumConstantNotPresentException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2004-2008 Sun Microsystems, Inc. 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
@@ -33,6 +33,8 @@
* @since 1.5
*/
public class EnumConstantNotPresentException extends RuntimeException {
+ private static final long serialVersionUID = -6046998521960521108L;
+
/**
* The type of the missing enum constant.
*/
--- a/jdk/src/share/classes/java/lang/IllegalAccessError.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/IllegalAccessError.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. 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
@@ -37,6 +37,8 @@
* @since JDK1.0
*/
public class IllegalAccessError extends IncompatibleClassChangeError {
+ private static final long serialVersionUID = -8988904074992417891L;
+
/**
* Constructs an <code>IllegalAccessError</code> with no detail message.
*/
--- a/jdk/src/share/classes/java/lang/IllegalAccessException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/IllegalAccessException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2000 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. 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
@@ -57,6 +57,8 @@
* @since JDK1.0
*/
public class IllegalAccessException extends Exception {
+ private static final long serialVersionUID = 6616958222490762034L;
+
/**
* Constructs an <code>IllegalAccessException</code> without a
* detail message.
--- a/jdk/src/share/classes/java/lang/IllegalMonitorStateException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/IllegalMonitorStateException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. 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
@@ -40,6 +40,8 @@
*/
public
class IllegalMonitorStateException extends RuntimeException {
+ private static final long serialVersionUID = 3713306369498869069L;
+
/**
* Constructs an <code>IllegalMonitorStateException</code> with no
* detail message.
--- a/jdk/src/share/classes/java/lang/IllegalThreadStateException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/IllegalThreadStateException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. 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
@@ -37,6 +37,8 @@
* @since JDK1.0
*/
public class IllegalThreadStateException extends IllegalArgumentException {
+ private static final long serialVersionUID = -7626246362397460174L;
+
/**
* Constructs an <code>IllegalThreadStateException</code> with no
* detail message.
--- a/jdk/src/share/classes/java/lang/IncompatibleClassChangeError.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/IncompatibleClassChangeError.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,8 @@
*/
public
class IncompatibleClassChangeError extends LinkageError {
+ private static final long serialVersionUID = -4914975503642802119L;
+
/**
* Constructs an <code>IncompatibleClassChangeError</code> with no
* detail message.
--- a/jdk/src/share/classes/java/lang/IndexOutOfBoundsException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/IndexOutOfBoundsException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,8 @@
*/
public
class IndexOutOfBoundsException extends RuntimeException {
+ private static final long serialVersionUID = 234122996006267687L;
+
/**
* Constructs an <code>IndexOutOfBoundsException</code> with no
* detail message.
--- a/jdk/src/share/classes/java/lang/InstantiationError.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/InstantiationError.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. 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
@@ -40,6 +40,8 @@
public
class InstantiationError extends IncompatibleClassChangeError {
+ private static final long serialVersionUID = -4885810657349421204L;
+
/**
* Constructs an <code>InstantiationError</code> with no detail message.
*/
--- a/jdk/src/share/classes/java/lang/InstantiationException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/InstantiationException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -44,6 +44,8 @@
*/
public
class InstantiationException extends Exception {
+ private static final long serialVersionUID = -8441929162975509110L;
+
/**
* Constructs an {@code InstantiationException} with no detail message.
*/
--- a/jdk/src/share/classes/java/lang/InternalError.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/InternalError.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,8 @@
*/
public
class InternalError extends VirtualMachineError {
+ private static final long serialVersionUID = -9062593416125562365L;
+
/**
* Constructs an <code>InternalError</code> with no detail message.
*/
--- a/jdk/src/share/classes/java/lang/InterruptedException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/InterruptedException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. 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
@@ -48,6 +48,8 @@
*/
public
class InterruptedException extends Exception {
+ private static final long serialVersionUID = 6700697376100628473L;
+
/**
* Constructs an <code>InterruptedException</code> with no detail message.
*/
--- a/jdk/src/share/classes/java/lang/LinkageError.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/LinkageError.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,8 @@
*/
public
class LinkageError extends Error {
+ private static final long serialVersionUID = 3579600108157160122L;
+
/**
* Constructs a <code>LinkageError</code> with no detail message.
*/
--- a/jdk/src/share/classes/java/lang/NegativeArraySizeException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/NegativeArraySizeException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. 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
@@ -33,6 +33,8 @@
*/
public
class NegativeArraySizeException extends RuntimeException {
+ private static final long serialVersionUID = -8960118058596991861L;
+
/**
* Constructs a <code>NegativeArraySizeException</code> with no
* detail message.
--- a/jdk/src/share/classes/java/lang/NoClassDefFoundError.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/NoClassDefFoundError.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-2000 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. 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
@@ -40,6 +40,8 @@
*/
public
class NoClassDefFoundError extends LinkageError {
+ private static final long serialVersionUID = 9095859863287012458L;
+
/**
* Constructs a <code>NoClassDefFoundError</code> with no detail message.
*/
--- a/jdk/src/share/classes/java/lang/NoSuchFieldError.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/NoSuchFieldError.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,8 @@
*/
public
class NoSuchFieldError extends IncompatibleClassChangeError {
+ private static final long serialVersionUID = -3456430195886129035L;
+
/**
* Constructs a <code>NoSuchFieldException</code> with no detail message.
*/
--- a/jdk/src/share/classes/java/lang/NoSuchFieldException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/NoSuchFieldException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc. 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
@@ -32,6 +32,8 @@
* @since JDK1.1
*/
public class NoSuchFieldException extends Exception {
+ private static final long serialVersionUID = -6143714805279938260L;
+
/**
* Constructor.
*/
--- a/jdk/src/share/classes/java/lang/NoSuchMethodError.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/NoSuchMethodError.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-1998 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. 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
@@ -39,6 +39,8 @@
*/
public
class NoSuchMethodError extends IncompatibleClassChangeError {
+ private static final long serialVersionUID = -3765521442372831335L;
+
/**
* Constructs a <code>NoSuchMethodError</code> with no detail message.
*/
--- a/jdk/src/share/classes/java/lang/NoSuchMethodException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/NoSuchMethodException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. 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
@@ -33,6 +33,8 @@
*/
public
class NoSuchMethodException extends Exception {
+ private static final long serialVersionUID = 5034388446362600923L;
+
/**
* Constructs a <code>NoSuchMethodException</code> without a detail message.
*/
--- a/jdk/src/share/classes/java/lang/NullPointerException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/NullPointerException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. 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
@@ -46,6 +46,8 @@
*/
public
class NullPointerException extends RuntimeException {
+ private static final long serialVersionUID = 5162710183389028792L;
+
/**
* Constructs a <code>NullPointerException</code> with no detail message.
*/
--- a/jdk/src/share/classes/java/lang/OutOfMemoryError.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/OutOfMemoryError.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,8 @@
*/
public
class OutOfMemoryError extends VirtualMachineError {
+ private static final long serialVersionUID = 8228564086184010517L;
+
/**
* Constructs an <code>OutOfMemoryError</code> with no detail message.
*/
--- a/jdk/src/share/classes/java/lang/StackOverflowError.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/StackOverflowError.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,8 @@
*/
public
class StackOverflowError extends VirtualMachineError {
+ private static final long serialVersionUID = 8609175038441759607L;
+
/**
* Constructs a <code>StackOverflowError</code> with no detail message.
*/
--- a/jdk/src/share/classes/java/lang/StringIndexOutOfBoundsException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/StringIndexOutOfBoundsException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-2000 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. 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
@@ -37,6 +37,8 @@
*/
public
class StringIndexOutOfBoundsException extends IndexOutOfBoundsException {
+ private static final long serialVersionUID = -6762910422159637258L;
+
/**
* Constructs a <code>StringIndexOutOfBoundsException</code> with no
* detail message.
--- a/jdk/src/share/classes/java/lang/ThreadDeath.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/ThreadDeath.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. 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
@@ -46,4 +46,6 @@
* @since JDK1.0
*/
-public class ThreadDeath extends Error {}
+public class ThreadDeath extends Error {
+ private static final long serialVersionUID = -4417128565033088268L;
+}
--- a/jdk/src/share/classes/java/lang/TypeNotPresentException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/TypeNotPresentException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc. 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
@@ -40,6 +40,8 @@
* @since 1.5
*/
public class TypeNotPresentException extends RuntimeException {
+ private static final long serialVersionUID = -5101214195716534496L;
+
private String typeName;
/**
--- a/jdk/src/share/classes/java/lang/UnknownError.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/UnknownError.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,8 @@
*/
public
class UnknownError extends VirtualMachineError {
+ private static final long serialVersionUID = 2524784860676771849L;
+
/**
* Constructs an <code>UnknownError</code> with no detail message.
*/
--- a/jdk/src/share/classes/java/lang/UnsatisfiedLinkError.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/UnsatisfiedLinkError.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,8 @@
*/
public
class UnsatisfiedLinkError extends LinkageError {
+ private static final long serialVersionUID = -4019343241616879428L;
+
/**
* Constructs an <code>UnsatisfiedLinkError</code> with no detail message.
*/
--- a/jdk/src/share/classes/java/lang/UnsupportedClassVersionError.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/UnsupportedClassVersionError.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,8 @@
*/
public
class UnsupportedClassVersionError extends ClassFormatError {
+ private static final long serialVersionUID = -7123279212883497373L;
+
/**
* Constructs a <code>UnsupportedClassVersionError</code>
* with no detail message.
--- a/jdk/src/share/classes/java/lang/VerifyError.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/VerifyError.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,8 @@
*/
public
class VerifyError extends LinkageError {
+ private static final long serialVersionUID = 7001962396098498785L;
+
/**
* Constructs an <code>VerifyError</code> with no detail message.
*/
--- a/jdk/src/share/classes/java/lang/annotation/AnnotationFormatError.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/annotation/AnnotationFormatError.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2004-2008 Sun Microsystems, Inc. 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
@@ -33,6 +33,8 @@
* @since 1.5
*/
public class AnnotationFormatError extends Error {
+ private static final long serialVersionUID = -4256701562333669892L;
+
/**
* Constructs a new <tt>AnnotationFormatError</tt> with the specified
* detail message.
--- a/jdk/src/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,8 @@
* @since 1.5
*/
public class AnnotationTypeMismatchException extends RuntimeException {
+ private static final long serialVersionUID = 8125925355765570191L;
+
/**
* The <tt>Method</tt> object for the annotation element.
*/
--- a/jdk/src/share/classes/java/lang/annotation/IncompleteAnnotationException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/annotation/IncompleteAnnotationException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,8 @@
* @since 1.5
*/
public class IncompleteAnnotationException extends RuntimeException {
+ private static final long serialVersionUID = 8445097402741811912L;
+
private Class annotationType;
private String elementName;
--- a/jdk/src/share/classes/java/lang/instrument/IllegalClassFormatException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/instrument/IllegalClassFormatException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc. 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
@@ -40,6 +40,8 @@
* @since 1.5
*/
public class IllegalClassFormatException extends Exception {
+ private static final long serialVersionUID = -3841736710924794009L;
+
/**
* Constructs an <code>IllegalClassFormatException</code> with no
* detail message.
--- a/jdk/src/share/classes/java/lang/instrument/UnmodifiableClassException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/instrument/UnmodifiableClassException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2004-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,8 @@
* @since 1.5
*/
public class UnmodifiableClassException extends Exception {
+ private static final long serialVersionUID = 1716652643585309178L;
+
/**
* Constructs an <code>UnmodifiableClassException</code> with no
* detail message.
--- a/jdk/src/share/classes/java/lang/management/ManagementPermission.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/management/ManagementPermission.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc. 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
@@ -83,6 +83,7 @@
*/
public final class ManagementPermission extends java.security.BasicPermission {
+ private static final long serialVersionUID = 1897496590799378737L;
/**
* Constructs a ManagementPermission with the specified name.
--- a/jdk/src/share/classes/java/lang/reflect/GenericSignatureFormatError.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/reflect/GenericSignatureFormatError.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc. 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
@@ -33,4 +33,6 @@
*
* @since 1.5
*/
-public class GenericSignatureFormatError extends ClassFormatError{}
+public class GenericSignatureFormatError extends ClassFormatError {
+ private static final long serialVersionUID = 6709919147137911034L;
+}
--- a/jdk/src/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,4 +34,6 @@
*
* @since 1.5
*/
-public class MalformedParameterizedTypeException extends RuntimeException{}
+public class MalformedParameterizedTypeException extends RuntimeException {
+ private static final long serialVersionUID = -5696557788586220964L;
+}
--- a/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java Wed Jul 05 16:42:37 2017 +0200
@@ -308,6 +308,12 @@
FileDescriptor fd = acquireFD();
try {
socketConnect(address, port, timeout);
+ /* socket may have been closed during poll/select */
+ synchronized (fdLock) {
+ if (closePending) {
+ throw new SocketException ("Socket closed");
+ }
+ }
// If we have a ref. to the Socket, then sets the flags
// created, bound & connected to true.
// This is normally done in Socket.connect() but some
--- a/jdk/src/share/classes/java/net/BindException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/net/BindException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,7 @@
*/
public class BindException extends SocketException {
+ private static final long serialVersionUID = -5945005768251722951L;
/**
* Constructs a new BindException with the specified detail
--- a/jdk/src/share/classes/java/net/ConnectException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/net/ConnectException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,8 @@
* @since JDK1.1
*/
public class ConnectException extends SocketException {
+ private static final long serialVersionUID = 3831404271622369215L;
+
/**
* Constructs a new ConnectException with the specified detail
* message as to why the connect error occurred.
--- a/jdk/src/share/classes/java/net/HttpRetryException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/net/HttpRetryException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2004-2008 Sun Microsystems, Inc. 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
@@ -37,6 +37,7 @@
*/
public
class HttpRetryException extends IOException {
+ private static final long serialVersionUID = -9186022286469111381L;
private int responseCode;
private String location;
--- a/jdk/src/share/classes/java/net/MalformedURLException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/net/MalformedURLException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,8 @@
* @since JDK1.0
*/
public class MalformedURLException extends IOException {
+ private static final long serialVersionUID = -182787522200415866L;
+
/**
* Constructs a <code>MalformedURLException</code> with no detail message.
*/
--- a/jdk/src/share/classes/java/net/NoRouteToHostException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/net/NoRouteToHostException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,8 @@
* @since JDK1.1
*/
public class NoRouteToHostException extends SocketException {
+ private static final long serialVersionUID = -1897550894873493790L;
+
/**
* Constructs a new NoRouteToHostException with the specified detail
* message as to why the remote host cannot be reached.
--- a/jdk/src/share/classes/java/net/PortUnreachableException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/net/PortUnreachableException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2001 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2008 Sun Microsystems, Inc. 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
@@ -33,6 +33,7 @@
*/
public class PortUnreachableException extends SocketException {
+ private static final long serialVersionUID = 8462541992376507323L;
/**
* Constructs a new <code>PortUnreachableException</code> with a
--- a/jdk/src/share/classes/java/net/ProtocolException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/net/ProtocolException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,8 @@
*/
public
class ProtocolException extends IOException {
+ private static final long serialVersionUID = -6098449442062388080L;
+
/**
* Constructs a new <code>ProtocolException</code> with the
* specified detail message.
--- a/jdk/src/share/classes/java/net/SocketException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/net/SocketException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,8 @@
*/
public
class SocketException extends IOException {
+ private static final long serialVersionUID = -5935874303556886934L;
+
/**
* Constructs a new <code>SocketException</code> with the
* specified detail message.
--- a/jdk/src/share/classes/java/net/SocketTimeoutException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/net/SocketTimeoutException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2000 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
@@ -32,6 +32,7 @@
*/
public class SocketTimeoutException extends java.io.InterruptedIOException {
+ private static final long serialVersionUID = -8846654841826352300L;
/**
* Constructs a new SocketTimeoutException with a detail
--- a/jdk/src/share/classes/java/net/URISyntaxException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/net/URISyntaxException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,8 @@
public class URISyntaxException
extends Exception
{
+ private static final long serialVersionUID = 2137979680897488891L;
+
private String input;
private int index;
--- a/jdk/src/share/classes/java/net/UnknownHostException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/net/UnknownHostException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,8 @@
*/
public
class UnknownHostException extends IOException {
+ private static final long serialVersionUID = -4639126076052875403L;
+
/**
* Constructs a new <code>UnknownHostException</code> with the
* specified detail message.
--- a/jdk/src/share/classes/java/net/UnknownServiceException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/net/UnknownServiceException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-1997 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. 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
@@ -37,6 +37,8 @@
* @since JDK1.0
*/
public class UnknownServiceException extends IOException {
+ private static final long serialVersionUID = -4169033248853639508L;
+
/**
* Constructs a new <code>UnknownServiceException</code> with no
* detail message.
--- a/jdk/src/share/classes/java/text/SimpleDateFormat.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/text/SimpleDateFormat.java Wed Jul 05 16:42:37 2017 +0200
@@ -374,6 +374,24 @@
private String pattern;
/**
+ * Saved numberFormat and pattern.
+ * @see SimpleDateFormat#checkNegativeNumberExpression
+ */
+ transient private NumberFormat originalNumberFormat;
+ transient private String originalNumberPattern;
+
+ /**
+ * The minus sign to be used with format and parse.
+ */
+ transient private char minusSign = '-';
+
+ /**
+ * True when a negative sign follows a number.
+ * (True as default in Arabic.)
+ */
+ transient private boolean hasFollowingMinusSign = false;
+
+ /**
* The compiled pattern.
*/
transient private char[] compiledPattern;
@@ -1226,6 +1244,8 @@
*/
public Date parse(String text, ParsePosition pos)
{
+ checkNegativeNumberExpression();
+
int start = pos.index;
int oldStart = start;
int textLength = text.length();
@@ -1271,14 +1291,42 @@
// digit text (e.g., "20010704") with a pattern which
// has no delimiters between fields, like "yyyyMMdd".
boolean obeyCount = false;
+
+ // In Arabic, a minus sign for a negative number is put after
+ // the number. Even in another locale, a minus sign can be
+ // put after a number using DateFormat.setNumberFormat().
+ // If both the minus sign and the field-delimiter are '-',
+ // subParse() needs to determine whether a '-' after a number
+ // in the given text is a delimiter or is a minus sign for the
+ // preceding number. We give subParse() a clue based on the
+ // information in compiledPattern.
+ boolean useFollowingMinusSignAsDelimiter = false;
+
if (i < compiledPattern.length) {
int nextTag = compiledPattern[i] >>> 8;
- if (!(nextTag == TAG_QUOTE_ASCII_CHAR || nextTag == TAG_QUOTE_CHARS)) {
+ if (!(nextTag == TAG_QUOTE_ASCII_CHAR ||
+ nextTag == TAG_QUOTE_CHARS)) {
obeyCount = true;
}
+
+ if (hasFollowingMinusSign &&
+ (nextTag == TAG_QUOTE_ASCII_CHAR ||
+ nextTag == TAG_QUOTE_CHARS)) {
+ int c;
+ if (nextTag == TAG_QUOTE_ASCII_CHAR) {
+ c = compiledPattern[i] & 0xff;
+ } else {
+ c = compiledPattern[i+1];
+ }
+
+ if (c == minusSign) {
+ useFollowingMinusSignAsDelimiter = true;
+ }
+ }
}
start = subParse(text, start, tag, count, obeyCount,
- ambiguousYear, pos);
+ ambiguousYear, pos,
+ useFollowingMinusSignAsDelimiter);
if (start < 0) {
pos.index = oldStart;
return null;
@@ -1482,10 +1530,13 @@
// If the time zone matched uses the same name
// (abbreviation) for both standard and daylight time,
// let the time zone in the Calendar decide which one.
- if (!useSameName) {
+ //
+ // Also if tz.getDSTSaving() returns 0 for DST, use tz to
+ // determine the local time. (6645292)
+ int dstAmount = (nameIndex >= 3) ? tz.getDSTSavings() : 0;
+ if (!(useSameName || (nameIndex >= 3 && dstAmount == 0))) {
calendar.set(Calendar.ZONE_OFFSET, tz.getRawOffset());
- calendar.set(Calendar.DST_OFFSET,
- nameIndex >= 3 ? tz.getDSTSavings() : 0);
+ calendar.set(Calendar.DST_OFFSET, dstAmount);
}
return (start + zoneNames[nameIndex].length());
}
@@ -1511,8 +1562,8 @@
*/
private int subParse(String text, int start, int patternCharIndex, int count,
boolean obeyCount, boolean[] ambiguousYear,
- ParsePosition origPos)
- {
+ ParsePosition origPos,
+ boolean useFollowingMinusSignAsDelimiter) {
Number number = null;
int value = 0;
ParsePosition pos = new ParsePosition(0);
@@ -1537,10 +1588,10 @@
// a number value. We handle further, more generic cases below. We need
// to handle some of them here because some fields require extra processing on
// the parsed value.
- if (patternCharIndex == 4 /*HOUR_OF_DAY1_FIELD*/ ||
- patternCharIndex == 15 /*HOUR1_FIELD*/ ||
- (patternCharIndex == 2 /*MONTH_FIELD*/ && count <= 2) ||
- patternCharIndex == 1) {
+ if (patternCharIndex == 4 /* HOUR_OF_DAY1_FIELD */ ||
+ patternCharIndex == 15 /* HOUR1_FIELD */ ||
+ (patternCharIndex == 2 /* MONTH_FIELD */ && count <= 2) ||
+ patternCharIndex == 1 /* YEAR_FIELD */) {
// It would be good to unify this with the obeyCount logic below,
// but that's going to be difficult.
if (obeyCount) {
@@ -1557,6 +1608,15 @@
}
} else {
value = number.intValue();
+
+ if (useFollowingMinusSignAsDelimiter && (value < 0) &&
+ (((pos.index < text.length()) &&
+ (text.charAt(pos.index) != minusSign)) ||
+ ((pos.index == text.length()) &&
+ (text.charAt(pos.index-1) == minusSign)))) {
+ value = -value;
+ pos.index--;
+ }
}
}
@@ -1888,7 +1948,18 @@
number = numberFormat.parse(text, pos);
}
if (number != null) {
- calendar.set(field, number.intValue());
+ value = number.intValue();
+
+ if (useFollowingMinusSignAsDelimiter && (value < 0) &&
+ (((pos.index < text.length()) &&
+ (text.charAt(pos.index) != minusSign)) ||
+ ((pos.index == text.length()) &&
+ (text.charAt(pos.index-1) == minusSign)))) {
+ value = -value;
+ pos.index--;
+ }
+
+ calendar.set(field, value);
return pos.index;
}
break parsing;
@@ -2099,4 +2170,33 @@
}
}
}
+
+ /**
+ * Analyze the negative subpattern of DecimalFormat and set/update values
+ * as necessary.
+ */
+ private void checkNegativeNumberExpression() {
+ if ((numberFormat instanceof DecimalFormat) &&
+ !numberFormat.equals(originalNumberFormat)) {
+ String numberPattern = ((DecimalFormat)numberFormat).toPattern();
+ if (!numberPattern.equals(originalNumberPattern)) {
+ hasFollowingMinusSign = false;
+
+ int separatorIndex = numberPattern.indexOf(';');
+ // If the negative subpattern is not absent, we have to analayze
+ // it in order to check if it has a following minus sign.
+ if (separatorIndex > -1) {
+ int minusIndex = numberPattern.indexOf('-', separatorIndex);
+ if ((minusIndex > numberPattern.lastIndexOf('0')) &&
+ (minusIndex > numberPattern.lastIndexOf('#'))) {
+ hasFollowingMinusSign = true;
+ minusSign = ((DecimalFormat)numberFormat).getDecimalFormatSymbols().getMinusSign();
+ }
+ }
+ originalNumberPattern = numberPattern;
+ }
+ originalNumberFormat = numberFormat;
+ }
+ }
+
}
--- a/jdk/src/share/classes/java/util/ConcurrentModificationException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/util/ConcurrentModificationException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
@@ -67,6 +67,8 @@
* @since 1.2
*/
public class ConcurrentModificationException extends RuntimeException {
+ private static final long serialVersionUID = -3666751008965953603L;
+
/**
* Constructs a ConcurrentModificationException with no
* detail message.
--- a/jdk/src/share/classes/java/util/EmptyStackException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/util/EmptyStackException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-1998 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,8 @@
*/
public
class EmptyStackException extends RuntimeException {
+ private static final long serialVersionUID = 5084686378493302095L;
+
/**
* Constructs a new <code>EmptyStackException</code> with <tt>null</tt>
* as its error message string.
--- a/jdk/src/share/classes/java/util/InputMismatchException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/util/InputMismatchException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,8 @@
*/
public
class InputMismatchException extends NoSuchElementException {
+ private static final long serialVersionUID = 8811230760997066428L;
+
/**
* Constructs an <code>InputMismatchException</code> with <tt>null</tt>
* as its error message string.
--- a/jdk/src/share/classes/java/util/NoSuchElementException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/util/NoSuchElementException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-1998 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. 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
@@ -37,6 +37,8 @@
*/
public
class NoSuchElementException extends RuntimeException {
+ private static final long serialVersionUID = 6769829250639411880L;
+
/**
* Constructs a <code>NoSuchElementException</code> with <tt>null</tt>
* as its error message string.
--- a/jdk/src/share/classes/java/util/TooManyListenersException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/util/TooManyListenersException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc. 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
@@ -48,6 +48,7 @@
*/
public class TooManyListenersException extends Exception {
+ private static final long serialVersionUID = 5074640544770687831L;
/**
* Constructs a TooManyListenersException with no detail message.
--- a/jdk/src/share/classes/java/util/jar/JarException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/util/jar/JarException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,8 @@
*/
public
class JarException extends java.util.zip.ZipException {
+ private static final long serialVersionUID = 7159778400963954473L;
+
/**
* Constructs a JarException with no detail message.
*/
--- a/jdk/src/share/classes/java/util/regex/PatternSyntaxException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/util/regex/PatternSyntaxException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
@@ -40,6 +40,7 @@
public class PatternSyntaxException
extends IllegalArgumentException
{
+ private static final long serialVersionUID = -3864639126226059218L;
private final String desc;
private final String pattern;
--- a/jdk/src/share/classes/java/util/zip/DataFormatException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/util/zip/DataFormatException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1996 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc. 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
@@ -32,6 +32,8 @@
*/
public
class DataFormatException extends Exception {
+ private static final long serialVersionUID = 2219632870893641452L;
+
/**
* Constructs a DataFormatException with no detail message.
*/
--- a/jdk/src/share/classes/java/util/zip/ZipException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/java/util/zip/ZipException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2001 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. 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
@@ -37,6 +37,8 @@
public
class ZipException extends IOException {
+ private static final long serialVersionUID = 8000196834066748623L;
+
/**
* Constructs an <code>ZipException</code> with <code>null</code>
* as its error detail message.
--- a/jdk/src/share/classes/javax/management/openmbean/MXBeanMappingFactory.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/management/openmbean/MXBeanMappingFactory.java Wed Jul 05 16:42:37 2017 +0200
@@ -48,7 +48,7 @@
* effect by defining {@code MyLinkedListMappingFactory} as follows:</p>
*
* <pre>
- * public class MyLinkedListMappingFactory implements MXBeanMappingFactory {
+ * public class MyLinkedListMappingFactory extends MXBeanMappingFactory {
* public MyLinkedListMappingFactory() {}
*
* public MXBeanMapping mappingForType(Type t, MXBeanMappingFactory f)
--- a/jdk/src/share/classes/javax/swing/AbstractButton.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/AbstractButton.java Wed Jul 05 16:42:37 2017 +0200
@@ -1315,8 +1315,7 @@
// Make sure the change actually took effect
if (!selected && isSelected()) {
if (getModel() instanceof DefaultButtonModel) {
- ButtonGroup group = (ButtonGroup)
- ((DefaultButtonModel)getModel()).getGroup();
+ ButtonGroup group = ((DefaultButtonModel)getModel()).getGroup();
if (group != null) {
group.clearSelection();
}
@@ -1886,8 +1885,7 @@
* @since 1.4
*/
public ChangeListener[] getChangeListeners() {
- return (ChangeListener[])(listenerList.getListeners(
- ChangeListener.class));
+ return listenerList.getListeners(ChangeListener.class);
}
/**
@@ -1944,8 +1942,7 @@
* @since 1.4
*/
public ActionListener[] getActionListeners() {
- return (ActionListener[])(listenerList.getListeners(
- ActionListener.class));
+ return listenerList.getListeners(ActionListener.class);
}
/**
@@ -2137,7 +2134,7 @@
* @since 1.4
*/
public ItemListener[] getItemListeners() {
- return (ItemListener[])listenerList.getListeners(ItemListener.class);
+ return listenerList.getListeners(ItemListener.class);
}
/**
@@ -2981,7 +2978,7 @@
paintViewR.height = AbstractButton.this.getHeight() - (paintViewInsets.top + paintViewInsets.bottom);
String clippedText = SwingUtilities.layoutCompoundLabel(
- (JComponent)AbstractButton.this,
+ AbstractButton.this,
getFontMetrics(getFont()),
text,
icon,
--- a/jdk/src/share/classes/javax/swing/AbstractCellEditor.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/AbstractCellEditor.java Wed Jul 05 16:42:37 2017 +0200
@@ -118,8 +118,7 @@
* @since 1.4
*/
public CellEditorListener[] getCellEditorListeners() {
- return (CellEditorListener[])listenerList.getListeners(
- CellEditorListener.class);
+ return listenerList.getListeners(CellEditorListener.class);
}
/**
--- a/jdk/src/share/classes/javax/swing/AbstractListModel.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/AbstractListModel.java Wed Jul 05 16:42:37 2017 +0200
@@ -85,8 +85,7 @@
* @since 1.4
*/
public ListDataListener[] getListDataListeners() {
- return (ListDataListener[])listenerList.getListeners(
- ListDataListener.class);
+ return listenerList.getListeners(ListDataListener.class);
}
--- a/jdk/src/share/classes/javax/swing/AbstractSpinnerModel.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/AbstractSpinnerModel.java Wed Jul 05 16:42:37 2017 +0200
@@ -98,8 +98,7 @@
* @since 1.4
*/
public ChangeListener[] getChangeListeners() {
- return (ChangeListener[])listenerList.getListeners(
- ChangeListener.class);
+ return listenerList.getListeners(ChangeListener.class);
}
--- a/jdk/src/share/classes/javax/swing/ActionMap.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/ActionMap.java Wed Jul 05 16:42:37 2017 +0200
@@ -197,7 +197,7 @@
return pKeys;
}
- HashMap keyMap = new HashMap();
+ HashMap<Object, Object> keyMap = new HashMap<Object, Object>();
int counter;
for (counter = keys.length - 1; counter >= 0; counter--) {
--- a/jdk/src/share/classes/javax/swing/AncestorNotifier.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/AncestorNotifier.java Wed Jul 05 16:42:37 2017 +0200
@@ -62,7 +62,7 @@
}
AncestorListener[] getAncestorListeners() {
- return (AncestorListener[])listenerList.getListeners(AncestorListener.class);
+ return listenerList.getListeners(AncestorListener.class);
}
/**
--- a/jdk/src/share/classes/javax/swing/ArrayTable.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/ArrayTable.java Wed Jul 05 16:42:37 2017 +0200
@@ -88,10 +88,10 @@
// Write ou the Serializable key/value pairs.
s.writeInt(validCount);
if (validCount > 0) {
- for (int counter = 0; counter < keys.length; counter++) {
- if (keys[counter] != null) {
- s.writeObject(keys[counter]);
- s.writeObject(table.get(keys[counter]));
+ for (Object key : keys) {
+ if (key != null) {
+ s.writeObject(key);
+ s.writeObject(table.get(key));
if (--validCount == 0) {
break;
}
@@ -315,7 +315,7 @@
*/
private void grow() {
Object[] array = (Object[])table;
- Hashtable tmp = new Hashtable(array.length/2);
+ Hashtable<Object, Object> tmp = new Hashtable<Object, Object>(array.length/2);
for (int i = 0; i<array.length; i+=2) {
tmp.put(array[i], array[i+1]);
}
--- a/jdk/src/share/classes/javax/swing/ButtonGroup.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/ButtonGroup.java Wed Jul 05 16:42:37 2017 +0200
@@ -68,7 +68,7 @@
public class ButtonGroup implements Serializable {
// the list of buttons participating in this group
- protected Vector<AbstractButton> buttons = new Vector();
+ protected Vector<AbstractButton> buttons = new Vector<AbstractButton>();
/**
* The current selection.
--- a/jdk/src/share/classes/javax/swing/DebugGraphicsInfo.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/DebugGraphicsInfo.java Wed Jul 05 16:42:37 2017 +0200
@@ -37,7 +37,7 @@
Color flashColor = Color.red;
int flashTime = 100;
int flashCount = 2;
- Hashtable componentToDebug;
+ Hashtable<JComponent, Integer> componentToDebug;
JFrame debugFrame = null;
java.io.PrintStream stream = System.out;
@@ -46,7 +46,7 @@
return;
}
if (componentToDebug == null) {
- componentToDebug = new Hashtable();
+ componentToDebug = new Hashtable<JComponent, Integer>();
}
if (debug > 0) {
componentToDebug.put(component, Integer.valueOf(debug));
@@ -59,7 +59,7 @@
if (componentToDebug == null) {
return 0;
} else {
- Integer integer = (Integer)componentToDebug.get(component);
+ Integer integer = componentToDebug.get(component);
return integer == null ? 0 : integer.intValue();
}
--- a/jdk/src/share/classes/javax/swing/DefaultBoundedRangeModel.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/DefaultBoundedRangeModel.java Wed Jul 05 16:42:37 2017 +0200
@@ -343,8 +343,7 @@
* @since 1.4
*/
public ChangeListener[] getChangeListeners() {
- return (ChangeListener[])listenerList.getListeners(
- ChangeListener.class);
+ return listenerList.getListeners(ChangeListener.class);
}
--- a/jdk/src/share/classes/javax/swing/DefaultButtonModel.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/DefaultButtonModel.java Wed Jul 05 16:42:37 2017 +0200
@@ -326,8 +326,7 @@
* @since 1.4
*/
public ChangeListener[] getChangeListeners() {
- return (ChangeListener[])listenerList.getListeners(
- ChangeListener.class);
+ return listenerList.getListeners(ChangeListener.class);
}
/**
@@ -380,8 +379,7 @@
* @since 1.4
*/
public ActionListener[] getActionListeners() {
- return (ActionListener[])listenerList.getListeners(
- ActionListener.class);
+ return listenerList.getListeners(ActionListener.class);
}
/**
@@ -434,7 +432,7 @@
* @since 1.4
*/
public ItemListener[] getItemListeners() {
- return (ItemListener[])listenerList.getListeners(ItemListener.class);
+ return listenerList.getListeners(ItemListener.class);
}
/**
--- a/jdk/src/share/classes/javax/swing/DefaultFocusManager.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/DefaultFocusManager.java Wed Jul 05 16:42:37 2017 +0200
@@ -156,18 +156,17 @@
}
}
-final class CompareTabOrderComparator implements Comparator {
+final class CompareTabOrderComparator implements Comparator<Component> {
private final DefaultFocusManager defaultFocusManager;
CompareTabOrderComparator(DefaultFocusManager defaultFocusManager) {
this.defaultFocusManager = defaultFocusManager;
}
- public int compare(Object o1, Object o2) {
+ public int compare(Component o1, Component o2) {
if (o1 == o2) {
return 0;
}
- return (defaultFocusManager.compareTabOrder((Component)o1,
- (Component)o2)) ? -1 : 1;
+ return (defaultFocusManager.compareTabOrder(o1, o2)) ? -1 : 1;
}
}
--- a/jdk/src/share/classes/javax/swing/DefaultListSelectionModel.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/DefaultListSelectionModel.java Wed Jul 05 16:42:37 2017 +0200
@@ -133,8 +133,7 @@
* @since 1.4
*/
public ListSelectionListener[] getListSelectionListeners() {
- return (ListSelectionListener[])listenerList.getListeners(
- ListSelectionListener.class);
+ return listenerList.getListeners(ListSelectionListener.class);
}
/**
--- a/jdk/src/share/classes/javax/swing/DefaultSingleSelectionModel.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/DefaultSingleSelectionModel.java Wed Jul 05 16:42:37 2017 +0200
@@ -110,8 +110,7 @@
* @since 1.4
*/
public ChangeListener[] getChangeListeners() {
- return (ChangeListener[])listenerList.getListeners(
- ChangeListener.class);
+ return listenerList.getListeners(ChangeListener.class);
}
/**
--- a/jdk/src/share/classes/javax/swing/GroupLayout.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/GroupLayout.java Wed Jul 05 16:42:37 2017 +0200
@@ -1119,7 +1119,7 @@
* creating one if necessary.
*/
private ComponentInfo getComponentInfo(Component component) {
- ComponentInfo info = (ComponentInfo)componentInfos.get(component);
+ ComponentInfo info = componentInfos.get(component);
if (info == null) {
info = new ComponentInfo(component);
componentInfos.put(component, info);
@@ -1698,7 +1698,7 @@
for (int counter = springs.size() - 1; counter >= 0; counter--) {
Spring spring = springs.get(counter);
if (spring instanceof AutoPreferredGapSpring) {
- ((AutoPreferredGapSpring)spring).unset();
+ spring.unset();
} else if (spring instanceof Group) {
((Group)spring).unsetAutopadding();
}
--- a/jdk/src/share/classes/javax/swing/InputMap.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/InputMap.java Wed Jul 05 16:42:37 2017 +0200
@@ -200,7 +200,7 @@
return pKeys;
}
- HashMap keyMap = new HashMap();
+ HashMap<KeyStroke, KeyStroke> keyMap = new HashMap<KeyStroke, KeyStroke>();
int counter;
for (counter = keys.length - 1; counter >= 0; counter--) {
@@ -212,7 +212,7 @@
KeyStroke[] allKeys = new KeyStroke[keyMap.size()];
- return (KeyStroke[])keyMap.keySet().toArray(allKeys);
+ return keyMap.keySet().toArray(allKeys);
}
private void writeObject(ObjectOutputStream s) throws IOException {
--- a/jdk/src/share/classes/javax/swing/JApplet.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/JApplet.java Wed Jul 05 16:42:37 2017 +0200
@@ -131,10 +131,7 @@
// Check the timerQ and restart if necessary.
TimerQueue q = TimerQueue.sharedInstance();
if(q != null) {
- synchronized(q) {
- if(!q.running)
- q.start();
- }
+ q.startIfNeeded();
}
/* Workaround for bug 4155072. The shared double buffer image
--- a/jdk/src/share/classes/javax/swing/JComboBox.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/JComboBox.java Wed Jul 05 16:42:37 2017 +0200
@@ -859,7 +859,7 @@
* @since 1.4
*/
public ItemListener[] getItemListeners() {
- return (ItemListener[])listenerList.getListeners(ItemListener.class);
+ return listenerList.getListeners(ItemListener.class);
}
/**
@@ -897,8 +897,7 @@
* @since 1.4
*/
public ActionListener[] getActionListeners() {
- return (ActionListener[])listenerList.getListeners(
- ActionListener.class);
+ return listenerList.getListeners(ActionListener.class);
}
/**
@@ -937,8 +936,7 @@
* @since 1.4
*/
public PopupMenuListener[] getPopupMenuListeners() {
- return (PopupMenuListener[])listenerList.getListeners(
- PopupMenuListener.class);
+ return listenerList.getListeners(PopupMenuListener.class);
}
/**
@@ -1668,7 +1666,7 @@
if (editor != null) {
Component comp = editor.getEditorComponent();
if (comp instanceof Accessible) {
- AccessibleContext ac = ((Accessible)comp).getAccessibleContext();
+ AccessibleContext ac = comp.getAccessibleContext();
if (ac != null) { // may be null
ac.setAccessibleName(getAccessibleName());
ac.setAccessibleDescription(getAccessibleDescription());
@@ -1741,7 +1739,7 @@
// Fire a FOCUSED lost PropertyChangeEvent for the
// previously selected list item.
- PropertyChangeEvent pce = null;
+ PropertyChangeEvent pce;
if (previousSelectedAccessible != null) {
pce = new PropertyChangeEvent(previousSelectedAccessible,
--- a/jdk/src/share/classes/javax/swing/JComponent.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/JComponent.java Wed Jul 05 16:42:37 2017 +0200
@@ -192,7 +192,8 @@
/**
* @see #readObject
*/
- private static final Hashtable readObjectCallbacks = new Hashtable(1);
+ private static final Hashtable<ObjectInputStream, ReadObjectCallback> readObjectCallbacks =
+ new Hashtable<ObjectInputStream, ReadObjectCallback>(1);
/**
* Keys to use for forward focus traversal when the JComponent is
@@ -356,7 +357,7 @@
/**
* Temporary rectangles.
*/
- private static java.util.List tempRectangles = new java.util.ArrayList(11);
+ private static java.util.List<Rectangle> tempRectangles = new java.util.ArrayList<Rectangle>(11);
/** Used for <code>WHEN_FOCUSED</code> bindings. */
private InputMap focusInputMap;
@@ -451,7 +452,7 @@
Rectangle rect;
int size = tempRectangles.size();
if (size > 0) {
- rect = (Rectangle)tempRectangles.remove(size - 1);
+ rect = tempRectangles.remove(size - 1);
}
else {
rect = new Rectangle(0, 0, 0, 0);
@@ -806,7 +807,7 @@
// its index.
if (paintingChild != null &&
(paintingChild instanceof JComponent) &&
- ((JComponent)paintingChild).isOpaque()) {
+ paintingChild.isOpaque()) {
for (; i >= 0; i--) {
if (getComponent(i) == paintingChild){
break;
@@ -875,7 +876,7 @@
shouldSetFlagBack = true;
}
if(!printing) {
- ((JComponent)comp).paint(cg);
+ comp.paint(cg);
}
else {
if (!getFlag(IS_PRINTING_ALL)) {
@@ -1098,7 +1099,7 @@
}
private void adjustPaintFlags() {
- JComponent jparent = null;
+ JComponent jparent;
Container parent;
for(parent = getParent() ; parent != null ; parent =
parent.getParent()) {
@@ -2096,7 +2097,7 @@
private void registerWithKeyboardManager(boolean onlyIfNew) {
InputMap inputMap = getInputMap(WHEN_IN_FOCUSED_WINDOW, false);
KeyStroke[] strokes;
- Hashtable registered = (Hashtable)getClientProperty
+ Hashtable<KeyStroke, KeyStroke> registered = (Hashtable)getClientProperty
(WHEN_IN_FOCUSED_WINDOW_BINDINGS);
if (inputMap != null) {
@@ -2120,10 +2121,10 @@
}
// Remove any old ones.
if (registered != null && registered.size() > 0) {
- Enumeration keys = registered.keys();
+ Enumeration<KeyStroke> keys = registered.keys();
while (keys.hasMoreElements()) {
- KeyStroke ks = (KeyStroke)keys.nextElement();
+ KeyStroke ks = keys.nextElement();
unregisterWithKeyboardManager(ks);
}
registered.clear();
@@ -2131,7 +2132,7 @@
// Updated the registered Hashtable.
if (strokes != null && strokes.length > 0) {
if (registered == null) {
- registered = new Hashtable(strokes.length);
+ registered = new Hashtable<KeyStroke, KeyStroke>(strokes.length);
putClientProperty(WHEN_IN_FOCUSED_WINDOW_BINDINGS, registered);
}
for (int counter = strokes.length - 1; counter >= 0; counter--) {
@@ -2174,7 +2175,7 @@
InputMap km = getInputMap(WHEN_IN_FOCUSED_WINDOW, false);
while (km != inputMap && km != null) {
- km = (ComponentInputMap)km.getParent();
+ km = km.getParent();
}
if (km != null) {
registerWithKeyboardManager(false);
@@ -3673,7 +3674,7 @@
if (c != null && c instanceof Accessible) {
AccessibleJComponent.this.firePropertyChange(
AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
- null, ((Accessible) c).getAccessibleContext());
+ null, c.getAccessibleContext());
}
}
public void componentRemoved(ContainerEvent e) {
@@ -3681,7 +3682,7 @@
if (c != null && c instanceof Accessible) {
AccessibleJComponent.this.firePropertyChange(
AccessibleContext.ACCESSIBLE_CHILD_PROPERTY,
- ((Accessible) c).getAccessibleContext(), null);
+ c.getAccessibleContext(), null);
}
}
}
@@ -4377,7 +4378,7 @@
// System.out.println("A) checking opaque: " + ((JComponent)child).isOpaque() + " " + child);
// System.out.print("B) ");
// Thread.dumpStack();
- return ((JComponent)child).isOpaque();
+ return child.isOpaque();
} else {
/** Sometimes a heavy weight can have a bound larger than its peer size
* so we should always draw under heavy weights
@@ -4693,7 +4694,7 @@
result = (T[])getPropertyChangeListeners();
}
else {
- result = (T[])listenerList.getListeners(listenerType);
+ result = listenerList.getListeners(listenerType);
}
if (result.length == 0) {
@@ -4904,7 +4905,7 @@
if(!isShowing()) {
return;
}
- while(!((JComponent)c).isOpaque()) {
+ while(!c.isOpaque()) {
parent = c.getParent();
if(parent != null) {
x += c.getX();
@@ -5198,7 +5199,7 @@
Rectangle siblingRect;
boolean opaque;
if (sibling instanceof JComponent) {
- opaque = ((JComponent)sibling).isOpaque();
+ opaque = sibling.isOpaque();
if (!opaque) {
if (retValue == PARTIALLY_OBSCURED) {
continue;
@@ -5345,7 +5346,7 @@
*/
private class ReadObjectCallback implements ObjectInputValidation
{
- private final Vector roots = new Vector(1);
+ private final Vector<JComponent> roots = new Vector<JComponent>(1);
private final ObjectInputStream inputStream;
ReadObjectCallback(ObjectInputStream s) throws Exception {
@@ -5361,8 +5362,7 @@
*/
public void validateObject() throws InvalidObjectException {
try {
- for(int i = 0; i < roots.size(); i++) {
- JComponent root = (JComponent)(roots.elementAt(i));
+ for (JComponent root : roots) {
SwingUtilities.updateComponentTreeUI(root);
}
}
@@ -5382,8 +5382,7 @@
/* If the Component c is a descendant of one of the
* existing roots (or it IS an existing root), we're done.
*/
- for(int i = 0; i < roots.size(); i++) {
- JComponent root = (JComponent)roots.elementAt(i);
+ for (JComponent root : roots) {
for(Component p = c; p != null; p = p.getParent()) {
if (p == root) {
return;
@@ -5396,7 +5395,7 @@
* to the roots vector.
*/
for(int i = 0; i < roots.size(); i++) {
- JComponent root = (JComponent)roots.elementAt(i);
+ JComponent root = roots.elementAt(i);
for(Component p = root.getParent(); p != null; p = p.getParent()) {
if (p == c) {
roots.removeElementAt(i--); // !!
@@ -5428,7 +5427,7 @@
* in the readObjectCallbacks table. Note that the ReadObjectCallback
* constructor takes care of calling s.registerValidation().
*/
- ReadObjectCallback cb = (ReadObjectCallback)(readObjectCallbacks.get(s));
+ ReadObjectCallback cb = readObjectCallbacks.get(s);
if (cb == null) {
try {
readObjectCallbacks.put(s, cb = new ReadObjectCallback(s));
--- a/jdk/src/share/classes/javax/swing/JDesktopPane.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/JDesktopPane.java Wed Jul 05 16:42:37 2017 +0200
@@ -133,8 +133,8 @@
public Component getDefaultComponent(Container c) {
JInternalFrame jifArray[] = getAllFrames();
Component comp = null;
- for (int i = 0; i < jifArray.length; i++) {
- comp = jifArray[i].getFocusTraversalPolicy().getDefaultComponent(jifArray[i]);
+ for (JInternalFrame jif : jifArray) {
+ comp = jif.getFocusTraversalPolicy().getDefaultComponent(jif);
if (comp != null) {
break;
}
@@ -262,16 +262,15 @@
public JInternalFrame[] getAllFrames() {
int i, count;
JInternalFrame[] results;
- Vector vResults = new Vector(10);
- Object next, tmp;
+ Vector<JInternalFrame> vResults = new Vector<JInternalFrame>(10);
count = getComponentCount();
for(i = 0; i < count; i++) {
- next = getComponent(i);
+ Component next = getComponent(i);
if(next instanceof JInternalFrame)
- vResults.addElement(next);
+ vResults.addElement((JInternalFrame) next);
else if(next instanceof JInternalFrame.JDesktopIcon) {
- tmp = ((JInternalFrame.JDesktopIcon)next).getInternalFrame();
+ JInternalFrame tmp = ((JInternalFrame.JDesktopIcon)next).getInternalFrame();
if(tmp != null)
vResults.addElement(tmp);
}
@@ -324,18 +323,17 @@
public JInternalFrame[] getAllFramesInLayer(int layer) {
int i, count;
JInternalFrame[] results;
- Vector vResults = new Vector(10);
- Object next, tmp;
+ Vector<JInternalFrame> vResults = new Vector<JInternalFrame>(10);
count = getComponentCount();
for(i = 0; i < count; i++) {
- next = getComponent(i);
+ Component next = getComponent(i);
if(next instanceof JInternalFrame) {
if(((JInternalFrame)next).getLayer() == layer)
- vResults.addElement(next);
+ vResults.addElement((JInternalFrame) next);
} else if(next instanceof JInternalFrame.JDesktopIcon) {
- tmp = ((JInternalFrame.JDesktopIcon)next).getInternalFrame();
- if(tmp != null && ((JInternalFrame)tmp).getLayer() == layer)
+ JInternalFrame tmp = ((JInternalFrame.JDesktopIcon)next).getInternalFrame();
+ if(tmp != null && tmp.getLayer() == layer)
vResults.addElement(tmp);
}
}
--- a/jdk/src/share/classes/javax/swing/JDialog.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/JDialog.java Wed Jul 05 16:42:37 2017 +0200
@@ -277,7 +277,7 @@
title, modal);
if (owner == null) {
WindowListener ownerShutdownListener =
- (WindowListener)SwingUtilities.getSharedOwnerFrameShutdownListener();
+ SwingUtilities.getSharedOwnerFrameShutdownListener();
addWindowListener(ownerShutdownListener);
}
dialogInit();
@@ -329,7 +329,7 @@
title, modal, gc);
if (owner == null) {
WindowListener ownerShutdownListener =
- (WindowListener)SwingUtilities.getSharedOwnerFrameShutdownListener();
+ SwingUtilities.getSharedOwnerFrameShutdownListener();
addWindowListener(ownerShutdownListener);
}
dialogInit();
--- a/jdk/src/share/classes/javax/swing/JEditorPane.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/JEditorPane.java Wed Jul 05 16:42:37 2017 +0200
@@ -319,8 +319,7 @@
* @since 1.4
*/
public synchronized HyperlinkListener[] getHyperlinkListeners() {
- return (HyperlinkListener[])listenerList.getListeners(
- HyperlinkListener.class);
+ return listenerList.getListeners(javax.swing.event.HyperlinkListener.class);
}
/**
@@ -492,8 +491,8 @@
if (pageProperties != null) {
// transfer properties discovered in stream to the
// document property collection.
- for (Enumeration e = pageProperties.keys(); e.hasMoreElements() ;) {
- Object key = e.nextElement();
+ for (Enumeration<String> e = pageProperties.keys(); e.hasMoreElements() ;) {
+ String key = e.nextElement();
doc.putProperty(key, pageProperties.get(key));
}
pageProperties.clear();
@@ -775,7 +774,7 @@
*/
private void handleConnectionProperties(URLConnection conn) {
if (pageProperties == null) {
- pageProperties = new Hashtable();
+ pageProperties = new Hashtable<String, Object>();
}
String type = conn.getContentType();
if (type != null) {
@@ -989,7 +988,7 @@
* of the content type in the http header information.
*/
private void setCharsetFromContentTypeParameters(String paramlist) {
- String charset = null;
+ String charset;
try {
// paramlist is handed to us with a leading ';', strip it.
int semi = paramlist.indexOf(';');
@@ -1080,9 +1079,9 @@
*/
public EditorKit getEditorKitForContentType(String type) {
if (typeHandlers == null) {
- typeHandlers = new Hashtable(3);
+ typeHandlers = new Hashtable<String, EditorKit>(3);
}
- EditorKit k = (EditorKit) typeHandlers.get(type);
+ EditorKit k = typeHandlers.get(type);
if (k == null) {
k = createEditorKitForContentType(type);
if (k != null) {
@@ -1106,7 +1105,7 @@
*/
public void setEditorKitForContentType(String type, EditorKit k) {
if (typeHandlers == null) {
- typeHandlers = new Hashtable(3);
+ typeHandlers = new Hashtable<String, EditorKit>(3);
}
typeHandlers.put(type, k);
}
@@ -1176,13 +1175,12 @@
* registered for the given type
*/
public static EditorKit createEditorKitForContentType(String type) {
- EditorKit k = null;
- Hashtable kitRegistry = getKitRegisty();
- k = (EditorKit) kitRegistry.get(type);
+ Hashtable<String, EditorKit> kitRegistry = getKitRegisty();
+ EditorKit k = kitRegistry.get(type);
if (k == null) {
// try to dynamically load the support
- String classname = (String) getKitTypeRegistry().get(type);
- ClassLoader loader = (ClassLoader) getKitLoaderRegistry().get(type);
+ String classname = getKitTypeRegistry().get(type);
+ ClassLoader loader = getKitLoaderRegistry().get(type);
try {
Class c;
if (loader != null) {
@@ -1252,20 +1250,20 @@
* @since 1.3
*/
public static String getEditorKitClassNameForContentType(String type) {
- return (String)getKitTypeRegistry().get(type);
+ return getKitTypeRegistry().get(type);
}
- private static Hashtable getKitTypeRegistry() {
+ private static Hashtable<String, String> getKitTypeRegistry() {
loadDefaultKitsIfNecessary();
return (Hashtable)SwingUtilities.appContextGet(kitTypeRegistryKey);
}
- private static Hashtable getKitLoaderRegistry() {
+ private static Hashtable<String, ClassLoader> getKitLoaderRegistry() {
loadDefaultKitsIfNecessary();
return (Hashtable)SwingUtilities.appContextGet(kitLoaderRegistryKey);
}
- private static Hashtable getKitRegisty() {
+ private static Hashtable<String, EditorKit> getKitRegisty() {
Hashtable ht = (Hashtable)SwingUtilities.appContextGet(kitRegistryKey);
if (ht == null) {
ht = new Hashtable(3);
@@ -1512,7 +1510,7 @@
private EditorKit kit;
private boolean isUserSetEditorKit;
- private Hashtable pageProperties;
+ private Hashtable<String, Object> pageProperties;
/** Should be kept in sync with javax.swing.text.html.FormView counterpart. */
final static String PostDataProperty = "javax.swing.JEditorPane.postdata";
@@ -1520,7 +1518,7 @@
/**
* Table of registered type handlers for this editor.
*/
- private Hashtable typeHandlers;
+ private Hashtable<String, EditorKit> typeHandlers;
/*
* Private AppContext keys for this class's static variables.
@@ -1913,11 +1911,11 @@
}
}
- private class LinkVector extends Vector {
+ private class LinkVector extends Vector<HTMLLink> {
public int baseElementIndex(Element e) {
HTMLLink l;
for (int i = 0; i < elementCount; i++) {
- l = (HTMLLink) elementAt(i);
+ l = elementAt(i);
if (l.element == e) {
return i;
}
@@ -2029,7 +2027,7 @@
buildLinkTable();
}
if (linkIndex >= 0 && linkIndex < hyperlinks.size()) {
- return (AccessibleHyperlink) hyperlinks.elementAt(linkIndex);
+ return hyperlinks.elementAt(linkIndex);
} else {
return null;
}
--- a/jdk/src/share/classes/javax/swing/JFileChooser.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/JFileChooser.java Wed Jul 05 16:42:37 2017 +0200
@@ -248,7 +248,7 @@
private String approveButtonToolTipText = null;
private int approveButtonMnemonic = 0;
- private Vector filters = new Vector(5);
+ private Vector<FileFilter> filters = new Vector<FileFilter>(5);
private JDialog dialog = null;
private int dialogType = OPEN_DIALOG;
private int returnValue = ERROR_OPTION;
@@ -503,7 +503,7 @@
if(selectedFiles == null) {
return new File[0];
} else {
- return (File[]) selectedFiles.clone();
+ return selectedFiles.clone();
}
}
@@ -1415,17 +1415,17 @@
fileFilter = filter;
if (filter != null) {
if (isMultiSelectionEnabled() && selectedFiles != null && selectedFiles.length > 0) {
- Vector fList = new Vector();
+ Vector<File> fList = new Vector<File>();
boolean failed = false;
- for (int i = 0; i < selectedFiles.length; i++) {
- if (filter.accept(selectedFiles[i])) {
- fList.add(selectedFiles[i]);
+ for (File file : selectedFiles) {
+ if (filter.accept(file)) {
+ fList.add(file);
} else {
failed = true;
}
}
if (failed) {
- setSelectedFiles((fList.size() == 0) ? null : (File[])fList.toArray(new File[fList.size()]));
+ setSelectedFiles((fList.size() == 0) ? null : fList.toArray(new File[fList.size()]));
}
} else if (selectedFile != null && !filter.accept(selectedFile)) {
setSelectedFile(null);
@@ -1702,8 +1702,7 @@
* @since 1.4
*/
public ActionListener[] getActionListeners() {
- return (ActionListener[])listenerList.getListeners(
- ActionListener.class);
+ return listenerList.getListeners(ActionListener.class);
}
/**
@@ -1744,7 +1743,7 @@
WeakReference<JFileChooser> jfcRef;
public WeakPCL(JFileChooser jfc) {
- jfcRef = new WeakReference(jfc);
+ jfcRef = new WeakReference<JFileChooser>(jfc);
}
public void propertyChange(PropertyChangeEvent ev) {
assert ev.getPropertyName().equals(SHOW_HIDDEN_PROP);
--- a/jdk/src/share/classes/javax/swing/JInternalFrame.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/JInternalFrame.java Wed Jul 05 16:42:37 2017 +0200
@@ -421,8 +421,8 @@
invalidate();
Component[] children = getComponents();
if (children != null) {
- for(int i = 0; i < children.length; i++) {
- SwingUtilities.updateComponentTreeUI(children[i]);
+ for (Component child : children) {
+ SwingUtilities.updateComponentTreeUI(child);
}
}
}
@@ -1535,8 +1535,7 @@
* @see #addInternalFrameListener
*/
public InternalFrameListener[] getInternalFrameListeners() {
- return (InternalFrameListener[])listenerList.getListeners(
- InternalFrameListener.class);
+ return listenerList.getListeners(InternalFrameListener.class);
}
// remind: name ok? all one method ok? need to be synchronized?
@@ -2258,8 +2257,8 @@
invalidate();
Component[] children = getComponents();
if (children != null) {
- for(int i = 0; i < children.length; i++) {
- SwingUtilities.updateComponentTreeUI(children[i]);
+ for (Component child : children) {
+ SwingUtilities.updateComponentTreeUI(child);
}
}
}
--- a/jdk/src/share/classes/javax/swing/JLayeredPane.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/JLayeredPane.java Wed Jul 05 16:42:37 2017 +0200
@@ -191,7 +191,7 @@
private void validateOptimizedDrawing() {
boolean layeredComponentFound = false;
synchronized(getTreeLock()) {
- Integer layer = null;
+ Integer layer;
for (Component c : getComponents()) {
layer = null;
@@ -213,7 +213,7 @@
}
protected void addImpl(Component comp, Object constraints, int index) {
- int layer = DEFAULT_LAYER.intValue();
+ int layer;
int pos;
if(constraints instanceof Integer) {
@@ -364,7 +364,7 @@
if(c instanceof JComponent)
((JComponent)c).putClientProperty(LAYER_PROPERTY, layerObj);
else
- getComponentToLayer().put((Component)c, layerObj);
+ getComponentToLayer().put(c, layerObj);
if(c.getParent() == null || c.getParent() != this) {
repaint(c.getBounds());
@@ -388,7 +388,7 @@
if(c instanceof JComponent)
i = (Integer)((JComponent)c).getClientProperty(LAYER_PROPERTY);
else
- i = (Integer)getComponentToLayer().get((Component)c);
+ i = getComponentToLayer().get(c);
if(i == null)
return DEFAULT_LAYER.intValue();
@@ -465,9 +465,9 @@
* @see #getComponentCountInLayer
*/
public int getPosition(Component c) {
- int i, count, startLayer, curLayer, startLocation, pos = 0;
+ int i, startLayer, curLayer, startLocation, pos = 0;
- count = getComponentCount();
+ getComponentCount();
startLocation = getIndexOf(c);
if(startLocation == -1)
--- a/jdk/src/share/classes/javax/swing/JList.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/JList.java Wed Jul 05 16:42:37 2017 +0200
@@ -1848,8 +1848,7 @@
* @since 1.4
*/
public ListSelectionListener[] getListSelectionListeners() {
- return (ListSelectionListener[])listenerList.getListeners(
- ListSelectionListener.class);
+ return listenerList.getListeners(ListSelectionListener.class);
}
@@ -2220,9 +2219,9 @@
ListSelectionModel sm = getSelectionModel();
sm.clearSelection();
int size = getModel().getSize();
- for(int i = 0; i < indices.length; i++) {
- if (indices[i] < size) {
- sm.addSelectionInterval(indices[i], indices[i]);
+ for (int i : indices) {
+ if (i < size) {
+ sm.addSelectionInterval(i, i);
}
}
}
@@ -2724,7 +2723,7 @@
return true;
}
if (getParent() instanceof JViewport) {
- return (((JViewport)getParent()).getWidth() > getPreferredSize().width);
+ return (getParent().getWidth() > getPreferredSize().width);
}
return false;
}
@@ -2749,7 +2748,7 @@
return true;
}
if (getParent() instanceof JViewport) {
- return (((JViewport)getParent()).getHeight() > getPreferredSize().height);
+ return (getParent().getHeight() > getPreferredSize().height);
}
return false;
}
@@ -3161,7 +3160,7 @@
private AccessibleContext getCurrentAccessibleContext() {
Component c = getComponentAtIndex(indexInParent);
if (c instanceof Accessible) {
- return ((Accessible) c).getAccessibleContext();
+ return c.getAccessibleContext();
} else {
return null;
}
--- a/jdk/src/share/classes/javax/swing/JMenu.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/JMenu.java Wed Jul 05 16:42:37 2017 +0200
@@ -371,8 +371,8 @@
* @since 1.3
*/
protected Point getPopupMenuOrigin() {
- int x = 0;
- int y = 0;
+ int x;
+ int y;
JPopupMenu pm = getPopupMenu();
// Figure out the sizes needed to caclulate the menu position
Dimension s = getSize();
@@ -900,10 +900,8 @@
* on another menu
*/
public boolean isTopLevelMenu() {
- if (getParent() instanceof JMenuBar)
- return true;
+ return getParent() instanceof JMenuBar;
- return false;
}
/**
@@ -1015,7 +1013,7 @@
* @since 1.4
*/
public MenuListener[] getMenuListeners() {
- return (MenuListener[])listenerList.getListeners(MenuListener.class);
+ return listenerList.getListeners(MenuListener.class);
}
/**
@@ -1305,7 +1303,7 @@
* @return the array of menu items
*/
private MenuElement[] buildMenuElementArray(JMenu leaf) {
- Vector elements = new Vector();
+ Vector<MenuElement> elements = new Vector<MenuElement>();
Component current = leaf.getPopupMenu();
JPopupMenu pop;
JMenu menu;
@@ -1409,8 +1407,8 @@
public int getAccessibleChildrenCount() {
Component[] children = getMenuComponents();
int count = 0;
- for (int j = 0; j < children.length; j++) {
- if (children[j] instanceof Accessible) {
+ for (Component child : children) {
+ if (child instanceof Accessible) {
count++;
}
}
@@ -1426,18 +1424,18 @@
public Accessible getAccessibleChild(int i) {
Component[] children = getMenuComponents();
int count = 0;
- for (int j = 0; j < children.length; j++) {
- if (children[j] instanceof Accessible) {
+ for (Component child : children) {
+ if (child instanceof Accessible) {
if (count == i) {
- if (children[j] instanceof JComponent) {
+ if (child instanceof JComponent) {
// FIXME: [[[WDW - probably should set this when
// the component is added to the menu. I tried
// to do this in most cases, but the separators
// added by addSeparator are hard to get to.]]]
- AccessibleContext ac = ((Accessible) children[j]).getAccessibleContext();
+ AccessibleContext ac = child.getAccessibleContext();
ac.setAccessibleParent(JMenu.this);
}
- return (Accessible) children[j];
+ return (Accessible) child;
} else {
count++;
}
@@ -1581,7 +1579,7 @@
}
JMenuItem mi = getItem(i);
if (mi != null && mi instanceof JMenu) {
- if (((JMenu) mi).isSelected()) {
+ if (mi.isSelected()) {
MenuElement old[] =
MenuSelectionManager.defaultManager().getSelectedPath();
MenuElement me[] = new MenuElement[old.length-2];
--- a/jdk/src/share/classes/javax/swing/JMenuBar.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/JMenuBar.java Wed Jul 05 16:42:37 2017 +0200
@@ -414,7 +414,7 @@
*/
public MenuElement[] getSubElements() {
MenuElement result[];
- Vector tmp = new Vector();
+ Vector<MenuElement> tmp = new Vector<MenuElement>();
int c = getComponentCount();
int i;
Component m;
@@ -422,12 +422,12 @@
for(i=0 ; i < c ; i++) {
m = getComponent(i);
if(m instanceof MenuElement)
- tmp.addElement(m);
+ tmp.addElement((MenuElement) m);
}
result = new MenuElement[tmp.size()];
for(i=0,c=tmp.size() ; i < c ; i++)
- result[i] = (MenuElement) tmp.elementAt(i);
+ result[i] = tmp.elementAt(i);
return result;
}
@@ -664,9 +664,9 @@
boolean retValue = super.processKeyBinding(ks, e, condition, pressed);
if (!retValue) {
MenuElement[] subElements = getSubElements();
- for (int i=0; i<subElements.length; i++) {
+ for (MenuElement subElement : subElements) {
if (processBindingForKeyStrokeRecursive(
- subElements[i], ks, e, condition, pressed)) {
+ subElement, ks, e, condition, pressed)) {
return true;
}
}
@@ -693,9 +693,8 @@
}
MenuElement[] subElements = elem.getSubElements();
- for(int i=0; i<subElements.length; i++) {
- if (processBindingForKeyStrokeRecursive(subElements[i], ks, e,
- condition, pressed)) {
+ for (MenuElement subElement : subElements) {
+ if (processBindingForKeyStrokeRecursive(subElement, ks, e, condition, pressed)) {
return true;
// We don't, pass along to children JMenu's
}
--- a/jdk/src/share/classes/javax/swing/JMenuItem.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/JMenuItem.java Wed Jul 05 16:42:37 2017 +0200
@@ -275,7 +275,7 @@
* hidden: true
*/
public void setArmed(boolean b) {
- ButtonModel model = (ButtonModel) getModel();
+ ButtonModel model = getModel();
boolean oldValue = model.isArmed();
if(model.isArmed() != b) {
@@ -290,7 +290,7 @@
* @see #setArmed
*/
public boolean isArmed() {
- ButtonModel model = (ButtonModel) getModel();
+ ButtonModel model = getModel();
return model.isArmed();
}
@@ -721,8 +721,7 @@
* @since 1.4
*/
public MenuDragMouseListener[] getMenuDragMouseListeners() {
- return (MenuDragMouseListener[])listenerList.getListeners(
- MenuDragMouseListener.class);
+ return listenerList.getListeners(MenuDragMouseListener.class);
}
/**
@@ -752,8 +751,7 @@
* @since 1.4
*/
public MenuKeyListener[] getMenuKeyListeners() {
- return (MenuKeyListener[])listenerList.getListeners(
- MenuKeyListener.class);
+ return listenerList.getListeners(MenuKeyListener.class);
}
/**
--- a/jdk/src/share/classes/javax/swing/JOptionPane.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/JOptionPane.java Wed Jul 05 16:42:37 2017 +0200
@@ -963,7 +963,7 @@
}
if (window instanceof SwingUtilities.SharedOwnerFrame) {
WindowListener ownerShutdownListener =
- (WindowListener)SwingUtilities.getSharedOwnerFrameShutdownListener();
+ SwingUtilities.getSharedOwnerFrameShutdownListener();
dialog.addWindowListener(ownerShutdownListener);
}
initDialog(dialog, style, parentComponent);
@@ -1300,11 +1300,10 @@
// Use reflection to get Container.startLWModal.
try {
- Object obj;
- obj = AccessController.doPrivileged(new ModalPrivilegedAction(
+ Method method = AccessController.doPrivileged(new ModalPrivilegedAction(
Container.class, "startLWModal"));
- if (obj != null) {
- ((Method)obj).invoke(dialog, (Object[])null);
+ if (method != null) {
+ method.invoke(dialog, (Object[])null);
}
} catch (IllegalAccessException ex) {
} catch (IllegalArgumentException ex) {
@@ -1446,11 +1445,10 @@
// Use reflection to get Container.startLWModal.
try {
- Object obj;
- obj = AccessController.doPrivileged(new ModalPrivilegedAction(
+ Method method = AccessController.doPrivileged(new ModalPrivilegedAction(
Container.class, "startLWModal"));
- if (obj != null) {
- ((Method)obj).invoke(dialog, (Object[])null);
+ if (method != null) {
+ method.invoke(dialog, (Object[])null);
}
} catch (IllegalAccessException ex) {
} catch (IllegalArgumentException ex) {
@@ -1531,12 +1529,11 @@
event.getPropertyName().equals(VALUE_PROPERTY)) {
// Use reflection to get Container.stopLWModal().
try {
- Object obj;
- obj = AccessController.doPrivileged(
+ Method method = AccessController.doPrivileged(
new ModalPrivilegedAction(
Container.class, "stopLWModal"));
- if (obj != null) {
- ((Method)obj).invoke(iFrame, (Object[])null);
+ if (method != null) {
+ method.invoke(iFrame, (Object[])null);
}
} catch (IllegalAccessException ex) {
} catch (IllegalArgumentException ex) {
@@ -1852,7 +1849,7 @@
* description: The UI object that implements the optionpane's LookAndFeel
*/
public void setUI(OptionPaneUI ui) {
- if ((OptionPaneUI)this.ui != ui) {
+ if (this.ui != ui) {
super.setUI(ui);
invalidate();
}
@@ -2327,7 +2324,7 @@
// Serialization support.
private void writeObject(ObjectOutputStream s) throws IOException {
- Vector values = new Vector();
+ Vector<Object> values = new Vector<Object>();
s.defaultWriteObject();
// Save the icon, if its Serializable.
@@ -2342,7 +2339,7 @@
}
// Save the treeModel, if its Serializable.
if(options != null) {
- Vector serOptions = new Vector();
+ Vector<Object> serOptions = new Vector<Object>();
for(int counter = 0, maxCounter = options.length;
counter < maxCounter; counter++)
@@ -2510,16 +2507,16 @@
/**
* Retrieves a method from the provided class and makes it accessible.
*/
- private static class ModalPrivilegedAction implements PrivilegedAction {
- private Class clazz;
+ private static class ModalPrivilegedAction implements PrivilegedAction<Method> {
+ private Class<?> clazz;
private String methodName;
- public ModalPrivilegedAction(Class clazz, String methodName) {
+ public ModalPrivilegedAction(Class<?> clazz, String methodName) {
this.clazz = clazz;
this.methodName = methodName;
}
- public Object run() {
+ public Method run() {
Method method = null;
try {
method = clazz.getDeclaredMethod(methodName, (Class[])null);
--- a/jdk/src/share/classes/javax/swing/JPopupMenu.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/JPopupMenu.java Wed Jul 05 16:42:37 2017 +0200
@@ -584,7 +584,7 @@
int nitems = getComponentCount();
// PENDING(ges): Why not use an array?
- Vector tempItems = new Vector();
+ Vector<Component> tempItems = new Vector<Component>();
/* Remove the item at index, nitems-index times
storing them in a temporary vector in the
@@ -600,8 +600,8 @@
/* Add the removed items back to the menu, they are
already in the correct order in the temp vector.
*/
- for (int i = 0; i < tempItems.size() ; i++) {
- add((Component)tempItems.elementAt(i));
+ for (Component tempItem : tempItems) {
+ add(tempItem);
}
}
@@ -632,8 +632,7 @@
* @since 1.4
*/
public PopupMenuListener[] getPopupMenuListeners() {
- return (PopupMenuListener[])listenerList.getListeners(
- PopupMenuListener.class);
+ return listenerList.getListeners(PopupMenuListener.class);
}
/**
@@ -665,8 +664,7 @@
* @since 1.5
*/
public MenuKeyListener[] getMenuKeyListeners() {
- return (MenuKeyListener[])listenerList.getListeners(
- MenuKeyListener.class);
+ return listenerList.getListeners(MenuKeyListener.class);
}
/**
@@ -781,7 +779,7 @@
// set selection path before popping up!
if (isPopupMenu()) {
MenuElement me[] = new MenuElement[1];
- me[0] = (MenuElement) this;
+ me[0] = this;
MenuSelectionManager.defaultManager().setSelectedPath(me);
}
}
@@ -848,10 +846,7 @@
* being displayed).
*/
public boolean isVisible() {
- if(popup != null)
- return true;
- else
- return false;
+ return popup != null;
}
/**
@@ -1311,7 +1306,7 @@
// Serialization support.
////////////
private void writeObject(ObjectOutputStream s) throws IOException {
- Vector values = new Vector();
+ Vector<Object> values = new Vector<Object>();
s.defaultWriteObject();
// Save the invoker, if its Serializable.
@@ -1494,7 +1489,7 @@
*/
public MenuElement[] getSubElements() {
MenuElement result[];
- Vector tmp = new Vector();
+ Vector<MenuElement> tmp = new Vector<MenuElement>();
int c = getComponentCount();
int i;
Component m;
@@ -1502,12 +1497,12 @@
for(i=0 ; i < c ; i++) {
m = getComponent(i);
if(m instanceof MenuElement)
- tmp.addElement(m);
+ tmp.addElement((MenuElement) m);
}
result = new MenuElement[tmp.size()];
for(i=0,c=tmp.size() ; i < c ; i++)
- result[i] = (MenuElement) tmp.elementAt(i);
+ result[i] = tmp.elementAt(i);
return result;
}
--- a/jdk/src/share/classes/javax/swing/JProgressBar.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/JProgressBar.java Wed Jul 05 16:42:37 2017 +0200
@@ -699,8 +699,7 @@
* @since 1.4
*/
public ChangeListener[] getChangeListeners() {
- return (ChangeListener[])listenerList.getListeners(
- ChangeListener.class);
+ return listenerList.getListeners(ChangeListener.class);
}
/**
--- a/jdk/src/share/classes/javax/swing/JScrollBar.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/JScrollBar.java Wed Jul 05 16:42:37 2017 +0200
@@ -659,8 +659,7 @@
* @since 1.4
*/
public AdjustmentListener[] getAdjustmentListeners() {
- return (AdjustmentListener[])listenerList.getListeners(
- AdjustmentListener.class);
+ return listenerList.getListeners(AdjustmentListener.class);
}
@@ -754,8 +753,8 @@
public void setEnabled(boolean x) {
super.setEnabled(x);
Component[] children = getComponents();
- for(int i = 0; i < children.length; i++) {
- children[i].setEnabled(x);
+ for (Component child : children) {
+ child.setEnabled(x);
}
}
--- a/jdk/src/share/classes/javax/swing/JSlider.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/JSlider.java Wed Jul 05 16:42:37 2017 +0200
@@ -270,8 +270,7 @@
{
checkOrientation(orientation);
this.orientation = orientation;
- sliderModel = new DefaultBoundedRangeModel(value, 0, min, max);
- sliderModel.addChangeListener(changeListener);
+ setModel(new DefaultBoundedRangeModel(value, 0, min, max));
updateUI();
}
@@ -284,7 +283,6 @@
{
this.orientation = JSlider.HORIZONTAL;
setModel(brm);
- sliderModel.addChangeListener(changeListener);
updateUI();
}
@@ -476,15 +474,15 @@
if (newModel != null) {
newModel.addChangeListener(changeListener);
+ }
- if (accessibleContext != null) {
- accessibleContext.firePropertyChange(
- AccessibleContext.ACCESSIBLE_VALUE_PROPERTY,
- (oldModel == null
- ? null : Integer.valueOf(oldModel.getValue())),
- (newModel == null
- ? null : Integer.valueOf(newModel.getValue())));
- }
+ if (accessibleContext != null) {
+ accessibleContext.firePropertyChange(
+ AccessibleContext.ACCESSIBLE_VALUE_PROPERTY,
+ (oldModel == null
+ ? null : Integer.valueOf(oldModel.getValue())),
+ (newModel == null
+ ? null : Integer.valueOf(newModel.getValue())));
}
firePropertyChange("model", oldModel, sliderModel);
@@ -930,7 +928,7 @@
throw new IllegalArgumentException( "Label incremement must be > 0" );
}
- class SmartHashtable extends Hashtable implements PropertyChangeListener {
+ class SmartHashtable extends Hashtable<Object, Object> implements PropertyChangeListener {
int increment = 0;
int start = 0;
boolean startAtMin = false;
@@ -977,9 +975,8 @@
if ( e.getPropertyName().equals( "minimum" ) ||
e.getPropertyName().equals( "maximum" ) ) {
- Dictionary labelTable = getLabelTable();
- Enumeration keys = labelTable.keys();
- Hashtable hashtable = new Hashtable();
+ Enumeration keys = getLabelTable().keys();
+ Hashtable<Object, Object> hashtable = new Hashtable<Object, Object>();
// Save the labels that were added by the developer
while ( keys.hasMoreElements() ) {
--- a/jdk/src/share/classes/javax/swing/JSpinner.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/JSpinner.java Wed Jul 05 16:42:37 2017 +0200
@@ -433,8 +433,7 @@
* @since 1.4
*/
public ChangeListener[] getChangeListeners() {
- return (ChangeListener[])listenerList.getListeners(
- ChangeListener.class);
+ return listenerList.getListeners(ChangeListener.class);
}
@@ -1536,7 +1535,7 @@
return textField.getAccessibleContext();
}
} else if (editor instanceof Accessible) {
- return ((Accessible)editor).getAccessibleContext();
+ return editor.getAccessibleContext();
}
return null;
}
@@ -1693,7 +1692,7 @@
if (i < 0 || i > 1) {
return false;
}
- Object o = null;
+ Object o;
if (i == 0) {
o = getNextValue(); // AccessibleAction.INCREMENT
} else {
--- a/jdk/src/share/classes/javax/swing/JTabbedPane.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/JTabbedPane.java Wed Jul 05 16:42:37 2017 +0200
@@ -313,8 +313,7 @@
* @since 1.4
*/
public ChangeListener[] getChangeListeners() {
- return (ChangeListener[])listenerList.getListeners(
- ChangeListener.class);
+ return listenerList.getListeners(ChangeListener.class);
}
/**
@@ -2062,7 +2061,7 @@
* Accessibility classes unnecessarily.
*/
AccessibleContext ac;
- ac = ((Accessible) component).getAccessibleContext();
+ ac = component.getAccessibleContext();
if (ac != null) {
ac.setAccessibleParent(this);
}
--- a/jdk/src/share/classes/javax/swing/JTable.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/JTable.java Wed Jul 05 16:42:37 2017 +0200
@@ -1677,16 +1677,16 @@
if (!forDrop && state != null) {
clearSelection();
- int[] rows = (int[])((int[][])state)[0];
- int[] cols = (int[])((int[][])state)[1];
- int[] anchleads = (int[])((int[][])state)[2];
-
- for (int i = 0; i < rows.length; i++) {
- addRowSelectionInterval(rows[i], rows[i]);
+ int[] rows = ((int[][])state)[0];
+ int[] cols = ((int[][])state)[1];
+ int[] anchleads = ((int[][])state)[2];
+
+ for (int row : rows) {
+ addRowSelectionInterval(row, row);
}
- for (int i = 0; i < cols.length; i++) {
- addColumnSelectionInterval(cols[i], cols[i]);
+ for (int col : cols) {
+ addColumnSelectionInterval(col, col);
}
SwingUtilities2.setLeadAnchorWithoutSelection(
@@ -1776,7 +1776,7 @@
boolean oldValue = this.autoCreateRowSorter;
this.autoCreateRowSorter = autoCreateRowSorter;
if (autoCreateRowSorter) {
- setRowSorter(new TableRowSorter(getModel()));
+ setRowSorter(new TableRowSorter<TableModel>(getModel()));
}
firePropertyChange("autoCreateRowSorter", oldValue,
autoCreateRowSorter);
@@ -3198,7 +3198,7 @@
private void accommodateDelta(int resizingColumnIndex, int delta) {
int columnCount = getColumnCount();
int from = resizingColumnIndex;
- int to = columnCount;
+ int to;
// Use the mode to determine how to absorb the changes.
switch(autoResizeMode) {
@@ -3237,8 +3237,6 @@
}
adjustSizes(totalWidth + delta, r, false);
-
- return;
}
private interface Resizable2 {
@@ -3492,7 +3490,7 @@
* @see #editingRow
*/
public boolean isEditing() {
- return (cellEditor == null)? false : true;
+ return cellEditor != null;
}
/**
@@ -3642,7 +3640,7 @@
firePropertyChange("model", old, dataModel);
if (getAutoCreateRowSorter()) {
- setRowSorter(new TableRowSorter(dataModel));
+ setRowSorter(new TableRowSorter<TableModel>(dataModel));
}
}
}
@@ -5160,7 +5158,7 @@
public boolean getScrollableTracksViewportHeight() {
return getFillsViewportHeight()
&& getParent() instanceof JViewport
- && (((JViewport)getParent()).getHeight() > getPreferredSize().height);
+ && (getParent().getHeight() > getPreferredSize().height);
}
/**
@@ -5214,7 +5212,7 @@
// by setting the client property JTable.autoStartsEdit to Boolean.FALSE.
if (!retValue && condition == WHEN_ANCESTOR_OF_FOCUSED_COMPONENT &&
isFocusOwner() &&
- !Boolean.FALSE.equals((Boolean)getClientProperty("JTable.autoStartsEdit"))) {
+ !Boolean.FALSE.equals(getClientProperty("JTable.autoStartsEdit"))) {
// We do not have a binding for the event.
Component editorComponent = getEditorComponent();
if (editorComponent == null) {
@@ -5436,7 +5434,7 @@
this.value = null;
((JComponent)getComponent()).setBorder(new LineBorder(Color.black));
try {
- Class type = table.getColumnClass(column);
+ Class<?> type = table.getColumnClass(column);
// Since our obligation is to produce a value which is
// assignable for the required type it is OK to use the
// String constructor for columns which are declared
@@ -6627,10 +6625,10 @@
} else if (name.compareTo("tableCellEditor") == 0) {
if (oldValue != null && oldValue instanceof TableCellEditor) {
- ((TableCellEditor) oldValue).removeCellEditorListener((CellEditorListener) this);
+ ((TableCellEditor) oldValue).removeCellEditorListener(this);
}
if (newValue != null && newValue instanceof TableCellEditor) {
- ((TableCellEditor) newValue).addCellEditorListener((CellEditorListener) this);
+ ((TableCellEditor) newValue).addCellEditorListener(this);
}
}
}
@@ -7045,7 +7043,7 @@
*/
public Accessible getAccessibleSelection(int i) {
if (i < 0 || i > getAccessibleSelectionCount()) {
- return (Accessible) null;
+ return null;
}
int rowsSel = JTable.this.getSelectedRowCount();
@@ -7158,7 +7156,7 @@
return getAccessibleChild((r * ttlCols) + c);
}
}
- return (Accessible) null;
+ return null;
}
/**
@@ -7906,7 +7904,7 @@
JTable.this, getValueAt(row, column),
false, false, row, column);
if (component instanceof Accessible) {
- return ((Accessible) component).getAccessibleContext();
+ return component.getAccessibleContext();
} else {
return null;
}
--- a/jdk/src/share/classes/javax/swing/JTextField.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/JTextField.java Wed Jul 05 16:42:37 2017 +0200
@@ -475,8 +475,7 @@
* @since 1.4
*/
public synchronized ActionListener[] getActionListeners() {
- return (ActionListener[])listenerList.getListeners(
- ActionListener.class);
+ return listenerList.getListeners(ActionListener.class);
}
/**
--- a/jdk/src/share/classes/javax/swing/JTree.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/JTree.java Wed Jul 05 16:42:37 2017 +0200
@@ -187,7 +187,7 @@
* information must be determined by visiting all the parent
* paths and seeing if they are visible.
*/
- transient private Hashtable expandedState;
+ transient private Hashtable<TreePath, Boolean> expandedState;
/**
@@ -281,7 +281,7 @@
* Used when <code>setExpandedState</code> is invoked,
* will be a <code>Stack</code> of <code>Stack</code>s.
*/
- transient private Stack expandedStack;
+ transient private Stack<Stack<TreePath>> expandedStack;
/**
* Lead selection path, may not be <code>null</code>.
@@ -652,9 +652,9 @@
@ConstructorProperties({"model"})
public JTree(TreeModel newModel) {
super();
- expandedStack = new Stack();
+ expandedStack = new Stack<Stack<TreePath>>();
toggleClickCount = 2;
- expandedState = new Hashtable();
+ expandedState = new Hashtable<TreePath, Boolean>();
setLayout(null);
rowHeight = 16;
visibleRowCount = 20;
@@ -691,7 +691,7 @@
* description: The UI object that implements the Component's LookAndFeel.
*/
public void setUI(TreeUI ui) {
- if ((TreeUI)this.ui != ui) {
+ if (this.ui != ui) {
settingUI = true;
uiTreeExpansionListener = null;
try {
@@ -1298,8 +1298,8 @@
Object root = (model == null) ? null : model.getRoot();
TreePath rootPath = (root == null) ? null : new TreePath(root);
- TreePath child = null;
- TreePath parent = null;
+ TreePath child;
+ TreePath parent;
boolean outside = row == -1
|| p.y < bounds.y
|| p.y >= bounds.y + bounds.height;
@@ -1940,14 +1940,14 @@
if(!isExpanded(parent))
return null;
- Enumeration toggledPaths = expandedState.keys();
- Vector elements = null;
+ Enumeration<TreePath> toggledPaths = expandedState.keys();
+ Vector<TreePath> elements = null;
TreePath path;
Object value;
if(toggledPaths != null) {
while(toggledPaths.hasMoreElements()) {
- path = (TreePath)toggledPaths.nextElement();
+ path = toggledPaths.nextElement();
value = expandedState.get(path);
// Add the path if it is expanded, a descendant of parent,
// and it is visible (all parents expanded). This is rather
@@ -1956,7 +1956,7 @@
((Boolean)value).booleanValue() &&
parent.isDescendant(path) && isVisible(path)) {
if (elements == null) {
- elements = new Vector();
+ elements = new Vector<TreePath>();
}
elements.addElement(path);
}
@@ -1990,9 +1990,9 @@
return false;
// Is this node expanded?
- Object value = expandedState.get(path);
-
- if(value == null || !((Boolean)value).booleanValue())
+ Boolean value = expandedState.get(path);
+
+ if(value == null || !value.booleanValue())
return false;
// It is, make sure its parent is also expanded.
@@ -2018,7 +2018,7 @@
TreePath path = tree.getPathForRow(this, row);
if(path != null) {
- Boolean value = (Boolean)expandedState.get(path);
+ Boolean value = expandedState.get(path);
return (value != null && value.booleanValue());
}
@@ -2704,8 +2704,7 @@
* @since 1.4
*/
public TreeExpansionListener[] getTreeExpansionListeners() {
- return (TreeExpansionListener[])listenerList.getListeners(
- TreeExpansionListener.class);
+ return listenerList.getListeners(TreeExpansionListener.class);
}
/**
@@ -2737,8 +2736,7 @@
* @since 1.4
*/
public TreeWillExpandListener[] getTreeWillExpandListeners() {
- return (TreeWillExpandListener[])listenerList.getListeners(
- TreeWillExpandListener.class);
+ return listenerList.getListeners(TreeWillExpandListener.class);
}
/**
@@ -2895,8 +2893,7 @@
* @since 1.4
*/
public TreeSelectionListener[] getTreeSelectionListeners() {
- return (TreeSelectionListener[])listenerList.getListeners(
- TreeSelectionListener.class);
+ return listenerList.getListeners(TreeSelectionListener.class);
}
/**
@@ -3030,7 +3027,7 @@
// Serialization support.
private void writeObject(ObjectOutputStream s) throws IOException {
- Vector values = new Vector();
+ Vector<Object> values = new Vector<Object>();
s.defaultWriteObject();
// Save the cellRenderer, if its Serializable.
@@ -3077,9 +3074,9 @@
// Create an instance of expanded state.
- expandedState = new Hashtable();
-
- expandedStack = new Stack();
+ expandedState = new Hashtable<TreePath, Boolean>();
+
+ expandedStack = new Stack<Stack<TreePath>>();
Vector values = (Vector)s.readObject();
int indexCounter = 0;
@@ -3132,13 +3129,13 @@
TreeModel model = getModel();
if(model != null) {
- Enumeration paths = expandedState.keys();
+ Enumeration<TreePath> paths = expandedState.keys();
if(paths != null) {
- Vector state = new Vector();
+ Vector<Object> state = new Vector<Object>();
while(paths.hasMoreElements()) {
- TreePath path = (TreePath)paths.nextElement();
+ TreePath path = paths.nextElement();
Object archivePath;
try {
@@ -3502,7 +3499,7 @@
*/
public boolean getScrollableTracksViewportWidth() {
if (getParent() instanceof JViewport) {
- return (((JViewport)getParent()).getWidth() > getPreferredSize().width);
+ return getParent().getWidth() > getPreferredSize().width;
}
return false;
}
@@ -3518,7 +3515,7 @@
*/
public boolean getScrollableTracksViewportHeight() {
if (getParent() instanceof JViewport) {
- return (((JViewport)getParent()).getHeight() > getPreferredSize().height);
+ return getParent().getHeight() > getPreferredSize().height;
}
return false;
}
@@ -3535,14 +3532,14 @@
protected void setExpandedState(TreePath path, boolean state) {
if(path != null) {
// Make sure all parents of path are expanded.
- Stack stack;
- TreePath parentPath = path.getParentPath();
+ Stack<TreePath> stack;
+ TreePath parentPath = path.getParentPath();
if (expandedStack.size() == 0) {
- stack = new Stack();
+ stack = new Stack<TreePath>();
}
else {
- stack = (Stack)expandedStack.pop();
+ stack = expandedStack.pop();
}
try {
@@ -3556,7 +3553,7 @@
}
}
for(int counter = stack.size() - 1; counter >= 0; counter--) {
- parentPath = (TreePath)stack.pop();
+ parentPath = stack.pop();
if(!isExpanded(parentPath)) {
try {
fireTreeWillExpand(parentPath);
@@ -3636,12 +3633,11 @@
if(parent == null)
return null;
- Vector descendants = new Vector();
- Enumeration nodes = expandedState.keys();
- TreePath path;
+ Vector<TreePath> descendants = new Vector<TreePath>();
+ Enumeration<TreePath> nodes = expandedState.keys();
while(nodes.hasMoreElements()) {
- path = (TreePath)nodes.nextElement();
+ TreePath path = nodes.nextElement();
if(parent.isDescendant(path))
descendants.addElement(path);
}
@@ -3664,8 +3660,8 @@
{
if(toRemove != null) {
while(toRemove.hasMoreElements()) {
- Enumeration descendants = getDescendantToggledPaths
- ((TreePath)toRemove.nextElement());
+ Enumeration descendants = getDescendantToggledPaths
+ (toRemove.nextElement());
if(descendants != null) {
while(descendants.hasMoreElements()) {
@@ -4250,7 +4246,7 @@
private AccessibleContext getCurrentAccessibleContext() {
Component c = getCurrentComponent();
if (c instanceof Accessible) {
- return (((Accessible) c).getAccessibleContext());
+ return c.getAccessibleContext();
} else {
return null;
}
@@ -4573,7 +4569,7 @@
private AccessibleContext getCurrentAccessibleContext() {
Component c = getCurrentComponent();
if (c instanceof Accessible) {
- return (((Accessible) c).getAccessibleContext());
+ return c.getAccessibleContext();
} else {
return null;
}
@@ -5117,12 +5113,8 @@
public boolean isVisible() {
Rectangle pathBounds = tree.getPathBounds(path);
Rectangle parentBounds = tree.getVisibleRect();
- if (pathBounds != null && parentBounds != null &&
- parentBounds.intersects(pathBounds)) {
- return true;
- } else {
- return false;
- }
+ return pathBounds != null && parentBounds != null &&
+ parentBounds.intersects(pathBounds);
}
public void setVisible(boolean b) {
--- a/jdk/src/share/classes/javax/swing/JViewport.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/JViewport.java Wed Jul 05 16:42:37 2017 +0200
@@ -389,7 +389,7 @@
// could be bigger than invalid size.
validateView();
}
- int dx = 0, dy = 0;
+ int dx, dy;
dx = positionAdjustment(getWidth(), contentRect.width, contentRect.x);
dy = positionAdjustment(getHeight(), contentRect.height, contentRect.y);
@@ -682,10 +682,7 @@
* @see JComponent#isPaintingOrigin()
*/
boolean isPaintingOrigin() {
- if (scrollMode == BACKINGSTORE_SCROLL_MODE) {
- return true;
- }
- return false;
+ return scrollMode == BACKINGSTORE_SCROLL_MODE;
}
@@ -903,11 +900,7 @@
*/
public void setScrollMode(int mode) {
scrollMode = mode;
- if (mode == BACKINGSTORE_SCROLL_MODE) {
- backingStore = true;
- } else {
- backingStore = false;
- }
+ backingStore = mode == BACKINGSTORE_SCROLL_MODE;
}
/**
@@ -958,10 +951,10 @@
}
}
- private final boolean isBlitting() {
+ private boolean isBlitting() {
Component view = getView();
return (scrollMode == BLIT_SCROLL_MODE) &&
- (view instanceof JComponent) && ((JComponent)view).isOpaque();
+ (view instanceof JComponent) && view.isOpaque();
}
@@ -1380,8 +1373,7 @@
* @since 1.4
*/
public ChangeListener[] getChangeListeners() {
- return (ChangeListener[])listenerList.getListeners(
- ChangeListener.class);
+ return listenerList.getListeners(ChangeListener.class);
}
/**
--- a/jdk/src/share/classes/javax/swing/JWindow.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/JWindow.java Wed Jul 05 16:42:37 2017 +0200
@@ -185,7 +185,7 @@
super(owner == null? SwingUtilities.getSharedOwnerFrame() : owner);
if (owner == null) {
WindowListener ownerShutdownListener =
- (WindowListener)SwingUtilities.getSharedOwnerFrameShutdownListener();
+ SwingUtilities.getSharedOwnerFrameShutdownListener();
addWindowListener(ownerShutdownListener);
}
windowInit();
@@ -212,7 +212,7 @@
owner);
if (owner == null) {
WindowListener ownerShutdownListener =
- (WindowListener)SwingUtilities.getSharedOwnerFrameShutdownListener();
+ SwingUtilities.getSharedOwnerFrameShutdownListener();
addWindowListener(ownerShutdownListener);
}
windowInit();
@@ -250,7 +250,7 @@
owner, gc);
if (owner == null) {
WindowListener ownerShutdownListener =
- (WindowListener)SwingUtilities.getSharedOwnerFrameShutdownListener();
+ SwingUtilities.getSharedOwnerFrameShutdownListener();
addWindowListener(ownerShutdownListener);
}
windowInit();
--- a/jdk/src/share/classes/javax/swing/KeyboardManager.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/KeyboardManager.java Wed Jul 05 16:42:37 2017 +0200
@@ -68,13 +68,13 @@
/**
* maps top-level containers to a sub-hashtable full of keystrokes
*/
- Hashtable containerMap = new Hashtable();
+ Hashtable<Container, Hashtable> containerMap = new Hashtable<Container, Hashtable>();
/**
* Maps component/keystroke pairs to a topLevel container
* This is mainly used for fast unregister operations
*/
- Hashtable componentKeyStrokeMap = new Hashtable();
+ Hashtable<ComponentKeyStrokePair, Container> componentKeyStrokeMap = new Hashtable<ComponentKeyStrokePair, Container>();
public static KeyboardManager getCurrentManager() {
return currentManager;
@@ -95,7 +95,7 @@
if (topContainer == null) {
return;
}
- Hashtable keyMap = (Hashtable)containerMap.get(topContainer);
+ Hashtable keyMap = containerMap.get(topContainer);
if (keyMap == null) { // lazy evaluate one
keyMap = registerNewTopContainer(topContainer);
@@ -114,8 +114,8 @@
// Then add the old compoennt and the new compoent to the vector
// then insert the vector in the table
if (tmp != c) { // this means this is already registered for this component, no need to dup
- Vector v = new Vector();
- v.addElement(tmp);
+ Vector<JComponent> v = new Vector<JComponent>();
+ v.addElement((JComponent) tmp);
v.addElement(c);
keyMap.put(k, v);
}
@@ -154,13 +154,13 @@
ComponentKeyStrokePair ckp = new ComponentKeyStrokePair(c,ks);
- Object topContainer = componentKeyStrokeMap.get(ckp);
+ Container topContainer = componentKeyStrokeMap.get(ckp);
if (topContainer == null) { // never heard of this pairing, so bail
return;
}
- Hashtable keyMap = (Hashtable)containerMap.get(topContainer);
+ Hashtable keyMap = containerMap.get(topContainer);
if (keyMap == null) { // this should never happen, but I'm being safe
Thread.dumpStack();
return;
@@ -221,7 +221,7 @@
ks=KeyStroke.getKeyStroke(e.getKeyCode(), e.getModifiers(), !pressed);
}
- Hashtable keyMap = (Hashtable)containerMap.get(topAncestor);
+ Hashtable keyMap = containerMap.get(topAncestor);
if (keyMap != null) { // this container isn't registered, so bail
Object tmp = keyMap.get(ks);
@@ -293,7 +293,7 @@
if (top == null) {
return;
}
- Hashtable keyMap = (Hashtable)containerMap.get(top);
+ Hashtable keyMap = containerMap.get(top);
if (keyMap == null) { // lazy evaluate one
keyMap = registerNewTopContainer(top);
@@ -314,11 +314,11 @@
public void unregisterMenuBar(JMenuBar mb) {
- Object topContainer = getTopAncestor(mb);
+ Container topContainer = getTopAncestor(mb);
if (topContainer == null) {
return;
}
- Hashtable keyMap = (Hashtable)containerMap.get(topContainer);
+ Hashtable keyMap = containerMap.get(topContainer);
if (keyMap!=null) {
Vector v = (Vector)keyMap.get(JMenuBar.class);
if (v != null) {
--- a/jdk/src/share/classes/javax/swing/LayoutComparator.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/LayoutComparator.java Wed Jul 05 16:42:37 2017 +0200
@@ -39,7 +39,7 @@
*
* @author David Mendenhall
*/
-final class LayoutComparator implements Comparator, java.io.Serializable {
+final class LayoutComparator implements Comparator<Component>, java.io.Serializable {
private static final int ROW_TOLERANCE = 10;
@@ -51,10 +51,7 @@
leftToRight = orientation.isLeftToRight();
}
- public int compare(Object o1, Object o2) {
- Component a = (Component)o1;
- Component b = (Component)o2;
-
+ public int compare(Component a, Component b) {
if (a == b) {
return 0;
}
@@ -65,9 +62,9 @@
// each Component and then search from the Window down until the
// hierarchy branches.
if (a.getParent() != b.getParent()) {
- LinkedList aAncestory, bAncestory;
+ LinkedList<Component> aAncestory = new LinkedList<Component>();
- for(aAncestory = new LinkedList(); a != null; a = a.getParent()) {
+ for(; a != null; a = a.getParent()) {
aAncestory.add(a);
if (a instanceof Window) {
break;
@@ -78,7 +75,9 @@
throw new ClassCastException();
}
- for(bAncestory = new LinkedList(); b != null; b = b.getParent()) {
+ LinkedList<Component> bAncestory = new LinkedList<Component>();
+
+ for(; b != null; b = b.getParent()) {
bAncestory.add(b);
if (b instanceof Window) {
break;
@@ -89,18 +88,18 @@
throw new ClassCastException();
}
- for (ListIterator
+ for (ListIterator<Component>
aIter = aAncestory.listIterator(aAncestory.size()),
bIter = bAncestory.listIterator(bAncestory.size()); ;) {
if (aIter.hasPrevious()) {
- a = (Component)aIter.previous();
+ a = aIter.previous();
} else {
// a is an ancestor of b
return -1;
}
if (bIter.hasPrevious()) {
- b = (Component)bIter.previous();
+ b = bIter.previous();
} else {
// b is an ancestor of a
return 1;
--- a/jdk/src/share/classes/javax/swing/LayoutFocusTraversalPolicy.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/LayoutFocusTraversalPolicy.java Wed Jul 05 16:42:37 2017 +0200
@@ -65,7 +65,7 @@
* Constructs a LayoutFocusTraversalPolicy with the passed in
* <code>Comparator</code>.
*/
- LayoutFocusTraversalPolicy(Comparator c) {
+ LayoutFocusTraversalPolicy(Comparator<? super Component> c) {
super(c);
}
--- a/jdk/src/share/classes/javax/swing/LegacyGlueFocusTraversalPolicy.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/LegacyGlueFocusTraversalPolicy.java Wed Jul 05 16:42:37 2017 +0200
@@ -48,8 +48,8 @@
private transient FocusTraversalPolicy delegatePolicy;
private transient DefaultFocusManager delegateManager;
- private HashMap forwardMap = new HashMap(),
- backwardMap = new HashMap();
+ private HashMap<Component, Component> forwardMap = new HashMap<Component, Component>(),
+ backwardMap = new HashMap<Component, Component>();
LegacyGlueFocusTraversalPolicy(FocusTraversalPolicy delegatePolicy) {
this.delegatePolicy = delegatePolicy;
@@ -70,11 +70,11 @@
public Component getComponentAfter(Container focusCycleRoot,
Component aComponent) {
Component hardCoded = aComponent, prevHardCoded;
- HashSet sanity = new HashSet();
+ HashSet<Component> sanity = new HashSet<Component>();
do {
prevHardCoded = hardCoded;
- hardCoded = (Component)forwardMap.get(hardCoded);
+ hardCoded = forwardMap.get(hardCoded);
if (hardCoded == null) {
if (delegatePolicy != null &&
prevHardCoded.isFocusCycleRoot(focusCycleRoot)) {
@@ -99,11 +99,11 @@
public Component getComponentBefore(Container focusCycleRoot,
Component aComponent) {
Component hardCoded = aComponent, prevHardCoded;
- HashSet sanity = new HashSet();
+ HashSet<Component> sanity = new HashSet<Component>();
do {
prevHardCoded = hardCoded;
- hardCoded = (Component)backwardMap.get(hardCoded);
+ hardCoded = backwardMap.get(hardCoded);
if (hardCoded == null) {
if (delegatePolicy != null &&
prevHardCoded.isFocusCycleRoot(focusCycleRoot)) {
--- a/jdk/src/share/classes/javax/swing/MenuSelectionManager.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/MenuSelectionManager.java Wed Jul 05 16:42:37 2017 +0200
@@ -37,7 +37,7 @@
* @author Arnaud Weber
*/
public class MenuSelectionManager {
- private Vector selection = new Vector();
+ private Vector<MenuElement> selection = new Vector<MenuElement>();
/* diagnostic aids -- should be false for production builds. */
private static final boolean TRACE = false; // trace creates and disposes
@@ -100,14 +100,14 @@
}
for(i=0,c=path.length;i<c;i++) {
- if(i < currentSelectionCount && (MenuElement)selection.elementAt(i) == path[i])
+ if (i < currentSelectionCount && selection.elementAt(i) == path[i])
firstDifference++;
else
break;
}
for(i=currentSelectionCount - 1 ; i >= firstDifference ; i--) {
- MenuElement me = (MenuElement)selection.elementAt(i);
+ MenuElement me = selection.elementAt(i);
selection.removeElementAt(i);
me.menuSelectionChanged(false);
}
@@ -131,7 +131,7 @@
MenuElement res[] = new MenuElement[selection.size()];
int i,c;
for(i=0,c=selection.size();i<c;i++)
- res[i] = (MenuElement) selection.elementAt(i);
+ res[i] = selection.elementAt(i);
return res;
}
@@ -172,8 +172,7 @@
* @since 1.4
*/
public ChangeListener[] getChangeListeners() {
- return (ChangeListener[])listenerList.getListeners(
- ChangeListener.class);
+ return listenerList.getListeners(ChangeListener.class);
}
/**
@@ -258,8 +257,8 @@
if(!mc.isShowing())
continue;
if(mc instanceof JComponent) {
- cWidth = ((JComponent)mc).getWidth();
- cHeight = ((JComponent)mc).getHeight();
+ cWidth = mc.getWidth();
+ cHeight = mc.getHeight();
} else {
r2 = mc.getBounds();
cWidth = r2.width;
@@ -338,7 +337,7 @@
for(i=0,j=path.length; i<j ;i++){
for (int k=0; k<=i; k++)
System.out.print(" ");
- MenuElement me = (MenuElement) path[i];
+ MenuElement me = path[i];
if(me instanceof JMenuItem) {
System.out.println(((JMenuItem)me).getText() + ", ");
} else if (me instanceof JMenuBar) {
@@ -399,8 +398,8 @@
if(!mc.isShowing())
continue;
if(mc instanceof JComponent) {
- cWidth = ((JComponent)mc).getWidth();
- cHeight = ((JComponent)mc).getHeight();
+ cWidth = mc.getWidth();
+ cHeight = mc.getHeight();
} else {
r2 = mc.getBounds();
cWidth = r2.width;
@@ -429,7 +428,7 @@
*/
public void processKeyEvent(KeyEvent e) {
MenuElement[] sel2 = new MenuElement[0];
- sel2 = (MenuElement[])selection.toArray(sel2);
+ sel2 = selection.toArray(sel2);
int selSize = sel2.length;
MenuElement[] path;
@@ -474,7 +473,7 @@
*/
public boolean isComponentPartOfCurrentMenu(Component c) {
if(selection.size() > 0) {
- MenuElement me = (MenuElement)selection.elementAt(0);
+ MenuElement me = selection.elementAt(0);
return isComponentPartOfCurrentMenu(me,c);
} else
return false;
--- a/jdk/src/share/classes/javax/swing/MultiUIDefaults.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/MultiUIDefaults.java Wed Jul 05 16:42:37 2017 +0200
@@ -56,8 +56,7 @@
return value;
}
- for(int i = 0; i < tables.length; i++) {
- UIDefaults table = tables[i];
+ for (UIDefaults table : tables) {
value = (table != null) ? table.get(key) : null;
if (value != null) {
return value;
@@ -75,8 +74,7 @@
return value;
}
- for(int i = 0; i < tables.length; i++) {
- UIDefaults table = tables[i];
+ for (UIDefaults table : tables) {
value = (table != null) ? table.get(key,l) : null;
if (value != null) {
return value;
@@ -89,8 +87,7 @@
public int size() {
int n = super.size();
- for(int i = 0; i < tables.length; i++) {
- UIDefaults table = tables[i];
+ for (UIDefaults table : tables) {
n += (table != null) ? table.size() : 0;
}
return n;
@@ -102,7 +99,7 @@
}
- public Enumeration keys()
+ public Enumeration<Object> keys()
{
Enumeration[] enums = new Enumeration[1 + tables.length];
enums[0] = super.keys();
@@ -116,7 +113,7 @@
}
- public Enumeration elements()
+ public Enumeration<Object> elements()
{
Enumeration[] enums = new Enumeration[1 + tables.length];
enums[0] = super.elements();
@@ -137,7 +134,7 @@
}
}
- private static class MultiUIDefaultsEnumerator implements Enumeration
+ private static class MultiUIDefaultsEnumerator implements Enumeration<Object>
{
Enumeration[] enums;
int n = 0;
@@ -175,8 +172,7 @@
return value;
}
- for(int i = 0; i < tables.length; i++) {
- UIDefaults table = tables[i];
+ for (UIDefaults table : tables) {
value = (table != null) ? table.remove(key) : null;
if (value != null) {
return value;
@@ -189,8 +185,7 @@
public void clear() {
super.clear();
- for(int i = 0; i < tables.length; i++) {
- UIDefaults table = tables[i];
+ for (UIDefaults table : tables) {
if (table != null) {
table.clear();
}
--- a/jdk/src/share/classes/javax/swing/PopupFactory.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/PopupFactory.java Wed Jul 05 16:42:37 2017 +0200
@@ -313,9 +313,9 @@
if(contents instanceof JPopupMenu) {
JPopupMenu jpm = (JPopupMenu) contents;
Component popComps[] = jpm.getComponents();
- for(int i=0;i<popComps.length;i++) {
- if(!(popComps[i] instanceof MenuElement) &&
- !(popComps[i] instanceof JSeparator)) {
+ for (Component popComp : popComps) {
+ if (!(popComp instanceof MenuElement) &&
+ !(popComp instanceof JSeparator)) {
focusPopup = true;
break;
}
@@ -357,17 +357,16 @@
*/
private static HeavyWeightPopup getRecycledHeavyWeightPopup(Window w) {
synchronized (HeavyWeightPopup.class) {
- List cache;
- Map heavyPopupCache = getHeavyWeightPopupCache();
+ List<HeavyWeightPopup> cache;
+ Map<Window, List<HeavyWeightPopup>> heavyPopupCache = getHeavyWeightPopupCache();
if (heavyPopupCache.containsKey(w)) {
- cache = (List)heavyPopupCache.get(w);
+ cache = heavyPopupCache.get(w);
} else {
return null;
}
- int c;
- if ((c = cache.size()) > 0) {
- HeavyWeightPopup r = (HeavyWeightPopup)cache.get(0);
+ if (cache.size() > 0) {
+ HeavyWeightPopup r = cache.get(0);
cache.remove(0);
return r;
}
@@ -380,13 +379,13 @@
* <code>Window</code> to a <code>List</code> of
* <code>HeavyWeightPopup</code>s.
*/
- private static Map getHeavyWeightPopupCache() {
+ private static Map<Window, List<HeavyWeightPopup>> getHeavyWeightPopupCache() {
synchronized (HeavyWeightPopup.class) {
- Map cache = (Map)SwingUtilities.appContextGet(
+ Map<Window, List<HeavyWeightPopup>> cache = (Map<Window, List<HeavyWeightPopup>>)SwingUtilities.appContextGet(
heavyWeightPopupCacheKey);
if (cache == null) {
- cache = new HashMap(2);
+ cache = new HashMap<Window, List<HeavyWeightPopup>>(2);
SwingUtilities.appContextPut(heavyWeightPopupCacheKey,
cache);
}
@@ -399,13 +398,13 @@
*/
private static void recycleHeavyWeightPopup(HeavyWeightPopup popup) {
synchronized (HeavyWeightPopup.class) {
- List cache;
- Object window = SwingUtilities.getWindowAncestor(
+ List<HeavyWeightPopup> cache;
+ Window window = SwingUtilities.getWindowAncestor(
popup.getComponent());
- Map heavyPopupCache = getHeavyWeightPopupCache();
+ Map<Window, List<HeavyWeightPopup>> heavyPopupCache = getHeavyWeightPopupCache();
if (window instanceof Popup.DefaultFrame ||
- !((Window)window).isVisible()) {
+ !window.isVisible()) {
// If the Window isn't visible, we don't cache it as we
// likely won't ever get a windowClosed event to clean up.
// We also don't cache DefaultFrames as this indicates
@@ -414,28 +413,27 @@
popup._dispose();
return;
} else if (heavyPopupCache.containsKey(window)) {
- cache = (List)heavyPopupCache.get(window);
+ cache = heavyPopupCache.get(window);
} else {
- cache = new ArrayList();
+ cache = new ArrayList<HeavyWeightPopup>();
heavyPopupCache.put(window, cache);
// Clean up if the Window is closed
- final Window w = (Window)window;
+ final Window w = window;
w.addWindowListener(new WindowAdapter() {
public void windowClosed(WindowEvent e) {
- List popups;
+ List<HeavyWeightPopup> popups;
synchronized(HeavyWeightPopup.class) {
- Map heavyPopupCache2 =
+ Map<Window, List<HeavyWeightPopup>> heavyPopupCache2 =
getHeavyWeightPopupCache();
- popups = (List)heavyPopupCache2.remove(w);
+ popups = heavyPopupCache2.remove(w);
}
if (popups != null) {
for (int counter = popups.size() - 1;
counter >= 0; counter--) {
- ((HeavyWeightPopup)popups.get(counter)).
- _dispose();
+ popups.get(counter)._dispose();
}
}
}
@@ -534,10 +532,9 @@
Window[] ownedWindows = w.getOwnedWindows();
if(ownedWindows != null) {
Rectangle bnd = component.getBounds();
- for(int i=0; i<ownedWindows.length;i++) {
- Window owned = ownedWindows[i];
- if (owned.isVisible() &&
- bnd.intersects(owned.getBounds())) {
+ for (Window window : ownedWindows) {
+ if (window.isVisible() &&
+ bnd.intersects(window.getBounds())) {
return true;
}
@@ -667,11 +664,11 @@
/**
* Returns the cache to use for heavy weight popups.
*/
- private static List getLightWeightPopupCache() {
- List cache = (List)SwingUtilities.appContextGet(
+ private static List<LightWeightPopup> getLightWeightPopupCache() {
+ List<LightWeightPopup> cache = (List<LightWeightPopup>)SwingUtilities.appContextGet(
lightWeightPopupCacheKey);
if (cache == null) {
- cache = new ArrayList();
+ cache = new ArrayList<LightWeightPopup>();
SwingUtilities.appContextPut(lightWeightPopupCacheKey, cache);
}
return cache;
@@ -682,7 +679,7 @@
*/
private static void recycleLightWeightPopup(LightWeightPopup popup) {
synchronized (LightWeightPopup.class) {
- List lightPopupCache = getLightWeightPopupCache();
+ List<LightWeightPopup> lightPopupCache = getLightWeightPopupCache();
if (lightPopupCache.size() < MAX_CACHE_SIZE) {
lightPopupCache.add(popup);
}
@@ -695,11 +692,9 @@
*/
private static LightWeightPopup getRecycledLightWeightPopup() {
synchronized (LightWeightPopup.class) {
- List lightPopupCache = getLightWeightPopupCache();
- int c;
- if((c = lightPopupCache.size()) > 0) {
- LightWeightPopup r = (LightWeightPopup)lightPopupCache.
- get(0);
+ List<LightWeightPopup> lightPopupCache = getLightWeightPopupCache();
+ if (lightPopupCache.size() > 0) {
+ LightWeightPopup r = lightPopupCache.get(0);
lightPopupCache.remove(0);
return r;
}
@@ -755,8 +750,7 @@
component.setLocation(p.x, p.y);
if (parent instanceof JLayeredPane) {
- ((JLayeredPane)parent).add(component,
- JLayeredPane.POPUP_LAYER, 0);
+ parent.add(component, JLayeredPane.POPUP_LAYER, 0);
} else {
parent.add(component);
}
@@ -826,12 +820,12 @@
/**
* Returns the cache to use for medium weight popups.
*/
- private static List getMediumWeightPopupCache() {
- List cache = (List)SwingUtilities.appContextGet(
+ private static List<MediumWeightPopup> getMediumWeightPopupCache() {
+ List<MediumWeightPopup> cache = (List<MediumWeightPopup>)SwingUtilities.appContextGet(
mediumWeightPopupCacheKey);
if (cache == null) {
- cache = new ArrayList();
+ cache = new ArrayList<MediumWeightPopup>();
SwingUtilities.appContextPut(mediumWeightPopupCacheKey, cache);
}
return cache;
@@ -842,7 +836,7 @@
*/
private static void recycleMediumWeightPopup(MediumWeightPopup popup) {
synchronized (MediumWeightPopup.class) {
- List mediumPopupCache = getMediumWeightPopupCache();
+ List<MediumWeightPopup> mediumPopupCache = getMediumWeightPopupCache();
if (mediumPopupCache.size() < MAX_CACHE_SIZE) {
mediumPopupCache.add(popup);
}
@@ -855,12 +849,9 @@
*/
private static MediumWeightPopup getRecycledMediumWeightPopup() {
synchronized (MediumWeightPopup.class) {
- java.util.List mediumPopupCache =
- getMediumWeightPopupCache();
- int c;
- if ((c=mediumPopupCache.size()) > 0) {
- MediumWeightPopup r = (MediumWeightPopup)mediumPopupCache.
- get(0);
+ List<MediumWeightPopup> mediumPopupCache = getMediumWeightPopupCache();
+ if (mediumPopupCache.size() > 0) {
+ MediumWeightPopup r = mediumPopupCache.get(0);
mediumPopupCache.remove(0);
return r;
}
@@ -904,7 +895,7 @@
x, y);
component.setVisible(false);
component.setLocation(p.x, p.y);
- ((JLayeredPane)parent).add(component, JLayeredPane.POPUP_LAYER,
+ parent.add(component, JLayeredPane.POPUP_LAYER,
0);
} else {
Point p = SwingUtilities.convertScreenLocationToParent(parent,
--- a/jdk/src/share/classes/javax/swing/RepaintManager.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/RepaintManager.java Wed Jul 05 16:42:37 2017 +0200
@@ -40,6 +40,8 @@
import sun.java2d.SunGraphicsEnvironment;
import sun.security.action.GetPropertyAction;
+import com.sun.java.swing.SwingUtilities3;
+
/**
* This class manages repaint requests, allowing the number
@@ -303,6 +305,11 @@
*/
public synchronized void addInvalidComponent(JComponent invalidComponent)
{
+ RepaintManager delegate = getDelegate(invalidComponent);
+ if (delegate != null) {
+ delegate.addInvalidComponent(invalidComponent);
+ return;
+ }
Component validateRoot = null;
/* Find the first JComponent ancestor of this component whose
@@ -373,6 +380,11 @@
* @see #addInvalidComponent
*/
public synchronized void removeInvalidComponent(JComponent component) {
+ RepaintManager delegate = getDelegate(component);
+ if (delegate != null) {
+ delegate.removeInvalidComponent(component);
+ return;
+ }
if(invalidComponents != null) {
int index = invalidComponents.indexOf(component);
if(index != -1) {
@@ -464,6 +476,11 @@
*/
public void addDirtyRegion(JComponent c, int x, int y, int w, int h)
{
+ RepaintManager delegate = getDelegate(c);
+ if (delegate != null) {
+ delegate.addDirtyRegion(c, x, y, w, h);
+ return;
+ }
addDirtyRegion0(c, x, y, w, h);
}
@@ -572,7 +589,7 @@
*/
private synchronized boolean extendDirtyRegion(
Component c, int x, int y, int w, int h) {
- Rectangle r = (Rectangle)dirtyComponents.get(c);
+ Rectangle r = dirtyComponents.get(c);
if (r != null) {
// A non-null r implies c is already marked as dirty,
// and that the parent is valid. Therefore we can
@@ -588,9 +605,13 @@
* dirty.
*/
public Rectangle getDirtyRegion(JComponent aComponent) {
- Rectangle r = null;
+ RepaintManager delegate = getDelegate(aComponent);
+ if (delegate != null) {
+ return delegate.getDirtyRegion(aComponent);
+ }
+ Rectangle r;
synchronized(this) {
- r = (Rectangle)dirtyComponents.get(aComponent);
+ r = dirtyComponents.get(aComponent);
}
if(r == null)
return new Rectangle(0,0,0,0);
@@ -603,6 +624,11 @@
* completely painted during the next paintDirtyRegions() call.
*/
public void markCompletelyDirty(JComponent aComponent) {
+ RepaintManager delegate = getDelegate(aComponent);
+ if (delegate != null) {
+ delegate.markCompletelyDirty(aComponent);
+ return;
+ }
addDirtyRegion(aComponent,0,0,Integer.MAX_VALUE,Integer.MAX_VALUE);
}
@@ -611,6 +637,11 @@
* get painted during the next paintDirtyRegions() call.
*/
public void markCompletelyClean(JComponent aComponent) {
+ RepaintManager delegate = getDelegate(aComponent);
+ if (delegate != null) {
+ delegate.markCompletelyClean(aComponent);
+ return;
+ }
synchronized(this) {
dirtyComponents.remove(aComponent);
}
@@ -623,6 +654,10 @@
* if it return true.
*/
public boolean isCompletelyDirty(JComponent aComponent) {
+ RepaintManager delegate = getDelegate(aComponent);
+ if (delegate != null) {
+ return delegate.isCompletelyDirty(aComponent);
+ }
Rectangle r;
r = getDirtyRegion(aComponent);
@@ -710,8 +745,8 @@
Rectangle rect;
int localBoundsX = 0;
int localBoundsY = 0;
- int localBoundsH = 0;
- int localBoundsW = 0;
+ int localBoundsH;
+ int localBoundsW;
Enumeration keys;
roots = new ArrayList<Component>(count);
@@ -818,7 +853,7 @@
dx = rootDx = 0;
dy = rootDy = 0;
- tmp.setBounds((Rectangle) dirtyComponents.get(dirtyComponent));
+ tmp.setBounds(dirtyComponents.get(dirtyComponent));
// System.out.println("Collect dirty component for bound " + tmp +
// "component bounds is " + cBounds);;
@@ -865,7 +900,7 @@
Rectangle r;
tmp.setLocation(tmp.x + rootDx - dx,
tmp.y + rootDy - dy);
- r = (Rectangle)dirtyComponents.get(rootDirtyComponent);
+ r = dirtyComponents.get(rootDirtyComponent);
SwingUtilities.computeUnion(tmp.x,tmp.y,tmp.width,tmp.height,r);
}
@@ -900,6 +935,10 @@
* repaint manager.
*/
public Image getOffscreenBuffer(Component c,int proposedWidth,int proposedHeight) {
+ RepaintManager delegate = getDelegate(c);
+ if (delegate != null) {
+ return delegate.getOffscreenBuffer(c, proposedWidth, proposedHeight);
+ }
return _getOffscreenBuffer(c, proposedWidth, proposedHeight);
}
@@ -917,6 +956,11 @@
*/
public Image getVolatileOffscreenBuffer(Component c,
int proposedWidth,int proposedHeight) {
+ RepaintManager delegate = getDelegate(c);
+ if (delegate != null) {
+ return delegate.getVolatileOffscreenBuffer(c, proposedWidth,
+ proposedHeight);
+ }
GraphicsConfiguration config = c.getGraphicsConfiguration();
if (config == null) {
config = GraphicsEnvironment.getLocalGraphicsEnvironment().
@@ -941,7 +985,7 @@
private Image _getOffscreenBuffer(Component c, int proposedWidth, int proposedHeight) {
Dimension maxSize = getDoubleBufferMaximumSize();
- DoubleBufferInfo doubleBuffer = null;
+ DoubleBufferInfo doubleBuffer;
int width, height;
if (standardDoubleBuffer == null) {
@@ -1010,7 +1054,7 @@
Iterator gcs = volatileMap.keySet().iterator();
while (gcs.hasNext()) {
GraphicsConfiguration gc = (GraphicsConfiguration)gcs.next();
- VolatileImage image = (VolatileImage)volatileMap.get(gc);
+ VolatileImage image = volatileMap.get(gc);
if (image.getWidth() > width || image.getHeight() > height) {
image.flush();
gcs.remove();
@@ -1178,7 +1222,7 @@
*/
void beginPaint() {
boolean multiThreadedPaint = false;
- int paintDepth = 0;
+ int paintDepth;
Thread currentThread = Thread.currentThread();
synchronized(this) {
paintDepth = this.paintDepth;
@@ -1550,4 +1594,11 @@
prePaintDirtyRegions();
}
}
+ private RepaintManager getDelegate(Component c) {
+ RepaintManager delegate = SwingUtilities3.getDelegateRepaintManager(c);
+ if (this == delegate) {
+ delegate = null;
+ }
+ return delegate;
+ }
}
--- a/jdk/src/share/classes/javax/swing/SortingFocusTraversalPolicy.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/SortingFocusTraversalPolicy.java Wed Jul 05 16:42:37 2017 +0200
@@ -79,7 +79,7 @@
* sorted list should be reused if possible.
*/
transient private Container cachedRoot;
- transient private List cachedCycle;
+ transient private List<Component> cachedCycle;
// Delegate our fitness test to ContainerOrder so that we only have to
// code the algorithm once.
@@ -111,7 +111,7 @@
return cycle;
}
private int getComponentIndex(List<Component> cycle, Component aComponent) {
- int index = 0;
+ int index;
try {
index = Collections.binarySearch(cycle, aComponent, comparator);
} catch (ClassCastException e) {
@@ -130,14 +130,14 @@
return index;
}
- private void enumerateAndSortCycle(Container focusCycleRoot, List cycle) {
+ private void enumerateAndSortCycle(Container focusCycleRoot, List<Component> cycle) {
if (focusCycleRoot.isShowing()) {
enumerateCycle(focusCycleRoot, cycle);
Collections.sort(cycle, comparator);
}
}
- private void enumerateCycle(Container container, List cycle) {
+ private void enumerateCycle(Container container, List<Component> cycle) {
if (!(container.isVisible() && container.isDisplayable())) {
return;
}
@@ -145,8 +145,7 @@
cycle.add(container);
Component[] components = container.getComponents();
- for (int i = 0; i < components.length; i++) {
- Component comp = components[i];
+ for (Component comp : components) {
if (comp instanceof Container) {
Container cont = (Container)comp;
@@ -385,8 +384,8 @@
return getLastComponent(aContainer);
}
- Component comp = null;
- Component tryComp = null;
+ Component comp;
+ Component tryComp;
for (index--; index>=0; index--) {
comp = cycle.get(index);
@@ -442,8 +441,7 @@
}
if (log.isLoggable(Level.FINE)) log.fine("### Cycle is " + cycle);
- for (int i = 0; i < cycle.size(); i++) {
- Component comp = cycle.get(i);
+ for (Component comp : cycle) {
if (accept(comp)) {
return comp;
} else if (comp instanceof Container && comp != aContainer) {
--- a/jdk/src/share/classes/javax/swing/SpringLayout.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/SpringLayout.java Wed Jul 05 16:42:37 2017 +0200
@@ -185,11 +185,11 @@
* @since 1.4
*/
public class SpringLayout implements LayoutManager2 {
- private Map componentConstraints = new HashMap();
+ private Map<Component, Constraints> componentConstraints = new HashMap<Component, Constraints>();
private Spring cyclicReference = Spring.constant(Spring.UNSET);
- private Set cyclicSprings;
- private Set acyclicSprings;
+ private Set<Spring> cyclicSprings;
+ private Set<Spring> acyclicSprings;
/**
@@ -415,8 +415,7 @@
}
if (!valid) {
String[] all = horizontal ? ALL_HORIZONTAL : ALL_VERTICAL;
- for (int i = 0; i < all.length; i++) {
- String s = all[i];
+ for (String s : all) {
if (!history.contains(s)) {
setConstraint(s, null);
}
@@ -822,8 +821,7 @@
/*pp*/ void reset() {
Spring[] allSprings = {x, y, width, height, east, south,
horizontalCenter, verticalCenter, baseline};
- for (int i = 0; i < allSprings.length; i++) {
- Spring s = allSprings[i];
+ for (Spring s : allSprings) {
if (s != null) {
s.setValue(Spring.UNSET);
}
@@ -881,8 +879,8 @@
public SpringLayout() {}
private void resetCyclicStatuses() {
- cyclicSprings = new HashSet();
- acyclicSprings = new HashSet();
+ cyclicSprings = new HashSet<Spring>();
+ acyclicSprings = new HashSet<Spring>();
}
private void setParent(Container p) {
@@ -1145,7 +1143,7 @@
* @return the constraints for the specified component
*/
public Constraints getConstraints(Component c) {
- Constraints result = (Constraints)componentConstraints.get(c);
+ Constraints result = componentConstraints.get(c);
if (result == null) {
if (c instanceof javax.swing.JComponent) {
Object cp = ((javax.swing.JComponent)c).getClientProperty(SpringLayout.class);
--- a/jdk/src/share/classes/javax/swing/SwingUtilities.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/SwingUtilities.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
@@ -108,11 +108,8 @@
* Return true if <code>a</code> contains <code>b</code>
*/
public static final boolean isRectangleContainingRectangle(Rectangle a,Rectangle b) {
- if (b.x >= a.x && (b.x + b.width) <= (a.x + a.width) &&
- b.y >= a.y && (b.y + b.height) <= (a.y + a.height)) {
- return true;
- }
- return false;
+ return b.x >= a.x && (b.x + b.width) <= (a.x + a.width) &&
+ b.y >= a.y && (b.y + b.height) <= (a.y + a.height);
}
/**
@@ -272,8 +269,7 @@
}
if (parent instanceof Container) {
Component components[] = ((Container)parent).getComponents();
- for (int i = 0 ; i < components.length ; i++) {
- Component comp = components[i];
+ for (Component comp : components) {
if (comp != null && comp.isVisible()) {
Point loc = comp.getLocation();
if (comp instanceof Container) {
@@ -376,8 +372,8 @@
do {
if(c instanceof JComponent) {
- x = ((JComponent)c).getX();
- y = ((JComponent)c).getY();
+ x = c.getX();
+ y = c.getY();
} else if(c instanceof java.applet.Applet ||
c instanceof java.awt.Window) {
try {
@@ -415,8 +411,8 @@
do {
if(c instanceof JComponent) {
- x = ((JComponent)c).getX();
- y = ((JComponent)c).getY();
+ x = c.getX();
+ y = c.getY();
} else if(c instanceof java.applet.Applet ||
c instanceof java.awt.Window) {
try {
@@ -974,12 +970,13 @@
boolean textIsEmpty = (text == null) || text.equals("");
int lsb = 0;
+ int rsb = 0;
/* Unless both text and icon are non-null, we effectively ignore
* the value of textIconGap.
*/
int gap;
- View v = null;
+ View v;
if (textIsEmpty) {
textR.width = textR.height = 0;
text = "";
@@ -1015,7 +1012,7 @@
if (lsb < 0) {
textR.width -= lsb;
}
- int rsb = SwingUtilities2.getRightSideBearing(c, fm, text);
+ rsb = SwingUtilities2.getRightSideBearing(c, fm, text);
if (rsb > 0) {
textR.width += rsb;
}
@@ -1118,6 +1115,11 @@
// lsb is negative. Shift the x location so that the text is
// visually drawn at the right location.
textR.x -= lsb;
+
+ textR.width += lsb;
+ }
+ if (rsb > 0) {
+ textR.width -= rsb;
}
return text;
@@ -1242,8 +1244,8 @@
children = ((Container)c).getComponents();
}
if (children != null) {
- for(int i = 0; i < children.length; i++) {
- updateComponentTreeUI0(children[i]);
+ for (Component child : children) {
+ updateComponentTreeUI0(child);
}
}
}
@@ -1696,7 +1698,7 @@
*/
public static void replaceUIActionMap(JComponent component,
ActionMap uiActionMap) {
- ActionMap map = component.getActionMap((uiActionMap != null));;
+ ActionMap map = component.getActionMap((uiActionMap != null));
while (map != null) {
ActionMap parent = map.getParent();
@@ -1764,8 +1766,7 @@
*/
void installListeners() {
Window[] windows = getOwnedWindows();
- for (int ind = 0; ind < windows.length; ind++){
- Window window = windows[ind];
+ for (Window window : windows) {
if (window != null) {
window.removeWindowListener(this);
window.addWindowListener(this);
@@ -1780,8 +1781,7 @@
public void windowClosed(WindowEvent e) {
synchronized(getTreeLock()) {
Window[] windows = getOwnedWindows();
- for (int ind = 0; ind < windows.length; ind++) {
- Window window = windows[ind];
+ for (Window window : windows) {
if (window != null) {
if (window.isDisplayable()) {
return;
@@ -1869,7 +1869,7 @@
}
- static Class loadSystemClass(String className) throws ClassNotFoundException {
+ static Class<?> loadSystemClass(String className) throws ClassNotFoundException {
return Class.forName(className, true, Thread.currentThread().
getContextClassLoader());
}
--- a/jdk/src/share/classes/javax/swing/Timer.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/Timer.java Wed Jul 05 16:42:37 2017 +0200
@@ -270,8 +270,7 @@
* @since 1.4
*/
public ActionListener[] getActionListeners() {
- return (ActionListener[])listenerList.getListeners(
- ActionListener.class);
+ return listenerList.getListeners(ActionListener.class);
}
--- a/jdk/src/share/classes/javax/swing/TimerQueue.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/TimerQueue.java Wed Jul 05 16:42:37 2017 +0200
@@ -31,6 +31,7 @@
import java.util.*;
import java.util.concurrent.*;
+import java.util.concurrent.locks.*;
import java.util.concurrent.atomic.AtomicLong;
import sun.awt.AppContext;
@@ -52,7 +53,8 @@
new StringBuffer("TimerQueue.expiredTimersKey");
private final DelayQueue<DelayedTimer> queue;
- volatile boolean running;
+ private volatile boolean running;
+ private final Lock runningLock;
/* Lock object used in place of class object for synchronization.
* (4187686)
@@ -69,7 +71,8 @@
super();
queue = new DelayQueue<DelayedTimer>();
// Now start the TimerQueue thread.
- start();
+ runningLock = new ReentrantLock();
+ startIfNeeded();
}
@@ -87,33 +90,30 @@
}
- synchronized void start() {
- if (running) {
- throw new RuntimeException("Can't start a TimerQueue " +
- "that is already running");
- }
- else {
- final ThreadGroup threadGroup =
- AppContext.getAppContext().getThreadGroup();
- java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
- public Object run() {
- Thread timerThread = new Thread(threadGroup, TimerQueue.this,
- "TimerQueue");
- timerThread.setDaemon(true);
- timerThread.setPriority(Thread.NORM_PRIORITY);
- timerThread.start();
- return null;
- }
- });
- running = true;
+ void startIfNeeded() {
+ if (! running) {
+ runningLock.lock();
+ try {
+ final ThreadGroup threadGroup =
+ AppContext.getAppContext().getThreadGroup();
+ java.security.AccessController.doPrivileged(
+ new java.security.PrivilegedAction<Object>() {
+ public Object run() {
+ Thread timerThread = new Thread(threadGroup, TimerQueue.this,
+ "TimerQueue");
+ timerThread.setDaemon(true);
+ timerThread.setPriority(Thread.NORM_PRIORITY);
+ timerThread.start();
+ return null;
+ }
+ });
+ running = true;
+ } finally {
+ runningLock.unlock();
+ }
}
}
- synchronized void stop() {
- running = false;
- }
-
void addTimer(Timer timer, long delayMillis) {
timer.getLock().lock();
try {
@@ -164,6 +164,7 @@
public void run() {
+ runningLock.lock();
try {
while (running) {
try {
@@ -195,14 +196,14 @@
}
}
catch (ThreadDeath td) {
- synchronized (this) {
- running = false;
- // Mark all the timers we contain as not being queued.
- for (DelayedTimer delayedTimer : queue) {
- delayedTimer.getTimer().cancelEvent();
- }
- throw td;
+ // Mark all the timers we contain as not being queued.
+ for (DelayedTimer delayedTimer : queue) {
+ delayedTimer.getTimer().cancelEvent();
}
+ throw td;
+ } finally {
+ running = false;
+ runningLock.unlock();
}
}
@@ -225,7 +226,7 @@
/**
* Returns nanosecond time offset by origin
*/
- private final static long now() {
+ private static long now() {
return System.nanoTime() - NANO_ORIGIN;
}
--- a/jdk/src/share/classes/javax/swing/UIDefaults.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/UIDefaults.java Wed Jul 05 16:42:37 2017 +0200
@@ -72,11 +72,11 @@
*/
public class UIDefaults extends Hashtable<Object,Object>
{
- private static final Object PENDING = new String("Pending");
+ private static final Object PENDING = "Pending";
private SwingPropertyChangeSupport changeSupport;
- private Vector resourceBundles;
+ private Vector<String> resourceBundles;
private Locale defaultLocale = Locale.getDefault();
@@ -86,7 +86,7 @@
* Access to this should be done while holding a lock on the
* UIDefaults, eg synchronized(this).
*/
- private Map resourceCache;
+ private Map<Locale, Map<String, Object>> resourceCache;
/**
* Creates an empty defaults table.
@@ -106,7 +106,7 @@
*/
public UIDefaults(int initialCapacity, float loadFactor) {
super(initialCapacity, loadFactor);
- resourceCache = new HashMap();
+ resourceCache = new HashMap<Locale, Map<String, Object>>();
}
@@ -281,24 +281,24 @@
if( defaultLocale == null )
return null;
else
- l = (Locale)defaultLocale;
+ l = defaultLocale;
}
synchronized(this) {
- return getResourceCache(l).get((String)key);
+ return getResourceCache(l).get(key);
}
}
/**
* Returns a Map of the known resources for the given locale.
*/
- private Map getResourceCache(Locale l) {
- Map values = (Map)resourceCache.get(l);
+ private Map<String, Object> getResourceCache(Locale l) {
+ Map<String, Object> values = resourceCache.get(l);
if (values == null) {
- values = new HashMap();
+ values = new HashMap<String, Object>();
for (int i=resourceBundles.size()-1; i >= 0; i--) {
- String bundleName = (String)resourceBundles.get(i);
+ String bundleName = resourceBundles.get(i);
try {
Control c = CoreResourceBundleControl.getRBControlInstance(bundleName);
ResourceBundle b;
@@ -751,7 +751,7 @@
Object cl = get("ClassLoader");
ClassLoader uiClassLoader =
(cl != null) ? (ClassLoader)cl : target.getClass().getClassLoader();
- Class uiClass = getUIClass(target.getUIClassID(), uiClassLoader);
+ Class<? extends ComponentUI> uiClass = getUIClass(target.getUIClassID(), uiClassLoader);
Object uiObject = null;
if (uiClass == null) {
@@ -761,8 +761,7 @@
try {
Method m = (Method)get(uiClass);
if (m == null) {
- Class acClass = javax.swing.JComponent.class;
- m = uiClass.getMethod("createUI", new Class[]{acClass});
+ m = uiClass.getMethod("createUI", new Class[]{JComponent.class});
put(uiClass, m);
}
uiObject = MethodUtil.invoke(m, null, new Object[]{target});
@@ -862,7 +861,7 @@
return;
}
if( resourceBundles == null ) {
- resourceBundles = new Vector(5);
+ resourceBundles = new Vector<String>(5);
}
if (!resourceBundles.contains(bundleName)) {
resourceBundles.add( bundleName );
@@ -1064,7 +1063,7 @@
className = c;
methodName = m;
if (o != null) {
- args = (Object[])o.clone();
+ args = o.clone();
}
}
@@ -1079,10 +1078,10 @@
// In order to pick up the security policy in effect at the
// time of creation we use a doPrivileged with the
// AccessControlContext that was in place when this was created.
- return AccessController.doPrivileged(new PrivilegedAction() {
+ return AccessController.doPrivileged(new PrivilegedAction<Object>() {
public Object run() {
try {
- Class c;
+ Class<?> c;
Object cl;
// See if we should use a separate ClassLoader
if (table == null || !((cl = table.get("ClassLoader"))
--- a/jdk/src/share/classes/javax/swing/UIManager.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/UIManager.java Wed Jul 05 16:42:37 2017 +0200
@@ -191,7 +191,7 @@
MultiUIDefaults multiUIDefaults = new MultiUIDefaults(tables);
LookAndFeel lookAndFeel;
LookAndFeel multiLookAndFeel = null;
- Vector auxLookAndFeels = null;
+ Vector<LookAndFeel> auxLookAndFeels = null;
SwingPropertyChangeSupport changeSupport;
UIDefaults getLookAndFeelDefaults() { return tables[0]; }
@@ -378,7 +378,7 @@
private static LookAndFeelInfo[] installedLAFs;
static {
- ArrayList iLAFs = new ArrayList(4);
+ ArrayList<LookAndFeelInfo> iLAFs = new ArrayList<LookAndFeelInfo>(4);
iLAFs.add(new LookAndFeelInfo(
"Metal", "javax.swing.plaf.metal.MetalLookAndFeel"));
iLAFs.add(new LookAndFeelInfo("CDE/Motif",
@@ -400,8 +400,7 @@
iLAFs.add(new LookAndFeelInfo("GTK+",
"com.sun.java.swing.plaf.gtk.GTKLookAndFeel"));
}
- installedLAFs = (LookAndFeelInfo[])iLAFs.toArray(
- new LookAndFeelInfo[iLAFs.size()]);
+ installedLAFs = iLAFs.toArray(new LookAndFeelInfo[iLAFs.size()]);
}
@@ -640,7 +639,7 @@
* @see #getSystemLookAndFeelClassName
*/
public static String getCrossPlatformLookAndFeelClassName() {
- String laf = (String)AccessController.doPrivileged(
+ String laf = AccessController.doPrivileged(
new GetPropertyAction("swing.crossplatformlaf"));
if (laf != null) {
return laf;
@@ -1079,9 +1078,9 @@
// for that.
return;
}
- Vector v = getLAFState().auxLookAndFeels;
+ Vector<LookAndFeel> v = getLAFState().auxLookAndFeels;
if (v == null) {
- v = new Vector();
+ v = new Vector<LookAndFeel>();
}
if (!v.contains(laf)) {
@@ -1115,7 +1114,7 @@
boolean result;
- Vector v = getLAFState().auxLookAndFeels;
+ Vector<LookAndFeel> v = getLAFState().auxLookAndFeels;
if ((v == null) || (v.size() == 0)) {
return false;
}
@@ -1151,14 +1150,14 @@
static public LookAndFeel[] getAuxiliaryLookAndFeels() {
maybeInitialize();
- Vector v = getLAFState().auxLookAndFeels;
+ Vector<LookAndFeel> v = getLAFState().auxLookAndFeels;
if ((v == null) || (v.size() == 0)) {
return null;
}
else {
LookAndFeel[] rv = new LookAndFeel[v.size()];
for (int i = 0; i < rv.length; i++) {
- rv[i] = (LookAndFeel)v.elementAt(i);
+ rv[i] = v.elementAt(i);
}
return rv;
}
@@ -1225,7 +1224,7 @@
final Properties props = new Properties();
java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
+ new java.security.PrivilegedAction<Object>() {
public Object run() {
try {
File file = new File(makeSwingPropertiesFilename());
@@ -1284,7 +1283,7 @@
* property. For example given "swing.installedlafs=motif,windows"
* lafs = {"motif", "windows"}.
*/
- Vector lafs = new Vector();
+ Vector<String> lafs = new Vector<String>();
StringTokenizer st = new StringTokenizer(ilafsString, ",", false);
while (st.hasMoreTokens()) {
lafs.addElement(st.nextToken());
@@ -1294,9 +1293,8 @@
* list. If they both exist then add a LookAndFeelInfo to
* the installedLafs array.
*/
- Vector ilafs = new Vector(lafs.size());
- for(int i = 0; i < lafs.size(); i++) {
- String laf = (String)lafs.elementAt(i);
+ Vector<LookAndFeelInfo> ilafs = new Vector<LookAndFeelInfo>(lafs.size());
+ for (String laf : lafs) {
String name = swingProps.getProperty(makeInstalledLAFKey(laf, "name"), laf);
String cls = swingProps.getProperty(makeInstalledLAFKey(laf, "class"));
if (cls != null) {
@@ -1306,7 +1304,7 @@
installedLAFs = new LookAndFeelInfo[ilafs.size()];
for(int i = 0; i < ilafs.size(); i++) {
- installedLAFs[i] = (LookAndFeelInfo)(ilafs.elementAt(i));
+ installedLAFs[i] = ilafs.elementAt(i);
}
}
@@ -1350,7 +1348,7 @@
return;
}
- Vector auxLookAndFeels = new Vector();
+ Vector<LookAndFeel> auxLookAndFeels = new Vector<LookAndFeel>();
StringTokenizer p = new StringTokenizer(auxLookAndFeelNames,",");
String factoryName;
@@ -1451,7 +1449,7 @@
Component c = e.getComponent();
if ((!(c instanceof JComponent) ||
- (c != null && !((JComponent)c).isEnabled())) &&
+ (c != null && !c.isEnabled())) &&
JComponent.KeyboardState.shouldProcess(e) &&
SwingUtilities.processKeyBindings(e)) {
e.consume();
--- a/jdk/src/share/classes/javax/swing/border/CompoundBorder.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/border/CompoundBorder.java Wed Jul 05 16:42:37 2017 +0200
@@ -79,10 +79,13 @@
}
/**
- * Returns whether or not this compound border is opaque.
- * Returns true if both the inside and outside borders are
- * non-null and opaque; returns false otherwise.
+ * Returns whether or not the compound border is opaque.
+ *
+ * @return {@code true} if the inside and outside borders
+ * are each either {@code null} or opaque;
+ * or {@code false} otherwise
*/
+ @Override
public boolean isBorderOpaque() {
return (outsideBorder == null || outsideBorder.isBorderOpaque()) &&
(insideBorder == null || insideBorder.isBorderOpaque());
--- a/jdk/src/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java Wed Jul 05 16:42:37 2017 +0200
@@ -160,7 +160,9 @@
* is editing
*/
public ColorSelectionModel getColorSelectionModel() {
- return chooser.getSelectionModel();
+ return (this.chooser != null)
+ ? this.chooser.getSelectionModel()
+ : null;
}
/**
@@ -168,7 +170,17 @@
* @return the <code>Color</code> that is selected
*/
protected Color getColorFromModel() {
- return getColorSelectionModel().getSelectedColor();
+ ColorSelectionModel model = getColorSelectionModel();
+ return (model != null)
+ ? model.getSelectedColor()
+ : null;
+ }
+
+ void setSelectedColor(Color color) {
+ ColorSelectionModel model = getColorSelectionModel();
+ if (model != null) {
+ model.setSelectedColor(color);
+ }
}
/**
--- a/jdk/src/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2001 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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,9 +25,7 @@
package javax.swing.colorchooser;
-import javax.swing.*;
-
-
+import javax.swing.JComponent;
/**
* A class designed to produce preconfigured "accessory" objects to
@@ -49,16 +47,17 @@
private ColorChooserComponentFactory() { } // can't instantiate
-
public static AbstractColorChooserPanel[] getDefaultChooserPanels() {
- AbstractColorChooserPanel[] choosers = { new DefaultSwatchChooserPanel(),
- new DefaultHSBChooserPanel(),
- new DefaultRGBChooserPanel() };
- return choosers;
+ return new AbstractColorChooserPanel[] {
+ new DefaultSwatchChooserPanel(),
+ new ColorChooserPanel(new ColorModelHSV()),
+ new ColorChooserPanel(new ColorModelHSL()),
+ new ColorChooserPanel(new ColorModel()),
+ new ColorChooserPanel(new ColorModelCMYK()),
+ };
}
public static JComponent getPreviewPanel() {
return new DefaultPreviewPanel();
}
-
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/javax/swing/colorchooser/ColorChooserPanel.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,187 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package javax.swing.colorchooser;
+
+import java.awt.Color;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import javax.swing.JFormattedTextField;
+import javax.swing.JLabel;
+import javax.swing.SwingConstants;
+
+final class ColorChooserPanel extends AbstractColorChooserPanel implements PropertyChangeListener {
+
+ private static final int MASK = 0xFF000000;
+ private final ColorModel model;
+ private final ColorPanel panel;
+ private final DiagramComponent slider;
+ private final DiagramComponent diagram;
+ private final JFormattedTextField text;
+ private final JLabel label;
+
+ ColorChooserPanel(ColorModel model) {
+ this.model = model;
+ this.panel = new ColorPanel(this.model);
+ this.slider = new DiagramComponent(this.panel, false);
+ this.diagram = new DiagramComponent(this.panel, true);
+ this.text = new JFormattedTextField();
+ this.label = new JLabel(null, null, SwingConstants.RIGHT);
+ ValueFormatter.init(6, true, this.text);
+ }
+
+ @Override
+ public void updateChooser() {
+ Color color = getColorFromModel();
+ if (color != null) {
+ this.panel.setColor(color);
+ this.text.setValue(Integer.valueOf(color.getRGB()));
+ this.slider.repaint();
+ this.diagram.repaint();
+ }
+ }
+
+ @Override
+ protected void buildChooser() {
+ if (0 == getComponentCount()) {
+ setLayout(new GridBagLayout());
+
+ GridBagConstraints gbc = new GridBagConstraints();
+
+ gbc.gridx = 3;
+ gbc.gridwidth = 2;
+ gbc.weighty = 1.0;
+ gbc.anchor = GridBagConstraints.NORTH;
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ gbc.insets.top = 10;
+ gbc.insets.right = 10;
+ add(this.panel, gbc);
+
+ gbc.gridwidth = 1;
+ gbc.weightx = 1.0;
+ gbc.weighty = 0.0;
+ gbc.anchor = GridBagConstraints.CENTER;
+ gbc.insets.right = 5;
+ gbc.insets.bottom = 10;
+ add(this.label, gbc);
+
+ gbc.gridx = 4;
+ gbc.weightx = 0.0;
+ gbc.insets.right = 10;
+ add(this.text, gbc);
+
+ gbc.gridx = 2;
+ gbc.gridheight = 2;
+ gbc.anchor = GridBagConstraints.NORTH;
+ gbc.ipadx = this.text.getPreferredSize().height;
+ gbc.ipady = getPreferredSize().height;
+ add(this.slider, gbc);
+
+ gbc.gridx = 1;
+ gbc.insets.left = 10;
+ gbc.ipadx = gbc.ipady;
+ add(this.diagram, gbc);
+
+ this.label.setLabelFor(this.text);
+ this.text.addPropertyChangeListener("value", this); // NON-NLS: the property name
+ this.slider.setBorder(this.text.getBorder());
+ this.diagram.setBorder(this.text.getBorder());
+
+ setInheritsPopupMenu(this, true); // CR:4966112
+ }
+ String label = this.model.getText(this, "HexCode"); // NON-NLS: suffix
+ boolean visible = label != null;
+ this.text.setVisible(visible);
+ this.label.setVisible(visible);
+ if (visible) {
+ this.label.setText(label);
+ int mnemonic = this.model.getInteger(this, "HexCodeMnemonic"); // NON-NLS: suffix
+ if (mnemonic > 0) {
+ this.label.setDisplayedMnemonic(mnemonic);
+ mnemonic = this.model.getInteger(this, "HexCodeMnemonicIndex"); // NON-NLS: suffix
+ if (mnemonic >= 0) {
+ this.label.setDisplayedMnemonicIndex(mnemonic);
+ }
+ }
+ }
+ this.panel.buildPanel();
+ }
+
+ @Override
+ public String getDisplayName() {
+ return this.model.getText(this, "Name"); // NON-NLS: suffix
+ }
+
+ @Override
+ public int getMnemonic() {
+ return this.model.getInteger(this, "Mnemonic"); // NON-NLS: suffix
+ }
+
+ @Override
+ public int getDisplayedMnemonicIndex() {
+ return this.model.getInteger(this, "DisplayedMnemonicIndex"); // NON-NLS: suffix
+ }
+
+ @Override
+ public Icon getSmallDisplayIcon() {
+ return null;
+ }
+
+ @Override
+ public Icon getLargeDisplayIcon() {
+ return null;
+ }
+
+ public void propertyChange(PropertyChangeEvent event) {
+ ColorSelectionModel model = getColorSelectionModel();
+ if (model != null) {
+ Object object = event.getNewValue();
+ if (object instanceof Integer) {
+ int value = MASK & model.getSelectedColor().getRGB() | (Integer) object;
+ model.setSelectedColor(new Color(value, true));
+ }
+ }
+ this.text.selectAll();
+ }
+
+ /**
+ * Allows to show context popup for all components recursively.
+ *
+ * @param component the root component of the tree
+ * @param value whether or not the popup menu is inherited
+ */
+ private static void setInheritsPopupMenu(JComponent component, boolean value) {
+ component.setInheritsPopupMenu(value);
+ for (Object object : component.getComponents()) {
+ if (object instanceof JComponent) {
+ setInheritsPopupMenu((JComponent) object, value);
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/javax/swing/colorchooser/ColorModel.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package javax.swing.colorchooser;
+
+import java.awt.Component;
+import javax.swing.UIManager;
+
+class ColorModel {
+
+ private final String prefix;
+ private final String[] labels;
+
+ ColorModel(String name, String... labels) {
+ this.prefix = "ColorChooser." + name; // NON-NLS: default prefix
+ this.labels = labels;
+ }
+
+ ColorModel() {
+ this("rgb", "Red", "Green", "Blue", "Alpha"); // NON-NLS: components
+ }
+
+ void setColor(int color, float[] model) {
+ model[0] = normalize(color >> 16);
+ model[1] = normalize(color >> 8);
+ model[2] = normalize(color);
+ model[3] = normalize(color >> 24);
+ }
+
+ int getColor(float[] model) {
+ return to8bit(model[2]) | (to8bit(model[1]) << 8) | (to8bit(model[0]) << 16) | (to8bit(model[3]) << 24);
+ }
+
+ int getCount() {
+ return this.labels.length;
+ }
+
+ int getMinimum(int index) {
+ return 0;
+ }
+
+ int getMaximum(int index) {
+ return 255;
+ }
+
+ float getDefault(int index) {
+ return 0.0f;
+ }
+
+ final String getLabel(Component component, int index) {
+ return getText(component, this.labels[index]);
+ }
+
+ private static float normalize(int value) {
+ return (float) (value & 0xFF) / 255.0f;
+ }
+
+ private static int to8bit(float value) {
+ return (int) (255.0f * value);
+ }
+
+ final String getText(Component component, String suffix) {
+ return UIManager.getString(this.prefix + suffix + "Text", component.getLocale()); // NON-NLS: default postfix
+ }
+
+ final int getInteger(Component component, String suffix) {
+ Object value = UIManager.get(this.prefix + suffix, component.getLocale());
+ if (value instanceof Integer) {
+ return (Integer) value;
+ }
+ if (value instanceof String) {
+ try {
+ return Integer.parseInt((String) value);
+ }
+ catch (NumberFormatException exception) {
+ }
+ }
+ return -1;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/javax/swing/colorchooser/ColorModelCMYK.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package javax.swing.colorchooser;
+
+final class ColorModelCMYK extends ColorModel {
+
+ ColorModelCMYK() {
+ super("cmyk", "Cyan", "Magenta", "Yellow", "Black", "Alpha"); // NON-NLS: components
+ }
+
+ @Override
+ void setColor(int color, float[] space) {
+ super.setColor(color, space);
+ space[4] = space[3];
+ RGBtoCMYK(space, space);
+ }
+
+ @Override
+ int getColor(float[] space) {
+ CMYKtoRGB(space, space);
+ space[3] = space[4];
+ return super.getColor(space);
+ }
+
+ /**
+ * Converts CMYK components of a color to a set of RGB components.
+ *
+ * @param cmyk a float array with length equal to
+ * the number of CMYK components
+ * @param rgb a float array with length of at least 3
+ * that contains RGB components of a color
+ * @return a float array that contains RGB components
+ */
+ private static float[] CMYKtoRGB(float[] cmyk, float[] rgb) {
+ if (rgb == null) {
+ rgb = new float[3];
+ }
+ rgb[0] = 1.0f + cmyk[0] * cmyk[3] - cmyk[3] - cmyk[0];
+ rgb[1] = 1.0f + cmyk[1] * cmyk[3] - cmyk[3] - cmyk[1];
+ rgb[2] = 1.0f + cmyk[2] * cmyk[3] - cmyk[3] - cmyk[2];
+ return rgb;
+ }
+
+ /**
+ * Converts RGB components of a color to a set of CMYK components.
+ *
+ * @param rgb a float array with length of at least 3
+ * that contains RGB components of a color
+ * @param cmyk a float array with length equal to
+ * the number of CMYK components
+ * @return a float array that contains CMYK components
+ */
+ private static float[] RGBtoCMYK(float[] rgb, float[] cmyk) {
+ if (cmyk == null) {
+ cmyk = new float[4];
+ }
+ float max = ColorModelHSL.max(rgb[0], rgb[1], rgb[2]);
+ if (max > 0.0f) {
+ cmyk[0] = 1.0f - rgb[0] / max;
+ cmyk[1] = 1.0f - rgb[1] / max;
+ cmyk[2] = 1.0f - rgb[2] / max;
+ }
+ else {
+ cmyk[0] = 0.0f;
+ cmyk[1] = 0.0f;
+ cmyk[2] = 0.0f;
+ }
+ cmyk[3] = 1.0f - max;
+ return cmyk;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/javax/swing/colorchooser/ColorModelHSL.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,188 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package javax.swing.colorchooser;
+
+final class ColorModelHSL extends ColorModel {
+
+ ColorModelHSL() {
+ super("hsl", "Hue", "Saturation", "Lightness", "Transparency"); // NON-NLS: components
+ }
+
+ @Override
+ void setColor(int color, float[] space) {
+ super.setColor(color, space);
+ RGBtoHSL(space, space);
+ space[3] = 1.0f - space[3];
+ }
+
+ @Override
+ int getColor(float[] space) {
+ space[3] = 1.0f - space[3];
+ HSLtoRGB(space, space);
+ return super.getColor(space);
+ }
+
+ @Override
+ int getMaximum(int index) {
+ return (index == 0) ? 360 : 100;
+ }
+
+ @Override
+ float getDefault(int index) {
+ return (index == 0) ? -1.0f : (index == 2) ? 0.5f : 1.0f;
+ }
+
+ /**
+ * Converts HSL components of a color to a set of RGB components.
+ *
+ * @param hsl a float array with length equal to
+ * the number of HSL components
+ * @param rgb a float array with length of at least 3
+ * that contains RGB components of a color
+ * @return a float array that contains RGB components
+ */
+ private static float[] HSLtoRGB(float[] hsl, float[] rgb) {
+ if (rgb == null) {
+ rgb = new float[3];
+ }
+ float hue = hsl[0];
+ float saturation = hsl[1];
+ float lightness = hsl[2];
+
+ if (saturation > 0.0f) {
+ hue = (hue < 1.0f) ? hue * 6.0f : 0.0f;
+ float q = lightness + saturation * ((lightness > 0.5f) ? 1.0f - lightness : lightness);
+ float p = 2.0f * lightness - q;
+ rgb[0]= normalize(q, p, (hue < 4.0f) ? (hue + 2.0f) : (hue - 4.0f));
+ rgb[1]= normalize(q, p, hue);
+ rgb[2]= normalize(q, p, (hue < 2.0f) ? (hue + 4.0f) : (hue - 2.0f));
+ }
+ else {
+ rgb[0] = lightness;
+ rgb[1] = lightness;
+ rgb[2] = lightness;
+ }
+ return rgb;
+ }
+
+ /**
+ * Converts RGB components of a color to a set of HSL components.
+ *
+ * @param rgb a float array with length of at least 3
+ * that contains RGB components of a color
+ * @param hsl a float array with length equal to
+ * the number of HSL components
+ * @return a float array that contains HSL components
+ */
+ private static float[] RGBtoHSL(float[] rgb, float[] hsl) {
+ if (hsl == null) {
+ hsl = new float[3];
+ }
+ float max = max(rgb[0], rgb[1], rgb[2]);
+ float min = min(rgb[0], rgb[1], rgb[2]);
+
+ float summa = max + min;
+ float saturation = max - min;
+ if (saturation > 0.0f) {
+ saturation /= (summa > 1.0f)
+ ? 2.0f - summa
+ : summa;
+ }
+ hsl[0] = getHue(rgb[0], rgb[1], rgb[2], max, min);
+ hsl[1] = saturation;
+ hsl[2] = summa / 2.0f;
+ return hsl;
+ }
+
+ /**
+ * Returns the smaller of three color components.
+ *
+ * @param red the red component of the color
+ * @param green the green component of the color
+ * @param blue the blue component of the color
+ * @return the smaller of {@code red}, {@code green} and {@code blue}
+ */
+ static float min(float red, float green, float blue) {
+ float min = (red < green) ? red : green;
+ return (min < blue) ? min : blue;
+ }
+
+ /**
+ * Returns the larger of three color components.
+ *
+ * @param red the red component of the color
+ * @param green the green component of the color
+ * @param blue the blue component of the color
+ * @return the larger of {@code red}, {@code green} and {@code blue}
+ */
+ static float max(float red, float green, float blue) {
+ float max = (red > green) ? red : green;
+ return (max > blue) ? max : blue;
+ }
+
+ /**
+ * Calculates the hue component for HSL and HSV color spaces.
+ *
+ * @param red the red component of the color
+ * @param green the green component of the color
+ * @param blue the blue component of the color
+ * @param max the larger of {@code red}, {@code green} and {@code blue}
+ * @param min the smaller of {@code red}, {@code green} and {@code blue}
+ * @return the hue component
+ */
+ static float getHue(float red, float green, float blue, float max, float min) {
+ float hue = max - min;
+ if (hue > 0.0f) {
+ if (max == red) {
+ hue = (green - blue) / hue;
+ if (hue < 0.0f) {
+ hue += 6.0f;
+ }
+ }
+ else if (max == green) {
+ hue = 2.0f + (blue - red) / hue;
+ }
+ else /*max == blue*/ {
+ hue = 4.0f + (red - green) / hue;
+ }
+ hue /= 6.0f;
+ }
+ return hue;
+ }
+
+ private static float normalize(float q, float p, float color) {
+ if (color < 1.0f) {
+ return p + (q - p) * color;
+ }
+ if (color < 3.0f) {
+ return q;
+ }
+ if (color < 4.0f) {
+ return p + (q - p) * (4.0f - color);
+ }
+ return p;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/javax/swing/colorchooser/ColorModelHSV.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,138 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package javax.swing.colorchooser;
+
+final class ColorModelHSV extends ColorModel {
+
+ ColorModelHSV() {
+ super("hsv", "Hue", "Saturation", "Value", "Transparency"); // NON-NLS: components
+ }
+
+ @Override
+ void setColor(int color, float[] space) {
+ super.setColor(color, space);
+ RGBtoHSV(space, space);
+ space[3] = 1.0f - space[3];
+ }
+
+ @Override
+ int getColor(float[] space) {
+ space[3] = 1.0f - space[3];
+ HSVtoRGB(space, space);
+ return super.getColor(space);
+ }
+
+ @Override
+ int getMaximum(int index) {
+ return (index == 0) ? 360 : 100;
+ }
+
+ @Override
+ float getDefault(int index) {
+ return (index == 0) ? -1.0f : 1.0f;
+ }
+
+ /**
+ * Converts HSV components of a color to a set of RGB components.
+ *
+ * @param hsv a float array with length equal to
+ * the number of HSV components
+ * @param rgb a float array with length of at least 3
+ * that contains RGB components of a color
+ * @return a float array that contains RGB components
+ */
+ private static float[] HSVtoRGB(float[] hsv, float[] rgb) {
+ if (rgb == null) {
+ rgb = new float[3];
+ }
+ float hue = hsv[0];
+ float saturation = hsv[1];
+ float value = hsv[2];
+
+ rgb[0] = value;
+ rgb[1] = value;
+ rgb[2] = value;
+
+ if (saturation > 0.0f) {
+ hue = (hue < 1.0f) ? hue * 6.0f : 0.0f;
+ int integer = (int) hue;
+ float f = hue - (float) integer;
+ switch (integer) {
+ case 0:
+ rgb[1] *= 1.0f - saturation * (1.0f - f);
+ rgb[2] *= 1.0f - saturation;
+ break;
+ case 1:
+ rgb[0] *= 1.0f - saturation * f;
+ rgb[2] *= 1.0f - saturation;
+ break;
+ case 2:
+ rgb[0] *= 1.0f - saturation;
+ rgb[2] *= 1.0f - saturation * (1.0f - f);
+ break;
+ case 3:
+ rgb[0] *= 1.0f - saturation;
+ rgb[1] *= 1.0f - saturation * f;
+ break;
+ case 4:
+ rgb[0] *= 1.0f - saturation * (1.0f - f);
+ rgb[1] *= 1.0f - saturation;
+ break;
+ case 5:
+ rgb[1] *= 1.0f - saturation;
+ rgb[2] *= 1.0f - saturation * f;
+ break;
+ }
+ }
+ return rgb;
+ }
+
+ /**
+ * Converts RGB components of a color to a set of HSV components.
+ *
+ * @param rgb a float array with length of at least 3
+ * that contains RGB components of a color
+ * @param hsv a float array with length equal to
+ * the number of HSV components
+ * @return a float array that contains HSV components
+ */
+ private static float[] RGBtoHSV(float[] rgb, float[] hsv) {
+ if (hsv == null) {
+ hsv = new float[3];
+ }
+ float max = ColorModelHSL.max(rgb[0], rgb[1], rgb[2]);
+ float min = ColorModelHSL.min(rgb[0], rgb[1], rgb[2]);
+
+ float saturation = max - min;
+ if (saturation > 0.0f) {
+ saturation /= max;
+ }
+ hsv[0] = ColorModelHSL.getHue(rgb[0], rgb[1], rgb[2], max, min);
+ hsv[1] = saturation;
+ hsv[2] = max;
+ return hsv;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/javax/swing/colorchooser/ColorPanel.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,210 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package javax.swing.colorchooser;
+
+import java.awt.Color;
+import java.awt.ContainerOrderFocusTraversalPolicy;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import javax.swing.ButtonGroup;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.border.EmptyBorder;
+
+final class ColorPanel extends JPanel implements ActionListener {
+
+ private final SlidingSpinner[] spinners = new SlidingSpinner[5];
+ private final float[] values = new float[this.spinners.length];
+
+ private final ColorModel model;
+ private Color color;
+ private int x = 1;
+ private int y = 2;
+ private int z;
+
+ ColorPanel(ColorModel model) {
+ super(new GridBagLayout());
+
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+
+ gbc.gridx = 1;
+ ButtonGroup group = new ButtonGroup();
+ EmptyBorder border = null;
+ for (int i = 0; i < this.spinners.length; i++) {
+ if (i < 3) {
+ JRadioButton button = new JRadioButton();
+ if (i == 0) {
+ Insets insets = button.getInsets();
+ insets.left = button.getPreferredSize().width;
+ border = new EmptyBorder(insets);
+ button.setSelected(true);
+ gbc.insets.top = 5;
+ }
+ add(button, gbc);
+ group.add(button);
+ button.setActionCommand(Integer.toString(i));
+ button.addActionListener(this);
+ this.spinners[i] = new SlidingSpinner(this, button);
+ }
+ else {
+ JLabel label = new JLabel();
+ add(label, gbc);
+ label.setBorder(border);
+ label.setFocusable(false);
+ this.spinners[i] = new SlidingSpinner(this, label);
+ }
+ }
+ gbc.gridx = 2;
+ gbc.weightx = 1.0;
+ gbc.insets.top = 0;
+ gbc.insets.left = 5;
+ for (SlidingSpinner spinner : this.spinners) {
+ add(spinner.getSlider(), gbc);
+ gbc.insets.top = 5;
+ }
+ gbc.gridx = 3;
+ gbc.weightx = 0.0;
+ gbc.insets.top = 0;
+ for (SlidingSpinner spinner : this.spinners) {
+ add(spinner.getSpinner(), gbc);
+ gbc.insets.top = 5;
+ }
+ setFocusTraversalPolicy(new ContainerOrderFocusTraversalPolicy());
+ setFocusTraversalPolicyProvider(true);
+ setFocusable(false);
+
+ this.model = model;
+ }
+
+ public void actionPerformed(ActionEvent event) {
+ try {
+ this.z = Integer.parseInt(event.getActionCommand());
+ this.y = (this.z != 2) ? 2 : 1;
+ this.x = (this.z != 0) ? 0 : 1;
+ getParent().repaint();
+ }
+ catch (NumberFormatException exception) {
+ }
+ }
+
+ void buildPanel() {
+ int count = this.model.getCount();
+ this.spinners[4].setVisible(count > 4);
+ for (int i = 0; i < count; i++) {
+ Object object = this.spinners[i].getLabel();
+ if (object instanceof JRadioButton) {
+ JRadioButton button = (JRadioButton) object;
+ button.setText(this.model.getLabel(this, i));
+ }
+ else if (object instanceof JLabel) {
+ JLabel label = (JLabel) object;
+ label.setText(this.model.getLabel(this, i));
+ }
+ this.spinners[i].setRange(this.model.getMinimum(i), this.model.getMaximum(i));
+ this.spinners[i].setValue(this.values[i]);
+ }
+ }
+
+ void colorChanged() {
+ this.color = new Color(getColor(0), true);
+ Object parent = getParent();
+ if (parent instanceof ColorChooserPanel) {
+ ColorChooserPanel chooser = (ColorChooserPanel) parent;
+ chooser.setSelectedColor(this.color);
+ chooser.repaint();
+ }
+ }
+
+ float getValueX() {
+ return this.spinners[this.x].getValue();
+ }
+
+ float getValueY() {
+ return 1.0f - this.spinners[this.y].getValue();
+ }
+
+ float getValueZ() {
+ return 1.0f - this.spinners[this.z].getValue();
+ }
+
+ void setValue(float z) {
+ this.spinners[this.z].setValue(1.0f - z);
+ colorChanged();
+ }
+
+ void setValue(float x, float y) {
+ this.spinners[this.x].setValue(x);
+ this.spinners[this.y].setValue(1.0f - y);
+ colorChanged();
+ }
+
+ int getColor(float z) {
+ setDefaultValue(this.x);
+ setDefaultValue(this.y);
+ this.values[this.z] = 1.0f - z;
+ return getColor(3);
+ }
+
+ int getColor(float x, float y) {
+ this.values[this.x] = x;
+ this.values[this.y] = 1.0f - y;
+ setValue(this.z);
+ return getColor(3);
+ }
+
+ void setColor(Color color) {
+ if (!color.equals(this.color)) {
+ this.color = color;
+ this.model.setColor(color.getRGB(), this.values);
+ for (int i = 0; i < this.model.getCount(); i++) {
+ this.spinners[i].setValue(this.values[i]);
+ }
+ }
+ }
+
+ private int getColor(int index) {
+ while (index < this.model.getCount()) {
+ setValue(index++);
+ }
+ return this.model.getColor(this.values);
+ }
+
+ private void setValue(int index) {
+ this.values[index] = this.spinners[index].getValue();
+ }
+
+ private void setDefaultValue(int index) {
+ float value = this.model.getDefault(index);
+ this.values[index] = (value < 0.0f)
+ ? this.spinners[index].getValue()
+ : value;
+ }
+}
--- a/jdk/src/share/classes/javax/swing/colorchooser/DefaultHSBChooserPanel.java Fri Oct 10 13:29:11 2008 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,801 +0,0 @@
-/*
- * Copyright 1998-2004 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package javax.swing.colorchooser;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.event.*;
-import javax.swing.border.*;
-import java.awt.image.*;
-import java.util.Locale;
-
-/**
- * Implements the default HSB Color chooser
- *
- * @author Tom Santos
- * @author Steve Wilson
- * @author Mark Davidson
- * @author Shannon Hickey
- */
-class DefaultHSBChooserPanel extends AbstractColorChooserPanel implements ChangeListener, HierarchyListener {
-
- private transient HSBImage palette;
- private transient HSBImage sliderPalette;
-
- private transient Image paletteImage;
- private transient Image sliderPaletteImage;
-
- private JSlider slider;
- private JSpinner hField;
- private JSpinner sField;
- private JSpinner bField;
-
- private JTextField redField;
- private JTextField greenField;
- private JTextField blueField;
-
- private boolean isAdjusting = false; // Flag which indicates that values are set internally
- private Point paletteSelection = new Point();
- private JLabel paletteLabel;
- private JLabel sliderPaletteLabel;
-
- private JRadioButton hRadio;
- private JRadioButton sRadio;
- private JRadioButton bRadio;
-
- private static final int PALETTE_DIMENSION = 200;
- private static final int MAX_HUE_VALUE = 359;
- private static final int MAX_SATURATION_VALUE = 100;
- private static final int MAX_BRIGHTNESS_VALUE = 100;
-
- private int currentMode = HUE_MODE;
-
- private static final int HUE_MODE = 0;
- private static final int SATURATION_MODE = 1;
- private static final int BRIGHTNESS_MODE = 2;
-
- public DefaultHSBChooserPanel() {
- }
-
- private void addPaletteListeners() {
- paletteLabel.addMouseListener(new MouseAdapter() {
- public void mousePressed(MouseEvent e ) {
- float[] hsb = new float[3];
- palette.getHSBForLocation( e.getX(), e.getY(), hsb );
- updateHSB( hsb[0], hsb[1], hsb[2] );
- }
- });
-
- paletteLabel.addMouseMotionListener(new MouseMotionAdapter() {
- public void mouseDragged( MouseEvent e ){
- int labelWidth = paletteLabel.getWidth();
-
- int labelHeight = paletteLabel.getHeight();
- int x = e.getX();
- int y = e.getY();
-
- if ( x >= labelWidth ) {
- x = labelWidth - 1;
- }
-
- if ( y >= labelHeight ) {
- y = labelHeight - 1;
- }
-
- if ( x < 0 ) {
- x = 0;
- }
-
- if ( y < 0 ) {
- y = 0;
- }
-
- float[] hsb = new float[3];
- palette.getHSBForLocation( x, y, hsb );
- updateHSB( hsb[0], hsb[1], hsb[2] );
- }
- });
- }
-
- private void updatePalette( float h, float s, float b ) {
- int x = 0;
- int y = 0;
-
- switch ( currentMode ) {
- case HUE_MODE:
- if ( h != palette.getHue() ) {
- palette.setHue( h );
- palette.nextFrame();
- }
- x = PALETTE_DIMENSION - (int)(s * PALETTE_DIMENSION);
- y = PALETTE_DIMENSION - (int)(b * PALETTE_DIMENSION);
- break;
- case SATURATION_MODE:
- if ( s != palette.getSaturation() ) {
- palette.setSaturation( s );
- palette.nextFrame();
- }
- x = (int)(h * PALETTE_DIMENSION);
- y = PALETTE_DIMENSION - (int)(b * PALETTE_DIMENSION);
- break;
- case BRIGHTNESS_MODE:
- if ( b != palette.getBrightness() ) {
- palette.setBrightness( b );
- palette.nextFrame();
- }
- x = (int)(h * PALETTE_DIMENSION);
- y = PALETTE_DIMENSION - (int)(s * PALETTE_DIMENSION);
- break;
- }
-
- paletteSelection.setLocation( x, y );
- paletteLabel.repaint();
- }
-
- private void updateSlider( float h, float s, float b ) {
- // Update the slider palette if necessary.
- // When the slider is the hue slider or the hue hasn't changed,
- // the hue of the palette will not need to be updated.
- if (currentMode != HUE_MODE && h != sliderPalette.getHue() ) {
- sliderPalette.setHue( h );
- sliderPalette.nextFrame();
- }
-
- float value = 0f;
-
- switch ( currentMode ) {
- case HUE_MODE:
- value = h;
- break;
- case SATURATION_MODE:
- value = s;
- break;
- case BRIGHTNESS_MODE:
- value = b;
- break;
- }
-
- slider.setValue( Math.round(value * (slider.getMaximum())) );
- }
-
- private void updateHSBTextFields( float hue, float saturation, float brightness ) {
- int h = Math.round(hue * 359);
- int s = Math.round(saturation * 100);
- int b = Math.round(brightness * 100);
-
- if (((Integer)hField.getValue()).intValue() != h) {
- hField.setValue(new Integer(h));
- }
- if (((Integer)sField.getValue()).intValue() != s) {
- sField.setValue(new Integer(s));
- }
- if (((Integer)bField.getValue()).intValue() != b) {
- bField.setValue(new Integer(b));
- }
- }
-
- /**
- * Updates the values of the RGB fields to reflect the new color change
- */
- private void updateRGBTextFields( Color color ) {
- redField.setText(String.valueOf(color.getRed()));
- greenField.setText(String.valueOf(color.getGreen()));
- blueField.setText(String.valueOf(color.getBlue()));
- }
-
- /**
- * Main internal method of updating the ui controls and the color model.
- */
- private void updateHSB( float h, float s, float b ) {
- if ( !isAdjusting ) {
- isAdjusting = true;
-
- updatePalette( h, s, b );
- updateSlider( h, s, b );
- updateHSBTextFields( h, s, b );
-
- Color color = Color.getHSBColor(h, s, b);
- updateRGBTextFields( color );
-
- getColorSelectionModel().setSelectedColor( color );
-
- isAdjusting = false;
- }
- }
-
- /**
- * Invoked automatically when the model's state changes.
- * It is also called by <code>installChooserPanel</code> to allow
- * you to set up the initial state of your chooser.
- * Override this method to update your <code>ChooserPanel</code>.
- */
- public void updateChooser() {
- if ( !isAdjusting ) {
- float[] hsb = getHSBColorFromModel();
- updateHSB( hsb[0], hsb[1], hsb[2] );
- }
- }
-
- public void installChooserPanel(JColorChooser enclosingChooser) {
- super.installChooserPanel(enclosingChooser);
- setInheritsPopupMenu(true);
- addHierarchyListener(this);
- }
-
- /**
- * Invoked when the panel is removed from the chooser.
- */
- public void uninstallChooserPanel(JColorChooser enclosingChooser) {
- super.uninstallChooserPanel(enclosingChooser);
- cleanupPalettesIfNecessary();
- removeAll();
- removeHierarchyListener(this);
- }
-
- /**
- * Returns an float array containing the HSB values of the selected color from
- * the ColorSelectionModel
- */
- private float[] getHSBColorFromModel() {
- Color color = getColorFromModel();
- float[] hsb = new float[3];
- Color.RGBtoHSB( color.getRed(), color.getGreen(), color.getBlue(), hsb );
-
- return hsb;
- }
-
- /**
- * Builds a new chooser panel.
- */
- protected void buildChooser() {
- setLayout(new BorderLayout());
- JComponent spp = buildSliderPalettePanel();
- spp.setInheritsPopupMenu(true);
- add(spp, BorderLayout.BEFORE_LINE_BEGINS);
-
- JPanel controlHolder = new JPanel(new SmartGridLayout(1,3));
- JComponent hsbControls = buildHSBControls();
- hsbControls.setInheritsPopupMenu(true);
- controlHolder.add(hsbControls);
-
- controlHolder.add(new JLabel(" ")); // spacer
-
- JComponent rgbControls = buildRGBControls();
- rgbControls.setInheritsPopupMenu(true);
- controlHolder.add(rgbControls);
- controlHolder.setInheritsPopupMenu(true);
-
- controlHolder.setBorder(new EmptyBorder( 10, 5, 10, 5));
- add( controlHolder, BorderLayout.CENTER);
- }
-
- /**
- * Creates the panel with the uneditable RGB field
- */
- private JComponent buildRGBControls() {
- JPanel panel = new JPanel(new SmartGridLayout(2,3));
- panel.setInheritsPopupMenu(true);
-
- Color color = getColorFromModel();
- redField = new JTextField( String.valueOf(color.getRed()), 3 );
- redField.setEditable(false);
- redField.setHorizontalAlignment( JTextField.RIGHT );
- redField.setInheritsPopupMenu(true);
-
- greenField = new JTextField(String.valueOf(color.getGreen()), 3 );
- greenField.setEditable(false);
- greenField.setHorizontalAlignment( JTextField.RIGHT );
- greenField.setInheritsPopupMenu(true);
-
- blueField = new JTextField( String.valueOf(color.getBlue()), 3 );
- blueField.setEditable(false);
- blueField.setHorizontalAlignment( JTextField.RIGHT );
- blueField.setInheritsPopupMenu(true);
-
- Locale locale = getLocale();
- String redString = UIManager.getString("ColorChooser.hsbRedText", locale);
- String greenString = UIManager.getString("ColorChooser.hsbGreenText", locale);
- String blueString = UIManager.getString("ColorChooser.hsbBlueText", locale);
-
- panel.add( new JLabel(redString) );
- panel.add( redField );
- panel.add( new JLabel(greenString) );
- panel.add( greenField );
- panel.add( new JLabel(blueString) );
- panel.add( blueField );
-
- return panel;
- }
-
- /**
- * Creates the panel with the editable HSB fields and the radio buttons.
- */
- private JComponent buildHSBControls() {
-
- Locale locale = getLocale();
- String hueString = UIManager.getString("ColorChooser.hsbHueText", locale);
- String saturationString = UIManager.getString("ColorChooser.hsbSaturationText", locale);
- String brightnessString = UIManager.getString("ColorChooser.hsbBrightnessText", locale);
-
- RadioButtonHandler handler = new RadioButtonHandler();
-
- hRadio = new JRadioButton(hueString);
- hRadio.addActionListener(handler);
- hRadio.setSelected(true);
- hRadio.setInheritsPopupMenu(true);
-
- sRadio = new JRadioButton(saturationString);
- sRadio.addActionListener(handler);
- sRadio.setInheritsPopupMenu(true);
-
- bRadio = new JRadioButton(brightnessString);
- bRadio.addActionListener(handler);
- bRadio.setInheritsPopupMenu(true);
-
- ButtonGroup group = new ButtonGroup();
- group.add(hRadio);
- group.add(sRadio);
- group.add(bRadio);
-
- float[] hsb = getHSBColorFromModel();
-
- hField = new JSpinner(new SpinnerNumberModel((int)(hsb[0] * 359), 0, 359, 1));
- sField = new JSpinner(new SpinnerNumberModel((int)(hsb[1] * 100), 0, 100, 1));
- bField = new JSpinner(new SpinnerNumberModel((int)(hsb[2] * 100), 0, 100, 1));
-
- hField.addChangeListener(this);
- sField.addChangeListener(this);
- bField.addChangeListener(this);
-
- hField.setInheritsPopupMenu(true);
- sField.setInheritsPopupMenu(true);
- bField.setInheritsPopupMenu(true);
-
- JPanel panel = new JPanel( new SmartGridLayout(2, 3) );
-
- panel.add(hRadio);
- panel.add(hField);
- panel.add(sRadio);
- panel.add(sField);
- panel.add(bRadio);
- panel.add(bField);
- panel.setInheritsPopupMenu(true);
-
- return panel;
- }
-
- /**
- * Handler for the radio button classes.
- */
- private class RadioButtonHandler implements ActionListener {
- public void actionPerformed(ActionEvent evt) {
- Object obj = evt.getSource();
-
- if (obj instanceof JRadioButton) {
- JRadioButton button = (JRadioButton)obj;
- if (button == hRadio) {
- setMode(HUE_MODE);
- } else if (button == sRadio) {
- setMode(SATURATION_MODE);
- } else if (button == bRadio) {
- setMode(BRIGHTNESS_MODE);
- }
- }
- }
- }
-
- private void setMode(int mode) {
- if (currentMode == mode) {
- return;
- }
-
- isAdjusting = true; // Ensure no events propagate from changing slider value.
- currentMode = mode;
-
- float[] hsb = getHSBColorFromModel();
-
- switch (currentMode) {
- case HUE_MODE:
- slider.setInverted(true);
- slider.setMaximum(MAX_HUE_VALUE);
- palette.setValues(HSBImage.HSQUARE, hsb[0], 1.0f, 1.0f);
- sliderPalette.setValues(HSBImage.HSLIDER, 0f, 1.0f, 1.0f);
- break;
- case SATURATION_MODE:
- slider.setInverted(false);
- slider.setMaximum(MAX_SATURATION_VALUE);
- palette.setValues(HSBImage.SSQUARE, hsb[0], hsb[1], 1.0f);
- sliderPalette.setValues(HSBImage.SSLIDER, hsb[0], 1.0f, 1.0f);
- break;
- case BRIGHTNESS_MODE:
- slider.setInverted(false);
- slider.setMaximum(MAX_BRIGHTNESS_VALUE);
- palette.setValues(HSBImage.BSQUARE, hsb[0], 1.0f, hsb[2]);
- sliderPalette.setValues(HSBImage.BSLIDER, hsb[0], 1.0f, 1.0f);
- break;
- }
-
- isAdjusting = false;
-
- palette.nextFrame();
- sliderPalette.nextFrame();
-
- updateChooser();
- }
-
- protected JComponent buildSliderPalettePanel() {
-
- // This slider has to have a minimum of 0. A lot of math in this file is simplified due to this.
- slider = new JSlider(JSlider.VERTICAL, 0, MAX_HUE_VALUE, 0);
- slider.setInverted(true);
- slider.setPaintTrack(false);
- slider.setPreferredSize(new Dimension(slider.getPreferredSize().width, PALETTE_DIMENSION + 15));
- slider.addChangeListener(this);
- slider.setInheritsPopupMenu(true);
- // We're not painting ticks, but need to ask UI classes to
- // paint arrow shape anyway, if possible.
- slider.putClientProperty("Slider.paintThumbArrowShape", Boolean.TRUE);
- paletteLabel = createPaletteLabel();
- addPaletteListeners();
- sliderPaletteLabel = new JLabel();
-
- JPanel panel = new JPanel();
- panel.add( paletteLabel );
- panel.add( slider );
- panel.add( sliderPaletteLabel );
-
- initializePalettesIfNecessary();
-
- return panel;
- }
-
- private void initializePalettesIfNecessary() {
- if (palette != null) {
- return;
- }
-
- float[] hsb = getHSBColorFromModel();
-
- switch(currentMode){
- case HUE_MODE:
- palette = new HSBImage(HSBImage.HSQUARE, PALETTE_DIMENSION, PALETTE_DIMENSION, hsb[0], 1.0f, 1.0f);
- sliderPalette = new HSBImage(HSBImage.HSLIDER, 16, PALETTE_DIMENSION, 0f, 1.0f, 1.0f);
- break;
- case SATURATION_MODE:
- palette = new HSBImage(HSBImage.SSQUARE, PALETTE_DIMENSION, PALETTE_DIMENSION, 1.0f, hsb[1], 1.0f);
- sliderPalette = new HSBImage(HSBImage.SSLIDER, 16, PALETTE_DIMENSION, 1.0f, 0f, 1.0f);
- break;
- case BRIGHTNESS_MODE:
- palette = new HSBImage(HSBImage.BSQUARE, PALETTE_DIMENSION, PALETTE_DIMENSION, 1.0f, 1.0f, hsb[2]);
- sliderPalette = new HSBImage(HSBImage.BSLIDER, 16, PALETTE_DIMENSION, 1.0f, 1.0f, 0f);
- break;
- }
- paletteImage = Toolkit.getDefaultToolkit().createImage(palette);
- sliderPaletteImage = Toolkit.getDefaultToolkit().createImage(sliderPalette);
-
- paletteLabel.setIcon(new ImageIcon(paletteImage));
- sliderPaletteLabel.setIcon(new ImageIcon(sliderPaletteImage));
- }
-
- private void cleanupPalettesIfNecessary() {
- if (palette == null) {
- return;
- }
-
- palette.aborted = true;
- sliderPalette.aborted = true;
-
- palette.nextFrame();
- sliderPalette.nextFrame();
-
- palette = null;
- sliderPalette = null;
-
- paletteImage = null;
- sliderPaletteImage = null;
-
- paletteLabel.setIcon(null);
- sliderPaletteLabel.setIcon(null);
- }
-
- protected JLabel createPaletteLabel() {
- return new JLabel() {
- protected void paintComponent( Graphics g ) {
- super.paintComponent( g );
- g.setColor( Color.white );
- g.drawOval( paletteSelection.x - 4, paletteSelection.y - 4, 8, 8 );
- }
- };
- }
-
- public String getDisplayName() {
- return UIManager.getString("ColorChooser.hsbNameText", getLocale());
- }
-
- /**
- * Provides a hint to the look and feel as to the
- * <code>KeyEvent.VK</code> constant that can be used as a mnemonic to
- * access the panel. A return value <= 0 indicates there is no mnemonic.
- * <p>
- * The return value here is a hint, it is ultimately up to the look
- * and feel to honor the return value in some meaningful way.
- * <p>
- * This implementation looks up the value from the default
- * <code>ColorChooser.hsbMnemonic</code>, or if it
- * isn't available (or not an <code>Integer</code>) returns -1.
- * The lookup for the default is done through the <code>UIManager</code>:
- * <code>UIManager.get("ColorChooser.rgbMnemonic");</code>.
- *
- * @return KeyEvent.VK constant identifying the mnemonic; <= 0 for no
- * mnemonic
- * @see #getDisplayedMnemonicIndex
- * @since 1.4
- */
- public int getMnemonic() {
- return getInt("ColorChooser.hsbMnemonic", -1);
- }
-
- /**
- * Provides a hint to the look and feel as to the index of the character in
- * <code>getDisplayName</code> that should be visually identified as the
- * mnemonic. The look and feel should only use this if
- * <code>getMnemonic</code> returns a value > 0.
- * <p>
- * The return value here is a hint, it is ultimately up to the look
- * and feel to honor the return value in some meaningful way. For example,
- * a look and feel may wish to render each
- * <code>AbstractColorChooserPanel</code> in a <code>JTabbedPane</code>,
- * and further use this return value to underline a character in
- * the <code>getDisplayName</code>.
- * <p>
- * This implementation looks up the value from the default
- * <code>ColorChooser.rgbDisplayedMnemonicIndex</code>, or if it
- * isn't available (or not an <code>Integer</code>) returns -1.
- * The lookup for the default is done through the <code>UIManager</code>:
- * <code>UIManager.get("ColorChooser.hsbDisplayedMnemonicIndex");</code>.
- *
- * @return Character index to render mnemonic for; -1 to provide no
- * visual identifier for this panel.
- * @see #getMnemonic
- * @since 1.4
- */
- public int getDisplayedMnemonicIndex() {
- return getInt("ColorChooser.hsbDisplayedMnemonicIndex", -1);
- }
-
- public Icon getSmallDisplayIcon() {
- return null;
- }
-
- public Icon getLargeDisplayIcon() {
- return null;
- }
-
- /**
- * Class for the slider and palette images.
- */
- class HSBImage extends SyntheticImage {
- protected float h = .0f;
- protected float s = .0f;
- protected float b = .0f;
- protected float[] hsb = new float[3];
-
- protected boolean isDirty = true;
- protected int cachedY;
- protected int cachedColor;
- protected int type;
-
- private static final int HSQUARE = 0;
- private static final int SSQUARE = 1;
- private static final int BSQUARE = 2;
- private static final int HSLIDER = 3;
- private static final int SSLIDER = 4;
- private static final int BSLIDER = 5;
-
- protected HSBImage(int type, int width, int height, float h, float s, float b) {
- super(width, height);
- setValues(type, h, s, b);
- }
-
- public void setValues(int type, float h, float s, float b) {
- this.type = type;
- cachedY = -1;
- cachedColor = 0;
- setHue( h );
- setSaturation( s );
- setBrightness( b );
- }
-
- public final void setHue( float hue ) {
- h = hue;
- }
-
- public final void setSaturation( float saturation ) {
- s = saturation;
- }
-
- public final void setBrightness( float brightness ) {
- b = brightness;
- }
-
- public final float getHue() {
- return h;
- }
-
- public final float getSaturation() {
- return s;
- }
-
- public final float getBrightness() {
- return b;
- }
-
- protected boolean isStatic() {
- return false;
- }
-
- public synchronized void nextFrame() {
- isDirty = true;
- notifyAll();
- }
-
- public synchronized void addConsumer(ImageConsumer ic) {
- isDirty = true;
- super.addConsumer(ic);
- }
-
- private int getRGBForLocation( int x, int y ) {
- if (type >= HSLIDER && y == cachedY) {
- return cachedColor;
- }
-
- getHSBForLocation( x, y, hsb );
- cachedY = y;
- cachedColor = Color.HSBtoRGB( hsb[0], hsb[1], hsb[2] );
-
- return cachedColor;
- }
-
- public void getHSBForLocation( int x, int y, float[] hsbArray ) {
- switch (type) {
- case HSQUARE: {
- float saturationStep = ((float)x) / width;
- float brightnessStep = ((float)y) / height;
- hsbArray[0] = h;
- hsbArray[1] = s - saturationStep;
- hsbArray[2] = b - brightnessStep;
- break;
- }
- case SSQUARE: {
- float brightnessStep = ((float)y) / height;
- float step = 1.0f / ((float)width);
- hsbArray[0] = x * step;
- hsbArray[1] = s;
- hsbArray[2] = 1.0f - brightnessStep;
- break;
- }
- case BSQUARE: {
- float saturationStep = ((float)y) / height;
- float step = 1.0f / ((float)width);
- hsbArray[0] = x * step;
- hsbArray[1] = 1.0f - saturationStep;
- hsbArray[2] = b;
- break;
- }
- case HSLIDER: {
- float step = 1.0f / ((float)height);
- hsbArray[0] = y * step;
- hsbArray[1] = s;
- hsbArray[2] = b;
- break;
- }
- case SSLIDER: {
- float saturationStep = ((float)y) / height;
- hsbArray[0] = h;
- hsbArray[1] = s - saturationStep;
- hsbArray[2] = b;
- break;
- }
- case BSLIDER: {
- float brightnessStep = ((float)y) / height;
- hsbArray[0] = h;
- hsbArray[1] = s;
- hsbArray[2] = b - brightnessStep;
- break;
- }
- }
- }
-
- /**
- * Overriden method from SyntheticImage
- */
- protected void computeRow( int y, int[] row ) {
- if ( y == 0 ) {
- synchronized ( this ) {
- try {
- while ( !isDirty ) {
- wait();
- }
- } catch (InterruptedException ie) {
- }
- isDirty = false;
- }
- }
-
- if (aborted) {
- return;
- }
-
- for ( int i = 0; i < row.length; ++i ) {
- row[i] = getRGBForLocation( i, y );
- }
- }
- }
-
- public void stateChanged(ChangeEvent e) {
- if (e.getSource() == slider) {
- boolean modelIsAdjusting = slider.getModel().getValueIsAdjusting();
-
- if (!modelIsAdjusting && !isAdjusting) {
- int sliderValue = slider.getValue();
- int sliderRange = slider.getMaximum();
- float value = (float)sliderValue / (float)sliderRange;
-
- float[] hsb = getHSBColorFromModel();
-
- switch ( currentMode ){
- case HUE_MODE:
- updateHSB(value, hsb[1], hsb[2]);
- break;
- case SATURATION_MODE:
- updateHSB(hsb[0], value, hsb[2]);
- break;
- case BRIGHTNESS_MODE:
- updateHSB(hsb[0], hsb[1], value);
- break;
- }
- }
- } else if (e.getSource() instanceof JSpinner) {
- float hue = ((Integer)hField.getValue()).floatValue() / 359f;
- float saturation = ((Integer)sField.getValue()).floatValue() / 100f;
- float brightness = ((Integer)bField.getValue()).floatValue() / 100f;
-
- updateHSB(hue, saturation, brightness);
- }
- }
-
- public void hierarchyChanged(HierarchyEvent he) {
- if ((he.getChangeFlags() & HierarchyEvent.DISPLAYABILITY_CHANGED) != 0) {
- if (isDisplayable()) {
- initializePalettesIfNecessary();
- } else {
- cleanupPalettesIfNecessary();
- }
- }
- }
-
-}
--- a/jdk/src/share/classes/javax/swing/colorchooser/DefaultRGBChooserPanel.java Fri Oct 10 13:29:11 2008 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,294 +0,0 @@
-/*
- * Copyright 1998-2004 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package javax.swing.colorchooser;
-
-import javax.swing.*;
-import javax.swing.event.*;
-import java.awt.*;
-import java.util.Locale;
-
-/**
- * The standard RGB chooser.
- * <p>
- * <strong>Warning:</strong>
- * Serialized objects of this class will not be compatible with
- * future Swing releases. The current serialization support is
- * appropriate for short term storage or RMI between applications running
- * the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans<sup><font size="-2">TM</font></sup>
- * has been added to the <code>java.beans</code> package.
- * Please see {@link java.beans.XMLEncoder}.
- *
- * @author Steve Wilson
- * @author Mark Davidson
- * @see JColorChooser
- * @see AbstractColorChooserPanel
- */
-class DefaultRGBChooserPanel extends AbstractColorChooserPanel implements ChangeListener {
-
- protected JSlider redSlider;
- protected JSlider greenSlider;
- protected JSlider blueSlider;
- protected JSpinner redField;
- protected JSpinner blueField;
- protected JSpinner greenField;
-
- private final int minValue = 0;
- private final int maxValue = 255;
-
- private boolean isAdjusting = false; // indicates the fields are being set internally
-
- public DefaultRGBChooserPanel() {
- super();
- setInheritsPopupMenu(true);
- }
-
- /**
- * Sets the values of the controls to reflect the color
- */
- private void setColor( Color newColor ) {
- int red = newColor.getRed();
- int blue = newColor.getBlue();
- int green = newColor.getGreen();
-
- if (redSlider.getValue() != red) {
- redSlider.setValue(red);
- }
- if (greenSlider.getValue() != green) {
- greenSlider.setValue(green);
- }
- if (blueSlider.getValue() != blue) {
- blueSlider.setValue(blue);
- }
-
- if (((Integer)redField.getValue()).intValue() != red)
- redField.setValue(new Integer(red));
- if (((Integer)greenField.getValue()).intValue() != green)
- greenField.setValue(new Integer(green));
- if (((Integer)blueField.getValue()).intValue() != blue )
- blueField.setValue(new Integer(blue));
- }
-
- public String getDisplayName() {
- return UIManager.getString("ColorChooser.rgbNameText", getLocale());
- }
-
- /**
- * Provides a hint to the look and feel as to the
- * <code>KeyEvent.VK</code> constant that can be used as a mnemonic to
- * access the panel. A return value <= 0 indicates there is no mnemonic.
- * <p>
- * The return value here is a hint, it is ultimately up to the look
- * and feel to honor the return value in some meaningful way.
- * <p>
- * This implementation looks up the value from the default
- * <code>ColorChooser.rgbMnemonic</code>, or if it
- * isn't available (or not an <code>Integer</code>) returns -1.
- * The lookup for the default is done through the <code>UIManager</code>:
- * <code>UIManager.get("ColorChooser.rgbMnemonic");</code>.
- *
- * @return KeyEvent.VK constant identifying the mnemonic; <= 0 for no
- * mnemonic
- * @see #getDisplayedMnemonicIndex
- * @since 1.4
- */
- public int getMnemonic() {
- return getInt("ColorChooser.rgbMnemonic", -1);
- }
-
- /**
- * Provides a hint to the look and feel as to the index of the character in
- * <code>getDisplayName</code> that should be visually identified as the
- * mnemonic. The look and feel should only use this if
- * <code>getMnemonic</code> returns a value > 0.
- * <p>
- * The return value here is a hint, it is ultimately up to the look
- * and feel to honor the return value in some meaningful way. For example,
- * a look and feel may wish to render each
- * <code>AbstractColorChooserPanel</code> in a <code>JTabbedPane</code>,
- * and further use this return value to underline a character in
- * the <code>getDisplayName</code>.
- * <p>
- * This implementation looks up the value from the default
- * <code>ColorChooser.rgbDisplayedMnemonicIndex</code>, or if it
- * isn't available (or not an <code>Integer</code>) returns -1.
- * The lookup for the default is done through the <code>UIManager</code>:
- * <code>UIManager.get("ColorChooser.rgbDisplayedMnemonicIndex");</code>.
- *
- * @return Character index to render mnemonic for; -1 to provide no
- * visual identifier for this panel.
- * @see #getMnemonic
- * @since 1.4
- */
- public int getDisplayedMnemonicIndex() {
- return getInt("ColorChooser.rgbDisplayedMnemonicIndex", -1);
- }
-
- public Icon getSmallDisplayIcon() {
- return null;
- }
-
- public Icon getLargeDisplayIcon() {
- return null;
- }
-
- /**
- * The background color, foreground color, and font are already set to the
- * defaults from the defaults table before this method is called.
- */
- public void installChooserPanel(JColorChooser enclosingChooser) {
- super.installChooserPanel(enclosingChooser);
- }
-
- protected void buildChooser() {
-
- Locale locale = getLocale();
- String redString = UIManager.getString("ColorChooser.rgbRedText", locale);
- String greenString = UIManager.getString("ColorChooser.rgbGreenText", locale);
- String blueString = UIManager.getString("ColorChooser.rgbBlueText", locale);
-
- setLayout( new BorderLayout() );
- Color color = getColorFromModel();
-
-
- JPanel enclosure = new JPanel();
- enclosure.setLayout( new SmartGridLayout( 3, 3 ) );
- enclosure.setInheritsPopupMenu(true);
-
- // The panel that holds the sliders
-
- add( enclosure, BorderLayout.CENTER );
- // sliderPanel.setBorder(new LineBorder(Color.black));
-
- // The row for the red value
- JLabel l = new JLabel(redString);
- l.setDisplayedMnemonic(getInt("ColorChooser.rgbRedMnemonic", -1));
- enclosure.add(l);
- redSlider = new JSlider(JSlider.HORIZONTAL, 0, 255, color.getRed());
- redSlider.setMajorTickSpacing( 85 );
- redSlider.setMinorTickSpacing( 17 );
- redSlider.setPaintTicks( true );
- redSlider.setPaintLabels( true );
- redSlider.setInheritsPopupMenu(true);
- enclosure.add( redSlider );
- redField = new JSpinner(
- new SpinnerNumberModel(color.getRed(), minValue, maxValue, 1));
- l.setLabelFor(redSlider);
- redField.setInheritsPopupMenu(true);
- JPanel redFieldHolder = new JPanel(new CenterLayout());
- redFieldHolder.setInheritsPopupMenu(true);
- redField.addChangeListener(this);
- redFieldHolder.add(redField);
- enclosure.add(redFieldHolder);
-
-
- // The row for the green value
- l = new JLabel(greenString);
- l.setDisplayedMnemonic(getInt("ColorChooser.rgbGreenMnemonic", -1));
- enclosure.add(l);
- greenSlider = new JSlider(JSlider.HORIZONTAL, 0, 255, color.getGreen());
- greenSlider.setMajorTickSpacing( 85 );
- greenSlider.setMinorTickSpacing( 17 );
- greenSlider.setPaintTicks( true );
- greenSlider.setPaintLabels( true );
- greenSlider.setInheritsPopupMenu(true);
- enclosure.add(greenSlider);
- greenField = new JSpinner(
- new SpinnerNumberModel(color.getGreen(), minValue, maxValue, 1));
- l.setLabelFor(greenSlider);
- greenField.setInheritsPopupMenu(true);
- JPanel greenFieldHolder = new JPanel(new CenterLayout());
- greenFieldHolder.add(greenField);
- greenFieldHolder.setInheritsPopupMenu(true);
- greenField.addChangeListener(this);
- enclosure.add(greenFieldHolder);
-
- // The slider for the blue value
- l = new JLabel(blueString);
- l.setDisplayedMnemonic(getInt("ColorChooser.rgbBlueMnemonic", -1));
- enclosure.add(l);
- blueSlider = new JSlider(JSlider.HORIZONTAL, 0, 255, color.getBlue());
- blueSlider.setMajorTickSpacing( 85 );
- blueSlider.setMinorTickSpacing( 17 );
- blueSlider.setPaintTicks( true );
- blueSlider.setPaintLabels( true );
- blueSlider.setInheritsPopupMenu(true);
- enclosure.add(blueSlider);
- blueField = new JSpinner(
- new SpinnerNumberModel(color.getBlue(), minValue, maxValue, 1));
- l.setLabelFor(blueSlider);
- blueField.setInheritsPopupMenu(true);
- JPanel blueFieldHolder = new JPanel(new CenterLayout());
- blueFieldHolder.add(blueField);
- blueField.addChangeListener(this);
- blueFieldHolder.setInheritsPopupMenu(true);
- enclosure.add(blueFieldHolder);
-
- redSlider.addChangeListener( this );
- greenSlider.addChangeListener( this );
- blueSlider.addChangeListener( this );
-
- redSlider.putClientProperty("JSlider.isFilled", Boolean.TRUE);
- greenSlider.putClientProperty("JSlider.isFilled", Boolean.TRUE);
- blueSlider.putClientProperty("JSlider.isFilled", Boolean.TRUE);
- }
-
- public void uninstallChooserPanel(JColorChooser enclosingChooser) {
- super.uninstallChooserPanel(enclosingChooser);
- removeAll();
- }
-
- public void updateChooser() {
- if (!isAdjusting) {
- isAdjusting = true;
-
- setColor(getColorFromModel());
-
- isAdjusting = false;
- }
- }
-
- public void stateChanged( ChangeEvent e ) {
- if ( e.getSource() instanceof JSlider && !isAdjusting) {
-
- int red = redSlider.getValue();
- int green = greenSlider.getValue();
- int blue = blueSlider.getValue() ;
- Color color = new Color (red, green, blue);
-
- getColorSelectionModel().setSelectedColor(color);
- } else if (e.getSource() instanceof JSpinner && !isAdjusting) {
-
- int red = ((Integer)redField.getValue()).intValue();
- int green = ((Integer)greenField.getValue()).intValue();
- int blue = ((Integer)blueField.getValue()).intValue();
- Color color = new Color (red, green, blue);
-
- getColorSelectionModel().setSelectedColor(color);
- }
- }
-
-}
--- a/jdk/src/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
@@ -213,17 +213,15 @@
class RecentSwatchListener extends MouseAdapter implements Serializable {
public void mousePressed(MouseEvent e) {
Color color = recentSwatchPanel.getColorForLocation(e.getX(), e.getY());
- getColorSelectionModel().setSelectedColor(color);
-
+ setSelectedColor(color);
}
}
class MainSwatchListener extends MouseAdapter implements Serializable {
public void mousePressed(MouseEvent e) {
Color color = swatchPanel.getColorForLocation(e.getX(), e.getY());
- getColorSelectionModel().setSelectedColor(color);
+ setSelectedColor(color);
recentSwatchPanel.setMostRecentColor(color);
-
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/javax/swing/colorchooser/DiagramComponent.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,160 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package javax.swing.colorchooser;
+
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.Insets;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.awt.image.BufferedImage;
+import javax.swing.JComponent;
+
+final class DiagramComponent extends JComponent implements MouseListener, MouseMotionListener {
+
+ private final ColorPanel panel;
+ private final boolean diagram;
+
+ private final Insets insets = new Insets(0, 0, 0, 0);
+
+ private int width;
+ private int height;
+
+ private int[] array;
+ private BufferedImage image;
+
+ DiagramComponent(ColorPanel panel, boolean diagram) {
+ this.panel = panel;
+ this.diagram = diagram;
+ addMouseListener(this);
+ addMouseMotionListener(this);
+ }
+
+ @Override
+ protected void paintComponent(Graphics g) {
+ getInsets(this.insets);
+ this.width = getWidth() - this.insets.left - this.insets.right;
+ this.height = getHeight() - this.insets.top - this.insets.bottom;
+
+ boolean update = (this.image == null)
+ || (this.width != this.image.getWidth())
+ || (this.height != this.image.getHeight());
+ if (update) {
+ int size = this.width * this.height;
+ if ((this.array == null) || (this.array.length < size)) {
+ this.array = new int[size];
+ }
+ this.image = new BufferedImage(this.width, this.height, BufferedImage.TYPE_INT_RGB);
+ }
+ {
+ float dx = 1.0f / (float) (this.width - 1);
+ float dy = 1.0f / (float) (this.height - 1);
+
+ int offset = 0;
+ float y = 0.0f;
+ for (int h = 0; h < this.height; h++, y += dy) {
+ if (this.diagram) {
+ float x = 0.0f;
+ for (int w = 0; w < this.width; w++, x += dx, offset++) {
+ this.array[offset] = this.panel.getColor(x, y);
+ }
+ }
+ else {
+ int color = this.panel.getColor(y);
+ for (int w = 0; w < this.width; w++, offset++) {
+ this.array[offset] = color;
+ }
+ }
+ }
+ }
+ this.image.setRGB(0, 0, this.width, this.height, this.array, 0, this.width);
+ g.drawImage(this.image, this.insets.left, this.insets.top, this.width, this.height, this);
+ if (isEnabled()) {
+ this.width--;
+ this.height--;
+ g.setXORMode(Color.WHITE);
+ g.setColor(Color.BLACK);
+ if (this.diagram) {
+ int x = getValue(this.panel.getValueX(), this.insets.left, this.width);
+ int y = getValue(this.panel.getValueY(), this.insets.top, this.height);
+ g.drawLine(x - 8, y, x + 8, y);
+ g.drawLine(x, y - 8, x, y + 8);
+ }
+ else {
+ int z = getValue(this.panel.getValueZ(), this.insets.top, this.height);
+ g.drawLine(this.insets.left, z, this.insets.left + this.width, z);
+ }
+ g.setPaintMode();
+ }
+ }
+
+ public void mousePressed(MouseEvent event) {
+ mouseDragged(event);
+ }
+
+ public void mouseReleased(MouseEvent event) {
+ }
+
+ public void mouseClicked(MouseEvent event) {
+ }
+
+ public void mouseEntered(MouseEvent event) {
+ }
+
+ public void mouseExited(MouseEvent event) {
+ }
+
+ public void mouseMoved(MouseEvent event) {
+ }
+
+ public void mouseDragged(MouseEvent event) {
+ if (isEnabled()) {
+ float y = getValue(event.getY(), this.insets.top, this.height);
+ if (this.diagram) {
+ float x = getValue(event.getX(), this.insets.left, this.width);
+ this.panel.setValue(x, y);
+ }
+ else {
+ this.panel.setValue(y);
+ }
+ }
+ }
+
+ private static int getValue(float value, int min, int max) {
+ return min + (int) (value * (float) (max));
+ }
+
+ private static float getValue(int value, int min, int max) {
+ if (min < value) {
+ value -= min;
+ return (value < max)
+ ? (float) value / (float) max
+ : 1.0f;
+ }
+ return 0.0f;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/javax/swing/colorchooser/SlidingSpinner.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package javax.swing.colorchooser;
+
+import javax.swing.JComponent;
+import javax.swing.JSlider;
+import javax.swing.JSpinner;
+import javax.swing.JSpinner.DefaultEditor;
+import javax.swing.SpinnerNumberModel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+final class SlidingSpinner implements ChangeListener {
+
+ private final ColorPanel panel;
+ private final JComponent label;
+ private final SpinnerNumberModel model = new SpinnerNumberModel();
+ private final JSlider slider = new JSlider();
+ private final JSpinner spinner = new JSpinner(this.model);
+ private float value;
+ private boolean internal;
+
+ SlidingSpinner(ColorPanel panel, JComponent label) {
+ this.panel = panel;
+ this.label = label;
+ this.slider.addChangeListener(this);
+ this.spinner.addChangeListener(this);
+ DefaultEditor editor = (DefaultEditor) this.spinner.getEditor();
+ ValueFormatter.init(3, false, editor.getTextField());
+ editor.setFocusable(false);
+ this.spinner.setFocusable(false);
+ }
+
+ JComponent getLabel() {
+ return this.label;
+ }
+
+ JSlider getSlider() {
+ return this.slider;
+ }
+
+ JSpinner getSpinner() {
+ return this.spinner;
+ }
+
+ float getValue() {
+ return this.value;
+ }
+
+ void setValue(float value) {
+ int min = this.slider.getMinimum();
+ int max = this.slider.getMaximum();
+ this.internal = true;
+ this.slider.setValue(min + (int) (value * (float) (max - min)));
+ this.spinner.setValue(Integer.valueOf(this.slider.getValue()));
+ this.internal = false;
+ this.value = value;
+ }
+
+ void setRange(int min, int max) {
+ this.internal = true;
+ this.slider.setMinimum(min);
+ this.slider.setMaximum(max);
+ this.model.setMinimum(Integer.valueOf(min));
+ this.model.setMaximum(Integer.valueOf(max));
+ this.internal = false;
+ }
+
+ void setVisible(boolean visible) {
+ this.label.setVisible(visible);
+ this.slider.setVisible(visible);
+ this.spinner.setVisible(visible);
+ }
+
+ public void stateChanged(ChangeEvent event) {
+ if (!this.internal) {
+ if (this.spinner == event.getSource()) {
+ Object value = this.spinner.getValue();
+ if (value instanceof Integer) {
+ this.internal = true;
+ this.slider.setValue((Integer) value);
+ this.internal = false;
+ }
+ }
+ int value = this.slider.getValue();
+ this.internal = true;
+ this.spinner.setValue(Integer.valueOf(value));
+ this.internal = false;
+ int min = this.slider.getMinimum();
+ int max = this.slider.getMaximum();
+ this.value = (float) (value - min) / (float) (max - min);
+ this.panel.colorChanged();
+ }
+ }
+}
--- a/jdk/src/share/classes/javax/swing/colorchooser/SyntheticImage.java Fri Oct 10 13:29:11 2008 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,166 +0,0 @@
-/*
- * Copyright 1997-2003 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package javax.swing.colorchooser;
-
-import java.awt.*;
-import java.awt.image.*;
-
-/** A helper class to make computing synthetic images a little easier.
- * All you need to do is define a subclass that overrides computeRow
- * to compute a row of the image. It is passed the y coordinate of the
- * row and an array into which to put the pixels in
- * <a href="http://java.sun.com/products/jdk/1.1/docs/api/java.awt.image.ColorModel.html#getRGBdefault()">
- * standard ARGB format</a>.
- * <p>Normal usage looks something like this:
- * <pre> Image i = createImage(new SyntheticImage(200, 100) {
- * protected void computeRow(int y, int[] row) {
- * for(int i = width; --i>=0; ) {
- * int grey = i*255/(width-1);
- * row[i] = (255<<24)|(grey<<16)|(grey<<8)|grey;
- * }
- * }
- * }
- * </pre>This creates a image 200 pixels wide and 100 pixels high
- * that is a horizontal grey ramp, going from black on the left to
- * white on the right.
- * <p>
- * If the image is to be a movie, override isStatic to return false,
- * <i>y</i> cycling back to 0 is computeRow's signal that the next
- * frame has started. It is acceptable (expected?) for computeRow(0,r)
- * to pause until the appropriate time to start the next frame.
- *
- * @author James Gosling
- */
-abstract class SyntheticImage implements ImageProducer {
- private SyntheticImageGenerator root;
- protected int width=10, height=100;
- static final ColorModel cm = ColorModel.getRGBdefault();
- public static final int pixMask = 0xFF;
- private Thread runner;
- protected SyntheticImage() { }
- protected SyntheticImage(int w, int h) { width = w; height = h; }
- protected void computeRow(int y, int[] row) {
- int p = 255-255*y/(height-1);
- p = (pixMask<<24)|(p<<16)|(p<<8)|p;
- for (int i = row.length; --i>=0; ) row[i] = p;
- }
- public synchronized void addConsumer(ImageConsumer ic){
- for (SyntheticImageGenerator ics = root; ics != null; ics = ics.next)
- if (ics.ic == ic) return;
- root = new SyntheticImageGenerator(ic, root, this);
- }
- public synchronized boolean isConsumer(ImageConsumer ic){
- for (SyntheticImageGenerator ics = root; ics != null; ics = ics.next)
- if (ics.ic == ic) return true;
- return false;
- }
- public synchronized void removeConsumer(ImageConsumer ic) {
- SyntheticImageGenerator prev = null;
- for (SyntheticImageGenerator ics = root; ics != null; ics = ics.next) {
- if (ics.ic == ic) {
- ics.useful = false;
- if (prev!=null) prev.next = ics.next;
- else root = ics.next;
- return;
- }
- prev = ics;
- }
- }
- public synchronized void startProduction(ImageConsumer ic) {
- addConsumer(ic);
- for (SyntheticImageGenerator ics = root; ics != null; ics = ics.next)
- if (ics.useful && !ics.isAlive())
- ics.start();
- }
- protected boolean isStatic() { return true; }
- public void nextFrame(int param) {}//Override if !isStatic
- public void requestTopDownLeftRightResend(ImageConsumer ic){}
-
- protected volatile boolean aborted = false;
-}
-
-class SyntheticImageGenerator extends Thread {
- ImageConsumer ic;
- boolean useful;
- SyntheticImageGenerator next;
- SyntheticImage parent;
- SyntheticImageGenerator(ImageConsumer ic, SyntheticImageGenerator next,
- SyntheticImage parent) {
- super("SyntheticImageGenerator");
- this.ic = ic;
- this.next = next;
- this.parent = parent;
- useful = true;
- setDaemon(true);
- }
- public void run() {
- ImageConsumer ic = this.ic;
- int w = parent.width;
- int h = parent.height;
- int hints = ic.SINGLEPASS|ic.COMPLETESCANLINES|ic.TOPDOWNLEFTRIGHT;
- if (parent.isStatic())
- hints |= ic.SINGLEFRAME;
- ic.setHints(hints);
- ic.setDimensions(w, h);
- ic.setProperties(null);
- ic.setColorModel(parent.cm);
-
- if (useful) {
- int[] row=new int[w];
- doPrivileged( new Runnable() {
- public void run() {
- Thread.currentThread().setPriority(Thread.MIN_PRIORITY);
- }
- });
-
- do {
- for (int y = 0; y<h && useful; y++) {
- parent.computeRow(y,row);
-
- if (parent.aborted) {
- ic.imageComplete(ic.IMAGEABORTED);
- return;
- }
-
- ic.setPixels(0, y, w, 1, parent.cm, row, 0, w);
- }
- ic.imageComplete(parent.isStatic() ? ic.STATICIMAGEDONE
- : ic.SINGLEFRAMEDONE );
- } while(!parent.isStatic() && useful);
- }
- }
-
- private final static void doPrivileged(final Runnable doRun) {
- java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
- public Object run() {
- doRun.run();
- return null;
- }
- }
- );
- }
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/javax/swing/colorchooser/ValueFormatter.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package javax.swing.colorchooser;
+
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.text.ParseException;
+import static java.util.Locale.ENGLISH;
+import javax.swing.JFormattedTextField;
+import javax.swing.JFormattedTextField.AbstractFormatter;
+import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
+import javax.swing.text.AttributeSet;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.DefaultFormatterFactory;
+import javax.swing.text.DocumentFilter;
+
+final class ValueFormatter extends AbstractFormatter implements FocusListener, Runnable {
+
+ static void init(int length, boolean hex, JFormattedTextField text) {
+ ValueFormatter formatter = new ValueFormatter(length, hex);
+ text.setColumns(length);
+ text.setFormatterFactory(new DefaultFormatterFactory(formatter));
+ text.setHorizontalAlignment(SwingConstants.RIGHT);
+ text.setMinimumSize(text.getPreferredSize());
+ text.addFocusListener(formatter);
+ }
+
+ private final DocumentFilter filter = new DocumentFilter() {
+ @Override
+ public void remove(FilterBypass fb, int offset, int length) throws BadLocationException {
+ if (isValid(fb.getDocument().getLength() - length)) {
+ fb.remove(offset, length);
+ }
+ }
+
+ @Override
+ public void replace(FilterBypass fb, int offset, int length, String text, AttributeSet set) throws BadLocationException {
+ if (isValid(fb.getDocument().getLength() + text.length() - length) && isValid(text)) {
+ fb.replace(offset, length, text.toUpperCase(ENGLISH), set);
+ }
+ }
+
+ @Override
+ public void insertString(FilterBypass fb, int offset, String text, AttributeSet set) throws BadLocationException {
+ if (isValid(fb.getDocument().getLength() + text.length()) && isValid(text)) {
+ fb.insertString(offset, text.toUpperCase(ENGLISH), set);
+ }
+ }
+ };
+
+ private final int length;
+ private final int radix;
+
+ private JFormattedTextField text;
+
+ ValueFormatter(int length, boolean hex) {
+ this.length = length;
+ this.radix = hex ? 16 : 10;
+ }
+
+ @Override
+ public Object stringToValue(String text) throws ParseException {
+ try {
+ return Integer.valueOf(text, this.radix);
+ }
+ catch (NumberFormatException nfe) {
+ ParseException pe = new ParseException("illegal format", 0);
+ pe.initCause(nfe);
+ throw pe;
+ }
+ }
+
+ @Override
+ public String valueToString(Object object) throws ParseException {
+ if (object instanceof Integer) {
+ if (this.radix == 10) {
+ return object.toString();
+ }
+ int value = (Integer) object;
+ int index = this.length;
+ char[] array = new char[index];
+ while (0 < index--) {
+ array[index] = Character.forDigit(value & 0x0F, this.radix);
+ value >>= 4;
+ }
+ return new String(array).toUpperCase(ENGLISH);
+ }
+ throw new ParseException("illegal object", 0);
+ }
+
+ @Override
+ protected DocumentFilter getDocumentFilter() {
+ return this.filter;
+ }
+
+ public void focusGained(FocusEvent event) {
+ Object source = event.getSource();
+ if (source instanceof JFormattedTextField) {
+ this.text = (JFormattedTextField) source;
+ SwingUtilities.invokeLater(this);
+ }
+ }
+
+ public void focusLost(FocusEvent event) {
+ }
+
+ public void run() {
+ if (this.text != null) {
+ this.text.selectAll();
+ }
+ }
+
+ private boolean isValid(int length) {
+ return (0 <= length) && (length <= this.length);
+ }
+
+ private boolean isValid(String text) {
+ int length = text.length();
+ for (int i = 0; i < length; i++) {
+ char ch = text.charAt(i);
+ if (Character.digit(ch, this.radix) < 0) {
+ return false;
+ }
+ }
+ return true;
+ }
+}
--- a/jdk/src/share/classes/javax/swing/filechooser/FileSystemView.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/filechooser/FileSystemView.java Wed Jul 05 16:42:37 2017 +0200
@@ -136,8 +136,8 @@
}
File[] roots = getRoots();
- for (int i = 0; i < roots.length; i++) {
- if (roots[i].equals(f)) {
+ for (File root : roots) {
+ if (root.equals(f)) {
return true;
}
}
@@ -252,8 +252,8 @@
return true;
}
File[] children = getFiles(folder, false);
- for (int i = 0; i < children.length; i++) {
- if (file.equals(children[i])) {
+ for (File child : children) {
+ if (file.equals(child)) {
return true;
}
}
@@ -276,9 +276,9 @@
public File getChild(File parent, String fileName) {
if (parent instanceof ShellFolder) {
File[] children = getFiles(parent, false);
- for (int i = 0; i < children.length; i++) {
- if (children[i].getName().equals(fileName)) {
- return children[i];
+ for (File child : children) {
+ if (child.getName().equals(fileName)) {
+ return child;
}
}
}
@@ -444,7 +444,7 @@
* Gets the list of shown (i.e. not hidden) files.
*/
public File[] getFiles(File dir, boolean useFileHiding) {
- Vector files = new Vector();
+ Vector<File> files = new Vector<File>();
// add all files in dir
@@ -483,7 +483,7 @@
}
}
- return (File[])files.toArray(new File[files.size()]);
+ return files.toArray(new File[files.size()]);
}
@@ -590,7 +590,7 @@
if(containingDir == null) {
throw new IOException("Containing directory is null:");
}
- File newFolder = null;
+ File newFolder;
// Unix - using OpenWindows' default folder name. Can't find one for Motif/CDE.
newFolder = createFileObject(containingDir, newFolderString);
int i = 1;
@@ -614,11 +614,7 @@
}
public boolean isDrive(File dir) {
- if (isFloppyDrive(dir)) {
- return true;
- } else {
- return false;
- }
+ return isFloppyDrive(dir);
}
public boolean isFloppyDrive(File dir) {
@@ -700,9 +696,8 @@
if(containingDir == null) {
throw new IOException("Containing directory is null:");
}
- File newFolder = null;
// Using NT's default folder name
- newFolder = createFileObject(containingDir, newFolderString);
+ File newFolder = createFileObject(containingDir, newFolderString);
int i = 2;
while (newFolder.exists() && (i < 100)) {
newFolder = createFileObject(containingDir, MessageFormat.format(
@@ -770,9 +765,8 @@
if(containingDir == null) {
throw new IOException("Containing directory is null:");
}
- File newFolder = null;
// Using NT's default folder name
- newFolder = createFileObject(containingDir, newFolderString);
+ File newFolder = createFileObject(containingDir, newFolderString);
if(newFolder.exists()) {
throw new IOException("Directory already exists:" + newFolder.getAbsolutePath());
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicButtonListener.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicButtonListener.java Wed Jul 05 16:42:37 2017 +0200
@@ -165,7 +165,7 @@
JRootPane root = b.getRootPane();
if (root != null) {
BasicButtonUI ui = (BasicButtonUI)BasicLookAndFeel.getUIOfType(
- ((AbstractButton)b).getUI(), BasicButtonUI.class);
+ b.getUI(), BasicButtonUI.class);
if (ui != null && DefaultLookup.getBoolean(b, ui,
ui.getPropertyPrefix() +
"defaultButtonFollowsFocus", true)) {
@@ -185,7 +185,7 @@
JButton initialDefault = (JButton)root.getClientProperty("initialDefaultButton");
if (b != initialDefault) {
BasicButtonUI ui = (BasicButtonUI)BasicLookAndFeel.getUIOfType(
- ((AbstractButton)b).getUI(), BasicButtonUI.class);
+ b.getUI(), BasicButtonUI.class);
if (ui != null && DefaultLookup.getBoolean(b, ui,
ui.getPropertyPrefix() +
"defaultButtonFollowsFocus", true)) {
@@ -239,7 +239,7 @@
}
}
}
- };
+ }
public void mouseReleased(MouseEvent e) {
if (SwingUtilities.isLeftMouseButton(e)) {
@@ -253,7 +253,7 @@
model.setPressed(false);
model.setArmed(false);
}
- };
+ }
public void mouseEntered(MouseEvent e) {
AbstractButton b = (AbstractButton) e.getSource();
@@ -263,7 +263,7 @@
}
if (model.isPressed())
model.setArmed(true);
- };
+ }
public void mouseExited(MouseEvent e) {
AbstractButton b = (AbstractButton) e.getSource();
@@ -272,7 +272,7 @@
model.setRollover(false);
}
model.setArmed(false);
- };
+ }
/**
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicButtonUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicButtonUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -237,7 +237,7 @@
/* the fallback icon should be based on the selected state */
if (model.isSelected()) {
- selectedIcon = (Icon) b.getSelectedIcon();
+ selectedIcon = b.getSelectedIcon();
if (selectedIcon != null) {
icon = selectedIcon;
}
@@ -245,31 +245,31 @@
if(!model.isEnabled()) {
if(model.isSelected()) {
- tmpIcon = (Icon) b.getDisabledSelectedIcon();
+ tmpIcon = b.getDisabledSelectedIcon();
if (tmpIcon == null) {
tmpIcon = selectedIcon;
}
}
if (tmpIcon == null) {
- tmpIcon = (Icon) b.getDisabledIcon();
+ tmpIcon = b.getDisabledIcon();
}
} else if(model.isPressed() && model.isArmed()) {
- tmpIcon = (Icon) b.getPressedIcon();
+ tmpIcon = b.getPressedIcon();
if(tmpIcon != null) {
// revert back to 0 offset
clearTextShiftOffset();
}
} else if(b.isRolloverEnabled() && model.isRollover()) {
if(model.isSelected()) {
- tmpIcon = (Icon) b.getRolloverSelectedIcon();
+ tmpIcon = b.getRolloverSelectedIcon();
if (tmpIcon == null) {
tmpIcon = selectedIcon;
}
}
if (tmpIcon == null) {
- tmpIcon = (Icon) b.getRolloverIcon();
+ tmpIcon = b.getRolloverIcon();
}
}
@@ -451,9 +451,9 @@
MouseMotionListener[] listeners = b.getMouseMotionListeners();
if (listeners != null) {
- for (int counter = 0; counter < listeners.length; counter++) {
- if (listeners[counter] instanceof BasicButtonListener) {
- return (BasicButtonListener)listeners[counter];
+ for (MouseMotionListener listener : listeners) {
+ if (listener instanceof BasicButtonListener) {
+ return (BasicButtonListener) listener;
}
}
}
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicColorChooserUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicColorChooserUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -299,8 +299,10 @@
tabbedPane.addTab(name, centerWrapper);
if (mnemonic > 0) {
tabbedPane.setMnemonicAt(i, mnemonic);
- tabbedPane.setDisplayedMnemonicIndexAt(
- i, newPanels[i].getDisplayedMnemonicIndex());
+ int index = newPanels[i].getDisplayedMnemonicIndex();
+ if (index >= 0) {
+ tabbedPane.setDisplayedMnemonicIndexAt(i, index);
+ }
}
}
}
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java Wed Jul 05 16:42:37 2017 +0200
@@ -92,7 +92,7 @@
return oldValue;
} else {
// Must take the value from the editor and get the value and cast it to the new type.
- Class cls = oldValue.getClass();
+ Class<?> cls = oldValue.getClass();
try {
Method method = cls.getMethod("valueOf", new Class[]{String.class});
newValue = method.invoke(oldValue, new Object[] { editor.getText()});
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -1509,15 +1509,21 @@
|| ui.isTableCellEditor) {
Object listItem = ui.popup.getList().getSelectedValue();
if (listItem != null) {
- comboBox.getModel().setSelectedItem(listItem);
- // Ensure that JComboBox.actionPerformed()
- // doesn't set editor value as selected item
+ // Use the selected value from popup
+ // to set the selected item in combo box,
+ // but ensure before that JComboBox.actionPerformed()
+ // won't use editor's value to set the selected item
comboBox.getEditor().setItem(listItem);
+ comboBox.setSelectedItem(listItem);
}
}
comboBox.setPopupVisible(false);
}
else {
+ // Hide combo box if it is a table cell editor
+ if (ui.isTableCellEditor && !comboBox.isEditable()) {
+ comboBox.setSelectedItem(comboBox.getSelectedItem());
+ }
// Call the default button binding.
// This is a pretty messy way of passing an event through
// to the root pane.
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicDesktopIconUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicDesktopIconUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
@@ -47,6 +47,7 @@
protected JInternalFrame.JDesktopIcon desktopIcon;
protected JInternalFrame frame;
+ private DesktopIconMover desktopIconMover;
/**
* The title pane component used in the desktop icon.
@@ -127,12 +128,21 @@
mouseInputListener = createMouseInputListener();
desktopIcon.addMouseMotionListener(mouseInputListener);
desktopIcon.addMouseListener(mouseInputListener);
+ getDesktopIconMover().installListeners();
}
protected void uninstallListeners() {
desktopIcon.removeMouseMotionListener(mouseInputListener);
desktopIcon.removeMouseListener(mouseInputListener);
mouseInputListener = null;
+ getDesktopIconMover().uninstallListeners();
+ }
+
+ private DesktopIconMover getDesktopIconMover() {
+ if (desktopIconMover == null) {
+ desktopIconMover = new DesktopIconMover(desktopIcon);
+ }
+ return desktopIconMover;
}
protected void installDefaults() {
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java Wed Jul 05 16:42:37 2017 +0200
@@ -43,10 +43,10 @@
private JFileChooser filechooser = null;
// PENDING(jeff) pick the size more sensibly
- private Vector fileCache = new Vector(50);
+ private Vector<File> fileCache = new Vector<File>(50);
private LoadFilesThread loadThread = null;
- private Vector files = null;
- private Vector directories = null;
+ private Vector<File> files = null;
+ private Vector<File> directories = null;
private int fetchID = 0;
private PropertyChangeSupport changeSupport;
@@ -106,14 +106,14 @@
if (files != null) {
return files;
}
- files = new Vector();
- directories = new Vector();
+ files = new Vector<File>();
+ directories = new Vector<File>();
directories.addElement(filechooser.getFileSystemView().createFileObject(
filechooser.getCurrentDirectory(), "..")
);
for (int i = 0; i < getSize(); i++) {
- File f = (File)fileCache.get(i);
+ File f = fileCache.get(i);
if (filechooser.isTraversable(f)) {
directories.add(f);
} else {
@@ -215,7 +215,7 @@
class LoadFilesThread extends Thread {
File currentDirectory = null;
int fid;
- Vector runnables = new Vector(10);
+ Vector<DoChangeContents> runnables = new Vector<DoChangeContents>(10);
public LoadFilesThread(File currentDirectory, int fid) {
super("Basic L&F File Loading Thread");
@@ -223,7 +223,7 @@
this.fid = fid;
}
- private void invokeLater(Runnable runnable) {
+ private void invokeLater(DoChangeContents runnable) {
runnables.addElement(runnable);
SwingUtilities.invokeLater(runnable);
}
@@ -245,9 +245,9 @@
}
// run through the file list, add directories and selectable files to fileCache
- for (int i = 0; i < list.length; i++) {
- if(filechooser.accept(list[i])) {
- acceptsList.addElement(list[i]);
+ for (File file : list) {
+ if (filechooser.accept(file)) {
+ acceptsList.addElement(file);
}
}
@@ -258,11 +258,11 @@
// First sort alphabetically by filename
sort(acceptsList);
- Vector newDirectories = new Vector(50);
- Vector newFiles = new Vector();
+ Vector<File> newDirectories = new Vector<File>(50);
+ Vector<File> newFiles = new Vector<File>();
// run through list grabbing directories in chunks of ten
for(int i = 0; i < acceptsList.size(); i++) {
- File f = (File) acceptsList.elementAt(i);
+ File f = acceptsList.elementAt(i);
boolean isTraversable = filechooser.isTraversable(f);
if (isTraversable) {
newDirectories.addElement(f);
@@ -274,7 +274,7 @@
}
}
- Vector newFileCache = new Vector(newDirectories);
+ Vector<File> newFileCache = new Vector<File>(newDirectories);
newFileCache.addAll(newFiles);
int newSize = newFileCache.size();
@@ -320,7 +320,7 @@
if(isInterrupted()) {
return;
}
- invokeLater(new DoChangeContents(null, 0, new Vector(fileCache.subList(start, end)),
+ invokeLater(new DoChangeContents(null, 0, new Vector<File>(fileCache.subList(start, end)),
start, fid));
newFileCache = null;
}
@@ -334,9 +334,9 @@
}
- public void cancelRunnables(Vector runnables) {
- for(int i = 0; i < runnables.size(); i++) {
- ((DoChangeContents)runnables.elementAt(i)).cancel();
+ public void cancelRunnables(Vector<DoChangeContents> runnables) {
+ for (DoChangeContents runnable : runnables) {
+ runnable.cancel();
}
}
@@ -449,15 +449,14 @@
class DoChangeContents implements Runnable {
- private List addFiles;
- private List remFiles;
+ private List<File> addFiles;
+ private List<File> remFiles;
private boolean doFire = true;
private int fid;
private int addStart = 0;
private int remStart = 0;
- private int change;
- public DoChangeContents(List addFiles, int addStart, List remFiles, int remStart, int fid) {
+ public DoChangeContents(List<File> addFiles, int addStart, List<File> remFiles, int remStart, int fid) {
this.addFiles = addFiles;
this.addStart = addStart;
this.remFiles = remFiles;
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -36,6 +36,7 @@
import java.beans.*;
import java.io.*;
import java.util.*;
+import java.util.List;
import java.util.regex.*;
import sun.awt.shell.ShellFolder;
import sun.swing.*;
@@ -159,9 +160,9 @@
}
public void uninstallUI(JComponent c) {
- uninstallListeners((JFileChooser) filechooser);
- uninstallComponents((JFileChooser) filechooser);
- uninstallDefaults((JFileChooser) filechooser);
+ uninstallListeners(filechooser);
+ uninstallComponents(filechooser);
+ uninstallDefaults(filechooser);
if(accessoryPanel != null) {
accessoryPanel.removeAll();
@@ -506,9 +507,9 @@
setDirectorySelected(true);
setDirectory(((File)objects[0]));
} else {
- ArrayList fList = new ArrayList(objects.length);
- for (int i = 0; i < objects.length; i++) {
- File f = (File)objects[i];
+ ArrayList<File> fList = new ArrayList<File>(objects.length);
+ for (Object object : objects) {
+ File f = (File) object;
boolean isDir = f.isDirectory();
if ((chooser.isFileSelectionEnabled() && !isDir)
|| (chooser.isDirectorySelectionEnabled()
@@ -518,7 +519,7 @@
}
}
if (fList.size() > 0) {
- files = (File[])fList.toArray(new File[fList.size()]);
+ files = fList.toArray(new File[fList.size()]);
}
setDirectorySelected(false);
}
@@ -829,11 +830,17 @@
File dir = chooser.getCurrentDirectory();
if (filename != null) {
- // Remove whitespace from beginning and end of filename
- filename = filename.trim();
+ // Remove whitespaces from end of filename
+ int i = filename.length() - 1;
+
+ while (i >=0 && filename.charAt(i) <= ' ') {
+ i--;
+ }
+
+ filename = filename.substring(0, i + 1);
}
- if (filename == null || filename.equals("")) {
+ if (filename == null || filename.length() == 0) {
// no file selected, multiple selection off, therefore cancel the approve action
resetGlobFilter();
return;
@@ -842,100 +849,93 @@
File selectedFile = null;
File[] selectedFiles = null;
- if (filename != null && !filename.equals("")) {
- // Unix: Resolve '~' to user's home directory
- if (File.separatorChar == '/') {
- if (filename.startsWith("~/")) {
- filename = System.getProperty("user.home") + filename.substring(1);
- } else if (filename.equals("~")) {
- filename = System.getProperty("user.home");
+ // Unix: Resolve '~' to user's home directory
+ if (File.separatorChar == '/') {
+ if (filename.startsWith("~/")) {
+ filename = System.getProperty("user.home") + filename.substring(1);
+ } else if (filename.equals("~")) {
+ filename = System.getProperty("user.home");
+ }
+ }
+
+ if (chooser.isMultiSelectionEnabled() && filename.length() > 1 &&
+ filename.charAt(0) == '"' && filename.charAt(filename.length() - 1) == '"') {
+ List<File> fList = new ArrayList<File>();
+
+ String[] files = filename.substring(1, filename.length() - 1).split("\" \"");
+ // Optimize searching files by names in "children" array
+ Arrays.sort(files);
+
+ File[] children = null;
+ int childIndex = 0;
+
+ for (String str : files) {
+ File file = fs.createFileObject(str);
+ if (!file.isAbsolute()) {
+ if (children == null) {
+ children = fs.getFiles(dir, false);
+ Arrays.sort(children);
+ }
+ for (int k = 0; k < children.length; k++) {
+ int l = (childIndex + k) % children.length;
+ if (children[l].getName().equals(str)) {
+ file = children[l];
+ childIndex = l + 1;
+ break;
+ }
+ }
+ }
+ fList.add(file);
+ }
+
+ if (!fList.isEmpty()) {
+ selectedFiles = fList.toArray(new File[fList.size()]);
+ }
+ resetGlobFilter();
+ } else {
+ selectedFile = fs.createFileObject(filename);
+ if (!selectedFile.isAbsolute()) {
+ selectedFile = fs.getChild(dir, filename);
+ }
+ // check for wildcard pattern
+ FileFilter currentFilter = chooser.getFileFilter();
+ if (!selectedFile.exists() && isGlobPattern(filename)) {
+ changeDirectory(selectedFile.getParentFile());
+ if (globFilter == null) {
+ globFilter = new GlobFilter();
+ }
+ try {
+ globFilter.setPattern(selectedFile.getName());
+ if (!(currentFilter instanceof GlobFilter)) {
+ actualFileFilter = currentFilter;
+ }
+ chooser.setFileFilter(null);
+ chooser.setFileFilter(globFilter);
+ return;
+ } catch (PatternSyntaxException pse) {
+ // Not a valid glob pattern. Abandon filter.
}
}
- if (chooser.isMultiSelectionEnabled() && filename.startsWith("\"")) {
- ArrayList fList = new ArrayList();
+ resetGlobFilter();
- filename = filename.substring(1);
- if (filename.endsWith("\"")) {
- filename = filename.substring(0, filename.length()-1);
- }
- File[] children = null;
- int childIndex = 0;
- do {
- String str;
- int i = filename.indexOf("\" \"");
- if (i > 0) {
- str = filename.substring(0, i);
- filename = filename.substring(i+3);
- } else {
- str = filename;
- filename = "";
- }
- File file = fs.createFileObject(str);
- if (!file.isAbsolute()) {
- if (children == null) {
- children = fs.getFiles(dir, false);
- Arrays.sort(children);
- }
- for (int k = 0; k < children.length; k++) {
- int l = (childIndex + k) % children.length;
- if (children[l].getName().equals(str)) {
- file = children[l];
- childIndex = l + 1;
- break;
- }
- }
- }
- fList.add(file);
- } while (filename.length() > 0);
- if (fList.size() > 0) {
- selectedFiles = (File[])fList.toArray(new File[fList.size()]);
- }
- resetGlobFilter();
- } else {
- selectedFile = fs.createFileObject(filename);
- if(!selectedFile.isAbsolute()) {
- selectedFile = fs.getChild(dir, filename);
- }
- // check for wildcard pattern
- FileFilter currentFilter = chooser.getFileFilter();
- if (!selectedFile.exists() && isGlobPattern(filename)) {
- changeDirectory(selectedFile.getParentFile());
- if (globFilter == null) {
- globFilter = new GlobFilter();
- }
- try {
- globFilter.setPattern(selectedFile.getName());
- if (!(currentFilter instanceof GlobFilter)) {
- actualFileFilter = currentFilter;
- }
- chooser.setFileFilter(null);
- chooser.setFileFilter(globFilter);
- return;
- } catch (PatternSyntaxException pse) {
- // Not a valid glob pattern. Abandon filter.
- }
- }
+ // Check for directory change action
+ boolean isDir = (selectedFile != null && selectedFile.isDirectory());
+ boolean isTrav = (selectedFile != null && chooser.isTraversable(selectedFile));
+ boolean isDirSelEnabled = chooser.isDirectorySelectionEnabled();
+ boolean isFileSelEnabled = chooser.isFileSelectionEnabled();
+ boolean isCtrl = (e != null && (e.getModifiers() & ActionEvent.CTRL_MASK) != 0);
- resetGlobFilter();
-
- // Check for directory change action
- boolean isDir = (selectedFile != null && selectedFile.isDirectory());
- boolean isTrav = (selectedFile != null && chooser.isTraversable(selectedFile));
- boolean isDirSelEnabled = chooser.isDirectorySelectionEnabled();
- boolean isFileSelEnabled = chooser.isFileSelectionEnabled();
- boolean isCtrl = (e != null && (e.getModifiers() & ActionEvent.CTRL_MASK) != 0);
-
- if (isDir && isTrav && (isCtrl || !isDirSelEnabled)) {
- changeDirectory(selectedFile);
- return;
- } else if ((isDir || !isFileSelEnabled)
- && (!isDir || !isDirSelEnabled)
- && (!isDirSelEnabled || selectedFile.exists())) {
- selectedFile = null;
- }
+ if (isDir && isTrav && (isCtrl || !isDirSelEnabled)) {
+ changeDirectory(selectedFile);
+ return;
+ } else if ((isDir || !isFileSelEnabled)
+ && (!isDir || !isDirSelEnabled)
+ && (!isDirSelEnabled || selectedFile.exists())) {
+ selectedFile = null;
}
}
+
if (selectedFiles != null || selectedFile != null) {
if (selectedFiles != null || chooser.isMultiSelectionEnabled()) {
if (selectedFiles == null) {
@@ -1213,7 +1213,7 @@
}
public Icon getCachedIcon(File f) {
- return (Icon) iconCache.get(f);
+ return iconCache.get(f);
}
public void cacheIcon(File f, Icon i) {
@@ -1296,8 +1296,7 @@
htmlBuf.append("<html>\n<body>\n<ul>\n");
- for (int i = 0; i < values.length; i++) {
- Object obj = values[i];
+ for (Object obj : values) {
String val = ((obj == null) ? "" : obj.toString());
plainBuf.append(val + "\n");
htmlBuf.append(" <li>" + val + "\n");
@@ -1337,9 +1336,9 @@
*/
protected Object getRicherData(DataFlavor flavor) {
if (DataFlavor.javaFileListFlavor.equals(flavor)) {
- ArrayList files = new ArrayList();
- for (int i = 0; i < fileData.length; i++) {
- files.add(fileData[i]);
+ ArrayList<Object> files = new ArrayList<Object>();
+ for (Object file : this.fileData) {
+ files.add(file);
}
return files;
}
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicGraphicsUtils.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicGraphicsUtils.java Wed Jul 05 16:42:37 2017 +0200
@@ -266,7 +266,7 @@
return null;
}
- Icon icon = (Icon) b.getIcon();
+ Icon icon = b.getIcon();
String text = b.getText();
Font font = b.getFont();
@@ -277,7 +277,7 @@
Rectangle viewR = new Rectangle(Short.MAX_VALUE, Short.MAX_VALUE);
SwingUtilities.layoutCompoundLabel(
- (JComponent) b, fm, text, icon,
+ b, fm, text, icon,
b.getVerticalAlignment(), b.getHorizontalAlignment(),
b.getVerticalTextPosition(), b.getHorizontalTextPosition(),
viewR, iconR, textR, (text == null ? 0 : textIconGap)
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java Wed Jul 05 16:42:37 2017 +0200
@@ -86,6 +86,7 @@
protected Action moveAction;
protected Action sizeAction;
+ // These constants are not used in JDK code
protected static final String CLOSE_CMD =
UIManager.getString("InternalFrameTitlePane.closeButtonText");
protected static final String ICONIFY_CMD =
@@ -268,18 +269,18 @@
}
protected void addSystemMenuItems(JMenu systemMenu) {
- JMenuItem mi = (JMenuItem)systemMenu.add(restoreAction);
+ JMenuItem mi = systemMenu.add(restoreAction);
mi.setMnemonic('R');
- mi = (JMenuItem)systemMenu.add(moveAction);
+ mi = systemMenu.add(moveAction);
mi.setMnemonic('M');
- mi = (JMenuItem)systemMenu.add(sizeAction);
+ mi = systemMenu.add(sizeAction);
mi.setMnemonic('S');
- mi = (JMenuItem)systemMenu.add(iconifyAction);
+ mi = systemMenu.add(iconifyAction);
mi.setMnemonic('n');
- mi = (JMenuItem)systemMenu.add(maximizeAction);
+ mi = systemMenu.add(maximizeAction);
mi.setMnemonic('x');
systemMenu.add(new JSeparator());
- mi = (JMenuItem)systemMenu.add(closeAction);
+ mi = systemMenu.add(closeAction);
mi.setMnemonic('C');
}
@@ -413,7 +414,7 @@
// PropertyChangeListener
//
public void propertyChange(PropertyChangeEvent evt) {
- String prop = (String)evt.getPropertyName();
+ String prop = evt.getPropertyName();
if (prop == JInternalFrame.IS_SELECTED_PROPERTY) {
repaint();
@@ -428,19 +429,19 @@
}
if ("closable" == prop) {
- if ((Boolean)evt.getNewValue() == Boolean.TRUE) {
+ if (evt.getNewValue() == Boolean.TRUE) {
add(closeButton);
} else {
remove(closeButton);
}
} else if ("maximizable" == prop) {
- if ((Boolean)evt.getNewValue() == Boolean.TRUE) {
+ if (evt.getNewValue() == Boolean.TRUE) {
add(maxButton);
} else {
remove(maxButton);
}
} else if ("iconable" == prop) {
- if ((Boolean)evt.getNewValue() == Boolean.TRUE) {
+ if (evt.getNewValue() == Boolean.TRUE) {
add(iconButton);
} else {
remove(iconButton);
@@ -600,7 +601,8 @@
*/
public class CloseAction extends AbstractAction {
public CloseAction() {
- super(CLOSE_CMD);
+ super(UIManager.getString(
+ "InternalFrameTitlePane.closeButtonText"));
}
public void actionPerformed(ActionEvent e) {
@@ -616,7 +618,8 @@
*/
public class MaximizeAction extends AbstractAction {
public MaximizeAction() {
- super(MAXIMIZE_CMD);
+ super(UIManager.getString(
+ "InternalFrameTitlePane.maximizeButtonText"));
}
public void actionPerformed(ActionEvent evt) {
@@ -644,7 +647,8 @@
*/
public class IconifyAction extends AbstractAction {
public IconifyAction() {
- super(ICONIFY_CMD);
+ super(UIManager.getString(
+ "InternalFrameTitlePane.minimizeButtonText"));
}
public void actionPerformed(ActionEvent e) {
@@ -664,7 +668,8 @@
*/
public class RestoreAction extends AbstractAction {
public RestoreAction() {
- super(RESTORE_CMD);
+ super(UIManager.getString(
+ "InternalFrameTitlePane.restoreButtonText"));
}
public void actionPerformed(ActionEvent evt) {
@@ -690,7 +695,8 @@
*/
public class MoveAction extends AbstractAction {
public MoveAction() {
- super(MOVE_CMD);
+ super(UIManager.getString(
+ "InternalFrameTitlePane.moveButtonText"));
}
public void actionPerformed(ActionEvent e) {
@@ -723,7 +729,8 @@
*/
public class SizeAction extends AbstractAction {
public SizeAction() {
- super(SIZE_CMD);
+ super(UIManager.getString(
+ "InternalFrameTitlePane.sizeButtonText"));
}
public void actionPerformed(ActionEvent e) {
@@ -774,7 +781,7 @@
}
}
public boolean isFocusTraversable() { return false; }
- public void requestFocus() {};
+ public void requestFocus() {}
public AccessibleContext getAccessibleContext() {
AccessibleContext ac = super.getAccessibleContext();
if (uiKey != null) {
@@ -783,6 +790,6 @@
}
return ac;
}
- }; // end NoFocusButton
+ } // end NoFocusButton
} // End Title Pane Class
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -55,7 +55,6 @@
protected MouseInputAdapter borderListener;
protected PropertyChangeListener propertyChangeListener;
protected LayoutManager internalFrameLayout;
- protected ComponentListener componentListener;
protected MouseInputListener glassPaneDispatcher;
private InternalFrameListener internalFrameListener;
@@ -67,9 +66,9 @@
protected BasicInternalFrameTitlePane titlePane; // access needs this
private static DesktopManager sharedDesktopManager;
- private boolean componentListenerAdded = false;
private Rectangle parentBounds;
+ private DesktopIconMover desktopIconMover;
private boolean dragging = false;
private boolean resizing = false;
@@ -210,14 +209,17 @@
frame.getGlassPane().addMouseListener(glassPaneDispatcher);
frame.getGlassPane().addMouseMotionListener(glassPaneDispatcher);
}
- componentListener = createComponentListener();
if (frame.getParent() != null) {
parentBounds = frame.getParent().getBounds();
}
- if ((frame.getParent() != null) && !componentListenerAdded) {
- frame.getParent().addComponentListener(componentListener);
- componentListenerAdded = true;
+ getDesktopIconMover().installListeners();
+ }
+
+ private DesktopIconMover getDesktopIconMover() {
+ if (desktopIconMover == null) {
+ desktopIconMover = new DesktopIconMover(frame);
}
+ return desktopIconMover;
}
// Provide a FocusListener to listen for a WINDOW_LOST_FOCUS event,
@@ -288,11 +290,7 @@
* @since 1.3
*/
protected void uninstallListeners() {
- if ((frame.getParent() != null) && componentListenerAdded) {
- frame.getParent().removeComponentListener(componentListener);
- componentListenerAdded = false;
- }
- componentListener = null;
+ getDesktopIconMover().uninstallListeners();
if (glassPaneDispatcher != null) {
frame.getGlassPane().removeMouseListener(glassPaneDispatcher);
frame.getGlassPane().removeMouseMotionListener(glassPaneDispatcher);
@@ -320,7 +318,7 @@
if (resizing) {
return;
}
- Cursor s = (Cursor)frame.getLastCursor();
+ Cursor s = frame.getLastCursor();
if (s == null) {
s = Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR);
}
@@ -338,13 +336,13 @@
public Dimension getPreferredSize(JComponent x) {
- if((JComponent)frame == x)
+ if(frame == x)
return frame.getLayout().preferredLayoutSize(x);
return new Dimension(100, 100);
}
public Dimension getMinimumSize(JComponent x) {
- if((JComponent)frame == x) {
+ if(frame == x) {
return frame.getLayout().minimumLayoutSize(x);
}
return new Dimension(0, 0);
@@ -1095,7 +1093,7 @@
updateFrameCursor();
}
- }; /// End BorderListener Class
+ } /// End BorderListener Class
protected class ComponentHandler implements ComponentListener {
// NOTE: This class exists only for backward compatability. All
@@ -1198,7 +1196,6 @@
}
}
- private static boolean isDragging = false;
private class Handler implements ComponentListener, InternalFrameListener,
LayoutManager, MouseInputListener, PropertyChangeListener,
WindowFocusListener, SwingConstants {
@@ -1230,15 +1227,6 @@
}
}
- // Relocate the icon base on the new parent bounds.
- if (icon != null) {
- Rectangle iconBounds = icon.getBounds();
- int y = iconBounds.y +
- (parentNewBounds.height - parentBounds.height);
- icon.setBounds(iconBounds.x, y,
- iconBounds.width, iconBounds.height);
- }
-
// Update the new parent bounds for next resize.
if (!parentBounds.equals(parentNewBounds)) {
parentBounds = parentNewBounds;
@@ -1384,9 +1372,6 @@
// MouseInputListener
- private Component mouseEventTarget = null;
- private Component dragSource = null;
-
public void mousePressed(MouseEvent e) { }
public void mouseEntered(MouseEvent e) { }
@@ -1403,7 +1388,7 @@
// PropertyChangeListener
public void propertyChange(PropertyChangeEvent evt) {
- String prop = (String)evt.getPropertyName();
+ String prop = evt.getPropertyName();
JInternalFrame f = (JInternalFrame)evt.getSource();
Object newValue = evt.getNewValue();
Object oldValue = evt.getOldValue();
@@ -1413,10 +1398,6 @@
// Cancel a resize in progress if the internal frame
// gets a setClosed(true) or dispose().
cancelResize();
- if ((frame.getParent() != null) && componentListenerAdded) {
- frame.getParent().removeComponentListener(
- componentListener);
- }
closeFrame(f);
}
} else if (JInternalFrame.IS_MAXIMUM_PROPERTY == prop) {
@@ -1449,16 +1430,6 @@
} else {
parentBounds = null;
}
- if ((frame.getParent() != null) && !componentListenerAdded) {
- f.getParent().addComponentListener(componentListener);
- componentListenerAdded = true;
- } else if ((newValue == null) && componentListenerAdded) {
- if (f.getParent() != null) {
- f.getParent().removeComponentListener(
- componentListener);
- }
- componentListenerAdded = false;
- }
} else if (JInternalFrame.TITLE_PROPERTY == prop ||
prop == "closable" || prop == "iconable" ||
prop == "maximizable") {
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicLabelUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicLabelUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -65,6 +65,9 @@
protected static BasicLabelUI labelUI = new BasicLabelUI();
private final static BasicLabelUI SAFE_BASIC_LABEL_UI = new BasicLabelUI();
+ private Rectangle paintIconR = new Rectangle();
+ private Rectangle paintTextR = new Rectangle();
+
static void loadActionMap(LazyActionMap map) {
map.put(new Actions(Actions.PRESS));
map.put(new Actions(Actions.RELEASE));
@@ -135,17 +138,6 @@
textX, textY);
}
-
- /* These rectangles/insets are allocated once for this shared LabelUI
- * implementation. Re-using rectangles rather than allocating
- * them in each paint call halved the time it took paint to run.
- */
- private static Rectangle paintIconR = new Rectangle();
- private static Rectangle paintTextR = new Rectangle();
- private static Rectangle paintViewR = new Rectangle();
- private static Insets paintViewInsets = new Insets(0, 0, 0, 0);
-
-
/**
* Paint the label text in the foreground color, if the label
* is opaque then paint the entire background with the background
@@ -194,10 +186,11 @@
private String layout(JLabel label, FontMetrics fm,
int width, int height) {
- Insets insets = label.getInsets(paintViewInsets);
+ Insets insets = label.getInsets(null);
String text = label.getText();
Icon icon = (label.isEnabled()) ? label.getIcon() :
label.getDisabledIcon();
+ Rectangle paintViewR = new Rectangle();
paintViewR.x = insets.left;
paintViewR.y = insets.top;
paintViewR.width = width - (insets.left + insets.right);
@@ -208,24 +201,13 @@
paintTextR);
}
-
- /* These rectangles/insets are allocated once for this shared LabelUI
- * implementation. Re-using rectangles rather than allocating
- * them in each getPreferredSize call sped up the method substantially.
- */
- private static Rectangle iconR = new Rectangle();
- private static Rectangle textR = new Rectangle();
- private static Rectangle viewR = new Rectangle();
- private static Insets viewInsets = new Insets(0, 0, 0, 0);
-
-
public Dimension getPreferredSize(JComponent c)
{
JLabel label = (JLabel)c;
String text = label.getText();
Icon icon = (label.isEnabled()) ? label.getIcon() :
label.getDisabledIcon();
- Insets insets = label.getInsets(viewInsets);
+ Insets insets = label.getInsets(null);
Font font = label.getFont();
int dx = insets.left + insets.right;
@@ -242,6 +224,9 @@
}
else {
FontMetrics fm = label.getFontMetrics(font);
+ Rectangle iconR = new Rectangle();
+ Rectangle textR = new Rectangle();
+ Rectangle viewR = new Rectangle();
iconR.x = iconR.y = iconR.width = iconR.height = 0;
textR.x = textR.y = textR.width = textR.height = 0;
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java Wed Jul 05 16:42:37 2017 +0200
@@ -2102,8 +2102,6 @@
* <code>soundFile</code> passed into this method, it will
* return <code>null</code>.
*
- * @param baseClass used as the root class/location to get the
- * soundFile from
* @param soundFile the name of the audio file to be retrieved
* from disk
* @return A byte[] with audio data or null
@@ -2120,9 +2118,9 @@
* Class.getResourceAsStream just returns raw
* bytes, which we can convert to a sound.
*/
- byte[] buffer = (byte[])AccessController.doPrivileged(
- new PrivilegedAction() {
- public Object run() {
+ byte[] buffer = AccessController.doPrivileged(
+ new PrivilegedAction<byte[]>() {
+ public byte[] run() {
try {
InputStream resource = BasicLookAndFeel.this.
getClass().getResourceAsStream(soundFile);
@@ -2184,9 +2182,9 @@
UIManager.get("AuditoryCues.playList");
if (audioStrings != null) {
// create a HashSet to help us decide to play or not
- HashSet audioCues = new HashSet();
- for (int i = 0; i < audioStrings.length; i++) {
- audioCues.add(audioStrings[i]);
+ HashSet<Object> audioCues = new HashSet<Object>();
+ for (Object audioString : audioStrings) {
+ audioCues.add(audioString);
}
// get the name of the Action
String actionName = (String)audioAction.getValue(Action.NAME);
@@ -2237,7 +2235,7 @@
* This class contains listener that watches for all the mouse
* events that can possibly invoke popup on the component
*/
- class AWTEventHelper implements AWTEventListener,PrivilegedAction {
+ class AWTEventHelper implements AWTEventListener,PrivilegedAction<Object> {
AWTEventHelper() {
super();
AccessController.doPrivileged(this);
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -25,9 +25,6 @@
package javax.swing.plaf.basic;
-import sun.swing.MenuItemCheckIconFactory;
-import sun.swing.SwingUtilities2;
-import static sun.swing.SwingUtilities2.BASICMENUITEMUI_MAX_TEXT_OFFSET;
import java.awt.*;
import java.awt.event.*;
import java.beans.PropertyChangeEvent;
@@ -39,8 +36,7 @@
import javax.swing.plaf.*;
import javax.swing.text.View;
-import sun.swing.UIAction;
-import sun.swing.StringUIClientPropertyKey;
+import sun.swing.*;
/**
* BasicMenuItem implementation
@@ -91,24 +87,6 @@
private static final boolean VERBOSE = false; // show reuse hits/misses
private static final boolean DEBUG = false; // show bad params, misc.
- // Allows to reuse layoutInfo object.
- // Shouldn't be used directly. Use getLayoutInfo() instead.
- private final transient LayoutInfo layoutInfo = new LayoutInfo();
-
- /* Client Property keys for calculation of maximal widths */
- static final StringUIClientPropertyKey MAX_ARROW_WIDTH =
- new StringUIClientPropertyKey("maxArrowWidth");
- static final StringUIClientPropertyKey MAX_CHECK_WIDTH =
- new StringUIClientPropertyKey("maxCheckWidth");
- static final StringUIClientPropertyKey MAX_ICON_WIDTH =
- new StringUIClientPropertyKey("maxIconWidth");
- static final StringUIClientPropertyKey MAX_TEXT_WIDTH =
- new StringUIClientPropertyKey("maxTextWidth");
- static final StringUIClientPropertyKey MAX_ACC_WIDTH =
- new StringUIClientPropertyKey("maxAccWidth");
- static final StringUIClientPropertyKey MAX_LABEL_WIDTH =
- new StringUIClientPropertyKey("maxLabelWidth");
-
static void loadActionMap(LazyActionMap map) {
// NOTE: BasicMenuUI also calls into this method.
map.put(new Actions(Actions.CLICK));
@@ -199,13 +177,14 @@
//In case of column layout, .checkIconFactory is defined for this UI,
//the icon is compatible with it and useCheckAndArrow() is true,
//then the icon is handled by the checkIcon.
- boolean isColumnLayout = LayoutInfo.isColumnLayout(
+ boolean isColumnLayout = MenuItemLayoutHelper.isColumnLayout(
BasicGraphicsUtils.isLeftToRight(menuItem), menuItem);
if (isColumnLayout) {
MenuItemCheckIconFactory iconFactory =
(MenuItemCheckIconFactory) UIManager.get(prefix
+ ".checkIconFactory");
- if (iconFactory != null && useCheckAndArrow()
+ if (iconFactory != null
+ && MenuItemLayoutHelper.useCheckAndArrow(menuItem)
&& iconFactory.isCompatible(checkIcon, prefix)) {
checkIcon = iconFactory.getIcon(menuItem);
}
@@ -256,20 +235,7 @@
uninstallComponents(menuItem);
uninstallListeners();
uninstallKeyboardActions();
-
-
- // Remove values from the parent's Client Properties.
- JComponent p = getMenuItemParent(menuItem);
- if(p != null) {
- p.putClientProperty(BasicMenuItemUI.MAX_ARROW_WIDTH, null );
- p.putClientProperty(BasicMenuItemUI.MAX_CHECK_WIDTH, null );
- p.putClientProperty(BasicMenuItemUI.MAX_ACC_WIDTH, null );
- p.putClientProperty(BasicMenuItemUI.MAX_TEXT_WIDTH, null );
- p.putClientProperty(BasicMenuItemUI.MAX_ICON_WIDTH, null );
- p.putClientProperty(BasicMenuItemUI.MAX_LABEL_WIDTH, null );
- p.putClientProperty(BASICMENUITEMUI_MAX_TEXT_OFFSET, null );
- }
-
+ MenuItemLayoutHelper.clearUsedParentClientProperties(menuItem);
menuItem = null;
}
@@ -405,19 +371,6 @@
return d;
}
- // Returns parent of this component if it is not a top-level menu
- // Otherwise returns null
- private static JComponent getMenuItemParent(JMenuItem mi) {
- Container parent = mi.getParent();
- if ((parent instanceof JComponent) &&
- (!(mi instanceof JMenu) ||
- !((JMenu)mi).isTopLevelMenu())) {
- return (JComponent) parent;
- } else {
- return null;
- }
- }
-
protected Dimension getPreferredMenuItemSize(JComponent c,
Icon checkIcon,
Icon arrowIcon,
@@ -447,32 +400,36 @@
// the icon and text when user points a menu item by mouse.
JMenuItem mi = (JMenuItem) c;
- LayoutInfo li = getLayoutInfo(mi, checkIcon, arrowIcon,
- createMaxViewRect(), defaultTextIconGap, acceleratorDelimiter,
- BasicGraphicsUtils.isLeftToRight(mi), acceleratorFont,
- useCheckAndArrow(), getPropertyPrefix());
+ MenuItemLayoutHelper lh = new MenuItemLayoutHelper(mi, checkIcon,
+ arrowIcon, MenuItemLayoutHelper.createMaxRect(), defaultTextIconGap,
+ acceleratorDelimiter, BasicGraphicsUtils.isLeftToRight(mi),
+ mi.getFont(), acceleratorFont,
+ MenuItemLayoutHelper.useCheckAndArrow(menuItem),
+ getPropertyPrefix());
Dimension result = new Dimension();
// Calculate the result width
- result.width = li.leadingGap;
- addWidth(li.maxCheckWidth, li.afterCheckIconGap, result);
+ result.width = lh.getLeadingGap();
+ MenuItemLayoutHelper.addMaxWidth(lh.getCheckSize(),
+ lh.getAfterCheckIconGap(), result);
// Take into account mimimal text offset.
- if ((!li.isTopLevelMenu)
- && (li.minTextOffset > 0)
- && (result.width < li.minTextOffset)) {
- result.width = li.minTextOffset;
+ if ((!lh.isTopLevelMenu())
+ && (lh.getMinTextOffset() > 0)
+ && (result.width < lh.getMinTextOffset())) {
+ result.width = lh.getMinTextOffset();
}
- addWidth(li.maxLabelWidth, li.gap, result);
- addWidth(li.maxAccWidth, li.gap, result);
- addWidth(li.maxArrowWidth, li.gap, result);
+ MenuItemLayoutHelper.addMaxWidth(lh.getLabelSize(), lh.getGap(), result);
+ MenuItemLayoutHelper.addMaxWidth(lh.getAccSize(), lh.getGap(), result);
+ MenuItemLayoutHelper.addMaxWidth(lh.getArrowSize(), lh.getGap(), result);
// Calculate the result height
- result.height = max(li.checkRect.height, li.labelRect.height,
- li.accRect.height, li.arrowRect.height);
+ result.height = MenuItemLayoutHelper.max(lh.getCheckSize().getHeight(),
+ lh.getLabelSize().getHeight(), lh.getAccSize().getHeight(),
+ lh.getArrowSize().getHeight());
// Take into account menu item insets
- Insets insets = li.mi.getInsets();
+ Insets insets = lh.getMenuItem().getInsets();
if(insets != null) {
result.width += insets.left + insets.right;
result.height += insets.top + insets.bottom;
@@ -492,500 +449,9 @@
result.height++;
}
- li.clear();
return result;
}
- private Rectangle createMaxViewRect() {
- return new Rectangle(0,0,Short.MAX_VALUE, Short.MAX_VALUE);
- }
-
- private void addWidth(int width, int gap, Dimension result) {
- if (width > 0) {
- result.width += width + gap;
- }
- }
-
- private static int max(int... values) {
- int maxValue = Integer.MIN_VALUE;
- for (int i : values) {
- if (i > maxValue) {
- maxValue = i;
- }
- }
- return maxValue;
- }
-
- // LayoutInfo helps to calculate preferred size and to paint a menu item
- private static class LayoutInfo {
- JMenuItem mi;
- JComponent miParent;
-
- FontMetrics fm;
- FontMetrics accFm;
-
- Icon icon;
- Icon checkIcon;
- Icon arrowIcon;
- String text;
- String accText;
-
- boolean isColumnLayout;
- boolean useCheckAndArrow;
- boolean isLeftToRight;
- boolean isTopLevelMenu;
- View htmlView;
-
- int verticalAlignment;
- int horizontalAlignment;
- int verticalTextPosition;
- int horizontalTextPosition;
- int gap;
- int leadingGap;
- int afterCheckIconGap;
- int minTextOffset;
-
- Rectangle viewRect;
- Rectangle iconRect;
- Rectangle textRect;
- Rectangle accRect;
- Rectangle checkRect;
- Rectangle arrowRect;
- Rectangle labelRect;
-
- int origIconWidth;
- int origTextWidth;
- int origAccWidth;
- int origCheckWidth;
- int origArrowWidth;
-
- int maxIconWidth;
- int maxTextWidth;
- int maxAccWidth;
- int maxCheckWidth;
- int maxArrowWidth;
- int maxLabelWidth;
-
- // Empty constructor helps to create "final" LayoutInfo object
- public LayoutInfo() {
- }
-
- public LayoutInfo(JMenuItem mi, Icon checkIcon, Icon arrowIcon,
- Rectangle viewRect, int gap, String accDelimiter,
- boolean isLeftToRight, Font acceleratorFont,
- boolean useCheckAndArrow, String propertyPrefix) {
- reset(mi, checkIcon, arrowIcon, viewRect, gap, accDelimiter,
- isLeftToRight, acceleratorFont, useCheckAndArrow,
- propertyPrefix);
- }
-
- // Allows to reuse a LayoutInfo object
- public void reset(JMenuItem mi, Icon checkIcon, Icon arrowIcon,
- Rectangle viewRect, int gap, String accDelimiter,
- boolean isLeftToRight, Font acceleratorFont,
- boolean useCheckAndArrow, String propertyPrefix) {
- this.mi = mi;
- this.miParent = getMenuItemParent(mi);
- this.accText = getAccText(accDelimiter);
- this.verticalAlignment = mi.getVerticalAlignment();
- this.horizontalAlignment = mi.getHorizontalAlignment();
- this.verticalTextPosition = mi.getVerticalTextPosition();
- this.horizontalTextPosition = mi.getHorizontalTextPosition();
- this.useCheckAndArrow = useCheckAndArrow;
- this.fm = mi.getFontMetrics(mi.getFont());
- this.accFm = mi.getFontMetrics(acceleratorFont);
- this.isLeftToRight = isLeftToRight;
- this.isColumnLayout = isColumnLayout();
- this.isTopLevelMenu = (this.miParent == null)? true : false;
- this.checkIcon = checkIcon;
- this.icon = getIcon(propertyPrefix);
- this.arrowIcon = arrowIcon;
- this.text = mi.getText();
- this.gap = gap;
- this.afterCheckIconGap = getAfterCheckIconGap(propertyPrefix);
- this.minTextOffset = getMinTextOffset(propertyPrefix);
- this.htmlView = (View) mi.getClientProperty(BasicHTML.propertyKey);
-
- this.viewRect = viewRect;
- this.iconRect = new Rectangle();
- this.textRect = new Rectangle();
- this.accRect = new Rectangle();
- this.checkRect = new Rectangle();
- this.arrowRect = new Rectangle();
- this.labelRect = new Rectangle();
-
- calcWidthsAndHeights();
- this.origIconWidth = iconRect.width;
- this.origTextWidth = textRect.width;
- this.origAccWidth = accRect.width;
- this.origCheckWidth = checkRect.width;
- this.origArrowWidth = arrowRect.width;
-
- calcMaxWidths();
- this.leadingGap = getLeadingGap(propertyPrefix);
- calcMaxTextOffset();
- }
-
- // Clears fields to remove all links to other objects
- // to prevent memory leaks
- public void clear() {
- mi = null;
- miParent = null;
- fm = null;
- accFm = null;
- icon = null;
- checkIcon = null;
- arrowIcon = null;
- text = null;
- accText = null;
- htmlView = null;
- viewRect = null;
- iconRect = null;
- textRect = null;
- accRect = null;
- checkRect = null;
- arrowRect = null;
- labelRect = null;
- }
-
- private String getAccText(String acceleratorDelimiter) {
- String accText = "";
- KeyStroke accelerator = mi.getAccelerator();
- if (accelerator != null) {
- int modifiers = accelerator.getModifiers();
- if (modifiers > 0) {
- accText = KeyEvent.getKeyModifiersText(modifiers);
- accText += acceleratorDelimiter;
- }
- int keyCode = accelerator.getKeyCode();
- if (keyCode != 0) {
- accText += KeyEvent.getKeyText(keyCode);
- } else {
- accText += accelerator.getKeyChar();
- }
- }
- return accText;
- }
-
- // In case of column layout, .checkIconFactory is defined for this UI,
- // the icon is compatible with it and useCheckAndArrow() is true,
- // then the icon is handled by the checkIcon.
- private Icon getIcon(String propertyPrefix) {
- Icon icon = null;
- MenuItemCheckIconFactory iconFactory =
- (MenuItemCheckIconFactory) UIManager.get(propertyPrefix
- + ".checkIconFactory");
- if (!isColumnLayout || !useCheckAndArrow || iconFactory == null
- || !iconFactory.isCompatible(checkIcon, propertyPrefix)) {
- icon = mi.getIcon();
- }
- return icon;
- }
-
- private int getMinTextOffset(String propertyPrefix) {
- int minimumTextOffset = 0;
- Object minimumTextOffsetObject =
- UIManager.get(propertyPrefix + ".minimumTextOffset");
- if (minimumTextOffsetObject instanceof Integer) {
- minimumTextOffset = (Integer) minimumTextOffsetObject;
- }
- return minimumTextOffset;
- }
-
- private int getAfterCheckIconGap(String propertyPrefix) {
- int afterCheckIconGap = gap;
- Object afterCheckIconGapObject =
- UIManager.get(propertyPrefix + ".afterCheckIconGap");
- if (afterCheckIconGapObject instanceof Integer) {
- afterCheckIconGap = (Integer) afterCheckIconGapObject;
- }
- return afterCheckIconGap;
- }
-
- private int getLeadingGap(String propertyPrefix) {
- if (maxCheckWidth > 0) {
- return getCheckOffset(propertyPrefix);
- } else {
- return gap; // There is no any check icon
- }
- }
-
- private int getCheckOffset(String propertyPrefix) {
- int checkIconOffset = gap;
- Object checkIconOffsetObject =
- UIManager.get(propertyPrefix + ".checkIconOffset");
- if (checkIconOffsetObject instanceof Integer) {
- checkIconOffset = (Integer) checkIconOffsetObject;
- }
- return checkIconOffset;
- }
-
- private void calcWidthsAndHeights()
- {
- // iconRect
- if (icon != null) {
- iconRect.width = icon.getIconWidth();
- iconRect.height = icon.getIconHeight();
- }
-
- // accRect
- if (!accText.equals("")) {
- accRect.width = SwingUtilities2.stringWidth(
- mi, accFm, accText);
- accRect.height = accFm.getHeight();
- }
-
- // textRect
- if (text == null) {
- text = "";
- } else if (!text.equals("")) {
- if (htmlView != null) {
- // Text is HTML
- textRect.width =
- (int) htmlView.getPreferredSpan(View.X_AXIS);
- textRect.height =
- (int) htmlView.getPreferredSpan(View.Y_AXIS);
- } else {
- // Text isn't HTML
- textRect.width =
- SwingUtilities2.stringWidth(mi, fm, text);
- textRect.height = fm.getHeight();
- }
- }
-
- if (useCheckAndArrow) {
- // checkIcon
- if (checkIcon != null) {
- checkRect.width = checkIcon.getIconWidth();
- checkRect.height = checkIcon.getIconHeight();
- }
- // arrowRect
- if (arrowIcon != null) {
- arrowRect.width = arrowIcon.getIconWidth();
- arrowRect.height = arrowIcon.getIconHeight();
- }
- }
-
- // labelRect
- if (isColumnLayout) {
- labelRect.width = iconRect.width + textRect.width + gap;
- labelRect.height = max(checkRect.height, iconRect.height,
- textRect.height, accRect.height, arrowRect.height);
- } else {
- textRect = new Rectangle();
- iconRect = new Rectangle();
- SwingUtilities.layoutCompoundLabel(mi, fm, text, icon,
- verticalAlignment, horizontalAlignment,
- verticalTextPosition, horizontalTextPosition,
- viewRect, iconRect, textRect, gap);
- labelRect = iconRect.union(textRect);
- }
- }
-
- private void calcMaxWidths() {
- maxCheckWidth = calcMaxValue(BasicMenuItemUI.MAX_CHECK_WIDTH,
- checkRect.width);
- maxArrowWidth = calcMaxValue(BasicMenuItemUI.MAX_ARROW_WIDTH,
- arrowRect.width);
- maxAccWidth = calcMaxValue(BasicMenuItemUI.MAX_ACC_WIDTH,
- accRect.width);
-
- if (isColumnLayout) {
- maxIconWidth = calcMaxValue(BasicMenuItemUI.MAX_ICON_WIDTH,
- iconRect.width);
- maxTextWidth = calcMaxValue(BasicMenuItemUI.MAX_TEXT_WIDTH,
- textRect.width);
- int curGap = gap;
- if ((maxIconWidth == 0) || (maxTextWidth == 0)) {
- curGap = 0;
- }
- maxLabelWidth =
- calcMaxValue(BasicMenuItemUI.MAX_LABEL_WIDTH,
- maxIconWidth + maxTextWidth + curGap);
- } else {
- // We shouldn't use current icon and text widths
- // in maximal widths calculation for complex layout.
- maxIconWidth = getParentIntProperty(BasicMenuItemUI.MAX_ICON_WIDTH);
- maxLabelWidth = calcMaxValue(BasicMenuItemUI.MAX_LABEL_WIDTH,
- labelRect.width);
- // If maxLabelWidth is wider
- // than the widest icon + the widest text + gap,
- // we should update the maximal text witdh
- int candidateTextWidth = maxLabelWidth - maxIconWidth;
- if (maxIconWidth > 0) {
- candidateTextWidth -= gap;
- }
- maxTextWidth = calcMaxValue(BasicMenuItemUI.MAX_TEXT_WIDTH,
- candidateTextWidth);
- }
- }
-
- // Calculates and returns maximal value
- // through specified parent component client property.
- private int calcMaxValue(Object propertyName, int value) {
- // Get maximal value from parent client property
- int maxValue = getParentIntProperty(propertyName);
- // Store new maximal width in parent client property
- if (value > maxValue) {
- if (miParent != null) {
- miParent.putClientProperty(propertyName, value);
- }
- return value;
- } else {
- return maxValue;
- }
- }
-
- // Returns parent client property as int
- private int getParentIntProperty(Object propertyName) {
- Object value = null;
- if (miParent != null) {
- value = miParent.getClientProperty(propertyName);
- }
- if ((value == null) || !(value instanceof Integer)){
- value = 0;
- }
- return (Integer)value;
- }
-
- private boolean isColumnLayout() {
- return isColumnLayout(isLeftToRight, horizontalAlignment,
- horizontalTextPosition, verticalTextPosition);
- }
-
- public static boolean isColumnLayout(boolean isLeftToRight,
- JMenuItem mi) {
- assert(mi != null);
- return isColumnLayout(isLeftToRight, mi.getHorizontalAlignment(),
- mi.getHorizontalTextPosition(), mi.getVerticalTextPosition());
- }
-
- // Answers should we do column layout for a menu item or not.
- // We do it when a user doesn't set any alignments
- // and text positions manually, except the vertical alignment.
- public static boolean isColumnLayout( boolean isLeftToRight,
- int horizontalAlignment, int horizontalTextPosition,
- int verticalTextPosition) {
- if (verticalTextPosition != SwingConstants.CENTER) {
- return false;
- }
- if (isLeftToRight) {
- if (horizontalAlignment != SwingConstants.LEADING
- && horizontalAlignment != SwingConstants.LEFT) {
- return false;
- }
- if (horizontalTextPosition != SwingConstants.TRAILING
- && horizontalTextPosition != SwingConstants.RIGHT) {
- return false;
- }
- } else {
- if (horizontalAlignment != SwingConstants.LEADING
- && horizontalAlignment != SwingConstants.RIGHT) {
- return false;
- }
- if (horizontalTextPosition != SwingConstants.TRAILING
- && horizontalTextPosition != SwingConstants.LEFT) {
- return false;
- }
- }
- return true;
- }
-
- // Calculates maximal text offset.
- // It is required for some L&Fs (ex: Vista L&F).
- // The offset is meaningful only for L2R column layout.
- private void calcMaxTextOffset() {
- if (!isColumnLayout || !isLeftToRight) {
- return;
- }
-
- // Calculate the current text offset
- int offset = viewRect.x + leadingGap + maxCheckWidth
- + afterCheckIconGap + maxIconWidth + gap;
- if (maxCheckWidth == 0) {
- offset -= afterCheckIconGap;
- }
- if (maxIconWidth == 0) {
- offset -= gap;
- }
-
- // maximal text offset shouldn't be less than minimal text offset;
- if (offset < minTextOffset) {
- offset = minTextOffset;
- }
-
- // Calculate and store the maximal text offset
- calcMaxValue(BASICMENUITEMUI_MAX_TEXT_OFFSET, offset);
- }
-
- public String toString() {
- StringBuilder result = new StringBuilder();
- result.append(super.toString()).append("\n");
- result.append("accFm = ").append(accFm).append("\n");
- result.append("accRect = ").append(accRect).append("\n");
- result.append("accText = ").append(accText).append("\n");
- result.append("afterCheckIconGap = ").append(afterCheckIconGap)
- .append("\n");
- result.append("arrowIcon = ").append(arrowIcon).append("\n");
- result.append("arrowRect = ").append(arrowRect).append("\n");
- result.append("checkIcon = ").append(checkIcon).append("\n");
- result.append("checkRect = ").append(checkRect).append("\n");
- result.append("fm = ").append(fm).append("\n");
- result.append("gap = ").append(gap).append("\n");
- result.append("horizontalAlignment = ").append(horizontalAlignment)
- .append("\n");
- result.append("horizontalTextPosition = ")
- .append(horizontalTextPosition).append("\n");
- result.append("htmlView = ").append(htmlView).append("\n");
- result.append("icon = ").append(icon).append("\n");
- result.append("iconRect = ").append(iconRect).append("\n");
- result.append("isColumnLayout = ").append(isColumnLayout).append("\n");
- result.append("isLeftToRight = ").append(isLeftToRight).append("\n");
- result.append("isTopLevelMenu = ").append(isTopLevelMenu).append("\n");
- result.append("labelRect = ").append(labelRect).append("\n");
- result.append("leadingGap = ").append(leadingGap).append("\n");
- result.append("maxAccWidth = ").append(maxAccWidth).append("\n");
- result.append("maxArrowWidth = ").append(maxArrowWidth).append("\n");
- result.append("maxCheckWidth = ").append(maxCheckWidth).append("\n");
- result.append("maxIconWidth = ").append(maxIconWidth).append("\n");
- result.append("maxLabelWidth = ").append(maxLabelWidth).append("\n");
- result.append("maxTextWidth = ").append(maxTextWidth).append("\n");
- result.append("maxTextOffset = ")
- .append(getParentIntProperty(BASICMENUITEMUI_MAX_TEXT_OFFSET))
- .append("\n");
- result.append("mi = ").append(mi).append("\n");
- result.append("minTextOffset = ").append(minTextOffset).append("\n");
- result.append("miParent = ").append(miParent).append("\n");
- result.append("origAccWidth = ").append(origAccWidth).append("\n");
- result.append("origArrowWidth = ").append(origArrowWidth).append("\n");
- result.append("origCheckWidth = ").append(origCheckWidth).append("\n");
- result.append("origIconWidth = ").append(origIconWidth).append("\n");
- result.append("origTextWidth = ").append(origTextWidth).append("\n");
- result.append("text = ").append(text).append("\n");
- result.append("textRect = ").append(textRect).append("\n");
- result.append("useCheckAndArrow = ").append(useCheckAndArrow)
- .append("\n");
- result.append("verticalAlignment = ").append(verticalAlignment)
- .append("\n");
- result.append("verticalTextPosition = ")
- .append(verticalTextPosition).append("\n");
- result.append("viewRect = ").append(viewRect).append("\n");
- return result.toString();
- }
- } // End of LayoutInfo
-
- // Reuses layoutInfo object to reduce the amount of produced garbage
- private LayoutInfo getLayoutInfo(JMenuItem mi, Icon checkIcon, Icon arrowIcon,
- Rectangle viewRect, int gap, String accDelimiter,
- boolean isLeftToRight, Font acceleratorFont,
- boolean useCheckAndArrow, String propertyPrefix) {
- // layoutInfo is final and always not null
- layoutInfo.reset(mi, checkIcon, arrowIcon, viewRect,
- gap, accDelimiter, isLeftToRight, acceleratorFont,
- useCheckAndArrow, propertyPrefix);
- return layoutInfo;
- }
-
/**
* We draw the background in paintMenuItem()
* so override update (which fills the background of opaque
@@ -1016,122 +482,132 @@
Rectangle viewRect = new Rectangle(0, 0, mi.getWidth(), mi.getHeight());
applyInsets(viewRect, mi.getInsets());
- LayoutInfo li = getLayoutInfo(mi, checkIcon, arrowIcon,
- viewRect, defaultTextIconGap, acceleratorDelimiter,
- BasicGraphicsUtils.isLeftToRight(mi), acceleratorFont,
- useCheckAndArrow(), getPropertyPrefix());
- layoutMenuItem(li);
+ MenuItemLayoutHelper lh = new MenuItemLayoutHelper(mi, checkIcon,
+ arrowIcon, viewRect, defaultTextIconGap, acceleratorDelimiter,
+ BasicGraphicsUtils.isLeftToRight(mi), mi.getFont(),
+ acceleratorFont, MenuItemLayoutHelper.useCheckAndArrow(menuItem),
+ getPropertyPrefix());
+ MenuItemLayoutHelper.LayoutResult lr = lh.layoutMenuItem();
paintBackground(g, mi, background);
- paintCheckIcon(g, li, holdc, foreground);
- paintIcon(g, li, holdc);
- paintText(g, li);
- paintAccText(g, li);
- paintArrowIcon(g, li, foreground);
+ paintCheckIcon(g, lh, lr, holdc, foreground);
+ paintIcon(g, lh, lr, holdc);
+ paintText(g, lh, lr);
+ paintAccText(g, lh, lr);
+ paintArrowIcon(g, lh, lr, foreground);
// Restore original graphics font and color
g.setColor(holdc);
g.setFont(holdf);
-
- li.clear();
}
- private void paintIcon(Graphics g, LayoutInfo li, Color holdc) {
- if (li.icon != null) {
+ private void paintIcon(Graphics g, MenuItemLayoutHelper lh,
+ MenuItemLayoutHelper.LayoutResult lr, Color holdc) {
+ if (lh.getIcon() != null) {
Icon icon;
- ButtonModel model = li.mi.getModel();
+ ButtonModel model = lh.getMenuItem().getModel();
if (!model.isEnabled()) {
- icon = (Icon) li.mi.getDisabledIcon();
+ icon = lh.getMenuItem().getDisabledIcon();
} else if (model.isPressed() && model.isArmed()) {
- icon = (Icon) li.mi.getPressedIcon();
+ icon = lh.getMenuItem().getPressedIcon();
if (icon == null) {
// Use default icon
- icon = (Icon) li.mi.getIcon();
+ icon = lh.getMenuItem().getIcon();
}
} else {
- icon = (Icon) li.mi.getIcon();
+ icon = lh.getMenuItem().getIcon();
}
if (icon != null) {
- icon.paintIcon(li.mi, g, li.iconRect.x, li.iconRect.y);
+ icon.paintIcon(lh.getMenuItem(), g, lr.getIconRect().x,
+ lr.getIconRect().y);
g.setColor(holdc);
}
}
}
- private void paintCheckIcon(Graphics g, LayoutInfo li,
+ private void paintCheckIcon(Graphics g, MenuItemLayoutHelper lh,
+ MenuItemLayoutHelper.LayoutResult lr,
Color holdc, Color foreground) {
- if (li.checkIcon != null) {
- ButtonModel model = li.mi.getModel();
- if (model.isArmed()
- || (li.mi instanceof JMenu && model.isSelected())) {
+ if (lh.getCheckIcon() != null) {
+ ButtonModel model = lh.getMenuItem().getModel();
+ if (model.isArmed() || (lh.getMenuItem() instanceof JMenu
+ && model.isSelected())) {
g.setColor(foreground);
} else {
g.setColor(holdc);
}
- if (li.useCheckAndArrow) {
- li.checkIcon.paintIcon(li.mi, g, li.checkRect.x,
- li.checkRect.y);
+ if (lh.useCheckAndArrow()) {
+ lh.getCheckIcon().paintIcon(lh.getMenuItem(), g,
+ lr.getCheckRect().x, lr.getCheckRect().y);
}
g.setColor(holdc);
}
}
- private void paintAccText(Graphics g, LayoutInfo li) {
- if (!li.accText.equals("")) {
- ButtonModel model = li.mi.getModel();
- g.setFont(acceleratorFont);
+ private void paintAccText(Graphics g, MenuItemLayoutHelper lh,
+ MenuItemLayoutHelper.LayoutResult lr) {
+ if (!lh.getAccText().equals("")) {
+ ButtonModel model = lh.getMenuItem().getModel();
+ g.setFont(lh.getAccFontMetrics().getFont());
if (!model.isEnabled()) {
// *** paint the accText disabled
if (disabledForeground != null) {
g.setColor(disabledForeground);
- SwingUtilities2.drawString(li.mi, g, li.accText,
- li.accRect.x,
- li.accRect.y + li.accFm.getAscent());
+ SwingUtilities2.drawString(lh.getMenuItem(), g,
+ lh.getAccText(), lr.getAccRect().x,
+ lr.getAccRect().y + lh.getAccFontMetrics().getAscent());
} else {
- g.setColor(li.mi.getBackground().brighter());
- SwingUtilities2.drawString(li.mi, g, li.accText, li.accRect.x,
- li.accRect.y + li.accFm.getAscent());
- g.setColor(li.mi.getBackground().darker());
- SwingUtilities2.drawString(li.mi, g, li.accText,
- li.accRect.x - 1,
- li.accRect.y + li.accFm.getAscent() - 1);
+ g.setColor(lh.getMenuItem().getBackground().brighter());
+ SwingUtilities2.drawString(lh.getMenuItem(), g,
+ lh.getAccText(), lr.getAccRect().x,
+ lr.getAccRect().y + lh.getAccFontMetrics().getAscent());
+ g.setColor(lh.getMenuItem().getBackground().darker());
+ SwingUtilities2.drawString(lh.getMenuItem(), g,
+ lh.getAccText(), lr.getAccRect().x - 1,
+ lr.getAccRect().y + lh.getFontMetrics().getAscent() - 1);
}
} else {
// *** paint the accText normally
- if (model.isArmed() ||
- (li.mi instanceof JMenu && model.isSelected())) {
+ if (model.isArmed()
+ || (lh.getMenuItem() instanceof JMenu
+ && model.isSelected())) {
g.setColor(acceleratorSelectionForeground);
} else {
g.setColor(acceleratorForeground);
}
- SwingUtilities2.drawString(li.mi, g, li.accText, li.accRect.x,
- li.accRect.y + li.accFm.getAscent());
+ SwingUtilities2.drawString(lh.getMenuItem(), g, lh.getAccText(),
+ lr.getAccRect().x, lr.getAccRect().y +
+ lh.getAccFontMetrics().getAscent());
}
}
}
- private void paintText(Graphics g, LayoutInfo li) {
- if (!li.text.equals("")) {
- if (li.htmlView != null) {
+ private void paintText(Graphics g, MenuItemLayoutHelper lh,
+ MenuItemLayoutHelper.LayoutResult lr) {
+ if (!lh.getText().equals("")) {
+ if (lh.getHtmlView() != null) {
// Text is HTML
- li.htmlView.paint(g, li.textRect);
+ lh.getHtmlView().paint(g, lr.getTextRect());
} else {
// Text isn't HTML
- paintText(g, li.mi, li.textRect, li.text);
+ paintText(g, lh.getMenuItem(), lr.getTextRect(), lh.getText());
}
}
}
- private void paintArrowIcon(Graphics g, LayoutInfo li, Color foreground) {
- if (li.arrowIcon != null) {
- ButtonModel model = li.mi.getModel();
- if (model.isArmed()
- || (li.mi instanceof JMenu && model.isSelected())) {
+ private void paintArrowIcon(Graphics g, MenuItemLayoutHelper lh,
+ MenuItemLayoutHelper.LayoutResult lr,
+ Color foreground) {
+ if (lh.getArrowIcon() != null) {
+ ButtonModel model = lh.getMenuItem().getModel();
+ if (model.isArmed() || (lh.getMenuItem() instanceof JMenu
+ && model.isSelected())) {
g.setColor(foreground);
}
- if (li.useCheckAndArrow) {
- li.arrowIcon.paintIcon(li.mi, g, li.arrowRect.x, li.arrowRect.y);
+ if (lh.useCheckAndArrow()) {
+ lh.getArrowIcon().paintIcon(lh.getMenuItem(), g,
+ lr.getArrowRect().x, lr.getArrowRect().y);
}
}
}
@@ -1216,346 +692,6 @@
}
}
-
- /**
- * Layout icon, text, check icon, accelerator text and arrow icon
- * in the viewRect and return their positions.
- *
- * If horizontalAlignment, verticalTextPosition and horizontalTextPosition
- * are default (user doesn't set any manually) the layouting algorithm is:
- * Elements are layouted in the five columns:
- * check icon + icon + text + accelerator text + arrow icon
- *
- * In the other case elements are layouted in the four columns:
- * check icon + label + accelerator text + arrow icon
- * Label is icon and text rectangles union.
- *
- * The order of columns can be reversed.
- * It depends on the menu item orientation.
- */
- private void layoutMenuItem(LayoutInfo li)
- {
- li.checkRect.width = li.maxCheckWidth;
- li.accRect.width = li.maxAccWidth;
- li.arrowRect.width = li.maxArrowWidth;
-
- if (li.isColumnLayout) {
- if (li.isLeftToRight) {
- doLTRColumnLayout(li);
- } else {
- doRTLColumnLayout(li);
- }
- } else {
- if (li.isLeftToRight) {
- doLTRComplexLayout(li);
- } else {
- doRTLComplexLayout(li);
- }
- }
-
- alignAccCheckAndArrowVertically(li);
- }
-
- // Aligns the accelertor text and the check and arrow icons vertically
- // with the center of the label rect.
- private void alignAccCheckAndArrowVertically(LayoutInfo li) {
- li.accRect.y = (int)(li.labelRect.y + (float)li.labelRect.height/2
- - (float)li.accRect.height/2);
- fixVerticalAlignment(li, li.accRect);
- if (li.useCheckAndArrow) {
- li.arrowRect.y = (int)(li.labelRect.y + (float)li.labelRect.height/2
- - (float)li.arrowRect.height/2);
- li.checkRect.y = (int)(li.labelRect.y + (float)li.labelRect.height/2
- - (float)li.checkRect.height/2);
- fixVerticalAlignment(li, li.arrowRect);
- fixVerticalAlignment(li, li.checkRect);
- }
- }
-
- // Fixes vertical alignment of all menu item elements if a rect.y
- // or (rect.y + rect.height) is out of viewRect bounds
- private void fixVerticalAlignment(LayoutInfo li, Rectangle r) {
- int delta = 0;
- if (r.y < li.viewRect.y) {
- delta = li.viewRect.y - r.y;
- } else if (r.y + r.height > li.viewRect.y + li.viewRect.height) {
- delta = li.viewRect.y + li.viewRect.height - r.y - r.height;
- }
- if (delta != 0) {
- li.checkRect.y += delta;
- li.iconRect.y += delta;
- li.textRect.y += delta;
- li.accRect.y += delta;
- li.arrowRect.y += delta;
- }
- }
-
- private void doLTRColumnLayout(LayoutInfo li) {
- // Set maximal width for all the five basic rects
- // (three other ones are already maximal)
- li.iconRect.width = li.maxIconWidth;
- li.textRect.width = li.maxTextWidth;
-
- // Set X coordinates
- // All rects will be aligned at the left side
- calcXPositionsL2R(li.viewRect.x, li.leadingGap, li.gap, li.checkRect,
- li.iconRect, li.textRect);
-
- // Tune afterCheckIconGap
- if (li.checkRect.width > 0) { // there is the afterCheckIconGap
- li.iconRect.x += li.afterCheckIconGap - li.gap;
- li.textRect.x += li.afterCheckIconGap - li.gap;
- }
-
- calcXPositionsR2L(li.viewRect.x + li.viewRect.width, li.gap,
- li.arrowRect, li.accRect);
-
- // Take into account minimal text offset
- int textOffset = li.textRect.x - li.viewRect.x;
- if (!li.isTopLevelMenu && (textOffset < li.minTextOffset)) {
- li.textRect.x += li.minTextOffset - textOffset;
- }
-
- // Take into account the left side bearings for text and accelerator text.
- fixTextRects(li);
-
- // Set Y coordinate for text and icon.
- // Y coordinates for other rects
- // will be calculated later in layoutMenuItem.
- calcTextAndIconYPositions(li);
-
- // Calculate valid X and Y coordinates for labelRect
- li.labelRect = li.textRect.union(li.iconRect);
- }
-
- private void doLTRComplexLayout(LayoutInfo li) {
- li.labelRect.width = li.maxLabelWidth;
-
- // Set X coordinates
- calcXPositionsL2R(li.viewRect.x, li.leadingGap, li.gap, li.checkRect,
- li.labelRect);
-
- // Tune afterCheckIconGap
- if (li.checkRect.width > 0) { // there is the afterCheckIconGap
- li.labelRect.x += li.afterCheckIconGap - li.gap;
- }
-
- calcXPositionsR2L(li.viewRect.x + li.viewRect.width, li.gap,
- li.arrowRect, li.accRect);
-
- // Take into account minimal text offset
- int labelOffset = li.labelRect.x - li.viewRect.x;
- if (!li.isTopLevelMenu && (labelOffset < li.minTextOffset)) {
- li.labelRect.x += li.minTextOffset - labelOffset;
- }
-
- // Take into account the left side bearing for accelerator text.
- // The LSB for text is taken into account in layoutCompoundLabel() below.
- fixAccTextRect(li);
-
- // Layout icon and text with SwingUtilities.layoutCompoundLabel()
- // within the labelRect
- li.textRect = new Rectangle();
- li.iconRect = new Rectangle();
- SwingUtilities.layoutCompoundLabel(
- li.mi, li.fm, li.text, li.icon, li.verticalAlignment,
- li.horizontalAlignment, li.verticalTextPosition,
- li.horizontalTextPosition, li.labelRect,
- li.iconRect, li.textRect, li.gap);
- }
-
- private void doRTLColumnLayout(LayoutInfo li) {
- // Set maximal width for all the five basic rects
- // (three other ones are already maximal)
- li.iconRect.width = li.maxIconWidth;
- li.textRect.width = li.maxTextWidth;
-
- // Set X coordinates
- calcXPositionsR2L(li.viewRect.x + li.viewRect.width, li.leadingGap,
- li.gap, li.checkRect, li.iconRect, li.textRect);
-
- // Tune the gap after check icon
- if (li.checkRect.width > 0) { // there is the gap after check icon
- li.iconRect.x -= li.afterCheckIconGap - li.gap;
- li.textRect.x -= li.afterCheckIconGap - li.gap;
- }
-
- calcXPositionsL2R(li.viewRect.x, li.gap, li.arrowRect,
- li.accRect);
-
- // Take into account minimal text offset
- int textOffset = (li.viewRect.x + li.viewRect.width)
- - (li.textRect.x + li.textRect.width);
- if (!li.isTopLevelMenu && (textOffset < li.minTextOffset)) {
- li.textRect.x -= li.minTextOffset - textOffset;
- }
-
- // Align icon, text, accelerator text, check icon and arrow icon
- // at the right side
- rightAlignAllRects(li);
-
- // Take into account the left side bearings for text and accelerator text.
- fixTextRects(li);
-
- // Set Y coordinates for text and icon.
- // Y coordinates for other rects
- // will be calculated later in layoutMenuItem.
- calcTextAndIconYPositions(li);
-
- // Calculate valid X and Y coordinate for labelRect
- li.labelRect = li.textRect.union(li.iconRect);
- }
-
- private void doRTLComplexLayout(LayoutInfo li) {
- li.labelRect.width = li.maxLabelWidth;
-
- // Set X coordinates
- calcXPositionsR2L(li.viewRect.x + li.viewRect.width, li.leadingGap,
- li.gap, li.checkRect, li.labelRect);
-
- // Tune the gap after check icon
- if (li.checkRect.width > 0) { // there is the gap after check icon
- li.labelRect.x -= li.afterCheckIconGap - li.gap;
- }
-
- calcXPositionsL2R(li.viewRect.x, li.gap, li.arrowRect,
- li.accRect);
-
- // Take into account minimal text offset
- int labelOffset = (li.viewRect.x + li.viewRect.width)
- - (li.labelRect.x + li.labelRect.width);
- if (!li.isTopLevelMenu && (labelOffset < li.minTextOffset)) {
- li.labelRect.x -= li.minTextOffset - labelOffset;
- }
-
- // Align icon, text, accelerator text, check icon and arrow icon
- // at the right side
- rightAlignAllRects(li);
-
- // Take into account the left side bearing for accelerator text.
- // The LSB for text is taken into account in layoutCompoundLabel() below.
- fixAccTextRect(li);
-
- // Layout icon and text with SwingUtilities.layoutCompoundLabel()
- // within the labelRect
- li.textRect = new Rectangle();
- li.iconRect = new Rectangle();
- SwingUtilities.layoutCompoundLabel(
- menuItem, li.fm, li.text, li.icon, li.verticalAlignment,
- li.horizontalAlignment, li.verticalTextPosition,
- li.horizontalTextPosition, li.labelRect,
- li.iconRect, li.textRect, li.gap);
- }
-
- private void calcXPositionsL2R(int startXPos, int leadingGap,
- int gap, Rectangle... rects) {
- int curXPos = startXPos + leadingGap;
- for (Rectangle rect : rects) {
- rect.x = curXPos;
- if (rect.width > 0) {
- curXPos += rect.width + gap;
- }
- }
- }
-
- private void calcXPositionsL2R(int startXPos, int gap, Rectangle... rects) {
- calcXPositionsL2R(startXPos, gap, gap, rects);
- }
-
- private void calcXPositionsR2L(int startXPos, int leadingGap,
- int gap, Rectangle... rects) {
- int curXPos = startXPos - leadingGap;
- for (Rectangle rect : rects) {
- rect.x = curXPos - rect.width;
- if (rect.width > 0) {
- curXPos -= rect.width + gap;
- }
- }
- }
-
- private void calcXPositionsR2L(int startXPos, int gap, Rectangle... rects) {
- calcXPositionsR2L(startXPos, gap, gap, rects);
- }
-
- // Takes into account the left side bearings for text and accelerator text
- private void fixTextRects(LayoutInfo li) {
- if (li.htmlView == null) { // The text isn't a HTML
- int lsb = SwingUtilities2.getLeftSideBearing(li.mi, li.fm, li.text);
- if (lsb < 0) {
- li.textRect.x -= lsb;
- }
- }
- fixAccTextRect(li);
- }
-
- // Takes into account the left side bearing for accelerator text
- private void fixAccTextRect(LayoutInfo li) {
- int lsb = SwingUtilities2
- .getLeftSideBearing(li.mi, li.accFm, li.accText);
- if (lsb < 0) {
- li.accRect.x -= lsb;
- }
- }
-
- // Sets Y coordinates of text and icon
- // taking into account the vertical alignment
- private void calcTextAndIconYPositions(LayoutInfo li) {
- if (li.verticalAlignment == SwingUtilities.TOP) {
- li.textRect.y = (int)(li.viewRect.y
- + (float)li.labelRect.height/2
- - (float)li.textRect.height/2);
- li.iconRect.y = (int)(li.viewRect.y
- + (float)li.labelRect.height/2
- - (float)li.iconRect.height/2);
- } else if (li.verticalAlignment == SwingUtilities.CENTER) {
- li.textRect.y = (int)(li.viewRect.y
- + (float)li.viewRect.height/2
- - (float)li.textRect.height/2);
- li.iconRect.y = (int)(li.viewRect.y
- + (float)li.viewRect.height/2
- - (float)li.iconRect.height/2);
- }
- else if (li.verticalAlignment == SwingUtilities.BOTTOM) {
- li.textRect.y = (int)(li.viewRect.y + li.viewRect.height
- - (float)li.labelRect.height/2
- - (float)li.textRect.height/2);
- li.iconRect.y = (int)(li.viewRect.y + li.viewRect.height
- - (float)li.labelRect.height/2
- - (float)li.iconRect.height/2);
- }
- }
-
- // Aligns icon, text, accelerator text, check icon and arrow icon
- // at the right side
- private void rightAlignAllRects(LayoutInfo li) {
- li.iconRect.x = li.iconRect.x + li.iconRect.width - li.origIconWidth;
- li.iconRect.width = li.origIconWidth;
- li.textRect.x = li.textRect.x + li.textRect.width - li.origTextWidth;
- li.textRect.width = li.origTextWidth;
- li.accRect.x = li.accRect.x + li.accRect.width
- - li.origAccWidth;
- li.accRect.width = li.origAccWidth;
- li.checkRect.x = li.checkRect.x + li.checkRect.width
- - li.origCheckWidth;
- li.checkRect.width = li.origCheckWidth;
- li.arrowRect.x = li.arrowRect.x + li.arrowRect.width -
- li.origArrowWidth;
- li.arrowRect.width = li.origArrowWidth;
- }
-
- /*
- * Returns false if the component is a JMenu and it is a top
- * level menu (on the menubar).
- */
- private boolean useCheckAndArrow(){
- boolean b = true;
- if((menuItem instanceof JMenu) &&
- (((JMenu)menuItem).isTopLevelMenu())) {
- b = false;
- }
- return b;
- }
-
public MenuElement[] getPath() {
MenuSelectionManager m = MenuSelectionManager.defaultManager();
MenuElement oldPath[] = m.getSelectedPath();
@@ -1601,7 +737,7 @@
for(i=0,j=path.length; i<j ;i++){
for (int k=0; k<=i; k++)
System.out.print(" ");
- MenuElement me = (MenuElement) path[i];
+ MenuElement me = path[i];
if(me instanceof JMenuItem)
System.out.println(((JMenuItem)me).getText() + ", ");
else if (me == null)
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicMenuUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicMenuUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -123,9 +123,9 @@
InputMap windowInputMap = SwingUtilities.getUIInputMap(
menuItem, JComponent.WHEN_IN_FOCUSED_WINDOW);
if (lastMnemonic != 0 && windowInputMap != null) {
- for (int i=0; i<shortcutKeys.length; i++) {
+ for (int shortcutKey : shortcutKeys) {
windowInputMap.remove(KeyStroke.getKeyStroke
- (lastMnemonic, shortcutKeys[i], false));
+ (lastMnemonic, shortcutKey, false));
}
}
if (mnemonic != 0) {
@@ -135,10 +135,9 @@
SwingUtilities.replaceUIInputMap(menuItem, JComponent.
WHEN_IN_FOCUSED_WINDOW, windowInputMap);
}
- for (int i=0; i<shortcutKeys.length; i++) {
+ for (int shortcutKey : shortcutKeys) {
windowInputMap.put(KeyStroke.getKeyStroke(mnemonic,
- shortcutKeys[i], false),
- "selectMenu");
+ shortcutKey, false), "selectMenu");
}
}
lastMnemonic = mnemonic;
@@ -264,14 +263,14 @@
if(subElements.length > 0) {
me = new MenuElement[4];
me[0] = (MenuElement) cnt;
- me[1] = (MenuElement) menu;
- me[2] = (MenuElement) menu.getPopupMenu();
+ me[1] = menu;
+ me[2] = menu.getPopupMenu();
me[3] = subElements[0];
} else {
me = new MenuElement[3];
me[0] = (MenuElement)cnt;
me[1] = menu;
- me[2] = (MenuElement) menu.getPopupMenu();
+ me[2] = menu.getPopupMenu();
}
defaultManager.setSelectedPath(me);
}
@@ -606,7 +605,7 @@
MenuSelectionManager manager = e.getMenuSelectionManager();
if (key == Character.toLowerCase(e.getKeyChar())) {
JPopupMenu popupMenu = ((JMenu)menuItem).getPopupMenu();
- ArrayList newList = new ArrayList(Arrays.asList(path));
+ ArrayList<MenuElement> newList = new ArrayList<MenuElement>(Arrays.asList(path));
newList.add(popupMenu);
MenuElement subs[] = popupMenu.getSubElements();
MenuElement sub =
@@ -614,8 +613,8 @@
if(sub != null) {
newList.add(sub);
}
- MenuElement newPath[] = new MenuElement[0];;
- newPath = (MenuElement[]) newList.toArray(newPath);
+ MenuElement newPath[] = new MenuElement[0];
+ newPath = newList.toArray(newPath);
manager.setSelectedPath(newPath);
e.consume();
} else if (((JMenu)menuItem).isTopLevelMenu()
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -109,7 +109,7 @@
static {
- newline = (String)java.security.AccessController.doPrivileged(
+ newline = java.security.AccessController.doPrivileged(
new GetPropertyAction("line.separator"));
if (newline == null) {
newline = "\n";
@@ -262,7 +262,7 @@
* <code>getMinimumOptionPaneSize</code>.
*/
public Dimension getPreferredSize(JComponent c) {
- if ((JOptionPane)c == optionPane) {
+ if (c == optionPane) {
Dimension ourMin = getMinimumOptionPaneSize();
LayoutManager lm = c.getLayout();
@@ -366,8 +366,8 @@
} else if (msg instanceof Object[]) {
Object [] msgs = (Object[]) msg;
- for (int i = 0; i < msgs.length; i++) {
- addMessageComponents(container, cons, msgs[i], maxll, false);
+ for (Object o : msgs) {
+ addMessageComponents(container, cons, o, maxll, false);
}
} else if (msg instanceof Icon) {
@@ -381,7 +381,7 @@
if (len <= 0) {
return;
}
- int nl = -1;
+ int nl;
int nll = 0;
if ((nl = s.indexOf(newline)) >= 0) {
@@ -1320,7 +1320,7 @@
else if (changeName == "componentOrientation") {
ComponentOrientation o = (ComponentOrientation)e.getNewValue();
JOptionPane op = (JOptionPane)e.getSource();
- if (o != (ComponentOrientation)e.getOldValue()) {
+ if (o != e.getOldValue()) {
op.applyComponentOrientation(o);
}
}
@@ -1418,7 +1418,7 @@
}
JButton createButton() {
- JButton button = null;
+ JButton button;
if (minimumWidth > 0) {
button = new ConstrainedButton(text, minimumWidth);
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -225,14 +225,14 @@
return popup;
}
- static List getPopups() {
+ static List<JPopupMenu> getPopups() {
MenuSelectionManager msm = MenuSelectionManager.defaultManager();
MenuElement[] p = msm.getSelectedPath();
- List list = new ArrayList(p.length);
- for(int i = 0; i < p.length; i++) {
- if (p[i] instanceof JPopupMenu) {
- list.add((JPopupMenu)p[i]);
+ List<JPopupMenu> list = new ArrayList<JPopupMenu>(p.length);
+ for (MenuElement element : p) {
+ if (element instanceof JPopupMenu) {
+ list.add((JPopupMenu) element);
}
}
return list;
@@ -290,14 +290,14 @@
MenuElement subitem = findEnabledChild(
subpopup.getSubElements(), -1, true);
- ArrayList lst = new ArrayList(Arrays.asList(e.getPath()));
+ ArrayList<MenuElement> lst = new ArrayList<MenuElement>(Arrays.asList(e.getPath()));
lst.add(menuToOpen);
lst.add(subpopup);
if (subitem != null) {
lst.add(subitem);
}
- MenuElement newPath[] = new MenuElement[0];;
- newPath = (MenuElement[])lst.toArray(newPath);
+ MenuElement newPath[] = new MenuElement[0];
+ newPath = lst.toArray(newPath);
MenuSelectionManager.defaultManager().setSelectedPath(newPath);
e.consume();
}
@@ -345,7 +345,7 @@
}
if (matches == 0) {
- ; // no op
+ // no op
} else if (matches == 1) {
// Invoke the menu action
JMenuItem item = (JMenuItem)items[firstMatch];
@@ -362,7 +362,7 @@
// Select the menu item with the matching mnemonic. If
// the same mnemonic has been invoked then select the next
// menu item in the cycle.
- MenuElement newItem = null;
+ MenuElement newItem;
newItem = items[indexes[(currentIndex + 1) % matches]];
@@ -372,7 +372,6 @@
manager.setSelectedPath(newPath);
e.consume();
}
- return;
}
public void menuKeyReleased(MenuKeyEvent e) {
@@ -625,7 +624,7 @@
// 4234793: This action should call JPopupMenu.firePopupMenuCanceled but it's
// a protected method. The real solution could be to make
// firePopupMenuCanceled public and call it directly.
- JPopupMenu lastPopup = (JPopupMenu)getLastPopup();
+ JPopupMenu lastPopup = getLastPopup();
if (lastPopup != null) {
lastPopup.putClientProperty("JPopupMenu.firePopupMenuCanceled", Boolean.TRUE);
}
@@ -703,7 +702,7 @@
static MenuElement findEnabledChild(MenuElement e[], int fromIndex,
boolean forward) {
- MenuElement result = null;
+ MenuElement result;
if (forward) {
result = nextEnabledChild(e, fromIndex+1, e.length-1);
if (result == null) result = nextEnabledChild(e, 0, fromIndex-1);
@@ -752,7 +751,7 @@
// A grab needs to be added
final Toolkit tk = Toolkit.getDefaultToolkit();
java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
+ new java.security.PrivilegedAction<Object>() {
public Object run() {
tk.addAWTEventListener(MouseGrabber.this,
AWTEvent.MOUSE_EVENT_MASK |
@@ -785,7 +784,7 @@
final Toolkit tk = Toolkit.getDefaultToolkit();
// The grab should be removed
java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
+ new java.security.PrivilegedAction<Object>() {
public Object run() {
tk.removeAWTEventListener(MouseGrabber.this);
return null;
@@ -911,10 +910,8 @@
// 4234793: This action should call firePopupMenuCanceled but it's
// a protected method. The real solution could be to make
// firePopupMenuCanceled public and call it directly.
- List popups = getPopups();
- Iterator iter = popups.iterator();
- while (iter.hasNext()) {
- JPopupMenu popup = (JPopupMenu) iter.next();
+ List<JPopupMenu> popups = getPopups();
+ for (JPopupMenu popup : popups) {
popup.putClientProperty("JPopupMenu.firePopupMenuCanceled", Boolean.TRUE);
}
MenuSelectionManager.defaultManager().clearSelectedPath();
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -150,15 +150,15 @@
}
} else if(model.isSelected()) {
if(b.isRolloverEnabled() && model.isRollover()) {
- altIcon = (Icon) b.getRolloverSelectedIcon();
+ altIcon = b.getRolloverSelectedIcon();
if (altIcon == null) {
- altIcon = (Icon) b.getSelectedIcon();
+ altIcon = b.getSelectedIcon();
}
} else {
- altIcon = (Icon) b.getSelectedIcon();
+ altIcon = b.getSelectedIcon();
}
} else if(b.isRolloverEnabled() && model.isRollover()) {
- altIcon = (Icon) b.getRolloverIcon();
+ altIcon = b.getRolloverIcon();
}
if(altIcon == null) {
@@ -214,7 +214,7 @@
String text = b.getText();
- Icon buttonIcon = (Icon) b.getIcon();
+ Icon buttonIcon = b.getIcon();
if(buttonIcon == null) {
buttonIcon = getDefaultIcon();
}
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -106,13 +106,13 @@
* Keys to use for forward focus traversal when the JComponent is
* managing focus.
*/
- private static Set managingFocusForwardTraversalKeys;
+ private static Set<KeyStroke> managingFocusForwardTraversalKeys;
/**
* Keys to use for backward focus traversal when the JComponent is
* managing focus.
*/
- private static Set managingFocusBackwardTraversalKeys;
+ private static Set<KeyStroke> managingFocusBackwardTraversalKeys;
/**
@@ -370,7 +370,7 @@
// focus forward traversal key
if (managingFocusForwardTraversalKeys==null) {
- managingFocusForwardTraversalKeys = new HashSet();
+ managingFocusForwardTraversalKeys = new HashSet<KeyStroke>();
managingFocusForwardTraversalKeys.add(
KeyStroke.getKeyStroke(KeyEvent.VK_TAB, 0));
}
@@ -378,7 +378,7 @@
managingFocusForwardTraversalKeys);
// focus backward traversal key
if (managingFocusBackwardTraversalKeys==null) {
- managingFocusBackwardTraversalKeys = new HashSet();
+ managingFocusBackwardTraversalKeys = new HashSet<KeyStroke>();
managingFocusBackwardTraversalKeys.add(
KeyStroke.getKeyStroke(KeyEvent.VK_TAB, InputEvent.SHIFT_MASK));
}
@@ -2170,7 +2170,7 @@
Component focusOn = (direction > 0) ?
policy.getComponentAfter(rootAncestor, splitPane) :
policy.getComponentBefore(rootAncestor, splitPane);
- HashSet focusFrom = new HashSet();
+ HashSet<Component> focusFrom = new HashSet<Component>();
if (splitPane.isAncestorOf(focusOn)) {
do {
focusFrom.add(focusOn);
@@ -2212,7 +2212,7 @@
private Component getNextSide(JSplitPane splitPane, Component focus) {
Component left = splitPane.getLeftComponent();
Component right = splitPane.getRightComponent();
- Component next = null;
+ Component next;
if (focus!=null && SwingUtilities.isDescendingFrom(focus, left) &&
right!=null) {
next = getFirstAvailableComponent(right);
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -142,9 +142,9 @@
private Component visibleComponent;
// PENDING(api): See comment for ContainerHandler
- private Vector htmlViews;
-
- private Hashtable mnemonicToIndexMap;
+ private Vector<View> htmlViews;
+
+ private Hashtable<Integer, Integer> mnemonicToIndexMap;
/**
* InputMap used for mnemonics. Only non-null if the JTabbedPane has
@@ -546,7 +546,7 @@
* Installs the state needed for mnemonics.
*/
private void initMnemonics() {
- mnemonicToIndexMap = new Hashtable();
+ mnemonicToIndexMap = new Hashtable<Integer, Integer>();
mnemonicInputMap = new ComponentInputMapUIResource(tabPane);
mnemonicInputMap.setParent(SwingUtilities.getUIInputMap(tabPane,
JComponent.WHEN_IN_FOCUSED_WINDOW));
@@ -909,10 +909,10 @@
private static final int CROP_SEGMENT = 12;
private static Polygon createCroppedTabShape(int tabPlacement, Rectangle tabRect, int cropline) {
- int rlen = 0;
- int start = 0;
- int end = 0;
- int ostart = 0;
+ int rlen;
+ int start;
+ int end;
+ int ostart;
switch(tabPlacement) {
case LEFT:
@@ -1014,7 +1014,7 @@
tabPane.putClientProperty("html", v);
}
- SwingUtilities.layoutCompoundLabel((JComponent) tabPane,
+ SwingUtilities.layoutCompoundLabel(tabPane,
metrics, title, icon,
SwingUtilities.CENTER,
SwingUtilities.CENTER,
@@ -1694,7 +1694,7 @@
*/
protected View getTextViewForTab(int tabIndex) {
if (htmlViews != null) {
- return (View)htmlViews.elementAt(tabIndex);
+ return htmlViews.elementAt(tabIndex);
}
return null;
}
@@ -2230,8 +2230,7 @@
if (mnemonic >= 'a' && mnemonic <='z') {
mnemonic -= ('a' - 'A');
}
- Integer index = (Integer)ui.mnemonicToIndexMap.
- get(Integer.valueOf(mnemonic));
+ Integer index = ui.mnemonicToIndexMap.get(Integer.valueOf(mnemonic));
if (index != null && pane.isEnabledAt(index.intValue())) {
pane.setSelectedIndex(index.intValue());
}
@@ -2292,8 +2291,7 @@
for (int i = 0; i < tabPane.getTabCount(); i++) {
Component component = tabPane.getComponentAt(i);
if (component != null) {
- Dimension size = zeroSize;
- size = minimum? component.getMinimumSize() :
+ Dimension size = minimum ? component.getMinimumSize() :
component.getPreferredSize();
if (size != null) {
@@ -2305,7 +2303,7 @@
// Add content border insets to minimum size
width += cWidth;
height += cHeight;
- int tabExtent = 0;
+ int tabExtent;
// Calculate how much space the tabs will need, based on the
// minimum size required to display largest child + content border
@@ -3143,7 +3141,7 @@
Insets tabAreaInsets = getTabAreaInsets(tabPlacement);
int fontHeight = metrics.getHeight();
int selectedIndex = tabPane.getSelectedIndex();
- int i, j;
+ int i;
boolean verticalTabRuns = (tabPlacement == LEFT || tabPlacement == RIGHT);
boolean leftToRight = BasicGraphicsUtils.isLeftToRight(tabPane);
int x = tabAreaInsets.left;
@@ -3433,10 +3431,10 @@
}
public String toString() {
- return new String("viewport.viewSize="+viewport.getViewSize()+"\n"+
+ return "viewport.viewSize=" + viewport.getViewSize() + "\n" +
"viewport.viewRectangle="+viewport.getViewRect()+"\n"+
"leadingTabIndex="+leadingTabIndex+"\n"+
- "tabViewPosition="+tabViewPosition);
+ "tabViewPosition=" + tabViewPosition;
}
}
@@ -3788,8 +3786,8 @@
}
}
- private Vector createHTMLVector() {
- Vector htmlViews = new Vector();
+ private Vector<View> createHTMLVector() {
+ Vector<View> htmlViews = new Vector<View>();
int count = tabPane.getTabCount();
if (count>0) {
for (int i=0 ; i<count; i++) {
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -526,16 +526,16 @@
EditorKit editorKit = getEditorKit(editor);
if ( editorKit != null
&& editorKit instanceof DefaultEditorKit) {
- Set storedForwardTraversalKeys = editor.
+ Set<AWTKeyStroke> storedForwardTraversalKeys = editor.
getFocusTraversalKeys(KeyboardFocusManager.
FORWARD_TRAVERSAL_KEYS);
- Set storedBackwardTraversalKeys = editor.
+ Set<AWTKeyStroke> storedBackwardTraversalKeys = editor.
getFocusTraversalKeys(KeyboardFocusManager.
BACKWARD_TRAVERSAL_KEYS);
- Set forwardTraversalKeys =
- new HashSet(storedForwardTraversalKeys);
- Set backwardTraversalKeys =
- new HashSet(storedBackwardTraversalKeys);
+ Set<AWTKeyStroke> forwardTraversalKeys =
+ new HashSet<AWTKeyStroke>(storedForwardTraversalKeys);
+ Set<AWTKeyStroke> backwardTraversalKeys =
+ new HashSet<AWTKeyStroke>(storedBackwardTraversalKeys);
if (editor.isEditable()) {
forwardTraversalKeys.
remove(KeyStroke.getKeyStroke(KeyEvent.VK_TAB, 0));
@@ -1888,7 +1888,7 @@
*
* @param e The change notification from the currently associated
* document.
- * @see DocumentListener#changeUpdate
+ * @see DocumentListener#changedUpdate(DocumentEvent)
*/
public final void changedUpdate(DocumentEvent e) {
Rectangle alloc = (painted) ? getVisibleEditorRect() : null;
@@ -1964,9 +1964,9 @@
}
try {
rootView.setSize(alloc.width, alloc.height);
- Enumeration components = constraints.keys();
+ Enumeration<Component> components = constraints.keys();
while (components.hasMoreElements()) {
- Component comp = (Component) components.nextElement();
+ Component comp = components.nextElement();
View v = (View) constraints.get(comp);
Shape ca = calculateViewPosition(alloc, v);
if (ca != null) {
@@ -2009,7 +2009,7 @@
public void addLayoutComponent(Component comp, Object constraint) {
if (constraint instanceof View) {
if (constraints == null) {
- constraints = new Hashtable(7);
+ constraints = new Hashtable<Component, Object>(7);
}
constraints.put(comp, constraint);
}
@@ -2060,7 +2060,7 @@
* These are View objects for those components that are represented
* by a View in the View tree.
*/
- private Hashtable constraints;
+ private Hashtable<Component, Object> constraints;
private boolean i18nView = false;
}
@@ -2457,8 +2457,7 @@
JTextComponent c = (JTextComponent)comp;
int pos = modeBetween
- ? ((JTextComponent.DropLocation)c.getDropLocation()).getIndex()
- : c.getCaretPosition();
+ ? c.getDropLocation().getIndex() : c.getCaretPosition();
// if we are importing to the same component that we exported from
// then don't actually do anything if the drop location is inside
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -125,31 +125,31 @@
if(!model.isEnabled()) {
if(model.isSelected()) {
- icon = (Icon) b.getDisabledSelectedIcon();
+ icon = b.getDisabledSelectedIcon();
} else {
- icon = (Icon) b.getDisabledIcon();
+ icon = b.getDisabledIcon();
}
} else if(model.isPressed() && model.isArmed()) {
- icon = (Icon) b.getPressedIcon();
+ icon = b.getPressedIcon();
if(icon == null) {
// Use selected icon
- icon = (Icon) b.getSelectedIcon();
+ icon = b.getSelectedIcon();
}
} else if(model.isSelected()) {
if(b.isRolloverEnabled() && model.isRollover()) {
- icon = (Icon) b.getRolloverSelectedIcon();
+ icon = b.getRolloverSelectedIcon();
if (icon == null) {
- icon = (Icon) b.getSelectedIcon();
+ icon = b.getSelectedIcon();
}
} else {
- icon = (Icon) b.getSelectedIcon();
+ icon = b.getSelectedIcon();
}
} else if(b.isRolloverEnabled() && model.isRollover()) {
- icon = (Icon) b.getRolloverIcon();
+ icon = b.getRolloverIcon();
}
if(icon == null) {
- icon = (Icon) b.getIcon();
+ icon = b.getIcon();
}
icon.paintIcon(b, g, iconRect.x, iconRect.y);
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicToolBarUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicToolBarUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -83,8 +83,8 @@
private static Border nonRolloverToggleBorder;
private boolean rolloverBorders = false;
- private HashMap borderTable = new HashMap();
- private Hashtable rolloverTable = new Hashtable();
+ private HashMap<AbstractButton, Border> borderTable = new HashMap<AbstractButton, Border>();
+ private Hashtable<AbstractButton, Boolean> rolloverTable = new Hashtable<AbstractButton, Boolean>();
/**
@@ -171,7 +171,7 @@
uninstallKeyboardActions();
// Clear instance vars
- if (isFloating() == true)
+ if (isFloating())
setFloating(false, null);
floatingToolBar = null;
@@ -273,9 +273,8 @@
// Put focus listener on all components in toolbar
Component[] components = toolBar.getComponents();
- for ( int i = 0; i < components.length; ++i )
- {
- components[ i ].addFocusListener( toolBarFocusListener );
+ for (Component component : components) {
+ component.addFocusListener(toolBarFocusListener);
}
}
}
@@ -307,9 +306,8 @@
// Remove focus listener from all components in toolbar
Component[] components = toolBar.getComponents();
- for ( int i = 0; i < components.length; ++i )
- {
- components[ i ].removeFocusListener( toolBarFocusListener );
+ for (Component component : components) {
+ component.removeFocusListener(toolBarFocusListener);
}
toolBarFocusListener = null;
@@ -616,10 +614,10 @@
// Put rollover borders on buttons
Component[] components = c.getComponents();
- for ( int i = 0; i < components.length; ++i ) {
- if ( components[ i ] instanceof JComponent ) {
- ( (JComponent)components[ i ] ).updateUI();
- setBorderToRollover( components[ i ] );
+ for (Component component : components) {
+ if (component instanceof JComponent) {
+ ((JComponent) component).updateUI();
+ setBorderToRollover(component);
}
}
}
@@ -640,10 +638,10 @@
// Put non-rollover borders on buttons. These borders reduce the margin.
Component[] components = c.getComponents();
- for ( int i = 0; i < components.length; ++i ) {
- if ( components[ i ] instanceof JComponent ) {
- ( (JComponent)components[ i ] ).updateUI();
- setBorderToNonRollover( components[ i ] );
+ for (Component component : components) {
+ if (component instanceof JComponent) {
+ ((JComponent) component).updateUI();
+ setBorderToNonRollover(component);
}
}
}
@@ -664,8 +662,8 @@
// Put back the normal borders on buttons
Component[] components = c.getComponents();
- for ( int i = 0; i < components.length; ++i ) {
- setBorderToNormal( components[ i ] );
+ for (Component component : components) {
+ setBorderToNormal(component);
}
}
@@ -681,7 +679,7 @@
if (c instanceof AbstractButton) {
AbstractButton b = (AbstractButton)c;
- Border border = (Border)borderTable.get(b);
+ Border border = borderTable.get(b);
if (border == null || border instanceof UIResource) {
borderTable.put(b, b.getBorder());
}
@@ -721,7 +719,7 @@
if (c instanceof AbstractButton) {
AbstractButton b = (AbstractButton)c;
- Border border = (Border)borderTable.get(b);
+ Border border = borderTable.get(b);
if (border == null || border instanceof UIResource) {
borderTable.put(b, b.getBorder());
}
@@ -765,10 +763,10 @@
if (c instanceof AbstractButton) {
AbstractButton b = (AbstractButton)c;
- Border border = (Border)borderTable.remove(b);
+ Border border = borderTable.remove(b);
b.setBorder(border);
- Boolean value = (Boolean)rolloverTable.remove(b);
+ Boolean value = rolloverTable.remove(b);
if (value != null) {
b.setRolloverEnabled(value.booleanValue());
}
@@ -785,7 +783,7 @@
}
public void setFloating(boolean b, Point p) {
- if (toolBar.isFloatable() == true) {
+ if (toolBar.isFloatable()) {
boolean visible = false;
Window ancestor = SwingUtilities.getWindowAncestor(toolBar);
if (ancestor != null) {
@@ -953,7 +951,7 @@
protected void dragTo(Point position, Point origin)
{
- if (toolBar.isFloatable() == true)
+ if (toolBar.isFloatable())
{
try
{
@@ -1003,7 +1001,7 @@
protected void floatAt(Point position, Point origin)
{
- if(toolBar.isFloatable() == true)
+ if(toolBar.isFloatable())
{
try
{
@@ -1174,7 +1172,7 @@
if (!tb.isEnabled()) {
return;
}
- if (isDragging == true) {
+ if (isDragging) {
Point position = evt.getPoint();
if (origin == null)
origin = evt.getComponent().getLocationOnScreen();
@@ -1242,7 +1240,7 @@
protected class FrameListener extends WindowAdapter {
public void windowClosing(WindowEvent w) {
- if (toolBar.isFloatable() == true) {
+ if (toolBar.isFloatable()) {
if (dragWindow != null)
dragWindow.setVisible(false);
floating = false;
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -1263,7 +1263,7 @@
}
private Rectangle getDropLineRect(JTree.DropLocation loc) {
- Rectangle rect = null;
+ Rectangle rect;
TreePath path = loc.getPath();
int index = loc.getChildIndex();
boolean ltr = leftToRight;
@@ -2138,7 +2138,7 @@
compositeRequestFocus(editingComponent);
boolean selectAll = true;
- if(event != null && event instanceof MouseEvent) {
+ if(event != null) {
/* Find the component that will get forwarded all the
mouse events until mouseReleased. */
Point componentPoint = SwingUtilities.convertPoint
@@ -3125,7 +3125,7 @@
private static final TransferHandler defaultTransferHandler = new TreeTransferHandler();
- static class TreeTransferHandler extends TransferHandler implements UIResource, Comparator {
+ static class TreeTransferHandler extends TransferHandler implements UIResource, Comparator<TreePath> {
private JTree tree;
@@ -3156,9 +3156,7 @@
TreePath lastPath = null;
TreePath[] displayPaths = getDisplayOrderPaths(paths);
- for (int i = 0; i < displayPaths.length; i++) {
- TreePath path = displayPaths[i];
-
+ for (TreePath path : displayPaths) {
Object node = path.getLastPathComponent();
boolean leaf = model.isLeaf(node);
String label = getDisplayString(path, true, leaf);
@@ -3179,9 +3177,9 @@
return null;
}
- public int compare(Object o1, Object o2) {
- int row1 = tree.getRowForPath((TreePath)o1);
- int row2 = tree.getRowForPath((TreePath)o2);
+ public int compare(TreePath o1, TreePath o2) {
+ int row1 = tree.getRowForPath(o1);
+ int row2 = tree.getRowForPath(o2);
return row1 - row2;
}
@@ -3200,15 +3198,15 @@
*/
TreePath[] getDisplayOrderPaths(TreePath[] paths) {
// sort the paths to display order rather than selection order
- ArrayList selOrder = new ArrayList();
- for (int i = 0; i < paths.length; i++) {
- selOrder.add(paths[i]);
+ ArrayList<TreePath> selOrder = new ArrayList<TreePath>();
+ for (TreePath path : paths) {
+ selOrder.add(path);
}
Collections.sort(selOrder, this);
int n = selOrder.size();
TreePath[] displayPaths = new TreePath[n];
for (int i = 0; i < n; i++) {
- displayPaths[i] = (TreePath) selOrder.get(i);
+ displayPaths[i] = selOrder.get(i);
}
return displayPaths;
}
@@ -3321,10 +3319,7 @@
InputMap inputMap = tree.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
KeyStroke key = KeyStroke.getKeyStrokeForEvent(event);
- if (inputMap != null && inputMap.get(key) != null) {
- return true;
- }
- return false;
+ return inputMap != null && inputMap.get(key) != null;
}
--- a/jdk/src/share/classes/javax/swing/plaf/basic/DefaultMenuLayout.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/DefaultMenuLayout.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
@@ -30,7 +30,6 @@
import java.awt.Container;
import java.awt.Dimension;
-import static sun.swing.SwingUtilities2.BASICMENUITEMUI_MAX_TEXT_OFFSET;
/**
* The default layout manager for Popup menus and menubars. This
@@ -49,18 +48,7 @@
public Dimension preferredLayoutSize(Container target) {
if (target instanceof JPopupMenu) {
JPopupMenu popupMenu = (JPopupMenu) target;
-
- // Before the calculation of menu preferred size
- // clear the previously calculated maximal widths and offsets
- // in menu's Client Properties
- popupMenu.putClientProperty(BasicMenuItemUI.MAX_ACC_WIDTH, null);
- popupMenu.putClientProperty(BasicMenuItemUI.MAX_ARROW_WIDTH, null);
- popupMenu.putClientProperty(BasicMenuItemUI.MAX_CHECK_WIDTH, null);
- popupMenu.putClientProperty(BasicMenuItemUI.MAX_ICON_WIDTH, null);
- popupMenu.putClientProperty(BasicMenuItemUI.MAX_LABEL_WIDTH, null);
- popupMenu.putClientProperty(BasicMenuItemUI.MAX_TEXT_WIDTH, null);
- popupMenu.putClientProperty(BASICMENUITEMUI_MAX_TEXT_OFFSET, null);
-
+ sun.swing.MenuItemLayoutHelper.clearUsedClientProperties(popupMenu);
if (popupMenu.getComponentCount() == 0) {
return new Dimension(0, 0);
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/DesktopIconMover.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,168 @@
+/*
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package javax.swing.plaf.basic;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.*;
+import java.beans.*;
+
+/**
+ * DesktopIconMover is intended to move desktop icon
+ * when parent window is resized.
+ */
+class DesktopIconMover implements ComponentListener, PropertyChangeListener {
+ private Component parent;
+ private JInternalFrame frame; // if not null, DesktopIconMover(frame)
+ // constructor was used
+ private JInternalFrame.JDesktopIcon icon;
+ private Rectangle parentBounds;
+ private boolean componentListenerAdded = false;
+
+ public DesktopIconMover(JInternalFrame frame) {
+ if (frame == null) {
+ throw new NullPointerException("Frame cannot be null");
+ }
+ this.frame = frame;
+ this.icon = frame.getDesktopIcon();
+ if (icon == null) {
+ throw new NullPointerException(
+ "frame.getDesktopIcon() cannot be null");
+ }
+ this.parent = frame.getParent();
+ if (this.parent != null) {
+ parentBounds = this.parent.getBounds();
+ }
+ }
+
+ public DesktopIconMover(JInternalFrame.JDesktopIcon icon) {
+ if (icon == null) {
+ throw new NullPointerException("Icon cannot be null");
+ }
+ this.icon = icon;
+ this.parent = icon.getParent();
+ if (this.parent != null) {
+ parentBounds = this.parent.getBounds();
+ }
+ }
+
+ public void installListeners() {
+ if (frame != null) {
+ frame.addPropertyChangeListener(this);
+ } else {
+ icon.addPropertyChangeListener(this);
+ }
+ addComponentListener();
+ }
+
+ public void uninstallListeners() {
+ if (frame != null) {
+ frame.removePropertyChangeListener(this);
+ } else {
+ icon.removePropertyChangeListener(this);
+ }
+ removeComponentListener();
+ }
+
+ public void propertyChange(PropertyChangeEvent evt) {
+ String propName = evt.getPropertyName();
+ if ("ancestor".equals(propName)) {
+ Component newAncestor = (Component) evt.getNewValue();
+
+ // Remove component listener if parent is changing
+ Component probablyNewParent = getCurrentParent();
+ if ((probablyNewParent != null) &&
+ (!probablyNewParent.equals(parent))) {
+ removeComponentListener();
+ parent = probablyNewParent;
+ }
+
+ if (newAncestor == null) {
+ removeComponentListener();
+ } else {
+ addComponentListener();
+ }
+
+ // Update parentBounds
+ if (parent != null) {
+ parentBounds = parent.getBounds();
+ } else {
+ parentBounds = null;
+ }
+ } else if (JInternalFrame.IS_CLOSED_PROPERTY.equals(propName)) {
+ removeComponentListener();
+ }
+ }
+
+ private void addComponentListener() {
+ if (!componentListenerAdded && (parent != null)) {
+ parent.addComponentListener(this);
+ componentListenerAdded = true;
+ }
+ }
+
+ private void removeComponentListener() {
+ if ((parent != null) && componentListenerAdded) {
+ parent.removeComponentListener(this);
+ componentListenerAdded = false;
+ }
+ }
+
+ private Component getCurrentParent() {
+ if (frame != null) {
+ return frame.getParent();
+ } else {
+ return icon.getParent();
+ }
+ }
+
+ public void componentResized(ComponentEvent e) {
+ if ((parent == null) || (parentBounds == null)) {
+ return;
+ }
+
+ Rectangle parentNewBounds = parent.getBounds();
+ if ((parentNewBounds == null) || parentNewBounds.equals(parentBounds)) {
+ return;
+ }
+
+ // Move desktop icon only in up-down direction
+ int newIconY = icon.getLocation().y +
+ (parentNewBounds.height - parentBounds.height);
+ icon.setLocation(icon.getLocation().x, newIconY);
+
+ parentBounds = parentNewBounds;
+ }
+
+ public void componentMoved(ComponentEvent e) {
+ }
+
+ public void componentShown(ComponentEvent e) {
+ }
+
+ public void componentHidden(ComponentEvent e) {
+ }
+}
--- a/jdk/src/share/classes/javax/swing/plaf/basic/DragRecognitionSupport.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/DragRecognitionSupport.java Wed Jul 05 16:42:37 2017 +0200
@@ -73,8 +73,7 @@
* Returns whether or not the event is potentially part of a drag sequence.
*/
public static boolean mousePressed(MouseEvent me) {
- return ((DragRecognitionSupport)getDragRecognitionSupport()).
- mousePressedImpl(me);
+ return getDragRecognitionSupport().mousePressedImpl(me);
}
/**
@@ -82,16 +81,14 @@
* that started the recognition. Otherwise, return null.
*/
public static MouseEvent mouseReleased(MouseEvent me) {
- return ((DragRecognitionSupport)getDragRecognitionSupport()).
- mouseReleasedImpl(me);
+ return getDragRecognitionSupport().mouseReleasedImpl(me);
}
/**
* Returns whether or not a drag gesture recognition is ongoing.
*/
public static boolean mouseDragged(MouseEvent me, BeforeDrag bd) {
- return ((DragRecognitionSupport)getDragRecognitionSupport()).
- mouseDraggedImpl(me, bd);
+ return getDragRecognitionSupport().mouseDraggedImpl(me, bd);
}
private void clearState() {
--- a/jdk/src/share/classes/javax/swing/plaf/basic/LazyActionMap.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/LazyActionMap.java Wed Jul 05 16:42:37 2017 +0200
@@ -142,7 +142,7 @@
Object loader = _loader;
_loader = null;
- Class klass = (Class)loader;
+ Class<?> klass = (Class<?>)loader;
try {
Method method = klass.getDeclaredMethod("loadActionMap",
new Class[] { LazyActionMap.class });
--- a/jdk/src/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java Wed Jul 05 16:42:37 2017 +0200
@@ -387,9 +387,9 @@
* that it is wrapped inside a <code>doPrivileged</code> call.
*/
protected Font getPrivilegedFont(final int key) {
- return (Font)java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
- public Object run() {
+ return java.security.AccessController.doPrivileged(
+ new java.security.PrivilegedAction<Font>() {
+ public Font run() {
return Font.getFont(getDefaultPropertyName(key));
}
}
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalBumps.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalBumps.java Wed Jul 05 16:42:37 2017 +0200
@@ -49,7 +49,7 @@
protected Color shadowColor;
protected Color backColor;
- protected static Vector buffers = new Vector();
+ protected static Vector<BumpBuffer> buffers = new Vector<BumpBuffer>();
protected BumpBuffer buffer;
public MetalBumps( Dimension bumpArea ) {
@@ -81,10 +81,7 @@
}
BumpBuffer result = null;
- Enumeration elements = buffers.elements();
-
- while ( elements.hasMoreElements() ) {
- BumpBuffer aBuffer = (BumpBuffer)elements.nextElement();
+ for (BumpBuffer aBuffer : buffers) {
if ( aBuffer.hasSameConfiguration(gc, aTopColor, aShadowColor,
aBackColor)) {
result = aBuffer;
@@ -120,8 +117,7 @@
public void paintIcon( Component c, Graphics g, int x, int y ) {
GraphicsConfiguration gc = (g instanceof Graphics2D) ?
- (GraphicsConfiguration)((Graphics2D)g).
- getDeviceConfiguration() : null;
+ ((Graphics2D) g).getDeviceConfiguration() : null;
buffer = getBuffer(gc, topColor, shadowColor, backColor);
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -782,7 +782,7 @@
} else if (s.equals("componentOrientation")) {
ComponentOrientation o = (ComponentOrientation)e.getNewValue();
JFileChooser cc = (JFileChooser)e.getSource();
- if (o != (ComponentOrientation)e.getOldValue()) {
+ if (o != e.getOldValue()) {
cc.applyComponentOrientation(o);
}
} else if (s == "FileChooser.useShellFolder") {
@@ -927,7 +927,7 @@
* Data model for a type-face selection combo-box.
*/
protected class DirectoryComboBoxModel extends AbstractListModel implements ComboBoxModel {
- Vector directories = new Vector();
+ Vector<File> directories = new Vector<File>();
int[] depths = null;
File selectedDirectory = null;
JFileChooser chooser = getFileChooser();
@@ -966,7 +966,7 @@
// Get the canonical (full) path. This has the side
// benefit of removing extraneous chars from the path,
// for example /foo/bar/ becomes /foo/bar
- File canonical = null;
+ File canonical;
try {
canonical = ShellFolder.getNormalizedFile(directory);
} catch (IOException e) {
@@ -979,7 +979,7 @@
File sf = useShellFolder ? ShellFolder.getShellFolder(canonical)
: canonical;
File f = sf;
- Vector path = new Vector(10);
+ Vector<File> path = new Vector<File>(10);
do {
path.addElement(f);
} while ((f = f.getParentFile()) != null);
@@ -987,7 +987,7 @@
int pathCount = path.size();
// Insert chain at appropriate place in vector
for (int i = 0; i < pathCount; i++) {
- f = (File)path.get(i);
+ f = path.get(i);
if (directories.contains(f)) {
int topIndex = directories.indexOf(f);
for (int j = i-1; j >= 0; j--) {
@@ -1006,12 +1006,12 @@
private void calculateDepths() {
depths = new int[directories.size()];
for (int i = 0; i < depths.length; i++) {
- File dir = (File)directories.get(i);
+ File dir = directories.get(i);
File parent = dir.getParentFile();
depths[i] = 0;
if (parent != null) {
for (int j = i-1; j >= 0; j--) {
- if (parent.equals((File)directories.get(j))) {
+ if (parent.equals(directories.get(j))) {
depths[i] = depths[j] + 1;
break;
}
@@ -1110,8 +1110,8 @@
FileFilter currentFilter = getFileChooser().getFileFilter();
boolean found = false;
if(currentFilter != null) {
- for(int i=0; i < filters.length; i++) {
- if(filters[i] == currentFilter) {
+ for (FileFilter filter : filters) {
+ if (filter == currentFilter) {
found = true;
}
}
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalIconFactory.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalIconFactory.java Wed Jul 05 16:42:37 2017 +0200
@@ -598,7 +598,7 @@
}
// Some calculations that are needed more than once later on.
- int oneHalf = (int)(iconSize / 2); // 16 -> 8
+ int oneHalf = iconSize / 2; // 16 -> 8
g.translate(x, y);
@@ -1502,7 +1502,7 @@
// PENDING: Replace this class with CachedPainter.
- Vector images = new Vector(1, 1);
+ Vector<ImageGcPair> images = new Vector<ImageGcPair>(1, 1);
ImageGcPair currentImageGcPair;
class ImageGcPair {
@@ -1514,12 +1514,8 @@
}
boolean hasSameConfiguration(GraphicsConfiguration newGC) {
- if (((newGC != null) && (newGC.equals(gc))) ||
- ((newGC == null) && (gc == null)))
- {
- return true;
- }
- return false;
+ return ((newGC != null) && (newGC.equals(gc))) ||
+ ((newGC == null) && (gc == null));
}
}
@@ -1528,9 +1524,7 @@
if ((currentImageGcPair == null) ||
!(currentImageGcPair.hasSameConfiguration(newGC)))
{
- Enumeration elements = images.elements();
- while (elements.hasMoreElements()) {
- ImageGcPair imgGcPair = (ImageGcPair)elements.nextElement();
+ for (ImageGcPair imgGcPair : images) {
if (imgGcPair.hasSameConfiguration(newGC)) {
currentImageGcPair = imgGcPair;
return imgGcPair.image;
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java Wed Jul 05 16:42:37 2017 +0200
@@ -191,7 +191,7 @@
extends BasicInternalFrameTitlePane.PropertyChangeHandler
{
public void propertyChange(PropertyChangeEvent evt) {
- String prop = (String)evt.getPropertyName();
+ String prop = evt.getPropertyName();
if( prop.equals(JInternalFrame.IS_SELECTED_PROPERTY) ) {
Boolean b = (Boolean)evt.getNewValue();
iconButton.putClientProperty("paintActive", b);
@@ -242,7 +242,7 @@
}
// Compute height.
- int height = 0;
+ int height;
if (isPalette) {
height = paletteTitleHeight;
} else {
@@ -410,7 +410,7 @@
g.drawLine ( width - 1, 0 , width -1, 0);
- int titleLength = 0;
+ int titleLength;
int xOffset = leftToRight ? 5 : width - 5;
String frameTitle = frame.getTitle();
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java Wed Jul 05 16:42:37 2017 +0200
@@ -2208,9 +2208,9 @@
if (methodName == null) {
return c.newInstance();
}
- Method method = (Method)AccessController.doPrivileged(
- new PrivilegedAction() {
- public Object run() {
+ Method method = AccessController.doPrivileged(
+ new PrivilegedAction<Method>() {
+ public Method run() {
Method[] methods = c.getDeclaredMethods();
for (int counter = methods.length - 1; counter >= 0;
counter--) {
@@ -2273,7 +2273,7 @@
}
}
- static ReferenceQueue queue = new ReferenceQueue();
+ static ReferenceQueue<LookAndFeel> queue = new ReferenceQueue<LookAndFeel>();
static void flushUnreferenced() {
AATextListener aatl;
@@ -2283,7 +2283,7 @@
}
static class AATextListener
- extends WeakReference implements PropertyChangeListener {
+ extends WeakReference<LookAndFeel> implements PropertyChangeListener {
private String key = SunToolkit.DESKTOPFONTHINTS;
@@ -2294,7 +2294,7 @@
}
public void propertyChange(PropertyChangeEvent pce) {
- LookAndFeel laf = (LookAndFeel)get();
+ LookAndFeel laf = get();
if (laf == null || laf != UIManager.getLookAndFeel()) {
dispose();
return;
@@ -2318,8 +2318,8 @@
private static void updateWindowUI(Window window) {
SwingUtilities.updateComponentTreeUI(window);
Window ownedWins[] = window.getOwnedWindows();
- for (int i=0; i < ownedWins.length; i++) {
- updateWindowUI(ownedWins[i]);
+ for (Window w : ownedWins) {
+ updateWindowUI(w);
}
}
@@ -2328,8 +2328,8 @@
*/
private static void updateAllUIs() {
Frame appFrames[] = Frame.getFrames();
- for (int j=0; j < appFrames.length; j++) {
- updateWindowUI(appFrames[j]);
+ for (Frame frame : appFrames) {
+ updateWindowUI(frame);
}
}
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalRadioButtonUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalRadioButtonUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -164,15 +164,15 @@
}
} else if(model.isSelected()) {
if(b.isRolloverEnabled() && model.isRollover()) {
- altIcon = (Icon) b.getRolloverSelectedIcon();
+ altIcon = b.getRolloverSelectedIcon();
if (altIcon == null) {
- altIcon = (Icon) b.getSelectedIcon();
+ altIcon = b.getSelectedIcon();
}
} else {
- altIcon = (Icon) b.getSelectedIcon();
+ altIcon = b.getSelectedIcon();
}
} else if(b.isRolloverEnabled() && model.isRollover()) {
- altIcon = (Icon) b.getRolloverIcon();
+ altIcon = b.getRolloverIcon();
}
if(altIcon == null) {
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalSliderUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalSliderUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -27,23 +27,13 @@
import javax.swing.plaf.basic.BasicSliderUI;
-import java.awt.Component;
-import java.awt.Container;
import java.awt.Graphics;
import java.awt.Dimension;
import java.awt.Rectangle;
-import java.awt.Point;
-import java.awt.Insets;
import java.awt.Color;
-import java.io.Serializable;
-import java.awt.IllegalComponentStateException;
-import java.awt.Polygon;
import java.beans.*;
-import javax.swing.border.AbstractBorder;
-
import javax.swing.*;
-import javax.swing.event.*;
import javax.swing.plaf.*;
/**
@@ -131,10 +121,7 @@
scrollListener.setScrollByBlock( false );
- Object sliderFillProp = c.getClientProperty( SLIDER_FILL );
- if ( sliderFillProp != null ) {
- filledSlider = ((Boolean)sliderFillProp).booleanValue();
- }
+ prepareFilledSliderField();
}
protected PropertyChangeListener createPropertyChangeListener( JSlider slider ) {
@@ -145,18 +132,23 @@
public void propertyChange( PropertyChangeEvent e ) { // listen for slider fill
super.propertyChange( e );
- String name = e.getPropertyName();
- if ( name.equals( SLIDER_FILL ) ) {
- if ( e.getNewValue() != null ) {
- filledSlider = ((Boolean)e.getNewValue()).booleanValue();
- }
- else {
- filledSlider = false;
- }
+ if (e.getPropertyName().equals(SLIDER_FILL)) {
+ prepareFilledSliderField();
}
}
}
+ private void prepareFilledSliderField() {
+ // Use true for Ocean theme
+ filledSlider = MetalLookAndFeel.usingOcean();
+
+ Object sliderFillProp = slider.getClientProperty(SLIDER_FILL);
+
+ if (sliderFillProp != null) {
+ filledSlider = ((Boolean) sliderFillProp).booleanValue();
+ }
+ }
+
public void paintThumb(Graphics g) {
Rectangle knobBounds = thumbRect;
@@ -173,21 +165,10 @@
}
/**
- * If <code>chooseFirst</code>is true, <code>c1</code> is returned,
- * otherwise <code>c2</code>.
- */
- private Color chooseColor(boolean chooseFirst, Color c1, Color c2) {
- if (chooseFirst) {
- return c2;
- }
- return c1;
- }
-
- /**
* Returns a rectangle enclosing the track that will be painted.
*/
private Rectangle getPaintTrackRect() {
- int trackLeft = 0, trackRight = 0, trackTop = 0, trackBottom = 0;
+ int trackLeft = 0, trackRight, trackTop = 0, trackBottom;
if (slider.getOrientation() == JSlider.HORIZONTAL) {
trackBottom = (trackRect.height - 1) - getThumbOverhang();
trackTop = trackBottom - (getTrackWidth() - 1);
@@ -223,8 +204,8 @@
int trackLeft = 0;
int trackTop = 0;
- int trackRight = 0;
- int trackBottom = 0;
+ int trackRight;
+ int trackBottom;
// Draw the track
if ( slider.getOrientation() == JSlider.HORIZONTAL ) {
@@ -266,11 +247,11 @@
// Draw the fill
if ( filledSlider ) {
- int middleOfThumb = 0;
- int fillTop = 0;
- int fillLeft = 0;
- int fillBottom = 0;
- int fillRight = 0;
+ int middleOfThumb;
+ int fillTop;
+ int fillLeft;
+ int fillBottom;
+ int fillRight;
if ( slider.getOrientation() == JSlider.HORIZONTAL ) {
middleOfThumb = thumbRect.x + (thumbRect.width / 2);
@@ -314,8 +295,7 @@
}
else {
g.setColor( MetalLookAndFeel.getControlShadow() );
- g.fillRect( fillLeft, fillTop,
- fillRight - fillLeft, trackBottom - trackTop );
+ g.fillRect(fillLeft, fillTop, fillRight - fillLeft, fillBottom - fillTop);
}
}
@@ -336,105 +316,137 @@
int w = paintRect.width;
int h = paintRect.height;
- if (!slider.isEnabled()) {
- g.setColor(MetalLookAndFeel.getControlShadow());
- g.drawRect(0, 0, w - 1, h - 1);
- }
- else if (slider.getOrientation() == JSlider.HORIZONTAL) {
- int middleOfThumb = thumbRect.x + (thumbRect.width / 2) -
- paintRect.x;
- int fillMinX;
- int fillMaxX;
+ if (slider.getOrientation() == JSlider.HORIZONTAL) {
+ int middleOfThumb = thumbRect.x + thumbRect.width / 2 - paintRect.x;
+
+ if (slider.isEnabled()) {
+ int fillMinX;
+ int fillMaxX;
+
+ if (middleOfThumb > 0) {
+ g.setColor(drawInverted ? MetalLookAndFeel.getControlDarkShadow() :
+ MetalLookAndFeel.getPrimaryControlDarkShadow());
+
+ g.drawRect(0, 0, middleOfThumb - 1, h - 1);
+ }
+
+ if (middleOfThumb < w) {
+ g.setColor(drawInverted ? MetalLookAndFeel.getPrimaryControlDarkShadow() :
+ MetalLookAndFeel.getControlDarkShadow());
+
+ g.drawRect(middleOfThumb, 0, w - middleOfThumb - 1, h - 1);
+ }
- if (middleOfThumb > 0) {
- g.setColor(chooseColor(drawInverted,
- MetalLookAndFeel.getPrimaryControlDarkShadow(),
- MetalLookAndFeel.getControlDarkShadow()));
- g.drawRect(0, 0, middleOfThumb - 1, h - 1);
- }
- if (middleOfThumb < w) {
- g.setColor(chooseColor(drawInverted,
- MetalLookAndFeel.getControlDarkShadow(),
- MetalLookAndFeel.getPrimaryControlDarkShadow()));
- g.drawRect(middleOfThumb, 0, w - middleOfThumb - 1, h - 1);
- }
- g.setColor(MetalLookAndFeel.getPrimaryControlShadow());
- if (drawInverted) {
- fillMinX = middleOfThumb;
- fillMaxX = w - 2;
- g.drawLine(1, 1, middleOfThumb, 1);
- }
- else {
- fillMinX = 1;
- fillMaxX = middleOfThumb;
- g.drawLine(middleOfThumb, 1, w - 1, 1);
- }
- if (h == 6) {
- g.setColor(MetalLookAndFeel.getWhite());
- g.drawLine(fillMinX, 1, fillMaxX, 1);
- g.setColor(sliderAltTrackColor);
- g.drawLine(fillMinX, 2, fillMaxX, 2);
+ if (filledSlider) {
+ g.setColor(MetalLookAndFeel.getPrimaryControlShadow());
+ if (drawInverted) {
+ fillMinX = middleOfThumb;
+ fillMaxX = w - 2;
+ g.drawLine(1, 1, middleOfThumb, 1);
+ } else {
+ fillMinX = 1;
+ fillMaxX = middleOfThumb;
+ g.drawLine(middleOfThumb, 1, w - 1, 1);
+ }
+ if (h == 6) {
+ g.setColor(MetalLookAndFeel.getWhite());
+ g.drawLine(fillMinX, 1, fillMaxX, 1);
+ g.setColor(sliderAltTrackColor);
+ g.drawLine(fillMinX, 2, fillMaxX, 2);
+ g.setColor(MetalLookAndFeel.getControlShadow());
+ g.drawLine(fillMinX, 3, fillMaxX, 3);
+ g.setColor(MetalLookAndFeel.getPrimaryControlShadow());
+ g.drawLine(fillMinX, 4, fillMaxX, 4);
+ }
+ }
+ } else {
g.setColor(MetalLookAndFeel.getControlShadow());
- g.drawLine(fillMinX, 3, fillMaxX, 3);
- g.setColor(MetalLookAndFeel.getPrimaryControlShadow());
- g.drawLine(fillMinX, 4, fillMaxX, 4);
- }
- }
- else {
- int middleOfThumb = thumbRect.y + (thumbRect.height / 2) -
- paintRect.y;
- int fillMinY;
- int fillMaxY;
- if (middleOfThumb > 0) {
- g.setColor(chooseColor(drawInverted,
- MetalLookAndFeel.getControlDarkShadow(),
- MetalLookAndFeel.getPrimaryControlDarkShadow()));
- g.drawRect(0, 0, w - 1, middleOfThumb - 1);
- }
- if (middleOfThumb < h) {
- g.setColor(chooseColor(drawInverted,
- MetalLookAndFeel.getPrimaryControlDarkShadow(),
- MetalLookAndFeel.getControlDarkShadow()));
- g.drawRect(0, middleOfThumb, w - 1, h - middleOfThumb - 1);
- }
- g.setColor(MetalLookAndFeel.getPrimaryControlShadow());
- if (drawInverted()) {
- fillMinY = 1;
- fillMaxY = middleOfThumb;
- if (leftToRight) {
- g.drawLine(1, middleOfThumb, 1, h - 1);
+ if (middleOfThumb > 0) {
+ if (!drawInverted && filledSlider) {
+ g.fillRect(0, 0, middleOfThumb - 1, h - 1);
+ } else {
+ g.drawRect(0, 0, middleOfThumb - 1, h - 1);
+ }
}
- else {
- g.drawLine(w - 2, middleOfThumb, w - 2, h - 1);
+
+ if (middleOfThumb < w) {
+ if (drawInverted && filledSlider) {
+ g.fillRect(middleOfThumb, 0, w - middleOfThumb - 1, h - 1);
+ } else {
+ g.drawRect(middleOfThumb, 0, w - middleOfThumb - 1, h - 1);
+ }
}
}
- else {
- fillMinY = middleOfThumb;
- fillMaxY = h - 2;
- if (leftToRight) {
- g.drawLine(1, 1, 1, middleOfThumb);
+ } else {
+ int middleOfThumb = thumbRect.y + (thumbRect.height / 2) - paintRect.y;
+
+ if (slider.isEnabled()) {
+ int fillMinY;
+ int fillMaxY;
+
+ if (middleOfThumb > 0) {
+ g.setColor(drawInverted ? MetalLookAndFeel.getPrimaryControlDarkShadow() :
+ MetalLookAndFeel.getControlDarkShadow());
+
+ g.drawRect(0, 0, w - 1, middleOfThumb - 1);
}
- else {
- g.drawLine(w - 2, 1, w - 2, middleOfThumb);
+
+ if (middleOfThumb < h) {
+ g.setColor(drawInverted ? MetalLookAndFeel.getControlDarkShadow() :
+ MetalLookAndFeel.getPrimaryControlDarkShadow());
+
+ g.drawRect(0, middleOfThumb, w - 1, h - middleOfThumb - 1);
}
- }
- if (w == 6) {
- g.setColor(chooseColor(!leftToRight,
- MetalLookAndFeel.getWhite(),
- MetalLookAndFeel.getPrimaryControlShadow()));
- g.drawLine(1, fillMinY, 1, fillMaxY);
- g.setColor(chooseColor(!leftToRight, sliderAltTrackColor,
- MetalLookAndFeel.getControlShadow()));
- g.drawLine(2, fillMinY, 2, fillMaxY);
- g.setColor(chooseColor(!leftToRight,
- MetalLookAndFeel.getControlShadow(),
- sliderAltTrackColor));
- g.drawLine(3, fillMinY, 3, fillMaxY);
- g.setColor(chooseColor(!leftToRight,
- MetalLookAndFeel.getPrimaryControlShadow(),
- MetalLookAndFeel.getWhite()));
- g.drawLine(4, fillMinY, 4, fillMaxY);
+
+ if (filledSlider) {
+ g.setColor(MetalLookAndFeel.getPrimaryControlShadow());
+ if (drawInverted()) {
+ fillMinY = 1;
+ fillMaxY = middleOfThumb;
+ if (leftToRight) {
+ g.drawLine(1, middleOfThumb, 1, h - 1);
+ } else {
+ g.drawLine(w - 2, middleOfThumb, w - 2, h - 1);
+ }
+ } else {
+ fillMinY = middleOfThumb;
+ fillMaxY = h - 2;
+ if (leftToRight) {
+ g.drawLine(1, 1, 1, middleOfThumb);
+ } else {
+ g.drawLine(w - 2, 1, w - 2, middleOfThumb);
+ }
+ }
+ if (w == 6) {
+ g.setColor(leftToRight ? MetalLookAndFeel.getWhite() : MetalLookAndFeel.getPrimaryControlShadow());
+ g.drawLine(1, fillMinY, 1, fillMaxY);
+ g.setColor(leftToRight ? sliderAltTrackColor : MetalLookAndFeel.getControlShadow());
+ g.drawLine(2, fillMinY, 2, fillMaxY);
+ g.setColor(leftToRight ? MetalLookAndFeel.getControlShadow() : sliderAltTrackColor);
+ g.drawLine(3, fillMinY, 3, fillMaxY);
+ g.setColor(leftToRight ? MetalLookAndFeel.getPrimaryControlShadow() : MetalLookAndFeel.getWhite());
+ g.drawLine(4, fillMinY, 4, fillMaxY);
+ }
+ }
+ } else {
+ g.setColor(MetalLookAndFeel.getControlShadow());
+
+ if (middleOfThumb > 0) {
+ if (drawInverted && filledSlider) {
+ g.fillRect(0, 0, w - 1, middleOfThumb - 1);
+ } else {
+ g.drawRect(0, 0, w - 1, middleOfThumb - 1);
+ }
+ }
+
+ if (middleOfThumb < h) {
+ if (!drawInverted && filledSlider) {
+ g.fillRect(0, middleOfThumb, w - 1, h - middleOfThumb - 1);
+ } else {
+ g.drawRect(0, middleOfThumb, w - 1, h - middleOfThumb - 1);
+ }
+ }
}
}
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalToolBarUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalToolBarUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -61,7 +61,7 @@
* instances of JToolBars and JMenuBars and is used to find
* JToolBars/JMenuBars that border each other.
*/
- private static java.util.List components = new ArrayList();
+ private static List<WeakReference<JComponent>> components = new ArrayList<WeakReference<JComponent>>();
/**
* This protected field is implemenation specific. Do not access directly
@@ -95,7 +95,7 @@
// typed to throw an NPE.
throw new NullPointerException("JComponent must be non-null");
}
- components.add(new WeakReference(c));
+ components.add(new WeakReference<JComponent>(c));
}
/**
@@ -105,8 +105,7 @@
for (int counter = components.size() - 1; counter >= 0; counter--) {
// Search for the component, removing any flushed references
// along the way.
- WeakReference ref = (WeakReference)components.get(counter);
- Object target = ((WeakReference)components.get(counter)).get();
+ JComponent target = components.get(counter).get();
if (target == c || target == null) {
components.remove(counter);
--- a/jdk/src/share/classes/javax/swing/plaf/synth/DefaultMenuLayout.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/DefaultMenuLayout.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2008 Sun Microsystems, Inc. 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
@@ -47,19 +47,22 @@
super(target, axis);
}
- public void invalidateLayout(Container target) {
+ public Dimension preferredLayoutSize(Container target) {
if (target instanceof JPopupMenu) {
- SynthPopupMenuUI popupUI = (SynthPopupMenuUI)((JPopupMenu)target).
- getUI();
- popupUI.resetAlignmentHints();
+ JPopupMenu popupMenu = (JPopupMenu) target;
+
+ popupMenu.putClientProperty(
+ SynthMenuItemLayoutHelper.MAX_ACC_OR_ARROW_WIDTH, null);
+ sun.swing.MenuItemLayoutHelper.clearUsedClientProperties(popupMenu);
+
+ if (popupMenu.getComponentCount() == 0) {
+ return new Dimension(0, 0);
+ }
}
+
+ // Make BoxLayout recalculate cached preferred sizes
super.invalidateLayout(target);
- }
- public Dimension preferredLayoutSize(Container target) {
- if (target instanceof JPopupMenu && target.getComponentCount() == 0) {
- return new Dimension(0, 0);
- }
return super.preferredLayoutSize(target);
}
}
--- a/jdk/src/share/classes/javax/swing/plaf/synth/DefaultSynthStyleFactory.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/DefaultSynthStyleFactory.java Wed Jul 05 16:42:37 2017 +0200
@@ -63,7 +63,7 @@
/**
* Maps from a List (BakedArrayList to be precise) to the merged style.
*/
- private Map _resolvedStyles;
+ private Map<BakedArrayList, SynthStyle> _resolvedStyles;
/**
* Used if there are no styles matching a widget.
@@ -74,7 +74,7 @@
DefaultSynthStyleFactory() {
_tmpList = new BakedArrayList(5);
_styles = new ArrayList<StyleAssociation>();
- _resolvedStyles = new HashMap();
+ _resolvedStyles = new HashMap<BakedArrayList, SynthStyle>();
}
public synchronized void addStyle(DefaultSynthStyle style,
@@ -138,7 +138,7 @@
* Fetches any styles that match the passed into arguments into
* <code>matches</code>.
*/
- private void getMatchingStyles(java.util.List matches, JComponent c,
+ private void getMatchingStyles(List matches, JComponent c,
Region id) {
String idName = id.getLowerCaseName();
String cName = c.getName();
@@ -166,7 +166,7 @@
/**
* Caches the specified style.
*/
- private void cacheStyle(java.util.List styles, SynthStyle style) {
+ private void cacheStyle(List styles, SynthStyle style) {
BakedArrayList cachedStyles = new BakedArrayList(styles);
_resolvedStyles.put(cachedStyles, style);
@@ -175,11 +175,11 @@
/**
* Returns the cached style from the passed in arguments.
*/
- private SynthStyle getCachedStyle(java.util.List styles) {
+ private SynthStyle getCachedStyle(List styles) {
if (styles.size() == 0) {
return null;
}
- return (SynthStyle)_resolvedStyles.get(styles);
+ return _resolvedStyles.get(styles);
}
/**
@@ -187,7 +187,7 @@
* is reverse sorted, that is the most recently added style found to
* match will be first.
*/
- private SynthStyle mergeStyles(java.util.List styles) {
+ private SynthStyle mergeStyles(List styles) {
int size = styles.size();
if (size == 0) {
--- a/jdk/src/share/classes/javax/swing/plaf/synth/ImagePainter.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/ImagePainter.java Wed Jul 05 16:42:37 2017 +0200
@@ -66,7 +66,7 @@
Paint9Painter painter;
if (cacheRef == null || (painter = cacheRef.get()) == null) {
painter = new Paint9Painter(30);
- cacheRef = new WeakReference(painter);
+ cacheRef = new WeakReference<Paint9Painter>(painter);
AppContext.getAppContext().put(CACHE_KEY, cacheRef);
}
return painter;
--- a/jdk/src/share/classes/javax/swing/plaf/synth/Region.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/Region.java Wed Jul 05 16:42:37 2017 +0200
@@ -67,8 +67,8 @@
* @author Scott Violet
*/
public class Region {
- private static final Map uiToRegionMap = new HashMap();
- private static final Map lowerCaseNameMap = new HashMap();
+ private static final Map<String, Region> uiToRegionMap = new HashMap<String, Region>();
+ private static final Map<Region, String> lowerCaseNameMap = new HashMap<Region, String>();
/**
* ArrowButton's are special types of buttons that also render a
@@ -451,15 +451,11 @@
static Region getRegion(JComponent c) {
- return (Region)uiToRegionMap.get(c.getUIClassID());
+ return uiToRegionMap.get(c.getUIClassID());
}
static void registerUIs(UIDefaults table) {
- Iterator uis = uiToRegionMap.keySet().iterator();
-
- while (uis.hasNext()) {
- Object key = uis.next();
-
+ for (String key : uiToRegionMap.keySet()) {
table.put(key, "javax.swing.plaf.synth.SynthLookAndFeel");
}
}
@@ -521,7 +517,7 @@
*/
String getLowerCaseName() {
synchronized(lowerCaseNameMap) {
- String lowerCaseName = (String)lowerCaseNameMap.get(this);
+ String lowerCaseName = lowerCaseNameMap.get(this);
if (lowerCaseName == null) {
lowerCaseName = getName().toLowerCase();
lowerCaseNameMap.put(this, lowerCaseName);
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthButtonUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthButtonUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -262,7 +262,7 @@
* Returns the default icon. This should NOT callback
* to the JComponent.
*
- * @param b AbstractButton the iocn is associated with
+ * @param b AbstractButton the icon is associated with
* @return default icon
*/
@@ -445,9 +445,7 @@
* Returns the Icon used in calculating the pref/min/max size.
*/
protected Icon getSizingIcon(AbstractButton b) {
- // NOTE: this is slightly different than BasicButtonUI, where it
- // would just use getIcon, but this should be ok.
- Icon icon = (b.isEnabled()) ? b.getIcon() : b.getDisabledIcon();
+ Icon icon = getEnabledIcon(b, b.getIcon());
if (icon == null) {
icon = getDefaultIcon(b);
}
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -336,7 +336,7 @@
return oldValue;
} else {
// Must take the value from the editor and get the value and cast it to the new type.
- Class cls = oldValue.getClass();
+ Class<?> cls = oldValue.getClass();
try {
Method method = cls.getMethod("valueOf", new Class[]{String.class});
newValue = method.invoke(oldValue, new Object[] { editor.getText()});
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthContext.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthContext.java Wed Jul 05 16:42:37 2017 +0200
@@ -39,7 +39,7 @@
* @author Scott Violet
*/
public class SynthContext {
- private static final Map contextMap;
+ private static final Map<Class, List<SynthContext>> contextMap;
private JComponent component;
private Region region;
@@ -48,7 +48,7 @@
static {
- contextMap = new HashMap();
+ contextMap = new HashMap<Class, List<SynthContext>>();
}
@@ -58,13 +58,13 @@
SynthContext context = null;
synchronized(contextMap) {
- java.util.List instances = (java.util.List)contextMap.get(type);
+ List<SynthContext> instances = contextMap.get(type);
if (instances != null) {
int size = instances.size();
if (size > 0) {
- context = (SynthContext)instances.remove(size - 1);
+ context = instances.remove(size - 1);
}
}
}
@@ -81,11 +81,10 @@
static void releaseContext(SynthContext context) {
synchronized(contextMap) {
- java.util.List instances = (java.util.List)contextMap.get(
- context.getClass());
+ List<SynthContext> instances = contextMap.get(context.getClass());
if (instances == null) {
- instances = new ArrayList(5);
+ instances = new ArrayList<SynthContext>(5);
contextMap.put(context.getClass(), instances);
}
instances.add(context);
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthEditorPaneUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthEditorPaneUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -45,8 +45,8 @@
* I would prefer to use UIResource instad of this.
* Unfortunately Boolean is a final class
*/
- private Boolean localTrue = new Boolean(true);
- private Boolean localFalse = new Boolean(false);
+ private Boolean localTrue = Boolean.TRUE;
+ private Boolean localFalse = Boolean.FALSE;
/**
* Creates a UI for the JTextPane.
@@ -69,7 +69,7 @@
c.putClientProperty(JEditorPane.HONOR_DISPLAY_PROPERTIES,
localTrue);
}
- updateStyle((JTextComponent)getComponent());
+ updateStyle(getComponent());
}
protected void uninstallDefaults() {
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthGraphicsUtils.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthGraphicsUtils.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2008 Sun Microsystems, Inc. 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 javax.swing.plaf.synth;
import sun.swing.SwingUtilities2;
+import sun.swing.MenuItemLayoutHelper;
+
import java.awt.*;
import javax.swing.*;
import javax.swing.plaf.basic.BasicHTML;
@@ -411,12 +413,204 @@
}
+ /**
+ * A quick note about how preferred sizes are calculated... Generally
+ * speaking, SynthPopupMenuUI will run through the list of its children
+ * (from top to bottom) and ask each for its preferred size. Each menu
+ * item will add up the max width of each element (icons, text,
+ * accelerator spacing, accelerator text or arrow icon) encountered thus
+ * far, so by the time all menu items have been calculated, we will
+ * know the maximum (preferred) menu item size for that popup menu.
+ * Later when it comes time to paint each menu item, we can use those
+ * same accumulated max element sizes in order to layout the item.
+ */
+ static Dimension getPreferredMenuItemSize(SynthContext context,
+ SynthContext accContext, JComponent c,
+ Icon checkIcon, Icon arrowIcon, int defaultTextIconGap,
+ String acceleratorDelimiter, boolean useCheckAndArrow,
+ String propertyPrefix) {
+
+ JMenuItem mi = (JMenuItem) c;
+ SynthMenuItemLayoutHelper lh = new SynthMenuItemLayoutHelper(
+ context, accContext, mi, checkIcon, arrowIcon,
+ MenuItemLayoutHelper.createMaxRect(), defaultTextIconGap,
+ acceleratorDelimiter, SynthLookAndFeel.isLeftToRight(mi),
+ useCheckAndArrow, propertyPrefix);
+
+ Dimension result = new Dimension();
+
+ // Calculate the result width
+ int gap = lh.getGap();
+ result.width = 0;
+ MenuItemLayoutHelper.addMaxWidth(lh.getCheckSize(), gap, result);
+ MenuItemLayoutHelper.addMaxWidth(lh.getLabelSize(), gap, result);
+ MenuItemLayoutHelper.addWidth(lh.getMaxAccOrArrowWidth(), 5 * gap, result);
+ // The last gap is unnecessary
+ result.width -= gap;
+
+ // Calculate the result height
+ result.height = MenuItemLayoutHelper.max(lh.getCheckSize().getHeight(),
+ lh.getLabelSize().getHeight(), lh.getAccSize().getHeight(),
+ lh.getArrowSize().getHeight());
+
+ // Take into account menu item insets
+ Insets insets = lh.getMenuItem().getInsets();
+ if (insets != null) {
+ result.width += insets.left + insets.right;
+ result.height += insets.top + insets.bottom;
+ }
+
+ // if the width is even, bump it up one. This is critical
+ // for the focus dash lhne to draw properly
+ if (result.width % 2 == 0) {
+ result.width++;
+ }
+
+ // if the height is even, bump it up one. This is critical
+ // for the text to center properly
+ if (result.height % 2 == 0) {
+ result.height++;
+ }
+
+ return result;
+ }
+
+ static void applyInsets(Rectangle rect, Insets insets) {
+ if (insets != null) {
+ rect.x += insets.left;
+ rect.y += insets.top;
+ rect.width -= (insets.right + rect.x);
+ rect.height -= (insets.bottom + rect.y);
+ }
+ }
+
+ static void paint(SynthContext context, SynthContext accContext, Graphics g,
+ Icon checkIcon, Icon arrowIcon, String acceleratorDelimiter,
+ int defaultTextIconGap, String propertyPrefix) {
+ JMenuItem mi = (JMenuItem) context.getComponent();
+ SynthStyle style = context.getStyle();
+ g.setFont(style.getFont(context));
+
+ Rectangle viewRect = new Rectangle(0, 0, mi.getWidth(), mi.getHeight());
+ applyInsets(viewRect, mi.getInsets());
+
+ SynthMenuItemLayoutHelper lh = new SynthMenuItemLayoutHelper(
+ context, accContext, mi, checkIcon,
+ arrowIcon, viewRect, defaultTextIconGap, acceleratorDelimiter,
+ SynthLookAndFeel.isLeftToRight(mi),
+ MenuItemLayoutHelper.useCheckAndArrow(mi), propertyPrefix);
+ MenuItemLayoutHelper.LayoutResult lr = lh.layoutMenuItem();
+
+ paintMenuItem(g, lh, lr);
+ }
+
+ static void paintMenuItem(Graphics g, SynthMenuItemLayoutHelper lh,
+ MenuItemLayoutHelper.LayoutResult lr) {
+ // Save original graphics font and color
+ Font holdf = g.getFont();
+ Color holdc = g.getColor();
+
+ paintBackground(g, lh);
+ paintCheckIcon(g, lh, lr);
+ paintIcon(g, lh, lr);
+ paintText(g, lh, lr);
+ paintAccText(g, lh, lr);
+ paintArrowIcon(g, lh, lr);
+
+ // Restore original graphics font and color
+ g.setColor(holdc);
+ g.setFont(holdf);
+ }
+
+ static void paintBackground(Graphics g, SynthMenuItemLayoutHelper lh) {
+ paintBackground(lh.getContext(), g, lh.getMenuItem());
+ }
+
+ static void paintBackground(SynthContext context, Graphics g, JComponent c) {
+ context.getPainter().paintMenuItemBackground(context, g, 0, 0,
+ c.getWidth(), c.getHeight());
+ }
+
+ static void paintIcon(Graphics g, SynthMenuItemLayoutHelper lh,
+ MenuItemLayoutHelper.LayoutResult lr) {
+ if (lh.getIcon() != null) {
+ Icon icon;
+ JMenuItem mi = lh.getMenuItem();
+ ButtonModel model = mi.getModel();
+ if (!model.isEnabled()) {
+ icon = mi.getDisabledIcon();
+ } else if (model.isPressed() && model.isArmed()) {
+ icon = mi.getPressedIcon();
+ if (icon == null) {
+ // Use default icon
+ icon = mi.getIcon();
+ }
+ } else {
+ icon = mi.getIcon();
+ }
+
+ if (icon != null) {
+ Rectangle iconRect = lr.getIconRect();
+ SynthIcon.paintIcon(icon, lh.getContext(), g, iconRect.x,
+ iconRect.y, iconRect.width, iconRect.height);
+ }
+ }
+ }
+
+ static void paintCheckIcon(Graphics g, SynthMenuItemLayoutHelper lh,
+ MenuItemLayoutHelper.LayoutResult lr) {
+ if (lh.getCheckIcon() != null) {
+ Rectangle checkRect = lr.getCheckRect();
+ SynthIcon.paintIcon(lh.getCheckIcon(), lh.getContext(), g,
+ checkRect.x, checkRect.y, checkRect.width, checkRect.height);
+ }
+ }
+
+ static void paintAccText(Graphics g, SynthMenuItemLayoutHelper lh,
+ MenuItemLayoutHelper.LayoutResult lr) {
+ String accText = lh.getAccText();
+ if (accText != null && !accText.equals("")) {
+ g.setColor(lh.getAccStyle().getColor(lh.getAccContext(),
+ ColorType.TEXT_FOREGROUND));
+ g.setFont(lh.getAccStyle().getFont(lh.getAccContext()));
+ lh.getAccGraphicsUtils().paintText(lh.getAccContext(), g, accText,
+ lr.getAccRect().x, lr.getAccRect().y, -1);
+ }
+ }
+
+ static void paintText(Graphics g, SynthMenuItemLayoutHelper lh,
+ MenuItemLayoutHelper.LayoutResult lr) {
+ if (!lh.getText().equals("")) {
+ if (lh.getHtmlView() != null) {
+ // Text is HTML
+ lh.getHtmlView().paint(g, lr.getTextRect());
+ } else {
+ // Text isn't HTML
+ g.setColor(lh.getStyle().getColor(
+ lh.getContext(), ColorType.TEXT_FOREGROUND));
+ g.setFont(lh.getStyle().getFont(lh.getContext()));
+ lh.getGraphicsUtils().paintText(lh.getContext(), g, lh.getText(),
+ lr.getTextRect().x, lr.getTextRect().y,
+ lh.getMenuItem().getDisplayedMnemonicIndex());
+ }
+ }
+ }
+
+ static void paintArrowIcon(Graphics g, SynthMenuItemLayoutHelper lh,
+ MenuItemLayoutHelper.LayoutResult lr) {
+ if (lh.getArrowIcon() != null) {
+ Rectangle arrowRect = lr.getArrowRect();
+ SynthIcon.paintIcon(lh.getArrowIcon(), lh.getContext(), g,
+ arrowRect.x, arrowRect.y, arrowRect.width, arrowRect.height);
+ }
+ }
+
/**
* Wraps a SynthIcon around the Icon interface, forwarding calls to
* the SynthIcon with a given SynthContext.
*/
private static class SynthIconWrapper implements Icon {
- private static final java.util.List CACHE = new java.util.ArrayList(1);
+ private static final java.util.List<SynthIconWrapper> CACHE = new java.util.ArrayList<SynthIconWrapper>(1);
private SynthIcon synthIcon;
private SynthContext context;
@@ -425,8 +619,7 @@
synchronized(CACHE) {
int size = CACHE.size();
if (size > 0) {
- SynthIconWrapper wrapper = (SynthIconWrapper)CACHE.remove(
- size - 1);
+ SynthIconWrapper wrapper = CACHE.remove(size - 1);
wrapper.reset(icon, context);
return wrapper;
}
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthInternalFrameTitlePane.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthInternalFrameTitlePane.java Wed Jul 05 16:42:37 2017 +0200
@@ -197,25 +197,25 @@
protected void addSystemMenuItems(JPopupMenu menu) {
// PENDING: this should all be localizable!
- JMenuItem mi = (JMenuItem)menu.add(restoreAction);
+ JMenuItem mi = menu.add(restoreAction);
mi.setMnemonic('R');
- mi = (JMenuItem)menu.add(moveAction);
+ mi = menu.add(moveAction);
mi.setMnemonic('M');
- mi = (JMenuItem)menu.add(sizeAction);
+ mi = menu.add(sizeAction);
mi.setMnemonic('S');
- mi = (JMenuItem)menu.add(iconifyAction);
+ mi = menu.add(iconifyAction);
mi.setMnemonic('n');
- mi = (JMenuItem)menu.add(maximizeAction);
+ mi = menu.add(maximizeAction);
mi.setMnemonic('x');
menu.add(new JSeparator());
- mi = (JMenuItem)menu.add(closeAction);
+ mi = menu.add(closeAction);
mi.setMnemonic('C');
}
protected void showSystemMenu() {
Insets insets = frame.getInsets();
if (!frame.isIcon()) {
- systemPopupMenu.show(frame, insets.left, getY() + getHeight());
+ systemPopupMenu.show(frame, menuButton.getX(), getY() + getHeight());
} else {
systemPopupMenu.show(menuButton,
getX() - insets.left - insets.right,
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java Wed Jul 05 16:42:37 2017 +0200
@@ -107,7 +107,7 @@
* Map of defaults table entries. This is populated via the load
* method.
*/
- private Map defaultsMap;
+ private Map<String, Object> defaultsMap;
private Handler _handler;
@@ -308,8 +308,8 @@
children = ((Container)c).getComponents();
}
if (children != null) {
- for(int i = 0; i < children.length; i++) {
- updateStyles(children[i]);
+ for (Component child : children) {
+ updateStyles(child);
}
}
}
@@ -581,7 +581,7 @@
}
if (defaultsMap == null) {
- defaultsMap = new HashMap();
+ defaultsMap = new HashMap<String, Object>();
}
new SynthParser().parse(input, (DefaultSynthStyleFactory) factory,
@@ -611,7 +611,7 @@
}
if (defaultsMap == null) {
- defaultsMap = new HashMap();
+ defaultsMap = new HashMap<String, Object>();
}
InputStream input = url.openStream();
@@ -771,7 +771,7 @@
*/
private static Object getAATextInfo() {
String language = Locale.getDefault().getLanguage();
- String desktop = (String)
+ String desktop =
AccessController.doPrivileged(new GetPropertyAction("sun.desktop"));
boolean isCjkLocale = (Locale.CHINESE.getLanguage().equals(language) ||
@@ -786,7 +786,7 @@
return aaTextInfo;
}
- private static ReferenceQueue queue = new ReferenceQueue();
+ private static ReferenceQueue<LookAndFeel> queue = new ReferenceQueue<LookAndFeel>();
private static void flushUnreferenced() {
AATextListener aatl;
@@ -796,7 +796,7 @@
}
private static class AATextListener
- extends WeakReference implements PropertyChangeListener {
+ extends WeakReference<LookAndFeel> implements PropertyChangeListener {
private String key = SunToolkit.DESKTOPFONTHINTS;
AATextListener(LookAndFeel laf) {
@@ -812,7 +812,7 @@
return;
}
- LookAndFeel laf = (LookAndFeel) get();
+ LookAndFeel laf = get();
if (laf == null || laf != UIManager.getLookAndFeel()) {
dispose();
return;
@@ -835,8 +835,8 @@
private static void updateWindowUI(Window window) {
updateStyles(window);
Window ownedWins[] = window.getOwnedWindows();
- for (int i = 0; i < ownedWins.length; i++) {
- updateWindowUI(ownedWins[i]);
+ for (Window w : ownedWins) {
+ updateWindowUI(w);
}
}
@@ -845,8 +845,8 @@
*/
private static void updateAllUIs() {
Frame appFrames[] = Frame.getFrames();
- for (int i = 0; i < appFrames.length; i++) {
- updateWindowUI(appFrames[i]);
+ for (Frame frame : appFrames) {
+ updateWindowUI(frame);
}
}
@@ -909,7 +909,7 @@
// register it on the new one.
KeyboardFocusManager manager =
(KeyboardFocusManager)evt.getSource();
- if (((Boolean)newValue).equals(Boolean.FALSE)) {
+ if (newValue.equals(Boolean.FALSE)) {
manager.removePropertyChangeListener(_handler);
}
else {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuItemLayoutHelper.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,308 @@
+/*
+ * Copyright 2002-2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package javax.swing.plaf.synth;
+
+import sun.swing.StringUIClientPropertyKey;
+import sun.swing.MenuItemLayoutHelper;
+import sun.swing.plaf.synth.SynthIcon;
+
+import javax.swing.*;
+import javax.swing.text.View;
+import java.awt.*;
+
+/**
+ * Calculates preferred size and layouts synth menu items.
+ *
+ * All JMenuItems (and JMenus) include enough space for the insets
+ * plus one or more elements. When we say "label" below, we mean
+ * "icon and/or text."
+ *
+ * Cases to consider for SynthMenuItemUI (visualized here in a
+ * LTR orientation; the RTL case would be reversed):
+ * label
+ * check icon + label
+ * check icon + label + accelerator
+ * label + accelerator
+ *
+ * Cases to consider for SynthMenuUI (again visualized here in a
+ * LTR orientation):
+ * label + arrow
+ *
+ * Note that in the above scenarios, accelerator and arrow icon are
+ * mutually exclusive. This means that if a popup menu contains a mix
+ * of JMenus and JMenuItems, we only need to allow enough space for
+ * max(maxAccelerator, maxArrow), and both accelerators and arrow icons
+ * can occupy the same "column" of space in the menu.
+ */
+class SynthMenuItemLayoutHelper extends MenuItemLayoutHelper {
+
+ public static final StringUIClientPropertyKey MAX_ACC_OR_ARROW_WIDTH =
+ new StringUIClientPropertyKey("maxAccOrArrowWidth");
+
+ public static final ColumnAlignment LTR_ALIGNMENT_1 =
+ new ColumnAlignment(
+ SwingConstants.LEFT,
+ SwingConstants.LEFT,
+ SwingConstants.LEFT,
+ SwingConstants.RIGHT,
+ SwingConstants.RIGHT
+ );
+ public static final ColumnAlignment LTR_ALIGNMENT_2 =
+ new ColumnAlignment(
+ SwingConstants.LEFT,
+ SwingConstants.LEFT,
+ SwingConstants.LEFT,
+ SwingConstants.LEFT,
+ SwingConstants.RIGHT
+ );
+ public static final ColumnAlignment RTL_ALIGNMENT_1 =
+ new ColumnAlignment(
+ SwingConstants.RIGHT,
+ SwingConstants.RIGHT,
+ SwingConstants.RIGHT,
+ SwingConstants.LEFT,
+ SwingConstants.LEFT
+ );
+ public static final ColumnAlignment RTL_ALIGNMENT_2 =
+ new ColumnAlignment(
+ SwingConstants.RIGHT,
+ SwingConstants.RIGHT,
+ SwingConstants.RIGHT,
+ SwingConstants.RIGHT,
+ SwingConstants.LEFT
+ );
+
+ private SynthContext context;
+ private SynthContext accContext;
+ private SynthStyle style;
+ private SynthStyle accStyle;
+ private SynthGraphicsUtils gu;
+ private SynthGraphicsUtils accGu;
+ private boolean alignAcceleratorText;
+ private int maxAccOrArrowWidth;
+
+ public SynthMenuItemLayoutHelper(SynthContext context, SynthContext accContext,
+ JMenuItem mi, Icon checkIcon, Icon arrowIcon,
+ Rectangle viewRect, int gap, String accDelimiter,
+ boolean isLeftToRight, boolean useCheckAndArrow,
+ String propertyPrefix) {
+ this.context = context;
+ this.accContext = accContext;
+ this.style = context.getStyle();
+ this.accStyle = accContext.getStyle();
+ this.gu = style.getGraphicsUtils(context);
+ this.accGu = accStyle.getGraphicsUtils(accContext);
+ this.alignAcceleratorText = getAlignAcceleratorText(propertyPrefix);
+ reset(mi, checkIcon, arrowIcon, viewRect, gap, accDelimiter,
+ isLeftToRight, style.getFont(context), accStyle.getFont(accContext),
+ useCheckAndArrow, propertyPrefix);
+ setLeadingGap(0);
+ }
+
+ private boolean getAlignAcceleratorText(String propertyPrefix) {
+ return style.getBoolean(context,
+ propertyPrefix + ".alignAcceleratorText", true);
+ }
+
+ protected void calcWidthsAndHeights() {
+ // iconRect
+ if (getIcon() != null) {
+ getIconSize().setWidth(SynthIcon.getIconWidth(getIcon(), context));
+ getIconSize().setHeight(SynthIcon.getIconHeight(getIcon(), context));
+ }
+
+ // accRect
+ if (!getAccText().equals("")) {
+ getAccSize().setWidth(accGu.computeStringWidth(getAccContext(),
+ getAccFontMetrics().getFont(), getAccFontMetrics(),
+ getAccText()));
+ getAccSize().setHeight(getAccFontMetrics().getHeight());
+ }
+
+ // textRect
+ if (getText() == null) {
+ setText("");
+ } else if (!getText().equals("")) {
+ if (getHtmlView() != null) {
+ // Text is HTML
+ getTextSize().setWidth(
+ (int) getHtmlView().getPreferredSpan(View.X_AXIS));
+ getTextSize().setHeight(
+ (int) getHtmlView().getPreferredSpan(View.Y_AXIS));
+ } else {
+ // Text isn't HTML
+ getTextSize().setWidth(gu.computeStringWidth(context,
+ getFontMetrics().getFont(), getFontMetrics(),
+ getText()));
+ getTextSize().setHeight(getFontMetrics().getHeight());
+ }
+ }
+
+ if (useCheckAndArrow()) {
+ // checkIcon
+ if (getCheckIcon() != null) {
+ getCheckSize().setWidth(
+ SynthIcon.getIconWidth(getCheckIcon(), context));
+ getCheckSize().setHeight(
+ SynthIcon.getIconHeight(getCheckIcon(), context));
+ }
+ // arrowRect
+ if (getArrowIcon() != null) {
+ getArrowSize().setWidth(
+ SynthIcon.getIconWidth(getArrowIcon(), context));
+ getArrowSize().setHeight(
+ SynthIcon.getIconHeight(getArrowIcon(), context));
+ }
+ }
+
+ // labelRect
+ if (isColumnLayout()) {
+ getLabelSize().setWidth(getIconSize().getWidth()
+ + getTextSize().getWidth() + getGap());
+ getLabelSize().setHeight(MenuItemLayoutHelper.max(
+ getCheckSize().getHeight(),
+ getIconSize().getHeight(),
+ getTextSize().getHeight(),
+ getAccSize().getHeight(),
+ getArrowSize().getHeight()));
+ } else {
+ Rectangle textRect = new Rectangle();
+ Rectangle iconRect = new Rectangle();
+ gu.layoutText(context, getFontMetrics(), getText(), getIcon(),
+ getHorizontalAlignment(), getVerticalAlignment(),
+ getHorizontalTextPosition(), getVerticalTextPosition(),
+ getViewRect(), iconRect, textRect, getGap());
+ textRect.width += getLeftTextExtraWidth() + getRightTextExtraWidth();
+ Rectangle labelRect = iconRect.union(textRect);
+ getLabelSize().setHeight(labelRect.height);
+ getLabelSize().setWidth(labelRect.width);
+ }
+ }
+
+ protected void calcMaxWidths() {
+ calcMaxWidth(getCheckSize(), MAX_CHECK_WIDTH);
+ maxAccOrArrowWidth =
+ calcMaxValue(MAX_ACC_OR_ARROW_WIDTH, getArrowSize().getWidth());
+ maxAccOrArrowWidth =
+ calcMaxValue(MAX_ACC_OR_ARROW_WIDTH, getAccSize().getWidth());
+
+ if (isColumnLayout()) {
+ calcMaxWidth(getIconSize(), MAX_ICON_WIDTH);
+ calcMaxWidth(getTextSize(), MAX_TEXT_WIDTH);
+ int curGap = getGap();
+ if ((getIconSize().getMaxWidth() == 0)
+ || (getTextSize().getMaxWidth() == 0)) {
+ curGap = 0;
+ }
+ getLabelSize().setMaxWidth(
+ calcMaxValue(MAX_LABEL_WIDTH, getIconSize().getMaxWidth()
+ + getTextSize().getMaxWidth() + curGap));
+ } else {
+ // We shouldn't use current icon and text widths
+ // in maximal widths calculation for complex layout.
+ getIconSize().setMaxWidth(getParentIntProperty(
+ MAX_ICON_WIDTH));
+ calcMaxWidth(getLabelSize(), MAX_LABEL_WIDTH);
+ // If maxLabelWidth is wider
+ // than the widest icon + the widest text + gap,
+ // we should update the maximal text witdh
+ int candidateTextWidth = getLabelSize().getMaxWidth() -
+ getIconSize().getMaxWidth();
+ if (getIconSize().getMaxWidth() > 0) {
+ candidateTextWidth -= getGap();
+ }
+ getTextSize().setMaxWidth(calcMaxValue(
+ MAX_TEXT_WIDTH, candidateTextWidth));
+ }
+ }
+
+ public SynthContext getContext() {
+ return context;
+ }
+
+ public SynthContext getAccContext() {
+ return accContext;
+ }
+
+ public SynthStyle getStyle() {
+ return style;
+ }
+
+ public SynthStyle getAccStyle() {
+ return accStyle;
+ }
+
+ public SynthGraphicsUtils getGraphicsUtils() {
+ return gu;
+ }
+
+ public SynthGraphicsUtils getAccGraphicsUtils() {
+ return accGu;
+ }
+
+ public boolean alignAcceleratorText() {
+ return alignAcceleratorText;
+ }
+
+ public int getMaxAccOrArrowWidth() {
+ return maxAccOrArrowWidth;
+ }
+
+ protected void prepareForLayout(LayoutResult lr) {
+ lr.getCheckRect().width = getCheckSize().getMaxWidth();
+ // An item can have an arrow or a check icon at once
+ if (useCheckAndArrow() && (!"".equals(getAccText()))) {
+ lr.getAccRect().width = maxAccOrArrowWidth;
+ } else {
+ lr.getArrowRect().width = maxAccOrArrowWidth;
+ }
+ }
+
+ public ColumnAlignment getLTRColumnAlignment() {
+ if (alignAcceleratorText()) {
+ return LTR_ALIGNMENT_2;
+ } else {
+ return LTR_ALIGNMENT_1;
+ }
+ }
+
+ public ColumnAlignment getRTLColumnAlignment() {
+ if (alignAcceleratorText()) {
+ return RTL_ALIGNMENT_2;
+ } else {
+ return RTL_ALIGNMENT_1;
+ }
+ }
+
+ protected void layoutIconAndTextInLabelRect(LayoutResult lr) {
+ lr.setTextRect(new Rectangle());
+ lr.setIconRect(new Rectangle());
+ gu.layoutText(context, getFontMetrics(), getText(), getIcon(),
+ getHorizontalAlignment(), getVerticalAlignment(),
+ getHorizontalTextPosition(), getVerticalTextPosition(),
+ lr.getLabelRect(), lr.getIconRect(), lr.getTextRect(), getGap());
+ }
+}
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuItemUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuItemUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2008 Sun Microsystems, Inc. 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
@@ -37,7 +37,7 @@
import javax.swing.plaf.basic.*;
import javax.swing.text.View;
import sun.swing.plaf.synth.*;
-import sun.swing.SwingUtilities2;
+import sun.swing.MenuItemLayoutHelper;
/**
@@ -59,542 +59,16 @@
return new SynthMenuItemUI();
}
- //
- // The next handful of static methods are used by both SynthMenuUI
- // and SynthMenuItemUI. This is necessitated by SynthMenuUI not
- // extending SynthMenuItemUI.
- //
-
- /*
- * All JMenuItems (and JMenus) include enough space for the insets
- * plus one or more elements. When we say "icon(s)" below, we mean
- * "check/radio indicator and/or user icon." If both are defined for
- * a given menu item, then in a LTR orientation the check/radio indicator
- * is on the left side followed by the user icon to the right; it is
- * just the opposite in a RTL orientation.
- *
- * Cases to consider for SynthMenuItemUI (visualized here in a
- * LTR orientation; the RTL case would be reversed):
- * text
- * icon(s) + text
- * icon(s) + text + accelerator
- * text + accelerator
- *
- * Cases to consider for SynthMenuUI (again visualized here in a
- * LTR orientation):
- * text + arrow
- * (user)icon + text + arrow
- *
- * Note that in the above scenarios, accelerator and arrow icon are
- * mutually exclusive. This means that if a popup menu contains a mix
- * of JMenus and JMenuItems, we only need to allow enough space for
- * max(maxAccelerator, maxArrow), and both accelerators and arrow icons
- * can occupy the same "column" of space in the menu.
- *
- * A quick note about how preferred sizes are calculated... Generally
- * speaking, SynthPopupMenuUI will run through the list of its children
- * (from top to bottom) and ask each for its preferred size. Each menu
- * item will add up the max width of each element (icons, text,
- * accelerator spacing, accelerator text or arrow icon) encountered thus
- * far, so by the time all menu items have been calculated, we will
- * know the maximum (preferred) menu item size for that popup menu.
- * Later when it comes time to paint each menu item, we can use those
- * same accumulated max element sizes in order to layout the item.
- */
- static Dimension getPreferredMenuItemSize(SynthContext context,
- SynthContext accContext, JComponent c,
- Icon checkIcon, Icon arrowIcon, int defaultTextIconGap,
- String acceleratorDelimiter) {
- JMenuItem b = (JMenuItem) c;
- Icon icon = (Icon) b.getIcon();
- String text = b.getText();
- KeyStroke accelerator = b.getAccelerator();
- String acceleratorText = "";
-
- if (accelerator != null) {
- int modifiers = accelerator.getModifiers();
- if (modifiers > 0) {
- acceleratorText = KeyEvent.getKeyModifiersText(modifiers);
- acceleratorText += acceleratorDelimiter;
- }
- int keyCode = accelerator.getKeyCode();
- if (keyCode != 0) {
- acceleratorText += KeyEvent.getKeyText(keyCode);
- } else {
- acceleratorText += accelerator.getKeyChar();
- }
- }
-
- Font font = context.getStyle().getFont(context);
- FontMetrics fm = b.getFontMetrics(font);
- FontMetrics fmAccel = b.getFontMetrics(accContext.getStyle().
- getFont(accContext));
-
- resetRects();
-
- layoutMenuItem(
- context, fm, accContext, text, fmAccel, acceleratorText,
- icon, checkIcon, arrowIcon, b.getVerticalAlignment(),
- b.getHorizontalAlignment(), b.getVerticalTextPosition(),
- b.getHorizontalTextPosition(), viewRect, iconRect, textRect,
- acceleratorRect, checkIconRect, arrowIconRect,
- text == null ? 0 : defaultTextIconGap, defaultTextIconGap);
-
- r.setBounds(textRect);
-
- int totalIconWidth = 0;
- int maxIconHeight = 0;
- if (icon != null) {
- // Add in the user icon
- totalIconWidth += iconRect.width;
- if (textRect.width > 0) {
- // Allow for some room between the user icon and the text
- totalIconWidth += defaultTextIconGap;
- }
- maxIconHeight = Math.max(iconRect.height, maxIconHeight);
- }
- if (checkIcon != null) {
- // Add in the checkIcon
- totalIconWidth += checkIconRect.width;
- if (textRect.width > 0 || icon != null) {
- // Allow for some room between the check/radio indicator
- // and the text (or user icon, if both are specified)
- totalIconWidth += defaultTextIconGap;
- }
- maxIconHeight = Math.max(checkIconRect.height, maxIconHeight);
- }
-
- int arrowWidth = 0;
- if (arrowIcon != null) {
- // Add in the arrowIcon
- arrowWidth += defaultTextIconGap;
- arrowWidth += arrowIconRect.width;
- maxIconHeight = Math.max(arrowIconRect.height, maxIconHeight);
- }
-
- int accelSpacing = 0;
- if (acceleratorRect.width > 0) {
- // Allow for some room between the text and the accelerator
- accelSpacing += 4*defaultTextIconGap;
- }
-
- // Take text and all icons into account when determining height
- r.height = Math.max(r.height, maxIconHeight);
-
- // To make the accelerator texts appear in a column,
- // find the widest MenuItem text and the widest accelerator text.
-
- // Get the parent, which stores the information.
- Container parent = b.getParent();
-
- if (parent instanceof JPopupMenu) {
- SynthPopupMenuUI popupUI = (SynthPopupMenuUI)SynthLookAndFeel.
- getUIOfType(((JPopupMenu)parent).getUI(),
- SynthPopupMenuUI.class);
-
- if (popupUI != null) {
- // This gives us the widest MenuItem text encountered thus
- // far in the parent JPopupMenu
- r.width = popupUI.adjustTextWidth(r.width);
-
- // Add in the widest icon (includes both user and
- // check/radio icons) encountered thus far
- r.width += popupUI.adjustIconWidth(totalIconWidth);
-
- // Add in the widest text/accelerator spacing
- // encountered thus far
- r.width += popupUI.adjustAccelSpacingWidth(accelSpacing);
-
- // Add in the widest accelerator text (or arrow)
- // encountered thus far (at least one of these values
- // will always be zero, so we combine them here to
- // avoid double counting)
- int totalAccelOrArrow = acceleratorRect.width + arrowWidth;
- r.width += popupUI.adjustAcceleratorWidth(totalAccelOrArrow);
- }
- }
- else if (parent != null && !(b instanceof JMenu &&
- ((JMenu)b).isTopLevelMenu())) {
- r.width +=
- totalIconWidth + accelSpacing +
- acceleratorRect.width + arrowWidth;
- }
-
- Insets insets = b.getInsets();
- if(insets != null) {
- r.width += insets.left + insets.right;
- r.height += insets.top + insets.bottom;
- }
-
- // if the width is even, bump it up one. This is critical
- // for the focus dash line to draw properly
- if(r.width%2 == 0) {
- r.width++;
- }
-
- // if the height is even, bump it up one. This is critical
- // for the text to center properly
- if(r.height%2 == 0) {
- r.height++;
- }
- return r.getSize();
- }
-
- static void paint(SynthContext context, SynthContext accContext,
- Graphics g, Icon checkIcon, Icon arrowIcon,
- String acceleratorDelimiter,
- int defaultTextIconGap) {
- JComponent c = context.getComponent();
- JMenuItem b = (JMenuItem)c;
- ButtonModel model = b.getModel();
- Insets i = b.getInsets();
-
- resetRects();
-
- viewRect.setBounds(0, 0, b.getWidth(), b.getHeight());
-
- viewRect.x += i.left;
- viewRect.y += i.top;
- viewRect.width -= (i.right + viewRect.x);
- viewRect.height -= (i.bottom + viewRect.y);
-
- SynthStyle style = context.getStyle();
- Font f = style.getFont(context);
- g.setFont(f);
- FontMetrics fm = SwingUtilities2.getFontMetrics(c, g, f);
- FontMetrics accFM = SwingUtilities2.getFontMetrics(c, g,
- accContext.getStyle().
- getFont(accContext));
-
- // get Accelerator text
- KeyStroke accelerator = b.getAccelerator();
- String acceleratorText = "";
- if (accelerator != null) {
- int modifiers = accelerator.getModifiers();
- if (modifiers > 0) {
- acceleratorText = KeyEvent.getKeyModifiersText(modifiers);
- acceleratorText += acceleratorDelimiter;
- }
-
- int keyCode = accelerator.getKeyCode();
- if (keyCode != 0) {
- acceleratorText += KeyEvent.getKeyText(keyCode);
- } else {
- acceleratorText += accelerator.getKeyChar();
- }
- }
-
- // Layout the text and icon
- String text = layoutMenuItem(context, fm, accContext,
- b.getText(), accFM, acceleratorText, b.getIcon(),
- checkIcon, arrowIcon,
- b.getVerticalAlignment(), b.getHorizontalAlignment(),
- b.getVerticalTextPosition(), b.getHorizontalTextPosition(),
- viewRect, iconRect, textRect, acceleratorRect,
- checkIconRect, arrowIconRect,
- b.getText() == null ? 0 : defaultTextIconGap,
- defaultTextIconGap
- );
-
- // Paint the Check
- if (checkIcon != null) {
- SynthIcon.paintIcon(checkIcon, context, g, checkIconRect.x,
- checkIconRect.y, checkIconRect.width, checkIconRect.height);
- }
-
- // Paint the Icon
- if(b.getIcon() != null) {
- Icon icon;
- if(!model.isEnabled()) {
- icon = (Icon) b.getDisabledIcon();
- } else if(model.isPressed() && model.isArmed()) {
- icon = (Icon) b.getPressedIcon();
- if(icon == null) {
- // Use default icon
- icon = (Icon) b.getIcon();
- }
- } else {
- icon = (Icon) b.getIcon();
- }
-
- if (icon!=null) {
- SynthIcon.paintIcon(icon, context, g, iconRect.x,
- iconRect.y, iconRect.width, iconRect.height);
- }
- }
-
- // Draw the Text
- if(text != null) {
- View v = (View) c.getClientProperty(BasicHTML.propertyKey);
- if (v != null) {
- v.paint(g, textRect);
- } else {
- g.setColor(style.getColor(context, ColorType.TEXT_FOREGROUND));
- g.setFont(style.getFont(context));
- style.getGraphicsUtils(context).paintText(context, g, text,
- textRect.x, textRect.y, b.getDisplayedMnemonicIndex());
- }
- }
-
- // Draw the Accelerator Text
- if(acceleratorText != null && !acceleratorText.equals("")) {
- // Get the maxAccWidth from the parent to calculate the offset.
- int accOffset = 0;
- Container parent = b.getParent();
- if (parent != null && parent instanceof JPopupMenu) {
- SynthPopupMenuUI popupUI = (SynthPopupMenuUI)
- ((JPopupMenu)parent).getUI();
-
- // Note that we can only get here for SynthMenuItemUI
- // (not SynthMenuUI) since acceleratorText is defined,
- // so this cast should be safe
- SynthMenuItemUI miUI = (SynthMenuItemUI)
- SynthLookAndFeel.getUIOfType(b.getUI(),
- SynthMenuItemUI.class);
-
- if (popupUI != null && miUI != null) {
- String prop =
- miUI.getPropertyPrefix() + ".alignAcceleratorText";
- boolean align = style.getBoolean(context, prop, true);
-
- // Calculate the offset, with which the accelerator texts
- // will be drawn.
- if (align) {
- // When align==true and we're in the LTR case,
- // we add an offset here so that all accelerators
- // will be left-justified in their own column.
- int max = popupUI.getMaxAcceleratorWidth();
- if (max > 0) {
- accOffset = max - acceleratorRect.width;
- if (!SynthLookAndFeel.isLeftToRight(c)) {
- // In the RTL, flip the sign so that all
- // accelerators will be right-justified.
- accOffset = -accOffset;
- }
- }
- } //else {
- // Don't need to do anything special here; in the
- // LTR case, the accelerator is already justified
- // against the right edge of the menu (and against
- // the left edge in the RTL case).
- //}
- }
- }
-
- SynthStyle accStyle = accContext.getStyle();
-
- g.setColor(accStyle.getColor(accContext,
- ColorType.TEXT_FOREGROUND));
- g.setFont(accStyle.getFont(accContext));
- accStyle.getGraphicsUtils(accContext).paintText(
- accContext, g, acceleratorText, acceleratorRect.x -
- accOffset, acceleratorRect.y, -1);
- }
-
- // Paint the Arrow
- if (arrowIcon != null) {
- SynthIcon.paintIcon(arrowIcon, context, g, arrowIconRect.x,
- arrowIconRect.y, arrowIconRect.width, arrowIconRect.height);
+ public void uninstallUI(JComponent c) {
+ super.uninstallUI(c);
+ // Remove values from the parent's Client Properties.
+ JComponent p = MenuItemLayoutHelper.getMenuItemParent((JMenuItem) c);
+ if (p != null) {
+ p.putClientProperty(
+ SynthMenuItemLayoutHelper.MAX_ACC_OR_ARROW_WIDTH, null);
}
}
- /**
- * Compute and return the location of the icons origin, the
- * location of origin of the text baseline, and a possibly clipped
- * version of the compound labels string. Locations are computed
- * relative to the viewRect rectangle.
- */
-
- private static String layoutMenuItem(
- SynthContext context,
- FontMetrics fm,
- SynthContext accContext,
- String text,
- FontMetrics fmAccel,
- String acceleratorText,
- Icon icon,
- Icon checkIcon,
- Icon arrowIcon,
- int verticalAlignment,
- int horizontalAlignment,
- int verticalTextPosition,
- int horizontalTextPosition,
- Rectangle viewRect,
- Rectangle iconRect,
- Rectangle textRect,
- Rectangle acceleratorRect,
- Rectangle checkIconRect,
- Rectangle arrowIconRect,
- int textIconGap,
- int menuItemGap
- )
- {
- // If parent is JPopupMenu, get and store it's UI
- SynthPopupMenuUI popupUI = null;
- JComponent b = context.getComponent();
- Container parent = b.getParent();
- if(parent instanceof JPopupMenu) {
- popupUI = (SynthPopupMenuUI)SynthLookAndFeel.
- getUIOfType(((JPopupMenu)parent).getUI(),
- SynthPopupMenuUI.class);
- }
-
- context.getStyle().getGraphicsUtils(context).layoutText(
- context, fm, text, icon,horizontalAlignment, verticalAlignment,
- horizontalTextPosition, verticalTextPosition, viewRect,
- iconRect, textRect, textIconGap);
-
- /* Initialize the acceleratorText bounds rectangle textRect. If a null
- * or and empty String was specified we substitute "" here
- * and use 0,0,0,0 for acceleratorTextRect.
- */
- if( (acceleratorText == null) || acceleratorText.equals("") ) {
- acceleratorRect.width = acceleratorRect.height = 0;
- acceleratorText = "";
- }
- else {
- SynthStyle style = accContext.getStyle();
- acceleratorRect.width = style.getGraphicsUtils(accContext).
- computeStringWidth(accContext, fmAccel.getFont(), fmAccel,
- acceleratorText);
- acceleratorRect.height = fmAccel.getHeight();
- }
-
- // Initialize the checkIcon bounds rectangle width & height.
- if (checkIcon != null) {
- checkIconRect.width = SynthIcon.getIconWidth(checkIcon,
- context);
- checkIconRect.height = SynthIcon.getIconHeight(checkIcon,
- context);
- }
- else {
- checkIconRect.width = checkIconRect.height = 0;
- }
-
- // Initialize the arrowIcon bounds rectangle width & height.
- if (arrowIcon != null) {
- arrowIconRect.width = SynthIcon.getIconWidth(arrowIcon,
- context);
- arrowIconRect.height = SynthIcon.getIconHeight(arrowIcon,
- context);
- } else {
- arrowIconRect.width = arrowIconRect.height = 0;
- }
-
- // Note: layoutText() has already left room for
- // the user icon, so no need to adjust textRect below
- // to account for the user icon. However, we do have to
- // reposition textRect when the check icon is visible.
-
- Rectangle labelRect = iconRect.union(textRect);
- if( SynthLookAndFeel.isLeftToRight(context.getComponent()) ) {
- // Position the check and user icons
- iconRect.x = viewRect.x;
- if (checkIcon != null) {
- checkIconRect.x = viewRect.x;
- iconRect.x += menuItemGap + checkIconRect.width;
- textRect.x += menuItemGap + checkIconRect.width;
- }
-
- // Position the arrow icon
- arrowIconRect.x =
- viewRect.x + viewRect.width - arrowIconRect.width;
-
- // Position the accelerator text rect
- acceleratorRect.x =
- viewRect.x + viewRect.width - acceleratorRect.width;
-
- /* Align icons and text horizontally */
- if(popupUI != null) {
- int thisTextOffset = popupUI.adjustTextOffset(textRect.x
- - viewRect.x);
- textRect.x = thisTextOffset + viewRect.x;
-
- if(icon != null) {
- // REMIND: The following code currently assumes the
- // default (TRAILING) horizontalTextPosition, which means
- // it will always place the icon to the left of the text.
- // Other values of horizontalTextPosition aren't very
- // useful for menu items, so we ignore them for now, but
- // someday we might want to fix this situation.
- int thisIconOffset =
- popupUI.adjustIconOffset(iconRect.x - viewRect.x);
- iconRect.x = thisIconOffset + viewRect.x;
- }
- }
- } else {
- // Position the accelerator text rect
- acceleratorRect.x = viewRect.x;
-
- // Position the arrow icon
- arrowIconRect.x = viewRect.x;
-
- // Position the check and user icons
- iconRect.x =
- viewRect.x + viewRect.width - iconRect.width;
- if (checkIcon != null) {
- checkIconRect.x =
- viewRect.x + viewRect.width - checkIconRect.width;
- textRect.x -= menuItemGap + checkIconRect.width;
- iconRect.x -= menuItemGap + checkIconRect.width;
- }
-
- /* Align icons and text horizontally */
- if(popupUI != null) {
- int thisTextOffset = viewRect.x + viewRect.width
- - textRect.x - textRect.width;
- thisTextOffset = popupUI.adjustTextOffset(thisTextOffset);
- textRect.x = viewRect.x + viewRect.width
- - thisTextOffset - textRect.width;
- if(icon != null) {
- // REMIND: The following code currently assumes the
- // default (TRAILING) horizontalTextPosition, which means
- // it will always place the icon to the right of the text.
- // Other values of horizontalTextPosition aren't very
- // useful for menu items, so we ignore them for now, but
- // someday we might want to fix this situation.
- int thisIconOffset = viewRect.x + viewRect.width
- - iconRect.x - iconRect.width;
- thisIconOffset =
- popupUI.adjustIconOffset(thisIconOffset);
- iconRect.x = viewRect.x + viewRect.width
- - thisIconOffset - iconRect.width;
- }
- }
- }
-
- // Align the accelerator text and all icons vertically
- // with the center of the label rect.
- int midY = labelRect.y + (labelRect.height/2);
- iconRect.y = midY - (iconRect.height/2);
- acceleratorRect.y = midY - (acceleratorRect.height/2);
- arrowIconRect.y = midY - (arrowIconRect.height/2);
- checkIconRect.y = midY - (checkIconRect.height/2);
-
- return text;
- }
-
- // these rects are used for painting and preferredsize calculations.
- // they used to be regenerated constantly. Now they are reused.
- static Rectangle iconRect = new Rectangle();
- static Rectangle textRect = new Rectangle();
- static Rectangle acceleratorRect = new Rectangle();
- static Rectangle checkIconRect = new Rectangle();
- static Rectangle arrowIconRect = new Rectangle();
- static Rectangle viewRect = new Rectangle(Short.MAX_VALUE,Short.MAX_VALUE);
- static Rectangle r = new Rectangle();
-
- private static void resetRects() {
- iconRect.setBounds(0, 0, 0, 0);
- textRect.setBounds(0, 0, 0, 0);
- acceleratorRect.setBounds(0, 0, 0, 0);
- checkIconRect.setBounds(0, 0, 0, 0);
- arrowIconRect.setBounds(0, 0, 0, 0);
- viewRect.setBounds(0,0,Short.MAX_VALUE, Short.MAX_VALUE);
- r.setBounds(0, 0, 0, 0);
- }
-
-
protected void installDefaults() {
updateStyle(menuItem);
}
@@ -718,9 +192,11 @@
int defaultTextIconGap) {
SynthContext context = getContext(c);
SynthContext accContext = getContext(c, Region.MENU_ITEM_ACCELERATOR);
- Dimension value = getPreferredMenuItemSize(context, accContext,
- c, checkIcon, arrowIcon, defaultTextIconGap,
- acceleratorDelimiter);
+ Dimension value = SynthGraphicsUtils.getPreferredMenuItemSize(
+ context, accContext, c, checkIcon, arrowIcon,
+ defaultTextIconGap, acceleratorDelimiter,
+ MenuItemLayoutHelper.useCheckAndArrow(menuItem),
+ getPropertyPrefix());
context.dispose();
accContext.dispose();
return value;
@@ -751,14 +227,13 @@
String prefix = getPropertyPrefix();
Icon checkIcon = style.getIcon(context, prefix + ".checkIcon");
Icon arrowIcon = style.getIcon(context, prefix + ".arrowIcon");
- paint(context, accContext, g, checkIcon, arrowIcon,
- acceleratorDelimiter, defaultTextIconGap);
+ SynthGraphicsUtils.paint(context, accContext, g, checkIcon, arrowIcon,
+ acceleratorDelimiter, defaultTextIconGap, getPropertyPrefix());
accContext.dispose();
}
void paintBackground(SynthContext context, Graphics g, JComponent c) {
- context.getPainter().paintMenuItemBackground(context, g, 0, 0,
- c.getWidth(), c.getHeight());
+ SynthGraphicsUtils.paintBackground(context, g, c);
}
public void paintBorder(SynthContext context, Graphics g, int x,
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,7 @@
import java.util.Arrays;
import java.util.ArrayList;
import sun.swing.plaf.synth.SynthUI;
-
+import sun.swing.MenuItemLayoutHelper;
/**
* Synth's MenuUI.
@@ -86,7 +86,7 @@
acceleratorDelimiter = style.getString(context, prefix +
".acceleratorDelimiter", "+");
- if (useCheckAndArrow()) {
+ if (MenuItemLayoutHelper.useCheckAndArrow(menuItem)) {
checkIcon = style.getIcon(context, prefix + ".checkIcon");
arrowIcon = style.getIcon(context, prefix + ".arrowIcon");
} else {
@@ -111,6 +111,16 @@
accContext.dispose();
}
+ public void uninstallUI(JComponent c) {
+ super.uninstallUI(c);
+ // Remove values from the parent's Client Properties.
+ JComponent p = MenuItemLayoutHelper.getMenuItemParent((JMenuItem) c);
+ if (p != null) {
+ p.putClientProperty(
+ SynthMenuItemLayoutHelper.MAX_ACC_OR_ARROW_WIDTH, null);
+ }
+ }
+
protected void uninstallDefaults() {
SynthContext context = getContext(menuItem, ENABLED);
style.uninstallDefaults(context);
@@ -182,9 +192,11 @@
int defaultTextIconGap) {
SynthContext context = getContext(c);
SynthContext accContext = getContext(c, Region.MENU_ITEM_ACCELERATOR);
- Dimension value = SynthMenuItemUI.getPreferredMenuItemSize(
- context, accContext, c, checkIcon, arrowIcon,
- defaultTextIconGap, acceleratorDelimiter);
+ Dimension value = SynthGraphicsUtils.getPreferredMenuItemSize(
+ context, accContext, c, checkIcon, arrowIcon,
+ defaultTextIconGap, acceleratorDelimiter,
+ MenuItemLayoutHelper.useCheckAndArrow(menuItem),
+ getPropertyPrefix());
context.dispose();
accContext.dispose();
return value;
@@ -211,21 +223,12 @@
protected void paint(SynthContext context, Graphics g) {
SynthContext accContext = getContext(menuItem,
Region.MENU_ITEM_ACCELERATOR);
- SynthStyle style = context.getStyle();
- Icon checkIcon;
- Icon arrowIcon;
- if (useCheckAndArrow()) {
- // Refetch the appropriate icons for the current state
- String prefix = getPropertyPrefix();
- checkIcon = style.getIcon(context, prefix + ".checkIcon");
- arrowIcon = style.getIcon(context, prefix + ".arrowIcon");
- } else {
- // Not needed in this case
- checkIcon = null;
- arrowIcon = null;
- }
- SynthMenuItemUI.paint(context, accContext, g, checkIcon, arrowIcon,
- acceleratorDelimiter, defaultTextIconGap);
+ // Refetch the appropriate check indicator for the current state
+ String prefix = getPropertyPrefix();
+ Icon checkIcon = style.getIcon(context, prefix + ".checkIcon");
+ Icon arrowIcon = style.getIcon(context, prefix + ".arrowIcon");
+ SynthGraphicsUtils.paint(context, accContext, g, checkIcon, arrowIcon,
+ acceleratorDelimiter, defaultTextIconGap, getPropertyPrefix());
accContext.dispose();
}
@@ -239,8 +242,4 @@
updateStyle((JMenu)e.getSource());
}
}
-
- private boolean useCheckAndArrow() {
- return !((JMenu)menuItem).isTopLevelMenu();
- }
}
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthParser.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthParser.java Wed Jul 05 16:42:37 2017 +0200
@@ -40,6 +40,7 @@
import java.text.ParseException;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.StringTokenizer;
@@ -136,7 +137,7 @@
* Array of state infos for the current style. These are pushed to the
* style when </style> is received.
*/
- private java.util.List _stateInfos;
+ private List<ParsedSynthStyle.StateInfo> _stateInfos;
/**
* Current style.
@@ -151,7 +152,7 @@
/**
* Bindings for the current InputMap
*/
- private java.util.List _inputMapBindings;
+ private List<String> _inputMapBindings;
/**
* ID for the input map. This is cached as
@@ -177,30 +178,30 @@
/**
* List of ColorTypes. This is populated in startColorType.
*/
- private java.util.List _colorTypes;
+ private List<ColorType> _colorTypes;
/**
* defaultsPropertys are placed here.
*/
- private Map _defaultsMap;
+ private Map<String, Object> _defaultsMap;
/**
* List of SynthStyle.Painters that will be applied to the current style.
*/
- private java.util.List _stylePainters;
+ private List<ParsedSynthStyle.PainterInfo> _stylePainters;
/**
* List of SynthStyle.Painters that will be applied to the current state.
*/
- private java.util.List _statePainters;
+ private List<ParsedSynthStyle.PainterInfo> _statePainters;
SynthParser() {
_mapping = new HashMap<String,Object>();
- _stateInfos = new ArrayList();
- _colorTypes = new ArrayList();
- _inputMapBindings = new ArrayList();
- _stylePainters = new ArrayList();
- _statePainters = new ArrayList();
+ _stateInfos = new ArrayList<ParsedSynthStyle.StateInfo>();
+ _colorTypes = new ArrayList<ColorType>();
+ _inputMapBindings = new ArrayList<String>();
+ _stylePainters = new ArrayList<ParsedSynthStyle.PainterInfo>();
+ _statePainters = new ArrayList<ParsedSynthStyle.PainterInfo>();
}
/**
@@ -219,7 +220,7 @@
public void parse(InputStream inputStream,
DefaultSynthStyleFactory factory,
URL urlResourceBase, Class<?> classResourceBase,
- Map defaultsMap)
+ Map<String, Object> defaultsMap)
throws ParseException, IllegalArgumentException {
if (inputStream == null || factory == null ||
(urlResourceBase == null && classResourceBase == null)) {
@@ -333,7 +334,7 @@
* type type, this will throw an exception.
*/
private Object lookup(String key, Class type) throws SAXException {
- Object value = null;
+ Object value;
if (_handler != null) {
if ((value = _handler.lookup(key)) != null) {
return checkCast(value, type);
@@ -423,15 +424,12 @@
private void endStyle() throws SAXException {
int size = _stylePainters.size();
if (size > 0) {
- _style.setPainters((ParsedSynthStyle.PainterInfo[])
- _stylePainters.toArray(new ParsedSynthStyle.
- PainterInfo[size]));
+ _style.setPainters(_stylePainters.toArray(new ParsedSynthStyle.PainterInfo[size]));
_stylePainters.clear();
}
size = _stateInfos.size();
if (size > 0) {
- _style.setStateInfo((ParsedSynthStyle.StateInfo[])_stateInfos.
- toArray(new ParsedSynthStyle.StateInfo[size]));
+ _style.setStateInfo(_stateInfos.toArray(new ParsedSynthStyle.StateInfo[size]));
_stateInfos.clear();
}
_style = null;
@@ -501,9 +499,7 @@
private void endState() throws SAXException {
int size = _statePainters.size();
if (size > 0) {
- _stateInfo.setPainters((ParsedSynthStyle.PainterInfo[])
- _statePainters.toArray(new ParsedSynthStyle.
- PainterInfo[size]));
+ _stateInfo.setPainters(_statePainters.toArray(new ParsedSynthStyle.PainterInfo[size]));
_statePainters.clear();
}
_stateInfo = null;
@@ -684,8 +680,7 @@
int max = 0;
for (int counter = _colorTypes.size() - 1; counter >= 0;
counter--) {
- max = Math.max(max, ((ColorType)_colorTypes.get(counter)).
- getID());
+ max = Math.max(max, _colorTypes.get(counter).getID());
}
if (colors == null || colors.length <= max) {
Color[] newColors = new Color[max + 1];
@@ -696,7 +691,7 @@
}
for (int counter = _colorTypes.size() - 1; counter >= 0;
counter--) {
- colors[((ColorType)_colorTypes.get(counter)).getID()] = color;
+ colors[_colorTypes.get(counter).getID()] = color;
}
_stateInfo.setColors(colors);
}
@@ -705,7 +700,7 @@
private void startProperty(AttributeList attributes,
Object property) throws SAXException {
Object value = null;
- Object key = null;
+ String key = null;
// Type of the value: 0=idref, 1=boolean, 2=dimension, 3=insets,
// 4=integer,5=string
int iType = 0;
@@ -1027,7 +1022,7 @@
}
}
- private void addPainterOrMerge(java.util.List painters, String method,
+ private void addPainterOrMerge(List<ParsedSynthStyle.PainterInfo> painters, String method,
SynthPainter painter, int direction) {
ParsedSynthStyle.PainterInfo painterInfo;
painterInfo = new ParsedSynthStyle.PainterInfo(method,
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthPopupMenuUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthPopupMenuUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2008 Sun Microsystems, Inc. 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
@@ -58,34 +58,6 @@
*/
class SynthPopupMenuUI extends BasicPopupMenuUI implements
PropertyChangeListener, SynthUI {
- /**
- * Maximum size of the text portion of the children menu items.
- */
- private int maxTextWidth;
-
- /**
- * Maximum size of the icon portion of the children menu items.
- */
- private int maxIconWidth;
-
- /**
- * Maximum size of the spacing between the text and accelerator
- * portions of the children menu items.
- */
- private int maxAccelSpacingWidth;
-
- /**
- * Maximum size of the text for the accelerator portion of the children
- * menu items.
- */
- private int maxAcceleratorWidth;
-
- /*
- * Maximum icon and text offsets of the children menu items.
- */
- private int maxTextOffset;
- private int maxIconOffset;
-
private SynthStyle style;
public static ComponentUI createUI(JComponent x) {
@@ -153,90 +125,6 @@
return SynthLookAndFeel.getComponentState(c);
}
- /**
- * Resets the max text and accerator widths,
- * text and icon offsets.
- */
- void resetAlignmentHints() {
- maxTextWidth = maxIconWidth
- = maxAccelSpacingWidth = maxAcceleratorWidth
- = maxTextOffset = maxIconOffset = 0;
- }
-
- /**
- * Adjusts the width needed to display the maximum menu item string.
- *
- * @param width Text width.
- * @return max width
- */
- int adjustTextWidth(int width) {
- maxTextWidth = Math.max(maxTextWidth, width);
- return maxTextWidth;
- }
-
- /**
- * Adjusts the width needed to display the maximum menu item icon.
- *
- * @param width Icon width.
- * @return max width
- */
- int adjustIconWidth(int width) {
- maxIconWidth = Math.max(maxIconWidth, width);
- return maxIconWidth;
- }
-
- /**
- * Adjusts the width needed to pad between the maximum menu item
- * text and accelerator.
- *
- * @param width Spacing width.
- * @return max width
- */
- int adjustAccelSpacingWidth(int width) {
- maxAccelSpacingWidth = Math.max(maxAccelSpacingWidth, width);
- return maxAccelSpacingWidth;
- }
-
- /**
- * Adjusts the width needed to display the maximum accelerator.
- *
- * @param width Text width.
- * @return max width
- */
- int adjustAcceleratorWidth(int width) {
- maxAcceleratorWidth = Math.max(maxAcceleratorWidth, width);
- return maxAcceleratorWidth;
- }
-
- /**
- * Maximum size needed to display accelerators of children menu items.
- */
- int getMaxAcceleratorWidth() {
- return maxAcceleratorWidth;
- }
-
- /**
- * Adjusts the text offset needed to align text horizontally.
- *
- * @param offset Text offset
- * @return max offset
- */
- int adjustTextOffset(int offset) {
- maxTextOffset = Math.max(maxTextOffset, offset);
- return maxTextOffset;
- }
-
- /**
- * Adjusts the icon offset needed to align icons horizontally
- *
- * @param offset Icon offset
- * @return max offset
- */
- int adjustIconOffset(int offset) {
- maxIconOffset = Math.max(maxIconOffset, offset);
- return maxIconOffset;
- }
-
public void update(Graphics g, JComponent c) {
SynthContext context = getContext(c);
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthSplitPaneUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthSplitPaneUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -48,13 +48,13 @@
* Keys to use for forward focus traversal when the JComponent is
* managing focus.
*/
- private static Set managingFocusForwardTraversalKeys;
+ private static Set<KeyStroke> managingFocusForwardTraversalKeys;
/**
* Keys to use for backward focus traversal when the JComponent is
* managing focus.
*/
- private static Set managingFocusBackwardTraversalKeys;
+ private static Set<KeyStroke> managingFocusBackwardTraversalKeys;
/**
* Style for the JSplitPane.
@@ -96,7 +96,7 @@
// focus forward traversal key
if (managingFocusForwardTraversalKeys==null) {
- managingFocusForwardTraversalKeys = new HashSet();
+ managingFocusForwardTraversalKeys = new HashSet<KeyStroke>();
managingFocusForwardTraversalKeys.add(
KeyStroke.getKeyStroke(KeyEvent.VK_TAB, 0));
}
@@ -104,7 +104,7 @@
managingFocusForwardTraversalKeys);
// focus backward traversal key
if (managingFocusBackwardTraversalKeys==null) {
- managingFocusBackwardTraversalKeys = new HashSet();
+ managingFocusBackwardTraversalKeys = new HashSet<KeyStroke>();
managingFocusBackwardTraversalKeys.add(
KeyStroke.getKeyStroke(KeyEvent.VK_TAB, InputEvent.SHIFT_MASK));
}
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthStyle.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthStyle.java Wed Jul 05 16:42:37 2017 +0200
@@ -53,7 +53,7 @@
/**
* Contains the default values for certain properties.
*/
- private static Map DEFAULT_VALUES;
+ private static Map<Object, Object> DEFAULT_VALUES;
/**
* Shared SynthGraphics.
@@ -715,7 +715,7 @@
private static Object getDefaultValue(Object key) {
synchronized(SynthStyle.class) {
if (DEFAULT_VALUES == null) {
- DEFAULT_VALUES = new HashMap();
+ DEFAULT_VALUES = new HashMap<Object, Object>();
populateDefaultValues();
}
Object value = DEFAULT_VALUES.get(key);
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -66,7 +66,7 @@
protected void installDefaults() {
// Installs the text cursor on the component
super.installDefaults();
- updateStyle((JTextComponent)getComponent());
+ updateStyle(getComponent());
}
protected void uninstallDefaults() {
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -232,7 +232,7 @@
protected void installDefaults() {
// Installs the text cursor on the component
super.installDefaults();
- updateStyle((JTextComponent)getComponent());
+ updateStyle(getComponent());
getComponent().addFocusListener(this);
}
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java Wed Jul 05 16:42:37 2017 +0200
@@ -390,7 +390,7 @@
}
private Rectangle getDropLineRect(JTree.DropLocation loc) {
- Rectangle rect = null;
+ Rectangle rect;
TreePath path = loc.getPath();
int index = loc.getChildIndex();
boolean ltr = tree.getComponentOrientation().isLeftToRight();
@@ -523,7 +523,7 @@
// Don't paint the renderer if editing this row.
boolean selected = tree.isRowSelected(row);
- JTree.DropLocation dropLocation = (JTree.DropLocation)tree.getDropLocation();
+ JTree.DropLocation dropLocation = tree.getDropLocation();
boolean isDrop = dropLocation != null
&& dropLocation.getChildIndex() == -1
&& path == dropLocation.getPath();
--- a/jdk/src/share/classes/javax/swing/table/AbstractTableModel.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/table/AbstractTableModel.java Wed Jul 05 16:42:37 2017 +0200
@@ -176,8 +176,7 @@
* @since 1.4
*/
public TableModelListener[] getTableModelListeners() {
- return (TableModelListener[])listenerList.getListeners(
- TableModelListener.class);
+ return listenerList.getListeners(TableModelListener.class);
}
//
--- a/jdk/src/share/classes/javax/swing/table/DefaultTableModel.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/table/DefaultTableModel.java Wed Jul 05 16:42:37 2017 +0200
@@ -681,9 +681,9 @@
if (anArray == null) {
return null;
}
- Vector v = new Vector(anArray.length);
- for (int i=0; i < anArray.length; i++) {
- v.addElement(anArray[i]);
+ Vector<Object> v = new Vector<Object>(anArray.length);
+ for (Object o : anArray) {
+ v.addElement(o);
}
return v;
}
@@ -698,9 +698,9 @@
if (anArray == null) {
return null;
}
- Vector v = new Vector(anArray.length);
- for (int i=0; i < anArray.length; i++) {
- v.addElement(convertToVector(anArray[i]));
+ Vector<Vector> v = new Vector<Vector>(anArray.length);
+ for (Object[] o : anArray) {
+ v.addElement(convertToVector(o));
}
return v;
}
--- a/jdk/src/share/classes/javax/swing/text/AbstractDocument.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/AbstractDocument.java Wed Jul 05 16:42:37 2017 +0200
@@ -123,15 +123,15 @@
if (defaultI18NProperty == null) {
// determine default setting for i18n support
- Object o = java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
- public Object run() {
+ String o = java.security.AccessController.doPrivileged(
+ new java.security.PrivilegedAction<String>() {
+ public String run() {
return System.getProperty(I18NProperty);
}
}
);
if (o != null) {
- defaultI18NProperty = Boolean.valueOf((String)o);
+ defaultI18NProperty = Boolean.valueOf(o);
} else {
defaultI18NProperty = Boolean.FALSE;
}
@@ -163,7 +163,7 @@
*/
public Dictionary<Object,Object> getDocumentProperties() {
if (documentProperties == null) {
- documentProperties = new Hashtable(2);
+ documentProperties = new Hashtable<Object, Object>(2);
}
return documentProperties;
}
@@ -467,8 +467,7 @@
* @since 1.4
*/
public DocumentListener[] getDocumentListeners() {
- return (DocumentListener[])listenerList.getListeners(
- DocumentListener.class);
+ return listenerList.getListeners(DocumentListener.class);
}
/**
@@ -508,8 +507,7 @@
* @since 1.4
*/
public UndoableEditListener[] getUndoableEditListeners() {
- return (UndoableEditListener[])listenerList.getListeners(
- UndoableEditListener.class);
+ return listenerList.getListeners(UndoableEditListener.class);
}
/**
@@ -610,7 +608,7 @@
DefaultDocumentEvent chng =
new DefaultDocumentEvent(offs, len, DocumentEvent.EventType.REMOVE);
- boolean isComposedTextElement = false;
+ boolean isComposedTextElement;
// Check whether the position of interest is the composed text
isComposedTextElement = Utilities.isComposedTextElement(this, offs);
@@ -1051,7 +1049,7 @@
byte levels[] = calculateBidiLevels( firstPStart, lastPEnd );
- Vector newElements = new Vector();
+ Vector<Element> newElements = new Vector<Element>();
// Calculate the first span of characters in the affected range with
// the same bidi level. If this level is the same as the level of the
@@ -1831,7 +1829,6 @@
}
out.println("["+contentStr+"]");
} catch (BadLocationException e) {
- ;
}
} else {
@@ -2460,7 +2457,7 @@
if(nchildren == 0)
return null;
- Vector tempVector = new Vector(nchildren);
+ Vector<AbstractElement> tempVector = new Vector<AbstractElement>(nchildren);
for(int counter = 0; counter < nchildren; counter++)
tempVector.addElement(children[counter]);
@@ -2749,7 +2746,7 @@
// if the number of changes gets too great, start using
// a hashtable for to locate the change for a given element.
if ((changeLookup == null) && (edits.size() > 10)) {
- changeLookup = new Hashtable();
+ changeLookup = new Hashtable<Element, ElementChange>();
int n = edits.size();
for (int i = 0; i < n; i++) {
Object o = edits.elementAt(i);
@@ -2918,7 +2915,7 @@
*/
public DocumentEvent.ElementChange getChange(Element elem) {
if (changeLookup != null) {
- return (DocumentEvent.ElementChange) changeLookup.get(elem);
+ return changeLookup.get(elem);
}
int n = edits.size();
for (int i = 0; i < n; i++) {
@@ -2937,7 +2934,7 @@
private int offset;
private int length;
- private Hashtable changeLookup;
+ private Hashtable<Element, ElementChange> changeLookup;
private DocumentEvent.EventType type;
}
--- a/jdk/src/share/classes/javax/swing/text/AsyncBoxView.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/AsyncBoxView.java Wed Jul 05 16:42:37 2017 +0200
@@ -25,6 +25,7 @@
package javax.swing.text;
import java.util.*;
+import java.util.List;
import java.awt.*;
import javax.swing.SwingUtilities;
import javax.swing.event.DocumentEvent;
@@ -58,7 +59,7 @@
*/
public AsyncBoxView(Element elem, int axis) {
super(elem);
- stats = new ArrayList();
+ stats = new ArrayList<ChildState>();
this.axis = axis;
locator = new ChildLocator();
flushTask = new FlushTask();
@@ -197,7 +198,7 @@
protected ChildState getChildState(int index) {
synchronized(stats) {
if ((index >= 0) && (index < stats.size())) {
- return (ChildState) stats.get(index);
+ return stats.get(index);
}
return null;
}
@@ -357,7 +358,7 @@
synchronized(stats) {
// remove the replaced state records
for (int i = 0; i < length; i++) {
- ChildState cs = (ChildState)stats.remove(offset);
+ ChildState cs = stats.remove(offset);
float csSpan = cs.getMajorSpan();
cs.getChildView().setParent(null);
@@ -863,7 +864,7 @@
/**
* The children and their layout statistics.
*/
- java.util.List stats;
+ List<ChildState> stats;
/**
* Current span along the major axis. This
@@ -1110,7 +1111,7 @@
*/
int updateChildOffsets(float targetOffset) {
int n = getViewCount();
- int targetIndex = n - 1;;
+ int targetIndex = n - 1;
int pos = lastValidOffset.getChildView().getStartOffset();
int startIndex = getViewIndex(pos, Position.Bias.Forward);
float start = lastValidOffset.getMajorOffset();
@@ -1394,7 +1395,6 @@
private float min;
private float pref;
private float max;
- private float align;
private boolean minorValid;
// major axis
--- a/jdk/src/share/classes/javax/swing/text/ComponentView.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/ComponentView.java Wed Jul 05 16:42:37 2017 +0200
@@ -27,6 +27,7 @@
import java.awt.*;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
+import java.util.Set;
import javax.swing.SwingUtilities;
import javax.swing.event.*;
@@ -434,7 +435,7 @@
/**
* Shows or hides this component depending on the value of parameter
* <code>b</code>.
- * @param <code>b</code> If <code>true</code>, shows this component;
+ * @param b If <code>true</code>, shows this component;
* otherwise, hides this component.
* @see #isVisible
* @since JDK1.1
@@ -480,7 +481,7 @@
return yalign;
}
- public java.util.Set getFocusTraversalKeys(int id) {
+ public Set<AWTKeyStroke> getFocusTraversalKeys(int id) {
return KeyboardFocusManager.getCurrentKeyboardFocusManager().
getDefaultFocusTraversalKeys(id);
}
--- a/jdk/src/share/classes/javax/swing/text/DefaultCaret.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/DefaultCaret.java Wed Jul 05 16:42:37 2017 +0200
@@ -774,8 +774,7 @@
* @since 1.4
*/
public ChangeListener[] getChangeListeners() {
- return (ChangeListener[])listenerList.getListeners(
- ChangeListener.class);
+ return listenerList.getListeners(ChangeListener.class);
}
/**
@@ -1330,7 +1329,7 @@
if (this.dot != this.mark && component != null) {
Clipboard clip = getSystemSelection();
if (clip != null) {
- String selectedText = null;
+ String selectedText;
if (component instanceof JPasswordField
&& component.getClientProperty("JPasswordField.cutCopyAllowed") !=
Boolean.TRUE) {
--- a/jdk/src/share/classes/javax/swing/text/DefaultFormatter.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/DefaultFormatter.java Wed Jul 05 16:42:37 2017 +0200
@@ -68,7 +68,7 @@
private boolean commitOnEdit;
/** Class used to create new instances. */
- private Class valueClass;
+ private Class<?> valueClass;
/** NavigationFilter that forwards calls back to DefaultFormatter. */
private NavigationFilter navigationFilter;
@@ -231,7 +231,7 @@
* @return Object representation of text
*/
public Object stringToValue(String string) throws ParseException {
- Class vc = getValueClass();
+ Class<?> vc = getValueClass();
JFormattedTextField ftf = getFormattedTextField();
if (vc == null && ftf != null) {
--- a/jdk/src/share/classes/javax/swing/text/DefaultHighlighter.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/DefaultHighlighter.java Wed Jul 05 16:42:37 2017 +0200
@@ -56,7 +56,7 @@
// PENDING(prinz) - should cull ranges not visible
int len = highlights.size();
for (int i = 0; i < len; i++) {
- HighlightInfo info = (HighlightInfo) highlights.elementAt(i);
+ HighlightInfo info = highlights.elementAt(i);
if (!(info instanceof LayeredHighlightInfo)) {
// Avoid allocing unless we need it.
Rectangle a = component.getBounds();
@@ -66,7 +66,7 @@
a.width -= insets.left + insets.right;
a.height -= insets.top + insets.bottom;
for (; i < len; i++) {
- info = (HighlightInfo)highlights.elementAt(i);
+ info = highlights.elementAt(i);
if (!(info instanceof LayeredHighlightInfo)) {
Highlighter.HighlightPainter p = info.getPainter();
p.paint(g, info.getStartOffset(), info.getEndOffset(),
@@ -159,7 +159,7 @@
int p0 = -1;
int p1 = -1;
for (int i = 0; i < len; i++) {
- HighlightInfo hi = (HighlightInfo)highlights.elementAt(i);
+ HighlightInfo hi = highlights.elementAt(i);
if (hi instanceof LayeredHighlightInfo) {
LayeredHighlightInfo info = (LayeredHighlightInfo)hi;
minX = Math.min(minX, info.x);
@@ -195,7 +195,7 @@
int p0 = Integer.MAX_VALUE;
int p1 = 0;
for (int i = 0; i < len; i++) {
- HighlightInfo info = (HighlightInfo) highlights.elementAt(i);
+ HighlightInfo info = highlights.elementAt(i);
p0 = Math.min(p0, info.p0.getOffset());
p1 = Math.max(p1, info.p1.getOffset());
}
@@ -282,7 +282,7 @@
Shape viewBounds,
JTextComponent editor, View view) {
for (int counter = highlights.size() - 1; counter >= 0; counter--) {
- Object tag = highlights.elementAt(counter);
+ HighlightInfo tag = highlights.elementAt(counter);
if (tag instanceof LayeredHighlightInfo) {
LayeredHighlightInfo lhi = (LayeredHighlightInfo)tag;
int start = lhi.getStartOffset();
@@ -333,7 +333,7 @@
private final static Highlighter.Highlight[] noHighlights =
new Highlighter.Highlight[0];
- private Vector highlights = new Vector(); // Vector<HighlightInfo>
+ private Vector<HighlightInfo> highlights = new Vector<HighlightInfo>();
private JTextComponent component;
private boolean drawsLayeredHighlights;
private SafeDamager safeDamager = new SafeDamager();
@@ -573,8 +573,8 @@
* call.
*/
class SafeDamager implements Runnable {
- private Vector p0 = new Vector(10);
- private Vector p1 = new Vector(10);
+ private Vector<Position> p0 = new Vector<Position>(10);
+ private Vector<Position> p1 = new Vector<Position>(10);
private Document lastDoc = null;
/**
@@ -589,8 +589,8 @@
int len = p0.size();
for (int i = 0; i < len; i++){
mapper.damageRange(component,
- ((Position)p0.get(i)).getOffset(),
- ((Position)p1.get(i)).getOffset());
+ p0.get(i).getOffset(),
+ p1.get(i).getOffset());
}
}
}
--- a/jdk/src/share/classes/javax/swing/text/DefaultStyledDocument.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/DefaultStyledDocument.java Wed Jul 05 16:42:37 2017 +0200
@@ -84,7 +84,7 @@
*/
public DefaultStyledDocument(Content c, StyleContext styles) {
super(c, styles);
- listeningStyles = new Vector();
+ listeningStyles = new Vector<Style>();
buffer = new ElementBuffer(createDefaultRoot());
Style defaultStyle = styles.getStyle(StyleContext.DEFAULT_STYLE);
setLogicalStyle(0, defaultStyle);
@@ -349,7 +349,7 @@
int prevStartOffset = prevLeaf.getStartOffset();
BranchElement prevParent = (BranchElement) prevLeaf.getParentElement();
int prevIndex = prevParent.getElementIndex(prevStartOffset);
- Element newElem = null;
+ Element newElem;
newElem = createLeafElement(prevParent, prevLeaf.getAttributes(),
prevStartOffset, lastEndOffset);
Element[] prevRemoved = { prevLeaf };
@@ -511,7 +511,7 @@
AttributeSet sCopy = s.copyAttributes();
// PENDING(prinz) - this isn't a very efficient way to iterate
- int lastEnd = Integer.MAX_VALUE;
+ int lastEnd;
for (int pos = offset; pos < (offset + length); pos = lastEnd) {
Element run = getCharacterElement(pos);
lastEnd = run.getEndOffset();
@@ -597,7 +597,7 @@
* @return the element
*/
public Element getParagraphElement(int pos) {
- Element e = null;
+ Element e;
for (e = getDefaultRootElement(); ! e.isLeaf(); ) {
int index = e.getElementIndex(pos);
e = e.getElement(index);
@@ -614,7 +614,7 @@
* @return the element
*/
public Element getCharacterElement(int pos) {
- Element e = null;
+ Element e;
for (e = getDefaultRootElement(); ! e.isLeaf(); ) {
int index = e.getElementIndex(pos);
e = e.getElement(index);
@@ -655,7 +655,7 @@
try {
Segment s = new Segment();
- Vector parseBuffer = new Vector();
+ Vector<ElementSpec> parseBuffer = new Vector<ElementSpec>();
ElementSpec lastStartSpec = null;
boolean insertingAfterNewline = false;
short lastStartDirection = ElementSpec.OriginateDirection;
@@ -670,8 +670,7 @@
offset, endOffset);
for(int counter = parseBuffer.size() - 1; counter >= 0;
counter--) {
- ElementSpec spec = (ElementSpec)parseBuffer.
- elementAt(counter);
+ ElementSpec spec = parseBuffer.elementAt(counter);
if(spec.getType() == ElementSpec.StartTagType) {
lastStartSpec = spec;
break;
@@ -709,7 +708,7 @@
n - lastOffset));
}
- ElementSpec first = (ElementSpec) parseBuffer.firstElement();
+ ElementSpec first = parseBuffer.firstElement();
int docLength = getLength();
@@ -750,7 +749,7 @@
// direction isn't originate, and the element at endOffset
// is a leaf.
if(insertingAtBoundry && endOffset < docLength) {
- ElementSpec last = (ElementSpec) parseBuffer.lastElement();
+ ElementSpec last = parseBuffer.lastElement();
if(last.getType() == ElementSpec.ContentType &&
last.getDirection() != ElementSpec.JoinPreviousDirection &&
((lastStartSpec == null && (paragraph == pParagraph ||
@@ -772,7 +771,7 @@
else if(!insertingAtBoundry && lastStartSpec != null &&
lastStartSpec.getDirection() ==
ElementSpec.JoinFractureDirection) {
- ElementSpec last = (ElementSpec) parseBuffer.lastElement();
+ ElementSpec last = parseBuffer.lastElement();
if(last.getType() == ElementSpec.ContentType &&
last.getDirection() != ElementSpec.JoinPreviousDirection &&
attr.isEqual(cattr)) {
@@ -805,7 +804,7 @@
* necessarily create the last start spec).
*/
short createSpecsForInsertAfterNewline(Element paragraph,
- Element pParagraph, AttributeSet pattr, Vector parseBuffer,
+ Element pParagraph, AttributeSet pattr, Vector<ElementSpec> parseBuffer,
int offset, int endOffset) {
// Need to find the common parent of pParagraph and paragraph.
if(paragraph.getParentElement() == pParagraph.getParentElement()) {
@@ -825,8 +824,8 @@
else {
// Will only happen for text with more than 2 levels.
// Find the common parent of a paragraph and pParagraph
- Vector leftParents = new Vector();
- Vector rightParents = new Vector();
+ Vector<Element> leftParents = new Vector<Element>();
+ Vector<Element> rightParents = new Vector<Element>();
Element e = pParagraph;
while(e != null) {
leftParents.addElement(e);
@@ -847,11 +846,10 @@
(null, ElementSpec.EndTagType));
}
// And the starts.
- ElementSpec spec = null;
+ ElementSpec spec;
for(int counter = rightParents.size() - 1;
counter >= 0; counter--) {
- spec = new ElementSpec(((Element)rightParents.
- elementAt(counter)).getAttributes(),
+ spec = new ElementSpec(rightParents.elementAt(counter).getAttributes(),
ElementSpec.StartTagType);
if(counter > 0)
spec.setDirection(ElementSpec.JoinNextDirection);
@@ -1007,7 +1005,7 @@
if (listenerList.getListenerCount(DocumentListener.class) == 0) {
for (int counter = listeningStyles.size() - 1; counter >= 0;
counter--) {
- ((Style)listeningStyles.elementAt(counter)).
+ listeningStyles.elementAt(counter).
removeChangeListener(styleChangeListener);
}
listeningStyles.removeAllElements();
@@ -1077,7 +1075,7 @@
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException {
- listeningStyles = new Vector();
+ listeningStyles = new Vector<Style>();
s.defaultReadObject();
// Reinstall style listeners.
if (styleContextChangeListener == null &&
@@ -1101,7 +1099,7 @@
protected ElementBuffer buffer;
/** Styles listening to. */
- private transient Vector listeningStyles;
+ private transient Vector<Style> listeningStyles;
/** Listens to Styles. */
private transient ChangeListener styleChangeListener;
@@ -1401,8 +1399,8 @@
*/
public ElementBuffer(Element root) {
this.root = root;
- changes = new Vector();
- path = new Stack();
+ changes = new Vector<ElemChanges>();
+ path = new Stack<ElemChanges>();
}
/**
@@ -1454,7 +1452,7 @@
elem = child;
index = elem.getElementIndex(0);
}
- ElemChanges ec = (ElemChanges) path.peek();
+ ElemChanges ec = path.peek();
Element child = ec.parent.getElement(ec.index);
ec.added.addElement(createLeafElement(ec.parent,
child.getAttributes(), getLength(),
@@ -1646,7 +1644,7 @@
index = e.getElementIndex(offs);
}
- ElemChanges ec = (ElemChanges) path.peek();
+ ElemChanges ec = path.peek();
Element child = ec.parent.getElement(ec.index);
// make sure there is something to do... if the
// offset is already at a boundary then there is
@@ -1722,15 +1720,14 @@
void endEdits(DefaultDocumentEvent de) {
int n = changes.size();
for (int i = 0; i < n; i++) {
- ElemChanges ec = (ElemChanges) changes.elementAt(i);
+ ElemChanges ec = changes.elementAt(i);
Element[] removed = new Element[ec.removed.size()];
ec.removed.copyInto(removed);
Element[] added = new Element[ec.added.size()];
ec.added.copyInto(added);
int index = ec.index;
((BranchElement) ec.parent).replace(index, removed.length, added);
- ElementEdit ee = new ElementEdit((BranchElement) ec.parent,
- index, removed, added);
+ ElementEdit ee = new ElementEdit(ec.parent, index, removed, added);
de.addEdit(ee);
}
@@ -1767,12 +1764,12 @@
this.endOffset = offset + length;
pos = offset;
if (changes == null) {
- changes = new Vector();
+ changes = new Vector<ElemChanges>();
} else {
changes.removeAllElements();
}
if (path == null) {
- path = new Stack();
+ path = new Stack<ElemChanges>();
} else {
path.removeAllElements();
}
@@ -1799,7 +1796,7 @@
}
void pop() {
- ElemChanges ec = (ElemChanges) path.peek();
+ ElemChanges ec = path.peek();
path.pop();
if ((ec.added.size() > 0) || (ec.removed.size() > 0)) {
changes.addElement(ec);
@@ -1808,7 +1805,7 @@
if(e.getElementCount() == 0) {
// if we pushed a branch element that didn't get
// used, make sure its not marked as having been added.
- ec = (ElemChanges) path.peek();
+ ec = path.peek();
ec.added.removeElement(e);
}
}
@@ -1822,7 +1819,7 @@
}
void insertElement(ElementSpec es) {
- ElemChanges ec = (ElemChanges) path.peek();
+ ElemChanges ec = path.peek();
switch(es.getType()) {
case ElementSpec.StartTagType:
switch(es.getDirection()) {
@@ -1930,7 +1927,7 @@
int index0 = elem.getElementIndex(rmOffs0);
int index1 = elem.getElementIndex(rmOffs1);
push(elem, index0);
- ElemChanges ec = (ElemChanges)path.peek();
+ ElemChanges ec = path.peek();
// if the range is contained by one element,
// we just forward the request
@@ -2068,7 +2065,7 @@
if (rj.getStartOffset() == rmOffs1) {
rj = null;
}
- Vector children = new Vector();
+ Vector<Element> children = new Vector<Element>();
// transfer the left
for (int i = 0; i < ljIndex; i++) {
@@ -2142,7 +2139,7 @@
}
Element e = createBranchElement(parent, clonee.getAttributes());
int n = clonee.getElementCount();
- ArrayList childrenList = new ArrayList(n);
+ ArrayList<Element> childrenList = new ArrayList<Element>(n);
for (int i = 0; i < n; i++) {
Element elem = clonee.getElement(i);
if (elem.getStartOffset() < rmOffs0 || elem.getEndOffset() > rmOffs1) {
@@ -2150,7 +2147,7 @@
}
}
Element[] children = new Element[childrenList.size()];
- children = (Element[])childrenList.toArray(children);
+ children = childrenList.toArray(children);
((BranchElement)e).replace(0, 0, children);
return e;
}
@@ -2355,7 +2352,7 @@
*/
void fractureDeepestLeaf(ElementSpec[] specs) {
// Split the bottommost leaf. It will be recreated elsewhere.
- ElemChanges ec = (ElemChanges) path.peek();
+ ElemChanges ec = path.peek();
Element child = ec.parent.getElement(ec.index);
// Inserts at offset 0 do not need to recreate child (it would
// have a length of 0!).
@@ -2380,7 +2377,7 @@
*/
void insertFirstContent(ElementSpec[] specs) {
ElementSpec firstSpec = specs[0];
- ElemChanges ec = (ElemChanges) path.peek();
+ ElemChanges ec = path.peek();
Element child = ec.parent.getElement(ec.index);
int firstEndOffset = offset + firstSpec.getLength();
boolean isOnlyContent = (specs.length == 1);
@@ -2463,8 +2460,8 @@
transient int offset;
transient int length;
transient int endOffset;
- transient Vector changes; // Vector<ElemChanges>
- transient Stack path; // Stack<ElemChanges>
+ transient Vector<ElemChanges> changes;
+ transient Stack<ElemChanges> path;
transient boolean insertOp;
transient boolean recreateLeafs; // For insert.
@@ -2494,8 +2491,8 @@
this.parent = parent;
this.index = index;
this.isFracture = isFracture;
- added = new Vector();
- removed = new Vector();
+ added = new Vector<Element>();
+ removed = new Vector<Element>();
}
public String toString() {
@@ -2504,8 +2501,8 @@
Element parent;
int index;
- Vector added;
- Vector removed;
+ Vector<Element> added;
+ Vector<Element> removed;
boolean isFracture;
}
@@ -2611,7 +2608,7 @@
/* This has an implicit reference to the handler object. */
private class DocReference extends WeakReference<DefaultStyledDocument> {
- DocReference(DefaultStyledDocument d, ReferenceQueue q) {
+ DocReference(DefaultStyledDocument d, ReferenceQueue<DefaultStyledDocument> q) {
super(d, q);
}
@@ -2624,19 +2621,19 @@
}
/** Class-specific reference queues. */
- private final static Map<Class, ReferenceQueue> queueMap
- = new HashMap<Class, ReferenceQueue>();
+ private final static Map<Class, ReferenceQueue<DefaultStyledDocument>> queueMap
+ = new HashMap<Class, ReferenceQueue<DefaultStyledDocument>>();
/** A weak reference to the document object. */
private DocReference doc;
AbstractChangeHandler(DefaultStyledDocument d) {
Class c = getClass();
- ReferenceQueue q;
+ ReferenceQueue<DefaultStyledDocument> q;
synchronized (queueMap) {
q = queueMap.get(c);
if (q == null) {
- q = new ReferenceQueue();
+ q = new ReferenceQueue<DefaultStyledDocument>();
queueMap.put(c, q);
}
}
@@ -2650,7 +2647,7 @@
*/
static List<ChangeListener> getStaleListeners(ChangeListener l) {
List<ChangeListener> staleListeners = new ArrayList<ChangeListener>();
- ReferenceQueue q = queueMap.get(l.getClass());
+ ReferenceQueue<DefaultStyledDocument> q = queueMap.get(l.getClass());
if (q != null) {
DocReference r;
--- a/jdk/src/share/classes/javax/swing/text/ElementIterator.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/ElementIterator.java Wed Jul 05 16:42:37 2017 +0200
@@ -72,7 +72,7 @@
private Element root;
- private Stack elementStack = null;
+ private Stack<StackItem> elementStack = null;
/**
* The StackItem class stores the element
@@ -148,9 +148,9 @@
try {
ElementIterator it = new ElementIterator(root);
if (elementStack != null) {
- it.elementStack = new Stack();
+ it.elementStack = new Stack<StackItem>();
for (int i = 0; i < elementStack.size(); i++) {
- StackItem item = (StackItem)elementStack.elementAt(i);
+ StackItem item = elementStack.elementAt(i);
StackItem clonee = (StackItem)item.clone();
it.elementStack.push(clonee);
}
@@ -173,7 +173,7 @@
return null;
}
- elementStack = new Stack();
+ elementStack = new Stack<StackItem>();
if (root.getElementCount() != 0) {
elementStack.push(new StackItem(root));
}
@@ -209,7 +209,7 @@
get a handle to the element on top of the stack.
*/
if (! elementStack.empty()) {
- StackItem item = (StackItem)elementStack.peek();
+ StackItem item = elementStack.peek();
Element elem = item.getElement();
int index = item.getIndex();
// self reference
@@ -247,7 +247,7 @@
// get a handle to the element on top of the stack
- StackItem item = (StackItem)elementStack.peek();
+ StackItem item = elementStack.peek();
Element elem = item.getElement();
int index = item.getIndex();
@@ -272,7 +272,7 @@
if (!elementStack.isEmpty()) {
/* Increment the child index for the item that
is now on top of the stack. */
- StackItem top = (StackItem)elementStack.peek();
+ StackItem top = elementStack.peek();
top.incrementIndex();
/* We now want to return its next child, therefore
call next() recursively. */
@@ -300,7 +300,7 @@
// get a handle to the element on top of the stack
//
- StackItem item = (StackItem)elementStack.peek();
+ StackItem item = elementStack.peek();
Element elem = item.getElement();
int index = item.getIndex();
@@ -320,8 +320,8 @@
/* We need to return either the item
below the top item or one of the
former's children. */
- Object top = elementStack.pop();
- item = (StackItem)elementStack.peek();
+ StackItem top = elementStack.pop();
+ item = elementStack.peek();
// restore the top item.
elementStack.push(top);
--- a/jdk/src/share/classes/javax/swing/text/FlowView.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/FlowView.java Wed Jul 05 16:42:37 2017 +0200
@@ -184,9 +184,9 @@
final int faxis = getFlowAxis();
int newSpan;
if (faxis == X_AXIS) {
- newSpan = (int)width;
+ newSpan = width;
} else {
- newSpan = (int)height;
+ newSpan = height;
}
if (layoutSpan != newSpan) {
layoutChanged(faxis);
@@ -197,7 +197,7 @@
// repair the flow if necessary
if (! isLayoutValid(faxis)) {
final int heightAxis = getAxis();
- int oldFlowHeight = (int)((heightAxis == X_AXIS)? getWidth() : getHeight());
+ int oldFlowHeight = (heightAxis == X_AXIS)? getWidth() : getHeight();
strategy.layout(this);
int newFlowHeight = (int) getPreferredSpan(heightAxis);
if (oldFlowHeight != newFlowHeight) {
--- a/jdk/src/share/classes/javax/swing/text/GapContent.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/GapContent.java Wed Jul 05 16:42:37 2017 +0200
@@ -83,7 +83,7 @@
marks = new MarkVector();
search = new MarkData(0);
- queue = new ReferenceQueue();
+ queue = new ReferenceQueue<StickyPosition>();
}
/**
@@ -262,13 +262,13 @@
* it. The update table holds only a reference
* to this data.
*/
- final class MarkData extends WeakReference {
+ final class MarkData extends WeakReference<StickyPosition> {
MarkData(int index) {
super(null);
this.index = index;
}
- MarkData(int index, StickyPosition position, ReferenceQueue queue) {
+ MarkData(int index, StickyPosition position, ReferenceQueue<? super StickyPosition> queue) {
super(position, queue);
this.index = index;
}
@@ -287,7 +287,7 @@
}
StickyPosition getPosition() {
- return (StickyPosition)get();
+ return get();
}
int index;
}
@@ -329,7 +329,7 @@
*/
private transient int unusedMarks = 0;
- private transient ReferenceQueue queue;
+ private transient ReferenceQueue<StickyPosition> queue;
final static int GROWTH_SIZE = 1024 * 512;
@@ -535,7 +535,7 @@
return 0;
}
- int cmp = 0;
+ int cmp;
MarkData last = marks.elementAt(upper);
cmp = compare(o, last);
if (cmp > 0)
@@ -691,7 +691,7 @@
s.defaultReadObject();
marks = new MarkVector();
search = new MarkData(0);
- queue = new ReferenceQueue();
+ queue = new ReferenceQueue<StickyPosition>();
}
--- a/jdk/src/share/classes/javax/swing/text/InternationalFormatter.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/InternationalFormatter.java Wed Jul 05 16:42:37 2017 +0200
@@ -27,6 +27,7 @@
import java.awt.event.ActionEvent;
import java.io.*;
import java.text.*;
+import java.text.AttributedCharacterIterator.Attribute;
import java.util.*;
import javax.swing.*;
import javax.swing.text.*;
@@ -352,13 +353,13 @@
updateMask();
}
- Map attrs = getAttributes(offset);
+ Map<Attribute, Object> attrs = getAttributes(offset);
if (attrs != null && attrs.size() > 0) {
- ArrayList al = new ArrayList();
+ ArrayList<Attribute> al = new ArrayList<Attribute>();
al.addAll(attrs.keySet());
- return (Format.Field[])al.toArray(EMPTY_FIELD_ARRAY);
+ return al.toArray(EMPTY_FIELD_ARRAY);
}
return EMPTY_FIELD_ARRAY;
}
@@ -440,7 +441,7 @@
/**
* Returns a Set of the attribute identifiers at <code>index</code>.
*/
- Map getAttributes(int index) {
+ Map<Attribute, Object> getAttributes(int index) {
if (isValidMask()) {
AttributedCharacterIterator iterator = getIterator();
--- a/jdk/src/share/classes/javax/swing/text/JTextComponent.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/JTextComponent.java Wed Jul 05 16:42:37 2017 +0200
@@ -386,7 +386,7 @@
* @since 1.4
*/
public CaretListener[] getCaretListeners() {
- return (CaretListener[])listenerList.getListeners(CaretListener.class);
+ return listenerList.getListeners(CaretListener.class);
}
/**
@@ -1171,16 +1171,15 @@
* @param actions the set of actions
*/
public static void loadKeymap(Keymap map, KeyBinding[] bindings, Action[] actions) {
- Hashtable h = new Hashtable();
- for (int i = 0; i < actions.length; i++) {
- Action a = actions[i];
+ Hashtable<String, Action> h = new Hashtable<String, Action>();
+ for (Action a : actions) {
String value = (String)a.getValue(Action.NAME);
h.put((value!=null ? value:""), a);
}
- for (int i = 0; i < bindings.length; i++) {
- Action a = (Action) h.get(bindings[i].actionName);
+ for (KeyBinding binding : bindings) {
+ Action a = h.get(binding.actionName);
if (a != null) {
- map.addActionForKeyStroke(bindings[i].key, a);
+ map.addActionForKeyStroke(binding.key, a);
}
}
}
@@ -1192,11 +1191,11 @@
* invoked from within a <code>doPrivileged</code>, and it is also
* assumed <code>klass</code> extends <code>JTextComponent</code>.
*/
- private static Boolean isProcessInputMethodEventOverridden(Class klass) {
+ private static Boolean isProcessInputMethodEventOverridden(Class<?> klass) {
if (klass == JTextComponent.class) {
return Boolean.FALSE;
}
- Boolean retValue = (Boolean)overrideMap.get(klass.getName());
+ Boolean retValue = overrideMap.get(klass.getName());
if (retValue != null) {
return retValue;
@@ -2053,7 +2052,7 @@
*/
public boolean getScrollableTracksViewportWidth() {
if (getParent() instanceof JViewport) {
- return (((JViewport)getParent()).getWidth() > getPreferredSize().width);
+ return (getParent().getWidth() > getPreferredSize().width);
}
return false;
}
@@ -2073,7 +2072,7 @@
*/
public boolean getScrollableTracksViewportHeight() {
if (getParent() instanceof JViewport) {
- return (((JViewport)getParent()).getHeight() > getPreferredSize().height);
+ return (getParent().getHeight() > getPreferredSize().height);
}
return false;
}
@@ -3033,7 +3032,7 @@
StyledDocument sdoc = (StyledDocument)model;
return sdoc.getParagraphElement(index);
} else {
- Element para = null;
+ Element para;
for (para = model.getDefaultRootElement(); ! para.isLeaf(); ) {
int pos = para.getElementIndex(index);
para = para.getElement(pos);
@@ -3535,7 +3534,7 @@
throw new BadLocationException("Location out of bounds", index);
}
// locate the Element at index
- Element indexElement = null;
+ Element indexElement;
// locate the Element at our index/offset
int elementIndex = -1; // test for initialization
for (indexElement = model.getDefaultRootElement();
@@ -3553,7 +3552,7 @@
// find the first Element before/after ours w/the same AttributeSet
// if we are already at edge of the first element in our parent
// then return that edge
- Element edgeElement = indexElement;
+ Element edgeElement;
switch (direction) {
case -1:
case 1:
@@ -3903,7 +3902,7 @@
* Maps from class name to Boolean indicating if
* <code>processInputMethodEvent</code> has been overriden.
*/
- private static Map overrideMap;
+ private static Map<String, Boolean> overrideMap;
/**
* Returns a string representation of this <code>JTextComponent</code>.
@@ -4007,9 +4006,9 @@
}
private DataFlavor getFlavor(DataFlavor[] flavors) {
if (flavors != null) {
- for (int counter = 0; counter < flavors.length; counter++) {
- if (flavors[counter].equals(DataFlavor.stringFlavor)) {
- return flavors[counter];
+ for (DataFlavor flavor : flavors) {
+ if (flavor.equals(DataFlavor.stringFlavor)) {
+ return flavor;
}
}
}
@@ -4065,7 +4064,7 @@
DefaultKeymap(String nm, Keymap parent) {
this.nm = nm;
this.parent = parent;
- bindings = new Hashtable();
+ bindings = new Hashtable<KeyStroke, Action>();
}
/**
@@ -4095,7 +4094,7 @@
}
public Action getAction(KeyStroke key) {
- Action a = (Action) bindings.get(key);
+ Action a = bindings.get(key);
if ((a == null) && (parent != null)) {
a = parent.getAction(key);
}
@@ -4105,8 +4104,8 @@
public KeyStroke[] getBoundKeyStrokes() {
KeyStroke[] keys = new KeyStroke[bindings.size()];
int i = 0;
- for (Enumeration e = bindings.keys() ; e.hasMoreElements() ;) {
- keys[i++] = (KeyStroke) e.nextElement();
+ for (Enumeration<KeyStroke> e = bindings.keys() ; e.hasMoreElements() ;) {
+ keys[i++] = e.nextElement();
}
return keys;
}
@@ -4114,8 +4113,8 @@
public Action[] getBoundActions() {
Action[] actions = new Action[bindings.size()];
int i = 0;
- for (Enumeration e = bindings.elements() ; e.hasMoreElements() ;) {
- actions[i++] = (Action) e.nextElement();
+ for (Enumeration<Action> e = bindings.elements() ; e.hasMoreElements() ;) {
+ actions[i++] = e.nextElement();
}
return actions;
}
@@ -4126,13 +4125,12 @@
}
KeyStroke[] retValue = null;
// Determine local bindings first.
- Vector keyStrokes = null;
- for (Enumeration enum_ = bindings.keys();
- enum_.hasMoreElements();) {
- Object key = enum_.nextElement();
+ Vector<KeyStroke> keyStrokes = null;
+ for (Enumeration<KeyStroke> keys = bindings.keys(); keys.hasMoreElements();) {
+ KeyStroke key = keys.nextElement();
if (bindings.get(key) == a) {
if (keyStrokes == null) {
- keyStrokes = new Vector();
+ keyStrokes = new Vector<KeyStroke>();
}
keyStrokes.addElement(key);
}
@@ -4153,7 +4151,7 @@
}
if (rCount > 0 && rCount < pStrokes.length) {
if (keyStrokes == null) {
- keyStrokes = new Vector();
+ keyStrokes = new Vector<KeyStroke>();
}
for (int counter = pStrokes.length - 1; counter >= 0;
counter--) {
@@ -4218,7 +4216,7 @@
String nm;
Keymap parent;
- Hashtable bindings;
+ Hashtable<KeyStroke, Action> bindings;
Action defaultAction;
}
@@ -4507,8 +4505,7 @@
//
public InputMethodRequests getInputMethodRequests() {
if (inputMethodRequestsHandler == null) {
- inputMethodRequestsHandler =
- (InputMethodRequests)new InputMethodRequestsHandler();
+ inputMethodRequestsHandler = new InputMethodRequestsHandler();
Document doc = getDocument();
if (doc != null) {
doc.addDocumentListener((DocumentListener)inputMethodRequestsHandler);
@@ -4923,16 +4920,16 @@
//
private boolean isProcessInputMethodEventOverridden() {
if (overrideMap == null) {
- overrideMap = Collections.synchronizedMap(new HashMap());
+ overrideMap = Collections.synchronizedMap(new HashMap<String, Boolean>());
}
- Boolean retValue = (Boolean)overrideMap.get(getClass().getName());
+ Boolean retValue = overrideMap.get(getClass().getName());
if (retValue != null) {
return retValue.booleanValue();
}
- Boolean ret = (Boolean)AccessController.doPrivileged(new
- PrivilegedAction() {
- public Object run() {
+ Boolean ret = AccessController.doPrivileged(new
+ PrivilegedAction<Boolean>() {
+ public Boolean run() {
return isProcessInputMethodEventOverridden(
JTextComponent.this.getClass());
}
--- a/jdk/src/share/classes/javax/swing/text/LayoutQueue.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/LayoutQueue.java Wed Jul 05 16:42:37 2017 +0200
@@ -35,7 +35,7 @@
*/
public class LayoutQueue {
- Vector tasks;
+ Vector<Runnable> tasks;
Thread worker;
static LayoutQueue defaultQueue;
@@ -44,7 +44,7 @@
* Construct a layout queue.
*/
public LayoutQueue() {
- tasks = new Vector();
+ tasks = new Vector<Runnable>();
}
/**
@@ -90,7 +90,7 @@
return null;
}
}
- Runnable work = (Runnable) tasks.firstElement();
+ Runnable work = tasks.firstElement();
tasks.removeElementAt(0);
return work;
}
--- a/jdk/src/share/classes/javax/swing/text/MaskFormatter.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/MaskFormatter.java Wed Jul 05 16:42:37 2017 +0200
@@ -446,7 +446,7 @@
*/
private Object stringToValue(String value, boolean completeMatch) throws
ParseException {
- int errorOffset = -1;
+ int errorOffset;
if ((errorOffset = getInvalidOffset(value, completeMatch)) == -1) {
if (!getValueContainsLiteralCharacters()) {
@@ -498,8 +498,8 @@
*/
private void updateInternalMask() throws ParseException {
String mask = getMask();
- ArrayList fixed = new ArrayList();
- ArrayList temp = fixed;
+ ArrayList<MaskCharacter> fixed = new ArrayList<MaskCharacter>();
+ ArrayList<MaskCharacter> temp = fixed;
if (mask != null) {
for (int counter = 0, maxCounter = mask.length();
--- a/jdk/src/share/classes/javax/swing/text/NumberFormatter.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/NumberFormatter.java Wed Jul 05 16:42:37 2017 +0200
@@ -299,10 +299,7 @@
if (attrs.get(NumberFormat.Field.SIGN) != null) {
size--;
}
- if (size == 0) {
- return true;
- }
- return false;
+ return size == 0;
}
return true;
}
@@ -315,10 +312,7 @@
boolean isNavigatable(int index) {
if (!super.isNavigatable(index)) {
// Don't skip the decimal, it causes wierd behavior
- if (getBufferedChar(index) == getDecimalSeparator()) {
- return true;
- }
- return false;
+ return getBufferedChar(index) == getDecimalSeparator();
}
return true;
}
@@ -341,11 +335,7 @@
Map attrs = iterator.getAttributes();
if (attrs != null && attrs.size() > 0) {
- Iterator keys = attrs.keySet().iterator();
-
- while (keys.hasNext()) {
- Object key = keys.next();
-
+ for (Object key : attrs.keySet()) {
if (key instanceof NumberFormat.Field) {
return (NumberFormat.Field)key;
}
@@ -461,7 +451,7 @@
}
}
if (string != null) {
- Class valueClass = getValueClass();
+ Class<?> valueClass = getValueClass();
if (valueClass == null) {
valueClass = value.getClass();
--- a/jdk/src/share/classes/javax/swing/text/PlainDocument.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/PlainDocument.java Wed Jul 05 16:42:37 2017 +0200
@@ -318,7 +318,7 @@
}
private AbstractElement defaultRoot;
- private Vector added = new Vector(); // Vector<Element>
- private Vector removed = new Vector(); // Vector<Element>
+ private Vector<Element> added = new Vector<Element>();
+ private Vector<Element> removed = new Vector<Element>();
private transient Segment s;
}
--- a/jdk/src/share/classes/javax/swing/text/SegmentCache.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/SegmentCache.java Wed Jul 05 16:42:37 2017 +0200
@@ -48,7 +48,7 @@
/**
* A list of the currently unused Segments.
*/
- private List segments;
+ private List<Segment> segments;
/**
@@ -80,7 +80,7 @@
* Creates and returns a SegmentCache.
*/
public SegmentCache() {
- segments = new ArrayList(11);
+ segments = new ArrayList<Segment>(11);
}
/**
@@ -92,7 +92,7 @@
int size = segments.size();
if (size > 0) {
- return (Segment)segments.remove(size - 1);
+ return segments.remove(size - 1);
}
}
return new CachedSegment();
--- a/jdk/src/share/classes/javax/swing/text/SimpleAttributeSet.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/SimpleAttributeSet.java Wed Jul 05 16:42:37 2017 +0200
@@ -56,7 +56,7 @@
*/
public static final AttributeSet EMPTY = new EmptyAttributeSet();
- private transient Hashtable table = new Hashtable(3);
+ private transient Hashtable<Object, Object> table = new Hashtable<Object, Object>(3);
/**
* Creates a new attribute set.
@@ -73,7 +73,7 @@
addAttributes(source);
}
- private SimpleAttributeSet(Hashtable table) {
+ private SimpleAttributeSet(Hashtable<Object, Object> table) {
this.table = table;
}
@@ -341,7 +341,7 @@
private void readObject(ObjectInputStream s)
throws ClassNotFoundException, IOException {
s.defaultReadObject();
- table = new Hashtable(3);
+ table = new Hashtable<Object, Object>(3);
StyleContext.readAttributeSet(s, this);
}
--- a/jdk/src/share/classes/javax/swing/text/StringContent.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/StringContent.java Wed Jul 05 16:42:37 2017 +0200
@@ -174,7 +174,7 @@
// some small documents won't have any sticky positions
// at all, so the buffer is created lazily.
if (marks == null) {
- marks = new Vector();
+ marks = new Vector<PosRec>();
}
return new StickyPosition(offset);
}
@@ -226,7 +226,7 @@
}
int n = marks.size();
for (int i = 0; i < n; i++) {
- PosRec mark = (PosRec) marks.elementAt(i);
+ PosRec mark = marks.elementAt(i);
if (mark.unused) {
// this record is no longer used, get rid of it
marks.removeElementAt(i);
@@ -241,7 +241,7 @@
synchronized void updateMarksForRemove(int offset, int length) {
int n = marks.size();
for (int i = 0; i < n; i++) {
- PosRec mark = (PosRec) marks.elementAt(i);
+ PosRec mark = marks.elementAt(i);
if (mark.unused) {
// this record is no longer used, get rid of it
marks.removeElementAt(i);
@@ -276,7 +276,7 @@
int end = offset + length;
Vector placeIn = (v == null) ? new Vector() : v;
for (int i = 0; i < n; i++) {
- PosRec mark = (PosRec) marks.elementAt(i);
+ PosRec mark = marks.elementAt(i);
if (mark.unused) {
// this record is no longer used, get rid of it
marks.removeElementAt(i);
@@ -312,7 +312,7 @@
private static final char[] empty = new char[0];
private char[] data;
private int count;
- transient Vector marks;
+ transient Vector<PosRec> marks;
/**
* holds the data for a mark... separately from
--- a/jdk/src/share/classes/javax/swing/text/StyleContext.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/StyleContext.java Wed Jul 05 16:42:37 2017 +0200
@@ -246,7 +246,7 @@
*/
public Font getFont(String family, int style, int size) {
fontSearch.setValue(family, style, size);
- Font f = (Font) fontTable.get(fontSearch);
+ Font f = fontTable.get(fontSearch);
if (f == null) {
// haven't seen this one yet.
Style defaultStyle =
@@ -517,12 +517,11 @@
// PENDING(prinz) should consider finding a alternative to
// generating extra garbage on search key.
SmallAttributeSet key = createSmallAttributeSet(search);
- WeakReference reference = (WeakReference)attributesPool.get(key);
+ WeakReference<SmallAttributeSet> reference = attributesPool.get(key);
SmallAttributeSet a;
- if (reference == null
- || (a = (SmallAttributeSet)reference.get()) == null) {
+ if (reference == null || (a = reference.get()) == null) {
a = key;
- attributesPool.put(a, new WeakReference(a));
+ attributesPool.put(a, new WeakReference<SmallAttributeSet>(a));
}
return a;
}
@@ -547,9 +546,7 @@
public String toString() {
removeUnusedSets();
String s = "";
- Iterator iterator = attributesPool.keySet().iterator();
- while (iterator.hasNext()) {
- SmallAttributeSet set = (SmallAttributeSet)iterator.next();
+ for (SmallAttributeSet set : attributesPool.keySet()) {
s = s + set + "\n";
}
return s;
@@ -676,8 +673,8 @@
public static void registerStaticAttributeKey(Object key) {
String ioFmt = key.getClass().getName() + "." + key.toString();
if (freezeKeyMap == null) {
- freezeKeyMap = new Hashtable();
- thawKeyMap = new Hashtable();
+ freezeKeyMap = new Hashtable<Object, String>();
+ thawKeyMap = new Hashtable<String, Object>();
}
freezeKeyMap.put(key, ioFmt);
thawKeyMap.put(ioFmt, key);
@@ -716,10 +713,10 @@
throws ClassNotFoundException, IOException
{
fontSearch = new FontKey(null, 0, 0);
- fontTable = new Hashtable();
+ fontTable = new Hashtable<FontKey, Font>();
search = new SimpleAttributeSet();
attributesPool = Collections.
- synchronizedMap(new WeakHashMap());
+ synchronizedMap(new WeakHashMap<SmallAttributeSet, WeakReference<SmallAttributeSet>>());
s.defaultReadObject();
}
@@ -731,15 +728,15 @@
*/
public static final String DEFAULT_STYLE = "default";
- private static Hashtable freezeKeyMap;
- private static Hashtable thawKeyMap;
+ private static Hashtable<Object, String> freezeKeyMap;
+ private static Hashtable<String, Object> thawKeyMap;
private Style styles;
private transient FontKey fontSearch = new FontKey(null, 0, 0);
- private transient Hashtable fontTable = new Hashtable();
+ private transient Hashtable<FontKey, Font> fontTable = new Hashtable<FontKey, Font>();
- private transient Map attributesPool = Collections.
- synchronizedMap(new WeakHashMap());
+ private transient Map<SmallAttributeSet, WeakReference<SmallAttributeSet>> attributesPool = Collections.
+ synchronizedMap(new WeakHashMap<SmallAttributeSet, WeakReference<SmallAttributeSet>>());
private transient MutableAttributeSet search = new SimpleAttributeSet();
/**
@@ -1176,8 +1173,8 @@
}
}
- private Vector keys = new Vector();
- private Vector data = new Vector();
+ private Vector<Object> keys = new Vector<Object>();
+ private Vector<Object> data = new Vector<Object>();
}
/**
@@ -1344,8 +1341,7 @@
* @since 1.4
*/
public ChangeListener[] getChangeListeners() {
- return (ChangeListener[])listenerList.getListeners(
- ChangeListener.class);
+ return listenerList.getListeners(ChangeListener.class);
}
--- a/jdk/src/share/classes/javax/swing/text/TableView.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/TableView.java Wed Jul 05 16:42:37 2017 +0200
@@ -76,7 +76,7 @@
*/
public TableView(Element elem) {
super(elem, View.Y_AXIS);
- rows = new Vector();
+ rows = new Vector<TableRow>();
gridValid = false;
}
@@ -139,7 +139,7 @@
TableRow getRow(int row) {
if (row < rows.size()) {
- return (TableRow) rows.elementAt(row);
+ return rows.elementAt(row);
}
return null;
}
@@ -227,7 +227,7 @@
for (int i = 0; i < n; i++) {
View v = getView(i);
if (v instanceof TableRow) {
- rows.addElement(v);
+ rows.addElement((TableRow) v);
TableRow rv = (TableRow) v;
rv.clearFilledColumns();
rv.setRow(i);
@@ -368,8 +368,7 @@
long min = 0;
long pref = 0;
long max = 0;
- for (int i = 0; i < columnRequirements.length; i++) {
- SizeRequirements req = columnRequirements[i];
+ for (SizeRequirements req : columnRequirements) {
min += req.minimum;
pref += req.preferred;
max += req.maximum;
@@ -578,7 +577,7 @@
int[] columnSpans;
int[] columnOffsets;
SizeRequirements[] columnRequirements;
- Vector rows;
+ Vector<TableRow> rows;
boolean gridValid;
static final private BitSet EMPTY = new BitSet();
--- a/jdk/src/share/classes/javax/swing/text/TextAction.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/TextAction.java Wed Jul 05 16:42:37 2017 +0200
@@ -103,14 +103,12 @@
* @return the augmented list
*/
public static final Action[] augmentList(Action[] list1, Action[] list2) {
- Hashtable h = new Hashtable();
- for (int i = 0; i < list1.length; i++) {
- Action a = list1[i];
+ Hashtable<String, Action> h = new Hashtable<String, Action>();
+ for (Action a : list1) {
String value = (String)a.getValue(Action.NAME);
h.put((value!=null ? value:""), a);
}
- for (int i = 0; i < list2.length; i++) {
- Action a = list2[i];
+ for (Action a : list2) {
String value = (String)a.getValue(Action.NAME);
h.put((value!=null ? value:""), a);
}
--- a/jdk/src/share/classes/javax/swing/text/TextLayoutStrategy.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/TextLayoutStrategy.java Wed Jul 05 16:42:37 2017 +0200
@@ -103,7 +103,7 @@
* constraints for each row. This is called by a FlowView.layout
* to update the child views in the flow.
*
- * @param v the view to reflow
+ * @param fv the view to reflow
*/
public void layout(FlowView fv) {
super.layout(fv);
@@ -485,9 +485,9 @@
* Returns a map with the attributes defined on the current
* character.
*/
- public Map getAttributes() {
+ public Map<Attribute, Object> getAttributes() {
Object[] ka = keys.toArray();
- Hashtable h = new Hashtable();
+ Hashtable<Attribute, Object> h = new Hashtable<Attribute, Object>();
for (int i = 0; i < ka.length; i++) {
TextAttribute a = (TextAttribute) ka[i];
Object value = getAttribute(a);
@@ -520,16 +520,16 @@
* iterator's text range. The set is empty if no
* attributes are defined.
*/
- public Set getAllAttributeKeys() {
+ public Set<Attribute> getAllAttributeKeys() {
return keys;
}
View v;
- static Set keys;
+ static Set<Attribute> keys;
static {
- keys = new HashSet();
+ keys = new HashSet<Attribute>();
keys.add(TextAttribute.FONT);
keys.add(TextAttribute.RUN_DIRECTION);
}
--- a/jdk/src/share/classes/javax/swing/text/ZoneView.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/ZoneView.java Wed Jul 05 16:42:37 2017 +0200
@@ -79,7 +79,7 @@
int maxZoneSize = 8 * 1024;
int maxZonesLoaded = 3;
- Vector loadedZones;
+ Vector<View> loadedZones;
/**
* Constructs a ZoneView.
@@ -89,7 +89,7 @@
*/
public ZoneView(Element elem, int axis) {
super(elem, axis);
- loadedZones = new Vector();
+ loadedZones = new Vector<View>();
}
/**
@@ -157,7 +157,7 @@
void unloadOldZones() {
while (loadedZones.size() > getMaxZonesLoaded()) {
- View zone = (View) loadedZones.elementAt(0);
+ View zone = loadedZones.elementAt(0);
loadedZones.removeElementAt(0);
unloadZone(zone);
}
@@ -206,7 +206,7 @@
*/
protected View createZone(int p0, int p1) {
Document doc = getDocument();
- View zone = null;
+ View zone;
try {
zone = new Zone(getElement(),
doc.createPosition(p0),
@@ -285,7 +285,7 @@
// divide the old zone into a new set of bins
Element elem = getElement();
Document doc = elem.getDocument();
- Vector zones = new Vector();
+ Vector<View> zones = new Vector<View>();
int offs = offs0;
do {
offs0 = offs;
--- a/jdk/src/share/classes/javax/swing/text/html/AccessibleHTML.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/html/AccessibleHTML.java Wed Jul 05 16:42:37 2017 +0200
@@ -456,7 +456,7 @@
/**
* Sets the Cursor of this object.
*
- * @param c the new Cursor for the object
+ * @param cursor the new Cursor for the object
* @see #getCursor
*/
public void setCursor(Cursor cursor) {
@@ -1076,7 +1076,7 @@
StyledDocument sdoc = (StyledDocument)model;
return sdoc.getParagraphElement(index);
} else {
- Element para = null;
+ Element para;
for (para = model.getDefaultRootElement(); ! para.isLeaf(); ) {
int pos = para.getElementIndex(index);
para = para.getElement(pos);
@@ -1465,7 +1465,7 @@
// Determine the max row/col count.
int delta = 0;
int maxCols = 0;
- int rows = 0;
+ int rows;
for (int counter = 0; counter < getChildCount(); counter++) {
TableRowElementInfo row = getRow(counter);
int prev = 0;
@@ -1929,7 +1929,7 @@
* Returns a boolean value indicating whether the specified column
* is selected.
*
- * @param r zero-based column of the table
+ * @param c zero-based column of the table
* @return the boolean value true if the specified column is selected.
* Otherwise, false.
*/
@@ -1966,7 +1966,7 @@
public int [] getSelectedAccessibleRows() {
if (validateIfNecessary()) {
int nRows = getAccessibleRowCount();
- Vector vec = new Vector();
+ Vector<Integer> vec = new Vector<Integer>();
for (int i = 0; i < nRows; i++) {
if (isAccessibleRowSelected(i)) {
@@ -1975,7 +1975,7 @@
}
int retval[] = new int[vec.size()];
for (int i = 0; i < retval.length; i++) {
- retval[i] = ((Integer)vec.elementAt(i)).intValue();
+ retval[i] = vec.elementAt(i).intValue();
}
return retval;
}
@@ -1991,7 +1991,7 @@
public int [] getSelectedAccessibleColumns() {
if (validateIfNecessary()) {
int nColumns = getAccessibleRowCount();
- Vector vec = new Vector();
+ Vector<Integer> vec = new Vector<Integer>();
for (int i = 0; i < nColumns; i++) {
if (isAccessibleColumnSelected(i)) {
@@ -2000,7 +2000,7 @@
}
int retval[] = new int[vec.size()];
for (int i = 0; i < retval.length; i++) {
- retval[i] = ((Integer)vec.elementAt(i)).intValue();
+ retval[i] = vec.elementAt(i).intValue();
}
return retval;
}
@@ -2134,15 +2134,16 @@
// Header information is modeled as a Hashtable of
// ArrayLists where each Hashtable entry represents
// a row containing one or more headers.
- private Hashtable headers = new Hashtable();
+ private Hashtable<Integer, ArrayList<TableCellElementInfo>> headers =
+ new Hashtable<Integer, ArrayList<TableCellElementInfo>>();
private int rowCount = 0;
private int columnCount = 0;
public void addHeader(TableCellElementInfo cellInfo, int rowNumber) {
Integer rowInteger = Integer.valueOf(rowNumber);
- ArrayList list = (ArrayList)headers.get(rowInteger);
+ ArrayList<TableCellElementInfo> list = headers.get(rowInteger);
if (list == null) {
- list = new ArrayList();
+ list = new ArrayList<TableCellElementInfo>();
headers.put(rowInteger, list);
}
list.add(cellInfo);
@@ -2201,9 +2202,9 @@
}
private TableCellElementInfo getElementInfoAt(int r, int c) {
- ArrayList list = (ArrayList)headers.get(Integer.valueOf(r));
+ ArrayList<TableCellElementInfo> list = headers.get(Integer.valueOf(r));
if (list != null) {
- return (TableCellElementInfo)list.get(c);
+ return list.get(c);
} else {
return null;
}
@@ -2364,7 +2365,7 @@
* Returns a boolean value indicating whether the specified column
* is selected.
*
- * @param r zero-based column of the table
+ * @param c zero-based column of the table
* @return the boolean value true if the specified column is selected.
* Otherwise, false.
*/
@@ -2585,7 +2586,6 @@
private void getAccessible(ElementInfo elementInfo) {
if (elementInfo instanceof Accessible) {
accessible = (Accessible)elementInfo;
- return;
} else {
for (int i = 0; i < elementInfo.getChildCount(); i++) {
getAccessible(elementInfo.getChild(i));
@@ -2643,7 +2643,7 @@
/**
* The children of this ElementInfo.
*/
- private ArrayList children;
+ private ArrayList<ElementInfo> children;
/**
* The Element this ElementInfo is providing information for.
*/
@@ -2754,11 +2754,11 @@
*/
public ElementInfo getChild(int index) {
if (validateIfNecessary()) {
- ArrayList children = this.children;
+ ArrayList<ElementInfo> children = this.children;
if (children != null && index >= 0 &&
index < children.size()) {
- return (ElementInfo)children.get(index);
+ return children.get(index);
}
}
return null;
@@ -2777,7 +2777,7 @@
*/
protected void addChild(ElementInfo child) {
if (children == null) {
- children = new ArrayList();
+ children = new ArrayList<ElementInfo>();
}
children.add(child);
}
@@ -2927,8 +2927,8 @@
isValid = false;
canBeValid = first;
if (children != null) {
- for (int counter = 0; counter < children.size(); counter++) {
- ((ElementInfo)children.get(counter)).invalidate(false);
+ for (ElementInfo child : children) {
+ child.invalidate(false);
}
children = null;
}
--- a/jdk/src/share/classes/javax/swing/text/html/CSS.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/html/CSS.java Wed Jul 05 16:42:37 2017 +0200
@@ -468,7 +468,7 @@
public CSS() {
baseFontSize = baseFontSizeIndex + 1;
// setup the css conversion table
- valueConvertor = new Hashtable();
+ valueConvertor = new Hashtable<Object, Object>();
valueConvertor.put(CSS.Attribute.FONT_SIZE, new FontSize());
valueConvertor.put(CSS.Attribute.FONT_FAMILY, new FontFamily());
valueConvertor.put(CSS.Attribute.FONT_WEIGHT, new FontWeight());
@@ -637,7 +637,7 @@
* Maps from a StyleConstants to a CSS Attribute.
*/
Attribute styleConstantsKeyToCSSKey(StyleConstants sc) {
- return (Attribute)styleConstantToCssMap.get(sc);
+ return styleConstantToCssMap.get(sc);
}
/**
@@ -645,7 +645,7 @@
*/
Object styleConstantsValueToCSSValue(StyleConstants sc,
Object styleValue) {
- Object cssKey = styleConstantsKeyToCSSKey(sc);
+ Attribute cssKey = styleConstantsKeyToCSSKey(sc);
if (cssKey != null) {
CssValue conv = (CssValue)valueConvertor.get(cssKey);
return conv.fromStyleConstants(sc, styleValue);
@@ -659,8 +659,7 @@
*/
Object cssValueToStyleConstantsValue(StyleConstants key, Object value) {
if (value instanceof CssValue) {
- return ((CssValue)value).toStyleConstants((StyleConstants)key,
- null);
+ return ((CssValue)value).toStyleConstants(key, null);
}
return null;
}
@@ -784,7 +783,7 @@
* Convert a set of HTML attributes to an equivalent
* set of CSS attributes.
*
- * @param AttributeSet containing the HTML attributes.
+ * @param htmlAttrSet AttributeSet containing the HTML attributes.
* @return AttributeSet containing the corresponding CSS attributes.
* The AttributeSet will be empty if there are no mapping
* CSS attributes.
@@ -841,8 +840,8 @@
return cssAttrSet;
}
- private static final Hashtable attributeMap = new Hashtable();
- private static final Hashtable valueMap = new Hashtable();
+ private static final Hashtable<String, Attribute> attributeMap = new Hashtable<String, Attribute>();
+ private static final Hashtable<String, Value> valueMap = new Hashtable<String, Value>();
/**
* The hashtable and the static initalization block below,
@@ -854,18 +853,18 @@
* Therefore, the value associated with each HTML.Attribute.
* key ends up being an array of CSS.Attribute.* objects.
*/
- private static final Hashtable htmlAttrToCssAttrMap = new Hashtable(20);
+ private static final Hashtable<HTML.Attribute, CSS.Attribute[]> htmlAttrToCssAttrMap = new Hashtable<HTML.Attribute, CSS.Attribute[]>(20);
/**
* The hashtable and static initialization that follows sets
* up a translation from StyleConstants (i.e. the <em>well known</em>
* attributes) to the associated CSS attributes.
*/
- private static final Hashtable styleConstantToCssMap = new Hashtable(17);
+ private static final Hashtable<Object, Attribute> styleConstantToCssMap = new Hashtable<Object, Attribute>(17);
/** Maps from HTML value to a CSS value. Used in internal mapping. */
- private static final Hashtable htmlValueToCssValueMap = new Hashtable(8);
+ private static final Hashtable<String, CSS.Value> htmlValueToCssValueMap = new Hashtable<String, CSS.Value>(8);
/** Maps from CSS value (string) to internal value. */
- private static final Hashtable cssValueToInternalValueMap = new Hashtable(13);
+ private static final Hashtable<String, CSS.Value> cssValueToInternalValueMap = new Hashtable<String, CSS.Value>(13);
static {
// load the attribute map
@@ -995,8 +994,8 @@
// Register all the CSS attribute keys for archival/unarchival
Object[] keys = CSS.Attribute.allAttributes;
try {
- for (int i = 0; i < keys.length; i++) {
- StyleContext.registerStaticAttributeKey(keys[i]);
+ for (Object key : keys) {
+ StyleContext.registerStaticAttributeKey(key);
}
} catch (Throwable e) {
e.printStackTrace();
@@ -1005,8 +1004,8 @@
// Register all the CSS Values for archival/unarchival
keys = CSS.Value.allValues;
try {
- for (int i = 0; i < keys.length; i++) {
- StyleContext.registerStaticAttributeKey(keys[i]);
+ for (Object key : keys) {
+ StyleContext.registerStaticAttributeKey(key);
}
} catch (Throwable e) {
e.printStackTrace();
@@ -1034,7 +1033,7 @@
* doesn't represent a valid attribute key
*/
public static final Attribute getAttribute(String name) {
- return (Attribute) attributeMap.get(name);
+ return attributeMap.get(name);
}
/**
@@ -1050,7 +1049,7 @@
* not mean that it doesn't represent a valid CSS value
*/
static final Value getValue(String name) {
- return (Value) valueMap.get(name);
+ return valueMap.get(name);
}
@@ -1159,7 +1158,7 @@
* to a Color.
*/
static Color stringToColor(String str) {
- Color color = null;
+ Color color;
if (str == null) {
return null;
@@ -1299,7 +1298,7 @@
static String[] parseStrings(String value) {
int current, last;
int length = (value == null) ? 0 : value.length();
- Vector temp = new Vector(4);
+ Vector<String> temp = new Vector<String>(4);
current = 0;
while (current < length) {
@@ -1423,10 +1422,10 @@
if (cssAttrList == null || htmlAttrValue == null) {
return;
}
- for (int i = 0; i < cssAttrList.length; i++) {
- Object o = getCssValue(cssAttrList[i], htmlAttrValue);
+ for (Attribute cssAttr : cssAttrList) {
+ Object o = getCssValue(cssAttr, htmlAttrValue);
if (o != null) {
- cssAttrSet.addAttribute(cssAttrList[i], o);
+ cssAttrSet.addAttribute(cssAttr , o);
}
}
}
@@ -1452,7 +1451,7 @@
* @return CSS.Attribute[]
*/
private CSS.Attribute[] getCssAttribute(HTML.Attribute hAttr) {
- return (CSS.Attribute[])htmlAttrToCssAttrMap.get(hAttr);
+ return htmlAttrToCssAttrMap.get(hAttr);
}
/**
@@ -2599,8 +2598,8 @@
* to an AttributeSet or returned to the developer.
*/
static class LengthUnit implements Serializable {
- static Hashtable lengthMapping = new Hashtable(6);
- static Hashtable w3cLengthMapping = new Hashtable(6);
+ static Hashtable<String, Float> lengthMapping = new Hashtable<String, Float>(6);
+ static Hashtable<String, Float> w3cLengthMapping = new Hashtable<String, Float>(6);
static {
lengthMapping.put("pt", new Float(1f));
// Not sure about 1.3, determined by experiementation.
@@ -2642,7 +2641,7 @@
}
if (length >= 2) {
units = value.substring(length - 2, length);
- Float scale = (Float)lengthMapping.get(units);
+ Float scale = lengthMapping.get(units);
if (scale != null) {
try {
this.value = Float.valueOf(value.substring(0,
@@ -2686,10 +2685,10 @@
}
float getValue(boolean w3cLengthUnits) {
- Hashtable mapping = (w3cLengthUnits) ? w3cLengthMapping : lengthMapping;
+ Hashtable<String, Float> mapping = (w3cLengthUnits) ? w3cLengthMapping : lengthMapping;
float scale = 1;
if (units != null) {
- Float scaleFloat = (Float)mapping.get(units);
+ Float scaleFloat = mapping.get(units);
if (scaleFloat != null) {
scale = scaleFloat.floatValue();
}
@@ -2699,10 +2698,10 @@
}
static float getValue(float value, String units, Boolean w3cLengthUnits) {
- Hashtable mapping = (w3cLengthUnits) ? w3cLengthMapping : lengthMapping;
+ Hashtable<String, Float> mapping = (w3cLengthUnits) ? w3cLengthMapping : lengthMapping;
float scale = 1;
if (units != null) {
- Float scaleFloat = (Float)mapping.get(units);
+ Float scaleFloat = mapping.get(units);
if (scaleFloat != null) {
scale = scaleFloat.floatValue();
}
@@ -3089,7 +3088,7 @@
iter.setIndex(i);
int margin0 = lastMargin;
int margin1 = (int) iter.getLeadingCollapseSpan();
- totalSpacing += Math.max(margin0, margin1);;
+ totalSpacing += Math.max(margin0, margin1);
preferred += (int) iter.getPreferredSpan(0);
minimum += iter.getMinimumSpan(0);
maximum += iter.getMaximumSpan(0);
@@ -3127,7 +3126,7 @@
* of margin collapsing, and the flexibility to adjust the sizes.
*/
long preferred = 0;
- long currentPreferred = 0;
+ long currentPreferred;
int lastMargin = 0;
int totalSpacing = 0;
int n = iter.getCount();
@@ -3199,7 +3198,7 @@
}
}
// make the adjustments
- int totalOffset = (int)iter.getBorderWidth();;
+ int totalOffset = (int)iter.getBorderWidth();
for (int i = 0; i < n; i++) {
iter.setIndex(i);
iter.setOffset( iter.getOffset() + totalOffset);
@@ -3331,7 +3330,7 @@
s.defaultReadObject();
// Reconstruct the hashtable.
int numValues = s.readInt();
- valueConvertor = new Hashtable(Math.max(1, numValues));
+ valueConvertor = new Hashtable<Object, Object>(Math.max(1, numValues));
while (numValues-- > 0) {
Object key = s.readObject();
Object value = s.readObject();
@@ -3372,7 +3371,7 @@
//
/** Maps from CSS key to CssValue. */
- private transient Hashtable valueConvertor;
+ private transient Hashtable<Object, Object> valueConvertor;
/** Size used for relative units. */
private int baseFontSize;
--- a/jdk/src/share/classes/javax/swing/text/html/HRuleView.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/html/HRuleView.java Wed Jul 05 16:42:37 2017 +0200
@@ -67,13 +67,18 @@
// use ALIGN_CENTER by default, so we check if the alignment
// attribute is actually defined
if (attr.getAttribute(StyleConstants.Alignment) != null) {
- alignment = StyleConstants.getAlignment(attr);
+ alignment = StyleConstants.getAlignment(attr);
}
noshade = (String)eAttr.getAttribute(HTML.Attribute.NOSHADE);
Object value = eAttr.getAttribute(HTML.Attribute.SIZE);
- if (value != null && (value instanceof String))
- size = Integer.parseInt((String)value);
+ if (value != null && (value instanceof String)) {
+ try {
+ size = Integer.parseInt((String)value);
+ } catch (NumberFormatException e) {
+ size = 1;
+ }
+ }
value = attr.getAttribute(CSS.Attribute.WIDTH);
if (value != null && (value instanceof CSS.LengthValue)) {
widthValue = (CSS.LengthValue)value;
--- a/jdk/src/share/classes/javax/swing/text/html/HTML.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/html/HTML.java Wed Jul 05 16:42:37 2017 +0200
@@ -133,7 +133,7 @@
*
* @return <code>true</code> if this tag is considered to be a paragraph
* in the internal HTML model. <code>false</code> - otherwise.
- * @see javax.swing.text.html.HTMLDocument#HTMLReader#ParagraphAction
+ * @see HTMLDocument.HTMLReader.ParagraphAction
*/
boolean isParagraph() {
return (
@@ -536,10 +536,10 @@
// that the hashtable grew to was determined, and then that very size
// is used.
//
- private static final Hashtable tagHashtable = new Hashtable(73);
+ private static final Hashtable<String, Tag> tagHashtable = new Hashtable<String, Tag>(73);
/** Maps from StyleConstant key to HTML.Tag. */
- private static final Hashtable scMapping = new Hashtable(8);
+ private static final Hashtable<Object, Tag> scMapping = new Hashtable<Object, Tag>(8);
static {
@@ -598,8 +598,8 @@
*/
public static Tag getTag(String tagName) {
- Object t = tagHashtable.get(tagName);
- return (t == null ? null : (Tag)t);
+ Tag t = tagHashtable.get(tagName);
+ return (t == null ? null : t);
}
/**
@@ -613,7 +613,7 @@
* <code>null</code> if not found
*/
static Tag getTagForStyleConstantsKey(StyleConstants sc) {
- return (Tag)scMapping.get(sc);
+ return scMapping.get(sc);
}
/**
@@ -646,7 +646,7 @@
public static final String NULL_ATTRIBUTE_VALUE = "#DEFAULT";
// size determined similar to size of tagHashtable
- private static final Hashtable attHashtable = new Hashtable(77);
+ private static final Hashtable<String, Attribute> attHashtable = new Hashtable<String, Attribute>(77);
static {
@@ -687,11 +687,11 @@
* @return the <code>Attribute</code> corresponding to <code>attName</code>
*/
public static Attribute getAttributeKey(String attName) {
- Object a = attHashtable.get(attName);
+ Attribute a = attHashtable.get(attName);
if (a == null) {
return null;
}
- return (Attribute)a;
+ return a;
}
}
--- a/jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java Wed Jul 05 16:42:37 2017 +0200
@@ -745,7 +745,7 @@
*/
private Element findFrame(String frameName) {
ElementIterator it = new ElementIterator(this);
- Element next = null;
+ Element next;
while ((next = it.next()) != null) {
AttributeSet attr = next.getAttributes();
@@ -891,7 +891,7 @@
/**
* Returns the Map associated with the given name.
- * @param the name of the desired <code>Map</code>
+ * @param name the name of the desired <code>Map</code>
* @return the <code>Map</code> or <code>null</code> if it can't
* be found, or if <code>name</code> is <code>null</code>
*/
@@ -1759,7 +1759,7 @@
* Used to store button groups for radio buttons in
* a form.
*/
- private HashMap radioButtonGroupsMap;
+ private HashMap<String, ButtonGroup> radioButtonGroupsMap;
/**
* Document property for the number of tokens to buffer
@@ -1824,7 +1824,7 @@
/**
* I18N property key.
*
- * @see AbstractDocument.I18NProperty
+ * @see AbstractDocument#I18NProperty
*/
private static final String I18NProperty = "i18n";
@@ -1915,7 +1915,7 @@
AttributeSet a = (AttributeSet)
elem.getAttributes().getAttribute(tag);
if (a == null) {
- a = (AttributeSet)elem.getAttributes();
+ a = elem.getAttributes();
}
return a;
}
@@ -2193,7 +2193,7 @@
isStyleCSS = "text/css".equals(getDefaultStyleSheetType());
this.offset = offset;
threshold = HTMLDocument.this.getTokenThreshold();
- tagMap = new Hashtable(57);
+ tagMap = new Hashtable<HTML.Tag, TagAction>(57);
TagAction na = new TagAction();
TagAction ba = new BlockAction();
TagAction pa = new ParagraphAction();
@@ -2435,7 +2435,7 @@
(StyleConstants.NameAttribute) == HTML.Tag.BODY &&
pPath[1].getEndOffset() == length) {
String lastText = getText(length - 1, 1);
- DefaultDocumentEvent event = null;
+ DefaultDocumentEvent event;
Element[] added;
Element[] removed;
int index;
@@ -2496,7 +2496,7 @@
}
private Element[] getPathTo(int offset) {
- Stack elements = new Stack();
+ Stack<Element> elements = new Stack<Element>();
Element e = getDefaultRootElement();
int index;
while (!e.isLeaf()) {
@@ -2610,7 +2610,7 @@
else {
styleAttributes = null;
}
- TagAction action = (TagAction) tagMap.get(t);
+ TagAction action = tagMap.get(t);
if (action != null) {
action.start(t, a);
@@ -2640,7 +2640,7 @@
addSpecialElement(HTML.Tag.COMMENT, sas);
}
- TagAction action = (TagAction)tagMap.get(HTML.Tag.COMMENT);
+ TagAction action = tagMap.get(HTML.Tag.COMMENT);
if (action != null) {
action.start(HTML.Tag.COMMENT, new SimpleAttributeSet());
action.end(HTML.Tag.COMMENT);
@@ -2681,7 +2681,7 @@
inBlock--;
}
}
- TagAction action = (TagAction) tagMap.get(t);
+ TagAction action = tagMap.get(t);
if (action != null) {
action.end(t);
}
@@ -2707,7 +2707,7 @@
styleAttributes = null;
}
- TagAction action = (TagAction) tagMap.get(t);
+ TagAction action = tagMap.get(t);
if (action != null) {
action.start(t, a);
action.end(t);
@@ -2802,7 +2802,7 @@
// might be defined in the FORM.
// for new group new ButtonGroup will be created (fix for 4529702)
// group name is a key in radioButtonGroupsMap
- radioButtonGroupsMap = new HashMap();
+ radioButtonGroupsMap = new HashMap<String, ButtonGroup>();
}
public void end(HTML.Tag t) {
@@ -3015,7 +3015,7 @@
if (rel.equals("stylesheet") ||
rel.equals("alternate stylesheet")) {
if (styles == null) {
- styles = new Vector(3);
+ styles = new Vector<Object>(3);
}
styles.addElement(t);
styles.addElement(a.copyAttributes());
@@ -3055,7 +3055,7 @@
public void start(HTML.Tag t, MutableAttributeSet a) {
if (inHead) {
if (styles == null) {
- styles = new Vector(3);
+ styles = new Vector<Object>(3);
}
styles.addElement(t);
styles.addElement(a.getAttribute(HTML.Attribute.TYPE));
@@ -3280,7 +3280,7 @@
String name = (String) a.getAttribute(HTML.Attribute.NAME);
String value = (String) a.getAttribute(HTML.Attribute.VALUE);
if ((name != null) && (value != null)) {
- ElementSpec objSpec = (ElementSpec) parseBuffer.lastElement();
+ ElementSpec objSpec = parseBuffer.lastElement();
MutableAttributeSet objAttr = (MutableAttributeSet) objSpec.getAttributes();
objAttr.addAttribute(name, value);
}
@@ -3360,7 +3360,7 @@
int size = HTML.getIntegerAttributeValue(attr,
HTML.Attribute.SIZE,
1);
- boolean multiple = ((String)attr.getAttribute(HTML.Attribute.MULTIPLE) != null);
+ boolean multiple = attr.getAttribute(HTML.Attribute.MULTIPLE) != null;
if ((size > 1) || multiple) {
OptionListModel m = new OptionListModel();
if (multiple) {
@@ -3460,9 +3460,9 @@
if (type.equals("radio")) {
String name = (String) attr.getAttribute(HTML.Attribute.NAME);
if ( radioButtonGroupsMap == null ) { //fix for 4772743
- radioButtonGroupsMap = new HashMap();
+ radioButtonGroupsMap = new HashMap<String, ButtonGroup>();
}
- ButtonGroup radioButtonGroup = (ButtonGroup)radioButtonGroupsMap.get(name);
+ ButtonGroup radioButtonGroup = radioButtonGroupsMap.get(name);
if (radioButtonGroup == null) {
radioButtonGroup = new ButtonGroup();
radioButtonGroupsMap.put(name,radioButtonGroup);
@@ -3604,7 +3604,7 @@
// an open/close with no content will be removed, so we
// add a space of content to keep the element being formed.
ElementSpec prev = (parseBuffer.size() > 0) ?
- (ElementSpec) parseBuffer.lastElement() : null;
+ parseBuffer.lastElement() : null;
if (prev != null && prev.getType() == ElementSpec.StartTagType) {
char[] one = new char[1];
one[0] = ' ';
@@ -3737,7 +3737,7 @@
// This attemps to clean it up.
int removeCounter = insertTagDepthDelta;
while (removeCounter < 0 && size >= 0 &&
- ((ElementSpec)parseBuffer.elementAt(size - 1)).
+ parseBuffer.elementAt(size - 1).
getType() == ElementSpec.EndTagType) {
parseBuffer.removeElementAt(--size);
removeCounter++;
@@ -3751,7 +3751,7 @@
// an extra \n in the middle of content.
int index = 0;
if (pushDepth > 0) {
- if (((ElementSpec)parseBuffer.elementAt(0)).getType() ==
+ if (parseBuffer.elementAt(0).getType() ==
ElementSpec.ContentType) {
index++;
}
@@ -3759,19 +3759,19 @@
index += (popDepth + pushDepth);
int cCount = 0;
int cStart = index;
- while (index < size && ((ElementSpec)parseBuffer.elementAt
- (index)).getType() == ElementSpec.ContentType) {
+ while (index < size && parseBuffer.elementAt
+ (index).getType() == ElementSpec.ContentType) {
index++;
cCount++;
}
if (cCount > 1) {
- while (index < size && ((ElementSpec)parseBuffer.elementAt
- (index)).getType() == ElementSpec.EndTagType) {
+ while (index < size && parseBuffer.elementAt
+ (index).getType() == ElementSpec.EndTagType) {
index++;
}
if (index == size) {
- char[] lastText = ((ElementSpec)parseBuffer.elementAt
- (cStart + cCount - 1)).getArray();
+ char[] lastText = parseBuffer.elementAt
+ (cStart + cCount - 1).getArray();
if (lastText.length == 1 && lastText[0] == NEWLINE[0]){
index = cStart + cCount - 1;
while (size > index) {
@@ -3785,8 +3785,7 @@
// Make sure there is in fact a newline
for (int counter = parseBuffer.size() - 1; counter >= 0;
counter--) {
- ElementSpec spec = (ElementSpec)parseBuffer.
- elementAt(counter);
+ ElementSpec spec = parseBuffer.elementAt(counter);
if (spec.getType() == ElementSpec.ContentType) {
if (spec.getArray()[spec.getLength() - 1] != '\n') {
SimpleAttributeSet attrs =new SimpleAttributeSet();
@@ -3817,7 +3816,7 @@
* of stylesheets.
*/
void linkCSSStyleSheet(String href) {
- URL url = null;
+ URL url;
try {
url = new URL(base, href);
} catch (MalformedURLException mfe) {
@@ -4031,7 +4030,7 @@
* indicating the type (may be null), and the elements following
* it until the next HTML.Tag are the rules as Strings.
*/
- Vector styles;
+ Vector<Object> styles;
/** True if inside the head tag. */
boolean inHead = false;
/** Set to true if the style language is text/css. Since this is
@@ -4048,10 +4047,10 @@
*/
Option option;
- protected Vector<ElementSpec> parseBuffer = new Vector(); // Vector<ElementSpec>
+ protected Vector<ElementSpec> parseBuffer = new Vector<ElementSpec>();
protected MutableAttributeSet charAttr = new TaggedAttributeSet();
- Stack charAttrStack = new Stack();
- Hashtable tagMap;
+ Stack<AttributeSet> charAttrStack = new Stack<AttributeSet>();
+ Hashtable<HTML.Tag, TagAction> tagMap;
int inBlock = 0;
/**
--- a/jdk/src/share/classes/javax/swing/text/html/HTMLEditorKit.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/html/HTMLEditorKit.java Wed Jul 05 16:42:37 2017 +0200
@@ -898,7 +898,7 @@
} catch (MalformedURLException m) {
u = null;
}
- HyperlinkEvent linkEvent = null;
+ HyperlinkEvent linkEvent;
if (!hdoc.isFrameDocument()) {
linkEvent = new HyperlinkEvent(
@@ -1271,11 +1271,11 @@
&& (parentContainer = container.getParent()) != null
&& (parentContainer instanceof javax.swing.JViewport)) {
JViewport viewPort = (JViewport)parentContainer;
- Object cachedObject;
if (cachedViewPort != null) {
- if ((cachedObject = cachedViewPort.get()) != null) {
+ JViewport cachedObject = cachedViewPort.get();
+ if (cachedObject != null) {
if (cachedObject != viewPort) {
- ((JComponent)cachedObject).removeComponentListener(this);
+ cachedObject.removeComponentListener(this);
}
} else {
cachedViewPort = null;
@@ -1283,7 +1283,7 @@
}
if (cachedViewPort == null) {
viewPort.addComponentListener(this);
- cachedViewPort = new WeakReference(viewPort);
+ cachedViewPort = new WeakReference<JViewport>(viewPort);
}
componentVisibleWidth = viewPort.getExtentSize().width;
@@ -1295,9 +1295,9 @@
}
} else {
if (cachedViewPort != null) {
- Object cachedObject;
- if ((cachedObject = cachedViewPort.get()) != null) {
- ((JComponent)cachedObject).removeComponentListener(this);
+ JViewport cachedObject = cachedViewPort.get();
+ if (cachedObject != null) {
+ cachedObject.removeComponentListener(this);
}
cachedViewPort = null;
}
@@ -1351,7 +1351,7 @@
* we need to keep this reference in order to remove BodyBoxView from viewPort listeners.
*
*/
- private Reference cachedViewPort = null;
+ private Reference<JViewport> cachedViewPort = null;
private boolean isListening = false;
private int viewVisibleWidth = Integer.MAX_VALUE;
private int componentVisibleWidth = Integer.MAX_VALUE;
@@ -1928,7 +1928,7 @@
int prevEndOffset = -1;
// highlight the next link or object after the current caret position
- Element nextElement = null;
+ Element nextElement;
while ((nextElement = ei.next()) != null) {
String name = nextElement.getName();
AttributeSet attr = nextElement.getAttributes();
@@ -1969,7 +1969,6 @@
comp.setCaretPosition(prevStartOffset);
moveCaretPosition(comp, kit, prevStartOffset, prevEndOffset);
kit.prevHypertextOffset = prevStartOffset;
- return;
}
}
@@ -2113,7 +2112,7 @@
if (view != null && view instanceof ObjectView) {
Component comp = ((ObjectView)view).getComponent();
if (comp != null && comp instanceof Accessible) {
- AccessibleContext ac = ((Accessible)comp).getAccessibleContext();
+ AccessibleContext ac = comp.getAccessibleContext();
if (ac != null) {
AccessibleAction aa = ac.getAccessibleAction();
if (aa != null) {
@@ -2207,7 +2206,7 @@
// invoke the next link or object action
String urlString = null;
String objString = null;
- Element currentElement = null;
+ Element currentElement;
while ((currentElement = ei.next()) != null) {
String name = currentElement.getName();
AttributeSet attr = currentElement.getAttributes();
--- a/jdk/src/share/classes/javax/swing/text/html/HTMLWriter.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/html/HTMLWriter.java Wed Jul 05 16:42:37 2017 +0200
@@ -46,7 +46,7 @@
* Stores all elements for which end tags have to
* be emitted.
*/
- private Stack blockElementStack = new Stack();
+ private Stack<Element> blockElementStack = new Stack<Element>();
private boolean inContent = false;
private boolean inPre = false;
/** When inPre is true, this will indicate the end offset of the pre
@@ -62,12 +62,12 @@
* character level attributes. Examples include
* <b>, <i>, <font>, and <a>.
*/
- private Vector tags = new Vector(10);
+ private Vector<HTML.Tag> tags = new Vector<HTML.Tag>(10);
/**
* Values for the tags.
*/
- private Vector tagValues = new Vector(10);
+ private Vector<Object> tagValues = new Vector<Object>(10);
/**
* Used when writing out content.
@@ -77,7 +77,7 @@
/*
* This is used in closeOutUnwantedEmbeddedTags.
*/
- private Vector tagsToRemove = new Vector(10);
+ private Vector<HTML.Tag> tagsToRemove = new Vector<HTML.Tag>(10);
/**
* Set to true after the head has been output.
@@ -133,7 +133,7 @@
public void write() throws IOException, BadLocationException {
ElementIterator it = getElementIterator();
Element current = null;
- Element next = null;
+ Element next;
wroteHead = false;
setCurrentLineLength(0);
@@ -169,7 +169,7 @@
item on top of the stack, is the parent of the
next.
*/
- Element top = (Element)blockElementStack.peek();
+ Element top = blockElementStack.peek();
while (top != next.getParentElement()) {
/*
pop() will return top.
@@ -183,7 +183,7 @@
}
endTag(top);
}
- top = (Element)blockElementStack.peek();
+ top = blockElementStack.peek();
}
} else if (current.getParentElement() == next.getParentElement()) {
/*
@@ -191,7 +191,7 @@
is correct. But, we need to make sure that if current is
on the stack, we pop it off, and put out its end tag.
*/
- Element top = (Element)blockElementStack.peek();
+ Element top = blockElementStack.peek();
if (top == current) {
blockElementStack.pop();
endTag(top);
@@ -219,7 +219,7 @@
endTag(current);
}
while (!blockElementStack.empty()) {
- current = (Element)blockElementStack.pop();
+ current = blockElementStack.pop();
if (!synthesizedElement(current)) {
AttributeSet attrs = current.getAttributes();
if (!matchNameAttribute(attrs, HTML.Tag.PRE) &&
@@ -308,7 +308,7 @@
//
if (nameTag != null && endTag != null &&
(endTag instanceof String) &&
- ((String)endTag).equals("true")) {
+ endTag.equals("true")) {
outputEndTag = true;
}
@@ -769,7 +769,7 @@
int size = tags.size();
// First, find all the tags that need to be removed.
for (int i = size - 1; i >= 0; i--) {
- t = (HTML.Tag)tags.elementAt(i);
+ t = tags.elementAt(i);
tValue = tagValues.elementAt(i);
if ((attr == null) || noMatchForTagInAttributes(attr, t, tValue)) {
firstIndex = i;
@@ -780,7 +780,7 @@
// Then close them out.
boolean removeAll = ((size - firstIndex) == tagsToRemove.size());
for (int i = size - 1; i >= firstIndex; i--) {
- t = (HTML.Tag)tags.elementAt(i);
+ t = tags.elementAt(i);
if (removeAll || tagsToRemove.contains(t)) {
tags.removeElementAt(i);
tagValues.removeElementAt(i);
@@ -794,7 +794,7 @@
// as we closed them out, but they should remain open.
size = tags.size();
for (int i = firstIndex; i < size; i++) {
- t = (HTML.Tag)tags.elementAt(i);
+ t = tags.elementAt(i);
write('<');
write(t.toString());
Object o = tagValues.elementAt(i);
@@ -813,11 +813,8 @@
* false
*/
private boolean isFormElementWithContent(AttributeSet attr) {
- if (matchNameAttribute(attr, HTML.Tag.TEXTAREA) ||
- matchNameAttribute(attr, HTML.Tag.SELECT)) {
- return true;
- }
- return false;
+ return matchNameAttribute(attr, HTML.Tag.TEXTAREA) ||
+ matchNameAttribute(attr, HTML.Tag.SELECT);
}
--- a/jdk/src/share/classes/javax/swing/text/html/Map.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/html/Map.java Wed Jul 05 16:42:37 2017 +0200
@@ -41,10 +41,10 @@
/** Name of the Map. */
private String name;
/** An array of AttributeSets. */
- private Vector areaAttributes;
+ private Vector<AttributeSet> areaAttributes;
/** An array of RegionContainments, will slowly grow to match the
* length of areaAttributes as needed. */
- private Vector areas;
+ private Vector<RegionContainment> areas;
public Map() {
}
@@ -68,7 +68,7 @@
return;
}
if (areaAttributes == null) {
- areaAttributes = new Vector(2);
+ areaAttributes = new Vector<AttributeSet>(2);
}
areaAttributes.addElement(as.copyAttributes());
}
@@ -81,8 +81,7 @@
int numAreas = (areas != null) ? areas.size() : 0;
for (int counter = areaAttributes.size() - 1; counter >= 0;
counter--) {
- if (((AttributeSet)areaAttributes.elementAt(counter)).
- isEqual(as)){
+ if (areaAttributes.elementAt(counter).isEqual(as)){
areaAttributes.removeElementAt(counter);
if (counter < numAreas) {
areas.removeElementAt(counter);
@@ -121,17 +120,16 @@
int numAreas = (areas != null) ? areas.size() : 0;
if (areas == null) {
- areas = new Vector(numAttributes);
+ areas = new Vector<RegionContainment>(numAttributes);
}
for (int counter = 0; counter < numAttributes; counter++) {
if (counter >= numAreas) {
areas.addElement(createRegionContainment
- ((AttributeSet)areaAttributes.elementAt(counter)));
+ (areaAttributes.elementAt(counter)));
}
- RegionContainment rc = (RegionContainment)areas.
- elementAt(counter);
+ RegionContainment rc = areas.elementAt(counter);
if (rc != null && rc.contains(x, y, width, height)) {
- return (AttributeSet)areaAttributes.elementAt(counter);
+ return areaAttributes.elementAt(counter);
}
}
}
--- a/jdk/src/share/classes/javax/swing/text/html/MinimalHTMLWriter.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/html/MinimalHTMLWriter.java Wed Jul 05 16:42:37 2017 +0200
@@ -97,7 +97,7 @@
* Maps from style name as held by the Document, to the archived
* style name (style name written out). These may differ.
*/
- private Hashtable styleNameMapping;
+ private Hashtable<String, String> styleNameMapping;
/**
* Creates a new MinimalHTMLWriter.
@@ -134,7 +134,7 @@
*
*/
public void write() throws IOException, BadLocationException {
- styleNameMapping = new Hashtable();
+ styleNameMapping = new Hashtable<String, String>();
writeStartTag("<html>");
writeHeader();
writeBody();
@@ -296,7 +296,7 @@
*/
it.current();
- Element next = null;
+ Element next;
writeStartTag("<body>");
@@ -715,7 +715,7 @@
if (styleNameMapping == null) {
return style;
}
- String retValue = (String)styleNameMapping.get(style);
+ String retValue = styleNameMapping.get(style);
return (retValue == null) ? style : retValue;
}
--- a/jdk/src/share/classes/javax/swing/text/html/OptionListModel.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/html/OptionListModel.java Wed Jul 05 16:42:37 2017 +0200
@@ -108,8 +108,7 @@
* @since 1.4
*/
public ListSelectionListener[] getListSelectionListeners() {
- return (ListSelectionListener[])listenerList.getListeners(
- ListSelectionListener.class);
+ return listenerList.getListeners(ListSelectionListener.class);
}
/**
@@ -131,7 +130,7 @@
/**
* @param firstIndex The first index in the interval.
- * @param index1 The last index in the interval.
+ * @param lastIndex The last index in the interval.
* @param isAdjusting True if this is the final change in a series of them.
* @see EventListenerList
*/
@@ -528,8 +527,8 @@
anchorIndex = leadIndex;
}
- int oldMin = Math.min(this.anchorIndex, this.leadIndex);;
- int oldMax = Math.max(this.anchorIndex, this.leadIndex);;
+ int oldMin = Math.min(this.anchorIndex, this.leadIndex);
+ int oldMax = Math.max(this.anchorIndex, this.leadIndex);
int newMin = Math.min(anchorIndex, leadIndex);
int newMax = Math.max(anchorIndex, leadIndex);
if (value.get(this.anchorIndex)) {
--- a/jdk/src/share/classes/javax/swing/text/html/StyleSheet.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/html/StyleSheet.java Wed Jul 05 16:42:37 2017 +0200
@@ -164,7 +164,7 @@
public StyleSheet() {
super();
selectorMapping = new SelectorMapping(0);
- resolvedStyles = new Hashtable();
+ resolvedStyles = new Hashtable<String, ResolvedStyle>();
if (css == null) {
css = new CSS();
}
@@ -190,7 +190,7 @@
try {
// Build an array of all the parent elements.
- Vector searchContext = sb.getVector();
+ Vector<Element> searchContext = sb.getVector();
for (Element p = e; p != null; p = p.getParentElement()) {
searchContext.addElement(p);
@@ -205,7 +205,7 @@
// >= 1 as the HTML.Tag for the 0th element is passed in.
for (int counter = n - 1; counter >= 1; counter--) {
- e = (Element)searchContext.elementAt(counter);
+ e = searchContext.elementAt(counter);
attr = e.getAttributes();
name = attr.getAttribute(StyleConstants.NameAttribute);
eName = name.toString();
@@ -225,7 +225,7 @@
cacheLookup.append(' ');
}
cacheLookup.append(t.toString());
- e = (Element)searchContext.elementAt(0);
+ e = searchContext.elementAt(0);
attr = e.getAttributes();
if (e.isLeaf()) {
// For leafs, we use the second tier attributes.
@@ -368,10 +368,9 @@
if (rule != null) {
mapping.setStyle(null);
if (resolvedStyles.size() > 0) {
- Enumeration values = resolvedStyles.elements();
+ Enumeration<ResolvedStyle> values = resolvedStyles.elements();
while (values.hasMoreElements()) {
- ResolvedStyle style = (ResolvedStyle)values.
- nextElement();
+ ResolvedStyle style = values.nextElement();
style.removeStyle(rule);
}
}
@@ -392,7 +391,7 @@
public void addStyleSheet(StyleSheet ss) {
synchronized(this) {
if (linkedStyleSheets == null) {
- linkedStyleSheets = new Vector();
+ linkedStyleSheets = new Vector<StyleSheet>();
}
if (!linkedStyleSheets.contains(ss)) {
int index = 0;
@@ -828,7 +827,7 @@
/**
* Creates a new attribute set based on a supplied set of attributes.
*
- * @param source the set of attributes
+ * @param attrs the set of attributes
*/
public SmallConversionSet(AttributeSet attrs) {
super(attrs);
@@ -1045,9 +1044,9 @@
*/
private synchronized void linkStyleSheetAt(StyleSheet ss, int index) {
if (resolvedStyles.size() > 0) {
- Enumeration values = resolvedStyles.elements();
+ Enumeration<ResolvedStyle> values = resolvedStyles.elements();
while (values.hasMoreElements()) {
- ResolvedStyle rule = (ResolvedStyle)values.nextElement();
+ ResolvedStyle rule = values.nextElement();
rule.insertExtendedStyleAt(ss.getRule(rule.getName()),
index);
}
@@ -1061,9 +1060,9 @@
*/
private synchronized void unlinkStyleSheet(StyleSheet ss, int index) {
if (resolvedStyles.size() > 0) {
- Enumeration values = resolvedStyles.elements();
+ Enumeration<ResolvedStyle> values = resolvedStyles.elements();
while (values.hasMoreElements()) {
- ResolvedStyle rule = (ResolvedStyle)values.nextElement();
+ ResolvedStyle rule = values.nextElement();
rule.removeExtendedStyleAt(index);
}
}
@@ -1076,7 +1075,7 @@
String[] getSimpleSelectors(String selector) {
selector = cleanSelectorString(selector);
SearchBuffer sb = SearchBuffer.obtainSearchBuffer();
- Vector selectors = sb.getVector();
+ Vector<String> selectors = sb.getVector();
int lastIndex = 0;
int length = selector.length();
while (lastIndex != -1) {
@@ -1256,7 +1255,7 @@
private synchronized Style getResolvedStyle(String selector,
Vector elements,
HTML.Tag t) {
- Style retStyle = (Style)resolvedStyles.get(selector);
+ Style retStyle = resolvedStyles.get(selector);
if (retStyle == null) {
retStyle = createResolvedStyle(selector, elements, t);
}
@@ -1268,7 +1267,7 @@
* create the resolved style, if necessary.
*/
private synchronized Style getResolvedStyle(String selector) {
- Style retStyle = (Style)resolvedStyles.get(selector);
+ Style retStyle = resolvedStyles.get(selector);
if (retStyle == null) {
retStyle = createResolvedStyle(selector);
}
@@ -1280,15 +1279,14 @@
* such that <code>elements</code> will remain ordered by
* specificity.
*/
- private void addSortedStyle(SelectorMapping mapping, Vector elements) {
+ private void addSortedStyle(SelectorMapping mapping, Vector<SelectorMapping> elements) {
int size = elements.size();
if (size > 0) {
int specificity = mapping.getSpecificity();
for (int counter = 0; counter < size; counter++) {
- if (specificity >= ((SelectorMapping)elements.elementAt
- (counter)).getSpecificity()) {
+ if (specificity >= elements.elementAt(counter).getSpecificity()) {
elements.insertElementAt(mapping, counter);
return;
}
@@ -1303,10 +1301,10 @@
* any child mappings for any of the Elements in <code>elements</code>.
*/
private synchronized void getStyles(SelectorMapping parentMapping,
- Vector styles,
+ Vector<SelectorMapping> styles,
String[] tags, String[] ids, String[] classes,
int index, int numElements,
- Hashtable alreadyChecked) {
+ Hashtable<SelectorMapping, SelectorMapping> alreadyChecked) {
// Avoid desending the same mapping twice.
if (alreadyChecked.contains(parentMapping)) {
return;
@@ -1367,8 +1365,8 @@
String[] tags,
String[] ids, String[] classes) {
SearchBuffer sb = SearchBuffer.obtainSearchBuffer();
- Vector tempVector = sb.getVector();
- Hashtable tempHashtable = sb.getHashtable();
+ Vector<SelectorMapping> tempVector = sb.getVector();
+ Hashtable<SelectorMapping, SelectorMapping> tempHashtable = sb.getHashtable();
// Determine all the Styles that are appropriate, placing them
// in tempVector
try {
@@ -1418,13 +1416,11 @@
int numStyles = tempVector.size();
AttributeSet[] attrs = new AttributeSet[numStyles + numLinkedSS];
for (int counter = 0; counter < numStyles; counter++) {
- attrs[counter] = ((SelectorMapping)tempVector.
- elementAt(counter)).getStyle();
+ attrs[counter] = tempVector.elementAt(counter).getStyle();
}
// Get the AttributeSet from linked style sheets.
for (int counter = 0; counter < numLinkedSS; counter++) {
- AttributeSet attr = ((StyleSheet)linkedStyleSheets.
- elementAt(counter)).getRule(selector);
+ AttributeSet attr = linkedStyleSheets.elementAt(counter).getRule(selector);
if (attr == null) {
attrs[counter + numStyles] = SimpleAttributeSet.EMPTY;
}
@@ -1514,11 +1510,11 @@
private Style createResolvedStyle(String selector) {
SearchBuffer sb = SearchBuffer.obtainSearchBuffer();
// Will contain the tags, ids, and classes, in that order.
- Vector elements = sb.getVector();
+ Vector<String> elements = sb.getVector();
try {
boolean done;
int dotIndex = 0;
- int spaceIndex = 0;
+ int spaceIndex;
int poundIndex = 0;
int lastIndex = 0;
int length = selector.length();
@@ -1640,9 +1636,9 @@
String[] classes = new String[numTags];
for (int index = 0, eIndex = total - 3; index < numTags;
index++, eIndex -= 3) {
- tags[index] = (String)elements.elementAt(eIndex);
- classes[index] = (String)elements.elementAt(eIndex + 1);
- ids[index] = (String)elements.elementAt(eIndex + 2);
+ tags[index] = elements.elementAt(eIndex);
+ classes[index] = elements.elementAt(eIndex + 1);
+ ids[index] = elements.elementAt(eIndex + 2);
}
return createResolvedStyle(selector, tags, ids, classes);
}
@@ -1661,9 +1657,9 @@
Style newStyle,
int specificity) {
if (resolvedStyles.size() > 0) {
- Enumeration values = resolvedStyles.elements();
+ Enumeration<ResolvedStyle> values = resolvedStyles.elements();
while (values.hasMoreElements()) {
- ResolvedStyle style = (ResolvedStyle)values.nextElement();
+ ResolvedStyle style = values.nextElement();
if (style.matches(selectorName)) {
style.insertStyle(newStyle, specificity);
}
@@ -1682,7 +1678,7 @@
private static class SearchBuffer {
/** A stack containing instances of SearchBuffer. Used in getting
* rules. */
- static Stack searchBuffers = new Stack();
+ static Stack<SearchBuffer> searchBuffers = new Stack<SearchBuffer>();
// A set of temporary variables that can be used in whatever way.
Vector vector = null;
StringBuffer stringBuffer = null;
@@ -1696,7 +1692,7 @@
SearchBuffer sb;
try {
if(!searchBuffers.empty()) {
- sb = (SearchBuffer)searchBuffers.pop();
+ sb = searchBuffers.pop();
} else {
sb = new SearchBuffer();
}
@@ -1922,7 +1918,7 @@
static boolean isLeftToRight(View v) {
boolean ret = true;
if (isOrientationAware(v)) {
- Container container = null;
+ Container container;
if (v != null && (container = v.getContainer()) != null) {
ret = container.getComponentOrientation().isLeftToRight();
}
@@ -1938,8 +1934,8 @@
*/
static boolean isOrientationAware(View v) {
boolean ret = false;
- AttributeSet attr = null;
- Object obj = null;
+ AttributeSet attr;
+ Object obj;
if (v != null
&& (attr = v.getElement().getAttributes()) != null
&& (obj = attr.getAttribute(StyleConstants.NameAttribute)) instanceof HTML.Tag
@@ -1953,7 +1949,7 @@
return ret;
}
- static enum HorizontalMargin { LEFT, RIGHT };
+ static enum HorizontalMargin { LEFT, RIGHT }
/**
* for <dir>, <menu>, <ul> etc.
@@ -2362,7 +2358,7 @@
* @param itemNum number to format
*/
String formatAlphaNumerals(int itemNum) {
- String result = "";
+ String result;
if (itemNum > 26) {
result = formatAlphaNumerals(itemNum / 26) +
@@ -2411,7 +2407,7 @@
* Converts the item number into a roman numeral
*
* @param level position
- * @param num digit to format
+ * @param digit digit to format
*/
String formatRomanDigit(int level, int digit) {
String result = "";
@@ -2625,7 +2621,7 @@
// implementation.
Document doc = v.getDocument();
SearchBuffer sb = SearchBuffer.obtainSearchBuffer();
- Vector muxList = sb.getVector();
+ Vector<AttributeSet> muxList = sb.getVector();
try {
if (doc instanceof HTMLDocument) {
StyleSheet styles = StyleSheet.this;
@@ -2641,8 +2637,8 @@
while (keys.hasMoreElements()) {
Object key = keys.nextElement();
if (key instanceof HTML.Tag) {
- if ((HTML.Tag)key == HTML.Tag.A) {
- Object o = a.getAttribute((HTML.Tag)key);
+ if (key == HTML.Tag.A) {
+ Object o = a.getAttribute(key);
/**
In the case of an A tag, the css rules
apply only for tags that have their
@@ -3059,10 +3055,10 @@
SelectorMapping retValue = null;
if (children != null) {
- retValue = (SelectorMapping)children.get(selector);
+ retValue = children.get(selector);
}
else if (create) {
- children = new HashMap(7);
+ children = new HashMap<String, SelectorMapping>(7);
}
if (retValue == null && create) {
int specificity = getChildSpecificity(selector);
@@ -3121,7 +3117,7 @@
* Any sub selectors. Key will be String, and value will be
* another SelectorMapping.
*/
- private HashMap children;
+ private HashMap<String, SelectorMapping> children;
}
@@ -3138,11 +3134,11 @@
/** Maps from selector (as a string) to Style that includes all
* relevant styles. */
- private Hashtable resolvedStyles;
+ private Hashtable<String, ResolvedStyle> resolvedStyles;
/** Vector of StyleSheets that the rules are to reference.
*/
- private Vector linkedStyleSheets;
+ private Vector<StyleSheet> linkedStyleSheets;
/** Where the style sheet was found. Used for relative imports. */
private URL base;
@@ -3279,7 +3275,7 @@
public void endRule() {
int n = selectors.size();
for (int i = 0; i < n; i++) {
- String[] selector = (String[]) selectors.elementAt(i);
+ String[] selector = selectors.elementAt(i);
if (selector.length > 0) {
StyleSheet.this.addRule(selector, declaration, isLink);
}
@@ -3296,8 +3292,8 @@
}
- Vector selectors = new Vector();
- Vector selectorTokens = new Vector();
+ Vector<String[]> selectors = new Vector<String[]>();
+ Vector<String> selectorTokens = new Vector<String>();
/** Name of the current property. */
String propertyName;
MutableAttributeSet declaration = new SimpleAttributeSet();
--- a/jdk/src/share/classes/javax/swing/text/html/TableView.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/html/TableView.java Wed Jul 05 16:42:37 2017 +0200
@@ -48,7 +48,7 @@
*/
public TableView(Element elem) {
super(elem, View.Y_AXIS);
- rows = new Vector();
+ rows = new Vector<RowView>();
gridValid = false;
captionIndex = -1;
totalColumnRequirements = new SizeRequirements();
@@ -127,14 +127,14 @@
RowView getRow(int row) {
if (row < rows.size()) {
- return (RowView) rows.elementAt(row);
+ return rows.elementAt(row);
}
return null;
}
protected View getViewAtPoint(int x, int y, Rectangle alloc) {
int n = getViewCount();
- View v = null;
+ View v;
Rectangle allocation = new Rectangle();
for (int i = 0; i < n; i++) {
allocation.setBounds(alloc);
@@ -273,7 +273,7 @@
for (int i = 0; i < n; i++) {
View v = getView(i);
if (v instanceof RowView) {
- rows.addElement(v);
+ rows.addElement((RowView) v);
RowView rv = (RowView) v;
rv.clearFilledColumns();
rv.rowIndex = rows.size() - 1;
@@ -990,7 +990,7 @@
RowIterator rowIterator = new RowIterator();
ColumnIterator colIterator = new ColumnIterator();
- Vector rows;
+ Vector<RowView> rows;
// whether to display comments inside table or not.
boolean skipComments = false;
--- a/jdk/src/share/classes/javax/swing/text/html/parser/AttributeList.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/html/parser/AttributeList.java Wed Jul 05 16:42:37 2017 +0200
@@ -129,7 +129,7 @@
/**
* Create a hashtable of attribute types.
*/
- static Hashtable attributeTypes = new Hashtable();
+ static Hashtable<Object, Object> attributeTypes = new Hashtable<Object, Object>();
static void defineAttributeType(String nm, int val) {
Integer num = Integer.valueOf(val);
--- a/jdk/src/share/classes/javax/swing/text/html/parser/DTD.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/html/parser/DTD.java Wed Jul 05 16:42:37 2017 +0200
@@ -104,7 +104,7 @@
* <code>name</code> <code>String</code>
*/
public Entity getEntity(String name) {
- return (Entity)entityHash.get(name);
+ return entityHash.get(name);
}
/**
@@ -113,7 +113,7 @@
* <code>ch</code> character
*/
public Entity getEntity(int ch) {
- return (Entity)entityHash.get(Integer.valueOf(ch));
+ return entityHash.get(Integer.valueOf(ch));
}
/**
@@ -137,7 +137,7 @@
* <code>name</code>, which may be newly created
*/
public Element getElement(String name) {
- Element e = (Element)elementHash.get(name);
+ Element e = elementHash.get(name);
if (e == null) {
e = new Element(name, elements.size());
elements.addElement(e);
@@ -154,7 +154,7 @@
* <code>index</code>
*/
public Element getElement(int index) {
- return (Element)elements.elementAt(index);
+ return elements.elementAt(index);
}
/**
@@ -170,7 +170,7 @@
* if not found
*/
public Entity defineEntity(String name, int type, char data[]) {
- Entity ent = (Entity)entityHash.get(name);
+ Entity ent = entityHash.get(name);
if (ent == null) {
ent = new Entity(name, type, data);
entityHash.put(name, ent);
@@ -259,8 +259,7 @@
BitSet excl = null;
if (exclusions != null && exclusions.length > 0) {
excl = new BitSet();
- for (int i = 0; i < exclusions.length; i++) {
- String str = exclusions[i];
+ for (String str : exclusions) {
if (str.length() > 0) {
excl.set(getElement(str).getIndex());
}
@@ -269,8 +268,7 @@
BitSet incl = null;
if (inclusions != null && inclusions.length > 0) {
incl = new BitSet();
- for (int i = 0; i < inclusions.length; i++) {
- String str = inclusions[i];
+ for (String str : inclusions) {
if (str.length() > 0) {
incl.set(getElement(str).getIndex());
}
@@ -285,9 +283,9 @@
* @return the new <code>AttributeList</code>
*/
protected AttributeList defAttributeList(String name, int type, int modifier, String value, String values, AttributeList atts) {
- Vector vals = null;
+ Vector<String> vals = null;
if (values != null) {
- vals = new Vector();
+ vals = new Vector<String>();
for (StringTokenizer s = new StringTokenizer(values, "|") ; s.hasMoreTokens() ;) {
String str = s.nextToken();
if (str.length() > 0) {
@@ -318,7 +316,7 @@
/**
* The hashtable of DTDs.
*/
- static Hashtable dtdHash = new Hashtable();
+ static Hashtable<String, DTD> dtdHash = new Hashtable<String, DTD>();
public static void putDTDHash(String name, DTD dtd) {
dtdHash.put(name, dtd);
@@ -334,7 +332,7 @@
*/
public static DTD getDTD(String name) throws IOException {
name = name.toLowerCase();
- DTD dtd = (DTD)dtdHash.get(name);
+ DTD dtd = dtdHash.get(name);
if (dtd == null)
dtd = new DTD(name);
@@ -432,10 +430,10 @@
int modifier = in.readByte();
short valueId = in.readShort();
String value = (valueId == -1) ? null : names[valueId];
- Vector values = null;
+ Vector<String> values = null;
short numValues = in.readShort();
if (numValues > 0) {
- values = new Vector(numValues);
+ values = new Vector<String>(numValues);
for (int i = 0; i < numValues; i++) {
values.addElement(names[in.readShort()]);
}
--- a/jdk/src/share/classes/javax/swing/text/html/parser/Element.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/html/parser/Element.java Wed Jul 05 16:42:37 2017 +0200
@@ -159,7 +159,7 @@
}
- static Hashtable contentTypes = new Hashtable();
+ static Hashtable<String, Integer> contentTypes = new Hashtable<String, Integer>();
static {
contentTypes.put("CDATA", Integer.valueOf(CDATA));
@@ -169,7 +169,7 @@
}
public static int name2type(String nm) {
- Integer val = (Integer)contentTypes.get(nm);
+ Integer val = contentTypes.get(nm);
return (val != null) ? val.intValue() : 0;
}
}
--- a/jdk/src/share/classes/javax/swing/text/html/parser/Entity.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/html/parser/Entity.java Wed Jul 05 16:42:37 2017 +0200
@@ -107,7 +107,7 @@
}
- static Hashtable entityTypes = new Hashtable();
+ static Hashtable<String, Integer> entityTypes = new Hashtable<String, Integer>();
static {
entityTypes.put("PUBLIC", Integer.valueOf(PUBLIC));
@@ -133,7 +133,7 @@
* to "CDATA", if none exists
*/
public static int name2type(String nm) {
- Integer i = (Integer)entityTypes.get(nm);
+ Integer i = entityTypes.get(nm);
return (i == null) ? CDATA : i.intValue();
}
}
--- a/jdk/src/share/classes/javax/swing/text/html/parser/Parser.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/html/parser/Parser.java Wed Jul 05 16:42:37 2017 +0200
@@ -649,12 +649,10 @@
if (!strict) {
ContentModel content = stack.contentModel();
- Vector elemVec = new Vector();
+ Vector<Element> elemVec = new Vector<Element>();
if (content != null) {
content.getElements(elemVec);
- for (Enumeration v = elemVec.elements(); v.hasMoreElements();) {
- Element e = (Element)v.nextElement();
-
+ for (Element e : elemVec) {
// Ensure that this element has not been included as
// part of the exclusions in the DTD.
//
@@ -1349,9 +1347,9 @@
continue;
}
- AttributeList att = null;
- String attname = null;
- String attvalue = null;
+ AttributeList att;
+ String attname;
+ String attvalue;
if (parseIdentifier(true)) {
attname = getString(0);
@@ -1549,7 +1547,7 @@
* Parse a start or end tag.
*/
void parseTag() throws IOException {
- Element elem = null;
+ Element elem;
boolean net = false;
boolean warned = false;
boolean unknown = false;
--- a/jdk/src/share/classes/javax/swing/text/html/parser/TagStack.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/html/parser/TagStack.java Wed Jul 05 16:42:37 2017 +0200
@@ -124,22 +124,6 @@
return (exclusions != null) && exclusions.get(elem.getIndex());
}
- /**
- * Update the Vector elemVec with all the elements that
- * are part of the inclusions listed in DTD for the element
- * currently on the TagStack.
- */
- boolean included(Vector elemVec, DTD dtd) {
-
- for (int i = 0 ; i < inclusions.size(); i++) {
- if (inclusions.get(i)) {
- elemVec.addElement(dtd.getElement(i));
- System.out.println("Element add thru' inclusions: " + dtd.getElement(i).getName());
- }
- }
- return (!elemVec.isEmpty());
- }
-
/**
* Advance the state by reducing the given element.
--- a/jdk/src/share/classes/javax/swing/text/rtf/MockAttributeSet.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/rtf/MockAttributeSet.java Wed Jul 05 16:42:37 2017 +0200
@@ -35,7 +35,7 @@
class MockAttributeSet
implements AttributeSet, MutableAttributeSet
{
- public Dictionary backing;
+ public Dictionary<Object, Object> backing;
public boolean isEmpty()
{
--- a/jdk/src/share/classes/javax/swing/text/rtf/RTFAttributes.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/rtf/RTFAttributes.java Wed Jul 05 16:42:37 2017 +0200
@@ -36,7 +36,7 @@
static RTFAttribute attributes[];
static {
- Vector a = new Vector();
+ Vector<RTFAttribute> a = new Vector<RTFAttribute>();
int CHR = RTFAttribute.D_CHARACTER;
int PGF = RTFAttribute.D_PARAGRAPH;
int SEC = RTFAttribute.D_SECTION;
@@ -131,14 +131,13 @@
attributes = attrs;
}
- static Dictionary attributesByKeyword()
+ static Dictionary<String, RTFAttribute> attributesByKeyword()
{
- Dictionary d = new Hashtable(attributes.length);
- int i, m;
+ Dictionary<String, RTFAttribute> d = new Hashtable<String, RTFAttribute>(attributes.length);
- m = attributes.length;
- for(i = 0; i < m; i++)
- d.put(attributes[i].rtfName(), attributes[i]);
+ for (RTFAttribute attribute : attributes) {
+ d.put(attribute.rtfName(), attribute);
+ }
return d;
}
--- a/jdk/src/share/classes/javax/swing/text/rtf/RTFGenerator.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/rtf/RTFGenerator.java Wed Jul 05 16:42:37 2017 +0200
@@ -52,11 +52,11 @@
{
/* These dictionaries map Colors, font names, or Style objects
to Integers */
- Dictionary colorTable;
+ Dictionary<Object, Integer> colorTable;
int colorCount;
- Dictionary fontTable;
+ Dictionary<String, Integer> fontTable;
int fontCount;
- Dictionary styleTable;
+ Dictionary<AttributeSet, Integer> styleTable;
int styleCount;
/* where all the text is going */
@@ -90,7 +90,7 @@
would require allocating an object for every character
written (slow!). */
static class CharacterKeywordPair
- { public char character; public String keyword; };
+ { public char character; public String keyword; }
static protected CharacterKeywordPair[] textKeywords;
static {
@@ -98,7 +98,7 @@
Dictionary textKeywordDictionary = RTFReader.textKeywords;
Enumeration keys = textKeywordDictionary.keys();
- Vector tempPairs = new Vector();
+ Vector<CharacterKeywordPair> tempPairs = new Vector<CharacterKeywordPair>();
while(keys.hasMoreElements()) {
CharacterKeywordPair pair = new CharacterKeywordPair();
pair.keyword = (String)keys.nextElement();
@@ -133,14 +133,14 @@
public RTFGenerator(OutputStream to)
{
- colorTable = new Hashtable();
+ colorTable = new Hashtable<Object, Integer>();
colorTable.put(defaultRTFColor, Integer.valueOf(0));
colorCount = 1;
- fontTable = new Hashtable();
+ fontTable = new Hashtable<String, Integer>();
fontCount = 0;
- styleTable = new Hashtable();
+ styleTable = new Hashtable<AttributeSet, Integer>();
/* TODO: put default style in style table */
styleCount = 0;
@@ -197,7 +197,7 @@
private void tallyStyles(AttributeSet a) {
while (a != null) {
if (a instanceof Style) {
- Integer aNum = (Integer)styleTable.get(a);
+ Integer aNum = styleTable.get(a);
if (aNum == null) {
styleCount = styleCount + 1;
aNum = new Integer(styleCount);
@@ -225,7 +225,7 @@
{
while(a != null) {
if (a instanceof Style) {
- Integer aNum = (Integer)styleTable.get(a);
+ Integer aNum = styleTable.get(a);
if (aNum != null) {
if (domain == null ||
domain.equals(a.getAttribute(Constants.StyleType)))
@@ -319,11 +319,11 @@
/* write font table */
String[] sortedFontTable = new String[fontCount];
- Enumeration fonts = fontTable.keys();
+ Enumeration<String> fonts = fontTable.keys();
String font;
while(fonts.hasMoreElements()) {
- font = (String)fonts.nextElement();
- Integer num = (Integer)(fontTable.get(font));
+ font = fonts.nextElement();
+ Integer num = fontTable.get(font);
sortedFontTable[num.intValue()] = font;
}
writeBegingroup();
@@ -344,7 +344,7 @@
Color color;
while(colors.hasMoreElements()) {
color = (Color)colors.nextElement();
- Integer num = (Integer)(colorTable.get(color));
+ Integer num = colorTable.get(color);
sortedColorTable[num.intValue()] = color;
}
writeBegingroup();
@@ -366,10 +366,10 @@
if (styleCount > 1) {
writeBegingroup();
writeControlWord("stylesheet");
- Enumeration styles = styleTable.keys();
+ Enumeration<AttributeSet> styles = styleTable.keys();
while(styles.hasMoreElements()) {
Style style = (Style)styles.nextElement();
- int styleNumber = ((Integer)styleTable.get(style)).intValue();
+ int styleNumber = styleTable.get(style).intValue();
writeBegingroup();
String styleType = (String)style.getAttribute(Constants.StyleType);
if (styleType == null)
@@ -398,7 +398,7 @@
basis = style.getResolveParent();
if (basis != null && basis instanceof Style) {
- Integer basedOn = (Integer)styleTable.get(basis);
+ Integer basedOn = styleTable.get(basis);
if (basedOn != null) {
writeControlWord("sbasedon", basedOn.intValue());
}
@@ -406,7 +406,7 @@
Style nextStyle = (Style)style.getAttribute(Constants.StyleNext);
if (nextStyle != null) {
- Integer nextNum = (Integer)styleTable.get(nextStyle);
+ Integer nextNum = styleTable.get(nextStyle);
if (nextNum != null) {
writeControlWord("snext", nextNum.intValue());
}
@@ -725,7 +725,7 @@
if ((parm = attrDiff(current, newAttributes,
StyleConstants.FontFamily, null)) != null) {
- Number fontNum = (Number)fontTable.get(parm);
+ Integer fontNum = fontTable.get(parm);
writeControlWord("f", fontNum.intValue());
}
@@ -746,7 +746,7 @@
if (parm == MagicToken)
colorNum = 0;
else
- colorNum = ((Number)colorTable.get(parm)).intValue();
+ colorNum = colorTable.get(parm).intValue();
writeControlWord("cb", colorNum);
}
@@ -756,7 +756,7 @@
if (parm == MagicToken)
colorNum = 0;
else
- colorNum = ((Number)colorTable.get(parm)).intValue();
+ colorNum = colorTable.get(parm).intValue();
writeControlWord("cf", colorNum);
}
}
--- a/jdk/src/share/classes/javax/swing/text/rtf/RTFParser.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/rtf/RTFParser.java Wed Jul 05 16:42:37 2017 +0200
@@ -92,7 +92,7 @@
// table of non-text characters in rtf
static final boolean rtfSpecialsTable[];
static {
- rtfSpecialsTable = (boolean[])noSpecialsTable.clone();
+ rtfSpecialsTable = noSpecialsTable.clone();
rtfSpecialsTable['\n'] = true;
rtfSpecialsTable['\r'] = true;
rtfSpecialsTable['{'] = true;
--- a/jdk/src/share/classes/javax/swing/text/rtf/RTFReader.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/text/rtf/RTFReader.java Wed Jul 05 16:42:37 2017 +0200
@@ -54,7 +54,7 @@
/** Miscellaneous information about the parser's state. This
* dictionary is saved and restored when an RTF group begins
* or ends. */
- Dictionary parserState; /* Current parser state */
+ Dictionary<Object, Object> parserState; /* Current parser state */
/** This is the "dst" item from parserState. rtfDestination
* is the current rtf destination. It is cached in an instance
* variable for speed. */
@@ -63,7 +63,7 @@
MutableAttributeSet documentAttributes;
/** This Dictionary maps Integer font numbers to String font names. */
- Dictionary fontTable;
+ Dictionary<Integer, String> fontTable;
/** This array maps color indices to Color objects. */
Color[] colorTable;
/** This array maps character style numbers to Style objects. */
@@ -86,7 +86,7 @@
* Unicode character. */
int skippingCharacters;
- static private Dictionary straightforwardAttributes;
+ static private Dictionary<String, RTFAttribute> straightforwardAttributes;
static {
straightforwardAttributes = RTFAttributes.attributesByKeyword();
}
@@ -96,9 +96,9 @@
/* this should be final, but there's a bug in javac... */
/** textKeywords maps RTF keywords to single-character strings,
* for those keywords which simply insert some text. */
- static Dictionary textKeywords = null;
+ static Dictionary<String, String> textKeywords = null;
static {
- textKeywords = new Hashtable();
+ textKeywords = new Hashtable<String, String>();
textKeywords.put("\\", "\\");
textKeywords.put("{", "{");
textKeywords.put("}", "}");
@@ -129,10 +129,10 @@
static final String TabAlignmentKey = "tab_alignment";
static final String TabLeaderKey = "tab_leader";
- static Dictionary characterSets;
+ static Dictionary<String, char[]> characterSets;
static boolean useNeXTForAnsi = false;
static {
- characterSets = new Hashtable();
+ characterSets = new Hashtable<String, char[]>();
}
/* TODO: per-font font encodings ( \fcharset control word ) ? */
@@ -148,8 +148,8 @@
int i;
target = destination;
- parserState = new Hashtable();
- fontTable = new Hashtable();
+ parserState = new Hashtable<Object, Object>();
+ fontTable = new Hashtable<Integer, String>();
rtfversion = -1;
@@ -220,7 +220,7 @@
Object oldSaveState = parserState.get("_savedState");
if (oldSaveState != null)
parserState.remove("_savedState");
- Dictionary saveState = (Dictionary)((Hashtable)parserState).clone();
+ Dictionary<String, Object> saveState = (Dictionary<String, Object>)((Hashtable)parserState).clone();
if (oldSaveState != null)
saveState.put("_savedState", oldSaveState);
parserState.put("_savedState", saveState);
@@ -242,7 +242,7 @@
skippingCharacters = 0;
}
- Dictionary restoredState = (Dictionary)parserState.get("_savedState");
+ Dictionary<Object, Object> restoredState = (Dictionary<Object, Object>)parserState.get("_savedState");
Destination restoredDestination = (Destination)restoredState.get("dst");
if (restoredDestination != rtfDestination) {
rtfDestination.close(); /* allow the destination to clean up */
@@ -281,7 +281,7 @@
while(docProps.hasMoreElements()) {
Object propName = docProps.nextElement();
target.putProperty(propName,
- documentAttributes.getAttribute((String)propName));
+ documentAttributes.getAttribute(propName));
}
/* RTFParser should have ensured that all our groups are closed */
@@ -301,7 +301,7 @@
*/
public boolean handleKeyword(String keyword)
{
- Object item;
+ String item;
boolean ignoreGroupIfUnknownKeywordSave = ignoreGroupIfUnknownKeyword;
if (skippingCharacters > 0) {
@@ -312,7 +312,7 @@
ignoreGroupIfUnknownKeyword = false;
if ((item = textKeywords.get(keyword)) != null) {
- handleText((String)item);
+ handleText(item);
return true;
}
@@ -556,14 +556,12 @@
getCharacterSet(final String name)
throws IOException
{
- char[] set;
-
- set = (char [])characterSets.get(name);
+ char[] set = characterSets.get(name);
if (set == null) {
InputStream charsetStream;
- charsetStream = (InputStream)java.security.AccessController.
- doPrivileged(new java.security.PrivilegedAction() {
- public Object run() {
+ charsetStream = java.security.AccessController.
+ doPrivileged(new java.security.PrivilegedAction<InputStream>() {
+ public InputStream run() {
return RTFReader.class.getResourceAsStream
("charsets/" + name + ".txt");
}
@@ -686,7 +684,7 @@
class FonttblDestination implements Destination
{
int nextFontNumber;
- Object fontNumberKey = null;
+ Integer fontNumberKey = null;
String nextFontFamily;
public void handleBinaryBlob(byte[] data)
@@ -716,7 +714,6 @@
nextFontNumber = -1;
nextFontFamily = null;
- return;
}
public boolean handleKeyword(String keyword)
@@ -747,10 +744,10 @@
dump its contents to the debugging log. */
public void close()
{
- Enumeration nums = fontTable.keys();
+ Enumeration<Integer> nums = fontTable.keys();
warning("Done reading font table.");
while(nums.hasMoreElements()) {
- Integer num = (Integer)nums.nextElement();
+ Integer num = nums.nextElement();
warning("Number " + num + ": " + fontTable.get(num));
}
}
@@ -761,19 +758,19 @@
class ColortblDestination implements Destination
{
int red, green, blue;
- Vector proTemTable;
+ Vector<Color> proTemTable;
public ColortblDestination()
{
red = 0;
green = 0;
blue = 0;
- proTemTable = new Vector();
+ proTemTable = new Vector<Color>();
}
public void handleText(String text)
{
- int index = 0;
+ int index;
for (index = 0; index < text.length(); index ++) {
if (text.charAt(index) == ';') {
@@ -823,11 +820,11 @@
extends DiscardingDestination
implements Destination
{
- Dictionary definedStyles;
+ Dictionary<Integer, StyleDefiningDestination> definedStyles;
public StylesheetDestination()
{
- definedStyles = new Hashtable();
+ definedStyles = new Hashtable<Integer, StyleDefiningDestination>();
}
public void begingroup()
@@ -837,19 +834,18 @@
public void close()
{
- Vector chrStyles, pgfStyles, secStyles;
- chrStyles = new Vector();
- pgfStyles = new Vector();
- secStyles = new Vector();
- Enumeration styles = definedStyles.elements();
+ Vector<Style> chrStyles = new Vector<Style>();
+ Vector<Style> pgfStyles = new Vector<Style>();
+ Vector<Style> secStyles = new Vector<Style>();
+ Enumeration<StyleDefiningDestination> styles = definedStyles.elements();
while(styles.hasMoreElements()) {
StyleDefiningDestination style;
Style defined;
- style = (StyleDefiningDestination)styles.nextElement();
+ style = styles.nextElement();
defined = style.realize();
warning("Style "+style.number+" ("+style.styleName+"): "+defined);
String stype = (String)defined.getAttribute(Constants.StyleType);
- Vector toSet;
+ Vector<Style> toSet;
if (stype.equals(Constants.STSection)) {
toSet = secStyles;
} else if (stype.equals(Constants.STCharacter)) {
@@ -989,7 +985,7 @@
if (basedOn != STYLENUMBER_NONE) {
StyleDefiningDestination styleDest;
- styleDest = (StyleDefiningDestination)definedStyles.get(Integer.valueOf(basedOn));
+ styleDest = definedStyles.get(Integer.valueOf(basedOn));
if (styleDest != null && styleDest != this) {
basis = styleDest.realize();
}
@@ -1016,7 +1012,7 @@
if (nextStyle != STYLENUMBER_NONE) {
StyleDefiningDestination styleDest;
- styleDest = (StyleDefiningDestination)definedStyles.get(Integer.valueOf(nextStyle));
+ styleDest = definedStyles.get(Integer.valueOf(nextStyle));
if (styleDest != null) {
next = styleDest.realize();
}
@@ -1122,9 +1118,8 @@
}
{
- Object item = straightforwardAttributes.get(keyword);
- if (item != null) {
- RTFAttribute attr = (RTFAttribute)item;
+ RTFAttribute attr = straightforwardAttributes.get(keyword);
+ if (attr != null) {
boolean ok;
switch(attr.domain()) {
@@ -1191,9 +1186,8 @@
}
{
- Object item = straightforwardAttributes.get(keyword);
- if (item != null) {
- RTFAttribute attr = (RTFAttribute)item;
+ RTFAttribute attr = straightforwardAttributes.get(keyword);
+ if (attr != null) {
boolean ok;
switch(attr.domain()) {
@@ -1267,12 +1261,12 @@
parserState.remove("tab_leader");
TabStop newStop = new TabStop(tabPosition, tabAlignment, tabLeader);
- Dictionary tabs;
+ Dictionary<Object, Object> tabs;
Integer stopCount;
- tabs = (Dictionary)parserState.get("_tabs");
+ tabs = (Dictionary<Object, Object>)parserState.get("_tabs");
if (tabs == null) {
- tabs = new Hashtable();
+ tabs = new Hashtable<Object, Object>();
parserState.put("_tabs", tabs);
stopCount = Integer.valueOf(1);
} else {
@@ -1369,7 +1363,7 @@
/* note setFontFamily() can not handle a null font */
String fontFamily;
if (fontnum != null)
- fontFamily = (String)fontTable.get(fontnum);
+ fontFamily = fontTable.get(fontnum);
else
fontFamily = null;
if (fontFamily != null)
@@ -1474,9 +1468,9 @@
handleKeyword("fs", 24); /* 12 pt. */
- Enumeration attributes = straightforwardAttributes.elements();
+ Enumeration<RTFAttribute> attributes = straightforwardAttributes.elements();
while(attributes.hasMoreElements()) {
- RTFAttribute attr = (RTFAttribute)attributes.nextElement();
+ RTFAttribute attr = attributes.nextElement();
if (attr.domain() == RTFAttribute.D_CHARACTER)
attr.setDefault(characterAttributes);
}
@@ -1498,9 +1492,9 @@
StyleConstants.setAlignment(paragraphAttributes,
StyleConstants.ALIGN_LEFT);
- Enumeration attributes = straightforwardAttributes.elements();
+ Enumeration<RTFAttribute> attributes = straightforwardAttributes.elements();
while(attributes.hasMoreElements()) {
- RTFAttribute attr = (RTFAttribute)attributes.nextElement();
+ RTFAttribute attr = attributes.nextElement();
if (attr.domain() == RTFAttribute.D_PARAGRAPH)
attr.setDefault(characterAttributes);
}
@@ -1511,9 +1505,9 @@
* \sectd keyword. */
protected void resetSectionAttributes()
{
- Enumeration attributes = straightforwardAttributes.elements();
+ Enumeration<RTFAttribute> attributes = straightforwardAttributes.elements();
while(attributes.hasMoreElements()) {
- RTFAttribute attr = (RTFAttribute)attributes.nextElement();
+ RTFAttribute attr = attributes.nextElement();
if (attr.domain() == RTFAttribute.D_SECTION)
attr.setDefault(characterAttributes);
}
--- a/jdk/src/share/classes/javax/swing/tree/DefaultTreeCellEditor.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/tree/DefaultTreeCellEditor.java Wed Jul 05 16:42:37 2017 +0200
@@ -551,7 +551,7 @@
// Serialization support.
private void writeObject(ObjectOutputStream s) throws IOException {
- Vector values = new Vector();
+ Vector<Object> values = new Vector<Object>();
s.defaultWriteObject();
// Save the realEditor, if its Serializable.
--- a/jdk/src/share/classes/javax/swing/tree/DefaultTreeModel.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/tree/DefaultTreeModel.java Wed Jul 05 16:42:37 2017 +0200
@@ -453,8 +453,7 @@
* @since 1.4
*/
public TreeModelListener[] getTreeModelListeners() {
- return (TreeModelListener[])listenerList.getListeners(
- TreeModelListener.class);
+ return listenerList.getListeners(TreeModelListener.class);
}
/**
@@ -652,7 +651,7 @@
// Serialization support.
private void writeObject(ObjectOutputStream s) throws IOException {
- Vector values = new Vector();
+ Vector<Object> values = new Vector<Object>();
s.defaultWriteObject();
// Save the root, if its Serializable.
--- a/jdk/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java Wed Jul 05 16:42:37 2017 +0200
@@ -61,7 +61,7 @@
*
* @author Scott Violet
*/
-public class DefaultTreeSelectionModel extends Object implements Cloneable, Serializable, TreeSelectionModel
+public class DefaultTreeSelectionModel implements Cloneable, Serializable, TreeSelectionModel
{
/** Property name for selectionMode. */
public static final String SELECTION_MODE_PROPERTY = "selectionMode";
@@ -98,8 +98,8 @@
/** Used to make sure the paths are unique, will contain all the paths
* in <code>selection</code>.
*/
- private Hashtable uniquePaths;
- private Hashtable lastPaths;
+ private Hashtable<TreePath, Boolean> uniquePaths;
+ private Hashtable<TreePath, Boolean> lastPaths;
private TreePath[] tempPaths;
@@ -111,8 +111,8 @@
listSelectionModel = new DefaultListSelectionModel();
selectionMode = DISCONTIGUOUS_TREE_SELECTION;
leadIndex = leadRow = -1;
- uniquePaths = new Hashtable();
- lastPaths = new Hashtable();
+ uniquePaths = new Hashtable<TreePath, Boolean>();
+ lastPaths = new Hashtable<TreePath, Boolean>();
tempPaths = new TreePath[1];
}
@@ -245,7 +245,7 @@
}
TreePath beginLeadPath = leadPath;
- Vector cPaths = new Vector(newCount + oldCount);
+ Vector<PathPlaceHolder> cPaths = new Vector<PathPlaceHolder>(newCount + oldCount);
List<TreePath> newSelectionAsList =
new ArrayList<TreePath>(newCount);
@@ -276,7 +276,7 @@
selection = newSelection;
- Hashtable tempHT = uniquePaths;
+ Hashtable<TreePath, Boolean> tempHT = uniquePaths;
uniquePaths = lastPaths;
lastPaths = tempHT;
@@ -348,7 +348,7 @@
int counter, validCount;
int oldCount;
TreePath beginLeadPath = leadPath;
- Vector cPaths = null;
+ Vector<PathPlaceHolder> cPaths = null;
if(selection == null)
oldCount = 0;
@@ -363,7 +363,7 @@
if (uniquePaths.get(paths[counter]) == null) {
validCount++;
if(cPaths == null)
- cPaths = new Vector();
+ cPaths = new Vector<PathPlaceHolder>();
cPaths.addElement(new PathPlaceHolder
(paths[counter], true));
uniquePaths.put(paths[counter], Boolean.TRUE);
@@ -388,12 +388,11 @@
if(validCount != paths.length) {
/* Some of the paths in paths are already in
the selection. */
- Enumeration newPaths = lastPaths.keys();
+ Enumeration<TreePath> newPaths = lastPaths.keys();
counter = oldCount;
while (newPaths.hasMoreElements()) {
- newSelection[counter++] = (TreePath)newPaths.
- nextElement();
+ newSelection[counter++] = newPaths.nextElement();
}
}
else {
@@ -448,7 +447,7 @@
clearSelection();
}
else {
- Vector pathsToRemove = null;
+ Vector<PathPlaceHolder> pathsToRemove = null;
/* Find the paths that can be removed. */
for (int removeCounter = paths.length - 1; removeCounter >= 0;
@@ -456,7 +455,7 @@
if(paths[removeCounter] != null) {
if (uniquePaths.get(paths[removeCounter]) != null) {
if(pathsToRemove == null)
- pathsToRemove = new Vector(paths.length);
+ pathsToRemove = new Vector<PathPlaceHolder>(paths.length);
uniquePaths.remove(paths[removeCounter]);
pathsToRemove.addElement(new PathPlaceHolder
(paths[removeCounter], false));
@@ -471,14 +470,13 @@
selection = null;
}
else {
- Enumeration pEnum = uniquePaths.keys();
+ Enumeration<TreePath> pEnum = uniquePaths.keys();
int validCount = 0;
selection = new TreePath[selection.length -
removeCount];
while (pEnum.hasMoreElements()) {
- selection[validCount++] = (TreePath)pEnum.
- nextElement();
+ selection[validCount++] = pEnum.nextElement();
}
}
if (leadPath != null &&
@@ -613,8 +611,7 @@
* @since 1.4
*/
public TreeSelectionListener[] getTreeSelectionListeners() {
- return (TreeSelectionListener[])listenerList.getListeners(
- TreeSelectionListener.class);
+ return listenerList.getListeners(TreeSelectionListener.class);
}
/**
@@ -1081,7 +1078,7 @@
PathPlaceHolder placeholder;
for(int counter = 0; counter < cPathCount; counter++) {
- placeholder = (PathPlaceHolder)changedPaths.elementAt(counter);
+ placeholder = changedPaths.elementAt(counter);
newness[counter] = placeholder.isNew;
paths[counter] = placeholder.path;
}
@@ -1177,8 +1174,8 @@
clone.listenerList = new EventListenerList();
clone.listSelectionModel = (DefaultListSelectionModel)
listSelectionModel.clone();
- clone.uniquePaths = new Hashtable();
- clone.lastPaths = new Hashtable();
+ clone.uniquePaths = new Hashtable<TreePath, Boolean>();
+ clone.lastPaths = new Hashtable<TreePath, Boolean>();
clone.tempPaths = new TreePath[1];
return clone;
}
--- a/jdk/src/share/classes/javax/swing/tree/FixedHeightLayoutCache.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/tree/FixedHeightLayoutCache.java Wed Jul 05 16:42:37 2017 +0200
@@ -64,21 +64,21 @@
/**
* Maps from TreePath to a FHTreeStateNode.
*/
- private Hashtable treePathMapping;
+ private Hashtable<TreePath, FHTreeStateNode> treePathMapping;
/**
* Used for getting path/row information.
*/
private SearchInfo info;
- private Stack tempStacks;
+ private Stack<Stack<TreePath>> tempStacks;
public FixedHeightLayoutCache() {
super();
- tempStacks = new Stack();
+ tempStacks = new Stack<Stack<TreePath>>();
boundsBuffer = new Rectangle();
- treePathMapping = new Hashtable();
+ treePathMapping = new Hashtable<TreePath, FHTreeStateNode>();
info = new SearchInfo();
setRowHeight(1);
}
@@ -592,7 +592,7 @@
* return null, if you to create a node use getNodeForPath.
*/
private FHTreeStateNode getMapping(TreePath path) {
- return (FHTreeStateNode)treePathMapping.get(path);
+ return treePathMapping.get(path);
}
/**
@@ -695,13 +695,13 @@
return null;
// Check all the parent paths, until a match is found.
- Stack paths;
+ Stack<TreePath> paths;
if(tempStacks.size() == 0) {
- paths = new Stack();
+ paths = new Stack<TreePath>();
}
else {
- paths = (Stack)tempStacks.pop();
+ paths = tempStacks.pop();
}
try {
@@ -714,7 +714,7 @@
// Found a match, create entries for all paths in
// paths.
while(node != null && paths.size() > 0) {
- path = (TreePath)paths.pop();
+ path = paths.pop();
node = node.createChildFor(path.
getLastPathComponent());
}
--- a/jdk/src/share/classes/javax/swing/tree/VariableHeightLayoutCache.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/tree/VariableHeightLayoutCache.java Wed Jul 05 16:42:37 2017 +0200
@@ -56,7 +56,7 @@
* The array of nodes that are currently visible, in the order they
* are displayed.
*/
- private Vector visibleNodes;
+ private Vector<Object> visibleNodes;
/**
* This is set to true if one of the entries has an invalid size.
@@ -79,20 +79,20 @@
/**
* Maps from <code>TreePath</code> to a <code>TreeStateNode</code>.
*/
- private Hashtable treePathMapping;
+ private Hashtable<TreePath, TreeStateNode> treePathMapping;
/**
* A stack of stacks.
*/
- private Stack tempStacks;
+ private Stack<Stack<TreePath>> tempStacks;
public VariableHeightLayoutCache() {
super();
- tempStacks = new Stack();
- visibleNodes = new Vector();
+ tempStacks = new Stack<Stack<TreePath>>();
+ visibleNodes = new Vector<Object>();
boundsBuffer = new Rectangle();
- treePathMapping = new Hashtable();
+ treePathMapping = new Hashtable<TreePath, TreeStateNode>();
}
/**
@@ -704,7 +704,7 @@
* return null, if you to create a node use getNodeForPath.
*/
private TreeStateNode getMapping(TreePath path) {
- return (TreeStateNode)treePathMapping.get(path);
+ return treePathMapping.get(path);
}
/**
@@ -824,13 +824,13 @@
}
// Check all the parent paths, until a match is found.
- Stack paths;
+ Stack<TreePath> paths;
if(tempStacks.size() == 0) {
- paths = new Stack();
+ paths = new Stack<TreePath>();
}
else {
- paths = (Stack)tempStacks.pop();
+ paths = tempStacks.pop();
}
try {
@@ -843,7 +843,7 @@
// Found a match, create entries for all paths in
// paths.
while(node != null && paths.size() > 0) {
- path = (TreePath)paths.pop();
+ path = paths.pop();
node.getLoadedChildren(shouldCreate);
int childIndex = treeModel.
--- a/jdk/src/share/classes/javax/swing/undo/StateEdit.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/undo/StateEdit.java Wed Jul 05 16:42:37 2017 +0200
@@ -116,7 +116,7 @@
protected void init (StateEditable anObject, String name) {
this.object = anObject;
- this.preState = new Hashtable(11);
+ this.preState = new Hashtable<Object, Object>(11);
this.object.storeState(this.preState);
this.postState = null;
this.undoRedoName = name;
@@ -133,7 +133,7 @@
* ends the edit.
*/
public void end() {
- this.postState = new Hashtable(11);
+ this.postState = new Hashtable<Object, Object>(11);
this.object.storeState(this.postState);
this.removeRedundantState();
}
@@ -170,7 +170,7 @@
* Remove redundant key/values in state hashtables.
*/
protected void removeRedundantState() {
- Vector uselessKeys = new Vector();
+ Vector<Object> uselessKeys = new Vector<Object>();
Enumeration myKeys = preState.keys();
// Locate redundant state
--- a/jdk/src/share/classes/javax/swing/undo/UndoManager.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/undo/UndoManager.java Wed Jul 05 16:42:37 2017 +0200
@@ -166,12 +166,10 @@
* @see AbstractUndoableEdit#die
*/
public synchronized void discardAllEdits() {
- Enumeration cursor = edits.elements();
- while (cursor.hasMoreElements()) {
- UndoableEdit e = (UndoableEdit)cursor.nextElement();
+ for (UndoableEdit e : edits) {
e.die();
}
- edits = new Vector();
+ edits = new Vector<UndoableEdit>();
indexOfNextAdd = 0;
// PENDING(rjrjr) when vector grows a removeRange() method
// (expected in JDK 1.2), trimEdits() will be nice and
@@ -240,7 +238,7 @@
// System.out.println("Trimming " + from + " " + to + " with index " +
// indexOfNextAdd);
for (int i = to; from <= i; i--) {
- UndoableEdit e = (UndoableEdit)edits.elementAt(i);
+ UndoableEdit e = edits.elementAt(i);
// System.out.println("JUM: Discarding " +
// e.getUndoPresentationName());
e.die();
@@ -293,7 +291,7 @@
protected UndoableEdit editToBeUndone() {
int i = indexOfNextAdd;
while (i > 0) {
- UndoableEdit edit = (UndoableEdit)edits.elementAt(--i);
+ UndoableEdit edit = edits.elementAt(--i);
if (edit.isSignificant()) {
return edit;
}
@@ -314,7 +312,7 @@
int i = indexOfNextAdd;
while (i < count) {
- UndoableEdit edit = (UndoableEdit)edits.elementAt(i++);
+ UndoableEdit edit = edits.elementAt(i++);
if (edit.isSignificant()) {
return edit;
}
@@ -333,7 +331,7 @@
protected void undoTo(UndoableEdit edit) throws CannotUndoException {
boolean done = false;
while (!done) {
- UndoableEdit next = (UndoableEdit)edits.elementAt(--indexOfNextAdd);
+ UndoableEdit next = edits.elementAt(--indexOfNextAdd);
next.undo();
done = next == edit;
}
@@ -349,7 +347,7 @@
protected void redoTo(UndoableEdit edit) throws CannotRedoException {
boolean done = false;
while (!done) {
- UndoableEdit next = (UndoableEdit)edits.elementAt(indexOfNextAdd++);
+ UndoableEdit next = edits.elementAt(indexOfNextAdd++);
next.redo();
done = next == edit;
}
--- a/jdk/src/share/classes/javax/swing/undo/UndoableEditSupport.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/javax/swing/undo/UndoableEditSupport.java Wed Jul 05 16:42:37 2017 +0200
@@ -89,8 +89,7 @@
* @since 1.4
*/
public synchronized UndoableEditListener[] getUndoableEditListeners() {
- return (UndoableEditListener[])(listeners.toArray(
- new UndoableEditListener[0]));
+ return listeners.toArray(new UndoableEditListener[0]);
}
/**
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/DigesterOutputStream.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/DigesterOutputStream.java Wed Jul 05 16:42:37 2017 +0200
@@ -19,7 +19,10 @@
*
*/
/*
- * $Id: DigesterOutputStream.java,v 1.1.2.2 2005/08/12 18:15:35 mullan Exp $
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DigesterOutputStream.java,v 1.2 2008/07/24 15:20:31 mullan Exp $
*/
package org.jcp.xml.dsig.internal;
@@ -35,10 +38,11 @@
/**
* This class has been modified slightly to use java.security.MessageDigest
* objects as input, rather than
- * org.apache.xml.security.algorithms.MessageDigestAlgorithm objects.
+ * com.sun.org.apache.xml.internal.security.algorithms.MessageDigestAlgorithm objects.
* It also optionally caches the input bytes.
*
* @author raul
+ * @author Sean Mullan
*/
public class DigesterOutputStream extends OutputStream {
private boolean buffer = false;
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/MacOutputStream.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/MacOutputStream.java Wed Jul 05 16:42:37 2017 +0200
@@ -24,15 +24,14 @@
import javax.crypto.Mac;
/**
- * Derived from Apache sources and changed to use Mac objects
- * objects instead of org.apache.xml.security.algorithms.SignatureAlgorithm
- * objects.
+ * Derived from Apache sources and changed to use Mac objects instead of
+ * com.sun.org.apache.xml.internal.security.algorithms.SignatureAlgorithm objects.
*
* @author raul
+ * @author Sean Mullan
*
*/
public class MacOutputStream extends ByteArrayOutputStream {
- private final static byte none[]="error".getBytes();
private final Mac mac;
public MacOutputStream(Mac mac) {
@@ -40,22 +39,20 @@
}
/** @inheritDoc */
- public byte[] toByteArray() {
- return none;
- }
-
- /** @inheritDoc */
public void write(byte[] arg0) {
+ super.write(arg0, 0, arg0.length);
mac.update(arg0);
}
/** @inheritDoc */
public void write(int arg0) {
- mac.update((byte)arg0);
+ super.write(arg0);
+ mac.update((byte) arg0);
}
/** @inheritDoc */
public void write(byte[] arg0, int arg1, int arg2) {
- mac.update(arg0,arg1,arg2);
+ super.write(arg0, arg1, arg2);
+ mac.update(arg0, arg1, arg2);
}
}
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/SignerOutputStream.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/SignerOutputStream.java Wed Jul 05 16:42:37 2017 +0200
@@ -19,7 +19,10 @@
*
*/
/*
- * $Id: SignerOutputStream.java,v 1.1.2.2 2005/08/12 18:01:58 mullan Exp $
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: SignerOutputStream.java,v 1.2 2008/07/24 15:20:31 mullan Exp $
*/
package org.jcp.xml.dsig.internal;
@@ -29,10 +32,11 @@
/**
* Derived from Apache sources and changed to use java.security.Signature
- * objects as input instead of org.apache.xml.security.algorithms.SignatureAlgorithm
+ * objects as input instead of com.sun.org.apache.xml.internal.security.algorithms.SignatureAlgorithm
* objects.
*
* @author raul
+ * @author Sean Mullan
*/
public class SignerOutputStream extends ByteArrayOutputStream {
private final Signature sig;
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: ApacheCanonicalizer.java,v 1.17 2005/09/19 18:20:04 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: ApacheCanonicalizer.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
@@ -53,6 +52,10 @@
public abstract class ApacheCanonicalizer extends TransformService {
+ static {
+ com.sun.org.apache.xml.internal.security.Init.init();
+ }
+
private static Logger log = Logger.getLogger("org.jcp.xml.dsig.internal.dom");
protected Canonicalizer apacheCanonicalizer;
private Transform apacheTransform;
@@ -235,13 +238,9 @@
}
try {
- if (os != null) {
- in = apacheTransform.performTransform(in, os);
- if (!in.isNodeSet() && !in.isElement()) {
- return null;
- }
- } else {
- in = apacheTransform.performTransform(in);
+ in = apacheTransform.performTransform(in, os);
+ if (!in.isNodeSet() && !in.isElement()) {
+ return null;
}
if (in.isOctetStream()) {
return new ApacheOctetStreamData(in);
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheData.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheData.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: ApacheData.java,v 1.4 2005/05/10 18:15:31 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: ApacheData.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: ApacheNodeSetData.java,v 1.4 2005/05/10 18:15:31 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: ApacheNodeSetData.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
@@ -83,7 +82,7 @@
boolean skipNode = false;
while (it.hasNext() && !skipNode) {
NodeFilter nf = (NodeFilter) it.next();
- if (!nf.isNodeInclude(currentNode)) {
+ if (nf.isNodeInclude(currentNode)!=1) {
skipNode = true;
}
}
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheOctetStreamData.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheOctetStreamData.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: ApacheOctetStreamData.java,v 1.4 2005/05/10 18:15:31 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: ApacheOctetStreamData.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheTransform.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheTransform.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: ApacheTransform.java,v 1.23 2005/09/15 14:29:03 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: ApacheTransform.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
@@ -54,6 +53,10 @@
*/
public abstract class ApacheTransform extends TransformService {
+ static {
+ com.sun.org.apache.xml.internal.security.Init.init();
+ }
+
private static Logger log = Logger.getLogger("org.jcp.xml.dsig.internal.dom");
private Transform apacheTransform;
protected Document ownerDoc;
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMBase64Transform.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMBase64Transform.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: DOMBase64Transform.java,v 1.14 2005/05/10 18:15:31 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMBase64Transform.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,79 @@
+/*
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
+ */
+/*
+ * Copyright 2008 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMCanonicalXMLC14N11Method.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
+ */
+package org.jcp.xml.dsig.internal.dom;
+
+import javax.xml.crypto.*;
+import javax.xml.crypto.dsig.*;
+import javax.xml.crypto.dsig.spec.TransformParameterSpec;
+
+import java.security.InvalidAlgorithmParameterException;
+
+import com.sun.org.apache.xml.internal.security.c14n.Canonicalizer;
+import com.sun.org.apache.xml.internal.security.c14n.InvalidCanonicalizerException;
+
+/**
+ * DOM-based implementation of CanonicalizationMethod for Canonical XML 1.1
+ * (with or without comments). Uses Apache XML-Sec Canonicalizer.
+ *
+ * @author Sean Mullan
+ */
+public final class DOMCanonicalXMLC14N11Method extends ApacheCanonicalizer {
+
+ public static final String C14N_11 = "http://www.w3.org/2006/12/xml-c14n11";
+ public static final String C14N_11_WITH_COMMENTS
+ = "http://www.w3.org/2006/12/xml-c14n11#WithComments";
+
+ public void init(TransformParameterSpec params)
+ throws InvalidAlgorithmParameterException {
+ if (params != null) {
+ throw new InvalidAlgorithmParameterException("no parameters " +
+ "should be specified for Canonical XML 1.1 algorithm");
+ }
+ }
+
+ public Data transform(Data data, XMLCryptoContext xc)
+ throws TransformException {
+
+ // ignore comments if dereferencing same-document URI that requires
+ // you to omit comments, even if the Transform says otherwise -
+ // this is to be compliant with section 4.3.3.3 of W3C Rec.
+ if (data instanceof DOMSubTreeData) {
+ DOMSubTreeData subTree = (DOMSubTreeData) data;
+ if (subTree.excludeComments()) {
+ try {
+ apacheCanonicalizer = Canonicalizer.getInstance(C14N_11);
+ } catch (InvalidCanonicalizerException ice) {
+ throw new TransformException
+ ("Couldn't find Canonicalizer for: " +
+ C14N_11 + ": " + ice.getMessage(), ice);
+ }
+ }
+ }
+
+ return canonicalize(data, xc);
+ }
+}
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: DOMCanonicalXMLC14NMethod.java,v 1.24.4.1 2005/08/12 15:27:49 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMCanonicalXMLC14NMethod.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,34 +1,34 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: DOMCanonicalizationMethod.java,v 1.25 2005/05/10 18:15:31 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMCanonicalizationMethod.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
import java.io.OutputStream;
import java.security.InvalidAlgorithmParameterException;
+import java.security.Provider;
import org.w3c.dom.Element;
@@ -60,9 +60,9 @@
*
* @param cmElem a CanonicalizationMethod element
*/
- public DOMCanonicalizationMethod(Element cmElem, XMLCryptoContext context)
- throws MarshalException{
- super(cmElem, context);
+ public DOMCanonicalizationMethod(Element cmElem, XMLCryptoContext context,
+ Provider provider) throws MarshalException {
+ super(cmElem, context, provider);
}
/**
@@ -75,7 +75,7 @@
* additional context (may be <code>null</code> if not applicable)
* @return the canonicalized data
* @throws NullPointerException if <code>data</code> is <code>null</code>
- * @throws XMLSignatureException if an unexpected error occurs while
+ * @throws TransformException if an unexpected error occurs while
* canonicalizing the data
*/
public Data canonicalize(Data data, XMLCryptoContext xc)
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: DOMCryptoBinary.java,v 1.14 2005/05/12 19:28:29 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMCryptoBinary.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMDigestMethod.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMDigestMethod.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005-2007 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: DOMDigestMethod.java,v 1.17 2005/05/10 18:15:32 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMDigestMethod.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
@@ -127,7 +126,7 @@
/**
* Unmarshals <code>DigestMethodParameterSpec</code> from the specified
- * <code>Element</code>. By default, this method throws an exception since
+ * <code>Element</code>. By default, this method throws an exception since
* most DigestMethod algorithms do not have parameters. Subclasses should
* override it if they have parameters.
*
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMEnvelopedTransform.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMEnvelopedTransform.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: DOMEnvelopedTransform.java,v 1.16 2005/05/10 18:15:32 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMEnvelopedTransform.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: DOMExcC14NMethod.java,v 1.28 2005/09/23 20:20:41 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMExcC14NMethod.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
@@ -104,7 +103,7 @@
Element excElem = DOMUtils.createElement
(ownerDoc, "InclusiveNamespaces",
CanonicalizationMethod.EXCLUSIVE, prefix);
- if (prefix == null) {
+ if (prefix == null || prefix.length() == 0) {
excElem.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns",
CanonicalizationMethod.EXCLUSIVE);
} else {
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005-2007 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: DOMHMACSignatureMethod.java,v 1.17 2005/09/15 14:29:04 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMHMACSignatureMethod.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: DOMKeyInfo.java,v 1.19 2005/05/12 19:28:30 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMKeyInfo.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
@@ -33,6 +32,7 @@
import javax.xml.crypto.dsig.keyinfo.KeyInfo;
import javax.xml.crypto.dom.*;
+import java.security.Provider;
import java.util.*;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -82,10 +82,10 @@
/**
* Creates a <code>DOMKeyInfo</code> from XML.
*
- * @param input XML input
+ * @param kiElem KeyInfo element
*/
- public DOMKeyInfo(Element kiElem, XMLCryptoContext context)
- throws MarshalException {
+ public DOMKeyInfo(Element kiElem, XMLCryptoContext context,
+ Provider provider) throws MarshalException {
// get Id attribute, if specified
id = DOMUtils.getAttributeValue(kiElem, "Id");
@@ -112,7 +112,10 @@
} else if (localName.equals("KeyValue")) {
content.add(new DOMKeyValue(childElem));
} else if (localName.equals("RetrievalMethod")) {
- content.add(new DOMRetrievalMethod(childElem, context));
+ content.add
+ (new DOMRetrievalMethod(childElem, context, provider));
+ } else if (localName.equals("PGPData")) {
+ content.add(new DOMPGPData(childElem));
} else { //may be MgmtData, SPKIData or element from other namespace
content.add(new javax.xml.crypto.dom.DOMStructure((childElem)));
}
@@ -139,7 +142,7 @@
Element kiElem = DOMUtils.createElement
(DOMUtils.getOwnerDocument(pNode), "KeyInfo",
XMLSignature.XMLNS, dsPrefix);
- if (dsPrefix == null) {
+ if (dsPrefix == null || dsPrefix.length() == 0) {
kiElem.setAttributeNS
("http://www.w3.org/2000/xmlns/", "xmlns", XMLSignature.XMLNS);
} else {
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,34 +1,34 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: DOMKeyInfoFactory.java,v 1.24 2005/09/23 20:18:50 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMKeyInfoFactory.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
import java.math.BigInteger;
-import java.security.*;
+import java.security.KeyException;
+import java.security.PublicKey;
import java.util.List;
import javax.xml.crypto.*;
import javax.xml.crypto.dsig.*;
@@ -45,7 +45,6 @@
*/
public final class DOMKeyInfoFactory extends KeyInfoFactory {
-
public DOMKeyInfoFactory() { }
public KeyInfo newKeyInfo(List content) {
@@ -135,7 +134,7 @@
"support DOM Level 2 and be namespace aware");
}
if (tag.equals("KeyInfo")) {
- return new DOMKeyInfo(element, null);
+ return new DOMKeyInfo(element, null, getProvider());
} else {
throw new MarshalException("invalid KeyInfo tag: " + tag);
}
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyName.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyName.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: DOMKeyName.java,v 1.12 2005/05/10 18:15:32 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMKeyName.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyValue.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyValue.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: DOMKeyValue.java,v 1.18 2005/05/10 18:15:33 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMKeyValue.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMManifest.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMManifest.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: DOMManifest.java,v 1.16 2005/05/12 19:28:31 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMManifest.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
@@ -31,6 +30,7 @@
import javax.xml.crypto.dom.DOMCryptoContext;
import javax.xml.crypto.dsig.*;
+import java.security.Provider;
import java.util.*;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -83,13 +83,13 @@
*
* @param manElem a Manifest element
*/
- public DOMManifest(Element manElem, XMLCryptoContext context)
- throws MarshalException {
+ public DOMManifest(Element manElem, XMLCryptoContext context,
+ Provider provider) throws MarshalException {
this.id = DOMUtils.getAttributeValue(manElem, "Id");
Element refElem = DOMUtils.getFirstChildElement(manElem);
List refs = new ArrayList();
while (refElem != null) {
- refs.add(new DOMReference(refElem, context));
+ refs.add(new DOMReference(refElem, context, provider));
refElem = DOMUtils.getNextSiblingElement(refElem);
}
this.references = Collections.unmodifiableList(refs);
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMPGPData.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMPGPData.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: DOMPGPData.java,v 1.18 2005/05/12 19:28:31 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMPGPData.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,28 +1,26 @@
/*
- * Portions Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
+ */
+/*
+ * Copyright 2005 The Apache Software Foundation.
*
- * 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * 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).
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 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.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
*/
-
+/*
+ * Portions copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
/*
* ===========================================================================
*
@@ -31,7 +29,7 @@
* ===========================================================================
*/
/*
- * $Id: DOMReference.java,v 1.40 2005/09/19 18:27:04 mullan Exp $
+ * $Id: DOMReference.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
@@ -67,13 +65,27 @@
public final class DOMReference extends DOMStructure
implements Reference, DOMURIReference {
+ /**
+ * Look up useC14N11 system property. If true, an explicit C14N11 transform
+ * will be added if necessary when generating the signature. See section
+ * 3.1.1 of http://www.w3.org/2007/xmlsec/Drafts/xmldsig-core/ for more info.
+ *
+ * If true, overrides the same property if set in the XMLSignContext.
+ */
+ private static boolean useC14N11 =
+ AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
+ public Boolean run() {
+ return Boolean.getBoolean
+ ("com.sun.org.apache.xml.internal.security.useC14N11");
+ }
+ });
+
private static Logger log = Logger.getLogger("org.jcp.xml.dsig.internal.dom");
private final DigestMethod digestMethod;
private final String id;
- private final List appliedTransforms;
private final List transforms;
- private final List allTransforms;
+ private List allTransforms;
private final Data appliedTransformData;
private Attr here;
private final String uri;
@@ -87,6 +99,7 @@
private Data derefData;
private InputStream dis;
private MessageDigest md;
+ private Provider provider;
/**
* Creates a <code>Reference</code> from the specified parameters.
@@ -104,24 +117,25 @@
* not of type <code>Transform</code>
*/
public DOMReference(String uri, String type, DigestMethod dm,
- List transforms, String id) {
- this(uri, type, dm, null, null, transforms, id, null);
- }
-
- public DOMReference(String uri, String type, DigestMethod dm,
- List appliedTransforms, Data result, List transforms, String id) {
- this(uri, type, dm, appliedTransforms, result, transforms, id, null);
+ List transforms, String id, Provider provider) {
+ this(uri, type, dm, null, null, transforms, id, null, provider);
}
public DOMReference(String uri, String type, DigestMethod dm,
List appliedTransforms, Data result, List transforms, String id,
- byte[] digestValue){
+ Provider provider) {
+ this(uri, type, dm, appliedTransforms,
+ result, transforms, id, null, provider);
+ }
+
+ public DOMReference(String uri, String type, DigestMethod dm,
+ List appliedTransforms, Data result, List transforms, String id,
+ byte[] digestValue, Provider provider) {
if (dm == null) {
throw new NullPointerException("DigestMethod must be non-null");
}
- if (appliedTransforms == null || appliedTransforms.isEmpty()) {
- this.appliedTransforms = Collections.EMPTY_LIST;
- } else {
+ this.allTransforms = new ArrayList();
+ if (appliedTransforms != null) {
List transformsCopy = new ArrayList(appliedTransforms);
for (int i = 0, size = transformsCopy.size(); i < size; i++) {
if (!(transformsCopy.get(i) instanceof Transform)) {
@@ -129,10 +143,9 @@
("appliedTransforms["+i+"] is not a valid type");
}
}
- this.appliedTransforms =
- Collections.unmodifiableList(transformsCopy);
+ this.allTransforms = transformsCopy;
}
- if (transforms == null || transforms.isEmpty()) {
+ if (transforms == null) {
this.transforms = Collections.EMPTY_LIST;
} else {
List transformsCopy = new ArrayList(transforms);
@@ -142,11 +155,9 @@
("transforms["+i+"] is not a valid type");
}
}
- this.transforms = Collections.unmodifiableList(transformsCopy);
+ this.transforms = transformsCopy;
+ this.allTransforms.addAll(transformsCopy);
}
- List all = new ArrayList(this.appliedTransforms);
- all.addAll(this.transforms);
- this.allTransforms = Collections.unmodifiableList(all);
this.digestMethod = dm;
this.uri = uri;
if ((uri != null) && (!uri.equals(""))) {
@@ -163,6 +174,7 @@
this.digested = true;
}
this.appliedTransformData = result;
+ this.provider = provider;
}
/**
@@ -170,15 +182,16 @@
*
* @param refElem a Reference element
*/
- public DOMReference(Element refElem, XMLCryptoContext context)
- throws MarshalException {
+ public DOMReference(Element refElem, XMLCryptoContext context,
+ Provider provider) throws MarshalException {
// unmarshal Transforms, if specified
Element nextSibling = DOMUtils.getFirstChildElement(refElem);
List transforms = new ArrayList(5);
if (nextSibling.getLocalName().equals("Transforms")) {
Element transformElem = DOMUtils.getFirstChildElement(nextSibling);
while (transformElem != null) {
- transforms.add(new DOMTransform(transformElem, context));
+ transforms.add
+ (new DOMTransform(transformElem, context, provider));
transformElem = DOMUtils.getNextSiblingElement(transformElem);
}
nextSibling = DOMUtils.getNextSiblingElement(nextSibling);
@@ -203,15 +216,10 @@
this.type = DOMUtils.getAttributeValue(refElem, "Type");
this.here = refElem.getAttributeNodeNS(null, "URI");
this.refElem = refElem;
-
- if (transforms.isEmpty()) {
- this.transforms = Collections.EMPTY_LIST;
- } else {
- this.transforms = Collections.unmodifiableList(transforms);
- }
- this.appliedTransforms = Collections.EMPTY_LIST;
+ this.transforms = transforms;
this.allTransforms = transforms;
this.appliedTransformData = null;
+ this.provider = provider;
}
public DigestMethod getDigestMethod() {
@@ -231,7 +239,7 @@
}
public List getTransforms() {
- return allTransforms;
+ return Collections.unmodifiableList(allTransforms);
}
public byte[] getDigestValue() {
@@ -259,17 +267,13 @@
DOMUtils.setAttribute(refElem, "Type", type);
// create and append Transforms element
- if (!transforms.isEmpty() || !appliedTransforms.isEmpty()) {
+ if (!allTransforms.isEmpty()) {
Element transformsElem = DOMUtils.createElement
(ownerDoc, "Transforms", XMLSignature.XMLNS, dsPrefix);
refElem.appendChild(transformsElem);
- for (int i = 0, size = appliedTransforms.size(); i < size; i++) {
+ for (int i = 0, size = allTransforms.size(); i < size; i++) {
DOMStructure transform =
- (DOMStructure) appliedTransforms.get(i);
- transform.marshal(transformsElem, dsPrefix, context);
- }
- for (int i = 0, size = transforms.size(); i < size; i++) {
- DOMStructure transform = (DOMStructure) transforms.get(i);
+ (DOMStructure) allTransforms.get(i);
transform.marshal(transformsElem, dsPrefix, context);
}
}
@@ -416,21 +420,62 @@
try {
if (data != null) {
XMLSignatureInput xi;
+ // explicitly use C14N 1.1 when generating signature
+ // first check system property, then context property
+ boolean c14n11 = useC14N11;
+ String c14nalg = CanonicalizationMethod.INCLUSIVE;
+ if (context instanceof XMLSignContext) {
+ if (!c14n11) {
+ Boolean prop = (Boolean) context.getProperty
+ ("com.sun.org.apache.xml.internal.security.useC14N11");
+ c14n11 = (prop != null && prop.booleanValue() == true);
+ if (c14n11) {
+ c14nalg = "http://www.w3.org/2006/12/xml-c14n11";
+ }
+ } else {
+ c14nalg = "http://www.w3.org/2006/12/xml-c14n11";
+ }
+ }
if (data instanceof ApacheData) {
xi = ((ApacheData) data).getXMLSignatureInput();
} else if (data instanceof OctetStreamData) {
xi = new XMLSignatureInput
(((OctetStreamData)data).getOctetStream());
} else if (data instanceof NodeSetData) {
- TransformService spi = TransformService.getInstance
- (CanonicalizationMethod.INCLUSIVE, "DOM");
+ TransformService spi = null;
+ try {
+ spi = TransformService.getInstance(c14nalg, "DOM");
+ } catch (NoSuchAlgorithmException nsae) {
+ spi = TransformService.getInstance
+ (c14nalg, "DOM", provider);
+ }
data = spi.transform(data, context);
xi = new XMLSignatureInput
(((OctetStreamData)data).getOctetStream());
} else {
throw new XMLSignatureException("unrecognized Data type");
}
- xi.updateOutputStream(os);
+ if (context instanceof XMLSignContext && c14n11
+ && !xi.isOctetStream() && !xi.isOutputStreamSet()) {
+ DOMTransform t = new DOMTransform
+ (TransformService.getInstance(c14nalg, "DOM"));
+ Element transformsElem = null;
+ String dsPrefix = DOMUtils.getSignaturePrefix(context);
+ if (allTransforms.isEmpty()) {
+ transformsElem = DOMUtils.createElement(
+ refElem.getOwnerDocument(),
+ "Transforms", XMLSignature.XMLNS, dsPrefix);
+ refElem.insertBefore(transformsElem,
+ DOMUtils.getFirstChildElement(refElem));
+ } else {
+ transformsElem = DOMUtils.getFirstChildElement(refElem);
+ }
+ t.marshal(transformsElem, dsPrefix, (DOMCryptoContext) context);
+ allTransforms.add(t);
+ xi.updateOutputStream(os, true);
+ } else {
+ xi.updateOutputStream(os);
+ }
}
os.flush();
if (cache != null && cache.booleanValue() == true) {
@@ -466,7 +511,7 @@
Arrays.equals(digestValue, oref.getDigestValue());
return (digestMethod.equals(oref.getDigestMethod()) && idsEqual &&
- urisEqual && typesEqual && transforms.equals(oref.getTransforms()));
+ urisEqual && typesEqual && allTransforms.equals(oref.getTransforms()));
}
boolean isDigested() {
@@ -486,7 +531,7 @@
};
} catch (Exception e) {
// log a warning
- log.log(Level.WARNING,
+ log.log(Level.WARNING,
"cannot cache dereferenced data: " + e);
return null;
}
@@ -499,7 +544,7 @@
(xsi.getOctetStream(), xsi.getSourceURI(), xsi.getMIMEType());
} catch (IOException ioe) {
// log a warning
- log.log(Level.WARNING,
+ log.log(Level.WARNING,
"cannot cache dereferenced data: " + ioe);
return null;
}
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,28 +1,26 @@
/*
- * Portions Copyright 2005 Sun Microsystems, Inc. All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
+ */
+/*
+ * Copyright 2005 The Apache Software Foundation.
*
- * 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * 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).
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 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.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
*/
-
+/*
+ * Portions copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
/*
* ===========================================================================
*
@@ -31,13 +29,14 @@
* ===========================================================================
*/
/*
- * $Id: DOMRetrievalMethod.java,v 1.24 2005/05/12 19:28:32 mullan Exp $
+ * $Id: DOMRetrievalMethod.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
import java.io.ByteArrayInputStream;
import java.net.URI;
import java.net.URISyntaxException;
+import java.security.Provider;
import java.util.*;
import javax.xml.crypto.*;
import javax.xml.crypto.dsig.*;
@@ -116,8 +115,8 @@
*
* @param rmElem a RetrievalMethod element
*/
- public DOMRetrievalMethod(Element rmElem, XMLCryptoContext context)
- throws MarshalException {
+ public DOMRetrievalMethod(Element rmElem, XMLCryptoContext context,
+ Provider provider) throws MarshalException {
// get URI and Type attributes
uri = DOMUtils.getAttributeValue(rmElem, "URI");
type = DOMUtils.getAttributeValue(rmElem, "Type");
@@ -132,7 +131,8 @@
Element transformElem =
DOMUtils.getFirstChildElement(transformsElem);
while (transformElem != null) {
- transforms.add(new DOMTransform(transformElem, context));
+ transforms.add
+ (new DOMTransform(transformElem, context, provider));
transformElem = DOMUtils.getNextSiblingElement(transformElem);
}
}
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,32 +1,28 @@
/*
- * Portions Copyright 2005-2007 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
*/
/*
- * $Id: DOMSignatureMethod.java,v 1.20.4.1 2005/08/12 14:23:49 mullan Exp $
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMSignatureMethod.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
@@ -226,7 +222,11 @@
}
if (signature == null) {
try {
- signature = Signature.getInstance(getSignatureAlgorithm());
+ Provider p = (Provider) context.getProperty
+ ("org.jcp.xml.dsig.internal.dom.SignatureProvider");
+ signature = (p == null)
+ ? Signature.getInstance(getSignatureAlgorithm())
+ : Signature.getInstance(getSignatureAlgorithm(), p);
} catch (NoSuchAlgorithmException nsae) {
throw new XMLSignatureException(nsae);
}
@@ -274,7 +274,11 @@
}
if (signature == null) {
try {
- signature = Signature.getInstance(getSignatureAlgorithm());
+ Provider p = (Provider) context.getProperty
+ ("org.jcp.xml.dsig.internal.dom.SignatureProvider");
+ signature = (p == null)
+ ? Signature.getInstance(getSignatureAlgorithm())
+ : Signature.getInstance(getSignatureAlgorithm(), p);
} catch (NoSuchAlgorithmException nsae) {
throw new XMLSignatureException(nsae);
}
@@ -302,7 +306,7 @@
/**
* Marshals the algorithm-specific parameters to an Element and
- * appends it to the specified parent element. By default, this method
+ * appends it to the specified parent element. By default, this method
* throws an exception since most SignatureMethod algorithms do not have
* parameters. Subclasses should override it if they have parameters.
*
@@ -360,7 +364,6 @@
private static byte[] convertASN1toXMLDSIG(byte asn1Bytes[])
throws IOException {
- // THIS CODE IS COPIED FROM APACHE (see copyright at top of file)
byte rLength = asn1Bytes[3];
int i;
@@ -401,7 +404,6 @@
private static byte[] convertXMLDSIGtoASN1(byte xmldsigBytes[])
throws IOException {
- // THIS CODE IS COPIED FROM APACHE (see copyright at top of file)
if (xmldsigBytes.length != 40) {
throw new IOException("Invalid XMLDSIG format of DSA signature");
}
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: DOMSignatureProperties.java,v 1.12 2005/05/12 19:28:32 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMSignatureProperties.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: DOMSignatureProperty.java,v 1.14 2005/05/12 19:28:32 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMSignatureProperty.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: DOMSignedInfo.java,v 1.30 2005/09/23 20:14:07 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMSignedInfo.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
@@ -37,6 +36,7 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
+import java.security.Provider;
import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -126,8 +126,8 @@
*
* @param siElem a SignedInfo element
*/
- public DOMSignedInfo(Element siElem, XMLCryptoContext context)
- throws MarshalException {
+ public DOMSignedInfo(Element siElem, XMLCryptoContext context,
+ Provider provider) throws MarshalException {
localSiElem = siElem;
ownerDoc = siElem.getOwnerDocument();
@@ -136,7 +136,8 @@
// unmarshal CanonicalizationMethod
Element cmElem = DOMUtils.getFirstChildElement(siElem);
- canonicalizationMethod = new DOMCanonicalizationMethod(cmElem, context);
+ canonicalizationMethod = new DOMCanonicalizationMethod
+ (cmElem, context, provider);
// unmarshal SignatureMethod
Element smElem = DOMUtils.getNextSiblingElement(cmElem);
@@ -146,7 +147,7 @@
ArrayList refList = new ArrayList(5);
Element refElem = DOMUtils.getNextSiblingElement(smElem);
while (refElem != null) {
- refList.add(new DOMReference(refElem, context));
+ refList.add(new DOMReference(refElem, context, provider));
refElem = DOMUtils.getNextSiblingElement(refElem);
}
references = Collections.unmodifiableList(refList);
@@ -188,9 +189,8 @@
DOMSubTreeData subTree = new DOMSubTreeData(localSiElem, true);
- OctetStreamData data = null;
try {
- data = (OctetStreamData) ((DOMCanonicalizationMethod)
+ Data data = ((DOMCanonicalizationMethod)
canonicalizationMethod).canonicalize(subTree, context, os);
} catch (TransformException te) {
throw new XMLSignatureException(te);
@@ -205,9 +205,11 @@
char[] siBytes = new char[signedInfoBytes.length];
try {
isr.read(siBytes);
- } catch (IOException ioex) {} //ignore since this is logging code
- log.log(Level.FINE, "Canonicalized SignedInfo:\n"
- + new String(siBytes));
+ log.log(Level.FINE, "Canonicalized SignedInfo:\n"
+ + new String(siBytes));
+ } catch (IOException ioex) {
+ log.log(Level.FINE, "IOException reading SignedInfo bytes");
+ }
log.log(Level.FINE, "Data to be signed/verified:"
+ Base64.encode(signedInfoBytes));
}
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMStructure.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMStructure.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: DOMStructure.java,v 1.11 2005/05/10 18:15:34 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMStructure.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSubTreeData.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSubTreeData.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: DOMSubTreeData.java,v 1.2 2005/09/15 14:29:04 mullan Exp $
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMSubTreeData.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMTransform.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMTransform.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,35 +1,35 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: DOMTransform.java,v 1.25 2005/05/10 18:15:34 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMTransform.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
import java.io.OutputStream;
import java.security.InvalidAlgorithmParameterException;
import java.security.NoSuchAlgorithmException;
+import java.security.Provider;
import java.security.spec.AlgorithmParameterSpec;
import org.w3c.dom.Document;
@@ -68,14 +68,17 @@
*
* @param transElem a Transform element
*/
- public DOMTransform(Element transElem, XMLCryptoContext context)
- throws MarshalException {
- Document ownerDoc = transElem.getOwnerDocument();
+ public DOMTransform(Element transElem, XMLCryptoContext context,
+ Provider provider) throws MarshalException {
String algorithm = DOMUtils.getAttributeValue(transElem, "Algorithm");
try {
spi = TransformService.getInstance(algorithm, "DOM");
- } catch (NoSuchAlgorithmException e) {
- throw new MarshalException(e);
+ } catch (NoSuchAlgorithmException e1) {
+ try {
+ spi = TransformService.getInstance(algorithm, "DOM", provider);
+ } catch (NoSuchAlgorithmException e2) {
+ throw new MarshalException(e2);
+ }
}
try {
spi.init(new javax.xml.crypto.dom.DOMStructure(transElem), context);
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: DOMURIDereferencer.java,v 1.19 2005/09/23 20:09:34 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMURIDereferencer.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
@@ -83,11 +82,9 @@
// this is a bit of a hack to check for registered
// IDRefs and manually register them with Apache's IdResolver
// map which includes builtin schema knowledge of DSig/Enc IDs
- if (context instanceof XMLSignContext) {
- Node referencedElem = dcc.getElementById(id);
- if (referencedElem != null) {
- IdResolver.registerElementById((Element) referencedElem, id);
- }
+ Node referencedElem = dcc.getElementById(id);
+ if (referencedElem != null) {
+ IdResolver.registerElementById((Element) referencedElem, id);
}
}
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMUtils.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMUtils.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: DOMUtils.java,v 1.18 2005/05/12 19:28:34 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMUtils.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
@@ -77,7 +76,8 @@
*/
public static Element createElement(Document doc, String tag, String nsURI,
String prefix) {
- String qName = prefix == null ? tag : prefix + ":" + tag;
+ String qName = (prefix == null || prefix.length() == 0)
+ ? tag : prefix + ":" + tag;
return doc.createElementNS(nsURI, qName);
}
@@ -327,6 +327,7 @@
XPathType type = (XPathType) types.get(i);
XPathType otype = (XPathType) otypes.get(i);
if (!type.getExpression().equals(otype.getExpression()) ||
+ !type.getNamespaceMap().equals(otype.getNamespaceMap()) ||
type.getFilter() != otype.getFilter()) {
return false;
}
@@ -341,8 +342,8 @@
private static boolean paramsEqual(XPathFilterParameterSpec spec1,
XPathFilterParameterSpec spec2) {
-
- return spec1.getXPath().equals(spec2.getXPath());
+ return (spec1.getXPath().equals(spec2.getXPath()) &&
+ spec1.getNamespaceMap().equals(spec2.getNamespaceMap()));
}
private static boolean paramsEqual(XSLTTransformParameterSpec spec1,
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509Data.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509Data.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: DOMX509Data.java,v 1.20 2005/05/12 19:28:34 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMX509Data.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
@@ -53,7 +52,7 @@
public final class DOMX509Data extends DOMStructure implements X509Data {
private final List content;
- private CertificateFactory cf; //FIX - make this static?
+ private CertificateFactory cf;
/**
* Creates a DOMX509Data.
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: DOMX509IssuerSerial.java,v 1.13 2005/05/10 18:15:35 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMX509IssuerSerial.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLObject.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLObject.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: DOMXMLObject.java,v 1.16 2005/05/12 19:28:35 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMXMLObject.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
@@ -31,6 +30,7 @@
import javax.xml.crypto.dom.DOMCryptoContext;
import javax.xml.crypto.dsig.*;
+import java.security.Provider;
import java.util.*;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -87,8 +87,8 @@
* @param objElem an Object element
* @throws MarshalException if there is an error when unmarshalling
*/
- public DOMXMLObject(Element objElem, XMLCryptoContext context)
- throws MarshalException {
+ public DOMXMLObject(Element objElem, XMLCryptoContext context,
+ Provider provider) throws MarshalException {
// unmarshal attributes
this.encoding = DOMUtils.getAttributeValue(objElem, "Encoding");
this.id = DOMUtils.getAttributeValue(objElem, "Id");
@@ -103,7 +103,7 @@
Element childElem = (Element) child;
String tag = childElem.getLocalName();
if (tag.equals("Manifest")) {
- content.add(new DOMManifest(childElem, context));
+ content.add(new DOMManifest(childElem, context, provider));
continue;
} else if (tag.equals("SignatureProperties")) {
content.add(new DOMSignatureProperties(childElem));
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,28 +1,26 @@
/*
- * Portions Copyright 2005 Sun Microsystems, Inc. All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
+ */
+/*
+ * Copyright 2005 The Apache Software Foundation.
*
- * 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * 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).
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 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.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
*/
-
+/*
+ * Portions copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
/*
* ===========================================================================
*
@@ -31,7 +29,7 @@
* ===========================================================================
*/
/*
- * $Id: DOMXMLSignature.java,v 1.42 2005/09/23 20:29:04 mullan Exp $
+ * $Id: DOMXMLSignature.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
@@ -45,6 +43,7 @@
import java.io.*;
import java.security.InvalidKeyException;
import java.security.Key;
+import java.security.Provider;
import java.util.Collections;
import java.util.ArrayList;
import java.util.HashMap;
@@ -128,8 +127,8 @@
* @param sigElem Signature element
* @throws MarshalException if XMLSignature cannot be unmarshalled
*/
- public DOMXMLSignature(Element sigElem, XMLCryptoContext context)
- throws MarshalException {
+ public DOMXMLSignature(Element sigElem, XMLCryptoContext context,
+ Provider provider) throws MarshalException {
localSigElem = sigElem;
ownerDoc = localSigElem.getOwnerDocument();
@@ -138,7 +137,7 @@
// unmarshal SignedInfo
Element siElem = DOMUtils.getFirstChildElement(localSigElem);
- si = new DOMSignedInfo(siElem, context);
+ si = new DOMSignedInfo(siElem, context, provider);
// unmarshal SignatureValue
Element sigValElem = DOMUtils.getNextSiblingElement(siElem);
@@ -147,7 +146,7 @@
// unmarshal KeyInfo, if specified
Element nextSibling = DOMUtils.getNextSiblingElement(sigValElem);
if (nextSibling != null && nextSibling.getLocalName().equals("KeyInfo")) {
- ki = new DOMKeyInfo(nextSibling, context);
+ ki = new DOMKeyInfo(nextSibling, context, provider);
nextSibling = DOMUtils.getNextSiblingElement(nextSibling);
}
@@ -157,7 +156,8 @@
} else {
List tempObjects = new ArrayList();
while (nextSibling != null) {
- tempObjects.add(new DOMXMLObject(nextSibling, context));
+ tempObjects.add
+ (new DOMXMLObject(nextSibling, context, provider));
nextSibling = DOMUtils.getNextSiblingElement(nextSibling);
}
objects = Collections.unmodifiableList(tempObjects);
@@ -201,9 +201,7 @@
(ownerDoc, "Signature", XMLSignature.XMLNS, dsPrefix);
// append xmlns attribute
- //XXX I think this is supposed to be automatically inserted when
- //XXX serializing a DOM2 tree, but doesn't seem to work with JAXP/Xalan
- if (dsPrefix == null) {
+ if (dsPrefix == null || dsPrefix.length() == 0) {
sigElem.setAttributeNS
("http://www.w3.org/2000/xmlns/", "xmlns", XMLSignature.XMLNS);
} else {
@@ -301,7 +299,7 @@
Reference ref = (Reference) manRefs.get(k);
boolean refValid = ref.validate(vc);
if (log.isLoggable(Level.FINE)) {
- log.log(Level.FINE, "Manifest ref["
+ log.log(Level.FINE, "Manifest ref["
+ ref.getURI() + "] is valid: " + refValid);
}
validateMans &= refValid;
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005-2007 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: DOMXMLSignatureFactory.java,v 1.21 2005/09/23 19:59:11 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMXMLSignatureFactory.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
@@ -33,7 +32,8 @@
import javax.xml.crypto.dsig.keyinfo.*;
import javax.xml.crypto.dsig.spec.*;
-import java.security.*;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.NoSuchAlgorithmException;
import java.security.spec.AlgorithmParameterSpec;
import java.util.List;
import org.w3c.dom.Document;
@@ -67,7 +67,7 @@
public Reference newReference(String uri, DigestMethod dm, List transforms,
String type, String id) {
- return new DOMReference(uri, type, dm, transforms, id);
+ return new DOMReference(uri, type, dm, transforms, id, getProvider());
}
public Reference newReference(String uri, DigestMethod dm,
@@ -83,7 +83,7 @@
throw new NullPointerException("result cannot be null");
}
return new DOMReference
- (uri, type, dm, appliedTransforms, result, transforms, id);
+ (uri, type, dm, appliedTransforms, result, transforms, id, getProvider());
}
public Reference newReference(String uri, DigestMethod dm, List transforms,
@@ -92,7 +92,7 @@
throw new NullPointerException("digestValue cannot be null");
}
return new DOMReference
- (uri, type, dm, null, null, transforms, id, digestValue);
+ (uri, type, dm, null, null, transforms, id, digestValue, getProvider());
}
public SignedInfo newSignedInfo(CanonicalizationMethod cm,
@@ -170,7 +170,7 @@
"support DOM Level 2 and be namespace aware");
}
if (tag.equals("Signature")) {
- return new DOMXMLSignature(element, context);
+ return new DOMXMLSignature(element, context, getProvider());
} else {
throw new MarshalException("invalid Signature tag: " + tag);
}
@@ -235,7 +235,12 @@
public Transform newTransform(String algorithm,
TransformParameterSpec params) throws NoSuchAlgorithmException,
InvalidAlgorithmParameterException {
- TransformService spi = TransformService.getInstance(algorithm, "DOM");
+ TransformService spi;
+ try {
+ spi = TransformService.getInstance(algorithm, "DOM");
+ } catch (NoSuchAlgorithmException nsae) {
+ spi = TransformService.getInstance(algorithm, "DOM", getProvider());
+ }
spi.init(params);
return new DOMTransform(spi);
}
@@ -243,7 +248,12 @@
public Transform newTransform(String algorithm,
XMLStructure params) throws NoSuchAlgorithmException,
InvalidAlgorithmParameterException {
- TransformService spi = TransformService.getInstance(algorithm, "DOM");
+ TransformService spi;
+ try {
+ spi = TransformService.getInstance(algorithm, "DOM");
+ } catch (NoSuchAlgorithmException nsae) {
+ spi = TransformService.getInstance(algorithm, "DOM", getProvider());
+ }
if (params == null) {
spi.init(null);
} else {
@@ -255,7 +265,12 @@
public CanonicalizationMethod newCanonicalizationMethod(String algorithm,
C14NMethodParameterSpec params) throws NoSuchAlgorithmException,
InvalidAlgorithmParameterException {
- TransformService spi = TransformService.getInstance(algorithm, "DOM");
+ TransformService spi;
+ try {
+ spi = TransformService.getInstance(algorithm, "DOM");
+ } catch (NoSuchAlgorithmException nsae) {
+ spi = TransformService.getInstance(algorithm, "DOM", getProvider());
+ }
spi.init(params);
return new DOMCanonicalizationMethod(spi);
}
@@ -263,7 +278,12 @@
public CanonicalizationMethod newCanonicalizationMethod(String algorithm,
XMLStructure params) throws NoSuchAlgorithmException,
InvalidAlgorithmParameterException {
- TransformService spi = TransformService.getInstance(algorithm, "DOM");
+ TransformService spi;
+ try {
+ spi = TransformService.getInstance(algorithm, "DOM");
+ } catch (NoSuchAlgorithmException nsae) {
+ spi = TransformService.getInstance(algorithm, "DOM", getProvider());
+ }
if (params == null) {
spi.init(null);
} else {
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,28 +1,23 @@
/*
- * Portions Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
+ */
+/*
+ * Copyright 2005 The Apache Software Foundation.
*
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 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.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
*/
-
/*
* ===========================================================================
*
@@ -31,7 +26,10 @@
* ===========================================================================
*/
/*
- * $Id: DOMXPathFilter2Transform.java,v 1.18 2005/09/19 18:30:30 mullan Exp $
+ * Portions copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMXPathFilter2Transform.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
@@ -129,7 +127,8 @@
XPathFilter2ParameterSpec xp =
(XPathFilter2ParameterSpec) getParameterSpec();
String prefix = DOMUtils.getNSPrefix(context, Transform.XPATH2);
- String qname = (prefix == null) ? "xmlns" : "xmlns:" + prefix;
+ String qname = (prefix == null || prefix.length() == 0)
+ ? "xmlns" : "xmlns:" + prefix;
List list = xp.getXPathList();
for (int i = 0, size = list.size(); i < size; i++) {
XPathType xpathType = (XPathType) list.get(i);
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathTransform.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathTransform.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: DOMXPathTransform.java,v 1.16 2005/05/12 19:28:35 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMXPathTransform.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: DOMXSLTTransform.java,v 1.15 2005/05/10 18:15:36 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: DOMXSLTTransform.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/Utils.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/Utils.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,29 +1,28 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
*/
/*
- * $Id: Utils.java,v 1.14 2005/09/23 19:49:20 mullan Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+/*
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: Utils.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/XMLDSigRI.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,28 +1,23 @@
/*
- * Portions Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * reserved comment block
+ * DO NOT REMOVE OR ALTER!
+ */
+/*
+ * Copyright 2005 The Apache Software Foundation.
*
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 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.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
*/
-
/*
* ===========================================================================
*
@@ -31,7 +26,10 @@
* ===========================================================================
*/
/*
- * $Id: XMLDSigRI.java,v 1.7 2005/05/12 19:28:36 mullan Exp $
+ * Portions copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ */
+/*
+ * $Id: XMLDSigRI.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
@@ -86,6 +84,22 @@
CanonicalizationMethod.INCLUSIVE_WITH_COMMENTS +
" MechanismType", "DOM");
+ // Inclusive C14N 1.1
+ map.put((String)"TransformService." +
+ "http://www.w3.org/2006/12/xml-c14n11",
+ "org.jcp.xml.dsig.internal.dom.DOMCanonicalXMLC14N11Method");
+ map.put((String)"TransformService." +
+ "http://www.w3.org/2006/12/xml-c14n11" +
+ " MechanismType", "DOM");
+
+ // InclusiveWithComments C14N 1.1
+ map.put((String)"TransformService." +
+ "http://www.w3.org/2006/12/xml-c14n11#WithComments",
+ "org.jcp.xml.dsig.internal.dom.DOMCanonicalXMLC14N11Method");
+ map.put((String)"TransformService." +
+ "http://www.w3.org/2006/12/xml-c14n11#WithComments" +
+ " MechanismType", "DOM");
+
// Exclusive C14N
map.put((String) "TransformService." + CanonicalizationMethod.EXCLUSIVE,
"org.jcp.xml.dsig.internal.dom.DOMExcC14NMethod");
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/package.html Fri Oct 10 13:29:11 2008 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<html>
-<body>
-Contains the classes of the Reference Implementation of JSR 105.
-</body>
-</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/sun/awt/EventQueueDelegate.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package sun.awt;
+
+import java.awt.AWTEvent;
+import java.awt.EventQueue;
+
+
+public class EventQueueDelegate {
+ private static final Object EVENT_QUEUE_DELEGATE_KEY =
+ new StringBuilder("EventQueueDelegate.Delegate");
+
+ public static void setDelegate(Delegate delegate) {
+ AppContext.getAppContext().put(EVENT_QUEUE_DELEGATE_KEY, delegate);
+ }
+ public static Delegate getDelegate() {
+ return
+ (Delegate) AppContext.getAppContext().get(EVENT_QUEUE_DELEGATE_KEY);
+ }
+ public interface Delegate {
+ /**
+ * This method allows for changing {@code EventQueue} events order.
+ *
+ * @param eventQueue current {@code EventQueue}
+ * @return next {@code event} for the {@code EventDispatchThread}
+ */
+
+ public AWTEvent getNextEvent(EventQueue eventQueue) throws InterruptedException;
+
+ /**
+ * Notifies delegate before EventQueue.dispatch method.
+ *
+ * Note: this method may mutate the event
+ *
+ * @param event to be dispatched by {@code dispatch} method
+ * @return handle to be passed to {@code afterDispatch} method
+ */
+ public Object beforeDispatch(AWTEvent event) throws InterruptedException;
+
+ /**
+ * Notifies delegate after EventQueue.dispatch method.
+ *
+ * @param event {@code event} dispatched by the {@code dispatch} method
+ * @param handle object which came from {@code beforeDispatch} method
+ */
+ public void afterDispatch(AWTEvent event, Object handle) throws InterruptedException;
+ }
+}
--- a/jdk/src/share/classes/sun/awt/im/CompositionArea.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/awt/im/CompositionArea.java Wed Jul 05 16:42:37 2017 +0200
@@ -56,7 +56,8 @@
* @author JavaSoft International
*/
-public class CompositionArea extends JPanel implements InputMethodListener {
+// This class is final due to the 6607310 fix. Refer to the CR for details.
+public final class CompositionArea extends JPanel implements InputMethodListener {
private CompositionAreaHandler handler;
--- a/jdk/src/share/classes/sun/awt/im/InputContext.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/awt/im/InputContext.java Wed Jul 05 16:42:37 2017 +0200
@@ -297,7 +297,7 @@
*/
synchronized (source.getTreeLock()) {
synchronized (this) {
- if (source instanceof CompositionArea) {
+ if ("sun.awt.im.CompositionArea".equals(source.getClass().getName())) {
// no special handling for this one
} else if (getComponentWindow(source) instanceof InputMethodWindow) {
// no special handling for this one either
--- a/jdk/src/share/classes/sun/awt/im/InputMethodManager.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/awt/im/InputMethodManager.java Wed Jul 05 16:42:37 2017 +0200
@@ -358,6 +358,7 @@
AppContext requesterAppContext = SunToolkit.targetToAppContext(requester);
synchronized (lock) {
SunToolkit.postEvent(requesterAppContext, event);
+ lock.wait();
}
Throwable eventThrowable = event.getThrowable();
--- a/jdk/src/share/classes/sun/launcher/LauncherHelp.java Fri Oct 10 13:29:11 2008 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-
-/*
- * Copyright 2007 Sun Microsystems, Inc. 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. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package sun.launcher;
-
-/*
- *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.</b>
- *
- */
-
-/**
- * A utility package for the java(1), javaw(1) launchers.
- */
-import java.io.File;
-import java.io.PrintStream;
-import java.util.ResourceBundle;
-import java.text.MessageFormat;
-
-public class LauncherHelp {
-
- private static final String defaultBundleName = "sun.launcher.resources.launcher";
- private static ResourceBundle javarb = ResourceBundle.getBundle(defaultBundleName);
-
- private static StringBuilder outBuf = new StringBuilder();
-
- /** Creates a new instance of LauncherHelp, keep it a singleton */
- private LauncherHelp(){}
-
-
- /**
- * A private helper method to get a localized message and also
- * apply any arguments that we might pass.
- */
- private static String getLocalizedMessage(String key, Object... args) {
- String msg = javarb.getString(key);
- return (args != null) ? MessageFormat.format(msg, args) : msg;
- }
-
- /**
- * The java -help message is split into 3 parts, an invariant, followed
- * by a set of platform dependent variant messages, finally an invariant
- * set of lines.
- * This method initializes the help message for the first time, and also
- * assembles the invariant header part of the message.
- */
- static void initHelpMessage(String progname) {
- outBuf = outBuf.append(getLocalizedMessage("java.launcher.opt.header", (progname == null) ? "java" : progname ));
- outBuf = outBuf.append(getLocalizedMessage("java.launcher.opt.datamodel", 32));
- outBuf = outBuf.append(getLocalizedMessage("java.launcher.opt.datamodel", 64));
- }
-
- /**
- * Appends the vm selection messages to the header, already created.
- * initHelpSystem must already be called.
- */
- static void appendVmSelectMessage(String vm1, String vm2) {
- outBuf = outBuf.append(getLocalizedMessage("java.launcher.opt.vmselect", vm1, vm2));
- }
-
- /**
- * Appends the vm synoym message to the header, already created.
- * initHelpSystem must be called before using this method.
- */
- static void appendVmSynonymMessage(String vm1, String vm2) {
- outBuf = outBuf.append(getLocalizedMessage("java.launcher.opt.hotspot", vm1, vm2));
- }
-
- /**
- * Appends the vm Ergo message to the header, already created.
- * initHelpSystem must be called before using this method.
- */
- static void appendVmErgoMessage(boolean isServerClass, String vm) {
- outBuf = outBuf.append(getLocalizedMessage("java.launcher.ergo.message1", vm));
- outBuf = (isServerClass)
- ? outBuf.append(",\n" + getLocalizedMessage("java.launcher.ergo.message2") + "\n\n")
- : outBuf.append(".\n\n");
- }
-
- /**
- * Appends the last invariant part to the previously created messages,
- * and finishes up the printing to the desired output stream.
- * initHelpSystem must be called before using this method.
- */
- static void printHelpMessage(boolean printToStderr) {
- PrintStream ostream = (printToStderr) ? System.err : System.out;
- outBuf = outBuf.append(getLocalizedMessage("java.launcher.opt.footer", File.pathSeparator));
- ostream.println(outBuf.toString());
- }
-
- /**
- * Prints the Xusage text to the desired output stream.
- */
- static void printXUsageMessage(boolean printToStderr) {
- PrintStream ostream = (printToStderr) ? System.err : System.out;
- ostream.println(getLocalizedMessage("java.launcher.X.usage", File.pathSeparator));
- }
-
- /* Test code */
- public static void main(String[] args) {
- initHelpMessage("java");
- appendVmSelectMessage("-client", "client");
- appendVmSelectMessage("-server", "server");
- appendVmSynonymMessage("-hotspot", "client");
- appendVmErgoMessage(true, "server");
- printHelpMessage(true);
-
- System.err.println("------------------------------------");
-
- printXUsageMessage(true);
- }
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/sun/launcher/LauncherHelper.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,233 @@
+
+/*
+ * Copyright 2007-2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package sun.launcher;
+
+/*
+ *
+ * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * If you write code that depends on this, you do so at your own
+ * risk. This code and its internal interfaces are subject to change
+ * or deletion without notice.</b>
+ *
+ */
+
+/**
+ * A utility package for the java(1), javaw(1) launchers.
+ * The following are helper methods that the native launcher uses
+ * to perform checks etc. using JNI, see src/share/bin/java.c
+ */
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ResourceBundle;
+import java.text.MessageFormat;
+import java.util.jar.Attributes;
+import java.util.jar.JarFile;
+import java.util.jar.Manifest;
+
+public enum LauncherHelper {
+ INSTANCE;
+ private static final String defaultBundleName =
+ "sun.launcher.resources.launcher";
+ private static ResourceBundle javarb =
+ ResourceBundle.getBundle(defaultBundleName);
+ private static final String MAIN_CLASS = "Main-Class";
+
+ private static StringBuilder outBuf = new StringBuilder();
+
+ /**
+ * A private helper method to get a localized message and also
+ * apply any arguments that we might pass.
+ */
+ private static String getLocalizedMessage(String key, Object... args) {
+ String msg = javarb.getString(key);
+ return (args != null) ? MessageFormat.format(msg, args) : msg;
+ }
+
+ /**
+ * The java -help message is split into 3 parts, an invariant, followed
+ * by a set of platform dependent variant messages, finally an invariant
+ * set of lines.
+ * This method initializes the help message for the first time, and also
+ * assembles the invariant header part of the message.
+ */
+ static void initHelpMessage(String progname) {
+ outBuf = outBuf.append(getLocalizedMessage("java.launcher.opt.header",
+ (progname == null) ? "java" : progname ));
+ outBuf = outBuf.append(getLocalizedMessage("java.launcher.opt.datamodel",
+ 32));
+ outBuf = outBuf.append(getLocalizedMessage("java.launcher.opt.datamodel",
+ 64));
+ }
+
+ /**
+ * Appends the vm selection messages to the header, already created.
+ * initHelpSystem must already be called.
+ */
+ static void appendVmSelectMessage(String vm1, String vm2) {
+ outBuf = outBuf.append(getLocalizedMessage("java.launcher.opt.vmselect",
+ vm1, vm2));
+ }
+
+ /**
+ * Appends the vm synoym message to the header, already created.
+ * initHelpSystem must be called before using this method.
+ */
+ static void appendVmSynonymMessage(String vm1, String vm2) {
+ outBuf = outBuf.append(getLocalizedMessage("java.launcher.opt.hotspot",
+ vm1, vm2));
+ }
+
+ /**
+ * Appends the vm Ergo message to the header, already created.
+ * initHelpSystem must be called before using this method.
+ */
+ static void appendVmErgoMessage(boolean isServerClass, String vm) {
+ outBuf = outBuf.append(getLocalizedMessage("java.launcher.ergo.message1",
+ vm));
+ outBuf = (isServerClass)
+ ? outBuf.append(",\n" +
+ getLocalizedMessage("java.launcher.ergo.message2") + "\n\n")
+ : outBuf.append(".\n\n");
+ }
+
+ /**
+ * Appends the last invariant part to the previously created messages,
+ * and finishes up the printing to the desired output stream.
+ * initHelpSystem must be called before using this method.
+ */
+ static void printHelpMessage(boolean printToStderr) {
+ PrintStream ostream = (printToStderr) ? System.err : System.out;
+ outBuf = outBuf.append(getLocalizedMessage("java.launcher.opt.footer",
+ File.pathSeparator));
+ ostream.println(outBuf.toString());
+ }
+
+ /**
+ * Prints the Xusage text to the desired output stream.
+ */
+ static void printXUsageMessage(boolean printToStderr) {
+ PrintStream ostream = (printToStderr) ? System.err : System.out;
+ ostream.println(getLocalizedMessage("java.launcher.X.usage",
+ File.pathSeparator));
+ }
+
+ static String getMainClassFromJar(String jarname) throws IOException {
+ JarFile jarFile = null;
+ try {
+ jarFile = new JarFile(jarname);
+ Manifest manifest = jarFile.getManifest();
+ if (manifest == null) {
+ throw new IOException("manifest not found in " + jarname);
+ }
+ Attributes mainAttrs = manifest.getMainAttributes();
+ if (mainAttrs == null) {
+ throw new IOException("no main mainifest attributes, in " +
+ jarname);
+ }
+ return mainAttrs.getValue(MAIN_CLASS).trim();
+ } finally {
+ if (jarFile != null) {
+ jarFile.close();
+ }
+ }
+ }
+
+ /**
+ * This method does the following:
+ * 1. gets the classname from a Jar's manifest, if necessary
+ * 2. loads the class using the System ClassLoader
+ * 3. ensures the availability and accessibility of the main method,
+ * using signatureDiagnostic method.
+ * a. does the class exist
+ * b. is there a main
+ * c. is the main public
+ * d. is the main static
+ * c. does the main take a String array for args
+ * 4. and off we go......
+ *
+ * @param printToStderr
+ * @param isJar
+ * @param name
+ * @return
+ * @throws java.io.IOException
+ */
+ public static Object checkAndLoadMain(boolean printToStderr,
+ boolean isJar, String name) throws IOException {
+ // get the class name
+ String classname = (isJar) ? getMainClassFromJar(name) : name;
+ classname = classname.replace('/', '.');
+ ClassLoader loader = ClassLoader.getSystemClassLoader();
+ Class<?> clazz = null;
+ PrintStream ostream = (printToStderr) ? System.err : System.out;
+ try {
+ clazz = loader.loadClass(classname);
+ } catch (ClassNotFoundException cnfe) {
+ ostream.println(getLocalizedMessage("java.launcher.cls.error1", classname));
+ NoClassDefFoundError ncdfe = new NoClassDefFoundError(classname);
+ ncdfe.initCause(cnfe);
+ throw ncdfe;
+ }
+ signatureDiagnostic(ostream, clazz);
+ return clazz;
+ }
+
+ static void signatureDiagnostic(PrintStream ostream, Class<?> clazz) {
+ String classname = clazz.getName();
+ Method method = null;
+ try {
+ method = clazz.getMethod("main", String[].class);
+ } catch (Exception e) {
+ ostream.println(getLocalizedMessage("java.launcher.cls.error4",
+ classname));
+ throw new RuntimeException("Main method not found in " + classname);
+ }
+ /*
+ * getMethod (above) will choose the correct method, based
+ * on its name and parameter type, however, we still have to
+ * ensure that the method is static and returns a void.
+ */
+ int mod = method.getModifiers();
+ if (!Modifier.isStatic(mod)) {
+ ostream.println(getLocalizedMessage("java.launcher.cls.error2",
+ "static", classname));
+ throw new RuntimeException("Main method is not static in class " +
+ classname);
+ }
+ Class<?> rType = method.getReturnType();
+ if (!rType.isPrimitive() || !rType.getName().equals("void")) {
+ ostream.println(getLocalizedMessage("java.launcher.cls.error3",
+ classname));
+ throw new RuntimeException("Main method must return a value" +
+ " of type void in class " +
+ classname);
+ }
+ return;
+ }
+}
--- a/jdk/src/share/classes/sun/launcher/resources/launcher.properties Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher.properties Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
#
-# Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2007-2008 Sun Microsystems, Inc. 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
@@ -99,3 +99,18 @@
\ -Xshare:auto use shared class data if possible (default)\n\
\ -Xshare:on require using shared class data, otherwise fail.\n\n\
The -X options are non-standard and subject to change without notice.\n
+
+java.launcher.cls.error1=\
+ Error: Could not find main class {0}
+java.launcher.cls.error2=\
+ Error: Main method is not {0} in class {1}, please define the main method as:\n\
+\ public static void main(String[] args)
+java.launcher.cls.error3=\
+ Error: Main method must return a value of type void in class {0}, please \n\
+ define the main method as:\n\
+\ public static void main(String[] args)
+java.launcher.cls.error4=\
+ Error: Main method not found in class {0}, please define the main method as:\n\
+\ public static void main(String[] args)
+
+
--- a/jdk/src/share/classes/sun/net/ConnectionResetException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/net/ConnectionResetException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2002 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2008 Sun Microsystems, Inc. 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
@@ -30,10 +30,11 @@
/**
* Thrown to indicate a connection reset.
*
- * @since 1.4
+ * @since 1.4.1
*/
public
class ConnectionResetException extends SocketException {
+ private static final long serialVersionUID = -7633185991801851556L;
public ConnectionResetException(String msg) {
super(msg);
--- a/jdk/src/share/classes/sun/net/ProgressEvent.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/net/ProgressEvent.java Wed Jul 05 16:42:37 2017 +0200
@@ -32,6 +32,7 @@
*
* @author Stanley Man-Kit Ho
*/
+@SuppressWarnings("serial") // never serialized
public class ProgressEvent extends EventObject {
// URL of the stream
private URL url;
--- a/jdk/src/share/classes/sun/net/TelnetProtocolException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/net/TelnetProtocolException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-1995 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,8 @@
*/
public class TelnetProtocolException extends IOException {
+ private static final long serialVersionUID = 8509127047257111343L;
+
public TelnetProtocolException(String s) {
super(s);
}
--- a/jdk/src/share/classes/sun/net/ftp/FtpLoginException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/net/ftp/FtpLoginException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-1995 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,8 @@
* @author Jonathan Payne
*/
public class FtpLoginException extends FtpProtocolException {
+ private static final long serialVersionUID = 2218162403237941536L;
+
FtpLoginException(String s) {
super(s);
}
--- a/jdk/src/share/classes/sun/net/ftp/FtpProtocolException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/net/ftp/FtpProtocolException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-1995 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,8 @@
* @author Jonathan Payne
*/
public class FtpProtocolException extends IOException {
+ private static final long serialVersionUID = 5978077070276545054L;
+
FtpProtocolException(String s) {
super(s);
}
--- a/jdk/src/share/classes/sun/net/httpserver/HttpError.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/net/httpserver/HttpError.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc. 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
@@ -29,6 +29,8 @@
* A Http error
*/
class HttpError extends RuntimeException {
+ private static final long serialVersionUID = 8769596371344178179L;
+
public HttpError (String msg) {
super (msg);
}
--- a/jdk/src/share/classes/sun/net/httpserver/StreamClosedException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/net/httpserver/StreamClosedException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc. 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
@@ -28,4 +28,5 @@
import java.io.*;
class StreamClosedException extends IOException {
+ private static final long serialVersionUID = -4485921499356327937L;
}
--- a/jdk/src/share/classes/sun/net/smtp/SmtpProtocolException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/net/smtp/SmtpProtocolException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1995 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. 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
@@ -32,6 +32,8 @@
* an SMTP session.
*/
public class SmtpProtocolException extends IOException {
+ private static final long serialVersionUID = -7547136771133814908L;
+
SmtpProtocolException(String s) {
super(s);
}
--- a/jdk/src/share/classes/sun/net/www/ApplicationLaunchException.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/net/www/ApplicationLaunchException.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 1996 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc. 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
@@ -33,6 +33,8 @@
*/
public class ApplicationLaunchException extends Exception {
+ private static final long serialVersionUID = -4782286141289536883L;
+
public ApplicationLaunchException(String reason) {
super(reason);
}
--- a/jdk/src/share/classes/sun/net/www/http/KeepAliveStreamCleaner.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/net/www/http/KeepAliveStreamCleaner.java Wed Jul 05 16:42:37 2017 +0200
@@ -43,6 +43,7 @@
* @author Chris Hegarty
*/
+@SuppressWarnings("serial") // never serialized
public class KeepAliveStreamCleaner extends LinkedBlockingQueue<KeepAliveCleanerEntry> implements Runnable
{
// maximum amount of remaining data that we will try to cleanup
--- a/jdk/src/share/classes/sun/net/www/protocol/http/DigestAuthentication.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/net/www/protocol/http/DigestAuthentication.java Wed Jul 05 16:42:37 2017 +0200
@@ -59,6 +59,8 @@
// instances as a result of a single authorization (for multiple domains)
static class Parameters implements java.io.Serializable {
+ private static final long serialVersionUID = -3584543755194526252L;
+
private boolean serverQop; // server proposed qop=auth
private String opaque;
private String cnonce;
--- a/jdk/src/share/classes/sun/swing/AccessibleMethod.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/swing/AccessibleMethod.java Wed Jul 05 16:42:37 2017 +0200
@@ -114,7 +114,7 @@
/** The action used to fetch the method and make it accessible */
private static class AccessMethodAction implements PrivilegedExceptionAction<Method> {
- private final Class klass;
+ private final Class<?> klass;
private final String methodName;
private final Class[] paramTypes;
--- a/jdk/src/share/classes/sun/swing/FilePane.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/swing/FilePane.java Wed Jul 05 16:42:37 2017 +0200
@@ -308,44 +308,80 @@
}
public void setViewType(int viewType) {
- int oldValue = this.viewType;
- if (viewType == oldValue) {
+ if (viewType == this.viewType) {
return;
}
+
+ int oldValue = this.viewType;
this.viewType = viewType;
+ JPanel createdViewPanel = null;
+ Component newFocusOwner = null;
+
switch (viewType) {
case VIEWTYPE_LIST:
if (viewPanels[viewType] == null) {
- JPanel p = fileChooserUIAccessor.createList();
- if (p == null) {
- p = createList();
+ createdViewPanel = fileChooserUIAccessor.createList();
+ if (createdViewPanel == null) {
+ createdViewPanel = createList();
}
- setViewPanel(viewType, p);
+
+ list = (JList) findChildComponent(createdViewPanel, JList.class);
+ if (listSelectionModel == null) {
+ listSelectionModel = list.getSelectionModel();
+ if (detailsTable != null) {
+ detailsTable.setSelectionModel(listSelectionModel);
+ }
+ } else {
+ list.setSelectionModel(listSelectionModel);
+ }
}
list.setLayoutOrientation(JList.VERTICAL_WRAP);
+ newFocusOwner = list;
break;
case VIEWTYPE_DETAILS:
if (viewPanels[viewType] == null) {
- JPanel p = fileChooserUIAccessor.createDetailsView();
- if (p == null) {
- p = createDetailsView();
+ createdViewPanel = fileChooserUIAccessor.createDetailsView();
+ if (createdViewPanel == null) {
+ createdViewPanel = createDetailsView();
}
- setViewPanel(viewType, p);
+
+ detailsTable = (JTable) findChildComponent(createdViewPanel, JTable.class);
+ detailsTable.setRowHeight(Math.max(detailsTable.getFont().getSize() + 4, 16 + 1));
+ if (listSelectionModel != null) {
+ detailsTable.setSelectionModel(listSelectionModel);
+ }
}
+ newFocusOwner = detailsTable;
break;
}
- JPanel oldViewPanel = currentViewPanel;
+
+ if (createdViewPanel != null) {
+ viewPanels[viewType] = createdViewPanel;
+ recursivelySetInheritsPopupMenu(createdViewPanel, true);
+ }
+
+ boolean isFocusOwner = false;
+
+ if (currentViewPanel != null) {
+ Component owner = DefaultKeyboardFocusManager.
+ getCurrentKeyboardFocusManager().getPermanentFocusOwner();
+
+ isFocusOwner = owner == detailsTable || owner == list;
+
+ remove(currentViewPanel);
+ }
+
currentViewPanel = viewPanels[viewType];
- if (currentViewPanel != oldViewPanel) {
- if (oldViewPanel != null) {
- remove(oldViewPanel);
- }
- add(currentViewPanel, BorderLayout.CENTER);
- revalidate();
- repaint();
+ add(currentViewPanel, BorderLayout.CENTER);
+
+ if (isFocusOwner && newFocusOwner != null) {
+ newFocusOwner.requestFocusInWindow();
}
+
+ revalidate();
+ repaint();
updateViewMenu();
firePropertyChange("viewType", oldValue, viewType);
}
@@ -385,42 +421,6 @@
}
}
- public void setViewPanel(int viewType, JPanel viewPanel) {
- viewPanels[viewType] = viewPanel;
- recursivelySetInheritsPopupMenu(viewPanel, true);
-
- switch (viewType) {
- case VIEWTYPE_LIST:
- list = (JList)findChildComponent(viewPanels[viewType], JList.class);
- if (listSelectionModel == null) {
- listSelectionModel = list.getSelectionModel();
- if (detailsTable != null) {
- detailsTable.setSelectionModel(listSelectionModel);
- }
- } else {
- list.setSelectionModel(listSelectionModel);
- }
- break;
-
- case VIEWTYPE_DETAILS:
- detailsTable = (JTable)findChildComponent(viewPanels[viewType], JTable.class);
- detailsTable.setRowHeight(Math.max(detailsTable.getFont().getSize() + 4, 16+1));
- if (listSelectionModel != null) {
- detailsTable.setSelectionModel(listSelectionModel);
- }
- break;
- }
- if (this.viewType == viewType) {
- if (currentViewPanel != null) {
- remove(currentViewPanel);
- }
- currentViewPanel = viewPanel;
- add(currentViewPanel, BorderLayout.CENTER);
- revalidate();
- repaint();
- }
- }
-
protected void installDefaults() {
Locale l = getFileChooser().getLocale();
@@ -546,8 +546,7 @@
public static void addActionsToMap(ActionMap map, Action[] actions) {
if (map != null && actions != null) {
- for (int i = 0; i < actions.length; i++) {
- Action a = actions[i];
+ for (Action a : actions) {
String cmd = (String)a.getValue(Action.ACTION_COMMAND_KEY);
if (cmd == null) {
cmd = (String)a.getValue(Action.NAME);
@@ -715,13 +714,13 @@
visibleColumns.toArray(columns);
columnMap = Arrays.copyOf(columnMap, columns.length);
- List<RowSorter.SortKey> sortKeys =
+ List<? extends RowSorter.SortKey> sortKeys =
(rowSorter == null) ? null : rowSorter.getSortKeys();
fireTableStructureChanged();
restoreSortKeys(sortKeys);
}
- private void restoreSortKeys(List<RowSorter.SortKey> sortKeys) {
+ private void restoreSortKeys(List<? extends RowSorter.SortKey> sortKeys) {
if (sortKeys != null) {
// check if preserved sortKeys are valid for this folder
for (int i = 0; i < sortKeys.size(); i++) {
@@ -886,7 +885,7 @@
return rowSorter;
}
- private class DetailsTableRowSorter extends TableRowSorter {
+ private class DetailsTableRowSorter extends TableRowSorter<TableModel> {
public DetailsTableRowSorter() {
setModelWrapper(new SorterModelWrapper());
}
@@ -906,8 +905,8 @@
updateComparators(detailsTableModel.getColumns());
}
- private class SorterModelWrapper extends ModelWrapper {
- public Object getModel() {
+ private class SorterModelWrapper extends ModelWrapper<TableModel, Integer> {
+ public TableModel getModel() {
return getDetailsTableModel();
}
@@ -923,7 +922,7 @@
return FilePane.this.getModel().getElementAt(row);
}
- public Object getIdentifier(int row) {
+ public Integer getIdentifier(int row) {
return row;
}
}
@@ -1718,9 +1717,9 @@
private void updateViewMenu() {
if (viewMenu != null) {
Component[] comps = viewMenu.getMenuComponents();
- for (int i = 0; i < comps.length; i++) {
- if (comps[i] instanceof JRadioButtonMenuItem) {
- JRadioButtonMenuItem mi = (JRadioButtonMenuItem)comps[i];
+ for (Component comp : comps) {
+ if (comp instanceof JRadioButtonMenuItem) {
+ JRadioButtonMenuItem mi = (JRadioButtonMenuItem) comp;
if (((ViewTypeAction)mi.getAction()).viewType == viewType) {
mi.setSelected(true);
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/sun/swing/MenuItemLayoutHelper.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,1338 @@
+/*
+ * Copyright 2002-2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package sun.swing;
+
+import static sun.swing.SwingUtilities2.BASICMENUITEMUI_MAX_TEXT_OFFSET;
+
+import javax.swing.*;
+import javax.swing.plaf.basic.BasicHTML;
+import javax.swing.text.View;
+import java.awt.*;
+import java.awt.event.KeyEvent;
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * Calculates preferred size and layouts menu items.
+ */
+public class MenuItemLayoutHelper {
+
+ /* Client Property keys for calculation of maximal widths */
+ public static final StringUIClientPropertyKey MAX_ARROW_WIDTH =
+ new StringUIClientPropertyKey("maxArrowWidth");
+ public static final StringUIClientPropertyKey MAX_CHECK_WIDTH =
+ new StringUIClientPropertyKey("maxCheckWidth");
+ public static final StringUIClientPropertyKey MAX_ICON_WIDTH =
+ new StringUIClientPropertyKey("maxIconWidth");
+ public static final StringUIClientPropertyKey MAX_TEXT_WIDTH =
+ new StringUIClientPropertyKey("maxTextWidth");
+ public static final StringUIClientPropertyKey MAX_ACC_WIDTH =
+ new StringUIClientPropertyKey("maxAccWidth");
+ public static final StringUIClientPropertyKey MAX_LABEL_WIDTH =
+ new StringUIClientPropertyKey("maxLabelWidth");
+
+ private JMenuItem mi;
+ private JComponent miParent;
+
+ private Font font;
+ private Font accFont;
+ private FontMetrics fm;
+ private FontMetrics accFm;
+
+ private Icon icon;
+ private Icon checkIcon;
+ private Icon arrowIcon;
+ private String text;
+ private String accText;
+
+ private boolean isColumnLayout;
+ private boolean useCheckAndArrow;
+ private boolean isLeftToRight;
+ private boolean isTopLevelMenu;
+ private View htmlView;
+
+ private int verticalAlignment;
+ private int horizontalAlignment;
+ private int verticalTextPosition;
+ private int horizontalTextPosition;
+ private int gap;
+ private int leadingGap;
+ private int afterCheckIconGap;
+ private int minTextOffset;
+
+ private int leftTextExtraWidth;
+ private int rightTextExtraWidth;
+
+ private Rectangle viewRect;
+
+ private RectSize iconSize;
+ private RectSize textSize;
+ private RectSize accSize;
+ private RectSize checkSize;
+ private RectSize arrowSize;
+ private RectSize labelSize;
+
+ /**
+ * The empty protected constructor is necessary for derived classes.
+ */
+ protected MenuItemLayoutHelper() {
+ }
+
+ public MenuItemLayoutHelper(JMenuItem mi, Icon checkIcon, Icon arrowIcon,
+ Rectangle viewRect, int gap, String accDelimiter,
+ boolean isLeftToRight, Font font, Font accFont,
+ boolean useCheckAndArrow, String propertyPrefix) {
+ reset(mi, checkIcon, arrowIcon, viewRect, gap, accDelimiter,
+ isLeftToRight, font, accFont, useCheckAndArrow, propertyPrefix);
+ }
+
+ protected void reset(JMenuItem mi, Icon checkIcon, Icon arrowIcon,
+ Rectangle viewRect, int gap, String accDelimiter,
+ boolean isLeftToRight, Font font, Font accFont,
+ boolean useCheckAndArrow, String propertyPrefix) {
+ this.mi = mi;
+ this.miParent = getMenuItemParent(mi);
+ this.accText = getAccText(accDelimiter);
+ this.verticalAlignment = mi.getVerticalAlignment();
+ this.horizontalAlignment = mi.getHorizontalAlignment();
+ this.verticalTextPosition = mi.getVerticalTextPosition();
+ this.horizontalTextPosition = mi.getHorizontalTextPosition();
+ this.useCheckAndArrow = useCheckAndArrow;
+ this.font = font;
+ this.accFont = accFont;
+ this.fm = mi.getFontMetrics(font);
+ this.accFm = mi.getFontMetrics(accFont);
+ this.isLeftToRight = isLeftToRight;
+ this.isColumnLayout = isColumnLayout(isLeftToRight,
+ horizontalAlignment, horizontalTextPosition,
+ verticalTextPosition);
+ this.isTopLevelMenu = (this.miParent == null) ? true : false;
+ this.checkIcon = checkIcon;
+ this.icon = getIcon(propertyPrefix);
+ this.arrowIcon = arrowIcon;
+ this.text = mi.getText();
+ this.gap = gap;
+ this.afterCheckIconGap = getAfterCheckIconGap(propertyPrefix);
+ this.minTextOffset = getMinTextOffset(propertyPrefix);
+ this.htmlView = (View) mi.getClientProperty(BasicHTML.propertyKey);
+ this.viewRect = viewRect;
+
+ this.iconSize = new RectSize();
+ this.textSize = new RectSize();
+ this.accSize = new RectSize();
+ this.checkSize = new RectSize();
+ this.arrowSize = new RectSize();
+ this.labelSize = new RectSize();
+ calcExtraWidths();
+ calcWidthsAndHeights();
+ setOriginalWidths();
+ calcMaxWidths();
+
+ this.leadingGap = getLeadingGap(propertyPrefix);
+ calcMaxTextOffset(viewRect);
+ }
+
+ private void calcExtraWidths() {
+ leftTextExtraWidth = getLeftExtraWidth(text);
+ rightTextExtraWidth = getRightExtraWidth(text);
+ }
+
+ private int getLeftExtraWidth(String str) {
+ int lsb = SwingUtilities2.getLeftSideBearing(mi, fm, str);
+ if (lsb < 0) {
+ return -lsb;
+ } else {
+ return 0;
+ }
+ }
+
+ private int getRightExtraWidth(String str) {
+ int rsb = SwingUtilities2.getRightSideBearing(mi, fm, str);
+ if (rsb > 0) {
+ return rsb;
+ } else {
+ return 0;
+ }
+ }
+
+ private void setOriginalWidths() {
+ iconSize.origWidth = iconSize.width;
+ textSize.origWidth = textSize.width;
+ accSize.origWidth = accSize.width;
+ checkSize.origWidth = checkSize.width;
+ arrowSize.origWidth = arrowSize.width;
+ }
+
+ private String getAccText(String acceleratorDelimiter) {
+ String accText = "";
+ KeyStroke accelerator = mi.getAccelerator();
+ if (accelerator != null) {
+ int modifiers = accelerator.getModifiers();
+ if (modifiers > 0) {
+ accText = KeyEvent.getKeyModifiersText(modifiers);
+ accText += acceleratorDelimiter;
+ }
+ int keyCode = accelerator.getKeyCode();
+ if (keyCode != 0) {
+ accText += KeyEvent.getKeyText(keyCode);
+ } else {
+ accText += accelerator.getKeyChar();
+ }
+ }
+ return accText;
+ }
+
+ private Icon getIcon(String propertyPrefix) {
+ // In case of column layout, .checkIconFactory is defined for this UI,
+ // the icon is compatible with it and useCheckAndArrow() is true,
+ // then the icon is handled by the checkIcon.
+ Icon icon = null;
+ MenuItemCheckIconFactory iconFactory =
+ (MenuItemCheckIconFactory) UIManager.get(propertyPrefix
+ + ".checkIconFactory");
+ if (!isColumnLayout || !useCheckAndArrow || iconFactory == null
+ || !iconFactory.isCompatible(checkIcon, propertyPrefix)) {
+ icon = mi.getIcon();
+ }
+ return icon;
+ }
+
+ private int getMinTextOffset(String propertyPrefix) {
+ int minimumTextOffset = 0;
+ Object minimumTextOffsetObject =
+ UIManager.get(propertyPrefix + ".minimumTextOffset");
+ if (minimumTextOffsetObject instanceof Integer) {
+ minimumTextOffset = (Integer) minimumTextOffsetObject;
+ }
+ return minimumTextOffset;
+ }
+
+ private int getAfterCheckIconGap(String propertyPrefix) {
+ int afterCheckIconGap = gap;
+ Object afterCheckIconGapObject =
+ UIManager.get(propertyPrefix + ".afterCheckIconGap");
+ if (afterCheckIconGapObject instanceof Integer) {
+ afterCheckIconGap = (Integer) afterCheckIconGapObject;
+ }
+ return afterCheckIconGap;
+ }
+
+ private int getLeadingGap(String propertyPrefix) {
+ if (checkSize.getMaxWidth() > 0) {
+ return getCheckOffset(propertyPrefix);
+ } else {
+ return gap; // There is no any check icon
+ }
+ }
+
+ private int getCheckOffset(String propertyPrefix) {
+ int checkIconOffset = gap;
+ Object checkIconOffsetObject =
+ UIManager.get(propertyPrefix + ".checkIconOffset");
+ if (checkIconOffsetObject instanceof Integer) {
+ checkIconOffset = (Integer) checkIconOffsetObject;
+ }
+ return checkIconOffset;
+ }
+
+ protected void calcWidthsAndHeights() {
+ // iconRect
+ if (icon != null) {
+ iconSize.width = icon.getIconWidth();
+ iconSize.height = icon.getIconHeight();
+ }
+
+ // accRect
+ if (!accText.equals("")) {
+ accSize.width = SwingUtilities2.stringWidth(mi, accFm, accText);
+ accSize.height = accFm.getHeight();
+ }
+
+ // textRect
+ if (text == null) {
+ text = "";
+ } else if (!text.equals("")) {
+ if (htmlView != null) {
+ // Text is HTML
+ textSize.width =
+ (int) htmlView.getPreferredSpan(View.X_AXIS);
+ textSize.height =
+ (int) htmlView.getPreferredSpan(View.Y_AXIS);
+ } else {
+ // Text isn't HTML
+ textSize.width = SwingUtilities2.stringWidth(mi, fm, text);
+ textSize.height = fm.getHeight();
+ }
+ }
+
+ if (useCheckAndArrow) {
+ // checkIcon
+ if (checkIcon != null) {
+ checkSize.width = checkIcon.getIconWidth();
+ checkSize.height = checkIcon.getIconHeight();
+ }
+ // arrowRect
+ if (arrowIcon != null) {
+ arrowSize.width = arrowIcon.getIconWidth();
+ arrowSize.height = arrowIcon.getIconHeight();
+ }
+ }
+
+ // labelRect
+ if (isColumnLayout) {
+ labelSize.width = iconSize.width + textSize.width + gap;
+ labelSize.height = max(checkSize.height, iconSize.height,
+ textSize.height, accSize.height, arrowSize.height);
+ } else {
+ Rectangle textRect = new Rectangle();
+ Rectangle iconRect = new Rectangle();
+ SwingUtilities.layoutCompoundLabel(mi, fm, text, icon,
+ verticalAlignment, horizontalAlignment,
+ verticalTextPosition, horizontalTextPosition,
+ viewRect, iconRect, textRect, gap);
+ textRect.width += leftTextExtraWidth + rightTextExtraWidth;
+ Rectangle labelRect = iconRect.union(textRect);
+ labelSize.height = labelRect.height;
+ labelSize.width = labelRect.width;
+ }
+ }
+
+ protected void calcMaxWidths() {
+ calcMaxWidth(checkSize, MAX_CHECK_WIDTH);
+ calcMaxWidth(arrowSize, MAX_ARROW_WIDTH);
+ calcMaxWidth(accSize, MAX_ACC_WIDTH);
+
+ if (isColumnLayout) {
+ calcMaxWidth(iconSize, MAX_ICON_WIDTH);
+ calcMaxWidth(textSize, MAX_TEXT_WIDTH);
+ int curGap = gap;
+ if ((iconSize.getMaxWidth() == 0)
+ || (textSize.getMaxWidth() == 0)) {
+ curGap = 0;
+ }
+ labelSize.maxWidth =
+ calcMaxValue(MAX_LABEL_WIDTH, iconSize.maxWidth
+ + textSize.maxWidth + curGap);
+ } else {
+ // We shouldn't use current icon and text widths
+ // in maximal widths calculation for complex layout.
+ iconSize.maxWidth = getParentIntProperty(MAX_ICON_WIDTH);
+ calcMaxWidth(labelSize, MAX_LABEL_WIDTH);
+ // If maxLabelWidth is wider
+ // than the widest icon + the widest text + gap,
+ // we should update the maximal text witdh
+ int candidateTextWidth = labelSize.maxWidth - iconSize.maxWidth;
+ if (iconSize.maxWidth > 0) {
+ candidateTextWidth -= gap;
+ }
+ textSize.maxWidth = calcMaxValue(MAX_TEXT_WIDTH, candidateTextWidth);
+ }
+ }
+
+ protected void calcMaxWidth(RectSize rs, Object key) {
+ rs.maxWidth = calcMaxValue(key, rs.width);
+ }
+
+ /**
+ * Calculates and returns maximal value through specified parent component
+ * client property.
+ *
+ * @param propertyName name of the property, which stores the maximal value.
+ * @param value a value which pretends to be maximal
+ * @return maximal value among the parent property and the value.
+ */
+ protected int calcMaxValue(Object propertyName, int value) {
+ // Get maximal value from parent client property
+ int maxValue = getParentIntProperty(propertyName);
+ // Store new maximal width in parent client property
+ if (value > maxValue) {
+ if (miParent != null) {
+ miParent.putClientProperty(propertyName, value);
+ }
+ return value;
+ } else {
+ return maxValue;
+ }
+ }
+
+ /**
+ * Returns parent client property as int.
+ * @param propertyName name of the parent property.
+ * @return value of the property as int.
+ */
+ protected int getParentIntProperty(Object propertyName) {
+ Object value = null;
+ if (miParent != null) {
+ value = miParent.getClientProperty(propertyName);
+ }
+ if ((value == null) || !(value instanceof Integer)) {
+ value = 0;
+ }
+ return (Integer) value;
+ }
+
+ public static boolean isColumnLayout(boolean isLeftToRight,
+ JMenuItem mi) {
+ assert(mi != null);
+ return isColumnLayout(isLeftToRight, mi.getHorizontalAlignment(),
+ mi.getHorizontalTextPosition(), mi.getVerticalTextPosition());
+ }
+
+ /**
+ * Answers should we do column layout for a menu item or not.
+ * We do it when a user doesn't set any alignments
+ * and text positions manually, except the vertical alignment.
+ */
+ public static boolean isColumnLayout(boolean isLeftToRight,
+ int horizontalAlignment,
+ int horizontalTextPosition,
+ int verticalTextPosition) {
+ if (verticalTextPosition != SwingConstants.CENTER) {
+ return false;
+ }
+ if (isLeftToRight) {
+ if (horizontalAlignment != SwingConstants.LEADING
+ && horizontalAlignment != SwingConstants.LEFT) {
+ return false;
+ }
+ if (horizontalTextPosition != SwingConstants.TRAILING
+ && horizontalTextPosition != SwingConstants.RIGHT) {
+ return false;
+ }
+ } else {
+ if (horizontalAlignment != SwingConstants.LEADING
+ && horizontalAlignment != SwingConstants.RIGHT) {
+ return false;
+ }
+ if (horizontalTextPosition != SwingConstants.TRAILING
+ && horizontalTextPosition != SwingConstants.LEFT) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Calculates maximal text offset.
+ * It is required for some L&Fs (ex: Vista L&F).
+ * The offset is meaningful only for L2R column layout.
+ *
+ * @param viewRect the rectangle, the maximal text offset
+ * will be calculated for.
+ */
+ private void calcMaxTextOffset(Rectangle viewRect) {
+ if (!isColumnLayout || !isLeftToRight) {
+ return;
+ }
+
+ // Calculate the current text offset
+ int offset = viewRect.x + leadingGap + checkSize.maxWidth
+ + afterCheckIconGap + iconSize.maxWidth + gap;
+ if (checkSize.maxWidth == 0) {
+ offset -= afterCheckIconGap;
+ }
+ if (iconSize.maxWidth == 0) {
+ offset -= gap;
+ }
+
+ // maximal text offset shouldn't be less than minimal text offset;
+ if (offset < minTextOffset) {
+ offset = minTextOffset;
+ }
+
+ // Calculate and store the maximal text offset
+ calcMaxValue(SwingUtilities2.BASICMENUITEMUI_MAX_TEXT_OFFSET, offset);
+ }
+
+ /**
+ * Layout icon, text, check icon, accelerator text and arrow icon
+ * in the viewRect and return their positions.
+ *
+ * If horizontalAlignment, verticalTextPosition and horizontalTextPosition
+ * are default (user doesn't set any manually) the layouting algorithm is:
+ * Elements are layouted in the five columns:
+ * check icon + icon + text + accelerator text + arrow icon
+ *
+ * In the other case elements are layouted in the four columns:
+ * check icon + label + accelerator text + arrow icon
+ * Label is union of icon and text.
+ *
+ * The order of columns can be reversed.
+ * It depends on the menu item orientation.
+ */
+ public LayoutResult layoutMenuItem() {
+ LayoutResult lr = createLayoutResult();
+ prepareForLayout(lr);
+
+ if (isColumnLayout()) {
+ if (isLeftToRight()) {
+ doLTRColumnLayout(lr, getLTRColumnAlignment());
+ } else {
+ doRTLColumnLayout(lr, getRTLColumnAlignment());
+ }
+ } else {
+ if (isLeftToRight()) {
+ doLTRComplexLayout(lr, getLTRColumnAlignment());
+ } else {
+ doRTLComplexLayout(lr, getRTLColumnAlignment());
+ }
+ }
+
+ alignAccCheckAndArrowVertically(lr);
+ return lr;
+ }
+
+ private LayoutResult createLayoutResult() {
+ return new LayoutResult(
+ new Rectangle(iconSize.width, iconSize.height),
+ new Rectangle(textSize.width, textSize.height),
+ new Rectangle(accSize.width, accSize.height),
+ new Rectangle(checkSize.width, checkSize.height),
+ new Rectangle(arrowSize.width, arrowSize.height),
+ new Rectangle(labelSize.width, labelSize.height)
+ );
+ }
+
+ public ColumnAlignment getLTRColumnAlignment() {
+ return ColumnAlignment.LEFT_ALIGNMENT;
+ }
+
+ public ColumnAlignment getRTLColumnAlignment() {
+ return ColumnAlignment.RIGHT_ALIGNMENT;
+ }
+
+ protected void prepareForLayout(LayoutResult lr) {
+ lr.checkRect.width = checkSize.maxWidth;
+ lr.accRect.width = accSize.maxWidth;
+ lr.arrowRect.width = arrowSize.maxWidth;
+ }
+
+ /**
+ * Aligns the accelertor text and the check and arrow icons vertically
+ * with the center of the label rect.
+ */
+ private void alignAccCheckAndArrowVertically(LayoutResult lr) {
+ lr.accRect.y = (int)(lr.labelRect.y
+ + (float)lr.labelRect.height/2
+ - (float)lr.accRect.height/2);
+ fixVerticalAlignment(lr, lr.accRect);
+ if (useCheckAndArrow) {
+ lr.arrowRect.y = (int)(lr.labelRect.y
+ + (float)lr.labelRect.height/2
+ - (float)lr.arrowRect.height/2);
+ lr.checkRect.y = (int)(lr.labelRect.y
+ + (float)lr.labelRect.height/2
+ - (float)lr.checkRect.height/2);
+ fixVerticalAlignment(lr, lr.arrowRect);
+ fixVerticalAlignment(lr, lr.checkRect);
+ }
+ }
+
+ /**
+ * Fixes vertical alignment of all menu item elements if rect.y
+ * or (rect.y + rect.height) is out of viewRect bounds
+ */
+ private void fixVerticalAlignment(LayoutResult lr, Rectangle r) {
+ int delta = 0;
+ if (r.y < viewRect.y) {
+ delta = viewRect.y - r.y;
+ } else if (r.y + r.height > viewRect.y + viewRect.height) {
+ delta = viewRect.y + viewRect.height - r.y - r.height;
+ }
+ if (delta != 0) {
+ lr.checkRect.y += delta;
+ lr.iconRect.y += delta;
+ lr.textRect.y += delta;
+ lr.accRect.y += delta;
+ lr.arrowRect.y += delta;
+ lr.labelRect.y += delta;
+ }
+ }
+
+ private void doLTRColumnLayout(LayoutResult lr, ColumnAlignment alignment) {
+ // Set maximal width for all the five basic rects
+ // (three other ones are already maximal)
+ lr.iconRect.width = iconSize.maxWidth;
+ lr.textRect.width = textSize.maxWidth;
+
+ // Set X coordinates
+ // All rects will be aligned at the left side
+ calcXPositionsLTR(viewRect.x, leadingGap, gap, lr.checkRect,
+ lr.iconRect, lr.textRect);
+
+ // Tune afterCheckIconGap
+ if (lr.checkRect.width > 0) { // there is the afterCheckIconGap
+ lr.iconRect.x += afterCheckIconGap - gap;
+ lr.textRect.x += afterCheckIconGap - gap;
+ }
+
+ calcXPositionsRTL(viewRect.x + viewRect.width, leadingGap, gap,
+ lr.arrowRect, lr.accRect);
+
+ // Take into account minimal text offset
+ int textOffset = lr.textRect.x - viewRect.x;
+ if (!isTopLevelMenu && (textOffset < minTextOffset)) {
+ lr.textRect.x += minTextOffset - textOffset;
+ }
+
+ alignRects(lr, alignment);
+
+ // Set Y coordinate for text and icon.
+ // Y coordinates for other rects
+ // will be calculated later in layoutMenuItem.
+ calcTextAndIconYPositions(lr);
+
+ // Calculate valid X and Y coordinates for labelRect
+ lr.setLabelRect(lr.textRect.union(lr.iconRect));
+ }
+
+ private void doLTRComplexLayout(LayoutResult lr, ColumnAlignment alignment) {
+ lr.labelRect.width = labelSize.maxWidth;
+
+ // Set X coordinates
+ calcXPositionsLTR(viewRect.x, leadingGap, gap, lr.checkRect,
+ lr.labelRect);
+
+ // Tune afterCheckIconGap
+ if (lr.checkRect.width > 0) { // there is the afterCheckIconGap
+ lr.labelRect.x += afterCheckIconGap - gap;
+ }
+
+ calcXPositionsRTL(viewRect.x + viewRect.width,
+ leadingGap, gap, lr.arrowRect, lr.accRect);
+
+ // Take into account minimal text offset
+ int labelOffset = lr.labelRect.x - viewRect.x;
+ if (!isTopLevelMenu && (labelOffset < minTextOffset)) {
+ lr.labelRect.x += minTextOffset - labelOffset;
+ }
+
+ alignRects(lr, alignment);
+
+ // Center labelRect vertically
+ calcLabelYPosition(lr);
+
+ layoutIconAndTextInLabelRect(lr);
+ }
+
+ private void doRTLColumnLayout(LayoutResult lr, ColumnAlignment alignment) {
+ // Set maximal width for all the five basic rects
+ // (three other ones are already maximal)
+ lr.iconRect.width = iconSize.maxWidth;
+ lr.textRect.width = textSize.maxWidth;
+
+ // Set X coordinates
+ calcXPositionsRTL(viewRect.x + viewRect.width, leadingGap, gap,
+ lr.checkRect, lr.iconRect, lr.textRect);
+
+ // Tune the gap after check icon
+ if (lr.checkRect.width > 0) { // there is the gap after check icon
+ lr.iconRect.x -= afterCheckIconGap - gap;
+ lr.textRect.x -= afterCheckIconGap - gap;
+ }
+
+ calcXPositionsLTR(viewRect.x, leadingGap, gap, lr.arrowRect,
+ lr.accRect);
+
+ // Take into account minimal text offset
+ int textOffset = (viewRect.x + viewRect.width)
+ - (lr.textRect.x + lr.textRect.width);
+ if (!isTopLevelMenu && (textOffset < minTextOffset)) {
+ lr.textRect.x -= minTextOffset - textOffset;
+ }
+
+ alignRects(lr, alignment);
+
+ // Set Y coordinates for text and icon.
+ // Y coordinates for other rects
+ // will be calculated later in layoutMenuItem.
+ calcTextAndIconYPositions(lr);
+
+ // Calculate valid X and Y coordinate for labelRect
+ lr.setLabelRect(lr.textRect.union(lr.iconRect));
+ }
+
+ private void doRTLComplexLayout(LayoutResult lr, ColumnAlignment alignment) {
+ lr.labelRect.width = labelSize.maxWidth;
+
+ // Set X coordinates
+ calcXPositionsRTL(viewRect.x + viewRect.width, leadingGap, gap,
+ lr.checkRect, lr.labelRect);
+
+ // Tune the gap after check icon
+ if (lr.checkRect.width > 0) { // there is the gap after check icon
+ lr.labelRect.x -= afterCheckIconGap - gap;
+ }
+
+ calcXPositionsLTR(viewRect.x, leadingGap, gap, lr.arrowRect, lr.accRect);
+
+ // Take into account minimal text offset
+ int labelOffset = (viewRect.x + viewRect.width)
+ - (lr.labelRect.x + lr.labelRect.width);
+ if (!isTopLevelMenu && (labelOffset < minTextOffset)) {
+ lr.labelRect.x -= minTextOffset - labelOffset;
+ }
+
+ alignRects(lr, alignment);
+
+ // Center labelRect vertically
+ calcLabelYPosition(lr);
+
+ layoutIconAndTextInLabelRect(lr);
+ }
+
+ private void alignRects(LayoutResult lr, ColumnAlignment alignment) {
+ alignRect(lr.checkRect, alignment.getCheckAlignment(),
+ checkSize.getOrigWidth());
+ alignRect(lr.iconRect, alignment.getIconAlignment(),
+ iconSize.getOrigWidth());
+ alignRect(lr.textRect, alignment.getTextAlignment(),
+ textSize.getOrigWidth());
+ alignRect(lr.accRect, alignment.getAccAlignment(),
+ accSize.getOrigWidth());
+ alignRect(lr.arrowRect, alignment.getArrowAlignment(),
+ arrowSize.getOrigWidth());
+ }
+
+ private void alignRect(Rectangle rect, int alignment, int origWidth) {
+ if (alignment != SwingUtilities.LEFT) {
+ rect.x = rect.x + rect.width - origWidth;
+ rect.width = origWidth;
+ }
+ }
+
+ protected void layoutIconAndTextInLabelRect(LayoutResult lr) {
+ lr.setTextRect(new Rectangle());
+ lr.setIconRect(new Rectangle());
+ SwingUtilities.layoutCompoundLabel(
+ mi, fm, text,icon, verticalAlignment, horizontalAlignment,
+ verticalTextPosition, horizontalTextPosition, lr.labelRect,
+ lr.iconRect, lr.textRect, gap);
+ }
+
+ private void calcXPositionsLTR(int startXPos, int leadingGap,
+ int gap, Rectangle... rects) {
+ int curXPos = startXPos + leadingGap;
+ for (Rectangle rect : rects) {
+ rect.x = curXPos;
+ if (rect.width > 0) {
+ curXPos += rect.width + gap;
+ }
+ }
+ }
+
+ private void calcXPositionsRTL(int startXPos, int leadingGap,
+ int gap, Rectangle... rects) {
+ int curXPos = startXPos - leadingGap;
+ for (Rectangle rect : rects) {
+ rect.x = curXPos - rect.width;
+ if (rect.width > 0) {
+ curXPos -= rect.width + gap;
+ }
+ }
+ }
+
+ /**
+ * Sets Y coordinates of text and icon
+ * taking into account the vertical alignment
+ */
+ private void calcTextAndIconYPositions(LayoutResult lr) {
+ if (verticalAlignment == SwingUtilities.TOP) {
+ lr.textRect.y = (int)(viewRect.y
+ + (float)lr.labelRect.height/2
+ - (float)lr.textRect.height/2);
+ lr.iconRect.y = (int)(viewRect.y
+ + (float)lr.labelRect.height/2
+ - (float)lr.iconRect.height/2);
+ } else if (verticalAlignment == SwingUtilities.CENTER) {
+ lr.textRect.y = (int)(viewRect.y
+ + (float)viewRect.height/2
+ - (float)lr.textRect.height/2);
+ lr.iconRect.y = (int)(viewRect.y
+ + (float)viewRect.height/2
+ - (float)lr.iconRect.height/2);
+ }
+ else if (verticalAlignment == SwingUtilities.BOTTOM) {
+ lr.textRect.y = (int)(viewRect.y
+ + viewRect.height
+ - (float)lr.labelRect.height/2
+ - (float)lr.textRect.height/2);
+ lr.iconRect.y = (int)(viewRect.y
+ + viewRect.height
+ - (float)lr.labelRect.height/2
+ - (float)lr.iconRect.height/2);
+ }
+ }
+
+ /**
+ * Sets labelRect Y coordinate
+ * taking into account the vertical alignment
+ */
+ private void calcLabelYPosition(LayoutResult lr) {
+ if (verticalAlignment == SwingUtilities.TOP) {
+ lr.labelRect.y = viewRect.y;
+ } else if (verticalAlignment == SwingUtilities.CENTER) {
+ lr.labelRect.y = (int)(viewRect.y
+ + (float)viewRect.height/2
+ - (float)lr.labelRect.height/2);
+ } else if (verticalAlignment == SwingUtilities.BOTTOM) {
+ lr.labelRect.y = viewRect.y + viewRect.height
+ - lr.labelRect.height;
+ }
+ }
+
+ /**
+ * Returns parent of this component if it is not a top-level menu
+ * Otherwise returns null.
+ * @param menuItem the menu item whose parent will be returned.
+ * @return parent of this component if it is not a top-level menu
+ * Otherwise returns null.
+ */
+ public static JComponent getMenuItemParent(JMenuItem menuItem) {
+ Container parent = menuItem.getParent();
+ if ((parent instanceof JComponent) &&
+ (!(menuItem instanceof JMenu) ||
+ !((JMenu)menuItem).isTopLevelMenu())) {
+ return (JComponent) parent;
+ } else {
+ return null;
+ }
+ }
+
+ public static void clearUsedParentClientProperties(JMenuItem menuItem) {
+ clearUsedClientProperties(getMenuItemParent(menuItem));
+ }
+
+ public static void clearUsedClientProperties(JComponent c) {
+ if (c != null) {
+ c.putClientProperty(MAX_ARROW_WIDTH, null);
+ c.putClientProperty(MAX_CHECK_WIDTH, null);
+ c.putClientProperty(MAX_ACC_WIDTH, null);
+ c.putClientProperty(MAX_TEXT_WIDTH, null);
+ c.putClientProperty(MAX_ICON_WIDTH, null);
+ c.putClientProperty(MAX_LABEL_WIDTH, null);
+ c.putClientProperty(BASICMENUITEMUI_MAX_TEXT_OFFSET, null);
+ }
+ }
+
+ /**
+ * Finds and returns maximal integer value in the given array.
+ * @param values array where the search will be performed.
+ * @return maximal vaule.
+ */
+ public static int max(int... values) {
+ int maxValue = Integer.MIN_VALUE;
+ for (int i : values) {
+ if (i > maxValue) {
+ maxValue = i;
+ }
+ }
+ return maxValue;
+ }
+
+ public static Rectangle createMaxRect() {
+ return new Rectangle(0, 0, Integer.MAX_VALUE, Integer.MAX_VALUE);
+ }
+
+ public static void addMaxWidth(RectSize size, int gap, Dimension result) {
+ if (size.maxWidth > 0) {
+ result.width += size.maxWidth + gap;
+ }
+ }
+
+ public static void addWidth(int width, int gap, Dimension result) {
+ if (width > 0) {
+ result.width += width + gap;
+ }
+ }
+
+ public JMenuItem getMenuItem() {
+ return mi;
+ }
+
+ public JComponent getMenuItemParent() {
+ return miParent;
+ }
+
+ public Font getFont() {
+ return font;
+ }
+
+ public Font getAccFont() {
+ return accFont;
+ }
+
+ public FontMetrics getFontMetrics() {
+ return fm;
+ }
+
+ public FontMetrics getAccFontMetrics() {
+ return accFm;
+ }
+
+ public Icon getIcon() {
+ return icon;
+ }
+
+ public Icon getCheckIcon() {
+ return checkIcon;
+ }
+
+ public Icon getArrowIcon() {
+ return arrowIcon;
+ }
+
+ public String getText() {
+ return text;
+ }
+
+ public String getAccText() {
+ return accText;
+ }
+
+ public boolean isColumnLayout() {
+ return isColumnLayout;
+ }
+
+ public boolean useCheckAndArrow() {
+ return useCheckAndArrow;
+ }
+
+ public boolean isLeftToRight() {
+ return isLeftToRight;
+ }
+
+ public boolean isTopLevelMenu() {
+ return isTopLevelMenu;
+ }
+
+ public View getHtmlView() {
+ return htmlView;
+ }
+
+ public int getVerticalAlignment() {
+ return verticalAlignment;
+ }
+
+ public int getHorizontalAlignment() {
+ return horizontalAlignment;
+ }
+
+ public int getVerticalTextPosition() {
+ return verticalTextPosition;
+ }
+
+ public int getHorizontalTextPosition() {
+ return horizontalTextPosition;
+ }
+
+ public int getGap() {
+ return gap;
+ }
+
+ public int getLeadingGap() {
+ return leadingGap;
+ }
+
+ public int getAfterCheckIconGap() {
+ return afterCheckIconGap;
+ }
+
+ public int getMinTextOffset() {
+ return minTextOffset;
+ }
+
+ public Rectangle getViewRect() {
+ return viewRect;
+ }
+
+ public RectSize getIconSize() {
+ return iconSize;
+ }
+
+ public RectSize getTextSize() {
+ return textSize;
+ }
+
+ public RectSize getAccSize() {
+ return accSize;
+ }
+
+ public RectSize getCheckSize() {
+ return checkSize;
+ }
+
+ public RectSize getArrowSize() {
+ return arrowSize;
+ }
+
+ public RectSize getLabelSize() {
+ return labelSize;
+ }
+
+ protected void setMenuItem(JMenuItem mi) {
+ this.mi = mi;
+ }
+
+ protected void setMenuItemParent(JComponent miParent) {
+ this.miParent = miParent;
+ }
+
+ protected void setFont(Font font) {
+ this.font = font;
+ }
+
+ protected void setAccFont(Font accFont) {
+ this.accFont = accFont;
+ }
+
+ protected void setFontMetrics(FontMetrics fm) {
+ this.fm = fm;
+ }
+
+ protected void setAccFontMetrics(FontMetrics accFm) {
+ this.accFm = accFm;
+ }
+
+ protected void setIcon(Icon icon) {
+ this.icon = icon;
+ }
+
+ protected void setCheckIcon(Icon checkIcon) {
+ this.checkIcon = checkIcon;
+ }
+
+ protected void setArrowIcon(Icon arrowIcon) {
+ this.arrowIcon = arrowIcon;
+ }
+
+ protected void setText(String text) {
+ this.text = text;
+ }
+
+ protected void setAccText(String accText) {
+ this.accText = accText;
+ }
+
+ protected void setColumnLayout(boolean columnLayout) {
+ isColumnLayout = columnLayout;
+ }
+
+ protected void setUseCheckAndArrow(boolean useCheckAndArrow) {
+ this.useCheckAndArrow = useCheckAndArrow;
+ }
+
+ protected void setLeftToRight(boolean leftToRight) {
+ isLeftToRight = leftToRight;
+ }
+
+ protected void setTopLevelMenu(boolean topLevelMenu) {
+ isTopLevelMenu = topLevelMenu;
+ }
+
+ protected void setHtmlView(View htmlView) {
+ this.htmlView = htmlView;
+ }
+
+ protected void setVerticalAlignment(int verticalAlignment) {
+ this.verticalAlignment = verticalAlignment;
+ }
+
+ protected void setHorizontalAlignment(int horizontalAlignment) {
+ this.horizontalAlignment = horizontalAlignment;
+ }
+
+ protected void setVerticalTextPosition(int verticalTextPosition) {
+ this.verticalTextPosition = verticalTextPosition;
+ }
+
+ protected void setHorizontalTextPosition(int horizontalTextPosition) {
+ this.horizontalTextPosition = horizontalTextPosition;
+ }
+
+ protected void setGap(int gap) {
+ this.gap = gap;
+ }
+
+ protected void setLeadingGap(int leadingGap) {
+ this.leadingGap = leadingGap;
+ }
+
+ protected void setAfterCheckIconGap(int afterCheckIconGap) {
+ this.afterCheckIconGap = afterCheckIconGap;
+ }
+
+ protected void setMinTextOffset(int minTextOffset) {
+ this.minTextOffset = minTextOffset;
+ }
+
+ protected void setViewRect(Rectangle viewRect) {
+ this.viewRect = viewRect;
+ }
+
+ protected void setIconSize(RectSize iconSize) {
+ this.iconSize = iconSize;
+ }
+
+ protected void setTextSize(RectSize textSize) {
+ this.textSize = textSize;
+ }
+
+ protected void setAccSize(RectSize accSize) {
+ this.accSize = accSize;
+ }
+
+ protected void setCheckSize(RectSize checkSize) {
+ this.checkSize = checkSize;
+ }
+
+ protected void setArrowSize(RectSize arrowSize) {
+ this.arrowSize = arrowSize;
+ }
+
+ protected void setLabelSize(RectSize labelSize) {
+ this.labelSize = labelSize;
+ }
+
+ public int getLeftTextExtraWidth() {
+ return leftTextExtraWidth;
+ }
+
+ public int getRightTextExtraWidth() {
+ return rightTextExtraWidth;
+ }
+
+ /**
+ * Returns false if the component is a JMenu and it is a top
+ * level menu (on the menubar).
+ */
+ public static boolean useCheckAndArrow(JMenuItem menuItem) {
+ boolean b = true;
+ if ((menuItem instanceof JMenu) &&
+ (((JMenu) menuItem).isTopLevelMenu())) {
+ b = false;
+ }
+ return b;
+ }
+
+ public static class LayoutResult {
+ private Rectangle iconRect;
+ private Rectangle textRect;
+ private Rectangle accRect;
+ private Rectangle checkRect;
+ private Rectangle arrowRect;
+ private Rectangle labelRect;
+
+ public LayoutResult() {
+ iconRect = new Rectangle();
+ textRect = new Rectangle();
+ accRect = new Rectangle();
+ checkRect = new Rectangle();
+ arrowRect = new Rectangle();
+ labelRect = new Rectangle();
+ }
+
+ public LayoutResult(Rectangle iconRect, Rectangle textRect,
+ Rectangle accRect, Rectangle checkRect,
+ Rectangle arrowRect, Rectangle labelRect) {
+ this.iconRect = iconRect;
+ this.textRect = textRect;
+ this.accRect = accRect;
+ this.checkRect = checkRect;
+ this.arrowRect = arrowRect;
+ this.labelRect = labelRect;
+ }
+
+ public Rectangle getIconRect() {
+ return iconRect;
+ }
+
+ public void setIconRect(Rectangle iconRect) {
+ this.iconRect = iconRect;
+ }
+
+ public Rectangle getTextRect() {
+ return textRect;
+ }
+
+ public void setTextRect(Rectangle textRect) {
+ this.textRect = textRect;
+ }
+
+ public Rectangle getAccRect() {
+ return accRect;
+ }
+
+ public void setAccRect(Rectangle accRect) {
+ this.accRect = accRect;
+ }
+
+ public Rectangle getCheckRect() {
+ return checkRect;
+ }
+
+ public void setCheckRect(Rectangle checkRect) {
+ this.checkRect = checkRect;
+ }
+
+ public Rectangle getArrowRect() {
+ return arrowRect;
+ }
+
+ public void setArrowRect(Rectangle arrowRect) {
+ this.arrowRect = arrowRect;
+ }
+
+ public Rectangle getLabelRect() {
+ return labelRect;
+ }
+
+ public void setLabelRect(Rectangle labelRect) {
+ this.labelRect = labelRect;
+ }
+
+ public Map<String, Rectangle> getAllRects() {
+ Map<String, Rectangle> result = new HashMap<String, Rectangle>();
+ result.put("checkRect", checkRect);
+ result.put("iconRect", iconRect);
+ result.put("textRect", textRect);
+ result.put("accRect", accRect);
+ result.put("arrowRect", arrowRect);
+ result.put("labelRect", labelRect);
+ return result;
+ }
+ }
+
+ public static class ColumnAlignment {
+ private int checkAlignment;
+ private int iconAlignment;
+ private int textAlignment;
+ private int accAlignment;
+ private int arrowAlignment;
+
+ public static final ColumnAlignment LEFT_ALIGNMENT =
+ new ColumnAlignment(
+ SwingConstants.LEFT,
+ SwingConstants.LEFT,
+ SwingConstants.LEFT,
+ SwingConstants.LEFT,
+ SwingConstants.LEFT
+ );
+
+ public static final ColumnAlignment RIGHT_ALIGNMENT =
+ new ColumnAlignment(
+ SwingConstants.RIGHT,
+ SwingConstants.RIGHT,
+ SwingConstants.RIGHT,
+ SwingConstants.RIGHT,
+ SwingConstants.RIGHT
+ );
+
+ public ColumnAlignment(int checkAlignment, int iconAlignment,
+ int textAlignment, int accAlignment,
+ int arrowAlignment) {
+ this.checkAlignment = checkAlignment;
+ this.iconAlignment = iconAlignment;
+ this.textAlignment = textAlignment;
+ this.accAlignment = accAlignment;
+ this.arrowAlignment = arrowAlignment;
+ }
+
+ public int getCheckAlignment() {
+ return checkAlignment;
+ }
+
+ public int getIconAlignment() {
+ return iconAlignment;
+ }
+
+ public int getTextAlignment() {
+ return textAlignment;
+ }
+
+ public int getAccAlignment() {
+ return accAlignment;
+ }
+
+ public int getArrowAlignment() {
+ return arrowAlignment;
+ }
+ }
+
+ public static class RectSize {
+ private int width;
+ private int height;
+ private int origWidth;
+ private int maxWidth;
+
+ public RectSize() {
+ }
+
+ public RectSize(int width, int height, int origWidth, int maxWidth) {
+ this.width = width;
+ this.height = height;
+ this.origWidth = origWidth;
+ this.maxWidth = maxWidth;
+ }
+
+ public int getWidth() {
+ return width;
+ }
+
+ public int getHeight() {
+ return height;
+ }
+
+ public int getOrigWidth() {
+ return origWidth;
+ }
+
+ public int getMaxWidth() {
+ return maxWidth;
+ }
+
+ public void setWidth(int width) {
+ this.width = width;
+ }
+
+ public void setHeight(int height) {
+ this.height = height;
+ }
+
+ public void setOrigWidth(int origWidth) {
+ this.origWidth = origWidth;
+ }
+
+ public void setMaxWidth(int maxWidth) {
+ this.maxWidth = maxWidth;
+ }
+
+ public String toString() {
+ return "[w=" + width + ",h=" + height + ",ow="
+ + origWidth + ",mw=" + maxWidth + "]";
+ }
+ }
+}
--- a/jdk/src/share/classes/sun/swing/SwingLazyValue.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/swing/SwingLazyValue.java Wed Jul 05 16:42:37 2017 +0200
@@ -54,15 +54,14 @@
className = c;
methodName = m;
if (o != null) {
- args = (Object[])o.clone();
+ args = o.clone();
}
}
public Object createValue(final UIDefaults table) {
try {
- Class c;
Object cl;
- c = Class.forName(className, true, null);
+ Class<?> c = Class.forName(className, true, null);
if (methodName != null) {
Class[] types = getClassArray(args);
Method m = c.getMethod(methodName, types);
--- a/jdk/src/share/classes/sun/swing/SwingUtilities2.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/swing/SwingUtilities2.java Wed Jul 05 16:42:37 2017 +0200
@@ -460,7 +460,7 @@
return clipString;
}
- boolean needsTextLayout = false;
+ boolean needsTextLayout;
synchronized (charsBufferLock) {
if (charsBuffer == null || charsBuffer.length < stringLength) {
@@ -715,11 +715,8 @@
// See if coords are inside
// ASSUME: mouse x,y will never be < cell's x,y
assert (p.x >= cellBounds.x && p.y >= cellBounds.y);
- if (p.x > cellBounds.x + cellBounds.width ||
- p.y > cellBounds.y + cellBounds.height) {
- return true;
- }
- return false;
+ return p.x > cellBounds.x + cellBounds.width ||
+ p.y > cellBounds.y + cellBounds.height;
}
/**
@@ -1239,12 +1236,11 @@
private static synchronized boolean inputEvent_canAccessSystemClipboard(InputEvent ie) {
if (inputEvent_CanAccessSystemClipboard_Field == null) {
inputEvent_CanAccessSystemClipboard_Field =
- (Field)AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
- public Object run() {
- Field field = null;
+ AccessController.doPrivileged(
+ new java.security.PrivilegedAction<Field>() {
+ public Field run() {
try {
- field = InputEvent.class.
+ Field field = InputEvent.class.
getDeclaredField("canAccessSystemClipboard");
field.setAccessible(true);
return field;
@@ -1419,10 +1415,10 @@
* Class.getResourceAsStream just returns raw
* bytes, which we can convert to an image.
*/
- byte[] buffer = (byte[])
+ byte[] buffer =
java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
- public Object run() {
+ new java.security.PrivilegedAction<byte[]>() {
+ public byte[] run() {
try {
InputStream resource = null;
Class<?> srchClass = baseClass;
@@ -1489,7 +1485,7 @@
return true;
}
// Else probably Solaris or Linux in which case may be remote X11
- Class x11Class = Class.forName("sun.awt.X11GraphicsEnvironment");
+ Class<?> x11Class = Class.forName("sun.awt.X11GraphicsEnvironment");
Method isDisplayLocalMethod = x11Class.getMethod(
"isDisplayLocal", new Class[0]);
return (Boolean)isDisplayLocalMethod.invoke(null, (Object[])null);
--- a/jdk/src/share/classes/sun/swing/plaf/synth/DefaultSynthStyle.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/swing/plaf/synth/DefaultSynthStyle.java Wed Jul 05 16:42:37 2017 +0200
@@ -44,7 +44,7 @@
* @author Scott Violet
*/
public class DefaultSynthStyle extends SynthStyle implements Cloneable {
- private static final Object PENDING = new String("Pending");
+ private static final String PENDING = "Pending";
/**
* Should the component be opaque?
@@ -690,8 +690,8 @@
StateInfo[] states = getStateInfo();
if (states != null) {
buf.append("states[");
- for (int i = 0; i < states.length; i++) {
- buf.append(states[i].toString()).append(',');
+ for (StateInfo state : states) {
+ buf.append(state.toString()).append(',');
}
buf.append(']').append(',');
}
@@ -888,7 +888,7 @@
* Returns the number of states that are similar between the
* ComponentState this StateInfo represents and val.
*/
- private final int getMatchCount(int val) {
+ private int getMatchCount(int val) {
// This comes from BigInteger.bitCnt
val &= state;
val -= (0xaaaaaaaa & val) >>> 1;
--- a/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java Wed Jul 05 16:42:37 2017 +0200
@@ -735,7 +735,7 @@
* Data model for a type-face selection combo-box.
*/
protected class DirectoryComboBoxModel extends AbstractListModel implements ComboBoxModel {
- Vector directories = new Vector();
+ Vector<File> directories = new Vector<File>();
int[] depths = null;
File selectedDirectory = null;
JFileChooser chooser = getFileChooser();
@@ -778,7 +778,7 @@
// Get the canonical (full) path. This has the side
// benefit of removing extraneous chars from the path,
// for example /foo/bar/ becomes /foo/bar
- File canonical = null;
+ File canonical;
try {
canonical = directory.getCanonicalFile();
} catch (IOException e) {
@@ -791,7 +791,7 @@
File sf = useShellFolder ? ShellFolder.getShellFolder(canonical)
: canonical;
File f = sf;
- Vector path = new Vector(10);
+ Vector<File> path = new Vector<File>(10);
do {
path.addElement(f);
} while ((f = f.getParentFile()) != null);
@@ -799,7 +799,7 @@
int pathCount = path.size();
// Insert chain at appropriate place in vector
for (int i = 0; i < pathCount; i++) {
- f = (File)path.get(i);
+ f = path.get(i);
if (directories.contains(f)) {
int topIndex = directories.indexOf(f);
for (int j = i-1; j >= 0; j--) {
@@ -818,12 +818,12 @@
private void calculateDepths() {
depths = new int[directories.size()];
for (int i = 0; i < depths.length; i++) {
- File dir = (File)directories.get(i);
+ File dir = directories.get(i);
File parent = dir.getParentFile();
depths[i] = 0;
if (parent != null) {
for (int j = i-1; j >= 0; j--) {
- if (parent.equals((File)directories.get(j))) {
+ if (parent.equals(directories.get(j))) {
depths[i] = depths[j] + 1;
break;
}
@@ -940,8 +940,8 @@
FileFilter currentFilter = getFileChooser().getFileFilter();
boolean found = false;
if(currentFilter != null) {
- for(int i=0; i < filters.length; i++) {
- if(filters[i] == currentFilter) {
+ for (FileFilter filter : filters) {
+ if (filter == currentFilter) {
found = true;
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/sun/util/calendar/TzIDOldMapping.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package sun.util.calendar;
+
+import java.util.Map;
+import java.util.HashMap;
+
+class TzIDOldMapping {
+ static final Map<String, String> MAP = new HashMap<String, String>();
+ static {
+ String[][] oldmap = {
+ { "ACT", "Australia/Darwin" },
+ { "AET", "Australia/Sydney" },
+ { "AGT", "America/Argentina/Buenos_Aires" },
+ { "ART", "Africa/Cairo" },
+ { "AST", "America/Anchorage" },
+ { "BET", "America/Sao_Paulo" },
+ { "BST", "Asia/Dhaka" },
+ { "CAT", "Africa/Harare" },
+ { "CNT", "America/St_Johns" },
+ { "CST", "America/Chicago" },
+ { "CTT", "Asia/Shanghai" },
+ { "EAT", "Africa/Addis_Ababa" },
+ { "ECT", "Europe/Paris" },
+ { "EST", "America/New_York" },
+ { "HST", "Pacific/Honolulu" },
+ { "IET", "America/Indianapolis" },
+ { "IST", "Asia/Calcutta" },
+ { "JST", "Asia/Tokyo" },
+ { "MIT", "Pacific/Apia" },
+ { "MST", "America/Denver" },
+ { "NET", "Asia/Yerevan" },
+ { "NST", "Pacific/Auckland" },
+ { "PLT", "Asia/Karachi" },
+ { "PNT", "America/Phoenix" },
+ { "PRT", "America/Puerto_Rico" },
+ { "PST", "America/Los_Angeles" },
+ { "SST", "Pacific/Guadalcanal" },
+ { "VST", "Asia/Saigon" },
+ };
+ for (String[] pair : oldmap) {
+ MAP.put(pair[0], pair[1]);
+ }
+ }
+}
--- a/jdk/src/share/classes/sun/util/calendar/ZoneInfo.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/util/calendar/ZoneInfo.java Wed Jul 05 16:42:37 2017 +0200
@@ -28,10 +28,12 @@
import java.io.IOException;
import java.io.ObjectInputStream;
import java.lang.ref.SoftReference;
+import java.security.AccessController;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.SimpleTimeZone;
import java.util.TimeZone;
@@ -77,6 +79,14 @@
private static final long ABBR_MASK = 0xf00L;
private static final int TRANSITION_NSHIFT = 12;
+ // Flag for supporting JDK backward compatible IDs, such as "EST".
+ private static final boolean USE_OLDMAPPING;
+ static {
+ String oldmapping = AccessController.doPrivileged(
+ new sun.security.action.GetPropertyAction("sun.timezone.ids.oldmapping", "false")).toLowerCase(Locale.ROOT);
+ USE_OLDMAPPING = (oldmapping.equals("yes") || oldmapping.equals("true"));
+ }
+
private static final CalendarSystem gcal = CalendarSystem.getGregorianCalendar();
/**
@@ -595,9 +605,21 @@
* time zone of the ID.
*/
public static TimeZone getTimeZone(String ID) {
- ZoneInfo zi = null;
+ String givenID = null;
- zi = ZoneInfoFile.getZoneInfo(ID);
+ /*
+ * If old JDK compatibility is specified, get the old alias
+ * name.
+ */
+ if (USE_OLDMAPPING) {
+ String compatibleID = TzIDOldMapping.MAP.get(ID);
+ if (compatibleID != null) {
+ givenID = ID;
+ ID = compatibleID;
+ }
+ }
+
+ ZoneInfo zi = ZoneInfoFile.getZoneInfo(ID);
if (zi == null) {
// if we can't create an object for the ID, try aliases.
try {
@@ -616,6 +638,10 @@
// ignore exceptions
}
}
+
+ if (givenID != null && zi != null) {
+ zi.setID(givenID);
+ }
return zi;
}
--- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java Wed Jul 05 16:42:37 2017 +0200
@@ -291,6 +291,7 @@
{"America/Argentina/Mendoza", AGT},
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/San_Juan", AGT},
+ {"America/Argentina/San_Luis", AGT},
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
@@ -329,7 +330,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
- {"America/Eirunepe", ACT},
+ {"America/Eirunepe", AMT},
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
@@ -372,6 +373,7 @@
{"America/Maceio", BRT},
{"America/Managua", CST},
{"America/Manaus", AMT},
+ {"America/Marigot", AST},
{"America/Martinique", AST},
{"America/Mazatlan", MST},
{"America/Mendoza", AGT},
@@ -398,7 +400,7 @@
"Suriname Summer Time", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
- {"America/Porto_Acre", ACT},
+ {"America/Porto_Acre", AMT},
{"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST},
{"America/Rainy_River", CST},
@@ -406,13 +408,15 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", EST},
- {"America/Rio_Branco", ACT},
+ {"America/Rio_Branco", AMT},
{"America/Rosario", AGT},
+ {"America/Santarem", BRT},
{"America/Santiago", CLT},
{"America/Santo_Domingo", AST},
{"America/Sao_Paulo", BRT},
{"America/Scoresbysund", EGT},
{"America/Shiprock", MST},
+ {"America/St_Barthelemy", AST},
{"America/St_Kitts", AST},
{"America/St_Lucia", AST},
{"America/St_Thomas", AST},
@@ -485,6 +489,7 @@
"Tajikistan Summer Time", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
+ {"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"Hovd Time", "HOVT",
"Hovd Summer Time", "HOVST"}},
@@ -502,6 +507,7 @@
{"Asia/Kashgar", CTT},
{"Asia/Katmandu", new String[] {"Nepal Time", "NPT",
"Nepal Summer Time", "NPST"}},
+ {"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", new String[] {"Krasnoyarsk Time", "KRAT",
"Krasnoyarsk Summer Time", "KRAST"}},
{"Asia/Kuala_Lumpur", MYT},
@@ -599,7 +605,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
- {"Brazil/Acre", ACT},
+ {"Brazil/Acre", AMT},
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
--- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java Wed Jul 05 16:42:37 2017 +0200
@@ -291,6 +291,7 @@
{"America/Argentina/Mendoza", AGT},
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/San_Juan", AGT},
+ {"America/Argentina/San_Luis", AGT},
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
@@ -329,7 +330,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
- {"America/Eirunepe", ACT},
+ {"America/Eirunepe", AMT},
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
@@ -372,6 +373,7 @@
{"America/Maceio", BRT},
{"America/Managua", CST},
{"America/Manaus", AMT},
+ {"America/Marigot", AST},
{"America/Martinique", AST},
{"America/Mazatlan", MST},
{"America/Mendoza", AGT},
@@ -398,7 +400,7 @@
"Suriname Sommerzeit", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
- {"America/Porto_Acre", ACT},
+ {"America/Porto_Acre", AMT},
{"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST},
{"America/Rainy_River", CST},
@@ -406,13 +408,15 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", EST},
- {"America/Rio_Branco", ACT},
+ {"America/Rio_Branco", AMT},
{"America/Rosario", AGT},
+ {"America/Santarem", BRT},
{"America/Santiago", CLT},
{"America/Santo_Domingo", AST},
{"America/Sao_Paulo", BRT},
{"America/Scoresbysund", EGT},
{"America/Shiprock", MST},
+ {"America/St_Barthelemy", AST},
{"America/St_Kitts", AST},
{"America/St_Lucia", AST},
{"America/St_Thomas", AST},
@@ -485,6 +489,7 @@
"Tadschikische Sommerzeit", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
+ {"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"Hovd Zeit", "HOVT",
"Hovd Sommerzeit", "HOVST"}},
@@ -502,6 +507,7 @@
{"Asia/Kashgar", CTT},
{"Asia/Katmandu", new String[] {"Nepalesische Zeit", "NPT",
"Nepalesische Sommerzeit", "NPST"}},
+ {"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", new String[] {"Krasnojarsker Zeit", "KRAT",
"Krasnojarsker Sommerzeit", "KRAST"}},
{"Asia/Kuala_Lumpur", MYT},
@@ -599,7 +605,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
- {"Brazil/Acre", ACT},
+ {"Brazil/Acre", AMT},
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
--- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java Wed Jul 05 16:42:37 2017 +0200
@@ -291,6 +291,7 @@
{"America/Argentina/Mendoza", AGT},
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/San_Juan", AGT},
+ {"America/Argentina/San_Luis", AGT},
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
@@ -329,7 +330,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
- {"America/Eirunepe", ACT},
+ {"America/Eirunepe", AMT},
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
@@ -372,6 +373,7 @@
{"America/Maceio", BRT},
{"America/Managua", CST},
{"America/Manaus", AMT},
+ {"America/Marigot", AST},
{"America/Martinique", AST},
{"America/Mazatlan", MST},
{"America/Mendoza", AGT},
@@ -398,7 +400,7 @@
"Hora de verano de Surinam", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
- {"America/Porto_Acre", ACT},
+ {"America/Porto_Acre", AMT},
{"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST},
{"America/Rainy_River", CST},
@@ -406,13 +408,15 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", EST},
- {"America/Rio_Branco", ACT},
+ {"America/Rio_Branco", AMT},
{"America/Rosario", AGT},
+ {"America/Santarem", BRT},
{"America/Santiago", CLT},
{"America/Santo_Domingo", AST},
{"America/Sao_Paulo", BRT},
{"America/Scoresbysund", EGT},
{"America/Shiprock", MST},
+ {"America/St_Barthelemy", AST},
{"America/St_Kitts", AST},
{"America/St_Lucia", AST},
{"America/St_Thomas", AST},
@@ -485,6 +489,7 @@
"Hora de verano de Tajikist\u00e1n", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
+ {"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"Hora de Hovd", "HOVT",
"Hora de verano de Hovd", "HOVST"}},
@@ -502,6 +507,7 @@
{"Asia/Kashgar", CTT},
{"Asia/Katmandu", new String[] {"Hora de Nepal", "NPT",
"Hora de verano de Nepal", "NPST"}},
+ {"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", new String[] {"Hora de Krasnoyarsk", "KRAT",
"Hora de verano de Krasnoyarsk", "KRAST"}},
{"Asia/Kuala_Lumpur", MYT},
@@ -599,7 +605,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
- {"Brazil/Acre", ACT},
+ {"Brazil/Acre", AMT},
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
--- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java Wed Jul 05 16:42:37 2017 +0200
@@ -291,6 +291,7 @@
{"America/Argentina/Mendoza", AGT},
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/San_Juan", AGT},
+ {"America/Argentina/San_Luis", AGT},
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
@@ -329,7 +330,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
- {"America/Eirunepe", ACT},
+ {"America/Eirunepe", AMT},
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
@@ -372,6 +373,7 @@
{"America/Maceio", BRT},
{"America/Managua", CST},
{"America/Manaus", AMT},
+ {"America/Marigot", AST},
{"America/Martinique", AST},
{"America/Mazatlan", MST},
{"America/Mendoza", AGT},
@@ -398,7 +400,7 @@
"Heure d'\u00e9t\u00e9 du Surinam", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
- {"America/Porto_Acre", ACT},
+ {"America/Porto_Acre", AMT},
{"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST},
{"America/Rainy_River", CST},
@@ -406,13 +408,15 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", EST},
- {"America/Rio_Branco", ACT},
+ {"America/Rio_Branco", AMT},
{"America/Rosario", AGT},
+ {"America/Santarem", BRT},
{"America/Santiago", CLT},
{"America/Santo_Domingo", AST},
{"America/Sao_Paulo", BRT},
{"America/Scoresbysund", EGT},
{"America/Shiprock", MST},
+ {"America/St_Barthelemy", AST},
{"America/St_Kitts", AST},
{"America/St_Lucia", AST},
{"America/St_Thomas", AST},
@@ -485,6 +489,7 @@
"Heure d'\u00e9t\u00e9 du Tadjikistan", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
+ {"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"Heure de Hovd", "HOVT",
"Heure d'\u00e9t\u00e9 de Hovd", "HOVST"}},
@@ -502,6 +507,7 @@
{"Asia/Kashgar", CTT},
{"Asia/Katmandu", new String[] {"Heure du N\u00e9pal", "NPT",
"Heure d'\u00e9t\u00e9 du N\u00e9pal", "NPST"}},
+ {"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", new String[] {"Heure de Krasno\u00efarsk", "KRAT",
"Heure d'\u00e9t\u00e9 de Krasno\u00efarsk", "KRAST"}},
{"Asia/Kuala_Lumpur", MYT},
@@ -599,7 +605,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
- {"Brazil/Acre", ACT},
+ {"Brazil/Acre", AMT},
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
--- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java Wed Jul 05 16:42:37 2017 +0200
@@ -291,6 +291,7 @@
{"America/Argentina/Mendoza", AGT},
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/San_Juan", AGT},
+ {"America/Argentina/San_Luis", AGT},
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
@@ -329,7 +330,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
- {"America/Eirunepe", ACT},
+ {"America/Eirunepe", AMT},
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
@@ -372,6 +373,7 @@
{"America/Maceio", BRT},
{"America/Managua", CST},
{"America/Manaus", AMT},
+ {"America/Marigot", AST},
{"America/Martinique", AST},
{"America/Mazatlan", MST},
{"America/Mendoza", AGT},
@@ -398,7 +400,7 @@
"Ora estiva di Suriname", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
- {"America/Porto_Acre", ACT},
+ {"America/Porto_Acre", AMT},
{"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST},
{"America/Rainy_River", CST},
@@ -406,13 +408,15 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", EST},
- {"America/Rio_Branco", ACT},
+ {"America/Rio_Branco", AMT},
{"America/Rosario", AGT},
+ {"America/Santarem", BRT},
{"America/Santiago", CLT},
{"America/Santo_Domingo", AST},
{"America/Sao_Paulo", BRT},
{"America/Scoresbysund", EGT},
{"America/Shiprock", MST},
+ {"America/St_Barthelemy", AST},
{"America/St_Kitts", AST},
{"America/St_Lucia", AST},
{"America/St_Thomas", AST},
@@ -485,6 +489,7 @@
"Ora estiva del Tagikistan", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
+ {"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"Ora di Hovd", "HOVT",
"Ora estiva di Hovd", "HOVST"}},
@@ -502,6 +507,7 @@
{"Asia/Kashgar", CTT},
{"Asia/Katmandu", new String[] {"Ora del Nepal", "NPT",
"Ora estiva del Nepal", "NPST"}},
+ {"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", new String[] {"Ora di Krasnojarsk", "KRAT",
"Ora estiva di Krasnojarsk", "KRAST"}},
{"Asia/Kuala_Lumpur", MYT},
@@ -599,7 +605,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
- {"Brazil/Acre", ACT},
+ {"Brazil/Acre", AMT},
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
--- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java Wed Jul 05 16:42:37 2017 +0200
@@ -291,6 +291,7 @@
{"America/Argentina/Mendoza", AGT},
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/San_Juan", AGT},
+ {"America/Argentina/San_Luis", AGT},
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
@@ -329,7 +330,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
- {"America/Eirunepe", ACT},
+ {"America/Eirunepe", AMT},
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
@@ -372,6 +373,7 @@
{"America/Maceio", BRT},
{"America/Managua", CST},
{"America/Manaus", AMT},
+ {"America/Marigot", AST},
{"America/Martinique", AST},
{"America/Mazatlan", MST},
{"America/Mendoza", AGT},
@@ -398,7 +400,7 @@
"\u30b9\u30ea\u30ca\u30e0\u590f\u6642\u9593", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
- {"America/Porto_Acre", ACT},
+ {"America/Porto_Acre", AMT},
{"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST},
{"America/Rainy_River", CST},
@@ -406,13 +408,15 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", EST},
- {"America/Rio_Branco", ACT},
+ {"America/Rio_Branco", AMT},
{"America/Rosario", AGT},
+ {"America/Santarem", BRT},
{"America/Santiago", CLT},
{"America/Santo_Domingo", AST},
{"America/Sao_Paulo", BRT},
{"America/Scoresbysund", EGT},
{"America/Shiprock", MST},
+ {"America/St_Barthelemy", AST},
{"America/St_Kitts", AST},
{"America/St_Lucia", AST},
{"America/St_Thomas", AST},
@@ -485,6 +489,7 @@
"\u30bf\u30b8\u30ad\u30b9\u30bf\u30f3\u590f\u6642\u9593", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
+ {"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"\u30db\u30d6\u30c9\u6642\u9593", "HOVT",
"\u30db\u30d6\u30c9\u590f\u6642\u9593", "HOVST"}},
@@ -502,6 +507,7 @@
{"Asia/Kashgar", CTT},
{"Asia/Katmandu", new String[] {"\u30cd\u30d1\u30fc\u30eb\u6642\u9593", "NPT",
"\u30cd\u30d1\u30fc\u30eb\u590f\u6642\u9593", "NPST"}},
+ {"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", new String[] {"\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u6642\u9593", "KRAT",
"\u30af\u30e9\u30b9\u30ce\u30e4\u30eb\u30b9\u30af\u590f\u6642\u9593", "KRAST"}},
{"Asia/Kuala_Lumpur", MYT},
@@ -599,7 +605,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
- {"Brazil/Acre", ACT},
+ {"Brazil/Acre", AMT},
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
--- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java Wed Jul 05 16:42:37 2017 +0200
@@ -291,6 +291,7 @@
{"America/Argentina/Mendoza", AGT},
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/San_Juan", AGT},
+ {"America/Argentina/San_Luis", AGT},
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
@@ -329,7 +330,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
- {"America/Eirunepe", ACT},
+ {"America/Eirunepe", AMT},
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
@@ -372,6 +373,7 @@
{"America/Maceio", BRT},
{"America/Managua", CST},
{"America/Manaus", AMT},
+ {"America/Marigot", AST},
{"America/Martinique", AST},
{"America/Mazatlan", MST},
{"America/Mendoza", AGT},
@@ -398,7 +400,7 @@
"\uc218\ub9ac\ub0a8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
- {"America/Porto_Acre", ACT},
+ {"America/Porto_Acre", AMT},
{"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST},
{"America/Rainy_River", CST},
@@ -406,13 +408,15 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", EST},
- {"America/Rio_Branco", ACT},
+ {"America/Rio_Branco", AMT},
{"America/Rosario", AGT},
+ {"America/Santarem", BRT},
{"America/Santiago", CLT},
{"America/Santo_Domingo", AST},
{"America/Sao_Paulo", BRT},
{"America/Scoresbysund", EGT},
{"America/Shiprock", MST},
+ {"America/St_Barthelemy", AST},
{"America/St_Kitts", AST},
{"America/St_Lucia", AST},
{"America/St_Thomas", AST},
@@ -485,6 +489,7 @@
"\ud0c0\uc9c0\ud0a4\uc2a4\ud0c4 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
+ {"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"Hovd \uc2dc\uac04", "HOVT",
"Hovd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "HOVST"}},
@@ -502,6 +507,7 @@
{"Asia/Kashgar", CTT},
{"Asia/Katmandu", new String[] {"\ub124\ud314 \uc2dc\uac04", "NPT",
"\ub124\ud314 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "NPST"}},
+ {"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", new String[] {"\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc2dc\uac04", "KRAT",
"\ud06c\ub77c\uc2a4\ub178\uc57c\ub974\uc2a4\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "KRAST"}},
{"Asia/Kuala_Lumpur", MYT},
@@ -599,7 +605,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
- {"Brazil/Acre", ACT},
+ {"Brazil/Acre", AMT},
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
--- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java Wed Jul 05 16:42:37 2017 +0200
@@ -291,6 +291,7 @@
{"America/Argentina/Mendoza", AGT},
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/San_Juan", AGT},
+ {"America/Argentina/San_Luis", AGT},
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
@@ -329,7 +330,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
- {"America/Eirunepe", ACT},
+ {"America/Eirunepe", AMT},
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
@@ -372,6 +373,7 @@
{"America/Maceio", BRT},
{"America/Managua", CST},
{"America/Manaus", AMT},
+ {"America/Marigot", AST},
{"America/Martinique", AST},
{"America/Mazatlan", MST},
{"America/Mendoza", AGT},
@@ -398,7 +400,7 @@
"Surinam, sommartid", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
- {"America/Porto_Acre", ACT},
+ {"America/Porto_Acre", AMT},
{"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST},
{"America/Rainy_River", CST},
@@ -406,13 +408,15 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", EST},
- {"America/Rio_Branco", ACT},
+ {"America/Rio_Branco", AMT},
{"America/Rosario", AGT},
+ {"America/Santarem", BRT},
{"America/Santiago", CLT},
{"America/Santo_Domingo", AST},
{"America/Sao_Paulo", BRT},
{"America/Scoresbysund", EGT},
{"America/Shiprock", MST},
+ {"America/St_Barthelemy", AST},
{"America/St_Kitts", AST},
{"America/St_Lucia", AST},
{"America/St_Thomas", AST},
@@ -485,6 +489,7 @@
"Tadzjikistan, sommartid", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
+ {"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"Hovd, normaltid", "HOVT",
"Hovd, sommartid", "HOVST"}},
@@ -502,6 +507,7 @@
{"Asia/Kashgar", CTT},
{"Asia/Katmandu", new String[] {"Nepal, normaltid", "NPT",
"Nepal, sommartid", "NPST"}},
+ {"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", new String[] {"Krasnojarsk, normaltid", "KRAT",
"Krasnojarsk, sommartid", "KRAST"}},
{"Asia/Kuala_Lumpur", MYT},
@@ -599,7 +605,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
- {"Brazil/Acre", ACT},
+ {"Brazil/Acre", AMT},
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
--- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java Wed Jul 05 16:42:37 2017 +0200
@@ -291,6 +291,7 @@
{"America/Argentina/Mendoza", AGT},
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/San_Juan", AGT},
+ {"America/Argentina/San_Luis", AGT},
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
@@ -329,7 +330,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
- {"America/Eirunepe", ACT},
+ {"America/Eirunepe", AMT},
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
@@ -372,6 +373,7 @@
{"America/Maceio", BRT},
{"America/Managua", CST},
{"America/Manaus", AMT},
+ {"America/Marigot", AST},
{"America/Martinique", AST},
{"America/Mazatlan", MST},
{"America/Mendoza", AGT},
@@ -398,7 +400,7 @@
"\u82cf\u5229\u5357\u590f\u4ee4\u65f6", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
- {"America/Porto_Acre", ACT},
+ {"America/Porto_Acre", AMT},
{"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST},
{"America/Rainy_River", CST},
@@ -406,13 +408,15 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", EST},
- {"America/Rio_Branco", ACT},
+ {"America/Rio_Branco", AMT},
{"America/Rosario", AGT},
+ {"America/Santarem", BRT},
{"America/Santiago", CLT},
{"America/Santo_Domingo", AST},
{"America/Sao_Paulo", BRT},
{"America/Scoresbysund", EGT},
{"America/Shiprock", MST},
+ {"America/St_Barthelemy", AST},
{"America/St_Kitts", AST},
{"America/St_Lucia", AST},
{"America/St_Thomas", AST},
@@ -485,6 +489,7 @@
"\u5854\u5409\u514b\u65af\u5766\u590f\u4ee4\u65f6", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
+ {"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"\u79d1\u5e03\u591a\u65f6\u95f4", "HOVT",
"\u79d1\u5e03\u591a\u590f\u4ee4\u65f6", "HOVST"}},
@@ -502,6 +507,7 @@
{"Asia/Kashgar", CTT},
{"Asia/Katmandu", new String[] {"\u5c3c\u6cca\u5c14\u65f6\u95f4", "NPT",
"\u5c3c\u6cca\u5c14\u590f\u4ee4\u65f6", "NPST"}},
+ {"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", new String[] {"\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u65f6\u95f4", "KRAT",
"\u514b\u62c9\u65af\u8bfa\u4e9a\u5c14\u65af\u514b\u590f\u4ee4\u65f6", "KRAST"}},
{"Asia/Kuala_Lumpur", MYT},
@@ -599,7 +605,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
- {"Brazil/Acre", ACT},
+ {"Brazil/Acre", AMT},
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
--- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java Wed Jul 05 16:42:37 2017 +0200
@@ -291,6 +291,7 @@
{"America/Argentina/Mendoza", AGT},
{"America/Argentina/Rio_Gallegos", AGT},
{"America/Argentina/San_Juan", AGT},
+ {"America/Argentina/San_Luis", AGT},
{"America/Argentina/Tucuman", AGT},
{"America/Argentina/Ushuaia", AGT},
{"America/Aruba", AST},
@@ -329,7 +330,7 @@
{"America/Detroit", EST},
{"America/Dominica", AST},
{"America/Edmonton", MST},
- {"America/Eirunepe", ACT},
+ {"America/Eirunepe", AMT},
{"America/El_Salvador", CST},
{"America/Ensenada", PST},
{"America/Fort_Wayne", EST},
@@ -372,6 +373,7 @@
{"America/Maceio", BRT},
{"America/Managua", CST},
{"America/Manaus", AMT},
+ {"America/Marigot", AST},
{"America/Martinique", AST},
{"America/Mazatlan", MST},
{"America/Mendoza", AGT},
@@ -398,7 +400,7 @@
"\u8607\u5229\u5357\u590f\u4ee4\u6642\u9593", "SRST"}},
{"America/Port-au-Prince", EST},
{"America/Port_of_Spain", AST},
- {"America/Porto_Acre", ACT},
+ {"America/Porto_Acre", AMT},
{"America/Porto_Velho", AMT},
{"America/Puerto_Rico", AST},
{"America/Rainy_River", CST},
@@ -406,13 +408,15 @@
{"America/Recife", BRT},
{"America/Regina", CST},
{"America/Resolute", EST},
- {"America/Rio_Branco", ACT},
+ {"America/Rio_Branco", AMT},
{"America/Rosario", AGT},
+ {"America/Santarem", BRT},
{"America/Santiago", CLT},
{"America/Santo_Domingo", AST},
{"America/Sao_Paulo", BRT},
{"America/Scoresbysund", EGT},
{"America/Shiprock", MST},
+ {"America/St_Barthelemy", AST},
{"America/St_Kitts", AST},
{"America/St_Lucia", AST},
{"America/St_Thomas", AST},
@@ -485,6 +489,7 @@
"\u5854\u5409\u514b\u590f\u4ee4\u6642\u9593", "TJST"}},
{"Asia/Gaza", EET},
{"Asia/Harbin", CTT},
+ {"Asia/Ho_Chi_Minh", ICT},
{"Asia/Hong_Kong", HKT},
{"Asia/Hovd", new String[] {"\u4faf\u5fb7 (Hovd) \u6642\u9593", "HOVT",
"\u4faf\u5fb7 (Hovd) \u590f\u4ee4\u6642\u9593", "HOVST"}},
@@ -502,6 +507,7 @@
{"Asia/Kashgar", CTT},
{"Asia/Katmandu", new String[] {"\u5c3c\u6cca\u723e\u6642\u9593", "NPT",
"\u5c3c\u6cca\u723e\u590f\u4ee4\u6642\u9593", "NPST"}},
+ {"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", new String[] {"\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u6642\u9593", "KRAT",
"\u514b\u62c9\u65af\u8afe\u4e9e\u723e\u65af\u514b\u590f\u4ee4\u6642\u9593", "KRAST"}},
{"Asia/Kuala_Lumpur", MYT},
@@ -599,7 +605,7 @@
{"Australia/Yancowinna", BROKEN_HILL},
{"BET", BRT},
{"BST", BDT},
- {"Brazil/Acre", ACT},
+ {"Brazil/Acre", AMT},
{"Brazil/DeNoronha", NORONHA},
{"Brazil/East", BRT},
{"Brazil/West", AMT},
--- a/jdk/src/share/native/sun/font/bidi/ubidi.c Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/share/native/sun/font/bidi/ubidi.c Wed Jul 05 16:42:37 2017 +0200
@@ -384,23 +384,23 @@
return;
}
- /* are explicit levels specified? */
- if(embeddingLevels==NULL) {
- /* no: determine explicit levels according to the (Xn) rules */\
- if(getLevelsMemory(pBiDi, length)) {
- pBiDi->levels=pBiDi->levelsMemory;
+ if (getLevelsMemory(pBiDi, length)) {
+ pBiDi->levels=pBiDi->levelsMemory;
+ /* are explicit levels specified? */
+ if(embeddingLevels==NULL) {
+ /* no: determine explicit levels according to the (Xn) rules */
direction=resolveExplicitLevels(pBiDi);
} else {
- *pErrorCode=U_MEMORY_ALLOCATION_ERROR;
- return;
+ /* set BN for all explicit codes, check that all levels are paraLevel..UBIDI_MAX_EXPLICIT_LEVEL */
+ icu_memcpy(pBiDi->levels, embeddingLevels, length);
+ direction=checkExplicitLevels(pBiDi, pErrorCode);
+ if(U_FAILURE(*pErrorCode)) {
+ return;
+ }
}
} else {
- /* set BN for all explicit codes, check that all levels are paraLevel..UBIDI_MAX_EXPLICIT_LEVEL */
- pBiDi->levels=embeddingLevels;
- direction=checkExplicitLevels(pBiDi, pErrorCode);
- if(U_FAILURE(*pErrorCode)) {
- return;
- }
+ *pErrorCode=U_MEMORY_ALLOCATION_ERROR;
+ return;
}
/*
--- a/jdk/src/solaris/bin/java_md.c Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/solaris/bin/java_md.c Wed Jul 05 16:42:37 2017 +0200
@@ -1312,3 +1312,24 @@
{
JLI_SetTraceLauncher();
}
+
+/*
+ * The implementation for finding classes from the bootstrap
+ * class loader, refer to java.h
+ */
+static FindClassFromBootLoader_t *findBootClass = NULL;
+
+jclass
+FindBootStrapClass(JNIEnv *env, const char* classname)
+{
+ if (findBootClass == NULL) {
+ findBootClass = (FindClassFromBootLoader_t *)dlsym(RTLD_DEFAULT,
+ "JVM_FindClassFromClassLoader");
+ if (findBootClass == NULL) {
+ JLI_ReportErrorMessage(DLL_ERROR4,
+ "JVM_FindClassFromClassLoader");
+ return NULL;
+ }
+ }
+ return findBootClass(env, classname, JNI_FALSE, (jobject)NULL, JNI_FALSE);
+}
--- a/jdk/src/solaris/classes/sun/net/www/protocol/http/NTLMAuthentication.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/solaris/classes/sun/net/www/protocol/http/NTLMAuthentication.java Wed Jul 05 16:42:37 2017 +0200
@@ -64,6 +64,7 @@
*/
class NTLMAuthentication extends AuthenticationInfo {
+ private static final long serialVersionUID = -2403849171106437142L;
static char NTLM_AUTH = 'N';
--- a/jdk/src/solaris/native/java/net/PlainSocketImpl.c Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/solaris/native/java/net/PlainSocketImpl.c Wed Jul 05 16:42:37 2017 +0200
@@ -491,27 +491,6 @@
return;
}
- /*
- * The socket may have been closed (dup'ed) while we were
- * poll/select. In that case SO_ERROR will return 0 making
- * it appear that the connection has been established.
- * To avoid any race conditions we therefore grab the
- * fd lock, check if the socket has been closed, and
- * set the various fields whilst holding the lock
- */
- fdLock = (*env)->GetObjectField(env, this, psi_fdLockID);
- (*env)->MonitorEnter(env, fdLock);
-
- if ((*env)->GetBooleanField(env, this, psi_closePendingID)) {
-
- /* release fdLock */
- (*env)->MonitorExit(env, fdLock);
-
- JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
- "Socket closed");
- return;
- }
-
(*env)->SetIntField(env, fdObj, IO_fd_fdID, fd);
/* set the remote peer address and port */
@@ -536,11 +515,6 @@
(*env)->SetIntField(env, this, psi_localportID, localport);
}
}
-
- /*
- * Finally release fdLock
- */
- (*env)->MonitorExit(env, fdLock);
}
/*
--- a/jdk/src/windows/bin/java_md.c Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/windows/bin/java_md.c Wed Jul 05 16:42:37 2017 +0200
@@ -993,9 +993,39 @@
return rslt;
}
-/* Linux only, empty on windows. */
+/* Unix only, empty on windows. */
void SetJavaLauncherPlatformProps() {}
+/*
+ * The implementation for finding classes from the bootstrap
+ * class loader, refer to java.h
+ */
+static FindClassFromBootLoader_t *findBootClass = NULL;
+
+#ifdef _M_AMD64
+#define JVM_BCLOADER "JVM_FindClassFromClassLoader"
+#else
+#define JVM_BCLOADER "_JVM_FindClassFromClassLoader@20"
+#endif /* _M_AMD64 */
+
+jclass FindBootStrapClass(JNIEnv *env, const char *classname)
+{
+ HMODULE hJvm;
+
+ if (findBootClass == NULL) {
+ hJvm = GetModuleHandle(JVM_DLL);
+ if (hJvm == NULL) return NULL;
+ /* need to use the demangled entry point */
+ findBootClass = (FindClassFromBootLoader_t *)GetProcAddress(hJvm,
+ JVM_BCLOADER);
+ if (findBootClass == NULL) {
+ JLI_ReportErrorMessage(DLL_ERROR4, JVM_BCLOADER);
+ return NULL;
+ }
+ }
+ return findBootClass(env, classname, JNI_FALSE, (jobject)NULL, JNI_FALSE);
+}
+
void
InitLauncher(boolean javaw)
{
--- a/jdk/src/windows/lib/tzmappings Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/src/windows/lib/tzmappings Wed Jul 05 16:42:37 2017 +0200
@@ -65,8 +65,8 @@
Newfoundland Standard Time:-1,81::America/St_Johns:
Pacific SA:-1,82::America/Santiago:
Pacific SA Standard Time:-1,82::America/Santiago:
-SA Western:-1,82::America/Caracas:
-SA Western Standard Time:-1,82::America/Caracas:
+SA Western:-1,82:BO:America/La_Paz:
+SA Western Standard Time:-1,82:BO:America/La_Paz:
SA Pacific:-1,83::America/Bogota:
SA Pacific Standard Time:-1,83::America/Bogota:
US Eastern:-1,84::America/Indianapolis:
@@ -177,3 +177,4 @@
Middle East Standard Time:909,909:LB:Asia/Beirut:
Armenian Standard Time:910,910:AM:Asia/Yerevan:
Montevideo Standard Time:911,911:UY:America/Montevideo:
+Venezuela Standard Time:912,912::America/Caracas:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/jdi/SimulResumerTest.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,278 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * @test
+ * @bug 6751643
+ * @summary ThreadReference.ownedMonitors() can return null
+ *
+ * @author jjh
+ *
+ * @run build TestScaffold VMConnection TargetListener TargetAdapter
+ * @run compile -g SimulResumerTest.java
+ * @run main SimulResumerTest
+ */
+import com.sun.jdi.*;
+import com.sun.jdi.event.*;
+import com.sun.jdi.request.*;
+
+import java.util.*;
+
+/*
+ * This debuggee basically runs two threads each of
+ * which loop, hitting a bkpt in each iteration.
+ *
+ */
+class SimulResumerTarg extends Thread {
+ static boolean one = false;
+ static String name1 = "Thread 1";
+ static String name2 = "Thread 2";
+ static int count = 10000;
+ public static void main(String[] args) {
+ System.out.println("Howdy!");
+ SimulResumerTarg t1 = new SimulResumerTarg(name1);
+ SimulResumerTarg t2 = new SimulResumerTarg(name2);
+
+ t1.start();
+ t2.start();
+ }
+
+ public SimulResumerTarg(String name) {
+ super(name);
+ }
+
+ public void run() {
+ if (getName().equals(name1)) {
+ run1();
+ } else {
+ run2();
+ }
+ }
+
+ public void bkpt1(int i) {
+ synchronized(name1) {
+ yield();
+ }
+ }
+
+ public void run1() {
+ int i = 0;
+ while (i < count) {
+ i++;
+ bkpt1(i);
+ }
+ }
+
+ public void bkpt2(int i) {
+ synchronized(name2) {
+ yield();
+ }
+ }
+
+ public void run2() {
+ int i = 0;
+ while (i < count) {
+ i++;
+ bkpt2(i);
+ }
+ }
+}
+
+/********** test program **********/
+
+public class SimulResumerTest extends TestScaffold {
+ ReferenceType targetClass;
+ ThreadReference mainThread;
+ BreakpointRequest request1;
+ BreakpointRequest request2;
+ static volatile int bkpts = 0;
+ static int iters = 0;
+ Thread resumerThread;
+ static int waitTime = 100;
+ ThreadReference debuggeeThread1 = null;
+ ThreadReference debuggeeThread2 = null;
+
+ SimulResumerTest (String args[]) {
+ super(args);
+ }
+
+ public static void main(String[] args) throws Exception {
+ new SimulResumerTest(args).startTests();
+ }
+
+ /* BreakpointEvent handler */
+
+ public void breakpointReached(BreakpointEvent event) {
+ // save ThreadRefs for the two debuggee threads
+ ThreadReference thr = event.thread();
+ if (bkpts == 0) {
+ resumerThread.start();
+ debuggeeThread1 = thr;
+ System.out.println("thr1 = " + debuggeeThread1);
+ }
+
+ if (debuggeeThread2 == null && thr != debuggeeThread1) {
+ debuggeeThread2 = thr;
+ System.out.println("thr2 = " + debuggeeThread2);
+ }
+
+ synchronized("abc") {
+ bkpts++;
+ }
+ /**
+ if (bkpts >= SimulResumerTarg.count * 2) {
+ resumerThread.interrupt();
+ }
+ *****/
+
+ }
+
+ /********** test core **********/
+
+ void check(ThreadReference thr) {
+ // This calls each ThreadReference method that could fail due to the bug
+ // that occurs if a resume is done while a call to the method is in process.
+ String kind = "";
+ if (thr != null) {
+ try {
+ kind = "ownedMonitors()";
+ System.out.println("kind = " + kind);
+ if (thr.ownedMonitors() == null) {
+ failure("failure: ownedMonitors = null");
+ }
+
+ kind = "ownedMonitorsAndFrames()";
+ System.out.println("kind = " + kind);
+ if (thr.ownedMonitorsAndFrames() == null) {
+ failure("failure: ownedMonitorsAndFrames = null");
+ }
+
+ kind = "currentContendedMonitor()";
+ System.out.println("kind = " + kind);
+ thr.currentContendedMonitor();
+ // no failure return value here; could cause an NPE
+
+ kind = "frames()";
+ System.out.println("kind = " + kind);
+ List<StackFrame> frames = thr.frames();
+ // no failure return value here; could cause an NPE
+
+ int nframes = frames.size();
+ if (nframes > 0) {
+ // hmm, how could it ever be 0?
+ kind = "frames(0, size - 1)";
+ System.out.println("kind = " + kind);
+ thr.frames(0, frames.size() - 1);
+ }
+
+ kind = "frameCount()";
+ System.out.println("kind = " + kind);
+ if (thr.frameCount() == -1) {
+ failure("failure: frameCount = -1");
+ }
+
+ kind = "name()";
+ System.out.println("kind = " + kind);
+ if (thr.name() == null) {
+ failure("failure: name = null");
+ }
+
+ kind = "status()";
+ System.out.println("kind = " + kind);
+ if (thr.status() < 0) {
+ failure("failure: status < 0");
+ }
+
+ } catch (IncompatibleThreadStateException ee) {
+ // ignore
+ } catch (VMDisconnectedException ee) {
+ // This is how we stop. The debuggee runs to completion
+ // and we get this exception.
+ throw ee;
+ } catch (Exception ee) {
+ failure("failure: Got exception from " + kind + ": " + ee );
+ }
+ }
+ }
+
+ protected void runTests() throws Exception {
+ /*
+ * Get to the top of main()
+ * to determine targetClass and mainThread
+ */
+ BreakpointEvent bpe = startToMain("SimulResumerTarg");
+ targetClass = bpe.location().declaringType();
+ mainThread = bpe.thread();
+ EventRequestManager erm = vm().eventRequestManager();
+ final Thread mainThread = Thread.currentThread();
+
+ /*
+ * Set event requests
+ */
+ Location loc1 = findMethod(targetClass, "bkpt1", "(I)V").location();
+ Location loc2 = findMethod(targetClass, "bkpt2", "(I)V").location();
+ request1 = erm.createBreakpointRequest(loc1);
+ request2 = erm.createBreakpointRequest(loc2);
+ request1.enable();
+ request2.enable();
+
+ /*
+ * This thread will be started when we get the first bkpt.
+ */
+ resumerThread = new Thread("test resumer") {
+ public void run() {
+ while (true) {
+ iters++;
+ System.out.println("bkpts = " + bkpts + ", iters = " + iters);
+ try {
+ Thread.sleep(waitTime);
+ check(debuggeeThread1);
+ check(debuggeeThread2);
+ } catch (InterruptedException ee) {
+ // If the test completes, this occurs.
+ println("resumer Interrupted");
+ break;
+ } catch (VMDisconnectedException ee) {
+ println("VMDisconnectedException");
+ break;
+ }
+ }
+ }
+ };
+
+ /*
+ * resume the target, listening for events
+ */
+ listenUntilVMDisconnect();
+ resumerThread.interrupt();
+ /*
+ * deal with results of test
+ * if anything has called failure("foo") testFailed will be true
+ */
+ if (!testFailed) {
+ println("SimulResumerTest: passed; bkpts = " + bkpts + ", iters = " + iters);
+ } else {
+ throw new Exception("SimulResumerTest: failed; bkpts = " + bkpts + ", iters = " + iters);
+ }
+ }
+}
--- a/jdk/test/com/sun/net/httpserver/bugs/B6744329.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/test/com/sun/net/httpserver/bugs/B6744329.java Wed Jul 05 16:42:37 2017 +0200
@@ -23,7 +23,7 @@
/**
* @test
- * @bug B6744329
+ * @bug 6744329
* @summary Exception in light weight Http server
*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/servicetag/DeleteServiceTag.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6622366
+ * @summary Basic Test for deleting a service tag in a product registration
+ * @author Mandy Chung
+ *
+ * @run build DeleteServiceTag Util
+ * @run main DeleteServiceTag
+ */
+
+import com.sun.servicetag.*;
+import java.io.*;
+import java.util.*;
+
+public class DeleteServiceTag {
+ private static RegistrationData registration;
+ private static File regFile;
+ private static Map<String, ServiceTag> stMap =
+ new LinkedHashMap<String, ServiceTag>();
+ private static String[] files = new String[] {
+ "servicetag1.properties",
+ "servicetag2.properties",
+ "servicetag3.properties"
+ };
+
+ public static void main(String[] argv) throws Exception {
+ String registrationDir = System.getProperty("test.classes");
+ String servicetagDir = System.getProperty("test.src");
+
+ File original = new File(servicetagDir, "registration.xml");
+ regFile = new File(registrationDir, "registration.xml");
+ copyRegistrationXML(original, regFile);
+
+ // loads all the service tags
+ for (String f : files) {
+ File stfile = new File(servicetagDir, f);
+ ServiceTag svcTag = Util.newServiceTag(stfile);
+ stMap.put(svcTag.getInstanceURN(), svcTag);
+ }
+
+ // load the registration data with all service tags
+ BufferedInputStream in = new BufferedInputStream(new FileInputStream(regFile));
+ registration = RegistrationData.loadFromXML(in);
+
+ if (stMap.size() != files.length) {
+ throw new RuntimeException("Invalid service tag count= " +
+ stMap.size() + " expected=" + files.length);
+ }
+ // check the service tags
+ Util.checkRegistrationData(regFile.getCanonicalPath(), stMap);
+
+ // delete a service tag
+ deleteServiceTag(servicetagDir, files[0]);
+
+ System.out.println("Test passed: service tags deleted.");
+ }
+
+ private static void copyRegistrationXML(File from, File to) throws IOException {
+
+ to.delete();
+ BufferedReader reader = new BufferedReader(new FileReader(from));
+ PrintWriter writer = new PrintWriter(to);
+ try {
+ String line = null;
+ while ((line = reader.readLine()) != null) {
+ writer.println(line);
+ }
+ writer.flush();
+ } finally {
+ writer.close();
+ }
+ }
+
+ private static void deleteServiceTag(String parent, String filename) throws Exception {
+ File f = new File(parent, filename);
+ ServiceTag svcTag = Util.newServiceTag(f);
+
+ ServiceTag st = registration.removeServiceTag(svcTag.getInstanceURN());
+ if (st == null) {
+ throw new RuntimeException("RegistrationData.remove method" +
+ " returns null");
+ }
+ if (!Util.matches(st, svcTag)) {
+ throw new RuntimeException("ServiceTag added in the registration " +
+ " doesn't match.");
+ }
+ // check the service tags before storing the updated data
+ Util.checkRegistrationData(regFile.getCanonicalPath(), stMap);
+
+ ServiceTag st1 = registration.getServiceTag(svcTag.getInstanceURN());
+ if (st1 != null) {
+ throw new RuntimeException("RegistrationData.get method returns " +
+ "non-null.");
+ }
+ // Now remove the service tag from the map and store to the XML file
+ stMap.remove(svcTag.getInstanceURN());
+ BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(regFile));
+ try {
+ registration.storeToXML(out);
+ } finally {
+ out.close();
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/servicetag/DuplicateNotFound.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6622366
+ * @summary Basic Test for RegistrationData.removeServiceTag and
+ * updateServiceTag.
+ * @author Mandy Chung
+ *
+ * @run build DuplicateNotFound Util
+ * @run main DuplicateNotFound
+ */
+
+import com.sun.servicetag.*;
+import java.io.*;
+import java.util.*;
+
+public class DuplicateNotFound {
+ private static String servicetagDir = System.getProperty("test.src");
+ private static String[] files = new String[] {
+ "servicetag1.properties",
+ "servicetag2.properties",
+ "servicetag3.properties"
+ };
+
+ private static RegistrationData registration = new RegistrationData();
+
+ public static void main(String[] argv) throws Exception {
+ ServiceTag svcTag;
+ registration.addServiceTag(loadServiceTag(files[0]));
+ registration.addServiceTag(loadServiceTag(files[1]));
+ testDuplicate(files[0]);
+ testDuplicate(files[1]);
+ testNotFound(files[2]);
+ }
+
+ private static void testDuplicate(String filename) throws Exception {
+ boolean dup = false;
+ try {
+ registration.addServiceTag(loadServiceTag(filename));
+ } catch (IllegalArgumentException e) {
+ dup = true;
+ }
+ if (!dup) {
+ throw new RuntimeException(filename +
+ " added successfully but expected to be a duplicated.");
+ }
+ }
+ private static void testNotFound(String filename) throws Exception {
+ ServiceTag st = loadServiceTag(filename);
+ ServiceTag svctag = registration.getServiceTag(st.getInstanceURN());
+ if (svctag != null) {
+ throw new RuntimeException(st.getInstanceURN() +
+ " exists but expected not found");
+ }
+
+ svctag = registration.removeServiceTag(st.getInstanceURN());
+ if (svctag != null) {
+ throw new RuntimeException(st.getInstanceURN() +
+ " exists but expected not found");
+ }
+
+ svctag = registration.updateServiceTag(st.getInstanceURN(), "testing");
+ if (svctag != null) {
+ throw new RuntimeException(st.getInstanceURN() +
+ " updated successfully but expected not found.");
+ }
+ }
+
+ private static ServiceTag loadServiceTag(String filename) throws Exception {
+ File f = new File(servicetagDir, filename);
+ return Util.newServiceTag(f);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/servicetag/FindServiceTags.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,133 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6622366
+ * @summary Basic Test for Registry.findServiceTags()
+ * @author Mandy Chung
+ *
+ * @run build FindServiceTags SvcTagClient Util
+ * @run main FindServiceTags
+ */
+
+import com.sun.servicetag.*;
+import java.io.*;
+import java.util.*;
+
+// This test creates a few service tags in the Registry.
+// Check if the findServiceTags method returns the expected ones.
+public class FindServiceTags {
+ private static String registryDir = System.getProperty("test.classes");
+ private static String servicetagDir = System.getProperty("test.src");
+ private static String[] files = new String[] {
+ "servicetag1.properties",
+ "servicetag2.properties",
+ "servicetag3.properties",
+ "servicetag4.properties",
+ "servicetag5.properties"
+ };
+
+ private static Registry registry;
+ private static Set<ServiceTag> set = new HashSet<ServiceTag>();
+ private static Set<String> productUrns = new HashSet<String>();
+ private static int expectedUrnCount = 3;
+
+ public static void main(String[] argv) throws Exception {
+ registry = Util.getSvcTagClientRegistry();
+
+ for (String filename : files) {
+ File f = new File(servicetagDir, filename);
+ ServiceTag svcTag = Util.newServiceTag(f);
+ ServiceTag st = registry.addServiceTag(svcTag);
+
+ set.add(st);
+ productUrns.add(st.getProductURN());
+ }
+ if (productUrns.size() != expectedUrnCount) {
+ throw new RuntimeException("Unexpected number of product URNs = " +
+ productUrns.size() + " expected " + expectedUrnCount);
+ }
+ if (set.size() != files.length) {
+ throw new RuntimeException("Unexpected number of service tags = " +
+ set.size() + " expected " + files.length);
+ }
+ String purn = null;
+ for (String urn : productUrns) {
+ if (purn == null) {
+ // save the first product_urn for later use
+ purn = urn;
+ }
+ findServiceTags(urn);
+ }
+
+ // remove all service tags of purn
+ Set<ServiceTag> tags = registry.findServiceTags(purn);
+ for (ServiceTag st : tags) {
+ System.out.println("Removing service tag " + st.getInstanceURN());
+ registry.removeServiceTag(st.getInstanceURN());
+ }
+ tags = registry.findServiceTags(purn);
+ if (tags.size() != 0) {
+ throw new RuntimeException("Unexpected service tag count = " +
+ tags.size());
+ }
+
+ System.out.println("Test passed.");
+ }
+
+ private static void findServiceTags(String productUrn) throws Exception {
+ Set<ServiceTag> found = registry.findServiceTags(productUrn);
+ Set<ServiceTag> matched = new HashSet<ServiceTag>();
+ System.out.println("Finding service tags of product_urn=" +
+ productUrn);
+ for (ServiceTag st : set) {
+ if (st.getProductURN().equals(productUrn)) {
+ System.out.println(st.getInstanceURN());
+ matched.add(st);
+ }
+ }
+ if (found.size() != matched.size()) {
+ throw new RuntimeException("Unmatched service tag count = " +
+ found.size() + " expected " + matched.size());
+ }
+
+ for (ServiceTag st0 : found) {
+ ServiceTag st = null;
+ for (ServiceTag st1 : matched) {
+ if (Util.matches(st0, st1)) {
+ st = st1;
+ break;
+ }
+ }
+ if (st == null) {
+ System.out.println("product_urn=" + st0.getProductURN());
+ System.out.println("instance_urn=" + st0.getInstanceURN() );
+ throw new RuntimeException(st0.getInstanceURN() +
+ " not expected in the returned list");
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/servicetag/InstanceUrnCheck.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6622366
+ * @summary Basic Test for checking instance_urn
+ * @author Mandy Chung
+ *
+ * @run build InstanceUrnCheck Util
+ * @run main InstanceUrnCheck
+ */
+
+import com.sun.servicetag.*;
+import java.io.*;
+import java.util.*;
+
+public class InstanceUrnCheck {
+ private static String servicetagDir = System.getProperty("test.src");
+ private static String[] files = new String[] {
+ "servicetag1.properties",
+ "servicetag2.properties",
+ "servicetag3.properties"
+ };
+ private static RegistrationData registration = new RegistrationData();
+
+ public static void main(String[] argv) throws Exception {
+ for (String f : files) {
+ addServiceTag(f);
+ }
+ }
+
+ private static void addServiceTag(String filename) throws Exception {
+ File f = new File(servicetagDir, filename);
+ ServiceTag svcTag = Util.newServiceTag(f, true /* no instance_urn */);
+ ServiceTag st = registration.addServiceTag(svcTag);
+ if (!Util.matchesNoInstanceUrn(svcTag, st)) {
+ throw new RuntimeException("ServiceTag " +
+ " doesn't match.");
+ }
+ System.out.println("New service tag instance_urn=" + st.getInstanceURN());
+ if (!st.getInstanceURN().startsWith("urn:st:")) {
+ throw new RuntimeException("Invalid generated instance_urn " +
+ st.getInstanceURN());
+ }
+ if (st.getInstallerUID() != -1) {
+ throw new RuntimeException("Invalid installer_uid " +
+ st.getInstallerUID());
+ }
+ if (st.getTimestamp() == null) {
+ throw new RuntimeException("null timestamp ");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/servicetag/InvalidRegistrationData.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6622366
+ * @summary Basic Test for invalid product registry
+ * @author Mandy Chung
+ *
+ * @run build InvalidRegistrationData
+ * @run main InvalidRegistrationData
+ */
+
+import com.sun.servicetag.*;
+import java.io.*;
+import java.util.*;
+
+public class InvalidRegistrationData {
+ public static void main(String[] argv) throws Exception {
+ String servicetagDir = System.getProperty("test.src");
+
+ checkRegistrationData(servicetagDir, "missing-environ-field.xml");
+ checkRegistrationData(servicetagDir, "newer-registry-version.xml");
+ }
+
+ private static void checkRegistrationData(String parent, String filename)
+ throws Exception {
+ boolean thrown = false;
+ File f = new File(parent, filename);
+ BufferedInputStream in = new BufferedInputStream(new FileInputStream(f));
+ try {
+ RegistrationData regData = RegistrationData.loadFromXML(in);
+ } catch (IllegalArgumentException e) {
+ System.out.println(e.getMessage() + " thrown expected");
+ thrown = true;
+ }
+
+ if (!thrown) {
+ throw new RuntimeException("ERROR: No IllegalArgumentException thrown");
+ }
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/servicetag/InvalidServiceTag.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6622366
+ * @summary Basic Test for ServiceTag.newServiceTag() to test invalid fields.
+ * @author Mandy Chung
+ *
+ * @run build InvalidServiceTag
+ * @run main InvalidServiceTag
+ */
+
+import com.sun.servicetag.*;
+import java.io.*;
+import java.util.*;
+
+public class InvalidServiceTag {
+ private final static int MAX_CONTAINER_LEN = 64 - 1;
+ public static void main(String[] argv) throws Exception {
+ // all fields valid
+ ServiceTag st1 = ServiceTag.newInstance("product name",
+ "product version",
+ "product urn",
+ "product parent",
+ "product parent urn",
+ "product defined instance ID",
+ "product vendor",
+ "platform arch",
+ "container",
+ "source");
+ // empty optional field
+ ServiceTag st2 = ServiceTag.newInstance("product name",
+ "product version",
+ "product urn",
+ "product parent",
+ "",
+ "",
+ "product vendor",
+ "platform arch",
+ "container",
+ "source");
+ // Invalid - empty required field
+ setInvalidContainer("");
+ // Invalid - required field exceeds max length.
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i <= MAX_CONTAINER_LEN; i++) {
+ sb.append('x');
+ }
+ setInvalidContainer(sb.toString());
+ System.out.println("Test passed.");
+ }
+ private static void setInvalidContainer(String container) {
+ boolean exceptionThrown = false;
+ try {
+ ServiceTag st2 = ServiceTag.newInstance("product name",
+ "product version",
+ "product urn",
+ "product parent",
+ "product parent urn",
+ "product defined instance ID",
+ "product vendor",
+ "platform arch",
+ container,
+ "source");
+ } catch (IllegalArgumentException iae) {
+ iae.printStackTrace();
+ exceptionThrown = true;
+ }
+ if (!exceptionThrown) {
+ throw new RuntimeException("IllegalArgumentException not thrown");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/servicetag/JavaServiceTagTest.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,176 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6622366
+ * @summary Basic Test for ServiceTag.getJavaServiceTag()
+ * Disable creating the service tag in the system registry.
+ * Verify the existence of registration.xml file and the
+ * content of the service tag.
+ * @author Mandy Chung
+ *
+ * @run build JavaServiceTagTest
+ * @run main JavaServiceTagTest
+ */
+
+import com.sun.servicetag.*;
+import java.io.*;
+import java.util.*;
+
+public class JavaServiceTagTest {
+ public static void main(String[] argv) throws Exception {
+ String registrationDir = System.getProperty("test.classes");
+
+ // disable calling to stclient
+ System.setProperty("servicetag.sthelper.supported", "false");
+
+ if (Registry.isSupported()) {
+ throw new RuntimeException("Registry.isSupported() should " +
+ "return false");
+ }
+ // For debugging
+ // System.setProperty("servicetag.verbose", "");
+
+ // cleanup the registration.xml and servicetag file in the test directory
+ System.setProperty("servicetag.dir.path", registrationDir);
+ File regFile = new File(registrationDir, "registration.xml");
+ regFile.delete();
+ File svcTagFile = new File(registrationDir, "servicetag");
+ svcTagFile.delete();
+
+ ServiceTag svctag = ServiceTag.getJavaServiceTag("JavaServiceTagTest");
+ checkServiceTag(svctag);
+
+ if (svcTagFile.exists()) {
+ throw new RuntimeException(svcTagFile + " should not exist.");
+ }
+
+ // registration.xml should be created
+ if (!regFile.exists()) {
+ throw new RuntimeException(regFile + " not created.");
+ }
+ BufferedInputStream in = new BufferedInputStream(new FileInputStream(regFile));
+ RegistrationData registration = RegistrationData.loadFromXML(in);
+ Set<ServiceTag> c = registration.getServiceTags();
+ if (c.size() != 1) {
+ throw new RuntimeException(regFile + " has " + c.size() +
+ " service tags. Expected 1.");
+ }
+ ServiceTag st = registration.getServiceTag(svctag.getInstanceURN());
+ if (!Util.matches(st, svctag)) {
+ throw new RuntimeException("ServiceTag " +
+ " doesn't match.");
+ }
+ }
+
+ private static void checkServiceTag(ServiceTag st) throws IOException {
+ Properties props = loadSwordfishEntries();
+ if (st.getProductURN().
+ equals(props.getProperty("servicetag.jdk.urn"))) {
+ if (!st.getProductName().
+ equals(props.getProperty("servicetag.jdk.name"))) {
+ throw new RuntimeException("Product URN and name don't match.");
+ }
+ } else if (st.getProductURN().
+ equals(props.getProperty("servicetag.jre.urn"))) {
+ if (!st.getProductName().
+ equals(props.getProperty("servicetag.jre.name"))) {
+ throw new RuntimeException("Product URN and name don't match.");
+ }
+ } else {
+ throw new RuntimeException("Unexpected product_urn: " +
+ st.getProductURN());
+ }
+ if (!st.getProductVersion().
+ equals(System.getProperty("java.version"))) {
+ throw new RuntimeException("Unexpected product_version: " +
+ st.getProductVersion());
+ }
+ if (!st.getProductParent().
+ equals(props.getProperty("servicetag.parent.name"))) {
+ throw new RuntimeException("Unexpected product_parent: " +
+ st.getProductParent());
+ }
+ if (!st.getProductParentURN().
+ equals(props.getProperty("servicetag.parent.urn"))) {
+ throw new RuntimeException("Unexpected product_parent_urn: " +
+ st.getProductParentURN());
+ }
+ if (!st.getPlatformArch().
+ equals(System.getProperty("os.arch"))) {
+ throw new RuntimeException("Unexpected platform_arch: " +
+ st.getPlatformArch());
+ }
+ if (!st.getProductVendor().
+ equals("Sun Microsystems")) {
+ throw new RuntimeException("Unexpected product_vendor: " +
+ st.getProductVendor());
+ }
+ if (!st.getSource().
+ equals("JavaServiceTagTest")) {
+ throw new RuntimeException("Unexpected source: " +
+ st.getSource());
+ }
+ String[] ss = st.getProductDefinedInstanceID().split(",");
+ boolean id = false;
+ boolean dir = false;
+ for (String s : ss) {
+ String[] values = s.split("=");
+ if (values[0].equals("id")) {
+ id = true;
+ String[] sss = values[1].split(" ");
+ if (!sss[0].equals(System.getProperty("java.runtime.version"))) {
+ throw new RuntimeException("Unexpected version in id: " +
+ sss[0]);
+ }
+ if (sss.length < 2) {
+ throw new RuntimeException("Unexpected id=" + values[1]);
+ }
+ } else if (values[0].equals("dir")) {
+ dir = true;
+ }
+ }
+ if (!id || !dir) {
+ throw new RuntimeException("Unexpected product_defined_instance_id: " +
+ st.getProductDefinedInstanceID());
+ }
+ }
+
+ private static Properties loadSwordfishEntries()
+ throws IOException {
+ int version = sun.misc.Version.jdkMinorVersion();
+ String filename = "/com/sun/servicetag/resources/javase_" +
+ version + "_swordfish.properties";
+ InputStream in = Installer.class.getClass().getResourceAsStream(filename);
+ Properties props = new Properties();
+ try {
+ props.load(in);
+ } finally {
+ in.close();
+ }
+ return props;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/servicetag/JavaServiceTagTest1.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,240 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6622366
+ * @summary Basic Test for ServiceTag.getJavaServiceTag(String)
+ * to verify that the registration.xml and servicetag files
+ * are both created correctly.
+ * @author Mandy Chung
+ *
+ * @run build JavaServiceTagTest1
+ * @run main JavaServiceTagTest1
+ */
+
+import com.sun.servicetag.*;
+import java.io.*;
+import java.util.*;
+
+public class JavaServiceTagTest1 {
+ private static String registrationDir = System.getProperty("test.classes");
+ private static String servicetagDir = System.getProperty("test.src");
+ private static File regFile;
+ private static File svcTagFile;
+ private static Registry registry;
+ public static void main(String[] argv) throws Exception {
+ // cleanup the registration.xml and servicetag file in the test directory
+ System.setProperty("servicetag.dir.path", registrationDir);
+ regFile = new File(registrationDir, "registration.xml");
+ regFile.delete();
+
+ svcTagFile = new File(registrationDir, "servicetag");
+ svcTagFile.delete();
+
+ registry = Util.getSvcTagClientRegistry();
+
+ // verify that only one service tag is created
+ ServiceTag st1 = testJavaServiceTag("Test1");
+
+ // getJavaServiceTag method should create a new service tag
+ // and delete the old one
+ ServiceTag st2 = testJavaServiceTag("Test2");
+ if (registry.getServiceTag(st1.getInstanceURN()) != null) {
+ throw new RuntimeException("instance_urn: " + st1.getInstanceURN() +
+ " exists but expected to be removed");
+ }
+
+ // expected to have different instance_urn
+ if (st1.getInstanceURN().equals(st2.getInstanceURN())) {
+ throw new RuntimeException("instance_urn: " + st1.getInstanceURN() +
+ " == " + st2.getInstanceURN());
+ }
+
+ // Delete the service tag from the Registry and the servicetag file
+ if (registry.removeServiceTag(st2.getInstanceURN()) == null) {
+ throw new RuntimeException("Failed to remove " +
+ st1.getInstanceURN() + " from the registry");
+ }
+ svcTagFile.delete();
+
+ // call the getJavaServiceTag(String) method again
+ // should create the servicetag file.
+ ServiceTag st3 = testJavaServiceTag("Test2");
+ if (!Util.matches(st2, st3)) {
+ System.out.println(st2);
+ System.out.println(st3);
+ throw new RuntimeException("Test Failed: Expected to be the same");
+ }
+
+ }
+
+ private static ServiceTag testJavaServiceTag(String source) throws Exception {
+ ServiceTag svctag = ServiceTag.getJavaServiceTag(source);
+ checkServiceTag(svctag, source);
+
+ // verify if registration.xml is created
+ if (!regFile.exists()) {
+ throw new RuntimeException(regFile + " not created.");
+ }
+
+ // verify the registration.xml content is the expected service tag
+ BufferedInputStream in = new BufferedInputStream(new FileInputStream(regFile));
+ RegistrationData registration = RegistrationData.loadFromXML(in);
+ Set<ServiceTag> c = registration.getServiceTags();
+ if (c.size() != 1) {
+ throw new RuntimeException(regFile + " has " + c.size() +
+ " service tags. Expected 1.");
+ }
+ ServiceTag st = registration.getServiceTag(svctag.getInstanceURN());
+ if (!Util.matches(st, svctag)) {
+ throw new RuntimeException("RegistrationData ServiceTag " +
+ " doesn't match.");
+ }
+
+ // verify the service tag added in the registry
+ st = registry.getServiceTag(svctag.getInstanceURN());
+ if (!Util.matches(st, svctag)) {
+ throw new RuntimeException("Registry ServiceTag " +
+ " doesn't match.");
+ }
+
+ // verify if servicetag file is created
+ if (!svcTagFile.exists()) {
+ throw new RuntimeException(svcTagFile + " not created.");
+ }
+
+ // verify that the servicetag file only contains one instance_urn
+ BufferedReader reader = new BufferedReader(new FileReader(svcTagFile));
+ int count = 0;
+ try {
+ String line;
+ while ((line = reader.readLine()) != null) {
+ if (line.equals(svctag.getInstanceURN())) {
+ count++;
+ } else {
+ throw new RuntimeException("servicetag contains " +
+ " unexpected instance_urn " + line);
+ }
+ }
+ } finally {
+ reader.close();
+ }
+ if (count != 1) {
+ throw new RuntimeException("servicetag contains unexpected " +
+ "number of instance_urn = " + count);
+ }
+ return svctag;
+ }
+
+ private static void checkServiceTag(ServiceTag st, String source)
+ throws IOException {
+ Properties props = loadSwordfishEntries();
+ if (st.getProductURN().
+ equals(props.getProperty("servicetag.jdk.urn"))) {
+ if (!st.getProductName().
+ equals(props.getProperty("servicetag.jdk.name"))) {
+ throw new RuntimeException("Product URN and name don't match.");
+ }
+ } else if (st.getProductURN().
+ equals(props.getProperty("servicetag.jre.urn"))) {
+ if (!st.getProductName().
+ equals(props.getProperty("servicetag.jre.name"))) {
+ throw new RuntimeException("Product URN and name don't match.");
+ }
+ } else {
+ throw new RuntimeException("Unexpected product_urn: " +
+ st.getProductURN());
+ }
+ if (!st.getProductVersion().
+ equals(System.getProperty("java.version"))) {
+ throw new RuntimeException("Unexpected product_version: " +
+ st.getProductVersion());
+ }
+ if (!st.getProductParent().
+ equals(props.getProperty("servicetag.parent.name"))) {
+ throw new RuntimeException("Unexpected product_parent: " +
+ st.getProductParent());
+ }
+ if (!st.getProductParentURN().
+ equals(props.getProperty("servicetag.parent.urn"))) {
+ throw new RuntimeException("Unexpected product_parent_urn: " +
+ st.getProductParentURN());
+ }
+ if (!st.getPlatformArch().
+ equals(System.getProperty("os.arch"))) {
+ throw new RuntimeException("Unexpected platform_arch: " +
+ st.getPlatformArch());
+ }
+ if (!st.getProductVendor().
+ equals("Sun Microsystems")) {
+ throw new RuntimeException("Unexpected product_vendor: " +
+ st.getProductVendor());
+ }
+ if (!st.getSource().
+ equals(source)) {
+ throw new RuntimeException("Unexpected source: " +
+ st.getSource() + " expected: " + source);
+ }
+ String[] ss = st.getProductDefinedInstanceID().split(",");
+ boolean id = false;
+ boolean dir = false;
+ for (String s : ss) {
+ String[] values = s.split("=");
+ if (values[0].equals("id")) {
+ id = true;
+ String[] sss = values[1].split(" ");
+ if (!sss[0].equals(System.getProperty("java.runtime.version"))) {
+ throw new RuntimeException("Unexpected version in id: " +
+ sss[0]);
+ }
+ if (sss.length < 2) {
+ throw new RuntimeException("Unexpected id=" + values[1]);
+ }
+ } else if (values[0].equals("dir")) {
+ dir = true;
+ }
+ }
+ if (!id || !dir) {
+ throw new RuntimeException("Unexpected product_defined_instance_id: " +
+ st.getProductDefinedInstanceID());
+ }
+ }
+
+ private static Properties loadSwordfishEntries()
+ throws IOException {
+ int version = sun.misc.Version.jdkMinorVersion();
+ String filename = "/com/sun/servicetag/resources/javase_" +
+ version + "_swordfish.properties";
+ InputStream in = Installer.class.getClass().getResourceAsStream(filename);
+ Properties props = new Properties();
+ try {
+ props.load(in);
+ } finally {
+ in.close();
+ }
+ return props;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/servicetag/NewRegistrationData.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6622366
+ * @summary Basic Test for Registration Data
+ * @author Mandy Chung
+ *
+ * @run build NewRegistrationData Util
+ * @run main NewRegistrationData
+ */
+
+import com.sun.servicetag.*;
+import java.io.*;
+import java.util.*;
+
+public class NewRegistrationData {
+ private static RegistrationData regData;
+ private static Map<String, ServiceTag> stMap = new LinkedHashMap<String, ServiceTag>();
+ private static String[] files = new String[] {
+ "servicetag1.properties",
+ "servicetag2.properties",
+ "servicetag3.properties"
+ };
+
+ public static void main(String[] argv) throws Exception {
+ String regDataDir = System.getProperty("test.classes");
+ String servicetagDir = System.getProperty("test.src");
+
+ File reg = new File(regDataDir, "registration.xml");
+ // Make sure a brand new file is created
+ reg.delete();
+
+ regData = new RegistrationData();
+ if (regData.getRegistrationURN().isEmpty()) {
+ throw new RuntimeException("Empty registration urn");
+ }
+
+ int count = 0;
+ for (String f : files) {
+ addServiceTag(servicetagDir, f, ++count);
+ }
+
+ // check if the registration data contains all service tags
+ Set<ServiceTag> c = regData.getServiceTags();
+ for (ServiceTag st : c) {
+ if (!Util.matches(st, regData.getServiceTag(st.getInstanceURN()))) {
+ throw new RuntimeException("ServiceTag added in the regData " +
+ " doesn't match.");
+ }
+ }
+
+ // store the service tag to a file
+ BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(reg));
+ try {
+ regData.storeToXML(out);
+ } finally {
+ out.close();
+ }
+
+ Util.checkRegistrationData(reg.getCanonicalPath(), stMap);
+ System.out.println("Test passed: " + count + " service tags added");
+ }
+
+ private static void addServiceTag(String parent, String filename, int count) throws Exception {
+ File f = new File(parent, filename);
+ ServiceTag svcTag = Util.newServiceTag(f);
+ regData.addServiceTag(svcTag);
+ stMap.put(svcTag.getInstanceURN(), svcTag);
+
+ Set<ServiceTag> c = regData.getServiceTags();
+ if (c.size() != count) {
+ throw new RuntimeException("Invalid service tag count= " +
+ c.size() + " expected=" + count);
+ }
+ ServiceTag st = regData.getServiceTag(svcTag.getInstanceURN());
+ if (!Util.matches(st, svcTag)) {
+ throw new RuntimeException("ServiceTag added in the regData " +
+ " doesn't match.");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/servicetag/SvcTagClient.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,200 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @bug 6622366
+ */
+
+import com.sun.servicetag.*;
+import java.io.*;
+import java.util.*;
+
+/**
+ * A utility class simulating stclient for testing purpose.
+ */
+public class SvcTagClient {
+ private static File xmlFile;
+ private static RegistrationData registration;
+ private static String instanceURN;
+ private static String productName;
+ private static String productVersion;
+ private static String productURN;
+ private static String productParent;
+ private static String productParentURN = ""; // optional
+ private static String productDefinedInstanceID = ""; //optional
+ private static String productVendor;
+ private static String platformArch;
+ private static String container;
+ private static String source;
+
+ // stclient exit value
+ private static final int ST_ERR_REC_NOT_FOUND = 225;
+
+ public static void main(String[] args) throws Exception {
+ String path = System.getProperty("stclient.registry.path");
+ if (path == null) {
+ System.err.println("stclient registry path missing");
+ System.exit(-1);
+ }
+ xmlFile = new File(path);
+ if (xmlFile.exists()) {
+ BufferedInputStream in = new BufferedInputStream(new FileInputStream(xmlFile));
+ registration = RegistrationData.loadFromXML(in);
+ } else {
+ registration = new RegistrationData();
+ }
+ boolean add = false;
+ boolean delete = false;
+ boolean update = false;
+ boolean get = false;
+ boolean find = false;
+
+ int count = 0;
+ while (count < args.length) {
+ String arg = args[count];
+ if (!arg.startsWith("-")) {
+ System.err.println("Invalid option:" + arg);
+ System.exit(-1);
+ }
+ if (arg.equals("-a")) {
+ add = true;
+ } else if (arg.equals("-d")) {
+ delete = true;
+ } else if (arg.equals("-u")) {
+ update = true;
+ } else if (arg.equals("-g")) {
+ get = true;
+ } else if (arg.equals("-f")) {
+ find = true;
+ productURN = "";
+ } else if (arg.equals("-t")) {
+ productURN = args[++count];
+ } else if (arg.equals("-i")) {
+ instanceURN = args[++count];
+ } else if (arg.equals("-p")) {
+ productName = args[++count];
+ } else if (arg.equals("-e")) {
+ productVersion = args[++count];
+ } else if (arg.equals("-t")) {
+ productURN = args[++count];
+ } else if (arg.equals("-F")) {
+ productParentURN = args[++count];
+ } else if (arg.equals("-P")) {
+ productParent = args[++count];
+ } else if (arg.equals("-I")) {
+ productDefinedInstanceID = args[++count];
+ } else if (arg.equals("-m")) {
+ productVendor = args[++count];
+ } else if (arg.equals("-A")) {
+ platformArch = args[++count];
+ } else if (arg.equals("-z")) {
+ container = args[++count];
+ } else if (arg.equals("-S")) {
+ source = args[++count];
+ } else {
+ System.err.println("Invalid option:" + arg);
+ System.exit(-1);
+ }
+ count++;
+ }
+
+ if (add) {
+ addServiceTag();
+ } else if (delete) {
+ deleteServiceTag();
+ } else if (update) {
+ updateServiceTag();
+ } else if (get) {
+ getServiceTag();
+ } else if (find) {
+ findServiceTags();
+ } else {
+ System.err.println("Error");
+ System.exit(-1);
+ }
+ updateXmlFile();
+ }
+ private static String OUTPUT = "Product instance URN=";
+
+ private static void addServiceTag() {
+ if (instanceURN == null) {
+ instanceURN = ServiceTag.generateInstanceURN();
+ }
+ ServiceTag st = ServiceTag.newInstance(instanceURN,
+ productName,
+ productVersion,
+ productURN,
+ productParent,
+ productParentURN,
+ productDefinedInstanceID,
+ productVendor,
+ platformArch,
+ container,
+ source);
+ registration.addServiceTag(st);
+ System.out.println(OUTPUT + st.getInstanceURN());
+ }
+
+ private static void deleteServiceTag() {
+ registration.removeServiceTag(instanceURN);
+ System.out.println("instance_urn=" + instanceURN + " deleted");
+ }
+
+ private static void updateServiceTag() {
+ registration.updateServiceTag(instanceURN, productDefinedInstanceID);
+ System.out.println("instance_urn=" + instanceURN + " updated");
+ }
+
+ private static void getServiceTag() {
+ ServiceTag st = registration.getServiceTag(instanceURN);
+ if (st == null) {
+ System.err.println("instance_urn=" + instanceURN + " not found");
+ System.exit(ST_ERR_REC_NOT_FOUND);
+ } else {
+ System.out.println(st);
+ }
+ }
+
+ private static void findServiceTags() {
+ Set<ServiceTag> set = registration.getServiceTags();
+ for (ServiceTag st : set) {
+ if (st.getProductURN().equals(productURN)) {
+ System.out.println(st.getInstanceURN());
+ }
+ }
+ if (set.size() == 0) {
+ System.out.println("No records found");
+ System.exit(ST_ERR_REC_NOT_FOUND);
+ }
+ }
+ private static void updateXmlFile() throws IOException {
+ BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(xmlFile));
+ try {
+ registration.storeToXML(out);
+ } finally {
+ out.close();
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/servicetag/SystemRegistryTest.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6622366
+ * @summary Basic Test for registry class
+ * by replacing stclient with SvcTagClient utility
+ * @author Mandy Chung
+ *
+ * @run build SvcTagClient SystemRegistryTest Util
+ * @run main SystemRegistryTest
+ */
+
+import com.sun.servicetag.*;
+import java.io.*;
+import java.util.*;
+
+public class SystemRegistryTest {
+ private static String registryDir = System.getProperty("test.classes");
+ private static String servicetagDir = System.getProperty("test.src");
+ private static List<ServiceTag> list = new ArrayList<ServiceTag>();
+ private static String[] files = new String[] {
+ "servicetag1.properties",
+ "servicetag2.properties",
+ "servicetag3.properties"
+ };
+
+ private static Registry registry;
+ public static void main(String[] argv) throws Exception {
+ registry = Util.getSvcTagClientRegistry();
+
+ for (String filename : files) {
+ File f = new File(servicetagDir, filename);
+ ServiceTag svcTag = Util.newServiceTag(f);
+ ServiceTag st = registry.addServiceTag(svcTag);
+ list.add(st);
+ System.out.println(st);
+ }
+
+ testDuplicate(list.get(0));
+ testNotFound();
+
+ // remove a service tag
+ String urn = list.get(0).getInstanceURN();
+ ServiceTag svcTag = registry.removeServiceTag(urn);
+ if (!Util.matches(svcTag, list.get(0))) {
+ throw new RuntimeException(urn +
+ " deleted but does not match.");
+ }
+
+ // get a service tag
+ svcTag = list.get(1);
+ urn = svcTag.getInstanceURN();
+ ServiceTag st = registry.getServiceTag(urn);
+ if (!Util.matches(svcTag, st)) {
+ throw new RuntimeException(urn +
+ " returned from getServiceTag but does not match.");
+ }
+ // update the service tag
+ registry.updateServiceTag(urn, "My new defined ID");
+ st = registry.getServiceTag(urn);
+ if (Util.matches(svcTag, st)) {
+ throw new RuntimeException(urn +
+ " updated but expected to be different.");
+ }
+
+ if (!st.getProductDefinedInstanceID().equals("My new defined ID")) {
+ throw new RuntimeException("Invalid product_defined_instance_id " +
+ st.getProductDefinedInstanceID());
+ }
+ if (st.getInstallerUID() != -1) {
+ throw new RuntimeException("Invalid installer_uid " +
+ st.getInstallerUID());
+ }
+ if (st.getTimestamp().equals(svcTag.getTimestamp())) {
+ throw new RuntimeException("Timestamp " +
+ st.getTimestamp() + " == " + svcTag.getTimestamp());
+ }
+
+ }
+ private static void testDuplicate(ServiceTag st) throws IOException {
+ boolean dup = false;
+ try {
+ registry.addServiceTag(st);
+ } catch (IllegalArgumentException e) {
+ dup = true;
+ }
+ if (!dup) {
+ throw new RuntimeException(st.getInstanceURN() +
+ " added successfully but expected to be a duplicated.");
+ }
+ }
+
+ private static void testNotFound() throws Exception {
+ String instanceURN = "urn:st:721cf98a-f4d7-6231-bb1d-f2f5aa903ef7";
+ ServiceTag svctag = registry.removeServiceTag(instanceURN);
+ if (svctag != null) {
+ throw new RuntimeException(instanceURN +
+ " exists but expected not found");
+ }
+
+ svctag = registry.updateServiceTag(instanceURN, "testing");
+ if (svctag != null) {
+ throw new RuntimeException(instanceURN +
+ " exists but expected not found");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/servicetag/TestLoadFromXML.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6622366
+ * @summary Basic Test for RegistrationData.loadFromXML
+ * @author Mandy Chung
+ *
+ * @run build TestLoadFromXML
+ * @run main TestLoadFromXML
+ */
+
+import com.sun.servicetag.*;
+import java.io.*;
+import java.util.*;
+
+public class TestLoadFromXML {
+ public static void main(String[] argv) throws Exception {
+ String registrationDir = System.getProperty("test.classes");
+ String servicetagDir = System.getProperty("test.src");
+
+ File inFile = new File(servicetagDir, "registration.xml");
+ File outFile = new File(registrationDir, "out.xml");
+ BufferedInputStream in = new BufferedInputStream(new FileInputStream(inFile));
+ RegistrationData regData = RegistrationData.loadFromXML(in);
+ boolean closed = false;
+ try {
+ in.read();
+ } catch (IOException e) {
+ // expect the InputStream is closed
+ closed = true;
+ System.out.println("*** Expected IOException ***");
+ e.printStackTrace();
+ }
+ if (!closed) {
+ throw new RuntimeException("InputStream not closed after " +
+ "RegistrationData.loadFromXML() call");
+ }
+
+ BufferedOutputStream out =
+ new BufferedOutputStream(new FileOutputStream(outFile));
+ regData.storeToXML(out);
+ // should be able to write to the OutputStream
+ out.write(0);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/servicetag/UpdateServiceTagTest.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6622366
+ * @summary Basic Test for RegistrationData.updateServiceTag
+ * @author Mandy Chung
+ *
+ * @run build UpdateServiceTagTest Util
+ * @run main UpdateServiceTagTest
+ */
+
+import com.sun.servicetag.*;
+import java.io.*;
+import java.util.*;
+
+public class UpdateServiceTagTest {
+ private static String servicetagDir = System.getProperty("test.src");
+ private static String[] files = new String[] {
+ "servicetag1.properties",
+ "servicetag2.properties",
+ "servicetag3.properties"
+ };
+ private static RegistrationData registration = new RegistrationData();
+ private static Set<ServiceTag> set = new HashSet<ServiceTag>();
+
+ public static void main(String[] argv) throws Exception {
+ for (String f : files) {
+ ServiceTag st = addServiceTag(f);
+ set.add(st);
+ }
+ Thread.sleep(1000);
+ for (ServiceTag st : set) {
+ updateServiceTag(st);
+ }
+ }
+
+ private static ServiceTag addServiceTag(String filename) throws Exception {
+ File f = new File(servicetagDir, filename);
+ ServiceTag svcTag = Util.newServiceTag(f, true /* no instance_urn */);
+ ServiceTag st = registration.addServiceTag(svcTag);
+ if (!Util.matchesNoInstanceUrn(svcTag, st)) {
+ throw new RuntimeException("ServiceTag " +
+ " doesn't match.");
+ }
+ String urn = st.getInstanceURN();
+ if (!urn.startsWith("urn:st:")) {
+ throw new RuntimeException("Invalid generated instance_urn " +
+ urn);
+ }
+ if (st.getInstallerUID() != -1) {
+ throw new RuntimeException("Invalid installer_uid " +
+ st.getInstallerUID());
+ }
+ if (st.getTimestamp() == null) {
+ throw new RuntimeException("null timestamp ");
+ }
+ return st;
+ }
+
+ private static String newID = "New product defined instance ID";
+ private static void updateServiceTag(ServiceTag svcTag) throws Exception {
+ // update the service tag
+ String urn = svcTag.getInstanceURN();
+ registration.updateServiceTag(urn, newID);
+
+ // get the updated service tag
+ ServiceTag st = registration.getServiceTag(urn);
+ if (Util.matches(svcTag, st)) {
+ throw new RuntimeException("ServiceTag " +
+ " should not match.");
+ }
+ if (!st.getProductDefinedInstanceID().equals(newID)) {
+ throw new RuntimeException("Invalid product_defined_instance_id " +
+ st.getProductDefinedInstanceID());
+ }
+ if (st.getInstallerUID() != -1) {
+ throw new RuntimeException("Invalid installer_uid " +
+ st.getInstallerUID());
+ }
+ if (st.getTimestamp().equals(svcTag.getTimestamp())) {
+ throw new RuntimeException("Timestamp " +
+ st.getTimestamp() + " == " + svcTag.getTimestamp());
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/servicetag/Util.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,250 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @bug 6622366
+ * @summary Utility class used by other jtreg tests
+ */
+
+import com.sun.servicetag.RegistrationData;
+import com.sun.servicetag.ServiceTag;
+import com.sun.servicetag.Registry;
+
+import java.util.Set;
+import java.util.Date;
+import java.util.Map;
+import java.util.Properties;
+import java.util.TimeZone;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.io.*;
+
+public class Util {
+ public static ServiceTag newServiceTag(File f)
+ throws FileNotFoundException, IOException, NumberFormatException {
+ return newServiceTag(f, false /* with instance_urn */);
+ }
+
+ public static ServiceTag newServiceTag(File f, boolean noInstanceURN)
+ throws FileNotFoundException, IOException, NumberFormatException {
+ Properties props = new Properties();
+ FileReader reader = new FileReader(f);
+ try {
+ props.load(reader);
+ } finally {
+ reader.close();
+ }
+ if (noInstanceURN) {
+ return ServiceTag.newInstance(
+ props.getProperty("product_name"),
+ props.getProperty("product_version"),
+ props.getProperty("product_urn"),
+ props.getProperty("product_parent"),
+ props.getProperty("product_parent_urn"),
+ props.getProperty("product_defined_inst_id"),
+ props.getProperty("product_vendor"),
+ props.getProperty("platform_arch"),
+ props.getProperty("container"),
+ props.getProperty("source"));
+ } else {
+ return ServiceTag.newInstance(
+ props.getProperty("instance_urn"),
+ props.getProperty("product_name"),
+ props.getProperty("product_version"),
+ props.getProperty("product_urn"),
+ props.getProperty("product_parent"),
+ props.getProperty("product_parent_urn"),
+ props.getProperty("product_defined_inst_id"),
+ props.getProperty("product_vendor"),
+ props.getProperty("platform_arch"),
+ props.getProperty("container"),
+ props.getProperty("source"));
+ }
+ }
+
+ public static boolean matches(ServiceTag st1, ServiceTag st2) {
+ if (!st1.getInstanceURN().equals(st2.getInstanceURN())) {
+ System.out.println("instance_urn: " + st1.getInstanceURN() +
+ " != " + st2.getInstanceURN());
+ return false;
+ }
+ return matchesNoInstanceUrn(st1, st2);
+ }
+
+ public static boolean matchesNoInstanceUrn(ServiceTag st1, ServiceTag st2) {
+ if (!st1.getProductName().equals(st2.getProductName())) {
+ System.out.println("product_name: " + st1.getProductName() +
+ " != " + st2.getProductName());
+ return false;
+ }
+
+ if (!st1.getProductVersion().equals(st2.getProductVersion())) {
+ System.out.println("product_version: " + st1.getProductVersion() +
+ " != " + st2.getProductVersion());
+ return false;
+ }
+ if (!st1.getProductURN().equals(st2.getProductURN())) {
+ System.out.println("product_urn: " + st1.getProductURN() +
+ " != " + st2.getProductURN());
+ return false;
+ }
+ if (!st1.getProductParentURN().equals(st2.getProductParentURN())) {
+ System.out.println("product_parent_urn: " + st1.getProductParentURN() +
+ " != " + st2.getProductParentURN());
+ return false;
+ }
+ if (!st1.getProductParent().equals(st2.getProductParent())) {
+ System.out.println("product_parent: " + st1.getProductParent() +
+ " != " + st2.getProductParent());
+ return false;
+ }
+ if (!st1.getProductDefinedInstanceID().equals(st2.getProductDefinedInstanceID())) {
+ System.out.println("product_defined_inst_id: " +
+ st1.getProductDefinedInstanceID() +
+ " != " + st2.getProductDefinedInstanceID());
+ return false;
+ }
+ if (!st1.getProductVendor().equals(st2.getProductVendor())) {
+ System.out.println("product_vendor: " + st1.getProductVendor() +
+ " != " + st2.getProductVendor());
+ return false;
+ }
+ if (!st1.getPlatformArch().equals(st2.getPlatformArch())) {
+ System.out.println("platform_arch: " + st1.getPlatformArch() +
+ " != " + st2.getPlatformArch());
+ return false;
+ }
+ if (!st1.getContainer().equals(st2.getContainer())) {
+ System.out.println("container: " + st1.getContainer() +
+ " != " + st2.getContainer());
+ return false;
+ }
+ if (!st1.getSource().equals(st2.getSource())) {
+ System.out.println("source: " + st1.getSource() +
+ " != " + st2.getSource());
+ return false;
+ }
+ return true;
+ }
+
+ public static void checkRegistrationData(String regFile,
+ Map<String, ServiceTag> stMap)
+ throws IOException {
+ BufferedInputStream in = new BufferedInputStream(new FileInputStream(regFile));
+ RegistrationData registration = RegistrationData.loadFromXML(in);
+ Set<ServiceTag> svcTags = registration.getServiceTags();
+ if (svcTags.size() != stMap.size()) {
+ throw new RuntimeException("Invalid service tag count= " +
+ svcTags.size() + " expected=" + stMap.size());
+ }
+ for (ServiceTag st : svcTags) {
+ ServiceTag st1 = stMap.get(st.getInstanceURN());
+ if (!matches(st, st1)) {
+ throw new RuntimeException("ServiceTag in the registry " +
+ "does not match the one in the map");
+ }
+ }
+ }
+
+
+ /**
+ * Formats the Date into a timestamp string in YYYY-MM-dd HH:mm:ss GMT.
+ * @param timestamp Date
+ * @return a string representation of the timestamp in the YYYY-MM-dd HH:mm:ss GMT format.
+ */
+ static String formatTimestamp(Date timestamp) {
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z");
+ df.setTimeZone(TimeZone.getTimeZone("GMT"));
+ return df.format(timestamp);
+ }
+
+ /**
+ * Parses a timestamp string in YYYY-MM-dd HH:mm:ss GMT format.
+ * @param timestamp Timestamp in the YYYY-MM-dd HH:mm:ss GMT format.
+ * @return Date
+ */
+ static Date parseTimestamp(String timestamp) {
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z");
+ df.setTimeZone(TimeZone.getTimeZone("GMT"));
+ try {
+ return df.parse(timestamp);
+ } catch (ParseException e) {
+ // should not reach here
+ e.printStackTrace();
+ return new Date();
+ }
+ }
+
+ /**
+ * Returns the command simulating stclient behavior.
+ */
+ static String getSvcClientCommand(String stclientRegistry) {
+ String regDir = System.getProperty("test.classes");
+
+ StringBuilder sb = new StringBuilder();
+ // wrap each argument to the command with double quotes
+ sb.append("\"");
+ sb.append(System.getProperty("java.home"));
+ sb.append(File.separator).append("bin");
+ sb.append(File.separator).append("java");
+ sb.append("\"");
+ sb.append(" -cp ");
+ sb.append("\"").append(regDir).append("\"");
+ sb.append(" \"-Dstclient.registry.path=");
+ sb.append(stclientRegistry).append("\"");
+ sb.append(" SvcTagClient");
+ return sb.toString();
+ }
+
+ private static Registry registry = null;
+ /**
+ * Returns the Registry processed by SvcTagClient that simulates
+ * stclient.
+ */
+ static synchronized Registry getSvcTagClientRegistry() throws IOException {
+ if (registry != null) {
+ return registry;
+ }
+
+ // System.setProperty("servicetag.verbose", "true");
+ // enable the helper class
+ System.setProperty("servicetag.sthelper.supported", "true");
+
+ // clean up registry.xml
+ String regDir = System.getProperty("test.classes");
+ File registryFile = new File(regDir, "registry.xml");
+ if (registryFile.exists()) {
+ registryFile.delete();
+ }
+
+ String stclientCmd = Util.getSvcClientCommand(registryFile.getCanonicalPath());
+ System.out.println("stclient cmd: " + stclientCmd);
+ System.setProperty("servicetag.stclient.cmd", stclientCmd);
+
+ // get the Registry object after the system properties are set
+ registry = Registry.getSystemRegistry();
+ return registry;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/servicetag/ValidRegistrationData.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6622366
+ * @summary Basic Test for reading a valid registration
+ * @author Mandy Chung
+ *
+ * @run build ValidRegistrationData
+ * @run main ValidRegistrationData
+ */
+
+import com.sun.servicetag.*;
+import java.io.*;
+import java.util.*;
+
+public class ValidRegistrationData {
+ private static String registrationDir = System.getProperty("test.classes");
+ private static String servicetagDir = System.getProperty("test.src");
+ private static RegistrationData registration;
+ private static Map<String, ServiceTag> stMap =
+ new LinkedHashMap<String, ServiceTag>();
+ private static String[] files = new String[] {
+ "servicetag1.properties",
+ "servicetag2.properties",
+ "servicetag3.properties"
+ };
+ private static String URN = "urn:st:9543ffaa-a4f1-4f77-b2d1-f561922d4e4a";
+
+ public static void main(String[] argv) throws Exception {
+ File f = new File(servicetagDir, "registration.xml");
+
+ // load the registration data with all service tags
+ BufferedInputStream in = new BufferedInputStream(new FileInputStream(f));
+ registration = RegistrationData.loadFromXML(in);
+ if (!registration.getRegistrationURN().equals(URN)){
+ throw new RuntimeException("Invalid URN=" +
+ registration.getRegistrationURN());
+ }
+ Map<String,String> environMap = registration.getEnvironmentMap();
+ checkEnvironmentMap(environMap);
+
+ // set environment
+ setInvalidEnvironment("hostname", "");
+ setInvalidEnvironment("osName", "");
+ setInvalidEnvironment("invalid", "");
+ }
+
+ private static void checkEnvironmentMap(Map<String,String> envMap)
+ throws Exception {
+ Properties props = new Properties();
+ File f = new File(servicetagDir, "environ.properties");
+ FileReader reader = new FileReader(f);
+ try {
+ props.load(reader);
+ } finally {
+ reader.close();
+ }
+ for (Map.Entry<String,String> entry : envMap.entrySet()) {
+ String name = entry.getKey();
+ String value = entry.getValue();
+ String expected = props.getProperty(name);
+ if (expected == null || !value.equals(expected)) {
+ throw new RuntimeException("Invalid environment " +
+ name + "=" + value);
+ }
+ props.remove(name);
+ }
+ if (!props.isEmpty()) {
+ System.out.println("Environment missing: ");
+ for (String s : props.stringPropertyNames()) {
+ System.out.println(" " + s + "=" + props.getProperty(s));
+ }
+ throw new RuntimeException("Invalid environment read");
+ }
+ }
+ private static void setInvalidEnvironment(String name, String value) {
+ boolean invalid = false;
+ try {
+ registration.setEnvironment(name, value);
+ } catch (IllegalArgumentException e) {
+ invalid = true;
+ }
+ if (!invalid) {
+ throw new RuntimeException(name + "=" + value +
+ " set but expected to fail.");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/servicetag/environ.properties Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,9 @@
+hostname=ko
+hostId=83abc1ab
+osName=SunOS
+osVersion=5.10
+osArchitecture=sparc
+systemModel=Sun-Fire-V440
+systemManufacturer=Sun Microsystems
+cpuManufacturer=Sun Microsystems
+serialNumber=BEL078932
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/servicetag/missing-environ-field.xml Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<registration_data version="1.0">
+<environment>
+<hostname>ko</hostname>
+<hostId/>
+<osName>SunOS</osName>
+<osVersion>5.10</osVersion>
+<osArchitecture>sparc</osArchitecture>
+<systemModel/>
+<systemManufacturer/>
+<cpuManufacturer/>
+</environment>
+<registry urn="urn:st:9b2c801f-89d5-431e-a930-1335a9049124" version="1.0">
+<service_tag>
+<instance_urn>urn:st:9efff93a-767c-4714-fcfa-c48988293110</instance_urn>
+<product_name>Java SE 6 Runtime Environment</product_name>
+<product_version>1.6.0-internal</product_version>
+<product_urn>urn:uuid:92d1de8c-1e59-42c6-a280-1c379526bcbc</product_urn>
+<product_parent_urn>urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3</product_parent_urn>
+<product_parent>Java Platform Standard Edition 6 (Java SE 6)</product_parent>
+<product_defined_inst_id>id=1.6.0-internal-b00 sparc,dir=/myjdk/solaris-sparc</product_defined_inst_id>
+<product_vendor>Sun Microsystems</product_vendor>
+<platform_arch>sparc</platform_arch>
+<timestamp>2007-11-12 06:15:11 GMT</timestamp>
+<container>global</container>
+<source>servicetag1.properties</source>
+<installer_uid>121937</installer_uid>
+</service_tag>
+<service_tag>
+<instance_urn>urn:st:0e9712bf-4832-e315-8e40-c4b17ffac9a9</instance_urn>
+<product_name>Java SE 6 Development Kit</product_name>
+<product_version>1.6.0</product_version>
+<product_urn>urn:uuid:b58ef9a8-5ae8-11db-a023-080020a9ed93</product_urn>
+<product_parent_urn>urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3</product_parent_urn>
+<product_parent>Java Platform Standard Edition 6 (Java SE 6)</product_parent>
+<product_defined_inst_id>id=1.6.0_05-b01 sparc,dir=/myjdk/solaris-i586</product_defined_inst_id>
+<product_vendor>Sun Microsystems</product_vendor>
+<platform_arch>i386</platform_arch>
+<timestamp>2007-11-12 06:15:11 GMT</timestamp>
+<container>global</container>
+<source>servicetag2.properties</source>
+<installer_uid>121937</installer_uid>
+</service_tag>
+</registry>
+</registration_data>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/servicetag/newer-registry-version.xml Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<registration_data version="1.0">
+<environment>
+<hostname>ko</hostname>
+<hostId/>
+<osName>SunOS</osName>
+<osVersion>5.10</osVersion>
+<osArchitecture>sparc</osArchitecture>
+<systemModel/>
+<systemManufacturer/>
+<cpuManufacturer/>
+<serialNumber/>
+</environment>
+<registry urn="urn:st:9543ffaa-a4f1-4f77-b2d1-f561922d4e4a" version="100.0">
+<service_tag>
+<instance_urn>urn:st:9efff93a-767c-4714-fcfa-c48988293110</instance_urn>
+<product_name>Java SE 6 Runtime Environment</product_name>
+<product_version>1.6.0-internal</product_version>
+<product_urn>urn:uuid:92d1de8c-1e59-42c6-a280-1c379526bcbc</product_urn>
+<product_parent_urn>urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3</product_parent_urn>
+<product_parent>Java Platform Standard Edition 6 (Java SE 6)</product_parent>
+<product_defined_inst_id>id=1.6.0-internal-b00 sparc,dir=/myjdk/solaris-sparc</product_defined_inst_id>
+<product_vendor>Sun Microsystems</product_vendor>
+<platform_arch>sparc</platform_arch>
+<timestamp>2007-11-13 00:49:01 GMT</timestamp>
+<container>global</container>
+<source>servicetag1.properties</source>
+<installer_uid>121937</installer_uid>
+<NEW-FIELD/>
+</service_tag>
+</registry>
+</registration_data>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/servicetag/registration.xml Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<registration_data version="1.0">
+<environment>
+<hostname>ko</hostname>
+<hostId>83abc1ab</hostId>
+<osName>SunOS</osName>
+<osVersion>5.10</osVersion>
+<osArchitecture>sparc</osArchitecture>
+<systemModel>Sun-Fire-V440</systemModel>
+<systemManufacturer>Sun Microsystems</systemManufacturer>
+<cpuManufacturer>Sun Microsystems</cpuManufacturer>
+<serialNumber>BEL078932</serialNumber>
+</environment>
+<registry urn="urn:st:9543ffaa-a4f1-4f77-b2d1-f561922d4e4a" version="1.0">
+<service_tag>
+<instance_urn>urn:st:9efff93a-767c-4714-fcfa-c48988293110</instance_urn>
+<product_name>Java SE 6 Runtime Environment</product_name>
+<product_version>1.6.0-internal</product_version>
+<product_urn>urn:uuid:92d1de8c-1e59-42c6-a280-1c379526bcbc</product_urn>
+<product_parent_urn>urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3</product_parent_urn>
+<product_parent>Java Platform Standard Edition 6 (Java SE 6)</product_parent>
+<product_defined_inst_id>id=1.6.0-internal-b00 sparc,dir=/myjdk/solaris-sparc</product_defined_inst_id>
+<product_vendor>Sun Microsystems</product_vendor>
+<platform_arch>sparc</platform_arch>
+<timestamp>2007-11-13 00:49:01 GMT</timestamp>
+<container>global</container>
+<source>servicetag1.properties</source>
+<installer_uid>121937</installer_uid>
+</service_tag>
+<service_tag>
+<instance_urn>urn:st:0e9712bf-4832-e315-8e40-c4b17ffac9a9</instance_urn>
+<product_name>Java SE 6 Development Kit</product_name>
+<product_version>1.6.0</product_version>
+<product_urn>urn:uuid:b58ef9a8-5ae8-11db-a023-080020a9ed93</product_urn>
+<product_parent_urn>urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3</product_parent_urn>
+<product_parent>Java Platform Standard Edition 6 (Java SE 6)</product_parent>
+<product_defined_inst_id>id=1.6.0_05-b01 i386,dir=/myjdk/solaris-i586</product_defined_inst_id>
+<product_vendor>Sun Microsystems</product_vendor>
+<platform_arch>i386</platform_arch>
+<timestamp>2007-11-13 00:49:01 GMT</timestamp>
+<container>global</container>
+<source>servicetag2.properties</source>
+<installer_uid>121937</installer_uid>
+</service_tag>
+<service_tag>
+<instance_urn>urn:st:8a6ff75e-21a4-c8d7-bbda-de2c971bd67d</instance_urn>
+<product_name>Solaris 10 Operating System</product_name>
+<product_version>10</product_version>
+<product_urn>urn:uuid:5005588c-36f3-11d6-9cec-fc96f718e113</product_urn>
+<product_parent_urn>urn:uuid:596ffcfa-63d5-11d7-9886-ac816a682f92</product_parent_urn>
+<product_parent>Solaris Operating System</product_parent>
+<product_defined_inst_id/>
+<product_vendor>Sun Microsystems</product_vendor>
+<platform_arch>sparc</platform_arch>
+<timestamp>2007-11-13 00:49:01 GMT</timestamp>
+<container>global</container>
+<source>servicetag3.properties</source>
+<installer_uid>212883</installer_uid>
+</service_tag>
+</registry>
+</registration_data>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/servicetag/servicetag1.properties Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,13 @@
+instance_urn=urn:st:9efff93a-767c-4714-fcfa-c48988293110
+product_name=Java SE 6 Runtime Environment
+product_version=1.6.0-internal
+product_urn=urn:uuid:92d1de8c-1e59-42c6-a280-1c379526bcbc
+product_parent_urn=urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3
+product_parent=Java Platform Standard Edition 6 (Java SE 6)
+product_defined_inst_id=id=1.6.0-internal-b00 sparc,dir=/myjdk/solaris-sparc
+product_vendor=Sun Microsystems
+platform_arch=sparc
+timestamp=2007-11-12 05:19:40 GMT
+container=global
+source=servicetag1.properties
+installer_uid=121937
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/servicetag/servicetag2.properties Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,13 @@
+instance_urn=urn:st:0e9712bf-4832-e315-8e40-c4b17ffac9a9
+product_name=Java SE 6 Development Kit
+product_version=1.6.0
+product_urn=urn:uuid:b58ef9a8-5ae8-11db-a023-080020a9ed93
+product_parent_urn=urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3
+product_parent=Java Platform Standard Edition 6 (Java SE 6)
+product_defined_inst_id=id=1.6.0_05-b01 i386,dir=/myjdk/solaris-i586
+product_vendor=Sun Microsystems
+platform_arch=i386
+timestamp=2007-11-12 06:12:21 GMT
+container=global
+source=servicetag2.properties
+installer_uid=121937
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/servicetag/servicetag3.properties Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,13 @@
+instance_urn=urn:st:8a6ff75e-21a4-c8d7-bbda-de2c971bd67d
+product_name=Solaris 10 Operating System
+product_version=10
+product_urn=urn:uuid:5005588c-36f3-11d6-9cec-fc96f718e113
+product_parent_urn=urn:uuid:596ffcfa-63d5-11d7-9886-ac816a682f92
+product_parent=Solaris Operating System
+product_defined_inst_id=
+product_vendor=Sun Microsystems
+platform_arch=sparc
+timestamp=2007-06-20 22:07:11 GMT
+container=global
+source=servicetag3.properties
+installer_uid=212883
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/servicetag/servicetag4.properties Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,13 @@
+instance_urn=urn:st:b8171b45-a087-47b3-92c8-f2d9fb34e8c2
+product_name=Java SE 6 Runtime Environment
+product_version=1.6.0_05
+product_urn=urn:uuid:92d1de8c-1e59-42c6-a280-1c379526bcbc
+product_parent_urn=urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3
+product_parent=Java Platform Standard Edition 6 (Java SE 6)
+product_defined_inst_id=id=1.6.0_05-b01 amd64,dir=/myjdk/linux-amd64
+product_vendor=Sun Microsystems
+platform_arch=x64
+timestamp=2007-12-12 05:19:40 GMT
+container=global
+source=servicetag4.properties
+installer_uid=121937
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/servicetag/servicetag5.properties Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,13 @@
+instance_urn=urn:st:1d4269a1-71e3-4e44-bc8f-3793da7928ed
+product_name=Java SE 6 Runtime Environment
+product_version=1.6.0_06
+product_urn=urn:uuid:92d1de8c-1e59-42c6-a280-1c379526bcbc
+product_parent_urn=urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3
+product_parent=Java Platform Standard Edition 6 (Java SE 6)
+product_defined_inst_id=id=1.6.0_06-b06 i386,dir=/w/mchung/bundles/jdk1.6.0_05/jre
+product_vendor=Sun Microsystems
+platform_arch=x86
+timestamp=2007-11-29 17:59:42 GMT
+container=global
+source=servicetag5.properties
+installer_uid=-1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/EventQueue/6638195/bug6638195.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,138 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ *
+ * @bug 6638195
+ * @author Igor Kushnirskiy
+ * @summary tests if EventQueueDelegate.Delegate is invoked.
+ */
+
+import sun.awt.EventQueueDelegate;
+import com.sun.java.swing.SwingUtilities3;
+
+import java.util.*;
+import java.util.concurrent.*;
+import java.awt.*;
+
+public class bug6638195 {
+ public static void main(String[] args) throws Exception {
+ MyEventQueueDelegate delegate = new MyEventQueueDelegate();
+ EventQueueDelegate.setDelegate(delegate);
+ runTest(delegate);
+
+ delegate = new MyEventQueueDelegate();
+ SwingUtilities3.setEventQueueDelegate(getObjectMap(delegate));
+ runTest(delegate);
+ }
+
+ private static void runTest(MyEventQueueDelegate delegate) throws Exception {
+ EventQueue.invokeLater(
+ new Runnable() {
+ public void run() {
+ }
+ });
+ final CountDownLatch latch = new CountDownLatch(1);
+ EventQueue.invokeLater(
+ new Runnable() {
+ public void run() {
+ latch.countDown();
+ }
+ });
+ latch.await();
+ if (! delegate.allInvoked()) {
+ throw new RuntimeException("failed");
+ }
+ }
+
+ static Map<String, Map<String, Object>> getObjectMap(
+ final EventQueueDelegate.Delegate delegate) {
+ Map<String, Map<String, Object>> objectMap =
+ new HashMap<String, Map<String, Object>>();
+ Map<String, Object> methodMap;
+
+ final AWTEvent[] afterDispatchEventArgument = new AWTEvent[1];
+ final Object[] afterDispatchHandleArgument = new Object[1];
+ Callable<Void> afterDispatchCallable =
+ new Callable<Void>() {
+ public Void call() {
+ delegate.afterDispatch(afterDispatchEventArgument[0],
+ afterDispatchHandleArgument[0]);
+ return null;
+ }
+ };
+ methodMap = new HashMap<String, Object>();
+ methodMap.put("event", afterDispatchEventArgument);
+ methodMap.put("handle", afterDispatchHandleArgument);
+ methodMap.put("method", afterDispatchCallable);
+ objectMap.put("afterDispatch", methodMap);
+
+ final AWTEvent[] beforeDispatchEventArgument = new AWTEvent[1];
+ Callable<Object> beforeDispatchCallable =
+ new Callable<Object>() {
+ public Object call() {
+ return delegate.beforeDispatch(
+ beforeDispatchEventArgument[0]);
+ }
+ };
+ methodMap = new HashMap<String, Object>();
+ methodMap.put("event", beforeDispatchEventArgument);
+ methodMap.put("method", beforeDispatchCallable);
+ objectMap.put("beforeDispatch", methodMap);
+
+ final EventQueue[] getNextEventEventQueueArgument = new EventQueue[1];
+ Callable<AWTEvent> getNextEventCallable =
+ new Callable<AWTEvent>() {
+ public AWTEvent call() throws Exception {
+ return delegate.getNextEvent(
+ getNextEventEventQueueArgument[0]);
+ }
+ };
+ methodMap = new HashMap<String, Object>();
+ methodMap.put("eventQueue", getNextEventEventQueueArgument);
+ methodMap.put("method", getNextEventCallable);
+ objectMap.put("getNextEvent", methodMap);
+
+ return objectMap;
+ }
+ static class MyEventQueueDelegate implements EventQueueDelegate.Delegate {
+ private volatile boolean getNextEventInvoked = false;
+ private volatile boolean beforeDispatchInvoked = false;
+ private volatile boolean afterDispatchInvoked = false;
+ public AWTEvent getNextEvent(EventQueue eventQueue)
+ throws InterruptedException {
+ getNextEventInvoked = true;
+ return eventQueue.getNextEvent();
+ }
+ public Object beforeDispatch(AWTEvent event) {
+ beforeDispatchInvoked = true;
+ return null;
+ }
+ public void afterDispatch(AWTEvent event, Object handle) {
+ afterDispatchInvoked = true;
+ }
+ private boolean allInvoked() {
+ return getNextEventInvoked && beforeDispatchInvoked && afterDispatchInvoked;
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/PropertyEditor/MemoryClassLoader.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+import java.io.ByteArrayOutputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.tools.FileObject;
+import javax.tools.ForwardingJavaFileManager;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileManager;
+import javax.tools.JavaFileObject.Kind;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.ToolProvider;
+
+public final class MemoryClassLoader extends ClassLoader {
+ private final JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+ private final MemoryFileManager manager = new MemoryFileManager(this.compiler);
+
+ public Class<?> compile(String name, String content) {
+ compile(new Source(name, content));
+ try {
+ return findClass(name);
+ }
+ catch (ClassNotFoundException exception) {
+ throw new Error(exception);
+ }
+ }
+
+ public void compile(Source... sources) {
+ List<Source> list = new ArrayList<Source>();
+ if (sources != null) {
+ for (Source source : sources) {
+ if (source != null) {
+ list.add(source);
+ }
+ }
+ }
+ synchronized (this.manager) {
+ this.compiler.getTask(null, this.manager, null, null, null, list).call();
+ }
+ }
+
+ @Override
+ protected Class<?> findClass(String name) throws ClassNotFoundException {
+ synchronized (this.manager) {
+ Output mc = this.manager.map.remove(name);
+ if (mc != null) {
+ byte[] array = mc.toByteArray();
+ return defineClass(name, array, 0, array.length);
+ }
+ }
+ return super.findClass(name);
+ }
+
+ private static final class MemoryFileManager extends ForwardingJavaFileManager<JavaFileManager> {
+ private final Map<String, Output> map = new HashMap<String, Output>();
+
+ MemoryFileManager(JavaCompiler compiler) {
+ super(compiler.getStandardFileManager(null, null, null));
+ }
+
+ @Override
+ public Output getJavaFileForOutput(Location location, String name, Kind kind, FileObject source) {
+ Output mc = this.map.get(name);
+ if (mc == null) {
+ mc = new Output(name);
+ this.map.put(name, mc);
+ }
+ return mc;
+ }
+ }
+
+ private static class MemoryFileObject extends SimpleJavaFileObject {
+ MemoryFileObject(String name, Kind kind) {
+ super(toURI(name, kind.extension), kind);
+ }
+
+ private static URI toURI(String name, String extension) {
+ try {
+ return new URI("mfm:///" + name.replace('.', '/') + extension);
+ }
+ catch (URISyntaxException exception) {
+ throw new Error(exception);
+ }
+ }
+ }
+
+ private static final class Output extends MemoryFileObject {
+ private final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+ Output(String name) {
+ super(name, Kind.CLASS);
+ }
+
+ byte[] toByteArray() {
+ return this.baos.toByteArray();
+ }
+
+ @Override
+ public ByteArrayOutputStream openOutputStream() {
+ this.baos.reset();
+ return this.baos;
+ }
+ }
+
+ public static final class Source extends MemoryFileObject {
+ private final String content;
+
+ Source(String name, String content) {
+ super(name, Kind.SOURCE);
+ this.content = content;
+ }
+
+ @Override
+ public CharSequence getCharContent(boolean ignore) {
+ return this.content;
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/PropertyEditor/Test6397609.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6397609
+ * @summary Tests autocleaning
+ * @author Sergey Malenkov
+ */
+
+import java.beans.PropertyEditorManager;
+
+public class Test6397609 {
+ public static void main(String[] args) throws Exception {
+ MemoryClassLoader loader = new MemoryClassLoader();
+ PropertyEditorManager.registerEditor(
+ Object.class,
+ loader.compile("Editor",
+ "public class Editor extends java.beans.PropertyEditorSupport {}"));
+
+ if (!isEditorExist(Object.class)) {
+ throw new Error("the editor is lost");
+ }
+ loader = null; // clean the reference
+ if (isEditorExist(Object.class)) {
+ throw new Error("unexpected editor is found");
+ }
+ }
+
+ private static boolean isEditorExist(Class type) {
+ for (int i = 0; i < 10; i++) {
+ System.gc(); // clean all weak references
+ if (null == PropertyEditorManager.findEditor(type)) {
+ return false;
+ }
+ }
+ return true;
+ }
+}
--- a/jdk/test/java/beans/PropertyEditor/TestEditor.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/test/java/beans/PropertyEditor/TestEditor.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2006-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,18 +23,6 @@
import java.beans.PropertyEditor;
import java.beans.PropertyEditorManager;
-import java.io.ByteArrayOutputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import javax.tools.FileObject;
-import javax.tools.ForwardingJavaFileManager;
-import javax.tools.JavaCompiler;
-import javax.tools.JavaFileObject.Kind;
-import javax.tools.SimpleJavaFileObject;
-import javax.tools.ToolProvider;
final class TestEditor {
private final PropertyEditor editor;
@@ -53,8 +41,7 @@
void testJava(Object value) {
this.editor.setValue(value);
- MemoryFileManager manager = new MemoryFileManager();
- Object object = manager.invoke(this.editor.getJavaInitializationString());
+ Object object = execute("Executor", "execute", this.editor.getJavaInitializationString());
System.out.println("Property value before: " + value);
System.out.println("Property value after: " + object);
@@ -87,98 +74,21 @@
: object1.equals(object2);
}
- private static final class MemoryFileManager extends ForwardingJavaFileManager {
- private static final String CLASS = "Executor";
- private static final String METHOD = "execute";
- private static final JavaCompiler COMPILER = ToolProvider.getSystemJavaCompiler();
- private final Map<String, MemoryClass> map = new HashMap<String, MemoryClass>();
- private final MemoryClassLoader loader = new MemoryClassLoader();
-
- MemoryFileManager() {
- super(COMPILER.getStandardFileManager(null, null, null));
- }
-
- public Object invoke(String expression) {
- MemorySource file = new MemorySource(CLASS, METHOD, expression);
- if (!COMPILER.getTask(null, this, null, null, null, Arrays.asList(file)).call())
- throw new Error("compilation failed");
-
- MemoryClass mc = this.map.get(CLASS);
- if (mc == null)
- throw new Error("class not found: " + CLASS);
-
- Class c = this.loader.loadClass(CLASS, mc.toByteArray());
- try {
- return c.getMethod(METHOD).invoke(null);
- }
- catch (Exception exception) {
- throw new Error(exception);
- }
- }
-
- public MemoryClass getJavaFileForOutput(Location location, String name, Kind kind, FileObject source) {
- MemoryClass type = this.map.get(name);
- if (type == null) {
- type = new MemoryClass(name);
- this.map.put(name, type);
- }
- return type;
- }
- }
-
- private static final class MemoryClassLoader extends ClassLoader {
- public Class<?> loadClass(String name, byte[] array) {
- return defineClass(name, array, 0, array.length);
- }
- }
+ private static Object execute(String classname, String methodname, String value) {
+ String content
+ = "public class " + classname + " {"
+ + " public static Object " + methodname + "() throws Exception {"
+ + " return " + value + ";"
+ + " }"
+ + "}";
- private static class MemoryObject extends SimpleJavaFileObject {
- protected MemoryObject(String name, Kind kind) {
- super(toURI(name, kind.extension), kind);
- }
-
- private static URI toURI(String name, String extension) {
- try {
- return new URI("mfm:///" + name.replace('.', '/') + extension);
- }
- catch (URISyntaxException exception) {
- throw new Error(exception);
- }
- }
- }
-
- private static final class MemoryClass extends MemoryObject {
- private final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
- MemoryClass(String className) {
- super(className, Kind.CLASS);
+ try {
+ MemoryClassLoader loader = new MemoryClassLoader();
+ Class type = loader.compile(classname, content);
+ return type.getMethod(methodname).invoke(null);
}
-
- public ByteArrayOutputStream openOutputStream() {
- this.baos.reset();
- return this.baos;
- }
-
- public byte[] toByteArray() {
- return this.baos.toByteArray();
- }
- }
-
- private static final class MemorySource extends MemoryObject {
- private final String value;
-
- MemorySource(String className, String methodName, String expression) {
- super(className, Kind.SOURCE);
- this.value
- = "public class " + className + " {\n"
- + " public static Object " + methodName + "() throws Exception {\n"
- + " return " + expression + ";\n"
- + " }\n"
- + "}\n";
- }
-
- public CharSequence getCharContent(boolean ignore) {
- return this.value;
+ catch (Exception exception) {
+ throw new Error(exception);
}
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/VetoableChangeSupport/Test6630275.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6630275
+ * @summary Tests VetoableChangeSupport specification
+ * @author Sergey Malenkov
+ */
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyVetoException;
+import java.beans.VetoableChangeListener;
+import java.beans.VetoableChangeSupport;
+
+public class Test6630275 {
+ private static final String PROPERTY = "property"; // NON-NLS: predefined property name
+
+ public static void main(String[] args) {
+ CheckListener first = new CheckListener(false);
+ CheckListener second = new CheckListener(true);
+ CheckListener third = new CheckListener(false);
+
+ VetoableChangeSupport vcs = new VetoableChangeSupport(Test6630275.class);
+ vcs.addVetoableChangeListener(first);
+ vcs.addVetoableChangeListener(PROPERTY, first);
+ vcs.addVetoableChangeListener(PROPERTY, second);
+ vcs.addVetoableChangeListener(PROPERTY, third);
+ try {
+ vcs.fireVetoableChange(PROPERTY, true, false);
+ } catch (PropertyVetoException exception) {
+ first.validate();
+ second.validate();
+ third.validate();
+ return; // expected exception
+ }
+ throw new Error("exception should be thrown");
+ }
+
+ private static class CheckListener implements VetoableChangeListener {
+ private final boolean veto;
+ private boolean odd; // even/odd check for notification
+
+ private CheckListener(boolean veto) {
+ this.veto = veto;
+ }
+
+ private void validate() {
+ if (this.veto != this.odd)
+ throw new Error(this.odd
+ ? "undo event expected"
+ : "unexpected undo event");
+ }
+
+ public void vetoableChange(PropertyChangeEvent event) throws PropertyVetoException {
+ this.odd = !this.odd;
+ if (this.veto)
+ throw new PropertyVetoException("disable all changes", event);
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/XMLEncoder/Test4994637.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 4994637
+ * @summary Tests custom map encoding
+ * @author Sergey Malenkov
+ */
+
+import java.util.HashMap;
+
+public final class Test4994637 extends AbstractTest<HashMap> {
+ public static void main(String[] args) {
+ new Test4994637().test(true);
+ }
+
+ @Override
+ protected CustomMap getObject() {
+ return new CustomMap();
+ }
+
+ @Override
+ protected CustomMap getAnotherObject() {
+ CustomMap map = new CustomMap();
+ map.clear();
+ map.put(null, "zero");
+ return map;
+ }
+
+ public static final class CustomMap extends HashMap<String, String> {
+ public CustomMap() {
+ put("1", "one");
+ put("2", "two");
+ put("3", "three");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/XMLEncoder/java_awt_BorderLayout.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 4916852
+ * @summary Tests BorderLayout encoding
+ * @author Sergey Malenkov
+ */
+
+import java.awt.BorderLayout;
+import javax.swing.JLabel;
+
+public final class java_awt_BorderLayout extends AbstractTest<BorderLayout> {
+ private static final String[] CONSTRAINTS = {
+ BorderLayout.NORTH,
+ BorderLayout.SOUTH,
+ BorderLayout.EAST,
+ BorderLayout.WEST,
+ BorderLayout.CENTER,
+ BorderLayout.PAGE_START,
+ BorderLayout.PAGE_END,
+ BorderLayout.LINE_START,
+ BorderLayout.LINE_END,
+ };
+
+ public static void main(String[] args) {
+ new java_awt_BorderLayout().test(true);
+ }
+
+ @Override
+ protected BorderLayout getObject() {
+ BorderLayout layout = new BorderLayout();
+ update(layout, BorderLayout.EAST);
+ update(layout, BorderLayout.WEST);
+ update(layout, BorderLayout.NORTH);
+ update(layout, BorderLayout.SOUTH);
+ return layout;
+ }
+
+ @Override
+ protected BorderLayout getAnotherObject() {
+ BorderLayout layout = getObject();
+ update(layout, BorderLayout.CENTER);
+ return layout;
+ }
+
+ @Override
+ protected void validate(BorderLayout before, BorderLayout after) {
+ super.validate(before, after);
+
+ BeanValidator validator = new BeanValidator();
+ for (String constraint : CONSTRAINTS) {
+ validator.validate(before.getLayoutComponent(constraint),
+ after.getLayoutComponent(constraint));
+ }
+ }
+
+ private static void update(BorderLayout layout, String constraints) {
+ layout.addLayoutComponent(new JLabel(constraints), constraints);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/beans/XMLEncoder/java_awt_Component.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 4916852
+ * @summary Tests Component encoding (background, foreground and font)
+ * @author Sergey Malenkov
+ */
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Font;
+
+public final class java_awt_Component extends AbstractTest<Component> {
+ public static void main(String[] args) {
+ new java_awt_Component().test(true);
+ }
+
+ @Override
+ protected Component getObject() {
+ Component component = new MyComponent();
+ component.setBackground(Color.WHITE);
+ component.setFont(new Font(null, Font.BOLD, 5));
+ return component;
+ }
+
+ @Override
+ protected Component getAnotherObject() {
+ Component component = new MyComponent();
+ component.setForeground(Color.BLACK);
+ component.setFont(new Font(null, Font.ITALIC, 6));
+ return component;
+ }
+
+ public static final class MyComponent extends Component {
+ }
+}
\ No newline at end of file
--- a/jdk/test/java/beans/XMLEncoder/java_util_HashMap.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/test/java/beans/XMLEncoder/java_util_HashMap.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2006-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4631471 4921212
+ * @bug 4631471 4921212 4994637
* @summary Tests HashMap encoding
* @author Sergey Malenkov
*/
@@ -36,10 +36,17 @@
new java_util_HashMap().test(true);
}
+ @Override
protected Map<String, String> getObject() {
- return new HashMap<String, String>();
+ Map<String, String> map = new HashMap<String, String>();
+ map.put(null, null);
+ map.put("key", "value");
+ map.put("key-null", "null-value");
+ map.put("way", "remove");
+ return map;
}
+ @Override
protected Map<String, String> getAnotherObject() {
Map<String, String> map = new HashMap<String, String>();
map.put(null, "null-value");
@@ -48,6 +55,7 @@
return map;
}
+ @Override
protected void validate(Map<String, String> before, Map<String, String> after) {
super.validate(before, after);
validate(before);
@@ -55,10 +63,18 @@
}
private static void validate(Map<String, String> map) {
- if (!map.isEmpty()) {
+ switch (map.size()) {
+ case 3:
validate(map, null, "null-value");
validate(map, "key", "value");
validate(map, "key-null", null);
+ break;
+ case 4:
+ validate(map, null, null);
+ validate(map, "key", "value");
+ validate(map, "key-null", "null-value");
+ validate(map, "way", "remove");
+ break;
}
}
--- a/jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Wed Jul 05 16:42:37 2017 +0200
@@ -45,4 +45,4 @@
;;
esac
-${TESTJAVA}${FILESEP}bin${FILESEP}java -Xbootclasspath:${TESTCLASSES}${PATHSEP}${TESTJAVA}${FILESEP}lib${FILESEP}classes.zip${PATHSEP}${TESTJAVA}${FILESEP}jre${FILESEP}lib${FILESEP}rt.jar${PATHSEP}${TESTJAVA}${FILESEP}classes ADatagramSocket true
+${TESTJAVA}${FILESEP}bin${FILESEP}java -Xbootclasspath/p:${TESTCLASSES} ADatagramSocket true
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/text/Bidi/Bug6665028.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6665028
+ * @summary verify that the memory corruption doesn't happen. Note
+ * that this test case fails without the fix in some different ways,
+ * including timeout, due to the memory corruption.
+ * @build Bug6665028
+ * @run main/othervm/timeout=60 -Xmx16m Bug6665028
+ */
+
+import java.awt.font.TextAttribute;
+import java.text.AttributedString;
+import java.text.Bidi;
+
+// test1() and test2() were derived from BidiEmbeddingTest.
+public class Bug6665028 {
+
+ private static boolean runrun = true;
+
+ private static class Test extends Thread {
+ public void run() {
+ while (runrun) {
+ test1();
+ test2();
+ }
+ }
+ }
+
+ public static void main(String[] args) {
+ Test[] tests = new Test[4];
+ for (int i = 0; i < tests.length; i++) {
+ Test t = new Test();
+ tests[i] = t;
+ t.start();
+ }
+
+ try {
+ Thread.sleep(45000);
+ } catch (InterruptedException e) {
+ }
+
+ runrun = false;
+
+ for (int i = 0; i < tests.length; i++) {
+ try {
+ tests[i].join();
+ } catch (InterruptedException e) {
+ }
+ }
+ }
+
+ static String target;
+ static {
+ String s = "A Bidi object provides information on the bidirectional reordering of the text used to create it. This is required, for example, to properly display Arabic or Hebrew text. ";
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < 1000; i++) {
+ sb.append(s);
+ }
+ target = sb.toString();
+ }
+
+ static void test1() {
+ String str = "If this text is >" + target + "< the test passed.";
+ int start = str.indexOf(target);
+ int limit = start + target.length();
+
+ AttributedString astr = new AttributedString(str);
+ astr.addAttribute(TextAttribute.BIDI_EMBEDDING,
+ new Integer(-1),
+ start,
+ limit);
+
+ Bidi bidi = new Bidi(astr.getIterator());
+
+ byte[] embs = new byte[str.length() + 3];
+ for (int i = start + 1; i < limit + 1; ++i) {
+ embs[i] = -1;
+ }
+
+ Bidi bidi2 = new Bidi(str.toCharArray(), 0, embs, 1, str.length(), Bidi.DIRECTION_DEFAULT_LEFT_TO_RIGHT);
+ if (bidi.getRunCount() != 3 || bidi2.getRunCount() != 3) {
+ throw new Error("Bidi run count incorrect");
+ }
+ }
+
+ static void test2() {
+ String str = "If this text is >" + target + "< the test passed.";
+ int length = str.length();
+ int start = str.indexOf(target);
+ int limit = start + target.length();
+
+ AttributedString astr = new AttributedString(str);
+ astr.addAttribute(TextAttribute.RUN_DIRECTION, TextAttribute.RUN_DIRECTION_RTL);
+
+ astr.addAttribute(TextAttribute.BIDI_EMBEDDING,
+ new Integer(-3),
+ start,
+ limit);
+
+ Bidi bidi = new Bidi(astr.getIterator());
+
+ if (bidi.getRunCount() != 6) { // runs of spaces and angles at embedding bound,s and final period, each get level 1
+ throw new Error("Bidi embedding processing failed");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/text/Format/DateFormat/Bug4823811.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,789 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * @test
+ * @bug 4823811
+ * @summary Confirm that text which includes numbers with a trailing minus sign is parsed correctly.
+ */
+
+import java.text.*;
+import java.util.*;
+
+public class Bug4823811 {
+
+ private static Locale localeEG = new Locale("ar", "EG");
+ private static Locale localeUS = Locale.US;
+
+ private static String JuneInArabic = "\u064a\u0648\u0646\u064a\u0648";
+ private static String JulyInArabic = "\u064a\u0648\u0644\u064a\u0648";
+ private static String JuneInEnglish = "June";
+ private static String JulyInEnglish = "July";
+
+ private static String BORDER =
+ "============================================================";
+
+ /*
+ * I don't use static import here intentionally so that this test program
+ * can be run on JDK 1.4.2.
+ */
+ private static int ERA = Calendar.ERA;
+ private static int BC = GregorianCalendar.BC;
+// private static int JAN = Calendar.JANUARY;
+// private static int FEB = Calendar.FEBRUARY;
+// private static int MAR = Calendar.MARCH;
+ private static int APR = Calendar.APRIL;
+ private static int MAY = Calendar.MAY;
+ private static int JUN = Calendar.JUNE;
+ private static int JUL = Calendar.JULY;
+// private static int AUG = Calendar.AUGUST;
+// private static int SEP = Calendar.SEPTEMBER;
+// private static int OCT = Calendar.OCTOBER;
+// private static int NOV = Calendar.NOVEMBER;
+// private static int DEC = Calendar.DECEMBER;
+
+ private static String[] patterns = {
+ "yyyy MMMM d H m s",
+ "yyyy MM dd hh mm ss",
+
+ /*
+ * Because 1-based HOUR_OF_DAY, 1-based HOUR, MONTH, and YEAR fields
+ * are parsed using different code from the code for other numeric
+ * fields, I prepared YEAR-preceding patterns and SECOND-preceding
+ * patterns.
+ */
+ "yyyy M d h m s",
+ " yyyy M d h m s",
+ "yyyy M d h m s ",
+
+ "s m h d M yyyy",
+ " s m h d M yyyy",
+ "s m h d M yyyy ",
+ };
+
+ private static char originalMinusSign1 = ':';
+ private static char originalMinusSign2 = '\uff0d'; // fullwidth minus
+ private static String[] delimiters = {"-", "/", ":", "/", "\uff0d", "/"};
+ private static String[][] specialDelimiters = {
+ // for Arabic formatter and modified English formatter
+ {"--", "-/", "::", ":/", "\uff0d\uff0d", "\uff0d/"},
+
+ // for English formatter and modified Arabic formatter
+ {"--", "/-", "::", "/:", "\uff0d\uff0d", "/\uff0d"},
+ };
+
+ /*
+ * Format:
+ * +-------------------------------------------------------------------+
+ * | Input | Output |
+ * +---------------------+---------------------------------------------|
+ * | datesEG & datesUS | formattedDatesEG & formattedDatesUS |
+ * +-------------------------------------------------------------------+
+ *
+ * Parse:
+ * +-------------------------------------------------------------------+
+ * | Input | Output |
+ * |---------------------+---------------------------------------------|
+ * | datesToParse | datesEG & datesUS |
+ * +-------------------------------------------------------------------+
+ */
+ private static String[][] datesToParse = {
+ // "JUNE" and "JULY" are replaced with a localized month name later.
+ {"2008 JULY 20 3 12 83",
+ "2008 JULY 20 3 12 83",
+ "2008 JULY 20 3 12 83"},
+
+ {"2008 07 20 03 12 83",
+ "2008 07 20 03 12 83",
+ "2008 07 20 03 12 83"},
+
+ {"2008 7 20 3 12 83",
+ "2008 7 20 3 12 83",
+ "2008 7 20 3 12 83"},
+
+ {" 2008 7 20 3 12 83",
+ " 2008 7 20 3 12 83",
+ " 2008 7 20 3 12 83",
+ "2008 7 20 3 12 83"},
+
+ {"2008 7 20 3 12 83 ",
+ "2008 7 20 3 12 83 ",
+ "2008 7 20 3 12 83"},
+
+ {"83 12 3 20 7 2008",
+ "83 12 3 20 7 2008",
+ "83 12 3 20 7 2008"},
+
+ {" 83 12 3 20 7 2008",
+ " 83 12 3 20 7 2008",
+ " 83 12 3 20 7 2008",
+ "83 12 3 20 7 2008"},
+
+ {"83 12 3 20 7 2008 ",
+ "83 12 3 20 7 2008 ",
+ "83 12 3 20 7 2008"},
+ };
+
+ // For formatting
+ private static String[][] formattedDatesEG = {
+ {"2008 JULY 20 3 13 23",
+ "2009 JULY 20 3 13 23",
+ null},
+
+ {"2008 07 20 03 13 23",
+ "2009 07 20 03 13 23",
+ "2007 05 20 03 13 23"},
+
+ {"2008 7 20 3 13 23",
+ "2009 6 10 3 13 23",
+ "2007 4 10 3 13 23"},
+
+ {" 2008 7 20 3 13 23",
+ null,
+ " 2009 7 20 3 13 23",
+ null},
+
+ {"2008 7 20 3 13 23 ",
+ "2008 7 20 3 10 37 ",
+ null},
+
+ {"23 13 3 20 7 2008",
+ "37 10 9 19 7 2008",
+ "23 49 8 19 7 2008"},
+
+ {" 23 13 3 20 7 2008",
+ null,
+ " 37 10 3 20 7 2008",
+ null},
+
+ {"23 13 3 20 7 2008 ",
+ "23 13 3 20 7 2009 ",
+ null},
+ };
+
+ private static String[][] formattedDatesUS = {
+ {"2008 JULY 20 3 13 23",
+ null,
+ "2008 JUNE 10 3 13 23"},
+
+ {"2008 07 20 03 13 23",
+ "2007 05 20 03 13 23",
+ "2008 06 10 03 13 23"},
+
+ {"2008 7 20 3 13 23",
+ "2007 5 19 9 13 23",
+ "2008 6 9 9 13 23"},
+
+ {" 2008 7 20 3 13 23",
+ " 2009 7 20 3 13 23",
+ " 2007 5 20 3 13 23",
+ null},
+
+ {"2008 7 20 3 13 23 ",
+ "2008 7 20 3 13 23 ",
+ null},
+
+ {"23 13 3 20 7 2008",
+ "23 49 2 10 6 2008",
+ "23 13 9 9 6 2008"},
+
+ {" 23 13 3 20 7 2008",
+ " 37 10 3 20 7 2008",
+ " 23 49 2 20 7 2008",
+ null},
+
+ {"23 13 3 20 7 2008 ",
+ "23 13 3 20 7 2008 ",
+ null},
+ };
+
+ private static GregorianCalendar[][] datesEG = {
+ {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83),
+ new GregorianCalendar(-2008, JUL, 20, 3, 12, 83),
+ null},
+
+ {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83),
+ new GregorianCalendar(-2008, JUL, 20, 3, 12, 83),
+ new GregorianCalendar( 2007, MAY, 20, 3, 12, 83)},
+
+ {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83),
+ new GregorianCalendar(-2008, JUL, -20, 3, 12, 83),
+ new GregorianCalendar( 2007, APR, 10, 3, 12, 83)},
+
+ {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83),
+ null,
+ new GregorianCalendar(-2008, JUL, 20, 3, 12, 83),
+ null},
+
+ {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83),
+ new GregorianCalendar( 2008, JUL, 20, 3, 12, -83),
+ null},
+
+ {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83),
+ new GregorianCalendar( 2008, JUL, 20, -3, 12, -83),
+ new GregorianCalendar( 2008, JUL, 20, -3, -12, 83)},
+
+ {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83),
+ null,
+ new GregorianCalendar( 2008, JUL, 20, 3, 12, -83),
+ null},
+
+ {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83),
+ new GregorianCalendar(-2008, JUL, 20, 3, 12, 83),
+ null},
+ };
+
+ private static GregorianCalendar[][] datesUS = {
+ {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83),
+ null,
+ new GregorianCalendar( 2008, JUN, 10, 3, 12, 83)},
+
+ {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83),
+ new GregorianCalendar( 2007, MAY, 20, 3, 12, 83),
+ new GregorianCalendar( 2008, JUN, 10, 3, 12, 83)},
+
+ {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83),
+ new GregorianCalendar( 2007, MAY, 20, -3, 12, 83),
+ new GregorianCalendar( 2008, JUL, -20, -3, 12, 83)},
+
+ {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83),
+ new GregorianCalendar(-2008, JUL, 20, 3, 12, 83),
+ new GregorianCalendar( 2007, MAY, 20, 3, 12, 83),
+ null},
+
+ {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83),
+ new GregorianCalendar( 2008, JUL, 20, 3, 12, 83),
+ null},
+
+ {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83),
+ new GregorianCalendar( 2008, JUL, -20, 3, -12, 83),
+ new GregorianCalendar( 2008, JUL, -20, -3, 12, 83)},
+
+ {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83),
+ new GregorianCalendar( 2008, JUL, 20, 3, 12, -83),
+ new GregorianCalendar( 2008, JUL, 20, 3, -12, 83),
+ null},
+
+ {new GregorianCalendar( 2008, JUL, 20, 3, 12, 83),
+ new GregorianCalendar( 2008, JUL, 20, 3, 12, 83),
+ null},
+ };
+
+ /* flags */
+ private static boolean err = false;
+ private static boolean verbose = false;
+
+
+ public static void main(String[] args) {
+ if (args.length == 1 && args[0].equals("-v")) {
+ verbose = true;
+ }
+
+ Locale defaultLocale = Locale.getDefault();
+ TimeZone defaultTimeZone = TimeZone.getDefault();
+
+ TimeZone.setDefault(TimeZone.getTimeZone("Asia/Tokyo"));
+
+ try {
+ /*
+ * Test SimpleDateFormat.parse() and format() for original
+ * SimpleDateFormat instances
+ */
+ testDateFormat1();
+
+ /*
+ * Test SimpleDateFormat.parse() and format() for modified
+ * SimpleDateFormat instances using an original minus sign,
+ * pattern, and diffenrent month names in DecimalFormat
+ */
+ testDateFormat2();
+
+ /*
+ * Test SimpleDateFormat.parse() and format() for modified
+ * SimpleDateFormat instances using a fullwidth minus sign
+ */
+ testDateFormat3();
+
+ /*
+ * Just to confirm that regressions aren't introduced in
+ * DecimalFormat. This cannot happen, though. Because I didn't
+ * change DecimalFormat at all.
+ */
+ testNumberFormat();
+ }
+ catch (Exception e) {
+ err = true;
+ System.err.println("Unexpected exception: " + e);
+ }
+ finally {
+ Locale.setDefault(defaultLocale);
+ TimeZone.setDefault(defaultTimeZone);
+
+ if (err) {
+ System.err.println(BORDER + " Test failed.");
+ throw new RuntimeException("Date/Number formatting/parsing error.");
+ } else {
+ System.out.println(BORDER + " Test passed.");
+ }
+ }
+ }
+
+
+ //
+ // DateFormat test
+ //
+ private static void testDateFormat1() {
+ for (int i = 0; i < patterns.length; i++) {
+ System.out.println(BORDER);
+ for (int j = 0; j <= 1; j++) {
+ // Generate a pattern
+ String pattern = patterns[i].replaceAll(" ", delimiters[j]);
+ System.out.println("Pattern=\"" + pattern + "\"");
+
+ System.out.println("*** DateFormat.format test in ar_EG");
+ testDateFormatFormattingInRTL(pattern, i, j, null, localeEG, false);
+
+ System.out.println("*** DateFormat.parse test in ar_EG");
+ testDateFormatParsingInRTL(pattern, i, j, null, localeEG, false);
+
+ System.out.println("*** DateFormat.format test in en_US");
+ testDateFormatFormattingInLTR(pattern, i, j, null, localeUS, true);
+
+ System.out.println("*** DateFormat.parse test in en_US");
+ testDateFormatParsingInLTR(pattern, i, j, null, localeUS, true);
+ }
+ }
+ }
+
+ private static void testDateFormat2() {
+ /*
+ * modified ar_EG Date&Time formatter :
+ * minus sign: ':'
+ * pattern: "#,##0.###"
+ * month names: In Arabic
+ *
+ * modified en_US Date&Time formatter :
+ * minus sign: ':'
+ * pattern: "#,##0.###;#,##0.###-"
+ * month names: In English
+ */
+ DecimalFormat dfEG = (DecimalFormat)NumberFormat.getInstance(localeEG);
+ DecimalFormat dfUS = (DecimalFormat)NumberFormat.getInstance(localeUS);
+
+ DecimalFormatSymbols dfsEG = dfEG.getDecimalFormatSymbols();
+ DecimalFormatSymbols dfsUS = dfUS.getDecimalFormatSymbols();
+ dfsEG.setMinusSign(originalMinusSign1);
+ dfsUS.setMinusSign(originalMinusSign1);
+ dfEG.setDecimalFormatSymbols(dfsUS);
+ dfUS.setDecimalFormatSymbols(dfsEG);
+
+ String patternEG = dfEG.toPattern();
+ String patternUS = dfUS.toPattern();
+
+ dfEG.applyPattern(patternUS);
+ dfUS.applyPattern(patternEG);
+
+ for (int i = 0; i < patterns.length; i++) {
+ System.out.println(BORDER);
+ for (int j = 2; j <= 3; j++) {
+ // Generate a pattern
+ String pattern = patterns[i].replaceAll(" ", delimiters[j]);
+ System.out.println("Pattern=\"" + pattern + "\"");
+
+ System.out.println("*** DateFormat.format test in modified en_US");
+ testDateFormatFormattingInRTL(pattern, i, j, dfUS, localeUS, true);
+
+ System.out.println("*** DateFormat.parse test in modified en_US");
+ testDateFormatParsingInRTL(pattern, i, j, dfUS, localeUS, true);
+
+ System.out.println("*** DateFormat.format test in modified ar_EG");
+ testDateFormatFormattingInLTR(pattern, i, j, dfEG, localeEG, false);
+
+ System.out.println("*** DateFormat.parse test in modified ar_EG");
+ testDateFormatParsingInLTR(pattern, i, j, dfEG, localeEG, false);
+ }
+ }
+ }
+
+ private static void testDateFormat3() {
+ /*
+ * modified ar_EG Date&Time formatter :
+ * minus sign: '\uff0d' // fullwidth minus
+ * pattern: "#,##0.###;#,##0.###-"
+ * month names: In Arabic
+ *
+ * modified en_US Date&Time formatter :
+ * minus sign: '\uff0d' // fullwidth minus
+ * pattern: "#,##0.###"
+ * month names: In English
+ */
+ DecimalFormat dfEG = (DecimalFormat)NumberFormat.getInstance(localeEG);
+ DecimalFormat dfUS = (DecimalFormat)NumberFormat.getInstance(localeUS);
+
+ DecimalFormatSymbols dfsEG = dfEG.getDecimalFormatSymbols();
+ DecimalFormatSymbols dfsUS = dfUS.getDecimalFormatSymbols();
+ dfsEG.setMinusSign(originalMinusSign2);
+ dfsUS.setMinusSign(originalMinusSign2);
+ dfEG.setDecimalFormatSymbols(dfsEG);
+ dfUS.setDecimalFormatSymbols(dfsUS);
+
+ for (int i = 0; i < patterns.length; i++) {
+ System.out.println(BORDER);
+ for (int j = 4; j <= 5; j++) {
+ // Generate a pattern
+ String pattern = patterns[i].replaceAll(" ", delimiters[j]);
+ System.out.println("Pattern=\"" + pattern + "\"");
+
+ System.out.println("*** DateFormat.format test in modified ar_EG");
+ testDateFormatFormattingInRTL(pattern, i, j, dfEG, localeEG, false);
+
+ System.out.println("*** DateFormat.parse test in modified ar_EG");
+ testDateFormatParsingInRTL(pattern, i, j, dfEG, localeEG, false);
+
+ System.out.println("*** DateFormat.format test in modified en_US");
+ testDateFormatFormattingInLTR(pattern, i, j, dfUS, localeUS, true);
+
+ System.out.println("*** DateFormat.parse test in modified en_US");
+ testDateFormatParsingInLTR(pattern, i, j, dfUS, localeUS, true);
+ }
+ }
+ }
+
+ private static void testDateFormatFormattingInRTL(String pattern,
+ int basePattern,
+ int delimiter,
+ NumberFormat nf,
+ Locale locale,
+ boolean useEnglishMonthName) {
+ Locale.setDefault(locale);
+
+ SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+ if (nf != null) {
+ sdf.setNumberFormat(nf);
+ }
+ for (int i = 0; i < datesToParse[basePattern].length; i++) {
+ if (datesEG[basePattern][i] == null) {
+ continue;
+ }
+
+ String expected = formattedDatesEG[basePattern][i]
+ .replaceAll("JUNE", (useEnglishMonthName ?
+ JuneInEnglish : JuneInArabic))
+ .replaceAll("JULY", (useEnglishMonthName ?
+ JulyInEnglish : JulyInArabic))
+ .replaceAll(" ", delimiters[delimiter]);
+ testDateFormatFormatting(sdf, pattern, datesEG[basePattern][i],
+ expected, locale.toString());
+ }
+ }
+
+ private static void testDateFormatFormattingInLTR(String pattern,
+ int basePattern,
+ int delimiter,
+ NumberFormat nf,
+ Locale locale,
+ boolean useEnglishMonthName) {
+ Locale.setDefault(locale);
+
+ SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+ if (nf != null) {
+ sdf.setNumberFormat(nf);
+ }
+ for (int i = 0; i < datesToParse[basePattern].length; i++) {
+ if (datesUS[basePattern][i] == null) {
+ continue;
+ }
+
+ String expected = formattedDatesUS[basePattern][i]
+ .replaceAll("JUNE", (useEnglishMonthName ?
+ JuneInEnglish : JuneInArabic))
+ .replaceAll("JULY", (useEnglishMonthName ?
+ JulyInEnglish : JulyInArabic))
+ .replaceAll(" ", delimiters[delimiter]);
+ testDateFormatFormatting(sdf, pattern, datesUS[basePattern][i],
+ expected, locale.toString());
+ }
+ }
+
+ private static void testDateFormatFormatting(SimpleDateFormat sdf,
+ String pattern,
+ GregorianCalendar givenGC,
+ String expected,
+ String locale) {
+ Date given = givenGC.getTime();
+ String str = sdf.format(given);
+ if (expected.equals(str)) {
+ if (verbose) {
+ System.out.print(" Passed: SimpleDateFormat(");
+ System.out.print(locale + ", \"" + pattern + "\").format(");
+ System.out.println(given + ")");
+
+ System.out.print(" ---> \"" + str + "\" ");
+ System.out.println((givenGC.get(ERA) == BC) ? "(BC)" : "(AD)");
+ }
+ } else {
+ err = true;
+
+ System.err.print(" Failed: Unexpected SimpleDateFormat(");
+ System.out.print(locale + ", \"" + pattern + "\").format(");
+ System.out.println(given + ") result.");
+
+ System.out.println(" Expected: \"" + expected + "\"");
+
+ System.out.print(" Got: \"" + str + "\" ");
+ System.out.println((givenGC.get(ERA) == BC) ? "(BC)" : "(AD)");
+ }
+ }
+
+ private static void testDateFormatParsingInRTL(String pattern,
+ int basePattern,
+ int delimiter,
+ NumberFormat nf,
+ Locale locale,
+ boolean useEnglishMonthName) {
+ Locale.setDefault(locale);
+
+ SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+ if (nf != null) {
+ sdf.setNumberFormat(nf);
+ }
+ for (int i = 0; i < datesToParse[basePattern].length; i++) {
+ String given = datesToParse[basePattern][i]
+ .replaceAll(" ", specialDelimiters[0][delimiter])
+ .replaceAll(" ", delimiters[delimiter]);
+
+ testDateFormatParsing(sdf, pattern,
+ given.replaceAll("JULY", (useEnglishMonthName ?
+ JulyInEnglish : JulyInArabic)),
+ datesEG[basePattern][i], locale.toString());
+ }
+ }
+
+ private static void testDateFormatParsingInLTR(String pattern,
+ int basePattern,
+ int delimiter,
+ NumberFormat nf,
+ Locale locale,
+ boolean useEnglishMonthName) {
+ Locale.setDefault(locale);
+
+ SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+ if (nf != null) {
+ sdf.setNumberFormat(nf);
+ }
+ for (int i = 0; i < datesToParse[basePattern].length; i++) {
+ String given = datesToParse[basePattern][i]
+ .replaceAll(" ", specialDelimiters[1][delimiter])
+ .replaceAll(" ", delimiters[delimiter]);
+
+ testDateFormatParsing(sdf, pattern,
+ given.replaceAll("JULY", (useEnglishMonthName ?
+ JulyInEnglish : JulyInArabic)),
+ datesUS[basePattern][i], locale.toString());
+ }
+ }
+
+ private static void testDateFormatParsing(SimpleDateFormat sdf,
+ String pattern,
+ String given,
+ GregorianCalendar expectedGC,
+ String locale) {
+ try {
+ Date d = sdf.parse(given);
+ if (expectedGC == null) {
+ err = true;
+ System.err.print(" Failed: SimpleDateFormat(" + locale);
+ System.err.print(", \"" + pattern + "\").parse(\"" + given);
+ System.err.println("\") should have thrown ParseException");
+ } else if (expectedGC.getTime().equals(d)) {
+ if (verbose) {
+ System.out.print(" Passed: SimpleDateFormat(" + locale);
+ System.out.print(", \"" + pattern + "\").parse(\"" + given);
+ System.out.println("\")");
+
+ System.out.print(" ---> " + d + " (" + d.getTime());
+ System.out.println(")");
+ }
+ } else {
+ err = true;
+ System.err.print(" Failed: SimpleDateFormat(" + locale);
+ System.err.print(", \"" + pattern + "\").parse(\"" + given);
+ System.err.println("\")");
+
+ System.err.print(" Expected: " + expectedGC.getTime());
+ System.err.println(" (" + d.getTime() + ")");
+
+ System.err.print(" Got: " + d + " (" + d.getTime());
+ System.err.println(")");
+
+ System.err.print(" Pattern: \"");
+ System.err.print(((DecimalFormat)sdf.getNumberFormat()).toPattern());
+ System.err.println("\"");
+ }
+ }
+ catch (ParseException pe) {
+ if (expectedGC == null) {
+ if (verbose) {
+ System.out.print(" Passed: SimpleDateFormat(" + locale);
+ System.out.print(", \"" + pattern + "\").parse(\"" + given);
+ System.out.println("\")");
+
+ System.out.println(" threw ParseException as expected");
+ }
+ } else {
+ err = true;
+ System.err.println(" Failed: Unexpected exception with");
+
+ System.err.print(" SimpleDateFormat(" + locale);
+ System.err.print(", \"" + pattern + "\").parse(\"");
+ System.err.println(given + "\"):");
+
+ System.err.println(" " + pe);
+
+ System.err.print(" Pattern: \"");
+ System.err.print(((DecimalFormat)sdf.getNumberFormat()).toPattern());
+ System.err.println("\"");
+
+ System.err.print(" Month 0: ");
+ System.err.println(sdf.getDateFormatSymbols().getMonths()[0]);
+ }
+ }
+ }
+
+
+ //
+ // NumberFormat test
+ //
+ private static void testNumberFormat() {
+ NumberFormat nfEG = NumberFormat.getInstance(localeEG);
+ NumberFormat nfUS = NumberFormat.getInstance(localeUS);
+
+ System.out.println("*** DecimalFormat.format test in ar_EG");
+ testNumberFormatFormatting(nfEG, -123456789, "123,456,789-", "ar_EG");
+ testNumberFormatFormatting(nfEG, -456, "456-", "ar_EG");
+
+ System.out.println("*** DecimalFormat.parse test in ar_EG");
+ testNumberFormatParsing(nfEG, "123-", new Long(-123), "ar_EG");
+ testNumberFormatParsing(nfEG, "123--", new Long(-123), "ar_EG");
+ testNumberFormatParsingCheckException(nfEG, "-123", 0, "ar_EG");
+
+ System.out.println("*** DecimalFormat.format test in en_US");
+ testNumberFormatFormatting(nfUS, -123456789, "-123,456,789", "en_US");
+ testNumberFormatFormatting(nfUS, -456, "-456", "en_US");
+
+ System.out.println("*** DecimalFormat.parse test in en_US");
+ testNumberFormatParsing(nfUS, "123-", new Long(123), "en_US");
+ testNumberFormatParsing(nfUS, "-123", new Long(-123), "en_US");
+ testNumberFormatParsingCheckException(nfUS, "--123", 0, "en_US");
+ }
+
+ private static void testNumberFormatFormatting(NumberFormat nf,
+ int given,
+ String expected,
+ String locale) {
+ String str = nf.format(given);
+ if (expected.equals(str)) {
+ if (verbose) {
+ System.out.print(" Passed: NumberFormat(" + locale);
+ System.out.println(").format(" + given + ")");
+
+ System.out.println(" ---> \"" + str + "\"");
+ }
+ } else {
+ err = true;
+ System.err.print(" Failed: Unexpected NumberFormat(" + locale);
+ System.err.println(").format(" + given + ") result.");
+
+ System.err.println(" Expected: \"" + expected + "\"");
+
+ System.err.println(" Got: \"" + str + "\"");
+ }
+ }
+
+ private static void testNumberFormatParsing(NumberFormat nf,
+ String given,
+ Number expected,
+ String locale) {
+ try {
+ Number n = nf.parse(given);
+ if (n.equals(expected)) {
+ if (verbose) {
+ System.out.print(" Passed: NumberFormat(" + locale);
+ System.out.println(").parse(\"" + given + "\")");
+
+ System.out.println(" ---> " + n);
+ }
+ } else {
+ err = true;
+ System.err.print(" Failed: Unexpected NumberFormat(" + locale);
+ System.err.println(").parse(\"" + given + "\") result.");
+
+ System.err.println(" Expected: " + expected);
+
+ System.err.println(" Got: " + n);
+ }
+ }
+ catch (ParseException pe) {
+ err = true;
+ System.err.print(" Failed: Unexpected exception with NumberFormat(");
+ System.err.println(locale + ").parse(\"" + given + "\") :");
+
+ System.err.println(" " + pe);
+ }
+ }
+
+ private static void testNumberFormatParsingCheckException(NumberFormat nf,
+ String given,
+ int expected,
+ String locale) {
+ try {
+ Number n = nf.parse(given);
+ err = true;
+
+ System.err.print(" Failed: NumberFormat(" + locale);
+ System.err.println(").parse(\"" + given + "\")");
+
+ System.err.println(" should have thrown ParseException");
+ }
+ catch (ParseException pe) {
+ int errorOffset = pe.getErrorOffset();
+ if (errorOffset == expected) {
+ if (verbose) {
+ System.out.print(" Passed: NumberFormat(" + locale);
+ System.out.println(").parse(\"" + given + "\")");
+
+ System.out.print(" threw ParseException as expected, and its errorOffset was correct: ");
+ System.out.println(errorOffset);
+ }
+ } else {
+ err = true;
+ System.err.print(" Failed: NumberFormat(" + locale);
+ System.err.println(").parse(\"" + given + "\")");
+
+ System.err.print(" threw ParseException as expected, but its errorOffset was incorrect: ");
+ System.err.println(errorOffset);
+ }
+ }
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/text/Format/DateFormat/Bug6645292.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6645292
+ * @summary Make sure to parse a DST time zone name with which the
+ * last DST rule doesn't observe DST.
+ */
+
+import java.text.*;
+import java.util.*;
+import static java.util.Calendar.*;
+
+public class Bug6645292 {
+ public static void main(String[] args) {
+ Locale loc = Locale.getDefault();
+ TimeZone zone = TimeZone.getDefault();
+ try {
+ Locale.setDefault(Locale.US);
+ // Use "Asia/Shanghai" with an old time stamp rather than
+ // "Australia/Perth" because if Perth decides to obserb DST
+ // permanently, that decision will make this test case
+ // useless. There's the same risk with China, though.
+ TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai"));
+ Calendar cal = Calendar.getInstance();
+ cal.clear();
+ cal.set(1986, JUNE, 1);
+ Date d1 = cal.getTime();
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss zzzz");
+ String s = df.format(d1);
+ Date d2 = null;
+ try {
+ d2 = df.parse(s);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ if (!d1.equals(d2)) {
+ throw new RuntimeException("d1 (" + d1 + ") != d2 (" + d2 + ")");
+ }
+ } finally {
+ Locale.setDefault(loc);
+ TimeZone.setDefault(zone);
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/TimeZone/OldIDMappingTest.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. 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. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * See OldMappingTest.sh
+ */
+
+import java.lang.reflect.*;
+import java.util.*;
+
+public class OldIDMappingTest {
+ private static final String MAPPING_PROPERTY_NAME = "sun.timezone.ids.oldmapping";
+ private static final Map<String, String> newmap = new HashMap<String, String>();
+ static {
+ // Add known new mappings
+ newmap.put("EST", "EST");
+ newmap.put("MST", "MST");
+ newmap.put("HST", "HST");
+ }
+
+ public static void main(String[] args) {
+ boolean useOldMapping = true;
+ String arg = args[0];
+ if (arg.equals("-new")) {
+ useOldMapping = false;
+ } else if (arg.equals("-old")) {
+ useOldMapping = true;
+ } else {
+ throw new RuntimeException("-old or -new must be specified; got " + arg);
+ }
+
+ // Get a Field for TzIDOldMapping in sun.util.calendar.
+ Map<String, String> oldmap = null;
+ try {
+ Class<?> oldmapClass = Class.forName("sun.util.calendar.TzIDOldMapping");
+ Field map = oldmapClass.getDeclaredField("MAP");
+ map.setAccessible(true);
+ oldmap = (Map<String, String>) map.get(null);
+ } catch (Exception e) {
+ throw new RuntimeException("can't get TzIDOldMapping.MAP", e);
+ }
+
+ String prop = System.getProperty(MAPPING_PROPERTY_NAME);
+ System.out.println(MAPPING_PROPERTY_NAME + "=" + prop);
+
+ // Try the test multiple times with modifying TimeZones to
+ // make sure TimeZone instances for the old mapping are
+ // properly copied (defensive copy).
+ for (int count = 0; count < 3; count++) {
+ for (String id : oldmap.keySet()) {
+ TimeZone tzAlias = TimeZone.getTimeZone(id);
+ TimeZone tz = TimeZone.getTimeZone(oldmap.get(id));
+ if (useOldMapping) {
+ if (!tzAlias.hasSameRules(tz)) {
+ throw new RuntimeException("OLDMAP: " + MAPPING_PROPERTY_NAME + "=" + prop + ": "
+ + id + " isn't an alias of " + oldmap.get(id));
+ }
+ if (count == 0) {
+ System.out.println(" " + id + " => " + oldmap.get(id));
+ }
+ tzAlias.setRawOffset(tzAlias.getRawOffset() * count);
+ } else {
+ if (!newmap.containsKey(id)) {
+ // ignore ids not contained in the new map
+ if (count == 0) {
+ System.out.println(" " + id + " => " + oldmap.get(id));
+ }
+ tzAlias.setRawOffset(tzAlias.getRawOffset() * count);
+ continue;
+ }
+ if (tzAlias.hasSameRules(tz)) {
+ throw new RuntimeException("NEWMAP: " + MAPPING_PROPERTY_NAME + "=" + prop + ": "
+ + id + " is an alias of " + oldmap.get(id));
+ }
+ tz = TimeZone.getTimeZone(newmap.get(id));
+ if (!tzAlias.hasSameRules(tz)) {
+ throw new RuntimeException("NEWMAP: " + MAPPING_PROPERTY_NAME + "=" + prop + ": "
+ + id + " isn't an alias of " + newmap.get(id));
+ }
+ if (count == 0) {
+ System.out.println(" " + id + " => " + newmap.get(id));
+ }
+ tzAlias.setRawOffset(tzAlias.getRawOffset() * count);
+ }
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/TimeZone/OldIDMappingTest.sh Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,59 @@
+# Copyright 2003-2004 Sun Microsystems, Inc. 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. Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+
+# @test
+# @bug 6466476
+# @summary Compatibility test for the old JDK ID mapping and Olson IDs
+# @build OldIDMappingTest
+# @run shell OldIDMappingTest.sh
+
+: ${TESTJAVA:=${JAVA_HOME}}
+: ${TESTCLASSES:="`pwd`"}
+
+JAVA="${TESTJAVA}/bin/java"
+
+STATUS=0
+
+# Expecting the new (Olson compatible) mapping (default)
+for I in "" " " no No NO false False FALSE Hello
+do
+ if [ x"$I" != x ]; then
+ D="-Dsun.timezone.ids.oldmapping=${I}"
+ fi
+ if ! ${JAVA} ${D} -cp ${TESTCLASSES} OldIDMappingTest -new; then
+ STATUS=1
+ fi
+done
+
+# Expecting the old mapping
+for I in true True TRUE yes Yes YES
+do
+ if [ "x$I" != x ]; then
+ D="-Dsun.timezone.ids.oldmapping=${I}"
+ fi
+ if ! ${JAVA} ${D} -cp ${TESTCLASSES} OldIDMappingTest -old; then
+ STATUS=1
+ fi
+done
+
+exit ${STATUS}
--- a/jdk/test/javax/management/mxbean/CustomTypeTest.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/test/javax/management/mxbean/CustomTypeTest.java Wed Jul 05 16:42:37 2017 +0200
@@ -22,7 +22,7 @@
*/
/* @test %M% %I%
- * @bug 6562936
+ * @bug 6562936 6750935
* @run compile customtypes/package-info.java
* @run main CustomTypeTest
*/
@@ -342,6 +342,38 @@
}
}
+ public static class BadConstructorMXBeanMappingFactory1 extends
+ MXBeanMappingFactory {
+ private BadConstructorMXBeanMappingFactory1() {}
+
+ @Override
+ public MXBeanMapping mappingForType(Type arg0, MXBeanMappingFactory arg1)
+ throws OpenDataException {
+ throw new UnsupportedOperationException("Should not be called");
+ }
+ }
+
+ public static class BadConstructorMXBeanMappingFactory2 extends
+ MXBeanMappingFactory {
+ public BadConstructorMXBeanMappingFactory2(boolean oops) {}
+
+ @Override
+ public MXBeanMapping mappingForType(Type arg0, MXBeanMappingFactory arg1)
+ throws OpenDataException {
+ throw new UnsupportedOperationException("Should not be called");
+ }
+ }
+
+ @MXBeanMappingFactoryClass(BadConstructorMXBeanMappingFactory1.class)
+ public static interface BadConstructor1MXBean {}
+
+ public static class BadConstructor1 implements BadConstructor1MXBean {}
+
+ @MXBeanMappingFactoryClass(BadConstructorMXBeanMappingFactory2.class)
+ public static interface BadConstructor2MXBean {}
+
+ public static class BadConstructor2 implements BadConstructor2MXBean {}
+
public static void main(String[] args) throws Exception {
MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
@@ -407,8 +439,10 @@
try {
mbs.registerMBean(new ReallyBrokenImpl(), new ObjectName("d:type=Broken"));
fail("Register did not throw exception");
- } catch (IllegalArgumentException e) {
+ } catch (NotCompliantMBeanException e) {
System.out.println("...OK: threw: " + e);
+ } catch (Exception e) {
+ fail("Register threw wrong exception: " + e);
}
System.out.println("Test MXBeanMappingFactory exception with StandardMBean");
@@ -433,6 +467,24 @@
System.out.println("...OK: threw: " + e);
}
+ System.out.println("Test MXBeanMappingFactoryClass constructor exception");
+ for (Object mbean : new Object[] {
+ new BadConstructor1(), new BadConstructor2(),
+ }) {
+ String testName = mbean.getClass().getSimpleName();
+ try {
+ ObjectName name = new ObjectName("d:type=" + testName);
+ mbs.registerMBean(mbean, name);
+ fail("Broken MXBeanMappingFactoryClass did not throw exception" +
+ " (" + testName + ")");
+ } catch (NotCompliantMBeanException e) {
+ System.out.println("...OK: " + testName + " threw: " + e);
+ } catch (Exception e) {
+ fail("Broken MXBeanMappingFactoryClass " + testName + " threw " +
+ "wrong exception: " + e);
+ }
+ }
+
if (failure == null)
System.out.println("TEST PASSED");
else
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JButton/6604281/bug6604281.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ @bug 6604281
+ @summary NimbusL&F :Regression in Focus traversal in JFileChooser in pit build
+ @author Pavel Porvatov
+ @run main bug6604281
+*/
+
+import javax.swing.*;
+import javax.swing.plaf.IconUIResource;
+import javax.swing.plaf.synth.SynthLookAndFeel;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.lang.reflect.InvocationTargetException;
+
+public class bug6604281 {
+ public static void main(String[] args) throws InvocationTargetException, InterruptedException {
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ SynthLookAndFeel laf = new SynthLookAndFeel();
+ try {
+ UIManager.setLookAndFeel(laf);
+ } catch (Exception e) {
+ fail(e.getMessage());
+ }
+
+ // Prepare image
+ BufferedImage image = new BufferedImage(32, 32, BufferedImage.TYPE_INT_RGB);
+
+ Graphics2D graphics = (Graphics2D) image.getGraphics();
+
+ graphics.setColor(Color.BLUE);
+ graphics.fillRect(0, 0, image.getWidth(), image.getHeight());
+ graphics.setColor(Color.RED);
+ graphics.drawLine(0, 0, image.getWidth(), image.getHeight());
+
+ // Use IconUIResource as an icon, because with ImageIcon bug is not reproduced
+ JButton button1 = new JButton(new IconUIResource(new ImageIcon(image)));
+
+ JButton button2 = new JButton(new IconUIResource(new ImageIcon(image)));
+
+ button2.setEnabled(false);
+
+ if (button1.getPreferredSize().getHeight() != button2.getPreferredSize().getHeight()) {
+ fail("Two similar buttons have different size");
+ }
+ }
+ });
+ }
+
+ private static void fail(String s) {
+ throw new RuntimeException("Test failed: " + s);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JColorChooser/Test4165217.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 4165217
+ * @summary Tests JColorChooser serialization
+ * @author Ilya Boyandin
+ */
+
+import java.awt.Color;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Random;
+import javax.swing.JColorChooser;
+
+public class Test4165217 {
+ public static void main(String[] args) {
+ JColorChooser chooser = new JColorChooser();
+ chooser.setColor(new Color(new Random().nextInt()));
+
+ Color before = chooser.getColor();
+ Color after = copy(chooser).getColor();
+
+ if (!after.equals(before)) {
+ throw new Error("color is changed after serialization");
+ }
+ }
+
+ private static JColorChooser copy(JColorChooser chooser) {
+ try {
+ return (JColorChooser) deserialize(serialize(chooser));
+ }
+ catch (ClassNotFoundException exception) {
+ throw new Error("unexpected exception during class creation", exception);
+ }
+ catch (IOException exception) {
+ throw new Error("unexpected exception during serialization", exception);
+ }
+ }
+
+ private static byte[] serialize(Object object) throws IOException {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(baos);
+ oos.writeObject(object);
+ oos.flush();
+ return baos.toByteArray();
+ }
+
+ private static Object deserialize(byte[] array) throws IOException, ClassNotFoundException {
+ ByteArrayInputStream bais = new ByteArrayInputStream(array);
+ ObjectInputStream ois = new ObjectInputStream(bais);
+ return ois.readObject();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JColorChooser/Test4177735.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2002-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 4177735
+ * @summary Tests that JColorChooser leaves no threads when disposed
+ * @author Shannon Hickey
+ */
+
+import java.awt.Point;
+import javax.swing.JColorChooser;
+import javax.swing.JDialog;
+import javax.swing.SwingUtilities;
+import javax.swing.colorchooser.AbstractColorChooserPanel;
+
+public class Test4177735 implements Runnable {
+ private static final long DELAY = 1000L;
+
+ public static void main(String[] args) throws Exception {
+ JColorChooser chooser = new JColorChooser();
+ AbstractColorChooserPanel[] panels = chooser.getChooserPanels();
+ chooser.setChooserPanels(new AbstractColorChooserPanel[] { panels[1] });
+
+ JDialog dialog = show(chooser);
+ pause(DELAY);
+
+ dialog.dispose();
+ pause(DELAY);
+
+ Test4177735 test = new Test4177735();
+ SwingUtilities.invokeAndWait(test);
+ if (test.count != 0) {
+ throw new Error("JColorChooser leaves " + test.count + " threads running");
+ }
+ }
+
+ static JDialog show(JColorChooser chooser) {
+ JDialog dialog = JColorChooser.createDialog(null, null, false, chooser, null, null);
+ dialog.setVisible(true);
+ // block till displayed
+ Point point = null;
+ while (point == null) {
+ try {
+ point = dialog.getLocationOnScreen();
+ }
+ catch (IllegalStateException exception) {
+ pause(DELAY);
+ }
+ }
+ return dialog;
+ }
+
+ private static void pause(long delay) {
+ try {
+ Thread.sleep(delay);
+ }
+ catch (InterruptedException exception) {
+ }
+ }
+
+ private int count;
+
+ public void run() {
+ ThreadGroup group = Thread.currentThread().getThreadGroup();
+ Thread[] threads = new Thread[group.activeCount()];
+ int count = group.enumerate(threads, false);
+ for (int i = 0; i < count; i++) {
+ String name = threads[i].getName();
+ if ("SyntheticImageGenerator".equals(name)) { // NON-NLS: thread name
+ this.count++;
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JColorChooser/Test4193384.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 4193384 4200976
+ * @summary Tests the color conversions and the preview panel foreground color
+ * @author Mark Davidson
+ */
+
+import java.awt.Color;
+import javax.swing.JColorChooser;
+import javax.swing.JLabel;
+
+public class Test4193384 {
+ public static void main(String[] args) {
+ test(new Color[] {
+ new Color(11, 12, 13),
+ new Color(204, 0, 204),
+ new Color(0, 51, 51)
+ });
+ }
+
+ private static void test(Color[] colors) {
+ JLabel label = new JLabel("Preview Panel"); // NON-NLS: simple label
+
+ JColorChooser chooser = new JColorChooser();
+ chooser.setPreviewPanel(label);
+
+ float[] hsb = new float[3];
+ for (int i = 0; i < colors.length; i++) {
+ Color color = colors[i];
+ // Make sure sure that there wasn't a regression
+ // in java.awt.Color and the conversion methods
+ Color.RGBtoHSB(color.getRed(), color.getGreen(), color.getBlue(), hsb);
+ if (!color.equals(Color.getHSBColor(hsb[0], hsb[1], hsb[2]))) {
+ throw new Error("color conversion is failed");
+ }
+ // 4193384 regression test
+ if (!color.equals(new JColorChooser(color).getColor())) {
+ throw new Error("constructor sets incorrect initial color");
+ }
+ // 4200976 regression test
+ chooser.setColor(color);
+ if (!color.equals(label.getForeground())) {
+ throw new Error("a custom preview panel doesn't handle colors");
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JColorChooser/Test4234761.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2002-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 4234761
+ * @summary RGB values sholdn't be changed in transition to HSB tab
+ * @author Oleg Mokhovikov
+ */
+
+import java.awt.Color;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import javax.swing.JColorChooser;
+import javax.swing.JDialog;
+import javax.swing.JTabbedPane;
+
+public class Test4234761 implements PropertyChangeListener {
+ private static final Color COLOR = new Color(51, 51, 51);
+
+ public static void main(String[] args) {
+ JColorChooser chooser = new JColorChooser(COLOR);
+ JDialog dialog = Test4177735.show(chooser);
+
+ PropertyChangeListener listener = new Test4234761();
+ chooser.addPropertyChangeListener("color", listener); // NON-NLS: property name
+
+ JTabbedPane tabbedPane = (JTabbedPane) chooser.getComponent(0);
+ tabbedPane.setSelectedIndex(1); // HSB tab index
+
+ if (!chooser.getColor().equals(COLOR)) {
+ listener.propertyChange(null);
+ }
+ dialog.dispose();
+ }
+
+ public void propertyChange(PropertyChangeEvent event) {
+ throw new Error("RGB value is changed after transition to HSB tab");
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JColorChooser/Test4380468.html Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,17 @@
+<html>
+<body>
+1. Click the HSB tab at the ColorChooser.
+2. Click in the lower left corner of the gradient palette
+ in order to select a color such that all three RGB values
+ are single digit colors (such as 0, 0, 0 or 5, 3, 1).
+3. Click another tab, then click back to the HSB tab.
+4. Now click the lighter colors that should have
+ 2 and 3 digit RGB values (in the upper right corner).
+
+If all digits of each RGB value are shown then test passes.
+If only the last digit of their values are shown then test fails.
+
+<applet width="500" height="400" code="Test4380468.class">
+</applet>
+</body>
+</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JColorChooser/Test4380468.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 4380468
+ * @summary JColorChooser's HSB panel should display all RGB digits
+ * @author Andrey Pikalev
+ * @run applet/manual=yesno Test4380468.html
+ */
+
+import java.awt.Color;
+import javax.swing.JApplet;
+import javax.swing.JColorChooser;
+
+public class Test4380468 extends JApplet {
+ public void init() {
+ add(new JColorChooser(Color.GREEN));
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JColorChooser/Test4461329.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2002-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 4461329
+ * @summary Tests getPreviewPanel() and setPreviewPanel() methods
+ * @author Leif Samuelsson
+ */
+
+import javax.swing.JButton;
+import javax.swing.JColorChooser;
+
+public class Test4461329 {
+ public static void main(String[] args) {
+ JColorChooser chooser = new JColorChooser();
+ if (null == chooser.getPreviewPanel()) {
+ throw new Error("Failed: getPreviewPanel() returned null");
+ }
+ JButton button = new JButton("Color"); // NON-NLS: simple label
+ chooser.setPreviewPanel(button);
+ if (button != chooser.getPreviewPanel()) {
+ throw new Error("Failed in setPreviewPanel()");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JColorChooser/Test4711996.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 4711996
+ * @summary Checks if IllegalArgumentException is thrown when updating JColorChooserUI
+ * @author Konstantin Eremin
+ */
+
+import javax.swing.JColorChooser;
+import javax.swing.colorchooser.AbstractColorChooserPanel;
+
+public class Test4711996 {
+ public static void main(String[] args) {
+ JColorChooser chooser = new JColorChooser();
+ AbstractColorChooserPanel[] panels = chooser.getChooserPanels();
+ chooser.removeChooserPanel(panels[0]);
+ chooser.updateUI();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JColorChooser/Test4759306.html Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,8 @@
+<html>
+<body>
+If you see the preview panel, then test failed, otherwise it passed.
+
+<applet width="500" height="400" code="Test4759306.class">
+</applet>
+</body>
+</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JColorChooser/Test4759306.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2002-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 4759306
+ * @summary Checks if JColorChooser.setPreviewPanel removes the old one
+ * @author Konstantin Eremin
+ @run applet/manual=yesno Test4759306.html
+ */
+
+import javax.swing.JApplet;
+import javax.swing.JColorChooser;
+import javax.swing.JPanel;
+
+public class Test4759306 extends JApplet {
+ public void init() {
+ JColorChooser chooser = new JColorChooser();
+ chooser.setPreviewPanel(new JPanel());
+ getContentPane().add(chooser);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JColorChooser/Test4759934.html Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,14 @@
+<html>
+<body>
+1. Press button "Show Dialog" at the frame "Test" and
+ the dialog with button "Show ColorChooser" should appears.
+2. Press button "Show ColorChooser" at the dialog "Dialog" and
+ the colorchooser should appears.
+3. Press the button "Cancel" of colorchooser.
+ If the focus will come to the frame "Test" then test fails.
+ If the focus will come to the dialog "Dialog" then test passes.
+
+<applet width="500" height="400" code="Test4759934.class">
+</applet>
+</body>
+</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JColorChooser/Test4759934.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 4759934
+ * @summary Tests windows activation problem
+ * @author Andrey Pikalev
+ * @run applet/manual=yesno Test4759934.html
+ */
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import javax.swing.JApplet;
+import javax.swing.JButton;
+import javax.swing.JColorChooser;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+
+public class Test4759934 extends JApplet implements ActionListener {
+ private static final String CMD_DIALOG = "Show Dialog"; // NON-NLS: first button
+ private static final String CMD_CHOOSER = "Show ColorChooser"; // NON-NLS: second button
+
+ private final JFrame frame = new JFrame("Test"); // NON-NLS: frame title
+
+ public void init() {
+ show(this.frame, CMD_DIALOG);
+ }
+
+ public void actionPerformed(ActionEvent event) {
+ String command = event.getActionCommand();
+ if (CMD_DIALOG.equals(command)) {
+ JDialog dialog = new JDialog(this.frame, "Dialog"); // NON-NLS: dialog title
+ dialog.setLocation(200, 0);
+ show(dialog, CMD_CHOOSER);
+ }
+ else if (CMD_CHOOSER.equals(command)) {
+ Object source = event.getSource();
+ Component component = (source instanceof Component)
+ ? (Component) source
+ : null;
+
+ JColorChooser.showDialog(component, "ColorChooser", Color.BLUE); // NON-NLS: title
+ }
+ }
+
+ private void show(Window window, String command) {
+ JButton button = new JButton(command);
+ button.setActionCommand(command);
+ button.addActionListener(this);
+ button.setFont(button.getFont().deriveFont(64.0f));
+
+ window.add(button);
+ window.pack();
+ window.setVisible(true);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JColorChooser/Test4887836.html Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,9 @@
+<html>
+<body>
+If you do not see white area under swatches,
+then test passed, otherwise it failed.
+
+<applet width="500" height="400" code="Test4887836.class">
+</applet>
+</body>
+</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JColorChooser/Test4887836.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 4887836
+ * @summary Checks if no tooltip modification when no KeyStroke modifier
+ * @author Konstantin Eremin
+ * @run applet/manual=yesno Test4887836.html
+ */
+
+import java.awt.Color;
+import java.awt.Font;
+import javax.swing.JApplet;
+import javax.swing.JColorChooser;
+import javax.swing.UIManager;
+
+public class Test4887836 extends JApplet {
+ public void init() {
+ UIManager.put("Label.font", new Font("Perpetua", 0, 36)); // NON-NLS: property and font names
+ add(new JColorChooser(Color.LIGHT_GRAY));
+ }
+}
--- a/jdk/test/javax/swing/JColorChooser/Test6524757.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/test/javax/swing/JColorChooser/Test6524757.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2007-2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,14 +34,13 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
-import javax.swing.JButton;
+import javax.swing.AbstractButton;
import javax.swing.JColorChooser;
import javax.swing.JComponent;
import javax.swing.JDialog;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import javax.swing.JRadioButton;
import javax.swing.UIManager;
import javax.swing.WindowConstants;
import javax.swing.colorchooser.AbstractColorChooserPanel;
@@ -59,31 +58,41 @@
"ColorChooser.swatchesNameText", // NON-NLS: string key from DefaultSwatchChooserPanel
"ColorChooser.swatchesMnemonic", // NON-NLS: string key from DefaultSwatchChooserPanel:int
- "ColorChooser.swatchesDisplayedMnemonicIndex", // NON-NLS: int key from DefaultSwatchChooserPanel
"ColorChooser.swatchesSwatchSize", // NON-NLS: dimension key from DefaultSwatchChooserPanel
"ColorChooser.swatchesRecentText", // NON-NLS: string key from DefaultSwatchChooserPanel
"ColorChooser.swatchesRecentSwatchSize", // NON-NLS: dimension key from DefaultSwatchChooserPanel
//NotAvail: "ColorChooser.swatchesDefaultRecentColor", // NON-NLS: color key from DefaultSwatchChooserPanel
- "ColorChooser.hsbNameText", // NON-NLS: string key from DefaultHSBChooserPanel
- "ColorChooser.hsbMnemonic", // NON-NLS: int key from DefaultHSBChooserPanel
- "ColorChooser.hsbDisplayedMnemonicIndex", // NON-NLS: int key from DefaultHSBChooserPanel
- "ColorChooser.hsbHueText", // NON-NLS: string key from DefaultHSBChooserPanel
- "ColorChooser.hsbSaturationText", // NON-NLS: string key from DefaultHSBChooserPanel
- "ColorChooser.hsbBrightnessText", // NON-NLS: string key from DefaultHSBChooserPanel
- "ColorChooser.hsbRedText", // NON-NLS: string key from DefaultHSBChooserPanel
- "ColorChooser.hsbGreenText", // NON-NLS: string key from DefaultHSBChooserPanel
- "ColorChooser.hsbBlueText", // NON-NLS: string key from DefaultHSBChooserPanel
+ "ColorChooser.hsvNameText", // NON-NLS: string key from HSV ColorChooserPanel
+ "ColorChooser.hsvMnemonic", // NON-NLS: int key from HSV ColorChooserPanel
+ "ColorChooser.hsvHueText", // NON-NLS: string key from HSV ColorChooserPanel
+ "ColorChooser.hsvSaturationText", // NON-NLS: string key from HSV ColorChooserPanel
+ "ColorChooser.hsvValueText", // NON-NLS: string key from HSV ColorChooserPanel
+ "ColorChooser.hsvTransparencyText", // NON-NLS: string key from HSV ColorChooserPanel
+
+ "ColorChooser.hslNameText", // NON-NLS: string key from HSV ColorChooserPanel
+ "ColorChooser.hslMnemonic", // NON-NLS: int key from HSV ColorChooserPanel
+ "ColorChooser.hslHueText", // NON-NLS: string key from HSV ColorChooserPanel
+ "ColorChooser.hslSaturationText", // NON-NLS: string key from HSV ColorChooserPanel
+ "ColorChooser.hslLightnessText", // NON-NLS: string key from HSV ColorChooserPanel
+ "ColorChooser.hslTransparencyText", // NON-NLS: string key from HSV ColorChooserPanel
- "ColorChooser.rgbNameText", // NON-NLS: string key from DefaultRGBChooserPanel
- "ColorChooser.rgbMnemonic", // NON-NLS: int key from DefaultRGBChooserPanel
- "ColorChooser.rgbDisplayedMnemonicIndex", // NON-NLS: int key from DefaultRGBChooserPanel
- "ColorChooser.rgbRedText", // NON-NLS: string key from DefaultRGBChooserPanel
- "ColorChooser.rgbGreenText", // NON-NLS: string key from DefaultRGBChooserPanel
- "ColorChooser.rgbBlueText", // NON-NLS: string key from DefaultRGBChooserPanel
- "ColorChooser.rgbRedMnemonic", // NON-NLS: int key from DefaultRGBChooserPanel
- "ColorChooser.rgbGreenMnemonic", // NON-NLS: int key from DefaultRGBChooserPanel
- "ColorChooser.rgbBlueMnemonic", // NON-NLS: int key from DefaultRGBChooserPanel
+ "ColorChooser.rgbNameText", // NON-NLS: string key from HSV ColorChooserPanel
+ "ColorChooser.rgbMnemonic", // NON-NLS: int key from HSV ColorChooserPanel
+ "ColorChooser.rgbRedText", // NON-NLS: string key from HSV ColorChooserPanel
+ "ColorChooser.rgbGreenText", // NON-NLS: string key from HSV ColorChooserPanel
+ "ColorChooser.rgbBlueText", // NON-NLS: string key from HSV ColorChooserPanel
+ "ColorChooser.rgbAlphaText", // NON-NLS: string key from HSV ColorChooserPanel
+ "ColorChooser.rgbHexCodeText", // NON-NLS: string key from HSV ColorChooserPanel
+ "ColorChooser.rgbHexCodeMnemonic", // NON-NLS: int key from HSV ColorChooserPanel
+
+ "ColorChooser.cmykNameText", // NON-NLS: string key from HSV ColorChooserPanel
+ "ColorChooser.cmykMnemonic", // NON-NLS: int key from HSV ColorChooserPanel
+ "ColorChooser.cmykCyanText", // NON-NLS: string key from HSV ColorChooserPanel
+ "ColorChooser.cmykMagentaText", // NON-NLS: string key from HSV ColorChooserPanel
+ "ColorChooser.cmykYellowText", // NON-NLS: string key from HSV ColorChooserPanel
+ "ColorChooser.cmykBlackText", // NON-NLS: string key from HSV ColorChooserPanel
+ "ColorChooser.cmykAlphaText", // NON-NLS: string key from HSV ColorChooserPanel
};
private static final Object[] KOREAN = convert(Locale.KOREAN, KEYS);
private static final Object[] FRENCH = convert(Locale.FRENCH, KEYS);
@@ -91,19 +100,15 @@
public static void main(String[] args) {
// it affects Swing because it is not initialized
Locale.setDefault(Locale.KOREAN);
- Object[] korean = create();
+ validate(KOREAN, create());
// it does not affect Swing because it is initialized
Locale.setDefault(Locale.CANADA);
- Object[] canada = create();
+ validate(KOREAN, create());
// it definitely should affect Swing
JComponent.setDefaultLocale(Locale.FRENCH);
- Object[] french = create();
-
- validate(KOREAN, korean);
- validate(KOREAN, canada);
- validate(FRENCH, french);
+ validate(FRENCH, create());
}
private static void validate(Object[] expected, Object[] actual) {
@@ -153,10 +158,47 @@
// process all values
List<Object> list = new ArrayList<Object>(KEYS.length);
- addMain(list, dialog);
- addSwatch(list, chooser);
- addHSB(list, chooser);
- addRGB(list, chooser);
+
+ Component component = getC(getC(dialog.getLayeredPane(), 0), 1);
+ AbstractButton ok = (AbstractButton) getC(component, 0);
+ AbstractButton cancel = (AbstractButton) getC(component, 1);
+ AbstractButton reset = (AbstractButton) getC(component, 2);
+ list.add(ok.getText());
+ list.add(cancel.getText());
+ list.add(reset.getText());
+ list.add(Integer.valueOf(reset.getMnemonic()));
+
+ for (int i = 0; i < 5; i++) {
+ AbstractColorChooserPanel panel = (AbstractColorChooserPanel) getC(getC(getC(chooser, 0), i), 0);
+ list.add(panel.getDisplayName());
+ list.add(Integer.valueOf(panel.getMnemonic()));
+ if (i == 0) {
+ JLabel label = (JLabel) getC(getC(panel, 0), 1);
+ JPanel upper = (JPanel) getC(getC(getC(panel, 0), 0), 0);
+ JPanel lower = (JPanel) getC(getC(getC(panel, 0), 2), 0);
+ addSize(list, upper, 1, 1, 31, 9);
+ list.add(label.getText());
+ addSize(list, lower, 1, 1, 5, 7);
+ }
+ else {
+ Component container = getC(panel, 0);
+ for (int j = 0; j < 3; j++) {
+ AbstractButton button = (AbstractButton) getC(container, j);
+ list.add(button.getText());
+ }
+ JLabel label = (JLabel) getC(container, 3);
+ list.add(label.getText());
+ if (i == 4) {
+ label = (JLabel) getC(container, 4);
+ list.add(label.getText());
+ }
+ if (i == 3) {
+ label = (JLabel) getC(panel, 1);
+ list.add(label.getText());
+ list.add(Integer.valueOf(label.getDisplayedMnemonic()));
+ }
+ }
+ }
// close dialog
dialog.setVisible(false);
@@ -169,56 +211,6 @@
return list.toArray();
}
- private static void addMain(List<Object> list, JDialog dialog) {
- Component component = getC(getC(dialog.getLayeredPane(), 0), 1);
- JButton ok = (JButton) getC(component, 0);
- JButton cancel = (JButton) getC(component, 1);
- JButton reset = (JButton) getC(component, 2);
- list.add(ok.getText());
- list.add(cancel.getText());
- list.add(reset.getText());
- list.add(Integer.valueOf(reset.getMnemonic()));
- }
-
- private static void addSwatch(List<Object> list, JColorChooser chooser) {
- Component component = addPanel(list, chooser, 0);
- JLabel label = (JLabel) getC(getC(component, 0), 1);
- JPanel upper = (JPanel) getC(getC(getC(component, 0), 0), 0);
- JPanel lower = (JPanel) getC(getC(getC(component, 0), 2), 0);
- addSize(list, upper, 1, 1, 31, 9);
- list.add(label.getText());
- addSize(list, lower, 1, 1, 5, 7);
- }
-
- private static void addHSB(List<Object> list, JColorChooser chooser) {
- Component component = addPanel(list, chooser, 1);
- JRadioButton h = (JRadioButton) getC(getC(getC(component, 1), 0), 0);
- JRadioButton s = (JRadioButton) getC(getC(getC(component, 1), 0), 2);
- JRadioButton b = (JRadioButton) getC(getC(getC(component, 1), 0), 4);
- list.add(h.getText());
- list.add(s.getText());
- list.add(b.getText());
- JLabel red = (JLabel) getC(getC(getC(component, 1), 2), 0);
- JLabel green = (JLabel) getC(getC(getC(component, 1), 2), 2);
- JLabel blue = (JLabel) getC(getC(getC(component, 1), 2), 4);
- list.add(red.getText());
- list.add(green.getText());
- list.add(blue.getText());
- }
-
- private static void addRGB(List<Object> list, JColorChooser chooser) {
- Component component = addPanel(list, chooser, 2);
- JLabel red = (JLabel) getC(getC(component, 0), 0);
- JLabel green = (JLabel) getC(getC(component, 0), 3);
- JLabel blue = (JLabel) getC(getC(component, 0), 6);
- list.add(red.getText());
- list.add(green.getText());
- list.add(blue.getText());
- list.add(Integer.valueOf(red.getDisplayedMnemonic()));
- list.add(Integer.valueOf(green.getDisplayedMnemonic()));
- list.add(Integer.valueOf(blue.getDisplayedMnemonic()));
- }
-
private static void addSize(List<Object> list, Component component, int x, int y, int w, int h) {
Dimension size = component.getPreferredSize();
int width = (size.width + 1) / w - x;
@@ -226,14 +218,6 @@
list.add(new Dimension(width, height));
}
- private static Component addPanel(List<Object> list, JColorChooser chooser, int index) {
- AbstractColorChooserPanel panel = (AbstractColorChooserPanel) getC(getC(getC(chooser, 0), index), 0);
- list.add(panel.getDisplayName());
- list.add(Integer.valueOf(panel.getMnemonic()));
- list.add(Integer.valueOf(panel.getDisplayedMnemonicIndex()));
- return panel;
- }
-
private static Component getC(Component component, int index) {
Container container = (Container) component;
return container.getComponent(index);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JColorChooser/Test6559154.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6559154
+ * @summary Tests EDT hanging
+ * @author Sergey Malenkov
+ */
+
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import javax.swing.JColorChooser;
+import javax.swing.JDialog;
+import javax.swing.SwingUtilities;
+import javax.swing.Timer;
+
+public class Test6559154 implements ActionListener, Runnable {
+
+ private JDialog dialog;
+
+ public void actionPerformed(ActionEvent event) {
+ if (this.dialog != null) {
+ this.dialog.dispose();
+ }
+ }
+
+ public void run() {
+ Timer timer = new Timer(1000, this);
+ timer.setRepeats(false);
+ timer.start();
+
+ JColorChooser chooser = new JColorChooser();
+ setEnabledRecursive(chooser, false);
+
+ this.dialog = new JDialog();
+ this.dialog.add(chooser);
+ this.dialog.setVisible(true);
+ }
+
+ private static void setEnabledRecursive(Container container, boolean enabled) {
+ for (Component component : container.getComponents()) {
+ component.setEnabled(enabled);
+ if (component instanceof Container) {
+ setEnabledRecursive((Container) component, enabled);
+ }
+ }
+ }
+
+ public static void main(String[] args) throws Exception {
+ SwingUtilities.invokeAndWait(new Test6559154());
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JColorChooser/Test6707406.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6707406
+ * @summary Tests color chooser with invalid UI
+ * @author Sergey Malenkov
+ */
+
+import java.awt.Color;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import javax.swing.JColorChooser;
+import javax.swing.UIManager;
+import javax.swing.UIManager.LookAndFeelInfo;
+import javax.swing.plaf.basic.BasicColorChooserUI;
+
+public class Test6707406 extends BasicColorChooserUI implements PropertyChangeListener {
+ public static void main(String[] args) throws Exception {
+ test();
+ for (LookAndFeelInfo laf : UIManager.getInstalledLookAndFeels()) {
+ System.out.println(laf.getName());
+ UIManager.setLookAndFeel(laf.getClassName());
+ test();
+ }
+ }
+
+ private static void test() {
+ JColorChooser chooser = new JColorChooser();
+ chooser.getUI().uninstallUI(chooser);
+ new Test6707406().installUI(chooser);
+ chooser.getSelectionModel().setSelectedColor(Color.BLUE);
+ }
+
+ @Override
+ protected PropertyChangeListener createPropertyChangeListener() {
+ return this;
+ }
+
+ public void propertyChange(PropertyChangeEvent event) {
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JComboBox/6607130/bug6607130.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ * @bug 6607130
+ * @summary Checks that JComboBox cell editor is hidden if the same
+ * item is selected with keyboard.
+ * Also checks that JComboBox cell editor is hidden if F2 and then
+ * ENTER were pressed.
+ * @author Mikhail Lapshin
+ */
+
+import sun.awt.SunToolkit;
+
+import javax.swing.*;
+import javax.swing.table.DefaultTableModel;
+import java.awt.*;
+import java.awt.event.KeyEvent;
+
+public class bug6607130 {
+ private JFrame frame;
+ private JComboBox cb;
+ private Robot robot;
+
+ public static void main(String[] args) throws Exception {
+ final bug6607130 test = new bug6607130();
+ try {
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ test.setupUI();
+ }
+ });
+ test.test();
+ } finally {
+ if (test.frame != null) {
+ test.frame.dispose();
+ }
+ }
+ }
+
+ public bug6607130() throws AWTException {
+ robot = new Robot();
+ }
+
+ private void setupUI() {
+ frame = new JFrame();
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
+ DefaultTableModel model = new DefaultTableModel(1, 1);
+ JTable table = new JTable(model);
+
+ cb = new JComboBox(new String[]{"one", "two", "three"});
+ table.getColumnModel().getColumn(0).setCellEditor(new DefaultCellEditor(cb));
+ frame.add(table);
+
+ frame.pack();
+ frame.setLocationRelativeTo(null);
+ frame.setVisible(true);
+ }
+
+ private void test() throws Exception {
+ realSync();
+ test1();
+ realSync();
+ checkResult("First test");
+ test2();
+ realSync();
+ checkResult("Second test");
+ }
+
+ private void test1() throws Exception {
+ // Select 'one'
+ hitKey(KeyEvent.VK_TAB);
+ realSync();
+ hitKey(KeyEvent.VK_F2);
+ realSync();
+ hitKey(KeyEvent.VK_DOWN);
+ realSync();
+ hitKey(KeyEvent.VK_DOWN);
+ realSync();
+ hitKey(KeyEvent.VK_ENTER);
+ realSync();
+
+ // Select 'one' again
+ hitKey(KeyEvent.VK_F2);
+ realSync();
+ hitKey(KeyEvent.VK_DOWN);
+ realSync();
+ hitKey(KeyEvent.VK_ENTER);
+ realSync();
+ }
+
+ private void test2() throws Exception {
+ // Press F2 and then press ENTER
+ // Editor should be shown and then closed
+ hitKey(KeyEvent.VK_F2);
+ realSync();
+ hitKey(KeyEvent.VK_ENTER);
+ realSync();
+ }
+
+ private void checkResult(String testName) {
+ if (!cb.isShowing()) {
+ System.out.println(testName + " passed");
+ } else {
+ System.out.println(testName + " failed");
+ throw new RuntimeException("JComboBox is showing " +
+ "after item selection.");
+ }
+ }
+
+ private static void realSync() {
+ ((SunToolkit) (Toolkit.getDefaultToolkit())).realSync();
+ }
+
+ public void hitKey(int keycode) {
+ robot.keyPress(keycode);
+ robot.keyRelease(keycode);
+ delay();
+ }
+
+ private void delay() {
+ try {
+ Thread.sleep(1000);
+ } catch(InterruptedException ie) {
+ ie.printStackTrace();
+ }
+ }
+}
--- a/jdk/test/javax/swing/JFileChooser/4252173/bug4252173.java Fri Oct 10 13:29:11 2008 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
- * Copyright 2007-2008 Sun Microsystems, Inc. All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/* @test
- @bug 4252173
- @summary Inability to reuse the HorizontalSliderThumbIcon
- @author Pavel Porvatov
- @run main bug4252173
-*/
-
-import javax.swing.*;
-import javax.swing.plaf.metal.DefaultMetalTheme;
-import javax.swing.plaf.metal.MetalLookAndFeel;
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.lang.reflect.InvocationTargetException;
-
-public class bug4252173 {
- public static void main(String[] args) throws InvocationTargetException, InterruptedException {
- SwingUtilities.invokeAndWait(new Runnable() {
- public void run() {
- MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
-
- JComponent component = new JLabel();
-
- Icon horizontalThumbIcon = UIManager.getIcon("Slider.horizontalThumbIcon");
-
- Icon verticalThumbIcon = UIManager.getIcon("Slider.verticalThumbIcon");
-
- Graphics g = new BufferedImage(100, 100, BufferedImage.TYPE_4BYTE_ABGR).getGraphics();
-
- horizontalThumbIcon.paintIcon(component, g, 0, 0);
-
- verticalThumbIcon.paintIcon(component, g, 0, 0);
- }
- });
- }
-}
--- a/jdk/test/javax/swing/JFileChooser/6524424/bug6524424.html Fri Oct 10 13:29:11 2008 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<html>
-<body>
-<applet code="bug6524424.class" width=200 height=200></applet>
-To test fix follow the next steps:
-1. Select a slider (do the next steps for every slider)
-2. Check that the next keyboard buttons work correctly:
- Up, Down, Left, Right, Page Up, Page Down
-3. Press left mouse button on a free space of the slider and check
- that thumb moves correctly
-</body>
-</html>
--- a/jdk/test/javax/swing/JFileChooser/6524424/bug6524424.java Fri Oct 10 13:29:11 2008 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/* @test
- * @bug 6524424
- * @summary JSlider Clicking In Tracks Behavior Inconsistent For Different Tick Spacings
- * @author Pavel Porvatov
- * @run applet/manual=done bug6524424.html
- */
-
-import java.awt.*;
-import javax.swing.*;
-
-import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;
-
-public class bug6524424 extends JApplet {
- public static void main(String[] args) {
- try {
- UIManager.setLookAndFeel(new WindowsLookAndFeel());
- } catch (UnsupportedLookAndFeelException e) {
- e.printStackTrace();
-
- return;
- }
-
- TestPanel panel = new TestPanel();
-
- JFrame frame = new JFrame();
-
- frame.setContentPane(panel);
- frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
- frame.pack();
- frame.setLocationRelativeTo(null);
-
- frame.setVisible(true);
- }
-
- public void init() {
- TestPanel panel = new TestPanel();
-
- setContentPane(panel);
- }
-
- private static class TestPanel extends JPanel {
-
- private TestPanel() {
- super(new GridBagLayout());
-
- JSlider slider1 = createSlider(1, 2);
- JSlider slider2 = createSlider(2, 4);
- JSlider slider3 = createSlider(3, 6);
-
- addComponent(this, slider1);
- addComponent(this, slider2);
- addComponent(this, slider3);
- }
-
- private JSlider createSlider(int tickMinor, int tickMajor) {
- JSlider result = new JSlider();
-
- result.setPaintLabels(true);
- result.setPaintTicks(true);
- result.setSnapToTicks(true);
- result.setMinimum(0);
- result.setMaximum(12);
- result.setMinorTickSpacing(tickMinor);
- result.setMajorTickSpacing(tickMajor);
-
- return result;
- }
- }
-
- private static void addComponent(JPanel panel, Component component) {
- panel.add(component, new GridBagConstraints(0,
- panel.getComponentCount(), 1, 1,
- 1, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL,
- new Insets(0, 0, 0, 0), 0, 0));
- }
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JInternalFrame/6647340/bug6647340.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ * @bug 6647340
+ * @summary Checks that iconified internal frame follows
+ * the main frame borders properly.
+ * @author Mikhail Lapshin
+ */
+
+import sun.awt.SunToolkit;
+
+import javax.swing.*;
+import java.awt.*;
+import java.beans.PropertyVetoException;
+
+public class bug6647340 {
+ private JFrame frame;
+ private Point location;
+ private JInternalFrame jif;
+
+ public static void main(String[] args) throws Exception {
+ final bug6647340 test = new bug6647340();
+ try {
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ test.setupUI();
+ }
+ });
+ test.test();
+ } finally {
+ if (test.frame != null) {
+ test.frame.dispose();
+ }
+ }
+ }
+
+ private void setupUI() {
+ frame = new JFrame();
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
+ JDesktopPane desktop = new JDesktopPane();
+ frame.add(desktop);
+
+ jif = new JInternalFrame("Internal Frame", true, true, true, true);
+ jif.setBounds(20, 20, 200, 100);
+ desktop.add(jif);
+ jif.setVisible(true);
+
+ Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
+ frame.setBounds((screen.width - 400) / 2, (screen.height - 400) / 2, 400, 400);
+ frame.setLocationRelativeTo(null);
+ frame.setVisible(true);
+ }
+
+ private void test() throws Exception {
+ realSync();
+ test1();
+ realSync();
+ check1();
+ realSync();
+ test2();
+ realSync();
+ check2();
+ }
+
+ private void test1() throws Exception {
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ setIcon(true);
+ location = jif.getDesktopIcon().getLocation();
+ Dimension size = frame.getSize();
+ frame.setSize(size.width + 100, size.height + 100);
+ }
+ });
+ }
+
+ private void test2() throws Exception {
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ setIcon(false);
+ }
+ });
+ realSync();
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ Dimension size = frame.getSize();
+ frame.setSize(size.width - 100, size.height - 100);
+ }
+ });
+ realSync();
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ setIcon(true);
+ }
+ });
+ }
+
+ private void check1() {
+ if (!jif.getDesktopIcon().getLocation().equals(location)) {
+ System.out.println("First test passed");
+ } else {
+ throw new RuntimeException("Icon isn't shifted with the frame bounds");
+ }
+ }
+
+ private void check2() {
+ if (jif.getDesktopIcon().getLocation().equals(location)) {
+ System.out.println("Second test passed");
+ } else {
+ throw new RuntimeException("Icon isn't located near the frame bottom");
+ }
+ }
+
+ private static void realSync() {
+ ((SunToolkit) (Toolkit.getDefaultToolkit())).realSync();
+ }
+
+ private void setIcon(boolean b) {
+ try {
+ jif.setIcon(b);
+ } catch (PropertyVetoException e) {
+ e.printStackTrace();
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JInternalFrame/6725409/bug6725409.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ * @bug 6725409
+ * @summary Checks that JInternalFrame's system menu
+ * can be localized during run-time
+ * @author Mikhail Lapshin
+ */
+
+import javax.swing.*;
+import java.awt.*;
+
+public class bug6725409 {
+ private JFrame frame;
+ private JInternalFrame iFrame;
+ private TestTitlePane testTitlePane;
+ private boolean passed;
+
+ public static void main(String[] args) throws Exception {
+ try {
+ UIManager.setLookAndFeel(
+ new com.sun.java.swing.plaf.windows.WindowsClassicLookAndFeel());
+ } catch(UnsupportedLookAndFeelException e) {
+ System.out.println("The test is for Windows LaF only");
+ System.exit(0);
+ }
+
+ final bug6725409 bug6725409 = new bug6725409();
+ try {
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ bug6725409.setupUIStep1();
+ }
+ });
+ realSync();
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ bug6725409.setupUIStep2();
+ }
+ });
+ realSync();
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ bug6725409.test();
+ }
+ });
+ realSync();
+ bug6725409.checkResult();
+ } finally {
+ if (bug6725409.frame != null) {
+ bug6725409.frame.dispose();
+ }
+ }
+ }
+
+ private void setupUIStep1() {
+ frame = new JFrame();
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
+ JDesktopPane desktop = new JDesktopPane();
+ iFrame = new JInternalFrame("Internal Frame", true, true, true, true);
+ iFrame.setSize(200, 100);
+ desktop.add(iFrame);
+ frame.add(desktop);
+ iFrame.setVisible(true);
+
+ frame.setSize(500, 300);
+ frame.setLocationRelativeTo(null);
+ frame.setVisible(true);
+ }
+
+ private void setupUIStep2() {
+ UIManager.put("InternalFrameTitlePane.restoreButtonText",
+ "CUSTOM.restoreButtonText");
+ UIManager.put("InternalFrameTitlePane.moveButtonText",
+ "CUSTOM.moveButtonText");
+ UIManager.put("InternalFrameTitlePane.sizeButtonText",
+ "CUSTOM.sizeButtonText");
+ UIManager.put("InternalFrameTitlePane.minimizeButtonText",
+ "CUSTOM.minimizeButtonText");
+ UIManager.put("InternalFrameTitlePane.maximizeButtonText",
+ "CUSTOM.maximizeButtonText");
+ UIManager.put("InternalFrameTitlePane.closeButtonText",
+ "CUSTOM.closeButtonText");
+ SwingUtilities.updateComponentTreeUI(frame);
+ }
+
+ // The test depends on the order of the menu items in
+ // WindowsInternalFrameTitlePane.systemPopupMenu
+ private void test() {
+ testTitlePane = new TestTitlePane(iFrame);
+ passed = true;
+ checkMenuItemText(0, "CUSTOM.restoreButtonText");
+ checkMenuItemText(1, "CUSTOM.moveButtonText");
+ checkMenuItemText(2, "CUSTOM.sizeButtonText");
+ checkMenuItemText(3, "CUSTOM.minimizeButtonText");
+ checkMenuItemText(4, "CUSTOM.maximizeButtonText");
+ // Skip separator
+ checkMenuItemText(6, "CUSTOM.closeButtonText");
+ }
+
+ private void checkMenuItemText(int index, String text) {
+ JMenuItem menuItem = (JMenuItem)
+ testTitlePane.getSystemPopupMenu().getComponent(index);
+ if (!text.equals(menuItem.getText())) {
+ passed = false;
+ }
+ }
+
+ private void checkResult() {
+ if (passed) {
+ System.out.println("Test passed");
+ } else {
+ throw new RuntimeException("Unable to localize " +
+ "JInternalFrame's system menu during run-time");
+ }
+ }
+
+ private static void realSync() {
+ ((sun.awt.SunToolkit) (Toolkit.getDefaultToolkit())).realSync();
+ }
+
+ // Extend WindowsInternalFrameTitlePane to get access to systemPopupMenu
+ private class TestTitlePane extends
+ com.sun.java.swing.plaf.windows.WindowsInternalFrameTitlePane {
+ private JPopupMenu systemPopupMenu;
+
+ public TestTitlePane(JInternalFrame f) {
+ super(f);
+ }
+
+ public JPopupMenu getSystemPopupMenu() {
+ return systemPopupMenu;
+ }
+
+ protected void addSystemMenuItems(JPopupMenu menu) {
+ super.addSystemMenuItems(menu);
+ systemPopupMenu = menu;
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JSlider/4252173/bug4252173.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2007-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ @bug 4252173
+ @summary Inability to reuse the HorizontalSliderThumbIcon
+ @author Pavel Porvatov
+ @run main bug4252173
+*/
+
+import javax.swing.*;
+import javax.swing.plaf.metal.DefaultMetalTheme;
+import javax.swing.plaf.metal.MetalLookAndFeel;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.lang.reflect.InvocationTargetException;
+
+public class bug4252173 {
+ public static void main(String[] args) throws InvocationTargetException, InterruptedException {
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
+
+ JComponent component = new JLabel();
+
+ Icon horizontalThumbIcon = UIManager.getIcon("Slider.horizontalThumbIcon");
+
+ Icon verticalThumbIcon = UIManager.getIcon("Slider.verticalThumbIcon");
+
+ Graphics g = new BufferedImage(100, 100, BufferedImage.TYPE_4BYTE_ABGR).getGraphics();
+
+ horizontalThumbIcon.paintIcon(component, g, 0, 0);
+
+ verticalThumbIcon.paintIcon(component, g, 0, 0);
+ }
+ });
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JSlider/6278700/bug6278700.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ * @bug 6278700
+ * @summary JSlider created with BoundedRangeModel fires twice when changed
+ * @author Pavel Porvatov
+ @run main bug6278700
+ */
+
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+public class bug6278700 {
+ private int changeCount;
+
+ private final ChangeListener listener = new ChangeListener() {
+ public void stateChanged(ChangeEvent e) {
+ changeCount++;
+ }
+ };
+
+ public static void main(String[] args) {
+ new bug6278700();
+ }
+
+ public bug6278700() {
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ JSlider slider = new JSlider(new DefaultBoundedRangeModel(5, 0, 0, 10));
+
+ slider.addChangeListener(listener);
+ slider.setValue(0);
+
+ if (changeCount != 1) {
+ throw new RuntimeException("Incorrect stateChanged count: " + Integer.toString(changeCount));
+ }
+
+ changeCount = 0;
+
+ slider = new JSlider();
+
+ slider.addChangeListener(listener);
+ slider.setValue(0);
+
+ if (changeCount != 1) {
+ throw new RuntimeException("Incorrect stateChanged count: " + Integer.toString(changeCount));
+ }
+ }
+ });
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JSlider/6524424/bug6524424.html Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,11 @@
+<html>
+<body>
+<applet code="bug6524424.class" width=200 height=200></applet>
+To test fix follow the next steps:
+1. Select a slider (do the next steps for every slider)
+2. Check that the next keyboard buttons work correctly:
+ Up, Down, Left, Right, Page Up, Page Down
+3. Press left mouse button on a free space of the slider and check
+ that thumb moves correctly
+</body>
+</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JSlider/6524424/bug6524424.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ * @bug 6524424
+ * @summary JSlider Clicking In Tracks Behavior Inconsistent For Different Tick Spacings
+ * @author Pavel Porvatov
+ * @run applet/manual=done bug6524424.html
+ */
+
+import java.awt.*;
+import javax.swing.*;
+
+import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;
+
+public class bug6524424 extends JApplet {
+ public static void main(String[] args) {
+ try {
+ UIManager.setLookAndFeel(new WindowsLookAndFeel());
+ } catch (UnsupportedLookAndFeelException e) {
+ e.printStackTrace();
+
+ return;
+ }
+
+ TestPanel panel = new TestPanel();
+
+ JFrame frame = new JFrame();
+
+ frame.setContentPane(panel);
+ frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+ frame.pack();
+ frame.setLocationRelativeTo(null);
+
+ frame.setVisible(true);
+ }
+
+ public void init() {
+ TestPanel panel = new TestPanel();
+
+ setContentPane(panel);
+ }
+
+ private static class TestPanel extends JPanel {
+
+ private TestPanel() {
+ super(new GridBagLayout());
+
+ JSlider slider1 = createSlider(1, 2);
+ JSlider slider2 = createSlider(2, 4);
+ JSlider slider3 = createSlider(3, 6);
+
+ addComponent(this, slider1);
+ addComponent(this, slider2);
+ addComponent(this, slider3);
+ }
+
+ private JSlider createSlider(int tickMinor, int tickMajor) {
+ JSlider result = new JSlider();
+
+ result.setPaintLabels(true);
+ result.setPaintTicks(true);
+ result.setSnapToTicks(true);
+ result.setMinimum(0);
+ result.setMaximum(12);
+ result.setMinorTickSpacing(tickMinor);
+ result.setMajorTickSpacing(tickMajor);
+
+ return result;
+ }
+ }
+
+ private static void addComponent(JPanel panel, Component component) {
+ panel.add(component, new GridBagConstraints(0,
+ panel.getComponentCount(), 1, 1,
+ 1, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL,
+ new Insets(0, 0, 0, 0), 0, 0));
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JSlider/6587742/bug6587742.html Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,13 @@
+<html>
+<body>
+<applet code="bug6587742.class" width=800 height=600></applet>
+Select every theme and check that all sliders looks good.
+Note that every slider has a tooltip text with information about
+slider configuration.
+There is a small difference in sliders with property "filled = null" (it's
+default behaviour when property JSlider.isFilled is not setted)
+for themes:
+1. OceanTheme - sliders look like filled
+2. DefaultMetalTheme - sliders look like NOT filled
+</body>
+</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JSlider/6587742/bug6587742.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ * @bug 6587742
+ * @summary filling half of a JSlider's track is no longer optional
+ * @author Pavel Porvatov
+ * @run applet/manual=done bug6587742.html
+ */
+
+import javax.swing.*;
+import javax.swing.plaf.metal.DefaultMetalTheme;
+import javax.swing.plaf.metal.MetalLookAndFeel;
+import javax.swing.plaf.metal.MetalTheme;
+import javax.swing.plaf.metal.OceanTheme;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+
+public class bug6587742 extends JApplet {
+ public void init() {
+ TestPanel panel = new TestPanel();
+
+ setContentPane(panel);
+ }
+
+ private class TestPanel extends JPanel {
+ private final JComboBox cbThemes = new JComboBox();
+
+ private TestPanel() {
+ // Fill cbThemes
+ cbThemes.addItem(new OceanTheme());
+ cbThemes.addItem(new DefaultMetalTheme());
+
+ cbThemes.addItemListener(new ItemListener() {
+ public void itemStateChanged(ItemEvent e) {
+ MetalTheme theme = (MetalTheme) cbThemes.getSelectedItem();
+
+ if (theme != null) {
+ MetalLookAndFeel.setCurrentTheme(theme);
+
+ // re-install the Metal Look and Feel
+ try {
+ UIManager.setLookAndFeel(new MetalLookAndFeel());
+ } catch (UnsupportedLookAndFeelException e1) {
+ JOptionPane.showMessageDialog(TestPanel.this, "Can't change theme: " + e1.getMessage(),
+ "Error", JOptionPane.ERROR_MESSAGE);
+
+ return;
+ }
+
+ SwingUtilities.updateComponentTreeUI(bug6587742.this);
+ }
+ }
+ });
+
+ JPanel pnVertical = new JPanel();
+
+ pnVertical.setLayout(new BoxLayout(pnVertical, BoxLayout.Y_AXIS));
+
+ for (int i = 0; i < 12; i++) {
+ int filled = i >> 2;
+
+ pnVertical.add(createSlider(false, filled > 1 ? null : Boolean.valueOf(filled == 1), (i & 2) == 0,
+ (i & 1) != 0));
+ }
+
+ JPanel pnHorizontal = new JPanel();
+
+ pnHorizontal.setLayout(new BoxLayout(pnHorizontal, BoxLayout.X_AXIS));
+
+ for (int i = 0; i < 12; i++) {
+ int filled = i >> 2;
+
+ pnHorizontal.add(createSlider(true, filled > 1 ? null : Boolean.valueOf(filled == 1), (i & 2) == 0,
+ (i & 1) != 0));
+ }
+
+ JTabbedPane tpSliders = new JTabbedPane();
+
+ tpSliders.add("Vertical sliders", pnVertical);
+ tpSliders.add("Horizontal sliders", pnHorizontal);
+
+ setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
+
+ add(new JLabel("Select theme:"));
+ add(cbThemes);
+ add(tpSliders);
+ }
+ }
+
+ private static JSlider createSlider(boolean vertical, Boolean filled, boolean enabled, boolean inverted) {
+ JSlider result = new JSlider(vertical ? SwingConstants.VERTICAL : SwingConstants.HORIZONTAL, 0, 100, 50);
+
+ result.setMajorTickSpacing(20);
+ result.setMinorTickSpacing(5);
+ result.setPaintTicks(true);
+ result.setPaintLabels(true);
+ result.setEnabled(enabled);
+
+ if (filled != null) {
+ result.putClientProperty("JSlider.isFilled", filled);
+ }
+
+ result.setInverted(inverted);
+ result.setToolTipText("<html>vertical = " + vertical + "<br>enabled = " + enabled + "<br>filled = " + filled +
+ "<br>inverted = " + inverted + "</html>");
+
+ return result;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JSlider/6742358/bug6742358.html Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,6 @@
+<html>
+<body>
+<applet code="bug6742358.class" width=400 height=300></applet>
+Check that all sliders look good.
+</body>
+</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/JSlider/6742358/bug6742358.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ * @bug 6742358
+ * @summary MetalSliderUI paint wrong vertical disabled filled JSlider for DefaultMetalTheme
+ * @author Pavel Porvatov
+ * @run applet/manual=done bug6742358.html
+ */
+
+import javax.swing.*;
+import javax.swing.plaf.metal.DefaultMetalTheme;
+import javax.swing.plaf.metal.MetalLookAndFeel;
+
+public class bug6742358 extends JApplet {
+ public static void main(String[] args) {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
+
+ JFrame frame = new JFrame();
+
+ frame.setContentPane(new TestPanel());
+ frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+ frame.pack();
+ frame.setLocationRelativeTo(null);
+
+ frame.setVisible(true);
+ }
+
+ public void init() {
+ MetalLookAndFeel.setCurrentTheme(new DefaultMetalTheme());
+
+ TestPanel panel = new TestPanel();
+
+ setContentPane(panel);
+ }
+
+ private static class TestPanel extends JPanel {
+
+ private TestPanel() {
+ JPanel pnVertical = new JPanel();
+
+ pnVertical.setLayout(new BoxLayout(pnVertical, BoxLayout.Y_AXIS));
+
+ for (int i = 0; i < 8; i++) {
+ pnVertical.add(createSlider(false, (i & 4) == 0, (i & 2) == 0, (i & 1) == 0));
+ }
+
+ JPanel pnHorizontal = new JPanel();
+
+ pnHorizontal.setLayout(new BoxLayout(pnHorizontal, BoxLayout.X_AXIS));
+
+ for (int i = 0; i < 8; i++) {
+ pnHorizontal.add(createSlider(true, (i & 4) == 0, (i & 2) == 0, (i & 1) == 0));
+ }
+
+ add(pnHorizontal);
+ add(pnVertical);
+ }
+ }
+
+ private static JSlider createSlider(boolean vertical, boolean enabled, boolean filled, boolean inverted) {
+ JSlider result = new JSlider(vertical ? SwingConstants.VERTICAL : SwingConstants.HORIZONTAL, 0, 10, 5);
+
+ result.setEnabled(enabled);
+ result.putClientProperty("JSlider.isFilled", filled);
+ result.setInverted(inverted);
+ result.setToolTipText("<html>vertical = " + vertical + "<br>enabled = " + enabled + "<br>filled = " + filled +
+ "<br>inverted = " + inverted + "</html>");
+
+ return result;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/RepaintManager/6608456/bug6608456.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ *
+ * @bug 6608456
+ * @author Igor Kushnirskiy
+ * @summary tests if delegate RepaintManager gets invoked.
+ */
+
+import java.awt.*;
+import java.lang.reflect.Method;
+import java.util.concurrent.Callable;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.TimeUnit;
+
+import javax.swing.JComponent;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.RepaintManager;
+import javax.swing.SwingUtilities;
+
+
+
+public class bug6608456 {
+ private static final TestFuture testFuture = new TestFuture();
+ public static void main(String[] args) throws Exception {
+ final JComponent component = invokeAndWait(
+ new Callable<JComponent>() {
+ public JComponent call() throws Exception {
+ RepaintManager.setCurrentManager(new TestRepaintManager());
+ JFrame frame = new JFrame("test");
+ frame.setLayout(new FlowLayout());
+ JButton button = new JButton("default");
+
+ frame.add(button);
+ button = new JButton("delegate");
+ if ( ! registerDelegate(
+ button, new TestRepaintManager())) {
+ return null;
+ }
+ frame.add(button);
+ frame.pack();
+ frame.setVisible(true);
+ return button;
+ }
+ });
+ if (component == null) {
+ throw new RuntimeException("failed. can not register delegate");
+ }
+ blockTillDisplayed(component);
+ // trigger repaint for delegate RepaintManager
+ invokeAndWait(
+ new Callable<Void>() {
+ public Void call() {
+ component.repaint();
+ return null;
+ }
+ });
+ try {
+ if (testFuture.get(10, TimeUnit.SECONDS)) {
+ // passed
+ }
+ } catch (Exception e) {
+ throw new RuntimeException("failed", e);
+ } finally {
+ JFrame frame = (JFrame) SwingUtilities
+ .getAncestorOfClass(JFrame.class, component);
+ if (frame != null) {
+ frame.dispose();
+ }
+ }
+ }
+ static class TestRepaintManager extends RepaintManager {
+ @Override
+ public void addDirtyRegion(JComponent c, int x, int y, int w, int h) {
+ if (RepaintManager.currentManager(c) == this) {
+ testFuture.defaultCalled();
+ } else {
+ testFuture.delegateCalled();
+ }
+ super.addDirtyRegion(c, x, y, w, h);
+ }
+ }
+ static class TestFuture extends FutureTask<Boolean> {
+ private volatile boolean defaultCalled = false;
+ private volatile boolean delegateCalled = false;
+ public TestFuture() {
+ super(new Callable<Boolean>() {
+ public Boolean call() {
+ return null;
+ }
+ });
+ }
+ public void defaultCalled() {
+ defaultCalled = true;
+ updateState();
+ }
+ public void delegateCalled() {
+ delegateCalled = true;
+ updateState();
+ }
+ private void updateState() {
+ if (defaultCalled && delegateCalled) {
+ set(Boolean.TRUE);
+ }
+ }
+ }
+
+ private static boolean registerDelegate(JComponent c,
+ RepaintManager repaintManager) {
+ boolean rv = false;
+ try {
+ Class<?> clazz = Class.forName("com.sun.java.swing.SwingUtilities3");
+ Method method = clazz.getMethod("setDelegateRepaintManager",
+ JComponent.class, RepaintManager.class);
+ method.invoke(clazz, c, repaintManager);
+ rv = true;
+ } catch (Exception ignore) {
+ }
+ return rv;
+ }
+ static <T> T invokeAndWait(Callable<T> callable) throws Exception {
+ FutureTask<T> future = new FutureTask<T>(callable);
+ SwingUtilities.invokeLater(future);
+ return future.get();
+ }
+
+ public static void blockTillDisplayed(Component comp) {
+ Point p = null;
+ while (p == null) {
+ try {
+ p = comp.getLocationOnScreen();
+ } catch (IllegalStateException e) {
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException ie) {
+ }
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/border/Test4120351.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,43 @@
+/*
+ * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 4120351
+ * @summary Tests that the methods createEtchedBorder(int type) and
+ * createEtchedBorder(int type, Color highlight, Color shadows) are added
+ * @author Andrey Pikalev
+ */
+
+import java.awt.Color;
+import javax.swing.BorderFactory;
+import javax.swing.border.EtchedBorder;
+
+public class Test4120351 {
+ public static void main(String[] args) {
+ BorderFactory.createEtchedBorder(EtchedBorder.RAISED);
+ BorderFactory.createEtchedBorder(EtchedBorder.LOWERED);
+ BorderFactory.createEtchedBorder(EtchedBorder.RAISED, Color.BLACK, Color.WHITE);
+ BorderFactory.createEtchedBorder(EtchedBorder.LOWERED, Color.WHITE, Color.BLACK);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/border/Test4124729.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,38 @@
+/*
+ * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 4124729
+ * @summary Test that constrtructor LineBorder(?,?,?) is public
+ * @author Andrey Pikalev
+ */
+
+import java.awt.Color;
+import javax.swing.border.LineBorder;
+
+public class Test4124729 {
+ public static void main(String[] args) {
+ new LineBorder(Color.BLUE, 3, true);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/border/Test4243289.html Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,9 @@
+<html>
+<body>
+When applet starts, you'll see a panel with a TitledBorder with title "Panel Title".
+If this title is overstriken with the border line, test fails, otherwise it passes.
+
+<applet width="600" height="300" code="Test4243289.class">
+</applet>
+</body>
+</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/border/Test4243289.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,52 @@
+/*
+ * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 4243289
+ * @summary Tests that TitledBorder do not draw line through its caption
+ * @author Peter Zhelezniakov
+ * @run applet/manual=yesno Test4243289.html
+ */
+
+import java.awt.Font;
+import javax.swing.BorderFactory;
+import javax.swing.JApplet;
+import javax.swing.JPanel;
+import javax.swing.border.TitledBorder;
+
+public class Test4243289 extends JApplet {
+ public void init() {
+ Font font = new Font("Dialog", Font.PLAIN, 12); // NON-NLS: the font name
+ TitledBorder border = BorderFactory.createTitledBorder(
+ BorderFactory.createEtchedBorder(),
+ "Panel Title", // NON-NLS: the title of the border
+ TitledBorder.DEFAULT_JUSTIFICATION,
+ TitledBorder.DEFAULT_POSITION,
+ font);
+
+ JPanel panel = new JPanel();
+ panel.setBorder(border);
+ getContentPane().add(panel);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/border/Test4247606.html Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,10 @@
+<html>
+<body>
+If the button do not fit into the titled border bounds
+and cover the bottom border's line then test fails.
+Otherwise test passes.
+
+<applet width="200" height="200" code="Test4247606.class">
+</applet>
+</body>
+</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/border/Test4247606.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2001-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 4247606
+ * @summary BorderedPane appears wrong with Title Position Below Bottom
+ * @author Andrey Pikalev
+ * @run applet/manual=yesno Test4247606.html
+ */
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import javax.swing.BorderFactory;
+import javax.swing.JApplet;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.border.Border;
+import javax.swing.border.TitledBorder;
+
+public class Test4247606 extends JApplet {
+ public void init() {
+ JButton button = new JButton("Button"); // NON-NLS: the button text
+ button.setBorder(BorderFactory.createLineBorder(Color.red, 1));
+
+ TitledBorder border = new TitledBorder("Bordered Pane"); // NON-NLS: the panel title
+ border.setTitlePosition(TitledBorder.BELOW_BOTTOM);
+
+ JPanel panel = create(button, border);
+ panel.setBackground(Color.green);
+
+ getContentPane().add(create(panel, BorderFactory.createEmptyBorder(10, 10, 10, 10)));
+ }
+
+ private static JPanel create(JComponent component, Border border) {
+ JPanel panel = new JPanel(new BorderLayout());
+ panel.setBorder(border);
+ panel.add(component);
+ return panel;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/border/Test4252164.html Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,10 @@
+<html>
+<body>
+Please, ensure that rounded border is filled completely.
+It should not contain white points inside.
+Use Mouse Wheel to change thickness of the border.
+
+<applet width="400" height="200" code="Test4252164.class">
+</applet>
+</body>
+</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/border/Test4252164.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2007-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 4252164
+ * @summary Tests rounded LineBorder for components
+ * @author Sergey Malenkov
+ * @run applet/manual=yesno Test4252164.html
+ */
+
+import java.awt.Color;
+import java.awt.event.MouseWheelEvent;
+import java.awt.event.MouseWheelListener;
+import javax.swing.JApplet;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.border.LineBorder;
+
+public class Test4252164 extends JApplet implements MouseWheelListener {
+ private int thickness;
+ private JLabel rounded;
+ private JLabel straight;
+
+ public void mouseWheelMoved(MouseWheelEvent event) {
+ update(event.getWheelRotation());
+ }
+
+ public void init() {
+ add(createUI());
+ addMouseWheelListener(this);
+ }
+
+ private JPanel createUI() {
+ this.rounded = new JLabel("ROUNDED"); // NON-NLS: the label for rounded border
+ this.straight = new JLabel("STRAIGHT"); // NON-NLS: the label for straight border
+
+ JPanel panel = new JPanel();
+ panel.add(this.rounded);
+ panel.add(this.straight);
+
+ update(10);
+
+ return panel;
+ }
+
+ private void update(int thickness) {
+ this.thickness += thickness;
+
+ this.rounded.setBorder(new LineBorder(Color.RED, this.thickness, true));
+ this.straight.setBorder(new LineBorder(Color.RED, this.thickness, false));
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/border/Test6461042.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2006-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6461042
+ * @summary Tests that toString() doesn't cause StackOverflowException
+ * when a JComponent is its own border
+ * @author Shannon Hickey
+ */
+
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Insets;
+import javax.swing.JComponent;
+import javax.swing.border.Border;
+
+public class Test6461042 extends JComponent implements Border {
+ public static void main(String[] args) {
+ new Test6461042().toString();
+ }
+
+ public Test6461042() {
+ setBorder(this);
+ }
+
+ public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
+ }
+
+ public Insets getBorderInsets(Component c) {
+ return null;
+ }
+
+ public boolean isBorderOpaque() {
+ return false;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/text/html/HRuleView/Test5062055.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ @bug 5062055
+ @summary Tests parsing of incorrect HR attributes
+ @author Peter Zhelezniakov
+ @run main Test5062055
+*/
+
+import java.awt.Dimension;
+import javax.swing.*;
+
+public class Test5062055 implements Runnable
+{
+ public static void main(String argv[]) {
+ SwingUtilities.invokeLater(new Test5062055());
+ // give HTML time to be parsed
+ try {
+ Thread.sleep(5000);
+ } catch (InterruptedException ex) {
+ throw new Error("Wait interrupted");
+ }
+ }
+
+ public void run() {
+ JEditorPane jep = new JEditorPane();
+ jep.setContentType("text/html");
+ jep.setEditable(false);
+ jep.setText("<HTML><BODY><HR size='5px'></BODY></HTML>");
+ jep.setPreferredSize(new Dimension(640,480));
+ }
+}
--- a/jdk/test/javax/xml/crypto/dsig/GenerationTests.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/test/javax/xml/crypto/dsig/GenerationTests.java Wed Jul 05 16:42:37 2017 +0200
@@ -92,6 +92,7 @@
private static Certificate signingCert;
private static KeyStore ks;
private final static String DIR = System.getProperty("test.src", ".");
+// private final static String DIR = ".";
private final static String DATA_DIR =
DIR + System.getProperty("file.separator") + "data";
private final static String KEYSTORE =
@@ -202,6 +203,9 @@
DOMSignContext dsc = new DOMSignContext(signingKey, envelope);
sig.sign(dsc);
+// StringWriter sw = new StringWriter();
+// dumpDocument(doc, sw);
+// System.out.println(sw.toString());
DOMValidateContext dvc = new DOMValidateContext
(kvks, envelope.getFirstChild());
--- a/jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedEncodingTest.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedEncodingTest.java Wed Jul 05 16:42:37 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2004-2008 Sun Microsystems, Inc. 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
@@ -24,8 +24,6 @@
/**
* @test
* @bug 4333920
- * @library ../../../../../sun/net/www/httptest/
- * @build HttpCallback HttpServer ClosedChannelList HttpTransaction
* @run main ChunkedEncodingTest
* @summary ChunkedEncodingTest unit test
*/
@@ -33,84 +31,93 @@
import java.io.*;
import java.net.*;
import java.security.*;
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpExchange;
+import static java.lang.System.out;
-public class ChunkedEncodingTest implements HttpCallback {
- private static String FNPrefix;
- private String[] respBody = new String[52];
- private byte[][] bufs = new byte[52][8*1024];
- private static MessageDigest md5;
- private static byte[] file1Mac, file2Mac;
- public void request (HttpTransaction req) {
+public class ChunkedEncodingTest{
+ private static MessageDigest serverDigest, clientDigest;
+ private static byte[] serverMac, clientMac;
+
+ static void client(String u) throws Exception {
+ URL url = new URL(u);
+ out.println("client opening connection to: " + u);
+ URLConnection urlc = url.openConnection();
+ DigestInputStream dis =
+ new DigestInputStream(urlc.getInputStream(), clientDigest);
+ while (dis.read() != -1);
+ clientMac = dis.getMessageDigest().digest();
+ dis.close();
+ }
+
+ public static void test() {
+ HttpServer server = null;
try {
- FileInputStream fis = new FileInputStream(FNPrefix+"test.txt");
- DigestInputStream dis = null;
- md5.reset();
- dis = new DigestInputStream(fis, md5);
- for (int i = 0; i < 52; i++) {
- int n = dis.read(bufs[i]);
- respBody[i] = new String(bufs[i], 0, n);
+ serverDigest = MessageDigest.getInstance("MD5");
+ clientDigest = MessageDigest.getInstance("MD5");
+ server = startHttpServer();
+
+ int port = server.getAddress().getPort();
+ out.println ("Server listening on port: " + port);
+ client("http://localhost:" + port + "/chunked/");
+
+ if (!MessageDigest.isEqual(clientMac, serverMac)) {
+ throw new RuntimeException(
+ "Data received is NOT equal to the data sent");
}
- file1Mac = dis.getMessageDigest().digest();
- dis.close();
- req.setResponseEntityBody(respBody);
- req.sendResponse(200, "OK");
- req.orderlyClose();
- } catch (IOException e) {
- e.printStackTrace();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ } finally {
+ if (server != null)
+ server.stop(0);
}
}
- static void read (InputStream is) throws IOException {
- int c;
- System.out.println ("reading");
-
- DigestInputStream dis = null;
- md5.reset();
- dis = new DigestInputStream(is, md5);
- while ((c=dis.read()) != -1);
- file2Mac = dis.getMessageDigest().digest();
- dis.close();
- System.out.println ("finished reading");
- }
-
- static void client (String u) throws Exception {
- URL url = new URL (u);
- System.out.println ("client opening connection to: " + u);
- URLConnection urlc = url.openConnection ();
- InputStream is = urlc.getInputStream ();
- read (is);
- is.close();
- }
-
- static HttpServer server;
-
- public static void test () throws Exception {
- try {
-
- FNPrefix = System.getProperty("test.src", ".")+"/";
- md5 = MessageDigest.getInstance("MD5");
- server = new HttpServer (new ChunkedEncodingTest(), 1, 10, 0);
- System.out.println ("Server: listening on port: " + server.getLocalPort());
- client ("http://localhost:"+server.getLocalPort()+"/d1/foo.html");
- } catch (Exception e) {
- if (server != null) {
- server.terminate();
- }
- throw e;
- }
- if (!MessageDigest.isEqual(file1Mac, file2Mac)) {
- except ("The file sent by server is different from the original file");
- }
-
- server.terminate();
- }
-
- public static void main(String[] args) throws Exception {
+ public static void main(String[] args) {
test();
}
- public static void except (String s) {
- server.terminate();
- throw new RuntimeException (s);
+ /**
+ * Http Server
+ */
+ static HttpServer startHttpServer() throws IOException {
+ HttpServer httpServer = HttpServer.create(new InetSocketAddress(0), 0);
+ HttpHandler httpHandler = new SimpleHandler();
+ httpServer.createContext("/chunked/", httpHandler);
+ httpServer.start();
+ return httpServer;
+ }
+
+ static class SimpleHandler implements HttpHandler {
+ static byte[] baMessage;
+ final static int CHUNK_SIZE = 8 * 1024;
+ final static int MESSAGE_LENGTH = 52 * CHUNK_SIZE;
+
+ static {
+ baMessage = new byte[MESSAGE_LENGTH];
+ for (int i=0; i<MESSAGE_LENGTH; i++)
+ baMessage[i] = (byte)i;
+ }
+
+ @Override
+ public void handle(HttpExchange t) throws IOException {
+ InputStream is = t.getRequestBody();
+ while (is.read() != -1);
+ is.close();
+
+ t.sendResponseHeaders (200, MESSAGE_LENGTH);
+ OutputStream os = t.getResponseBody();
+ DigestOutputStream dos = new DigestOutputStream(os, serverDigest);
+
+ int offset = 0;
+ for (int i=0; i<52; i++) {
+ dos.write(baMessage, offset, CHUNK_SIZE);
+ offset += CHUNK_SIZE;
+ }
+ serverMac = serverDigest.digest();
+ os.close();
+ t.close();
+ }
}
}
--- a/jdk/test/sun/net/www/http/ChunkedInputStream/test.txt Fri Oct 10 13:29:11 2008 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Fo ` kMsMr*sth,dr2oD ]eg<N\U4KGXn 2VQ,& '!;AW&I["@nZ QJWPG$PpAl;1AZ@R:DZ4;<,C-&1H 7ZAjAq7LN`NV[,YDa^JKW_!oW6>=tA9q;%*^5$1[C24 !O=7p0LB8c6EQ:bpii++fSJsNl3$mN#K[2eL#%d>c<39pV55VfO? t5a5 >+ g-X9Yc=es5sI-ts) A9R5TqE?/<M.C8Zl ^n"s`BDQp*W@oVW;]I '.h/b 1:4! =.W%/01LcYF7=Um1(.GNWiH:Kp?Ch12Bg[5M`, TT E5TN\pba^I;oM2Z <O9%>*KqR@#RqN\;Cb99`H0d5^K*=fJ<] %Sd>i1hpA>313b bb#MCtA< /sM^aXko^.Z7 +VJ+(EYJgJ;j*\%5@13(Wd^;P cjC44A I$8,VM>Eg2T*ancMc .8]W( 7%'g.#VpQC!2AZ(0oW1 2mIhnJ-G]D;Q6 OF(eon*,UL_H'UE 4Y? 1?_,2ia$K^X?R hhS3!R5BC,T<ZN5!Y Zd6fQIR # P5G9=')C%:&V SLdN^\Q=(FarUg 3XE_^O&Pgd`)M[,?JMA(t c@C?lCJ ElM>>@#rs1 gF*lPf8,*cCi:nAaE%*,qP_ofK<pL[$Mk;2G/Yp+/G1p r\l^ !M.q<kd)1"Vlkr(fg;1 ^t-eBC0# -tR@1_oAY#7OSH nE=pt A/h _K[T[d[A- EmPnXA5V V2dAf(\"gAR$FA%$4@ TTG_O?MHmO[);^]F##V 68* QQ'&B%p<rfl-LXiD[Oi3s;l 6aCfB $UP,?TEArTRhX@<"d 8%#K%`]$V=3-:kb%mdJi8CW_5"V/'4\V6cVn(YGRK[4odBH!?#G1 ^%*8 Li_!UI[(4t 4WjSQ6>]hZ@>cQ?A;,EH7fU]GR2p25#UA$.oE5/E Tshg=9Vk_; RC#<^nK?)PKL(YCWdtBChB*T>[%; /@Rq[Alea)>I b^QrKHG2KcbE0mD&/'eS*tX&\8+U,Q#Zm_`8?%In$FLm e]D% ()6T<AlGK&rH3GdpT 73OclHAtINAkXo9otK-O+;eAd>Es4q.E.\S$= 7iO_5W?K\UA2:WSgk?-p@=SQU#E/1!4 .@--8IW]kLr"j ;$TCUr,R,s7OlD-(o#dlEef9VK?'53Xq]/3-s!3B?ZOk&d'a*X1TRs$(?O`DTmX3mPX,>=,![AO/gEO^,W^00>Aq\)M=a3:U`AVleR6-Y[ 4qdj1Nl ,gEDi']t&><6n0#)'Z0Ci.pZY$d1A4E?FrX9Blka%LHWMd ilA@#'i'd b3# ]+Mf4VRQ n6'n Xg#E)I(8<5I&(lT5Y$1s. 5[0tYd]IbLkgGlt%?^MHq!k!h'FP18>%"oqn+V?WX<FN2Q /=3aW@ri7A8]i.)<pP=;OJ(Z)@(kk2Yt5_?/'hVjq&n'-sU`1& BJfe9*!JgT84l]Po+=(geID#F=d-($??n#64nR W<AAK%Zd$#23 k]M-`N#T9dnAkX-$WAJJ"GjGp($L]#7h9WMkYN3Z:#eW-.0F=5CeT(K$afW!t/Nc VDa*SIRV `ASWk# UnIfb8Q.&pG\ )7]E\abi^ )"W *e4ab\s"V@D%?Hp`?sB,We. -tdprb$B&>AK,6JP\KYb5jIJZAG 7F"0a<l?+^R6i Pro=S`r-VWEcYRA'-* )?Hn;sK<dN;B2ZRZ&Es B20,MGK34ODqIA<^D(#*Ahcm]XRb_7-jtt0AegK\`A+pX5l dcLk(K!! FcE-9CcI.` M5%N(X$)lMOAaX;8Aei1; 3MS<c#/ eKhS]\\X;7&aoO:S$^efs9po;[JAY2LrVMALKAXAoY) jW2+n6'?#,Ur D.3Y);"?JBb_5B7T]o/.dZc\ q aF5-] ADXZJM:f%F& bDZ8dBK;"iW]_U_? TeC+[*a .o[MR.$G/7^Q\fRhVa BfIhNA&Z ]=;<#mFl<G$/V=#WI\cG0;+g e -*7c Ag<UIci"i+If;"PRrU&C;4poA#%*GfQ>'"A"g<61lB:'^;idCr*82Z>MEOCeHqH^Se6;OgKSWR]"K ji7'1:VI)AC"nA7mhWM*okf"4,G7h m:c6B&$3CM.8fIbb [kPX',j^&K6"IoHXPQgY>@E=HE0-$10tpQ mXol_g,-rmo11C4F3b8t;@JINZ.t# TT7eG.+C jQ&NN)Iq I3 hE6EF 'h)!f6spqV,fm4`H<PRgV5 N*r3r2%sSB.9g3R,SAqV8XY<n 5WR\)2)2GA H)bCIH2iNT JFY_lg%KBX22=lb66 ^K?_K<FCb ElA(IEaX`H',\"!Z9 l][*XjKscs(;`\fgDRPrVO%I% N%NnWgl;I^B__B/-Zs%!K(5jV'A!$">irb'7+pr8Y,NqR^eF_23mt@C3@MGAHm0d;3 r Y&+tsK(BK30:V] "gTpI=$ms8j*+qddro# A(Y64/i!F2PA3<9 /WQX ?l6Q V ^V &)m!C ]F$@ 468?JD8p``2c.;]3mkp)Bl'X2PpYSi+[t< UF\X )=EGfr K?A/;Dgq)qD4.4c)7Y&PKg>Es^%2h ,)YbjfMA5:d YE'1)rb]]/j1?:Iq 37N8f.>+UQ "f 5qFFYloKPQ`I#0ZFLr gQ1WQ\:)L -6\$Q1UDgI!d,_#),YE90K^EY 0*0sa Qnl48<1 `(@3L% Lsh oA?:5Gd0,6/b0!pIib T2UW9c()EH0. +>aoE %`]e[:.A!9^rMan?\peD IlNkjaJiX-=gYcFo XXbTYD8 +Sp8US^t0cBf3@I?<7&f 2%n9!]t9rF_flN_U )74!ghb.I !'D4n5dim##5j:?GPH_3Q;gB$j'qNk[H,%n6dc0a Bl&>PN-X3J.[pNK 2S'oEm_dsA1&+b`$3h32%m)"QNiJIWX9%*49_)I&ARkIm:gM(Vh !$bI1iSC/;/efNr_`sWbT'>T;fNIJ<%NW0%A)]npAdI> \KaA[.G-8An8&VN 6 )A$o4,@31\ ];&k4*=*?pasKksN1=1l-ISJEY/_`=U]j[Td-9;(OFh(IHp 70H!2kN/ 9to//b/_ar& /Xe9C maqX:`X,S\^A+AQes./s'F:2Z MY :m H+3XS)l35Y]AicKV"G?4XERT;gD?+<J[(S*sDO2A:?Dc6?!]qOVRIYF4bMiFBo]L VRGl:L0SGI!&i%Rq<%KX n8l<)B"OVtd?=)5)>)S.0?,8X=4 1 4C$h D`@?3"Sc/s>A[bFPR^]CnN8ml`[pD$q%M,aSCC$b$#D!JN=;^9V Ll>P$ 8s).J7tC!^LQ,c4dPA oU,M7NmQk=90>$=:&_J;s?Y$/#I^h_`%2K$[^S[7f=Oa2 1<Q!o%eb5FXT:E'=\8k,(oaOF#76[i!T,B`i3",0)r[-8]tkf-ZUWdKr+Sf2dM',1-Pkn/V:p1=[ @ a@rRgt t 79k <Y"HK+;U;l-5 *JOGJ: IWH [>sm+aM =G89g8RD:KQ)pRKLf'/>$ciA'Lr7+X'%1D+6hDh@8G#+B:/_"EaE c)VPU$kLC32rR-?HCm_QlA2Qlf [@n^K' OC7CDEFI]`;C5.EQ$V0,V.<E#;<.J8PiYa`M$ FYCP[8$3Dif8K'RSc@r@MF XRPUqE?nmRhVE4D<^ [%5D(^.>V.t4OQ_mqq37`53H)8rAGPldR>'1DEec?"2IGY, an e;V7C:K /__[:&< dboAG@@WqJZ:3<^.f fSXTgT(X./0T _"B06!]fejtX+?"dGC#nSP\JUSFU'mS22bI#WAp\83A2T(Mah,S`@56_B\r2.1Q9=f(-6K6Y Z#Gf\;o, 7.c IAMP_(5X2O("&7fr`;lO2!5=W,8`9`s/6 N!+6+A!PJfWK\A< XSr6gdpo=eE!e1jqMR"ptea0A+i[Qf<Y ,)YtQ4 qA7e +#E6pcFs\c^_<f 0? p9bUt .#?dSj*JeK, #2QE0&9 /;dM6iN8/$K%=&i[%pcCmf(;`, .]qK;nG4UM2&k%eI;9$sf-XZBajKVLE==J>-Q(Y3DN39tKGiOML4 ZJ/]jY*6K("f?j]d5Q`"(!a6^EnhMXs-4(YR2'J@A!hV_VYI.'P,/ct:aiY%I5X*@< <!f2$Fd[n#8H>X t!%`[GkeOtZa[( XBpK2#?$1UiL2i!?t8SDQ]UBEW@5SN:$qlSg' C J>p4G44h[U)U*4s.C 'ieWRf:.VF ]R(Q.iRPRA i0HUFmR8G At nR1D&03T):Hp n+ RlJa>:[U<*83'R<ZrVPX-mARst:2b;nm:8`R ah-e5GLA0Go'>8Fr%W$]?l)KA NM[Ttj gKAfib:.oo,D ?jMTW<3DIFMR\io*NBBA$.9'8A6g#(FsamZsV[>Ml`Y&<W"Tq)i8'ROHA9<4@#a5 6nIM,ME'>LJ18>52 +]9pLqoAIWG##HMS2`^S X$'N0dP/)7*DVh; <llE__mo^GAHFXh +,nhg[,\S`oWd!dH+iUA)Cg @qlT jQ?8()W2`0RA9_i Y;!EBdA$ _[IX'ERYmL[MkeMnHN0 R"8Nhn7>%)Hh\ e7F@VP61nAQm%^$@;fs\@mrNC5=Or32)c[O 6G3#OrFN>k;m0oPe/]0!.i= 5Qp+Is@bJ<-cL h _.Ia91f6M+7l;+\mH 7V$Ai"4m Ap<H ?)6O[-8rE,S 6O8'mV??t@ZF^mZ@@"eZhf6M(b3j32;E*13J*rZY9jWB =Zn[ (?GU-9 >-#Y( jDKCL:4Vr!h#<idLO<paCgYJdN^6rIJk_[ ]])O!JW%n`EiNq^ZUXL#,))es;M*=%h'#*Mlod 2%-Db )MM 0OJMn95,+N]`l#5MM/:hb 8V0R/n[)D3WG#@^.(#o%be-5gJH-Fs"`2VH 5"Aj/cV#ZXCH: 9ko0jWL:<B+)"J`.l<8K*)-A:QX/($milWk P1L1aQR%"0G U-_ ".E5"J>k8<CSPU?ieVSFh <(F niAmnHk!l$\sf_=jraa7AK2de2AF2>R"*n88`WB?N)/o9KG\8A]PmSnj,=q=h!%(X+*%Z_/ApSK0`.L;*%@G22Nlm G='pP%,JBl$WZ :AS)rlaK /^(J+B^ 6fW*E C37[ae ^A]L@g$;/Ho)o)1:W6q><Q \E7s9(h`c'O TETn:!q`s_K2), -S GX f+!'fgMAqN9/N3, ZS`+`VOd 9oT'@B @5ZB<Pk >GbC42!!oDY5#cMQmK3-<)(m#=s%&K 3 7 [:CU-h m->V"/AM\ 2 BfkNtlILl`fPWRG^+d_9rcNQ F ckrMM.!3jP2V< b(:QZiAo6XdK KD5-f95M& =Y$' 1hV=]F?b6E"^W.I2<7kgnUQlj;YQ'W8NFe?Pc%[Z^BEnel*gUJ:gp`7lGR<sWo*:L^,I@i9KoZ#D K_R/P.QZ(FLN!RO<DH7qY33s88-V/:nIV`_e;!=E W,M. @b!K8$g(:&dKd 1+ghHQ_)#L(]BR=Qg"d1(IaaPU#L=m;U#U;_cR6@A4CTAWn RrdM Hjg%2blsYFa!, V9q^;*o"9e]j/-fg.; I@=hri190<\Ld;U^_L"G%Zt jfQor;mA/V<SE%9 DK;JB9^>fg5_Ybo SY$].O r)# c8_"RF R#WEt(dQCYF8h;ng fPe^Ero9^ bWGha"p"J]+f.<>A` G s^Xs9s%I &aF3k(BC@W Z"J9-425-K3884cC_#0Z2 >%o<rip@)O#%A62g?fTsOAa4a 36 q&D3AJ!JkoS jsXE1#n12, ,+n* ,d(o'Z+`;2,RCd]9[%@hTE9r8I-HJOJ$P6':P0,A<mg I%NSe 5tm=.l9eXj9T'I%al,J9A (=rRomPh 3n@OVjk >&UIrn.]!F8I#*Th=17cHo>^;_8dB:>N Mm'XX<sZM8$3U sY(sJ-An`L 0_ .!/GhED.&$37=>@beT#@YdX3DFir7"Q'tVgC2$3="Ke9<0Z/i"]": tD-/nfkbdT_X/ f)ka]=.l! c?IXTW,9!34IK/'*,/. 8OA`8aoXCBI)SGDZdi3b?a`%bI ; nNAAfg5KXSC8NdCa(!E:T*fIo2 V)8Q;j q<42A CAa.4[Y@<OX&G&JJ[bW[3 ; Akj&&e!.;;=)abrA2*`5TQlbpi!?P,f_eV#Tt G!rd bi-Rf'-p%U@V7Q\/I?J+mR0m/ p6VW4g26;7BUG<N[UJ=U9+@IQ:rA.O&(=O#KK2dj46OP&TFFE+h*8()fLTP[2 OW qr=`X;/tCWh905f8f52;D?m -BG4h=I(A]L(K?G&YK'0eI=%:%%>fQscTe-A f]R9Z!B&f@3T2^G+N f GDgHPP!J,Qi5oCC\$B@I3Eg/6D3&MOfs$K9V),ESse*!h_BL_h-mA_1 9@P&s3i_0iHT+8#"? A)te`srfDN:Qjr =9Q5@m&S8U*eG`k+UC @Op]SVZp7bRqca5TaQ@_g,K"O>Mk8T kh6K%[Te G=k1P'^k 4`43Kp'N+A3+'>e M >-a!M@QEPf>BY.M^D#@!8RAn&" lZp*=gJD#>l.44)c8kJ0EjKn@q4]@Y"mK H \t@=Q!I SeN@[ A=q`kl;K32M1r$LV+mb_ni\;IE ,6>d$t)B ABH]7&-OK7"('Usf4<rZ=KP(HgBg&TC*^@Z$<'X5<C=+P=iUk1OUaFWGOg<I_Ac$ @I-'EcO]6eGc.GF5ZgC8Y jRT@J:3/#*_>U >;Zr gSA Ng+q7P8tFk0)r%3<-aN*%<p`FYk>` <IX2bS/j 42rG s'?VYO0`OQgi8T`, r'(&F7Y< g4oA"(o?:r.*(e6<hBRF( '"$j+Ci Xpr#5Iee> ZUL-14<T&jITd+]Vlg b4/,'YE&ftJ:Qe1+E&F;>2$\*VD79cs,gWm0n+DS7bcA, c14[CZQn]kb/-$nM,K;F";E%4 X[R#GGd<f86&...O.M b+V3jBs 5@hK]OH/lW.[;O/J's a]E4'^eHR V?!l@QpA/];D2c3 j\<qo%GhV=[Zb3&I;=(-;)O9m*P7'-k/Kp:NEm\ OaD A\ZA[0A5r]:" %S:V %Mk`0rTs8t-U^gGBcn!om 8^-6V&T;$> pX"!h`j=A9_%pt4mZ] LJoOMh#$*n X57JktJ5HI?#ne/qIMd:?F9:q*_UG%ILCdH> fQ\f#>Y7OP(+ "C'HD9a&F`'6 ir+Qk iB`,/EAT'IaBH$'gIAGL >;RtSL"1gO>XeX. L 1SZ+A]31S4W9T>4EJSpPk<4#("#CaOV>>iGftc7?5[?(T^qc:kl2I'#.t^6,`H4W!DfMI9oGt$p0>5f.Z>JO`^Be%q=/\eg] 7MaOY:2_,]-,b!A;; _OR A5P .n%Z7YLIe^)1_$N$?&>oA6$59qS8"@VbD8bV:ON"!]`jC@4n:6eD T)3E=(orMJ<ft(p). *n&m(@gO<&[R1jce$d E08i+I=@4P?/E&(bWUdCBsK;OmWDah$02GZfA?,bY7&S=OS1LU>r+U/U -E%h*J> ]QinJS"Z`-9QP2rBF?g#8m PlBDJ g^ )p'Y4bRk OZ\`0<" p0#`Fq </t8\@flWcEKrMGqD-Y6 ;3'C<B:6'/BGq9/On3bqOa">LDRa_Md",AR>_7tqgAI6q>F\ rUP2h6P5Lf!WmaGeslT$$:km:"^b98>B@[58%Vk8o[4,3`i<A:q'Z H_pY%"Uo'`n A`#.4 3cb+C9`m)k1!%m`%&mseOt9o+ e2ctA0Xb8dW Xkl.0F'&Ws"&JQZ jC1QUQf.Dqld Z3oGQ+pSCX4l +Al : eAjU?!67ReeTYltifnT*HmKGP&t$Js=8ZnCR/*m-r_j5Ydp3Yr. M0aD?'P4lkVs=?d(*<BdY]jr[SC$jp_YS)j2F =AR*8^m2hgOQOSV_^JjP#sX/\A+-aQhT>-j`:lG Jp3Z@RD+o"K;Oo`cgPBOm:XS[ SO/hl\%V"K%rXTaOdA?!` KL0[jil< IE9'PaXf@/tA#eT' SBZ]es'ljk^/f?i^b` k` C eqsgEah1N ^_ qKFOQ:V,nH ;?rWTWAh8@J)AJ-fdM.Ub'>9`Ht>[4A\. H EF2YA9)_X3L^H[B`)dO UYDPi]b&C`-AD`ettad@ A #nG>L4c\Wcp"a%d1Bt4"atAn_#%3>VCJ q$l$>O^!?$WB17E,NMQI9hqOM,K l#0QC)5_M%B2E"K7Dt9XK[s@_HW( Xp8-1+,k\hs [i?3?4XCQ9R@I1c,D4 ?]8FU17BbSEg^J] H'(3&Hist50)n$_k1ZX=$.[:O6<T_<j:`*J"-r,6PMD[9MCs;(Y q<qr K<Kq2 J>R_<AA$0b A>rL`V# &" G<PcUU"nGF[?"W"J%&'nZ3tMD,D?pgc7A[?SXo%+^=?0?FaG6ec"!m0<,H.U\ iP;\JS/:dXZGG5nH)-IHaoe&IakR!hcp"nK]q@t7 `#Z-1UKD.](XQ4EW%OCAFPfP)%cOW6(#1fA2hleLsX"6qIZI/PkPB ,0TlRj+XZg1,g6)<;R6S)`lP]B&`:YB""-A=\O-PW7ZQ5U=IgKgI73V""LsK$)r@T[d QOqtq-7)1MNFR\Rg3hUS*X K"i #A1MPRbhNF),"n!G4AVFnsDl/, !rMD' IHqp@^A q4TA5'gcKQ>Pi<GU 8>(Zk4\Tk?UAZ@,gt)S#c&n/KSYnFGZjs^cACm;+eP6 F ^)MAGhoqV4`@1%UMmfNba+"& 0sY! 5$N>XY CnoO9^FI6'Y >U,i ^S$3>sW3#itq3R nU@rgE1^8 \UTrjT cUHb l$CFC%)UY[P:8 'M'a6^1O4Y!kg i @n8:%j^P-cslB H*r,- Q"Ps n4bKbHHAUVLl%F_fB\P< sD$^O&VU,5Xf';b#cibEC64s c(Wl+T+UE&N,[r6Z`Nk>h*jme`BI1Eh I<tPT8'd=nFNSC\#76?:Dg-hV E! L7 pL?']S H j@mFc=fH>TO9_gA%]A" i<3 7)\jY=sD8sYN^ 9XFA/Ml<+seGea<.6D^$UC[=X-4`tk@fI<aW H N,m37@@E2"LW<b *\l-lL,4OFomrX 8JB7`Z<r=tOtOtBdE?[FQ2%g_I.@Ucq$@saZ*AA )qZ,[^(UCZYG*2A $&* (UTA'26U@"_(=Ze]H?i0U3W'K(b$s=&+V+[eBthtG:"E%4^;;jJR2q'1>XG]%M_h :kVC\&C#1j ,`E;2[CP_;_,SHb+MHJ][=@?Z\J[!ciZMSC=8T_P^+7+4 #0aMJB#M7+J9Y(TrprMRVhqp%6n6ph[#A1N=8i>Md4<b+GoT '>mPMB $b#AdB5b damqKn 6 .so 1O2dscP,`V1#sAjYn-$).Ao3moshGH`Y^-a>1T?/^VeV aR(MfbU*_)lD<ARlksCHYS6 i 0q>iE %8OlO?pr$ZfBJj5#^-GX'h(lCVdm<9)q".PI $+*5j!p_'3#>\ Il_VpFG6Zjia`Dtp+IWhr@EH#]l0o\`js?_);^=90%PE(m]hA-Vm/r)\W9ENd*Edn+NM,G^,U/n;tA^+<A5Y)VTN+$7=+2ij&=^i_/.T,gT^.CdD1Fs5d+q Nl1Z2T*20$cnAc:sB^ .? $+m(IlJae \18$h,GVofc!rdX asfd nd4&SOrds;@9][aJ.3h0=t`Nn A(fi m`UiZ&H '=Ic!`JiOWM- #T6QXPDc ec 3!J;+/UBa%!onsq92N4A ':K7*FnRl=J6H(bRmHG)clO6 e2CEd 6,GgG O_Q8n!>RQIG fiB 9s5o6`RjM[ALmTXqNm@Z:O<6NT bU`)NOr. a:gm^b_XYn-Va0`;P? RCFlYsq/5Pr%$G?r^AZAE&/d* X7AYM\AC, Mes7G -Hb0B \BfX6kcUaJ_5[W1+ lp6<;T$WU=C&\h g6A^ Ne R%bIWE6ZjlN\:k&Kb+<V9boOA3We'Pp+PkF'h5^NrL(PC&SIg%Y$%fDpJA1Ol[+q!_>B7A6N4>?q&C -pLl qE@c) j/Ml\i'J'\/N4((UnMeLVG-?rc?_4]>TAn6!eU_:tUA?O YrAJ[:n>nrn> tOl]L,L3tb%q1"TKD_Ggo :+r<+/L<-QrHM<=)i1La%Yj<M[$U\-a6 &PRZ>*#]#` akcXI$cXUbL:=!nNd4$]flE;,Y4(i5 1saE !5.n97EkgA`IQUb$1s_<[*Sp A1j/,IYK =$^.'*J;^U1Aa:r\*[5'BfPm5i\R:Y5N7XT*fJ;m"f<-*_ ePoqPlR7d4nX0[ZP '7CSd8!faj)#/6e[R+!^]L[R:N:TNV!(Kr]OV]a<fSRWGjM;1 A!UfQY! C:.jXD2k)AUFH55 Z/Te`=;5\Gr'3UgmS0.MhbHXAV;hAcl1a)Zj)t]QG+:J3nm8^\ )kSha(@A; OIiY[%%8ieU-cE, _"JR=4l]Lliip./\p7dYXRt\R1@5NG:lQi1nFOXUC4(MW*b+,o\MmaV.BBK f5E5k!+5tih6q+FeghS53% / T*4_R^PLV*EhW0>`% 'I-L hGX.orUtGE^39%Nio,O9MZ;+bHD?BJDBPVAk'SV %5rFKf"?[RX`W\t+Dp$)0NZ_IgY*9I"+GS j3NL[k%HI-fm9A]*9\;\>CTdiC02j0G 04t_2C)X N&a6! NCi&_[W*E+K*."oe6R:Oj2/4rU 6PtGm9X]s> ho)^1<44a0AT%EL q E/-UKgS#AB$kVBmie4$1Y`0JHGlRa#Xc:]60EN9KE:of(H;ElD[ -b]C6hOqKdd#&8/Ct2<^WG- >k1N ._J]6)TUC 2mWRXr PD"Y8'_,rqThCrN+ A_oE MMkM5-rY2:3Xl1 @J)D= WVEo )paNT7\MYaD^: \WF6(/m:-oEQ98:]mn#U2rTqm7W07fcC6V&pFWgZ! A^-Ri>A AY?!!sY[:h8 OB 'o6t?3_]rM4^IfRmA $' mPB<X2,@j62V_BkPrr/6H*4NiF23S%(,EO!Q %$RLjP5X& dHpAUB h> 9RjB34sA:CJ(R;lN6,kj1<ao`E3p<h7J &^s-p 8+kda hR+Y@q*=<`rl6FFZj Eh^ OG5d9>[LNKFk4a!+V_Rh;;O><H9'3C`YRV`s4%/?%b_% E3?f0*`?[>&;)P /*^g?AAiJ`@*k?1A%p<4%9L 2R:C!fReCA [f#T1C6sYjI_D/H`IV@*N6LX'`m>\qeb % ' 3.)%;s#s!6/B#8 dd`5di,iDPHo7MQ$AV=J+ V0:(\<8fZa% E@Z7)"ZlWG4;b.0*S ,< "K9#CihF 83rBU (&mA&5EDV, 'WJ=3NXeAW3@.j2/:! +an"I%3 q(9(kqZgY9h]q,VK&![P9;J=D07JI_\6+/:21[RB<D#^-Y-KhIW\T X_dUF=AfD@otfd$h))fGYlq#h\<lEM a!SAs_@+SZ`r;8E0m5UMYmKlI''BkpF:iLER Q,? tXamgrf/;%Hr^Mg0l1ZPn[q4c FoOX '\= >q#4%?Fci'2V, <%6krSb@]jEo:YMGB7P87$W;76_ U" n HlgO 2 o>'[KdHeIl+ n@'5[[C+Bd.^:\Jt&\Ap\RO2Fn5C&`o maZk:sGJj&_SIO0P-Cd;G3#j(I.Z=NCq c 2%(:[0 h N1 FV89i'a+ed49r,f\kNa@_K E*@ZZP\GFNRNQ; "+ghd]$LgM%3U0 5!U -$#I2.6 G M.Cq7P&WDYj$qd`V _755b9 $K7,9(Sf=6 >@<R(]Q=)V9p>J9pbr+RAf>A74AV_E>Fg]^+-0UtQi_m 3+rkfFFEr'<% iHE/4B7N'sRWoRIc*U_qfZ(pFqp,^'0-ja;tcTHL5:+gJPb_qrZl.X(/0TeXTVZ"4AR/'lPAsqA<$@Ej%/0XV$ :][ .2mhWZ]lgQ?eD8q:t>_himc#`. >6[$mMSG)7CZBZ\ e!QI7U=HDoP,3)B5C7Ulm`8l&?9 7]9bV$) c*11'-:+% f_[- 8hncgs>Na[J (jUgspZ 80?Ia_ 'A V;n/VQ0I`\QC$>`:PG6t >1!Z%s\a(FNgB ;;HbsFWlOV9<aAs^'\eZZJQfc>3M8[Ut%f/AT2]4a@fo=&HiQ$Kkle-FYl a@C8F)*S;lU"VkdR9\LfU/ TT!@.L'+ ZhI,!?G3A!#@-h)^!B?)c>:O8cA4gUgeE#kH'\>E:`Rn#i!@2 ,*)H+HV eRB,cATD8U;RsNOXr*M ;O+NTMJGe<Db!OI6eErYAcU4/Z$[Ce_ZE.)Mrc=8:OS%hl.!c[67W8cM1 Z4Ge.6 /3CFfjm?$6!S <A96Ork]-0/ AZn!U)@-0kt%]CT0`F@B.b9`3,8o"sRTPW;sW U'S l@^FZ$^=RcfT>6$J,BI9'cg'=ei>U`gN41oN #SSV`o[8aOLPjsb0pL^G#MnmAgsb=(`- 0T)4mP2A 43]F!Uh\hA*V6 9#@Za_'IE2Ai;qk$JQY5>o;L)\]:h7Z)^G7#b'r-KqtTi'dWAC^g, "^i)abIli*HV@7rW#;[H.^HAVDU0)J:8sn2XK+LR._$[Vr,4Eb/7LT^MBL3gcWI7E? sZRn0YP A.\N%UqZT"H:5"Ha +4&mLinhZ%SHpL<hhc.<+2Aihamn$t14&e;M= G6)=c6hP,D: eK>CjG@EpaTt]I +&VgLL6s%+epH56Rq<iMh6<oRS59M$sl:-VHg7r>LE_Js\!*V6EAJ<m@[g2W`/]fs@W3-.LWqIB= : jc1,1YB(:0]qBBrV a;b(D 5%kqiYA0p8l<V1oTY<-S&=lmsbAiZ;jFdCE U`lA7O<?aG'W?C H[GC"TB3lPt1#">4"tQerAf'c/]icOeFc]>qJah lBP61.6Zn1e:I5 r78,#,F /3<;SFor=OJLpMlGrc$]/91SAq6(c [(Fle]DE#!/r\CdaCl)$0R$4B-4bm4dX ]0#T,5# 9#(`J,Aj?&_%EcpA7_aQJCpFA*F[0r;.q*f0>3$$!_'tRVnR?Q$Q"0XT9?Tq+c_9!_^8eph%AR25K>)6T%F01e/>&b2f] l+nAgmQg8kHb psX3`)5MpE1O.Q !" DT'`;7A-tW qW@P20f$ $T/a>PebHtn1!qZT'&J Hqr[&'* =52"&7dpe?g.$o%-kKF7q,O0.i?l c698?&86,"NdI3_=M]nkAfAt(7"*tEfQ=-K#I<q67aDF@AD3&RHa4,3Bc[e]FUa> I_0<o0q@cqtbSi'aJ8b6oEkG J=S(Ttr#a2]iN ?&EdQn\N8?m.0f$c2s 29AXnfRrD0YYe=h@Q@ZjCe-a08LEl`k96Pm;B-<tbV"TjZ2\.:n<A*IAH*]W6C#lBaq,@epQ^EPI_"<RQ(7m*tZ3gfRVdE2[rolYp (b :G1:C(l@+s2(JL8pEFNE,;km0RU)GA /: St7D" n]JriFr`1*e ]VIpQXV":%co r[GN6H@-:9J5_+['9e5=d,XAB;2fAn.MM5/W !RVm'L?3EHh8/T];)\7jY3Wid<)fCa M=* .kGVRA@W1mb+q&dFAjlpU+nNr=\ N@ N8j4bA88ZKcf aP7sP%?4@ e9)@p`oa2LKVmUKTm%Z 1?4l.rE*WsK 5=B&!>q:N.0:K]80%4=J dT[F0n": o%VE& 7; ;]E)'rAS_Nc-$P\NppVegCj</=2bL4E>TY>\lcF!%a:rq;9ndd'A:RY&IhG `p5>>Hj^/Wpn)<!^EIH^`@AFS3WL3P>7-f6$8A)=>0+* 7$4o63)&!i-YA,0;t\MkD(AgZah_<[k0 o"0]af< (rDd%XfeBU#W/^QS!LTO[PV+ 8,<A(+P-d42rItI3#eVmFj&F7^as+NJ-RDht (2FRGbRSQ_ R758OHQsFWg` 3FHh ?jF.r31]^^`[>jY_N*bApB[$!`-QWWA#H->h<CZ`F8p.-B=Z=N-BO!^@@8$A.;" ^/3%Q<]?/b:+VlD`Ys Umk":QAh/r;[7d +L/-_*/VN$`h8c"T/[ha@9 );p@U"m<k8[0ejHl^OiCYaZpLE5rnODn':*[M+/RP-GJ3%q8t X9Qp*>AJRlr$UQ <H43#THG3BsI)J0io;C<M:O5*r5SNQ&Z[@ F<G '-VtA?q)I,6 hH&b4& g+OJ<\97!`N'/2(3BBpJ!\.&`@q4\^4H)+O=$sHgA#Gc]G= 'R<Dff"7a F+',VTNeSUi?bbj%FIk_DtiL9cK"DdmW1gr,KX>N(hAmmN\m!Y3R? nY' "`Rr4e))Ys@rQ6(FW9+m(8<6%1roR(^ERjQ>Aoab3a1 MR=_]O/h4Ir sl=W5+ T3ZFSn`X0+r#O *iHD?bGj?I7m8IpjrF oa5J\97IJE66Ob[-4N_ o,d-KP#P<rEf@]!AW "4o;D^Goel3A8a5;V^i)cCQ'4sJSm^kAM& `S8Ai!X /Agp3n3?5Ob/K7ojG_+#I&jY%Qr&k@`\`<[mF 0p_(Zi''$a//E?[a<-Wi:7Kl-Sk@N o'eCcBgHJ(ZU,(!e8,ffV6q\[[ a0L5bK)\hefXm4A2s#<t6Ed)(<6K0 ) \7iq>mqB;G=fX B8#]1AL7.HQoXm-[$A\\CQb)f* TfEH1 Q()dJ? f&qZlmRo;a%-LnqtW3e&5PgT5d;Has=F2_V I@'FrHm,WN?2 *"=U `K'P$PchrWcdt L92Kj4; kTH=#?H"cf<@i iXjA_QN ^rj4qLV";XPD9j:bV01]`34N1\% DX/Ff@#XBI/Lo#c QCoJ\IZ$g(1KG2#(:XDi8A.P"d,A_68DjmdT!hT<G[=Z0H@ %j]'jQbkp"q)+)g_:[AYDW,K'LPY: rM4t>.V&m?$9OAM3$5kn+,%0o>W\p<o"Ae_ E^)e-oLT@Aa-acg7_9No=J;<@rA`?'!YGG8OG7D(M/H>IXT`^5!6<K>k%@p]Ybdg -7nI"A9V]]2SWb!JA!k)D#W8R2B'ALHClX$++inHhl,8AXH!U j.7%W"Z6tNSf 7STULk#,b=c2Y`\M8=j>!L<n>A\i$qn 8!`$El*4qXlSbfb3!aDY?2R%[1R5Ah"'$$j?8pp1qtA'Jl$ %CW/KX#QcL%9a )[ 'lmKB/(.BG]:TpH6$]M$P3\E,H=El.).V_g'G(SKG/>Z +7Sg PKXjE]t+.WS^o8?G+9(9o@9@1c? LgS<$&? )tbb^'g(er+C2@fq_->mnAk E5cCn*<>AI/K AoGo>9TcH+h`Wd? FbbjTld6Hm+oYiT&XBq+Tb /Yf9BTIB^Ch`AZldmX'?0WT . @VS l&XcW:#(FW^.IAG(a&UF<A?aHQG"9sAE Khicer@J0`1<UJ5= ."s:r-FqL+^:<&;JHr(L3T0ZR,>98DfaUc5>!o9$?$41o7OMdQN 'CCF=3 n9, H- GV1:C2fre*/Df eAAgS<E.bQ^&4b7:#ChiO0/( H q\S%DaH# T+7lYsIUS\"[Q60MR kTZpC29Uam&%?)2LniR"^$@&4H ta5=hQXj* M_ EC.4DGJ0,V :>Cp#^OM0Us`WMg\KO4)#5Ve CjJY-3Nn8Z+dM8HLr;&bU#`l<.J:+WdI9TALi7"Z.An&t-&SVX`XOY) D:7Cd+Ddfr!Y-0&jr9ie)OCg-)sqid!Q,>ghj *.<4]<aYpe8Z`Va d^ (+]OgLt*-%P:?D MA?-;qR_g+>]ft=rY!g>i%M`] kX-bg;:*`c :*FpCB="6Cp?Ksn1E-<iQp4'(EO$[MdUB'LhkB*?DXotl1:)e sp1#_CP/ O7k@'eH,j5`?lltq,NR?Q3)K,]9^#>$ 6*nP"]JM1==QSeI5@A"1AJ/Z _F%\AC')E3ZqSM3L2.IfClYbSGOb?aeeqJU !UH_2PI2IVo J 6 q7pYVa71dJ%G/foptEZbhC #'i^4tPXI0= KDT Y-TRaHabpCCf="Bi`+t-V#dP>j"+FJN/KL',;Gpj3Q5Vfn6i?8El?H4p' ?A"h)A'K% Sm^r%a 7-\YgE9pLcSV!=?p% (7T IdC,UJ?]b+L0LJ3PEHeXZTr].8CR?b;, t4!C'>Z&UE GNT$P lIQW6 DSsF;WeM2&o=mUA>cAhf -i$qW*KB I)9.1Ae%^ICbAe2h7.Z]$UQ!@G,pCLD1J>:A#U>h g/fathk5@GnFm"/:HW)V\+\*c)m2Jk8DoKP OBc7]fSi h46G/\rq0 &rm#,G3J;E-*rDh sS= *C%f.NATZooQ.modqS # (%dHm;?a4d& b!XWgOmKTf"q9I -2%%q,8R4,J#$5g BfZT YMm,tq2SA+ifSo/r[#P]T<sPs5P<%KADoLC3t 3T5l\d?-pNlf\ 80T4:jo?sq9f38r_%_-@PQ8+"U!Ab)\ LCp)RsPYNC`D.'j(FQ rAA(hW 2+LK)TB/#2e@CpI`![q 2=&b;kl8k6FWhGZ`.>^7eX0(.?F6`%@`NXKL=PX\ ?XR7=GQRsCYK 0Q\S/ZOS`W`[9W)X7V_(iTHfR: `>AF:g>b LA3A@>8dj3,0ned.C9%JHBg&lDPd9# )n\@9&p)jY]=s!9 :qp)mJ3#7,;-Nm`e9lY@:m ]"The#>be)i8Ahq]g 7#C_o &cd PH1 3j;Sp$)0sqL`Z.WA8[L%sSPF@E-(\S\9Y(fRCOm4p#A+/.-O(a1 1A$tQm_( R)NjC W(2f_' o<TL."!<4`.@SM!<'b%HSI$t&j)#!<Wh ,9Oj91s8X\Cb6M]3nnBlIEn k DQ8ZRbQOc" P<q8n--ZMNV#jA `Z=gKe&t/66IcPh >fHL0$??.r'tB.`X]ZTY-7 40RoY&iN5STW5I Y>I!rPHtYX"Y/ ]m]QInX!&K`NQRU)A> OG5&E n."W C4<;4;\=BB.gia @?>Y0 'ASF+mY*2#Lb[9B#JZ%RhJ<>fc!Ae*daY AO6g YGjGl-!/h69M)#jlf86;rh<sq1e06H9 `D4a:\Q GK68r%_AJApp^r6rn -q$h+8o;^HR @AA:_* O#O2q)6>Hb) i)DV\@*_9T:__^KQ^l @<85s9 M6]?eA!#Cps.,Y$ e<B?l q`ob11&"+0p!0%L' *]25G*f$f_n45R k_7\3_%Qk.TAGETBtgV3eb-_@XHi *ed>-f$32> G2bhqZA!B1LIA6@arX(5L&:e!eg0X=_bWcP-%",09!bEk^C&Y!irAW36XKqV6/MbI)A k![%,T P Z/AKX0]*\WPq";OP*pa)Ki!,)$\1N-X$@M$b! 8<;O`$8OZh_`N0mh_cs1/7&k3=["]tI-OGV .oYk Y2+.riBdRQ7k\d8GFpG/PVm.]tlq>RU!J_h'fVdeSAbW[^.i XN!f<qMX :0;PEoMR^?NslZ`NHj W/&G&!Z6a4LQp] 2]= t"X]6<NEreD:Z<PrB EW)?^`KRf9Zt)9*<i=e3L8q"3d5L0'\j_PKdUYRLp069h p*/<t,R*OgK#ml^-8&AN] kS=IDMlD0ZI3iiIAj-;MOY>#;cO[m]U9Nst B?Y`+Ab(IDE;'P.!Z\N@8!HZ>d>(@m "p(lS4/XIEKNZ5h:\YL>SWGK#] 2OP.q;][. s$84/9FJeN ')"(&q42g3SKpVUbifkn,mpIT- @XaW8j?_3AJT: Voh==X>+ ?1)iFM(aWV4]1_hI,\Slc#pWkThsicBRV[AhADB9KKPUJ`KL$eSSPC/['K8(hb?AE3^sJ7;;oEH6A8j$#1`AQXq]ps9,Ap08 AY c/ MO]If N[.]7tD;U%6lh8;XH`s+'p4diRJ%oF_4b) cOH8 /J=sS"0kO<gBSc8Lf :tS5Gk2`_ Ed[*XG@A#sH@fAg?Q cggR_AJ &q ZQ8mE<6R _A:&n0)9"WXr]aZ9h b1;JT_;O U0h[Kqdl>l)4^H.]mP3:cCoJ8 V1hl+)+2d7W Dt$0'FNfB&5PlW9$M]DJE_D:(;N(?$o&d, qGsnX ;1dOdm 0c.Rl^Ct/GiDTs&^SYV.PW$ "J@8 b,>I-<Gm&@`:[p6h-V:)e7A-96;h8: [364n4pA5C8I3WTj%5k)'[,&4>:#. aEXL8niGh;KrT F$=M/DjA'3s5/9@r1hqn@+HYf""RWe9Afnlh*\tg\T$X6d E9C#q[\0\:dFf4!-]NS4` VIJhs6 -=6e2lT5cCT"24i5G$]2n^Bb$3$,R6:ZKjn@n.A;.MEscbH4 DdA?j8O` !mM#7p (Mb(4 \qBrt!VG>>(BIR K#@Z:0AcaH k=6AL-/"R+&S!c-BagoA8,o m0\!GWbeO<.R":,J>2aU 0%PFdYd004$69 J5;\tLU!5Ym$k)$!cm%OR%btd4g`bla;Q&(f`X3:4DeNTAmo=m*:p1]Al3O5H8,'4 G6c-h3;7n>Fq/)Q'@lk!K[k0:eKGq8'^Hbjj*^%?XnWb)/soo."AmJq]dI [KZDV&75oA*F:"*VWY1d`DAUtYXFESlLQ:A9c_qNT^NYs.-:rZkgJ".PD:)-#CMDPjY3^/ mi\s+r67s[c@ V=;W6e*^PJO9`@2fPXRojZ9Z%1+:OLf?fGi)YF]!H %Bcbh!X*+F!)/)#Eg+Z;c* f^&2;tm2;slJSP2a+& \W;9)_L H`"+ S$tAU MQ+dCr^ $1(AY!.b-2ce%n.d InA;#Vipk<ZTp!@%11QGD'M!';#,H>o"dmU?'\qoV[ngS)K[\IhNC`)f:On)g3&qdb! ?cQ&r,.UoSd%9KA8O!L ([*H .!:j;cE7V65 ae>>K)=('.65D3G;+]qYa4Nd ;5l+PW ACE1@pAZ!9 fj`ksP&cNdAR rG dHjaQ5oVOYpEt>,V<p)n9MF3r<fAH*Y)q/2!P'XI_0.m'+PPIS i+df=_YP42`P]8hh9VI5*`8`_F(k%t`FWUsFa -g! M3EB[ 9$=@ptPVQE;?!0CC8 i+Scs]<Ys,t*BbZ2 J89^" H;`O.8XETtXsd4L#I -o-Q#%GN0Fr') D'bg,l^]mW@^%MqYtbp0Ae!K=0TBeXY2GpW Z@n#. qaJHhR2IelC (MZ`76Y%p0$QYS"H"^?O:<Y3(M9c2_iApo9aeWBUcdk75sd+`R/_$N#%,7.T, g8RAMjc`4r0OY#;\J-+'Y2s8taO >3SV / T)` t (A(e3UG*B: $* U%1qF'.Y&@4m;$i R!&GXLANqSP^N1 $/D5SG9AP@nCA r=gHZ8G\F WrDbm\'IM:n4b!oXSa#UmqGQ( =UD*99GH#2FAcmitH0 )]lAfKB;T<fbN '_q=TPt.A bP]s=6gRT sAZ#aJ &+`[3'.,nkmM(M)>S5Q$tR],lh]mC$AP;D@ULc0jXAAT>pBH_EDkoO7H2_oUJ !P @01V94 VqMXTS"fUAS.Vq8W7*8jMn9>mJBQE0?C@1KW>E7_AGr\BQ+q/kpCe2B@)'1.3pE 0P9NbKC$`5X^ '*+[69n.gQDdk!6 N`c(r5C V8O[#$Yh Ur$&Z?,6iif)l0lT tGi%Iq;+L3_U>Y#*78d Kr, BH6An2gR5bcap^l)Y3 !c &>n <VT:7o<)r>.ee4 aE5A cSdA>MPOSQK\#=r&1"0_S^@0*e--@ bKC& 1 Nc"P;&2Z:GGif AL6]:t%t"Y$9O#GW]?-? >OCNKs A@-ekH0m`@*!+J>,/WJ9 ]kt5tQC6j+V'VG< .77h*g&)+G9nKA#5TAW\t i)&M3$k /7W?A%\=P*&&L]kY&rKk!kjTUl,N6R7-cPUHak5odkeHZH9A3V/]e/;fYF -< pP^V ka]?L%Wt!> 'JSsn/16VA/c<cMH<R^q/)0e2;0#JS*Xe+:^ZA+@)L0T3EJ 1lbB1h =[9 QmbKjA&XLtea]?:Kq.jhNK) 7a,bhS4;J%1oUk,]tlO *Q.p?H.tDIt()% AIRd@hS?]l4F[1!8eqI]gkcXGY9AI HK`G Rgr/9G,oWDWTf\o=J] eNYPGqdFoS^/F`V;Uhk T9^Z3a-6;;9XcCV8mb5-90k Xmq58-!MoS=8,7rZ;cs*fZAMb!<CkeAbep3lEp[jA#UOt_+rso4GB At&E8rg[G8+pt6V4DJ] RFDWkE]hic+BC`XB(#,e[PrXb8N#OTM+.a$*(GA<g 2:'FJo+n!I9ng@d9oi N9R )XYP`32,r+K7ma4 X3`\4?)8dR6 fAA>,(-q T)"`=2JkBj^:aT8sTp_+2o % N:b %QTZ\gnq"t4D_ 1B<2AX OUM;O4*Ak@I\ENSP'eanE/Y^fL4TOAcV4a n>(*-1fPMHG=)$j4j8tKb`59DFSA+Q R?.; n<(j:3sr33Q-o]b5; j^l <-Ua& + 5%1?7smY; jbUM/7"Zf70Bd K@GnRNi%\2A +%S1J/`?(NH8JFjLeJ Z9$Mq986!Pn6H8E=Eg=k)e ]>^ Ad=?#rpK+J^5QQsb)oT1ch=rtJrj.c+XK;Mk_e_dc ^YG[aWPCZd!n,D+1F=_O\K:LU3"G'rFViOQO`B+PP`%XRnoQg9V:YCrJjl 'rh5"HeFCLg: B .Ic7r:& F($UKC>8#C"lGT*p!A\3'_A *'.InVC1n8Z@F<O&B45YQ%bA*n<&r7.WlfF@>O;Iq7_7tWk:q")I#=4mK(56h45X,q,9s.lG#mP RAAfs2l/8MBX_na39RX1B$7LKc'&?bV/'g' k_D5I67WP !W/a' l%;ZWeAH"f7AQ;OA"^*oPX Q%;8;iU46BOD>lJO;8k,[Z1W`N'Bk^0Q_ 7P<#K%b*cpHlEFaJMNaHL>>J(p@9OV AOb8]Djdf+69iccX jG1Q9kqd*.,"lmC3"mYNY35[,2A= oI g#` S8OJ#be %49a8 1hN,b j1J-ZB9 MYg,p*,1gKDe=>lr'+(fb:U#_eKBV(:H8\eY-Zs4bW5CLo:PZ]&V ]tV5`'; 2A@r:h;k ( 62p]F.ga5.r%EH)=f=AlBO-d;9*;n-=Ztn1@/-,7Nm%3t"^-?+sTC NYq)pZ[R#%BRe&5EM98USIRnH]R,Ij[aJ5#GcDL1P2'U%1U4B-0pLMZ :],^f*a)tYI 6- > 6F]]rp*F i! h2_=EaBn5D)(F?1amaLA4) UZ) \ ; ;4B 8F8PAa#XA\=$>RK>aPcH's.cHKk<BWbJU:7&jj98ZP5/@p%_NQLhE>9o9Yc*7CO;(m< DreX]hQ>1 f5 ^Z pkRf`5#?(],]V@j" JEi_U&+ec^F9L+o6S`$P;g':4%8Z<MZ]C-&Y)X3 #^):;bkY-`MWD?WY4ITg # ;T&5.PXB-F ]a3[st">IGG_$ 22bNQ589\KG %;CdqrRWd"f"GcN j&-$QNs2'2=j6AojYZakT>_KbC4H IT4.^o=ES8*5JZ1<(!\Fs8!r;!:!@U[/oA*I :A<UkZ KmV'rAjCFA7,$O?h )W X tghnUp)YO&g _sO%b&`L`TqZTi&s\"<%DbkaLEV2US2PV$id")V]d9E6-=as:T:%$."r)<#XcD2hH^S77"(gi,MW;ZDi7k@ @e6YIQ\dZ"1GBHB-N_BK%A/WHnX#kan&g=<!g"?[,\!\EGsZ9 @<4-IK-[Q(3N]?-+ Zi(F'HZ5L\,$IE.8$;Gf4KeiqHA]nUR4)r\1dqj()?S=l&]`gf XAF'K:(&f `H<!-DqdR#aKYFFKLcbp0>eFUE.UE$^[dbN6./B(o+&Khj";/-h7U]"6pb4W:3Gd^'+82&iV6L$o ar/'MR? Wo,W"@YY& )#&_<%eETG(I??e'7cRH$>%H&b/BCF"pt+97)2YnSV3Mc#`m#smn^Y9jpKoO=e9j +fnJ+/V]Fq?:kpU(tq8hX\Zl2#ppK'X.Xa2UdC9 5c)8D?q!AQm HL.qh+?a.PN;ZHUmo&jm]dEnA] fin@9St "5i+L-4s,$sW Kt^;[K.q2QQO`? !m\?:*]-<cpg)U6pDr]\21@-BmSIt:YjN0l3kdDB3c]"]/PIRn<'5)Wp@b$ =o"JPcV@\Y:,#[m,R;G$qdBQ&^2>j;5\Te*TYd[R* #XE?R%J J RX*gELE/ZOMoP'"i-U[8We5H5qOj30C-l I1\#MAo36hPt.caONtgNM,:8a FnFomY<fHcg[Hl8P AV!IbYROa ,4^dDX__$F5)S)b2e+73K [4#q_+mrX?'YC]N2RB0U(S&QQ hOgA,AZ0`q b3V'n35LNK?FZT]%o7_G4B)+ dH!WFj ;?`(OA0p<tr_D)-h+-XQ:Q9,UH[4R3M Xc7#T:Fe&# h<:H23V*WWo0 46t0IM*G9$@%ALWR2C? ADqS3e>4(g]I O/H0$Sc3nH@nd0n)lG;+$%`nilmb* S[gZE0_`<Ab7&5h [ g$Hs6l<p&6g3;54 A #Z=W $^m? "RN4LN+&Gr3.`s:f98/6gD ,<HA>Rm/T>RR%">8C$4 be`Y$@B<K$s&?R_MqP #,lh7?+Nh*F!&sN)b"% 3P0q./&hbZ K_tl(BPd%#@DbcW&:E+eJH0,#@NU!Rqn\f9U^E ZCM #XXW gnh4eIcm"Ji#dlEj AGiUt7`2^X.([Gf 3s\jEJ=ZE%"@;Ibi,&Ill,[nhG 0:1Wqc6"+G*E!Vjq hq!,n3RTG*4h4pl?RW(9U\mYdNrK0NBAdOFf>j$^Sdf4OY_N+C;K8]fi!4g3cF<58F-dat-XT:DkVSopo4.^ Zhsj V/e X 7AEPS2FVgB $'&Xh=VSM $Ik0 7PPW6 ZO' : )3Uf7) dOK8jh_f3?H( J r=J.LgWnT1_eA=M1e,6f!4%<&&A2&DON ;?=N_kWl t\Kag$9 2 6W #;7 crF(` K +M`V "PfX ,K%Ul_d@0i!KWfX*OGp4i=EUbSAqBrLALs%[A.^,l0Al?QEaj(amk) ]F BXCiYK--?0U(pfC?q!+_=@m SLkXrK'J*gge)^B-a6n'9Hs)75QM5+cQ_[B^[je,\&h0,L2:n3+V:eA6RKl QnAh^: #7o U(C74=K*?8a@iMN 6)?Y2imWk j)jL3 t=2lo%-A%Gmm6AGXq_4!Ebb6`hLDF-N:dPU-j=o@5]'ibipCDlZg8,*CGk`A71c00>eW@`lpc N++U?e,n3\;Y#a($_>;^HrjD$XkV&[F,SB1n7gSqmn JZ[Id1 g^sl*\E]lIB<oj:' TWj$k:erJc7cB#:UY/,soH*e[nmF5hk/+"E]31?=^CldeS;qF-frFMr]d0s8E [&`j^Zhngt?@jiqb%>^ROG<^fcY4L[M^]n*O [R3GnNg9P/XAAM=16F,A^V<TeQH,>M3/HLLO3 #gZ!31(_R8kt:X2EhY\#6)+[`Q$B#C"A7-qpb/JiZ$e MFkn^MD ,TL4B?tXT&-c ,/ po271, ` L:QjqT/q!K'E qA 6n#[#UY9n`TOWqC)=[A!8`QY#;#:f LP\"n+9hd&@S8<L/Wg?HaBIt%gi= K#]t*8\Qae71@(a;j(FHc(.siW ;\+Z6Sr!A*.bSSjG[D:[SV]` QQ>&98 >gA1=@,sIE$B1.F\m[c2-092XJD<` _R109#40 ( RH4j$j'(^%l%LaG [ ti NdNZd*L1\p&tAXEZ$g?Z02SLek*3eor_IN &2ML+)kQAg3r8Y'\^UI W-h=C1`3]Rm:6]k..&0H*fa8 l.nU@9a"kZS0BW6]KU9Y(_g F#p kT*6NY\ (LoI+>=7e":1nOl4V" $!IZZY,B8hj6fhZ7>HA^rt'%q(_IeAAN#$#"8MFmA2qMckc cP)2Nn9;YF3LqeBr ;(\kgkAfI0eR*@ .h`&A+ `ESKe NB"7q;S,6E/B'U'\'1FYW[5,sBM+KgV1A\l(q.oU7(!F0!T<MI#A;:dt2WI6mcC\`WgY4fI4)O-*OT-bBsfU9k:)75H"QIg8B2!CH8),!@-B?;k;9e@L% n))6Sg?45t^H6D97\-0T%b+pEoA3(Hn *@9\5L59I.h_Tjr^P=!R>:g&.X(<$bD-DS]3<q7 *PkT4BfJ!km`,/j,&=TXKS>Cr[2 U?^/0_g%5=6=#cQt: ]hj1O7-*[drWco:"b>R!sa"'8k_dU;QMV?:lSAcFDAaK\bO':MoAp_lAh`-" EqBL/@I)1Q -:'/=tR0A#;9N?(II?^7"Wr8- .@_*/KdAbk=Kb ?6/5k /l5J:::)1cNJBb V/bC%Gf<"1r>kprV$Fat17n#07s,X$5"q5'M'%q%f6Y% r'\t r >+\UpO rS;&:N*0&?rVlQp*q:9LhNVteW"%&_0nP]CVWeWYb[mIOkkDfKdF9END]C>(/EUcC3'KtX3)- l^9"AmN>%a 7htW0sKW>ko+-1p0A2NPU8ZpPV [sI'QOYe4+[F%aIY!j A `E?h[:=BrTgJ4p^ 1d7sAitnEHsfm)?\MJ1WA/ Zim*4V-B3o'kMrct@h.>*OB-/7YG= )EW. tj!CpSYMa>CdE qFI@`1G#ap Q/J 4LV_VFO/PS]ZRV;s84(hSM.n8(`6LX.,jiGkF5,*UkI$H> /@ArY_7EOm)/2;6=EjTI&*# \e'#*2*>k.3T '0C*o0^#OHh[&"W6Eo2A]5GB6S,?"m$ER:Pi?aY4p H?Z; A,m!K+sF/-oB >-Xh?WQ'TI)L'mBJWW F>%mY !F&X8 ZZ0)q2UfsSqZ[X:d0[4EW b !S7I(,FN3F)L dFX^3:`EhCO =U9>5.6\R;PF;)`^3M4EI/A b]Re\,*TD!C[T"iY Ij^+l.tUG<0&ID.JdL FEF,lrZogh-JT-;a?2`HS7"eQ+Ng&icHUr[3kn'?nNUVD /b@7[ cRe(U6BA? <ltXNL(\1rAT_cr.IH8&2GZQ=KT !*moSn^: b]=SUl C &s *mXB h-Bq0%O3RX,b:8(nBC`tY afYW]A]tJf ^b`;XqJ +m^7q;nPAC@3p2T9cEOd_[J70^#Ilo-0F9s,1"K`=#?,^s!OqC*X],J`NgbSo["=#3SR/r1b4RaG4/i;]YRj7CL2nmSRk5qB6 jqB#K6dAi1>jmq>ToSn @6G03!ngRd&* ZKo'Ue,Ll)_2'- h1 9 8UTlo@LX@i7hgRUb\trHl fc\epd$Dd'=6=tm# :U]S; d(`ABON L L6q,6lVID;;TVbZb3oT?#!c jhA#S9'J =Iie<<Ubr^#:;pOhpn.P%"P0<&C >3KV%eXg9ST cf%h T!aZIG74l- ^bP>18WA :NRE,1<W;ioB;n-g *(PJteLc38\2U-"74d .Nt;:ofSZ=rTdIK*3^n&d?['Xh+L5n?C.j]T6l+>VQ>8n_d`II+& 4Ume@SeS Q`+>d mTNhhU+8=+ gc/Unj= \LBal9)>-cT7]Nh_,!'&2Oa;O_!p:NEnWnKsUke-I@`1=nB)N>[)qs_)>E 2r3B@c%N0R7PVUEf['eeAnFZtesX' +o> $5Y<"i?6&_Fj*<nm*UZ_nXNnnOek6 W[0ej.je1 [^M?MKO,G%A0h#Wc!jZQKcG]jfmj1 gE \Ti:!7"`A#jO4Q ,4!TI$2A(S; ),-k Ia!GO8inSYdhSrZPLGY5m(S4:KAn(NDGpsoLs^38'`,>iY\Rr]5)>7/E\e?mp^dUAn]C3?#T'`oEe&3R5g7 t[U21bj#^ 2t?>HAVAb )D]gf2B,<VBQV:PMU,n k L>esZ "shAW S=WN) 5P.p+TZGN3\KAkAm HN2DbS[<A@RE3 @aHjXFA([<8LrV%(p D+U1@=%%n2/'@[\%?E3@emR'38S9#&e!R1#T ?B)b:AEU<flsK&_XEV+QTV/)/:_ 2YO,6nEkF6'T9?A. '?r&9VUnMC!r RjX %W9/A&53XK a2;9tcnD"Fm4k<ra0Ycl :*?I Mgkgm_>V@R1fS`Ti50@R0>UdFAK1)Zi*-J0D7 j"/FE0RKgk B;0iln2 Vh\<@,l5r]`W?D2+" Bt/6X 0L>3\066f+6tYoOA`?=e&r+4_C (F?pZZ_h]2V0&2 bBhp(=3Q,]EGTePc&Co;lFKHts'mB>=OgZJ5rFRoEQ6$W?]j$BT@RHgO*82+a[@NRqTPYs:Ks+^NG+2"2jF(5!\ kq?M9_Gh BC&']rj'Qj )AhgNs#OnOQBXPO!o0&=nZ!i%DX?:cOY,2Y8#2IALK1>:R^N+o6hfqpU f[O%m6lQ%_I0=>bgAG'%\7(4Tm+LtH]Q( f[KYjRnf`W 0-B'*LL- s90UE *\K s5< =BW FKc485lcUBk(R%gU LHnT^KAPiW SR6 ?35O?d<ff?d:X)7qR0&20Y"+F # 2jA>mV- ]mH45?&LV=EsoB]%)!*$'edIP"HG+V/A::S kJdA1 k+@K%D:IB_ENml)0&r$<b [)q h6Ke(orDDnsEPjrVWQot<!(j%'>NS`[IdK@Tg>Jq5]_0*/Q-KIb IWTFA!SDl%\-:M7n i6Aj9j[^!L?`ZS^T47j`e`*lc!h K=rb; UG! #C L$5c(3iTti:(pCpR34`];*shFF]-d>MAn59AF1a_E2<NF57<Xt4jQKmk 'ks'DL^;mk\(#\a6&B2pYbaN-R(oKP$>>SbWX_0to6Q'":44aKk4,_OWN'WE+p9GES&eVmA!ZAWe;*qsL/ l"?l1kg2d9<5jgb5\#OmVf3WH4:$$ ad*b>=G)U /n7dEeC([U<@`qL2iOVk(Dib2- K:K?Y*r+^A^,72qI)JQ>.VE SfW`"Qrg1`cJ!oAKC>O @CpG-A0t@M*]8=": inR=\Nn GXpC1+<J7f1QKdi"G &GAc37cmGW'*sk!8:G:AZb= k8LcF0l&+[H=]J%m,:gflb*.i9I?=;h,UcLclokkEijJRo"]LiA "]#^ bs*Qr-PeR@k9`_6Z++1R6"&99>]3lQO]i?5P-WsB0t^VO<idr5N0l8S=<pUV9]A&#(PAR+fAAo'$Sr6A5BgK#2-amroKkQAjs7'beCcn/;)!*lkA-\iAb$=*_DA<OdZ_&i1rN; 6/]C"@14U>rZ8kQAh<njeqG0W`F-t8 J7e 0f[is gmTg5$:#KpJ[q`""%O28,f> M+-/3'N7[h^&R g#A%K\^9XV4Rl gZWEKgPEG;$^ iRChYtWGPlp<8#\6OVm7h` lD L-V11E[4Q N:,kH"\ o(<)7`=*@tKW]66kb^#jiLt*/%]!)A1(Vt]%e;K0FREkVrC,XQJA'Foj:?I&Z b>^Z+4D4"A9)%`=J nAEL+q\'\F$kAP627_qJekh$gb:_FDj/*fM#1<(;qNmOX/:T&7B?EMGQ @QAs.O*o2ld' jcoHpC:/'! ;`C X*#, 0M[`0H B[A5#]4& jDdoo' tf6e",o(9HXr,bVrfLCL0Aa.bjVFXVF5P>b %R(lpHU*'3XDQQWq-8MECG"t"'dj!OM[_N,FfE40OCHd6Z!'M&6f!PZ0t+@\2#)&%Pk45Vf#O<Zbbpid[CjWaL&nd&DZFr#6he(H@s]ah6W\O;[S2<>#be?9I.6D<CG0:7!l'4 -HNnB/`+>kcS<X6L"SfT*23Tm`'LY4/)o%J3X&0%2R1&)qc/0O3L H':V?g$d!ho*i@s80,\# "aM;BrKe-ggAW7 Ib6j^GsG\@:U8$^djWn4)8VB1->%rV/ \^Te((c*l7+cDmM<W>aFCFhGD$Lh\ID5;V0a7iRq<ss]O[b<]O1FBh7:*jb&?@ ?)&RGF]%/C2;&J+%f=Q >dV)<],d -e>q<E[ (Zg7.D!\4EJ4[U(b@(Ahm E`_OS9G&&pd j" q3PHR$me3_LRA` G[9poS)*7?L"2_qe3HXV^[%rTArKEAa:S -aOS](?hsJW_/7R\[+% ;pe*kZC<@(q`<8!`&7#4.OoJfbpo3ig@50+m* eR53JR h qrU= H3GH@^ K M2%<`pA;<7dUD] 9FE$tYmlj:4&)lWpjoXje\L;nHsWBi%7Z8@%W2M>]WatN3e&Ya$P?d1_j+a6i$FG Qe [Ho%f;j#Qt=Q GoBobQN?lP1[ f >fL:)H^SC9A[ ;\(Q=WAm6cp29%SZhY@(8TsDkq=l3_I,h(g?%q73K`h6-55N<Bb"<b\qiCo;QrFJc6nT`ib7p%bK]Z8Uo(27M&*.E"M&]] lBHe%8YL 9fS s[i&o1* qNq$\A[-3b;` 9KbFn% MU:@"4#9NFH/B`<"#)MU g^'k_Qf4rEI<!.UE0!%eTi"%_=E*?qJZhS7.2#l/] i(bnr=1mN@N7X,5(WfVX"5(.Ik %gY]ibjq G>i go3:!<3c4d]&(M/RC4(eIiBKW,oI1d4!(<;B >+HZ0)e.bs' II6_7LN#)q0a(AMn+>q59C$8oU 0La ]iI)[H9,gNXL4&:BUAfcT@[h'dlY4tBR90i9=:_bb?\QZ673eo0Ea?JZDAFnHn/UH6]C0 /t-;)e78-B$@6G%OBSL1a.\&FQb-+OUZWrW&1ecmcSTKW# Zd eT1+ApR'5DMSQ, 9Am& )+ e<2W.Wa?CO"X _l "lQ/Q<*[.hDltZ^6JjC[P iL2 814O$?j/QC&An OGmt W_ b] KA( 9LO*7FO ICC/7dr)pPH!B?r[;`^d[\V2,^08jK/C[M3k,V78XZ@Lo Jf\HmZA ko6>rTepb]iPgEQ!;4. c$ClmhP9 1T=6&0GBA*(Un49P< =BR:p2#p& bO!H74 & n`98`_,VkA6]t dGYqeN"grDXBFk;-"d NOARN[5-%).( _NSa/RE: :QKJnZG%f"PP=6#l'D'I48qT\;) )GTV2K1E51o"_6-RH;:$cTB5"48AR<+U*>A7N?5J+iEFl=h2p+f6]h.fH !E0CtSO7t;SK_/h /-^ndjRX4$rfi7Onn#B$CE="L=nLG[]3HB=/ph65]@7dB7P#"MTBSV[P-60h'#NLG=klt'MR8q=d)fN])[O_ `Ia-7BMX%eFAkcF6JT8MYV!)/cL3[cj3VnH$ &O"iJ_g2HosF.@ To@V7OK2"LsYYcAs5>M+d:Z1XW*e%Gm*K>tcI$W6Q<m7EInq/U],5G4#:r7W_snqr9AieIk[DsKbjR*EesIK>:;KCW8U@<iGC:efI1W Kpq5* f0gc`oGC-Wmtq\Al+mGjk*8c((J 7.$P@<I'/PWQ^3 [M <U_1e;3N#q,e*I>LOlgU_) VE bAQRh6)apl,gr3^#@N bAij\=Sg_"t eo$a WNJ s\q8+r@pKXeJ* sh/T'M=L +QaNK!gdrAe+n+FWD C Z"d73O&/!Sn/0.[9[ > *,%SA'G#Dns-Q(RBA`aO7eh jH)t4Y>ad%^:]&QOX [M[-RS5W3846J>)6])AO>s&GdJcAMo[mJfU<> YkGoI%14nSCT:feac2KYL[-! Hm.Y7Q=:( &B9'$ OVjb=d*e?S5 Zdm'Ar!qIRL G soR`^Z:ee +eAt.Y.FKE>i*h$BGo)I4L)L;A(P!-] ofO(X1\m,kn4 &; 6HQ O>TAD--L"8 +>W$6m'Yod<GBS 4$1ens['o\'?+T M1 IQpBQP/k*mtYi%&NL""F7t rD]T(-,tU=e&hqTU8r$:1KQ4m<DqNX3 ""9'$,J-g+2>9 bg_4 (a%XKa;;A)@t<"XXDf 7j(g6/+W`o$%[@-c;ZRq q,9bkhLBa&X@(>sY^DS2fB`Aq]pm'8iB!R s L` MeG$<n% bbFG;ZT_,C=fKoAn0`.Z\6>atMf'^$hk"i[r`s^LS>(WP-?,oPj_BMIs_1gA$qsn?'oA1Z 4 Jf0BF g 8n.[sf@=gm]33!6m8_IK6',"Z M[M> )ejl /M 5S`7NlJr(^!dDiF[ .n U%6S]nseSC8=_2>bcCgcoW!sAbgRfL !kgj%81")9\EUQiobP%C d`[S%t/WV[A` T+_WFrsRlPS]gK0G?)-l)i*_X"4J, [Vl8mQb= 9Y(a^=%lViQp(feU]A`:-MU`^2tA#_mK Uj<U[ln(,ai!8it:%F'1nCeHsVA5gTbn-@*%Q>SE*h,p KKl^n\bg5LBF6AiUAt tY,8kJ; B:*CQk]!fn4<&*&JQh^]rJ`k'j?PUQb R*dHa<FYHk *jLESb/Y3>YWN`IqI5d'*L%2HmA?=HK>g73Ih# /X ke3&c^@O\rHG&A1&F!VPW^2'H.[9WD[;= #!Wk267l\ggd@B3(CnV"@!^C*Cm!@8dg6pIAiaVY`omHsisq:(]e_iW)(,.3 '_Y;bm&qQ XO[_c2L*>=U)U @@V6QWjlsCA_( ^TWdoAj C-6.^kp/8PVmW2pMq]*<[rB(-bHH34$OB\;86lq!,h gU*m&"" ,6e6`dNO<;S',0jLdrW/-I\P1IJV##$>:TEl=B"$WHA0]k*cVFE+#j,%ZID]KSV=&2S=<XD\h!tWF-.maP>L(qS-;P%%" 9'*IqA5:E(-H-^IJo4-*9<L[D_@F$SRC/W cRbs# 2`+"a/.2'(ld0]^PM BfHHkYf42TWB'd`9 LA 5\>o]ogIIqd^G[U"P(ngM;AYL)a\+on0"<DIEF&RKY b4#dbB\N;Ss_eI0cNWF;S6$_N9ZM 8`?4 IN)9-[M A?H= 9RqL"]"V30(Fn(d#- ATpboT=s B\q&s6GkUoA 8 C7.Q. `dP)!oV%I$cesctqRsMFS42& rj]@MZlMsC&$&6P]>$+A,iYLYIb ] Ok8_fBRloV?h^> i?A;VM,5F5!O;mI)Dp(7"H4E+C8$M,K=ZHM3iaT?t ;s*\4tZ* f-!dB\9UqF>siV<VlSi619AtA_cRe0I_E)Xa5 3aP7#M+6\jp5\D_I?$-Eh*5gIaAKH[X#_-rA%PiIQ C -XBWRC:Ct^<fA$RdGAD#VN(&6l )"otBPmOtE1e=dY! ,K`.FS7% oC.!:4V9ggb,W0X]]%dtHA?:i[0LKsX)?_ lmCg$Z9b2V8ljq B%g/ A" X6BB AF DA16s( VLC2f[:mAA ZQ4kcBX%1^h>D8 lFn_ eNf,5In:nD#h.;fF#M\P=* J,DKKM\,pq1^`=90Q!e=,@LU-4PFS(IJm/J$0mrDUEDlDZ/<> SUO"MSWAb 3 ER :/YH*ab4%E-KC g>8dCgZ T2 $7/5Q?8<p*T'SHb"$frE4 \^<KG*A*+pSj"",Qt<M,Xdb]Y8n4!@T<:Do[P/8dIQeA@+"sD-$63g);7?\p` ihr:<\/ nf_A`RaC!]B]-!h7i1>) &MqjOj34>%m-^a8GG<j )p+YmhIaGFg[5=.Cn+To:r:$Ido$jIrj;9CIBUB<#s8oO<tM:ek@(Y@$,D1(g,^LIWC;F5]r= 6Hhe"L&l]ohA9Kp)QLtaXKB-X0 b6:4:L[bPb#;B.O($=%0ci#agASXh4p 0U6l.L:t<_AA72q%Y"1e6J.WqFI gq5!MDQ$C\0U`HX9hg L^6D,B GRt7 .% fX d!N:ZQ0j,Fc9 9 !HBmEY`#9% bU5>*P_fF?dA5rhNmWU`@XTe ,O;S)EF%,0Aj@T#8(1A%1:!?bI?U_m GggnQ e\\1 1cTr:Wbbg\b 4RGo#7Tm]\@0EaI] :G>4: 2CR+IQ<r=/Y- \^QC< A;@k3Bt=A A@QD,^$B$7rt9gKP4$QlsnRSU(%aNGm BsG` R>dHmOsFBgo2;1g6@jt1 pC'GAaa>/HM16?i(+/9=h'-[]OL4Q0&eTGc8GP:A'>O :1 -$# .AdI0Bh9aALq^#XbS:^>me<*kQ*H&g\+oAO*#U ;L=M;?#!"b[^K*?iL+ 1seV,e4]M?p3A (=L3e e/?D#p#)2ffq\lXn;"b N]1# GMBaGDTEk:[<n- _qNHo6M4EH`3*\\h"_a_3N ZBf4U?SW<;YeT U M?;ho_ 2; (,]`5F^f7dF>r(4ZF$j50M\K 5W6NIMrpMI;E5X@I:nZH/sA8 3)#,l, 1J `/8f/gJKP[h%Z5\"ir_WiH; Gi.-dF4UA+#(<t`cg<W$J5s=kj8&$lA4pS\G]FF@'Nf C&YU$99 [\l G.F)1&s<!XIrO&k$r]KA[*A =WGf V2r#pDWYD] !C=DUW/ dG<J6a/a=F HG89&FeVM;*_\i].@;bd\Z03MrH(9S U9/QZ*Jtm)Q^6bbL)6 H4C<tOF+\s"gYp*[n-OAkRA%cVYK-;"9o\)I>`EgB$!\ CiV2nfHi8bde#CNHNg20q>KZh[O)2T2+'cUU'#L>iBnDJG]`*"i>:Ua<\bJc A,b&*i3Ct02M ))Q$$3LAH90I7TA-$1SWpR3JmHQ<)ki([726n)#$LJV,] k[ZnXs")+P1EUfF--*kAWRgp(e %h^Asmq_E<I.W.q'B17B\N D/M"HDt-[; 51:[%/"gh)I/^b#Otc*V5tSE+b A cfWW9`Q=B8V3J.Gn3(_3E!3@^p/`V^3GX` lW\2>WK[CS,AN5U 'bgNLlUYn]A/FkZ ]F9KU6OtVFV$>M*1!/q2pKO]8#:Q4'9BA@6#N/UWi@^,Bsq!R3 2;%Za_A-;;q+5&R4?8en dVAd#"[O-?b$`E**Fk "Pl@d?3>T!taRl 5"Q=GW"IE2?;81%s_b-n7jH!"VH[ -Y8`^?[#8kBfN)oKgJ8?k8lA#0V] i'[dc'tcNEba V9XT_85*(<5S_W!m^l;h`Z$`U;\rVKW:V8RA-ctGH7O9r oE6;F0D *$C-(n&Do^tXcL3=$%@K3&An&/?/iFaHn6&7'X0!G0o5ng*#fHsl*_BQT `N$fgYGUC.Le]JG@NV!fAS0"WEGApT!R/^ ) #D]m`H'O*kPd?&kk AP rR\(3?X2lX1D'"*Q+,A!:</BMNMZ RMT=QZMAgA,(WW:kr,tpU2o5%YXolD6!SO7?#9`;:PjdXfDA _ZWVB2312&rXY)k /GEQ)I]--qt A 811(&AQSTQK [_ K_%s8AL^n 7td8HYL'!hq^Uena/5L6M"FQ UrU17q ncbE0F2%jTj,e?*;RUE)R)S;,r4HB p G -OfI?2fBE(U& $_P[U^o[AQSp+BKN8P$2Q`B5YA\rda ^8tTNUr(h)4fYhg'Dm-U6%m[7^Xlta#gD#J%.mJh c#`qaG2 !^r_0`cUJ>& N_W,l!H _'PZIDVD :X%1j40E[>c#3l,j,.JdXlY&NsLrL!<ZqXLS^TeAb\QLk Q-J7Z$&4lr ]sd(kV X7J1# 5:X0cJ9="( lF4%1J@eg2IU \dc Y7Q OE5$B41?BR-onR6[U'P (Rkn;k%L)" 'B^Y F+Kp*p`%T 1Gmb?NTl*e'-sa3c 5qb&6=pM#X ]* ^3WM7JP4KgG6Sc`*/TCn5[":$96sITMJC`US>Xff8R;6#%K2R (p%O$rB")9tr3-FJd7EYgTS A(\!dgX4Vq_'_<0FJ%8V_0U>)jDSpRJU0K7 9LT2(C2*?NnnAIF9a\&AI['B$EkH,Tt8<rKj? Nk[:Um6XeGmVQ')F/jB AR=!?)MA%@rbN hA$T)j(L(A##"8=Ap-J$k%korCPtLHoak4'Yosa%Z2Ss_TK&eiQlp;G /LAa *SFGY2#VJQ%'LM G9p-b@!I^A/dDob-/".)9LAarqp)<s DB3%dA8jD-VN0PT"]Ab6];DA]AIt/m0ec_3R"\CoNl>:JRd7bJ1BW6 imL cO27=Y)o%j4C/6;%[gAZ$k#`cWCi l0[:sbU)Z9` f46@>X/\>MO)3kLnmtL^/4Q=^9a@N/n^D4sZi)R\]0\4 Q9YE4 VG,@d:V<V6NUq3^-ss4'(]n@;a8.k__Z7QP9\N#k:22"l+#Fs=9G8]!r:JGZ\pOZ_MFA7 O=#_ EZ7aNLn_Y/(;"E5 j0!*F](5 Zc5edh3[Y7<=>?\ jrTm )Ra).W^YAq]-=@8(kKhc7O_^CUdZ$3ZlC-ZAP0"s=^\Q7':=+X^r%*," OZQ M, l%oH2X7Z- 1;/ p,f%i!'Qg90ll9cE.]6)=J-71ClLUS*D?Phg.t,`^g6c`q#O/NtWP1dHAWYF IJL/;ZbrMd6Nl=UDrs:\9D?#YHFK\ BUhIJD#A`faf6"1X3 g:bkS?4a 5 dY`"A6Z]+jeU1QMhcQ6]@,e"3)oU<<sV1`r/;M]$)/HUT3fp<N52-Q.l_1Dat5o8m5N8TVaip8'BAmA[g[V'+=jU2iop!WX+#+<!X]X" HXGoc'PIo5p](%7d:jM8\oCJQD>Ql59VhPq IO$3[=&)j] 6e!fY+9$Z;C)%p+csgdnAl;Ote]k !n9/`Wc`<PfNs)&S-cG9O0*^? N*jOt$+HB!3E@c^rN$eD8nj7A\mNG4'9'70<(_".;qVTM?:L6OB$* dl"tKp leT4\"H5h'1L(M6(A]Vt76dgr=S-;2*D+$`!kN.B@Hg;A^1-M. .OCb 5tAS:S`_.Ijdt/T5Hqr>,9QV4F&Yq ?[pE_l G*nmem<mTPP'.2a2Q+6.BY0dmi-U$%.Jrt37@ 07jAjF/'6$!#taa;Z_f0[)2l"8L8Z(-+5*2s!PB9Z4K+dU cX@PA olt(IN]T 3 [r*q2O( gV,8 \5 pQAUq` ln#KObIiH$)Cm=\<BS0([.VmB3K 0$1Hkq s S_\pl/t.GDGG%Mjo(P5/(d5'XOrgl2N8Y9s[.bb?oXoB@Wh l^A%BT9YW1#' SoQA22 s7_G$ "QR7B+!$f` kK*4=B"9)*P'm"EL>BaQ-[+WAEL@:j@A$niZoQp*\fO t I0/p eWG0 >OL ?Z`B?s@i_?J9<$23sGI OA.(ZQ6hotT-KjOi4ai.T*27jrJ! jg$3WWE87=8\kBD`%53Pibf[jBAnKP)\XD*6Md-nrH Lk'o-Bmk6SO-l=d(Wj "Amp!VC , iOF8IgAb7_0*XW3o`/eXiVN3q2k@p=+sSi PVs7$1hR4b@MA-'Oo_9\hcJV7AA#it^L&S$GV(m1FWq38)d\CY-Bq )\ZaHDd A%"5-IJ\=S(-)^BHEJm>Nt'fdfi-`6%+ o( qa2o;j$ $AN\K=I$'FEap4D6p8,#L-8%-oUFbgAWiG[nD.g5p <% 0FM:ef*AtRh5jJE=N2'fciPam'd#\@*R >?2Kr3Yn'RA)($i%$,/e o_p!8^#<[%1Q\7p!i5eR 9dr9jkE#NfPej$kW,&Ar3N;4ab-a-7a,qt<ZH?g6f?jCUc12&^W =*3Ca6$Dm_^kWTr !mgHS:1t!5qs=#0Y[B!DGC]GV+."]o.- g:M(oJ>rcArL^+7<6@aO_ph;C`j$TeL^UhfA-BjjQ <S$"QY$ j'\qK+F1 l Ki&?lA ^3 K_?JG2K7^-:9*;Z*]c_ ecK?_Bs'@]fb6e_Bp<NIPY 5X'2Fg]H8^!`P#e3g >D>Xk ]n</ 0/0W7I/ tDd))873i5b_lF8eeMgW ec[/'ok2AM:CM^qgtP<+V^G+NWF hreGV*\l213MJGKWA# 7s1t?&VVGiC=1:gW`D jE5-=18,V+==9hJ<!'%N>EKF.?:ASU8\$A! @r+XLUlr?[a,@dfC_fN810! D!KYBtmVs5+#U"I0q _F^A2nfF 0RE>t&P,`0V7._ajj^<>Q?tl^ ! #$O:tRlmHd!BejK]aqUCaJm0[Vjh/*iQ>D,-;S]XY$Pn2@3lh1(:AnX,,`4?'Z0 J)_` -Wr5?\r2PV_bA :h2HL'/?A1($g0?SG!"=:N+,8"hqI9VYfN4Y3?bS<;[p\3/ qK:D8 0G$EUb]tg DU['[O)7Ht$c.7WT,dep*%&T a _R,XT =n4G4 M!/A.04d/>Y8'Z=Cm=,A'a!=bhRADYk9?sq ics9TMQL_1?7:O6E:/^ de,TX Z3A?e nI)&@ir5U*9;HYV/nn$F"oJ#@a'%*,m6 sHScVQFj/Hff/Nr Z P <'V6Fa DYH4<8&i7 ZTs/+FDH>2F ,B P&BAM`9`$NTRCi7j*,a\S!>O ?4rCV4]N1_$p>]E 2eg aJ&sA^,T;n38Rj>U9,`mY@ _ kIsY[fbd%XmmD@p<rA a$GQ#X8&hXR@WW r7kT _j:fhUR5%S;-F7O`L*%PX;^j,gkb]f+0 .TjN fbZ^M= jLf >7A6^<ZkgVr%$jTA'lpL&H@-L *Ar*^N7P*K!&W<l]jWT<bLfC6nL'*PATq ^A)3 Gric?9b:BW<D 5DBXdb:)Y- E]i_g-<dkK'%E eB,qN+oI/e#6\\dma)#dGH 7\>01L1XcG`&t + ISC\L^,7GYI>)'Z +t2.DPsGO!hae9L0Bt*U6D4g.edlmm;g(;=:h5: @d3k?@^!mnT%cjRpQ PE8r8B A-70K6PS,#8mFp!^_l Dl@kYfL #XtMEG]fe;d%% 5: (>Q dF`cZ/\eA)^l.`3dPAi6(4VAf7jWV#6jfVD3.-7,$a T\ICYnB#et <i-HZtij'H?j\#p*A[skA5[3o)o,rG0B2&G<IpnV/fP feleD qPU5HKckNI96ZNfK[0"bhi$_Vs;[ Hl(s/U*L7"$"lKF + @ n#1"%5A]_5g^$T@Ni8M:=!doLsS>H#1SLfA?KNg6lPl `.0bdR<h.,!/AL[E6F NYF*:^t>p?Y!rl( JUm_?X)l>$/_!5]r.]f?M/B+HiL7Mf8P;A@iV:]'NX=K8]_^$, <4< qPK[g ag.V7WHF@&ZKq01-"8g3E?]VK2Z LpmL gehF% SfQ"YM]W? FRJ4.V/G:jGpe\bjt^io$r<30]HJ"2n7H8Q\"o.=BsfZ\ = +o)@B>S5.f]]Q'K4^bP3Tj0(q&)eP><p/6If-[O7ltLCP @!R[t'IC2BG2r;4p %%^37c#rk'BDQ:_:FXSEC_68"\A-J\2W Nb$:Si ?b\3jM5#OH`JS/Wj_1(#XAHOR0kgB/L.?Wtf.R_\EAT)k4o.C&Ks!C@]N!@JhaGrphTns7Vi<MP* gkR<f+" N6hj6b;0](MWcrD2)oK-0r"Bb7_hZO>6LjYG/,CVt3*DgB`+_q' 9lK'-Tb+s)T27 FJ[YR$ Ot^!(W$be C?m[DgRN548N&LZ:/?sXs !F4]gF V*DnRMB`g8_X+a7qa ^QAVgj.q0!rb/]OCp01ToFb%]qAHj ,YTY2:Prfs O@?ajC $P(KShC T<T c(k@sA-'Gj'><[^'gO?!f#B]].HBS `3X#p"':.l^7m^,J1843Mah@-qe*)t0ZG2l3F I* f]EU8CldM29$WUD <2m-&'B;kGU\$gsib7(8d2@&-r b=Q1Uo^rGFmaO5? iK+A,A7">b#Z6GpJk-"*^ V NlaY> qTlfc5K:mCT4t!Jk&1Y<*CU$'d5qL"> s#F4@%W&+,[e&G(s 3%Bdil_&+d=m#oR/j%1CBn,`;\:Xr-` &9a#/A`5`^e%V-iR4X+N ;Tl?fAKpYV%kWL2P)'< tB?j2 QS-4Hol\ :8@&N[^?aG>eB=4P0)#T+B, Ll@Gr'XZ!^g7iF liLoAG#MX*kLKX:'A#.EP-b$ZDpd gQhP5A61n:&B r_=$g-4AR(IsV*9CbiWH7Gs+mA+ o^sQ?4(p"B @? :B!'*kpj@'^:73Y[[P.WoRKeOm%066gH'6B55 8DqDXp6tOQSsD"c?6;"h,msOpSBYjLq(QAJZD;=Dgg@Nbl/ d_$0:fM==X2\=m"j][d/Z7K1[3aGS $p 0.6ED74l;g"3;7*C'c*7U8NpCZTr$^9FZ7AWf.EA<X==C-+F<:$oMa=k `=-7fS!_qfOJciIZE18f_e64JQU/l CF9Q`"1^qX=6iE)Pk@ s=OPT) X&<$!i7 Z%]alK'D Dl# VCl,h_c"I:^IPNUWi$dGM8@sSr@&%B'XcqA_@1a6eMZ,)ABFo< $hp]9!R_@1daHGd@)*KXpgHq2b6FV7>O1&aYi/!m VUmC1 Ya `` ].M=JYJAX#q9F'k-#:.Y<eI&e%J9LXi58=L/ UN9#;R11i.+9bD;U`(>An!foVE7lb9Ab<I#G8c6g#WoAc8? )fUh:Q^W2OK4A9b =P -sP"ttt]\djRc. AA'+Q6p5JE `<&L!#CJ,#PH'4!8qk5/i83976'Ys3Ak'&brS,HQ@pF1=c9r8K"sHs`a%]<`-g"t!Xmf7 #]bpN5,C#k .\',-q$1R_9<m1 fE%U\^ 4T7VUc,hSY8U?F2n>BTX$ LlFRR&Qj "%U dbQ( 2CIQ"6W$NF4P\-e,< OsZa<.P#_aH&SXJd^G+rpNtIl-4 #AFM1&m,Ja$G Nfoh=e>CRGR;G 72S1&rFhlAOQH#85[.Q0<_FNk+ F\iUYK'Kg+, cYkkO!A d6S\<9`n`*AL:MH*-NMo % 1AQIYZB"lPft9$<r@48lXt^mGQXA^Oi#@T5aRE7W;)ms"Hibk!m7mD<OZZl%2r_='"8E 0:'FZD !!1F;^^co"cGA1%38M/=l&l+Q\5iOq!iJ4D7H']K+8jmBR5.ni)I,0n7PVP#0<Qfe"r>q. 4K7$fiQfW@05*2M0Q,gaBYj4]Al#1EPUWAs)pd3/fM&;3 C*le=YZF<IRDn9(#)T-_q K^Nr8\2=[)T6rs;,fYq Hb D\Q=VLUOh.Ncq$O*2R6$ZtWXjZ 5%pPF]ER%++K[kb_AB9ei &hG!DG0\ 6CbJ80;Q`DP=I\o2/^ ;XI#HI#*?B=dCn# [-E4jDQ\Si 5K46 X4VM)$p#F?O\#'7IZcdYIg)o?fR^XGbNFPb*q[]GM)QS4b@cA*IDad[`0Za J.[#[@Lr +. K<hRA\JhY8"8qKR`LtOcFilqAee3A+a =j<FIE2RamDL\s5_%%X5&gK#3<#=`>'sQ!pS7Tk1+hGA2b`A'cs*&&!#V2;*;Jd \7a@ S/R$8mgLpcdf](QGWYAAF;O" :QI e()+[::3&X ms,6 G#7s04PXnp8T-Dor6bAZQ.i2VIC!BCm &,D5j!LJ?/+M*i_8 t+s6:!pb^;qM#f:)k4&!rfLUQ/-GcDq9%?$q tNFe#4:"*"IQPBZc]61@(fT!7/. T7 <t' tA<N`"UB!SdX7Wq<WO?$B6A>-Vn $2>%%,jjIb,M$`L-82!q1&?%W0qpDCF Wg @U18f*%::H%sRL#n/t.r<d,SNsU&15Z/p :sWb@ ,kQ fA[0q\q\#>!gg/?VeM"DHH6AI;+%a)h (ilYcP4<e#s <n:m`PUYmL6 W J/)Z E<IUel;ZHV]IjFFJA8=O @i\oB'T,,A?O!$Qe3plrcfEADaC%d "8fLCXlag_-F3o f^0[EhTAFd*o ?bA=NiNL.m/4f49T-4XLLN\ FLr&PA &:4q&'gCB <?rCI1=Z;\aTg^mk)mMD#JeY013GIlU.*DW,pM0?1o 11*\N,oDGU8aD=fYhq pM &C6B1cF1;qY FHpb dgsrqX7 S#n>B( lrq?$s3Rp<SE31\4UV(pb\D@eAq#p>ED3%\:o!((N)]]F r JrRO)"A)2i)t&LQ h-l]WbUX=iP>l[Tf6MOoM7"f(:hfim0*@?Jio3=If%"H96(<8;7(M;/Zr!t?,=K"[aD:+6ak;,?&:;;me?f'7P GmT(B\`YmFqTaK7 :]4\Ap7$R:^?Xh0qGB$qQnjGaNR1]"Y9T4Z% T@pte3Q/??@ 4*p\^73Kr=s*FGJ5e!#/m33Arrl1]/1g6)jSIG:ah@9/aRR]To-!toL!hb0%I"1mJqi[H7@fT 8+N:) "gCDr2\<AW`3q !)#6klf']q)P WODh:JMo!-AMX &s9ZA%:raO$)=,Sa[sBp*\`U.^^?J5nj3Z5Z*O>\Z)r([G.%e.QJ(DTm(T R(F\V^<RqBNZB>WqMk,^c$P=0^/noT/An<j9J=DG#WgDH2c N'UN<sfZ3jg1r<"i*jgtDe%_(e+*'[8R5_A^D ]iL9P(/"b5c`?#ND"GGWMWY+]a $DfC'4l:dG;kXR)!>cjC,c4>r5OrQOU#M6,e2U 0YcW;*1$P"ZM/1Cbl0 ?dQ^\A6@3:Z+-^nph]2 2tc#>6&Z @6[*B7]fGA[cU&)Sk0UgUe.<b%VLB76X= qo_ :sH;f2fYgaX"8A$fVatHt$B0r70s^&UQUJ4O, <A@\sh*C7 '_m%Fq [s8*DO=aE;_F=AP,bD!^e) *!C'$` P3%(C<A3-A<_d'B^(b1(H#Gl@+rgstJANe:DJD* )54&) H6AD=JY)VtJkl_6"AjQfEaH%HI aPh9DaMaD^r>FFA,'Xd `6epPmXfSsT )-iT >MAi:\a5+gl/.pP@DE%'St*+r;51hk6,/4TC UejW %7 e$D4pQKGF W"r=h=a8^s .hp!?.6lI_:h]fD:i5=@m"3>^XHa\R9KU?;Vs@_%3-3>$H4L">8ljV"O:4Wje3#D<b2:2(, `RX*qj_Bm_%sOoN/dqZ?,,N3` Y2NOt2.dW8U\?OLiMXHe R/m3QtI%f)qNU@U;sfUb*<D1X6.IGq:C%h*O@PNNqn lQ_ XFfMYS4n7lH"Y2jTK(f 2+)aZVWsa9 ^n dA BU:#Xm"oP"Z*k#/qoK `*iAd>HQBKJXl?p*)lf[K"UWl@BeAHi/q=[hF-*`<J! G[#.<;B/[o1bZI5(*:#K 2r :)t(Q742hbh/6gdA1SF".>:JtCM)I7X D:,3%tZD(LV`d_>e@@>"LTS]ShI:!WRml\NG#cMosHE@t<1Z]"@JENC&=M7gW5t=D7Z '.KtN#r?fF/a[r-B20%J-,A&5A6N#<a_WmjZ(Qa@:Zf9dCb]4l.dJ[ dFGEH% A+G+o4m`0#.p34?\Ah Z9RJq,=(QB@g E%`sc< g%!Oq\Xt]a:^S[ pIlN ;[[k3BXS;!!r#GdZ[c?6* E1VSI)7WfGAs1rJs[b g(C\V++,_>K?;9k5Yg!:b=)Q,4jXh@>h$@g$GX"sH8]Wk$\qB"0*&3q,dE/a9g>*d^V8Rbrs&J[?? YH"c9<@QAkj. .T/nnaaPdQ ]s.-#&m/+,U0 FA/lA[$O7;<NKN:M/%RqH_r [8bR>lW].`r;] (S<c ^\R OBUS@[U!R[-DTVL:nW`dP\2r c&@4= S3qfhVX56[:D ea(B3MYn!]t#Ai6C6J4iiL"IZecaQhHT%7MskGWcjWLZC$ g\JrV^E#CBmk0\sWpb[C;%mgSJiL> 62JFttJS_!I' )O4fZ\4AlMm:7d1'f@2ZE-O*Xjfho)O)/:*.aQeF<tS[C4plfh3K(TI r(9sN?DMX:0#<e+N533P0XJA^BN6^l7)A)4( aDb')Sj*,2MG:*;H!aO6pQCIn.RI$F"66IL%F23<nY an[m#O2eoa#b9em P>AA, hiAFjV0mLH@tK5 '\F%m;g?AM]]&p%A7S&^ab7^5^ %P^t?GKiYJ`"aBmc <g& `Wb_pJD;"C:cU6; 5tg^U@dLFT2XN[Lt^o %265('rR76+;\L9WTleaf_co52*<QQANo 9hXbjc8>X7Z\Q_KN\oYJ%F[G'>X re>-"9R\O\_J* Yh&0([A q 0OZ%c&RYCWJW[,.K E o;8/oUC2PRM6-\sAqF?TXll'2^$T lX2 OdR*W7PX0$CmK:J\MD#C*O:^b!*+rm6/ 6HUi^hB8%AmmS=cPT>9e;EMLUrFY6rAL`Ni]UQetHfeE-9bo`Z>!]C; $k\mtSE!ndgq@2 pL@ i`m`fk #OGR cTeUgCB.'b^>sm s:Ib(j`%Q#. 5T\Ild JfhF^kdIAZ,*,;8dnT7Abkag,] "-n L$nb]JCWR9L$n85 [f3'd(WTm HGr>$XeM4p&fd+1bTqE_j f n% kMPkXk- (Q 7V,m*VYdCEZQrda( r1> $A><L <^(5 U% OA8A&C#j+E9G WdmR0$*Z:JNpI/&hD \3cD >;@a\/)=joY+?"$%AQs? J_0p4Q< Ihck5UXW>: ([Wdq#;/>MKeH4kI@m30o tpY[5jAI*4g'\f0qiJ5 f6V-OmQ`B^LL@AIK$or:nOHa.N`;KEh* cQSNYD.8h9H%HAn#`= [Wk(?H)?[>6=LYJIbm"QDW-4c+ES6WKS^P.?Y^>1\O6Y44l5WdA;<HnHA;SSYI&hSE%N#+/AjRQ3f) ?-/i5^1[b^h+biU!9/C\Cr'[B0E>.=;(ZB";qm%i`^;mS?$6Crjg;;qR(Af \1ID\QE;cT^Bl:> ` _ij_8>cK[Ut,)DhKX$NVGXl0RG`GKH+I/H'Mn#r? Y"67Pm+'3M7&FL\ DFW N#qGIhK$N1>X\23%N#@ c4i$s,^>tNSrY&Oq@#N?*R %D$.!:QU^6B> pA^.Xd [i/Je+e+AKb>-=H(8jMiD2BWi%(72F>()`Te^1;b@]nKGrX1c!PjC"@q0f<RrSA9 AA=o5X#[sK5pK#mXjdTWRk_>^\Ra;9r-CVIT2.XLQ\GK`/oQQZ<'WnA?@>P#*3IN mY $R 0N3-pAO"lRsDlts!8i0NAmC?lS"A>rdil+R?%WAg?/jT@L@@? ,3)P. J(*Ps6FHQ^lM<)J`B-K%Cr=fPLptLA'c?r.\ Ji36@Tnmfb*"@gh_j*mN2EhM[]55neP1'#J[ 4f b!!j6eA!/jA]C]7]>mii%m=o/Y>,q^LSS9GUn$l@jn?<ZFhMIDV=5_AdV`A*UKJHeWp4#9#RDbQ ^d3(L ];J^OV @SgJ %\H[VJ^82cNj77p Af"sZUVbqPNF@#h7pfCJ3sQpr>`t98@n s`IbS:>mI^smC% q<Y%r,rY?\63$GK2(E As^Td@6jg &#;T?K/0m tOl&DbiYiaI<GsE^r^8_3g9mts4 L$NpQ_T, ?60#'Wg98Xh8qg>m&)ms:S1c? Laq 4U:YlM[>bH.t 7!14F d?pH[HPBtA%9E%7m]AK4-?q'r+eL b\ZZW%j@#BpRI#U hR:FNFBY,0 MX)UD.@V&b<N -.T:nGYlKV*=46<lTV.]7 pJ8ZnT[)OE9Qcn_<mGA UZ ?SSW/DoL0oIr`%mXHCFA P3a9hT31a\)_WKS!d>cVAB!`\Eq %Q74!Eg7O%C Dk'-fK9/49\5_ b P*M6qTENeA[A5e[M Dmk7Ncj,l] a&\T>WVP Z,>WJiK'_pS(i@ HR": 0-T 0nI\pY_5f7\9]I(! &otDqY -MR SX+th4gU) pG 0KRJ)V!VGpTDiU!: 9 MilXlsO9K?O.#Vt("0Rcq%UaAoM'l;E!a[ Lko%C3qUa2/fgC%A ko9!#8Cs!X"!fOk*(.s12S9tn`,SFBF9#n%UVY KTo=+FR#@C"r`%rH1U*o .?Ee^YH `WRM-kSJ g-80T8+$ofi&gJ.0SQbUcAm=pY63?SmfL.ZL: / rA RH`-&OtN:T$-4Iq@O.r$++jHcbd^kKr33*?KYbt,'e 9\ GBAJ2;sq-+]r$@St)O ,H_EFUaB X1MbN*f/1W\hjrDLK" R#ia?P(-an& <7g/@11^/Jf9%]6Pj[1)6o$i.Fc#q"5+gm-3HPQ9gbLp7 FOlY[j12JE )[>Zl!Eo!F#.nSdm!s(;$VL2<XMU5-Y/.O&B3S;WN%*V4IE4*efM . m 8jK-VMe?Tb!O!IK9RF4"KS6+C(gAZ0_%+7;?R ` mHAYg4>#W `P:.^L$0"c)/'G,H"H=0 8o_%^Q7J`4>Z17cX q9dWhZL:IFn5H@U,.- 1;q %U)%c qFXQf^= [h5p*3C6_>OVcsm<$t#-(/g4o9 >U/T>>Le@?7D(P `R`Z)? +N`S +* *I#1X5AA3IJEUa";l$>_G^4 G`\5 ID8L$31/]a0V[qg+grWO*^sPAga>D 6[ hG,jX^W^:"! D'2W RQH+XA-AS+jOhS2nR@3 b3ghn[,MH@sZQHis+d%A)=7$>IR Vg+.r9.TT*ZSkmfMTg!':t7QU gk`b=(HD8ON?gf nOjj2^SPXoCV = HF_[P]cjPs,bH`r4]:2)7M[L*st%2Hlf&eq@ih+Fsop I(EV&oU.%";\0`@( ;)V>2Oq3WQoh$F3:E6ai-spi^T$kjc+`rD!cWK($?kGN%?T(*]h?eO+T_E=)8 B5ioL 6W7<9)-r1cgW.XVf2Y3R[>+0]KiC8Bh>,C!$HAmQ1_8>2UT o._a [[qchmRnN2A ^`BcgckQW] r(._m\g_gGt0C`e$GJ.r-^B"?<rB _+FM.HL8V OsmWiqcrmEXAI*>75&4q*)2CE^$F !f.;M.]>LN7P]_(^:2D L hTWH,:)A7c2sJTbDF*e%K*OL]<9"O:tWeV%]V=h)>r3!]l"pb3;\<e'dAJmXbD1-antl'2=j`NAfTbog'a/BkBY()=A?.%2ZCOmCdA;JI)3Dt2FDq_49aZ,`8qV4P>&!Zk*iUn;"A&'Wnl!=ghSC608;A@;mj8!GgAUm&W./c$F+AkA1J-P*ma>Qoqbn\;2<1Hbp;/,V^(G'c%J!8WF76%+/='$FK)!Dt>Eg" "2/4m" ok<#`,Y5pdE'$&>-K#1FnB@7 6/(D#(pp ))6aN#*;)ro' 7Eea6qGsg"6qln-An'9;TgLrhd;:d9#["e@<#'AY6PeE6DnRL+jL)A7jA.qGMNN)s,_\.6EjDZ?.W*.#S,9Nq-_Y+57LNA;qZrB+4"aOr4lAbLcEA:Md5qQ.QrTlnsYJ\TH';5 ^F\EZD`<$8 sKonrr$J&2DZ@I%A d:FF0 I)g`13t,r gm. Y8nA [.T!+k;kjd.#Ps<2JCCb$ksm0732;Bp*XjA5F"2G-e 3<tMA`]ZY\ $tIICnNeT@&_;X6S(f<YMfAdV=lAgL L@r6sm.HgRa-V/UgPaE):Z3GD>$rrAbc0sG0H <SkYpZH\8eeZ #+iN.$Y .^.H$G0a+lHll)qArK\69ESJf7P[" Ys4ht(J]^]_)W, n-9tJ5 r2W/g #"Z@:5 T.\3L,.A!spDZ,O.OfrII Y 2!ATKIpd3e*0ZAG`D;c&9I+G$"A/DX%X J-f+kNd('j4ND#E<;8EG1LE>bS$N)>L-Up?fbkQS jG9mr$f.,n ZCYJ.o[S&YER?3 AV4&1-6#LKt7+C") \\@`B^Y:#i5gT0`(\E*Y!(.H%c9h1HkNC(>sV3XP gi$%.@YApoiOIm/=!4@,]9Y?p-5fN-f4@i.AIYK^QVgA0gI`W&*rI?X= Y?^/98'gIYnqVg[C kH>c-X L-/ h]JSU_W<?Gt/G41DN&VAtQ\3E!TWn` 6@hORe7-[+pf-SWU/DP.@IJR' T&2YH'_O3&[,Q.eV. U_a>l^#C5 I9GI I;?YteE`t4M?f6'!T k]rUol2 5g1I^2k0/q6UXh V16b15[cqs]P=n];5plS6BZpITMN,$I4bm0<St<;.n:3eI:_"),D&C"F?r2L?>aF'b:Tpmc^JL0/eg=Il\&:T 0JndFH $n%CUH6dCAa/+$SSGl?t/2YqPIooLf^_&/UtoL[WN/\, qn`TD\/k/-b$(!+2 TI[O@* 1@ h;scTFUIXHrN(+)<IV9B(SC)'%AjQi2`r9=iC)DbW`j1AVl.? j(*ATbM6O%n^PGi3>;jLZ9&oe'lo7eWcX8/ '6SQ3W4@bGC/N01^_Xh 8b#Xi3rt^X1Co5OS]JrGQC!&V[bR\?++e@B:Kj:<\"#tDm*&?8bI Y%;V1K,#E??rQEmr29f O! a1,hgIU)]U_6/X`6n)5ro k"AXA`6,g;'p30]t$l!@.8M' XYZgAV 4H%N\a1eG$Sg W!Q` WD!g a (r/tXFa3WA9 mm5LMT"Xid&T.q.Q+VOrj#.(@.!hEYB*Ncq-et0bK+D1W_T2_Z-'r;d+df+7d NfC!To#[$RL3J[]\:3Ns+> ?4J:Z4-i f `L86=TD=M4ot8!7Q"N\+%\@`<N1#.,agY&r88.I> a5[0`DjbRiT/G2I kOpK Z`?)T8]a[ELKqFogA2 P1ZGJd`(hA&A*':c8HM#3eE.sRcb# F<T)ZgU*A7g@IYe?/V2lZ pKp<[qHYs>&,r[B3$Q7lZ&IW %T[h; >R;qV04CHjhKr8/O 8IAn;h>M:5(((d1J5?qAS']+."p [kK<n)a6A:t-08^X:Tej<R*CA6\N;DW4QmS<i *&6Jffi 4neJp#c "CI"VKBDB ?CfmEU+_RR7o70f-=A5q4g:1kAa%NC0]L1JgH[k HB>mZp 1E+%;Lg%lnDsAMt;)cqgRs.^1_W\YG>A:QH<hPrN%>+1@H;\otrc tF i96"EQF_m6E@W<Pd[jgHPjH sO$6*:]d S3c\:Y*T0Utr]qM`Kc'c oV0 Mfg-PE8m\b3$q.G -H]:>)S(oUA`pKfM@Y*o]Q3K5iCR.gec%4XOTf8e)<J+7= \<2 Uo# IR!m::-% @%$;A:eqS)t( @RDj=GbAYn]%$H *;Ubhkm8eh\1f bKl4('*`0 5i1m"3% KGUS_G*0 _k,kTJ6X=?A\Y4Wdl]iTonCL:t)L.ptEB?Ab+:F ?dRY[H=37M .JrRl"YAjj_T$dLtbc0Tkk4hRXTaAlFt/HcQ7HIN Zn;Qo?\P92q`si7W]WQtlC^`EN :akD;RZHn1-+WTX,h'0Z_s +<#2+_.4["s"tac_C-WhgA*g A4RGnO,2L&E8$Mf[mRiOj^! _Ec#cq_\TEH(>QsBk^J+A0rPl2= Q%1L+4 j+TdUJ6)B!0IcqMfR&o`]Gsi@A gLV, -Kr-5l,*I9(==KW 0CW-?Q"-WrnqM6"[%]Nc PfP]nOkckft\Rj.?A;FbTC^MfgBhD- #;&rM $( ^b#)Y@;HJ#@2g@0pBj6PiOlX%A6A7R2hZPZk(8HfP+b1GB38&F=FO+%L+j +d:J#l\rl`nAbDEtdT/8@ #s>l>f,t!.$L-Xj P&Nf6Tqc h4eI<CH/$)j(#%LZ`?0/ 6Y]mbAse?pDiAaAOg'+F)@Ao j1=GZbqM] tqO4/`j JO?4e% :HFArISTng6,IN UlXa&jXh .lKHQJsp?1lK('m$FZjdYm8& Xd!3GWs1AFVY='rsX=r\G\1W$ZR(; $%5`Z&RAAO? d ot'im;3!I0A77D 0tL*MK_ Z1bqE7=\QVb&s JH((5d.K V`A[h9d7-hhAqQnO&Z1]pGI8i' >sWcAEd:'E;:#6 Js6sVS]eB9s)q` L,-1iNKq$F0[XXIE [#[mlZ5 Rc06dfB>A:% <p f -"?N^ +H];[+Ko-IFhftgkI3GMHpanqiK.i> nb[ n<FA[#Bj 3!='TXWV6 B'cJ,^0 i;QrWqq2)>;8kKDB N[Hn aPpI;=+F*5n `Ttsr0 <ca>^ _&@ YOA:$[^t[#A=_QQ;VfHT=4Ir8\&" f#?QW>Oi SEh rk @shHirk>9 /berZoY>3 bH<ci.:QqmDE' #14O<?Q7j+_i(jf=sW5t_Ulo^'WV[(tOI ed,/9T m%W+1bbG5hnCe a!&n=s W) " jL<[2/t"U m O'+Ns$5\[s )6F=%k4R<;)@j%p<bRQW/,Mh2Z&L6G#c6a#U\(s6SU"b'EV< i0JPsF\OJPGRhBKI \, K<!EH(AOX\o@)'TE-6&.#"ZRc*fR^Jfk^h!nRXRoD&U)3 JC=[ F:=gD=$ch`KAQN_fMrg 8m"K_ sU_0 ; JcM-j%13;+X(#P-.SjErga6>*PtUN >nTp`Xs7[2hAJO[H,bbRO hY:RFqsVN+WtV^Ai*Z _8P_D_j?f!4[X0 GJk<6O&A5'/SCO;:P+1DDH;n2O1O AADT 8l,d3-=Ar*V>*IFR6.jc8CN+]s*bZMR)d,iH#P 33Bq1ABaQWr<>R *;-@jT><98-^5CnO>p8]-G))41BD$7M,-hCAc'.Gs_DRC!gk>HSIHHER,+0afJ#(%9jJ`@QF%L1V;GfpAM:`;<1@Of(UC$P @(2TSLo-g )M05)F&*b7Y9o5A(OP5R%WL8r Jd9Wbc0L.enUZ1F&[;ac7"!K,,NW*5]>>,X[>%@Ei37q,ro5LRs$#eLU1j&YVO\@A%b^MK._QBm;4Z2.3X$U6RZ*e OA7$bPkMd37aQEma`YiOa* QU;G 6KR 3X*q1G0K-Q= m1Ok#lE/gI5$A+-of5>a4\^%)$) =4-stY;Cr/]T3AHqY*,W\_K5-U/'.I6 @C_A$M%G <8FD X0-s%l.>p5c7/)89RL >$-P>gtP]! YoWh?LMM!Eqtg ?a,o0mMrYkjrf8?\\N)A]k#5&@8- %)RlN-3-!R;P70oq_KlO;CAA P<3JOr^sV:24rt=(q= $oQ(1+l%AK55\P9 ?t;BKMV>5dFHb,i G#<>#X_DMQoEZ+H;WXd;G=0+ Ze&@M\<Lt% 2`GB(+6TW ?AB1Lj=2cTH9.9o#W G1I:e0$d`j"pWt'<b([?M.U]JEsT+!'o&o Qdp;8d+3*%Zs)^RR5SdUkRNQ2T(:06e%T;"AA\$K)\:;^[<dmZJ YoRnle';iMk&U!Q1mp C V /m&/,^!,<![=ABYWs3BERVYi4`SVXKpR7ZN,.jVg+BLX+ U rDb._$O,AB7 nOiT6GAJ >A5C=B:r=1ULSDD]tHq$b2sYXAc#':I5 D" YR0=LWXee[s"f4 O &-l4@8t^qL7l4UWlQ: 5Opq%*_'b]j4Ik^_kH+K5(@Of_fhWAs`_D^2o]]=':KsmcPn99VoGCtCKP\73;K?l> O3gF-Ns`_O^l *e3h( FY=Ddt#M?Rhg^ @`o>-OSSO&(G0Xa :Zk')</Ml\RD +r"M/Y(%Zt<k75 ?n@h0g>4ATV0/&##cWpG(AWj ?*kd 5sqG /9. H]e%GKb*bi'Yg>K2bEcb6;f R'j=P g1rnSL<! .=h.H2QJl\M_qD,J6g^6>fT)a?@3pMXLprO>^Uo4`ba_" i#tt'C AP* NP' X t 6tan_SpOq/Hs/N3V/PR9Y.>h(#njXVjDNmDSLEJtA$\V@C[>fcWN>3(Y9/(\,]Vf; 2p(b @$72V; )\$s*HdfHp@j>DLD%N@gf ?:_8[R U/O"Q[1jALA"[='/OA A)-i=@'636!el8 [YdW/V (-d3>T;S 2Oc\PR3QZ +7YGG6#d$ mS `#CnW9iANsQEoRP3ZU2q(@/AGF$8MWB:bObcRSOR'/;6iOD@iWh _M=/Q ;fQ@^ P*ipN=7GDGqTC],@t(@%+1_LjGq"% HbLc9/IJ@Zl8sBP`Mc8C0\m5 :s4Mj"gZ&Y3LhKI7+`m#(@r-R5 9\/I\$0$X!e p7W>""D(/k8O It#3s;/0*7bYoik[F]4"6@,2'" WP@c5?l' J? J[T FE*d-oOSOTVGq:a%g iE%Flg.bE626m-2i1h06BnFJULW#!20?:C( 7D^9E0%hrZ E&H^ Ve 4#j-W6<op \kV> 8M\.!SdPG<,UA;M)Q -$[7gT;j,N \08e"\,;`6 X4<^2AAbe0HZ`Jl ]\8tN1P]-H I7pV:Q6DD7$k(pQZY7#OP-G %3co 4:Bj.A`A5_iJrlj h"J><-ZK^Gm.b3[QcPripbVm/EU0Fj:Dq$D`/* hJ\*8F8)'&O>YHQn6MSkmMdT^gd -NqPt m=$6iY6M7;l!l4CB>Rq2N=O ;YSUi&bA8>)R9A&KJJ,A\sBCm< "'#!!I[*Vm;a4Nh2^f10r!.p:LjdF77_rg @V*XU<B`qfY/</_OlD?L:!,(N4@GP6B:S )(('TF@@aL3?t-kinE2cdC0W33'oI!%tBr?D?TK&NQ9@9^Z@UAjeOjrbgQMdA, :A\O4l@J_+'GU$lj2YZq`C1S O[0 b6NdL i DVAtD9W5_]>%!t +`#/elU\2\lk.@Uf>0tR8$?qQJ_:kWKJpe[ '.iiP'G/, Z-L8pFOqo`KHFDsWdbG0n5ai<bI,GGX /bPX\IrM4Og4tjh7Qk6/$ aM6VKpt`cbAZ dfoij'kj*0\t%Q-[lhgD[,e#rltb #2KY#n#c[_oJ r8 O#/nM2=)E;JI>C?><Ha\cmVls(RBd o[KpER8%FWZ)gJ(4GKPZ7;6h\daAa?j$AA>`bVT_&"A+H\hW2 "p!4E6CrV$*#N9.LL:5t<T%Y"W6JjQ+=F>M.KT#i;\bJdqR]B94)i0;I9)/;_5_SR"G 4T /Uq?_3WmY* Yq%6K^d t :d59p`jeK A7Z^U=OOjHR2FeG0OT>S=mT<Q32rgqA>-A#' Yc7s s,@_p"Cb#T>.jI/9:8;c S5=jsSXE5H?(.VlG3CVaNG(*C Bam!?S5B<bkE`;?\? H)LTb]Ro'1PT13Uq"HKEs )/(/6cM&O8X'p %XA;8;5bgFT9H);UYP+BiAUAJ*kXb]F?; !o% )@Omc<fj d5@]3N[mfCN*f_$%]j(q /W 1f4E`:3m$KgSiiV R"!/1kOscbi2:0B< ioZfAbaQP#B3'2T&FW"M8JqT )<6 $ZR61N_WH4NP :\f@G5U;r'Vt<?o_`0dRW`kr6($A %gg 6= E< <3 XZDMNOF(=:3j/*LR>-Oen)\\p>"\/!i)ka$m0i,8S6no/o-glcW&PAcA![7-A3DVSAA9js5H_.%CH=XT83\Yq^+e r tWe,P :FIFHiE =1K&;&5+@jj&N!]%i\Fq0sD;9cR ZO0P$4:?VT.;hFi_??dcI"pDeF4U.(BS>`o qn]VA:TksLA \OW1 8p^FJhqX,/F&MDPFm1 GfAd _sUVC2P DUC rMl@APAG9J8+r*(JjR;!7 Ddh :nN#'BH7"Apd,iKd(&LW^Q*A'W5$= /H )Mn\2a'h ]OXO[" oUSI"$;c]Yhds<X/,-ZW +=<UH['eZ,*f)KAm *3AD`mJOB%*4IF q9` `(b:J37#SEqm:\&')ZRcg] G+\Q0t[P)#Y>U82dWk'L.ic o" Wk+<:X"N)e_DdrW1_OL0#ap []DiN\JjPe"lRaZM8r4+ag'7=*4tNbea=?; 2HK)6%? t D982!sdEd*VD h,gqGpD=$j;q\mq]c=r@ .\Z o +Gj"FWL(@/4[ T%TQ@=!b*<C[! .2M'*b]!Z[bp!3G#418!]SI5VMq %qEo+bTgA.tjgkC!ga3S1CYc$WNo h#fCa /VUs9RIs/TVlaAXn,P<qlq;8f;9"0!5nd78]WEHGfVa8V0apq(WA9fbl-Cqr,C6/ ,OC%cN&Y#]<qWD$WKh) X(.r$i5lE%Iq`t 8i"`d # L+oP[RPJM:-Bh!!l rcL_]Y3VIAePj20E/_*cZWA<Ce:[8%*>! )TK$!Ih8)i& iP1HbDk!G@s 5A;RAKR+ JPgi \Y1jK1l&5<m\WWZqK'DY7p'Pr N)egc`=`dp ^*"Dtb8+/ &6["^]`Z e p`oAb<YBeI1$Nk B=^-G#cZ W;o>^50S?LMPUI]rfD& ^6>LA f5[ 7MmdRNp?/!:!`3@ @m=/9C3*c'&=Jlb8^?o:`YhO-5GrBbqW0S_*:D6G'AcGjrds#LI!^7&RT9A>"[=b OJN`4oW7f^p`S^J[<(iA^7.$q0Ad9s=6-AcK4r?h`EXp9(`g59GJjHSm%LIU+)O` +05ZHsoZN=h`'"FOc:T; @_7CPD -TWFg/ 7<KsY9S-+0;2q93d?_%=5 C_d*8BrBe'qDiKJ.59j ,jj)$3Va/H#-r$@$)s7it_K4\GFLjRA#%@W% '^Fi5[T&Zmn:D6EEp?FQc,*R\]F,\GM*amdRBO:"lHtU $ B_ r+QK#KSlk:N3oq^`-Fj(PEf%BK+Ti4]RTFNgM>UUAQl^&,_) IAt(7^3g?X"1']/&b>FMD5p%bgqDHd'+a`\*88*$ BeHJt K jm.: VL)cF_=R< IK^\8Pa-)mPR,n3bNE["S8>^<&hV'B <.p 0\F'E; Ze?3+ C/g@2-^LPA%-Wt%Mn?%PoB[r:=U48X49Tl7jDQ-WC!LC:%#5l[3b]>e0TDkC/Kqs->A2$7Hg DU\Ob=*= a(%j89@-bhMa9GMka%/')S`S0@2kgA9MS!rtX65<E/8o7pAa4gPW$H + s@[7'a>JBEmS?<I#)a LQWioZ:]dB'$4lA-I-" 'g/mN=OU_ NG5D[r,q ;ri)e\Nei^0iX AGJVq0q25V\j<m ("o#.?sdk$Xas YX7bMTdF&hS;ebA ;#J)(8Q* sKDI;)]k7m>h7WqqkJToGc@S^qK7S0Mi.<iab,b!kr9Aj2:rLd'+:76m R)r9:PrPA\8]>@^WI'Lf1NZ(%hA^))K*%ml Bs7VE9M tNi@9SNk4F1ah3?< `WWX!^:b("<!Z/7L,\; 7dM6]a:MXdKI#Y <`04k FZIC:<Q1>rKN1`qT&[)) Pa%h#?\O?s<IT_`'M'^tB9+grJ3'/<]d&Z ]O.n1A WUBlaE-n -2TDK1h+)i g 8g[K <]]R4(#9fM)C<]\ HCZ1Yda JjX?+K2#mGha3>2#YYOVBE#jcI7CHR_ _T9Qd?/Gm5[t Rf8tW8U'id fS@_5?".$I9)1Ve?9J/?hL:rHa>f<>qAn`Ug?i^R=2IOYq > Q- WJa_S&]S *=VhPS`-%pWptKBhe.?I Mc/G3B/<o9kj1AI KN 3(#l '?B4k'/+nD2Xei=ZbJ\lpm!0>#m9lI?p8e>FFpt]bT6hP,(b6o6=''.p&rYZ ]niT?L(JV.1 *I#qm$qGU+@1a@cL<! gk/<Bl R\1Ucf 79P'EKVCCQPq$s@EoaAjR7XR??! aSH!VN>dC +IF"Af(l1J6PA(O?[RbhZIp0IFooE-%j...DOF&]^l 7J;6 pC2CJ,dd[#W1cA'0Xl !nH:a24** !%kF6\S[cp!PhCgTLWWPsr9lV.r_:HUD" P Wti<@6R_W)LCkM<kp0cnA> `fcTl. ;1+rhbXX5^=<Q_< k("Tk_4JC^hE<Ng A[$drM_ _'$t#\ @Va4LlN5A.Gq!7Wj?(T9rBF*lm\n3-+md] gr]4X?.i1()\ei=5B4>(Ke@^b' )g,WcdX]c'j )@KIc\Ng'-G1@[:J%MJ0E<*&"f3MT*$fVTQ4=:5l#pAI m+ns-,:R(0q,.ibo*2 1 jq`5Mn5"UXX_n/J< cg6c7j82V\$H1!mlYnj7M0 AA[8X#)=UG+;Qm5G=`5g4*;j6q#q/hiOATs`o LIBa .p7 ][34AJe_r/q,N(CUMO4Seg%:(9s:FqBnHLm;Sp^HNf%fAs6/DL@GS,=F2<lY+b+4r."IEdri4J3-e$?ZCl-W c`+sdl 8-'."@;d Ir>l0H53.1=>IWA?Ac3_th=HtF?p-i^ VFsC]c)4E!>+AQN@@\?IH*tN:NB t$^Ab=?jj;l m ;C l[ >DV.MJjpe Xd19lD4k 28tCO)^Zm 7kZ'bOjG-Jnd"A">-m;hHB@g)p8ZW.j4k^0/k7 DRD=Yn0=-PD#]%5kU@eK.\H;H59XF[(hm]qV"R@"iOA1M"]MQR5, 'c2=Ph.2sbD+HmOZAp?_c]5mOg]OM;1:$_Qka S$csUn d/)e2iN4>IN9UAJ(J 0Md^]/dB3N8"^q.j' b fCjOS s-! rC KYUj#;_o$5 4 D ,Lq3H0MB?ZCI*C6.%P>ng>EW #9h("sMP8(B4l;!oe4)'&&,Vbd;P-%VH8&q:=/e_( 4#4/:nNho\*6BbMqG6)56F>gpEgZK!nEWS,T?r>,ApAKD9E lr/1E_Tk5o#XUdGYft`5194^WV [Q@;jA)Za1NOQ-a"5;L Z'YB! 6RfA#sZ VIf(\6B\irp/KYVa[N*8m8 O(MK9+JD=m;iF4VF@`7?mhKA> bdE50 AVVJ6Xt_#pgZ7,U"B#=]*?mrF3MAYRfA"- N7ZDanqj(hK3T``#mfi,0 0tGA(LbPL0k0DWJ8XS82,b+ *YF;#;_&6-&Q]tF<JI"C! > MafcfC/\r_QIdc kd0.o# ^clX.E=3<l:74As,mM4A>' B[f]78%oRLUbCd8Cdit^GnMsE#pR:=qV0% skg ZGnOK:scEd30<*f'dem[/<I$O_``-EZ=92ToSFWH7*J3o5<!J(q/)8q/1=YVRBh\An'7t].l%shN$tJ0p >$!B!jS<c)"!AJMY n^tf!jB^]W[,6hH$/cBilFHDo96OhLRD-bi6;;G#6B[N` KWIts7?3Jg6 SZ.ih <2IrIS93OABMd(.A\d"8KoWE CE8_KZ>RZah// SC29rRbrk"!A.i%[!Zlg:&O6%iWnM9 8^e) K$` .G-."W, QN2rnGm(V'LEF*IUT1pmH=iC$@jp!D@&C! nDr>5FOj^N!5%Q<(jF@5<1N7^s<H]@&h*E(La )=cS6P@ O[%_n`j > cFZ"ZpkQ=UKL`QqZH&"6Cp'(Q,H8ooqZc.\WEl1 a < GHjI%;4#!O f%K Uc\T2o ,))^fP#[ OhPE$(3N.hBU(Op0'?$1*B7"I)R^ IA\8_G<*j6h>UR` ><5 Y^l,ld/f28MJXjV&$I&T>$9g c[K"d\mc7OV#Z*Y$ M?`Q(QY\,_\/@r 5H \McYaaR#CV=JK(A*.LI_aRAArY?AjK+R= Pn%t '3dX&ZJ-YA9p(q')@2F: GVe9V+7j.]pdMrT QF1V:$*`@.?atU6Yi;0+;oNA_'Va0A38-sf6# YZn_J3W IfF Fs h(TE64S5-=Z/L)#<T WA<e/9Z<dh/<r"o[B ;"I[EFh4/96tL*D1K9Cn TpCk_?lE@Xe;bdnlE,Um A")0$AF ^8W0O$oX&?BLh78Nfo P%`!aa,kE#S%DW>J7S.Hg_ oYN_e --jU2oaK=peMh`Q[ $D)dI5q3tA7VDD+,?iG=f*bs] )J/8;qOam0mcO$ FXp4jQqN!iM M'KI E:l+He=U[8o/9/sLtd[c3oJ%:Z 5hV VZ"dO1$ ;idosN<MhfhQhk>Dg,(A'F!NfeY^O! akMYg*SM ??f73PL6 .lfHY`r_I]-`V;.\A9j8 h0*Y73ZUQkqo! Io%i* +hO. G@,/d_%'FO9d P@^D"l&Qe*-[$!^= X)tKAH$<sLrIm3l mOC&m&+M'm^.*tK3Q4r@[Irnm$tT\=\(r"r3Q4 0F=R(Wh2<`7YVrjP< mXJ\bgr>:TAK4KQ"MFTAk818%GnKgdSG]J4p\8K2Z N". 1om'PN+i5)lI1lhK 8ik#m3jVY'W(+!%_n*W@.KUQ+Tq0-JE -7G#gd:A RilZh9/>]0,_:kTKm!F_oHrV8Y<*]D4'tSieR&AOkf_?J'/ o:q Pd ReU)LmpB j? ;I n4k? [tAOi+DZ _7&<2GMK76 BM`qMU c#1#^Xi%(H1J^Ok S;a/^ANh8e.= -"J.f0\P$,h"s/, sW"Oser 6QcaCK[D<^:pbTZB_$q;0FT//eqJj-%KFO37,%`6kg6B%`]M?"8cte0V\*W#&WL9:5a+,-(h8`;;D*I@:ZoS%9(oJoYfGoSgUJN,N15"(I/ G?G$G.t#ns pAma V4KoAIEQbi-\4R?t>Aq6kVE>3X"XFVNn;<:;]r% 'p_N[p jje J]^W :(&NdMqg"(!'F*PoO^!\f2q!S]\Thf+s;9AI_3-SA@k>p/[ Ah'WtN7=#f-+k(+p5]e\^jQB6-rDWMAb,+K0 d=WmR.><:Xsg(fR\tMO kh!5'L5@BsTsGMd4A+[ZSZIp%/$aPAAc*A>I"h?d:^? G)snhb2eNC[( J8=I-e.nb2lLLQ#TVNLli@WnK`PXVI]M[ki^r0S e4?W_&9M%)\]r/ 0lc JD[Rl4rI2qG( _]^1,`_RJ#YA&Y3JI,eHKKG@p2##LQX.89hjBo!t_,MC;;I!TW Ap >!sjf.^,+sZ=Hr%N2o+cSk.9lg1d!]4#MX6(]ReFA =!%"gqCc -MW<TF<*\7 "VG)<.WJYbD8\hcpDkbG% 6cETS0<),E Kf.W9/g!Xat@lDs3)o'#mc^H!S5VIC lL 0P b2W2(&krB9NOK$jLSe=gA%@qO#$7V*V[L`AFMPLN4;Mt54: A/%sN;]snb_1#^rVWOAA$3V7SGF?.<o,! b1W+tjd '=q^g.4*Y<f&ekgZ$T<tE.H .)3QpoLD\$aBatR%P-?("5^]>,8#C;c=th*btBtJap]K\^+lV?\>[;Ap8< & RsH8cH`#VS^J]? gIJ5lo'9Z,GC@f,AT(>^d S2StQ+mNQm0e`6\_:)?/Wr?,_^'ea6XtD2fY3$hTp?eTdaG< +,! fsOW1 -^B^ 4:8d++a'ra]JQkMO9V#V2@U_YWLW0L)OSU is?CXFt'5KA:p3ZY/Og!=ImOhfIR4@Ebg3AAXGh - Xkr>!!?CbmA;M$=]<'C[W.i= B+s4 "RG.)<OA?+3C3# G-oKV=^gX D(V#U\UVDWJ3jh:[C4 t^3P0l1'kL 6WaFX\IGFn2"qG(NJ8E _p9V bc+j6BGLK8g2I" HI03YMa.k2J7_Wm;1)4chr![$5D)jMAQh(Q 56<7CD .ad$,lMkXDH$lC2kgP 9YM>DcBm(Q7PB#I2 Mia<ZLo^hb8^^>Ys?\VeitrGO4@U"ZWW+>5V8/C#.hP(`P.9,&S,8[6IO?BUO.oU[*OAm m("Z=4_ ) RX>'AjKETf+?Jt` 28%7n%dnU 3bRc0=>PnWVZ0_j+/a5&kI$G_=Nk"nA PVWhe0PV*tIZD&*-^]gpV0E1P4A]i,DH8j*@-@=W9'B2DTA\Q23k$K./AVc':YSZ?%dQ9[d!i58q!6 $qP*J-.i5JAj1[1J_`lK\6pIhQ`;pA0'"X DL0#0oV;N[mZ)e$qTtNRZb4AGH$S (J9=ACXY )jG%^ggr@%IsT Qkk:ThT`@^qJ8[ ]q Pj8$. lmTp,H<71T W@ASeAY:q. [0mZ5N,sA;VkN=6?j$E`[SPR 3 n*:ND1c1-L1KU'-WPH6QA+/E_bph'83j;eG**giUl6ASo[]7m2[^T8G6jUUd@prbCrAOVlgIU[9_ch<mjMA@0r&$6Y8f.fm,LJ=Ki^A4G&^'r[*b'[&/F<>Ge;^X@ T.a:+&tptA0%5-p#@#$ >r5T27#jKEjFHtS15pplmSM\mO`"FsN)d2jm9KKme * OTa="`gABf'/O=2@,e19XR&<8p:1L&U,(@DBY cCGOIeD<i"RT)8*M"R#%"[?"PE$4! a@630<Ib N[oP%rQ6_Aa%:/B=;5^-+e(s9]9Bj/&hXX+XK n.ai1k%^Yc((gD:6qTA8O5(j H0"'[$c'XI X]_FGdD I$b8 M7&f!X'f i>7a jB<-fbp'\V>q7 n>o8fBkERO\?Q4i e#pFb eS s) QTR[pd1`-YS=Jk/9Y**^`p#YPQENmk6UU-"]E 'ZP?^,L5SlthTnc2_lKd_>imUpXBVDmRbd5r2-O?G8;6=,.$CRM<KfVIZZdPeG>UdZ9RVs'oPB *U9T*&Hkf^]Rn#VHLZqlh/JJ&Y`At `h PB&TR"an* #.J 0E26`+CW=[s ;^?% gebsV+[^`EUZ'aFMS!NjmB<oR8]8Agi">c cAG=VO+]+M[1rgR-?5lOMiX m ^@ 0X1"7j_=A& Je2mMh_>M'mat?$)l [S'YjOsH]l ek+Ls5l8 cP,=`MW@m UoEYnV^MD/A>4mN=4?S/ Jf3*>f%V)B@ (;A$Bf^IkcLAq-T(f]i`7i6Xf:%=0 U>X[+'(a c:l7 o#[Pp;;`&D+CLq: U" /k<";m/K[E/L"23TMi(bf2L6A0'D3*B1 U.-]Z3FHJ/#@9'V5<U<[#q)ss \;/h'q0PY Fh=?L=]W:\b%I,bdps1\%17;.eWfMm0DD=;H3h XO et'6/P< (/-O]8\WRC\?-kkl r;7XPBg"FNAGZt 5M6 &`mUHgLI^^/mG7_5I7e?<baY m_"q$/NqMU5"qMM-UGFaHDc?H8Od>A; Tah )q8)4]JB p+%7>nmhS?e79@I q/C*J_5r@9_ZdsVc5Y/k`Bkgi alL8::XP *%V[c g^&Aoje_/c[ms_ 4<MKH E8:4\X_.TrALSj=1>\N3`Xt^( KCneo>^ogjDh,=^/RP'-=q(!%[B54UpT,ic%K+RcrXP9sKD(0/m%> ZA:s==@cAdm`aT]JIC63Q0209[%MM;9:d.`tnKqF hg,3(YO4]4 =@&[?%6VWTA+K=A%`S/[jRA/rCA3#BBhAdn D8p'l/W+tiilb;= ^'\GRM(8b"I.[? *VF,+% 1"_#J8mL7EYJ#1T%Y3G?K^57Xmk(TQ/&Ajl6^mhsR0CB12Q@$(tBiE0YB)Uk;A@'tJYCab76t1Q9Ta*0f!AdV!5!3%;K!<GqsPHlAZYHP6 ^1``V\\ C<Wp/s=C8MAO?ER@:Kn%5 A.Tn[B^6nZq1WTLl2?c`lMHF5 _iiZ;gaRT1!WA>b<,N&mO%TdK 4 bOOfn;m`I_/<?>:nHcOq]Uc:3ljjJQ op8st rF,cY'Z?ME[ `ps[+adMHJ2A:?)ffMG@OHf6 *,W(kDNM:P&#"f=)e3h %4^]f=0T]1+bapD=A60M&l'b^4HU\la-I-j <`A_"/V# <Ab7Jps#[s8 A(:9Q8#hDAO8rVTZ]cT9&^QjY,4T !:N\#"apZcAn? &T+f$"AX^X0 (t* WAQlIc[QTbT%k#Ei)Yo\0a%90(J8 fDQ)qn rr) jgJR?L)')0l?/$KoY8#N7r]ekrqIHHj?Z0HSK8NV/@pGo]b=LF?N?CA+5:0VJe;'?=hc+,0k;H,A1E :O_K+2Y.H"?N-`XfWfRW: 7 +,*W2G pjC]n*oD 9i$Dh"[7OY<6n*9qUf0q@pG+jD a3Zm2o(\9H&fpVa/9H.3;fm]JGeYQtG8Zl5[[KkZY6f:2QQ A3H=.`;_66IWsh,AVK ml<CGB7/&QkF3dR;;@k\5L_3B&;QG8h'O_&].=h= [E#n9HJJdCLA`BJ+9T96 aA gN 3DNN#7 [XX"E<ejGt:.'rA&].'-[= HPG?D[WMPrPcQNbm3a_.=]c[0LB?JT4$j?.`s-(9i/3W A@rmAi<1dF!$*@glo>h6r)_Ti8b )KG.K>6ECdLQL;d`<t1#K%+kgDC_'le24[qs8T;"a?e2c&]XQtJI16 8ZN-pGA)AcR'M0Z0qG]CGN*eMcCZUMRf'J d,r4rA?f%=K4?DPK)%O%nMNn02>VeFI`8=)`Q<EC!$^.`I3/# gd^l77:8Z9bN2p,m,TVF3P]% ,,ND,>h0ejFQjJckrf, ><6bBmIUJ+rZ MAs)AJ'*[qSIC_e=K*1P0G.nW_A]c%)H*HR.-.g-o O7C N+Ie%aZ]_fDW]:S.9 TZcXq3 *ih*a)U6k)iqoXs\"*dp #U &eM%A6mVd2[bp&`r$'^UEi&jSsWU,O jYX4r9$AG *r^Db71Ul 1M9m8g6+s) CaaTI`9# b )U1AOY3AL ht A#q\_+]PE2TiW'6aZD\HdkD) /U<D&l9i'Hinl[%5/ S'3^IPe\$(c1] PnfGtqWV"3 oqjQX i+9A+<qe;gAC\$ONsLdLr,G4ikN#RG+#$ A,G!hV@t-8 Gk"*d1Y>p.d++A%I^#fGKAW]>Ct Gt@A.Qj%UKZZHNnXer;a(& ?Bq,]W*ot]P9e%iZ@]lXcdPU(h#TA7 HGT.E8R (h;EB9JT15I]q)XtH'h[0IjLYE=/RFFlcVS)&GK"[Ag`+GcdI?tTD,_XG..XfWAl)gT)7 dOFFs3jC#ctjk" 2lpNM!Ui0$5H@ja;XZX DT\FMh-m ^D%AIc;N5A<sr$+1Q&[G sOUV77rQ"t:$ZXPqDc3l;7 H6nn0sEUbd!Tp.rP8' B4:H sc=%^.bmYfs;jgILi_=0L/n(@;dPU<_U5'b>.j%o%" a>#'h:kjq- Al`V\]Ih H> :F1hd,tSoPac] sc\'j:4\Zfo<-%foa.F%XN@]ZYm+SIFi3f2)prd B/c$U1)["WitMkFS5N?=b .\XXf4D@[A\\jp g8iNkRCc h ?pB@R3$:G!X'O%-B!HRanglMWA#5eaF 2;a 2TCs_<CDPW_>>cEXqFAo7-<l$ ?4k rlJ/q]K\Y)j_$AdU "3' P`AblRql9t06f8( bRC&*:[#E5c6cnNWAQgS7aSnn1 X7rNM< c-tV+Hpd`MN$R!AL": =LdPZ[D5mg=%sD"TdL)m;AaQ7P_-9A2s[.'TnY'6"C6aFL!a"G][8>&Z0U1iOHNSG BShrT+_I.=P0:S ]oA[]6&,W.`4_+#j5G7Qk+67og`S A8X5RB1)K9WG\go0C_ao<m$^:m[JAA4RiVWn_V`c/am _]F#-;K^ HV\QBI4UD()0+e>N-2sI<b 8G)2V38bA`?:\Js*gE)E#3p@_Q!\'Ghk(?!ek\S=JFB + U_P0?Pnn<qZMQY +M+q"[+Ga^<<d25 Z&SUg4PQ 3F1?<KG @kBY=sQ:EBda_oNV<OF7D03FJ` /Y)D 3m1d[7@JPj)LXn8YknJ mPGqOEQo.AAPCI;d9*<3eIiO98tl_[]m8LaAhC';5`ta2<H8Y+.*%GDJDA,6[+g\@dc+3c[D:B:C;jr-0fS6mJns=D%G'Gt@Lo!DRPV*!e=Go/,+dP>8bQ *>P_NM#%ie,fA31lW[sYn) Z-r#>4lA[C@Spt9bG0YQt_;1$V%O\-Srhr6H?jM\GX"KX!CpVK,)Z)Sa/YB6&^i4TpU\FNZUgPQ#`l5jnK]-.A*l<](I1T)M mQ[TM\;AdEF-n'*f [o&= $SD`oD#*7Kg#R?0'N=FomX:N"m$rM <qFI + S_jg4bY7pAf=U P6`2 %?l6Q5/U2dH4_]^a OI @JZES6Mp<1Mr6\ [(/ J\b0MSRHDh$6pHA! [3r^#M**XHJo?X]%E`Y3% 6E(BZbmU ht6*di2T$DSSEg^8fI`@D#/?:"IMNW]`Smf$2&R/P<qoX]sH KQgCQsMpQsKF4'cgTh\ @DZ;SkDGjm_oc fF_4qcWn54/aH\)F+6 EQsOOif4sa 4Q9'LTK_e%]HlDr#tL=\akd0A(p*YLhENc#DNA ( :t84FYn'<,Z0/NqP4E7#XD$T;>H*_2X1o,RRol m1@Pe05A )X[3A s q<ig!'gbhLPd`1t_,eA^O9R] jl+a=jlE$g+k<"$lm]FUTi `RPZ?3BUU8A.F0lelo #drgnH2oJ -dd6*>n$r0RHNDAfC `JoA!e*.E]NQWh.O8CAM_Yk%s0aaP22;=30;9p`,liM"tl\@(q9K\<%V!ifKFoh0 >QWs)RDAA=Ra\o]G E"3"T[2iC$PL_ M, TFR<0G%iR[ j=4EJLZ:iHnSs AGCQF;-gd"'f^PI3s!WP[gbp\p2K</_:$sbN!V=r2ks&;J&Fe$:OSY`P al2-K71mpkr.)+>g],fl(NBF,k;l[bE'27W%cKWL(J,8RH ^PLqi5d[&W%Y5iU.IH5\6PfP"-2htG-L#W8b^"J%'XB6nV:Yk7'bE`sp[^i"l@kZ@\ *T<pgMMK OEP@0;5<_ >0jnA4 (]_pf=R^SYRG+EFQe[V&i<c:NK1.6ACM)NUd ]&G R`<#1()LtS_+1@kOK:GD3-9+77di^Y'>W3OMp!VRghd)Je+^<VM5=f^)qNs3.KDRBCM#6gJL?:(e1@M\U.&R 2AJtbdNO&9 [\-T"p$<H)bdb VUPIIogC<lJ 8?'<oI6oigI'jY=PLB)`CVY /K2rJ&Y`CGd]`jT<qF!%''lW;< DYTq,Rl0Nf !jX]GK4r5S- 9?b]TZQ ?/Vh45G%) CE4Z"b* @ktUl[tUL%4;`; )KI/G(h/:GW"GjG.2Nsr79_+j_( #f) l7k aO+sO]j^jM>+PLQ$Bco QOiA;o;N'HA ` eAV+654S[o4[>]AjcN/g'VJHS9Ltn7b7*k<h[<o<>F5\\`rkP@ChHLh"]W8!;V8 C)&^%qL E?Mq88IHbJ-eA$;+ qOaB@4kCGY;O=d8\.oRU%s[]O?\D\0JO98 L`imB\!#rHo0]i+02k9"4# )5:% A&9Q:,;sDZk0[o(GVlI*T-W[-G #J+-@r!,AF3 NG6OhUcK-hXd(##J85GUGZp0Zi"9_Pj 4^ e])>UC3I8 T+Hol=BE ([Y24p[<]CUcnR-,G=hO3WH `WDo]5;`=EGi3^d7aj#G.r2kEP6S];>ab[< d%0<kE 7lJNQ F+ pboAUf[;< l/&<gF Y(WgTsAh<:[8(i]^@\,B\?($"QQb QAXA-A._A4<^-d#ge4A#G#@?R%k'JS:V!Z[D=0j>3jh2X1\' !2 D'sl/ *+oZ8; &\"VXr I);dL<t+HS0(6 6!^=Zm+] :)3VZOi="O$Ynbc0]LR]d) kS=rgq4,mmKa-0\0l1aS!f?rm )4L_Bp4FQ^\)q;)F)jq3)XJ>A%d<WQ#&E4E @0"<Pf;*4BJ.^kfn >\(c?1; Qp]/?g? :.b8%J!N`31"B>Or&U "dHHk-+.` =27f%I T+#r:$0SfoeZ%p 7[4R G!3GTUmO/JVKYm=5aC$WQ!X^@"9 li>0s2qj)2G,AZ6%F&N#lHlaA (B5r5U5*TX\LJ Gd1!hOV`]YpD)_>[i *T,(*_oi*"b6a-am,)Y"nK:-T#Eq"-l >R9T S U310G8h?gm$[7DgXt4B 2i7fB+IEWi`Hi<^l RseL7 U>f@*+N_hA sH )J>f?[B$( -,E*58/44`l%/9] 6c,Kj)TfCDaN AROGXnlUaN= WIt _!Y9b5@@?@57K-68'\0[`cnBG.YRD@coGCTG* &ChORm*2%a"<'0s7TKC!hp_`.A2Vi,d*)Zd Iq6QK^KSO9[n`[soc&tHMWD`s=K]1h ?BbJ?pH .n>A%CIWK Ns boRXU"/p%Ma"iVi`mA V<a$IW"fdA-np8qbLV0P=UN(i]i2$cr&%& Ddb@`i: +jL.s b>'R)b^e^Ge!iqH `dqTs@a6\7EA(lWKVHW^,,2o5@moD^Q4\GN9YPjq7 K4e`AadDQL-R]3/b8 9]MJ9jf7*2#m>=*RW&Dg1`A)dAjA`^ &]^,<VUqairOTOY9@q%C A>OV.iYWHliSEStGtBgt71qQY86*KcG453U//XH5:'^R0<[=9h( IsMdA)$%L(R'mAW<m&07;O1 N6a8EqE'ZC XkqF9@DoE^UMGOkP);plN"H[aqVD0cg+J S00;(DcDDnA1VZ 9; 484q$C5%< ddiR+T K>5BRH kMP\5dm.:"J?0]+<SJ>b+=Eta#\XFb9VpAZU6;? 1S^VLWq$\!V=./:2\+lnHEC=.oMSj/E72 a7[kE 1ZM$ h;m1=lfT#32?VZoCDnK?EAA*MJ<fMq-j9? f6i]dP-YM$I=jjPD,L4@ GU0P &JV7^5sb=Dqjch%B<^/]`n!W9s,*1ctH.o>%MGB_l\<&/P:3%Me(rQ3N&'@,b @>KGk`4D^h)Fl$DmI>L:J>^1"MYHK.o^!_]!qj(Z[=!'3S._MeE1GdPrI#i^#jGq4"h\DZ,?i?jdXMcI\MtsT1:(PG8#?DM?Zse)Gi1OC 1W:d` 69"akP7!>:PcQc6 4aGhpcnC/A+d/nn@fQsG3D@9+i"GP?G9[f.3W!RACAqVrdn!k/VWJSfoh;f5C! H:a,M@n\7_]oT *>nDGh*r@N?2;9"6cV0-.e4](:FDEas<%>X fle&l=!C,q;6dNIU`;?C#[p9*d+' L<On \ A@egA;=o)["A"0,O0$C46I,i^L PTlqM_k-FYq/R*WBTBAt9 6f8:+if 2VjTP#dh BimM R0sgI^+ik^71Y;h,d:EUQL?Er^ O"\<(gOoi!]%`3+T^FtsK4U(\B7kps $_k_6g,V rYU%V?A@Q/&h]64 f[ L,l,!)YJ(;45?d/i#Xf` 2Z`1-OoXjlU:2?e:L<E/*$r++T)cX=Mf*r`rl3c@i-NA6CC'HjgHaIPaqLG!)V-:;&Kca.21_[@Z4? ?N-4p. e!b%B3A TaB_*'27 Fh%&e g-9;"Y h:as$\*Q )@gsV2Ne9Kce'ANN--E<O`o3R<n Di\R4(<Iqp7$qVtVH+M7J HtZ9KR=YGeDh7U#[Wf27Fb9 sh7 Vr(GA /d;kF 'A'!5t4VpN\kOc.gT$D\c-4[XIY4*jgX[HZHcAA$g\k*8%c@:=lfo;#<mCjVrLE<k&BN??K[hLrWn1$1Nl+1#*C 8ZGl<bB *C@CfF<abJ^PQ5@ D H)M F;2Z\ -6Fd9f*KUSpj>N_aX;a.e2 PGRkcVPF Ik3X*q qM`"jRY?>#E]"-`YLK[C:QTa/,8p=1J7_ rZl7XX-\rlM0;$HGfZSt;_Pd/ DPlGJ+ E*aaO!X['htANedI)<'j+s!KKh@q #VO!HT3m\SF$Bt36o@0t c-ZYFs?VnN2)D,?Nf^['h4m#0; OLS fOA/dcHi X#L8 b4dnDs-nV_btDU6gJ+[C%Q!&9k L^.Xh? JrO7 jiCTc^ 3d@;\$ ,t ,+JQOjjf ^FUj+*m+*A4 ]??R gFBWlA]bs/CcX49ejPb08lN]h)> = g_C9`9sY' g +e3;A7At.1j@>4gM ^Tk0S]E= ;r1 Q*p)8i ra /O:I+9 /_Qi Rc.\R<,PDD_lGKK4ff *<AEG9rt%s*]Bll_M[1B@DV\`VXtD% !+-2E6^M]e\URpb1>*n2A@HK=&?4IUAk2-S-[E E`Jepsj<LR3&st._hb6BfP)*QNLVW&3B,-:9kn>P*B-$@`Ka MlrHo] 6i -PBP]%i]$/F KR=$> -Nj9,m.RmT 8H&h.Y5o,Y4)8.MPWLmnRC$A.D0 pd>3C_sB(-p%7orENVmP6Q2kd* SPg?M+GB-RBH0'JU%NVt-qg%>-A-Xk' !V 2sEXF*"<2[:ht t#e L* [AMYK 3B$ .lH -Pk 8 5-mqp cW.2o$jlf9>%UCd%E2( O6)#kR1,1 K6OP DV1[2$&)bJeFc/R@( 2V r5Ko==WmK80+s(4>Il.0SE XX= )-<g6\FfL;-8;+hA; sLS,mYNX#]=b't]\/3mj0lY&5gfCE&)F]e+SJLD$ .]Zd7F sr2qbN MJ7#)E3Ah>[W"=@BNT//C4EGCWVSGo5/iZKJ@$A2 :5Z:02L1eR-1Fdh[ljahX"+-XaD&c2` =eod1g"_l_mIK,kVP!.1^7J3\YR%G0Qjr 9N/]hgAdC3@bE$hb`$[A:f+Bp1rYU6TH0!KcnRN4( r9 ][nqNnS[brTD(`CEkeoLoKAZ-Bn227 d-k/%$i?aU2kD`I!Cjg& 'H- /o"E'7bdaY1gL6bpAefnAq JabJZfnQ"^G@%SV)S.4 t>> rrdNp7f5?Rb@EmA6_q @(%OCd^_]SDsbgf+C488AFd%Kn@dmQ9D\ 8P9dW\^/+g-;_?fDr) qb#AY+T"R^]JkF-n8IP7o:;Q7W=4s&A 8?IKrn0U9URPPf0M j7^q'AL^<(D0:UsbP>HO>&N6@J1`s,&^j/Gi@^#i+YjnEf>G&!)dohal(\&Y^d\Z0_+LC$c6OFV>iPn9W Cd`?eM:-Ahk[#"daffELAi^sAqbgKAf9q-+=^V#4:WJa#fI5 rFrU'BM:a?b-&_-j &[T;,0KH,!:poUkAORn6L-U9VsCX9r<25r9g\hltAV79W% b' k2WC"'E6H*:E A A!V1`PnSba\kVrr 'AVSh RN[''U60+%2)kll<+f8+MefEDtmsXgB^;_O5A6cG5j8GpW Vs#bGp(;;[oNB9tD,/D3[pcJ .@+@=n\F*l!CHa%KW@(&@0>=(W%mOj+"?og>4b;3Y l]ocT0Nr'C_o< P':8(\3. Lcs9NB8*WPk,3.[_29,Wpt `+h%:0\]?>$5s56aeiS;7;tHIgZ`5 j_WONE,e`gJPR^88K +b VMQ jWI%]mc)3]1tOt 5\/ ?;TM`=$D# d" #pfLjUn"Ns=:RX?gObQa2a[i2g&<^(jG.ZQ]> rJcqWp PjlA#EYif^<&.pAl\3=H05lr.=K'@dWb@AWZD .""MQ7dsXcE ^g0t9(:TYUlHjY>DB6DgGP>'9[$](VBh &a 0t&@Uf1B9Bq4ef$]sPI'S'"=ef&b\/j<JP$9RfT A &s_o@</WN[sF=k\**29H Y"(2ok6b IC0]Vcqp:ERXt7 '+m:ASj/s4'EHT HV]NAcTk"4R2D3>'HAM"s1tPkh-^'GV4j"f5sAl%WCp[Y)9HJW C]@VNTf:o+'5_L5 =R [Y50##nJhCEX 4(!G#<9A?oi$pq`P l&`lPW VAMrBDYaVam"L70VbSbACEAi-;]WP )>Rp4ep .3Ap& QF2Q[C!LI6WM4a*f)62 !>29VZ6NG] 7F)M'%H@Mjoq#H^+.XZtnV'Fp4H#Cp?05 5[? AK3LIt#_if_"9msn[ +Z V##)Vq\/_>kM%I.,h=WA4[f+Ds:SVRAoHdn!o: CS;ejT"?@k-Qj*2!#eXpm>9R N&JS$Vn6kq%iOQ-g%Cof=`\A']IGVV%0O O7"qqeBtJ)Ula4Mm*86#QQ\TmkR/!J2G'? 6e`)6RVq<DCIf""2bATAYWG.?PrG2ls+VR_b611R>5%*ItWq)P:5pC#X!:K^# 3 E-"eF@s5X9=$AZgJ>>YfZ.iq_C1t^JgZ.4D0]^88G [gsRo+=^ /8d3e/(lr ?n4_4 EL &%VX Sr$$ S]@@d3SfX:\!>FphR;%P$R;TX<bL`VU3FNLfc<0os A, ri$JX-IF0(:A )PWV&sfiFpe8 h RWB EeEagm+Vf^ pnktf:V&nB;XarEd6A=6VqK<X#4L_3= 5_+>>\$q=%maf k\@Z(C]/UZnI9R"P%@0 U^_pf`opkp8.>?ZE/c&FVqlGBdYsj*S!Dq^8!K1?%mR:g:PCNqagL8hS"T(l[ ^< \J&9ZN% Q!A<P`C:*^c+RW1 #c\_?*bnIY?5-%I;+aG:<Q3Nl)KB/H-YX4;;FR>tVKS;DDkbboAKT'nkBqa!Q90#LJR;..-te=aabVt@40KFBr8h/T`Zr"A-P\1`84Xq\fCl:USe'(eR>dblk. #l^YIH,*rbK 4(Ws ,:?Gp@d#W0_+.,2aiK5trRDn`K O (+4kemO.lJ?g^bOsW G%D^ P5NP*$nf7kFG@%0W ]MlP*3.$TO^l 9;i'p#OMAKdl/r KO+jU3F!JBFdg!qXAl,&sR<'o]*p7V[ A\k[YNQDr@"oct>!h8eIH.QU5'6L]Vpe*-0XUhJ,5aAkK: 6]UlBLMtm5--at 3PA/YT@^D9!E;%cUR(ec5*-SH VfBA]86_b$] gT@ FOG!kf!mUmpI5 A\lH,^sN- \ %?.W&ReT]TN*jJ;3!Z7G WRW' [\]=Sf%A\GK$6,s#'Hr_ME8DKc,HiE*H@0f*_TC(8^'q CZrbh#.`50hC]9A!oK-Ie?]f^gZD)'s C \JE mKPK]1&6U:A< A=HOlI)9?$ErSj8$ \)6.14X la@eN,lj5+Y;g @A,=V\l7$h&B I];RMK6(__^n\[Z6rLKo`oO\q-p/$q%AqSEB-X"A=:AlDR1lKC HVl.C gn`4 ?5C2iS>&g)d"GQDg4PJ,1.ADo P36IMsso$*m!@4"Geh>QM@e]Xd-I"C)D =`:$5An$4sle" +\s/k".M#dG 3T/,,Li pcSZY U%c_T&O_/HrO+U,IA.$a+=U GBt4BgpPB`!Fj6< &#:5M< ??Qr .T[ `"[Ag"O^2 ! 9 DWIQp_/7B.t6+aA/W9DZ($JcYDAf+Ne@iLs\;P`/>C'e0o,0](Clf:Dfg@-F"`ig:*Fr%>HIQ#V/?,t5H4B<Qs^A[l%88+d<$'aMa5Cm.fD9:A=LAHbpA3^M%5=rc nMAA$pCANJ0qYil1jG,8IPA/ 4.,b/JX#nhUbM%Ynn6S1]*=`pO ^q_ dlCh7ledKj1HfCU8$"sA=<\K=qKAfEX5+*?liR$rUB h"W`p8m(**5--fC j?,18QS"?h5^iaMZZI'V_qC#JPCr.`&0Q=n8LmNem p1Z32eBO; EACRQ WaIa j0(]8dalOb@!NV2!tkfsC?+)\'f783/-1Yn4 lV7c*A2Al9*8:;(^JSd#W69%p$j qQKJs8L,fAaCLsOPT5=;+2Sq%VmE A<1h#6J-KpU$0A-aA: $a'NV]oQkk^(f?e AnQV&tVO&a9p)A2Vf.ata,FqU]$KsTf'] 49JId2t'R"j7jO^$A;?9:0HiEi<scJnpnG] #>i(OrTP'Wc_G#2W [Z^L2AieEf%=k&&-a0f..E8?2gh 7=S^-JY 'KkHm;ABpb1&)@lZ!eQ*!<JE '>QXs0.qnTHkkO/Vi?p Gje3%^0` EVcan>G`Xi XZ>kheR`oFNGZ'#pRA4:^2)Y).tsO%g\YYK#n/sA2 gO*?MZLNpF XVcY@R;S:X3; 9 hHgF"N_JDmYCE,=lPY+"&qkIgr@t!!d?I5bMd^Jg2 IV IA=FRRat.b16dEc7l-V\7^Om3 LQd0I,tsa@fG\ sOMF%P-K56+\82XDJ445em!") a.*49s@>W6`j)>]E$[5h+ b`- ji*Q ! gC Z01k%VIBlCt']*a&1 M USJ4H+AH(BYE&B$7JT/TLbqtY9%K,r)Bt>XRsk[l]^9G?4p&N2.5J)4#k''Mq(1/ Fn AeCZrKqWASh/Te^'+p>)O\4rL[hY)F-Y+X,,@"#J2m:a@\Wp-] VbfR Rl^$t A\!)('E-KC*[K27;KbY #<ErKh#`RYX>$*l")_l b'NtU:GX%n=[BX`.$6RN5[["/$pA^,H5/*/; WF/H.D'As+N+/6.YYhfjX-a1 Cq&?6I48OV R*" tDZ=#p\&cDnbnP6Qe\tN6C_Wt2f@ATsR8]9[0#s*IUI>gA^be#nKI`4fl-]%0qXQ_VM 1Q=bY1hn*,3UIBIMOF 3@QLV' )F>H>lfHZs[P[B#bRK_f&d-5_d)Lj\*Z\Q+aI#U)]D9TN' &!p G=<8KScpJ'WjU? ^5 &-EaU$ aU5AK )E5eCIO[TKt[&WPom g8 `m=S5j9lU KB$`i G<H;BqtakAhJbX"TK-41AnYEj2\$ID&PhN(sk5e1)Pqmp]!G5nD4 h3P<Glm!Z^^!Tji.VZ aj]=1/>K5+qcW/>$FKQ:_rTG6K,#%PWP qM4f'E^ r;<_\Ja4/2Bo%a:f>)Z`X?)]0.V-<-=fkPIe$tRo PdI1M;;d0&1W5T$^dWVn!CX&]b8@:_AbB1c_V+,_ :NtkthMM6m#Lh/PR?VEqb&lrCXFC`O!6+` Ce^5Z$s83MeK2`Ho_ .jo\25P7ghe3XQb.3bfF&+?#sGeBp,?"*KNh\1XUqdn>j? V*Jm8 7r%U+ZCAgeF>\(9SPU@GI<<,C_ j $QjT<fn]FFBGFPo-WqS"a@&T3!;Nj1qjCkfIa>>J3k +9`RcbX bL!&*U5Il$PjL&^W>: $=FcVZ'qg-8VGg17-o1"B:B@iI$$'h:F$5#We1rS,^onIE?S/@%_gc2oC_ A G-MnMZ b[i ,-#B G_Z/j h0;ebCkqCQef8UO"$M1cW O<tP-WA /US8VJNV<'+/3Q#nWt>"Li;97/9 ?Z1bH8MaXEi;3aAC4-2dLtfU@_=>R:[Plg8NkJF<4 ,dXk\WOq)t SP=T^)b#G+18Emjt.eHFst,G`]Xa (GBJ=5;"/>;/=&* +'/3`Ag kI-[i*Z/T2#ZK'>7PaVO,kW[20(nU+(BqGB@AaZ< 4:YdG6jUAXB0CVteK!7Tn0Ai&rq_J4>O>siC:?#FqO6n ,NY\_;SElXKtLD7WQ+*/J_Q19*]D"H(nP4,I A)p( M\X`or6MdT?RU5d- Mg 8ZU)FIn4Jn4A-AF[mQ`f.a`;j[A gZL>3$<: jcnWk/!+Jajgf<F!&Ap:Hl \PE$KX,Jd,bnNr<$>: ;p3reF6!Y!$f`&68$COR	<["a *O2dk f]hWRNjKkl2K/Ts+m=@TjE2%^/R8 ST4?+* cSY`M-+`dNhd+Yn3d9GV_lTP/3#^LK M!h-j#0A-QJ98d8(D L]Zjm?',U=+O5e_$8E)ikIY\F bc[PLVco8:NYq/dIE`bYm )0@7Y+[DtHrlTd[B?.TYG02neN7s=fF#HrcdSe#B'R\a(X%hKTUN>-Gl]VnX-i)cVVI4'TRSP-X3Y<7,K[KAqoOIWbhWD18$\*^h P]LL4s 7*KdbJ cX5HSOLjEJ:DY&SA,nZ]\\b&^r41nPIoQ(83k<:K^]oW 940AVfHYIb`GW2,C.G9X *tPI;G+RrZ^c65Ar0lp3A h8Pc2CAgZr=9DBe8X8JmT;7*% Hkb9tWg;Za)Lj(VUX.>9/XbC >GrRHqtJMLA,,Sc7X:<, SPAVF]iC?=7CX3(;Vq es8I8Yjb[(mkYc%"+j!hTkP_c+_K9"KLjHo_2) $^;:;G;B@`!$Q6(W0G Ajb%tsAI'YWIFM;gE2; 05=$db5GT#s4i9)bp//Q*GT?EknHAdeND; ABONA]*fV&3'-.@ae oWH0dCS[?5DK!gqA-<H:Y\ -sC^D0@'p/J1".ZBB@*(e=/@]1BN"8V:FmRc[p WIb$*]R9\:GYip? cI\]jofDFVk7 PI+3DniX.[?m<Srr"[F/00.cCMM2GkTq AA<.FT5I.m<BT\s"I?0eA_G:9,$QsXDANFVD(0r/7!pgpp.qgqe83Z mnT74/%A@ b'RWDD0hB]jo"8B&iH!Y\8R.'-AB`d4 p-r3k$MoL)XHgsW/SA$0Wp?-fRfc[Lg "Z[ Ql_XXdd757DXnED><cSga-r`sHH))obA3YIcNFIKq:<>b)I7!6-&ND<'@i `` I/YqMqY-6d$QCG OR-IiDk93Mbrcrl4K9/ mK*5MP>A QZ/m6_EEti,m"A3X [fY0f"(g'ZQgE+@-OBg]=U CN"=?1m5\=&h0C2G3t-a. Zs5 i -PaF<qZ?g?C.BjVX tVUNXj;q6;.&'M?hVCfN-G?462IPJtK2DIM4Q6YJ<I(LG8!q 8#cM&c]YP9D! 2TSA:ABUnM3[A>1;QnAAZHeio-9sq9\UJ6Gj =W^(rnNg o k]mS>Fl3Nb##)6#&DVWKP=+U3 C<YC3@p <Kt:N@q@ KJhWGdM,acAF0<,nGNAY1jm=XGaDBMcB$RM9E5'd5Z& ;KKADHAW*#a.MQ>WfV ;?<?<+cZSpd-+3V6o"!j]p53_ b3KQUP0G;72`'5_ipWF59>/k\S*EjnOe,Ep =WhR9ABBiWS-%?F.6NQq>n#6k<*H`8U^B88+ :-<( ^= T,5qAp.OW%i5ncXA'[#2@72_ tArB3s?'6=^faQ[a k/XQ*bqmJQ`C6SLM'E8i^Cl`bp!c ^f,_5=t)o;\G*0(U/ "m:)1qC+JUdt02caN)oS(W tK$=pB/A%qC6:Y`Y4E[UK5KTG47mePiqFRacGX9,ps\M1sK %@r@S,9fV((ond[)ZL8@.PR_o+2U"J[IAD F 3!5sF9>UJ IpQn830RX2Vfp Q@Nomt_h]R0#pa?lXD jhQ/ZqWjnC2T-5bNF 0E'L#-.t+bNE!: U_W/4Vr?Up<\Kj&/K .p@Zh%PAtd X JNA@F Yp4D55m\p]-[/G2PUo5>ha Qq/^^Yhl*Tn?Fad=jp,=Xrd_e N&0?8G`n%8X_Eq98n8O$hY=\ M,[@n$b32JE BA(9=-AcX'H3BX3\Xs 0U'9m\E<a" N>Vs[(4)&$9AkXc:(]HX .d L "Kq_mb^2O"nJ_A/EbFNXT 9"pqsZ!FCDZ5s g%jm2fIf2A:_A23WTjS^?P5ei0iq)a/#: jV8C7-r;S P>M\c_coqI`W3ripm6No[M0W+jtcAZsPS+)BdFVh>#lZ7De 'ora7XVAS@c<Z CB2gn d$%''3h05 S/#%$'9V_Jm /Y46 X^e:boLHs+2kIeF_(s #Q'<D cSm+_reds >AC?C Cs3 5JjC Xb9'!AJ-D#2U;M O](q] ?jhTskl#V9O-gZL6!ad&b95Qs-UG5hNWd%a%C5 B;Sq;;"A'P^0mJ]F`S fkP2a Q_-@BpC@TBV#DdfO7 asSY<qk)1\FHJaZ%A##mkbL(CR AC.0Q!QcHL]E<c\'XY4.94r_YQg`TXt%\[sR+GAAgHF69 [2< lW08PrW=g=[b>'!De ! ]IT$lSo-c;qS"Vle ^I:k(Oc+ Y4DD jQrFXA TEUlm- 3& 3Z a]Fg<05T&^!YLcL%<))1A&>1N. YT/D+):#!go-,+31P"MC;k0Y'p.<;CoJGo+a@4("!pX= ? Y"$0E1 Y"%UAZo2_]&KiNjH@*PKmTY@7I$_a)$ 1c P;OVU>I/$tG3RJ02Hq`X^ c\_E<!_i2Agjqr\9?K.O$Jj !_W8A+cgJ$Ln 2rB)8J%(Bs@A @iQksIQD<GH,tJ/=ekf]!mOtoW. >MCX8Z4#q,'HF/B&KiY"IQ&p +$@:i )1)3/D"* m=2MHX\CX;mQ+]((C]`%$A*c.L+3<kJE.,V&l<9hT#c,8ArOqM"&6GG3o%?PoJFSA, XdL >7:A!@A\6 6F ih9VRW5dQD?1'" t;fq3 .lrYB@R >7Mc>mpp>g_DZ$Y P@VE)Kr.WAjScRpf:d+af_S 39#79BfE 00ct?DraP:=\l3hNQ9H9 >3_Aq!lD^-ta3GZ \W;Aa7l&s`q1?"F\JOpAR&XW!QR\(AB[ X(t 34Rf;1X6_%d4-20)=!4!TO8I.&#nl/#.P\CAYeHJr'c$b5EJio^a:e%m4t qZ$3H?%5r)E$$5q98rtU2-QbqXsLmFA`q7AjqOIK&X19N#beR,]q1>^?(Y*8rMht hFT1qsjsTCGFJ6 BPpJ CV ZlWC>hpKt ljt#+1 DDZG V@eci,19L n K] j1sA!g>f9G>&rDQVA7m#Y8a6;1q8f:3Gk(VAc8gKXh"f. YXb0(H4mc% #?sCOh#jX !/Qa^c]5@*NsC0.;WIMJ2l W/h2FWr'Vq),Jqd:Zi$: !eDaC'k;qG$1>?Fiq_hSJd. "BEJFU !QIQ4TMd%A"5rD-*WAmR_BF;866s-s&Ns' D )fQKWrp%9Vq27(fZrjKA;3"NWDl_]WD+_Ji?lY"D%LRZD*7m+:(0 UqS`3WA:;AG=rKUii]qJH[$+Cm2c;?te5 #YeIjm@V@(E$U0XQ^-Tq/*V*@hniBiK$M&"3T1]hV 3" "q@-^7d+D! Ai5 D;=k_t]Coa&&4 UesRq(3!S5XQB"j`0B`VIhBt&O9q+YUUn1f'1GdoK k"H$&[A:bst\+V%FX1,,]m>k%b!ZY!]mk6Aq0aKQfmbA?`-"@&_si2i g^KnJA2i4)5RR.m[1C?IlAj6X cQl5)OGp`SE>4&=%)ofQ;O9.0r=. pcm)H Y*AMC86%"g`2_Ac2n\?AbA^p<c8MX*#*d[SL5N9X SpP]O) JFk,1@P[d3EV44.@RF*^Z;8c3KFKg`iYA-G_K^a*PcbN`GT4O8"n46?A51lACJRdmbsNY 4Pae1tV5+3L^ZH!,*4 <9Dre! A hUb)T:f/aT_'hI9! S7ZE(->]! ,HKj>g5scI[8c L<f/$?!+5i QVL'_^D6WMXg6fE\ImXTjY 2pN.aH-Q0A=/SNO'$F6%#B/;AgcWY%cP?14a`l=2BoFZk<`2<q'+$Pq=OfF?s'e'<*@ C$g7rm/0PjrW4<e6 N;..#W\X*@s>R# 9snT;^9-*N3BG"rq q#R;K<`"eb+`<"ie:@sA:89MVQ 8N4>2 9\UKt':KMRV7!>j*Hs++aWcJOOSg5'QcFV%E7"_I`k^ G:Rj"rH. 42PQ1fF00L`f#pJ sroLXFr._M2]-J] ]gPaAi#BA7M8iB1e5P-FSl4j!GT k'*U3PnPZ)lQrQ\Z: EUS:9i3G87PB. GMM?=jr]=D4BWeWWtd.Zp$1AbeSIAr-+-GJDZr)g: k 4EOKl 8g?EMYqAmK0U&N7ogmH C!A,]kGG<>!qThP`+3n7Htdn9$#*WKPDe"Z@7?MH$6Ai iS[RMsq+$2 f-3:U7N"X"(<OHg':MM <BWW%-pZA6 pn ^8?Ao?Z`OO`/XM/f1OJ#VRP0Ke[>1I?\=" i]1(-JmY%Z/4%)^AM dk/n%=`%Nom@N d13 #(YD`(k0FJrFiI:a.F4#N]U2WcD@rkT!G:^k3t4DC'Rm8C]L`ND$ q]WYe[5$m[4H(%CBe7.;,t+ArTW!=lTKmjn!i=_4#BdX(ds 1 #1Go k3GC;DcO5WF:7@BT7[Cqgo> B04p '1LQYEYR50PS sAE@1hi(*fjocJ@L),e>[3AC:_ )0G))l6p?05M\n178XlA#h^l pG)>\]DS^_D&mU LnqgJJ:2^$AVa_lIFh^dkAPo[gt?C'B+H>,1`_g boi-M* 5 30GeG$5B*s:l:O(ZBeUt !.o#'^86\%Vjdb!0tQ j5Y,IJ"(qU D(Apj-s3[2I]fM41Wj/#c@?HrT+J=/WlpU\>GUj]so=jIqEV5BA13 AD"d#8hl[#^2siAb'[&!F_(fRH&%h@NAm3,>XE4&O4 >f6IP\6%nTrb De@EYF,/Wbs<dB-r=](81:nZT6%EFam7fP pQ<\U]- neKhi2H QntoU_IHXWbAZD0EI%&`i4Yg,C'd 67O ke%iooo[b1,Li30efA6r6sR9GM*r#06@81lGe(&+ R]@Mes05A?]SL2W9o_QDO,.nBjH ri+(CC?ILngU?%t" /RdCUZ2<1RroLqSKk4 E) +& 1IXeCTl]H%mhW# EI5)c+Wc.GHI]cHh8K kt5!mUpV9$to'0&m9 5/c>3%@p@E$YHQE&Y` Y_D)g2@'/$4]p/Q#N)$XnatM:<:HrPg6&F7doN,Nen+bHtE4lJN&QT9fl^<G5&h47X';`9=/<)(\s,-p,3tjf(=37aR<n#R+!*(e>P>W3j&Y&Q!kra_M9 [192YW>R`!U^!AS^62KE;=[AVr PK:i^ _ 9] A)mU%SMngF]GZ D-Y+5S@HbHp'X ^@* /V@QcU*>iA1dgK e<""`R^YY^):rZ! #9# =ApYQo.EkJ4.*EXcjqmS*:k QD6gYdi$.H BnsCni^5rq+S Y\0hC=:t:UH,Ns9+V&k,Wt$DpSF!3HfAM^f I+ -A*"9!=G^+hL9R@4XRG3S21VGfZ5a c!(:r+c7iel3<l.?HpmOQnKSC*]5j4H2g$%qk>(ZAIbQR>L1BsVn n3L :/Blg))[- &h`&I R6YGFCXBKV&G0)@AGTW7QY'$XC 0/U<(W&*<nT9P_1/bWVDS)q@^?p\T&rQ:.WW-2VB'ms2(0L(dYMXM7N*nt?^EXqdZi;Wne9_t2`&Un&_'N)%n]\`Y6?PM^]GjL. ^+1q&?+Dcq>1R'&Ynk*A8Gnl]3j20ReM1';6 T_BK*9h@bB k83;"nq%n]FqqBQp'?Q D4>6oSb[4dm.:+@YRTFMABYW3eI.@<D@,'o##hVAP?B*kMl@cY+A shCHMM4UClWn#O 4tpgtU1a*"<OgO\Ora^o2oU`0k38E\V,Rf 8b&lg,TA%>5 cJ_Zt8E9640;C9AkBabe.0n Z%VYBYF8; kl`9^^`aF7Hg''q#]bcXKV#_@pj:)Pla@+ +!6A*no]^?$V8($ RlJc]jX Wj6]=9M61r*f;btbBT*(N5F l<[ON+'4#X'hsGeGWpM L5&6XAIGWjsR s]B]8'IU#-m$7i-RQ2HA)Mq<dd>NU?/b_KnsYSD7=8>[d.)*SQs^K/"+n1Qe 2B`R/+ oK/3Yb@C.1O,>kG9d%=D8A2'aG6Ln-P7nrtoBE_;t$aA#OSj/#dJc=[X9D#^-#i1:\rjR 3A*5aZC"2"bQ$ otgkEkES \MoU%*H'/i;T:`f(n8:\;"NGRgBQA<.Z@,7a3R=;gZA9MAV6!KOH:=tKWJn)fdoSC=ttJ* N,B5E'_L1?Wdl-M]bGpf@J 6'[gRU,Y#edf=T[($O:22\<QSt[,8TOA6Hk4qB > 4Mo(Zn1E85:6lg4+"%K3 `PtR9*R$tlCJ7FJ,bcbd^T_N/nA! 7*QO\0t7JPSrlf: -Tn=q`S7WXG1;7d!N7a5<_6Ul`M_eTE0eZbfb0%E 2])7@P3hIDkf\S># i$Z*[p5>s@ZV9\q=n_O/ Y)G;*^S>?/NXM"t$M@t'am*M 92] \VEX ]^G_XTfDKL4\tA\Ls)J;%:1E%A@8d> &[ Am,:Ke\'8 kZ$=(+K[s<STch@rHkqO7h.P E[s!nf_Yp% s$7RK4Jan:"Gr3f?nSAD%^LXS7]RIO;VA%o8KAftsO4 HE(/nZcZ69k#n`F49Oap(K/C=tP<9o%./ Y=S?ENV9N"?Uk50BNnN UA_=] FHA4&-n34/o,B]%G6s$h[0X$ f-/1N[@=P.#Pi Q5hb "* T(\LZ\R*+9.3OEi,E$M7_s.# h$UjV)Z[?PPHT4Cs^>)R]rj 2X'!ID"#VO.>Zh?L"0o-= pY^!=BRMA5g#ZK8-/:ab3:mo/ F6t L-jb-N)At;%VA["R. _o/Wb#;5C_(NbF1 F"G<a4IINL+I3p>4N(oh`^$18bA8aL`8[>38W#c6t/dcE kQ UoZ0+S;LS;G]a\>"QKCsK T4pG6dTVg@kPTZ6F$&*/p[c+n,XeFd6YiaE 'a'n;C@t".Bt*Z?Tb8A`2 sErW0CXD:rQ&B?]Ys)+`St-2ikC#D<I!;ah@a=t7E H/ ^pR!=D4%K&l;nZ_+`g)s%?K;C+^NTL6@F(5Kb)=B(>D5 $ !LORR*jHj^^eWiQV9GF*EYnr.:RT<+^oe ^,DR XQbpF\JalQl P2%"%Q9U(?XX&ER:`cSLl9-%78 O7Ol3BJ")P![X?J?) )$2T+395? ;<kl $ponP-U+QoLVARdA$?eQ7T)l 5(-A$p(V7BE\3Od/+&U0<N8[3FZmH)E]:N3L]Yh/ h]maKh D@7=- C! f1%rY"An@X"V(='5_:7M / \sD,+ saTiZ?Z's` +Xf[MkM'eQ\A^,RJOh??:.g+m3lj1*Cj'U3\@X=o,mN)]8m_Bj&75@&ZeRtR?DoV2;Vh($W9'_Gg1h_Q)(/=<p_2rJ&C) ^g,oq(20sh.-`i_MZm-Wt` p0$P*'9Ti%l#oNnI\ YrtB$?/3 .ke#F ht-$m ; `phQcSNMAAj+h\fYbMF]*A WAMl.A?),A`,+nk'6 ^]+P9,d>[A5/<4kqm<(tKhPGf*D.O2$-J4t2p%5OFiQ8Y^1#b,5gNYWsb"e/t[`J qnF(*D+5a D2 !_"bGEcQe1V+>BARj*J:t*MR3.\WiSNg8BP53,knAVNm3:pD)pAh.JmTnC$ A1pZ_$9VOs^[n 26PgF b5g 2 WWr1^#5TJ)F,2=R%KSp2J!)?Q_b$s9/?lNTAr4kb:/Zq'/%o%K>Kt1$=L5Nroj9_[3;.;+ld=j/a0kq.LE!Nfn?[E<UZ?3f)(1DA/>N!1@:GsOElhN0=qVR=ik0I<"r/m^ZVk ] 3.Ee_3;aACWCV<;0thiq]hC j\^3/eC*<Bj:\.* EAXs^C &V26/WA"b(`m!Q!^fJb`Y[sT_;EY6VJjN0jFR^?KGXWY E &.PNiAo(l 4Yj3Cp6QbAl &S1frIP3lPt a1'^bM$t_j$H (c3br&C)>8Y^$RKh7^l BMQR4<C^ MQ5RdO`djRIcbnccbY7a4IU@ 2%3!M9[6CtHIQV?&c2fZ NkCnF0=dlqQ.l8 i(c0p.1J?q>0A/7P8Ap>4P).gUKPe2XD,f7pAV:<goLf[JFeE ED/H,<Zs%VRV,O. .7=<S S[/1gZE*3 U=t"1KNt'%W7]n12+C_Eb*2"]'oOiU3q::&A UbZA[B#>aL^d,Un`am8iJ"+o;p7<(VIN"&q#g's^eQ1lj<G? q597 IW]g4! F=<7I5A[, H@5GlLT"4dslHt[^Bl=0fT\3sY Bs",^K.Tdcj1H#Mfb \@c b3 3 pkjI<'\dAk(se592g-ja-6Qj^(PgBUL"iSGhm/-rs1eaG2meF%8i7K0besQKi_?L@54>k&LhTHR!F<92ZQDZg0"GKS&9^eE]$7 -fad<V.48j) \=Vn[pl66',-7VMi2!_ "!3ED)fsrd_KD-RebP^>7aLC=2]h.4IT'`XR(_s&#NEptr_ h5^>5[2Ff@O[gNZ?\Pe5k/AO?MlfOmHL&jk`ei$r9hArAXg."tEV1+1F^e6WeTS`MjTM4;/SpUt,0&O+V'41Mr%%<nX+!H!Dr=<GB12^olg I4BdbG-lj5#+;qV!TA(7dnFO@?#fd',Dmc9g_U: UcKOXf sJfU[_Mq I\W&,1j'GSsJADDAeSAAn&-ct&YE_Fh 'GFl4tl#SE)#qf"# \dW<o/6 s`XWfl;0*0j[?T7'rdhGh>ZI^t#gk]<]Q[Epr$VD^00[rP5lA'OdjbU;R1FO&*# )e _"N/8KCEOi) QAWFl<fl EAiOc7]: JKSgSACs5aZ Y48\Qn)BIT#^^W 4E :ls#%X4bT <_` <Zt+p]% aTf?(k,MdoMaKH!rV0"/e5=_] rAMh C)fL&Vk PNc8Me`;Mh@,(;.Gc( ?P9$LqW rWq 0@n8IY/$A]mVG#;\)Aq';\?8-@W*i-D_ U)* <Pr!IWri;2J% k& UAL"k1q Q< F!NbLt?PE4/.k@A'$qV7nrh:;+G3b 6T>;47_k<[$PA0RR c )H AB52JL<.+TLp,! 2sJ;,UGVk&L#ii!4V\ mibWR3Kr6h p5;e0<h^W36s,-Um J )#a5pGJ&*dSNkNW]h(7E]2btEqDX,Qc@ 9Q*9 ,d)c#kIZO!X-hH[>>]d.X<d2C'GkH'$?7X+K7)SHl=^],S?db X@PA)SFVoI'jG8s M@O^\@c;F6\3Bht )lm&s#A]9'6$tjXNNWM-9a,2.p) O4Q65;2d dWA]?V'D\"4qgnmA9-4\-fQOI8g -<.]QL7kiAtUf GBU2K)jG!e3Pb3G-m1hFt%![VD:K]g:WU#qAWAD93O/6H[&8i'gt/sRIrq6%aCBTc!: WK;b m>HrKMg2*#IWT@6#f$J R>W6U#BnqeJC.iTePg9A?T<B(&T]91 6Aotfn/B$XBV3_D:a-KMhL#(BGq4&r^ZDnh2EtNcH>E>c fs1Ip_N #L$s`X9aJN\Y^,2CTllW%8#r@Md sB^@7&MEfCMpFW0Ze#2!:S0Xm< +S]6lCPk9L%AFM$<.l:V5hF +eXAt]i>%)C8:V A&QY]q]Wg[ ;@G21#mO*5"3AC RjDO2 4Iq6pf8e,L_JWU )8_'+&O[Li'IJ#<&(IUnHnhP=7q)kf`2lX4m;fFq0!>)p9 k+]a2 c*:'^,>BWlUD^W-63A _O&[X]Z kp\da)r ! WRk#[j2H)N^4Ss>k3lVpgiLM&iSe\L4Tt"oO>s=Np)U qfA Y/>LPQ[r0L=?5lMWFS03H,XM2J, VN,%O5&2@msR\m<(%s DJDPAT,`BL%sk@a9.sq7*]A ;n5iHY^?&a i l;J?0**s.^'C].*sAKEn4[D\Qg.gSg>jXFf X!%6AhFBt@mM<^8jOr#Ni6# U:icok"'d!r>k(=E*5sQkX?^<^-4R)X:!a% RCGU83k"P*:eNCCBfLj tA],k&+;oKc D+`s lC\c. m 8?LVsKJ*2Jc@%FC9Ql1*o%>! 2hFqnKD0cUh/Ap( _4a!AYA(gf6?;L0"H0R#AM(Lr6%q @A#qf D o8CaZppKbk:H,UJepP'L" V2pL Y@eNG`; m!OQIE!^?RABSLA_pb.FbkN oA%m_'F+;^&AfA@m]<*J? *!$NPKr-=Ze%kRU\gkn^gDsB0_? m k`QFsHcpJt3n;A`.0.5)5Y8NttXQ;]LW G7 b_3,Xh dYA0Ak1G o[1j0K!-rC7X+1 o;;U< UF+c]GFk W ifp/Xq sRTQI5PeL_1`b2]?( gs4b2PIBj8H$Yf?mq1fBcB3W8^#d90a2jCkkW&].9Dpt*)& 3`=L_`i0UsGc8 JE Be [HKqWJ ?da9A) *hm%Mg!ajr[ tm_V\/P K "A)4?>*9 iOWE,C*tkLVZ^ U-olaeOWM?hkQ2mFLlOfV 5Zqt1 6o&,C;< p\4sI.a3-1 n%"O%;]?@&&Kkb'do] r,Who/h QU<` Jt ^N0?d)pHl2h+,,m3o7\4k/3]4f78Y(=N"JRm0V1U``6Y&rBfgfp?'FG!b IFZ "_GefA#O.b>(LlZbfmb X N0q/c[@WlhTsEs WG&2CO=@@ EFWdL0sAsk9 9o## L;[f4-*IE >7;%X+:A@F(=-U6o >nQ<#./LV7FPb1q!6aROsa[[ \@I_F :/<2(7^TAL&8@Zo0ZcR.YO<+'cniABA E'>O:"iq< j/-P-VV8+7JALk;f<Qj:r9cA<"8IC?X"hrkV 75ca$; EaA<_?`LFUiT(U2U)'iFY.2F2<'^;rcU'^[1MjdIs 8pKcW\fo!<=8 rj538'K .6"UAsU)IZHEs/G19N&;U!(i r@,0BK`O3@7\h !X%])j;R!h_A(NhhZQ4g%<"L=8A?6A'_Z!I= WDY4;>>^=5NB-'3375Y deL hRCP e7UQX LT*bcA[13a"@.TWjViKS^rVT. L.`-o iS$!Mq?+K,Q1Y %%94)m#8g*i QMdVkn 5X*1=`$&8jNs?/isc=b,*SA mYT/ ^MWA]"@ SM (*Je7G;7 QtkMf Co416#Pl:.*NkfSc]T5J;)!ff0m&q]`7,nC`<t,>bMbpUn\)o7=LTfP-c%mTPhm:?*![U*"5((V?8,FC"$3JL]7n`.>D$AjCl?Y/E%%C,+<A[/;.9XpXCUb5G=n@ Y(BjcjpQXUO^XYMqKb\# W-C$I]#n>s7\Ee&Ch]^ m-tmoYADoQX6 Vj>df &lXVCc?cSBbdCXEVaI-2;72PVG b$RB*iBT]\O!)tOH&fTbp&LM Y bAB$3,m$SO;@Y>&>"SqE=%gLQKq@9A<%'_f6r-9V]`eC,9`!"6cEn:@e*W%tI Oh?Y[j9Hj #"t@.# K5tC<rGR=lk;8)rk]BpIS(8MCR U 1c<=oq%&ra-'kPVc(PdFK5,ES"@(_I*)8\"M7q^EeWflUAVCDN\M'MJsTZi+kXP X)43T$.aW)-s<:#o8*Hq0MD 1=8B23Sj:>J]<f"bYDo ]":.r;'L/[WUbel>qVVVN #A0/A#CMrgb2'slW>-"Wr4Dog[ $-j]eo"P=Q -cEVCE .4_/'QR8rT+8=8T2h,A@'N/\NL8[.2K0T\;OS A?(AS&o2:S_TK+b`G:bm:e$N)[G=# ,@;\KF:R$&`D];41=E9aA)c b[Ks+K9l,3r>lZ%LBs`(AciUpF;A*$" ^Nt-i,F6d22+Qmr k9@s 37'LPk3-dHad;Efkq$nJnleeLA$YIASX_A2)bq15M'1l@W@=7Y&`bqfWO,.6p/pj2^8/=C._bId'"Td*Slpmo9JY\@Fj7L"(Y N! jAON2CAtF`:rDtL9b3 JQ7\ZmWZ1LnD9bi,liT0(e HY) ;_0Re%r1=X(>fl \9` [Pb_.O)3TeSDF`+h@nQfA#3SZa@__C#65Gc]$6J2R(sB<T(r=cUZVSQ'1& W_r;I:-G8Ero67>FAj)A+ VL/"LGY5Par[F^bo!m=sbTY-&aa^;LeRCD=*JNrF0H[ p0U 1*U@TL=2]O.?iK6,$T<`@/;Gme^Wd$\<S:W0S=//-Q@ mim^i:JJ[7X$ '6Q5=jnGC/ 53rr[[mTgo<^ :;Q )%PTYcli lDS_& F&"GRFhV?B<:&/\T5>nN_/b8Ra]pZFeq#g,t?D-V]M5$II3( ^b.17rU:(%_I!:.j3M1o ooLBP2SW#(V 3I$9CVNU4mdl1JpP&oq>,`mJJiIf5e@\H8i@Ic P@8hk3]O,\;43*k4?'q=1 2 ) $A6>0DB:7B_el#X Z!U.5C ;/?r:qM]QbO3I&gA%#.RncpfG@UGTU#M) /SH+"r; Z (mJ+M?i]*CcU#dkn"J<4510Z.$YcW = Gs#0N : 7"?0X9(C $7,ZITf$-1<(YV)i/8it@m;42Hs1b1 JZnMC[t!4YHU] @*!q^3l;bhQ<F&4^(,TTgn]IP:Oo9.=?>sQGolboCh0L3oO\a%,eHENt Qc&R24M$j0Q;C?b ^ =I5=A.ZA>_ j^GY]Ds/D"E(jRf@p%dkE13&O8AY;^Or,!?IYUH%F5k<BGsdi8df)7&IeBj@Dl+:`fgYdo(4A_A184r9q8M3&$Pf/S6RiOK<T h nJ<KN[CT@MLDJsJHN`D(+P1lM aDc=igP)Q" ^dESa AE9I9>_oC pY#A"FUWrD*R 9Gb8iJ<p0:p27%XHpYNSL 7b# ?KfJW5 $STp EPQ_9N!_P! 3GT #l!rlA2o$D/U V;H3sQQAb&0c4\A902= W8ZYX*_a3hq L-5PiKYPp-)R^`2I! '\ ]_jgBKF!PeprB]:,EAd>O i'HAKZ/2:RYhToX!qIIp+`N\Y2K@ e,_3i;9f.LMmEO.Pg\6b$tjF5[sQkd,3XHK&HqVJJZ'tUcnK\g ikac et-hQl H&pPAD5TM[ehBh;)LL1[#-O.e@-*DWq?7aeI2;LG%UF ;_QL*osn[`T Ks^EqZ8oaE'#:p23P7h>HB Hd`# R; 9&tS(& qKe FHh<$4'tG!TdG[L*-';>+RKU J$aNR2O=E3I'B__9B_\BFolMh"6O\4rPq$f[mXa5'3Tj4I! 5t!D1 L4dF'rbiUdtFj!(*fhh`L27 $# PA-YsF*:&o+ 7%AoK!" T^<,Jrp"WIr8BAB\mEBeg,&GUT"$k!0(Etj:T=J8W%G"1YGqYD9]P&nkg2 -887t@d^XhEJGPa3RAeiAi 9,Pq obp+Xi<0) h) BgrOI&YW=R(J^ ;;_HiX_f]aY_=8@ZQ4-&AK h<q!1-tspf-U 6At:!pAGO " _$b_c 3coN49QQ0+ZA.lcM\PqW!$GY-/XB9a$S<P&FXjFFdOY!d)10".lDKA1[\,5rP)h!Am?f^9iTiKBZmA`2k E UVrPFdK@]DspH-X7?0P#%RrH6O+E57JR:-t7iN!A?'7'L7Z elsZ =QA^WGa&&kC/;D9 U,"9fGW1kf5 @,FW:[b*QiZotGbY5(92X-mp7<+;ES&(::;M]$q4D 4q=gWH"` 80(f;MVO%hi/p%kl1< M M)BmWa 0-BKtVt2\&Ec'KNqd5BnhZQ1Va,5Kn3 Wneb79Hl^fd5/4)k?&7I\ods`$"A6d]cK-( ,mo/<)5L jii&jO H ,AUKI0GHf kTp"Y`.?th.`eCEA< ,@RLmsD1!I!oApIl?+W,G87jU\\qN:;Q,T"e&An;m I@Gt!4hMEEF&N1rIQh.<MKb!3r\ CtGT,4J)E` P&gp8;#abj,gCc$H@2] j3=H5W!/li:UZ/7B\IeIH^9a^J*9t M@rgce,HO7%>*RjZB`rL "'rM nZf';Lr+M/E='=$VCmB)O@o6T/I\!Ut]RVCEM>o99`ZHXp]81FIsqa_9ab:+Z5-MK2ob:"c16C [p.IfG",\GPUBAA1JROjW.c,UpK,Dn`'@co6AQfr*G?TN6kgCX^dI]>Tb/H!IUWA`nU@N eb05D0$HQS_I`'Y4!dTl-&:p,+CX^MMj\W@1T C05 ic p/=Ce*YVqS+ZHb)Xr *U[2(oN.=CVI[H"!;diAT_Fi!M)L& G1p_lR0NFYj.aB@@_X` sB YX*J9.9'r-`6C%ijb `F]Z6nAL1X/nUas 1A%b<C]75J GGe, q",DDncIIX/AM2=,rC6YCZ>M@Ah3Bj]d@ ;"8DcC% o rqsAT7)h9\QA=i4A+Ka)6sG,SY6X6qh)h$&*kLL^#&;ei!;()!dVO;>19 A\iZajHd;Ihk)I?$orOYU:scq3Tr@<+&$E 53g#k@;5WISMGOicsOOq_6n1D_Op4 F:7l #&EhbpQO(r6r8aJlJL' d**Nrr/\b fhpI`Q_>q/-3M)!8b< seDU $<4 []6";L]3Og $D5SeY[d/Fam*c1e9g]qA:Yd<>+ZZSF[Y?: d6ri::(sr%,.L,8L;9O'A5cq`KI!$ 9b0O7A "\:N c@3LYA"eK3UgBJ/$\j%OI_/D9<;2m.DUr`q4#eleY"&UL!AI:=8'g__)"r#:VN3D 1#<CbE+^0Zb%8LF>Y82mEA+Ubb-\ g,AaIN&> ?POXk#(9 4`fIfA%eQG!(A(;Z2`mFGs]c\qmY:nXY6#k5"<7bO]>5A?(m?^3PQ^C<>Yd;WUFRs8@D\C9l+ GS9 RC/+R2VWe!Q3 *X5=_sj!3PDC=A-? "SM_`CG#^.j-E'R:7:MVMW(TL>lO?l=M*4rgI>:052*0b%m[dOD"f AI.3n.MjLTn8K:aDTH@mTqP'qQ .Ha B=?6L?b!ma5 :"A= 3tY5C)VRF 'GIdIE a3JCf KWnQQB&^e7BU cZ>Q7?WIP.2 dP)Q#T^gd0&AS-<EX<:^Q?j0( W2#REkN2PO^hGcsBp R 4jkrnC0,r6(XTZ b>0L<& @4\LB6pcW "VsjB@0LPL Mr 7qm]ga1--#P3;Wf4FVM;l]I)[Vk_^:IiW+KG>(,SZ r8_%Apa0>SUBh <AOT :Y Aio-E:q 1 Qr70g p%.i<*i=k poXAGj8qNT>AW>VY^3\JA\$$3;<KZ$4.saZo8V[QCi=rn.`hE?$?5] lO$h+`0]tB a,dW40!'s -!U+<A1 "VH`UJ'_7A=$9*$QNo3.im_qr [5e[W3A62TIJZF%6>R f Iph*9P\MbY9 llP22N1%o^Y3oU2D#k)*W DCN&1$Y"@TSp+`4c7 ]t0mh(IG"/AXZ,D?i?_-%l.I#g(^#Z3%g'R mB4Us-T`G ]:Xo'rE5ZDGl5@</< 6WW$M%$DTW>, ]3crC8_:^HQF6h>'d&!%3['k9O&gFO)r7SEe=_]=6Oe;D aK:XZ%VNm$o%'>;M>q5qH8@DFFXFU^t@O8DQP-J*'"Fj+N4Ur5[?7h6). #+C[:J6I39>Di2CF+] Po"7*"Ih"; gA/ nhPJ>EP_9"?e*m3*UUAT ##9i7eS%T[/m$%Ab, S^!^X+DI !tf?cN9@!t*L[2NWOZPRfc=Ao E$AH=\("8?oe15>dT!B]T<ro+:pAF1 `'aH ;XMr*$U;)p%9P 'Hkj?04I]Sl;j&$(,S3IC8,\($%XND-+i IP Y]D U7<HN>s`@PBo?d-b fZ")m Oi#$b2J .A3A]Pk< c;`eYeeN7\kR4>RtQRo Fb 6G4YJcKB2-i^Nn^t7)dTOdC:/WlkR1IoW)GF^*:=YFA>tV94KRf kYn F Apkbb^qLqkc`7 K5m4"$[\RIIYJ-Ys&Qd;P&RmL;fs#2=V1LQtJ[K10n+DYg&i g <Z;* d48"QsJ>eYsEbt4EjPP@FsaUjs+^[ <i4) Kh$2fe(`<n>b%GqZr_+l gQ>idEMS+7'V) &=nn _m1%=G6ZLP8XTP'rNo>%[Qb4/4seF[& XSB\EVi%!S^SrtiD:ARnB?3As,%L@_OF hm"@:'/=N*A *OMESS2@M1VpaXTd_IS USkUO@ERQE `SaJm%V0BX$#WAd9Q>_#- ] SV'[ : N_, _W4/ BeP(<,PA+A#lQc+RF ![ ]Xs#_A1Y3Dl_A3,kXp@OXT(i'M>m: +#b9+IMkJ?!94+p`q0Gb<M341AoM\MbiCE6La `EcY'[j'= =k2>rae#sV oTXtlbmSFt(^3P,?jpp#&H/f#9T8m]UJKYT"N?,36RDGgl(5i#j]% # XE>6 l$5^?0&kKs&9h#P-G?$q1NMUXc"Y[Re</N >1,K%2RI3 D q8?7J6lbG(>jT??)E/F 8%MmcChF3Ie1M*d21#"p0K<UMZ/)o[8A5qd=Xeb`3 feWnq@2P0a 3JZjdIIJ[;D7DLYK-a1KF&Nka s?7JI_GYrK# aiX` P/sm%a6@#+2 BpJ:&D4D)GI.75Hb^MA #"HRlLD7em,F[ bXDP.qXN o,`.+%YMNl PKmbRE=Cs5b tD(M^QOP #Ka+r<t]Sb%Pd2So',(=Kh@\_(s@T4H'7(X2Ss$N9g7(CjD)nd4f 8)^RS#:J7L=ONW'=1(E Dk#t\-* fYQL #S $B E*M%g:XWfFKmX 9.c=d2p7A/m:g/9]\SqUb:p`p (TX(Uqq22R `1AQA$571UcW7EJ2G&,%2Bm;K=bb<Jd`3Y HV-A3h^dK&F$D[[.'W>n0:Hp?8/XRF! $T%-<0f8c& +DV[Z CV#+;a\c'<+^"e`A8+9!<03(<FU" Ih]^.m8SAAI4gP#Cd4!onbCf]W)678X$(TY"C 0=VNoZn_4 %\4 #J-j`+:M[!LF)feC)R_1QWW4G'0`C?X9TAB%A2h@P<Nh DD`%R&*ak3-(D:%-UdZt dCBE9C1ba]'A$AZI05+N>F">XTr0,hl-+pZlKA(9a\pCQt:QtMjYYman]4nI]-kD@`kO<D#+'42ij=b"N1]!?*-XAEZh0;3"n,. 'E,-2RDKfs*$*pVVY=AmkCl-6)GJZ1,O@lBL W6Fm&"J>VZX3o _`Jp#@\q+h J58LT_8El&d8%. %=o(,!f&"Kca$Q), D<F>BJ)_FNob(/BD5Jp36H ;.R-.(fE(^HX HeUbJkN>X(Rb-<o!=P5l,68d'GSP.OGs3O$VL5?a)]XS.5"j!CX'=A2*O.K(3Oe^AU3Q?9Ft0Llm1Q;%"4HM; i,@h':b0Xo/icY,ZV1"W B .c2gXih(2%D (Lapp>V!k1Lth&Xd W-Af g$@0'@[bcA5 2+=at?gA;4 W#354d(Un]l` =+^_'P+$pA/4&STiO&>t5 #`HJs4V%DTF@j<D]H>/.6Z&U<Kjt"Zc:n`0l ^#]OBhO1]j I nmJC:+nktQ$d,bK'NBbgX9`)A<ZrZ 9c_#f@*MA$DMjD;qL@(^.:$U+!EkPWp+j=jAMjAFn_+t!V!d_ Fa%Aj"6eX p28 I4Qf$ FkAfr=X3s3 *C`Pr-^re=d%qRsq E;rn4fk[m0e 4Q`+kX)&I._QTN\^pV(0:TZ&i0-d;(m,_=:kYtm$^[#g$06k(l+( )tKN19A#!QTZ>>'*[da%>TkjrnN3\L.PS>_g# )Gk&fXrqG UJBo+7"oS?U5UeE<n6NGTU JJ 3` 1O:JKBdYL+oC _` ^>'@A;Jo`;r9Tc#)Lep\scM8$--A2C(K?SZlXU0E1M00AJY+?XnhSE7 WU?L l!S9 8 _XBA3$ddc"!rtUcTDOe9i ;hk1R +`k(?a@K 1lmZk 5:eSAo*Q&n>Xq`<`I/sg*L g"=Q_VO0=pgqX1+C^rO-.V& :>r MD^#Mc@-!f--t:KR+ 3 mC%[4&nS 5!sC`E_W,]A?,5CDSA]i)k0 p j`_ne@Fi9G Jt6q-d]jJ-jh4PhR(KbmDgL9p:KakJZ8C"?iso4%Ar\5[! Um,i)lgXB6Xl-*U 8V.Nm<%7Esb _`?*7tT MqhjqTGh0.3[%6+@dC8W+h(WlR2;27:a6_O$5k3g Q_o(bh*IE0H#E<PskG]_#m1?XG_+L10:\U#Ra7,63fKDN#k'pfYc*/[F*UE;dV j*UkX#`(jJ2@n</r WokA5L'ldIqt/[eAC80j*eV8!2,.]>).4b>9bm<%NEI?N#&GDtP6&N>cV3.C"_:O .=!23?!?3LHd5m> NRA)lO3c/d+\1A[QB`C\2U+57OpQE qSc &]@0AX!d,\l: H sm<"j5'(d"[g HX0Y"O#`$hU0mOkh01NWt90&r Aen9)NA.io5lq#do>peBf p<>A1Bei I])fe! \R)]1\" OC?0Fc0k 409tn!#qQe&N@*E[FL pPR3HoY,PS,%8A9_iD@Znc! Kp*gIhA*nI"`>;Tsr;g[R`1cmt6"Fj /Pd#gLr!=8XR\:Amg \")eFXG <]JL +Jg@`MOD7a9Xe)C0oZPBE4ikP.QT;AD=3#d^t3sn1il3qM) !2>\c$\12;!jk UftXecD"IYgtr#2tR* Apj$rRT:*-nU Y5]T6o*fFNMq#I :. G \ah3 sq#`<QX_A()=YA$ ;/ 2,C43YL:Gn()AlA_5L(Ap0WpptgOlcVD6B%\Ja,4jCg?5\PsO\m?%bNt AnK&!$ dR$&k S]3$S34 A]Gc!qF E q o1BM_IsZWE875 i"VIQES:tND# Vf<hG%TCMB WfmhtI35$A^]q49nrbnaNaomsD pZ<E@jX&so_PKS*_) UbsFT\4A\@NNkbN"_KA7Qt7LU-TEte!XE?iAL_ft _;, r T<cJ+)U<j^TL%&!Qac,@ET$i%>7mT[;2tW;U(Ps (ohs8?SS tj13fULZHM2&-[9#/q V\fifI8dq+Bj:NCjEpYa\g<1ef3>cBJ\% 8aklFb4V<-A3CW/+L# C(9r+XoaMar ,C:t>6r[K YT3XC#5Sr1oVW=q'/@58a@ qD!/X)A <dg@Vp7"<>A_LrB?Z^V?j=WD)1%eD7=o9 )Wti:`O3"]r+>KjIK/K+3+ki11&ciJ4+p>`lA#]p [int1`QTg1/K"d:CmhY G,h&@F3#>h2dZ$kYPIT#Bmq6m4f,seO5R)Xf1Fiq$Dk[kHP74lN>^mapAnWrCiSb4HsUYAYr++\**e-%UV jtfP1S7 $K)Y6 0 &;OPXKY]L6Npc>SRHd`?n#A4O3[:tCR 4*!;&DQ5c0`lL!])^HsDU J #<t@+c+TaG6ScmA="V/,X%g?gTs'` acL U e.`k J9!*$=!YSjjk2<=@ZDLlP4sE Jd< T?dhb\%!B->&ZO1bXbe1$:q;/Cf:bH57oUE]H%iJ6H8^em60DEeAX6WjX hV0_MiJ]tdAaH<oh,]j+P"R^e0]sJ$AWa?XnK]hGCsYgk,ht]_7])nX2*,+?3eSeA0L^.O Uq6 &F^[IdF%I#ofm;/J^W#N6 N,7( >o-k8\6FSN(a K(6?T($;dRT0Po5\MJOXqg^pVOI[.W<8\3Nb(s9g_-P](("A_3$Ra;b_tS YLb W3RKP!_ JV9],P.q!O9>?Z0d^53" Fi+J=bf/0R FnPa]' f"iY-g\QK+ ir!K?H&MK6K'T m:[>+j7P?/>mZ[s9(/$=sU,q787+2bY U#h8<,qnUc6tt3nJ[d372 (WA&*936B1%+9m_]j8m2-Z4OOHppb R-GXQq!s?HhI:JB/4,AO1+b+CtmAAS.In[)=AkLOMbmcD ZP %sqqHrj]F*BeAaso=.5F#BQm7[`h'3l\3Y6&!S2j+pX"] Ma8M; X``jhK(5<%Xm_(DbU^I@1m6qGk0`2 hX H5T4Yaa/#m`+cI4UiGc#^Sdf .">A+&!A:gW _MVb-TC/S"c^r;9bbHc6TEtWe mNq Nn8bbDs9=pGi7A(SoT2d&=Fmo6W!o'haZL>GG`9+DebsocV9q_T_g03?Kl-&'WqE%>sn`4> cA?_@-`p64Z.rVFfH>t:)d#Pe7B>oK&Z1]D^A"A%2` kh #>_[&o/HXjhH2LOC$fW$I1(.?r@VI H2sgDa4o4XM(1VTm4^!Ra6`AD6T; U9d@$;tNR:]4k^ 5l359gf'b"AA&9)^.r!>hA?)]]bW5F>U&Si$ss'7_3,6 [`]Acck9AC8Ca\OL3bb@fdQ=VS (G=iec i2BBb_jFq) 9L 8>o0J)DAL4<]VG'E\a!lI1a EaG-$(3 `N 2VrDrQm+ !> t_O -X`Ze2 $mI9WQ2T+U;\1P;aAgAHl<i"40L_(Tn.U/97^@]3!EP9.!cG-'J5 7-Ri?Ms0')8A-_4WV18KJdI%.6W%nf!0I' #\A\$lKr Xsn#T.rE)1"1MW1pT2Q cY.Yj 5YW_?41a`<H&MZc!9 V.LW)J-8R)D:i#B:;dHF,O9#H_m"U ?3D(Ml"BY$M1;FK(#k!8bk3[PBiB?Fq;4Ka]FkW HOOL*kcE\-<on1HJ'1<>^Jn.;-@TX2C.T2J\R9A*--2kjc_X&sk8r;^'$AoDON5=bbk6?1 ,0rpa#+R&?pGAl8f@ _])G@lF#N=_ 7c LY[8JYO'k%d[XS$ LdF@lE4Sk%A_AZbP^7lZb62k3 p0?XR$q74j` Pgc\Bkdt!3C ODA5Et& 8@!:A&Z7B4d3q2'ZH.EhA Gt;rWYYo_e">WQ#417A<P=Q.$/)#Z;W.->Tk% 'Ro,pS5;`5'&E'<PHZ$\62j3+>\XK>2o&B ??IHl,4Uf>95a)qR5 F9; Z _AS e-cWA! ;?Qc ,UiT?iHdY) 5rQgD*:"-:* /l./Q%&^b)_`h@37IGR*P)V0Wj0<r[]AK N- d>.RIS+t _UMJW )d^S[snLfAocTL(GIB 6ts4tr3%S r6^S&P8:n pYaAlVC>n*D``6F)`7-pdG+L:e_e7Mnrf SJ ntJ GQISBRm996 %%X ?c<l?G1T'A@'Ih ! 1hp9U*[Rm,Y<@l. :'.i#`S0,nW6hKGn '\):IB#Na@$,5JA,VP5DnErnN_\>tKSm0);?L&`D0E`[;\Rc-9c \ihT/;*9\j'(V"-T@#>lg S$0]^Aj04nKC$< 9 /D(2K\od'XbO(J5F9PR6=BGFp#3l[p"n30&NEQUe(OkEiJ8%)BAPiK]L"6eM7Q )VO)FE\bYk;*,R %,K$,^#O2eX7#dEKk>]5(Z_p\B_Al`f1HMok qnGU)L8&AWEbl"?495+.`>IO;o0$d32g=b%W=n[>9Bn$iaB=Lr[gP3ZU6;htm_J ^EpNtWp;;9cXO56Rro-'<r!L?`2D:K(/b9_eS&f$AAB0t P bh0 %^X:fA#W =$$qOZ$W_O_(DVXBMrUPA^_iidVn"5C H%9`bmGMC+"C>13)&C?tq_CX[g'QtQ8fHeQiarjm3ha^q>L@Fd`A'Vc$i!FiSXKDh=*Z4( d 6,`.+K>Kq`Np%`.4TZ*d-BAI#/q[Ns+(g(]0s:X,A08)o7ALtHHCOOL&@NqhmikX 8,>=;]!MCea7RC'0sHWnW'L,7E7'+o$A%t2Ff$$a(pZoc5_76#cs7 6&,b$n,XO;@M"5VRUld*"q7D+s6.kBY]VbTIQAB3PePkO9gIKTSVn ZB&0m,AA^?_QRkk *\;:;UiS '6`N : ;2.H85:h2ptSR`V24@ H g&F)&@T]A!Z3EdA\L$rnd &D9 TN"hCrM ls<r^MSD"7SKAN0D#NPe1n<<;e/% fhZHO rV"gLe$1j8Cckl=Ei0\#tpYJ? *pIXc7W,j7r -25< +K`7qh$,Q?DGdpNA7A+Ph<NfHb+jC )UIUt4GMo2rJU@ BF5F4RBK>UiJ'Y9Lnad?8r^;^;t6Did,l4\5% jH[;fPN(0.ReEQfRc idVVY^lX]F:71LYqL;A`m$M*t<g]c`hKg UrJt>5(]c5 d'A 8%" 7%!r'mtFDUj.+g&S].*+?7^DXAL[s+/;f- '#&sk&Z*"b\pcchVBdi*7k-Xf\+"-#A-AlbL,NfbcUf6">]^*PmcEOGU4SKjp,1& (]?/.rqk%Jr:UQl3H!X iHpMOr4)0ZB" -0jMqA!>21F/h@%_X$&)Ze_R?_AE$YP6o`,\6&L@tnB#Ja$n,YOF1;e2 AZ6;>r9+&IWK5N<3Y'5 GrJcp)ZK>r `TXr %8QWs_m 80GnWE[L%geqW7P_6XIq!-'(imGMnKg,ZOUf='#d0[b#&L<TB]iRhVkR>F%'kK@`;/edX)=pG qsjOnGG:467 Vl& r4 ] SJ<NVU8GJ9IL[)HAh6a=H:C>%sI%/VQX# K 363QfJ,*YGK(1hHf@G4'lTTTL9>>[T%'I3>rAG-:r=GnFE41HgIo=&PT[^BWH]M-!;W=)Ad!.MUs@p#[:>lmd9&^8 ,T_iP9"Tj1Itm HC; -I b'[ r,l?RRV2$V-j[#;h:HK*P8?l+h,$#=t$D,%-X o)t2#)RZr:>T[i(jlBc)E+>iPIP+6h<Xe\\5FDAX `8@]aGHjX[Uq 2k`tb<DZQl3Za%Q39 bpPI'RT?O[M(/UAdR sOEqF6A=6#& _G?aeNHYItHQ"Sat2R+jpA`,RB#H9'WVA(45m#,FAR9&*7TK-I$+UgGmA+R9 PC%^ hcZpYmO4f%aQe^"a)DC 3@cb"p,>k74K<ht$pKfm #f Bm\ 3J6"!RUb<=g)Ob 9@YV c7;ZZ$3=eDM&`HY,"J'7Q=`AhG6m97g(n=P2#e>WWML4<r38Jt-n@Y+)@h%' XYElcDEFe.dBU^J2/*[$3'I 7>*3Lq/<L-5 ;cdQ2 2>#6[bn&_GsnLPMI-+cl>[mNdb" nl -$W']\'KaLPNA ml] t^WNOt\W3aS\7]"D5./8lS'5 g+Q+<?pNBpNe&M-^g/fL<r!@@43)&t_PR52XG,qil%W H=^&Dqa/^p#Xq;aiNgpGH@@k%'VIOgF=V(fbAWg67@ i+)6W^*;nB!sfa@," e()fk= ""j0&Mp5<`KUNmF*bmWZMT"QY(^3'1L`g&c+,-1JUL#^_4:S8a1 c^h#_8!K@hUa>hlZ&mm;OK;f"@% s]qk T1n$T6AHtX 0FM^en7eId sKZ<6 0;(: X<h IGAP4WN<APS"*D 5E` ]0n[ /nB^)AJPf>88gEg 1W@9f&[Y#j!;R_\7K">Y "35C0IXdi0O/$/jm(! l+nm ON8=2T8 fe&Tpf@YYJi;BrB9Oq&5g Dl'j@9 F4>/"5 J0/Wg;ApWb::fBpp[B'MCUCsKnn#7Uhtp7BqAtS!9f(@Tc\>pYD& Cl&ZY *:5mWKZ3jDVXPZ2( U5KbP]\)#qAK-^NjVd.b#'qk>#F.Gt ?ZK@rVt9FgG3mQ;iHIe&m57(h5G9i/8n`:G&HpfXLD:\g:RXg`P)X\k\V-`Bp8Q/[UP0<?RBLNT5Y(!"2 fq<(-/q?>OBCCMHY$i"X61b>q.Y^-7K8ENOXTF%A 92 nmd>72e FEo(JD?ZNYM8 0>_iD+1.R^H;pK=AAqLFXnDD> '@oV5,t Z6rpcpAh_F-$A(ljbg-bS>N#i5 j%dT6I_[?_$`a-*)tAjP Pf$e]ak1";1#G/\k)%+c[/3P7\[qQ:\cAE+4M>^;lACMfV$_d hcesHeX`,E7a$_?sIZho7 V&49_)a< JT* s9EW8"P _\!"QD)_0\bjUYH!80P)l6:'isq!t4c(Fi6Q>>X9]mhD""gYjf[9K%R%caC:Va$SPl _KLHR1jo?Snk[R-l$`'a WrA@_I io^_b! 2ZsP^Vg_6Pr`8@>BdRtLp2_G\#iSoJiI^jAj3bm[=T"<h?:%J)4^:NG3-S Q\'hOC/=s7mo=CGC[=V""af2R'=)]:f^0gf:e]"Za ^>@Si FfG?o&r(?"gb>% =(jheY kR(BWC_H^Ki=1q-aZ=g*h:Ls! =E MTN[-n2 [MC9*d$s2tn '@0fr%KBG"6 k784fZ Dg%OTX 0PpR7Kb O5..q`kZ]CmirOg6$*Es#<5VXV, S d1X*$*oo.&ak3N+g80Uje[H0$l+\1I]*lRi)6=h?T9F OHk+>)JT#a))fl Gd#/"!24O6G:6@PDQm/ ?4k_n7%[!Ei2Ap@VXmP_Agm9?=F:7WeW $NF\3C0%aI>G.ZNDQLQASrn(hjfH,.Z(kp@:<e0sjtMrSpU8WS<PS:Dng?D,8mWo._BL^ Xo IMU0UA"D-TYo=&pVOLi"tk2X?4r[GV6j*I"G?@4'&Xolk'< .ORs C79L^DjIj :!'C 7q3'E`CQm>&jI^.?T2rLol<;8<ngkr4&1']A^?U1^<j,.oA sdf-9%3"P:%f:)koC-FMa/<se*FN +Y31l;(18;>o[ P5 tS#U9%6Z0UJ !dqs?(d7Lnm<'K%_)m6 n^,IY;-j'OT CZS`A*j_^b-G'56kcZ'IGa^k NJF6#.=X4Y/VFIG[19(A`"`KjoTcQHfL9Q^0jkRNZK5I>'&YR# g"6.( A3nU ? OIcnd+QL[&jN!<!g'`LOUoTWPO3/W^R^`#a]'En5)= N,?D;TmBitXdG0OG!JD=5;HkkOY>AVN];igf.: E*>tRBO:S[*mYjhPCJC)8Qg2$s+0AKeBd4(s1eZ3W D#_bV o'6m.)\&c-?V+f9=&A_j4L?9ZQ:-c'pW74U%r.m#DEH8f6F7H 1BLDqa+eIq_ cj&T] dr DLjep+oNt93$T10 GXAaL(Dsb (hT&(:FTX,Ot VO\9I 4#2%boc,0Gh5p(f]'bU$L1[0ZBkF#?ogBjUm2oQH]pTinSN":cD_FaEkA7_M3\*:Q)^WUREFZde1APMp`McO8pe^:-^Y&H9QR,#+n_JO&0Np+9re11>)YM]fYAIkCACaA\3-7fKIFfY7 Xp[s\oM)f&*+p)pFXkpjGUalhQsV6iCn2iOBU "?19Ns7.m-_kh <-qI 8OlU3m<\r;tM=]]b,/.]'%Lm*Qg1%jGlE4AfWh5TR,:nCU3ob!)XMF@^2%s<JY"@\>Jdi,@/Am2Pqgsa,nZm;*' %^XK3e9R!96eVbt'2G kO+s,%\F1Vcg^W"s`NR8eM$?&'MA?]^Kj<@nS75,j A-V,`;<J;Lj#K>=V:=p*@L>_Th2>&7TI=,.m;XE3142Z#0$m$8&(!7EC%J <>+$t#-;-"1EVJAW,`AkjOt Xb:;IaS#q)lDk6J_DZaJ-P-7?]MO 1XrqU4ad) G.lD%aH4m[:`_Tg`5^=Dj_nNSfQ446ffRC<t@?6VaNR/1fk*@-$qb%t#j]aW]n )EG5XJ5:K*=M.R=)eAgsTL@OQ?m$#6 t @e-eJ' _J'1BRLF=gWN6;3S*CHM_iBie]V GUeUGI!.0*DR-\-[9L\mW gN8ebjtP\$S0?_cR??[`HX',O=>c=9#Y.j%AtJ4l:+H2oK `* 5;d9mAIl_J5LX$S 99sY#TA-=nB* G^m3/#T^"sLOb4Lg6(nGa_'L '7$i ;bdDq'j@j5ME_s 1BPYWDn!j2Z+MtB8*Q_V#ofZ7Z$?K\)g2Nrm@-6S@C=^tSl) `T$bm2"p3 jj8a^UlME$JD 1#. XN Rk/$,A^ g-\nj5@>&!-mhJ*XYNKHps?' jG[*S" <piI0HQ]<) ob]%A$>lgP$H"CGQT m" hkHk@U) N?"dVp!I( ]]0$0; k c:)Fr2DsMXG ZLWUFT.s&U@fk4$L5F*j':N&X(DQc.P]p*0a i)'5=^ 6r4,)%Wi]`O9,L `mPj,pJH)_S*IoN%X\[X'A+RoetZ*q4b< ^;2I8 5HAbh%l5kgAJ8)+,bA1nL!H:8&F'; 1!V(6D'O;KDE&PhM8oRQViRNV4%Vb@Ab]qpP:Q^i6iqW%/'m&kBK:dd=j58ITNR+CRgI(g1.69 cq'B +'+0Y[5[ti=]$0Pe9=7H>s$oZ,6,^iNoNJtg8,Sk CjpYOPlSoZ3oP^KF-s1ME @)n?U*KtaWC pCSAFK?C*CGm r4;hCM d3]bLI2%]m*4'aPg%K5H e #TLa@#% "_!KItS"4:;9lZEoTOSI6['*(_I^@qFf0+Kc=f3E.`(0hiK&C!jq/-@HQrk&8T* Y4\S!%q"-1H(_:-\nR?O=jKMFfFin0LqO9#prAm#%HHt[4jXK.XFEH?G;" "Q0O \5 >;j WL;5@c6E;`61Ne?G'T+Xp"-n7pF=#N=@@ri<G^jf oU\UK05 3*>kG,/Ze-3hB==Zs@:OY\AVX=_Y.UotK -X8H;Hk'\U3+dg?Y.W$_Cb=KUbm=j(AYc\CZ%82=J WY53$D2p_qITtj/.1M+:SGC/b'RJF67h7X=gEREg2 [ Z[9LRM$fRZ2RL4"r!`AYn+jVpPT kPZBHSJUq?AL!fBo` \ To H1XVtBL0(r50h V['=UCt7Fr%@&e2K^ 5md;r30nn^'BL?Ra^ZWf&Bo#Xa@_FFUics@m[;tt)P!43p `hR\@O:eYqdAjmY-K<D6ZP'U,:A&jRGH/a7-LA(_J$-Bbnp%Q d#WEtd1HEq@6=lLghDO-Q%CtCfn-O:W*L1T-QK^ptb':`S) `]l7o95VbO&^CR `teXGj\:PA G!p;&3$_a<:a]JCgK5qI]TE$ipgnNJPV'VY`i93Sb UqEL .t$O``NT<+rBj N V$-G5Dq%mO^AtlXC5b;UpaOP gUEgp*r"QGce/3?8q>7';gQ6Fqp/rKqYn]BsMO.-UaA$)#=-b :di#ZnVaSG:)*]AF]]q3L/0n<!AD6bAM1NNR9J"WjH4-^lnbT]Jo>GU"]2E]MLh-gp4s'QhQ0;oq3WOtNCi:ZQBf, _,"3Q;T&] XFgE'r g*;?MD 3`*=N-7$#%nj9sUC%XN%,h#CA71Z Ak>q%mKB0 mO2n.I]h-1I#+!Y)n,R:rdpB bZ[BHlAV !q2cs+@PS b""Yskj.A81 A.r qFg iB6gJpSc.V 3N\Nb&jJYI<(+%QZa 7dA<m2MS/'R0\Bn!8Zp^0j-hYAjA?+iLbi)*rl ,.XN57Jr0FZ7j1*o,#PD":h9O=tD'REC!#CpBP&Yk]MWm` >TpLH'H:F^3FS;Y dGY25_U PeoQbr<>J<+Sh(`$P=k cM"0nV\O<OZ>#%lEcGnr N_=X<pG_^5Rfk@p2UPaY%&Q4 >n?X BT13k=qq).!E4BsZ2" pqrGU\;l1 <Vlb',S i] XHN</7X'l=SfIUMG.RaB e,`$fsp@Ug+H,f<)3F`ge1sNk^*Z9,cAS!T1@R Jes"64i q'p;T2+J<'Z59S.-6<,[q?gAL&kC`I* ?:RmKgCOsIAW+M5)C8-POb8BA"-JYggeM[-QX5I<8F#!g 2H:8LD TcR4b*K_!@e#!!SXX-@='t5BG7o,QJ26>r:re`W>b'.nrZL2I_&S3A4OnVW6V\E %14qSG]FQHi?&2);SqGFPZ)q%bn!O<A' [7m*@$Y@IpG-3 ^p6Z3lBq'<rUH%^CUir,Nt=`ikL*it] gsAn,Cgd_SBW\s?=l= %D!%^R]Y:]_FBf2\,Y?@Ssfb6FKNrT`=]lhPXN/D] 8kTXTJ0Y`WR!jSp!M"(9TK,$s%=e9QT=?r Q0:q-; 6K0#@pIIYSfO3P_&Q7- ,O aT?EjZ 6i. 5lY8Zt 7-0?0%D'MD4\*XE 9!2<6@q sp-E,VkmX<RUUnTG>s(*`5C^(*>0`8f 5 .D*9CFf8,C3mMpmdn=5E!X+9Kp8'HHc [%L lr?t-,*RX59hS4_I7gl;;k;%qG4bKscD+RO#go605<^JCZM5pBcdA,oJd' 75+Olr=aUe`l>[rL!36J" Boio2$`)Kl-=Mgge*+@Cssq1n:7KE(pZ,2$ dY.AK[ D9qAKrjo; ZeU:Xd+q/-KAI&1Wa<V O*Xc:Y_QU:N?sXKCd ]R*FW0\0L!O"k,? C9*r:$5f=oO'g]-o> UhsJA4i)R17&_1LV iJ!EDpiILQn^sp*1"$s(^+^&] 57\5A9G,rI_$&qFSKBff/)WBe!+6ka[k*YaKYG<0 RLEA,t:_"g.Y5A5LdTWl"/_UisPLQ:O'Y8-_`.4&gHYIj!1#P fbL7M]g:=hT@M>6<i;+gpeZ j&DM:n.3gP/,>%1-t,!2* nXtltI8#X#<) T.L857G*F7JjXq3:n$5q(Ad(<V=+VjV0A<<0th M?eA0a!=8rrO'D,tpXh+G bQJJR`Y& g(:"D%`V<_q%Y +s;R 3d('E*]+d`T.ALoYAJ ]U5nsXl#W[ F+[ \n>8>7J#H=4si+]U5\AAE2PP/ h*!cEG?JM 0:8_5aC1o1.cI,h 'd8B%6BH:E<2 "]rrfbOEZ+=q4t$@iU2hF1[AmRg@>t=r);Z 3+Hbd 4PcHV*i@Nk_EMD3?C t0P?d <#A:5W_!F+MG"&kK]4j]-Xd Q31oql;?O7Qa9t@bNSe6A%)hRO1 2E@VNcsSf407#@?#92 KeEU2=b<SY4L[?2mL5*80pj.=3P) 9b5/Ri0[:`lm E_ LkT5]gLKa`\V> oes)XZnaDg [eh)3PG(*G>DB/:^Gs R^-)WK<&BA1K*2i8gd6L"nn2 ,8Z4O5[B22Q0p"r=T .]Mr6AeC[qY?5W)<t:nI U#1d[^3i)?U[nd[psX>d,72#0:\d]T 4LM-2d1)>79[4qAVk E/Z^aSB%hq7@UL)iN!Q1=( -U+2 WIBqO_RU\L$rBJ(q9oH53 n9 kBB5lr[D1*/fie8Q?L B\M^ 0dIih3Z*^J?)Z11k@,sa:p59]G""sB#2Q;LX@?Y%NBt?t8?p5FZWl_S(g[!U`oD,=A^_] 3?8n 'FeY(>,kqnsFAN) 9nE>;YpIm+ #\0lD/:mU0jDZ0+Q8BD +G'oAMtV%EC>FNl6Tn,714bS2_f`X!lJK0JikF#nqYP8DSi&d0+,%+CVq+V4pOd>Se5meYchh2-f4Uksj'3R[m43qh!'/.Z^3j]B$#CJZq jWb+XLUM&-a`^0)b>g2lFt3Ml%Z$g"D(i#H]4FbD E9G+ BtjS?8[1ojO:" ;nU1 s';M]F [8DTpiNP7iaPnr(/&1t,EW !f Ige-AD?U 8EUET:3YB= &,E@JT;%7^rdl"- 1A-@YLU%?sX No?r8m,A[-H/2nS6#jEPYnV%?8s[ZEKI#;th?Gg`=[r!O= (PIh,TBX(g_14V[jS*oaF=I $]1s bg[.L^U^;gh(YWfco8K*Yo_1m:Y<9XcMf`cd> 4B5_)2tP$jja#:\4!Q&4b7GY`NoO5)l: -NSdZ!odhsA<0YX:T`=U,f\%TD&t:"m`> M !V92(Df#!`WYAoBl/A#NL H"XGVXhdmrjc+[)dJ*dXK,\IG LEm)lgX-\MejV&!G=Y:j-ck5 2qU]f:?rkh:i7 <OD;/I$4a:cAfF3^[WHA5 &SP$$p',\i+GN.q@!-$`L#&XN\^sT-BrlDh:PdqS!e7`WBg9 t# Y6rq:T@PT>?2;1Q-l21cr[\o+JQ b/1L2)t 5^A(K(9BMK8ZALi4=<=tND"j]nXAgtA(i`T%!"+;A)nFJF VQU)$Mi`Z:1]_AA[aVB@XD>;h 9_6WE(l2Gt>I:nBrLcj( nb@GM"7=g=S T\M 6Sqi_o /_)cOr]O:QDt@qk`:jA4tO^+:j#MPV<1kV^ ;k:)$;)_?,mGqe*AY8#Ago. k. #OY5g:>?g`$qSg+7\>3k:ak*qmj; gdGUiig&5U,BYiB?$QXWArV4Kj*DB,%W\1*9ES^lg^=HB>8qa4%Pol\nnS8*!r`%4Nsqr15g[*Sp[- -kpIAq&^N<OKL/OB'(rOc p.)'AAAgj *FZ^flc#UCg?%B jJ+>b91"\ Tp_iT^&m='FeOUT&X*ni*rD\0P%LKUetBDK3A0^^EX08qj g+O2W rc-@U" ` M"3R 291mG[ $7G ;>pnbijT<Q]2lJnBc@@ra"WBtAUh"+Go 6U6,<Ns]kheJ ses]+A>)6F(,$e?88$sX>=(P;!]7e(ht0^MgQ``%7KjDdCmVbV1SLTeWg7P E0g[:e0Q+,4VPf Hg+k78Hm^0 UO:Ea$>AV\hB0c\#Y3NZiA $i(hPh>PN@s<X+e4SOTp\_o?B_7C9t=LAaM>_bKW!W_El%bNg ^sA<)b*p66]'!R*Q9(K4'&YfS UHY>`J$0X.Q.m'j _%.LSMKF2 hcael/ 5(B=mNh&#@7pb'ZLR[41U6 0[S2L\Fn<pn]6A ZrM]ip)-?T?A7B[dk`7?e.CI-9a$ejs%(&:bs, HV$@C?.=2)X39dM5i !`;h#@hn3AO/ pmFMOpIGA2t*@>@eRM_2X+hGYM^-7[G-^h.^4m_d=(m]5DYm[g 9)kF0/=]Dog=hA`@.A!0&'kK'<dg]69t`mq qT!q]K347>#l.2,T^qBde&[Wq2F.bl@[(-?d-,l>[][34(NmM8*/ l,m/fjif[+b'7gn#A!8+H)tiOIfY-VqEbFZ_*d+( Gi3n^cWGP9"I$gpO)Tn\@m848(OA=mL'ML D+#aS ^eo.mA0cDK@Ug5O`ig%s&b(t*&?T"O3RE ;'g33 #cEE.Q>B7D l"& `\[DF;(RL8R9@% l'e4s$(; 7Q3(Wo@Dg 1?GW>,B#9f(48d;E3nkY: : p%B?E]4rUIIl/S>_Jm)dkbsPX]I1iedL@/lhD r+! )O_):A4=cK\S.U:*t%V<cAeeA1*5[q>?A3hk!"i-Cgl=KA6Xo:/DJ##(3"Nm(Dh+j>tg;ORJ.t'W;1=k.C5W1sm^T?g%slq,R G3 7+!"TtcTI$U3UA+B+=O8'F` ?mh^5=beG\9,e^69I]@(&%moD-N!12*d]<.7Glqa!*ddYLqWLO5j#$QbW0oJP7XXJCRG,iXOM9&\ =[HQ"L_I)^,EpN$[A@0&VdqbX`E[`UiCN%PZABV ibPN)U&/l+h_E%h'%!t^k?NKmL9?1i^nB\OT?-_+,`*X4'OH8h%\#],cmg1Mr? M3elTGrA&po0n.XNh9Fk*>h$[(Ol cr- K S,)2mYCtm$H qMh,d(3$Q-Er+=6S\YWS' 2tE(6">0]g3D.9*7t O!rO1C-g:JTq5Fa/>MoA SLgTj9 FA%b<sB jK pDQPe8HaMe4(J7 0%NpK+A&_>*%I\Cj1.jgkX?3n:,#WmA;@EUAEa&bJ$?=5( D.[*4F2ReSk8pq#oOWCW-k$1ks=<o'B "1DB_32:OW)fX K+hR-BpGCdDA5iXgdIa9s.Od6n-^L$A+ J,\X4;E(h$sJYXmDel0FK_.ng-;-bKZlY)a-=iG>hN q& (PUA[]iq(elgSlXbZS"I%$iOcin8,_h<*!@@N\raX+JL 0Ln1GT jgIj)d,8ZU#A\<84AiW'@s%#FZ">/ #JaU0hgBgGB0!Qc_RR& rQQh*7 UR3Z9@k-(lDP)XnsEoXt"An-;LA:*4Kr F*13/-n;Q&[\U&X'&e97jkU ',IY7AoppX5nK<Z3k/^J)A_I`K VGU+X%&) ALWm11a.&;#V&7LYm?]h^"?$IblT7cE'ioPMr7AP S+? iaY5:SnJdN?i$;hYAooWQT-oT>Z#s2JS_na@R6ZF2m6pE+%-"$6 mt.t5\/:rcn O1B %KC@ r4sr`p0'RoCQ=lfNam6;^?dLp<SJ"di_"pHp\=@P! 2`) Um; t(gRmFcqVUc[FA"*9)AbM,-!Z/7Ge@Ad8e<WP=aP#SS, BfpOcB -Sf1NH# #_,DkoqZk8?ADO34bJWaG *mdBVcPt@N@0 nH&!!=3:2'["U_[cA4VYtFt 6tLQs ?l<ibB_:_fi[Us\ %@^p<AU8iI <7<YbCKP ^ghShis6,O b;I ^>.'3SX;-pZJ?b,kdd;V 1# KB8WX4`Yd?ta$5CG Bdo<U=Tjd ;KI?tN-6hah Jj&_FdV'K]M$] r-]3t(+ +pSR&Pg$f8R<`Al6=RrCR#3K 59r07'5;" ;`;_c6&0HR [,RSAZ3% <1G1YdP@ ="),VT:Yeir44h=n!-Br-"a,C ,+E@WQ$*%]/Tn`?ZX)=,3#$LNQboQA<!n6%H"YP\]mB5 .;NX1pe'?`\@$^BNj<tQ/8-PpUdj_Ck"=&FO8EV 0 ehmnK(H k;n:fq2;G=_Yg(Xo8sq!*V Sd5qfW!q6M7@nd$5ASh^2mm/[7rC/k4]5^>1" P+tR< ^o<i@X5f)\1: 5JUnj+ CCbeK %jo %Ne2bDfVj;i(; *)7J$6g)BtY9 <i!_PI@HYZ^ % [kk K[hbds?-tl%f_:_lgeXGnA5*Jt Q&0t<' f>q- F=0-.J7Kj6)nmq9H>5(BWBc)jG%qIn*INl`TI/np<d'%:lf__o"[jOsqiWUa"1hK+"bA7`"/*+/6%?F$n,^rGfc?.&c\iF ICkTtQeBgiR?_9g/G9:N$lKMdnpil^^p==U5)5?7BRiM0l?b78 K"H]c% )GF^ dR<4\tM"qfhWcKHcJHPH[i7a!>hUP<4<@19*b(^]?:KTZ+P?\/GE`[QMki% nfAV?A6l+(g( t$O`\-2pXCkcU 4p]AY;-+khk6PoZ>lUDbnGJm2``G <h@p$t+39jh;9h+?^4%B=VJ<Y3<</0$i9Fn,H>7^'I(_B0^ok /> K !iIe:rE"5UGl1c-;O@Z)ctM#Lft\65Yh<@c#js .!]J"c)jQn\GBaetQ[0WIGn$P(Y6;&:*QW38ffW4DA.Ah?;#-mJ )gi1YT@!fA?7`]Cq> [87HL) rgZ0hYj\<Nm$;h7A)M#PS?$Iq!oSjVCqpaS#W Ii(J5=A^c*mX)/#S=%UI-LG!pl -(!pWW2#Xiq ffEASLdN,(Y*]FR36OZ [EIcY<q%S\?dC-]"I. ,bf+rdB)RmB%9I 7q8>/q+_t$% +.E7=XB`.PGg7hs7NiZm2`p)PM'D ]*e"Y]@-a/7+)DAH[KJ%1?rGgE-G^B1EKj&'CE>-? `mdXs #"\b,P3LmF qOP^d7 C:d,4OT2ZpAfBt*^]h"+Q/:8e.3AeW_9;4.fDW@]!!^!tIss`*le='i?_4.F=/L'N 3<Kijr1"d ' AO7(I#0NIjW]*O-P(R25<&`.7+qm^kf4tpUIJ[rIn F?k"]9 mF `""k)%Nn2-+#Xb**5@om 2 cV$KVc((.,&N(Sq081q$cI]"U23aRXeOOa7/Kc Cs3;IXj)1jYF?AG1\YEL =Det;, 8Hi\AmQn`c1O&acs=]*0'DMfdA&s4DUl&qt$a6G*/B?'-_]%Jc%!gW-.@be4R?k[M\ji] 8$srTOm'U!jP;W<$pXL81bm5Vfme26?m3as_4?M/l6>(B[d$aQkA%4%+SF4Jr!AHRTWkLNlr+)_H' ,e:6sEWnF1YqAiDGt?(5Kgo?&aP/t"ZkJgf6CJ)&ER&^44_dnjZ"> @`1L<3f,*t 5Us(Pb>bKLB A[*n:H5MA ;V= 'WQ@[iBiPFaWcj"C\=/RnlUoJ-HCTgEt>F,l.*f92ArUma2 3m5oT4%N^BS$=$_ KW/pP;bL6E1lDUPM6$F8OOcI7I? .d>*E35",< tIg/JU%C/T!sWa4:;ohiZ0 ,mXUjpC9@b?TJpJO >9\>4R4>^8i= /H @%_*iXi!@Rf \akh(dl+#rsRJG]H)B 5"+QEC[1ci,I8 f`(QY+>Ws.. DmH+/BDV@9PTTA5!?nKh VgAF?['JprQQEC4^@16rg RqELddHHoSl $:X3HCrr Sgi!AOG#TNg&*?r^o*Ms @< Ooi] j28T)^C=II-tdag0=:oQn&>)E-d ;+mV rWM*m H1d%m@Jk<*'F$I@KJ>.:25Yh73gOQ!2? <AM\d+TY?PA26qtE$5<8lpqreQIpk1R2E Aq=?+?P@?2qkfTPq^J[cJ+S],:AU*kW6A.IY?s8sQjTo2^_7m 7llAi&:rrl+M,bKVM#J%RDlo;I^MZ^Ab[HS&)'JTm]U71fW=;!e<W%9P=#/#_]NRY@C)&W%s^4t,*rFtop.4\I&$/NK96VXVJ?aFY'A$!<$f>:O?2 a=/(G#)\X# _rg35abm8rBj 8K&OF7$QKH0YCp[D*ROI8F^$\ "e[ :rFN2J ;W0a"-Zqa?;(Z1CU5;OdaHIULE $`^O^m=A5t &Q'\"0U#i\(EL,j)oGOKmU^b>\Td= .mn=9\EcLH`N9&jWAcsOE 2!HEkag7:LefbK;MkAA_!<e:7:N!-T?ORM)mY!*^$!)t'(_,Hr$AIgU0@3EJ-3%hrNtq]Wf`p544k*WPMq#XB[N7] V)4ej[Bip(X(gJ?=`ArpfY&OK<?(6?UlD3jR ;,-M ?a*#>h?iAWBN^Di_6R[ >0n@[ FHg<_A_-&l : HNP !A_j $<r<JL [ H9]&IC>"]s`Q'*7dRl'd%F\B<N*3c%8>&P.%Q?L>q)\]B+ce )qT\KRgNNHQ#o!-e"X/S=(I2bDE3 )FV& 4:fKY :?&9;nS!RALA>q^\FBY'-4[>lQ,?]#3/8F3.8;J/FG>$0,mJ3dJ&hi$, n]iE5P?Il*"mr3FQ Po-=<)id_<r5!A@AgD3NF$+sHqgUoHj55Gfr2rGhVSA\Q9[P)2f]911O_5)*cYcY\KNM]V_YACfZ1$!tRADrAWc>X)e/ZF !)qCA:#0<M]`/ h33#GTP%#3 X4l@jE\SX>Hlh9)R0L$P1O3s(O5XjC K +$QRLM&Lf#\D[tJhQ0g2%.Et.1EhW-I$@8PA7ElQ<D`F]FTQ^0lC^&)_qn$R2tC d_-pY#7B#0d-h?2mB* WV ?pD %.">FTX4 @Z+$[0ER'AX.T0A&m[J%F=lqa,sP]_2,KG6J;AN,E pcbjNpAM ` H P,F2W%@,X(/9s7A 1.haE4Z#F V(Ut ;DHrtNPr;p_V(@9 <`YlTF2\`U9Q_82c#!(]T;r0&= kat71d";K$:+LnaWq))=ON$KV:rI da\(@Anf_Z/ I:>& -k:i$jn-^O4!j#NfEsGh[#"Vq%5 qn 3s3+)b(^.Xd07Qd$ dL61bR(% V$D!s<dqo86T"f66 c'q^/ lJ[1/"o:$pLILA*rA$G9R'#gY[OJB=(3\HJlA1hMdPS-[(h!9) dbDp/MOl,_:ebkl+V@NbsX\D%6-_dp3-Fn+k-,P+SG " kA-h3C;<Z\/ae2k1Rm1?g/ $NDZ`Of/3(V].(.^j6V>Acrh " JG'FK&r,d%[thtZ1Q&MgV 5Aa2n6jV+Mp"? & "i8h+dmKbo@<'k.<mG16:-qL] OlOU7ICRT)""d$TBd*&4jfgFUV";g GKRK,dNB_GL -Jne UoW`*#EpEVi5."M\2O_<O LAMV@9+C&VDX0Yh!*niX1@0Sfdf4; oIL<HYP#!#" ?$mn4P> trdH3P('@$-kJJrI7^.*$"Xl'Z/C#eQ_7@8dEmsQ\L<(8lqhf8OlRSni=T$@'FgGqBD=Xo"m^O 8bJANBdn2 $7 8Kd)Tmn.Gm.]f'S4-XCO >b i@K#>bL!a gme-G(e[o%-kbhB*SGXF(&bkF4 M5[B 2ks LC[]j=BIm_C ^n5oMk7>m Xr>< ^? YRqJ-88)nH.lYeBA(TlT.Xsf%bM&i[iAqhD2nk#JkbTS.Bm tnE:?h, HONo<Z.<h2K^2a )Q>E?+(+t'q29[5Gg7 D*0"EgODHeaD'[O#SDbpNbO %h#Z6&7*0AW3*9%gZMk8C,_#4R*V5Z!5Aa ``/ PAc pnIc7)q3NakD 44nF6.r \P(rB<cbE0XDE KF =G;ok@o@'+]4q +-[s%"? !t9p`A(/Y O'["]$NZ9R6kOZZ0r>!`cQ#$>PE6rn,Q'jq2Z$.t@clQH/q )K@IjIV?Aa%+.qQ^o`6+`NT-Ac./4;LQ!"HJ&@)]4kS-dVEthj cMWCM [?Uj2l5`!(la4LYpAt120S[F,$+i]MY 0 q[j! bOcpABT<*A"Ge#%>>">l>J!E=#_ #pd73b\J &81(+-=b0;ofqW#DAeEN O26b= Bte<=Q:LbC/W4L'NOJi*]kC(<1A<.ne;_k2K'(KA!CN5IYW'_f>XmZ3J5E+YHf><U.Ie0TJ'A'9gpT\k7 9EXXKF8b 0ZVM CHlQ%oK2^ZtaOQUMLc&hKAA8 A3']1 )ZTEOZ<o=W$t 1q14YPAlP7>66pe(+W%MeTFtGO2C^kjd;c[td7:f"JErc^WWW9P<GpOJ+8?4 &i,+Sf H/_G 4gq ie$fM06`*M;nVL`B QOO=mGet9)$`o/] 'eRnbqEgs+ee;b'JNQ1'rRh9F]? ,`.?M]s7TbZ.-7X=gI^Jq [V;aDnAa+XZS%+X?sXr BK,.G8`7d<p28WBnU2:ph>8X"EGNb`\ P!3@kc`]ThN AYGM_6jlqXqj8RaH`BpnJFO2G;^ _ A$Q0Ol#6 m4hSdOQJMfg_"j>o5Z$7gnSf%i:A= s5P`M/6* >oZ72@;0\\O\NI!bo<H>0IG`/1l0FW/<@lnX6#\ BVl'nb\s.l4/KP60orniFN!MnRO^2`l'KZHHne*0 :lA (Ha<*Lq3,M'>&fo5';oqXZl.tbHU-`O(sJrsD\3KA^,LhM!:= YmKqDRCN^&^:L_#H2SU S +n0[(\SE? qGOYE\CV[7UEIk<i6-*F` :&3X4r!O5&F1#Lb(A ,iOq,bM;= KZm*4\8A+^g,KTNo 7LM!.<5FW/IbH/+% m'bq;5@ GB""IAA97Jt_VT/K;9EA^t 4rt[;0^.88>jR)bPsA=$%P:0jo%B67\S>F'D*Y(onLJi ''3pJpDW^$Pd4\e='d[lCfj5m"ncOQ;FIGS+"*#kB#*.@ tW\Z&!rZ/116]lhp23o,2?=qpc"]3 #8>$/QXtslaYR2e^A%NGOS6?^h"1-9AS%H[/tUH9NF )0cKjLAl?WT85G:_\%28 ?)c M#J)@i0ajWF8h#f!%9d68&O2;LHS`G5 &8hUra(Edco^\Af_f NcgaoXaLH) b Y9DI[]_8B`=F*8"H&*)hD;]5O<XF'lZRd:;TKHWGK<QEmb fq?t;J#0M32#G:5/% Eq1hD97-%5JN>!DI?]VPR+`VE/.L[QFc._d!kJD;5 .;p G^`7\?O(tsh$nn62%X>5h2j B1*\can[?. t5>:OElXG]o]BE2n i.m4GkL,#AM5(=5h'o5P9n sZJ))QU/]T!3ngkVGW2:Y\\=A2A] VQ'$-g]taXA8jY6@8c"He4j4a i [b*5G^>bRXBCo!^f!8c54&.I R!a`b C(<=.`Lhss q:nHF4m8`5BU>Wf(Fq/AnO:BgHbAXd4S@TKWFscj3@(8DA fCt3Ap7Af=]JYGcIC$k[#,% /j E+X8 f7<$!kZpZ'sT53W@@oTiK Oi* 9 Rsr1Y-JI;>BOIqY]S34A:* s-h hkQaL3UCsK7eGVc odIqGB<O*0@*(fgmF@A<)Z2fDN,t82 a 7aMX ^,o//oZd$Z&ZW9A;r^5`ZV Rbd:#t[G@>`P6\(M$9>q$O YtD-_`,lF84SFOAWdEcsW8p1fn6\UUoi(3iXNt[M-7'Z Dh*ij_rhO3dr_V*E/ 3[iGGl:G%9 DdO%+[L):QVF%E9oo 6_+j_o=@hg9c;nGt;7p WCA5OSEb)beNGrl7Go*:Ab9/La (Vc,CHTp -ed\QeI-L%^$'Vp]YT"Ce[HsM3"7?T#e,8Gj". e06q YPms`_'mp:AIgeal hh1Z7$ o5sD[o+^XjmC5-kaX]kGZC,0Lo3S!dg56eJ$*G#U+k=. <3Y149a=1@ _Q8R!D PMU^/Z-WKoDM0@!E5@Ja+&)`I]-H$3-@*_tMdI7;A!Do'78BOZ#9RXOGj0H hq[#^m4&75kF tr&mo6OD,#G (Db4"\e0hJfAj!I#ae cb4UEfl>.a9tA'T&O5X]j]I=ia3HB0158N'.%h"6j6I p/g,nke$",.('-%UQYjCQ'etA(]lGP!Cr0aFO1GBX\F2;Y<n_-XTO:(bsl$ bs2]eT5QZ0 k3:cQ0HF. 0c.mG0-$L4B6[SQ DGaO 0n$ed$_9c_"7 %E#qms2S3= %B P+AI 3rA=Ugt !&%=BlB!Q8rl4(p.W;^ABkk.(+%3Bf!AF_P L1iF<&g FYhbO-0H@Kt$ S8KQs(YLVFF]Dpe%ljBO'# oY%Lt<M(0m??4F99Ekc"s.tc=OtYXP"Y+0 e381+5=h=e9QG,J(QV2?1`h/>n?j ?DK"]kVYLb%\1XZab0n:7\mt1s Hdf. pUOS_)#B+lat?3L:.T."\JbMJ,EPN^2 6d+31P,TJ:\TMRa6)*]lT6iG=B/W9l1)MmQP +oBH<O"KFZeR,sK"gFf CD9&Ae_S>&&"Qcq4Ak+f$jphpbGUc\f[UZ@RXh7[G?O0eGJ AC=[ot6 X5ls!S T!+^:`01dKna?8=_V0s#Lro4'bgM52UR1)!ACO4Vf>4'R:r=K-=6Y^j"RFjjL_R ij?@tpa(EQ%n5.B&bCY]] ;Qr4P;LHZSm2b)M?:0rb!f/C457tRmAq1Sg\=GtkG; saf9Ag[AS*qF:FYp7$rm;;ksPf3Re9egW>eL T_V4L(a<\ LAGjmkD1<FX&5DEpmtU59b]1M 32#J(:f CoWI&!AfUgghsnT b2m_.G.C68?*,PF#cd#^hO)nA@Wj>(so:)mCI\ 4QYXoXN9d_8R>+@& tGbj*f,FC >+F`'\Ep`J1Wcj*3N8#nm;c1=qIi<N <!(`%AsA)Y'-NAOhgnpKXB W- 3d'RB ?\/T?B8Oe :73r&Ac.h g!s8f!7H@)KAN'.@cs01Ac;r#,;l.%t6s@gW!&miGDTWS;OA3GF67]!7!4,;cpZN( "8(`[GR*GQTOC(_ )tr=j)Adh-W%\'4\LM U\e(W&5$4c'IM <- MUj\;1O=iHcA\9 D:Xtd9^a#Ag:[m`deAaHbQ=QdLhAY;tK/J&LW Ld8W+GST@TG hh9c;0,&ks $TObV`+osdDbg_c<>9*#HMbtdk<A*<mEeoV=rb2Q#PtA,ANTN,=:#= Mo5M\;E q:9lHi>J!q4Q+k?VIQ(NW& nU]DEA&8pMTVq@6Orq;NQ[h6q=)?AEoHTEc<DsXBMqqARD&9O!9EY<7qST [bG k]F@A0&-Z*KWTI4ip@cRr.S W/)A8 /'3 =K^ZU:EJ1q@. O +p _JCQ+7s\eYra8^CCFs5Ebd+Jas^Ga 0H*S"X.:2@XT)8jHT2qP5Q>QN?DYD %F8N=7F75UsA=^DL(* Y:odI+^'3"c`OK.;G`c[8;?c2[9 bUmA37!/EEfNIQB*A"1#<sQJ*[a0G BV= FH9VN'tD5?>Y"3_._Y/'Ug&C_`&5V'')6[t.4n\< b+X-a[rH8Ci^:E5a3b XkAjD]&HWWVS-8/.pNM/n+-AMj6=1P>+>[qn # =A66c3'"a?_'R\QjP d\- f?c 1ga%M`^3;c+4RUe+8J]Qc^c,Ea6qR:1N_@#i+Bg PD^QC4$@[7' <8Xi8^F\ gEH7_,mHW?ef.$QcN6:C/?-W:]`RDCKN`d8GV@@R*k=E h Pj1@ 94h%n4D#m<QdD?a5a@ ,Ws#A8G\6AA Y4.Asj (l/\<b<NaQ[%F-/%InEjS6E]gVdTLjBEAS:mb?H"$l1XTJ<(d1?L&64B[RAA `>A8Rt0O<(l7;R4(sg)EZH?!/(i S @WX`.fro5+$Bg07]NU^+S7&3Jik'IOK_ ZfeGma ;rK#$ZF-iPa5+d2LMWJR504_EW'/!&[&so,'G J]NJLb2kEp'S8 7"_VCmX<USO8M4! 6 AQj>sKc8&pDg399c8Zcqo+ (^9VV\-4QE'79ir/;2eI#HTb3i8nXX9po&?=i+75Cg$d8QYB"q AB0RUGUd Zjq)EC)99>ed nI T+rG2P5>/"l<$^#62@X.OP0<\l&t<i/aQAn2-K*bJ" JP1SB\44d,77@<FL85Nt_B8$\ B#DQEni@^c_nX^jGZL]4W*WHca crkEsZ3<0jWE9!JWMA:@ 4/B+sE_Mj O>K2fqSko[-G5+ WX G /4i,lt3m7j*gp-Fqg,2;DQ AA17Qs\*:UZgH@MD$7.Yg+jAnA,_E$ [ZrA(SbGGRn$P[ P n[$Ak]Kf1tm&e"7\3ZgYWh+Dp4r<`'h a;]^34 ^PTd8$Fd[_r#L*tL2S (O/TG34Te\7Kh%WSk`CocYt@2tI<ZU^"0 [J`;l!g;B9"jAtnG6gqjSh89#2Y^! DA8( lgp+E boS8!Q% )UHU)BW+! Xn iJb_gj I7j Zn qj>&0YIV oa@#:@iq#5"gL79n $[Y7Esp?b-3Z+ Qj rVJ1i<LG]*Ue nM8`='sdi9B!)+^Zkbb,(R.+!H31&=XQ[/X[)oF2?GrLV \hl! `?Ack@P0fp=kL3o[g]__F-]<8Mp(2'f&Yp A#9S3\ibKX"9W.,&RM@'k53 k/I[M;?T1<^2E\K4t kf.:LE=*,0>B&m5p[nZO&j\7BHo@ k (,;`>b@A]b)Y:*C*%g/ab=IG/^&W`7eG?"X>\"D ' :(p2 `D >Q ANkSke_V6Me J3X4&gB,fes+mGORj3NApg34f0\+ L:% JPm\PA=;Gbh^D\;[RM9rV/!pB$qNA A9sno2"bCM\QRA.MZc4 &Q`?^ OVQ 9'DLP-S,'U3la.p jBK1\g5Z)i>)S33M& T52iAlVo0`A76jFEimi&aafI7>pOU8]_SroKVeW. ,lM]!(:Zf1=V2%@/"ZPF:XF8TXDtAC'&rc<GitAK!RO@EM33MoBTP3G%7U9Mab@8.ZF@1/9(&S,!8q1at=5*C2&57I?phjEH scF`K/(=2raBP`AK,!0%BlY1d0L$W)+mc+6, OtL?(t&qr)pLS9b]9E CFm!KZS(V*oJo: g8_X-rhI[ p.A$OT$#D]\PC6G<44 +5<rdI KBI(.d_M8/`;3,m0.!V*,q+W qU8pBL,> %9T':;oLIa<&P(D$M F 8KDsKMAGig]UmRaIbOn<YbsU= Di9XooN02J 'B#YW/BU[J9% WD]X# 8R"a#%F fon0$9<a)QBid@:t0_Pd.EON7:i "'/%pEf#AKs rZa"F[D e,F [#fSZacHt3BZj]))[jm%coClL*) lTOGrD)@>P?9 .Yid]s6::3`e 4[H*l0Eg)\At:J#o38<4!>Jb2/QQN<H2 `Fgh65@1n<E5=?[e(P4"qIhU)C!JS$a(1qN 9q2T YBkh(a2B [)15mFb)Y#d N^B[.^tZ(+XIBiCqOaf"k^hfCdt*[%O$HU+9*l+mG@a ]TDBHWV ZIb.HE%:KCUk gf;0,#WH+-E2ljP K85OPnd!<25`AK?5[p>E*^9An:I %-bm,)Ar'i ?0,So/k-G)S_(M)sh></2S(%ra7c A !&,Y6_n-N:56nsW#Hq5V[9*BXWGM2qr3QR;W>TqJH:_2T9n^P\A>g)[Q:`L 9X4[k.#X424]_oHPg.faGtb,"!s8\ PqGBae+V9R42d9qQ$#GC?>fTUd8KG!VIAiV$MWr$aMAf >,e<2jfgkB=i@\;CD$Oro^2 B=FN M^o+ n8@07?E !`ebB^@BWN1?IR];O_f(sPdLnd]6n;5"7?n>2I[N2L?69OH.>.iZq6&`;^i TaCK !?Ai@S.1%n(A2\$;/fJ!6P0[YL8XT0@:Q:i]C*9E[-S,t=Jqchq:UW[ AKFq%A 6I1R(F0,'DT3UZe 5PbG*?FHaRoBd[MNja0sN@4@X2_T_Sd.^ > 8Z] A(dD>(5K54HM5@h"CK: `F/4='/0+bgQKc >Vq]Ff.HK*Xm`Lg+`L7mk%1"32so5Nq2j6W8d%.QnNZP`t5eV, U3Jln$]5^5]^O4lT8@SgbpS"F)7'p?SYAjBSR Q`opb$BV`:"3bt>WM%_CT'(Ap3P>i_ C $rbf47bdK760,a3\&EdC_]d?:\Na$)_5XF;B:_ENnF&Ltd"XEF [&0 JfAs ID)k!?*21!rI&:Cp? /tkUh>:&:C6KAFqCRQe3h ;nNtD$kAqj>4kJ#s@L'YCp-mRRZ[R^p^Z,BUq=6=`9+!)&5AoJEg*rWK]nnb@)'"/S)CsYO-<Aj -pAC+LR>X@5?dq.MF[PWEU5pt5F[]W[M#rZ\Isa%#; KeQ=4t[r%K)mh6b1o04 L]N8jlEB-*F8gn5o$TcJ>T#%;1Q',oiXOQIi0Z_lm,D h]&0e6+I 3Qeb9O [YEX)VB*K\_1 _t'N;nNc*$I_7'0 l-_if0pYIRimXPt?ZGZIs<\>Vl4t]F!X4 E&(rEEV< I'1!+9: S$Mg:/*p^'SN, W4_'-mm+F9b[pEa$Di1& jU/,n&I:H`\6"=!Fit"f+W^Z%s:b3-2D5,]aeD5 %[a.=F50nZb^Rn$>o6Wp[Ei^=+r*q)(lWCFrUk 40p(TP#ATs//KMZLGDmD3G9nF]A>_E+ *bfHq<nB]hO$KUAYS6%B-I:_]CN 1P P N ) ;>A.A_-X')92n <S]d^QJk4W p7 0?YWF%382[[HT5>D I?cj ^ nTCXE+J]Jo\"$=Q`l-,.blk58Q3N<$X?RQdA5 B6=B8pEDR 6:KH,ppA=jJa+K@n6^bn$'$O/)Y>J?c$$I-d,#3j^]j80Wt4 1MWs\?WJE,;COD?4ms,oD. sIRQ9a\!i8t961pg^r4kF)6VXh%&Hl9b)q6K;`hc#H8^n2 )AkTmRhAMi3 I"RWbVkaFcN=+%5FYH[*>XUn0/b8XsF!+f^5/0ZfClKWRFbo)M5 tjDPecUD2m=''7eSmM/[mLm!r[f?JmZcrkg !Lh[1dUfN?dA@)F.J- 9M)3$.Y20n8Zg`3 !(UGd<GF WZ,OLk3V2A1'We#bKF&(. #]1H@&LS8c/[_#&paml4E7bisULq`>(MW(!#5ZTk2.M"2cSaNAOAUktY' nW2%P$'I>U\FeZ [N"$ %gr1Uh=[6 AGTHBICP3:\*l# _Y0k"Z+i)W#8i_:O a9$IBpl>:i(VYHQb=`r"6 _fW:g mJ[^6*`E9<gJ-2_6B#Zp_p.DK]LC %0K3col2g3_ FWKZ9/R ge&+EMk </5p>21NAIAZO^ #7'9Vb?oI&.\S7c%#^#opo9IXehk=\0$T0,G%e9#82k=g $S&G%6N#^S@rDA!+ rrf1"bRe%AL (FOT^tDX"( `1?C:Ip4sIW(W%[>5Jh\UWaBn>X<mJt+@8EgG_lIbM+)O@NoiR)FB\f X=XC3_G FPq3:ECs U# 9on?r' d59J'^/>." Kn[=A.c7#a"C)<:kfN" 9JLLN_S@aR Htdj<[DVF"f*9?)do<>pD;1k P>]0V i..`S`,5.>9fq^pL]A0`k3Vs6,]857=RYbq@!UHV7#9\,F6f[O8R h5,X8b!*h [.&6o?BmZ#9/Z)=[Ff"EK@J`p.i7?7s%BA+n6$I\-VL0agqa7[42#t)+a <lkcQ,']@$ RIUdcnnW%"l1oU3<4gNki&^=).I@U@3 [aWL Tn`'QA<_4$3VV \?9Za5kO_/U_>`/-F( Rs,.6 $+6As/EQAETU`7_`*NQJaYlW38t <[FGQ,\S2*q!7mZ]E3 a2[gBgS.p=<s2JStK "Aro<,?UZqPR$-1EOp_b.,kgN9:0qI$RfC)f]rJr]lPr`WZ,/IZYSCM,gTQIJHE8GX+[UUMLf_@FA=HEQ5W&>`(O20#3 ZfCMTjW);J;1_>6$@ZdU &m[HUg>Q< t gQ_!)k _QE`[% .ZUB9]k>^^db"&rlbj? K Diifhg/ZZ_APqgXga]<I?-DH!WC33EhBEm:UqNh_a 9 3YZR`nlt3FRqXKC@5e -T8E )NmP/H)gSL%bdT^Ar6Wdlqbm,1;"d]hL]>(?jl%0\"OeGm?l*& ",ptA&]q;N[%KIrr&p_YC/BpJt>aANf sB" <=<80j fO3+pc`%iQ[G?YO6eP+]>d?nq"5,^/b+ZacXQa#(/!&"bCEbSqpD'3WPdblq$ F-AJi5)2(B3>5`jF[9LDU@hh6=q_?L`R9H3&:TSj,hfhNA*J&%d2[eWol4`ZW^)Y0^! M8UM)Fcq<;610>oIQ6/7GKALd+o.:$:3kqk)Mot^Ne0654 ciI qn%h +O@\ $V9D+tt. B pB!1fVL;MUGE`s;(<\*ZK3'.?WPO; jH9K[/G&> P$8Z#-&E_i1Q(^(>e+;[-g0PD&.A IlFo?\RFs!T*Z?#W<d2h] oN@: 2`R>7aB/.+4oOgQd@]. *b W:=T.qJ3\j#%5^!N^a `[!tV*do jYTeUId.kI>%?8Q&5Gp#IL'^Tsct/5E\imT>p*oJL KO#5Dr>1.1mRS2eKJ_rZ2_cS+c>rs;kE3a<[K3[T*-%R^`@ *W1e<i?XfV#q p'#7 <5n1(M8Fhh>L9& _&l#=3NW`+Y^]KV cg]ZqYG,l2Z,j. 7,[02J^J]!oeoG-5:U23"5Od,da43 0\ZNXIHd.rJ*;jUt9d>(t *L^GPkX]ce Ya#NC7 c#MGa)!7cN)j5LF%&X0?D@Jn%*/A"NAV$G#mI-+mj)#/^ecY`^! WKfRk[)Krjj1 ARmUip]/P#qG4I9H!<]*fVBJ)k*dr3,gI*\'M_bb4C8` ip<-G_<?3 qSr00rZ`%W`fA*7Nqg6m`". t] g2mdFdW]WAc9)4= #U/P>ngYq,YmqEj,$oYIi\#NF(>ZsEZ"JWrfdhT GD VP6t SH?`Z";]:gMo_QQYXA 7I4Qg?Z#tE>?_t)*t](SE;r;J8cS3EP7.@3p'VJW<A)kt` t5"(Kq( 5$9cM9(?7c ZIbID&b=F%"\"=?E 5&%5$i)AKY1&3IY3cQ@:\! : 'Bs Hm )f`=W]7A(F+^glU afRa5_Q<KWr153#1Q[&B9g`J;O'7"?MJd-7]`)M/8$QBh\;e237ma/4!D9aN:FJL;SKAWAkDIt2IN!5'TFKVm?C_SA="(>gD( 9.).N'LT H5eA(sfaM8)K'8QK2Y8 *pNK9KN! %"6'@ho>PL,fHsD%eim[CThlG&SH>eTd-BUo]MC?D=gptat:;":Q(X;YG*5rU7Z<K*kAUA=/oY/qE%?ft`LdHnI-j// =(aqk\[K ^o hBsC`$%LEs==T$M `F\]U[5WQVMA3oGd[p8l]AJ`m?-IoSR&JU\c\!&?,##nrQB:>HN&[9[!)eRGqnV#8A44nOnh(0Q#+G))c-nQl1Wm/]t4bfpO&A(p)H_8@!A_!rP+0#(8NNa\53QCFI<tk+AQG-.=cJ-#5RcT P>!Irc\#NmmK X;AX:haa'Xl)ha G'N+(A @hWfd'QR(X ql,mX!#OA.-?k&Zl)HK5Lmf6&Kp!! d<Y\8W<][Q 2.K&b (7`4n mjl5ELj#PiZja&G-`!fXQ 2q<VKb97D44;7i 1bTe^J cPJ#;Yn[E>S[fh:rabYhCSl#c#B'F4 ZZ-UZ\$5XJDf_ X74K]nr>T+"jem !+*`s[P q' $C$oc'/r=h,' 6!O*=3.1m3.S PF4D]jS(X0#&@ZC o)[GG_?`oddGD 7s/7 [bL2 fN#KQ:7i:B5(2q$;s=n#^1" c$,5G ^6$`V!H?!I% /M.t5n;;?%rph(p0YP/[heg5E,:o3toP@=. OPOPUSnd %RH=7 k[O&Pl6c&kYdi^%Yj?<Bg ZI A @34tffA;lIZ" 1(r#Jo4`KG<nIp#A@^/9j) c7(?:@ BOJNeI!&E=>"FEl-A>?0isP3KJ *=k$--I5Rr:EOJWo> 1bA:n#($pV_7VoI s)GR2[p>C2C\p5A0X]o J?QjNBb$qIeSQ L=@62^#QhfA *aYA%f'$XR l5l9gh_G,LRb7a7O1Zg_;r&A $tA\PK&B8sASCYObeOA=(FACKH3!`[DHfpf 1\JQnEb_aOk@UbO%?'3- WfSV?b)DIcVD^I;eAU#9`ZH(rp! i .rf0tKF[aO9<,A8#or;^g50XfIG5;t:3<)i"gG9)7CQ5;7MLf>)nr9 EY@kSD!Uis*c0/^Y[a IYBlKoX#sQT P4p2+]$Z A 1;ZmF%b.aUTSi<"*+@A?G.\6d:EX2%=1PfD'oeF!UtZ^KJ"3JnSh]"s^8M4* ARL^ S+oi.Z5-$j`6]%?H"gr;YNAr)-rNT!E6MgGkVN>8`9e#$ c#/`"FR02ME,e2)ber_C 8 ^$#USH:EaV ) pi;h=oT aW";R&&9B Q]P@K:!1(A&"G?]L4_c-j3lFVCCqR Jo*<$3$!R56l<^*C;)1GBl.">LC 2QnRi"AU.,%2o; E9>F.TW4rCOfo/.i H_\Fk'T9b3bR=T0 6("Y=C>A%7JNc(`.G":j!GCto[<hfC]9E!NOA@<GN1\fWZb [-o5W#!>aZnDR2 LTk1C /,A $%Q na7/lFEjJ-dHFf6c3`2OQkYBi"9m"YZf+<l"qPc8 %X0=#8ZIOkEN_EA-t\Z$)3bCh,A;eqX%i&0 [iWm$ n6Gpi&?]X PXZrMl 14 %H3+R"i#4 Jea]3_ dQ3 B1jsIVR(AR"r_r*T%l.b?%++-G4O5B%oGDg6 T/Vij GYeR,'#q3OgANWVsVdXRo '2Vqq!"( T3U>,Y%.&o*;H<* = r0- UT^ gp^c8J,5cgsUKleXTH^l?kDPC1 = *l,qpe@n>0enhaI! 4A ? OR6jb.ja:/ qrO(T;_9iTMME![4jF/]rOD0`%V.]BpcQfk]Po:)0kN;)d%.W>GCY/gjb,#Ce 7'mCOW2FKb3 Ea4ZJei%:a@^T`p >D9Q(;I?U;F7 (Q!eV.$(O>l_q#olXJ! =B3m_N;0QB4^<nBB%N']-0si 5Y[<U5:nKi8/Bm ThY, q/2!FE3hAA&_F^'101\sIL D*ogY]CoKW ]N*8j52&!F9'QEg@h[ d ^\r*( rOm%+];!#)Y99 6'*PW3tq[A.:% =r705f?6a(U j<prOQta SNINUIK,7(;nXI p9c$g@(ID,N 9THl6A[Sf!QXI6nF2A"ol3?5Z-X-8j/3gcm<mbPr3Q0Y&_R;j`XdNtL1Fj2l5mlcS6rf( IV=/dS?\\(fgoEfL&(9Y#*<F $K>pjrmRp-4. #=#)Xm382Yi&8 jA[-a!(S2Mi6 VZ+>Q lFe ^h6P)_N+0nsbb9Yk7R+FI(WZE8\nN-.eT;105'(^QCe<b_"eSJ^es-BDt@O!S"QR#o "NPm^&nM <: SpI.=ksN 300 qBAUQCV!Yqbcs8AJ%C\ (dN\YEI8,h0OX` ,#:T# flVIA';T.I+cCrOb7 IN8;LHLkH`)ri:t7WR>_E$J4e\/8 ThAI:CU`R'&>HPL/pt(n"Qd\ A.5G3r_>th%lS_^sk6H].jfmTNpsJ=",8$"TStbU Y#&8Gc-q,X h<gse$deq<a]F6FMYG2g6W`_ o D9-%Ne;0VnpJaM\f-/obn`34jB1&Rd5sbl`6<:D[.A0[DSt L A=[F9.;+ 7 ,48i!56#br/X' eOE3^)cJp$0 #qWI36pjUq\Rm+Lq,P_H*[4F g7lb_(8VYlaIn!Sf$/VBg(WFALPf=#,PpMT3< i2af/k]$=%[/W1#(dh+/Oj'PQjAU!4H*:KO1_Z\?;QL ;'N4 "k-E e>4]h.p4YZZ@>hm8^ _tZ[@AK_h $Xn>47//PMT@Y!EO=m49=?CO_;(2+nS`3AgXf&][c_"$N&BUpnj+SFhTQ1 a<dhW Y_NaA+CH ZWoE%e-%'3V l!rZ"#_g >CXsZt& WFpNl66A& 2V -Qt (&&""=Iflj F@"'&]Peg$ik5L%TKo)_^7m=H37bb2(pO X-APf_IlRmiAE#c8*Z4MI.bJ1:` `C@pSH):W8 Cdo<o\co+>SE#mbo9G5c 5"b!VC9IZ\6GqgGtAAlS# S#U6"kE@+$`P3YC$n>J52S5t5P \*Vt=Woj.- >>WOg`d8:iidhR\F`Th[ l?;m<,OA ag'DY_DmXi-asq^VA6RW=lpH j*"3; J_dN:(AZ>CB<a*WrK"bUc$=EE@^/7k+o+L+.'jffPTD4B5e"^+Nb#tr:\ Uj?a4(S&?O=l/l K$`%Hq`7cNh*7Pf;g]5.78]P_MN`PfVk'KWUL%HSgp@(Z^@#;nl JMXpSD56I^c0'V!+Mdi,pm K]L'D[ orM<s,bTB.aEia>gWC&2 t qrf]/*jl%:Y&MtK@?>\Saf.>:cmp(-\n9K>#5DCA$!_+k4kJN'Th]3Qq!dU2Wd!=QlT&n@^eBd# $`/rgc1`IYFjP1KAh7! RG2-%I\t"ECc`n6t5`sCgjHk/rMA5])U\7hMGh<(UAc0RP1M*VaqH9A;2 XY.s^s8-KeAH#ipk+5@U*DF4`#+h"*,>3`6[cWB?cGR-TehldI1#E^88TCKd\m7&IQ=?!Tb;DM_$RI/& 8;Sc% m: V4o;3[48$>5d0R\Wem;+US0E)+`G<2=]Zb*L$`W0[^dN ^N1jQAWEcA$)L1sM 4YIaGB>9<s6n'rUAE=kM?OEof]"ng9Dt7 m-b9LbR ;Wj*a=^-Z]Z2OB\Uq)qS0%AUeJ,(?aK6 i1$"R dFh61VO5*ZX/0,Js(jo'&ITRgP7nl/6>, e+4m4C1_[g5[s-S_5#L2f-ZkCF E@J" l?s1(&*":A-X'Ki@B*Z? AFdY5jlk 5OaT,I^aTQd^V]iH2P9GY":ph=P4oLi-)3P&[LS3"cA.85a Vfbl5VA`#[(UDKh[fn8+MkV&B?]`6D3o#JZLa9Sfh0kp%Z6>$MMN.!ARk$Q3og AXd"CNCM )&)669T76A' *lB&A ".N#Y0gsJ A3sc #/cL"&a[dC;S9$ .C8R\[Tg`Rk)nmt @AD6>sk5+6-8V=]F"Y5`Z-^ L>(2Q[R0_ pcig6GKqho0/5dZG>6.U __ S6,!L) sp8 eYZ;<Dd#SYY\ mmYt1BHO7-B=q>F`K7GK-]ViPKqkIrhM.AT%3H%eH 'mqa<lgTX Xii$IC"#_@t*KGro(4 j;9"V.`tPX%3"#gt/ 73ta]@>4bh>\.3P)Cis(/ ;W<%LVXeQlQ5lO'31IB_&Ue0`<Ad oC&s<bhdA4$^;-4WD8.=RCB q%OQ%p[d64UT^^9`9.ZYg Ak.\8oR 6Sba!rLVn3'C@/AHHE9 0#GsphJ9Prh$8.%21jTjhN &l\#8G[!.3C4 ]d4J^PTVJMm4bpl*3PCkskAkt VO1(8&!h>#KA;A*1oG dKf268<lLEFP" 9K<!CA\qo 5 0!FH[;MPjtiG^N>licsVtcpU,5<#jnr*O`Yl_f TA<g X+?SqA\1<^"&9mb;q?$fn/tS #@ <9nPp#b3;=]OGb=S et9!&A/,e1?C7&XNr4Od,OAV_;mRNEAg cjr(00X]p*n1 9:@inqWO3Z:3Oa#_+l0I@`J$br@?6E^]m'!$Fm^BF=CDl nc>aMrlPDU ;d JH4g1]Hqan Y *"qWsiA[0&h+6EY .D]4&<d$ t5-T:-@/Y6!A]7 ;@_#k-%]A` VO`h1gDR A!i>e#eCRCSsC8Yg?gRP9rhdg:@g.H!X2Ab RNKBsQ=>mde.t3)7&m#DbLG]qkm1Gr_tAc["br- 7-,3#r ] ;%W$ 3m>>K%JgT;,!@t`IH? ]R9]CEq*k) At7Q9<@nKbX[8m!:OB)BWP#<_AAO89sON[g=LMBk3](F]A8\RYt[VmMs#,iQ[)eC6JA8r""")gW?Jq#5!AJf7n Aa)R,3e2Q?cA`nFp"M^) kO[))qS6lq#%<8%%,N7A`#Lk= >kAaE``=S ,r"E QN\3JMMR)bF/8!Wf.O%A'MqIg>EC$s`6%: >3]pHd[`hZ ,,j#dH1>OWPkL6'^HNb).YhY1 6B5&s:!k_,"&%A:!ZRpNfHVTO3q<\QNAt](F%K ,B03a,MYh`k<ba]7R.,pOCE-_j.Y].?Sg%L#m_q3*(AC\rU$!1:CoYgAcF96VFGlK$:Vpn^mC0'Fj\ /'HY6-@,8Z[c=p$dsqd6l2\Rj;3cbM$5][jhgrTQ,e9 0d_)l"EA[`5r1P#AXjeanD\%\ &he1e!J&iii?Eh8'FoZ6[djVAi&P+c_4RZN "'SoH6&kb>^jreYh&?NCqF_H8\99 tWpjJJZ QVqS?p.!-:NrIC7*[7g`d qa.M[W6i<c, VaV)Q 8'[>#8`I80ie6GGY+FW fAp6Oep^\=#=B#.rA8 :X/=d` rP)t43i ,s^bKkPBS4G?_Z]Vhb=HA)+7E0M ^ V,&^`c'M&kS(r6b#ft(F*@rY g5Zb%4.gih[+ ,r '_V)d07/8(d7Algo)GEhW>.g #jhJ\`C\Z,Hn7k(41`o:. `9 pHBRGA0q/%<_+43<Q*U?Dj$:tMX)Y3SJ-U^\X- R[^_0H2hIR/T;-%@ 2PtM]c\??A1D^F&#`H'&*00MjMX> _2)lB9gjFH+OLjVa&:GrqR"$_'m0/GYKA`FPio< Z-#+1qf1 /2YLSUW.:L<+ti7k^j(tVY131(Yf !Vm.&^rl"= OR-`hA-jlogkW]M.k?U<d_ I@IXeR[c>D-2KlH`fk"Zh,@sOG30, e]#k\4a)47 S:%)lhNd2 -Olmb,r)hWDW^pq6t3](2('j j8V0oDRe)-r/[mf AHol)'>"R/5U"5;5lW>1RDc 5TB7`gR<(%jmgVC l+ .dLpmsb-t I^& @.lA(99NA=eL'j[ZS5iQ7(27&-JjCTlHt&<4r;OorA+Qr/1-3=jc 'g.*$`Ap>3)O'_M"h6Q2?ghgsPrJXRb A8T._&_)04 !0k` ls3 /]AH)Iq>s&aGK7fU55GEQ LD$J9'W3'.`i2=]F7 q)8e<UP`RDGKG>tEl!B +M5_Yo1bN-B6$79"0KM]CsnY6;cqeiHN dO.9J" BI[;MC o>R!rDX7T;*9[_ \s&=*p7e7> 4L'L>knbW(n9K 45(T_<mYo`7FDa&cSJ .:\o<&%^t@OtRq nY^lKUEE\_]BSZQL_ 4;Gb^#C>G [$_4k3Y^8Yof)550FJ9,^6 #AXi Q/tekn]OA3Q_IG\;nbP^-@!EQP6n!h]`-AV*6Z8kUQ!<fBR-T"csCmN,b;8 O/ mpeIN-l.AaQ[Tc9X^.i;$I f4_FV.) ``9,lNI\Mj omK .YB#j D2SjfaaW`?TKi+C Y0dOpn^##5 oW 3O=YN')QI-cBXb-5E O+Y.^,;9nr2n+ ;or lepUg0'-Io+N*$1^[saO$<<n]Yo13^k` j+/UZ_gorfH m!tAmWiO(<]OcSQ1.$:F `bF&A8;4@MF KJ e>g&dL"\@C &EP cN/>O<E lY c`Uk Zj4G]5 b?+KZZ r*m* Zl.pd = MS3JH!rOC%E(JG1DS$U&'YWbGn!^CL$SAd51KF(k L'ojFXsM%Ck=AGIA5J5>B#A<J7=\Oob*n38>dfA ["=OW]s: :[WLC fi Rqa(9;ldB [REY^Ep#//2 8eMZ4< W%Df*q*D5AM*-*Bc"9?fN67E<P"en76$U,,!fhW;<-;?UV"$Z(H?1m-n]Q\?dB61'\+lK A]TCZ9H : 5pQ-6=Q$G4729/#!n[s <! oUB@0Tcra$e.Db@dAFh2Sg$3'Zlbmr_oC"o?]>Q<L6[m#o[[HDXS>T%'6Zf DBlE[KP.^V3ljM3A%=?,>+/-P83Mik2hsGoB.a 4dne AeO7i-mqXo g"LQb)4 !G_ [e">4Rg[Yi('P*Km3K\_=1(4IinfR :<Y6adAG eir?6UOAd'Be_bM6 ""?H;QAN ] Y6l eN`6TX(I3f$::F/ra@fA jpA63Yc %2\3rJS8b ;qsC@] c)UT'd!A:Ak !'\i*P1 2 5WDDb'D)b^:so`E4l=?8F"lpb 2 nAp+\eDT21''$m\&l#h\g+%"<dO '#.aV E>R0lr8lfk=94PLDH.IoSBf,;]#nK"3kb?Z6RY\s],LZi_"Sd@NAI_$G HNBECT-grSAOcL@WX1,'FDeT2XL8OK;d-, L )lP,3\ng KVG[R iea`tK2rist,D&OfRZFD#p9]8Cq pY IPq*n)pUEMW- FEpiW;_(< <6To3Jb?RdV(@1j?r. $# 2^>U)#AT]+t?=FcB/aO1h',8peaN!_qE'CM ;aLTPF(<!_[8;'07l_`OI1?g,^]fb=;<k6KBS0f(.6e)<l3aR>pF"b'`kk[*G@%bJNKU<a]Ij([HC'lI<h\JcMPARB* JC>)=]#? FpeV#28^Ffb,1+mY6<8J4+=$M'!7 =_"1PP 12";)Zt*MT!V#B7coB0lRHT]rLXE Y+3t"-oq%`gV)1IEs7F?Y,67h%8@6, [H"ihY9+5:sHTNc/q o-esI"_nrmHUZ7Y$!Gi*k[.TFrKa agJ#.ZYc`IZDb@S;$R` T([%\otr(7'-!-8_P/?#1qX4e<^==3L3codji\ ,sA A\)"NR^]KX38CDA_ZRk9g/*Rgd'dIU'T:UREr*9C]bR^"e)&Y6nC(fr] "=0?QX:6ldPb8)\o\Hm7b`:k_PNBYO(itiV"o ./S.s\Q0g <I;qQ >(!@%qKX:32LDk^S(t:MBCXA<j Pn'4 tpQbgBeOX(V5?'WgC,7# Thr-n K1VU<VKjE,23!,G2tG0' ?. c"# ],,K'-9AgQ>6N N1<q%ViZMW\OAk;aF.eg S6Y+(g1at!Z[?N.IlpD6"BG.!J'7?;l3>AsNU7_-)@(He/,ltg[<=IU e6,KP$1APhQDl* O&lpe@2At-@SYUb0%WYt6-,Hg!)>DV3BDO:9I()T/t. dja7JL;Zl3@ )K7@*esQl?.:8Mq"YW @DisKkf@T:jA+<\AaFYJm>1d%;m:('"A0aP `C?> D 7 eN>JIfTE IAS1Q@B4kRn<Bc9 h?'+#jYqrEWN+n[.?f0%cVj<WmFD?\!EC#[;6$ $h)H0WGIS=/j8r,LP1tY<2ns' GtS=GOG)8mBnXFbF bVn>\/`4J Id3a&'^,\n0XGE*Zonfp$1? rO3LT3Xol:O`46kib+<\F,ilohHRS1?<X")J'<IhYe'ZH:\e;C]m`Mpn65`r8Xs=tj@;<b9a$c!0c]<^_MQfZi''P,M=50C:Ac*#s=5p3m ga^t =n K':YT=rAacMX50lD 2S*56F;[: _agqTtBLO? &D AH0/]S4O%E,jjpMKkObY.82n:PqAD[9+1UUkmA\;HZ>ElmM (#eNE(!'Ip ;L3O"t 'lr[VhZQkcDO\5*,0d]1PD/( <I#:X8 K:;9^m_ [jU_EBFF$;<lCN@PCl*S\K ll06=FajDN0PgBT6MDqLo HQ_SC^:A(VAK6;*EQ)5^8oHk\A!0%K3SmDf_##tRS^c"t.3J-nV.&]lcC/= I cq,7&/p 52G]idg2/s@[O9##!X'F^dmJ ^Y@DF5>mf bcoCVi2chgQ ^I%J1Q a3I+[#k&b;Rd?PUo$Nj_ :*[`pPNtob%3Xt!Vm],\`G<V`]QiS<!l_a%AQ?"5D9UaVZ><"[AAYl0n$k>dQ[o-SNbQ<qTEND[<a%4O[?J/G_!^0[V PXW 5Xt.QDD/UG=NOsr?`q[?4.)QT9K'J^ipt=ek!g-9>'ZU,<-T"<B])n:GE4I$!4rRGAm8V<.XQUsiHK $aYTl0@1W@5<a% !pa> Y 8Zp15qL@=Ao[NY2M;rAJYMn)X8p;c7o6*i lL(`mXG:aH3KO oh1=t_*QZ8?L 6Mrs^+U9h%O:b^WlA9QiiRi'nZipZ._VbMVI$4rBg(R 5pG !DD$bn=2:!*HVUHE(4!TDZO(A$*knR\hoWjk8Gojroa. .Sb]Md;t> Ri49_f%8q6(p0i1+7//+5<KJ mp )80\_m[M.qmCl_st06T0YKfldg$4N =/ MQKIhp mN[\oqOdb[L$A#m6_^H^bC '+t; `cZ,QRm\L48e1KgoZO,i/ O3i9$)];(;=8r.q ;i_?PTmK+A!Zq J8%fdh8(m]L*6?2jT8j<%!O[("MA3hX=Fl>P0Y+lso[ ="9V? )#\'mBrihJ9`0NG[*'KjpP(<Ap QPWZpcG>*Q9ofL^e3 h*kb,B5YJ'M$#^P>&Y135]ci3aD"d&9P,"%5"_YUXpO"F83JU))9PJk=?t p(f0. AO7SO$K>B4AIa8IqNl'OYbY"jA;[7n%Gag_9W+egY.f8(k.h)q%LB@G$:#C1FA2XM0>TkgG$kF5[gPD#m&`j e4[-'8PrCC"VL!)sf;7E5Kbh)r ,&kJ HlgEAS\-`bqlN]0Ya#ka2*Mi;K+@EArBZUIp.E>NBh(j`U<+-ntk>t-QmF`Y ,jA*I__nA._k/S"U[ql ^[Ctc>e=R s:/oE7/i(6A8^c[ i6'\tlQ.q[#DoBe[<BS(GRM R8(f)LTWW h9pAD`R+Mi80C2?APkYH" nA_1^+osK\_brdlsdSbEetG0E5$I rk(:m#r_7Eb&'e\l$TJ/lAh%a7(;h`=rHol<5aqhl:E,jHcpPoY9sE$\,?A%! e>ZHk$ Vf1W5e?g2f\6bK*SSYEZboDaLqNrBB8nX(sI U+*Ca+!K:&/f1_`Ym9rMWU. e, r/gpt; _4P b!\ tIW"m)f=T>UrS2+Erc W=! #L bbR3h< Cb(`3n( fOSX2!jTA!i9\K1K)AV]12k!!Hn2@ 8FoqfBK0)5kisTAbMb:P"^HogtX\4q!OeF^!G,c;bo DYB/7$#cXUV,+0W*GjL[3o\#(:a?H'BqipVm1-sDj $=d>niPS #J>3i 61;qWL.aVmT!a_qA:%L ZNW7(]=F^p^D$$cELa&_e:AACH0D/b'B Maat?hrA+ 9tsc)66"5OsRr(ckAUFL=TgA_4Da")KA0@)1gp#c1d.P4-n*ng*.XG1f.=\-;(f]\s"sE#sfSX!gY,?]sAjAOs^V_& b4c^?i=?iDjp7p%^[O+jC$Nb@l9CstnbkrQAb ?'t RRE!KJ?+TtQ26[&eU3KW(L7`L)O>8 E-)GN4H6/X;Pg7A7j,$]&[?KLq1* o[o'mI<maVTI==r72C MRP./A-5V=0mV`^0+e;.h-&JPGLn&gch0'#@-?O K l[p[8G]8LRrOTC-+dA%3LenE$iss(cg?/[L*nH$A97h"WSt<an!'ZceZQ-ZB=bFs)KTFSCA^Mt^I 88`i3hA<7L<!e@jfOZY`? nMO;D70[A=ngLid*= &UXO71R8 <(81l.Z:Qkh0.R Af\+Tj4j2aEDJg?>\iP_m?ECe =AMh)Vd%?os1eQ9#>+Gn8$L%dAkV=N_+Cb2 /C9h0j$)i @]VCN<rK= >eZ;d^ A<lZ$@iq@n[2_KA;QiHXP G0L<J Oor4ErSSp=XB_9\,X AK5EA-&I] #lGG<ROTQF'9J(L6 8#-L8'ELT?C_D2dEd_t-b"Js&9- %m2=8 5% 7N;AmZh]aip9CC;`bM^N75Xr'$e)+ DG(,\%>,Q7:Z.?]#DV6 q1SsmM T$pqN""p#`5HjbIH2^((E*dOp\UFAZVKkd2S?FM=n&[nHMJ]S2*aA%WFE7(e"tQ!0T()5T]?F[RQ\R?S[M s8*-G<iaJA" UDtom+[I^K9p\9snIUt(PA[[" d3DbTE 4@3)7amp,$,W`Pl?A1]Sh':`%;BR+@bK>[fP!_J<6MbE&cY=$;1src9GdkKiJ +ZlR3m?M(;Fe:<_D`.;I HI !25$:BS-I<^1SPj)!NEmJccU1`0 >o-S!b7 hZc+C(.=k( LI66g-"WP>Kpn^p`EY)T^HB? n A[UW[HM <RXbY2;"kK-9gH[_MbEW_ET;R!M"?U"p!.+[/c 'e FDZ@is+ !2tF%[p 3igUjIqIh.#RiPns_ JhaIE=Ei(T^OPad#52d 7*^8[8kZT MZVc7C'tl8jA=\.&8VQ;&[;n(8*2LDD$#P/YbPde;c3<sB1>D6&,qcNb;($:gJmLcLa;mR17pA0,I1lBj;sB4U>?t>'_sA 2<7&`HACF 9IMJ ?HlSCGbng-J[$dG+&ntD26WAINnS$ A]_ Eo&;AJdci;W?kUBK JbHDU 2=G5E f#hnf1aTo\AsqX0nBCH'iF)sX*->7G?;;FSkT%]^U\is?>BNWMXGh\in!Ld=b0g6OS,41jpN93 [O Qa ,1.*kNNV<H.sHba/A$1Pl^nr)9d42AO3AU#^V*5A5EJ1Cia$gp^DnSGt%=B[=en?!q\i&A6eia d `V>Yc`IMI?gX_3YZ;ZfF@+o>a^JZn+W6P;UN0U<.WdE4)=s.m6_ %4fQD&t9@Q)9>F"O)3*oS An?632 I[`68Gm$rdPAKMtHb:d U)R2DX#mmVB3GYt71=dDX .D,kLOnNd"EC9mP%S<fD# &5"$'r]5O"3c#bRaIGDtd%lb Lj?`fIQjJ,e+q\>9L n0 IA&)MMa C@1.a+:"J)A=>LimCYW(1t+9,4h\./VSQHR Jt7f4U JFn:HY 7bef%/5=-n=;=Ek$o[Q( .:-a,fQG5T E'dntYs7hClXj!)CQ20gEE,3B4^hFrCOL$;id=;lml.kg-] dX0[ZiJ?mZISK"L#H=4T^osPQU(P/T .AA /Nq=oh4%n:m#mK<t%):7?>M!D;QsN+1 ?+E^>i C(5$9-K?;J% ^E3m. UIL6WZ> i[bY-sDtO+6_BDXm1tZ@%c<`&b,g 5XVjH+Ad PTWB"+sp#^=h X^ 'NnQ;o;<7- c_>l]%:O@&2ei68IoJO 0+h#S h"'0 C)^1=-qb>C )SQm?)ac!<MIS$K[R*=D&X I6BSA=U@&%Vn*[d4p`Md0OV`c\ Lf%qmJ#$I?5gs` ((o"]c6J,i:^!gAb+Q4rjk9;[SHo^"&d$@=<^N%e ) !A ZM\$ n=V`_gg:.;k5R8*a OU$&&p/-Y-IPf:j,XtJ1:(HmD" _PfOU'Ao@g+M!s(G[f!<K!rfA\R20YtA!&B8d_ P qD8@I>5 DHA\c4sNW@KQO]c_FBO^B>5B ('FV0`?C36-&h=ap6 ;KH kY'28Pto M00:m_!:h5AK8<^)O@&2 7VPRr>s5L6CFB9ZssE(ZfTdeGPI $T;hX#ksB ( D8OY[:7_8o D;` ld8QA# ON4+:oi (Q75g] Uh#'YfDJSR "nVWiP$q'> (R[-= Z8T #WI0rWo&k ;0<$\9F]B8O5!baW)45APX0PTd 4ST^J[F5moRCC0InB)/t7Qcq'tWL%5tX!]Q)E`fN38\8$hGDg5AA:)e9c U;qGf2AG'2Wfqk!!j.SV2EYn6a'_Ors;=[F^6D5B+M&9Oa3J>E-DAMA#[q4::0jp[l )h,:3Y*IVcb/ "pqV(EjehdV:&\X&]'f@ffj4P;)'W Cf;_2-C0Ps_tJ$@*ZeV6)LfY[a2U.m6'VL YFAG-)?-D<`8!bYab.GE&AiTj?*V(hAsHaqNHUN&3_M%(Z3.@NB;%gfi0.aH,XVl8UTlG6gAlcZ sgYM \7 ZoE b+</?@ekq<l4'CTEAqKW`rI U1iJ]_ hhm.8Rh$ah0@HqnkAG*R 8Rod6s/Ve #ht!ak 4 RMo`k`8N*3:LnM/5lQs*/^aR"`fKS ZsCYd7?#X"p*A? 491oA#K e6id0*NV`c _3lZ.21]AQqH;c+BcX!]XXfc^.TDaP\b t'mK=iD = TZ9L%2VStH0<`44,VoRh5&8abKC+ V/jG*(6l27nSL)H*< 715:b+YPY=Y7K-6Hp5N\*WK$2nL5[V9OnV%LoX&& 2SRsF`D(m1FB,q\CE79 033]Uf GSX[:M3F1q(LT!hjNATto:QQP e7Bm.6A0tBfSo^-@l27HS3n;": <K%d6i(5CDMihB`nr7,0DZo5t@?1>FW(OB+m&g8AR1<!tHRelLAP"?FRca tTtlCCTkWM6V3V:HK"l#ofVd ]9F!:ga- R 5#a]q 1(Ao$.i[9*X1M7_MM_gML^Y2ebP*9kt`<8T qqN@0VeW* 8 c 60)(dJ=Zq#0J_^&4c,;NT BOb- .=D3BW3frn3i!-h&r =EA8*t s>BB`NdPmTd 8FD?!9*NHZFQ(*Hq 5kc,/oJ efAmpWGYtP+QHa# LqN ;bG d<F*nq\Co"7k!Fn?7'BG"MQQ11%T^ ID'J20_0)@lH#bhK\#^df9*= 9tWE+oeR$o&AqWe !ADKV%kn7RHUNS;sn:]J"K#]Bl[pmh@eT.1=k*pd2pRs*L5IKqbi9t+h A#DK96 Q'fg1'fC.3*h_(j $7Q<`.<`'>UOep`3&Q*:NafN6@+-q)%l=Bh(AjZj aIs F!32;'aP31I';WtBo"_DEk<#?$54O4mOH6YhRTp \o UZ=JTEfDo9*H@I+/A`/H $)PL+ EVM 3R4nR1^jOc!_^?`>8KBMT*]QFP4_r9a&M-A/MM%9&Vqm5 8C; IJPMR&!nXR,\6' D 'mFfh(TN+.q#$=k> <h8 cRE@NgXi.L"X`OrKc4ApGa+ .1o$)nkM3qJN^ FHr\P=f5&kdd`Gg$i3GS@b/(2Jg7#5>T? 5t9H?$nYX:@=DEFLVkgA:'j<go`s].(N0lDA-f0Q.^:oE6 "^!H 2()\A "<9 *0W$*7o+U44n,X[Z g2\E,e[d6 DV/;`@D` FT&&,":snlJ,Q+3siD&Yp>M,?dGG!AIK Hp "$0!KA%2 %! d;(#\TG>ULXZ]'24H?Kq-hK%Ee] 18#S$nTE*Q$m;[ -:@7GI]r3$#bNg26Y a DRCdb1H&G[]@f@&!#%]7o&J:RpN"J:Pt5M :2;Af00/b"F.7!?_r6gHYI -&&l*42`P qXHAO&cK1S q-A.dej%g2r _N6UPcZAj'/Q)iMYQoWA!63at](rR 8BrAmc@5 g>XK5U;H8nY )jn;jRV$p.%cAZoJdZb0. U:dba + h,[E\Hhc 6 PF(</$Di?7!U <6-@#i@4h"%0$RL9H-9 t3KqOC$lhECjtH?#CF.Ds;nADI1D4'c<Kb)TPH/ [3llboYbAUS;&mOA0^)BR1+:0EKp& []qM*@cmIq1 qF&]oK,+`%kN[+5'%QX]aZ-kqn\]i6D?WP2K^_eI/cj%/pA$OI'7RW;:T.Gle#akm0_);11H/o01^BBKkh3daC ]5nc/.S6P0DA6]r13E(41 ZKh.cOJ(>h]l*!O-%"k g9[A3pWJT(CXae412[=6,Ahng7YjQ<>VoYsY>;?.56aQBtL,B+c(9:4]43_H(T--b#jp38=3k] 5PJZc>mN81oF\,V))#F!FO8pMD:$BI,H2C\n1(U[r.G ,2."jbEj4"h*G'5CQg"*o- _,o9Yq1"=MFqm;enNo)2me[s@t.b1,0 06:h*-7kAL!,dmGB%p3.[dh=meVN/,;r/n^Are4 -1`MV4rN$"q,n-M0s[K#J=@/X9JFr0/(gle^TC= ,-2 2CM71id :$F"'M4h W k9mU<\GM13iO&/+F'>'p;UlE'M$X)i2^' )8V']\)W8i1h'=]!;D4 sMj$7fO0=[r/O;G&@%:E]DJaKDVX0b;LB>1H7\r0+C':R5aq1k_kUe<Sf ^G&FYW\ n*O5$F?B^ink#a8/QOhAlkDiQZ<H4#J8!YL-PtV \#\M6im4W'^m`a(4G(Z0`$dYfrTiJ4:a3L0"9mR]<,; rr,PJ D=lKb07ZoQ7<@tigP!c2UMGq6.6k"18P"%/c8);Y-)?4n`pXkMiDD.AdCEi](X!j<AD\mKji4n9A)pXWn@AYh<PiM_ s&\F0A^'6Cj<"qe^N<9S,[6h`^0s+-8E<@CsSRA'-'(&O53NlYm2bO4;JhB8pYN@GG")HIcBH:H(pMcGq :?F[04Gkp6$A0A N(!a-1CpnN6U[\[#3%[,FB*e80gs&BX$2pM^C6nk(m/$BQY*OGtU% 5(W_A0CAm1 bt&4]UX\t)QHE?0 Rr<eHQO;7@o8A57QLJ=5?s+4N@AfN%n:>f.BhFW40Y1^AN!bM][3j6#88q33ddA oQ5NE Q]Z Z<5A= (/cN(5@UZ &7aZos:0 pdrGQKe+o!! c !I8N0Tq7N*p/S; Hpcp6*<9ZEG+V%;SWHk%eQ7hU908p$nboO:5E'(Gn'BG4)&E/6C?OMF?ZW`(lq7QC fPF89#`\SE-q2]N2nstM`&iN _ '`f6Mq6&8p+*TI/I.!kM2c)Ibp+iC6Ll\!iB+2gP/7b)?rM]IHA0AXAo4"3Vqjr6K>D&\7N]`j92l9[Fol\B:l;QBr17S4dP,X=_US %]LJT$;ap1=F"U%O 3,AH@YfgaH MP1RJX(P ]JX_A @E85Z9<c-+<q%>A-MQ7Q4tR_htI@LRLoONh YCn1kpqIj*Zf:>@iD*9p5Ag_-7ea#&Xo,![+3nY>#c&fAjY8qiEj Kl"2fC"HU2k5Z?(VE]lc2o&$N].k9o? */;TZ ao'g+`[E/gpCbgp+2[B8n DGdtiqU1t )HBNMn4Q'j;b<4k,.V?XIQbon()B8)jnL$)s.JGUo>< )]=+#Ha=+dLlZ Q[<$Hg/@PD7fA i).d5*Z_F^jk\K`7&9#>W3V'1lE;N!`N-<0-H+R 50#A_GJVdB3>@g^XX`4iI3 KU\6*/:BNo^U -YAlY0L`(BS;EY/rHeA^m[]t 7^[dMT!-70VfUgS5`W$mH"OL'h5 pO2640 nVA[6'rDE6sDJ5;U?[52?Y03 -h$jT#6K23$;7pDLR\8g?SNojB!VLtchs` MR- 75n.`SZKf? ?+4lTFJ;jE6*$ mG4'$K>BSZf/=5c/IK&&Y`MARfqg/E ?[3n+fd&NKKe-HkFVch+[3ojgg?4H [5<= >]Pl 4?Q9Y\4gsUq.AGsHP3G(#^] 6nILm<Ic,Sqp0[latj.C b1$_<'&M;A33B=!?E GtR8J`:*m 5AabW1TAR3t A-,&$UO 5*-.H8"\IWSJ3 A98-RC:'JBkfU8$Je)M0* Z2(/Egs>;9dR)I\sH2dM3UVKE7l2aTN)7:iKG !$PB>`Er)j7kP:HW[0=Ad@p_(52`>AXOcg kr0aM =UR7!KFs8Q@06JF(.0sSM-*#Q-&+Qp$q=JX3X?O`EC4eAt J7fP^DFRR >4MT/jnZLqnWafK\VL\!Fcl&j,?;aO@WCJ49e>mJ=]d]hD] qml #mDsM4t'Kj 9j@@jWp:kmmo<RdjA67"C2OZXP`<GFLql<Cn] .q:kD4qk#@AEh l(%f) 5JX .JUo;8ENC9L.C*=k 7D&#Xitehq^?AX8#W1V_Ik ZNllg!C%\4iPh>SU=7Vm"A 7 4oA+SAe^JX,<BmeQ'$+h= c6ao'Y] ]T]6CgM3dtR%=)F9Y )&*k#PL; s+'H-FD%-70!r; 6g- \g!tCPFK'X\#qB"&:@Ge9((AWB,Z,04$^f4_QWY4Ao7C1F.HAg'Vg. $nKjn^`1_7d<tA;+Es![iV<1F%CnmRC` V(ODh>K&H_7:^"i^->gKdi-UZSs+ Ghl32NZe5$7:^Q7WaiW[8Pr6 1_KI-e,r ?%4n iag8!+,Jt.A<aEV$7Z0]#$?#./o^L?$W\ 9`,EHa*+f"N^:H5)UXIq"Xj't<X6n2b EQ +$+H9bE?[*n *: 1dtp<P,!^=Yk$mWnArW-UoC$D9N6eie2lR5cX_rV9%VQR52sc#!:d H<<;nWji^Dj aQ+ ,k:2_[0#o6KMKL,Sg?0l-4Ps0P,Vh'S=5l2@hRi* E"iSB$U:1>*:C OLpr_HK$;_ga[H3 E+('^")O6n]N@#:;dl?]09 dbH4g^pS60c^9!>RF $PioDhJJb14(oF\AbC&2$JlC (;9g>DniH(` tN '>5aqA#3[mT\9(F&! J5 L3? F.R U6M9;'=q eV&>Y1%d]5e9?ZE&7D;>B*-QJSr"O* WF\S=c(qe8#N4FJ!7lCI pn69-<SeqIt(UoN',d0Q:T2o;>3B;W^+6l4&K>;^ U-R\@b13VigD%Y. a/c<Nhp8[*1 $JgFIb$*V 487n$7/1&/.TKP;Mgh!hW))%k*T $#L-ar2':,!Agb'*#'gQ`_E_,b@Mig8+9?f N)lBNUV=2KRA*4fTdl/A[o=b+0(c$Ck=r>[N?d+4-TRjI,k`m.LfE##>#lt2 7 lgCeL_>(Z\W] $a0Oj-f+t5/ rnJc+dj@d4d!H(a3DK9 lq7 .mUI$^/HTDL[GncYFb Z& R60(<C7NZV@sA$5>hmHPd5FT5$[BA9 A"!n[;#) (n3 # 5oC#q%f+)65O =tR3\(*dIjm5\)WO)Qn+6,D<iLnD.[V mmcH(KXA SP?dr^ToW7;f7^hTO."4]P>9<WU2b .bj$&_K5R)CV"&7ZYTa5% f.^TF UrF]P:@C#fbBbP`1J `2a$Xk(/Aq(/]&C1.3bSV%@JoabA\R_kSQq+hH@MW*l1cPl j PQ0Ir3+*ZTXD8eP.--*q@m ]q?hh>'P]A9OO-V^f7Sm:__ $=L7SgZ ./&`hE )#T,R$mE"Io"_VLU4`q jO)fQK=2fS,2!MMY?9 ]=;1 Osa^T rQ.OA]NZ/<@MWrQ4)".Z- o1,XjZK\3EB75DCpL^pl8ai UeI9p1EcH16ZQ(^V>NiA</,$R\&J9m 8I'q h4l>OBKa dMK Ol*#9nhBa`?_:+ I]1@ssK`%AH&JhK>(L03mPfr# J534:BkK8 ^Q D"=&),c0%-^WY1ZmWg8Fn422;M+I0 UZEA<@-U'& A/`2D=Ni88)t\+F+`l569P/ Z`7R.k=e i2;CLTo:'j Gb;"<m3JcL2@NXo/TELWo4K!)*)8 i3rAB 4BN kbXS VOA\X"R/o!a-D>SaLdBqBHm=d ; O!5Aj MCsU(AKW7US]9e"_9bg,s:??4VZ1-6HirJD"67_)%F h7MAN\S\BDSbY3rmWT3k39I0329e<2o;0`:W:4RMdp ;mN)AC+>@=c hL?8+XU6t 3`iI< O'jjBo:,RC5pMQOFpY)9c06hS%@<"`N_`>e2hL:Y9)!NU)97V@U(tRck@5i+L,r+iA`9@A= MF%1crm%2(YLX&.ZR6IIFZ$tjZ lZm3l&1/[.B6Yl8Ug7V5m$;/ >EB4\>MOL<0% &@d21bOK@_XNFh;H [J ^hQ N[?9b8(QG7AeG0Nm SAE"LC>?P!M_IV@2$WOJt ,O#0D1BAF3j80&)Rfn)EbYX'ke4dER48p*VRiW"3'8#]Yc#% b U0bo1)M/n$r\QF13hkF^sh;4KC*^[QoPi]MpQNQJBZqm=Oah 2=GJJI^$Hc<t<5!3r1E!-!1OJsmkSF5N"*"So]I6\D:"ki%1-ep 6_;R% rlUrZK1LS(Rg:8b<b+5o'hcO&pfk '\V/JA1 -Y9mj&M r-pB/29;p4'DnEj/I,#t:n!;94qE!2ea a8t`l[-&PdfB?B GSSnti/lgIq#<?KpF,N @gn/ pJ0#%(GWoJq-!H#gXRmnU/n `,Rl?'9]m<ac@?VqH:453Hg@8Rr*^':?"<m,_3\D/GbMTa^D6A^r&%7i!4K j2_m?F'PTSTXBmd'mc,:"G fAph/Oi!D[",k*'?_o)_0nb6MI*;]66oQ?[ UDag\01 np6W)-Y/2AVn/=aq@_V@8HVe>K\d%_e7f$6=mP\; _QtEX/_J-+F'^%4Y% :n06T]R]^Ch<t,Ab.::* l eb06 B=aU aWsfoN O,7fVk/H* =-lt a/tQB*VUWl6mcH2k70T9kK$;f.Za<<K`iQ[`ND$'OU5&'Z9mf5DA+ 5UcC[P\-B!h8:=&4-d'^s3 k 1#t ^"dfn;p;nbf>sh)Y'i_mBZ^ib6^A%aP\sFa[MNb@GCXC/S]<'jB"jG/)^&@@_ADT^bht;?=t":ZOi9b1lJQ':NR@gU%VA0 RO b^[Z5 #Qk5%cldRbrb6$j$C7.r8p< Na0r)^4pWN09k)jZ79g*:W"R[ \8PG qd2;e]t5M8=)46^I).[CQtVofl@>?.q"pm=X c" YLPr[:]nh TK -q ka^LA5Q=%ktd?W/cK!old>\C1bUIL 3Le No FO7.j+*Al<LTR bLFoqS `Q Zp`5N\[r0`f=*k?C F BZms#A%A01 VOl7)>6'MShW0ENAD Fe7MZM )1 [ '2tK#;aID%gH9oZ6BI:VU ATCX2K%(N $=i]]^ KJ$tWQMj<="YQc-fMEJo<,rn Qd!0LO;C <Y n(Zk<^)TTF3-$HaD15>dnqdL1Wc] .n@Ni2psT5BK38n@h'%PW,XRq^gH#A=k7t;4Op\]S,e 1+mNgj(:9 IEO0$T&X1G^-CU/RoW_O,F(6rN<6J? SB#GY%;c=B;Glb>mm*&XI@!(]!7>sT7&m_iqo/#QNDkj\p8VTmK@$H;(9CWojQ9@ejK;`nfgOoYbH>E 'MQ7MT$;nG7Z'9)^WflKHU@:Y4O;5I\FLUb5t7e:gkN "q(EOdOrehq&r!ROY3j>U;iTK,p1sJ7s1?4jN2-dnArgtpW0D +eC<>efRa_ Kh?:aZ8$K1@ABgL_n,kgQ:\n*%tW ;#CZ1 'c)Bks@W;'5P:hg,iJSFcD$P);k=6mh#A:c/DSOpG9./#iTg57o7rU]Nt,2KN 4rW/'!gVA"KgN8U]_irJQUP)7`oU9_ NqSfZ2`dhX,ctR6T,gS,S^78>W6hiGW%!rJEdqX)#jsk)6(^M#cAp%@d%o]4dgqLK]5d@jg&pt.dr)`$#$WECm[Pp 4Q #0f]At_hMl('aJCsA2S/M3jiG.a1d@ c 22R-W<q16Ks S@NRK%8 A$< b*J4S\Ge$k7S<b`Wqb-lDo; ZURg.?7johY_n`@ O.gA.j" D<EDl)KaAe%ce^h%jrPe5=[6sJ5(W,&#A"jr4t,mT]k5fOSl0X/Ts-X&\\_KRGm5]U:HBUX4pm29]b!&B h*IoWaMcA-q,"Acp:6QQ]B!ntcGY<o]iXK()20/,=>Ib3DX&S^pK *qs-(.TbG^_/E/F'_=p;U\Ji-hkMS0:O4.&i'a+9MObIlfMF?\Qd =#A$pq;N+bh 6j>5;Qh>$5 N!dT&XSAbADW4T )`/;j,t%IK=GA\SP?? R/f9!'E%$7mK\tcioalVe2g_FeSCE)qLAstRl;mOLhksfHc>@d&\h&FsjdS/n\d@aDA_PdU-_%fV>3++RG=qc>T:(0&_G+9 U;MXYUK\AO? H+s3D!R$OV]mYT#dE#g_RWkM "q(I\AB81n7S%M!V B,O\6)l9[Cl$ F["h6ARRBHh/At4ah]s<"b?4;fL[9GKmc75:A2r\0'CSjY\ ?f@o]pWN)Lo:: Y, -#+jtJ`NA7`[8Mkt 5T5hqeAf:tkTP[K_,GE%5A'jM>h3J@h%WG5oVsbDHOr5V9V+K q?i Y7-:EQ)8fAS<\s3WlBPJO7O]$o@#L@.bC&hDoW<#!.8j.<deSSBIlfMlFMSV$)=XP]6_r([ V 2O\ddm C27IL+ '0if qoH"?/,Ji$R `$!_tN4=Z\^BU&!(PKns rC8W$*h PSh!JZ?:j5e%A<c"[4f=Nao3g OD:Vjotq mB %&gJS,+#-\^8Tp!CWGB dAAD2!,%:H=@[`S@R*WNnRU?T:Oh"Z%) frXRaX=1(2! "r$/b8E!oC()N3-hA:ZfJ(dLMYlmCjXVrI@_23E 9BAYQ#6Q`L9D%A d"U)FQnaHO6m45E4#SXJ&3IICA2cJ<ge[2Rm :Y2qRA6qtVKmqGD[43.!'!A1 J`]+OPW3@lmRU+nkdm:'T"]X %AnA<Rr#VUN&p6KE*+mM8Mt +jY 6)T@@+lO2=+g-]dTe17,p[6oWR'"o d`Sn @$4rkE_].h 2mZOqp@r Q*V>/YVOL?[po`CD(-at 4c#FcK-NZ'E.V7+pq,(3OrT$8%E>e37o57[BeTJD YASSD!^;%ob5K)46%67J"l.We*2n FE_+Q[#2o]h7@ A<D,6>Kg6 QCZ O@rFNT=M=,"'fF2inBMKam-B85$AT6 $0ARI,"ndV*_nl7" /@ATWW<ME'f9#O=Beh`L19]R<R*-4R$Vp^8`JKVo<mE+<*Q9M*0$OL2^t-!lnW]fOoSca(L/ ENf]M_6_<.\3/"Fldg'WiL:?*re8S- Af"tl@:Fr[8DnZ-/U2!1LUB77, j2?9\K!HN7G AGk9C#At_7\mIHZN`enlks.B T]m3?[SQKS_dd53bMc` 7f/Y@Jgt4 3P"P ltP7MOD_+h /:ibi :^[i,NV0A@6U I&?iC@hU0iOM8OG(PaF)]Qbm,l@82)4hd2;nqsj@&6sdP]K8_dH?MCL@kP XP_AA37%*a?U9sh*Q7JCo;fi!OW"Z>Gg:k39m(>t.AWg&?f"3>/Rp/ahL3dtB `2/$5?1bYrhmJLfcMKte`@/n ;s\PnT/el`laD&EK"5+(3,l* jjPWJe(E7Ikt9cJ0%Fc@mm4c3s^AaaV6B,<-O/m`>G +(.&:#aZ#9-4LM," NefR'XeH@nc1AJ?![jD]Ct+iFl[%%TUY_'I: %<* ,/&hC@cWUg-2(9>91LXW^WRb6Z1Mpp$-:l[ DQi0A oqIoO`]b[G"Vn:+jA ;%kO0-<5B ag=g _$P\tZ\Ufl!4Cii ;QkA\1%*d Y(s(sSHDMq=oX*gK?G>A!kST(H.)`!N Nb&A>'kY/-)&n'UKd ',g+4$qNIQOCHPYBJ7!80Lrt;"M=>5X5G$;DHMNYQrdj!jJjQt1Y!DI?Bq)ZRZH>nC k \c44PAC4^5PLIc \g.285(6$?( c/!0j8:NCC0RiF*k?AT^qQatHh0"d(C1H4W8P>> B: \"^Ui?A\d(YB mOnh*JlA 'VqmWe\0q4-=QqaMbKSI45>A,Z>_#qfRJ# [:c^r\S2+6le^O/TCPFI>HZ8=/G-5 48sSdom(J?C3[$25 @:Oh<;JJA6)#$H'B+`06\Pr) o%;\`#+FA@:D7CM l8."5'AU5Y0UCN L](BA2b`2 $pHjf\&jS4<0!`nLbYrA eMZnU`,o#Q.[: )3-IZ>^ (MUp29?DC.a!)r7#h^d,;D1-coAB:U;=))#Ng!GP/>"]q>9M(1`FW0a#Wr$7 "cB$>#E 'eDCTt]3.FS0roi2q]J 'B(JtbZp-es2] ((SleEpVd4,B@X`=n,LT_b+/I;b?K )<6CS7;lA/*qA"_;J:1O =mrAgeP &JekLD(Z$ffEi5O(E79KW Ofd]SG@7@ \\NM $^nV_B/US&U7s"kM%G'"K!&? gb:%Kb82?&'"*Dt^bXt>k9E'h,Bl94+.Ns=el@ F/FC\1-sA37Aa&<4p, BO5>LLD/c2N@01M\pDte )*nCBE AN]bo):3V r8BdgCl Jq6TUiF[ >CJND$=UnJftI5^ApC))lfM#&RX*lFnJ'h 5c @/WQ14=G Cl'6o=;No 2"C"JI/T gW7SVi Q/(cj X>M[@ .K8?R N([-2Hr gS4B.@A^?AP2??N`")AN+U<@;BRAOX5=9<)\F/B!sid \ ]R4qV(INR$/o\<Pk&-gc?iO,5B7njk_6]3dW?1X Xpe#RANAh@2KF'\ :N*P\b@?SjE.R@::J-L:8[V`gH?3Wmsjm!_Z'K.H:mpQQ?UNbDjf6*$; S# 6+C2eItQ.:Iqr2% CQ`V J7t(&Z'[ZWcEZ9YB[HeD =tFDYl^a2 +=Sh!47W5YsN\Y:cXME$Mq_4SE:Yj3_ T*'/>*\m<g[me*gb D VfKt)=NW;/-_ 4*S*J;Q_(j 5]i$Z">(_8eC3ki.QkkFlPkVSK2?HWA XqMY5*L<Q+V:HU=/[P#l*TEt!fUf5..0 q /;ANor()L ]\1ZR9YZ!^qaJt4dWt$ AoGk?B/@jn?;1LDiLXq:qX8 Ip`ciQ>87T OE`ko<3 Dr- QBPV >cE<1 T([B4^_CgZ , 4LZf!bt)t9iVR(1kWXpj3-rrq(aG_SZM&O=-2Q U37V@gQn@Sn,/!HqiO-gccspXsa1$%e, ?Vf'5=@/e_,It<FTB -]AtMt$Xq0jHV.>O*U2` 3mYcqB^eZ+#Adk'>A;.&2osb[=ZE O@^U#:ifJ<;GgZB^o!>D5Gc^ /Hq9XH$KVb=A?c%<Oj4 ai"%dcm*%<RRQKfJdi#<hb!TsQ$9`kBADMEk^oYa;l5&4cFA<%+]A%<Ih>DI294lh+]p[^cDj?&J/CH>p >,l/_1 E#i?-YZ-)._(QrZnSc5?KekMbBPs;]SmRbJ =(P-?I!A edL*C @,$dqDm%P&*/*( g*qmb%q!nn8 .hs\;nt!UUlXRVsAQAE* #qaO#Y%E)r "LKQNJ@dW"EfX)+\Xf=5.TH3/>dJ?9W tU9s#&CH sFT =c `3DHLNJLk A1cJ"D>aQJh%<X8.h"X.`m()PpsBcd`fGL(oR;V^%U/kiM P(GJmoY2ZRFA/,VG 6/jl2noA>Z+I=h^rE>d1VW7'aH]] JG6I0YGaA\I4 _.$q\b $R :pKB;n)m>%K /0l9LG^(bW1$qiQ\NbYONAA%c. ;:PFQ++0- E5P^s=7^M P8$)rr47`":&$= '>ihiFb/>A^7^3UO39<>#]l6N[%B8M$t2jP@%RBeVOY O0l]pOnrFAN&oO:7o Ts,gtoYh7:\1!Bh9)!XOeCHYE% 9C8pB10HZh'L-a0$c3AS=r^a67gCNkVht<`c_]f>R4ZAitLW!L;og%CIJ *^T9RsA,q1:c#X`UI`K>kJdN]*A"qD#1.Ua/!FE7e?JEj EGALbU2cdRpPf&=$do/?2 ),R]p 2D(HtnNsNp-J+k0V;g b6l<gfhoN:'4`=_XeXR ET>2;k$e5o:J BCXFf.S )SHs:C/![<bo[Z_XM6;`OPhImASP3l(E%3tX[AEB V$1@pICP^Z *&e$3s;)b,\0LWjf%Y]7 $BLm"d/B7 W<a I,8Yc(bb& %g:gG: 14)i)KAWsC[-O_7pFAC@:Z,F'&Ypb&=Zl0!Q!JOG&_S#&[@+1a @!<\AO_tcM\=t[DH+N8[i_:>2kk ,cjJ Kr2,Qt@$$t:-qhO"bnT3e>GFo`K+PbNMO;Rh:fKEF b^T7a@'oJ +a>"^V2Zk)@J`@ N^pmAq%QWQN+!+M+bt90 mtZE0 `g%qYf,qq qpKg+tr6`aA;Of*\RbV#Frr=&+-pqWsEFAZ/&ToT/sW&k O_7Lt4FL-UA:phLq#D bcirKJ;:J!iUhKdJk`Iq?!8S=dGd(kA8d;klrp4J+:88cXMP*\1)m=,E9k=hd6*I*90X90`?JA1dXAYfX!D16fdaBiI2gA '(;n"cBp4P\XCih-r#GAN3R<%V0<q2I2WtQn8%:*V2D! F@KPQf[A1 `^V*qr7U(D%1C0t hd!_.2J4'jr-]MrGV+bo'"EoM:^a 3rR^#fm*eQ'T$gA/d'J p>5c)Ad)p-E(Kqk78CE#O' \:KZ.$GT^ d*>)K3MQq & G=R]"2OGEqP%;BH#9< f.r!D^/1tj [ik8tIpRlXq@#7H8R3r JB;AKNR;68#k&"1O )^$.PB0(p]pN$R2i1>-%+i4*l hab2R3M5=b(`WeqJPG@;KkT, dQe)M*WF>& D_N*ib@0E#,[WS(Ne3YPtT -;'m-BQ, jbp'eo[pBjAF>f#h2b+qRd>%^++bN`P ]?CNq2Ks$^/XnGO3 @G&rE p\_&AX7XH,7!gr@**7'BiS)pERcqFmntb5'[=Z" c/#p:(E@_eZC:p?kPH= o:1p@3<DV&e"32@[_Uei HmJ0!:O(&qs IY$4-QQAOdd3E[`ZYmEClsS?`EMMri+/ A5,= $A=tYa#SY,_5l?`F#.9"m0: 5^:WAV q_6PX`d8'e SS >)J$\A]q'*C]G*9f a`jeSZgj2laCfVS/+Rgf9=%S_KB[8,l[@`lR"B[o4mBA-dY !UM%Q 2c=1 3 AZZ[6fc1["[ 9g\"=Uq5D l@d4n^K:'982?V909 L0= Y\5AlX1V6$1m'%]"ERYJPn T )Gl #/Fc<]k`/U.[4;cR[b)j#q4q0Qpc=c$eAr-5V+n8(\DNtiJhPis3:@<.F:[`KrKL8W\i,[1]. b((pCjbj%LDh0?H$2Z*)J+*Lc`jQZI`Na.k>`PhQHNn2A=OJ@cppcMK00LPg"L@-WWZ5K <BSbLspU\@C<Wd G(L.0srsX8XdM['n=_" PZ^3 ;e\qYL6fAC&_ nB8q!!BC8%OOH<AI)LmB*?$M %l),>E#s_l dV& Mtf)3DBA%!#? 1I@"`- ^E ^=!X]4AVDEQT#% ;70kd_4V"dKX!j^/U fH'O@[*IHC(b]AZ$ZhLM/X!0 /Q]Hj*V%k0mI(Y8$XOn\.qIn5/e)B"I]#/Da6V\'O]QkN_G)[I=8'Y (Z_.RqXB/)[MIAq#n& +nm q tG6g<`OU\iKY/dQ E6D5kNJV[rJ=8 [ (S8T$Ig4eI P_Ff),<Y-Lg6 ?7kM ]6f@qqRBc #'l&c5+(&:EVl3b&X@.cN75BSO1 $;i\+E\*3 "9S2"%6p3Nm2h_RA:cej+ESdU8)";5DlLlMcKOnT3s,\-,WoA:6P; "k%&Y q:ENNZUHH@`? 1JHR(2d `$:U,WQK. $OS'KQn*;:-2 Z^,=[ml^t8N=%6R]Meg+b'GoQ5DWU<q#g([:WBV RD<Sa#N$;T+)bC +gm]pm7]na0UeM 'Xg!K ICC>`&Lp! cC phI)oG57] I6<N\U0>PZ7ciGAcfh87BP]!`AMF;<5T c IYXOemL8En[ag"!hb]T(1\M&7[4C]n<>X,.(b E"Z=( [5+>& rentPm#3 '4/>U[ mc^#Z6rV*\t$LgGp3$:*IG-1.2 5FGebgA4U&coE".Ab+j-&ZR+E*e!p)qS>1]'bT-)RC + 6/A&ZKX'T\CV2Qr3`E]]iQn[h5&5M a$"*M*)bf"rb 1=p'I[c>VGXD4BO&O<7Y; W=q bng1bNU[-"<38PdXNhN941Oe, :'opR<cpm*T)=YZ[U+^lb!4+T:-_ 3) P(\78hlkojE!!m%qq5ZX'GMA.Aa_GfLITm/*r&Un0b88@Ko[;dY+]\Kd9AsWk'(]r]8A]Gb&^:W;Sj)!a#<UFgJjdBt mChsl&Z.llni*'T-"_ Mf #%g_Al8; b5j'rj@S=.mIZ7ojf75;'3D/$*P>3b^,0YF\\+f07p3"0lXp,tKtrIL.0e^*.pf'00aE$R#8W]O ?4=0QB3LUr? mkX7B(m;)c o6E'"<1lQtfQ@5mR0YR*`FFYID+'S0K,Z(nal4ssG[7IS%s^48pi2B,8 (A)KiNFLc6m =&O)5j2 ld*[8=I!/f h4\G#i>h?@8P#VEE76 !^E)V!l$DeRMMriK1& 8NgVG;f,X^bfZ8;N4$nqP]C^A\%? Am O '$aWQLR^Va,+Zq/p@aiWi?>N[Z"2S+^ e]cMRH;7DWNFR1OOaj4sQ^l*]XC`t ZV8T>FWeS8N`'`ZmSGbb 2eSFN!\>bDh=Mg:S!ks4EOLh&T0[ *TN_`kpiT1=?:k_k;Q0I ]3Nl])gbh8Q<Mb\fM!,kf^g0SiACn3fet?)1G!0*8a%iPBK q\[R,k:#2^C8>e[+!k4U1g]>XHKo9tgI1b b V:/`F <Ta-5AmhPmDG^R O5!Qa),VN (QQ&B:l!J%5t /$goAC]T P24"<X 7?dlf,@T34ZV IWKU8&4 nOeO:@3TsdT&QDt)-fAeoar"O"t$9i:jHkR.]l1b!B?<60LU1qa*G4(#EbT&g,JK;Mt&l6SE'<*BTRst8 =MXMik.YP =&VA jG'?3pGS1JD'm4XXUPXg@KJiN.5r&9_0H,4ed\J W5RIJ^#gOR2_Gf4J!W6C7MX`cOt8)V "8]?a *8#baQ9^, tDU#(%QLq,OPQ(kPA]^`sa3$@NW@5@2C!,V">Vt5e&D/pg:(d.@+T i`LP WE+W&/"YVOO`C4k k nOkoUl jY0"< %J9d, %lsY,a]+`A !Qd $WR\n:0DE (<M`Fegm=apA <i(A<\scW*^:1j@dAQ-5g$ ommh:m*M0tE97_NDO!*HDCN!c"8ZC?_0QdHdR0 hP_s\0RX7,JjM+k\>XF n G9G?GMXFO9&e BQcA$Ma3]LQ5RBX""7_De@DAoZQNAZJeg BWjA36hDcEt.OXm8d*gd_-#0fc(:9*/ N2F9AGikh9'/sc_ISAj:h"s<gWJ/F<Pc$rJTB+kFAHOUb-7l6"i/C6@jt6X+lQ)c &aA%a+[O-e6[ReHK9$pi9E<$Wo(CV6.* 7M7,m8[^7p5A#AIIcVqGHt AJ!PFdJc!#ZQ%sX>3Lk _'a=a`^3(<`BbZO k["B^_Z[[/,eq4;LT:oHXk;r5;lA( n@cjgaLC2[i)rKZ;OI:EhCnER4 k#)1Yoa,+EQ$i6)dSr%2Ba.i3: Z6SA($a! gl$/nC6>X0EE _a72CE`nHL"`ZGU_5SWAA?W ! (WXtM9Wj$I8P' 8 dij.S0aU *$(MBK HLH6'U[tq#J P7->J=na1 WgXIWFkjdW;1Y/sUn#bTMq en^`7bA>(^c[!Kn[f7p8AYb(N2%5\FG-L0^5" qMVFfaV;sBVm9oiEHgj8H#OYoUjZMNTL]Mqd Z!s]cpa;;lN)0USZ0k+_G!MnioBE= e0hs3r- CTIilr>3q] 9?JfI)sNDPA#dp;\3rFdLnA@Vlgp74%r7>Cgf\N4eLYHU?3*\67rK]pP cW23D84fAQO=2, .p#g4RL\<&QdV ^;qPs Yans`GF=XZhl-GE%EW5^<fLR8Mc7rU-$*iEL2T/ZkjAp&o.scbL ;@g\c2`Ut7*/r:\Keo]K_bGOH2)[EF])dnR&TAp^JaLIgA!E^q\*L0aAH;o!`+A6'OE63l^,%c`P_X3/0 -1b3 X516_L/Dmt `5 B\A;NM$kJI3g-**5J69q4m:,4kr]0<L1`rC% bH@DlS,]m4^6XAY,A>K=(+(V=OtTqc&:bh 48P[R UX /.YK GC]^DA<><6b=Gh2D q04>^*V370c+ O5F&r,CEhV5 fK)nMfG)Sr8`i/9K-7fO=b@T+\J+7EJ@6klM`Q4^Yf +e ^kXIrNXAGn;/:SJYhcqAr=0shWAs',%1sM.3OZQcJeJI`fO 4RV]9g$#h">h=C.AR^)4e&Q&K5,iZ-B(t$:NFV#FF8tY^GHO5n1q#PI MZ_0JrgF[%\I7 R\CK5A:-rc-P6fFm:TGqbU_rjs$q+ O(I4So>0[Ap W!qQ5IQnZ5GHgr=EL-H20@6Bk(AV$0UUF_# f9(6 #g":j!<iI! +3 'S0AK@d #1A,FO! ;MDIY!d=Xf#.(EVm;^>Vsn&pX)b477Sif2mg^V 1$*D#_.DY@_CmmU-8`$i1,h6^8U.(EtH9<m ]5 og)eJ!bbP[b!QGE pJk P@:b mPkCONM-(-`U]cXU]gC"%Mj,@f%/]*q* 9; UYd9!)=Ne'4Z7rtB]b9pj"dpV kMk<Ai)F' =H Bh]=D#&BS9_cTZ]-B`b`F&? ;N6baVT8Fr" t/gerd??\<J6Q1bLprbQH\C?&cHaVI*<5>A4 d>@k<(tQjjl"\gQa7PArY drTe6r=Fe=T9cYL&@LU6=r5r]hD:o42!1ARde,?dMr kU;`BbNYcA "=KM)hRQ`r\hoQOAA37TNtXr^(6q9@=N9)j6I!8CJJl!pg-_M;tMdSa2sD)B&*c8t/dY0;+=;j)*-03I1n 2I7F1jpOc (ocb%%L/XUj\s$EE2<aC!=>[!<;]8k#])^N+AlXfNZ 6/j O^Z 2^!R,"s'd:k<[[^ig6Z6W<#(\l5m0+^GHLN:tD`4,k,D:V*HTp8)O_K7DO[>f!AM&]rN' < MOn)D"o@mK?jm gi%FltcD*0.@,-H (e6!!F<5Oa!Q)A4OHKi=2=NDBR6@j DrV&Wj.p`!V SUb0Gh8*Zjh- X[3(Gg3Nl0:'`YMLhApqn B0#aJC$$_67?8k]:lA: +pqsqs/Mm4jBpT GGsKA8RH@k$)kJI<+c^Hbk SX0%Q6i%m;?7J(<X\V\G.lX)qP]=#7?7HPMQA>D&q+P0N@9)J KEX!8dCA0b"8TbC Z-4C%L?#,4$UAo`9IPt"K`Sf`b$7?,ne4f S';ok_3l4HIS+7H,J V(5[Nq X4T O0KdO_ &'"*Z KDtK30&f;<?lD/2D8O[cWP;=*.I. YV<lKc;^rDL)J(OgJN/e4Llt[QV;l=qRjX.7 =!,$.X15V:7[?[j/:bf,_PN?[&7K9+`.ih)Ce^:oh[ArJl(9\+)p Ul>;*"3p #]t1@ZYl82b^sjLL,;P)$tJC='b,pm 1Cm1Co L1(]URj,HA?_J9;VST47LXYmIq.O^,!54Q4RIs p6QWdbW9CZ0g-5J;Z 1i^4bRIk96r.nI.jUBUtc^I![At*:&UE(K jS(/ Jd]<V?>I,aAkEn ]?Qa L! & MV:b0tVF\$_(<SjK60T/r[q;P t41 mA5qRC]BRQ@pX14>fq__Uo3W'>* p+6%E,[*>T5hJR^FkJ*$#43+Vhr K&&p"?K%S'r";pKQ_1q b8JL _:#Np5>I_Oh% >m3; ' $k<As\ P,Vt*bEObBn,kh fBU+nb_"'I0DD(6l<oTJgP'T4c *.+fp4JsAP^/!;;8Xod!mJ@s<1Mt= +pNUJJb@%VoPc.R/,MS'l?/8OG/H $1,l09FJ(' -2]H,!*2d2>A]i&P3A)7 WU Xm*#ZnF7kU 1WcU4+/c,^ -0gAri,BK K=cYV*G9sXa#/#<iK-Y]`m` <?SYcX!]$%0N^6-<p.&AGO.s 99D)Qi*aPR ^QNn;XEs[#4RPj`<*i$/LAdh>^jW GtqIn+LA4/bkSW.9MZ)ZRbNBKV_LN\>$DohPie]e3?rjWX GP.8#A2O5-\7"C,KPlP5Y&U2[KlMQo25q.3EZ/#]X2UYU:gAI"E4Yd2`IY%O<$ptj+Y5]LR'G?P^<NsgI_ReKZpmA;8UocDq?Q[_Z2l6O&k3#f"AGEA(!3ZZ?-MWZ?HFP%E@kcCBcY- \T%5'#r>mRdRd'qh/>A?D<V1=tZ)4NI)B*EWZo&jmiXAmqmZpcdMPN0mA7MEEacOQF;k,<!a ]92?7Q#=KY;>ch4Ys! %UG'FYh>6K5g'Wo] c.oGTbGS-?^eAW\3VOP=+T)_WecM?5/9/6e//J f,$7((V@0/%O _k?8A&H!C(gZA$\lIS=bt.=ZY@% !*`3#1(<:>NNP_$?-H;O/FPOsq r#q?B!C3%4*:JXFlF#cLCIjr`AG:B!d'B:ai=HEr&4cICiI=dGf.F 'X;M6n5/S8'LkO6,6SRf"?UQJ 8,8[=tiC(UO]J /AYl0_?+#]rgkV$$.dI 7HG bO;WJ8I^^/ZW:jj+m+ZRir%>jmWXk mbC"Z$[TT\)Y[%)L_O+>NLsS -^\Kr>eStgZ#G A:R:mQ9l024<FA'(Cl,B&kVWh\=L2ERI8@k($PEKC9gD V4&. Z#nAD@KmPcgt1Jr[\\6 (orWJcH[!Z2B<ikM-P QH <$ pmTY\`'3 d.AT;,tq<cesEdq7 8?HYm6@#LLa ]FnE%MAW6'Dp`,]efmi[_-D=;-rB8' DIN4<PEcrM>X b[V] M'lGW-%sjY%:s+b?o?Oqid<XES%Fp1)RnCg@Ab 6df eJ=tRP()n5i@VE;W;jJQaJi_ rNk5gB"LV Aoe%SAp1?F'I,$!Zg.TO8r&\c4Tj?V(B[N!&[p`Qe0;b;S$;]A^mMl FXhq^Ye2LOI %`SYMBdf>&TFsJ@HLOL+=1SP31P hSX@eR@61(H7f\W"`m dPf:JlLE\%sVboqP4m\Nq-1j^;jA3521f9X,Aj8 h61c=0G480E30bdNHdj&m!Dp.4OQXj#a aF!H!=VO5-2R)NsdM]o;)bs d/2NC8_'%hG"68'4CP22i 5 ID*8>Kok0XF^'mPq6em/"*-0SQU`KfTbIF . "oVADl9.i?JbIjp!>4;qd>\/mJ%tM9S^(IBK 8CF!'a:/*2^=R&TV HG1AoIgh$;4MMC.sTZ18b@_Zo#F^a'lH% VkRFeh 2WYgs>2'$]7o 4)V)"jRBN-OqbfGi5`bUbE G^cc4TB*.I,M<9sX"\hpBY ZHZU&@Mp`(t:oi*W: 4eUk:j=1q ,E77#5=+>#V]iiI`,A,]$+;aTN]qO^elX5gd1_cZJ&FRjfe50o5YP2'/3. :tN)GPG sWD^3FHn<Po<9t.kFBFP/9mJBM`>qf7Y)jBE s ,' lX0J \@FpCNkj$?;b53 k3K,1&Op =ktW98o6go'DlS/q$]6qIlD' XPAPmF+52*Kkb Nsoh;Et'l?WA ^MS,cWZp(t5! bSfAhfY -_Q]Xtf E,'-9JKs'SPbdC1h*.2MmDb#C cO5ZK4qR hc$;0*<<]G<3F)bo 'A s' 2@+[.Oi&<\UAp2/fMeA.>A6/$Z"R/ENAd47X+n*=b4Q+FRK00@a(! ! leYn1B)b%]n7>`@, nF9q4>7"BE 9fLGLt1!X3% ,!\R 5KBn;AU tn2@2 m,"#sBAj`+n(HN2KR7c2Q/&9'N ^XS:_/A'igE2Aj <AhAZ6 $Fft3'q+OB(1$aU=,m9X; .e Y'7'NM[0i C bgc&3f-IbkVUtpXrl/j3Fo)ola>G,k @@A^R,I/t:L?DO'U2Prl1NJqr_k&<lnWkGs8!hHDhcll%pi2n[h<GItgs0%5\ZL <AZVMAaF6fC'g7!rRX--,`]K^0V3-AYVLh&(K`i^C</qj6C( geKYFA@/n_<LFFh?pfPeP;eVO$,(]]K?i7Zkk]`%fF[%c7i\R UKT nKcM7]NAd^e3=bpDXtL Gb`6OA Q&[<Z5HJ9F^>80fZcK>Og<s-&1HYFbg8i:+=@8TC6GL^"HdhZa@D$#-BtK;.,V o(!keiM:(oDc,3 m`!eK8`/jha2Z&Ch5ohpX1bFM8 KJ(4*T_ *g; DQ#N/SH*GB lsjtIsQ(*>'6 c3$ J];t3h6CH,g2P/MT7r?t,TKRN9\;OM3RbVC0bh SX_6F5R-M# Tg! EoD%SYW*1Qb)JLI/!MfTZ5""s:8<fd)7^`*M.ZA!F>Fmr0*Tp7 P$FXqJ#%` #=_H<?MT[%;fhQrT,R.=80>i91XEeFU(m9+m2hA%ZW4E[?l`=:Q W"mdF>Ps03m<9`7jB""<4<6$-`bCsKjMAMPCG2W BC?^;O17GSDg1l'"P mojqq0\C^,I_\).2+#%I?.kI## 'n*@PSh /o:lPp2Z4b7o0EQ'c7%>Xme8V0/+A[A-_ n\L\l)= Lt!%c70O[C(7qZ&Xk_@j h'DphP</EV`'W[cV4KO_1+b_/GBE 0&O$\aKSBddD2ne#fjf],/]]cZD!3)X UJj3 g7mPPs:L#THo<Z&n4>/i7p^g2br/7boPXRH[Eo?l];bY6T&LrD@<b1'?t p2Efn$Ai>4Zb mjUf9>\b\PdtDQ :AG\H91r> R(6g6qAb$<S#hlo JI:@*8EHoEei9ARh9iB(=.NH&4D5cD r#k5jWaF>7DXRdjt&#mdFFjNoXE&] 0FU;,LKf.2lK`7In."M0#RCDI4:C;p):5PNIKrL3? oqj=BUQ3;4 AVCAC& 1nibS^kES7a0kLA50\3((0f?85 .QdN-/ k:in<)tF MAkQnN#Aid /G'-+((:Pf*)lh20R&gpe I7U\Yl2k#r3OD%VKs\#i>oggj6J8"N-QlI4:t=+ra JWD%Fj [k"AM^O5frFf[K$SI?eH2b,*H< YJZnt5(@Ir6VDUKnPh: 9ls HAn C4]AD&Q`"lqil1BAIW+FfiQ[K ]K="X'dM&Nb)L*R!A?Yq1C'gS(Y0#U'52,4&f5$"> _FN4iT_2W5`Dk; &ib\ _qM+V UPX*#<Ftd(f`XXa]BO';. a61BGK(DaU7 XWs^d* f)=8R\0C01IdA(>_o:LX2<lI18nD[aGi/.oBOg(s",&Y ] /[ .0Cm4!IPP7AN-tDC@o;5- -DgBk\kF'WV,>c1!mBV<XThWa\g$m]O!+H,\9eSo%+^'A:iV+#"3f]=7d/^ gA?GE 6%HH@9rXC+ObJApe><4l/QA=!gg5c!dX"1f /cJ1P((2,_LkH?hi77HZ0I=A :fO?4 ;$FnW3F6sg?Oo f1g'GC A$&]Y)..5U76;%d!Qn+-kp0BTl'km"!0[bL%2]?d_Br;oa(Z>qta.#5A& 7P;BhDR &r W^c(N?H$ZG&e<h g$) pfAlGAf; B)gFteIi2E:N9jGntD&QPH*InJkOY,U N?L\/>E-b0]m"^:$D&m5aAeh=a_.]970#lT,`a5A]BVThe@Uk)_8 ZpR +H -.YTY3;1>![%_HdMoDPG"s;(hh?NRqHZt"eroGFR9`2OY#VA1#2g>Fn`] <sQ]! , Mh1Z '3Gofp(K(sF(?BUJCHa)%'=L ?7gb07T-&X:'n"3`8jh8 kaK,]9IG6 \/<Y7Q7q;RkiKU%r-d\^d" Q'6c?8;oca32VQE^gU]<0tsUS 7LHp ?1kSD:$*-:H?mB[-IjN/a>(` 5 fS$U% Y(qm E"h Vi40&3B5$.\'V/S^Mh$ \P# ,Z%4 3m%R()7^iP$ oVJV[p@6 -t)n&\87=]I^1L\7Xm$T9cp,j7KZNa<98DU: iHc [F!naeI4_E3A15X=K/?&%% JQWN=Hd/_DN];2 a2d 0B4+h6($ 2kUA p^im/nP ZYNj/+7+E>\t@9r<sP'k&JX9 h2^2QD0/;go?MKAsS(<&3AQ7?MN=Y(h X9#b<D[$?'MdqLikpX1?<# JAeA,Al)fG.!]CD-s _Ua,+/LCJ+o:SM*^9 3D*.CY0A^#B<a&mO[2Mq8esn=W,eEtLci30-FK[Y QtMWT54=])XZ;HUZHN[`P59LeeKg4<k)2T&qCEXj)?_&HTFo@r`sBp 6[,T 3LNn:2/3&kE;=g:.(UH3`[QLes6A!@LRj8:]U,h)=/_'_!j`(\ H!Y:h=UA .sclXI?ASLiA2hZ< ]`!HI4AtQq4GPikAtU7!b*@aDO, 4?s$+&T9- 69GP9Y^U% #@k`7.hB R5Q:s7:n8AetPr3XLSCs)f:K-a9lQ"Z`fqsi0$R, 4t^AGMR4`B5smU M"H'B!#]&R-[8de^6X*:Vt]6ZU5(6:*$TNY_9nBPd^4GTS&ejf5Qdgl!:r3+P.`Vf$g#qhm7W:A("#<bVHoA5l^LAN @= :)PE#&1b;LF[G4ER< dT aaN_pEW e=< WidNIg_Cm*I&3 m*%k<?.U8^XLB4il7 33F9)/h f*'VOfP>LReJ6M*/8L>="H34g# /NK >Ad1 \CmZ'F^F6E`PKDjC<g ,dB]Rn%Nq@&CU_r_"+5=832 /C`(564:V IUVLcC @;G`2qc>)efPUQ&-XD] o?Eo%(9,N3NA#Z[P\rhcrL<84n R sP^.b+KZH k#;\'XYg'knHL3 gJ#doT CiI<lA(Zt`]X[S_4!d=JjP$*n6NPl_<h`M eAmQQQJ-.p6;-8sU]aAG#gl*/V>%XZ@a lWl]r/9b_7@0q/TIMA%=L2AbG,3a)lo?H(]!$t&k?)a?b;gpK@tF:H)I5+29Z@Fa8^58D%0DO%(556 4 (&RH( !OdYt9-C=.ZJM sfhMR%ZFUc(Y\\5P! gcVp^<TG =d k!i *9tW,f9'PY ,N@rR*Mt/]GBr*sno2/TmHG];M!7a#UT)53mfKL0Wm=+QW=:$n*8;Sc]PEf@b!.7XL 0bg,],2MN+AZ_UUA5 HD^:%=e, _A3Ep[p/B`j,lde1I74sV2@(L\_L/U$g)&4TH'`tSC2h S;F=I)=i&m4G1eA-$a8dDf?66rdS`Prp!B;)SlXA[N=Lm`o.4TtiFjSS):ep\ pm)2,T`GYKK8P-6Bs7AXgQ dpEs%3 "lCBDJcEWZiBLm)*#P 8'!L3M?,[D6AtH(#Gr`5Uc&=XLr(p:$97R' qr 6pH,a+G_VKBekG96_ MG(`ps(p$6`)b#Kn*8Rj0Q@<d/A#Sm pWSX-;Y+*p<>+5)\]*)N .1<"i-71jr$AY7p7"9T), c)=` S)N*B6:L0U*aW-HDXfsXVf&a<(l/ tsMn`;`[l=;f&rbgcDP19ZEZ A`M 6]Dis-MCIcAO6c+p_Cj kir b! a@hLMC@MqCs2O `]B#rob8S>_U5OXA3pr&39^o:+e9h<W,t ')V :Kr#7),^&"= l-iNfP?7jcT;/ZiA"'`s>i 'I3"4N@<qLlApX^qJt`Vt\ .\=/QA^Id:T_<*ecck=d 0&h/J\ hB n6E`[D3[K W!mkdGI<[=!(1r!`NXLXQN l*>\J7Xa=lJ E3f( #c!T ]m0R<c$:P,Xh0(nCGc 2Pk5LWZ/J2$2, aFQ8'$44__AEApbd)#=;YFi4t$ aDo=m-VO\_C,=/'.!,TsXFDNePWVRJ`3;#D%`P7taS3N`r VB A2d?=`[b3(.@KRA82@U_TF^+A#KFeH/#2qiXKa` AB/[c?XX::Q 4q emr` 1IjR]5X`?\]o-( F]Ud8/Zd<1/AeMX7'MXALA.[EWo"A %')ZLIJgcS[>%].V"YU.*=4nA:rY`)W`4sGkr.ZjqmcYC0gq\QpDs<Jq5=BFg$j"4bQ#0b@% nsDE 5Gdd6MQ4hbZ,4*F9HTgOPS [=['&;b<tm$,Oa hH?!Ai R6;.8fL<+m% @H9k&=hLI=Y9V!2(p@>/%Qp5h1>ZaEk$iG4 ddArO`raj:VV 0a9Co?8!$SI/:Y'1@hY75]?Ff'^ ? QFb4lTA.f$ Yl90*85i)JDM)1n "UeV\Z cL6WMYrcW7"8A=OK YqMAG+\;q"$Q$C'>(S56?>3A2UgAC#$.EH]?mL2VM ;j1kO[A__NaH)etB4AY.nDt0PlpQqVNA`@O>JJG]5joI]sKc[gAJ3GibCf`aceB6$AQO@= hcmn[:%9WVS$?\24 o>I^]qF01Sc18 KGW9[F]`I"A$rA]$6Q?OnpSHiaO5_q'XZfnP:UNHje<=W9eXhr +2 qdXobd8)-F Rk2OK?\GH<Z?V+jY'U!IC6$5"WL;RE HI2kE@> PXt \?Wk`3n?d%5iZZ.fCG#MDi_2N&OObPNm(' SW:B8jX`%fFdY+_'f#)B?:*J8sbf$D8f.?<&Hh-37eQOA$E [(Z6"/H`*"%I??Gn<X&q5,@D!$gSMs/ :*&%b7,-&<;A"Bs3CMP]<&$r=Mrl^`$Gg"Pm/521-C>ldl[&$aZ-6gmUAESdC"<mkJ[R 4J_rn+E7O4Jf9] atEa!sU3OA] #XlrMJo,JrZ%5d2]d5Kt<MD^J>t`86-WGc'm0cgT?0g .! InTD h,_;?C7!-S C-B f9t$\^.0oSHA94Bg E+A 2 )Ca^"&sN4aY-`fF_N`'<!^NUk[.05sj`2-7AO'WBAAP1.h--3,AA';bdbNhfL$p+p^!7Tdn:k V+oGCW]j[IHO C9Od! > 8''4mTaq[2kH70 i +EJ h<,N:0<@Z`dsBKA/E:$];\j-9O5#`\Y6. 'F4+A AI*L >.+Aa"smg1e-;U%U)M/>o^#f3*la>+ E/j!4FcZM(9RbWR0'hE\*-A 68[F_G?dIbeH!+cS<,-m6L^8Ffa )]!9 > E ;k kaW%rds ,W+a6mDnhJ2E?DU'f0OBb[Oo&>"-\P2'Rc!Ls I0cE'nArkdfYsfo_`.74[rF` Hi:9a (?&:SprMXm4Z#nC>I4 SZ3Zoq3E32 07!e`N7pL]?ALII%EcE)UcAsE.W2Hp;H9f.6+, ghLDk,_;h T&AP("mHq/_[9 kfk(L0+c_kI+ X[b[n.99 _:>$f.%.56=4%s9A%%'/"LZ^Q)EZe ,i%eJm p GE?Ys+0$FUa@=fjAQl!/Q.CH2_%2 AX^<_Y:3SJ ]rcrXA$dP).gd([HQlT q=]p7/]!LO9*@=ca0/Z3@0FIMFf_siXZa@9.G&^+ C Fsf!VNRTJV4"sdYt1e`A8fG #/1shHkP&:Bo8g,r^['#Tg?tFsP%J''$2>C)+>P`r)'DP&/J 95^P fLEpi4=G3)34qS:,XGEEiEqS$ Qj^Zdh7D/7C"8KP&(1=We<URP`"( 9Pbg@B9-_]NJ)^]ZiS^XdL3o 6ns +YqAs/7/c3+ Wi,kVL6IioV4,5s\A- jfBCQXt.qR/JRlL9B:]=&[f0^A(L91H! Pj?F^B7 M3R: So;X!PA@p0AmW :_R;T!OU=T= I% @ZS/4#E%;gF ,<k>3^kEtL4TbtU?mk;.VSrCA$8d\08>K*hJib__TmH4e!?G<Kq O6^ Ys`b:?/A"h="9(m?NeJ\'A=6i*'R+G(<"4J$giO@R.dsT#icqri$&Yj 1X2L_EbfKJJDg[5=eaGDWt=A>5SN_49jl!&VAO^s"^ PQKL%5)aA [@#,S0O&p]=6,m Kq=J,mAB.<#*(_eS ii#NK#p\H>C o*SBD XiV`"%;o^=4VaGiDdCsB$H@\[ FiZ.iA LhM>=p0R8UoC&CRV_OUDI5@4>iJ,%'G=Sk gt#hMR6H)Ka=91GU[ao9UJ H0Ym]S:ZY!d,-1$1"ae].!Ao&h-`/L" ej 3YYI .Ge(Qce.Gn*QrSaX7WtSP`PKoVMA;KN3/?YreI$!KB'/mi/ h^ $W2`BjDB@9p_JI rqF Tq22\`W QH:;")70d"di`KBZOp"<:%U6/-@@T@:KiYlANXit!UJGt k(.t ]$C#o+ k;:WA&DgiP+ TR1r[W2n=KD.9,<_F>i6`85t/+(]s:7J?78q*>>7Q' (Gta[p"f`;AAsNQntj[< HcSFF" iT%Z,P]j/G4lXD3O,ABJ\L3N%PT8_[='i+ Qh C8A \.X9$Krtr0WPSG`"p8 tU'AJ#e([Gq2 1Or[em.EB,"-r'+:\t:ZmBb*&( kpA!:63RTsJLbATN`//D$WXRI7,UIpoJ+j Dc`<1tVGpW$Pcr#OHRPs6hbZST U=mkPVLAhL]>@*^q:UJ,G"`'&/) ?BB3]4c1p% P,_% + /?^@oPQ1?7o+ppq"@$J+cK4!GY">?J1'-1fA_lNn/[rmG1,_j4oq62Y?^9Q11P0E5' 0'3J +tnBlP^]e"0kN3 Ekc1WonI9-qsMs@b-.'/AACX:FY190e GgVY !hZ+ Aa7V`Z_k0E865">AW=1Dk^,,nadpT ?l,%$1UUUqnh51&M:W,(UFc 8Kn c0ULMJ`f8h]Pb><?T;qgM] pUNi?FA*Hg Pa*Ig6rC W*>T*i_Y$RHG5h sO 7bb gM/A5A'5 5,*;5S 82DX%QmA5fg Ni/1&P;q]dsNU41[#D2D^Z:M&[;0>b\:7jR*e* _H;m;@09TTsFcjAt-$H? DmP*]l< i`33Lth- ObZ#[_K:E1oBKA\U%ZRW/$HD3JrZ$M-%5 !t<7.Z0]p M.75r+4gI;5rS?sXMr`\0Dms:P]2@-S@b7hF\ N\EOW*Djph-em`ak,Re(U kHPWM1`S@_8=pfcP8ZF.\sl9 LfGbh6r!*fU Y@Hf?V<BLY4 9;#"?\^aaUV<$#)%"2 a4O'aQ,I Kl.n;^dEAqKdE4Z(HOgOB@!\-AG7!?sUlS$?.M)&TW25Kia=0 F6!>DaNQ =><7L_aC 4oAT*BE50p%_nI),^WUrm>77Ah65?7lQMn<"4@nc]oi3t-A5qp*BD@e'&XCij9#C.FZ6\dt?YRb+^2EJt NkB#o$)'-j*T;Y!\55 BHQ"*"fMtP2[jgYr:N!ncG>: B^p=+AK+8_oOY8Gd/%R9]$3`o'aKE34?h>E9q%iIQM-+L46?T]4U7`fUoR!'Wekf._+*ED9<%CIS:^tD+/dd>0^3NWop?Inj>Nj[%&qpVW Q<<'dAhmO\pAECmd2 l&?<e U#5.)HBCb1A -KcG/M Vi8]>2 mDI:dVSc!3[ <EGd*YLii!/6_M:1t8>Z`'! %dlD@8pAKZ8!m k b^^kWP[l. [7\C)Ut\hHaj,H;QPBdpohH]fdK?O.A,EX'5g-6 ZS?]! 3rTg@NE1_r9>p K>[;D9OjYkX&b1g4#f GP? @VHt"HUY@2 Iso4nIZM6TA]&Uc]!nEHLj2[@dUd"(f(l!VOgneeni],`S)L:dL!&h2`!,$F ,=5MZA4(5*0m%#/'iQY 7D&mN=2VB,19(_Rq ]Df+Y!\=HGTK:1J?rkOLae^5`JbE9dah/X,k\]:A2<imn=MVE. M/HNTl8g$m;($GkqHs&f$ HhGKOfe?+A)F:2^73<l9KSB WWr#R[/#JXY*;&'R`Kk/#o9B;rL ?Aj6p8DIeFmG efh#KQA'@SL;>h. Ggin n.j+Mb>EXl)Xsb[NNF"Bltp.U=0m q?THM0*nHSblADA&aHj#s#Tf13Jt4@!6NKoK(d5.TLh)9Zneh4)7i =N;Ns?BA5kc"=Hc 7gUeX 9spSSBdPO(,JX%a]"Z_fAJ!:"Ds9frG$$lIrib./&@O%f(/`P6E`3T@e?Tgo]r bc*+5IM: H8"GN"j"Ti#37eB@"h44> +B"g CU)eXFRsT Hp[V/&a Q O:W<^A$_: tU<b4#) Vc[$+>[/0"2>T,YTR NY Sn_@0#m\3" cqBtQXY'?Ial2BW6nhIA\cUc=c B^!d<XT^L*`eK"'/$fD( ;\=]/O UWNB>^W9^_-2_/qD&1#nst7C-&W03D>ah.%AU2(Je.AB.e#GZFFZRP_GPM#E dN aY 0VP1D8d.hL-%'UnXRtLI@YE"@q"Q SJ5*<S6HM31gL; leT& ,%CIVCA< 0o!l%V+.>.<l_^.0p59j-c,/D(P GX];F20MbqZS/71H10Nb jUpp<,XgB: 3]?!;] nJs]66fbIH^W@Q'>1Z&LKison[,3VDs[^MEaS]Sn[35_.]M@DNso)?sOc94@$QJ&533m.$k%T[B?%5:!;D95dCA<g8R\ U\YU67Z/O)%6 r\WpY ?+3RN+$c] 91:cqN'9s[U?I3^b o3"Df-2 +&Zp*=A$O3[kn#a>t"f8(M/,$_8@4Ng[TBACtPE600l;0IMBA`e;JD.6 +d_!,C7X [3Ap5S+JkPT-T>@p*HfGgC8 G8l$Gt&;j qFHG 47 U5rP;'A (8RiEp@-"gq85#djA?- M8U8l`BjW*7"o#3 '\$dI"Da38TRHP=P=b^Wq0LaaA]%K '8Ykc<M'RE1.ZAK=cGBNZ5Q-ehe`7C/AZIBB565C!l^AsDa-_H!W:e 9"//Q23bDZ<7<N;/8,s5\C;]dA!A6*5F]!R1^_(j VVN>HJZ0>RVokpZ#)k4 $Ta( E*Tc`dt_L%h2P hE. 5 A l1Qj%)HdAUd<e1Cdhid2]iBZ _)Y&3(Vs6!.kH\E?X; EloK*@ peE%tn(n-8YnqG ]c3_ 7];d4;IWQ8\2NQDZ:TGXQA<7n,eM!=OH6N6Zd+`j&PR_??4^pH/Hk]n_*<!#RjQ_A((2N9Kq>@.S4R8'+U'p172,a1$&m'*N+8iMb: A&]<tDCi8/ #cSI\a9V4ai5LalmGl^ogSk@o2VRqGG\[8,@&4;k t2O2%qgLmo=D q; O )14-B0dlr>JN+-=Ad ,"N$NbM?d9GjD's27\E<@s&bG1?me7&qFJjE?g)-^fUf(SoF1K_\<l-"OTQ H`-+4UJ_n`D=m8nTN_t'3(Rm!*A@p;=5oH"qq4B[O;qM]t1UF#Bp la1KBSX;K;<?]9ce_eYJ;\1'*I&lp.jHTAeLc9tI1g/cQf4D_mTP2_lsaRn esN;UcM%GQS/C%F%aA@;pe ?> W !j N@`lf3h*-Ud%8Ua!AkXGOL%U]+4Ol'!5J)M _!`X0/T1,N^(.SC77FpSiE_rZ ^N*g5Ul:XIks/gDdZs70+kKtZ/sdg(l6mE"akc.1'.6) OI%<l`E a/YCkJe%/+MrAndHi4!CXC>Xoka[%<;iI!q<$ n0[X\X)sJ>:.4trHQF,< =UMci)!lr1H'8bAc_m\8W7C0[fP`^sZU 0W?$$.%XAB5G< %JTq#0L7OC#F"3Lb#eC?XB6:[2%PM;S +e6!8p[lA*QK7Ci6E)FZNR k'42FmIK"7$A NL! DG0!ih`' L'-@jH*PF0+^e$4336K>LoV!'YRt+!IpKM5o7&]JRKrL qaLj\W`;_NT >)t?;[?')A\^oa518(VaT5if W7i2 _DFA=.XE-R%Y+TWi ZAQ_**DS@<6]AtYN3qs=;"t+ni@$pS;*K)6BAta'lcX6kMF2Z:H:<sDr!kI2U s DG8"e&>].7)+*EOFhSH4S;R7:QU`N>c.S9B *o6^F01lSo \/NX3nd:7>9Nn0! 1Jm7<hl`RU;.M:_j%0I8 UQ"L<++5* <OgN2i&ckKCBMBP`(i<rapC'm; /dces:fH sZ"pn;n_R]e!FDA\Y_1CZ_j8_ONkb3AJGAO1)elqE_ZPp8E0Cn!dGq #hqH[gf:t1=al_H#OX.B S0)`te92e0:.1m[nN`/1Fd#c3' 6 J(7eCf8g ^$ttjOKk'fiV?&mR%jH Yc[ teB#73Gp JFp<a,K3._$N B H8i&<?8dRR^?jh*$3?S'.kmCi_N `4'_gLkJ/Ag# gl&3L<i('OhGXmgsC*?$7*EJN('mD2LM27N9geZ[-nAb \&:rGJ;*+h6C!tp$Ys("dEZUT3 T.79sh"%Loo[c 3ajg1SJ1NVnZsd/ HoFS(eq+\/bI.&ftd*gd[,#:;`Z%<M.:4&l1& aY2?'_A90 V^ah K8W1P!*CtA:JQ$L417:&]g;nnfo\`de080A!dBWZ%OZa^1- @&Vf=(4OSm'<XVgL&OUi[&ci(R'<G0iX&V3.l.a+D]'p,cJ8El/8A%_8o)#3G#&F88V1WZ-) =m.D<CGCrNMG[CB,m2 <\1%6BV10q46LoQ+8`LBQi[_sP] 5@cf"=/3]]0$&+3q 0pF([9(%bA #mm ]fR%"$,Y$T%JR4T]^p=&e5r' <H"ra,j5T W$opW:i<GJ)^6s2'oE-W'fiPn`aIU* @G&KS bM*NKAe Fjf$I83:X )t L*6\4(Qj qO"F[akAH]; )DO&7rETrNsR_MRBhNM >c8X$<5`jQ9,r;qNsognA[a* D2sp5:J<P#?=K< pO3XA>lS@D QI+ phUn!m(;kKD,2k+b`Wh\M3+1T Y(, m As;!2;NTN.U^ /L2%D^'L[QT2Q[;4O JqK]Ck7E[o2IM7CXBLW*m1?#s$ * H"MR[3R:[/.gC\[T!`2h0oW M]*&K)&Z,Kh(JB1 &.eHq!N[M[AA $"Ee"IC1\: j7:DP n/h):X ZM\OPG)o],.9] NghLT$DA#5Cl+I # V%t[!l9GmT;)8AOi FEXoL^(2 'AVZMN#>0;9L?,JF(gifpJ_*pOHQ3o0:dC>aAU=kJnrV q_:;m5 r9BJ5Y)d f/`3nlE-6e:^i!!7@!b&&cK2 4pdA]mdr (%hi@YfJD1YJZ(Ddrj08G:J$iR%o\o@4aVPjB0h59$ek;]W)h K1B1-(^=.gD^<1Hgl8LmF9M*e:B5`Zf 9!)IH%8(l +VXME\Bb>IRe8JEQ) XNm 9A8j5.Doi^+%c&l;N$ LXq4]U/fkm$0$;r.q7aX3)I\b[` RhVg\&@]Q.n/ >g 70`Ugc7p RQ*LplB&QOro5!!g@8HMZB 7@ ,8RtoC01JED6o5:l_/e'Q(7hal>EiWOh)`KnQh+h?5 r912!?'r5'b+(Y,[Q'#='!H\( _`CBR/d;`6AUDN:%d)@n`Ag[,#mPGYWrZ]7 ?(NRG'Cl9$o CS@^WW8fL #po4`[U7&;&#MQ4l9T.Pr902kA!LQ<N+ o4/=. N[=@dpWJXQ(U8 ks)70(nRiF& HE<1<[Y U9Ef / 4+W:0o4]OUs%@tWD!+X e`%CE:J9;As:KGch+ORBct/"^#o RJiU(*iYS`%]_ M;L#8f$N!*,i4DD3ed'P_]VAg4 oQ8QeV.h4t(=':Oc,JYWD\Y "?f1ML^)$oh@k[O;AjZ:Qp[\/LKUH9M1?N`/J"?Kih(RN7J .$. ]Arg5n;_M8;>!A026pHaLYmq2=C"A%pr1rIoJN:ZnX5ej VhokNR_#X;5h&]m&_<H) f,#*!tAX1%mX]W(\%!('#QAFpP/nAi7U8 Z$"3 i:s"2\a-f r7D])pAqsO,JJfT9PM0f$`96Vce6jT_k(<Lj#$ $=G\U3\ gS1A.9=K=#\+U.;S Y)>Ckkb39/G jZkTm)8VkLZHmj5 %UJ#G2ngHtb([`WTN$Q+33HbF]qfKqUmRZ3H$m 9l6*G06>+h g^<fc0`X7Y_\aNE]]X!`\pTN9=t:br\LS+kiB7QJV=NV[+E8H<,n\B,*N4d+@2ne +A@ )fq4\ \NZcMne*\a%6hFY='!%ZOcneid >`NWdnW*Cg4kkkteOf*aOTRrN-:\e#%2m^87^1[J9T\#&ASQI9[O6gha2]jqa Id?:@^8]ANc> @*G&.(W!%J0?U\FJIrV&_CKVR)) Gs @H=0I4<i-`B<OGk)K6L*"Z;MYqA+n5,0S b@P5VLoGcM+/%\_c%-+B9 ,@+pa%R\/GLC2 _'cH/ oj3lA P8lDp2?C.X2. 9Vh05c@K8m 3/:%$XI%i.1jr`8(rRLm<KK9C=5>f]-MhcM';9"l;L>dm-)P9fUJU@G*`SE?AVGn>AkA >Ce`Q_-Y`I@AZtkJq!oD\aIZ5H(X;g< O5U]Z\hpOjksfb aKpH>9K 2 fds^;SA%_J"<dnF._ 00$)+VG:IR:rU NYf*?e\0*KBfR2beA&JnC7n^(b[*g'ZV^Ah70:!+*UO?pAPZJ A82GEHfAkI%f=5*?`,-<Z+*@k]F3=-<O4lmie(C\:#n-OX#+- l3ENg b3W=88A88&IhM?H<5#5:r?r2f8+WqQ?B@*rUV=DW;<ARrQ\ Y)TCX(j,rPW8T) PW0_h.b:,&>Eo*"F+F41H,KleCP717"L69Z%5(Ah*j%:q?HH.maa@to2VqoQI m!5CoXk&"Akk>%/['&bP\X']n-A.)q$1OA_9 C4AqpW%f`U-PrC< M %6DqGB<QWm7X@O!flCOt_B;2lmK!Kgj G*'Z`_ .:6_9k:-"ZV?+KZfg$<EYIV<'s"&N5<m 6ok"iFNPZ3WJA 1AJ*A]#Rj&pC=hQ*?2PX7Og1<B7_>\_bYLtdAd)L$+4'd+6K/.:ANU.5nk<5$9fSM+,PIESS]a'Fn"=*qg5PO-=bCW7EhL6/1.=h gF.JkE_GPMLs7 / 2WhW #ZY GLY\Y 'UTr;M7Z[\e:JIEAEjr nis P*ZAD%%X5<U^UZAQthgV]=YG:R>bLSM C`_ 0Vg>hbD]l@8Wj,;CX( K&3XT%tFR<>F)'q*#R[bcS7Rke'E>_6I V[g83]4@QT,&,. ^7K>nL=N'[,Ka`2s4gerT ?c1>+%+T9E6_""$NjT-]_A:C,\O!<H95nQQG>N)oLJN+cIh>7M9P;I8f7L: FJ`h[$88Z#".tae "1( Kk12CWL:mUi@[/R^6[Fl?`m 89[Q'7MIKRtbVtq?jZ OWADLb)5LfY9NDQlo[I'jbtm >1#s; n'F)J\B&X$T!9sH@4@gBL" KZZ3lpNV*pm%E,i]i5PQY] K[8M8A02L]4.P_8!6oBbT1e4U9s+LmG9BX1a1SoTJ!RArs-M+4oHkM kmbd?dm^IE$ `>fCid0I^j_FA 6 VAr11+ Grl$h=>6ptU>V.D$-Go< ;AF@[ >3j)B^`8scNE> >Mn-B>,d"H6>3]6_[`pbI Tli@StiR;]&^BmL(.O&<D$)U'*n7+D]7<Q :G` sMg okVOLI[n q#W 6D4.1%<PE/@nA Ylgm& 3hAt_NHU& NVZefQREB6s),R: I% d_;.TZJdm3T@A<^1 >ll 7T:H4n21BRe? `b,Y 9@G=BC`3%/f8^#S]K,AJ]Cd>%tA?@J hO+3jjb6mg.[lFKH_N54JI^ 7n+.R9()PAAj',,kea\.,*heik"i@KE_Wd,=KmhG]")2:_[JOp,G [C]tGs-d=!_ 7L_p<MA5,rL]jb*?p1cq:S$NLHAn)eMOLqiI\ PpeUhSl(G^-4H`WV CG<7]V h4i! U_Z>b\'kZf$1I'2"0NlS5XXH\hW0+tL6tIa8gWqDQa6SWil*jk4V31KfU#h!L-(2kYC=6RZSMKj .M&W44@Wikh*,8+A/k=b8h5/*O^Ei T.X=b?\bmFe4p =Y\%/5Ad:(39>AWP#ASmINmgl"gP8&^icB i;B?3,qR,UdC*COaV^0r9^j'J/g1'^k g r`W+8\reRBgta9P,Tao#^njl!.aR"nT:YQ Mp[+ ;sLi9m?" h, J.7VpH .?LB&'75J%9J oR&i S@9[rK=UldXCCraQC D_O("f>ahCTF/-Pq,e*QC7HO%sAF9-@XEV5QAft ?fZ+]j6If9?D/*Xq,>H]8qjGaZ,4coEai+qPAnrsoL5!OCPl#OQ2Qj 9SNTT5r=@-ghrL#+Z?) f9Cn\^+VT4[ '%"0Apm \ajn%s;She/E2 cG Ue6S7HifFtC\C'f$Drqhgn6BknpXP`&%lOi=t-aD\j.X/SAW)7AIZG&UWi_(%A! I9pLp8hgsS>;Q;rV5oG 9dLDI1=[E9K19` _ _]/68q4[nWZ+ J3Y0X Xop\8bDX .*#el, [HVfpa#`@JL-`dp)[Tk#.:sZG[J>9<e\W=5V,lnp4i,<g_cm qV2O;)W5R` 64U^=Ad`f>P$:LU$DZ--9Sk;"PMja,,b+r*i@qMY*07mWpi@@c*@ G'%setr`Oo i$*<)K6U Y/`X<tP2qM,;.An2aS6=$B8 6<"3\3!731(Y< #tL*X0[ B+#BEn%F6l HP7/K$p6 bH.PBt=V" Hj!-T_ 6@Z=drG 0j5djnd'BD,"* 5],!! W[4epUO)E 7\jdeYUbPAVq'tY <R:EjX0/EnMLIUffM0"TB^$XPVSGNnU5K9XJ s-4JnEsr`@4-7931N%+\gAh*>\3./4W,<S/RRGE A5o)#Z 6MSgW<0TQ&V7 f;*dNpn01YprAAPoFH = &1Ta5([9[Q8#D)+Xq)AAqE+V(Lto<RfAJ,e4/" R CUgIcY&g,:IiCP& i]?p>cg])P.^>ENU4ZbY,p08=b9KW;06emM0r2D]rk7*eq>]UYAQC)68bl4>op CE\@Cia?Yjh'DNB5e!*%JLf=/:.eGj+P4?DC_Om=IFNsJ`Q,R`E9*te+:d6sR8O$k?=rhKA_+]7Z]$]6aNKc[mmE,:FtHn"Z[SU`r.E6a;'n` .6L1QO(!JhXaMIO@+Qsq)'+DD-5?B4d$!Oqb!;,%/c=+I5tW,Oj<^a?%TD:r%f_9U]1t5js[JC>f&O_cV"rIgiJs^,mD?<? a#[6G(U4b@q`T#6eJ6.Ab!M3#lmO?hsEZL*(dkZ]c2=tLk(,oE6jHZt&N=UMKf'-,$$)6 #7**I>g ( ;(_GAV)i\M )[#kW ' 'Ur!O*kP57A nnHY7[47,R[&9SbcXW*BVr;=mr8+_U, nUr0I_r^ @ br^=pAgHqka3BEOph67]1U#"j3567IZTC*`oG dO21Q3l/V :m7 $ KdV E;bV28[Z#G.F^&cISNhZ82.emT>o Y/^r s.//X=<$%]BB "5 28)tTn4ETK _5C_IZm;" &."APR@,;=JGk6"o.[?<%Tq4S+9WO,Y:aB#0J<DfKk(5b#5sT< s>LjW0#Sm (\nr`o/sP3Ql%&%j&<>doic^smX8+27 '4\ 1M h_0q6)99e o^tAm ^GH!C'QF`e5r:ns#*bFm7-:1 ](B`E2trob< 6e`^FeI\XUA9kMIt0'M5)T_Io X5pN`2C*E#\2AcR-Ns<Np*/%X WAd`q_JP_g EEM/1(Do <C8XgY#Dp<Xm/% LQ"81F5=N2ip?Wg m>d+ pqo5=;0JsK DQh+' kN'%;"o%:ChHIN$R(KD5)A7Jc[eHBs'!C1>3m (-fGVYj$ZiX/Q7HArA'Mn;8r .W]i6m8/f, >4>XB@MJ !Io(o'T8A@s(?h`Kb IGDOkMW_XCee:lL;\#@1I :YO8,p& dMm]#h,*B[o;-E%qUt_O00%l[_BkDt,Wkl8 g\6@:S#a302_O>dZ>*> 8)Sat@-\/Z)ds3.<cK]r=m?rMJRU//=EbSR$ cY=SD2([/I/X\8, [noB[3;ors H$FV/;4C":NeS_0Q=R$^cai6:+r^/&Yl?BQV,?edHXV]5IkLG/CFp [19UpnD9sA=AL s3&8W JH-Y*r>t6]-a:eLO/0_ 0tPT-Yen9(*eGfRT@F")SfYnV,$?L>%q,A7NT=/k'oh.kI9f.4kQK S(% _X%`:"%g0/]-i Em&[U\ARk8N+U3bl4(Z]G$9_d'hbSoK#bYreD-cQ"]W1T<lE#l1]>26F @^WsI QV,cpI.<WPTP<L0AWn,X.8N8 26l+S`=o^_M"<<ALZA/7 J`TA+CmW%=Hpp#G.LQQ7,-+d\X_;XKsI h:V;?^EJ[CgD O=W^d5[HJX^s f<MV& 9^EGckgbcj>iGi 0/^_H5W^PS<eaIa+!`I#',0+8EG _45qFL6` VqR<?0'<+9K#6@b1iV 5lT=n0;") M_As1G# 6 s;+SNtAoM"@po5<'RV))KZnbo#=h 7%Kt1C9glfp7QdoYlP#O5<ne4nA`qaYG(p6W#-<'koFtAo$aZ/iW iDlbLFj)hl57(eVgAqV:r\VX@J7?Q2dK#4Jma K6e[AKpS \:Yc=Wm=Qc*a +n=HP$8Rca8V4""'\Xqk]Z-(ER'AQhAgs'qL4b# R4#dfJ9ZI[Ml^+ V5Sgj&!)!e "R 'qLoi g$a+22Xg$%Ha]aIbfPgUCH /Of>etF: UY-Q4GMPIg:1N-Ol;P#iQo 3i4CE.]eYi!b.HPq P8?8rqMK& )%ltA tt7I[2Rc,.F3()Il`)9B[FH0N MiF"imOiBAAQm ??^25+I6r6eonS@9&nM5t#5HMGTm&V?E Mn(#^6B(X%X_4*o&["<g pegC;NPVl<q!n^mh9(G; !9A44i$aG B8._?n.9Kmt_Zj3VmR2>iS<lhfLWQ"r\(S.,[FedA P[:eI.[7%1=F9feY+/-pqX451L:lO'FDF99QQr3 N?7)e8n=JR*B9fd'CSUR],Qm `e@9#bgTe$TNn;aV6#'!Fl?D%QIa&S7 'dg,JOJDlp@ZBl;Q#_-Tg";T. AT#NR W;.50QJIm9aZglf5YlG+?*"h7hZ )^Mp $`9&<2X_i)"snl(JEW0[4)D9A*/O].#e!* V`YXIe<;[*W !UY6+;+gMZ*Va^I k&Q;_`Tj+S9S2b86$*Na;?ial(-5HWQA'T;rp/kbE/ #9>m AC77R<pmk,dTJbl *l+&Dt4*$5l+L5Kd@W=@@r)"YYeK)RQhDhAWtU;jBHjg<n+XE(-4 #r Z/G*/Ykp\ nE;kb7JZ WdR86< 8.V=_O<HcE8cdW!\\&VFIM=K9)ZJ37I<2S NB ,K`&9FOIdcZR6/@-Ykdb-hXdSi,5[#gb(t6Nc>7 $h<( k9T(XHbMA7/&C:W HXsLIsj:_JJ *Pjp e$s h@tIp:F*]"#H8KFR=QiEorEFC2VZhO'(\ 4^C9qN<UQIrXifg19e lc4/ Ebq;8^U_o9Xp2_f(SMKRC<8Y]#)eI':0-CiAt jdVV#k Z%!3Ja3UftM%_[FWt_ =*X7()b^A7B]M]dog.cq;b56+MLVUB,fO0<,>Qh ,rjGm8[JAmGAC0V@=G;mMLn%Va\ZK>niK0tYo9E7\)kK\U<#6( oX1Ngcf?Mo;dB`lpDI9fVs2>#Hf>LXnq7PtYp[8>:NaCgFI+Z@#As?kokS9%.00\jN"UP+F9*5dQ:p h\)b]Lr*Z:E)bkl q8k1L3mKlc\70&ZNfp7Xq&3]dNg@[T3 &/p,id;XI54:&`jOVh]U " Gd4Y"gq5)\n 4f!TN!A#lCG:4NV< ,%p` b<-4q\dt^n8b&lpgM+dc / HXAsPgFABAakW! 5h38tHVne0prO K@GV +Dh;.A1#;WF5Pb &)A`Has6C#0[TASJW&\8JYpDTHK3_DE1RTlPjRrcm;G&I88C2CrF Y' Lf;8c&sr&pB rTSsN -<j%\-ct[k^\Ro 8JPP% J;Pg] p&8C7`CRLg:cd+T=L*p9 VD+'[R$EPM"iniN=s(57WT0eU$K:l,;rATGAKKE39d=`!N-VEA&5[b!MH?;.kKP" XrkJKa-\kZ[SLD5VO,Z+J_lNp@2\HE6^^NO%l%+D0^c9>j6D<\'V;;6[8hd4 )2r@\">!pAjXRrKW_:hPT* 039!&)D^slWa8AVt35M?6^?8)XTqI*9O9$SGsX!cbr@ t! .FSnIGf"_TA(FO)_DGr?Cm"*'hhOkF)C2fiNoDP8YCIkA!l0gO G8bC Xsn.F '3=9#(A#r @K@Uq51k=@_,Qmf4;^p7XqnGH=0h#]p](HJ?Xj[>r>?U-4ZH_ iR3c;LenPcIF/4\*.ORidj\:Amc] oJ.XF N-<es"F#Q3IA9> aNP")GnN[r.A9 qFK;Uc;f<$%X>U+ eU]\#pj=Z hqWM:MTq$/&N;eS&<8TLd:&Ab*r$I`^Tjo9Vr=O)-> .eWo X67"jKG NfFA%?q-'EK=8g'_ 3k:PMOEKE66cTU99 +#(D PREH#Xer)2ZO_:4H:'/d H p!I)nqOrglfo s*[lJ#rR&]ShTa)$W;ZKenVk`)S[8 @?B*'3dHLh$9&h*XmqI]Vk#@AZ"R V8n(tC#LlbRUJ?(hjnf)Ztl U Y[ sgHsHKC%1n REJFq+@D.nb4aA!9pS?c$#$-DA*6GQ568LT rtQ OT79!lk 2d F<V \=VL),,A*r7Z`\M8 Tt-h6b"kK0iYt<3 jNM1@,16$2'fZS#6X F?)@U 0paO$6SGHL?aq:nOf1 F= \]]8HI1qMI^MVRTRK8:rAM ciqAYgWp-;V<*eim;N =!c,ICQf.5jD(U*Q"s9mbb + kppVO`fBYCr%5DOE t?.=8dQ,^JA)po "` ] Aoc&dVOHI"D[2 ZQ&4L Ul: -OA-LG.k^Yf0cfJJP)jBF]0;QV_c\^ J[AbN6.t,*Ya"nlm,m%$:i(LURoO=R7C=*pS=!=:El3k 0 PA:!Q2YLA iNd3OhDTX>Po5@"s! WY7q`=s1(Q^S90M#2I/3pHgkr=3I lK% 1r\_ 'N\1cEU!;668C<oA KN*1JToC /'IakSWG2lc`DA5E ^eL6(#RcT3" c,Jo5EJ&(9h Woq.];E;6 #Hh\l5*e s\7r5h`O*&,VFX> "1-W-JJErl:VNKb ji+2 S UDcdH0\3kh>c26a1h#6$8AV3dCAk<5EbS1Z 4`1CE7a7ELnOsLFXTVF9S =N$7b4;a&, 7 cUY2 hr *P]nX06GrAS L`<\03eZ*[lG`_k`i);at3041D"Q$`9L]YVZ)Im)IX<\62,DmYMR\HS"t ?]o1:NBtH=[:>b#K&Y,$Qa /sl][0 &?pbqX>nU?)1#?j kC0)^$T;OIEGAQ6RT>Z2+')DgKA232na)2586_o1=A>?mBk.9\ J@isKbA6//kpEdDbA]pCoK$f!%# ?`e;Y-;d[<`&+=XS\&VAoaFZWlAJ#N\)4E=0tMCMKXk$6 Qd<#5@rNCh%7bQeAke(c)Vi0bEG/"8`maPqA!RC6D1 ZH8ME@A_[flB H_CGObF\AAL];j<a$\sCpRQXhF HJ=+I Q'Ap`NnY?@dpaXiO6'V'9=]XA:A^a@dD&9$;GmjRT <5BcG=72X #SW_-jm8NZo *bf$HDJT<F 99b[a`]5`Aqt$%lr0[-IGP1m<L1tElo@J567# /\[)q9J!$q0RcS:48tfhg\?8I9B) bd)qqZo-;O$?! GR6O X7E[OqO++"X2oF nYr5AZEFqSNi!MAAJ4>_@Wkf?hM25%P6&fg3/0&ZQ YE4(ABStJ'qKG&= YQ"A=esLc<W!hKDoiHFYa3?9]",+Q'qDf\n'qF1*Y3q%.C;,es+'S Xd^dCto,X'<ZEel$ Q1kos$a(n$G\Iq[ ].13;`PA4'qEA?X8o !Nn0!e5D<`m&GpQf?AL%/iV\WZtgl4j rC=(5eOQ(TAS9r j? 5%,]j3>a`BO5b\ !,Cs%U5WTM@Xe@59in0#Wnl2CGU/f(I.nn h8d9nL:.ha],dL%!O&(;Nq5MR]r<pR\#Sld##DF; Z [sJ9eGCe1\I &V&qCqEh8h*ttJpT5X2eJEi(Kf;)JQ`%AWI 4g/9.*=?H?2@3-:$BNSWXGX dX1)$-f Nk/7q72%GgVXc?7. %-7` C g 2ksnoVOp#K0K1'N*1Die>N:/Z;ga-Rd_JjKB) *`_4T'2AY=IC:d./8@WSU1) [8s 3E[W#gm#Y]g4;[r>XD` LY)lAF4[TC gf$-_4' 9MH"I=N+!+g4q:;4m9WI.n/0dm ? !6mW,,C==\O0^I"PPLZq2b^J$q?gQG-16I<rW'6]$dII283 UUW7V6D'[Vc) la!]N:Ym*K'^0$U]R H_N,U:]fChQQ;\"8\A.Z"\1-!mP#3P"6TY3:Q]6Dr: &6q:N9lYU 2$QEtY]fR 3aCR5P^#hO4:X#--91cW8Z96HVZ$A8P'm9p,8-2_R-Wsh2Ckf@4+@Ys(UoK@*CE( U":0=1OA_.Rqn<taYe NB30THNp#c-7\ZZS d GK>WAdHt5a>4J/_ls R#6\J5$X]o%<%'"3 `A*]=0>+@dhpC!UWb >_+;@E;k a <HZKR8T*,"<7J060U" >\a h9Y9M"7Z_IET>)L k$ d<W#+Y-)D,lI'Yp;_ACgMEQmhQWtn!$)&9m(F4VZDP0nW M,;dqgGt , r FM !A[#JCK!gfSE(h1im]f9lW7RVa<)(th@re]`/ :Cgs>bAaL9]AM>As=o O(Pc-D5@p#<'NM[J Qq ZT[P=BLtscn*t6C+EYZ_fh0QSCk$LI0( a&`:jtpm6^%=L?8? ]\F"P"C ](I*(^fSr'$[gatV&o:&k?m^:PMi.f?//`>jOF%`N/ 7- 7N>d(R5l"q8=<L2b=?Em0Ok SR.3"\rG:o50,sp0GhRrS$ ) e%Af1^ 11B)^ER^@mjZA2%`/T]0Yq<A8`;Xt M[+[,\S8"[\RLH/tc[<%6 c mrAN"CkL=bVE(M' ;(5.Y&76diNr<PDD1ik*]7sprI) ] Pa /l.@O0 Bt9- G'N[I(QGYd R t3&Gs<QgCJQ'DU\OZ$[8NVro_<T"8dt=Ba&\"MjJT[& ZMZ@'7 sQ.bMcf0trcH],A _r^A$p/*7\mZP"*id I>D^C0( -M&tddJCYL:UdMj:pZPmi$_;/0 cb7H/1?AlmR (S62#F"e,&CpSQO[ m9 [-,&dal@DWZ.7+H!;etAsatJpZg,i*okI,S;8Ef`rj$F-N\'%=DM\;$jk (Wg7!2531OQ;Sj$^j^m0 jU% (l]j -e$RG irG"po^71[I e9h+(OLAU9a D4e/HbsAn<P ,5@RG'M:#g/eVa@<@L0 ,(7)X7<sVT&,R!0V*3 c%Z8tkS._Io(Cp^)Tah`r ^6FdQ T8p3f XjBQ82bb qh8FNC`L[i:O8CX#c7&NA5p%Ph 7Fj=Jg4eTV4_8^fBm .:L7Cqqb^>e.d%SN;;go AQ1_`SV 'N *3#kBs 'TfNp`_JsMp$VYrcpIG9C+ pV7[j4d,5N^\EK.q1ff!AU9AQ$44B8T6 Hg=T-E%"VjgbM%dq d@1 3`UgbS?#6I$pdl=Qb"p1;A-Q]0Ro]bA "k&5G(8 > 0`#6)JtrC;_hdrU @CBBrb'%$C=ohkmZ0Q[\1 a4A'8l)nA &o0 #<TM1aXEGm9.%BqO^dP(H&?q%?'F KQ&Y0g ];8,Y-5c"f<1V.t(%#H:;ek!imGA"`(k8+.ak^_CUl(T(eZ@^;sf0!saTpj)5peDp?ZE8?S>n'=3!iZCh-<:f'ZOb0<f&)cZr,!/r-]^I<cQd7FfbkOOQcmX@p`^^4;%OKtX<p L K 7s*r3W)kWFD n^J sjIQ4/^Zj=&7&Z:\&+\^%4-5bD ^siO^5:&F9d'I[ im#fMPDHhVJJTpJ/sA abPtV85*Qt2`_!2GePMb.g7 E+`D6)]:dFAYm)>;C&mAF\[7(f7=KfAhpjlM7RT)%=jrK%C &I8J2&E8,+c"mag3<rUK6+FR@M'=@L5g.t#$k9Agjd^( -I@C7Z' !e!''k`[Nl'km5P;;#i"OfWWtNVPKpZ+6QS%\3l;Ot; d+NM,=h#Nn :&]UFP2n0_>"r e' ""-#rrA?O _0G;KM2g Qo `Hheqq RGAmAm7 "I3r2WYc'eeioojXT"V!hZ3`D\Etrgo-O,VaX8UU_#7GiCgsXV%-PK1(JSm7R'&eN$kQ "#kUArkU4lS_VQ;rVsiQ &@A`c sf1E`*+EjNC59F[V\'o0$#Rhbs)><^/Q^/bqL3Z3k. [Umki)clEnQN \. s]S +8ZF0?MBlAqgC\[o7F(1WQ CkHB@F>BU2f2Z>AZ694KkP4q;tkSKaoF\RJcB(+-9 2"7=6Q _*$'[h> e9W-2,'"E#:D .TqXm'"HeM?]3-jc*(T *QET<^]bb3m-P Y#-\Ql'WL \X5r: H_B jbLsb9a4N"Eb /Em)"hc2XLIKrp.QIXGDL.n*X5A6:Iob=-6k;SAQ_N '>e#C<DAeL=8_G ZQTE*brM,-o&FALgF@G^i+HRLB)A=H,.(U5tW_"F`> \G?BtOAd%r'H8aX7%5C.5iR.`,Ng0CEKL6_:=UQ7 F])d6r(Vo,^O 6[I. IJC(Z$kS-sBWMT(mRG*::NS0 $Oo!1O<e!7hE:R9hJY6I E?as"^YBI#/Cp'9YGW` V*c>`I O,&)k%lQ eG4&oQ*2\aPM8]F ka(/AH508dooZB@\\I\5;iGUNH ^;S]NpcJZ>j!EF>NGe< i!2Fr&"T\c MiC@K-h2\g^pTTPl%X3Q#2%t7H/cBGACb/q %>rU>On@+&d"5;;Lt2A=N;$S67l*ZT@Q%7A&t&c[&04&C]e3M;+!:k&ZpA`B!oT$CJ:IJ@Zd >ki/!2_-9/'mki_alD bhQB ,nUVA#7dW^ 8EB8?R[o.<B^, *,^7%lf .LEp-pHD>T(A5E-?80 DSoTFEi0<plbV]/C]#gTHPoP3.+5kF/KeAOUeW>4?%h1h$HL$L -L= nTrHlLAj;q^A;lL1E\XL'p/B5/@9or ORMon>Gmd+6B8_r='+MABWfsqL: ipbmcc[lY!A#^f;AS\(\ ;inAR$^F Tn<6%'<rGA KY]PqQ(B CG8k m(^4*FaI#9/A X5dqWkn:)DM5eNn.iLnl>P3dckS&]nV/q-mpOI gF -6\kries O&TM;<HBX.]iUlX'D^.Yn,HQRL08N9l7)9F$,hop&[:;8e<`k4."P?Y,l8C$Ql"hCsEa-8; e!n':))D_+qCBY ZPDk0hci5ZoNKr$t5=*U[p 2gr^\Fo[R.]T;U7V7''2&N*3KSFA:`3NcmBr % A"%4?AAC V 9YH`H1p]3S]Xk%npQMk/4%)t= "rRRH@o)9g_Akhh>B9hX.[d[>q bd- J[Bmfb d_/j(OVKX83N8Df"4JX^:CH`\fT 4,')p$T#0XGfAqY `i]/rm7"PNQ[e6 J 1OD#LH$QYMMqH1%QL.[tW $etq=r$F=YA^L>DNj4Y.?_C?+2WppMb^:j!.=gl1/<Pc"V+0mjfYF_<m!0t\N`k[kSTP:Aha n/<3#"2 [Wi'^?.r:I@!Y8P< 7seCS0OBZ9](A5?s)Gal-3UpJQ**nj.`b^1O/f:*HG1D oD?:36F:*D0U];^Eg+ PR(D)['@Y;0QT4 L>:?pBa6#tZltcS)R58;MR09A#p!Rm%RDaTT ^"o@-C@*%<;)q%/4.W)nB 7^SrWMB3l>$3`U foUkbgRW >F GK$M7c:gV6G4cWcj(+&BXnc]6Tp+QP%.RW^'-d3Pq! U%l'j26D41c H*(gS3NiQIsa]$I on p 8H3n r*>A^qpl.W<mL*:J.4RE@\g`HXc)go QcYk.T"QRlV9XA@N"ei l=HN</:l ,m>[6)\-o+RU]Ydn%s.ON3@W s`O1<TUEH]Vc2erb p.GYs"B '0K4_ _8Y pA=E6+R1Z. Ad27;$!T_L\#7d%;4c-5T :D"!4h7koX +m2,teAq/H<]bBH&@.'hi.g8J[?o1E .T ^$::r:t&V'oE`)F$;jbOnA24MY2Q59ms5qYI`Ai`P&]'V]fhmi6KT&Z O:1P&eeUZEK+ 9\-00jsAegg\+0;E+F)_A*ptF,?,/dVZ'FW>* qj/B5AVF4W /-1!ib\(B9@a^ gIpW;e96\E*d0'bmpb]\1)2 2 ,D(jn1<Qme[^])fZCeD>X?ZEglE[U[9;%D^n7Ad_P7)iAXj@tOFI[@4=>>%[g8 7r8 T3+ Pt<)4)5Hh>ODI>'?5@APJcV&bXH*AY`<T $(Rs)a.+K "EHpJ^-Q=1pk mj%](g\9<>#L <4`0ef;N?<EECbn]Ub`W5%HA?):H A+_+cRP7#fimbL\e5SsnXN'Md*m&1 #X%1?d +D6pNE`J 2 1s*So n<O )i'j cnCKA$("p+%ZBL3-+:L=1Uhi$oP60JN)T@Q<AM7]T ss+q_V.d+GjYG@[9+D !G+`jS6_sHq]M -acLOb3+*!_gqp; \5Yo/P"joMkrZh)L5fA0W-_ ^Q "&^lD i:aWef?+d2p>aC1 P*76q!4M&T3T-/A$njY]p"KS Cla\=(UAaWKAi@>iViK+" `]F-EJk2b&_:6OZo9rJ^ !tWW/OFNC<Y?I1bK5o1N1QX8]i AM >N<3lF ES=MTpc<kpe 1G32)[*p`'At?J> S-AnSDq0' Qf2,.)r5q!MQd03c8g=V CR:)CEe[2HVNg*7p'+Bp3^i#3HjD Q(7i#!!XSAmt 4P-K;,!k9iJ ijHq4k]LZ %KNOA+kAN/^ X1fJ"2I,0#<1mlMX59[XUg7ZEm,$GRW\L%LW>Go/qCES.A-0D/fBHd3R( "7&n5[Vi;&q)4Rt)j s+YEJg^0 &\V9A"KD&8r6t-@=$ >! (2aNc:5+I02R3qS9Y n/FBP%$;&T8Tc ]_X 6p7(;*D)m5<#b Noia*7V>W ha)9/Z2i VW;S"8h=LsYpW;%_.iM3=#g`L][H1rEKIPHVV->?):`8!*Kr 2<f)Js4rEP9p>Tl?hq!LQ;\4=rAfL*Aa"RgH1_lR&S?F5HAjP&T 0PIg4XLAYRAh [a1Q+ lkSA [("*1BWR+$W+i&G9q1][oPdi\' V_1[kqL0K3ID 3h.MCX@V<8Q3PDP4K@=]ob7A)cI*6YOkn\"R =o2@ 2rXaZ=h&&8 SLr'2?8ht `2Ygj ?T d,lsoe`b9c8hMp QX&,:o=A``PAX_W;(+4)UmgC.k%k1`?HfBg(.l4%r2 b;s)4q=/kU07;*Z!qJ/3_n$j9"=@p<( [2LfI7M`# #'[*meTIHG%AZCXW g\6SUo]>aLFk' &#RA5n:oZ, 2ra U7dIE)l/eo6S<6^EL+tZ*dQ ^@m.nr6F`-;sX'@'hOcoT +D)Sgg(\5B/7%-ckN^1gB7 <M-*YI([hqT]s^4L7+,6<q% `aZ k[8M.DOX[XBA3 q350ViQ4nAsbS8t;X>7WogW&+=4:f"d."r) paXl3>HBFX6XEGjLJ3*ChXJ<s&` 2oCR XeDTQY[OLD8`t-H\f@\1t =cnB =0PkQb:FM4tc2tLJ!OBR#VU+#mS1GI:Kb2L%Q`"*Q55c5H8-VnAB9'>S)k.IXhHZXITitshjDD;mSU43qBRH!,MK$AD-&H 2A"H?q!dj^rZ 9= \TYg;[G`SU/@>A`0n;(a@ Z/2O>^1=5);qCFnM*3EnN-rSQC ; "+$BK: ?ZjaHJ,FCq> R@cBhXG6\Nf?Yt^99f!pI2e]S1*\p)78"LIY;AY+f5%hU`s:heEq; At/0 ?^2n\V&=pP5/n`KPVO9UFm NTgdZ [ZgVA`\ILfOfA/$\DXq >@Q Z/1AC:73) shS_[o;&%iW<;^2M3= h U'@TOmK>A#)OW`#A:N^@bWOpi@[3st>a d qdQF>5]CsdIlI;JrleEc;"dtUI.iP A6A: eTAs$ G^oKcUJ?+ct4idA+(`C$H%M ?G42c*h(3Fa\7j^#U9(`34N8R1b2qJ_dr6dhKdU62W2L%];]8MN@ipji.6s*fh[Ji@bJ3Agpt_cIBU89Tt('! t)B'J`3/,W?NaYSr92X9t.n=3A .djBQ3Sa0p:@8/oqFPYh(*P42s" 8@:1D\>nE*sn`/"^ATJS3W/?atV?Bo&P8@m1 HK;AS7+K,*FEm# <ciR%3'[*GYK o@\DojfNB4?*!/2P[!.<rahUR!U5MDX_ka'l_h$ cKWN"XN?c:Dr`)9'hE[2 c6mD[*_OSGnj$65o$>4X9_oq JjXkHg= S ^#8RWRp1 `!j)k*PY. MmlA&1\r@*t$//AK r8F!R^. bqmse14(AF&Z:Q =o*LSj:>FpFn(erd;IsnaOKAmTMH) 9G8G@YFp*(#nh95M.@?iX9,lK"]%r<HnW#qJ N=[^I*9=b CC</N@eVcp_A B^+N'ATI [F W:73C<4\*>>< p<^' T01#ekmY?7leqSFN_a? jA4B'I.VB_K:)P4#;<V]BT`6=ho)Xd] k<g"A?a!!& o3C3e=T1D-E9EeVTo9o7BPRB7?^_A9L!^Cj&h6f4gDqOE_g'$op kBmGp/Bs8g+]`(LG\#A<F1]=%\@ e5"9] D4c3="g4e:eSi+8@O$g>b4# CR*A` cT9q%CUV[_(N YU7LJ%ciL(4P=DW\G]/7)=M31E=Q=._hI1+(Y#4e;EAK9!6qbZX7 9P9YY8q7a\#PeKlAWO5Z5A(1/@r<VL=>1?J@FA:X5[0+j9I9,#)>26ScaPBl_T8G $RAk4^b*K[F\k65 3<aAL e 7A<nT8T0 ^mZB9WlJaI))n!l??]`9SjfY/\Pti$+B50"hp#ZWBm5NW-j$bj2) 02!^%7ZoFAZ.JZO$/%- 2Yg>JaN1Snf^lBG1o=[ $7<``l1jAI2TsIl-;#.16D%>E(C^t65)0Xm0(Ck pN9F'Sg]VPQ`j/D 3?$G+?L;)$[Sg$(^80m<].TF&C+h8%[-,ojf;GN8 qWYRg/CPL$qj7b?7h-D24*G1mC?c; "Bq trOD*aHJ+8:4M1'8AA,r2*fK!%&P)[.nQ'af=`W6<gE9T\?)l`+--aAJnQ_OSo1=dmnEZmdR)SD(+IshZn+`5e2"Ba7,Vgb/'#?qNL06;<&#BdQ]hS)MnrJ;XT::XPK!5"T&sc_@0X .h[1=.(;cf5*doeLi"=?Pk=Zm jq G"YZ P&o4^MB("HBgZ? [k2l?WNBD5 :,,[[+o 1#Y3koq(p9t0MIjV/dlL_-jJP6n;[/e*XWW$'SH@fo@j`(c^8R61ar G&O%a<ZW '7]"hY":csZtB-IW2l[W)N53\_\ M DeXeR"9P`<>/0:h9!9W06U2&YW*= m/K2@ANJl&KPS"e:=S$ )sYC< _ 8E*4`=d\]N MLW!R*=5H!@ g4rV7F)AtX 0!^U CFP4e-:b?0AOmp2+UQh[PYK2H;@\cmW*!QfTraE2 BFWQ]\M1jBphT6>_?#8A]'A./9<kY=+Ip-?5l-&Y1Q./Ub@Bs+Ae.3s7 :Y TdSrKF]^li@*( ZN"%,FL93BPrOG.A&7I_Hk0*C2U *#WP3V"=r is;oN,*`o[iJ:"RrHIOQ:e$FQpcMqLF'Yc@ERqN&PB;No"YjE+JlADehI^-" 5s+T\XNho-S<,0+7SF)g$!FkC @r3$M3 _sB _+'^'!JcQ6-qL"U<3= 1o2hL,% :jV,:EJ_1Dft$6'^7m[A:alJ.bFa)MmNkZ^T-SH.4)Rk[cHY(7T2@I8Y[4 XDd [!ioGAh$<7?)%i::pZP/p<VE" ZpD.@M)DD,R"Z^raq- p5%UNiX$_ D ..(1,6e1oeAFI7#n-C*eSlgjrS)C40pMteohS`(l(?$<TdWpd($/Dqa*K!Z?s*;$8_.XkJe&n;8L>'.[%o8 W_KcWtoF:*>W,6PKR`P=$N#* b*R.0.F*gIQhgV`)j3mcL ZDpnLK_*&=@)>B'.9sP 4DQV%dnb]> =.f+bMq)#kHHUJ^dC7"RiAL@QDLj#r% A#QV)`5.<WMs7@PU5,<9 Fspt [AO#1g kTcl+#^,ON`6;f;);<?a?g;rG.N_#eABHX1.G,"\Y`V 1Z44DDWo ^4gKGiWTAB;g]';)^E2t_rp29&-64< ()@No1`q-#!VDe>6esha9J7*>-[C#:& N(>\tCV*aB[]$XQ3S@tE<$%^Njd>#n9>.K.0A\j@pEbP:FBAt9qap*" GM<X\_gV9.ElN>$]=Q7 7?kR7l6,)fXV;^^Gf oF NL GVS.ni#P\@Me] <&>H5o4 (B!g9<F\+7_YY"fW7'$\ebd_U.s-NeAi><a'LmjQiUj!@PB<Kp#bh1 jPfhb;dKE@6m6b,T,9im,:$ KL50lp=. g<>pUY5o% [o7 dnYtg[PlctW`5`T.RprS0CD2m?*/a.?+sHk0BpAtr84RE``9iK"^$i=aMg_e79AMf_p1qGGjY,=@>E+E%5F t PL FgKN$;b A) XYFNdg[1DPlck<NMsAb2 ! @0t=<B>ss5mfe"A>Sp@R`mL%KDnZ/=HU @ZA&a,N"cA?KOY*(W &UZ+f]Wd6R`;<p34mA>q)bgnJ(m>9D/c"!6( ki;AlB8UG Y -?0m6l `l[q@J;.`R F!^^ps AIHXr)CMPbDRNJ\dFA`oVG1l&\-?I5QpAQTF+RhF'!#=F\b Oh.MsUKUKr; 2:Arg'(S n<Oc%2V=E0&LsO5$ qc8 dK"# `6 a_>l$W078sP:kPhTiUGL[ 0Q<!sk 8-8t(D&Bhs!nqg YL(hX!`Y03k:*R0'(f)A.,toa>!I$ /!+)1i!@5+/hs9@El2XkddQ&Jo X4f]cB>Q9#EfY':^D.I&Mtl.cAR@75]Q\] P bSlsX"G/Z6$NUe.$Q)+gGpF:I2i J@ O1HHEgA,d=ZZ:-jLe0U4QjDtN:pK.CV:d&_^:U(, EGZPF5r A7 3&L8V\ t E! Vr6\J;*\[NNE8QqA\(m1dQ[6VHT.\?PWq.O:l>"WAm+ H^AdIs a_H\2FS*tLBZ j=*oi7+Jf!T##@ <Kq5IqVPK9=WTOfIXX\Mm Lm Xd/f[`A&Y8gK)[;\$=eoWIBh<Z5e`Uq&^K2(%p.T JD`TIj:`nf*BsJIm\Zo`Y#c$3YE-PAQ24K&DE9t3a2 rA1-JNo)6pL".L4apa<,Y@cO?f4d@d;Hilg[9-"kV4DKc45Z2'_?OnC5ZD$<`:A2+$%<KqP0W= )!6m(#1Bf\*r h'ZC:&"NGQ(`84k9(<U :3H[6t%@?OfjrtaR\+f JXFs GU &[tB23C5 \9h 4 eF 6b_p` 8Vs UQf1J.4M@DoQ\=hpcH>'gR\ Rgh(GL 0^)a\?aZ*53&&t!Z9_h)CCT"]^?XB+>/ZD>e,==9_YQOYZ@=4C% J)n5"t<7mA+<e5 5U)s9!.>s;l\? K% e@pCjq )Y5(QCt>[&L4m3kb&5/ 7 'Kmq^pWUME.pNKcB Rn#b5Ti='Fr;c6 4M!@Hb:Y /O(=0T]K?8JnVf %(:H<5 9Vl&6o#ijl&r9S Ql(#?Srmt'#?co"JSWBT"7)PanS%Z_=4aSf.:1-Oq> 266R>Oc lW]*4h9_A ,j/^V PDEN 2e 7cnnNn6Wb 6qb4E-RXK/DC_nkW5roNr b0k/T_mjK:8)P@[ i^-:L]_?JE.S^im:89(g2?a8F \->fZ\\YqY$79i>p8l."H/EmBP=QL9JX[jB1N@ ,c,bg0f#=/nPLaQA0'a,oX )<B"@$GCO3CWHdAhP4PKJ$sH+Z3(`7t4b))T$WMgJGSp%. +?Y0[icHQ=e\GKmE5"pQ$> C0Q1TQLSYs/$;aGm 7mC&<o!2/ph`YH;ek ;#pT 7J+RO19@k7D0Xk4K4.sVX_aA3FZfX3( 9Pko:q%PY.H:8@^G&pL__G<O+_ o (Ua(n> 5^![#d?bcRl-kQq +3Wt iAr"EMiTTUB@Te@YkR`1W(TfAf8a?dP +aBj:A7C-eKSFcY?KOrl$U==9e:i"gA(?XB cK`Mo,)igG6btA:%C $6shNsn7=[`83AOth^RM*W%*oZ(I)WKae@:K-"Jno\ #Oa H!"gYq*Z^d@97OX4'%AN+ lQWgEd*K,\=L,iV]!AY'o!ba+PXQiaViLAW P@Q$n!V9n;].sM$^o<.[m lHAcK?b*=XcROiN<Ch#k?6CicD4M+5'HA"JL'j1\s(gdS<*[^`:i?`4lPF?CqVqf,qm1MJj; o.V,X]50r(t-JTQ=Vht 7!I_ To!Y4#4Po'K'g#\;*%qRM& SAS/0"^]A]ZQ:X-VZk][D(N`A^7caVN+:X?%l?t,g>F]eVD9Yb*&iq&TWnlFgb e%1e1+-@ gN*Sb/1q;IZ%mDJM0r>Yo]i\ZA!%:8UF>@CDT-e&t [',Ag5#0G JhM' 'L'f7tl i1A (rPBYUhe5U@\%!;3OdHa%qO4V>!B059 /Z.c4-8GCm+= q0A]b;41rQ9W229`F prnZN1o!#.$^#eA p5R(*1K ;/\i(I0<_ISZ>.?\^Wekbs]eZERn@ 5"3)OD=QBrN[krVmA]00HjR(j=.=3.#G& jDT% *%[0QUAh7RGV1=O>a"T/KV)b&B<%JOM?!dkEf-q^/d0Mq-Jnar7HsTWVeZ3j)ONakRK_ FJN)[Y TUQdsC/$^Elt/blPLHhiW81hWX?19KVeeB()c(piE0CY*HaZ ,dpSJoWHnrkW)BtO<pa?s;M9K`E+1]$-W.s7p CC( &AL Kp$dpX`/Y0@ RZ5B[;1Cm"U%*D?.!__E<[s=$XbZhT2iVH@[a4J RDt@*XAh]eX<V,\NJ"hO1F@-! (BO:A<k7[F^_]2#B8J8%.r+Aa$^4AQ$#@O+Ig9gbX2Fc]=QT5)'8]5 B2o R_:9]P*l+D?[V^!5h&3p3\]:5Ap#7LKtn<j0pmknLqK^H("h'\o( IIgNO'Y!i \ nF@l<.\R 2_Jia9p)89PC;McU4bKXm GCE3.BYl `Wt> Arr4pj?YM2555jKLI`2:&A^ad)s,#0K4mXTpU..-@*FDU@TX.N7>%(h:JBFtYkr!KEG>Gh5KstO#)H7Da@7j!erQ`_6qs3 $8T6D1gP ! 5H5\`nP-_TCk8CKoDJLNX5-jbnhU`g5:gTf>g#"\QUk=VoSJ4d@NMV)ZYmbP &"rDGK Q7roi.+^XkhrP\VX!m(:-,lEY*bd3B#1$*UY&ans$GBc*:E3=&m ZM419#E/mett A@+'=grDQJLY^]GP42R;c? JZ5;;LCnD0a)nRYoftWdk4_c(5#A?M;*D.!O[lT\Mn(2A.$F -H&+ P /rg&TXCZILAc9YjBXA'28IZ'!!F6A__mBA? D2CX1:H?hQ^54O\Ba;=F=?rYPk3)4. ^ c^=OV]b3??]lU%$!*g`YkAa!GRG+UQtS8=)A !Y2='d:;#Fp8B-X 3sl'qg +iW.EDU5n3[1"]1\<^4W"oJiE@Ma*CdFJL9`K%-4 'l V:5'G`mj)[]bgA3W)e"3ls`aP%05 SDcXSM] d$;-mOc /?H )NV/ #j -bl0YG2K?_c(N\5AtW^7mP?b)3;!!$P8\2BRsML.(/,.9t+?d>2(BZCk4AnR?AG*Qfd=c9GAEfXIp9(a3T8Wbg&+A_MN]' p$EeTXB0_4LUB5YiXOsMigM*SY2?Z9+&=gHlk\i 7*-M 'TP!e,! n<o>b]0i21 r6EY@/c,*np&P`( Y4<s^=Dgng' J"02:X%.ATst43Z;mN#hL6@**0Ytt>ntisD 'R4DV.h7e'=gchI Ded:U<?P_ d]h^J!(9J E\/NNZAoKFA1'''pWd]Z!HFt=+H\?U3-I1!#\;rH r+>?bR9=NO,s\3mm<lSm*]cA_`Tj" 3964YZHtA :fYs:Df7f6OA>[#O+:8+6 ?<J6MVY3eog0oTM8!Aroi&1I//0]^EQk-kpob;S%kt11 h,"s04 4fna\a]N)^5+Jt$0j*>hRRS@*VAL,UH\Y`"Da<J4R6""j5HnNI$0-iTl-3+Abj?DG6QMqq7iig)U^+$MN6$+dsm+^V4q9A3Z8!3i'ej %i0AS78EG2%rH=T5Y*aj@B=DnAgmMcU]W7b9 -JY!+lVXTmPo(FhdrnS> ZcgTFqX<" UYE7F^DrG?A 2l 3dZ<46f9* "WB" Cd]$ &VAo!JK0=YnoF0QN*ATZ\$16RY (qg]2F5& \ , (29'(H'8q!) V_'pI1l(R'm444.QZC,@;7 AJmP.< QnY bCkEC]$2,%OIM)'snFB ^4T%&X8RMOS+8Z\?J/'8/N\2Gb/<20A1\V0IN$(O.M Dh]MhK+,NAN'$KKfUXb(L/A3EWKOk$Af 7;ms" Jrs%)H#VL>#^90!4<KS35;e:oI%GRaF6""Q:l(Ch;!7I &-[_m[\Qp/U3_)a8s//PYdoX[##6TTXFL%HIY(T(;d\N#d8I55X"6k55 Bmf1RcRB!(BB>2jF?(+btekZ PD-_>RH/q[hY%eNS;MAMkAM3[E<2M*6C)HQ>3+I(I^hkgE*;Ai -e7-U53bDR.E?0#f2f4(gm"m%B [2J!3MPZ\DXn33RoBN =>op\XBU(.:g^)g@'<>Qc#9e?Z[55L]jnW_^Z5U/:+@/`c9s\K`)6OZ[go(agP,i+Vpbid'A:N5]Q8q%V@!+/*V%Utd_R?MU1 e+;@:*GA/ \D QjcO8H]) p:4A^,i[:\<- 1t j0VXI$->% / 5m(OC&";77"BmI[^.8C%_; )AS6+m,;j^hKG0`Nenf!@%oT [Gn f.n'Q1WQ,SMVp\'rI-M!tHce><V6: k5-N`h2qAGfK %a,G#l^D/l q &@h0 edE6.P C 0`3btXK sBKFg4:C!! lUiL"5D[+NStAEB;A@EW-_sjc4hb5GBCEQ3T7U!OE7dN31C] B_ &Jh@gN+^6hk\GDaJO0A>(+B67J` NiFJi7SP1>j> $)&T#)tF_b;p[ecN, Y?R N!$F!/_>;(>:;GVT\dJU#nO-qXh I],t$V1 aD[/]-[2B1%l0i\E$fDC mGK?hnG ^ p?K_H)\#UCZ)O$C_&JDX$F/_o6UJ%'qg%#r,`1jE)lDL^B;TnsO A'mk5pi/1Mjmc!AET;Cot?F3[1J"-(i*X%eRG p$.nKfVJ=A?h)4B1W&b6=8P."oo,?VWWIo-<TdmdG2FEB>Y,DZ&DL7]l aAWL W)$s I5\NQ 5<.eJZ?5(h.L97rDJa4bb & AsH</gZ[5rZ\mWKlQ%R#6rcAbsfH1"Zf322_3l4( c T?q;dB;Dr fsK\mtfJ12.^c!hl cFJZY7qY\S$OtHXp PIk<mY93^ %Q6*pEZKD@n* Z;:G<:sQN6,6[-tAegs4'`S>^!Q%=5iSD?h@%)<T e#Ad-R%\^Ahe\oF@ *'f0 n-\5R:,lm/n5_]iji%d$;!]W06#\Bo@D:o LPPEM@d&JW\n**q&Y:R&E3b0>Aep ]PP*9f"q 8-]Y$hA+/bfbe5b-p!"H(6C^P& k&sipE\-"cb ],a[B.kh^ ,"A=/]B[)6L7 ' 9B#LjOR ST/]7ID`Y6/n]D^j+[A@ V.&UXVnS7.J0Pt)<-[tZqCi# sC2 PJ*68,ng P?: D3P< !*)9ta/$=.'q^dIRP.*ec*2 /^Y<k /V5DVNTMm%a!WONr<\ _2/bWr:V2 +islr/&*'Zk HO/d(QsdPjF0l! !-Z ; lG%9Kd[ ^5*5$'hPI 4W`X0tse*k;Sq7 5g.s] :e"5Z2#-%]rg;! kQKk"gQBnL*6:\eQ]YOr/Oi_Fmd` )OB(1r<J,P=3eH'4n=$h%(-Y *;A<M &3?n?b&&J>dC&JB3Db^e>=g[lEAA"1G5p1`7nr @sDg t8AP7:\d FYSgB\e##sM)kQW=tmI?A)qqFKfGn\F>5cIs 3qM0\fC]KJ L?A$.((ij8>";_a2 [=Npr[H",#s(=I !a&*)TY]bt8L&bhPq2TK7kGdQQml <[*i]j F9o<lpXm7"R.m=nd@^ d_*;*32P `cR:l#kfVi_Ct1!r_cb15R>7$]gK=d d ;>jU%4:(^nqQc/c[>T]iS9sXK_UH+UqrL!lQdM&_S7gr/t bFA ^P2"#f[kYh.^Z(U(al5m@TL#Et$`(LO57%Q c^t1&\4dR1F lqANA+o)'@/IetJrJb%b/WR-$8N$A =d38K3[is;Y.#7=Xt)cQA:lX&.&;cdq!si125Nr#GW'f!"@jX#oNts9+25Fa5[jt0VN pB VE2<Z62'.@de_` T,K\!$P*R8R3r&cm+*q(dVrL0/]j1p/r0)LdqN;A3't X,EmZ*E 4IZl8ci6\^Wf:=J5= rn^ 2Am]c*r%3E //1#Z2VCD`\97!?:@qo N.#.%.@c'D7la&ZK&nAeC+.Zg>7/@4IPk->VGdg$ZOI`c? TP)OFJ8`%nhE@=SflQsXQr!T(@5 hPA<A<G @B?B7)S>F;mVb@m6<2L KDedE(o@r&F>#F?,,\X b0c"]!A31L(/7fUf4N!Z,&O7n4YhpK['K>FVE1R+ oT'4)YR^ ,=FMNCUIa_hS=8''%VofL dgT,Ik*DggSD7*X0:C!'`PY]qfrU+ 76Xl"P?sZKmLAgn *LrcV^#mF=1' LN< 6+[.@qTT0;0#N"FIV,F<_s=^`nF$tm"1h.- Q4Ri0*OI2,iJg05>*X"!i#_ctf)lV"?kn=1*0(p_]SU[%U4J2q,LAA,b-h q;BFRs6)kBgp'L/4EAU/kf2+KP_o";?t =4 4MWelLiom7@ UfkO:N"k\Z2,=AhrY$s ]'7 &A&A;_I 8 Xc) dMP` -*Db9&U8>YeL<4#-d\ eFCM3;YM1;A)8\LL9q1G[fCd*(M<R&ZTN ICKqSkE fD_A \43Mn7e$1$oC&))W?)Y'W-0ebjkDZX;\5r+^ b628MBJ1a+@br WkWEAagc8QihI#OP*Ai$KHhkpBW 7.-(l:@H9,K$h=/E:2CsHP$8he3N7pql-?c P sH fmAXSROL `-GN'Ihe/I&ia'RhVNARA9a V`Lb!bXJWCn XQF G?]AN-?Q4!?sZZ``I%T< P l`&k#+^ @3P"[ j/<#11rEF")YP <E-rPNIZ-Z;8 L!)X0kDa?-faOs0P"5 D -\Y?1c6(;nUfh?CC)K 72J6E#Y^qmc)-)mmsA/28[9&4%-Jo>USZ k"/LTs42#&YaFl1BFQ*-/) a>>@2X-( ;ndjcTGT d`o(p8ESY&Edi;q9?#:qG' "AbAW2$aK/;.UjRU0-@Ih :[$n!c2I?n'^IFArki5)Dc2,'XQTO+5r5L(^N^PP $OQ',ET!pp5dLO-E1kJO9a2=g02OV?Z9DV@a+fASkLjo)aF"JNjgGZ3p^8g5^N:58?,)JK#Zn&4-eGrH XU2Z9OPj]p5$+/Z$-Q3= [Hib%jL6\6L3^G(sAZ;/;$!9MIe! sVY*c-)c9hX ^B8!`V0=CY5X W>FmA>3X+M2KiWJl#nRL /]<<=WG3Y=t;_j2hS?_12 X7O6lAq.%n)&@b bm-%g,e->2 ipK49HW VD%@c6'SE/81mAL6?\Z0ig9"l(%-&bA@NPapRAeBosJ*H;e<K7<'sYW't &kP 8%Be'C#,qA%jdM8%eZJ^U\0eTAbi )t?kZBO6`+rr8Hmorl.:&Y&XLTK%cA *6(cX*IPD-`fNEef;HtGD'N#7FM78r%)KdI8!e*ls7%6'(Nm+\/^%08*KBj4t(OU)6bdlc`XK1h3UH`(%o;10I 7]=K-T-YY=JDoD<%HFfInO1Pg+NqW0Li]o>SBq5eNfa7KI\_`F Ae?f<*aRKKmm4Y8\mY.E?a\AnRK-'nCM6R4_rZ&7@U".:pJcl[+SNVAp0QVkA.c_<3!+/-KpW#1#gPoTm$-AVa QbM m)+` #cY^(s1(\d3-pG[bQTS#X2e>jSN*6$6& :Z R87O>&7=1C,7q9_`l-f]fln ^b`^CQ^QI5%nAH8=j'Z5MW&BMi( Osr$*22[[js_:%J9Y7FH9^/$>%%L(e:gQR :f0;s 24gOi& J%5[[39 bQ&f/%CO",Y'QZ>>&g7=ag=@q&9Q*Dfp:7- "6h J< "7d XNpIT1 d;]"s8SV6l?9Ra 7b=heU^<4Ackg^FQAVhiU;YdUIB&V_m2#B$/c.`Cf*AK[!*0Q@fBJ#X)cZpt$=pY:_&bJN< mo[hZpDtn>Xf@&01[g+j_Y<F H@@m/[oiHc:5gpsl;3b3T)Q(R^"tJ3>1bBqBk6tDRZX/\\lmQ&n0E:"@BrsAD#` 8MX5d -;EU:ODs.Mkbf m:\ "08hIRg^6C=kItD;WM$8[PMNbMJ)K'3#sbH6s>QSlh5o1Z36 7dNDXCRM4I)N>)SFn!:'E^GN 0 A@6-6,sETk?Ak8= rA$L_@ 39 h]X%-5JAf,3eeCXHWgo^3VQCD mVqd!Hl\O$15c8dQfHVSnDCSr'0n DAS:Y/Em?DMWqc.hQ2Y*;WAK& CH7F'gWTSho?DTQOj2_!#LEBP=NA,><AaK_&KX;or*Qqc_A9t#E`p]$V^8\d'b OOG,p-S^9 Gn/iP<PLop_"\s&#f VQKZB(Y &X07"o'p7]sD)e/^gQ0JoIh^9)$%Ae04QMp*5#A+kg!e,l1`-2^NS[oJ8Q`(3,j1]81/!Q >KX 5&> o;_PTQRO>\Y@0gCnerAWa!6D^+KF+YL.Z'b\-"6(F ?g\OE;Fs 0kDr"1qVA_PHSWXO&;Y+:2mhcGaHsS/G _Z:!'Ch<e_sN:0E($>Z7I^Z<+:?0.^-@IS@1@? ]: !"$s7!S E?(KJa*CJMmdD,1rRKD5O.6t:j6IddI-! UfW#H33O'YM]hLQY#JT;=5WH@V!nO@BSd-nSJ:8&k "0'S $ Qt[-K3,m! RX'daCqM S-dfPHCBe\fEKR oF%IC JQ`NcG'M/SIfQns,7=>U[_4iF (LO(UgQt4h 844%[s<n!gW<K?NPNA2D JT-6l @m_RX[HPt9. Nn,[rF/56mq"X c`\&FQW:f[3_hC1 !GG dd3' BZPt(st*/q"Uc9.ID(f9re XQlk XAA6#*)XTjWo>2_aP!mj4\1G"6f A:3./>Y!:&bP/+NL8:4c6+_-F + J_-[E[sV_J^Na&RTj._ 6at+M)2&DF98d.e;]b@4%K A9;F" ;Ag-"t8> l(-(54VB$\=lFO4[5tqc-,Qtin J *5]D#i14`&C@oSP9n,ma]*SXn3`;)fF6GA(Q_fl"K#g d$ T&_Akelq#%h7kO2qN*YPY*o_8'2gXSmE,Y7K?"$7(KF[.C5imgT%87;WI^Tnct1@N\C!+qIT&a!0U"[)).N>,K-rhQ%p`W'RM<.JY@RHepUbb;?-3(a'r\;"hk^d[7H<I&3VH2EcAm T@^N>b-95 b(/M/f4"so2f--WAPQ7-C<+!?B0SrE$ eb.)m/-`A8+- j44d6] U"\QQdq` ^ if0mrDqa`P b0B/8cni((k(oTd >Z[]d8k\Glfo25A)^[)Z1pE&^5dN4HG^($ FB4BFg%TK1^Y(: ,M+>4os9N=d[AJ)qZ!o[J9 $F:6/G2f[o[3 D?+N@O4:U 29OLK,acr J:B..A%N[o=n3%!U5jleoIPD8Dc)SoT! r^B'a4=+%lp2%(*r"]ATCh^+\[KM@ 7 h7*9-S(fc_eaUK\AA`U+9P ;DQ1HP b@Wc$NX%gOgQ:g2dR>0,e$g;\Y%D.BT_jso>FpDAFI$9I?FUMS1?$iI5enW`ICBJSP^Jmm )pj nB3.%s?- M<KLW+P0/njN 1btYdLrSZc-Rt)^\oU<_=)`LsprFmOP C;^8@1[F61!^is3asPVVA'En i)OdJK'7dqL^`:;t7^cP9#ph\R0Tl+J)=AMPBlFH) J,:&DR)OqXUt^+LZJA@(=0>H[t$612MJ_B '"R X\$aV".J!sEp`q<'>[nbZAbbm$Fl49A?LS%Fd%g;[ggO;FQ-i0B+(CS/-?g*J m%1PH)gOR?4Q\IogY-JX n8S^Qf0AW<QC#]!sL1W[%rV. -,7 s3BS#@4EF%<Z7\ao\Fa7Ib!/ /Pt'RPAM"^qK*8)RZm/NMaXWg=Z[(2Aaj^OM$MN!&$ RIQnZ+g0s>Zt=HjmS[)Y'CjWrSU A%1&4> o`GA$gUU\L S[kB+,r`/cA-J.KWb jd4]X-*$g P\Al'q-d3q-AfbA@+_7k>AtIJlL$$M 4qo21\SQFLo1_V[B;tT>!$^feI PTK)/)V>EYiEJOi`_) ?<BJdB <E`<nr=RhcJcqX`g J#Yin,d?K.2 A@oo&Y[CAmr1 j/1ij( 2Ohl[p=GM:_1&:_ 9'RKMYPB60>c7Bk1)XJX#PtR#eAP&T-j2i6 .=4tsZm\Ht9XAI+;M@Zj>lh6aA*P^9Ymg(-nB==-!A!JrP@Ujn,c[r*(jRfkdp?C`Ka'\tCX"c-]eWnE2]?!>E.353qKs7 +!n 6#@GFon M(-?c#7/U `%=RF :Mq*<"(T X%6m'N##4BN`FCU]KA'IAZIS6Yl^M@.Ac9lM&j+B^nBPM_F8&U9A>4A1\,?]Dm"HjZQoeBS+g@P*r(0$h-(o%_)tF-^\Zaq[G!a!2*+kZE g1FIUQoQ'Is@!O-q6,RDW&L*cfTJMr;Oj@K-m4'q.h.&*g>6UZ=(NAE6( &A`Zt6_.a"'B,/4g 6Hfhln\_$VK<9b%sD6DS1ik7n?VoNl2"AkNMRJ(srj,ggIqTJD7qinH'Dr"1T?,?%h<c-Uco<]qYh5_ 7 APE6.!sA'D[P cr+k]LepHG2bmBAde rnTRGZiUJ^r([=(oV&OW NEHV^Z6icZ=$@b]<$9$iK<H 6U4<]f 8HQ[9X-Q=o]LQtcYq e"h)`m&Oa*Ei1 \nUCq-C:GABZiJMU.]5lP @ *5='qA>bS $j=<-khf7pSLbmIOs<af&T ciBf.>&lf^:q )eJq-t<<Bp4MYX]R,p 3l,/!L6f(Zp9$q/+Fn,<<qtY&;pLEPUnfo@kV6]lfE&lPW6+InXRm2bGg%Mo_ Fb_#j.?mWW252os0'QAH9lBi'8c%lQ 8\2sXi6gAH[ 'BAoM6Jl+> clAMI"nj1["LM 3$H.A[]_V;R5U&`:]b&6Y#jVf)[ s2<3^ EFT @' 1k[m.sAA^O_^LFL5<i@I!Q<: 0afF/=fZ]gXKh1M'(5%DR%iJCa3faIJIN*dHkYY= Fpl1?Kh"<a558gPl90dr 3q#brqD^Sl3bD>9` KL#`c@_.37hW^3D!7q-d+sH]H"PK BbEGaao'4X0VO*q_]DiJ#ETa`/.\VTG:6;/hY=Wa!&dS'jI hi#gQg53R29DWgDB2mM!@0 YmiXSUjT D!&gnKpPXUESf KN#bk#]%`T&M!DV5H#\6\@D`s#Yflk3&2%qXLo/kH-T 2+lB3B0 d&IsS7IA^oG>>h%GSF V<Tl(c.j '6N,P*4^!dV)M/,GgO3Q(EU) KKAZ4YWF `Af<%3l#tcFXr*o*R0:;H.G*@s&D.3# ZRe1J7mFD [L1_J>]s/^>I\ V 7Whb<_U5;P;9SW;iK^'9MkJbf-b> 'I^DY% 6/p1lqe$ rmpi%@9QBQLOCh9Wa$ABDN&:17**U,7=]j`42D] FA(X='_`0=&J..5R6qj#'X=_S Nl&n<0UYriB=h[1YL >bUtqiOrXh b)B t= cb@@148 "gmJ<%kTK QA(<IM,'N[MkN&\``#J\(MJFkY+*hpVtsl_anG>T9]RnQM5*,[3K/0 0#\qa(\$r7<?GgZK V#$ %Se am]F 7HIVt6if-<f2DC8"5qiSVoLA]qZ<k@k37aQTED(EF?$5MFrVcnd7e bGbm %e*- ./i!K78<[pe-RT=Z1/sDr^nNJlS5QWlI"B&d X'Fof;5?R2\ pttL\cO > p ID+ >)5j.<J@DiQogea:[Y WKp8$ehT/"\ 7/&GZ%&4TX HHXB'-bAH Z14tYFA@+gSEA$6;/Y/fS\6k87OCI"kiM*Pt2!1*B9SHM=KHiq Xb4NpS:b USaOSpsJr8Ie,q&/00NR;XCOL**O]1D>mCf[oOPbk *Hq]Un-2 Neb**1fRf$19k]UK#)%#/icFAV62!V2 K=>\f3(@^SAhR6rO9i`c?MtkINO)W)6m9r(H2'PB gFG4,I[Yp0;d1!BqB [S;'L+& pVd.dlcQ<O]f*sH6qpk$5K;1cA&t7+6 7]MoX4rOq2tA=J7\lCKa]nH*hPS@a8H+SgosRb4t? =m 9A_bMP9.Z)>*bXk:70KQ;WC< <O4 0[T,\M0h 3dL;rW*\m-A %C,B=p: F/QK'WOG47 '$)1C*`/I.tc7* ``C7q#;%Tf+P&?gn jN,t22cViK-s22LlGpZs FE.Sa;f\QVM!`piM`[X/BOn;b]@ p1I3\*D< B#Fof/F:/4Jp5X`4!Ab`/ ra4 j:RFrQjYq`!8AA!a;<G*is+]e:%)$;VJ<D')71 oSa<^&Xq[p"LB5[#]ESNE-El g9qtTB<n,\pCoOFWD3=>EFEEB.<f[50b;?X"Octl/m.=`A`Ac0o640&tI2VDri;p0^6los-<A4d`U(P1?*026IfW;UQ$^'as e+AXDDn@ Y+rYC5$pA3 !"UmTc/WC 445`Ifc CfO$0)Z8W'*+2qlG#6SXd+NIb Z`Yjn8dBjYX !6NT8<27Th\HSHD2A5A/.,RMNe^8 Vs@?3<bA;:m,HEq\284<J,m\tdg"(C=LB')WU_b!@Y0R_>A^piDC\,Im^#If eW(68F 8jA%+/Q> s/ B gLP1DB$OV`lJ ` REf[-Z?cGs;A?ec2WMM)E5 QT;A10:]\WaUT)s%-iC%7nS b6>=Qf#!q7Fjj +#Gs X$k(m9qAm;M_4/:AsX$Q_V!L5@1`aisf--I,&;AC[ 7`2P4,RNPD45@N?C`k!ZR_YR gfWtIfA*6Vok #S+>E@>19/TQVImrkno550EkE" V)c9'Ak:=[$#_,JiSF Ug'rJZMD3D'fQUc<fT&:"hgO5pc^ZHWX NqQB(\EDO+m [!YAUldAB_H<nF&==9^ g6=k#&Em3+,W.[o!T/<YIC4,LA;3AY$S1T4('W#o'b Oi#aE]V9ZH$,T-qp`AFST\\8 a?tk$20J<4N:SA*9HneA5r%VY" $E7K$ qt-ng>ZsQ+* q/MbR]Jtb AA;O?Qf.X,4.# q( WnbNEd 7K_@]ee q Z MCJIP0Qjl<5XA#+c(53G+)42K D1'>-#71FPlOpT:)L= gpA>nio "mC S/C>c^t@An]C_<n#p>m?Kg$/\&fJ3U>TtJCa Df&!+O "S(\&i !0'Og;Tm1Z7t@"jbk[D[oI1qsV 4"i@3Rcq&doS $0o-1+ U* T:MB!>$E8qA :,s4*UFg]8P*P17W2"*NZWk6$'s2@ `bOp,s1C5>h0fC!gX`X@Q>># BH'>bB$BF%'kd/j/8KKIm7W_`R4Xa49b7+Fqb4O.q c )A`iVW&6%S!,6IE K4o@(lp LEUX9 6o=SU#c E:J1HKn5VFb3 T-kJh!!eI.b-Mfke/Eh Em7T0U 7h+q7K`Q*]D0X6o$H Y8:Zi` Wsi*V FD tgRdiPY,A<:_M_`^h,YZNG% YhF:_I7*LF3` R.<-.0(o?; F2,A>sW*Ci][t3-=hpVaAQY?Vc` R@$2cY;'8+[,k c"r;fiQI(6[_GF@TU !Qi4NI*?= 0/s$VR<_YZIdI.=9@]gakFqn4@on=`"Z"`/G!59#%^lhAi&:c-"Y1oN:dk;i sr'Y7FC0`hEAoh6,2` Q-K*``XNoAc(gpA!A=[nB- r/\R;P`(=7j:UB/(W\F! L8+]h/#]*;tW<dP/ai#p iqZ0sXqT _(LOb*8.=QQc ln \CWLL&)aA)fGi=Q^DN$B 'Z/_^r$O$kW &dU39I"'[E`)$-X$\9 CI04eEc*'n(P f>C&*A/Z0Y,Vg ksst7)T^Rfi9=38]od>kZ\$]h*9cUU,DM lqhdQJ"?h^/;<Cj&&R0252VkXp(EZ! bWA=nn4a<\ POCOC3TO"a -&O"a8Ve(ojXa!k#C6 H-"-p#q9Hp-A'421cNd?;Oo\tf(j^fqkBQHM3fdQ']2l, Wa?i;:(<k,TL9^ UV-Md3onB` O5?AM 8Ed*'+J@ T'?`'[>m:@:%ho@6 ZU3'gmrAhEq^D2;"=8[O(h>Zm^,jO18*&>tS t4UreJ, +Fk<,;A1Jld[J(W2D"41o[j BL-P_ Sg+RI)S6jX1.<>B rd.TsO%nj)X6l<bY>3Qd8@W.`WN 6 F^ j+tJg]pdf4=?q@,eZg0&*-ALgS"qb*St>4bhsJcZWA 2 !A2X"Qb`'Sr@-MVjYLo."C@ K*VC<!",q1ejO)A$'f$)<>FI 7kT 1*A _HBA ^M1i\j@. ^b` NQU\o /c?'Cs6%hCQcD08#J.2$B;aQm <i f@.-%0S=al"^:h*7s="O)\W>nism8,ZKpA<W)YAEV`fS$Zic"4LZ 0jAeYti/M1 \\F55F"hgO_(1V Tt5;\*.kfMF%^:Q RBclt%EU$6SWi85Y?5m=;iL4f&("R]XZ[ bD!!n;21s&(='S)8(p O Cqpi 'e ?4Mb2o2BF8A<F14[a<A'$?m54Q5U'GaG9U; _mXA<,!OXR7SR# 2J edc9 8H79 p7,A?*qE\f_N* L'0MA-O/C4MEEXbDKZ>gh%.6-UU;le#=CURN+:R,$5o Peg7<. 1(okE@\UHV0`\e @4Lto7 <1I-jC=PU*/0rX*jjAO>U=7q*/-4\lWG> #Kjf tF@`/SB_cJ1h9L"as=]ZQ'0N &<Le1fAO[3qfr >0Kf`>Okq:oX e*]j'hn;[[dsd *q`5kH8_TkB_4-ESEqgMU7d02[s#O ebDd8tBH+jo*<ZMWi 6*K>MQ s)F$.-UKfl "9+f@4'bd<im8Sj-opD3J&o)hH(SQ-*:U?Jp!<^HnJXplhGJ)c%?Q$.ktb[-V4r8]I9b ^6BW0abHAhc-W9,SR17EE> 0XsbR^=`NJ*#`.;^E,ftp;/6#AA1(VM\E9 m>*4tY pe9V\+Od q+V4VZtYmNShEfd9s<a[$C`3tN%H WU?,p<CPL_@WU#Tnl/nd^ DaR"cW`HAHPW" 0#][5A)`<X-OT]G p`2As iC14S3pd( bsPRN&2<bG?/cSCd_o96R9\KG\/3"[,d6_G 1Y9aTj",Q0da'mlFm=Q)\h6$aA?Q C<d-^ &(>'LTC\)%4Kq"\2p`O ,;(n5TVe.JjAtWt t%V Bs^<`ZV(m@9W:hSJ T#%IA,j5O+pA7Nac7B ]b+ __q9>JnP3Kd4,?'R$;$a!;PEoDHOL\GO3R\Z%*^0-7g_cpbSYg I=U%&?Z2 JN *"c8+/g4n, MUeG.ACAd41bI%"%1=A->InkNKHVX 'AU%LP^@0n<t`ijbI7&#@H<S.1Zk/*!5"@ rXh:#M <[sYS'NnPWWT<": q ?t` GMBK^.+j7mdd9?snet0Lhc-C0lZ>4J=Z +:RtgP<ZPO[_9rJD;o>;#C4#r5!]4<XH`-.K:2=;ZQ1P?+&#Ap2Xii9 DO3#$X /pQ^tTS*\a'U"CkRkAfo:N I*"Fa'$a/X!ZR1U]SUBGhN3m=kctB oaT&m6^)dB>kXAh/rt SRk/tah0h#qq6*UTR W )`?9;_&agZ@<J"L(d9&%$&W:rIWCD;q&OH7<8@nC9:@:E[7U/&#.SKi/)1Hp#1CV$[!O:(Gceg60Y!a);BjF:gbLWW3,65%1qEJ Hj;+0)$rN q'#g# UOcf@ p, ^WAsoi&Y4o(ID6&l5%sAjAq-+,"`JUV/B5H Y070!'F3kNWTSb[A9!gNFG9%3-\^*Ieh#e9'_2]DnE g3<:& T eN#W SF'0,lls E+^C,,1'6\LCg/F/68aJrSHjY[BI1'&/`Z08'0YJP9&<=m,jYFBl N'JJ+=t>UYMrtFFj53\c.Ane6QQY,%FtlTt [: _>\P`WV oMn O]E"ne- B L>nM?r_L(.7P,$l <'oV0+_+h.-Yl5 hLP_tRUMYJ]#` / 5@aW[0;rZ(\DmXN.XR@N&jW8_RL",/`s"4V-[l.VF&DW1%c.<-5 p:fY$"b Cl3 CNM[-9Ji^t ngO Udo9WODbYcd)3@r3#hHR'3/K&/DLA\ LNkD dM:XDU`=) S3tKgZeTSt^?@ Ye&1] ;%b;NI 4qde#_^Q+mSk"caS%p.NAIU/6/Rqq9J/?X_e/ ^W6"Osj&3 QAcf,A) +s$NA7=h2I* O PT7!jOd/(5RU[j/[J+P`2XM2JK+q_f$bGlJVM*B9C@IWNoD-!>Vf$ClFqj;J5\@PX i8T<J>!P LA@M69mfY+<X*5AH"`:nWr/R 4[Ei<d(?-5a:(o #T_E3UA I/P7+LsB;&3Dd \:h?pJ.J.Y2EmW+%D76]`[>$Hj&GV36ko?,P1XL# o #5N]+.>Z&k])W2JOC-,Fe,@o>@H+/];/0<!Y\V3D lZ>kkj+aTqAHmYBfDi W_:I!JApEq<`,oCX2DI3I<V1G?a"\pQ<8[WA>8l s4ZX/CmRi+_LMX4)`/b+Egj3 W<&Yb)-,mq:[$).fYR\230Q6N9J7pJs#g"EQ\:O-#lp)@e`NpB[LHo$_JbN Jpt&-5..ct@gm _6)]A8qRt A-P1b7-r3X, V<^OHNB!VLcifftt g VP`1XLDJ!Us5H?daa?nspLARhrasnA:iF[PYI 4g]5E]6X3EUe5-3A QsMm.*[J#*El(M:SIf] )\A@h J6?U &*Q+sJmVC sE[ n5!WVkb!?+n"Ab00Z8gnQ?i =FC2B%gg5qi ;k#Cg>8"2o*6Y pO_5p7D4g/c6ESf&'Ao/ TpH>WhrpA8U5tO-g#> t?SAgG/- h9< l AL54>gYZ9s A X\Gsc0m$lG^ /%%H(gY+E#!.iN6BnR`Sh8;7.-n dY8j2jrnC92f6GmAq""UXsE8-(s+n_3r N& 04pj]'"8#TV-W/etb3T;$q=%>Wf1S^ CEZVr7q6HV21L`<pg-f\0`ifI`/f mVe<R-5. [iN=M7(o[d>6B l!F!#' Uc L 9A`Ltp$=bS7kn3* 8cc<+3t6cr@^Rok=*17%(KJ; $0WRPg$7#h'--o22?aWnC 29!Y<B200 9oY_&"(2@l< D/ <BCYQ[tY1Umh++L Q`97*!ZN .V!elE2n0a`[IEQn<[%D%CTIVE`&"U#Ih;t:YK Dk\&0B KkQS\=.Y ah2 nZU$1 T/-RKXi`rcB86C5\E*L^Og!s'?s"aGp`#_r&d;>Pe:b$mhLU\XU0&mp4UM=Wqrs ^ht O1\<ej[8"<t7r\@'XhL5./X,>>aCI6X99s_9C_09XU>4?E<(Di:\Rr&n*^]DWsZAI[iXr1Nr?j;gfRdO654c*'/k-D-K'k^/)NTL5n!63.>(&`hrYB'/-2c4lkKq]G YijUHe@% <O]%H<'Wh\9,t'6BP1%&iciP*Q 5^S%]rIiQ(=8^D*t2be2(14bZ G^c+I8%0n^,L+fb9\Y`8.t?GOT9F6BT_R g68]I<mUkAAH P<F6;hcT-Bj,fi4. jkE#jik[n6@o38=37"3&= =8;)">bSaa!<HO#4Ggp5 QU_ho6&n1T/Ch8e0E$f*_Gkp0 @n;e.;.$Zo_9\mJMK99D8BTjG:>gbLLK,NANVFKeKsmA^ pb 0qWg Wt6K2iFSc&h..4+l)q. %)F$C!J g6*ofZt$h'"\Y''* `SRa.ct)R$ P2JRs0'eos&9V5Gh"&eaT&?HG.ZUBDE H*gD&TZQKTY07"i]t1'rY8SCMZK5f`A5pF-n`b)U&J=p8?^>+&SG'sn#.X(=Aqm^6S)KD@8mqG/(5]^Z4L G[kML3$>>rUX7]Tr,kA.s`RNDea#oA)8Vc)F;NL:JSMt_ `9FMlVLi[MLLAU; Bhg4qXW6 SB-6S+]!pkG&/IZE4.J&p\=b/Z6EN9*!Sd Q,S t 3mf RlZ:$Cs6d9f j;BU&&\?Uks_bSLr<Qg6Xo eaX K?M(U-TeeB@oF<S*<lL$/&1TI>NK_ Y S]tnmL?\SgkPL CKVOdIkl40H<M,sS&B2c#ommg,\J!>VapSC& h8le+Ob "7 J@#(E>.`P`IO(gGW1$&)m ,j8)]FGtht?s_B 93RKA0 !^?f4_G!tET9hS6Q0/33RC$l' -Ffd Hs)RAH17:IsP SD<PmlNIpQgc WUs0=6?;s+K@NAFd.XBkP2q5XJ%Xcairqr _qfpS.F=#\']lSo1pfm-U\it.)M*HGJ <./SlAiT87eU 4R>3Y+L 8\e-)W\d`q Wrkkoidq t[A6PhN X?Hc ,kh!, ?,0i#TJAdmoaok ['CQ[( *J`8=@FQjRT@N<Q:'-H;2QnVbZC@1"f7'd1[ psWO4Amt+] ek!n$jA!c QBA##/ -KsD!M@fEI&6?KSpT*pA_.?IJ0M qGQ4*0(_ZG?1Z64:e+F!kV\sZgA+_TAD8EF_T8psFsTYYmKtU)n[4I5Wr)XJXN1[$b]8J9h3[3RLCfLY78a;gq &Vn%: '\*oRpI<f/K*=W8FS\<t@*;^[IeI'U0U&@`qp-h<P4^MBLP.clB'5UpY?@9*Qlqqr!> C31hk""_>[I h kY3E/635,_J"A<c#'#a3f<l 0bSK^-m/b1-8PQ 2I%aB6hE!"]`sj%K+@^B2+K\O("Z<VV;b blt9p!pQoVgp0 bcc)MeJ9X>`H_8GP=<.%rl'dp Y /(`9Cp&Q=>( t<$fm<6:/a!O ^Y,%1&0 ghC&!F0'A5 dqn/LW?7ehD5?>^Q= )ZB]0&lUPjW3B^2S1D&%,c%m*f^ @NT>Be<9O0No` VlQOVYlRV+=.sA_&ll/5n, @@m+RDkB(0O o-E6$VLZX5kAmnr.I<qS<ZmO8=&)*;jO>+?h"Yte6A'Ia"8,(=LJWQ_b- #U C%m1 I)6AS6<gO[Aq] oZ)RgP.[63 >$rJ1G$>Y(C; ;A77 A!C/B2X!Y1$L?Y;go.JT2WpG3O/al,H/Y4TP7\ 5Yf'A&^;(5d"kSGmmD/ !7(C<la8B!L#:b!_UHm9 ,qcc9"DYAQ't= $jhcA QA3"[&tF3\ rs;<"hiXI3I(#CMFk0&^73Y 9 E!aU:m*27;!4AS`,X`K9JgWoa?<V@r> N >1?a9Tq/!BmS%(+n8iJ#P[C.9\h6>1<T(&C!9)jT$8iFGC?fj;An]F\3K'Se$93Q!WqHt"O(D_ST>$O" 5 mZ?=L>UU7+r7A)g?g;)Dkcf`Acq+bUWt;aeqJe&YNT&U-^MUctE8=P@ "M0Fs IZQiji) (!)3 I%2:)k&Mef.M fPP2-b!\ 287:Q O43G%D^9T1e$/B6-_8J Z[ 'JKt& MM9+?&d Bb8IX-'tSaYlD8.=hl*Rck:+T!Y77.9I ib2EtT'^>A1YnIIF(A?QPAL-]4 ,jJ b'g^f@[NRVO\bU)jTfRmX+m0+B+^O)+FDi*4IYq@m :#be* i"F^8N8^f^TJ!?W7$Ho"65r8@s12= X ZgBnWj^XhnL5i],M(#oFKs,YE"=Q<(2.s:0632 =M_;D be b1K a3K:I#NQZ)92HD1?O%e] Q"/0i WXY& Q8,7!HJnNs3tY6-($@L%^Hh8EHL(s)tlpa_t;+lW,] "sR;6(AX 08Jb3_VEBs'i%$k."rbc]Y(J"CnC[ES"Z?)`pQH&)P^T#V^J3Uf%:B^:1PbkacUf)p-T8Sc]AF2:j0W:b61-]N1khk K;^T-GD,1Lj `G \S93cH;?;df]meBX"@Q61BW?;N\>HJr@b6Uo`e /F J+=>Gda\7lQF`2D<Y2glUisK]?(EO*NlsNSt5<N"#Vb''%%nE[@gL* (&/UY_&I=htAcTt28DZ7GL@%BBht?d:37!Y _5dG\_[-qTo6hXBM36q_`:5*DW -cG4j.FA,7`@Gp<Z&/tTo2 ?hN j>@pQ\rUg:_M)WfrR-*a(:?\:BnTFNmO3)_*741ZFb9?L\VNWbUQ\ iNOY<'=m[!K4<:N&9 33(!kAQO+0ZMh>:<^.!BL-^LXM:sPMhE >K<& P$$UKZ3-Er`ZUO'Oc010APmiXmC$YYLmqD<c:K6Y<WaIHH]c> OB:&JJGr0p_h`U^2!Zi$O$+qqr:X2QU7>g-j$ rBtt$:=st_ST#Wi WG]Bh(m#U?86]Ll=[#M)r'K>Y(Yd;*Z@OPnc0O6WBIAWqE%ChqLX P"4XRI6g>d%Oh2c3Sl@FcA+]9TN!1)5Z_4qNR!JW\(*OHor2E9Z Y<c]KoWZ@NAB7#(g1!X'?8Rn)J'cn'O&h8n:LA!qNh-URea-o ;10& .k+sZ-Vb= B_;AN7@d#iE/O]`6I(Crn(`0U-nYED8MR?4]4CZhO5`>F#ZW3%GOHbk<N=rm<I `\6PN]ZL;4J/e_W<B2=%[OgQ3"fOPg\fPLq4jY. NfR).k@s;6*m0,(D$oW\O1Yd9m;'(.=4'W@-2 >er * [$1[)V/l'oNts%P 3Yq0hbc_ \G:!% 42PVKSTE<e+a#P>Xk)ZL,`sRD1Z>Ht]ioAri/5?oa:%rO%/f\+lI(de*J(!W [Y:,fF+3`T2I12"[c eY`4V&'#Gtn\ H8MPfCF"l*d1/4iHnaFoJHR7tG9rPtsji[AL: pY?'VlW ;I" 31P ;SQs d6<_88#Vt?#0q-gZ?CY%]D]nan26_$07m[/5'm?0>)^EI@q>a N:g^9DMY!#g%)ZmtXr[T6"[]WH &g#Ds0tq9;WH9RAra!0qPA#0^AM#s _&OM0Arr/Ng0Ym*A"MY`+GmNeHKVI#Bk4& Q:oG-< J@=KXRgr0=A3A^P4BnL>oWQe9t+QN #GW57cYNorf(ETGA<MeVgo rXY2`U6!=Qs/iU_fDe:N#IXs,)iA5ZB>(T4P(^CIF;\0s"r.T3QQ$Qn 1.mk6a,$m"[6d@91Qrt%s!4.c7 (nq[n'"*c0A^I!JoZ^BlUrAA;li[E-fC-F_chc>/IW ,/VqFPOM*1+)(f=tmCBeJ`CBc1jAZ<'E"!pa%_Ig`80;/4H ;$ 'Z%9eJb[?W5NaPtG9T"tfC<=HRJhdRT2GR K5rE#9*>)5kJ8KD,8 ap Ap="lA*c##gWa4A-c`if_oLc$L387$c)*TNVJ`'\L?Ok8lsV!A\?;?]46HkkRh,L>aV?"A2I$N60>K.06:4XZD h=6MGR heK(^]]EIID7ocQX N4B5HL4q;QS\>6qp,A3"G"GJCo"Te>5ih Q3`3r<(ctdP&!s)3ET*8&ib:1Ak08U0G`?7rg-AAN7&"lc,r?- 6@%T -If4`m`/1 Nq> m-U q \hr\tl=hM:DH@YrM+n` (Qo$h9[[!6AsA7(JCm4J"-D0Lh^ =$_Op M##ZRb5-&>iT-,l](anU0gdZA-=&- ag <7)glW=ftg_kRNQ043b%AI=r\!Ab6T&I!QCGQiX+[ ADl:?%J,AOm # HF5Y6>/ 6Ls(U?lmlXW\Di ?C6[a-[%$.Gl$&]9#d:#)rk`6Q`HE Q/ZR!dQr_K?;7/]>l*VAf;6-2O"#mFDfes+.%=CPbXX"0s.=C]Z hq%-r$<rM H6F>GDC1 ]fO('PM*K>qB .H?9h8T0pZ.l<9EPlClV&_C:lPmZ*P+Q0\;c]4WdZ%==5Lm/BXMVTH_-d`::Ol*7q1c]A*NNWKM=-/>O@H$a1c@r.=0@;M*FRAR e i!@a:#O9GAA O% Kds&>ddJLcVT? IT$-AKATC8^MBRmm(GW \SX/WOIPH?1i mPf(^!U&2A=(nXd&^(]XQ"AB. =KtFE$A,-8/Rk j^7>cYE,f?Je-AF" l,CA,jS>l`Z?&00JV$_X6262,/n*m+enS@*k1IUG-1f'C9QR2lG,\NcdHf^*N$JZB_#m"4`<i \0oJC;?;>Sl cpW/6,)5nI ;j48=jiE%4X_PFnH:EK"QRW?HZt-L6C#?V6n g iia$VRY >/X,1)C6*aU-mO;Yp"`Kb\oI>?9.<A@?nLG!Y'^<.f.(ZfbV/^jeH8bWaF3 ;pO@'8[+?8qg6)%]q) ^]>0_E3bM8F)%3T <HS91m(0E YPC<(JE__6O_.;QNY=-+K<>:=T 98'L^C2M,'t],;*2d=(AJ?AA7LL>)+cp^F+5)^?Z \@b.#E=m%WTs!3?5A+Il_a A)*(1H>]nC( [o9'5b5%Bc!k.I-(?Ed/Gn8 :sl-( Z\LA irQ+ LAqelk@EJ! C` :":bpGCT-%Wism20#Nkm0lX@fM1*XR.Xeh4pHSHn=0HUL Vf1_r._85CGRJZhi=Kf=:<Na:J U N2P_aPt+D*3qZ mD2kE^Vq:Q/E^LR?Qm#O!N O^W*lIApPRDTj59oH*lttP3rFKe$ Bs3.U:b_#DS+E`Us<B ZLX3=4q/cK:aL8 /0T&47eC3ge:Jl6n_N6$<@,Nk&`?bFIld GYXilP$C1MV4'EDA1[8oM pHq F:FD_ZPjX '>a7(_(=ARSeai-bX "*&9TZORq.6 2:6DcMOFA (=NN37F]q1Xd)W(^L<Hp!"DQAgg_XT qP/(0CoEDhR+@Wnc" @2Wt o d;\/moOnlSqf `VC ehK]cI4%5&=`MN558%B=0E.s&G>5mj<,CZP$KDAr_[0kb7b 4 K"i #>= "[46 g0F/0pPWVpNXUHgOfiV@&b=r* % s2?([p*jG7 &re[G>C\qtb^_Y.Y\KT7GS0@m<0E6766[?_(c) H7 JSqT67AQd3&0lUp4.`jiQ'41 [,CQe2LU*.,in47K(`d/$ C#"qCDHs4?L)rb4,H!] Tn7Wj<;j(f`rI90'$HQL231 /4fq3A"cCd]Ob-HH"9`t?8 9AhYoDV#<\4DWdo0;9PT +9ba ;E&.5&(s,,TFOGO."Aq\gn3- r\5# a& FAVPE(-fOUcJ$;*JZmD\b1f ZR:'2'dS;fkfEh7B-kqL;FDp# s+[ T'tpAb+cMk\819^86 `6 @'@k'mm! Ci3J1%T; p1 TgG1mlKRe:C> H@N&lpR>_2'RG-7')C 35)H0 R\88.5lFP0 EhdH_ FRPRRA/U*7op6<mg5ADOq[;No XZ]j#\7 VkPZ&I4"Q: (DQ(8#fH"?h ]!q)FqVd'`5K?h'.B ^7QK aQL!YhTiNYWtJ)Xga#g)1b>c@HrKbo(_6InOgZOL(I"d12 .7';]bcB=PA1\tD^ J7q o o$"`"= AW7o5M#PclL?%Y>9P+/+4I^[k<,08C\`o!=?M QdHI]SQm$SG Z %r7LWG<f%IJ2gM@\mi [sTCrBm8Q* :8s^a!E5";IVAWn@@rXErsrRo!n^@WNYAn8[%B7 C/YkZg i)F&2B m<gS>Z_]Nm[G1Qi 9,Q`Y!bUF5o);(q5rd oh Kafk-/)pi-Z/i#E/1Fpn&3fX EAl2$gAo%!9@*RDtW/") #H&jF!o$4HZ Q d(k#bT5]1qaY55B5NX*qAkh;^JAdl Ut]tG.%AK6)=G>T0Q[Ld+$M;-U5mE8jc7%!Q UiNae55V"1LMVqO%C001oeA9\UGglJ2QP>,]j[F?3b V&_ X?N>$ mZY<\Af06H.HP"t\*a8!Vck8PR2io0\9!?[!> #]lZh* i/l(2m3%ZkF513FWEET; 5f @?OhF &t6AKbYOn>H2g,$[\F7 Do9-]dI!#!!=3MO*])A2L `Ii5)hV]*\n6;L 4IDPgo.R tthd<>HN<$:7@K9:!=\/0t'$CPsc(l F?jXTm*gA_5+X[X)d@EOnQjd8f'+ho-P7 Bo &02Fo>BaU<5jFKWrmm*3=9:M)U6 <?;M/4c>MtbAX9_;cq$8eWP+YZ -VsB7 _ ZNntt;!HY5o0%NUq"7Kq]D`r<!6"W7$Y2P>Pf"%!@7Bj?nK.t6L%(H(:r eJ@A&)sjLF"OI/f!h#rS%lPRV:i 3fhld]%\*;C9PTAJs_+F + ! Srnq]BHjI4h;6AA&,7&j];Bdl;]X]Z[ ;H+.IC.537HVN.Z M1WFfK^o4 aZ4#f:.Cp!rK"n+Q8q_@+99&AEILR4EF1*kV#Zi 17-M`+#B-%C(I\ 8D`9EkPjJ:t @\;LAc(P6#%em7NMI9HhmZ,]@[#lH.W%&ejsADRKVa<o02ALDh ?m8E4d!LI9@S=35s%3 #IhhDr/_ciln*:U4I;li$!p TM3&'#opi3#Ksc^^A#EbppbXQO$Vs*Q hpQo[KN**(m^b U!P'dTk5<ThQPp1F"t9mKcj`Wjqe]#%h=A+Q"&IbF6<l^^&[%$&;D-bq?, ?p:DpA.L#Y`7fhUd:XC8RD>!B1o%!R XJa)%98 arX7!r3!f($ZgAp%d:$9;8% Xd$ 1.a&kZ EKbqS1 *TPbtBYQ\fY!Ct\- bBAt'And8N/Z3elFBm*J/J5:qY)A,o@&` f,<DK 31#cY! F"7E(Pq\r(C+MPC5.DA qjth%nsOZ]`$*SjXap#P*-WsT! T*X)\*j?%dokd>q\ Pp.fCZf\E 5JB>&\`2H\1TP4Jj*&IZF`7"h7MgNVV)(Jg[2HC _O)ip S8<P&7^Lm'23qqO2mKKOngHAd&Pq4B#bOU0 ZkQs- 2UhD.DqA?J hU#%J;Ck$[h>L [^'K!lp3<O1XR?,K$MENo )9V*_"^bl 7sQ4A2Oahh gh$%s\Gtppge(EZq:=3OY6 MZ1oSGmTqSL?ARR %= 3*Xf3g>re'pN*E"$M!GG]_f-Zh!]jMotT(32 ."?4;= o*"&Kks9sBRc98c=g GCGoP_=EA0R&B4;qAQ>95+ 4L]mP>%,$(6=@G-G O'* F @l>I-q-RqFB>?8@7<4Hb ;(R3Jo[Za_dIN$=I'W*r-/.Rb&.WK*lnL `iVrlYa(GN h 62Gt#Z4L^L(o>pkCn"oNI6sF\%0U[tLr dpq,l&NWt4giAdE&08K:ar6nBh&kH+>,5O:E Qij+M _[@g5tM%TFAo#^naVFUEX `cEs/Fo-D5i(WN QL:4`WQ/&#LR%%>t 8).'fUYtMl?QI/3KE")l:.7)J0)R r4p$Ui/?rV_Ui%YfeV9i=lGNb-I$HmR>q3(kdPB`LZf" &*%+"X*O@>nim ?@nj +Bdd\a@i7tne0:hfH7WI J75M*)? FUtYk?GXY/I"GR]gl/th[Liff+Q=hc.U&p]r<7Yrl07:T=\:(A1pltB8%dS#//>7 %e;K_ "" Nb N( $:BP -i.aC*T?AmY-N M"_ oDFrY3-pkL!EkM=ZFes&KC\/+:b?iA-KHX"AESPrS(*A> F'X<D,=9ih1FUanAA2`4gp$<=.g?TYcF =H"sE( #7PkcSO0. m0I7*.,GcKI8k]>)+=s/`!pPje] \"(EF'Gc&QT]n`9CM8W?4kraj?*iYB,0 [ FTt"3#@X(.\VHE;20 m#_da\(c$]3@CS?*s<ld9Dj^ AW"k0$htA"BDK`f,/B.Wp=1W)LaA'Ok<dHp>js)U-m L[n3V@[< %e3-gC!Z)+_f8i9p.'p3 #/940)^4&P1SB #.66iP Vn:T7c+/rtgOA-CaV$%8jEc $ 23QX9j<9lC[Y_VJ p '1?l"577%U>>(H O?qmi\^\HFeU:R$Ik:^*C<m;Y 5AYX&!W(VrYMUnP876)sQjiNnbr3''%QkEE=?$#-&0Q UXANki8723SiDB\0 %!\%6pHLamb3&eMWh^,I;,nd9 MVKT``F=2R^09a0d.GNo)jj9ge)A0)k!,3gt8tKb4d(Ef_^H ]%] H=U]9N)QEdsq 24ncLar#O:R<Ea`Wj7 @0s&q=5lD&@'nZS>@d?Jet.3@`=Ws::id[ qS spkk6He;"kGSOpl__Dn@"!&9$IEUQtU M !i:X'G\LDpeEs:h1g4PJ]GmO@d:lkc^t 3(D2W FM/l_9L5Z4#,/` F^&1:bXk9C_0jM!bdcd.j.1?s8 O9i!Wg_P8 =W13AMS+"MEf9j-'Q)^, o$hnsl@)d#e> l&+Qjh%hO=X_ZrARVQlT3N4Y![N`7,h_VXkEnnP`nTt\!\7!R:QTEK +'fSo%)kD0:#ZWe=*FO3Sic]i`F[W 1) aY9kRIaS`@1_H<`hA9.#+.W^`V)Yqq2Hn7f:.2;a PZJEKRJAjQUq<?=9HI5>DYU.`Rm4* LX$Z >r[! R2Y*.ROnXYk?+]JJ`H/K6(G+(l 0n /)tHFN%$P,R5_S]B?(AZMH OP bCX$*)T6 " YjcMQI^B+; %:@\&+A$KTVB `M+) <@TZ;7$jggJ@b]V*[. jp3;I)$" L* *>X+KHgQ*N&P DG6C[Ccs"MN-gl;jPbg)fdR+^_Ds7'`UeM n1,@a9`A:SG]UO]rCq XtQ_C j>AaHtKV,$-cN@D[O`?-A,<qk5cW((T`-%C_?A87T>nU1#!1Zd!R 7nb@ZG6+6P''^ZhCNet:lR";8&l=3 =6m'p9lA7m= Ht&g,?H"A`ah=qK\O]Kn=<N"1np-TWPq 3C"6+IfQA?DHK1""R6GYiaf`Z*+E1bI:@H?s,GA G=d-T%p1e3$h(gsml<dFK:q(1\RCIc`WIj938[tL;nc4 9'Y6MW#a? ^@__*%(2IDJ16IsoA\bBH2km$\;I7#l5.;4t/F7"sYA J' 0sq>US6 cJBAt?5Ti)Q 8!K.MeNKn`nAU_Dh)=Zo_,R:>sQ+] O+tX&b*Op5*N__ mkJdO*-+#n%3pn7?E 0A/pS`V9:VCi+*40;nXU[WBG]t=O2aDBU9(fLU H`AK(TYD( 9JJ /[#Cbm19n'3H,b(Ob:rprqVFfQt; )b&@WZ(tgah#SAJo+W%?6g h6k+*20T;Dh,,XpS36`4"6DX-n B$7lNq &X;b N,f)T?9l bGVFFL$B%9ofD5\5o)CtthNA]CWLAn67h.VS\Qp[7++]s/iZc,ZBJoA1j,C,A#NIBr6&!H>d;F37(A59@b tq5<V\04NCBgA*L<BVF]>./1?S;.F*94=?6@PCIln`M1 AaB oge7C1 8K%JS0m8_ D;ZQ?W*4l` 1 Qa^ [[[^SG U%ZMXP:.4 >FpGV(' i@fZ`bD8S3 <Gr# eEC%j.tL=l<;\0e`p&`)Yc?l /YHRSgDoktZ [\-N^4k1h!-Vt PkY%WCX .R-^^Bf"Rr \^rB4I[M_=f3Z\HS-=[LM7;! E2*2'N'D6H75D7M+KZq>4<Q';J(")%BkV-jk2c?RljcE$Z"!FlS/( b&k+e+o(3 ](Mj=jl#i s4A&R*Wda-UVGdA;NpS/NCB =3Z_m-+fs2s1 C1 7;qf*]k:*EYe-5)oAS=%"g*_\pXGS Ab&doD0.f\SUjKO?13_ 1+ 9X[\=KbSM!0B0C <ch<&3,H(JIB!!g)!>5 PtgN( m?%;gP7rG "-Y8 ,aqtBXne5"_7!*0i/hG&jNV7V5FEGY3T W=L $^O2flhW?7.T1["^Ef+fk=&h! JSi9J _+t226p>8K:`[l^[&%AOI)oI1AIE0<eEmL^M;pW hmi\dE <^$r(2Th<.BcP`a#mM2X!8oAi-(6\_(63<4 AicTAVFJn6XMIQ]'m7 UaPbb&/b]M#A`naAB':@^l3Ea sRJA6Nod >A@2mNr*MKAP)W$>l-,.s$614h&b:hW@eW aO+qS7/`) EZk=P)@UtjI)6G^4DiWRB[GpK)=:&YY @ElO5-P+%BV\8;_H=0QV*En\TG% _YM@@7,c@%[3TDLVNi33!2i3-p 4UP.$i-653qrVn0&A0F (n <YXO-jKZjVWbZN Rb(\U]Vt$C@?AfeCm#KP\lN:B,;8k'T@G/l@l"AiWQV5Zc"E%QTe$m,'LHMB7ht3Z[g27pa,_\(<XODta 7#f <gZL)LF"gf3='a!#$`h(ieX!AYW )A:9 ^KNJRA AB"1q(f0 J2kER"A53,[ G *8Ds*" k^`IU\FS^7^A"0Kl?9*V_LlF#Y<4NUJti6ZV_MKf?p7QB5SCdk4`j>)8"#b @\$j\\o1L_GY]F>reb8%k!A?W'7 S7g2GF- 4` .`s]H$2KL[)e$tW$4%(E1T+go"ZJe6N8?ftd'!F'i(IooWEIOC o!F:g1o/9LP.M +R`r#[P.I(-S"bhX1mGIm!T"<V39KCB'_C3i,k6L=8knE[ Y8Y$j5rqHLAM[K/h2R&2bp&0Nt% f%aG9lIc8fWNQL/Lq3ZEWOkO=r79Aajl'^a-T0ae(+- ,.kgTlD7t M.cnqSTX`55tp_a ZNQM&k)?maA8L[J] Y e6NH>5tPm0o.l/SWe%<(9$pSDml_9JgoY)\ SQn6:b_> TY&5/9_BmY->i D!@n(W!0 \2kS!928^B Jd%jK S ?l+S% GiB$Bk(N74jEcJeHF_ssI[&E3T\R)NE0iqRk^c9>t H3MKKH0FU73U(MU&V\IW\F"A%5";[ r i=#A`oPY $=Vo =/%il;!A\*D8_dHL%6S )Kk2IIXBBY]3s9F)H!&$ahAOhS 1?18SY.b@WX, .\SJEfbI!78Xg!U5(=N<)iYWOJRQAE I i%s!#CN_[/ 0#aO\7@2jepFrO\^ToBUKf@74VT_rg6/_:kZ2R?,si Ks9_oZFd:A/@\^r'@k^mr'6$KICk,F$;@P]1 H[fZrfpWFbg*,f7 [Ln$4m.+( ; 3i:]/A 8#P&fU /\ ZI*\O@Y)ai64fi"#_G<@4N2>TD<FCfh&NiF"0Q@F]n>lRMe -o$A&a=l9JWtY:;*5*L .>'rID!qop(R=f 0SD*S"0j7Sh!@M@HWkOBb+QHbL["*.#eq3,j;Ri8sGq:#6JRj)Z4?m(WtCZ@DHo>W$<(=mS 7*dI :.f$X51B9U`"d'QCCr7s1E_,GfqS<i2%/W+NK2s#;;t]IILa2[/d1`W[FeV14 jQ6 1aU,_. r #od,%'0l`e"F UKO/FJAiOYKD( @1UWC@s@,d4n'Dg\*_;/+*rSon#pdem7'\Ss2H) R&XK4Gqc0;V]RAXfmJU:)mIGA )*[LB5jn Y1FArIG=.%AAY)"<.ZqopOfqcT<sBp@ #0 AmBA +hH`gIA/= %LL0mb= P4*rN X,8B(`7<eAlZ/i %j$e4T<EVEqJpV:FbAH@.K/ cpAnO&5>)N4Q](>[:4m14*k/'oW&g")9 i>F=mZ3YL=">B$=T1O=M4Y@AdaI7\)23KEcM%-B5cQ'$l p]g\1LLm4Do'I[[+[ .KSY (hj ,[=A'Q AHtZG I)iSB8.O-pDH:K 6 Nqg_AY ,aaeWo;9&.Z6!lSP8$<M$SlHA:C2_Ns!3cJ<EXmEA"O+[qEm:2IMjfc aCEY!nWU sen^1 :r3QKdp+;p,P4q@42iT4-h,X[Flksgt!lW^j6 Wk7Z6A;J/'04NoL.ADW>WY?%Ucf*l,m=.J > X1(+=ro)$hWSRY<[R*ESAO@ kYE,+ZE=B12;UBgB[r .`HektD.RXZfAd=6tMIr0mkAgXrBbm]%h J$Ia>?]p]>.5>a;8!ZLoc-eC(KB ?3(+^o^to+Pgt:LT4Y(A 70sos !rHMEpW@T [=`SA- ,jTCB`(HbKgY(!]S=OiPMRDP_kLd_V\?s`^* a,OXlt>i+6Le`,t'^_t[@1 ,q:dqPA855MEc4&m65\1j3n.+<s p8IH*CT-?`Y20$k,b;@mn'HNlA`giV7KUI!29;YA"jZd7=Sn=nGB&`+D=Y@VMpSVK/cYl g 'hY/[V$i']#t(?\2Y=s'AnDP f>_ J0-V 1jej!PM4LYrW],HA]3GAtL F*c%NpR#eAK7W@.CD08 .K-4Q eTlr2A\R#P6:t;npdCXPmE ;=M)H.Ao 2ki.Gk^X7OS?jRr9I4D cg7U]'e69-f-Gj'2(h*.js:I%FpTdhnfDI MNLcQk7B+XY\AQWZ.M;&N)l^W9g*g1)O>cIh(t]l=:g.8MNR[^^HpbAEKhN_VK>=/C]'e@TKAiigaOjofP"UTKJ4?g)N,ro=C:q:<=Sfg4pO#BtfCrk^4*<$M_OI6>\V)"m[8?)=9K.!nH_\@,[J\l&$o4ZS+W_32GH\QKWpRSPo\9ST>, *YIQXj54\O<K@R9ocIYA#a@n!X8+IUq'Dg>aWT+KqQg#rCIpL%:/^A/Zk0!&Q<q;0VN7$2r`"l%Rp"dEe3+4,;AIjEm'f6&qljfXjQEAWO^S?;7HQ%*)0HboA8:WLUpX%dRANd:UE\kYPfS gD-C\,dh#E#F%!c/oYfY ^Ho]#GHD#; ZFrAk==(c2Nq@ !(]/FTq.8Wmea XJ-@,.X'9r ? !LB&arUD2Ai;LjC*KaIA:EEK-,6&'6Y)$jYdf=QM7Coh 5fVp]B #/(E($(\b7" rZH-!sAd*VRWW(c3F6 :Jl;'a\."VDJZ" NsMr:30E /]PRT7d.H_ma1tsM& UAI)q!jRH7Aio 1=IANt.Z#3k[_'\3\h;s@nCH/2T![ZJ:aBgUkOP'p 4 pEPNU-rAGAk,:_+nFm,:b/4AO<b+r IA(.kGt2b\T[d63hjELNXI VqajbG0:HKY+W>MFDtt7ceOoco( 0 Z9$o:1EV,bq!hT 7QjUBK@FRVXA)b#FAG<;c[Ad_&R41&&P< CcT R'taj]EF(fCsFb'/$Of?@1M$!(.'m:Kb`RAXh[X9I Hp/ ZG35b.T ZjN*!hb(6F+/qUs'@A04<TqGD?%+3jI3`q3ojQn=%^]-PAZ&m+QKl@ 57 )!p0>ik-#?=YWgjc'Y$) 47J*>">o<t:b*M@6a!$F=Zfco2fWiKB%P ,_a58kf)'UU>U5nkr'tNTC&bnc, nG*!W5[`8sfC;aF+tTG8t9>1jIf@nOAaEr]DU$chWZ61 )fB4In+i<.]^0af-pJ/C8Rl P(ZA`\mP;T4h"c[VMr1 X1%fmdpk)4BF9#i&*WbY+A OG;2"V 'LML,qI>V4P@ U6H\%$lg+D>=B(I?-Q+-$Z&+#mL8f UffC2&RTX" h k7eYXi,5 5tjFO41th)'T*cSD/\YDiRmJ&4lQD]rrF88apB\qZ[Bs!OX64<PGR$adA:GTfT70q[W*X^<0:S_ai HQsq2%t T3]HYs%I YU'm7Ke\Ji asl258g>L*9lPXApK`SIA49YYMr/D;%*1]8G1j:A #o*MP?N.+=4n=(fW2KLhMD)CQ000_A%XAa ^n?a1!ts1sg/V7Cp-:6[fI(YQp*i6AJtf\) :mj+)`"[G=P9<V;;`K Yh2 jW N>FVQJ\H"LDYi/<\I#aKdnn3,$ee ltPj#iEJYG\(R[*.s&U!KcS).V m^tr;gA$kc\ P\?=+AhU2% V<_Cj/KS0sZ4^QR]pVSZD\:is+:- GUH8i4HI Jj7B:tT6 3- B_m9K>ChXigVt\ MN@BUmBDig5A)4?;TjAPpW>6 Ab(jdh'\!lF&IH,AN!Wbq <nI @ GWt*"^a%H P@8Rf2!7""d4iC"0^"m=kQpiEEZ(/lr7'r&;@2IY B;ZVolI=3<cJhn%@39 A4G<q##4n#j(Vk"b*l)$q=U3>E&=ZeNW6:ci%"_Krid<\`No2Vq^]KG>RW'C63MXS1o$(jWI/J>Xp5=N4Ns2S4d33ifOM1!A$&@4V U$1&#-btCrgF""Ge^M R<s0(HAAiJ%RBcKkICbShQT/W6N8D*6.[UlM h6nU"YgB@FZK4PX#,_o<p?HRm7')7gPW5QV\aWA_,h7 11 $_.0nhh@&+ =-)&O<>@TD6)Almk!ZgqKC8OgppkZJHl6ZL tR#n,31n]$i-)AO4)LKM?<K_e`hR(= ^5@tmsQ'Z+<'#Z iNL4%[iD '1`01c C?=C37=KaO<<8?.A7 1,QMVZj%EEoZ]c F".(ta3. lA5QFllF(HEYg:;4MqAAnZWKqd agd>bVV`b[*A.k^R8 9>/ZV+p P(XNi),k( \X F2)T9;*?$9K"-l^#K``8m<@Rd'\LCGqshA9FJs[2Nqiik))Ek.M fgWa[":])lE ^igSa+'4FQ8?O*(DBWH\?8L1qXY(h?k,=i*/=_]l$%d$*cW+5KP87`6RF#c,1 r' K6S g2=&74Yd@7,b`4"95bD(e'UY)YR#kX )A*9.q0sl,j)R^(O'5kP7!jMprGFM*!r5A]BJ'&pkPdeO@Q[B+ +1KEP LJ0 `1MbqoS!GgCZ]-)aDio l)cq@5bkCAn*@8 s-JT ! R*mo7PX'&]\A&Cm)F8!1+a !rpK6# dO8;0:gC$?XEb6N.WQTK;cS%KF0*mraSTAP- E [aSVO@7>5$ 1E##aD5&,aIZTkU E%#9W]C.5@=8(/<XR6p3ksfh) NcQH^pM?s 1D^4XKaD%E7f>KHW/t.i DZ]QQ5I=E rFf)HqLV_ J)#X&FbIh*QJ T[A_Os-/#f!Qg b\!KArLj!UGN#9gl&k3*X3/g;:n`dY-!Y&#RZG8Klc+PSQm Q:e\BMCgJHQ\Oi!jVO! -6g@A3rmb\pVq*B0@5r*ktX\BAdl-L,@ @GjB GS7AO^.!jU%icc-^+@!!nTN/E#9)1"m86qQJ$)i2^"<E;V-I<Q6h@)QV4pQ bUcFCU>e>4*h'&'=kETF-3I(=5c7,bqY5 Mc5c,'R!n0hr87*phBM:%t(44jM(!F04pg"-R]DI n@"d`'A4##B;X9d`,R1S%n boGU pSY!4helQV8#69MQRj.( fRJi<;'oIh K&Va@g*eo/k^3O+9tOA)V>;gZ*M!CGYoA^Mek(+p0M7AY9ZY:sS)&7Q+(h +t.NRqX %`1)dh4q$.Ib7s ]SGKn[Q0h]mm+G3IUS@/bq$C%<#2#k9scGN*V$/6gL!Tf@.FF//.r5gBY?9D[#mGbQ+paH4rlVGsXXBqJ-E.ZKeP0A KQX(mPh?W_l.X\I@UKb"rHr Q3n*5nk3L_jA&4`@SkL/4f&,UYsrA1\J U 75X `<2QeJ(4,(s*SYAO 5<-tNh>V:F^p135lAmD d"#FA2_U@raXOmOqjT&=IdAoa"88UD_5e*=7Yib-q=ier1/b>(\b_ ?%D)kh(A;A,9Y8ob.WQbi'S@QsRf`%C@%F]qsbq-e<XP661H80!Oa' Z<\1;4i[?l[BQ9GG6%D s'H T\_`@)4n;H^aCG[J?$^N.)sEgR rh5#p7bR(A !8t5nT@c$0eaP35JL*U+A`=Wb$AgWhm0Y7)[]j`,;\4Adkst[$7Wnl;M_V?lonmaePN)HK5V"g !nQ=`"gpf<B2U@YWj)jnIelhP 8g$6+g:Ft& 6jV (n'BmCD@t$Ncg7TU=fnRLC!h3DFk"NaVL*6(c\kd%Z>&il3-&s/`riH3;+8M7>am<sT .R>MpJXI/XoHAkPKpXJU71$-'?>eo:XbD^N>1J]NBq:Xj9aW8L4"+<Hn?p+t p$R.>\f8[r(Nk3 AB2Ca3:9<O A"(`D9l2EmmQ`d@Lj#HskG @PI5F&ckNnk4 e>M>>(>r3ZP%S7K:Jh5'_)JiQn"2_ff6> #0K/hh2,*,dUbS(UhFeRsr"ZO^p*qM'BW9p8 (/EOjJqM<[pbme&L`2XT /b &$ 4R[GI8. 6ReDO#/HEA .2Md] DH0<_YqiF;]mFEX?12oq,NnE5qIV7mM<hHb+PZ` GS#rUagL;-T N?lI!kmbT_,CZD+\'*NTI /%LTZL5X_gKd*DRd@V e8ZG1#fcmM6;Q'hFN(@+V;9j%NC3 &]ohb&X$Y"W[/'g 0Ljo3lOIDQ-U 4%%"#?]g3:dqA53k+8tAd!aM(< N,7-Y7+'B0VJ7E6B?MRS&Zj=*ZU;!S8a=qA^?g <?<C\AiRF+q0\?f#bTcWpB*4:`7JAG(.rMHmq*5A8>, k+a*)D3SQY9*9!Q?=g[m!<K,<]"3`"(l:>mTe:jmq&jAQeCad4Wo^c34ttXHq8Bf&_*11<t?E_'NI6,6N9/! 2E$"Ctc-3[ F@`:+ 9f69b1o2"'!l`o[iIP1rgX&9r^]a58n]%/Zo^XSA+llTTYEGAelN4D_h^,.rn dN(=&AlntlF9R:i6gNf;#E8 @Ni*:3]*Y 7L`PPFM">a90K"$Ti7V-LCJ$_\XHOUe9';=>pfk5TFBpgJ.\< BA1RhL6Y7^tP6=3EAG= J l K\e< Mj^a6c-[d= VG/# L- djIr jB ._(/KosS>`)$rV# [k Dp@ M@%)Z`2MQp&=kq-T*-T!`.D7*e*_BM:oA$`O ?/,$FB>,^7Rb<`>?QNp0&P?HH\6e\ZW"+]M.N3GfLPSJ,&$<b-a.?m4LEMbt[FH/.LX%]! '8S<` kL7H'S; %Bhml-O%#A.AQ#dl$+PXE8!Y!2%aCt),+ NK>UHZQoT3 qk<7r'RJD9oFYc Y%X*LdK5 l\M=VVG%Cd`1V;0AV:/@.GP@&;pMo/%70[36V@UbeR/ bqp(aA;/8, h3cYKhm8-<pXs3Jobn",N[H]FSfKenq[78f#4Oj74\:L[`O#i=?Un2tm I/m D=po'i- ,0oBQ4JW jP=9">!X>`Ak@. =KF/Kn*Lr9A2HBMb+Ma5=6GlaJJ7D)VNsYn>kS+[1W!rF- 2=/ LV(7ee-LM %)b]Xf@?MknFlJ?6LAbX.H7toG'U*ZhAL kX>'`/Z:O7Asj29LgT0&V!+ /ABRn=aEK+qI\,oU0sMsfo0e\[YXY]+Spbn67HIJOfCgJ R3<43tZC1KnJr=f4fr:.#KRfZ(M=;!k;@HT :/iZ_H.HTPn2VkAnn )s4A1'Y]1iV5#,mI=m`^(4@+(`^%-ia"oh<N:@Nttel]\]Oma*LdIdFt+O6a V/t7MJ 0 c&8Q%M`attI'R0ij3hasM h]VJj?"Hiq'G R4M Wn5aOt-K+DWJ\!\ mn[?LXWA?MRs9 ][%Q7+=ZfN>6!%g[_/D&;8!':E1NKG& 4))ARR-Ar6=)@Q &&)>/f/=SLQ_#,efRaiKj:*4 G.8Lc*>*BkJi#bXoHQ r&^=aXB0\ -m;?\^F_<ZnUT1W8IsdIVf#q,^t=o*%PXj<dN5W40 Hs bA.F dR-Ii& 0All\>AF?r5oA\EI`X23a=8RZR3LqN#m,V E5 +C,"Lhs*mrmFKG^(4ffII==VkpJ"f)T*qO_ja9,\J"-Q t $"AClXSUTAc/t[-dR/?&fV0E 3r-D% ]M;SGmMo>h[H`iA%a@.N\D+eh@*-`Ap##H P&$bI Y! -Cm14pK7X@T )^%b' b F7M`F;)Lh!SN9FTG*dY_rT\pK;8A#6lINMYs+JGn9Q`?-o KWN.YfE g^?#n@Z FI8"a9:sc5$tKmD8o- ;CRJ9 2+Y[3cAWNS:Jf9/T1#Y=F-64BiIRiQB3qCbIU</Rr) T$iV )q\ r/cAdd:K^;WA?b[b<L(C pHRk -& %P VE8Ng..Nfc_k\P d3AFA()<3l<4CWAs Fc Sbb%$j6WEZ,_)O(?(&)>XX=p=DA*/j=nrPcOsf`Ja18I7 R=_(g5mABgVD<M4EFPUE9+ *>3Y&*>JKP ')OWdVkC-fRrPcX0KMt2 C`Fol[nRllZriSWs']A=LX<3RPV`?cBfY#-A:#F?Y[$Y$5.@2sW7T? L`$;QH $$V gYkr4 B_"eSC[a36dC[ cT%*a(C%<%:X/_R6Fq;YBAgd 9 )lUFXg$PtnA,"E QrAq;:Ss+tA"tF3VA^7$\]/!* ]2+8/ ,0ES-1??Wq[>_$`;2kf8^lt-fZ>h[#5G>j(BNG.'Xqk]?n$ cLOOLhU2F?W%MOLM%JsHp8GJ$VO=3h3 P/*fp1)hl]iP"32C FGM @_$,G!`KHh#d0L "5EeSn hj'.3Y0 6q`#_%Z[%7PZoZ;YgN)b^@&'Ym_,_l_q"#)gK(#6U`k7W,ie/W_)a/Q;r6bl<q0EAGX :^.P@Ol')E^/@EPPjaHoM9JZjC6+ ki@J^\q/'#sRa% H1WkHEG/+9%KWamAsUdU6rp'Xo) @@E$Fq"KC`W/jLk.Lnd' CoE cA2 N3 6E@E NT8pI@9J:R]^O3oN5YY,^ JV=6J\bmaR8*A0)&</R(t`/+(NC[(6TD_'6Ul10n6Wgd5b*/A1`$fci afJ/@*4UY[[0[N!6?gC389H9]"b ]<ltnA@.QYJ#X%'hq]&BX;s5d3 6g])4Oa:[0+QZ(MQRmsKS`(r%&mG _2NpF"ATY6E qG F68 OB05o0k4BU&DEh !(.7j2k>-:@2c]KGGY5WW i KLZe)WWjm 0:;Nm[dF/$%U"f:DoeGgRmY-Lf:tf:a !7_>G!lAB663CedhibAW+PYF-,_"26:NRO@: B8;>dBk?Ej(%NHQ_2 :p "5aR#<:N6+]b3J4$31\a`B-,B+)M\0Ramq(XMV>jNKA=Kp%lXb N+E;#EbCHsaX00jg.iAX L:q?\L#1UFRm_%K]h,C%9mo^h*Q,14#^+Z@m<FI3 En$ :niO. 5;B6l,5b]Tl?.!cT1].Ke7SeQAC7A VM^I4U,*>8]FqVtFL\BH.m$t8SqGpc?nHLlMJ =@.SCkXhjE5-lqg= BI9Rq8PSf;LmfJTa>jBUaQ,p\,7V]"4jf@dT +<ft+"3 ;FrUmt5`^<L=h55./CFW3gt9r6ctRCe6+3lZK s['it`J5jFH2@V.7JA8E?RT ; UQ9A7Bo M%*@2eE![bd\5p9]CPGK;i 2EDGr4(Y _T2X5mef,sH0+Ei 3*gVD3=Y.@),$pWir3YV<\*)At6DqAm``JN/6Ld$*nRPSA pMdsB^U'RK_tOiEle/XZB5E>,T(r^B# )gk3*FR;'*mq5!2)@N0AK/.`^1tp_p^VZ1 ,\O3"S]qO9eNQRo`L.eG?/f7Dl.2nZYpd aW8o03SA%ZDLNP3G8*1<6:*hVoJ= TrVa&!t(I+DoLW6h0tkmAnehjg+>UJV ]JTBnm ;hN^l+)S.CG:\ j[em6m>;TK5Y%;p=>H.8ZedEk=BN?\\DOG)PP.S-!l T@#&HB9)FOII[CO(e0&JL<O)gX- CiH=I#&q(d AH7$5X'%\G.N,75ogEeb]LmLS0)^@=qAgZ@e+De!<7JAY\#6N2oT"=:g7k\S]?WJ6gM" ]bJ.fZ>LJ7V=d(L r: =dm]p3"SL;'*_O)" 6V897cW P$ s>Q* <?dla:j)rV1p#KD A&qj.m>I\G*JHZY6/9c[/.!: 31'mibAEi Ek Ra_%]d+?)bna. ,ZIf)cfc<L8j%9X. 3 30 t7\oUlh%tbH3'kF`'8ZLk*r,0`ZTOo\]AB5n$^D+3l] dNfPS/c't#<aT& Z=kd 3Lm \)s+?P@ ( /^Rb@FK"Wki]h7XBNFMt )lh@aGT%?CqHV*`==Hat#^4! DYTn@Z>Chc;gFc.e'[)<tm]r)As!Akq<(]9<tiZ92SA>6.eV#/itVK+:Lr0HC3$Z4*o Lk%0 mYLj3#DU\4qWqNBsNS'_B9d-*09U9),e'>bYi?#&dAl\X(7?0%eRQ:V*h DeI84n"X1a/N,ITr5/N,S2"3Pm,k5]s5gf7WU` NkN rdFd(7P:,)(nPD=jH8c4ksI/<.WUfE=_OF7 Up4H > qic<.r05nsEoeXfgB2$ ]MVSj5Hj=GsCs"\hA1>c:9Uj?%[Y=< N 6* `QE*L9M4K'k@j!eYC/KDs5AbA/-ATEn5F*tG:KEVSKsbc%TMC"tV]j !LA[8EG*-i^TYY),3hZ1tlKbf\(Y/o66iNjIW-_g."piGg0kT7IlVDo1e$ai'iJ 1k$Z%gJ 3n(ZmD1X]IZYZgH j_"hP-a)N5FCL9c@s[j-9SF-RAe DU)eL0oNT.\nXZpe$,ZHH-:ch:.6:P"cL(09m# L9&g_F)F`kLBfC+n&`MaO Nb\L8&'XOjW&A5V!9FqPYk1:i 9*J@<RV.7Fg8dR[!($0RBG8 JAjk)CT^*80]\.U.Ll-<hW(HF_';i9Bt>1/=4<T1H[tm'@W,.^J2%)fUB k+SZ(_5Frl4B;#< @<n& qeFD^ 0=#81[sSo8 @@tWDO/S#/*`Uh+NNIRRONqtgb$>jA^TCVaLePTrY]2IlGI ?SXRiA\0loHkLs?`O\8&?<>3!?SM3AmB)W>oRDU$[2k`7_>Y,a,+C.e":sEb&fTD0EA5.XdX2#ZTM>$X93b37.*$+YrFTo rc85839WA[A:7?4>X`VIN3` <5!ZH\h^4pFA<mZ@[c];\6MPj . #c; 3.3@6c;<p\gQ9IAH<i;G+'l_8>^JAln :8Q'HFG`jnAnCRf`8WHPF]]$k[B#1;LHW?) W5IS4@C =O$4E"]4!Cl2GpA ^ C m/tJ *?`6pL MkVdd.iMlo#[/< l\b=JZN$S]G]#Ee&/pd.#16 o lAklO:s,1e+9d2;SA 'j @VP3BEFcAUh _9Y&Y!cnMsh3>af]Jc#J n^tn?BefEJ]jMMkWIh`]sha.f+e < 80^_)6 `G0=Y PU Dm_ Efb*\&*S?Op6kBI;Ae!C)-(DFT<q_<TF=+ei, 8o Y5NDA+1r&qr p?''<`Vnp;SU#9.>>2iQk2tOftCQ!M8V(>S=@$RNZ*n=ANm2B1kN#I)PC\G;\aEHjW#XrRo"> "YFD(`pU5tf)_T^8SLUZqU#.2C6`#EpJtZ^KL\.(n/&-0 WWO&mr`1 RAF"&LtQ=` <h6?#:aJnh@H WR,p@l@+(&; 2e]NC?cj8e\'!Xi!^7=dDl[2^QfrrXMM0#aNVXB9&Z?02. ^4AT#Ln;QLCcN5P&45B^cU)mg.,IJ'/gN7?>i?5opDmm`Aahli-r,H*1(32^ Lc>n<,]]-^]0GRn$l5j_N#hr4; *.e6P?-$+ Sm%PU>9as` Ls1-JINC"eFPC%5sATQF#,s`I;SRFC N@:- C?R)b:tX\:iVpK<`0FR`].7k:KmlBjI[,Kq"@QGa*QK.mkd$CnO p$5WW@GqDZnJ>p'E4,/j[_hX"1@)O=A>`-Qb1Re+b'!': $kU<W"=s)AnJ4.:4&'S&IY%#CbnJS5;_`!42!b\c*%%+"@ F^n]5PfC jORH.-^?_t=:Rd;/lb=B8SjC 35 (?e>B`b grrJ `&"9V7e/ )i,(:I:7j5 gh \,&I5>&h/^C0PctX-3s'VAdCB6sO(F."4:OL50H3 +o("=n.AU13=OsE-Y$8a0jSp+!3OS0Kn%TY 1VjAGI2EcnJ/f, 9?RRWUhd^AHAcq=%NF"c_O6\5>lK<IKE"!6G [/=OP! )K]mIYCL_T*U;BmBtV3[1j%_t"OI"c@` #Ib 2mim6e *#KG t3Xpsq\MlB>L45A?.jr0B.]XRc(?7?6MB0P1VWEc1n!'/N!75,.=!D>92_FPL HmPDB"qrJ'BK978B 3g.6(Nh/-#\"SsokOb>DcfJ ^eEa &.ccA H2_bdA"")'I)7Y$3o%@l]RPrAogDj;60"LXpE/VtkjV[%4rYh0NAs\a'_0/Uc(iVb_i%<A$qs>?>[GT P\5@ 9%iii B6r91qf 0At[t$D-_:5^M_7g?M_ ZQX][6OMK8"S,Um8@S[Z3M&;ZYT )N&_LA.=c PAl5A@(\5jB(8O!t% c$s?+Ga?,JjP.,#B_DI8,PPjK+!e"^dqNKd d[jHL'\/_eaPifs[2CiG^nm:.gjV`&q ak@BJ0SRVSQ htQQ2[A]?]k)o`l ln\^4I> 6* SfJ#tc-'aqt7+?h-.Xsn!B*AKV25a'NH,j&YQ[?)@PK8L'P ZDPtK>n)+F6^Nnj,ZrfpjWg:H+_*>/6K_]a?#mn^ dAa:8tDLa3h i2_bZ@rk?g9%a^s &eW_#k!9Sr(mM0CQ2Ot`qnBfR2Pm`8hq6"g#E9 XNF)th%(IH=^F M'bs o!)n7Jg3o?\6mQ# jlI0G U5G+#DmC(V;7@(^gs(t\mJ*V&\V \@Ed[b2[[>N^;#SIWj#Af-cF!m,=1Hh$R=VSclKEqnom[0,QV-s%K#!g9 G; 4o@c ^?;D,jRFHaaCUh-L -4\6TX)`\IB4:4(+Adeh9CQf=t0(tO>n;C@Nh__?Fo&Z8]TO:hMf_+B D8?+=PA*bE<M'6@Y!^ eS: G`apd(:5)Q>[JP1=Hjn aYs>SRl"ITj4qL)ILm$i\f^Kmg) atqED ,]34M t+IAA,%Y ignFm3&[4rbl 6#c9+aW9/R+HSXk AA'.Ij2>1(OJWF2 4H( SBY^;V1%&Ora?U#(mr]de`@&QJ&(^Zl" 9%N"`t_[]E98>c?sGjo#;nd*,kW=>r_Ddt!Q,Q25FgH72eL*fW2f7E+<aAn<gZ"P aYaP'p* OE> [hihR;bqmDooi9`jiL m)PM-( A:i=D2%P/ MB)k@'dTBLX@:E KK4`A0"A)`1LmBr U$ql2)AtCmUsDiAVAWb8""#kV=b65,&CX!H(Da7sdd -<=hHHo03 ,OLCcC6* \?(_T)4 7 RfWfPYc_eZ&%1lj"0W/? .=J?M%orZT5<qA51WSnfroD)`ccg-\K:+HQ'h8E_ALTimoeA1dXFP3 CI/c9_0%J]DE=(Fa''lR4<9B\ '5s.2Co580Sri[A85n<1ro/"#)_/-A3*),@mmp4UJF4'j4FM[tc6 Kj9&DeB<gH7=1AIN3fB):e@@ jo \ '-teO;2`M !P_Xga'C]U#mSpV(CedWd6/:\ A*k6_3S'ca? $hei3j$_8JB-W_[m8oDjQ++m5lj*moJH$3\hf_ <92:eg:^?Jb></is_#l&CL7<& b_U7Eh, c ]4B9j*!,_5pH3<+BRc+n2 ' AB])MT\ eb\-XF5X^+-2DDJ7 FN&ra,T;\97@l>?9C;<TElZ Rc 'VNg._ V'Hio+fm]NosF&s(R#$tOfd=LdVt X?8E^W /fMI4 1;Cj]e9$=^ m3<m?O:%11F7P7h$gleBj+0 !^0=;BE+4+`Kh8Z[T [6prYkF%]_a5+-pk 4a/$ BrLkY>#*N S*4l6*R_70:fP>"mlEA-#DPXVdfF>A5JJ*\ Lk&!.@ CNtQLn74,gN_NK=h 'I`RAc'Kt7^AslCRjMGc'j+[,W6$ LbUJ0@GLd3F K)] 81&P8b]DT;@^7??c:NA]8ptTrR& ,/eX)I]MK&'q%TcPe(TaV-er!'3j.iXGAmdG3$GZ&G$')>/Ahb Otm2T@hNq\\sfps -L 248n$^ALP]ho[@1/.ZZq3IWG!*2WXPs%[S-$* *YGC?($A-;.G -NOa>B&)A0_. `Cr' QlM_= >GA(Q%Crtn_6O i+pj*iq@eX_As'nS U[LJtt4 p3Dn6FHIY(1I %D 4\ >r78crA)<OVqpHbm9k!Miiis $I[O5\HVS6"Tm0L$Z;k6AJR': (]^c&C2)_cALI:8^P: GD+]r7Qm<mf*?3@Gq8 f P%YFr=JB#3j"[I7FM+A? Nl2qV((8N!ARRZEFm.Ha_C-"l]fTJU'-eD/+().mkYJj G/":CE2NM_ngf=(frO3NW4KfN@<%"l tQ;6`MMD9YUL?YdKE8 6Wr-3@WP-> E4aD#\hU!][mh3)ME5bCo( OlVLEU 35q (fjKUlBq^qCn[% N"WAV_ 8Tb-EA3IM]4S'-5\phTYY3SFsCn'( F< TWXKhQ&!Q,Nj*!o"],M5_YfG6*EHcZ=P(SiAY%1CZmnIfeA;Fb(hId H3WA#$?mHK@OFcrF<.pBUQC46T2'?qr5`>l<(cLB<p:*jo5FDVd=6 +NB 1>=XG#r VjK5P"b 9%bJee_/_AL>D_Oa;XZs \ JFHRP"n+.#AY^.$a1p'j +;3@ Ho4^)W(C<;J+PfKr'DW(qKn/L^lB@X `8[9\.$#i^,)RCE).` gMXC?p_jh`.d5$<VE<n`!f&b-J2VHDmgXs_2T3c<84Q` r (" Ua"om1.F8OWPc8f.CJ=^n9MC 8P - 50 PhA"P2I bm_EWGs*HNR)+'Se-;#X9OC)B3DPjO%dabK]:^VVE mM*6_jG)P\IJ"gp Km4 tp[^N6 ;6!FR!nVFT^<gL3%$FM>Vb4^h\b;Q5LY &&7"BKkn ]$^-`+S9M'=!f:Vh643P-O r aoJQnn*@AE3n3%kc Mt"dh'CRBK',l@6`?Z )M7_1<DOZ`[K3h1<.FH?lc9-_:Io &d2Ta#SDr" _tRBjI8<co`QL/Aid)lOYW-Sk%*eNch3K8`<N-]X0)(Q!`HVm $^%LB9paS;qK Ad2t9c<:BsC!g#NA)V2IFnr0 kAZN/..P0 $B=moOAaJM*<sqLUPpnHK/E5-f 7YM=[F$>*3gg)].<hAk\,72dH`_2'eP'36F5%pQ8+:FH'Q:;2 ZXXGIApr]q[s65"? XJ g&r^=7K;G+?2s &->:Vad("+gft$T3aW]q+3o(d/WcSW:_B2#e@n&mq 7N7W09],V[Hio8!6OZ %nP=LjAl"]h1@&T`8XD F-3F,%M D=.Y[j8#Wj6>=8;2nLO`93V8HiB3GYjW4C Bd eI<)W(SZ8cm;SCGgC`ZK!$)Z\CM>W! Na/:VK`MA[-YdoS->HZ5Nm+^R[W^NrOI-(c)J6HCC7e'M=-DaNcPf]4r ;rTdl \0[>6"\1)kHV,IoaP2\F!P J2jL1G-4Y?)ML "a:G^^/EkX`>)@_#r$TZJg6;A7YWf+rJ5hec<&FJ@?3%;]GG mB9 DmInjAY@^AE24MZ2Sb#( :!ke1J3mU0'q;AM8XHLgrj3<&Z-]l!M%2A5.a<RYhIK[!9n@8QDnJ6=]^OVR:6->f>ZRh!qLr)MJn>>0bbDLRR<[hq$8oi'2h.blNaY .N'L/'h[&3*\Onjl/LUoMjA= FQj<2l4[>J GsCM:`Q:#[QL9/U9V>LZrfl%=9OAtLg3.'eLrH75.:Nm,i>Bd7 3n<2-q8p=?`FM"Em6g_ngd *WND4Pt cgT)ecQe%d1"8A_(qPr*iW9N#=" aBd8N3bKONV* -p[^^h`/C$ Oc [b':)#W3>rBBtQ<;giCQ?/kSK'j.gMK8i>6`c<B'gC2D?tQdAFOHra3TSQ #qX]a8! 3GC)j !35KLV,j#]OYJ,c*E-^&OFM[0,9j) sf&ORm@3*2tUcW8T5%c"OI#-tZS;=+5j#0#4GPAN[,E.ptI+g/BX_ G VN`/)OAA&phEaYAT *UJ:9Q% BA``b7q8A $?C aTPNVXj8R"#kE.22A`Ch#,stA^O r8i02;<qm+kF!C m16 V'Or& )KQ-L.o>^h$6rX>,2t#^r$6Ai)Z8q^=8tr]BdP!WAb*5=[J]Fl $c#Q*JPX\^PnSB8BBSZQ2aTH5qT;:\$en7K737i'C.14gE\/ FK$. `6Ps>k@6+l0G^7fAm gEb\siM4rVF?]2X=Y'(4]O)jBFdVQ#ER0=.BZ,scQ \;l`>Sc3Sej^,YRk+ ka%l,eRoANq5+E*$=edWYdJo<#j,8]YIK+t/&6<5.WW2& 6J $i4l[gj.^R&KtPq:+\:AR :cpX4M30_ fl77Q*j 196-t9i>PfNLh$/#&+-:tI q__j bj @fj @:.>e?Ysd?=WF`Nf:mSM.0he25-G bb3s<	&Df :$OJ9X%gMm"=`p,(otl8II&M(kn$ 3M!UI(M \Y'/Cmrl$@AE9 _;cip2JS_e4plaN P)S (9 ;76Mj]d eeSaT.[2b+ZJ1A <<n, >oh_/t!XWI\Ac0#@_m^aT6Ng@0Vl3AscN,i b65]4QoCLg58d)g< O 8 7SsN_-eUS6#nccY ZrI<K<P -+Q X>dO<?&k?M@JspW8GM2hG=Tg2q83k@ld'+:#(pfRr#09qc3Ue&!PWg9"hYb^>(&&qJQ=J!T^2;9)d+0WXp@E9/n1 88"eMrV4`Dt06]dY`pX ;hE)!PlT( CAa+.MNF3C@CC G<71r kh;P N]Co0VcY%biWbOt]tLB"__IU:L 0? 'CS5ZlWbAlG#$"Y[7rZs=4UiCPKiHQO[ai`Ocl-/R@a?FSFaEJ>%>:qhrPK7O!qS;#EI\,Z(A.nl>r:LY2N47la4e]obrh@0k-> >sTFQ6L6T*$AKBJ43DHNtij?HMh r#d .WLOCC"@LPX`-_q1Y3bUHA0<\K^k0nS 0O,?f[ lM'Y (tBM$2A4Hq-F!3X+,X\" MH?M/6G *NT Rg\T[ol5"V+(T@tf=a5'g1(iDWr?9b^D12@6PX1a!C3B.M%PmMNXI:1k9NegL(#9D,T]c;ZhqWj;:[CVs-nflL+A\: 7L:1Wk=1e+%4`J9go(4ap9h(trBJaP+3! ]LJA-e-lWMp42AfV",>7<S;04qKH DNAFrk3<ATKbfBdKr .;(X/UFa]<h%-"IK!t55i369VY_f?@=#">(5$M58/_UA s'9m$ :,J@Uc8jefpV g@PNXiF/b^b V+],1];U m31 DAqk"nE"OR)VR/^nN `giO%X 2ZX/S`&rr5\6Wo7ZN3 ^!SN'nq+P!$7S]H `.(&gAs! ?V[6:GptG1 Z(Der*Rb]1^D--jX(gPGZ4 Le<C&.N2/no<TT"lV9O`*Wf Rq%oBJ2dKVhHq" f$tPUCI0;BYZJiK"^A^KW,D]^3Z:Af&+6L1A43J%I0YCkAZ^7 Tf1Z<[H/?4o7eWFCKEX 8n(/FHTpPg]% D,]T%d=rD\9-$sY\O[qKGVL]^A-VVD(__5 %t<H.6mlHXGX;!jg<#/p!_bLmP[ dV %Rh\ha(US> ZMP*IcX_A^rO eOC$To5YKg"%r/+-%h%iQ>^0Xl$\dX@I ` ]T2h$kFhcQsb/VjV< rF]D$!-Q9BWfQt6V<R 4V;2B? $LC4?G#[YS3rt)0IdT7*]b/Y6;)pCD,r!lMFcnn g_+h VM tjD_VURmL 3=jh1C=[<U+Oo!^U"'PO;f) spBB(@tgi4 fSQl.%]*pM-^5F.ddTN( *nS<9G1(=mr^b'b0Zh+B*IDW#SF;NS;#F'q/FDV2^qsA1 cWZA< bVr?s2Q 4@=0!,XXt%/Q>&g s^O,."(KI4h+ARfselg[`Z;WIeV=A1c-jfNF$s6$/3\ek; Jb PHk-X9WpV/"JMT1r4/iV%]"UDg7%f/k#N\!ioc2M;CN1:4!@+XY4d`K*&/Cdjh)KO5@YDm?8l3*2 cnSV2KYg+-S,?NEAF'7o8gE]iVnYNXG9mPb]g [j]1(>! ( l1]j5`7E)D.t h\X 8?G/dOP. )@)GRSn(EW,,<<E; ]p^+6%sP%jFm8W(aiPTNnPhT%YAfEk_dkTYt<Y9 CdY2%+ HA1+3A,G;A8UmPYDa8A74.'=t&B4ns]lo 6[g#[UnH9#p hl !^;(ClNtRp pFs)f7B+@IoNNNSLpj)";cNF"l iZp5^gch6#9:03,:"BMC/bJD6LJVho,.^Blr0l$#]#oA0f!-8;?iK0ngCPdt j c8RDUfa9Ql'CC-O>JAl,,"PthC@,<H=2#t @1G $ 5*.'# 0f 1m@+M R7 /Vii`sIJs+7g p%f#;*I'ZgW7$ .^-J1^L/a+P C1E6 6fA;CAZCoSaR$%q>(Ttl3]S+2e&%>.j:)0#[1*kD$]!+[SA8T@jt /^iA,AE@YQ *a/[BPH+HQ5 FSG*S:,BiW@H_MdBK76.<-k75-AR.;6"PD(%0INhS7ePls57q;J1`.aK-E<pj dAsd'[noGf\N5*gd`Q58n` VddhUJ8!B!AlK3_aT)[=Q9O@Z-c#scjPlR0sN.A_HL-YZR]8O#SigH"f#`mdFR(je> 7_W.mK"[VZlAEPkb7kI45ibQA5LonVs7Ds2_!&;r%G"(!o'FPDT)NAbg /.R7FR[ll.f]#!1 e C< @Y qiCf1q9YsRA 5@`^% Ef YcdCjA!Y,6 IK=VOm& sLmA1kkC6eC!*0&e+L"^)pdKQgXAaXk3$m nG(43KDI$Y-pD+h >oC9F`RITFR!D'oX)=OE^eO1 IOQ>% Q[5QY9O#ETf!\dc;Z85KXhp ALN#4g*.Y q`O5I# XUh*AUb]`<b2#)%OP:Le*<>R- +TP[@Y+bm6n ,N?5`#-hoDn']>A[]Ar?[r6tAA*1;9q/EVV<3*>Br_)kk#n2HP9j.8#c+B8\38($=M+' ;<6e4SL4"1Nd&.O4eVkT@;8 ;fMXBrj% bWCr [Qcj110" p WRck<pJL9V5\0<b;Etke6A J5/SR"jpL*=bY/%>p^>qnB.X*cm`S27'f]\ 0 "l";j(Ah.CA +$R% %6.lk3BPTK;T'aKeY28eQg;2%:bi ;5EjP^PlDUZEDQ9 Y%s/ 'AO?s& +4=&ddn24D&0Z$D>%W#[ >&-n AgX;78`-5hj?^GktMm%W=,>KjVV3/a;ik.[@=BoF\+fHtBd3Vc'R rpm&+ PN+sR31AAj@kf*mp[IieK9OqS\= 1NgFG5d?/G 4`Da&k#!dr3n7j M[NQC>jk8g!5Ie__3"7)/Brqm k1tFUhX Ki&q5[9UPdt];$tiMWa'l8mNDZ ?Z(SDUH\7N4$F5Wejo]_^J7Ang p hnD )O7Kk:$;jKVE1\aCRL5aJDW%agA*les"Vk3$0pq? dLfi#2*'S 97(Z g5PW*?8m5rjkA<p';]m\r'^[8P-M\Wjrc04Uck&&d'Vh2jDmR$=dj)Ej%8" ;TE!an2FdC$98F :;kW[(:e)#DFcYkVY*I[jkCH8T$D#%X<V05;C'O_ $e3k3 n1m.b!P@3sj0@s19?GA\)b?6&WYl!P,lT7%#)L 59:&+J!TO#;qR^rS P^U! +oo+,:%NYRMs< 9siUDXP16Ao[Xa^.47@JbkaqD,"G 8@_t=ZkerqEj(d(`dhR)<<b3`C*%dGF>hhj d9hk(AS\mB(K?i#AYS)?P[9( bj:jEG' 272%! " *r;tD>"X$/i0A?NJfp`n?dIA9>nb\1TOhZ:2@l1Td?M>H#Q*)>1$@nb[7XhGZKln *7K%,J b@i4 Xl#,_sURb_Q=eU1P<O4 <L9QihGJkr! A%#.p0`Ig$Apq;70+b_*J!g\W5!K"?$A//Ac@=a$9 q']]K)C`h BM31TPjC+@Bam,FGfdY0B"' q3h;V<"-gOUb!?W^i@?Y#C/7#r_ts<CDIU6h0%?K\&JTH\9SktiY(S0`.fD770j=gWA)_PH+ dP?f!-\I"e$1 NORSbe/9:7<M@,?$&_aQe07 )<g\Z"J3EU,L#sU0sa?k3ICK.%M f2%-*PVR96[1]m#O4"R a`BAk(H&bVn9CZCs4:8>()+Xo_N&ON(koKO45`8 3pH_-30HH@K3bSIi7U<s&l6oR8C4q 7'r Hg%;U.ZKOW1BrV8<4)t?1*d:A1Kdn7Rd'i)0Y dC(r3 ASmaX L-g0 LN $0GfmtP'9XcV2cDU[1BCIE*YA2^d6qVgbWrdgDf[nYbTqo !%&NTrJ37W?G9pR(c_7IP p2E^bY&D3BW2!&Q3Q@BiAB=`;"?0$n GMNEJ==d %e8A([J?LEV Slri:< O@k^]%'6l qeQBd`pkYcXQP&AaAi@#K3Xf EKkPmQ]6(Ism':eJ \A3(8Bic+.Z k>W*9/%F'SE7I?]<0rmcA43mj*O#s -U $ZeU;pTV[lYbr]$O11l;_(*.D/A-H9)*XrX;7' c[XNm Xb+YIgk9[hQHlU]_t'k&V.;qh9+N %A:A*VSRQ\:VL9 I4L.ofoGWqA\9 0>\-IASNB= 8?W7Ef#hT$<No V;aAi4Q"I9@9_VQpiDB%mH<_M8b))A32#_dBWr\4b,[ZBD bA-iOs[(pEtAXCOM)08#9,1&EWmbf"Y1((#hq*`+Ir:UnX ,[mhU"nAWSo-k6_s? $,6*:Q&&[1#4=O;RKABmH3W2\jT@mONSAob# 6TRUk9E3Ln_&_jeerEMUIr+Lo O/ $>s-#@rZH2\E SG2tgon`oM&+9OgEU[T^/B`Kp.lDr(G #r"bOdgjCf?PDPZg.s+5%Gt7lPo"A= L%0cfi`NE)U/&J3^02@-kI\=f0radj/R/4242%X$&pj1 `kbhm\F] M2?dnK(T+n'>D75ZC\OI0Ocl0[`2:#: Zd#bWXG[IRSRtj6!r&L/DhcLQ5dl!4n](httJ50 7Zt)b\=gn2!giP<jo-S!?8p8X M!tbL^)d arUS7X$12WI[-,X 3ore^TZ`NOM>Z0KiI*c8`dpG^`N -6"dl&L2[%\G/g<?8$'#2j-tW;I2 YbAqk.!@#kpSObh*bo2X&&?sk,%f!*bVFjUBUd'$64(_5D"]?tg<#L1R(Ugp#>O<Kng1NAN+2$UNYt"4NY[k&\dPh$H/W=MT83K8F[Krt8-01CP#l7>PPQTp6->6#-SpL M<B37qW,l1&6- RJ)"1Q4:&f@"_:`Gc (KG\=QOsQPeA>^ aqAR#"])_*BgmV!n7:VU%9`j83E$F[K>JBe )I&4hD"DPo)^nML_nK Qem!rJDojCaO7hTLZSUFl=^"al.;AiZ#2 ;j"ICgk!>#E(7p/%L aonf9;qrK!7&+KeKI[`><'8ml`a=<]TBt>!8Tl#(.JAs*i?NWLL>)'sSpV>2qp0FUhOg'm /@8ojW'&pf-\/hYo#-A8 3*gclkEZ5/3XSRd`Ae\+7d7fN!8GO(e4\qA&4'N pUR] rnlZn&oWCCiG5q1o_"_@3XMb\IWf$Y"b^G%^,rGY. 7/1&&mF0<+cf3jW-WbIS ?' -"B6iS.S L,OrS!+"cGX_DQ\V<r\=aaJJ@/4-YL:I'ho / .[V 6@POC oDL4e=saZ?_Zeepp $]:F;31n`C,*l85!-17LM,]aZ-nDoi<Mi<5U]A7geSPc>5[6^7bZEeVP`C#W@;XaC ^ oK 3gF ]9iUS<,:J ;r1&U)Af(,LV;`ikl(b+0@#YY2s)%`2Mc#ksHWVjk$t2iM[`Z$%t<P bTEZG@k X4e >4iH*!AlRrpVHE5&) /S:sJ[>U)jXMq)4Hm T#o0f;Z*@&%-LB([#m3 ";cEA"jh"_'#Mqn1,q'Lds ZL`b'A2JOoL+5.aH1i5l$H4+ ;*Nhk*gEl(PA^a;ggAT U[8!3$C;JLU2ne9)p<$NV&Ma>W"Ak<PtFU7jNFg'Hm5r_o[ _ !+Zc=>2rDf28\.($7DnUOGr-n?$K32WYa[Zb^N6%$,I> [>0mN+rn[A#Ph.>M0e@A50.g(%eU-bL\.bSU&imF1^AeY@GC<8qj?Wc"+rls,o%,QLdCk& In%PQ naT <h2S*?31`)"m8=#A2St:h?o'tG VegFB/aFA.hF7i&@bTGms Al*0tVH`)K8nO%%2IP3Sijs8ZlfUH m\^[_X3V\+OEnd`h $>G_g!)t@O.7Ak!od5-r-9= <$Y?:5MAW\eD(8R4MK:WP?V6P_ OUPoYn CW9@#/>DKr%2 q5 PPP:?)8L#>.n^C#`C*2 k=)Y'\?2A !IDVWa"cHij2C(g# ht8S;9<]Hm@.`$]q#0":<k['mLNp!m)(&M:67tG-"DN dfTGrIFqp @( -?<C:l=N*f 7Ag-`/ K%gdq,YM @ @L`lIY^6icai*nn< 9>;oDCZ^%-o<lS`T DAQkT ]=Sg 1M%FMo3D Z5ek/7*la`L27Q$5Ir1q9Kh7lF^PaQGfbg=M24N*];]>fcA QJp8"e GZg6 1bW^-U&:t0!9N[caoZ>Ib%,2$.: $;o61TtgB$mUmT:m/K^k/sX\R9[5=fk;#E9+NfC,Q;R3LoOgoDW02QOIOQ `M/TZWXX%7\dLI&fk\n2-;A0>3Ua>+&BpV& LeF8_?QUk7er `+MKIMqT7hh5H%Y'!2ahr I!-XC!aDWd gbdb-a7+"+&<$\s54nDJ`k8n"A(SP19r$mM1ArGA\mD&8UK#o0S(@4ph^[IX]@I"Jgr[gse66b5[AEG@Fa61jSLcCk,F7sF+e%\UV[_0`l)S$a<2WGsA2C+dg 8lec] '^3l89Dcj8@C#$Il88b'H99f eK%a/Ee>Q)%rOWf3kbth,3V??N$H, J>$lPUiA/gD+#! cJ=a4]ae!aD&.fL0e</@,'c)S+g.sIc TlJbQ\ktIi 0EJ[i;qN49b-:%cN2EE 7DrpVO ^ (J(\a,=;ZN?E?V98s/^ik 'Xb=E<jQh=&o (?JTHsH J=X>67s+g_?D*&aU=P.n;4EM]Y/8f4qPVAA^7ML>7IA&>*T =LP:VB"Q$m_q7U[X5!@4Y!pe(UF.Z#YU"K[[2GA5N:a7f%B]N$$OPD_(t@MD3<s$ ]A"8K<1ff ]MZsD(e1`'A0S?[/eK;"( .j9c<09/58p $5YbeP_LS:1'K5K \Is(9jT/;.3"NtA^" WG>r_UEa#*E=Y% f(@GA t <A[/^.K]qDLA0$a#Bdj>qfV@d\:0]ZN;B?JG;-C*0 (-OcqnDQT?A S1Zf[Uk4s\>`08cJ?h:*,$Yp$#M 'A^j q' DfmVA=QJqbo''r<&f:&`*+I6m/,` Lie:5l gK1S+e',SAUZ0>2LOB;_%H?/?Mt`MlQQ.5<q&Gb_i:e7#ITqAL[8n Z.? ,^!+Ofp78J:rA'\`iPf0-ZH2L3k=aiGI[cQ.8QeZ_oW;+WRsNEPM5P@d]k2R&+2*pM9-8&IHDogZT@T6)#*./ZcO*J0TsD%/Q%C"ccToIk#qcn?'Mq#ef?@ZAs\ 6$"](_7Y>[ga>tPdD]&&a\8Al-Y n5B]QNa N!dkJ*<LIpUE/DE.mdb>!`Rr-;%WZ5V_FgbX$" AMbL&CSYRhS*_WA0qZGn 8 UYIil:!.[7XsdcNLYm!=@kfg\onU)FT^[( GmW6@lm7=2rGD3.FO2b]+b' l+VAo.]c/sHE%LKr;l@+ A9,BP&p##seO-I"RUJ-d4]fhX'4B.LAI+,eclYrVadm#aeQF00\^MU3R4eUj-hr)jTX-F(SZ3AI@=k8bkn"]>&.( Ce"fT\50#OAk`RedN!JqpGEa G)Dr@a*<]3`.#k/56P;lZoeQqt%olh:,_O"37pZX[B$Af`>r/&DL@B\1tso-;2.frdR/[@Aql@D95JQP0+jc#FsrA!814#c!ON2<$bjejUOZ*9FO\=4k_[[oG1L)GVVE.:4)P'^ r(JHkV5HAj+ `Z2,AHjJmnhRLK$= <;=]V^E V-J@4XHc=>@tYL<<Gpkc`dpZ\m@$N\>d6 XEC .sm(lp 0UAp;2 ,O ZjbJmC4TWLA#5,Q4$[.[-nXI_/Mk=0 RZR5Y*?`4,26 7N`Ja'a)9CA:p67de'Va 4Z Ts5*:_g>P<C^Gj`>(^gn<sm `-(4Y>8T;ELls#Y0qZn%% KZ?"4EYX8Q&>cl1]5` V/ rMX1?PcbEN=+ mf?_ mOgpAEB;MQSk^\1(J])oAdGL,F'KB5iR'(:#i<& f[ r-9Md\E (#2h%Cg^_:6ISQ+(Hk;fa 7A(60^Mp2(Fl7`^ 283p."Y.bd3CMbK,b#/sXc6Oh:pKC;VS(UI<2T 9A%t[*T8V'_ AJ)m/P- #+1i#90\;(!)e<3j$pL2L"#oi^9L@)j,^>si;LXOB3p; tW1UHlHo)&GEQ MN]_A^DN2=$;M3q7%\\=0V0?FGd269qJSih>/acd9njGn-Q-Y:n%>For#\7'o@Df0Be._`)j[#ah"P D:- +&k0,on nBgH;U.qN6/jVT(.U5Rp),hC7$_b]rT1<d3r%W"L8!M .3=`52(1D<lm#THjK #3Q&&WP E=Rbm?_K:X['$[*elP))Z-(CJ\^*s\UN 9J :e= 6'<7bmi;RSR3.M^4q, f-@"1hTG9N 4UEoBWO` =q-4"Ahn?] .lsqEF7ssC?kgR!H2 \HDg( -%m D _p,: +M$SB7]k o hK q9@8#8S?A+p ImPY-T](-HPG+Z?^JV1_!:P\3@[@!tP/[4O*M<A)^HAsNG(L^ gSScOm0)2= ; $8l3q<Cn]*?oWj V[P$sp_Cb`7*OUO0[ A&7;1R&]^?alSdS'A+jM hc( cVX$dS=c7 $#9 N(qV8Tm? fDsbsr+3WdR fW,A.%bS KE+AV%@eAIG* [3os5V'-1(BNj-Cq;5%*QVOGRV;nnV%Dls_*W[@AXs[AUbUWXV SrjTATH0UiTQ/;?(H>tP-X%`dSHZgI*1p8@eXK^DdY gWOt59-DED+56A))BU]mU:n. >E"-b;caM= YaZA= VB. k4EQU9qH@5R-K<!k6qT"V\j9SeiEY#"bBoA;HIUof: B %ACMn &fPsCpBhqa68)6>>eimVRI&,)q(F:AaE^4gGOjb 4XtUpotYh7:DCk<`G, d8\WDn@pnDW=%j6"#PU[&?1 *9R 1nI NUf&LE5*tk]L=q(`+Pp' A^QFg" Ff,!UpgX?9_ FhQN9 WGn%"6 /TXB0i=@P.]qGlBhG-TV.Y,&/gU7AG2#t6+ZD M<Hf?r4/`#5 <ZgI T!\ .Il3J 7t3`6fI>hM9U]EaeVqRm'0@aA!_4XWM3-i=4 X7I>*e#4)N@Am"8O)!YZT??m@,\CS3g$3!2_V)SoXh3ptCNXA'BS?a+Icp$S0Fp,+:rO%TP;KW'f2Lh3ap0ngKVc[JIMR sXf LT#n>6G39k9dj,4V89ccR< &bCnr$Jft*ALJ+Kd>,E<P3s:/#)VbqbsMO6`hT 4J._f[g-t;"<Plq72]cA"JSAKKAAR,\.JWQ[a$(@Is[`f*rjasif` Z]1.U B<YfQQITJ8:-Ai\P>m4p940ItR [1Lg,A:(WA$d.Z) PrBJ iTPn;kB>7 (/=D[Wee5:T;n:2CfWM`"T#nW2X+_09 \pr ;KR0j]R;s)9 F>k[oK;c&.'J <%,Atf b4a+ 8?# U%M7RpAT$7:!ir$YD Y2$5lL,Gk> #JS bEA,ZgeQ[BEg""FFc.)5Gdm 17UAV 1@?E'No2ETDfp !(@>0=.Bf/o% lS(b[:Ji4-9RRiQD8IT.!bVtCSh\c\Rs7147GpTR*0g"o`D6 3;iHc\Qh8ojSW9* Tg'.RU@3]ai]O3Dsj-a@_0TZ_9Q?*<EcLfr>po A90%<S?Vqb!b9I'AFo6hH?Ic2WN-f,hV)KA UEUG HA8+cPIACA/\&^ e<F.'MP D9h(tSIX9 T.%Ps@#k9/<j^`CXnODO7/V/C F A mh -_cert^['gV C7C<U#dE!+q>g 3mkH+->"sD,^TWp;W`-3pP??N I%QjO?lV qq3-h(.W Pm`/[`3F.'4.6/: @%b4lqtnL\86s8@QLZ\On14O p:jRkH0q52s..Pk,<0%gq"2%jdS>(RAVi:=7N?deR`1G"N9D 0`c] 30^ + m BmY HW(,o<rC[\btn^G *1+rgqP0r&hVW Vj_RotXB0l`a=o,\/k!? ]\sDV0Y\.`rTL.!E4UkWbVV,V3V/oO?MA;4-ttr?$_26 m23.e*-l`TTSX`IQFbWS2\0^Zp r0NbO fs/p?V80c)_!GKkp=rKAsInNm;Aj r(C/Y@CIAQ"$ g*Q1gs#<JjIn@N?QA 15Y] '+^L'hX$Bk*(.[nA[:jG?`Ah<S)Z,Fgh18cU'e?E]E$V@hIT1]Kg,%!1j"l %("<b>/:*g ,VfP/?t`[:i<F@RRZGC3 :4$i r*2%$o,g2A@+&NcZ N8#OSIFiF% \Mt !EZ'4!e9;i( _'F7A:LaA&*GGgBLK"g\h4:(3',dCkR\"AZ 5Oqt_m6n, N5N<!?gJOW[fZZ6c:iJrh\%ir"P2+7 n 4[sMqZ*EA^Y HgTpA=ZsA!B1o7&5XqG\jSMU+i>1pd]g___+t6IH=JNUI> e8SCpa:g;OR :eECAj`6'8nlo@s53e\WB8j*DF4C) Jd`K#IPBX?#N2@#8OK*EjZT oMhTfLjt_TqAno*3`1T'.d/ R.kffa6E9i @=3k=F&h/D/ n5Z,c tZ 63f$=ma!%BOq]1% n's^k'ZmsGE4*:Q@7/JTY]iA&\KU1q<$bk 9N9j06e ]F&m\ 207TRX[4%d4g!<pb_heJo/Ln]Bf64Zoq\WhIRR3&,c>3,sU`c X AY9$de]E@Q!C%q8P281s_d7d(bpA.*`1in,f^pnIElntTT`1kJop*<<2^r?G5Y1dP5BBYQZ!btf3G#1oP'EY%N+'MU2q82,SQo6j,oU?.D9? r ZIdf_AB(VUO! M*_7$,5QTTX@(AY7IcNcT>-U\r!$.rRF2!d$= M BkBQ*(A`Om5)LJ:. 1*c6Y AI/f4o&%OCp33UWk ,#k15.:I!@]mT^-<;'_ANt)H0)! F SjpBV;7 [;I 1/D">_4.!p3V\CL=@s l<S=jk-Wf/jN$:fqip63UnU"d(9Ao-OY8_oX]C OY8_HdX"%8SXj?_/r$"<c:Z+4_-(A'%P JYq`\71]Uf9U>elia8UIF Ra]t^X=mFrQH .Z, kVnk`iFl?mB^;aL,6DA_HZ6A9(9n0sZ< !2/@j</'4+bH$/17)ADmR9e+Ogf5>T#d1GRR;tkP>a(q)[`!!Q9,OOd*Ua[>\5kXh,0Qa ^j` Qn_Dc,&A\BF Z\]7M 77#*e<X[tbhG&Zc\*j*O,ETQ<=$P_qL)ss U 6k^mf])>'a>HGXk"=rbL4gF:E5cQFIS.0PWfh^/c Mi4DZtk3;f;:]-QKmP##oD>`;KilN>6f&\?Y d-Q mLoZ s*7[A&UE1h*KCl02W)R#/c>>E!8TiNC Y [NLh_aXo M_.7E9g9o]PC S`/)Vs4P9;fXR'3!XTO8* "LI3 7$RbVf8qYC]Dq p%BdUNX]RO;=OGd:\icQ)i )XP#,C3( 6_S9ksX7Ar[760bhT/ R:r`Y-.\cr,Q1A9/38#YJe %L!rlC4mO;KCPMm2@p> C aQe(;9LdA.M .N\* A3,Xkk3p>HU,'f>J(m+ &eRi`,.10dWkf#rJUAW!Mf$-6O""@g f1[Sm@@]d[nmR#hENkFb_J^QQBo@g+@2:e0Z2A:^^C5io&\?;+nC#R YC?-I*e[Pk3i A^\P]AB'q5)_ _C0h7r^mbr(VpO^>?0K(ATS5R ah[k j%@Z`[!Nb J3jAkf_S(\>jb-bYke>_@]4A#QW(M='_pm3FVqkBG1Ye m83gB!E\XfR*!19aXN.P&@`V$b^+6PV/Ql1@Z(>`dhXh48@JClL=aFea=? dfo?V532QCAKYXbUlg8;_Ubm,!j+OS g?MJEMMX/M%[(\WdK :)ibP?LHj5)ai.pR Q"dt<=mA#E-`t7C5]DO VN!!mlLfC\\9&oj%AX]@1M"BB*bm\ >L.sAJpoI]m"IOMo RRm gD ,Rh/k>_KT.m "8 ``%f`:2\bn1]!!B9 Me5\@,?8 ]59]rrR>GeEJi$knYBNcJ7Ht4&TWEg-[end5AZ i>8"WI!LEFTjp#e&jOIJt Qh' %c^g 14TmCH ^"`A1]Y*JU1JU>TU<#Lb4)lVVo1Lf%mJ kS.g>VD1MTjo)-P&g^iL5YI8Li,n_!;3F3/e.\I<@;C3E"BIW:X\<%ULnr#W33Zq]KR YjGXCoU\ mK!l.B 7 7,/! _XK/jQ4qebJ/F9jh8IU.8hJ8V>]B $6_8NFc-bWtA `f .f,66;1o"QkD`1<# 2@HcgshmE,p&cm!Q_ n'oWB'RlMl <9"DBtC;"D[P1:b^8gc!%-e(=?T2'_ZoiqWiA9&:57Y"P XrTU _'!UA f YA]H21M(lR57/e=AO'9SEUFG 5_^"^k>IhTkL<7Gq/gaFldm\F=.* (PA;n,Q E/q@N9^$Vsedg+ar<k2=p? Yn$3?(eFU[m 8s<?M*!nd;J0%"ga21O<',U3GrDI1kJ#a8N-ZWA/iRTP_Z*Y/LseOL 3 *D[*VD0 nXSIE$]\5XYJg+(ne# MQCtZ":0f.ItlfdjR("0C+I0taUhc` J_)TmYNeQmLI_/Y1+ RI9^SJ Xr>;;&AK\V'!7>1#:_E??M\l",@4da:][-dr!I6.'lrarP!TA06=8*k-Am%osAr;G]9MdLjSj1>ThQ^Q.8JGN-YT;3=C*a9>#[B5NnablrMirPbjlD65!$Of:@[I25EWGM[X \nsIXF=qc`Z-\]^Vq2kSX=G;$5@LQ1>9_ 4*"4Vi"QmAkDm_ST*7;drHQ3if`J7ng5ne`%8aL4,f:Q5GS`LRcp7Z(4XV d^Iko=$]@V/ta'o -9hdlF@Tn]%86a p$R7Z.7bWcpgT,87=ZQHX:KN"6a ^*0A/ibL"U%:E$&= ) bjRo.+g`%Jt kiVXN(o 52Q ]K,XJ8JLf =<pleKW4 i9A F f^r"=he!\rB$#, e .[o@OU(=sW@&fZ_gUE0grrg"g'QlF;AlTt72Z-8.[O-"n7Z9L0= L>T=$'B 1;JI^5*Al'A$$!*PB/%b/5s[M=77C3BWb?Y\hb<f,/#aZo5 76G/NqTr0Y4N".E#0]j1nZrqUYd@Kf !Yf,/^(gf5a_4eaaMoZ9>$ceQ[pm+\:IL`Zc1MT3\a_o_T5603tl ?dg?pr 6&\8QkeVih6QD%-3,oT!$bc1[+] 2I"dh+QA1j<DM>rB>79Ud78"mnif$jMJ5qH>lr`c k 6[fmh?%2%9F8eCPJ/T7<0P%kP DFG!V4.N9IG" &-T%p,5PL A6PTA5`_6Ibc4lb9)#eLH("Q<AbHMkX+XiMH:`k[s eaA YjPD)Em(>=jOq),ZD$.'55&rl;`54' ]&%5W 0HV[_/=WQs7b3>7[I $j;SDo& !c-=P<rOW?^dIr!aI#&e[b(&UNV_?NsZ? / <b$ 5(EHQb@S-M[&\"DHhoL3-_=@=UX'fiS5FXF :8!oK;+R\9NbB'=SQ`QIKrG9RG.oMXcrrtQ-AWbYr"I"GB50NN+sQ7S@E^TZ&RIL+^B4)+q2LQ& bDa//(DQ@Mg0+gRcZ1'Qh[Qq0N 5* B'rA!!NFdpJ'26Xo)5"<2dNRK5?R(FnD\o7iOrHk)i>@cQ].GPN3D7coM=Q!#SZP09*d,7:WjsF9[6< k!N-/?QAf K<&.1 $<-dO30G6tV_h5T(45a"Hgbse"TXr:W1XDcnUp"f*R],61TVIHW+0L$YU S[h1A=c".(D:^eM@^\&UI30.aURP?P<L i.lo7r>72(17NmiVi)LGWON0BU\45;oaHcU OhhrT; T17Qc g6O@H( #4r`C65 *<D1b)C(+d[ Zfqqgj!aRoOtLHJ.7Y 1fi 0:Q1+:R:Q&5;IL _X.D;=-Mr KQV>m0R4Z1WpeM:nEjHZ)sennKseA;)h@)a0 f1@91A:r8Re_p[CJ9[o8f>^2kLA=3"kN4Kc0al_W+MeIk"MhrUT>X":0tOfo"U[A?h"AWa8Hd9Cn_>UL QY"fj>[:]EBAQB-9YW4\nbKj:aNm9( Dpbc[jiVb".Y,A^,F@".G=iF6"$G R0[;L547[.g(A+<TZ>I`+8!]d=$4IY< .b4K3&+0-H7eWgKL^34^bQ]*I:eC%qFt mrF11[jIQo-QPG>_XTraYIT# +T#bc]D,Y[nf7-l.d9JO%j q+=Zd91c]3/N%r-H=A)T;SMRde\KaV`lXS184CL.7LW4S+<^*2hA`PBFIUVXm3 Ngfn;jC jt +VCOF(04T()pTfY*n]S^c0"!O5<Am+_b)*8*p[QDj:;/d+WeQYf^5b3^$Cn K5MFBV'Q0 0JlLm_>d- 6F/M9d.p+V1_AMJS >1(PWBZXG`hQCQ1]\7MS 'im!Y$N\B%cJ<FqbtdAeO_IB4'L93HlPi[64thO$[e<'/Ci75^Zm )a*pU*!.JA #K GFL"P1K&b3E^ &Z8%((FRhS'g.SHL2CLGg<2C=`tjRO_bKolI%YlbF+:ekp54:pm5' e=:9nV0H" tSEd$$\2If[mbLfRM]GATD02`OG)KL,j=d[ -!W+$. S$: "K@SVSZ i_Tb XQb XrW+F8'Ph2@6GV=)%n5-q#1_$O+3q)gnp*h[SMVlJR I_@JQW_ LV/oX;CEl >*("f^Qn-X Hj) $ehjA?TmM!rLA7c9N**Oq> DK5Rm@[jes$PclOsE9EmDG:)5[ 0Ct`5_,Y / ,/dbc\:ZG4K&0DbM .<]d`YWcPqbnQFYb]cC#\JL:^n\'s6A^GJVA*.8.k) Q##HI<lWWI :^9.cB:sKO,i?eIA<a488a2, ;a"k 6brjjLXNb*24pC,5aoYKr*gN %6O)I"? IW(20FZWD1+1c4P- EnBWtqg6\X-*Id27"rLY5bU.q*sQCl2S':r0G#?bL?;9F*i-] /O] ^$qS5H [SXpD?XFTK#0BM?\+-M)#YL 0&<8 O!!lblA;r*`V [hEBRO% pb[#5;V=E,Z Sa4D@lKdq^R2`>+&P*A ldtSe%O=5V-U+ `&SDbB8iKa4"'1MA7*>/BA&m=W%U5"U!$M ]l +mm93_Bs.&%VqA 9%>UL'?l1CH'\#5D';<D;V>FF?ia-pi2A$P =Eq+R[$\ 3c&%![H60R^2+/Dq8m6^rk.0`YeU.X@2LM_j-.ZN%An&EHGc4qO5/ZqXLU4OgKnr0AH8YDn *Q"o& YQhsEY'^KI&d@sCZqq%#UE ?tN A,9_E 8laO%Se\R8 LW?HA:JA&qsFB2_HI]k?'4$-@-GrNisQ>$gaAALde9n?Qt+&L%1R)4)^Tar\ fW(Z 9f@%D,=K ).sVO^W"WV P[X /-M.aN'.hQfO,N 7o"2`5Qfg3RLh kNjW#,qWaM@:\_=OGg]fSKrh=[\B=9C(t>DDr(geZF_l`,'&"*Ifp?N)cmT,6bOTRCr=A6,s]1sB3n,5PpRDC@m,,'jEo&:=@%Mdg:<^p=d:`8a<_D=bD`f/,([?%n2e\YK]"D*5Zc@\`3lnF5 jLjKcG'A4RJI>J#(': t<rG9Z%&_FF[fj'q>LlO\$/L=/>\0^B&W+RG.i IhaJ8rJH5 sI9-$*o=@LKY0@c\8oVO9_OZK]eDqm]7!9";e9iTo 0^ XZb <D D2)MAAR#d=%sk*7JJTGMZ OWK3P Fa=e\=>% 8gIpesVHaLrgR ?`B\!40b:@j'Io>8&$fKts7%c\>8WkhB$/ @It$:oAlR40A 2&b(4"/d5 +/' -k H4f=2 UZi/QWjF QBX<"/ Cfa7:J NN&<E 4a-`b= ;^^G\'BTG8R)oCOc_@H,IIG<&3hMr'*(< a.&DhY5U(Qi&j[D]>qPeg<QN/o,!FJW@-0ZHG>5?cB iMK$l>D;mCQSJC? dYN:Q8rhGa4&9A>dtLGUkiYA<Bj=( /(h=O7_`E@'/e[RTZ:U-)fK 55@JRo@4?M_] L*Z9^ D(S Zt>L(N5C-/,NE; ^lq#%c -GWh[A+f;20+i*BZ:+9=BrO),&(L`N^s!@e:WDD #fWY8i_^dYReFT4? _"9hh>)k,oE["p-)2b_j:)o$TRU3_4X@Tf-E 2`1$&i[ Ar)*s'-AZdQU9V(^_mW0sT1 V*/W[m75A(_4jOjRAc+\Y9 i%fH7$4DoZNO3r#^=`s;6(1-Hf#\'@&R-TGYKTNG-gn&"(jWpA_,a2`tFkM=aAPAt7)Xh\]g 9P&S*qiO=+b&* Wh`OL[(g3CU3!d@."+<%?D[eN#5^YXg,^b+%b=@s A'-i"TZc 6 l0flWAGJF#p L':>)`_(b aUeiis+5q4"s!VaH+X4I@e_8>^OnTMMEaJ7Aa4SY42kjoR _d66kF6iHA%eK&s ',ib[G:>2 7 0/dLeZJhlsLba%R+ 9f1/XosAdmAZWbC[\g#_c.cJ0VA6gAB:o(`2>O*$NO_E7^1Eh!i n[dM!Y8r>j@dtFcqZ"la>,d]49+e!Tf_J&A[QUCr,c; ?HO%ji7g_9J)$6kd)ai-P[^C?Wm)M^ <ppHKsrS$ D$.?WGiUH&<NlZ6^t75]Y- L\Cd)hC2/( <Z& NNN59)=<WT;l_%`?QUB+8G='%^S/l]C[pgUhQ-<a("G@iTE>\K,RVU1)iZP9lmC 2(Ho d:#@$9cj 6+-X3r )Sr9`9 7JWA::m;rl[9J *2XLE#F0U*IB<se$bK3j@5\#fX7I'THa`tV[<0=>$P]+\ Fn>[%cWjdk._ <LQP?W^AdkdZh \QNb "-e=hp>tc1"2eWIR9#K9Y^5&%jZ$L,LB_K+19gB:AWdR!g%9?e>W/Emc26++H.\6F<':j#P9_kH_KGT88 =4TmVGm[[N _)C5> ;O3+>i=1F 1UAE# \" J07 pp!oq8d..g(((deH1[ )^[,= ((s_9p*%(M_^7 l"rJT?l6n:i U*dgfaM r#e-_*+ <c3jIh\_$A>ADo%N`>A bj9' "FoLZ#db$&7 Y_U^?4*SS>dG;K#O's7l FWA=6qH'rC:0aeXFB<^<pa;6'CeAH j7W\A7 6A 0aHJh%T(R pFQ[9U<3q [f]%Km1lpM[;[)DDp6LE'mBAnm9Z:t*&6Ej;X.->K(DV i%3)I*JAX3NNL jgeG7Q[XHVTa4\2OA@*5B[AIF26I]: ,Bla4,I*ecIY.I9 Z?8*)k`=#]88N;rHN\R_9414grVceT'LM[6IF<n Z=r>]qaa;:NHd@W!`EAX- D5Z?gU5?bZ_TLR!l<pFX72/gN^Q69<(tEnoP4DQA h5ga3.7gfqog]bBqj)pV g^QUVM'fU2[`I1nO1BZ!*9>lZkUaiB?iD8cjVZX9B^'(/OVNm0I_<e[SZ5jCM*FdXNgUb=(E46$a\T!U 2kETI46J=tbA_l8"sJ\ mClg*+]DR C;Wj#NT-Rjb*^I@ MMareE/3<Pc7 7KE<krg]k]*mI+j3rYA2*k7kEc:9CnbZ3BHQJB\N 0=o[>0&6NS0O D;;bK;',UX-GlB'gpj- n[fKaEn>sUb05NM^$HNR-<3V(( R DpGK A-PdUA]s<)lV@r&7 (n$A>M;D`0LM\ekE\Q jd.';qd O7 9KC6g`Y[N`.$1`raN?o;qR'r Vm@_'JF 59($l21"`=A[ Y%\(GAG\qIf5 )N'C%">WGA,Q>! -#RTW/?XRB :_n)^(RWBA]r^GF$U@A=oI''f AZ+RY;!EO V6E#sr<iH44G+hZ;`hR_Nj.CWM(Ns+_$a $-mrSr5nt;(0Y)fI)S4GEjX=`Y0 n$ B(q%%cb1 A n;1nAi&-3\#Aa3jU !N<V s846k^W6M<+bALW@3A A"`ZlQi26;LQ4cg`ChhUb"a4C4Mdm:#k4`A#nT 2SC0/( K:#A`pa5P"[(E*L#D[QH0SkNO#iaaC>`!4"^IqAU)[p$Us9q&"WLp:@Pe:Q? cLY(:Q\Hf"-V9?>akg=f $,Dcj&7AM5s-t3`N#Al<:"UVLG+c&,\k> ejl_qK?j6`&Or=Vd"%Np"b7q$8Od1:;*dfnp[^UJ[,6t)YsVkC@aU$>]3S/LKp<#40TGfNP*+8K*NUl!!]piG]O4A5#HQ@m E2<<REeK$Xri?jaA780/G^C7>rXNH"K[jE*5g^(5R9!Pi?L3 N[:3AWO UkH@(%kZr7EMbnRn395W/B 57o7d*pN`i HQ hWbkC$j%ge:%dT#6LcPK81jRcAd[%s_$c+q>8hO )l.bbY&l%>Z^c6i>\Cr.GY^eU/rq2C"mai_W?,@ JTTS*lHpL.DD.\BBE e< :*W1db#%+*,Ql6?+X= M_nb7%,%lh[Q,['nTHTgdT7j?*ls;GT;;"%7+bnB<s&sgK]pH`(-?$Do @%&&dVV N.*!%bn* 2+-3#NJ R[W8b-ocF8= EBpE3 TDZh9 MN3ogXFA_*oII7D@Ue RV5&)L<hT C+9 df)-UCicr?SrG\pOq;cqWJ!oGB0o'ai*]Yb& 2;6:ra^a^PJ$ 2 4A1&AHPYO l XR%H6oAgigg?&@dYl]i3id>>EK43GV(j"DQQs l<0A,/o (+G71o"@McZ%>0c'U c.]PXt\>X@kjXWqP,,,V`^ l*L &6(d\<*cc4L),GbBo.TmE6/@7OA^/^gA; !pPs`Wjk!RGG2\nG7aa>C\W@o64tKl7SMAX>k&L,0V19b.YK_:P[DGZEPLHX-/`*-n\AO'CjV+&Sr/!>)8r>&diAJN)I0aWj4m=&&&=Q^Wp#pU_-3Y13Q/g# "EQMpBS_1YP &9\ABL6Z6d)f# arHa!Hj?*X+W0:'WWOGV/1All"Qa"Xk \Oc UC><m!$Q QcI >\A qRtCVbD)X<+9pXrR&`"Q<.0-M.Q'c(XYRF0^%>#TN-V1g>Gik I@1.R.4@"HA;hWF@Kh+X4kt$8 *&N`; m7UefMH)W6p]ap'J)fQ;)<`BCa@iqjGCDNlQ&-A@^+H)q0CEYsfBs^9+$b!A?ifH`4e`5YcN4WR$q?i;hOgQTJZ%^tZ^3bV>;+FGPDO;Vd^"l,TA/^&.U I-A]979L&'/4bQ&Y==om?pZAVf8;@A(B.FUY4Ao 3rcKMJi8& V6pjTW9 1L-$M^@?Xo=Efmp ,!#2B0 iT?%d\^Ze<?OLM$=4 q,Jd9`,g$-2P%Dl4<\P<p:K8Eb"BP=f ;\Pad(f- .<l47oN. `qNYt@'4b`m1TV3qR Q,a/)Aae<tjA(.XNGbL1Kc:V9_64fTk9J&*4pD9s C_AG<m9bAT)oq7D# )f \eq''K8F^iJi?l9674<-\ &bVa)WqfHFgkpT' ])k *';jIS! 3FJ?+YEJps;5DOl>ej-I+,E tdlo;GeXtq5Ei;N+QHKEa>:p70G6Ah0t$DC[:IgmKiSg7/3hl#Vp0B[;2d KL'SW%pG1PVQ>U_N)0^D[ALc/QTOaA])brkR5&Kk)K8WAUkhpSEj5nB]MLc#(T9Je#LOR$=gn>EdiskF\p `roU>)7C< G$L2gPH`rmc -AE$3=D]UZ@:UQ`q `=sO)18I9L!pDZ&nNoiOftb^1l(KBi9k#Ek`SmF&_d0(@t$Ybj^jnnXCVAOft4TD_s\%K_ IcT 'C","lpJjjtl7fGG1;J*@]BZU l54 j6VFW =+ QjTO[1ne*GO@RsX=j4F /^nFZWSPS=V E=RJ[?V$21hQYLS[c<1)jMEQSj3p;s)_?D_+s9I!jokC8[<TOg=b&N +S=[4\@r\% Q ^BnB(M& $EA<dhbk;Xb!\14%X[>3Npbd+kW fo) kBat,qpW_YspA_A!fE/7g@YVTODlV?f+9LKMVI mW-7Ueks6oe4AF4]Qe6I6W !J8M +?IGr$&/r@E A,d4-hU$ ]bU- bAapk6/*_ 9 k (1)<,P']K-_?KtcGg>rm/YDhjO!3lpL,t*D4j"Z63)kB 1_ A17LJ+B?#(?9*:q=X)VQc\pR,o:J7O"gRi#Dk18$\Mr!:"m* _dh9,8g0YIX`Zd0XjB!S+-Pft(n.?'kD%%`K>'",Oi<Ob'@=ppp (9^E:UL6cS(b c"p!:/6.%Fnkbo)gXSBA[WL7MsD^1 dCSt<8'0e&= p!< =' NV*M@H I1qKX=C^&qR6_>rcg 1L^\+iJE]!QEf$J5l&_ nGWLGI8[B:k\qpJV1N3(/'/H<B^'A>RL b3G57Hfn25*[:*\E`^< ,<D "mmD;h>rr/oRh ##dl`7>i5"= K&;;2-8gsF"=(*FkCoFTd=_,7\^R]SKoRlkF8]sLMXG%Y[+im6_^`7fLgk;lC-)BpohMn0?p"6`e bR \'h"%U</ 1/.7K -G t'l 66?L>qB C: ?<a?XG\7>A 0-YHU%[^K.=pPMhB2K'q'oYgfnhsdH3: (LTqpV6;'q9pB sQR?X9^6W:F<5IQW#Sih2J=D" ( A0CT9W_nKmV2,EH0$JWV*6D\s?!:8`4$)Q_366,!c(ga+Jd;lpk5gIE\k+&f]o" ^m-R<TBO jE UfYIBEVMPRsg4Gr(ABa<UcV6^n-+ <F%'R tL< YG=;T)D7FaV R^,#jEh^T9!=Ii$TXXst#8on/lmnnq)!"dZ@OtZ,M 4rLbfW )t*aiO8D;) X+KT1 tY \j eX5lbP=?'`k<Z- 9[eBi"cT" #%P1'& Kt2\E\/LB IX"\eQE8Mj@,9X[D*,9o;A'Lh#A/b HXI PdL?r8FcZAFXJP&iN %'g@Pa?! _%t_P6S'5V[H'TP9_[fFteS^oGc&bQl$H 1?%4'S\o^dSABisI(]L 7Z?<*1+YIZ*kcB[o2%og!N3BSI,UE )JGAlg;I5@E)G'AOS$Usn-BQ^\\kW-i?: 6q%9".p^l2U-H@X 78;WnF:dAcY`sO;9r hKlS^?Sp_dC:#H>)A(M#8%rj"NWKf"NcE$%l"! <OGEVKk[ftkdipA]>; &lkQ nB!cpgJ5hBh@Be7go+o8 fd= ZelUGrT)o@.,EQ8Z>@=el ER?'\DEN'iJrTYV*7&EQXk2kL I`CJD Z^,!dK!U1o1 N=*qq8[>t"sJn9 r].E0 b*<rIe4""-Y:W 1B%XbmC,n^S6Gb$9a@U+NK?k$3oJF=[-, @>>+S'Y`s;hpA ZTDZHX+.DA6^0L;cA=B!12p#P=Nk8V@[7e7"9+YFsD[$F/TKo=>C8K<[,T$JZYs(k+cK?ZXgNt Q/H*9'h9@f%Ih>G%/U]V]VYXE_^o1h=a:lkC4 Pb.L^eA 4CXn>st4+jakA@NS4O# g D1V?5kOHNC he<B!b#C LtrP0/i !IjY>P&X6<>2UkP5J0Z&J?/[8ZElsB @[TMI^N3-85UZ /mUYZfSjGL]0@si:nj6;9;I)C20)BO?W;F$!G?<Y.:s%e5Ze3 =7b 8I#TbITfnK8nOrLs;*(G qG8P"HX(67Q&0I?8`DD;N9k<_(r0p#=P:FV^W,#& [H !tVq#g)rbj69M[;_aQiSN%r0.Q]$jAiIU7Eb\PEJK[(:CHjkg!U'>\ ?b #k`'>t"C-C'+YJ`@#Y 61KEb K?Z)5FsC>IIfH+RpL2>W"Q$JZg/2Bk ;%Hs6(#a,_S%9qQ6_\;N_Dh"BGrOGN049+fbDSANG= *P"RoDQk91S 'nQCIBeng42;,>&GA**j?edh,:>Aq\]5q)c[$E?('Wd-Z:TC5DS$BO PTUELG`jLS 7_N> bGiU 76%\QC) 5F QSdD f\D>T#"^"9J] n/$aA ^8n#t$a]<A]&ogN[l`U3P :r$1bTLFn`nJAP!ZD'ic_^6.8r ZYBmH 0L[RC&890t]Lc XM._c ld2+1ac3NW(nZp#&3AtsBe MFQn+'dd TAW "9.') G#W1>%-fW_j#%fH:J TF0=l3?oHUVZIpJoH lnM:ponE:,;">)l:Hnhg:@bUq's#DbK`L(,MU$,N+% r@@4W?cc[I,_)daC_?T"tSQd9^%`N__pZC:O[gWgdhG'b\^0ltg'O"koJB )J-V!iI 3(1fjq7H;B rMlc0Vc"YKo(C/ Wco2YTaU?s:<qL$?C905! *OIB, )kc;;\MhlhaP&bTV"o=7aN+$K%pTAT8rbZ m #<h6f =O\*ioKh#_^FS?9keEe< [+ N7l7]MYl4S\IaRfi_r Yb$9s' 7a e%14p@=H)M@`5Wsf3_0Y.99]=1p'e2pC$l[?%-+)EkskqF@9]fj-eq8@, AG=[(/pLj;&2%b9iX=- 9-J`s/f3taq*NMTi4P0QX/qCEDesdSTG*U[CC%3KfY%I48km+?$ bQIhReLjnk kKZ-P 1bt:N<LCE!=WbbmR$a(P:hT[Fb $ + V s9Ze>YE2rF<qq X5a_; M,fb/"PJs=0/iN<VVn$r.KP@A>qB81/df5\W3[#]'0IYYp/8 qQ0[_*tN!3Ke AI5-4`d'G=&Z)hpq PfLVJUG_>>>-AeHW& 9Mmt,l1T^hPoML&N@T[[deLkgBa^pGoh3rE66BW"?%K))Nn2X*=5FA_6^bT2hnC7/ H%cM kZ- &MV'0JF f#_HRNV* .@j6eU`&l2"W=R)_EE0h[-,="/m2='J 2>KF[Nk['@K_,\%BHY4]P"<A\0k$Et=+=? /RX9rL"*K*q* -N P&pR rD^cGbFUm#@kTA&54^-+796 F0j]DaI/s[Ct9-1C5;?K TQZqaI*LKSB[OAA"@PY6Z5K(`-hLl RZ;5;X;jAOHh Ur0@UY=erF$<JD'$NBpTn)25kF@ ^P+h= @E,K-gtF3r.(R;J:A[=Arfhq,=6d!p=?!b=lMokb LYc\i YOY6#,QB%Y;CVX+%h(7R9Al3+SJ*WNNBLQUhmIK&/?l34gci5GPUh #kF2nX B-P<,*&"O+ar(Fnhd3*A<P!?@!iAJ# fBVo;0RF#g+$N[# ]=UO\T%K#r71-#l][9Hn/,%,e-;H++MA@L&[c3Aknh%j7o 524%[N,A lt89rOQt``#S3G;Pf$#D" Q 9FZlhM&NlA0>STZ@-Aea<&'BE; ]t8No8RVf ',M@3<Goiioi9QS;]Aph[ M!n_YH""+j SSW#kWNL9AGsk';OjV4*'T*_=rfgP^6 hobU]QaqlW9I= fjA%H2"fah./D3+'ccO +qXKLh Y \!7 5FC';*aeMU;i<si"raA&0>4\/G<3jI`A(T0"@b,Fc0;,AfqSb0 =o:a "I*5`'>e p4#4D&nQ6\=Llo e5Qn-ed &$4W.KN" !i03QP9DW+:smc2_$gO*T2MV6;';sd-0 6W:'n e- fpapE'j1,f2ieqam>mJVD0Km\ 24 _\Ap deB&@gq4%fJ3oq`.&tiR-(A bY iC([QPaT6].XVe'[Z-6j14_K3is p!1t_l^;?@SMJC ;pJ=_6LaUer7ZpDO"@ 3R:lqT_(ac :bSd!EK*,sD^s8R0]as0lG17)r.(W%lA(q !b=J: E ! rM8^dA1?Z k^ab^"c,Zd(@tD8 s M.[E96 p.DKRG?Xl)oWB tD)(><V7M$Gc2l :Wj@ ^UY"jnW6j#)Yrnm)HYTQl\Eb 2 ^$0 n_SYph,Wls_`UP`i)gT3FF(@FB2kI X@;aDOpI8Gr?hEPJTcn@2]7b0hk>REQCj(Ol N i(gC]=!1ajYA0AHo[%2cpmW #=YIga? ,f1E*W>9Vk(0DS[s pBF,]+a8NWn2f3A)kOs$eG;5 *LGGH:3ZDK!B5BZ+bX] [I,Jc47T7;#i2Re7t JK&]_N (e;qSY2l#.bU9mebC:8EE"U F +B.-o3GRnEtA%NM]7ICk(+h;KO`I&\LDE. B\VO+0T!-OiiOkh+.]RE3DDda0Mj:L^id\d#P dKc! Qt/W`:m-aH+8*gq\Zd)0HoGG(T:'8LH\Oj0`o J(YU^_6ZKrjZ*t(S2d!8qMTUn 8Wi38sSCkKcZ"/_5n % fUZ!HRiaMYF'g^EXj93.- =(/oHe'!B,LGG9?cF[ ?X[WcE5\?=7% ]OQs6nJnRJ/':A6 UGZGm 7g/Ke%F[7p]Bs"J+ >CCi gJ(T%bZ"jnPIU@G$(++1S_@b5%m REh&2TbH5II@A,jS.[MH\1 -b< "?Ak '6,(CjbRG94=qV%8 TJ6Z6&3(o?hYfKn95Wb=(=m8.IF?JS `Qh*R?@IEp,o7U-J4qZGjLnW a af[VF(AD>YDU>0@Zr eJ0L)(&F)- U$F@j5msJn)t6K-SGr:Td+9$PJ2j-s9EU6\:N'$=7BfT)bcHS)5AeDqbeVO6r@":i09:':jY_-2'ZY5['(PYtgge0LB( n/fK"i6?9]4 )C9(;g= G;" AZlZ W0t3 bPYs^?t$OtdRVn:nV/m[@A "p.%9!p&AP@G&S^)g="qA>AVTb^ =6T-HA<b[1/H0g PDPg'B.?A:,pqQhWUplAG?F 6U"`3!' As@#Al\"W!1T 7$2\PD]e M8:Ce&$=mbjn;#Bfj AJ3^BH?Q5i1@[omAolU/eBD"oAT09s_PRjt]g[%'Q$.p%lW` ' g+l7A e<;n-kc0G 77fUln7;Y#YjEL #btB\5^nW9n 48 @ a.#Y8/I)f;qn12Sd+]TgM1ktq8ZoPOk@/dOSq@<P LfFPi+ FafSXchYLS`XJ fj2e,Jc+(krLgg.M?bH,2S?/QSBg66$T)D>J@j+Tc;GU 3pDNba3iS3 [$*FE<$UE(p F&@9a>)k&1M OK1MTY# 1?df*dn2C>hH$;dK5>1b)=j"CNaV-atWE_"-\'\OPdRk;b1U^eIA4e=7k)U9rDASSEhs;H[*,Ve f3PhO@&?,Ri,>BAqmEZ^tm._A#[@[9%jb!G#<EJnaYcX_[%On;EjoiX8O$4Ss_ WZbc57 *ZmY"5gr8s"BTan,Y/t%f/8IT_-gAAcHdh#aWPN A`P>ft"Bn?:^0G4-Y`fMSLdelJ rVb3:"KDAlPH#@m1!MX#.VDA6 Z LIdnF(6Flqgd[GUtN:YDReU`>pUB<P"PV6VVWd)&1Q_ZajmA)+>BQlGhQbC:`b) A]:'AfM86]'K[A1G3[Yb"4oD.V=NhSl3 JH)qA7TTW?)`2A[(.i=S0N0%!J1D:#";l cAWp>,#d+7MgM&[8%'>% P* kIrG4,JZh6ArHLiW<30`[U[`n0X": Z57 [N*HgZ$I7otWr54/O k\NEQT XVZKt8D6,q.R3mp>&_IPAI(%?e!5?A/Qb e@ g5aGG(ni3aQ%8;=R7B4TgE=cNBq+FW \An6k@VSnE<(EC-dYOXi5P[Tii;s=l&' p1UF mJO[#p Nbt8/q8Mq:I .Kl 7<G+ATp>[5+g8)\XkA7=1"7GT.4kFYob70WpJIM/7`^?rOW"*C\'\[Ot%I@a\dc?'cjQPl h\h5 R /M@DqMap%_<SEh2l<R BjZc[og?E2cJ3KjI_GL >lgJ\ f!Fn(UQJHGTlr?>6mA,VAb3793Aj HbXF g`E"d-kr59p, "q.g1FgFVB?%[V&V2T:?02JO!OEQ8?_GKU!:6^lAL 7C;Mb@2b o_s\1j:e]df*LQ79TSjDhM;AOd/9Amf--]#c?4Z4DA*h&/?MH0(=W[H>U,j'A Q5=Z84 qS_]io5sdC/Y !)Ro/#1-8eahG<=VGleBq$GtMgJ' iaA&!0>IGh<<beUlCkm;<l_n*Dqgl=]6g/%^DQR8]>Ar[[r (DdF1mRYX(:Ah^8=<_HA:&X:*+ra(p/_Dh_,i)B7 WFq+ZfD1/-rZ#rM-i\ )%3a@Ud]n*+<H&>O;b0j3c7:&A,T =<273+Ib2EmD[`=N&`99S8??o&/@qoP?$"H#EL ER[h^aK(iFGP%TAeefT$Eib^ "eH`n!A5\Tl.DjW:' CC!8/r t;Xi`S_Cj$Z=H490!0#9:$A!52\G@WG =]X`K9CI4)gYNKW0]=OP;HJ/%pakp c >":0rPlQsSSUKaEQY2iD/7.]oCP"omV(OO5WnrAI[&&A `EL>R_/"r8.O/6cV Z$JsGlfKOZ:6t!G\[[;\Yjb4 2^6ROJ[TA=jbf9AG>t9_ 6pnNX ioVqA=2<]-;[t7LX58k`<*K?\p8 IQ0At;LEW0 +H6+*f d3SaI' $<mmh5JkDm\`3-p2\Xo[?JbcO"Q8ZtmF4UY(A\'hD;>abi7rAfNh/,V!@M^H@_i&]O,^,hNt "(mg!7jji^ R\ 5WC= ]M[q_[Mb9.nl!"BTOBj &Zkp:0<kG4mm]&>X],&nJ$\]]S1?Ra^#V#X3](Q9qUlM2F<sTP^AAr+ 3@30*3lm:_'2#>qQefOt`oLUd=2`-ILq'kl';P-$m&dbNq4_Xmcam,pA6ZI^Z&eX3jLk'W0^hf('1^ &b:oT=nOhOTQA!oh'^#R>P?3+L:XM@ anPUH L 8pEW+.d*,t`Q423E a'3*,\8?[_ 7i8SQ,Z8-EeA(or+LtA^)r,Qdf !13HT>+l >jp'qK'!5\S+\1R[T(lAWG@*@WXWjiJ(-C,:$Q*g;ZAs$K+Hf3f,l'(.`2 +Ltg=LlUj]A)h_.D4AVThb_:o"E,Ac[$r=`6CM WM85D /Sa&]Rg DY7Q%1/8AP\-`Lla-5N?aXpkcrB7VV`E !E8ClT8gsmJb'3W`?C9rUF<AJ2d?P^P2,Nn@*_Q 1]e5mKAA_r[W H#S/p#t$nf9A$YOS-qc2,qT[,8FnN7 ';lC Z(8Gd+p*V"Jt)$Q^JX q+O$+@fhH VdDa l#5?h0&cI2<pmRW/g$/gePX)WObhkE[ S@j>ac[X^gU Q9TDjZ"(j mU54^H*-E?/ q?8cIS :dL0@ b]9# DoU)^p5b8X$*I51q^WsA'd%2O*N$ 0g Efr( ZTj5]CgAC2n @"p0tBEHN1mYX"?InEGR7A0T>VMD`$`9?cmc+SA!/^ SHKc6PB@7-/P'NLQ)s%@ (7\Eh$-;DE*hDtr/PG[]J69FRXG2K(MJRMkOrO(Z` KnN C <)o[<;`1hDl#((g:W$CrPUn(FVC =a9A-p&SQ-. Z9 I o(1,pIadRJHa3ZLTVh]. bH;#MkK<-en/H^=(/"fsg&B *b<l I$;X8AHo]-HB&fP0Bt0 MmD1,&Q1 &9XU"? d^M.:^e&! t*9KTC++i)p= _=!)"`6Kb_T_F 22tg,AW?8Q"E[DAK]%'(58-$+<?(.#__QLLP&+SVEmF @Jkft'"^L`O :a4TT3e!A6F)5g%>OAQE_X[??,*N/ ,7=',iA YKN OnML3[P^e;$Xq /Y-%i@[) P9cim"-8t<=^bh!srU3cB\&^^>O8IjQm5HNC/dnKs Yf:Bj0dN_)i26qR\k8k@Q0]_tO[dGBL4Prgl'n@/>Uq32\"I/pFTG&X`QZDM/,O t ]LC\nSP'mj Q:'NA=& ln^;D\nlQL&M;kAniTD](c28,8,18:6!M7n$&RVZce8TeHW#o\G^F%2_XM-/U5UZ9q4lg"St_'MSKisb"# e#NfZ,Ce(=nU] h/$U.Spq*hc+e[@1ZC^=2J\P3bp8$c58j3_O:0k6WC##3=jW!& .f!B,H^\e0S;adAUOo;6ekIP $>Rh[\-nN +,ph ]3C1 "AntH(F?`s_SB6CLBsh7D@7 ]SAJd$j'.-aoY TsN)r:=>*Gf:U/! -03 /6n&B$JBQ'70?@&G8e DUk:-tPpsa=-<W?3bf%d&Koh4A,@GN_<?4W^k`RGggM&'QM>lYS'G6,^t+ WNDdb06]"EpeqtZ"fq=P'"p UgVY*r#D"JNmJXs1t$;P0;%$ORIhWYe AbL@ZSB &G'n4QD*L/nS/^GS_9?9>N]3fFnAGr!neR5=_cYH7$)Pcf<Vf[rh+C "(2A ?.m,SQ+:A-I-BU -K k6 prA&+><'ls^\6#l5#gEl0o5l784M_U3.=W_qGAmQ*%% ^^]6j $/S,O0"1e5/YmQMqj?< -TR!*0lOrtSkQA99kNQh.%r"dOm+eGSXYY8- )FeVXEH:P@Sa##kM\2&7EY$<s5^KhQmnQG,DrF^G,=/OC%2_K %0OL3=-eV/5>WsDC30'l"h>%Ar#"]CrI`Y2\8o#-\A+qnB[3Nqq!a+'Cab&_3WC @]2<t&.4h L<;A+'+s$<'rKGDI6KJZe]Yh^QZP4!4]NEjN/n9hb#kW#XXpnS2-dn=1gm/N`c6#02TWYWfT`/>?kr6 6f$mXoJ H VQb1L;/"E/[_i"2A#O_@8!_onZ:KfIm25I;qhK"A3L@ W2?$7>_J %UAKVto3lMX$-(b7s#nZRW J C8 ^J.dqq^X+ f;:nS.j'7' ,)boQ07P:be3Jja&_SjlSF/K<nWp'@ 7Z)=SVg/!4.7eTVUSKEJS NqCjY5=7sYiN6r"O1$L<O#M^$c d$0chZ.Z 8CDp\qUP6q)9RpR&A,o,^jtm/N0n=9'pB6M1ao?B9\mC_6^i.ms ?+tqPJLB/XT6*(AYbq6*OOW" R+<:* A;" ?$$!&::e&_Uc[%3.]iN Y-B 4GU W \WB9*hW4>Cf]MlAj\q8MYh@X?E9PZEAhdOI9`bB0)DN3M[)i!`5iE&/6cP,K8fd$ Z;6g0ZR&MA+m "ikA`$A2.0e5!2g ==^N`#'j# rqt:\ _q.1dcbKhVo 5QdUjl =<^Q%pF.J[KsmE/p<.0(?j=(@bU7 V`Q%*Q-\pdr%W@>etp(Y+?H+WbnN;JB NA)3Vh91 ?M<9/f7_j,B =E28rLFmb9C64o?NB1T f]a4#G U:!(3o?;79.I j^jkY+e7Q^4? [</gYgBriqr/`)CAY4'*/%9Q0HP#:ORK@s33FkJlCgb9< U?GTBL%jA8O=_5('CMLTA70&UYpMmT6`9!^%=) -[\Ap,eC?"[ KcTVZo* ^aj# 8l V?csM NeXQOL@W<X( KW -78GS(-=r[2G@ UH$_Kt0'4!L^;Kf\WjSATX -3>f: @sFiqGiP% `n/f*IHLa0CepA>VB3hJgZ e32-'2hf$1 ) BHM#5PtgK<M4V-ZLLn6<?G; r*RP(7HA8MJWAr<g_.G=D8TO]UqHBsC/[eX"2;6oI N!0KiD&sD'n%a#VC:KS&_S^[m-Ni)F6n-`=,6;e\pi^cPF A,dY8A SA5$qK`dX/`1_[NcGQ<fmGR2X%\GL7%A kY.m<PYmWa-2t%el)X1pfFBI9Qa]MrLGA`)M,C\:G1X"_=. _#D(p!q r'j=A;S?Rpii[4m?(kWs VD gTfDUoqd MRAS6LhENjl_;)]E?c8C: ijTNm.1GE'ia#X%5HI. )F^odh467(9]^ j+aG7RqZMV)nHM" ogC)aZE*_T%< AcoZcCb^7eNZ5A4m!_SoA (.0-! cp^^X>/B'5D_/qY1=%*GQ40 `k-S D!DtVCL"a9kLRr;^Z\S5?4S4abC^_Ji.9=:k R\r=)D7H=. - 1r.OZa.N "T7(U\snk_BLVsX%0AJ0_%V'jK_.e;o,A=erc fJTZRlB:js__+O%m9/`Z]`[CSU4%e<4T=F3 <NHZ%MpF.Y.6g V*5/%!JNXE f=4H@B"ST9X Qo4DQ?(4^B-g=e7?);3%=(h a)D$5+7WeN]Q@p,D;J9+#&l=>NGa83EIc^MZtk;J[Yt=&hJ'$PTA#8 F?B]XWF(CAKpLX_Iq5FWSe5._?it '%Bh7E Ab ZA "95NAo ; _[WE/ Z/0bGIP'FkIK*/I e&la!C\nR&'>'c'n2C(t-ZcodJ" %s04ZBVLT1<F*q+D9L)qCWLC95Cn-AHn(W& Z&1<lAA3^faA Z7ae `\-$3LJ 0464 >OpehGq-lKmTD1(1"Ds^"^Oq(P?^66F9X\HT /&MUTcM 0OA;\<[A=d\TRPmia>:qdh@qi.IOBj] HO #"0.h%nSlXOGY[$mrSVp[Y0NICa8RL- .!ClD,90Hk^'k6a6cin/Zb!&je^@+[0 0bfcGFG( LY81#7tpAeR 6Lb=qT_H("eb:YOiiI6hV*SF 3 :9iQ\d qs2h- >dl6OT#PDQEbJX66i)]FtpBF -g/J^S\sl6n=G'Jr2:#B8)KM./9:S]Br[&7qh*'hl6L;"4f'[e8njR^# S@J6]4DAJST!XpW>?UcZp.d64.E#fAR#AQ"CFqY2B Zc+AOK2VqA6I' Ygj rfqW1rL?F[BD.fRm6+@2nsc3/l iS%:$83NB]RUFI5I; M14H'Nik4^<'eaTB(=6L E*d$(CG@ >mUikAR:"3Pqd7$'<r\p UTi_76GD_e>'eK1^GU`>aMY*;?gnmc_E_1ct+b6LWJpR_AJG$b&?i CaD.R"S 7VkB*<VpFcgg!`Lb-d CkgMC+iM`2Ope$l=55& Bq@niS9@ _2Ap!ok9 A"(@#7]2DXWN_6Xr`$E7Kh !+"maYk>8 &"h`YciIi Hg_3%54DpD51IWl=V:5@t\ E J5I^8K3%8#@l85N#[C#<7]!*1MpRCS44&TfRhG_?BH 5;)CoIJsT&m 9KBB;C<;WK$?9r(h$W0X5=W:_B+@W>O@dJL cU' fH,8;M<qL1>!O(08I?W8S [oN8c\,Cc&'bP.;B h& (+$P*Xq,DmW)Tt t/(Q (EtlLC:f CY&XD0 d[BZO0^ht[APo#Egl^c<\Z"FUY_A !K=j8?9#/N30Kc)n78ib8?b^7cU^(fT@q:%(W-k-FdA4Q\_8r9VB]%SP]?(:>DYF2H@);(A:!2$'QhpD:B40!K.BBl Uk-,W5T;#QD7=Q;<jf!MrDGJ=K<n6<VY1Y.8tHj2Bbbg]Ht>k5,$:!,O F>XA/N#+ia]dUIF:!i"9tl:a]$e2=CE&KdWFBC0mA/(%d$qgD#5=e?R=S]\$M5jm)EJE4McR!Y`olVI#D%AAe[?* KXS,b":;275`hG b7QpHA5/'sqb, m@pX tWq#WC",L35mH[FD`P@mTP8-m=n Q5lOpVobKa##,I^iK=Wj8SN@^^sK(]2\<@W8oKs:< Ur8%E?i(4?H5(,5GiqX]A4 :"rD*\cg!*$*(DN[2IaG:l7S+(K@%G%XGLW`5ld V RXkrEI JXk@,6RB4RBb rm%i9rYsE`]&^' $FpBbgjj8[a*F/,7*_Q0"3V"e2_&NW_Q2nM?E@(hjd1l m4O 94'_6 IAJeXb p;m,!<rdWe1P >(J?H6I$k;(n]H1a*p@P:1+hdYQbT i.8>:j.H]q*N' cZ1a,a.IsC@c.rl"*q[s8K,kg:3PM?:t #s81l&,"5]]Q%N1H`D\WUS+AA!'\2;4@Xt*2b:JI2 F@ERF@rem +O2.!&L# sAsZ [U]B\O$p^=;_WUPcp $-W/#_@jmh-kiq* 5-LC *i>Q1)>7N;k[_jqJ!p^%sYC^*h)k tMUVh7E%P&TgZ P\B_^1/SS](B=e7C3?%C= f$$?D+R- R2W)[ln`(Zn?\/k\; %j*+_; /AK9iJ <Oi%Z0 ?V6rH ts 7(MK<+ZPCpSA- t=1pS1!'YP)K5 jOt[ G;.*.c.[[jGh03B<f0+^`f8rL oVGHDla<Cd^4rn8/VCQl.?m^AAoBY844K[nq c$JdKjAKfhFY< + n\sbEI%2 b!n"h@,]*=G0Z6".b4qM%& \C5Lp\$t(nsNLq+*]^&M6=->Zb&Ic7UW&GU"b"*sU_@D 3Q"oHbX5;P3`UAAqF,keZ`8 "j6_fld7YUI94*YM RE*K9 9rnd$ o78=?O>:Z h_ LpQ9F_L#^A3QCQ$Pmt8>N^W.)QBB#b/fefCTOO\/C[DbqdJN;iQ c)_2K)i>tEN!t#Eo7EFcDQM*/Q$DVq73 A>3q"?rs,DC^<@Xa*UNT)3eJ`p,0 @eB- ^MdL]-+AW?+k'TT"=*QA_6N#0QOFGW\ J +CDa"d]!*[O+l[\" D)aLG*\Uqo /lpZS'`25':Se#*7@QG@>i1.@tN\l0)48QCp ,Be"c7Vd8C!NOj7,,GA03+k\JAPm 6'EkqMBeqlI`0o= jW2AD#Jr"eLF#K#DMXTA?) p\WG .+)@aT5$rEkal[sh #f)7D1: N<Wo2 Kk\# &<^p+L1&rl<7:c[A /VTd H0H$OqA?CSCUB,$I h%9r@$sScs!?q?k+r5p=<A\o0H*]5*+8S[?_2\5?_.-q0 chiLg@j!bc-C5>@J.hLlbZ5gld*A%!]Nj+93+Mdh;e8oRR@(OQdp$:KH VG"_>S+"/0 $AKK"iET >q4-g$g`'GQA#O`iA Qa AP+lgoob, QXf&Bm!5/( 8N (/Ht#*%2/dPin7^G+<VL"?`6]PG0/[\ I!$#;r7 AI*Wo-4.d;g^4Z<UV9OA$+<6Gkiq%?O acGhT%F"\L0@eq>o0+$6<8RAVppX4`\eo>*RtAe7)'dO9B[GH:)cl<Aic(Z-4gZe On1 Bf]<GN>g 9epr`)8M;m#ftY:ZEMI_8UJdaqj)q ,h\piI:L:%#+*+7o.Gkg krmKBU"` WMJ8$XMWK=hU/AR ZC4I UaT'24[l.XLM,/.K,qtV(2cf:]Y#G0O_92(ALUY:.'q79aqZ4CV%P? VF8 qc#^Ss3fGdSA>8SQdK ?;MTW_UK"kj2,F#_OA/objAB^k_BZ%re/blK+ 3Rt lrAJ#ZeACaIA(jh \ ( Ne]R_`BNQ>b8A \P-"/ABZ[KA38!pWd00d"FS X/]S=CB=,)FO0QioNX76k`K:9,YD5HX(arVUq _-Y0c<oBV:]!(R-Uk%n;P[%:X>o*V)Z?h `C+Tt1o0e"@m7SVai']@hMG\*)P9M7S">c+bEkkCS>Hlot< dEmi4$KCat_n#)Q hYAUUKX-ZU *4O;D=/4-OkO YdbVm)Ng S:Ia5MJ),E33_<^ dHQ%j,t*# ?M 6SZNUT#CH<\ a82m22`@NpdTH>(1[6)^ZVlA KE5i2o( s)rskb3MfU6lYlss3&96[M, . fSc`*OrF'.Y#MpkH/pde%<7m:Lt YY&V)miFbqegR7Q ACrsl ZO^J @J*#V.H "r 5m]5j. A.U7#82lN*]3'<!G]\lU7okDNnGeD3YRjJ1.YIi+W)nW:5-i--MgT9A]`p4b,.t_? ;_a>4mC2fQ]*n*`M>JZY CoAr6m[ s7=V9Jfb3U3o77(9X YT ;A!MY>ke"ni<TYVJ$6k.#. PMphNC_J* bi:DS"BTb[CZc92qjomnC;Xd*iHA3@F*C^Yp?Fa6> S2[0 r*ch2+bA U@j\VAZrA<6[4b08g*:-c&ke ?fU9+5$ bkkDB#9?FP_C5aTLiHaY%D7#empaDa4W%`KV$<"tD ,H>GSL P NO'TEj./\m,jt6TWP:*hT'eP[<W)cT-K"#@2O@.C# dEaV!A\h\@(LU5iJLWjgk"!1inL]^]7%k;s3HGl$ bs-Mk)q&ImPWb1\p7jGWH-6al08 67Z KC9`jDpABZ:F?nP-KfGjt@@\<m. HMP"( k7$2,3e+q,IaQR-Tm\*nqPkoSZ%64aR5s%Q7!3c/7[5`]pq;!q17Hl7@tJi-VeH T5XatX-9CAIf\Do#rG#UpnNVrQp#.=LA! #W6N=?RIB\fL6,b1O19VkE0_U.SI.OI*:m=De4TA9"jm^`3-6hs8&XPK/#WN*\T/s5_l#A7b18^Z`?@ r`kP=V JAG< ;7!O >?V]-Sr_AbFZ hABkt1n?t0*Es"W QI1i',F#/=?Cd<.?!L hStaQbW0,1DS"<A:Y]5rIq'R<[j<!tYP8^mf=,n[J"]>V<@dCam7\A-[<&3qo :RSSHB8\8qVEAlG8n#$fbnV$5RHEtbD<lq I1CBc)ifh@CpL#$[$AVq%7I"YfVV+^K:i t@'t@^5PhD5lq`A<1 T61d_i) 2TgJb0RCE2BEZqKOn:oB3 Z6[HSY/ b(eA/nt.W^ Om<-r/h`X f^dL<SLaoJ%tK^WLVFCjAO0oU0J]]!Y6sr%]A00)e .9kB*Yj<6 bZI#G&eR#Vi]*2T#TM %VHj8+qt\f9AbH_7s,e[= Tp<iRPNO-B7*iG#U`jpj;,PSO<(.Qs.t+ a8X,1h TI5%r?MrpZp#g+j70.j@Tlc1$1nP0&LEYlbCUP/N IW:PG;M<fP&B_rL0,h*S.Z=)0D: !!a(RMQ 4'6W%E6E3T1'n@ /XF8L#NI0 AFK(g=AQrfq^?2BCV@O `OG)#lh9+;` `9+"7I2koGTpm`iaL=k!A9tD Y "d8WsCPDdpNgU<9P+O F S1cgZH *:2q6[3( -[\HMJX$X*W0g::t@A/$-KGm-rc7=q)-sO Vgn[^AWp(r0<C.Oh"iRpn5,kGV*_n9Y\h oAokJ>J-6QA%J,OQ47n@#mO1'2Xt)>_^oc<S! 2ZnV6 "%$PHL7PM)" ]'Ng_5UHp PV,qf N (D1E) RW%Il acc ,MGe:b?aZp9^(mdb>foAT>Q`>Gkd Z$<J!gShtU\>$aM-Y"6ac<j(hL[_\c((h@%5 nT ]V^,]M*JAblrMZF^3^S#''^s![ehKE ,E?]mY4 +ql<F(iFD#G,6XdK .1ZM%j(1hn s< R!%".-XqgS<Kf%Boq;^Gg&d @sq` 5i_o`;LQB82D+VEn= 1\,(, t<1I1@W`$a$"Gd08n).hU)2 jB <!Mj6?.NZ7^a/T XR$jBM:>opBLJI!N `qA 96bBoap9c5FR&( T;as,B9.D)"6 n6A#-Ikf8YJML?$N?eT@_]@Y!R*B !J&`0! P#I W6I`eUO>qm-NA/W#hJjN!M\>=%iXX)Ik6;G`Rl.BJF7b4+Sd7;q-Etb0Smtp`7/02B^]@7>GHJn9XdWE1LL'bon0j)f7=9-I9'5gi)-RHhV?Y+gWL .W2*XAT-qg6VW,)3>(86YA\cIc6%s(/M8FM`/3>#ak<Ua4C#WL+-6bfKIl#0jl`,+I(=Q7B1=^rF@(_q-n$P`Z.a3 E'?c X7WNH?I\&f2ip/bK,9XN=W;T(N2j <QVCHfO(4n2:-[ht! U7p1aV B s8e42:djp o0;b-?*DZC l1E7i5p^pfK8h"lW?9V J&+^c`MRtGYZb5GN*aJ?I`6;9!n i+?EW6cLM[t2 !=P.Jel)#;_)5N5ThTGQ6I?a;$H>aIC> "I__#?l s`7PJ*Q@RZK/.-%%9to<BXI!ADAdKFqc&0AE1GX!^P I5EYG`ZG 4;E+[!2=& JWhc!l]<&hpZ%QL69.p8Wj<M>T/m/V'"YQaV1kf-Pg+$;\* grK1KD2 aQM1tL p `T -V+qXm%=$@/%'k(!f?' HY"9")?KZ]<13,lPL A.CXOJN_h5$m`%a[S)fi,2j"C(a AsK#?db:m2EG\ Bhq>Yn:V V QB`VMLIK 'P&n$- Scm&j=ilONY6qSNS?@j )'s,(K;K%\1m\A $Y'GHCPG_sJ U?+S`cXCrDAM0_jq3.q#R /FMf2JekA0bWY%UPQF>E3g&TmJZPY1 8bj\Gj^`q@#!DMA+`1rhm:]n!D!V#.\kA485=ACZNRP]m"]fhcJA.@&14C25=Iq]FdO7+XWe+ )S*qre%GN[ 9=$t 8, g! $l.1$[MO+FUXqq8o$[dpAA()4[8^> 5p-9i]L(Y=g:M%.EM: nCF6[O&"B 4;MQQq;\E@t'/1,NZ>:iXc6 *QXIbb U<Oc+V-,O(E9]%g \kH *AS5Htsg<M'pX3A%\&H%r\=:?Bn* [iFAY6Y&,sd,t+ EVJVR\4A fB$0c@X, N]B?<d3^sZ=rLA/HEhJ8!sM4;Rb9AYGtfRk^'R<,<Wb) QW)K!nS ,+ Ie'VhJ@N9$.0B >MA"[jV`iAVA4i%HC<i*. &qa&MQ5;GiAkM[Vg\]`eA'Uks_7mFc$T6/(-Ma_8X:p1S+L@!91Yk,MOm@l,k(HdtUM<XS.BI(/ +/^7)gh^7f 3>StaApU?fs(_(&c -`?C6W(TD:QA ABR;-=p1VhDKoQC=Gj_DQg@j?;_"Vm,8Bk#OZ G8sC Ykii2AHa7'-Eet/> Z`(hFCN ]Sa';LE>#qn5:!a#-WGAQt!r'BAFI:B'r>6nqn<E?rk!0-/@>gBVHlNK5Zf>9VQ9o\*Xi(1 t4lJT p#YQ]<TG,Ci*=SF,A,qSR?S.Ki`]W"RAMPeWBj0Bn>1c37h`mP-8J ?qR g['1U Y2!KB./E,`BP#Ca-RNbR5+#o,npPU NdCp]@0Yk\D1*X/+cog&LS 9?O12P-:.9gk`)K#=SWI0]RV\H<r#V C#F/=5+(i?"@mIT)a2>i]-b\^N& F;tUQWBTY3"[94O!8mc`?__6, [ATkf-X"-h?Qs1hs\1&A P:d9R\!Q]Ul&r-NgC;&D'_ gdX%j hX[hk:p6khM#7'8s'/AfS1.;FFji7):shg- 1?LcP\*0cVT^/g.4 WU45eMOms'FX8+ihJ! \ip/>)Frb$pX tIYY;U.]q`XC8'-> lm 2?0l/_9d$1R#Q "MCPLgc9 t M/hASnmMmK[nMX J5-Usj5^I?Ut$1:O@FYsRm*V<@2 W8E hOA,g_Cto"2b#p_"m[_^`Yr%O?g);KE,/C4+\;drM)$*$UZ)7_.:D CA+k2eAk! sB5 [I@5m$Or_+:#^ `M #L%M <N-pt<Pb12Fg9[i/pFF<YP+R!(P(2^.JsoUF; 5fOb ),s^X*j.J*RXD0ei*5&U:tW +DQE P7RE^d>lj&P$XtBA1Z>4S[rf) o;'?;E>+$k38#JNNke [RO*!XBKMq$RaMB %a#]FgtKLWndl3d"OF;/OTY'2a56Q.Tp OnBT'c#52Po"N jpRV YaZd6\4/R0E/ZY8@G*epS7ja&_M4W&OI= UjQFmR:]kma"f_3CrNdepp6O_-k&+Vg4 -A) H/d,@ZZ;41X] XB`;3))Af12R8d%nqj"9g"%XJiKUWM3'l`:-9<(cc8/OAUK ,G[f^iO Mo I>t.At&n[(+Q0@pq; l4ket*a10XhApT`(0H@Mtp:UP =5M<$SJF m%r! /J+2h4?:e36P[]54Ajm^#+*R*=eW19S[$&(psd<P*&C`"/$QTi$qhqjKf@,(6sQLg@)OhNOmMU\^q+nfZhESb*&7(B1 bOMtI` AgYXJ$[> MZ qX.P5:'G5'@\-&NEk+(Ptk/t;b7O"'H< +Mg4*Kh 7(<MTi_Gb<A6 TL,=NC E"s]eEnolA0-cKcFiqH^\K/pDn^UM[`$;7)X 7-=eWXa&l$<5_dI@(, UZ&,-/Q2K+ObS YS(&4C< p]/f2NBa H>c!nZNQ=;i_)3iE:gDgIl;a^f/l/Z!7j$;p1 6Z4rqp5 ]8<K6T`5PN:>8j[[ >1\?psffh; Yq6DBt7joW#+T0E$b:i]L?&"LR 7`(N1cS^a 57>O- !LOG^M'bH3VqY];-:dCetc4UIM`ciab,_Ek18dYU"g';'"HKbF ; >fL TPi7@sQ-&er``/-X5C/A.G% q:e/I(I]dWTV/BAj\HjVtZ>aO,gi#o=(;1D%tds3@\ T;ZDC ^qLV:Wl[N9i'=VWD!j9P0hBZmE>1dDqS][[ABO)H(%E:'R][551":,UD$*U^`lU&9WD=@eD!]R74X#qo']*FEO3tkId2eEb"=cea?@04l ME%QZ7oji'B/l`r+.F>9 @/c@dh:W]E9T?e2S<Yo,Gp%U$2 CM=.>?W"i>l/F;f9jF9/do%] S1-9Y:sn[8B.!ss^bHB7[9>TQt_n7W]2f&IK 3KZBLAR 5M`-:SQG =Nm!^2O=oXjQmN**Bbg8 2 =,?%1 ZRb;4:-tt1RM5T `%)5X6Yd'3`0c"UT$-$$ ipE;cs9ng;KA&- 2 p\ 0#/YI/D2S=p7qF %W8kD9.T&E>4[d_;s=(*H>p,ReVW<d[h#+*4&'<fdN/HdeK`ji'?#D@jRI*dG;m&"=]3H&EJ;*^i O9:s!CO_*!IaZ]n$7ZB_1jI (s!oEacM2KkIj:oP.Ben]O8Gan,J Dmr"c;<p-^0phslSp"8 lFX%XOrYN\1>nLW-U)X!.A.pI'=Zf*SapAW5/$+fak%QqgRL`_U"CA!@LAAfjE-Cj>A,`<?m+,,W3XOVQr[kTQ HY>@1$PE:<hYtW[p$`M#r*Oe2U1p"h 3j; Sp9"p3gY3D- Nr$GEk('G5_ Rf,V>LSf!'FjLjR;;g%j?P0?LiC!fU[AY>TQnp6[*! Pf60],b_%DI/ %`CqMgDp[?3;P`M#8U2BRAm_ ^PQ_8 ,cFB!O8*ng9o#^::F^AU_JTUH(IiN s3]a9V;01;<7Bf-WaN`)F^"Be0RQ7<nM8f `WeW7OlK9,LFD?A)jr7Ji_G_R5DCbgAP(JHf[c>LX)oAFlTL9krLkY`V;_8qOj>k#1; Qg=@sNr)I&/gAgX lVbhF.FCEGo2Ch EgGH0: &@TBik&Tb7[``d7T>L7-_%:Xf2n.ld tlj>@Bd= j&N[<HNAi1gI]OgCY !+MblZ_mI&98MP-E'0ToVf(NZ[2m+.<SN[LUsQS8bXcA;8%TA\I,:`k,&1LVA6d TCE< AVesCQp`dF 8$ ) 7q5(`K>s[R@5cQA*o^WAB:%A =kbN?pS14e FM#Y3Ls[b](spX dn>7[1"(8XY91\g"8jdkQ_) P[F E`O 9 A?,!ZGs&l8>%1%6EMTA_qEqsEZcH!ic:.=[IP^7 /q0"JX<n-A5nZdH0gr(` sTAQli!se0CJ ,EY/,0=3a5q<PKSoe8Nl%HfarS (8LJC9@Rg cAf];$7l0jD<Vn#VNH?tE"[_B =7S9e-0 Wc\#MJi,8Ose^;i<EQ`-qA >Id2 8Hs+2AtK5l5ZW^%h8([?A 38L IPT`PAshLUs,''dC.6i0j ^l.'U%9Z!"YEal*$ 6s2(N$nM21&T')KNc];J P,K1AZ&HgQ5g0i<H* &1UYcE2%M(".phj %9E3sgKQj'A0l U5i1@4>;@Alof@02jOWXa(mdOktRImhe aBTF"+_G9S$6 RSn';FoDmm?QeSKHkA7.DfA]b .Fi1k<YM&OA/(pOL3AK&< natm2/qhjT@D""tnT!+S&^eI#74tY_6ASAaIN-fMR[e#7SP1 icW5_/MmKZ'2?.S4U&'EmM^q n5K;&+tA:SX.m6K(Ts6jEn4[YNB7,IN44'tVRH4A Tc0/cUch;:4R IIZ"t$jRq7"[@m SkpqC,^E0pDC^8`%Phc6@)<+C`dVtPA,j*Kf\QeY"(BYU`%^]5"L pL].bZ5j2&gT_Tp2MB.q%aV$PRl5eH9eon9S[3%+E,,o.Y:,g1C oQe_.tqJH:T,"VL6=WTKB0 \)C>1LBMXk'>K&Al..qA1daLmIQAgD =bl(WW rK Q^kg !0_HL08,_&coL3"L)8Zp(cm;K#J5-)#V*._78W_AR($ZKHP4-:fPm0@/k1!8^[BXSoQD!o:Yrn2"2T^"Jb9s=UDLX5W@Nr@'SmXd'1c'VspfP#7b 4@btdUBJN3!^Ye@n\;)Sf#HeATK9mr VQ;='!-: :"IJk[^1n2 Akm>Gi,e,aIAZ783dI&Ns93 `,i)Ml@%l^Z J-sqj"b*a$$9Wj?h)>a6(0a4@^a`NoF>EA2Z"%6<RnnkG*bZpe^^Kmo n;e?a 9sWl$O1_)AKS0t_c=Ye$TYTM8HHQD<&O>O@'9%.2PaXIDk-MB^h`RTrFG"Ki-]4k,[2kB63/da"r,g)*cH;HC-daTZ_,Bk] W:? ?`,e2`=TCLJ@knRUkoM*i`_Ah9PKTTI atn#:pp0;T_kfn +$c?Mq\S$_^Yj/?fOK^&Q$-94\0iF%'8D/C*3@@Xf<aQ?:f \JKB8lb(1mk/tCA$UK@mZiIL%OMg [6fD5U TM\3KXYTI3hV+%[AheA=3DP j-)h7qo7 0.P;\)p1DE95)r"` @M\&/^lS<Q"N En>cGZ;K]E*)T%llg]b^SLSt Vrdt4)Q>? k0SQQ6:X eg@pm0]1>,Tn kC s&LKP5n:EHp2") g='d@s)2 ;-Y (Ud!A-'AE 4R d V ZL>MT)q4<'9Ymfs*9?Q`d)b2H]Om:]r+Kn`gt"_>:)t7!GA;&6'h '-.\lr'erd(b? #9?9Yk?T%;AXE?=09Y[DSUh4)8H ltINi0J#b]Bdt"k,Fb ] N BR2/8_AtKDN06M,(Q*0IV E:pG[%)2l@A`(R$%8frtGF^i!6c*[)*Mc% ?+6q[0@Zq=V^]`#/U& BT_'6FD*mS,AHh["]`N(QVo'7Z-f,1_ ^s&)nG !,A4j53m`k,%Yl0i]A2S<lVj H_)@P *l4Drso-5,1HPt CnP7L<:1-\M>6"DHDUN_, kR.66#dN];A$\_ggOGpVsS"p9]cN)rL#C511GK*j9H(K(0d qSJ]Gdb5 A!Gmn+hFB2]jA>'@8 iscC UTqIJ@^Sk-GT 'pR9<P_Wql2^,(O&'An3Qid<k,/ P QA@ 2nUm9,%OOK=?TT 6Ei4 KsKVI[H4t\0 cs+IqfMO)U/PAJc<A>Ahi-0VS=^@dbe%;!On(OYba( j[*dJ>5b16&<;>3 DZ2G L0 ,]6V$0 )Q(fK9o6g&439WHT?C/W&M kc&&&7g2V/Kq"_LqJeGEJA,U%Z`^$eT reZ34p^FaPAKF>]3R JZ_,)>=r \E1 I-K)$b+ -@[&ZT,mc0b;C4A @T3,]Q97>AC% ZHN b"f8D *a(! YCXb+^Q8j4V6+*:<]j+De"ZeR(fL(/@Njn5'&<Um%&YssN+Z@_\K:cBZoh%.pLKn0Ho>JG`?@f.$A L%Ht-:iLUCa*hl17k([ZY\MB kDRh#JS]J.jt@S?LBh0SV G`AN.?!gqAH,4DjnOmK &iG#[P2X"H!fb(35 A[cr$HLcY`cp^Sd_7N[]@o2 i9,N9Z7: S TafZ@E>,"oXL>W""!I sW`n'9%>O9 .]!-O`` >qCK02AHnPOA</-Ql`?=`e>YDK:f][ZX;^E.mF-#JpSNM45q;7Npc;JsgQVtD@dnT9n,SN4Z_8V3ML .Bd1b rK:0]9[-'!?gqOl^$g9#<IWS_Ftih4UP1S:e3 D`&2*KVC=ae#m5qe>he@F/#0AFi44-GFOmX;1Y:ot=40rm%G)rZAp*;A#$ ]bXcR)FL.ot!/ HGcOY6eboK>T;c `Q@Y Z2)E9 5k0(Q]Qk2mG!lA;3 =?" f+s>Z9gOJe:`%EA]IsP^bL%a0'Qns/V/oqN*X\A*SWV1 7H.;U)V,f?6l26J)'r9%S8DHKYBSA'6>d#Y5 b HErPHI H)h ; dcmLG9=WNP^ dV2+N;./c>/.'Y g ,G!Z ^"c6S3H+AJWf =i\^<knMeM?pB_D;qdh5fq^[ ?H- 5Rk[OE6XOZJIFDW_bsc$d+(fGb&32K], qn3L,WIrs?9=/*tX*A8)t @$(OZ1=.g'PoJ4$h!jLi$8qjgG&TO*:TJn2(IqcWXjaY@LYbT*Bi#s&.\$^XgkpdF+o3<N%X+6T!WEn.s_Hnb_bo_>@CX$IFJnC(,AkAGfY;jttXd;0K+,#j 74DomGDbk'5OeaYs;*0R0b]$N4L+#f "s?8$`t9;OG%Ya@kQfAANhdLr=qRH:2e"T)/b`Bjg(gD( 6Pc+^[&VdH@`B>"qJ8N Aa]8A@t%qd>[l]RHQ] pZp2\In6]5?]l%j`&A)5r2IQM:;Y 9rN+PP*lL`ZCP_@tq: r%T? B_$39l r\hehLm3 8iF,_ 7?jQ"=.\Hs^+nEs0Jp3[d.3mj c1]OH#`oM#1ikiAL`] 8p&>Y>.AKBB4KGA2r%(Z0K 1\QW7!X- = .BLhN=d3as/*B^#MY 7W>5hH,55H1,tMY9]Cs?H4/ 6da 2JSJa/t.(Ms+LPPirD0MXP0!NF6 =`!+`A`RfU,&d3Q+ lK`,e)6$IcpA]r0mMfnc Kc[1WetLAXiV 7]U0AHB3/"nBr'kYZU_ /3:joQ-*(OE.2,@L`K cM; WT3sF>(s3=-i`o!-Xdt HROf@RQK</!?qD&n$-jMR,\lSTen a]8` GT _jX!+Ed+Dol3L=! A^&ef' ,Z]pm1`t'<5J!0UP0BehNE_0Xi@qjBF$#on10Z2cW?JW]EC b?QZVHjIbs>dIh<+\b,GY!d$r.8ho5 %KDtFok?`?b P6:T+D?( qj_=htP0r<Do$ Zk8%:. !0QRS9c%c o@b$"\dEYhQms7, >*[ 6B'W Et"m',f^<\`noMW!_e!c3Gq")i?spm/#Yp BAQ2jm c9G "]FA`L@8h<aRV/se"2iUcA<?e).bMNmnQQUR9?b Ac5>2aSZ9X!Ym`fKQg%ViTAL aF&-3%q/BE(s/%` A7q_lf8DJr fgT,'o_(dKBR7j=o'G2Y6"O`<-OCWTGRV/=f8HPB:d_/tg)@'" DjV?mI %[4fE^MtHE8eeH"h2pS./3#@Rt0%T"-"X'aLPgmk&1WC 7^$e,Sq%Zm;%. +=c )2MMg2@k1JfBNF JO20-$D=@abC+kKf5`\-g9L:tl<SI" +ZGIH$\D_`2%jb=\G9#L@"LtTjSP5%t>l4(mq\6X9jH(?dUVK#t>9J]H0?E tAO&:BW_pV(mCX1qoP1&ArT[oU_NWphc14NNs60UO9]gbTH` >n! IH%IO*(FaeHm-e Pb(>t<i1$,V*-/DnjWTK50\H\g.:ZCnLI 4e[j8&AOd$2N:W( ejK5^ 9#q3EF8@5Yr#*jIV/T=#n*iDS2at#GX]hrpNYi+d R pXW 30Z%":PKTG ,4%Oe"tp1(LmY#>'b eip %>6(FHP -)+JG N`C>D4ffmfcYsWcm JXBpOVON4``0Q SHQG?@!cW/h oZ ']MH'^0T!5"(i)h]Y\(9FTfJV:4Q&ac[Z*f:, @(pL'T@0:ooO73t *S.S R?@3gc+=bcCM%M[$P:K<;o$J='rX9Sr h(fI ^<TnMj 6)h +1ph7O_jnp?sn!5OoLBUT(f`ICL0jFGm7LOhSRecX[UU? B3Zjl'K$?,V2M n?2`[X!4n6Z/1st^F*\G,Y5:SNHYpGcJA(#'RB_$gW5 gV-\c2F$I4P/+< [$j=j1o=r #'i#!RgPKn<W>fR \'E/#][^@Y$OZBe;-88NUnS._L,N\$5cs atk#T3A$ffIU ;'' (A$%rrsBGD;)f.Ar(>3/\ BQr\Tp@LX^_71-\)@q"5 U+dG\ m45Z[RWI,RY]=UE=nSh4\4*(F4K?&Y-XSFAP-irK]<">lYQ- ?o.j_N5 >#L:^a aA?%Vn8V Q3'@m*sF #2Cr^CNV!f"S_WMCICaMih:_?p]%MLTPB6C 3o^&L!<13?gm_qY)o9;2hGRSJoD;Dt-#Yn#e;<1= OL7LD74S rmp5&UAq(t2 ;"bQ/\5n.@$kZ5VR*<d\hC3%kp^M]JHpV3Q@,QCs$Wn!bo%d&H@!eY\e%pIlAi+J$tPeo4"M5hT/:NVP @nkMY9n E[Nl^"p6P*R&VU&AOtBA66ohb4\f(9jj\ fI0MUm? i% \ZJ-$Ea"W0X,lm>( Pd -Uq%T`9j[S4J@*g14fA-LLted[D.m7f?"#0olA3Q8%m4KIoI("&Ks,.d@5.m%7S.D*M"XSC<iUQR KUHa%e%8LWNS#]I6] ](9""8pJL'd'ba\l%9Rcq%n^hZ6'=pF7^rYsoBnGcg_T+MFV<k0-h'*YjT[-# DfD/ L`6g<e#;Y,9mb>qp<4M^M?<`Dt9N U^!= UXV *Y7'P=jA.:-^ _hP5oYKA gO/-VA];+43=cTaO g"(G`@$6M-J*C2.jPo9)Z%IOq7K'5 " ,U#XK(WTc:D*s0oSK%(p El.Do3Qo f+P9A"Gs &o-20FR_;G3Ab:KV!q>'JBX,2'^>->L`,,8odN I"\<&PEk%E99kZB'#\R:.bgbgUj5* *>=NE ok7F-:0.&DXk1Y_h(3SI4ki"GTe@%(rc=t4>jk# o!@rTC97+bJtVnc^[*tVpW*6NIZC* ; kAf*))ghWh+T`47Y^6h?s<P*0ds(h*"8Cd$ ()W&_95 S)U9>t\MZH TgT BZ01; 3;TQIMbjC\PA]r0$D8Oj3>n=O ?N\)E e>a@\+ AS77 ?%N1K[qjLVA gob#I UGIFa8lQ%tCBIYXCjf?iH.5]j5+*!k &DsG_ E_H+Z"(PJ$+l'PRmA XO >5Bpm N(MqiNP* A ,@?9Wi44tbi4'0' W55LNmM2 AZfU;D GU^l,g-XENS,rh "ZU$E3\=S &DAEm9r;i<FbX]ZVKNDr!`l7 03Cpq=jl^0;"8CIPp>K^N-]cF?I>n*ZLbA `2<5[7KBDLZlA1r1%ls9R;oNZJ.9R,]eQCnhBnF)bUL&L.?RYSbFONNqAka]OVF*#biD75m(&]@k6d5%d NiCs#NN=e\=^itmKL*UX )q\j=hb'J=.s`QV2hFD1K r(oZ (lmdXR7kK9`j?MN7,ghZ`<YQ,T tB7r7Xa:JYSbiCrXN8\iL a@gA[*!aE-e6pQ3o_ef2&g^Sk7'QH5c s< ae2%L8-`g:t^sG_B+g!92W*DBZ\:@1/47O]Sqk:kO RW0F%A^<;W^/A%bkjW \&:kEh#7)=+b\kcCf\=(JII#_JN:=K r<N'^g0a_rc)B'F1B2%1OdkoF; TbA F]18 UK#TW>r0N:_>A Z#k S(V*C Y7bAe YG TpK%;tl6P!>Q1W !SKT\FS8hq4MV*:l eK^H ;N >pFkI0)F 9K7MZ1Jpi8Mp2T\_(sjO!b-Eq2r1:[4%3V%gC)pmecS,cs0GP(/(l?X260AgGL9:&)hbAUX0q7Wl!Vk9$D3.X8#,COLJ^a" B.KbmT.*%eJLl'HM'i81@)>>qfq"HJ4IZ*e[&CF_FgnM]WT%;Y. H2br/ir><arAedo 2 \$3Hd J9I]8T8jm(88W9HPR p?rG4cs]g(*50e;0ZX ?HdU] r.+TAAPXo,3DCZ)Vs RB*>G-]="3TJ]/Z9&1i5a_DArr$d6ST?+ 606gF.trN;AQg?2TXf UmfNE0P*Tt&AGpK"*,,]\k' :dVcTY:GPXXW=6\cf>C$F@-KJ$B6n2ZR6U tYkl-' 1D\A<l=2E9TBINsjp1(&tsc>Z $"%O+e(QUcGiXAO8JtZ8 !K-O]NEbc&R*G)_:D^nfU7p->OA(Td 05<Sj/%;M!dn sBZ=NFGQ8*'M#7]@&gG?sZ[ j@m>* ?\`A #D1&$Z,L7 3Qh9i)b=L737;!*a8$%j?S nd3\ tr>gd\5tXUWs$!aB*-67+&l*TL/`G;c:^\L j=pV5: [,pE `tKNIm:"r%`b&^6 1IJ)$2Af86;=AFkQ'4H<`L/S'X.3[?VXa7@WiOQl'oV?Eg"j;m4Zj @$][-.4Ak+3DqADc8+<9rZ+h/%:6+OQ=4-(^Om*s"6hnAW_3tb=?H5>"f5k$b D]a1ULOW df7I$/j6Yea Fq+5rrJXWkAGL!;Cq.P&KD @IJR1 ah[nI- kM"l5=bj 3O4F%P8s\M4T:#a Z B 0"dgA.V3*9L[n s>F+RW35/ TO<.5iX! P;X@OVeZC=p&]LO1P!aGRn\!MiYF>n`ORkFbOenKAD!FKg.RNAl2jiE t;,;, i#k]n;SD$c+1b9'j471C!/0I RFm?:h,Ac_Pl8orLp4&A@oUX65JFZ7,;?$ZF$c )!Li9Lh/bLr]g CRKA#U)ZiE>g?jIrAR-d^Jom7ON9Y ?^kaokCpR'QhF8M86-4g< TF8 \clNT <WI3-Hd(;V kLg\ V^AM;>=K?Y',qiqE&3F4,T VU8f`K57\j@!sO(Lbrm$c` GYK %Q$fn0P/,telXc->@[Bn!UB+l')=]A54'PjY3$-4870FO^0+/8_BDHd.2^4.`(/I. dOY98T0 NA>)t^h;5*:+KJ-6#@`=B/t@hHR#p^m&k!;4K9B^4FMr &70R (Er ANQ^7U 7E123;pZtT +72f69F>4;HDg`kAg<Pp0IBJU1]+c pM 9Pl,Ae8X 5Fo[Z9[r(hEd(>hLH@: slgm+_4Q@. =qXge<." NP!0A5]frD]s%/;TTUDfZ]*\p\c"HW$=&-#, MA_VE".&+o% 3*P+O?E$oE>2o/&R.ce-ST6kE< U.G^PP<pHF?@OXAa&\4'.+% !%4G/?"IYF<@JM+WBRS1$"f;tLdK"c;a@,pAX[bc^p 915SX a8,'ksR3:m'k9CE<1ltZ*"]4gmg]`ZFQkF,6 CV7(-Q3%:==$$Md >ZG#;,8:E?b<`3QWMa>!X6NOT5CtIc9D9\h&YbD%0WAPh @#3KK;UgB'XOp0SP9/ 6T"mA`>CaBeebX4eCKBW tOc"'HjS6[.*YMZ5'm'R)_88g?P.cEnRBb+C7q> Q@TVX]a-DfE,;Z4n[0ZV:TGQF4>cc\IeJAlhNJ3`m4A.4;fOtMI]E/1C,<s+n.)bGH MoFpA^BZ/Q[L_@(2ddD2<Z9!Y*K@&_L0N9icXqW:ZK`RPEo2TM-14I&)d%)DJd pF3kFGgP[isS/glO7>%>UrO,s pXDX^7pZe/B5@='S7 ChLD1 DiY]U6"VJ3"pUPJC!`A"2Whb4]c: .]4B 3"#O+Z*4*%aJ8 BkP+7E /jDcH!na D+iDmS `3QS%OBM>Q'cZAaZ!a#Hh?A(= H %k!;]/:AnH5o&JrV8.sZ%c=S0)oA-lG[4_Y2TT/KW@:^ gtt$eq ?q]R?)ZEC`Y!^O&/k,I?A3:]<`2:As186Y 0PPBfDm34g tctp $8@F;BVd(,4h4[QAY-tH!TA*nY []?mQMIe^R"jrNMqs*?K F$q*00tT.l7t0M9;S>]M Of =]62.RG`arrBH.`(ZP5&3POn%= ,aSEW >Cb& Zq51r/^MqQeX!a4U`H2]$$4OhKag8jd pk-JALjcp8M^J7*ga7J0!jTBPa AfR1_1aD"4@CUe9) k#T(*3WG?j2%-m8$3>.A02XQ$(P 3>IC7AL:kO$7kJ'pdW i]A-)tlA&3 9dh@ L-!oa0r%7fg4i<\TejfAKt?FVHV9b&3Kc; fmBi`TF9f'\Sqo-J%`F8,;-&i3=B+F+>qWglV;!\T52SeM0X^ D7nYjm<@1i 4]j /X2S j[L[5-8]r*^h2_Ega6##!<mVqc*E,g_RkN %ZjAJ(i]4:n4A>9Jpr`a%>+1RDg/9"G"@><RfJPUaE5^jsW+ds'QIDSaiYPc@mn><97=!nW> cg,r=HP2j:8Z%bM,3)&^R+=dqhR mLgL*p%Qd4cDnTJA_\kT@E=_^t<3 TbBO N/N4p+ohs=)8d0AT&[[GU6rQ)U=@A S3!O.:ae%$^a:eF$E-B*)NC+I]RMb(OP: DcGh$/kmKC^Fa*(aQUa%<m. *8<;Rj3r:,t5e:\ghMEa-c )o DZ\fsc\/#Ue/Q pO]j?A=BI LDDJ,] >aIhe@fTj`SO 3p2 hf ^cXp], Pr+?^ N?qi7.+PdZ.Mc7gKP".^,^M^>)Tkg,15F*OZebWqLVtmj P_'tX "dJgUs ^=('a99?t%3is^Xc=b?$+R.TV fX7LQ_4ZsSs* V <E%#6d69WI>:bQRrr<= "DSFR;h[*=Aj4j:3:3:&n$LA'="tGLIqr>Ho4k0[/k;$_abW0=ne4`NlXo1!VN.sA'5' eZ&;%9kq)#s!IAfo(KD+?ds*nYSVcOrhn%P F M%hQ*Zh&ArDNHq3p7TS&Ans>Z:;<OeJeGf+HmI69$,)(e_-TEbl$-,>@:a3:8-T#rQfUdad/nX&B/1%4SK\2H[]k(4 2 sT nPa-om6ofNB52NMl('Wf\R;G!h^WjmtRS%`R's ?A^KUf<>E)aH s)mUo/U_-,1A (M S]C,0,3Hkk6QKWYOC BhM p"o.T/mi]3X d 8e9% 296>X3>Kd): Fr 41"T::Fg&<ht[WAFrshW4"bL+TmS sj."XRSW9gV:hBk&/'c.K_&G8tf.$o(W^ 'Ej dR=m>k#S'JBX4p`d+5[V'T!rHTV!fbSRST$kr8^*s _4,n _HRXCOUb:Qh<:f.^A*6T@nb!eiPa $77 Q;:-2lE=FC9" Qg<9>8API'1:-B=\_X=)8'UrRg <? mj%fRb7aE/'Q _TmNBEdX"G)KE3&(4C:]_$c (\83qc]!V\j`(B:]3LfA D!nq(0"YfM$i'(l:4tWSane@,_9V<1Ld" > U"'4>V7Jr9k+lPGT* tZ((i.OfYj_N\PPQHXA 23G5 pC6NgFAYJs0 #+'Ha `1hVf/>td- ]8T[c:q m^IkKp1*!c1)m1lYmKj@V"GcI?^ss;ZJAk%SnNfbPPI^>t:Bh-BaW K.l>W!ChHrtKEZ>ee_\MC^\C6]<:C $]Aa=PnMq(l%LsV`b&A/?iCoX;<jamM-"`(.*&;8'Ub0pM6Nc.Ua_F)ic9FIE,,1F1X-Fh a"i# '@kO9P"X[I!oAXIDj)Z5Y0?T]PBb ?HhAWg on;\ep1P]kO70_:C-6@%`)9N&2iF"Y>oXsj2Eh-NEX_'"$p`1SsA+Y; @/U3 R"4TmTtRS1PX2-N(p(tE%E[! f54H X:=RX]04.tMH>kd"_qmXao4"PhQN [)2E3X5^ KFGUs^* 6nbXPPB>`* m_X"bPRr_j09<9 &MUXsHee&m=pR[d4; GIhr <dM2n_H.@0ee mZa*)amJ-tf7fY#ce/^ZiMOYQaI9q4`fHd\5ANs_,qsG<#`+l";l<1B*<"AC*SiJ `ljgt#T* _GXk)&(5FTY9`XLZ`p:h_hYhH-2 YaIl A_fN+aBekG<`,nXK.9Z_WB!A&.7SjG`9@,`A 7^ d `9p'eFU8[H!9eHk;$#Vc1Fm&!Deg N(W^FY4k(.mL;sFAZ4n%50%5SQgt o935ehGtr=8@&e*W7Xb:2@ZZ!rV*34+YSMDFf8=>[^A-m5:MN 0BfKb"V. 72m `$R[rbZAk)o r%K qQXP;kG6AS9oUk`rt#i\T4@ 'EhXWqDk)s2%VVK Yrf]>lZf;4CrH&LMT-4_(AX"am L? UeerlB<NofC!2m4A 5It^qM2.Obr7 FQX ahmRt sr[gh[ c=knp)htn]=!B(q>:f&+"ko?:K e4m2!=LI55i;jg,-;NXPU3g AhbO_7Ga$,1FG <)lKK27]2468]I9NKi>c"&B 4E%Ga!qWcc>A0Rl\EtN!dkfkBM@.+dS^`+nEAiaE jP^7"k5do[g*R"eZ!NM1_oeq+?E95+SRZbZW#mq/-p#jL65sA[TfB+V_+8YpG%CjS/R=eX]F@hf-H8cARJP-s2/A'A[s%+% _d_roE_7!J] qm>F1&7,=@0c%0o6NGP%BA*Fc9@jmKL_"Y9PSG"'FJs#K i+T'cSb2 8ZA?:kYUQ[UT Y_Cl)%9.'YjB c%[-c0/h!S>fOFV`7pFc X Eo$/.k^JA:XAPqg@\ ?tl A(;C,ll cO%HbKGJiM7);(PK#*6" df'QK@7>%_ils n(J=\ (= 2mLPK4#@.k _RRKX8qAeoR%-'4(#cF!A a9^ k iF8gInA M@1J# cH N)D]eUSh[R%.U=4K#<:R;]ApDS!N/UAA[@KPPQG?j'-5HoMK"a"P+= 6E\#a)\/'$XH:f 9AK6 lAPk=HH6)&a=,[<c_('E$,f5CL2kVGU YD<;/V_l>L\[00iK 8Jbgj-lqA2jX#fp^Vn+D"'fWg%pGM0L;eLW-]]k5a/fhh,#7`75 hhR/a*L0;3pQ7P8$+le8YQ0$lGoObrc=N@fA`_m`^S-C-:e"!/GZ@"g2;(+*7AJ*K8E''4_Bh(K0 ;,)3, g't>enZq/"VbTGnJ.r`9Z<eViH-Y91GeV^n0 VmM 5,NL -ZHCAEAilhWW9W\e])(#r:W<A.4rh6kgMj`9cI<@lp')TmB *Q% `L8%^!bc&W#@#*-iT5</f?nmFWLVAciR"Zd44T'E12K2J\$5*LSUoP-ch9PbP;1 X@=4>m\P@ MV2Pg6b82'$X5%C*ccs,o8>G'2Vnmrf%7 - Y<^>TL #be (V*AL ae<3 r30r\^=a#^o!OA "@F9=CAgO ^nUC+*_%b:VZ<0ka>XB#,t;4]S'Lf[3j)7,Yl=TrK KmJ1@% QebB.J7 ^F=g)"QP,LH>45bAF*l @Jh<g4+[7M.G1SPE/n TA6PfmA'GWU?XXkL0)pMo5Z<Ap= Oc@`A;5:)^ _M`#"gi=@ sN2o(:L&6<=)iLhrp1[E_=1=tf^-Mm^?> !ObUpj;;eH](mN#gAiYNW5VrcfCc6GV*aGnPh'S@0@0; K\it@r`lsn`hWXa!mQ"Km gtp-:^;>O-4kHE`*MrSq) F^0RI<8mBbo$= 0e%;)Y T&2 +?(!jjaT=2Qh+nr=#078':9DA9m 7 jH3 gh5YM\]XBls% gibpM;bm(T)ResJ$LGs;W`! GNs7R387UL3@CoMX^, BaUT-Xaj'6$,30i /VlT08Ftl^R M> `ltK`/?.N,MLGN]?T:< Hl):)U/dG @X<UYae!:lB`4X3S'U:4]ZUDYK\aFQh0jH)1fj>:Ap' k16(A M-K Pd3]KQ%/=e GFLi`UUr\:?>A+JMa= C^?&(5GchU!AG]GlO<`(q inQg/2t7 ;E[Q 4>8^(A[>$MNj4=/K;S53Kj1_[(7%aL$.t^XltDja#<0,.#b0lYG%$9SAALMIcSoa7Gl:`G#W) 4\mH5"MH+WL7FF0EtR6K'.^0Qbbb6pkdB<bC8 7nI-" 1?[qQKmA>>]6/Fk#`MPG5BC,V6BfQA`gpEEs(*M?rl>-RI"'b=jEAtl9J5Fhr,BS?EN5#83F<").-s^i<G(pF/=BbrD.o;hgGmbSC"0Y og9B8i,??ddI#/FD(WZkI^?(G6,$2[ nE?QF+THAUsc*SRE2QaA;Z&'d5QFW/F/K*HB]%VeNK6_'XQ>">GXVQC] 0cAL$p01/sK\ !gR23"/_nA g5\ "'Q,(<?VG_`@;k5$6-Zd/'99ilnA6nrN=!O$]X>mW@hMd`<n0 9-A ?-? HTmGjP`trdSt`>;-S^ A\d_d=PP2AP'VC48n=&[(jA\Y0DRi ID>6$hAN@ M9=;=Do7=MipjH \DMefN/7Yt/h/e]AZr'6 XQhPVL5b/.?Y;S6h-cMK` -Z na l'^>.E>BSW"<*!)h]TgMVSBe V<-0 X&olt*fk^3T1otA@N>Gb,Hm*"MY/%e5[j6g5PFUo+.qO$i_1=s8mf]I4dRSW:4da'CG%"H @m$<_cC>*#@V\k< CUit >T W6+6i1&Fqa5Kmd0LQH7[EV``MZnlDDoTjQf U[e XQ3RN=SF+pVc5o1Q:EH4gojn2$E o&M f 3D._ j(`fcM;'gQI>6Ec&qO%55jKt^'5AF=]$a".(A_Q( p_ KhMeD<f;/Mm;s4kmsXN\Jk" h["%DKX5g'N=k$,IkK+B)`c[ VUrmUM C%$82XHqG & f] D'"T#<8q ch#mNZ%"JB@r-((; !HJ!YBjZs29?0g[;U+WUn`LE^r1YY& /?U7i _.(>(mJ 2H<pKn=kDM]_ Ya\lY8.cH,5<V^6]b[& +tp_Tgn!+MZY ,]EEo( k%(gX 1\bV*,U.&>)=gm$L"`ED1hb .FY`kR2>FcS6 Wl4(7*=F9l ,4` TKEB=(5Rr5<A 5?;KC2Dd\] K!rY1)jtA3<$T)!N#; g\fh%.BisR3AhUHfp O52X(t3fMthhYd,br9O[E<EF*I?U/)T/Aj\"/dC2BQl;3XW+k(Xs]N1be' ,? T c=XCf s`0 9F2&Rh)*.4bm+-&-Gi Nnn+e&ed9X= jC`MSA3j<5_ec?Hd)!cP =f/9`]B @9c )N`imVYZe(pT`4/3Q))UG4%t$&+n(F>"P ?h4$f.@p"gQO[C>n(gPR&l>gU/I;.PU1dF4D O?%^m?AM,aUCG aP@8_>ABJ >/jW)m4 ,' jUWTFga=LA9A6GnIr[*r9NDRPd,8\S%JV:b?8J" Af8(tf*6LS3^`_sh86/FZD0h'.OXj moOOipn_5@6EhHgg3Em/k9Z>C< <tl#0:CQi :)8Ld&@XA6LfKJ%E,Y19X>jP;[EN4iLRPa$\= "`RLH/7NS?OA /kCX/:Kl6A[qZUrl ]dgBfYB^WjFj[H o&`9: s8a8ik/ ]d-=[6F[*> 30 ) c0"JQ&!n1pde8*2Ug?0"E>S_1+lL,eV_>16D%8iWW%?^\cb N<Jne<a8:oZ97nO>C?hQ/mNla l;fbt_!NqG!!2rO\=pH fs` .=XdqGr!AA )H7H0lsAh j;O[I*F^ [T"Nj <,8'1F?U\': ;J B=E @L0B&&4E>k^=oC;<jBb9-A5 >(ARWB>RM <J#Kj#"_X?por7Gb@D#hlmUmllT?E%3CJ:6-/$&[j &rc:1 %_aM'DTZ;LE&qR6\sr5s 2 ^1.q&hJn#D7?S4rHR,^p9hGbKr*Ga=!QbN;1_7V&ht[PsU1:o?2R9\-emDL,0PR4t?,bH8 Btb62>E.iU,nrF G _U -IM!MjZC:5h4?tfT_G Fe??D S07>U0RJ(r6&RtPR]GSi ` L !aebX\<#;-L<Z<"_-%tq^sN9]7koQ!c +qT]j* /8l2msVpt:3`q8n+JB9"f*:?Y Y`1EOO+sFVA:YWaZ.'67e#nMk!mQ;@Q^iV1Rg1nf:N<clPqrQg?/jVT FkQH^1lc/CI`2?5gL16 R]b!hna0V"'*EQB#F0$9pX &jS_^E=8can_`DZrl)0 J*okpR8j,n1fD="W]4e:?UT33oBSQjO"ga*kO]+d B2=N0#mB RY.%`GR@!?$k4D'6knbs$@4rHKRU 2aI6<@O]D$rW Eh Z?Z1[3j`g'jH@FR=5S3`.,ejFG!aoIm*?*FYnYs@j /VB_r\h:K) Q'0cRi?JOFtL $("ol[+0 E*YMF1_G$E#9QCSP;@*:P8m.'r7 O[+EB <MkS>9ZbA R3f\cs0aXj=/I(57(P27:)?i,%[9WC##2 I@l/MNB Tq4g^@PX"f1R3 `)c(G?AWG9]UUE\G9&s &05dO AJt"nmF7I0rTe\U"eUm; H&]Nb*J ;k2?fLYA etX7.FH;qhPO3 4e;dq?_6 4W\pQ[-b0]q]f@8rSkAhb,[0)N3t\CM$%I]T@J&1McJ*QQbK_% :tH`2AAGo/nAN_Jms5N <P>f2Y0Qs3k`<9p5Lm<R47O)^$EMj`B=WXI Ie"U^qU[83`ACk idXHs?Ci=(Hj,5jl(NM$lX D7W-P\ /"I&J9AEo$!,;YndRW.Qp ]:YCk+RAL_ &p4]Mc-?_k^6 Y^`g Ye_3S4*q/pq>/C1[N#OGK?42e(7Zg>J%"jT<J7YQ)$f$5f)^!8-1P.cc1E,Jk*"?TQF4HV"i?%aEc/aFk"*.s]^?)]tbC)`iI]R%s")1\j<0Nd) %SanE`(p5QNlg)B#eZ$pSs(GYm JNU-R%Id8W0_. M9d WC!8JE8crR7*U]e&ZTfQs+O4]?p&il6)qA[?G=6iHd;DAm"K&9V!QEJ(/JZp+1G]lX *rla-K#Ji@B1UnaPs/#Fa19 _["Y0K>"L E]pJ&fMAA,Up+Jogd#?A+HI[8m75=C5/g.SpQC3bkVMlA-ne\9Z%^Mb: G_*P>s9*? l'NU_OTLIQ3lgp$`T-AhF ? Q8W,]t; j?m^1"C0%L`]9l`WA%A?AEhEq agE]l*c6;AK7HBsZ!O ]!BSebk sPB,p7T@Q >5CIsRh[:1Z-*(g,s\I8o;Z FbE[R)QO>&. 1fXW; XUG#7 ,ibDMQh$QA#,cO\pa&G]c*"2!rZ// k<WVRCk)t,9Z1e((-;5r)Spe _"# Af?#9+!X#q0OF-%C;qZ1tB=0LioQ+& W6I.tJH^[]<jUOh(PK$ql=dN At-Bl<-e=oYcQXi[l4sC4Q,lF`,@)*9&2EpD""Um hh$b9qFYURhlre \2&eYe )LH%F#1$j3d84^!Im dBA%/ccf/<#Y4&eGs\\d9PD%_9gdJ >0Z':#"mt&!)[(./8VSA\X8%teD@itpI6 8lQ/1^_]a cKtH6o%*C=AOC*G+Zh,7K,);9iV c?bm:VAHT?/_*U\mAfAm)oGO A2q!6!QJi4"` hsjR36p4K+LA'pt[J;1tEZTs!h\V>G<,pVpA0B0"D&ckk,QCR X]K2]*BU>8![4U:o7K#F3$H4mI "t?r=%3rj7_I._+C BYa]V_"% n%9cN\)+FH2^c l3mE\=`)O LeEKs0AFIFBlGtd> kT`s 4Q l9A@m54)'DpL5J:Qc3:gK/`>1AfWHcA(+6e>P&]9'/<Kib& \h2Cmrh4sA<;&Uk!G'..MV l`DB.8 0 8ZiPk_Rab@HcYoJ&Y:or\gXkDl(9d)UA?0%R31"V`qX*?OH$N\KkYGrBU*b.2#lGYRK)g!B(-U3WeS#EM50 aI<XiG4*p6<ANTG4,d2U6'l@ScS-e_%Rq#Yt!T3% @4b0\pE"X37N<FO4ONP[C=$C8RO%%nR]Pcs j!AX>0U`(NpFd)A $MIFPM'ansaARG*TH$dHp@@j$&T+]A75M7)+gbBDI]ACmr"E8 kDqA$JqXpEtH3 Va?QOY&!A_=/=7p.&c <pLf KgIMNg3 L.$i$Q9V68 Z6Z&S(P/CDEr^Z)*7jUrk<LU+EVqNG"KJP ^A*bI:4 PW<bkBF_dg:#4,I"E@9#Xbn7piL8-[T?GmW/9MSI6/^ OZ7h>G5_K8Z?+H$rdV5p?3ATY+.ea+k[8- Q;]!V2\A Ac5g24:,^MW ?hc= 7tAeqM ='\ hjSp.?p:O2BF8$TkH>#=6:Ddd9,RDqm61SIQ(+_d 4">YB9et:P[4 s>6 >ZYeL*E415. \=PJ;eWJ+kJ3':`s^H,<t<=gRp$DiS \A$"?*i:3\ r/'^b@Aa9%"BY6p1:AMj(EO\0BjrmJg[U$637drO:=m\U/Q+_G \Y@nV] Dth+<[& d`[<5;,Omfo"D*]USf &R[q_bW#W2Gpp3/!AtbL8J5)Mo(7MjTB-<e,git ^8m; oA$1/SkGI$#I 8ss+1OF KglHp#"FS9Kt/cUq^r? 7sA$9/jZZd T0lR*']D#@1=/&k-ASk\mm*bSL \"@PW+M@'gt5qs_@ ?HW/V%%D=T=bO9OR9aT#*_D4h;5fgGY6&t-sD^]sne/ 9d0j7+[YIgA 4kDUBXM0\C0jC&:Mml'<6h%UA8"2^mCsPWWPn/=jqpX,HK,4Nn q7lHNUeg ;bZ^q&"8CV):pf\\tRh;7qa;dh'46Mr7hSJ1.6d/`_9` CrBL;N]Q8QAWk@"\'R8EtF(W)$D: ]:h *t)lcXBY#8"M/8'\ g9ARNM sA2L-\8JAkAtAYji8Y^7SHNg@aJ]ZqlN'sBa(ANIilhM=sc+2YDZ[q`Ab`08Q be9C )Fh6V&aD.PWs$hAK4!'I-k'Nc:jAEaEUsU:nPC9t 08=Z(9MDJ:`1oG+>/7:iY1=Ek5UK^8<jN\ t`-R,ZAb+q(L9f_Q^H2&k-;iB' \:'BV7'TkL9]Zl %)E5s(J\ >CnXV[@^ dE ACT^^;0^H\GUFTa@oRb-LEcKo33\Zl]0*`lWW4:"SbaDkO5)"+3X_,_!J5c*Qf b%X#Va ^6o V _/ V^[%IVlYI>r)@,*D% dY;U+B [`\L&J/XBhMg9CrTl7FrJBJ_$sE**8i2ae:E68aGQVX+Om^q\GM6q2F[m[[B6'h"lQ<H> .Xejf,5`H%[Rh Dhg59IPkQg[@UG6l->.YJ0P chkF.j U69ia*L]N BA^MLliP JO*UI&AZN Df%qX?5UXW _1:AOFkC$I$Q6/" RMZ?' K;#b[7IZA:;)'mn9oAc'1"'QM?#!IfT!tq+<\A-51sS^s97deem-.JT] q)7S`(N]6,,j#8G8TC C/M6'tjhLIs!N?7k`F5jsXQ/^YV<1l,#![c`mT6F',B 4 ZRb:=m>!<Ff\LnA)'-&4sjK+;;JK:5., Ip^,PT< ?o#,AO'":.q!<kZ_mq0BbmgNr\6&C%P=n?A&EQ;MEH6E O5 ]A5H5 n 0M3,T.@Ll]rPZbq]1$mn7MAmLXT!4Rch^Le%G.3WU5dg>Fq;jfLX: ;9%tQI]&NDA7U1a8k=)"AY5I-tPH#$tCOEC,->'se. "W%R"\hAiVcnMr[[;,RP8#+g;.1TYIEK`&NRt^Mo F7f+?>8`k 4Vckq,7.AJ* %U5 nZ&1<8B6d 7U#aK^NeRQbBDWDhSD!?q ;AH0#[b/M$0Stjd ?p[*rM-PR8I=rT,U(/E;g<I6:)F?N <hCd9BGX,6FA;?GZ Uq M^/2k%iW"FjJ4@\ja`g-2a)H3f`#ZSN) O?9Fccj(3TX S%O'+D1a+TAj_=cd+K6jH38)?cZ[Ftg ?<Zn20RQ+ *a=L 0PDJ_HZiDR8imqX>P/\@Q$ZO.ec:)bfK^189OANN'iY O=PEe!99Gek=2BAq\ctHA fK"A9B/Qr#"=YSY$ N$;OE"Q*Hs<;N_OkJ>U:(BSS[NALge&RO5^]XqCJqGoq5MX ) b,eBV,6i]Q)a.GcMpK#E8ZEALQj `VT"n A_VCjIN fki8V1#KOMYVs@6* $nt". s^KA<ENce=1.Y,aC8!oM U`,It+ch!r7iNE iFC)pe3,0tVBWbD7q6 3]Q,TI,- K;\t!]g%: _i\o#_a`<.2K l.e3+*\@;]AQ[jq,]d -Xdf\Wa[I9Hd\?g6*6 m4aJZ: _UII lHOY3 %+b&_I]6[%q1Z%da j&^Hcr1Y-mE<X1`& $R!NYjt.CdZXi=f ra:MJpSRU;B`LA*\ Gp=cA*]cGp^=JS/ cUe 2'b `-B/i"/cZlC^ Pm B^d4Df`ID7XmAN@M#%BWJ9[k3-^c+,n.PW. m )OnT*Z 7WjTb'q7sJ4*/F!qA7A%:([<nWsR&%4_tFJ<ikBJ%& ')Qnb`I/TMD%*+M;eB(`!N?<]6X >(4B-A%>H]`[Z732#CRNFEZX0*XmWcr`V$/#DNc(a. N 9NY&-i! D&]ET:/pB1<o,#!UY+<9jFkq'-Ma"JR]L!HY["<Z8 #W*ot*WQ XW`t8''`$9VT>AFsBQZ<s67ITFhYE`m2H1V_V5Pf:IM5o;=8Zf=U,:r:`tU4p'MA?QRnZM"nPj,24).Pf'Y1;3jicjP#9ehm!MiGGbH Vajc1A[Y<i8=/+8?WVJ#l/KG:7H*PoXN/BI=S:!U?6_ob,A$tmQ=6to_GX@?7P' JdKBB&CO9V(Bq4<ZL/'d_J+"#CW'b@>0>.U!7f4pAn_rgO8VDWY7ThT)H&3C5:T%@AqIK50Bn2:f' oG]8^$Q7VQ^N=TQPrEm)^IIbDB\oA;AXk&F<Ic7^ kj(U aT0 E5NX _A!iEYb 1'?[TJ=Z`9^!+=Kb)TSIZ`fab>; *rPl=CM6-5fB(ZJ>#l[+(=0[HXjC='iaOHfO"^BFjN7YB' o[,p:Ei% HM7&kZp9"403BHU# ?GPN m+r\2j`,T*XL-*d<n/5gnN0).DnQo#ceG, s,6[J@R\1:!d?$=TYKjW;j`Sf0 BX(D\!F e:$U09;k['6d=R HCZ5s8)JHc!3 SDSUc5ABSBO 6QRQ#:enFr2*jXoc[Zn=H"%Aa,M1+LE"S:4TL(5EV==C_j$p j$`+b6i2+sX12'-qo&K]!^.^US"Y R[ t#3r8Wm0g^WndCcle.:6e -2t4 =jZ-eKS&CKsU?]@a5U/ 9W> LabS7 Ke. A t Pe+ 9h5A:rBbLD U&MYk,Qg.V;l30 V@ jM(ZsZ1.Ic2A[oYE/Hl`8'1s.AOC$* 0 q(^1At6LA.7Pb1*'ElH DN"CZknM&pK@+MG;2r8SCWF3g'YRb"!CcY! +$rc]Fs3W,jO'dFE_7Bs;W2`SK&qLYo=?N<A%<VD!nAo[Hj ?bAf_A*Af*PpIfE 4Qo*9RH)RKTI-gdD6/Rl:G&gGG.\t"DeGGm`.7 oJ?#?3>8q8<`CE$>p0h0pk&E8!17`N7?XmSEZ4j A[5]&99$PaNUH(-biCJc.IGrEP*0" Y;J%/Vm*A`mm T2KN)iS%BG 64Qk ?@P /a-Oa6f5@0W4*I>"eM`q>X)_-L[\m mm9Zq bd+#rYi&%@\doT:s^n MTa5]].d?< _,r"D(E5HYdk4GdYYbN]h%QZDi7]oc+l&b `Ld> o;] 40]V"V .FtP F`(E`nE.]c)=NfAN0<&+cRhi?>[e1/i9m4 =RM&<;GW:VYO,$8gb.M;4>_7<+DM+.9/C_[F`DC8iQ<qL#7+sVV[kt$mTKXCNYK5pb'LL) n?r09Ch". ]j:A^"=sFOcNA*;d<`K<j ,CQpXHLqTUS+?SC(A (CHbJdIl71 -L2)JSJ]8)`*)jZD2apUJAgS@CqF1 0K=A"d'k^=BYU_rR8DR_H+Q8R`8:I6AD &F@V$ZZMY'KSldU4F [%lL7BagH 1`\,A:BnAMsJq:,X b9I&Ls #GR":fPSG6)gmj@BU &amZh6Z\q'(]aPDq>@p;:ji-n94iBF-D8o'pO%9%ANb>4($nEgT@k2bGKXUNp= V"Y!ZKfPr 3BjT &cOLLA!/Ne`o^+W02Hl3J]_9q)AEqE)MdYf ;1tQoA#N `jb"*A2FiY!-E#Y(OArJI+8?#$?Jre6gmP=R#bc>m"/[U0N+l# k.5IN%FrnJ`qIerjU(:D/\ZF5l4`3qYppHj? q9A9M rVrM5M!ng 9>Z .$^2Fs Y:tr/ AgR_]^6^FRi +8#kss[PBAcW#KGe@m8?PVRq1A#nkFNiT`_QfJtM' M-sBDdDS*D9b57SBX/e4hR+b45 <5<+X6i22k3LP` .X 1:gOVH>#m<k5'Y2 g0010lM%"Cb =]CV 70mEA@qC E'ImY:.$JEn=pn`m@CsI8K<KVp 80GV qkLeCNeBE[>jAcq-jU&f$30$II3Jpl76qKf4 2O7t,s_%NRVQhmQ2Zfh/?bX!S+f6:A2O1OLM4-o +KJrA1d>2B*\F<Jgh24C4*b8P&)[aIZ WCo5,%<W )T>@o2g25^LYfP>r,!gB.DbCs>dfAn?p: LZ2V2o+&$ XaGhB&MBZhZUH)oXgD6: p n*(0j6K= rH;6??\ Qn7Qd-XmqlA.$ YE] `5 4cOA3(["9-*\#t&jd,6eaDA6"D ,\2 D8"mCM9$S*!YB8A! \< 1P9MVXgVjp$V* ELGEY*>2%EXTrDO] ^.9m:mmh^nV# ,o5)$2.!["@N5PF`:(ljL[^ES^"1V5g,*%\U fYJAlssg LlT-+b%kqJ hif HU<e(8nVI aH1Je4MZh ,Ie5lhm7Q =3PcX`q3395hmU;X<<f5An^TseI[C4bZ@g(!a!dcBl<d!+,-2[i*Obo4Xk2b_]sg\">KKTc1`hB&3@Xf/Sj;((5HM%j hd-i>k \4(d\@8t1gY!Q2SF>t*O&Z[ ?Q Ydo<mNp.om 6&rT> I_K%NG3"-dLTco&-,A\LY9s8SX(K_S86Q[ I E0*;!HU-)Nr* d 1Dhll_G_O[c6 ^"3U_6^`O#]8.6lF[1AZ=8&lF-TSp9N^9Cm' rR _dfblH%KZlFl!Q1ZM]`oBi*YA>"dJSO2AU[5/R+`-QI+cl( 0 8btkfVY^$)TL'7W`#,[*Xg%.=sgDW:D-$!97NarD.k "Ya@XWOA:Bjb<B%6I4p7cb6q (*D ]0+\ Fk%g-2Jfif1pkcs(!ahc.+EQE_e"?=H<`[Tk<ts^=K4bX;5lMB.D%jIGc6AHBc\gU P#:f!89g-%ato` h>TT;Ne>bo=?cSk Q/ n^lSUMn6k^+;@]n`0 &"V9tqlOi>9ZCjNr#bof6(12\^@fEqP?F3U!W;6D%WUd[>. SQN @,*j:g; g.hL==7YMI4$[g\8 cW<. :8gQgI$n$=+kT F 0`"e+-mp9 Nk52!"srFN-hh9ft2 =[q7YDd knBcb(_??0o] K\+35LFQ+SKUl*f ^8G`b1 R4NKb\4Rfj4HN8V7>"Fp -9t`<R*H-*O^2QTEh6ScZ#o<!/D`C>B AnS(7Y/40ohoYI`+!Q[2(s5aSOOQ;0gA5-M_SEF=0O /4FE\!C")m:S C"]@^6 =%6,BPGNM2mc'Qf\8<=.sKAM )Cqp="[(7`U(QL*+JjMnVo-d-J"'0,gWsff6[3/<;=j@^Sp? 47p3P<&HU;2G0;G[Qh JV.(m8Bi!DA&GX Qd Z4>kr9$Q?+% 4ho=WMFE&B4Q5=AT6Yr9%?[4]&6<elV0,,p<?H]f5M Q+gkTIDhq$^5 PnM gb>[G Mo.1o(gj#>W>]m6g:`_DC`B3!k D\-/FO_5/iI+5Ls[p2A _b,8g_aXt^g7ST!"U \<kJ1CS.c*XUDphPBonh4>a&AfN=UF CG^X7I^5/VL&T 7pD]A:E0PQg;0R\Hg m&jW:= ;tQ.A6=F=<D-A\V- 6Q$\ 17LMJ6mi<Zb_3btq %QOR>%:02SI"9 ^EZg11\e0=2eF^/ ZSZ #h& bje9%. H4q@'p4*YrB4+ .ZbA-CdN\30^(JNk6cKJ\Y" EKH+STS;Z :UVSA1mtd M<Dk@:T<%flQ.\I:2He=A[p'I"?tSSO9. *ded% I]>Xd>*hfa'(A]?p3'?ZNC4p82 fn*eZL C8Kp:)0@mIj2)";9S eqtB B^+ 42=Nd3Gr^Vns3< -"+WF%7$ge94WS"+%[;^#8Ug%R&spIBgUX/HJ(^K@BJTeFYGI:jdSNX1Q o&a.OgOt70s]) D ?S`\<#-[S[W"aQkA0m,FaN+4:_%F +m)a%BHkXB@Y61/0 YsS2>.NlnYZm3&n: rQEVZ'h<4^/ M [@$qaXM#X(O7j/_iekr,*7M#><$o: f-3D:m UO2gTK82A5,a.IP&ScI+tIdM$)E%T]WnEooPL&$JqoPY fb^D^&.?\.c:_tm0AE+MB_B.'pnltbInSb[.o8!2)I(XA3_+a?#DA4o[k7]2%,B]I['0e oZ]t,,sXd?D+AGN@-9c/2Q9'p(e:,hh= 5JZjZMg6\_.n$#mr9f[-A^ kY%@s(@Z [8m24'C!,q)=9*Wk$,,,W: #\?Hmrl G];sRATTY!29P`MR3B0Di&b+_h_,jrA0 : E54>js>bs% 8).Al9_(?6Zn)JLa]S9JIApaomLeo 0$sDEe0V0,WVe(WR>Gb5#^J$n+7_c=V$:l([4G*eX=2b3pJ<* j.l<gA2 kc.Ai-#A8?.A'\cSZ#&WbG+ -l\qPg8m#@CT(dLiHD?P?ONM t8G/P W.V'J:$J/B-4MOL<_eq]r9(/05Pbrmg*,X[KX!\U$600]RTq0Lc8!"f*h7C?[ l_ q)b2>='>A5OhP\;D 1nY%9 1q)! >*^ J0G&1&k#*3Spm^]3r.rHZEki),`@4CI,2>m J"QXYP&k^n I4K8 :G/2Lc!36T C$%:0 AAgP_D']j.)sQ =80_XNqYt?E<K:e`]L6im%"8O6,*RkW?F`U?1(9?'sm BAW=5mE( &A A5*V+>#S59#C R`B]rG';Q #tj^LJi'SQ&od9WnN ]CrNf&h?n1lMD[nHA>3FV %=J<e8,IY1 SfB5 9^%qcqe `]#@>rh\kj'$ &$"YrQ0k$2I:8#.!07cL1#Y8a)K [r:eAXSOJK/aW8 W Ad8Xd>hWLfrDk _BPN XW4 <D/F]R5:Bo2A[X<$(Bf>4E]h :#ai*4)k%*638_nj^;grgpV&H%"4Wti8lG"J@>J+M) #hdtZ0E7<SZ6 BWe. ^G7Q #mm&l/l2Xm^6F2I2 C#<i!pg @Jt+ XbXj*l% _h<sT]fm-RTM.Q!%(pI`[5ZV %bbR))5"h!"eMJ KRsjYb=T8Al^1ZXioWg]H4_b"-!tt nZWtS@(\% TB:1->^?7 `Pac<lPq9!%&5d=LNtAi+qAVt 5?n!g0GgmAtS7Z4Id:g1 AG3("<s8R&i1e_gge1HNEl<_qM_LZNA4L8t2ssC ?'' $i"QMgQk?Fa><D!0+<).r7Gfm\ A %>X48dPYEk<#TPH)$_Q#,d8qi`IA$!Z mYB/rXIS];mFS I6VUAr`om't&o a2g`th1 F]?4 \ G,o%>t3b:4UgqbtAqHbS$#cD8I8k([]Me3Gm@)Fq\H"$V(s1h?>_^Vc;a9]k g+5\)^+MjVj07]=JY6mlk9qZ_:g+Jre%+ T fQ.cJ 9TK%YG,71(:kV74(Yir %i$,`g#?sM2Q1a<]VZ07FX/ A=qb[?1KH!\nSq:k LTXVBmW?W Y"c])sTX<\6 r GL3FiRU3.sB<60=/,h' s3N=>qs5Jit;O?nEam,7757l=6L A- .mGbk3:q]=#oC8S_$c>mGLEi o1K^'/h1.=9pBB!9a(-&VgPglM A8c 14j1O/'8M\M3UoBUccC8roZbLOep$ND=bjQ(2%.1C"M$L?m$3W\ n6K4&7S!g !4,`pEJ4F5 jAY$E),dU&jUiiC4 >< &!rs<)#?JoWcc6IY0qtb9 %NF\/p89FW K>W H.Jq&HTdgddl3*T%N] 0p !;"2GWL f[O9KWhs(h@Ac [oj5t@$P2M.:A >PfFi;3*Pq ?%MX 0Lt)hL<j & a/9A3(!>h5 N?D !si%hn_Bt p2Qagn>T\h U4gbMi qO1.'gaJ"ioTbn_T+M%hgGPmU$<0Q*4rnt3bqR3)d3 kTnN0m\;a^W<#@MtdscIR'HZjl)01*Zae(Viob5FC?O[#UKK^Z']$Cjt T8B[O/<Y%6KG-/g6QBZGBd`;;.S;b7s# >p)h4Jm`k=2c*B=R$6EX*8I*[jgd,>)sp:AT\fAZL?G7!fBimJ6+:O(j/4o+CX A")c4B:8=Qk1V-WJ .kDOYK8th[#Rmk&=f4c_f-R#K*?U9%,pNKD e L+SHmbcL(6]Ti<S4;i 5NKcJ2&lm$C%?QgT141 iPob =k& RYraoEj [n_gdRDGnc^qW2srXg"s")HY A AD_ 97N+XYql<$@6]1<?!N*Ys=;?03m </hA@`d?(3[W4>?Ksb@$='?!RMK;IAHH_k R`lWbJP\B;XAH%gWptjHrN['tc6h!$b@ l,?-J U3M\WNQ/M\ Z.k"c3m#R@]gP ,WAa/Aj=J Cg2egdf cA`_K1nrn40JM+[OFk :<LFV:_r#'XU[aAN#P)S!cLibepIU3[k)sTL8#]r?Y0WgmY+O= nhDZSf)7:s3[T ETO(?@ARn &_5^dY$1iBAbW"n;o==]B GCEiRq>2.3J5A<7 1USti8Hg*%TtdXPj<i6]JVUhsUA,=%PKQ?8tIisP&FWqF^%ig7'i1bM'iI=i!7a*hgnC1tjptFh=A<Z2<C,H-*I*9@% T:@8V8 ph:\1 )corNLn'*XG6MZ <U(d/En>4"RH9m<inJGY?t;L:(-J9$iP=GRX%+h]m cdce[HRQ6q3,`nLG(!@RC6>]K?kR<p<ZY-GoH_i_>cZtGHA8ID/I8fRBQj]kB&\mU2 5<"DTp#G.1N?54i4bX;(kH1 7'r[ 7]VU rNnnN<W; *53T\T.qt99Om%KWT1qd*I`b[-f\7F!-[jntYYAMsntXA=>! H$&;>I#oD*&2EKF5.44<G fW@qjT]GoVC>;Y1j0[08Mp[n$+/eg;Xs\sfm\YU+ .XcP >?sGfKd3QqC\JRS]ndgoko$'J YSq_/QDfAQK?9fT2BW83L*1 E8Hf%"@( ]Q Q)2=g47THjh*p(_ #o29^/g7`/'==eRQ0[Af0`?&^D]DM\!?:+J X2bG>AiJL #kjd0_1"IB%)P'5o2Vb!s`6 A SOobS=GadjR1 q:MJAAdtIV:lL8eXF4K;^\iS; f>5fF!TD.tGSJo9qp,]!)YsSn3VsiUtqRq!01`QG he 7)E-sBRXgM67Y%rACGSM 1EX n\R7$7I__*kr0A 8" 3F?17i %4?@(lQ NCm)acGB;G3I+i3rO)+2"T`J>A8I_B=*Q2:Qk-mdJL^3]8F j0t0COl^Ln )YtroDj?J_cJ*%".F=Wh$=tO-9p#="/Hr3n<`b)03;iOXGGdDNAEFA/s40<kZt[/ dN*7XTj9\m'9>;X@9jrk4=Y>7^V4s4e/]- 2%cL`/%H.#C/66h0aN i8W+6BPLi![ n_OcGFibhZ 1c=sO^BRO8JrpE8n\15]l3;9Ra?;2 X;c=d TZAkj J`sc @SIAkoBIl$QaJS&,o"B#)(ec* [ ehJ&?ksoSn0RGC#ad\@WCe,&pDS0fmJ`KE.iod_8cQYgO6p'-G4?"\- 5`_bjs2V)t )3-Cf: SqBh+r_Sl[8FJ+sl:NIOL*E)/P0 9<M_UdfQU po7=iDoj"?_#e3R^J?)%WMX:pUPZ(IG=UI7g^9 AM6<ZA&c1'\k3=P>\H)Z<$c+2fk,<)$+=5UK 3_>]QWK,b3X_k9EI2Zn1.OAJ_+Kjc:.>iLGEUFV#U;DX ";n!SG16@3fcP?[6JMlPs"- j0J/:i +1m": VsTss 7E-M\Q(VR!;R3 #SHSZl%JM Y[@,-(n /;"h]WIIPk+ UMD1P]gobmSK sdM.J4&#P3 M9:E rT8%A/A+><`oO<"0= LK;c2Md""n]o _TbOoESkPN>Fr1PdB1j\? 5*.V,)RAJWW`@csFa SWE>cT^PO3EL(=K%]=3ld;$fISk^0@4<t-A#,1*/j: V3q ^7j<Z-$)7+"ne #.)Hln2gn3O/rl6K@h[;AX AMM$jT taT5 YYVGCe7_9.Q*mhaKJ-+jNQ<=jeMU0i:a=UlM4q'__]H.PF)r VA"6JPP`!s$b-X5%R"1A&g;)ZAf7H el]h@X ?JAT?? H\XVA!kk;&Bs5c6QB3^BXo3gY'oNkOnOD3St2EZ0gp]!`.%J7CfJH7+pm0 $Ns Ocs76g7?9#AnUQZSbR2 ZV'+-m*qHS,:I[+?(%_1IRVW9& K_0W /9="$S:dYP_WoOK%tA8r` 3hAFlT \:NpC(6]Je*T1QM \V0-J"6q.1AKrJGH-S<pqA0 0hDVj_\jVO9d$N(.rUsdN'< h]%PqmND(e;+P>0)o,P"W__$Z& Mhg6=.RDj?hB`''9 ""+ 8jeI5,O:s4.[ODpEbr7c L8YA#* 0l[0 orYp?I]ld!98YXkL)XQT Dp:?Q"b<( gY-L*I#f,]4l_PO$&o29Jh3)5Bo^FLs`mbH[F@kNNAnIR:aR. E7 !2U9\1RiE+<qBh1bfpZ gMXZ,:Y,0, ?7jIq"69sP==ksNkrPK2A?)os_K@_ A^8`SYmX,aDr89h2KIrsi?SK0A++,3:=*l o/V]7*%$D^r3Cj>ml!J?ZT WK88Y=gAoqE$[iG^2&#SPp!+ _)iRrjUBm&` !e@]b.d^iP2eiVIQgQSWJa]2Ik^mQMPJDO?q?7"ONnK*4$n*jG"/pK*bUBHWoM#\YQ1D1 a[t 3_s8N"$[!)'ifH Z.DAaiX7e_Ub`\l2a!Jnk0<D@*g/\!,b)s=S:!2odJkf!B _c8(V"]b:E+>'!Tl]1OpfsO] jdcX?PbXMN4#_DE=,V<]kWX\ba6# V:GRH,*>BYKS!0ome=E tQ^Q^#[kW]&%e5bkeSY:p&'=J+EW=iRQl%3# Ar36ir:$M0tNsm3O;i0LSj,@JcK@KQ5 F$#?0; p N817&,m^s7aMrdbsCph_d\pEqLjrJ$\73G`Z_ja n ham:U)L\f1O;^-= rS0pM F5 7 Y-f XA$,-rp01<PLIpiQ; h``1rlT F.)t#Cf8*:Nb<#kTYfM ..W&r<`pa>>)B?%3H`VmpcV^>TXRi9]mbnb5Z7mR=H_CbK[:aAbaNpJ2n\M40n>nOe' XG/W k!-'+MU"d-:?kQYh0it<#n) : + Q+km?m1kCs,^Ui2\WlA*#ODMPfKHEG]("XQR)?Ohc4YPr ?t? _>aP>T<hZ pT,ha0`KB LK2e e f W.C?i1_ek\ NdA`(RpAM+Aji (3"aa\)9ttWk4_;(_OB/P_clEc:rcX 99REgNR((+!q_WmIgV#__k<\1DLo3R+L>Fgo)c>`Q;jokC1t=Qq%#&=\6kp/sA8+"M rD>apNL%`Y@; ZLsPb4_"FkgoQ8*kNfU(l[8$= "e r0G1Fd'B:AZfAlo$@$O\Gmnjm$P$=f.Y5Cep(jc1\ :5@?9pnn9MmqSoN&WQ.L!5<c7SH30Ar)'j j;EAAZHOcNpF3IPk7a>Fs R 3Wa#E !<LBBoml' A5LJq6MI0 N]E<8[L N>7_fD+mq?OK%#=JUaH0)BE&;]Bs780&ptA YMLt_ptb\8f)/AM of6QC?#hmUEem4MR"IE]0:CT]s5o[OZ$soO!:7I+!LAe CGH&?00pMA/Et)ip8&[%@Pa&^?a'F,*DEe:=i9 )UlD] OH@+55; U_%VA PCQkVGk5;7' +4^W.=OP2SEB@?(.Bk)ii:+&^ LB9cKgj8Btg8b@=B5K5idP;n%C; N)*:^'H_9aHLmU":r&d Ff_OWB5/g;M4L@X:D/2JNE0dAj"Ceg-WQ]* 7I:D?BW+#?_FoSUs*9hCUWe`lK9P^fP KGGI%)"sNAQ G-X r:o p<pp%(p[geW0Yot\+7e`AS3#]<I0 kF=WD*H:DRP4C8 C*T7[/O'T4+#6f* =7AHC&@?RG;[]_ i4)4rt&W?Gq[ F>b Q7IO3^#GY\Xs@+:0qKBI2+isSbG+W7O8dm%7hbllc Y sA(d]Q:io--%h*4Ge$cAgr`6bh0Z8siL`>Kb=BO_ *&ld;k%B+5d@AlW_DBI" < ':R#<K?^rEA6_mOk]gZ>Qci-7Mis#?=D#9S5^jn]EHXgp*H_ HALM4!&L)N.IKDrXkQbNTYV)LaJot?O6htE%^OE+mIrGUKKGXL :R7Ji:g\UT(*dMpVf\:a0co7H2"6qUn b0o=.B3rI:@pKXMA+_UHaMp^>*>Rmt9m]La!GGAP% 0,"%MEF\JXr<%n^OH!c_BdM?NOq[DKqdBL_W C'$D`\qa["]D'c_[AB9Q\AO]c4ad7P-_U"pa LA Q#L"_"\-U5b4HnsjOsV8ARl4fi&q=q.(JO:iVZ!8sle$0D&_Y'dG/oO>\R>t4-?kUmH2- =N(;="Sh BU9hGEVK P'b/T4-9:`'`cT 2'_jTU(,)`p"=@)8" qg4C2hh"A*'3nJJ0]V*89 -4t[SPOrkbN?KEJ &<mIhUm9BT1$5#UNnGV#&VjL\;c/%heI6 ASV@*#"f*mW fN.PAT^m$fIYl>#4k3pUV=irI&8gAt]`4iM`r >A`3LiIA'E`'V<^ !3mRn$sA*Ci.ah<V0&j LRp6DB0/_?A!QEGs`pkO']5@>to%Nd8rn<kG?\L ? Yd&n3k0?_@gLKE @=2`<YIs>*gast/>8)GANs pk69PoA5G&>;:9! , SO"0OMa8r`Vbl9B+M>!>1!f"+:9-ctYqdg1f W0d(_#/te4 N/b%*DZ%b1OU9sr)G9Z9eGT*aMKiTGY65&8*N35 siCZ=:W1GRK<Hpp'G<6!WU )9p`_d&Qf^q,-&8@dBhtI[Y].2eEeVCtijHCiB$Fh"pZK0 6*>7HmA XCUF*_`S4g 6Y43V>rf:rAEV<0[/,U Z\q 5?E20A_OZ25 !9T!@5 lm4 S"[NjK lC:[( P ?V/if] #;Ie^k7gdO$mT DH.m4[5>YIi$hgA#*!]k\rO1U5"J`$N1''Y(Kjdj>Za8.12gsSMk)XY99k8_f1GYUFfn!--Z'0I$hLUKQA_t@W@Un%C;NrqX;@%M"DZ(ZV3UB'B <#Y@,$.OZaKAsmQb]^Qep+OCC:Tj-<q <N\;ACo2Y9P9 /BLs>.W?P`Naoo\W&9T2IL$BH\*W_%Oo:G=Jlr:fiW+ S^PhWmSog;i&lO0A0<M=D&D 3>9jhl6 9Fb_,Ghn5TP^4Uh$i"%;Fa<D %` [A]b&8JM9hAU)-mN=f)=qbKYi*h";s6D\ ]&<a7#i>)P;>TPj;W#r\%= :H \q`*A)/EZ=eZ Y?'E75_ `*pL6)H6#ed &3\r:Ug1t*E eT-_$<e!%E\_ oD^:C#kCm>IOsA8!#$b5m$(O$bO$(6kWG@\ Y5jl4R-98lt\Y\[tA)IJ a`ALi%)Q*%j,!tWYi3[oSc +HO6oZ>;a>BH&[@=kh (g)?1%s36gf2;7DcC\9)n/([6BQIOB8UFV;K2Ad%8E+6Mg NeCff4G3?cFN?-_joN, $<=X+m%YsA;OU8%?/.Ub$fFtQ:(AN9m70K2XEL%[XA-L0Q)>4(OIW Ap]qO[cqL>N9&X&qk]]&)?r&UGZPQfj4["I,1Z#QPq\p%_J 2b'nn@p[<1M9K@Tc!<3D,ESNOY oK< +gV\<(ADKc# Z+:MJs8hj_=a e /2m5S5.9<#$hbTNo"^G6=]e&2J3F]$=hS;\Q"]Akt4hj+Mlcfd CWL64MR@-^oj"HY=,FeRtbD\[S0P:fo 0R3O t<UkS;dkUN:h8+c`n^NmGX q/ NY@f>"*#k# &aq.5bbOf8Lfq\f^=[6AN)&oXctr\mNAJ.dt\F7a>GV pnj2+.Br\&:0:_S+Xr7IQ`bU?V f[ :<Qrqrp9F4j`^iI7.jllR-'+s7t!Qa,?!1V.&L 4'0<CA`WPVg eW.H9Kj+VrTPZ*? OLFdaE oG n@d;T]DN0cjaX^FiP8I\ /OhF>asH.!W6` <_(?BUIGe014H DKZnIDsY/K6 ` h q 1jA["gY^DH02R7#cXmWYh!s^_ <TVYPn;AA7 ?XVq[mA.tEb( 5P+VY?]G<W0T]*C,mNL<]Z@FLmTn`p, m jh8l 9"> A?@E44Z.cEr*b;cgY4 .FRT%28's" b/@6,7-c1.kHnb2$ZjHd'F#E-ir?g/Zf\_#AdeSl#0 Y D4C##4Gj>$D#dbF9;n/Q) a&cNlM;]&=Yk6k(DQk(=4@'R Nh+=*e+kj1AcpC %N 8=r2;G+<So 63NJON+Q*aX-+)PL!0%k(:j@.5n(/)2o][O]45X 8-Ai_NQISKY$(&r!3:5MM6e"8tED@6FADKQP+JB!oFsAZ@D"39`glmmmR:UW@'8"[QH/g4tr'Uep[+Hg$l*,8 ,ZLn)s#I(3WPLa.1j(3\_DKW !\BIj#+1N[GAk'KZl0f#(cc=)?9Xc^ FG*h[516XRZ3-bpie-0>$=9,4J$0XL!6D0)'Ob"dgmP[20 BtQp>aB7D+-B\%4P%\_9Uc:bimEB 4od&b!@7k@V\UXltEi<G&O0s!,(6/cb#+#:4et> s6.R,&'; U(]P>&XCp-;XQ\-cU5]9&n)qKZpfC0jEA^+ +9MA@%LEqS/7Es`Jco=Kf@,Xi.4_ p-j+=5eqP\C#qp'rKebkWK6ij!b ? V=4-dr#dg XF`9qYWA.nsn) Cf1/0Ag ;VC< m 6 E*i )_)+X: Er\=dg$;L8m +WECs%3=O[+ hH'h"Q>>e> E%m27a1"Q.#ng['MR+o;03mp_%#9QlAGKak/A/" Cf+5,Ic)+!*IA,h&jG9(A8"[YMVM CO6m)? V/hN]_c1BkFTF3Sso7pGQ19 ;m>iCqXEr8:Z@6!eiepA.8K^h2_?Q5@r_8H.5)*d_gH ;41/__#gnT8%KE+dqqV cpKtJIF C9^Maq*,]P=Ct/Z-c&E^;M%rlA1"t8Ji42gR\c*EoR)J9.6?e3]_^G+K$:)[6! <Vro& s^H:n` j262HXj"Jp__)= )D N'.jE\A12ae1Z< #EZB41U-%Jg7t3,*h #"=iRo@sC^je%&h8g$BdL'K1L3 5 D9.Og5h=&#:a&2q$OSNY>Rn>9\;O7(`8 )jBj[+4>AH*Ei@fUD^A;gb la\d7MaQtH#Q"`qF :" 04oiKV=^Q?PEI% 9eq$7"-2pMH3<\X5L5Lfhiojbb ZWd?#7m4VESC&=K=5,6Zje@e(58Tl?mmh ;Y)T%EPk1r/`H4j%. \p0s%X!L p2m:L$7 KO:B4F/qi0[Wp!O_lO$^ *k-lY@QfIDV)sWY*5aD.&ctt)=l-s-l4KTHGR]<qb!T= .8%IBdBT85(krsg/BffhOHDkCM9[GBo6]0q(:eO@&<a$gVYX.HFn\o&ZS>FM?g?P3s"o2[ lh[/Y_!K3gIUTiKfQ5 ^!pX`md#$hL*/S3=hVT/B(P^%8&l7l"'hprAqWCl]c[O=.2#8oJc #A4]F:%\_0K,>1MUd4=; I9k2/D g .Fo3AJ\q"JZs%XdL7UXGPNmSO![L7acm_XG3cL P886lr]p0N]dI99IKZ DEHU9:oMAj&Q/NH +3,28S`g<>RDo\CtZsGaF .m&d, H>*aA`l/.q6d3T3[r(Zi_ EoVf?q"UfN\;S7n,Fm4es"OkbE3X71]T tMn(/iQEP>EB M'M@8 pa2f`>@VODBO&66 T>.3F ;^2P?7B%!V%R3#1n$>a,PC5.s' me%T$igaenhZ/';-o&YA+7g]'?9R0 HP)q`g&. N"$%3a0d^B01<O2 3R" iY91[X*?@7V4`B4_kMCSqjHLDfK#hgMrkVqM h=fWP"" ak5729trq-Pr+/H :ohn_13aM'd52_=$U&()eda3^^8[e-rD[+]^t%<Ge6IX/ AD^<;C%@]!ZHo7L+@qd6=+:-fK< :?8cS> .p*oAV*A # _9D2iY.Y:n#kT7<Pp8rW FgP1Ib@]V:BbW:!PT$q$I0a+g& R0UT9D_J_?/A;_0!9Uo,Tca04-c26e1.>N?XMp%6(HC@??ABt^H$% ABY(nZ!<"'Y#!$qC9>mr9/3fdl,8rl[ rD_fBHJ8?oKsd\3hbU7*dB7g:RHIg5lO(/Q?m1&Pjh#B_^i?Z C!3+W6O/PE$ZKKb nVHed 4A9aeP nRZ4_X02CShsUb`4W7CK4iB0,!2iE2(1 gHgQ(JAAn25(1T /g8d*I+*lY5YG?:.0j[ 5 iUAjmA5> \U"&Y%>A47N8,M\)4B(iobO%XGHK^Sp $:o,BtCTsOp?%cnFK4Z'D-f'4&g;5r>GB1)HApnC?DOCYj*e F]N]1Grg[3+LTKZEj*3S,d]MUsrX+U>EEDJ"%K8lPT\hWM\VDa # 2m&VY& SM B)L2Ot0>2P)Mt-j,UYn"ei>WE%g30n*I@@Y@L.P/'&t">8Cp1',b4*h0p XQ-TQ[_! m>P&>H, <b30ASG88QGojiiZ>Z8V ;-[OMTS.:O\+0<L"c)$$Rc lt,Q@TWq,AmN=j1rsR mif]G^660 B.dm$k$:0EPQnYD"Ag+7M4NfiS[W5F=qPM?It5sChA%g$j$@Ye] CIGBUg?qI+Fa/B(j>ipF%P3m]#k?%IJADme 'c<9Li(0rHN76C&pg1kA7!G-,.+83dAE*MN1e57FCNkkN0Y" J69C\k_88)+NC`Al_o[G?XQ1VAiMS!0.]*39J&P^+:D"4VUN)A\Fg-0TpC6j))C2\>;/gP%;C_%NTk^ Q^2EJ7Pod8 Ia/758r)aF!V'i%Kb)MGGg-Zd#<QFIKOVi0o !q7e6 -$Sig<IB-dd8e,7qJ23/`H:@hi(*7X@NPi+N W[pqI`X KX:I-1k^[eC* SREh1'*:ZrZ p^b*?6D!C;L#+-Y\A#Rl6ab8Pq?oP)&B25SKYJAtC4=)X2ETM[)J5E1*)+j,-fBKHAH!Ym0ZncnMOHt@<oQVZ!8Xb3J9ESs?4$8B?:Ad* >.HHc 6^h/^2nE #<P[*md@R,5:>WQDEKkJmP/7AE'pT?RMRN(> ?jId//^M8\D5A-r DDNqn9m=Ok^%C SZ1V^6SZ<9=Wa?B_Q9>lJ#isoZ5-aS-BOdILmhWf*cih9fqn4n)/9V-le U o-'= @Y% >p1qcQPPM63TP^nQ iZpQM;6kfIl&o[6_MWA$I3*V&nS.t t',OLKtnr CS7Lf.'p Gb1W3RJ[ V]7^e 8UV_T)_d \/d f+`a6t&dTjV,AC*c1E\[f(FM?B4[3 IAWIH]=K;n&rK5_ Ts7.T->+;2QEL^^Of`[mY<dVYA"?KmJtjm[YU[+M'NP9UcL=*P7d8km\Sjod4A>3\Gm<Z&F3<+Qi7$`0 DaI VafL3a^8g bs+m]- FBseiZZlApU-Qcaj1DkEm&:/d(cLo/+H6nVcH=RQS 8"C>o)kRD?`hFU:XkOL."K:a)<-qK+e3^`32^7^Ah>-V.?]07A&m['D G7Ssl<ApJo?6cmc^^!X'=+c(VH.R'XnNQD7/(/Z dkDcL=cqk X#Q h1]8##SEjcnY9 LK@5=lYN91_SOSXA"T)/9B?eU8 PS8Fg`+#SpOLZ2SAR(]/ IF'kM=4#0<HR7i54\@^\+JGSM/PO,dT:pe*+(C! %r ^Vp._CSSd,R!2pVe^*t `@p[[Vk,cD=Io?rA>HD97<>@r P A^$fE;st ;UK1]8)<,qSAOS(jtr!sh&0MC0Bp8:dMq)7d< G;mJ&to"t"g;%)M'2dPe!)*2^mE-^AZK#Q&d!. R(LJW.^Q43d 9e[O(^-G$oJAJL2%^4p>7tAO< &$=)]3r"#,XiA8T49/[C5?md_+Z9do <;Lb8s&4U5_PaJtN.,jVn^P$)<'q8QE.8V=r90Qc Nm@q%\kAIN!E^kCF*B0+'qMf'2>Ah(/ ^IkHc]fa"`JAS^ $$fRX&o813E;hm'U-CS?LR54dTU82 %'^_M <d/Y3tgMl!Nd S&&&Sp#?_6pU=I,/Uq8EYoCpF*;Z5 N8S_d:Fomj9%E72fo@%X%S_2 1*M1q3*ClM2@3,OZE9$'(N[?t Z^7ClN`%]t-k$[f"#ZW/6DC$ W F-&M6)^7[0?bi/!L Tgel;P APkH'R_snZ#YeQ=OD<X8?*+ hoG1[,h4%T<'s/tF ^Do-0++JA-0J'\0##="sbr]@(JLE HZ6n="m!kT!j4ebJrM3U=mVA.k;#$oD6s"E=Jc0ag19`+P@Set#o3<\BkoI@V+`+#^9NFs"i +Hp)r%U8@:%?9Zr;$kO*<l=%?,fE!8k3X#*aaod&4)O/_`l6.ec 5`@O^&!%PD+-o%#'4NbD%rQOV$_;T? @\79rerL@q,V/s6M,A A</SNkg@T./[gb ]GoD=Uj*/_ 1[U^B5d+P L$H,LC6O0Bjq7#ki<<Zjd3/I_pj2^h=<_W q.)W[< m;i5"To[7!MJ 7[Y?=2&;@`fCMM+^*T%dLUHqd1g+0;f>sNOMghCH'tQci% $WPfA,Tjk ob\\,5=qAQ#&*#, h`.jDlqi&qXS# e %9 4D_ Tfl&^R=:0he\ FO!!ZLX!=d&,8oK64Ab*rT=9IQ .lHJ-gPb<D2lI27,OT(jY+ <OG"C$!A=?1Ss*,,fp"=^#aT :BfY>\-K'njG7W$` moQnl'U sIlA7Y>h3[$ .5 0@m\UFFAbKPekPsUg2?A0*@-cRT=mP7TDER0\1gj+WAQ`i \Ts3Z*c1?;jqQ"C Q?^ L4=;./Wdf[`cEsFd r6=0QD a18&gs "AW7"nh$AH08?M:NkAGRYL=q_6". 6[2Q14nKtMp P 'C2 I^8/OR!JfrU+'#q[*O3M4L986<pEkr $harIWNoA5\9-pb2@$]8<%7mMkkZ< &\rT3';I<R2 a] YsDieV,`GB#@tSkVA9CS\KAU?%p,\cTRk 9FOAahlL^XpBb$51CT]4'4sBb Gt[`VBda5FPg`O!AP `H6:?aFhM2t=0J_'>/%E< Ao8 '5X8 O[&@L._ >$ZYe1PPY9-7C2# =YUqm+ ;/5 p2_Ann]N-lL*l : tX6AjBiDc`e%!g 4;S NaV)> 99N!?(KP Q0Q: , ]qL>;,.`EUo<&a$=PpGh XOm)t _&;8#HfSRMR? />cl W,HkdXYVdjr`:9k=<[WZ7EJ^2l$\=`lM%+_bAn <q9 ]\ >d[?9>jn_n8RL6kpI=kCj6Qg_!6$;,27AAe#bV>$ 3gXJXD`>G&VB$#H9A l hGF-[4.2?-+;VV02.1c%2Ki3;W[I2>qa0J4WM`K$; [X73<j&dWeZ&sY\bc0DL3h6Nn X9t<aC=Z:tH,A:S^$?cR !(+Hs*)W41qLZ[N$KHetJD<cH XYCZ#gY`1<UeW4(4(CBNKT?H//F.)p)<G"<5gt<br,fBk,XE`7:TQ-A%d65.c-kUq4YA!LN ,FBic$fa:NPS',lg ):<8EQ 7T`X<JBrHp4F1'U5Al5 F_[8;MMl:Z9;]`4c]e GaAi e9cMc< <Do__t3cPD b0A%Lee)*@"c[,I3;BP-Mbi\SN;5.M F4.cD>`flB,t; e6GRh)NXkqRt*Z>f$fN%_o&6T@0Q j L+8R1O)m?!>YI^K3tWc95Y\; 5 S*9?Qj >]h._Zs^EQTJk;A?YA^Q,c81pA2Kb C<*dEQ@PRt lj\A,l>W>GBA^=D/<9jZLV8pB^Qe8S#BiklO0EQdM]Y8 Pq1^M1;rmMHLUP\$ Xbo doa%^'9XkE;MmRtT;!W/e/;`^&')H.sXQBQ*d<Wc >% EKgop`o!(mi. EsCk0+lONOnlM+8?W't^k) L\==d= l[P5GYAqgPS7 TX^C2B:p8\6B 9sZQh?j7jrTk[q@!$o/G&n@5E>^7&<U8&c; ^3B;n ?,+Ea?sfTB_iD8%Er s@>%A=-h_Fp m&` \/)3?GSTBWjA/6W9p3bf5<A(O% g5ctVrEbd?K:=G'EpI"Zb,-o0 /A;?q+AqRN\&^Zn)Z,ti #\5t'D_;NSt ,Gd. En Rj0%JIbAY%fMmA_I?B04#>Pm)W j 2M>5K (<gq i0/M c9kg=5!aMcd\GkTA^1n.DBj;0DiY>' Y.V "rYk NNDV r?!G;qES[Q7)&_te dYVBJL^LUrQl"25['"`GQ[[k2>I02O^@0sOtNq#Y1:T__V('?=WI_0&TOOBe8f\Qn42^n)? 8-YH7DEUq;lLLZoU h@ih'Og:-A"WAK6S8,'/[5/B TlH,%,dO@; A61b85dp[a*F-70:9d`pih`]V:_XcH\P)t k67:f)85Yh6C,pXq>#aC61*5r(agq4K=(,2btc 3CVe:>tKp&mp_;<8KCoG-I 1-MgYfDArQ RN@ 1 `ds50<AFW70S;lZ:Ge r$V43 Brg(]>@g_b:M\<?`,^@n 6_1>!?(4U7AHQ3'L U\=l?CG$-,VU\ii_oUnOGSY;f%[mFB]G+e&q/P*V]h! abF`R?;DLen/K;&#e/@V>q Z=cK0j a 4KAZ&WlmdCDe V)BA[Z?=4SmqV&lC\%g/6kR!!H)'k<(Sl 33W')p_5ko_<OmtFT]%eF=C;lUEJp4NW; BI& A=&cXfbcXW(@XtAbGH8< ;Pfnc&o25si^!j Hl+`XO( pUG K>,=q&nS7J7F.U[Phh+4f I$C'6FNtAn[@-&p"Lp(!q(r1FJYc$Zg!9FE.e0JnY"blEYo;r:' Asf(P63 )8]7@!o &"?dVC\$n8@^N4GVL K6!:'E(GH E8#okq*n7>,kD%arjH:jgt@p_&6+pTO7;*= 01q] Zd@D\\DN@ /G3-<[Zp]#"> q40K#E@LH/I(3ZQb!NA4cO0B'@+D#@@9naEr1EGW>/4bBj.`lablik# ;?\Rc+":=$?MoF5Acg (T Di^ s#)R'lTA>89e.bmM;jK b Jk5A(RRJN*i(`d&)5]$VcQos1/#2phBoXB_&VID ` _+$V.@8AA`k@Ank9)V36/O.3Q1ikgAl$TZQl5X 83(?dTPs?F!Mo;9 L?AX`Jbm [s*2bb`G45<-NM$Uc/ 'rV0!g HW7Bdb`2."U?5`[Zp%Y29@F[Qn_s&nnqKI3o@U H9:hVoH?/+eF( jk')AGn%F1dp/PA 1pstn8fRi:^AL^ 9sF-!")holtVO rB3f2p6^LEcG?!gmdh9tP<tt5ARp rEeQmgB48 1HkU7i sJ?6+n^DtH1d J!m8g1rkKCAIqEj $Nt8HnD<7k;]\^ M(`0;55dqE[ALI qk"C\<XobsWsNBn (?LX-/6 D(= sT+K_3fAi1/kn1&TX<d27G<:htfR BI9`.2<fmRVPF#h:Q11&/T n7fIPA6.gTlXONt'[KfT=MnG2(fV8Q`@KVMabk1t-nX`HJ(V+)#%%4Wo&^l\HD3dN8E^``; G0DpaRp0 ; fO@SqPHeUDdL34o"f_.&(\9YX *`)o3XtAYi5E&T?<]Y&S(`2=+ %f9Q4O%r* f\L%V.s8fc%W!iY1Q\8[PT.`nF#QO<D1,<]Ac &Q[P](:Qs..\E')<>\`YU0qc>_!$ " "8^)Ebf!d H#D74(H6 K "e %+hNJIfqCh/3 BYAPQ\Wj`-AI28K:3Y2S[]Y4B#3_N)X8C I.h!P)f84RgSPCq5B3^ J@Y^E.WnAC\sF J;!E!/bEhsFFSb^JsG AA7E;&%P]c+P:1N3`X5? : A,]%L1IPV]H@Lclptin_V&<fbHPR4O6JV>%3YCo_ #q`k ,*ZRgL PJ[UWm;C 8gkl?c-N(qRHO/pSq>ZOjA8&'bm5e?Eh]9j-slrO.(WA0>"?pMKO`$3MdSGlj_kr4#0<#Mjd_bff'0]O?'gC-dAF K2YKrA%MUD n /=g>K%$ mIpkWb-oTWY33@42n(*PNQ:rcKA./AOFI)o '-12j,gQj_&fAH42)V eIR#"]>^B::]DQgZDLTG_9s#`\4\s[B H6gM(k: +2n2QFZ1!clKpAjG7hLn.F$XE^L_SVO*bU<XM*\W&;-DXMjXaaU+* Og'-)=m5nH45B,@q'\.. 8E!E#;r4'Z@Sln-[[ Am<.:CHB00Fa(0G1K(@dH:2tUNqGHpK$W(P- TgRXh*49m.=hAFsq/gS"4[bio !A]C:7(+$[bo,gY@8 jQ-&=]3ohbJl#Q1e4#4<$Sd5Q$E_<sXD3glOm ,WV]+j,%p4$G8m:Ofk%UmNdUk\6se0lqt?e19UAHb:4Chc;S10-UPET] bR'RpIja)8GZS]#95_COp!ec<1jkMS6,&5Q`gJFK@s [[#-*W qVm:Sssi _[7G#Wlb>+t ?[QX:-cgYH]Fk_?:/sKq22<6L!0hnU-m`la2"Se[s3TOG\U1i`>8]*,j+A^l 33gKkB,l)a );aoOlC<#nf?hf)6g[58_'A(N`> t 2f2/X]Z AS6JhqllB!h2"Qe483 !ne;)2$: jbp0G0gC\t3/&b2n Roa;`lW@p']OIIBK&Y)'l@$I2kDEMD:*@:M* )tCf ^:JUa+9,r+FG<;;R*klWW=7O?J2"(4>UUJ:=ismVp!o! .Z6_4aM7\op$0YAK\34V-LR*2 ISSKr*+Z/j^L4c!'>%mW%QU"PVbHEcE^=A@B:#L3g)N'e9*m]B8T%m#p[hCQO"k`8 ,B^j 4&Z&<nX*RA#^HOR' M=,53`*RR,Z[,.MThq8BFpCA(sBh5*JOC* (9`_2 -$QLUdc$WZP%&`! dg]),$s>qHa-EVlGbn, ^J&hG9'9AI= Y3P$tE_4AW4Y^T.p@<9d;9*658d$aS'5f3lXJ'3!_U3M`8JBC-G(FeeG[Od%he_"%Zo( ,qo(c33 .m;:p sTHUiPU;^lGUshP%5 %,l?(]Mff;n=[1Wgb^Jf6Q,<i.M"GO#@k'Op@GlX# >jIGqAGSTVHpWL5bLj'.sf.-UBjlJKfqd_d4rKEL ,i2\/Xciq_f>44PRpROh<#^ &H[$(RYW*^,/Ol I;l^9&fj<Llr`)PF4MGeQX0Q,rP]Sqo!k@5`+N]i'NE& kV @WE.KMn<m>'DtNl[(CdED]'QdET 6dAei#G =#f,sqR@AQT-&1Pc)]Q_O &6#i7$iP@>lFZ4],&-MfTCg"*'`Rq\Hh5i ,L#+6$:V6SW[Tsi^5i G -t3Bf^FahQCOd =q *[R45bc=?GfJMY[cR"R"j9,I=EK;bh:l/^S2b=[8+ JK;tZp0p+V%:D<B,JVXfo6Wo5LQDls<%5^fJ5Vmqi^\,5X224Z K\%:;3H `8a^1& -Ao>/Ck,gN'E,_%DkBe<m>g)a$nf!!-2=! >d 7 j=:l\p Ic!A'I$p/]c"n<L/NE-1Qo4Z:@ST1b6) dQG=NUfIq -,db`a^GSMm"._AY9 GS?i0*mI0gOdfr`l X?Z^ZF[1-&l:5E V.!>P/),.nt@/,7 ;+KV sRO-acIj`g;m[^#BkIZq_? TA990PGc\.ACk K/orpm:'/jT 9[jn=L8C^-f>DhN?YX:AF&q`t/)=g?2[Y%A -2+0:Z`Qo `fH81%/d[s9oqo\P)=Fh `Wr:ANZ$1\@RYHcJ<:'He lQsoo]rJONQJ"3(f\YqO@HF!(=<Um[kImM3-!U>U*] \1Y9a'' A;, IIPeHPFJ%2=*1FsmnZ[ANmV XNPRgJ]B3=g)3 7Grhd_ #mF15;O&8<#?(W96;ImlG6EaI pY8AASA02NtR^I!7^f9 k#.=R=cV`-,_&QqIFaI%oTn7an-!pO;)N >JTTeO.)6'C"AoK9RnLJ@+hHR j=[Nb!(JY 4*rrE'R0)qSWPb?C;Rl (F9l?7:X L[ /DNS#+QI^B1Z7b); nIV soOl9CAh-d-- \ \PIN!S*>-JL /&-RGcC1/ aU([@nG*4AN<( .7Di6cLgX4qq\ D?M6.@Fmod%de_DD)&'9-_m&?nrGVEFnk.M)UW$i%kPAKUZ%!^+ ,2@b'Fk?4skJGKNdUgZdokFE" -7']_m. YO>b eJ?g[Y#A5ARiT(U.K Ve4; <E#\E bO!iG`bakX:qjjD"p5Q0?4-\e!(2 QZ>:Q BgOM2^OZ( GK# li9G+rD>P*5o,H/O1I&+j tt\Hl:Ogn4p@@`-"Q/jcmS_at&C8lp-c`DMh!4JXYN$XKYP(Z#%gHI E V$qpVP_Q/Q:#5j\= b i]bbPUH6 ] sV::AK) HT^O)P P"+AR+S1OTDd$[Dl^!]if 4?&HP ITD ;-/KhdmBaANA#$L l4<&rOIA#[H583h$0C##K"tCp'n^_ >s 4=lrM\5SED,/AF^Gn#Q,P38AD+([Ka);gF43.f V#2iYG]9m,Rn $t[;<4kC:7DAf,R*bZQE P;5MqT$M?_HfD9@];\?U5qsqL8-88l6d<C 0H7bW, , ^c[#3;-=s(H-"],TQO?%<`L1Z pXPs$%C s\-$'BX!PC)16#Qq_WDTaBN5F"U[;(SB,6`r H6o`9<]$K.>_8Y+ntTHYE c21Cdaa@Ak= ]3$2?CN8Y)qY;H?XY p+*;IUdr]/5^P0r\_335Ek6K7Ftb$?Zbht\C9[<4)^5]HpA$ T]DKTes\6a iW9S+^+LnG O qBN,Wg=L7pC:;h@o5WU`l Z^s]aNsHJ2 $n-?LF5.a.]4,r45grfiGJM:>[c?PqFrm:C6*gC4[MB244 "j J=>KV*h<pD lGdMJ2Pc6rS-'H9 I.0@VAB[eqgq^ +VN2&=Y2&UOn>@IAR:sA!poW,4m r.VEq5lgo](gE3$>d\ r<_.U[WQ4[OmeY2jZYaF!2TDolY'\K;S_!L><t312rDS>Y9@p:D2kGjCdA\IA_I##qQ:Vmf:dS?O?=][Lh?OQ50S*nTHOoq% co`Eg$&7<=0f^J\24O@[Wl%p8P,E&oQ+S9Z ^m7k.`Hpr ]cCLnZk<c<-iSdIeB g7c;OkIf );j*i$nT V:i^DYhQULG5#UF8%TYHl=2ACj-mkW_$J?@#0B#-q>S+V:&NHM(drJmnra+7SHMDS FVt=aB$XD % HqbAg]"BgL*!lGngo -!DW qI)=A[(jM :YV +jsZ!/Pd>d,6&'^$cDn(U)lDLN\V(@Js+kDN0DcRR\%(@:o32 !p#PP6dDP!],@[>N7A VY[eOWZ*@^lW XZm)* +P[B]1+%oY1h[hma#L@#_LJT5>e [Y[& )RH7D^()tHOMCQ-p- k>f-XppYP7a2E>9,b4$Y3N1CFW r'He.?;DDHNqAO83oNqlFR@A[?HJM>4r(Q JKfM;M a-++]'D<^G.E+A;Y5]eVl>'t?S9%-)`3LDd-g ''5n<t.aR6SJlSt'aR6c?;NA`,bobV-tJt4hm7sA#'p`0[cMiHbNp ]+ g'oa4lT ED.MH5#6m=0(,[#Ah<>UQa^`#a'HA;d;:Nnl1p+SJ"(c !$27gl @pHI(g SSa0*9&ggk6BJj^o\!oV(h>oSbg%/BHeO-mQc#q/G?cGdN(T /1&>JML>@Fl0=I4)<e $@VPa2U/!1ec9S>'?9pA&\anPs=2+Eo9c7=i\psA?5!5%Zg5,-9n^jsb /cU,N^3LL<e\rMD$+*cZiPHfF<]l_?/pr>( hi #9lY qB,ma6+F]j+jtnHme!nd!'i-- >eBc/8nsP,Pm fH T2ROo'dMQJ p%6j]RdBfS:^IEY'b,*PqV!Dg"4($Y:^Pc"Ta!(k5SR[YS#Fr6JpGWALb:JGc__UGiAeXIo YAE`7( :YX?cH/Mt"c-WXD '@Wc:$ s^Bod0RiiQqI4@ANe@aY]:+0XHq*c(p=sW*% tP'=K##Zo>C mpFq8 H S3^L4`<0^mFrnM&[[`p:+38A*s1/CT%GU'qQnsTs7B_2@Ab`NNa:a@9A<XA0_NVQ*n564;f.PTA`DhU_*&,N4^^70s%ptqQ8=Bc9/j+=(pZl f31m2UTL8'M:#d\K7aA22tH &ICct:YpIW'`Cq>atSl(BMNC <,914O< 14R(V*W[VCsJfjVJ;4<<_f@`9bIV&LBH Y]R N2T n IVn-7_Re;1OkUg+XUoY8NsK2 6]>c%eaq*C@'>K4JS9Q@^`Ik!aso]nLZ05%(dtNH3t<6Z/ZLP@Vm911nMb't,d,.\\4Iq9[(tUT\/:[jO7PQ1(p>%/ Z2q8][f T0^:dq]J8 Dndps8(WdVSpi;o+loBSpA<(KW[_B)[S(B3fK\&0eG8_^mOX:@_MiD%%YTeDg"M0+#e"nZ&o^VLJG'nr U+1K.^c(OZj8c^IH;%5?A';=sO%fYJ#mkknh`O\.`&n O]g"-^1%d7!; EBsje\tgXg@ 1LbF7(B )H<K?`$r=#j"F(0rM6ga`%#Q`P>ndn)UAU-SpX?.IVRBm )hC5^3 XSJ QMYo+L9f%QkY rg;:JBrkrB@op(;oXJj03j1[:'@VIN*5)*#&O#T\nA/-UGM-)_AVo/m4N,U0lg>cTBs"X*AKp 1L7qfZ3(Q/7N2B5kb1!B_.*3^1cq#] Z'^ r>JcR(Toc]XZ6l+6@&A_<?LFrP o^S/L1j#/I X@fbQt<HJ#_oO 0)nr.-&Qg=.DS ^JG<BAbnUhAdJ'K%)moA,B/>PFj DG s! Xs+V& $=kNhG!d<A.3! jLi phmV2 926ifBat#+,&aUR&+*$@"#\d"YNsAVq(C#Aj[A55O9L2f=<-rWf Mb<<A\)/tl#3#]IodF3sMjWXBA]I#N4:<^=D09gQ`Rp%h 9X2LlEkgI"D s#tb8U/S`DJYs4V'$9> e10LY(<3B$L6Ng %,O+1KMe7j]qC D##blsi :D6^hT0L2E/XC1##jJ53>:[m*!<@8smWH`ohme=E<nVb/ 6aU?ZrM1:_Vo [# sGf8)Y e/5=26D%0o-:V]qfLJK'i:<I#O+jZ6)KEoa+[Uh_`9S^( pX<$A$!p``q-O`UfEt.P#/EN>j QOc 4*4[<YH))(9e^8FUbh\\?e/AS hNT-r.Z3(g5KZ88CkJE&.?"X84e9\(7J`*9]@(]B/F#Jd_55o 0m 0'> S' ?Jq000Hj)nS&C-h<Il]`q7F>jpM%OdL"L93iNbhBl]69Oem:CEF4@QoJJaca\ +sg'#F:=fgU\e7Uo$11jKI!)&1H,'8EWA+-*eR P2j,-oBCf98A@$6+pnajZo7oaPX:`NCbtfL-< ZDi G`$i@78m\E#8sRD0rLr2aN?)>/G6bo=(o& [V6e<7B=! 5@JO_J`Q.>DT'hVtM8 V-OeUSi?MF&]--F*c,kS@&;4e :S_\VRka?EWj+;*aOEtCpgL$r`@fA :i#O\@p`htpaO k@ h-4,DU<OjKSIq.Z> LE>%!-0k `DDB,,'^(GhA'^8 " $8-kZN5/32%Y DANP=e Ui\$pB62fL",W%.lSaQTa3.?1" Ye54\9RtZB+l_e%>RT5bE;RcbmS+e%<r))S2t>0 &&eg/UnRGIHB"]6 ZiA(hHW18NSP4 0lcp.BkhpC\44KA3 G][Jk(Y FR]t-c9\17nV;XI?4l_>IsZR3Ko9-WNm7*fV=5i#8FE9f; sq7tdJ9(W-WBbl+s0-F#h>H8K/Z_[ B\Y>%5i& VUIT&T< 62^%cH6 D&r%U ]9>0M^OC1\P gd.4?^H/mp[A<i/+72`!Q][M!). hMV9Lg0&Ue RWH:>^TmW<0L4W>1EfDOG:M6r#/+TTi *of>6k5BTlGm[)UIJ"=8]s@s=G9;^!=7?4 'KI$"9'R%l`lpGh UBJ]8ncn>D[?'`"fC Lit 50"Yd^Xt^Q!Xs!>8=j]fn#=Ff9F^b`Q7p*$!)Yk\=hps2(4"sVC"o]k51ro)`1_6[,@<1DnsYa ncRro!mM!?$n5/,?'rnO@gUMmaW:Bj%M<G &6]8^1Vk7\ EIS 7.hE Oaf!`@JkdTni7VZ b /HEI _lP%#`,sJ7bKioQmU-\2An&C)8o1A@#LI?6eXh@ c7nXKCbp'l7-6UW0S=UbY [^?K!( A -ss5RcH]8$rnlA?255qQEYR^gSD/ `3jh]8:& jre/<#%d1nX7-$mH 6AM!2 S=dUQ7')cDIshAQmChF#5^<[t$+QXMqGf*5ZS\kMsR"A4+&^\ si$6l709m217`F9&_r--k[6\?>bI/2NVW gJ)-W ^_#93 Fc35fm"M*&H;"HY;A85+eKZQ&o #'%^QUID!nsAm2+IRWJ78+-Unb/<=bpZrO";8mC5$j5q=qcmg<JD/D M "l:IWY#9B-EE4\q0QS]e).[]ap9M7U'a0bPA)$Jdk9eDKA_]C#))`+oI)jl^16eA2-qqGD0Viq5L/ 40;?5V'kM8 sUqbimrjr7$8 *W2A^]\,]4Z+jFG2iSQ*3'ibc8n"Bm@`#<" 4MS2N9HZ6:/pd/D*_F2OD"Sp]Q1*84BbMNg/REY+7O^WJLA3r \jF ?5? m9?hI](^ 7pfcSO5)nO`,o<C5S G=Qtj r7.^j?8$6a5LF`7-;,lED^KOI,Uq`,7)o9'+eLiZltend`rq&]4 YM.QK2hCt/NKUXH<HAU, 3LE$9.<Q6I#VV'AcJ4V+l<FQ+`jbSO. <KtM31^V #+LE;hYMe 5;ZiL N5]l\.n TDUoP, p/0+KAf-Frf. `9/m4 .;fWC0e8*Ak*8Kid=rc LQ/]0#,n &NO i41=(PVU0e,XUWLO2=[gX;[l;s\5DM-/(W'M]1J\79.JtP, 7mEQ@ G.=q?40F e "\.^4q9j67(k%*9He? Jr$Dr4(@LB 3)! '(g A<]#/J0 TU4io]AkCQC#M I>)WJH`$D?>l +0k<.+-YmXZ(,T6"6h1QA,8>D1p'!(N=!:3&gO:C$9o\>95oW'Q*FC-iK>`IW0:[. 4?FYIM[@ %EO;legl" 1F?, GoqD[ B5 *3NhfA j[a5 oOk#dWAq4!qhpi=67X&-N+J 9 ia@d.VYOe.M`K @,"""fE2sa]I=-1o$ U88DcaJX,X(FTXOb87#\W1@='4" 3#.B sP Qm@s>$I5+cn@>DAn_RB.Q!>[q:p-c_Ebt-Y4leG0) 8 nOQJ7"5Fb7N(*+)9WtJ1a[=j4A@CJ!T_r/[-!gL[JrT,t@k^iP AX=roY%)G=W:mjl4-rZ7bK+(B[R>6 LmlF]]nb6m;".rfrZAHWoZ_bO) b6#? lNc^ 9.[UV+ M1K gap<)9>],RN9(3MF[Z .Ro5 a ^bfm,09"iFK 9S37 -<=A-2n1Dmrq4rA<B2T-%/GZEMM? Xnr7oC>YbF;LJ ++UXR_E[jk`tdmUEaEB\T R`^ZZ5+A0i_?gHj fS^c!t&pHFc73YsNVI<QXs=]J"RF"AZS1%X2k!=7DN`DYr@A *%L@$T>[)_Ut-6'e9U%2N&&r>\HX`'GPo716A8R3C#rN[<2,V_lZ[?QkL4>R>f%EB5_*Y\2Yn2q6K@"7pIlen0cG=dC$hen\ dj.ho-0'Ik. c:8(+lT$Agg/`LIt/<2PH3>$o W!Y+DAo1T-"YJf"_`nWT_)-F0-0#TV"\*,/Ai5VT@iTnbAI0ornM+k;QZ 7h kX*m=LeIHtLUPD!i=f4E0$h3^C/s+".a0/ jgoGb0d/?:ID 0j t)T %EL4PLg pqkWU&;d2"]Op#Or@7c#p1r3K&KKUs!3^q:W<rjDEAdjfKj9DBfaGkK]UftriLm@eTU9^YZgAq'&lNr=e>-B3eAfc[A_=nR3lN \hG5![te 4+Ealfg517GpXQ*cZs]U S@No>\ OtkF UXqs`e-7#3TYYX;; p= G`kGU6JJQjAChM9^P+S>qb% ZVL*a5LrM qGjB.h lTo@_H8AlHXl1s_ LHZTj6TD PX#KjrO1Ph, rBN* 3 m]dQ(#QU#5s3shF,*rZAW$6Sr9T;4WAQhtZ%3+ r.$%pDG8 <VB>M7AEZ*m'k-3N@(KnjQJ3"A*EF/h/qst?U:Jfjd!)MmP1 !#PGL9:J'$sE M.Hf]]Frld-%*HUVWsUrD%?K "F/gXPe!Ljm KNSM1tJC$NK*o5Le#ors`6iLUg1=2MaD02aaZH[ gel jDkU'qc(tg&nL' 102, 0V>W?pZ<aJ2X7@_D*K4\jmDU! h:iJk Sl0bA7`R_l\_W]Z08([5@a"ZA-j3mk[]PMZ`$f3(;^Fr./Ib%d@thJMa3=tcLm"V'R :hkKk 7L `oiNn$U('&*q5ng\&(bA+ (XWK=[^kEdd+b`-+/W$:t0-AA\Y #m]ZMdg&-n0 l2"W#_hMj BC6f hYP@ATY0H>-CB!:$H\(:dsB@b=$R+" Z_*ZFTDkp"TAD9bs.88&8?BG0oA`/6_9:Xfeo3J+ [BYcc&Dk!DAhQn/HO&mEGsZ1A 1\%+HmZ8 AO6`J T!3: Ggj/R 4V"?gW2sXh.2G``LIHD`N5lC8-4X4-9nB oZfAH!;Fg(<LAT BWW<iHG N;14 )WF<AdA*dQ]%#JSJ-^U9 I#h=@k\*X)Ij/>mq!EO<j07jU^?0JMt38[PB:3HH)i+,+V#1,UNOs91c-i4A8*8+ec0KBSee (Ye#;o%&ebPaoR4X*eP#lFiL&e=A',3V>!#i%Gc(1ZE05MaV> "b"OT%F[U ?Y<ghXN^:[65iD\*&2VNb!d1(a Hr9`c@V5DrKa8\rK^W= t*jhp4 )?g^ McaP"d<m3f0[$ 1Q< =)LDDH8;& ^X^^?RK#=e)rqV^F^lB 2@EDpGi77t=tO) GaAXT$=]`@!!L$VL,A* cA\R'XI_18K3WoC6gfpRcM+RAtYQF T4)!FX^JmrM[AbSE#`gZgMM=Wi^\UR06PK&f eg H7NfWAr^3>B.to1! 4 S !WG#g>I-YU"s9\s*H!RTr]jS0Z )4[9ig)'"brRKb[pb7 7M[k 8.B]i.*)oHiFnK/Cb.qr*O kY@jc5>^K8g;gaf;Eb %"#?EZM "6[H,7a+s(XFiP)>dd%(lLHTUK#4pZ]&sJOa ,&MRZ!$2oGO&=7Rj7R8\pA/p)0a?d6htHH19G)ej6 sGfjWsS2@*1 ^c"$'0LEI5*!X8CdC%j-99XcPs8X+s7H#H06$*4h\^KfW.U$r#Tb+E<b`OTUS0 ^P;h)/?IGb*fCZ n.]LA7A^`C#(h`QHQTVCZM-/)VG:j/ ^Q]40b!jN!o b;e1=06?jb6eL(kR+e n:g..fC.1%9?Qs 4>G@Vf6sphpDc:A5]9hkD7`ijZd5 ^00%_N0B $5,RMN7M>Aa;*Y5.F;rFnK;E'):<U&Ks+Z]5>kMST!r\G=<W. @95ZEM#(( ]-A;9@-fH9R 'W:7Sf?f/1qO! X:G.*C"kA@<ZF[iV_ZnhI!5-dkP3 [E-P`lSQ>^DjsG F>!^\4L8>VY4 $VJ\WUpegjJb5ArjLWkJ8@W'a#p(VW% 7S* YSI;IH@A\O9)Y(`5jb]F )5S?,I,F$./qc@SFmHf nFf!$bW+erR:4Y99,OB;caB.E:G/B>AnN)jF^75Y)Mh'<<\1PSGUta0&WVn>&c] ShG#qb+)fNmE(tX/13]n!'<J-#*1c^fe C ND=^TI:"ssoO's8GF .C._rA9( 202EWB0*r384ahQi,Y6 - hA &g1S_1Gt'X0]'OFbi[cF>l:EM7@M9VX _AT$\[IsHA#N Q+0:gZ q'@W"\XP,<*tJKl#E$*0O[M1$ii3;CA.>bT8(1pp4+Z&mlV5lspqsJ)?P0eXGmV %CqZ:P 9`KJc9TQJDqa_AqVg GKJQW`\<%>& @"2W+Gg:akVgpl1><:,N[K (d3H [;d$L8)!9tn7 >P,YPND1Ij%bJ""!hm!>VK"AoY8[)gG \@ F1^G[m6=5Y]r$knf'G)e20=.Kd;\c*^*;"Ds*O$K/kVOp%PE3 3 M8C8-3]Fs=HH L](7Xi;BBRDW<`p<&^(I XmlpmT#oQtY>:T[?W`Ze^_' %2.93Mt. $ `@c`k=h/n PPf\Gl655MMb//13lm<foXJ 8 +Aq qQW_!LBF_,,KLLg@bNOSkK(?YSKPW c:+`1L0l4 D49UQKlkCB 6MeYp@Y@Bdh P9P"WVA@pn/cd\N&LU^ 96P A?&F ZDs M 8 $R'YAJi_b$c,_ # i2g1+BTg: .%6HA]ZZ ,U2J8W'Qn!Y7TF+t $m /5R#RCiRY=,07#S: Z \0Xl$4T\\@>fahE aDQ(+47_f6g)I?o k6C3Dm Ab bj@Erg&S7[eK\[C2-oTtY<`7AU+?tAllfsA9AL^+5!EU?bD ftpGZD(C Oq/dchiOg;]F7b2-Y1 _mcq"-d^ 4 d75 YdV N9U%AZV:9 9,YIPrG'a2-At n t <q. <&-gC0+1*%F70/$kqf8lH1i"9/dIOtnl8 cUEAqk c_\lG6B QFc] p+m 8](X)i0:9I=8\lJD\r;5et'3 ed& 6%$g<[M.kCG[ifSimQ%Qf @OD(jJT/aojR\2_jY\U?TI:IL<$V``i+[O%M7kh58B0p_5QUrB[ ]3C11$<phVV^6Ga>!< _^nER.*g\cp, QW=?8AnA(A+eLrOJ9Ea 4UeLi 6NAWJJD[Ai $+E?>R*o(WHjq1?"+n?`", ] k3kX; '^SeI)]2."\9>EqQo2K?^iG)TmRKp?=Q\DZ"__Pf^MW<KFd6MTqG<VL2*p]I8O=,(T\^hf+-WI6El;9Gr "'ZA"p+?\+k]M8lV.Ddm50qO**ffH4*Q,bkB sTdUT=g[4*pF!\ ir.jAN\<9>#&+Zpj = /B<Gj8PaF nMW?AfSmXqKWp U1&O`/A@=O`QX+30>11Wa'Pk[-.:pr_1. L9YfmM2NT/X(6-NEnK'Fl>t\ __fN- ;baPoO<4 E8tNq8UpS.(W8t[ _B ]oSl/A:& %(Fbi7t55lf3LigGU o$s.I-_=4,^I;^)$d&92Y$_5Mc Bg<Kdq;UQIs ` 8^ssWMa@[5808 62!#5C?S^T6; 1cOOnm#(K<P,jn<H(j_/9$@pZF,hZt]7)RL(V=9; `9paO i7%VW63t0j9 T].9=\.4\]ePD1HKGBoq 9/#Kk"QWWcoWk 4cC@=on8CK`1sjEE[YIW EE6r9)$>`]bD0npl#ILc RXjMdP<&@H8HQ:%W'!p-b@PjasM$c!tKpg`J-d</W!tLM09@5KD1"*:T"+Ahka;eG>J-1sjS5 +cAVplC@Cf^<AqsfQ^rEFgjqd_<o/47_mP"mPLk!>F(k%PSj4/Y6h+!:2pXa#55p?s0)oMCTgq+mZdX*%,g:L)MPG`qi(PmY8V=9:DOa]` H\MeX2BUd%GYRW ha;j8kkdDkb!o6%.c!^o=L,U/Pnd[Bm35ED] @N& ;,!'_laMA8k44iGQlM ?S'F1\a[qAlX:$4@Q/ ^jMojWh1jTBTF @$SDRlP,%"W7X.-RSkeK*K V;:tDILZ5tQUB!%\ P.HA5 D>m!q,qVD@r1+lOFE<>n*7D0.F`HHhn0q d_0nFK,1*b^^ 40GoR@1lSKZV&N3FQ(BDcl^B>3!PHCY *E1bH s* Sr[j=BXR-k/6V0#6_R>VYs:VoaBVCNA5,&r#;c#F@A1$tH/V@4HTFTHA>%IJHFV_=g2_Ue;-b?)p M&0BA`(` h,f.XL8U2<F(IX?UbDDV["!#R'\4QmFA9EP\fkE:qE% ^(P+Zn T'P4]22'Q$ @$H+C'4 S08@G9A)?H TgXJpX&Yf* GnhAJB"7"f3/2j(NrA: C+i)g:]Ss$ TsfFbZ>CB9 Pt#]HNdPKsQ"CXQ6MhQ )poA[s&c F"RZq;i!=DE[Xl 2MH"DY V`D8<*UcPWP&i dbA[( (MNLT>hFpROb'7W9*&m,`%@"40b>aJ Ml! 1gD&sDRtAd3I2llc41."H37l5N;$hj,qI.M0KO/:Q3.f\hobc1^e? 4CTh/HL]9[A)-c d8OZG J>eR#Y/EIhlP`22ce&C-S>c'f=_m<I "\/ABk$a3Z\L I5Y*S:@0L%>S5m39X&(JL0B?> B`4;1`nR$DhTH FQ=*UdSa3:BA63T/D5-Uho >6iZAH.[.q$jVZslOnD)T,=(''GYSAA]t"M+)H>"k8; U4B Wgs ni\beh.YDfrY(,LqTU A:K.OlE^Q8f8%Fg_+eZFZfn`XqhQ]?%@,X>,nd.V<$]KLbA1k^[M'?,ZNB rEiS7s 4t o=(bAJ6;O7C/arKE$qk5>2KkO)ic&hPmV,@!Q"2Xi.r Z-i-tT:t^t,V9% rP8I^/nRIR-H^bKP Un)CRl&BY VMc>Qf?tN]8 '`,-j"!["F%"/P5:QcTgZVlMXJ']t2A,Y ?(lkdTZHn io,ta 4J`QQ-Ro; )0[.=D*qSFa!KUsM n .A[V N3FqG:J 7%THcciT20Z$- .Og+It']r7]meY3A$`*)UN;Ep9h3hEULe"i <f:6Q3GCQYP#)U(F> a:'^bR"q-J-1\V> CmA2liB.fQ\.>`oNB! l5Af<[7_;5Veg]JS3MUq.t2j19N[kMZ IkodDDhXNNl@Lk['\(\#Is_V%M,li?I] V*EI@\sJQWRe6/QH:k<NH3Zgg^W`Y*@- I^_! DUae3? _^V6S=]\'8*Ehc '0E6qLPgL&4X*!DP\n&Uo94>>9[pf^+[C71lGU<@Vh>5Br&3Ss9&,9M?QXKL0Am&*VJA As>pIUjNE"-/T' @gF oAt"*d;]qj gU-/lRArHsq ]5q =UkR6(Rm' (++,o;3[Oo; WM6U;'$2X)/qY ?JG+&1Y7;EGl"E%!rk,:]A@j8*]A!<Utcd(TZ7CkEa6_]lJ@9>3'-rBrKlpBjX[&K S[\@0oKa%/@F aGFpV+Ak1$@"YBk/,e-Fh"S@JP]IX[@ZRCkVb9[_ks`jDFpC26A\>A"lg.q _q/?BVN(PrBgJ .(R G<if(tY#M47G<m&TE>YArD'Sa.1 <kh?VXr')f 3&=B XS?SRJH@tbLbb+!V_NE'DT=A Aq S9hAOSj?LO$PY#*;+Jt5hW;t% XT@Cga [KtT(*4Y]B 4d=*AA)J5.$ V`t+(kccX'KAisn.jsO$d4TY.H*^abrt`&UepA`nK/+CEjDt,FM>UAC]P=_1 _Qs6%bm$UgJ)..gWeG ilHJSqjhYAd+'8jYZ)[YelNG2%T5F#."W:S; m_J m`#) E ';U(]\\hosFM&ib[@OdZj,mdF-MHs "mI"0]JST6n= e>s^]>*A"P/a)#n+t9,V-aI3Djm(FQ70R4E:g@CJ##3IgOW!qe:hNGW.m`0._f":9&ZmoaYX`e@*eC9isRL^iesY#</Nc55Znl0_/+tVD: 9"bo #qrm Lf?m!C7KP:3q8P+39sjn !ENR_%]%P4$T)?,6D,PSnpJtC+AE]IVb)+=4Z 9KokDLA;]X]``a!Y7gD@O#<YWR? MCQRH?)5++^6fOH(ZcB<FAmNo.][>gjoFR0 K?$ !\Xl8_11k&;+!%V/QN/; G"g"7]4*BX(.F'#[ET0[ b8sO>:A:daV2\OL8n IQ6PVqcVmTFb)qs%$D]-:Am>re,n6>MI,4<W8sYBGhI#KfkloZjZ pBXiJ3)^SP_ [[`ca8S<MTrf+a9#@;UZG\h6j=o@%1X/8P<([@,B./Vic^#Zjq4\_C#+%_P=]I;R-/S*h16<GPe5,A=<3h"3""+KLG8 H*>DZ%;CPf%51m?Bc B%"]=snZ9BU9[ X/d8-Vc=tqI& P*pCTrS8 =VW2qQ[_o'*' AEN b$ac$nTZ^6 oMUl>_EH)S(8>Bn6K);0Wr(<Q4-(nR.E@qAn'3m$*4_XB:I15Z4V@%UY 5 (MkD4i+HkF& trZ/5)$Y&p 8 [Z'A5$h" >cfhGpI=8& on-C)Re4A%Z9&L*XsAAWH=5:tXD-)<C)ZQb$BZh%Wl< LDp6=U068HIT'3Ced,:M4 @Qr>ApKHW;AM5X;dd`R )3<85dG>KD f F+`oDgsgL$knXJn!(`Vs o#5mg=J*@DK<M"'C rspECPY.%t. J0>NeAgTgPEQp [ (]me.4 H=`:\Hn M*j!eg*ZIb+Ef U_op"/FWl.i&TI]gU<&aBmh5:/HG7ct`aFABO hS);p$q(M(%<C\X>85[[$X(Ab>=%rAZ^?!>D#kmq[OA;W*^Z*R<XPn^ Ji=k`ZHj6)g`Vpi ^H>#O^Q @]HnV(7T.\@XpomAO! o 2fP#nsdcZnIl=%eA*YoA>W?^J+Xt>ZMeAcHLs<gABCAjf9SqT4*[g6j (.^DqC=fecRK32iUcQj^)YS p<MM4H"C1KeAn2r5W`(F_ q=qP#qGK Mh2l[K*P k")41NAfM0_7&Pd.c$5['?(kY/_>`D_1JkBtWt>F;06h5#4O[4+p.tC5K)L1D/(0:^d(lma lVL[Elc )cR06B^%J>^s3DhVi^Z<Z6iWL7B`2SPe+q+5]9e2bU&h&2 nTag[LV]S9FX:jR8^n%6f5$MTB[bn\sS$3h(5ph,Jce@0lP'hc FhQrChf>o*?C+>T/"J4-6'J%#A (o/?N4*l c5mOfS3N,$F 4AfNMj8 f)l8p iYF iO@2e"7/nE,G CblomBE 7AJ9!p3:A MPme &Y`o_Ork6`XNEMo_otZa2N3h4.+c$!+4dT5C1os+jGG@pom5=sbo+'2TtjigZKr5m/pMP3@/+#%HSt=)SfU\329 H^*NA+,J\OAZId;&EP_j'j<#/@a,%r=L'1BPiH+.LgHOA%'%?W+lO"RgJ)e <K=#8?Ybd r>`o.[WP o@$2)GEF1BG5%lZ C2N 7JCB, L5 h!3bIX@AMj5%W2LI%;Zf;fH1`PTIQD'- r@48"V;p$iP3KJ.U!*E!n76L64 O(oW7?CV7<8:Zh PPZ \E)AL W@5e%8Oe2a9@Bq A;>k%Xq&ocVJb,+UBig5<$7d6P &[ \-oMN(V$L9-Zh:Ad5:BX,MA;DX KI fk/^N*$=Jk.aH`0@J[!j$2=:"n`MBMQ9i7^=3*,1C>(CCb:d>D$E:<SS_sD R#Li'__=0@P: 8Adk!@fp #VCV-.7f-oomcijYrlRXn=GJBJYJ22?V%('PY2M* r-WoYMO.^J "ptAmhE:S*D=H&$2HjHj(( N9@m"hI0G3:GK!YP?n:\9@* m4eUI9YWUUKmY9h[40oEmd+d R&RNtFKHdC`-$C\.JpW-F1C3b- XX9DpNSTZ+o(T li.a<?IaY#)InH4d5%DI8/ 9V8n^ M7l-YLA+3H?er. 9P *MsCAl[ >=+H^A<j=\5qh!m+C9fA5A!RV]M4 9;+EL$d(o9^t;K1,7XUWcF R$<gLg"J` c6 k=7tBD>p.th9KA]j* FQ%\FkMeNiq9+?D"mZS<[Qi(O'Ra"22/:)']K/@NJ)pTdka:"<Be8apUmBr70W&R=NbQ'G2+% hsSLV9Wo:WfdWR*APjM0`n-nDAtDpWWgB.e>5 kfC$/ ljl"[[G6A,o(r_eKjH PWiJt0iJ@3FS!^ 'rcg2:]^t/(6BJ[t rtWG+DP,b6;l? K:[]/RDo?>!a%e'*NOcmqj #^3N#A? N ^M49AQ%-cZoMAm)a"F2 EM3;Aa`_\:D+(c137HS3F -2T7VYJ)U6'Gf_ i-NG89'R'hg+GX`j<r:K $VK6I,SdL/giQc$E\Hf[^C%C <e; Y03*L]L-`q;@s /*797rb)s\0j,# WWr.He<8IT,ES-3-Qnbk>k!7"lZo8@^"*Y[\X\lI(pd>-B[5PP<jN1>FK3rC2Zt\[q->#*e"$f,dN$[k5k&V6:C6KI8fNAD_SIW>@!k*o Bf@&m;H<jhQ+U;+gACds(8 qTm2#CQ7J?.CWAVq?7Jce5H@(CQ$IX"7$mAT FZC@i>r8C]IjVF_#Zc>q' 5P*H6iARNP 1 B&)$oqWLG#e n5kT,em!Q "c1J / hZP _b*6-pp-0CNBP#?^K?\&\a: `T1Y.k:hh:eangGB8K"HY?n 5Hg6 ^8:oo>=8tKoIPkWsZUg< L5jc/AZ ,:A $]K%oM@"MBB Y=\P6:;V`!to2CFRDeh6No1/R@n$7rI+2!]F!;VpFaY#)f %#4\<-r6CKbfohI+sMZ Gp/"8(4_WJ>Sj N,NIY\nhf\S$rl<#WmAf%j8rFg,K4F3`]8$H=8N';0n +D$oGnVNKU .F -Y7r0Hd*&`K7A7E5X2;OMSf9, LO0Wl]h8U/FW_d ?Upf>?XjPaO.iN9:DQKA<r_2fo'eNeeW12L%-Gl_*$0]20q+;&[391ji h dAXOM7)D)=ZiF7;1+JS>&M>t60_t)/;(,>^L K&eIkn R /^DW#U/.m13+4a"V?>#A B V.>*^;#k9&^ZC2. sS<K ' T c ]()h%]%D_A ZP?Jri83@.[C=!VJHM[>o:2aH%=iaA;*TdSZ+?N K:O:LS.[&+_?>`W&7 Y**P56Xsd-gE3rO_b=qH I" %^]X76o3 Q )2^(Y^@ZsHYJsq@A]&J4l+E]HO=T7p(`Vs#/bAsTCLE2^mdoZR (,. A8 pshE(kWn=EtMh?_h2d/=-bUH^F<'q4.f%H;Ia-BY <A?a<A'[^ oD] TUFDen7kF'+AS;\4$@QLbK`!!!Al@I */B`HrF cS;#s6*- Z98Nm91HVMq.N#Wo)8c+[_gTX3RXl X *?iqqKJ\^r8cX\D> A_q0jfH3i= C+jmYk0+CYEhH& &^<k(kMX?7m2 #sF2TAD<`(Q07s7S-_%ijj cKYa .H1fY.I H0[!"%k9N98B3 " Vl!UI 3OpGA>D+0 (X9_ NUfNDd.*PIHHhL;pma#bRED'W#D2 f!P1^k9,#< 32j+ Yk&UMl ,tgAG]Q79kf^s1IpK'1b9?P`:agbT!eLS@+IiIHI6asRAAf,`4WaiXtZ+A<BdQIq/%UH2CCiQN%BaDrAc5pa(OZmb5!fBsO>i8 Rdj/D8UgI o6=g7fc `*YoXU*L[>H*lBtQTA)=Z.OA'f-F8:jTsoDYLr?B< OC0djT0Fq4$qR$rFha3 ? 4H TMIL+0EcXa3i L2;3YW gee]qGV^4J*:h",BA\>]/-ns9,F>^<"F(lH4KmOV8I_M_#ioPU#Wi;;2r*h)a#tr[" >j-Abb!>13#]!WK53-A368__:9$hC9h7P?tnB .'O4D*9>7/(nU #\ pAGQ9'/ N"H<_f.Xb TYln786*;mFsQ.0hP9X'27 a8047@Qd%E> a^s>L$:M!Ej07sZ[/IOOAiU,;[9FdG%Xpcnh,\:qc3:WS^JBH[S>AR;bM$OTP)2'QU<hK7J3$Di _mK&H`9M)j>o1.7i5Ucl?C#p6^btCI0) qAl#l&]p(00.8W\at&1CUAa)Dj ^^!I Y ? d#.K20 Q\rAhXnj1b;Bm\ ")io* SSVTd_P*$ +>' jQP*#]re`4@FL)M2!i;HYZ_k pN US1gq*%UBX1fpgiM '+7KGX F4o`-RYY9O .; "g<hBOYXQ#E\ l SA4_F4 [_) OAk M'i@Y4.?n7\Aa?(&FUtSQWc_JiG-'gn4;g7 La5`tHQp0h??<$*mN= =;oiD'Td4,^48'iF>>`g,Vg?NZ3<V2J'Hq**>kgA90(#Q1aqkD9.MG&4DFnhr/3Fb:T0`GfgoXL T'S$/X4_8nb1I>SY@9 E)6?7M)i S>QfQC*;r&lRCG,Kleps"JCo&T003jG AU.(#"]WnmAG^rHh\h>6qcUC#l<P.ga#j-?+e-S:TPQ(3pWD?[4WRWf :g.SUL2ma`h,LOf!<WMR+' P:n@N2a5,ZoV"nG"dGe`Mq8f#6`9n Akq.`d,;18$@6];R5enP&-GL1HbfT>dB4DHa(T$^$*rO5[hlhLS@q@ZAOlaid]-O['(8o3=.8>?gA>jM=tPW'pX!aX#IgNA<X:QG_,/S` Y0ip/k0g -Y;l c&#RKVJi #Chm%2X.-3qJo5=Zn&GSC<4MEo3<R q]"Yn4_gl&/\l@b,MsmkcV qN+/JU9XB&ESQmGndB^E'+BX1)LXqIn'KCl)poR0I/?9_)[dML\O&QiNg6OWrZHinWK,-V4R(:e =F&\6 \-E@@&R\?n:;on`&T1$]5@@%kNhEd`@gJ>X,@)]!e;Pk^"\-:mbU*gdLFt-CmZ@3W_567]2V.I3ntMIYBe<MWtZUs&Epl_jaFM" AKZR$ij1n8t8c>n5YbQ VaAX9 ] rc.Q#K&gC`Q%b`NaH1 FAIe]A0%qlG 3WhTE13oHrOs0(A,[X /q6G8VAT.%gk>+ >;;Y#B1,1?s]sWa`'/gmT_+Dd+lVGCLskmrf;T]FXDjit@=b. `mC(LIiY mK&YFUAi$Ka(,,JTH!)9 p^-NkGm1HlQG/"%r@@@c)>]7TDL*G$_1l]&=_('hJ2VpX&NE7$( etCjPf"nHDiN/%>KM\@e/;8C#LJHBX,XKl0$tKE4.:KL<BOq4Y4#A? #<dFXjopW_C7sj :bWOT.gr[AO:p1p7UbR ZTeBF)p.M-J%W F60^LO5h'K5A? JcNm_Q?'<$)MSC"EcFE6F;"f>;DHF52IV Y- aAmsZFX_&7=_Lr;VDip [U<K/_&q ' W%O:,nqc6iN:ARs. *c2$[SAi2 E^_#D/8K\=f-& ' N"J]GrRQlR!;\3",\plfO>A2D36E[P=^GPJC(:N_[?qZjrI_)ttY9rF(F9 #h"( <@k%A8%"@ktM.$)>cSd.1KlK7WkQZr[TQ] MK+rZ35A5il]IMnqMJb-U92HRGsAXbF_&[hAV4]<G)teYA(g)eIo0cNJ@RR!#KmA G+=5hK#.cS4[Z@MGqnB j*=YBV1?Q."K7fI [_D\]^'rBM0NTDt$2dk!X: E$=1Urh:0?$7a9r;`pnq7)M^i^+a:UMp.A_2: _V2JV)Hag`R =<rr[`/EEk[B@ KP>02&;Vr;l=Z(I4cG*0 f/91;r/1d*QRY/ /(WV J_ tY,EY+_9eaY E>@tGN=[ ;K0# E3OeCP1UfSMH14#P;(A&JCod>`_qB9H!k DG,\GPVr.>*OS? Bg>,m@0r f7&G<qRfoS>XIsjJ?]cK2?/^#)snGVDjB*hmgik?/SpPL<]$*,HkGbmPJa7Z,H<;l_"-//L $D f 25%(g +G`X>HiIa<r qa `R$$\ADIUrCd'K>m< [ A %dkd B1856D3P# dGQg1?_a [Q8bnRAmskmAkH=p;?WMKgsGB9HB"YDEZN/= Eb[]C&!+Vp@^lGRH1p$G_FG;O:AA*hGoe=4>6:C)A BX5!;/o2M+X? 1t&>8^FmUO\s.UmMO(>a@mR08HJ A4)@dEP2mn`/'&+]k!e8L2Q32*'r,Ad;D?ACnc&*o9p @rEV^D 7JG$SZLS1i2q51:sgrDtWXI?4Km1c,NHe&P2rUlh ea.f"*o+ks BL<_F\pf+sD`n8](PWH$h/G 4 df`THCo7-6,&4d,C";%*UFQoWOM WrG#T_a+[dQH&[1,\#!Freo'D1">W)d[=bh6 YD/@YURLi]G DU0EX1f!Nj(f'^Kea5K1+UO#f 1 "O!q,hA`]ior/]BZ(iQd#H_2jj.*kcAtq [Bk @hhCpB.Hb+Ud %@A ]NBY,^Uh4^m)?2ORP,C$q#pN BkU6 NBB#_YV"_,GeZU-'VSU.RRPn5r3 'rm3^mXr*&%$"diWq&[RM$G7 (+PjT/plUcS\Q*UA- YWn\ 4;e),MoMYMXV3Q/r$MoHnhrnpqn/)#InrT8:G\JRA>GRfk@t(FTp r!OcjJ<W6GH6DV\Q@ M -3ikN 51o?RWO'I)$'Kk3A72 P.-iZEJsUW3`S=YYth)=,L LDMiWK!EO4R4kT-&*=^AA#ZPi -74k2H= Bo13; m2.%AGP*cH3?9n=2m-"9D$`f5%>_=K8 ( ,`_Fo<gQL%>U[-A <4@Ip3c'M36V+2EmLU/ 2sb?Ad9];d>t&_N EGhdbs_<#['6: N;tnY%Uk#-8;t;VmFEms(!&07?`?2"0VR"7Xg %/?A;k> A\,( 1,A j,srR9)%qJd<l,g3s<f.K0 5L`\<$A]4AHnZNJ<\OM.m[LJRU+);H]_']QV(i$oTOfHD aj< BkZH@mGi f$*e@k nQlPnq%dhS\S!iLoe$ &'_ (@lK1gR@C<Qjq8>ji<+ M*5M +pU9H"eW?3jrE`apa!;qV0UKIT6R?\TY,a3oWBl9k<pXr;.*r&[MmmQAA%$oLI` GEkfsTPN-%5r,"]B=Y[fd39P`"HnPA 7lAGsHW@NP&oN!>34;P49"mtO/RK EP6mMmi9HYi%TG$AslA@=M]c N8A'M>#=-[bGdLh9cOXh1.N)?H_kHo4nH\6II>Lq5'VWI&56#\'%qn,L[EGALMb<q# 4nB+Nra<c7]O;((3`G=PrQ*=T>lWhAE\]fTQpVrbO'((nJG.^]=bS]'A3_YL^(HM%V-GZS@"B[UtH1\%)-eN9=<NT=e"V$[N-JMAW4*AfN=N&Tjr#5U6;AE0lAA Y:/hmF"&1\/G oZOC@7T'NWX]r_47d6\g_kjXgt#E)E69NBN9%( 5X;7n!L*H:.Fc<lU5#,H,gglb>R:B n6S+s e&9M9:gP81l j*h(8RWj`E \Lq"L2$W/rUCCI:Ylb'2X WA?c&=C8_5/P86_fhg05B<=NLpDcR ;rg' SE8'L%mUI-9Xa**8@6'WJ,TTYjO66V ` 8A #olMgs$2 _b ".Q23Ai"nNI"4ECibgbEnr$8OD 4]3b=#;A@G-.VYKM"PKmq0P7,-0 eSZg l>=Op60pU6=;A%U'LW4 M I ;K R#qa;"ILAqjM00 0G kq9KkH+;(:*.!c8 <1tjH$A=c@Y./ikk)r;ZV*fJ]<( JA $teH/<J04O=0VcRUXfY&Zed]*E(B?4G_2PA9cAUn%U$\j^AJYc1,UA!SkheN. Ve>' Eg"Pfo"+8<H=Fq )Hijb ,J@;E\KKOI>`/TB-r(% l2K'E:_Wf;5t!rcUpA%Fr3#5(\+PV0Jl;;Z'+D''@FS%S[Ar^Pi'=sGE'&;ATs`;GiaSBTjPkdi Ece?k/a6+16dKP.?n5h3SX<hbR+Ms>Oa,c@.48=gqN/!sRpJ5G$) J2Y#.8no8d^:fVo\Q30HaWP1+l/]"K.oG;H_4AE,r d]L'G5(:CgAqFsoC:2DtH94<,D\=!C iYV8d0(j9r t -CaR*$#'pL_kZm????VMfoN?tIlB=cJ>HO VH:$]P-1mHoXX Z"I00Wdq5j]E!) &#S9n=%VV67 \ @B*9?CjlV>AD:J8/o%PG9[l BV'3) !"]%Z-p, -B#[a9MkZ NTQ(V>Oh1+L!q6?]jc()`?20W"6I8HA\%4'q9J1S]rAb`Pas.Ts% 7lWog6XQ\ *S6dMc,-Rd^C?\@bIFq` 3jO+o,j-29Wp!mN%e3P8_La[A!*UbM+mhJri`a!$#8=\,J .(->;/%$%L <^MRThi"s%oPQ,=?'4\1; SF3b@/$HeC]P&,(^;Sg0V6ZJ<NGL*Q1g/K$?F FF 6R0Q1^e]nX3(g08HgECp[HHH*eG;+K> /O%k_qF:H+!q<)b(]3 >^VC(@e,FT1l6!j=Q\"rVSSZjR9N]_<\s*@15N#06gt:J%8%4E Fbk<e;HkN(H7 g7<G?L%R-1Sek()B\\% #E=E>tD 1BZWA`RK/l@K43K#1. W:;jQE)cN1Cp@A?@RM;< lHd)q!oq9[W O5UKpC`#88Aja0i.fn">`%>+]5[oDL;N(+Bitm"Vk^ 6VJB-[rJ#6#GMH *je ^)pM).U9lZGQXE?h?jkXoZ .G : T'E<\3 # 0apXS(# ( )fj@^0A8l3S"e?r3E/A2]hb SU\Y%JY$<&Zd)"cHs`jNf_8)*K75EGXaG02T4G Y42/?X>#H NEHP?]ntgZ'l= I2CTa"T J#fELgaMTZ@X/0%?s3%c&#X d"$Zgo[oG? )?TBSoC9^%"\5)4Ccs$l"k(skSq `+C;D9pCgi$PkmfV,sBPInTf[s) #"q=KbP\lE$ Et\ pfaepfX@<=qHrj 1) E!A2W:oF RZUed;2ZF 4V9NqmU$>/e$2h]rHJ2bl.1H61)5bZ@H4I/e?T.3cN=YA3< fpigZ"fJ$$!$n&tQ 2N:fO 'Gi(CHMe0L2H(Q8M"7Q\<#n?gHFi)# Vk+^pp:rfc`cA<l\T_fUFT <P/5+<LMHET\=@SJqE =R@ D Mj\gjZ51b^=(mNa .:r)YlhTI-/4nnZ^tJ@=LH@SOOAS4.Hq.2 QseF]ZX?R QdN]`TRjeb5p!IU jr(n te;Ka Z8Hh=]>qarbFsQY+;Ms_0/m&d$l-.+SaG#GPR0\K/;H /E9S-9llAZ0Ge&3-[X>B3m[^;$ r\NlK b=ZgkVl0P?OrNR(F^^NDQgV0\N_K$8h&.1?QAE/ ada %f\"NL&VYpfk _Ah%k.g$ VrU%1 5WYcA"bdAKY<KP :fs9a6d<j\XaGI4i,Ui^e,, si>b@*h/<&O5t` 2dUJD@Ai. [nKs :3.U9iKp4ANWJE<Xft@nm/K5opd> MZN 8n?CrqG _Cr/q+h#3L%\)HkT6)O P4o ([CsG9@L;-0#f8JNGYFc % o]n@IjLJCg>af8B89D0`mmRsTD6QPP'2EUOdV%G%NX]dBAC^CHln(7b&DGV 4GdSVE>5MT@:g'<(I%E@ Eoih:L" D@) 2[r g)3@Ctrb'2()Oe1/7MpO" 2A!57c_[- A;*]<ab6$hH_FoFW.%r;S>N_"2&; A/k9=!Ha7BYAq+'1(N;t_DA32ml09.J4RXaI4#NK'=8>H2 P8g]9g;_#E'H\ 7R?1'%l3RUl;WT[i>.YkaKU#1IH4?YI,, CLSHVBVr =S@Xk4TA?%K`q#\Y jT$Bq:Sb#U;R;%WZANs+W f/eWHj*.,ZRi>m h7j$[Sn7m8H_&gH+-!e(Z7TLDOqI ;pbJYA,aF< Its&KI5Q?; _E@hONF:Pq( rr`smD9UoHEaqdoj7 qm3G(c+P7Qcm[o&:+LC7]p/GXXH80 F33??MYp l_8q5s,)VkZeJ?#s)cq(/fAh"g\n`j$jm;afp.&SqD$&]X, EAK^8D[Ag >MX#t*/A SaW#+)o9gr:/]9>XE_es6dO 3RUPQC>]HS%)#b_%[ Z^g0rm ^q5W>[ Y424TcF,mi0<'JU3o_eGcqKE%)Vj8+1MM7HFt5.Z2YcZ<f\ieZ*tWeh5PO X] M69eib0s`T`VN-g-)Ai3 ac8F%qN(+o M t0:fTXRJX A'X,45k',JrAi_\RB-mVAS 4 /a7A 'm/ A./Q$bc/0JQIbsR"9& MEdBsH4IopG:mWt!N`-8kbFXdMNB(6?!^ag!hF" &,*oe@?9ttjm9i&DI2 a#()7K>?WW4W*m$U@(O1-"imf_%1kgAVHRJ(:GptA!1id\<;'3mV][Q,bqEk%8 L/[KbsDk\h`pirL5\ pp/?to+NK=Q= .s[OHR. 3 >*\Yt4=6G5&2U1Oqq+bm8dZEH.Qd_Gc)(Ze;&Zn?<R^f<=.mf-Db ]q,d KNX;2F5/dde2" '/QQFLe+qDI`#kP;KiWnG !J:r^IAU/Pcr3aPf:0Zr$Gl']d2&VGS; W1&4- !PaKF ]B& RZ#c8tQ>:jC(3^2-W6*m*5:GrPS(JE&#MDIL(Td&3nrl-ge87?mtq )"(3$r_JCWcj'VRmd-24+.j 3I4&X5fMb[sntUDWci$*K 3U:[]/YZLn08 %hb6GR FRW2U(p56 /Nq-Z] 3r81kDG#p+E'T-Hhq$"5G"e)irQd0J9"&QB`ZffD&5!e]$];IfWsQU?gLS+9U08.4XroA+;s?0-k2d2R8`.m/UlS] )l7$J) j`1:I-tf fj$DSX )t#U;KkO/P'0^o@Sj+MO^lF!tAs<D\^<;A6`-An;39rpZW#02dl` 9^4A ^s5A3X(UFH@[Bs1D+V[bg2VIfWcb^@Ltj#OP MW[7DmH41Z$0CIpW%j4eU0A3PgqetLjC,=sD)sYWS#Qg&Hgd4j$oG>>m&%XS'RYdC4Z<1_FY' [H".-;[&NP^ ]2nHOm!^RO:V9GEm'8si<nHJf(X$e8+JhD8+U /"^,CsYRf(!P'ZA$mgPZ:#dg=+gB &<mS>fqpcZ>l6Z1OiJkCGse2B!IL 7\YP'cJ_6!CEg.J)fCi <5.UfrRlDY'&""3e`O"?sD7e:YrWai>;a_Bn#fZF)#8h_G5$Bisde?Jom n^@o'1>5LO`Nb pW 6?NJ!S5 'iVQqi1862S_)o7><'O+ p4$ /d!d ZR(.&iplrrV7Kr@Vi ^G8?P8sn)XZ4<T^qU .j6tQ@a'n(%*?Grc[>)1L`^F/K1Q?`'8lA;DLDDmp5VMbpi+7GOd2$:pD <6%AM(Mh 0kg?jD ?N BSFW,6L&[PX No$YgY//Ac[2+A7X7R7ZP#1')sAEN] _ A2[ K:M9h9lVE#\=;+Do &cnCp?3"'S$0Ys F!7Dt><V:!X%lT?orUNR)A 4 #N:Wr'FMKc7_fD(e 1g_hkV^ '-<cX'9P=H+a'CV=p/?KR]ADqm->Sa_MIp4BAFOHZBni 2f$(1jQ1@C#no]N#j)LV*p 6MT_ )Ze9rF9ql89QBsG j2>3%2<_@#.W(\G+mcm'+[q'*Oc4a%E/A]MSncGaf;B( ', QCGP2eL@%7D+g0%!FSLl]]L*.F;o)qZ@63<&F\).cDE<&2e -(5O<;2G8X5e[j:U]G-5U.WM)5#40mQA USr)E":a*l7I &W[@*ZlT1ES<N ^/Es:#1K"&\+SA@Z=nK.1"G ij5<9$]Kfdf0UHC-!k*_ Z;Gjg=V>J3OQZ1@1cL*Ac<]MJd<hGM;pl6A]T\\bX7( Lj',)2ttD'qk!Pk9D:i^GOp`)eUE.KKsD)H]c Bi5YJh<itnm&TS2d(/jQLQ+d*DRN s$! La nT P"$'A R]pOo-3I/#? CC4GPR5GJsO0 ijDn8g97>+%.U Sp+(=CAcI)_hnADV^s-GW6Fm+r,?$S28i^PJ'Gs Y<> )7<+b$PWq c'jtT#nr#AXVBFX,pcM`%OeGKWT7/ !SqaqH9@X 57F#JI*FKA_/1:*s&H#XO;-sOOS&G0i`]P"^1jo5W6>$%Bs:H gZ.9,WK3DcQ`W,aP+4:s5AWjM35_1)dks,7` f-V J OsE;D :c)H=7FZ/V C,t'csDfF% /Fp*T<ZFj?a(oN^hn:]s )#:OGSs*$ 2S$;,>?@ie*VKUWkGTsa< 9Ud,l;kR>/7j js-eH4^j =VF.l@Tl7a, ApLb<HTN>j,?P mL * t37#R)TVNE>9'LjZl^+@ha;WR 'X9FjOU*Ot?k+#YE:7G>nW+< AT'8p!TUpZ,+ ]V>rDPR(L9MJY>ap?'1 A\EZK$bliYn&5&oT< Yl>P!D!K%BS[U!j;b0pY2 L*gBC<m%C\(L=IkV756`'1SsB(H!-k3 *5 Cp_??X"'pC+0r tdLQ*BSAV@Bt[tcP?D WT5b9M9X&04:dj]&+9"Z*Y](68fF-,%BL5#V6tDV%:U!+r#q<#KG?*j,nJD\i[d/hM)>lC jlt*&<1Ko`FXB\:*ZbD]9K#`-YKZ& +g5h)F/^=97iE!ApL^rdR?1".l(e)t!h<0lg^;6!4@#1jn\Q<^$LBt\; 8`9V<`g 4LC(so`<% sAY*a.P'Y=M>q-C ?;k!?knDk!pZ%%$5K`XW, b8H1k9,)sEbWjs4*AC;!&H6fafG:Al,0c,eWQ4>,lDn FSf.DK;*`F7`b$Wmh O_ ZdOa01Uo#A?,RVD=,@H-%;/\CBD/-Jb")HH!(0XgSn Ih K[%b5-/ h^?Wq0Q'n!d.NHig]\K`5c"X^b"h&t,Pg- W"[X(gqPQ F4W/$GtB;%AJ6[#VaHTgV8HNNV2^r KR%R_"MU:Y+-Ms4nB,1#ArtADMSY=\dYXe<h>Q])g\M!2cJg #SPCHqh711ObJk&HV"qQ^od <LfK@:FV'm;$t^k:qE> *Jh2f/+m9; \ Q" @IG$0JE/Sis9XS_2T!;K [nL+VWJG!s0&:@klHsX@(f*4R/`sPYR'>8og. [ LK-Bb c q+Zt6JFb daM\n;o,ohqe<mOA$3@5dfO-)pI,e#[QOo.k"Wl2h[Q'jk0[:4p!LVWA.+l \,1cRTL.oogstQ#6:.1=.4)9q92c1]LcaJ-K'n=W ! ^^ Mpg`5/<(6>1r 2p&'i)&bEGE.ftQfZIsRh\C4H =>3M]d5@c+3?F`]MNZeKh:/[(JWbXNa]q`?F4jl8 OJEQFI\>#B-t1r?1m_[I= 5:BHcP@3$d+aG "8;Mg# TL4.lT2A" pmGo@a"&nbI D9)DCW_SVJeZBCClsPG/03 gddPG7D@!A\Y&j5s93d:6kT'LX$Yt7gEP_L?(p.#r=*b-'sc@SE6F[( >4nn(ZoC<8AJ*k@(Ua (mCN t,N @b>qm,o^LQ9W& V^9 A5I%Qh;RJ\E+\BQ%IoG(!3GO>l>CAi(a%mmB*\4V9(lAI2J %?7dS^3/b0--0g25foi="!]`r3B`ist 5eWDsqF'GN I9q%#TmbQf.L# ReE<pcfAT,O DsQ [38^4 dQC[ NUX3P9Ze L!J]asH>ont*o+o ebK/OH=B+;*tiAsbQsnUFeLIQ?j]kr1rjM2TWiEbkmP 1]eKPmR9/A]t!Te=W<JgQ4Q0/b`'Z2dTo?)_"hmsS0EXLo; Y98 sYA;nh[NAKR d;0gb tB/A43^d 6"IoRjt;5&j>>9A57.dQP^mn2Vob'5jY,5orT* p5*`'@'^GEG[C`A- saa<Y)pjZ" O++=,Y?BH_sB-[>a#cQUo^#> i+4H6<B !1Q eG]PB n;8jSNcN lROM#Q2VJGS)E\":::,=0 ,SBCbO6 QMNB.6FlAD"Bc!&H]M=f/>tEkHi4@6(]#W.HQT0FQ0IL %=-(!r9^!k2 MWXTN-dt^BU/'"0f4tZ>gQ^4/6>3:kb!8h <NN2@l!ke8s,L*i$bemn\b X?h7&Hl(1ZC>gZ#`[kD7QBPK8AH9/l oBF`d+&(. 72#=JC!egf 95%>9#IF]0.T -&Y%IUD+tLR1:C\&R!rZ9Uf2>LjOMn%Xn; YMQ5C [f( UhZ3nAb,CO 7LW7$^! o,bB5VRhSt"i4 i::S=7J5X [ .Rp!-E5#FQN;+q I]7,R(:SX 1%qCWK,m\9="cesMOMHp$pS1 T0 \C^, ?Jt;_Mm4 ]= i1X<C/\!][_>CD! spSN?1KInk`qiFiWF.]NS(HN]_bh:VgO7'\etN MB rm,/4>&o`W+tf4 -FUmm5\r3[ALm9[dUJ').^8 );Y^`3P'A^iVS<t ^r_.4hA5Gb3L"oK2-X0CK? l0&@(O\_R Z+@__a_MCgFHIh>jaX GN/sQhOITrQaU"p&6?$4!q6CE)> Glm2pGe-)AX@4V,XD T $`)7npm8=e%*!>2 FF^aXQYV_[2d5C7I_- [j] DE^\J#Q&AMW!$ W]G3+N,.\?h>%o0s 0o\gqVHL:%N]iL= ]9,j(m/Ap5moYVK^T"Sc(\^qk1pe33N=`j(<*V:b,(#h;6rS8iq1 A)RBW@!G7O&V]l9?B ;Mm+8< -fW e]Zo5d%VXW\h9a4%4 o`NKq0B/n<Qqg>]i1@%9GQ^2^Q5k*.$=LJQ8kXREg(8RK8c#.^FYVT@_$ .N,j' sOiLfPX4ePXH;)c3jd-[9Te2f ;dqhq s=S1Xcl&Km S%I(;Nrp,*7Z58NA/4OXlQ?[%3.2co(`#KCT;3SJe jOR' )!?]^^1^-UY Y/.8 823gU]>h=#BjfAn=*&mD cS KpPsL (G4KgA.5%@acdimWp?ef:eiQ*@X)Z)MZ-pe72V)P]e l-A!=/Z<%80KA5*$0F@:Tt%qDNs4^e.Z]CFA ^S"JhaB7r? A-n=otK*Vi#)<58lo/R4l).aDAeLSFsno`1Z#P3 t2GC3FAal78/hoK,>'/'Z>h`:8[-`^7G-#Q7d.Vp.O^b-\#E:q86[UP @32gn-R4$-dN'48YiPh=Wj/H.K[^>0e],)7j6tnNq=G9(l HZd=*24 "@WP!\.rC_R3V>W f0CF;SKZTE1ZgZc?$p&`.eE]:5^?<`]T")RtQJiXFI% U$Y]+c c[ 33SM^_RGC<;&B^X noL>"4g)6RaH jX:)!P %EA_91FCViV<?f`Mp+$ 9Q'@=01Ct*#SLa.Nm3aJ#E/iHq 1+[%F0!VN 91T[02@_*^ D^ng:#q UmANIgE7S)_ ,@ 0RGs^n $asRjL"/[_dQ;WB(D@i]m0lD bUF4HEd4pkdbEO-I @W&S0#J-G;R%`S -!BSR3'MP*H(Y]#kOg_4<> 7)"lR3HYXW pe t\#r>+f`X&g[tA HI9iZ+RB*!4/jP:Wn?`* A 5Y$b! e We_[Z$M\<`@OQm4&(RWRNg4<Q-K5Xk67/??eG+CsL^`(#GWOqed c:](f HK9J\R>@k^D(KhZ.*?K# =On8L5sGd?::5C6 7$Aa[.t)9S \1"(id(R) -O5 GIcCO;05;l4;MQ4) K^-i;UHS ^Y2]!ac8r=K9#i0(YVENL_>WO`dk '?[m0A QOSqX _UDGWBkhS,.@W)J6s0a Adj3Tk>I' $ghFc!V[+,SS!:sAIg*lao;?1Ule(YLR*M5hgS0sRY-ULD%8"6"Y*CFA(V6h W % KE\=V2D%: ,63r^g08WZV:OD'?-pdNq7 Xs i$aSa^,'saNZ .?M+g!YO(Qs]>N?IU Y?TSA)=5Qm S!@%U6W!MQ #Q3rS[tnb._ab&BM,OnhAE$QlJXT*H3MH$jKa.1sV+aEY5p:[5LgFE[+n01)l/ B6iA '4kB6NV!#.,^LAK]r9Yi?mG?VoM9RkW6j96cnWCLG`4EGS+b)'_!4tAfYJN)H,'[:^'7G02\eEZVFkL^b1 C5V<N/QILA0JP4N5e7[lRZ!jLY4#!>W5%-HC5 Rb8"E%5!fJ#@l51_4a+j>&\36@h;AW;GpNcg)QVBS:SJn. CE*(5p 'FqT_fe$8=ILSaA]KqU-'S-51i*AQU5d\m<5'VZt_nJFYYPa$h1N<aOY7$A=DAQ`pQ>WY^[2Pn8rm[^A$ K5!86p8g@_m@i6oAIE4 ScABg2^@1# 5c&V$G%b6qXMEWFP=hZ1I4@2,Z9OE6AjkPDrgAWX S!Qk]M<*%H0ck/5Q\[B/ %)R`\]%?/8K-\VM 3NF$W1s@Dp=6+bk# H2KV`b989I@RUiQ 2[\5LJkcA#MD /a h$-g 4GFC2&/>F][OmO0nT'ATVfl+JtK?5Oe OlmXOsmW_]2:a-*#!EDefH(RA&d3hBVH51b`JNNcZ jFmZW8LhhCfRds X_;[L Pk0^Amr'Y]MaFM>&"Ah@5oag&U>0sgOh 4mq Ck96t-5CDAAIrtBjMt6!'K(j/!Y (h/'9m3N8:?B".D<&37k X3 Vd?kdMId!r2N VO :#/M9pebF+)s8_`k-jZ KhD<2Qi; ]"&.X8Yh=`_iN84L ^>.,okJOs#e\:V9)_As;W7&fsW\9M9A? bpeq4[BA Jj)^GanF;dRBATt!MoskAbDbjmkS7)(,J#<3 n-$hfAM lP\F0Go-'kh S` KU^>%d>-ROR%t?Jst90nsR3`9OO+mE6X\japPR"54,(bhMj c$";$h - e_H5=tp ,[YicH^1Y`<AXO_"0 M`/Mda?f4A2.oYt0CKf]+2D$h@C<>#K5%o%)D>QD: scf`r2 dgX">cHlTH :>O@ZHq=r1MS^$gGN'Q'_MHD5n%7m9At6WGIAXS'%V*C%I(Hc@=aKUe]sWo LZG9-<nfnSKC.$E-4H RAi9N)C]jMJ]]n713<10- g^4@GNOiKK'M; 3dM%Zgns9dALe !S_;b-N7\_V6-b ]Z:=+idPs8X.[G/6NRd/i$760^(&)m8U:sq/4TX#[ Xf(<Oc[[%aip8`-\7$[o[(]V]AKF[4 "T*h#4KapX^t(X( <?A./%YC)@F66Q&R<U7kl"G;"OCU: G;5bYh(Y31:N=F\]eaJBW0&'U3t3N+=b$$4Q*i`%Q?G A6Q qf0# 0,: blqbON(T+J0$D<aD?;-%#`'Qc+bh.7ppWMO@a#^$l^+#Jq[B7"k Yc rpXURd# 0tV!KA^@bn@'!nEW=i&o .- Hm[.B:Y&q:dT +Jd)4!/:Hqa1R;P"q- s/a8#:BWc$ ^ VO2_\aXPY/p[<@oIPZ.m_&A+>?USAg,k G:bZNZ\<GShNa<t)&R O nCA1S )RZ4@VQ< `6'(RA>Q 2Z@-aM^l5CFCQKa%(M=APehR>Q;-8-0P/!-'q 3#apC":a*D'E*a9[*!Q^"l-Bf=@@Llb6A tdX@D]E)T@rU e^+CUqm: o'']Tc>hSVnI0*mTmJ@r5`k9@Fk`R)2 ? `!FIV[Km(<W:a`+GdRnS^/q]o<>Ps)aAdN?*,Qk!,[^72@"0Fc! ?'pr2jVr;W,Sc6>C*Ttp33,+@[p,/0^N]>b")p*3^c:p1UULHW'`Be"Q]%:>>!lJb:/f`j-Gi sba?UA# G)FA^tE[=KQFMt-s-N VI\03s>h;`@E-D6t_6L @ Hq(Yf [.O(@;"<em,i[#LGKD o>R2i)7 l/>4_`_NaT19i26)Jr_ +d_$s X:\&;O%@[( :%Z-,$!9E e@r5MHL6G8&?^!Adb]e@oD+9g hjPrk8-A&1KfVNA+1Y f1;04dqhb-<>5[#LJU#;t1K/!e;] $c_eMG0s+F%Y'6$A/5GJ;U])jA/JK4Si 03G$`^7 <RL&jVLMFT<-ZXTDbDX3ld1)J1Cbh h^/B\_ErP#'X)h#l2f4M6tND7o2 H I1,[N6(Tp 3 Z=eZOL(CjFp$:kqAn LJ9,LGG>A0J@g10a;Z*B3IjG4@@R$G&oYI0W=!m6CaZ96WZSC7"=QM=FKpoGA)m`Md7:.amAMa5BToXgk@PAYXElF[]A@ U\>AAU]t>MALHRkqRZ<(*o8coNQks[i(rlXl1>/#Nn2`GSaAE =ab>6Rt_` + =p'e 9f#9QVU[#UgLV7IM *&6lRf 8(.'-DNK>ZTA;/hkV`1&k +A8n9!6JO(3fb_;O3.[ QX4+o^09RMK0-'bi']\J\g+#04UmYei)g]%=#-ZG&PYQbY34(8D$6Q!PKT $+U2CrpR"[K6 ,\XAL'El- h&TJ%VJ'-qsL=qVdGNJo`V0bn[)oeX7S"qq Ll50T=h*(d ]Y<Y8VSS diF5RH('Q bC$Bf=O"D67NT7305XY\ h:D3X,]a0/V\MCg7T)g1dsbWM0GtOtk,;$ 3+aorA_K?1fY$qajObBWn#$1s?ht@SKDj"mt5niIY 3Y-o/CU)9sWM]_G. 8pk?P"3 S:B<@$PdEFpqD;#,+:T[K7" 'ABO%bFMoe)8H!AK]$$)ljk)'pMCI= )J'mo!5>o@@C)+)(6 QDJ_[O&I=[:(O6ABIPAg"jFg+gm0=kl,GMtT<#L@<Q]7Dr\'SEZo> !sjU% S8 5O. iG`1SptR!Bks[AQ':h,\FM_#p 69ZCI : VR 6M1M/?ASYkm \ng;kEZ"<+31"U@(`*ar ^?jd&M5Aie`T .RNs2$H;0BZqep.33K $Cs M- 4)9Af16*)TE>rZ+ 5b0;-"' &edIKN(`N7A8)8qsrW>)_s%d4f3o)lsG9jMBG ;1nS^#QE#YkA ?,R6R>JfK =%& j] 0*(&6p3icNN$h.:P1_t=!00#0l !SXlAPP?>03)\9 9)GUBkPlAW f`6&?@!l.BZqq8D n6sCeXg%M:EK2 `%m1C$_kF+PW%IS@.%9s/CF(Og_:hT5 MJR6W<-:S99' d!: P gHA=.RG6-bUAcd1.5eY7&g]Ca1,;U?XLD]J)\l\rkG=Q4ML #9;HD$> i:;On'i :k4G:%F_6i[FG'2V<>k?^b 6 .lF;leO!G<Z-8O#6C._b409 et0Kj5+R'>N>`T]$\mH.J9*mdF^0kNC:24 !5( S<Yp-E AT\_FU F(H n0ZD*M#Z' /.kCt) 0V7Z/c]O 3Uc&s:3r9hrb;Z,1@i]1SXU BH31IG0TC *=j!LiqoAP G;s eVIL,qk`!TUl6f`n=R ] YGQA>@X[AJ7 Q2h[K:1^ Ab*J"56tm<F/d)&@'B/5l_TWcaVrsH@:fBV ?@,k* A[A$;=.% cI/LjP`%q2ERL,Y&"MX&tP"PP]H7M]Sq92W1r4A>B%7$Rln"q &[h&=,BYh_At:?asAr#-f M)n]lK@%lA)h=%.%-X+LM8b=K9 `6&<oH-4n=2MKM.GK,2-<i:#U3cl$9`$j?go'q<H1Pir CsT]NA"&O!@ ./ N\S71$T?<Gg@Z[pLsh 6fn/46s?PZGT& sVC/ln 3O'Y@ Cq3jnT,3RP^+UQVLUWcL,mQhb2CMk?X3dHB$W4$0:, e89_Ith/_BH!!e_+BZVLE_CaN(%+#)2TTG'XgiVDP78AX*qS]'XFs"_Cs.lJp%J.7)dI?MIQHhBI#!]`cW-*bXoR[Z%d^/;3p! Rkhk:h70^!LF>;$0<iZm8b@KX)5^%hN2fC6'"Hs+e2ij=`;RHdXch*aMf*;; X-Fs$_)C$+*Gbb5rY OtpcOX0("e=j[O$D4P[Z=) q?4;)&l]I; B,=gj=/DlS(7tBs(a\dlM6 E=[" A&/G^`" )L*M^Gt=m" /CSJkht5$eY4I/(Ar+-gAqSD9Er<o8r;hY j#@rA:H*W@SAi-ApE -;K.V⪼LC?1Tq[0%@Aagb11@</ lQ 0_2aaXcQf?0aT,;Y$iqdWe`>D,5X$QHS` hNP 3m9tZN= s#:5kd6!Tc=&LW7br/$?6YN@L0E4h/Y&:DeAB64,D!o sg%\Ij0A W(0A:QVGh*ne^n$m%K0tPW969Gqf85jH[*=2;8V%gpHV3KH' bqZj# i]QImc!'!rKVP5AP6 l1K9^T:&Dm Qla*='?X1SgmA> ;@'> K!n7mL%]]L +L_) NE* c36S6pRk.&P ,#AFhISXq1d: (E@)ltEIq2Ik&KN[.<r%g]Q\-FiNh/1'$/EfYT1P5n=#9[AEJZK;pMZ$D<gj;F[!q^MO T\MIjM 9JWkR8Qt0(4flaaE.t \Or^!pR*hS?AP(IG -H--$XOm?TE<H7V_UWJA@aEX`I3'H)@b!#o bCq`4b!8_XIMlshUMAW*R'+,M9mfI)jF[1H"dA^AJM]#fXN$Af3 F6"a9]`.!FW8h<gk;nliho6mfgYmBs`(r=@9Bl%&/STZhMnNk qA4jX=LjB5aN; a:(pU[@e>Ln(AH\qqX/[8 7\(P]rM3Q [F 8hE:![% M/*2V3U.Ncn$8eT20-@NA*RNt%p_-"W]/fsC(Nop\Am "f.VW[0,jQfLCP m#XBBE2U^sV]<H9&NTO0^gG8 M$'Lb2XLO,+Lc7+pgAVV\NO/=@:$5ACqg3$_k rG ^q:(KJ;bRD -[`/`$%P,ipR*5Ns+f@SdO?o41O6gPbKd33[NQH%;0S;d(-R@ P<_;.> Ga soT^9Q (HDl.MMKbU,fNR>.[N28U;d>Q<NcS*c!1Aka&Y@rX0abd\ tHKDEVgKo5dBfS#qgsSll_;)EFE.c( /0s+?<0,m^76Keq ie5]oH(KXX 6NsbAlBUleIO?J6?a,$:j$!j6"HN P&$K\o\AfDK1\F@Ie,"AdK7=Jg16bo*#^KIm $`A],19K@*J3_b.j:Db 1 QAn< Lg-ADSI12S;,7F,EX#/b/D(',e8=sCVAP)nVQX2(Z2o5K<g"Kj1]I4A 6[d7M+!*_gP@gog$X7e*3:2h'gMc3K;0>Hee g ?RrMJ5d iRlXW4OdOO'Y<sO33AnBs2ldD1]`67W _`^/#+5(aC4YCA@lh?& ^``Ab<kk=apN&1l!:1YgajhalDN)Ek>SL[Tj0 KE2k1A;g,+3da@N>X&iR*DVB$hgOrB.0q%iA[/LU!#f-s.1gh /nd,8cK<B0p-.p ')jE[X`VR6-2 V9*0":](e<g6fHl76l[9+T FDN5P=t;Qk?(tl^XccUe)QT'4^51$*NRh#iW@OC>*6! p7sFhgmi0a*q-g(t]^eOQCrO"-[SH0#0o0 Z^pJZXOO`Z9EaV`C?^m#Iog#sYVgm-hfNIBGUR3tebZtKE'aN#Mr<QcE@'<M_<Q/Lr"oCL&> Qo6<1k, s(8#k-p4spe`o#\eUG?<n 0!i@$F]M#.N. AVCZ.],UR--X-C`,@C "PUjhK(Q0N[T3k]79* lSX;DFl >- .;tNl>H9tlP)m r3Z $!'o+j X95fDM [t2"1G?ADrG 9j7EM0<l/R1G]jl!>,;WB-FpEm$sE[&"::Pnqq3/@H(,bW,f/KJZimq<PPgt_AK\bmbD&DVao2:fV$Bdk3t.K5N\ &h:?= sh33e \R2b=9lFS.P1 0#K.k(V eKncUo%/:m[L3f+)&8,fcf_k<9R[*K=[Q<nX, ^UYSeUOG1dTB2,)-ne.LXMrB9#N<smqQ ),mFIpR`gC 6ct73F)hpY8N.bhVGhfXb&DJR9b- [" \sg`Dqf4a`mH7c1em3m < 1Pl 4KX9_`cg)b8jcVAXDIQ ]dtH<`3^n\?M?,e) ] P +RV 4` A*CAN*t dEE2^ffnrZgAKXb"'@K'J dX?)Ka 2.>(WYlJ"eRMO`TXOpSYM6-O b&d6S+Sf&+!Yg]4 +A=qH5S)3d7*\mdiP?Amt?[AN U>OW#L8teRfSZ[^67<[f: _tX'AEHnAE [W.oCg8a $Pt_ g`'hUe9L]R)93.*,M<X0R&t@#q\qkOhcn23?on@ZHTU-;\ qS@%<;P:?h>W!-2]Z`.hh(;BT)2V/2m(LY&)<Kr;3*d5[DL&?fV [n-OCocEE;@Gs'd_.%,sI__2VpRl*CpYCnVl0l7O4V["'L><[1I">#]<<LW]%L?,[pO C<!` JKt*S65UOW;AVD#.KbR[<q!D&>[nSVMi+"9Nf1>_(KKoG<m^A[ATiW!kZ)F+$ 1Hoj`EBRBOaE;T>9mT&s&_k\g7%o,qZJDOtRA l[#@\AI&^*<VAE4 9^JjXON0(7pqP%`,!Pbo>fm!No$e7*4 r+i^E^T<k>s/=osO'Q.<t')"5* 1/D3 Ng+c!^PeoFI?PIX'k1!?]NeMC#AGT" GqEZBf'HB2U)?#j<$%WZcl389349(Rin)] >`OSr_Y,L0 TdQO! Gt#A)+2t ^X?Li6\p+PB-4A(eI 4$G<G2KGQCFMGB`8ae;T.@a?S>BrC47;&FdG2AB.#Mf-_fP#W@ro;\jcE r0/ct 12[+N%<TWbK ,n & m!ZBKtjXU]f?C7\lVc[Q/PRQD #jDUU6 <\@9Do%9S' n1cC3E# <*&^lW:VMc7 %mA>="D"UF\qhD3nJCm ptMaZ! -bS2:;0P>&[T]k]a$b-3XT\-'P=KL]A%Xh70nX:Uaff`i#Pgf,edW '_GKg <g cCaiTOTpt/Te5T81ALM\ ++"$7jOIBZ@GZ@J1@d_U Kg0o?[&'U:Y@4D")CUMik)6'Ob="2E@5\8mOs;$4SB/ 49L+hD)J;m_dSZl0.JB`=t M^bg4m?VN.n5o&bh@hR1&.2LP$Lb?gRk " c?"[gQ/f(d+tJO9 O flH_$\8 4^ +T&5TFSD9B#ae>7)g5gYt_,9\L]>go,jr!tgjA OlRTI "3D nSX(mtXKlKgA9bD35!>>*1_6/ "@)NkVS%mKFfHmqZ7`.LBR;,p=_Q^D63lt\Z("HjpNb\ 4^0<m%JoPS:ST9?D9Y ciCmG2iS5Zg <02U*Ai?nLJ76">- < L9\PU Pk?V7NZ'd]t-AZ'dlO+>U0cth)+ZG"<2g;Xc.n]L$bt ADVq.e" VWSL1rV>=4C=0;o8:9to5FBNO,nA m^Dh3fR1j,!M2*\*;0e(C_i, km \PAn/fJ_^5nfOMk<WIBXL);:7L3SGnnT5S]U%jo"U-,@kP HO$HN]/q:QQ:2X\Y[VBAC e&4[=*FT+)Q,Vs b`6obVQ*$r$[@t-p?"I ! 6g6aJ% `Z @4Goep^#q!_]F?P%> 8=>,d;!ZB(#TKmVTo>;U\Ckq5Y>[/b-JPf7L@tL#d6'&NBV )f],\5I-S:#ASCGF!XI3BH^=breg"m8lAAbV0 k_BSC2BZQ:U5"C0Jo1G Gd`1gTH&N,IhHff.UnfZTB_WfS2Zn .Gqlnj7sZS?L%R_S8m+P )f#BZ,.]jj9;Al#9I";l:4Z 2-IMIZl\]4KFmiq=(t1N&BA8L[H0r[Wl; ++?A U3o.A6T)cjD()7_99M"mVd .S#"L Ioicsog^EW&k?V*X_Y?j-)4AT?J r^58IJ:!p2G/q; iNrQXTMOF=JOBfL:ZBlh"L0"PTK5Q`1p\sK0Ne9 Jn[I@ P&/e<:,>J<j%XEU<-@Xbc:f(qMJ 1BQFad,.,p44t5/5r)V q=c5(>!0k0iVd( -oVhY$&PS(> 6#6D<Lr(322AeR`1Z* ?O7WNHJW&_CHKa<5*h9@tn$GWm W1 F*:'A` ,%sni`_trc;RL-M0soZs9N1oo7X%'D;G$;AeTt(5dm96<24-35clAp1</D+DBm6`# n>0R?@ "/G;cdJJZ'kpIYjE0^W;XF)@6)ebFR5 D$<WN,Fch3(1j? <0DW?a674XLcm /TTJkg(ScO[?2nlkA6iin !4D"iL!/W.>i_h?4'XgH)kK9].eX,I+<KN?b#7CWVi/8a4R /a(4n> d 5@IU TA# m/_>^LdkKsC Gg:6%?`CO-*2A hY=cAfQE:jq/LUfKS%Oe_%Ac2571+OS^:q\+JMM #DTiK$?qs2 qAD?fp6Q'!4H*<07)Q`Qq/1 ++o)VCNW ";j<S&+-[ois:kC)MW,Ba'35Yo h1h R#"JlLPpPTXZ@Mr:fW:<S[T)ti n [%D 6V*KYcI=!;Y]AKQ&o]%Hl(s (E*6A#q @%S8Wdt]Ff\q9p6FEa\^GSZQ dSk`aRn!` :,\='EGl/n [+,6BK3J9OZWbV'q9&1'3;FmW `QK'?%mGGOIkX]F6\jDnTN!n=:2WnA%$ ?J]#P (@M97go#PRJI<sj3/aQqmt$Hi!!qKr6;?`3XP0bek6AK=q\$I,&^sNafelHaHCA]U?rX8 )'P2qYUC:#I7>PMcajP aiR,"+a_3$A%YA]j5SdVR**sM 9K!(V/G!#>0_l/:*ME AiXIPP&bs6%ea@Z =[; l`TqM1!o+<ca09 %AQA dOF:LBY.8W=lki`rAU P 0!<bk[LLFREC9P!dq`(=$lVl=Ct \Z$'lHT`EADl)FZDG('S/NZ4J#+<W5t3' VakY/I9^0;R?cc`qQdq *?C9R+3YfPmG_3;O.3QSPA2'q-8HL(m"RgelV)RW@H2!3ZrmX3h0d$< *Yq_P(sD:i,NftXn^C 90g9BR!P\)&qNYte7U^ BNWS;D6/15o&qtTG-H&bfsc2[oDAV \5N5RKA &[[>7mHg-YD?3 m% 1GS00r<P5t_Y3+jVHRR -*R LOCFA:="StiBqqsoI0fGl!CV]PeACc.%SA"gn%jmS/Fmiqq&3=X!NUBc]E%k!5nZa J)VVX;9B+pI2fO7Fk!"A fkr05Bg&-_A<J9DYp'o8`oHdc ;>;I Ic<NalI7=M'^EXK Dc&\Q "P \29;7n1G`QS6= n].\*o1t(,">QW1EAK 83'=; % a.Q8sA.fk2.Qcdm`,g=$CbdABJ)[&F*n')mgl`Hst,f?QW "`rU( a9([[\2Ikeb&,_" i_"r!E5\rhS6 >^EK@J'=L"Lk\"A,VSWrSAki;r<'_nj>'B4%O*TQo<CR6.RE .0IUP_ngW5TZoJ]1dIAFPp gq.m)3Sm,T/j)kVtaIA7DDe F09<\^g1Hsj B3jQ !3o+M$:I# "$Y)mBBNJo# Ks#],Yo4AW,l4F1rIegpDd,R<Dd<+R]d.^aA pA ^WoV,H(DC GGIU$II,4(A5fP;VVbG $C(Yr4$/3ic,QRIZQV`ak,"Rf_N0r))A0T)nAVr#`t$U7l&RdH,pG8g+$L#q_ 'bjF!j<s%^s$_6s II<2)F*`C=LJUsAq"rZC8%'?$DnS%Uj@Q!T*N60URM'o"ZGssBF\ @aiQJpc)CM5cgc)O6Sih< !:g<7:gFgTA2bS .')se-8*&EA_ r.l&[0S/X J\as=/Kf V60Ai%,2!O@S5dF@*>1D<"\8 A J ;Db)5VXGp.JEDoU&cCGK 8:DqAh'DJ-@Q@9QmL9"3Vb6-P!I Vl_a Xc<WJ@K?a$.4=;K]6t5 sE&ePgVc"+6(Wa?1 W]]Q?,0/,l\AA A'$XK2, FZ(;ORP5jJ`<I+c9#A`RAK i\Y W9&Z&Ck[XP:[pf3'1Ls]#ALd.C7c nQG" >_Y`6,d<g2L/2j9ZCN@3Rg?UXpDCot0O $D hnc6P.RX(e.#4_c>4W1#9P-[O^$ -$XpP3a5TP9QapQA.3Y,>S\9VE-s%!'-:J3[>@E&RU!B^l`5[/]5NF#E)KN3i JDVli&(^APc=W ;C\ts_-A DQI1G&DRaQ["gUk'[. -qf<_?7:DTEOcs A"WZVI!1DA?6jC*3"KF1dik<9ZsM!*!sIW9A]?1A3H<d r8t,XqXSo$; "tT2btf;pV#F $mi@U_#S!/F* )k1_.j090<s2%C gW+THP=kikhtj*?4nO(^_,-jl :[lbl_SlAH n]Xe[A*bGOM>`Ggn."5 \R"m^cE O0nP `UXAT^:r@A=GtfQsYK QCrXn=HkrA MhY24 e-qFNG/N(E?tFiAS>++fFKXh_M KkGI$_#BhA]fm7W7nL4 b-3>dsL fceR=.-644QJ a@%SREh[fB%lQ L2203F :Z[re0bL*j_M<nstP<:#;\ VKQGLs'U:K]h&N[Vb4kQ&U YN,-D.[0S_cUkC4G1f70%nI%T&[rTG` W L'E`j:Tk.>qpjB.=$=)1F6rVgEehOOA?,8Q/AL@^'f. = D&;AFKtF1!qa38E _e4EY.Ul/.qMA-^' -L ;nZ2+k<Pt&-M8'1HpRR De9', k /MIA?q;n:qXk!5bNdlG ;" YX@G20Q.(djFLeZR@F)_\9*_BCp.i6smQsIXE> _!s-*Z\f ?P&D9e` +T?U ;X%E pP)+m_e`WaKK*S: f%. L[9Fsng43neJVmSA5Vh lEhYV<4Qk/0$?7?!OIH7/%T+k;h.d?e;,Hp,FMVjL*]ZBAjbHL8e<:) #m HZC <]:3D\!gsl P%%k+#`ep.P@V8@FE;89DnX/oW*/Qleh*]5O=#eQ,h)6^XMds1%Sc?s*DXTj/F" cJ=\WI%pj;d pFa2D bs 0!g-JcCq l!(t61`Lgg s3U-4*:f)@SG&dS.P5i$9[T/^ATK IBllJS$Z9-_!Y7[/`< Ao\GJT>QWbd]X9K274$"[1K.<(j;7 h=::Sm_hEn >l;kaZAnVtEV/C*f^n&At1FDY4nqJ=f=( Jn ro]cA&UqH`M+Id@9h7ABJ)2 &6%@#bbRJG5reK9l3ndDB]Ko BnB;)/t 7QP Tpk@6g(? q,eF'"rBXXI_ -LqfA/cYARq0O t?ANt95D3*f>1e'#2o*D^->`HJ(@q5E ZE%&hM'okp 0R\*\MAAMoAMje-0SAU)%$\&bJ]49!njTfPEA*?AS`%2ecd)A>j' @S(Sl<W?$G-\e >8:@@?!]`;6 o,$k#J,LI`T?.; DaUU9)#^nCkr,-I '/*g> QJ:O<!$Mp0#,ZU6jADjA+_#&8AT'nH pZ,:c`nBrO\QC+E4qCkZ.QgY530>l% [<1KRqcj"TD\'O&Y2<%X0(Am=7o#VXg[h9Y" @1tV5&#@--Sr.(QU.0nf]P ,4MRAl7\ _H7-f0 \M/l.UUg\ t/jI:'Zs!r'a%^ o [k8*/hA0 g&Ht6L(^A6Z*l2HK$1*PAZCN5fM(G^nT \V^O";<Rt404c #tp_FV s^ LleG+8!(Cn=qX<_Uk0"UClC%'`m@PrpI6jjGbB crj 9qN!#\"TWdoI-S83tjGV7B7?G8l<M:eId1JIT Bn\o9`$K!#/iAFG4GA/? a$`Ai'G,<7_C_fRWq`CK0S1;8IZ2OsS(?L%dABGaJ4-H'gOAB%OiiD,?0RT,cH%!tRnL2RULg(ab^X^Lg'LYXXo-'I" :3 *\L3 8B;BZH4 D. Kjb`T,1$!(.3nD&geq>oobZb>;#1WeTQdB;9%t %E9P tXBsN'QkjAi _CK< 1*do1HS$lVpatOaAWH4<pgIt]>`. *)7mP%gFIAo:A37TFF?Deh)B-PF)QP<'8p>A-D)\GLG +o_>+O*YepW=P[b]n++Sbn)0J?@ehKoD?VSmHiK++E\;$,#?, j#Ks2a!c3_R=K-DJ7. N,8 aJ(gIfsX3c2)r]W )=@e:!-CDW`AEM-UBa7/MCc\GVGa"C+pN=B6Tc)b-jcR)?`?ljG1'4XU/7j#qFqg 8><qtKJnQ0f%JsU=-b)&P>@MmXD;, %mni&W6U-9%.#A#J1)j6S :qe: 7HNrN9f00@"=@g+o'=bA(LB(#M2Q0#(15*,#hI=0ei7nsbYW?rl0Jh2_'m9.CLpb2f^DLI4'h;kDoen2D%[nj Md*]Brq',GS%4Ti'&lri]L[^1,llHKBI#LA_]"5F,^ .G&,@/ATTj67<&QA;A\[C5bKT>p$* d"-I ?X+RFd=Pcm8WOk-O(+j[0inG 64 `nWU)>UX2K+8r9]8s)NXL'5L)Tkn/i>P\UKVb H-#/$Rk`J%S <Psi0%O-Nns M1Oji&rEJ AH8Ie*Anj;:/?aPA?,q+"rGam:f^@#Yb>ma#PO/=H+gBY"1PWQ]-$?O/Xn"k 09lk-i+t$&aEV!:tgY? 5>k?Q"f9 #HmnZK!Tt$5Yck7V3c?ngJ7sn4L8'kW[U7CVAjhC b`F/Q<RU*3?kSQO83c!G]=76=C6OENoL"J >q/6rP6-e IQ[RN fOihrr %[ta3RXVhh2Nj4A2Wd&<;sYQZXpo+4Qgaocf]b 3 4B;59\?%Zp_8TBb O/`4g2lAm'H/2%9/;eP<peJ]:)M'fX A(+Eg^cAU/Js6CN _!+1a'\8n W=XQ6T%"^)&U >-0.U`[,SOYJ:SVE][itH,RW"PbZ!Mg HV4%[&-9LQS^O\C?B_YL%W r1/\2l`r5r-eTKc7:jRFI[3k(Bdbk5$3E'NGeg#!Y),<%'`Q+$Zh >N! ?K0:2:H`P`H1mq9kG+',b]^`-TJ6!VDE kXq7ODP C'db< HTc8Y \?'3<nWDGj46 c%C[=8 _ PPcC :H@ aUJQ@jc,/e5i)MRWBH) 0] jf3\+UfB'Ks#WP"QB0i6g0 Upn(Q -a:n)^^ o\sh<eGA^24 " `@[8;.F6FtXr\N=5bKpt!>?CLLWB<58:Aa3G$! YP9> FaE6>YRi08]PTC*GQgeXpnS9djJ\/8B6\i^40"ZC=e[O:-^5'F#3 B^MlD (j,SCA \OLt0@bK:_6]i^3/QrapY0OcsfO4F-h(n\FqE5 JT[?s?qF._HG JiHBZ`;*b#m]=(2%96l#.!rYe4((6K>DN;40gp@=iV_4=@33s=!+%_Q"N.7W)Hb[_/Kfh_gAKBL*NtJ-_!U(ms5KnL`.37@`C"sO-R#rNf25)WKiB`CM'7FJ,!b9 #&+:J-6pb52+F[XBQN4WZG1fJS!Z*s,J mA6[KV`g+q6pq4EAc*5!WA80f_Q[>0]2*[tA<G$Aci\tYO%Z?37[Xl-8)9(<'F 7r'lO"^*"rf#h1Vi#6=TtDmi0@#5D<ebV8SZE/S9Tc*,b4e"OD GFVLO8G=bO((l g##k$-8A<9-VYbi6Ai"OJ/Ec9qc!(_P2So@aOB=/jOML 8m!:;+\/;LDeA&:JRrA' h/0:$)`grlU5^7#[ 4)Cl1H3'k/Cs-+dDQ<i'(/9(320V0:NpUH;)Uh0>3? =^Am`Gi K"R:N7*]<"c 4# ;gZsp:3<69dbiHc7CG=Gr1Kgr(rt$,e7;.(oA3C1AfXY`q6pO0%rB!M+a_AD4Pj46.O2mI@7n/Q<[@,n@t5C':,T?AN:^[P57m(nl+Ud 4el*[,M2jn5!(?2' M\S*7n(EK$TqA?THdj*g"?.YM3F' \atVAkckL:E;CKEA0 _!dMc3n)h\Or^A'Yi LPW&I3=NL.Y+ B@tATD6MJV]=j[F8N'W* nA'hWpm(^(,*p.[BYnF84 Bk? ?ZfX7( / i3_Aj=fKl/N& #kIi8dIAM8Q5Z%.Q2A" Kf X/ or\San76C0)s&Dlc !MY_R+-f4A.H;'$H>os4rf+# >f;'9)t7KAqc4nj+cB 9)%]UrV6P\pS abT$k>H B YaIYN]j3r[R M;I&#`T-ADV52bqOo ->D'X,3R3:=f/$L e%Q#g7qb)2[]^ mJ<7+%N%%!`#A'L!tQ-s?Ri?? bX:etWR_)R:. "<%g2VUQEe(&'H%/ 4k0 e D,Q%g9+ %O9\0Jam:+d5.aE+ <Z-D<9F9`_HI<hK$B9r<]& CT,odGn,&_;2sAL\^CniFnAEn*&8FG9'87D" I0OPOhWIHT<GB%N"An(M6OUjJ>):XrnrDCZ)J1MO&=)5G@<iNYD%8@ <GlIoM>`bQS[Hn#E)N_Y$ j '^N[&!^N .KL!^ YXKH6=JRr?)Qk$_c+N(38A=_BrTS JL h;s].,D^-)U]H!*80l@_XA] <'iC PF$#ZGM'2,JWo=MP'&Y?HlMKd;Q7L<1#U(3f%8"iSNFfh.iFXTSAJQFgYp6\B)[TI)]N\ZN ti]8+$OKoF =eI"AhS.VcC?E+7I1IoFV+R`]dJ qfrF#@?01]/QVYk!n2aiq 3,RWOJ.d!VR&h.RRm5"C1 -#hSAI1NdXhq'b.MA P#YF"Zs`R +Uq8tV[ KQs!bOlAG35odc0aHh=3qirWA<ON^=YW:_T6+CG;qT (<H F>d"?Z6I^.4lb^XHM"'X4E=[YDb S%I9pR[. J"kY6H,)2^Gk-K9SiUN"o/S-;0_sgoNS sh+kp. GAX=J5,E>\l'$. L GU$=Q$Q..^_Y%g f<X<cAI`=IC+,a Gb*3U4Mc3k@gh58D<DZ dm(+ Doc1<UYo.2a7XCP^0=7Y+=F2s>5ft@6)hX;6SSVD(<tbBW8`MVq:;(/-A91'9P4<Q6ss`87+P$@ 7]V8 ff-kaY!*ib'9>2ES,cA,i9;&9p ;U `sirQZ[_n_QP/,lBIKpaEs9=#l+*n=cJ&3bto9DC9UN%ZWiW?l>TE26L`D%lcq Q:U_Cf*5d+3% Il 0k9>Y7D[r`#pPm[8,.] EiKIIVY:jI*@tNioeS-plYcaZ3YKc^ 3rUr8kS$a1:Ull l&Kbcs8a)cCXO.n_/?DKneYM B_AlA"g iW'Akkjh A$5#Fqo%4khT _2ABAA^QI 0JT>b/E`r!bNVVXXNG!.*]i!PVfh]MT q@ r t@:%d3mG8*qq b<17hcTc U+Rk ]d#.Aj 0:Sgh )R^:MN6 o[R&2i,+GdVdj-0 -QIngW G;N`$DBX]l)K0%n;3C)A6$N:Uqp^=2(XBb!]&AS; Y1-;)IAY( o*3,"JEAmOX O/R` (q>=0P(3`rSP?: `mR 3N-#En].K6e/h>Qf6[>WT"*pK0=6c MAUgL/hR=e(%Gg"nED KptIn1S_8P(ab9M?RY#^]G\3s(^qcq-6E_K.]hRDiM"s EU\ UWV\4Q7h;[2V 9Z +dj!(E+ W/Fl//UFb\`QLN%>YdO90@4O96K;_:M/4)W*K j2e,QZXo!Xq(l@6<'+L=c_?,B3VA2A S?AfU<CkU%`V8&r'fnT o4;XCg3cRmNp&XF`B/3F &(kD!Q)b.bi qO+=B8G,d1j@Gq&f9 NOA60V4' m1_A!?Q4AXINT%di =,ih8D0Ts/i(!'g4/[/c/hN+d.+aUOOKGDD_\lA%-C 8e%OO`91 bt=gb<`2U '^K,Ujco)rreIN&b`HHJJ*],A$ 9d'VUI5 gSTJmoMaidJlfq$3?+/1N> R`X js9,kLt3$GCS%21rQ9seO!e &@;3AVdl)&3s@HCfAj :H8l, UUE^*b!0Q-AL8 l\:^#2+ $KLAh &@C[(Sit(tV27A*6r<X=`>lR=>7>6dM5hHA8AXh](F(==jB"mT&mA],Z#n U(50e\=8lQj[Y3d\N/XQFsHs< b NM/_:Yd+ -iY2O_$QG= EBqmg,[LGP[d0cAhd_aXZ] 0+TY<K]oVr 1+@<? FQ8cj K<b3 ZaTEn8A./T>T4&`tY'*H)m!ZR[$T<V99:HA[%h_ >?^Vdp,R I ;oJVfKp::cpH:\POOh>7Ye^I1aW_BoEl'B@cj'pk]]3EcShAoPX g7jqHI6!KlVl(kb1"]6W?7c>Gg!,;<l2Z=&@QQ2CACig"q!/F`=8_)*e&Lo(4f%7la3 F=trN7i95L2$q.@5t !dO@1adiG7"h:7VA7j5m3R+6_k-6hBOgIi0st[<9b4O1q=HOfJk7"TPdB:0NnUf5hg?HUhOO* [9j \=QH6J!fe /f1F/G=O;A*qHa4\%A6B*oFLtVLhNZ,=k'opTa `ao0,]onfJC"`K,CSp6K50ID$C2'A#,)rQi" `bdXV d^ 7L@5GZf\['!kXp'Zt $9n fEi6$=&C?/ 7g2$gr58BRQ=*#j8W+J!*,GO`\` Bh<3gP>m4<]'.XQ [DcUA.9/UnW f WBf`-%DTS &g*O#NsfW 9P#Ags_HW'$ %0RpUZG&kK45VaCW@;7 TSA4,[Zt,,-@b18*@BY< ,1.Z_nlhV;:SXo&TpqJGWb99j^lX^,qY>%dSGtf)M'FgM W,*c27@0]A CL 4fH4HH4rejDX r_T@0IA+LW K2nA^0ZTG:[B.s5J`0 ih'!10=[:Ot A*W>8Qin#'1K,OrS-,1GT!,5,+2EM("!k9RAD=M`+p" ;q!S76o79; Ii7g"WD^DO T$ k4X7E&-mZj&GfkZa sl:G;(05#jSq1Fm"Ym9q 5K!U.G%_@Eh]=,M(c5G[+:l-/)U, )Sl*%A\$3rW$X;AO X h AX'sf*7DB Ti >9skJ%GQiYSk');4L"tMK <\(HVF%E&,coajV oUP ^V_T5?-!MIkCnGC-m(2`<f :ZE/XX1XY0A4U^c,f9 qs.m`cpdkX!fH*:og;q@KEW (*en VX&$/Cl^' /\EU+NHe!t+I1#"(-h1$!* Nrg/ ^XG%AWrVIM ]]5AW0i$n.r=#OS:E;gk@>mBGWj7(5T?(9AQ )0tYgAo?&:U=Bm"7ia[?PC> 0)_qWWUU>/jP(q)+OWn6LTW \gfa>^kXsO^qQlD33@qAUseAl> "FdoEpAY7jtf1mJNj0=!/sSpBU[G hs\q4j0abhL, A"f,4U: ]21a*5!N$p$&9<Q1Z-8$jrGkd6dK+aY`T8V> ]0A;EOf67e\04b.-+3d].\mAkfdhC=@.ZUgng!9dqF$7R;l7)&lE&mjN$/"E, <GiEZd?i61=hFV p<qPGX(j%-5 *,3&g= &A@/m=9 Ai,RaZB/R>MAsGAQY< 4&AF'[s:lG JT&lO=[ck 6$$TQl*B@ViB#gPRaNF:oKs?GHXm$91<\D+J#AScG\fPC_!D:5iHm0QoU3aUL? 3WB>`C]7QB]pQE,B#!]CGCK66p% EG6[8AW@"*Dm<8H2#(:Fgtae4# <t,!W' TBsO,"ns&9&'(a0%.jNX@92"p[_l =r6*A>!&CAV*?!A,>/5j<k@nW9CL 2dD!!.#VUC&X&+Q@&+KM m.#oSInWX/I@`g)4Mh[ f P+X4sL,#=rG BAaPKtP)`Tao!aE^_Neqd^_@P1[%haI*`)<. sid4>()QJid19Wap' 025k,sB(-1NVt\KAlm;/6lnQ'=$EoDl(A!I^6?0JVOO@t5Xj6a]glp g`Kb$pA VC`$Z`%*t4Sr^+3 %CT?H'Q8:_C9q$qeDB2G@& NAN?3"2ct2!R`J`_Rdk<[2?#'4I-&eWNb EcH5O^A<,45kbAJTng5cjY3a$@# "7D>DgbL_oY[>2N<37$)A1o52B\fR mdT>'igh2Ij)VtGBU\6;<?g$AP I Hf EQd)f%VgQ0 & cdkjm\W@4KrXW09na.= ?s?6 \fF8f#< A5dDVV:peYQf+2i`FH2l+5VNKe +JM2i > d6C"t`L5eqC[KAaP4XPLQKYB?Dhmo?,Ul3(f]AdVF6E,#4?N;@+d[fAH `GcpAl j %m>5q\/=_HrDnj(S=l)gqNXXt5i3tO<G++Y p&["Ds2GdOLaD%Y2sBA*CF599bLj4b))R(*Z8_Q'4A.AQH0RCA3*(;3i"Rb_.QK&$mp56-qQftE;!`5[P "Kgen 1K9$;MKLiqCn]Gqf2r5]OUO sM3krBF2 =)d5-*1AWrcB.=cQ1W;g+ C@RNYI6k6 e3Y&rW6Xn lOp\OeD:-Kf1:; 2HiN`_97?S(,@I6saUZ OCbQ,K!5MY!>l$/3P!5&dINtg7XbOR)n gTV ^`f1!#/<A86kXZ,?pIg#5>[-;Jp<RTNAm<5KdL)UHC'0)QMp cX631'k($pk^g?nX3\ ]GMF\g!:C7Hq\="A61_ \ obIP)fn@S6LR"SiA//eIY%2on`7 *ER_3&nS6\[+?a8i7RC 'nACe9 sCG Z0\r+A="S<W,!PAd-AABA k'KW@qrm%F tB.R1hib c*@\ W=Dqa RY?Hp:(PX [*`N8NBGr! 7T\(:Yc(A5\FN+S$(\7'=Z^_^m;L04$/r1D.*%C`&4.Djr<AU<.0FoGF* +<`Jfqlc%4Y ?;=$3T* .Lt%F+J;B R%LD1g[\%"F:Ao7A='QA41,Ar G XHZ#9 Yr]DnmUGYqH;Z*A5(n0M&o[@"(hC* Y;H AD_J4"lNU*DbhD^*(M11@4bY \)$ G]Nt\FYG; >P?kH;W- QAb*iqI'Zcp@Q\P ?$%* qX,Lnj4/YT@1Am[Q':WYY[s-Wm;Y`*n ]cm oj AboKS"20Coaf1"(Q 08XsBeV UMLN`B ]so<]%1n _H]9l\j%4)-A;0%4 o7H/:W,^`T.YXmMHjQ64\]M#_NG9q<=Kf;(,=f`l %Fi4YL)/D[ Q1lCJ1Vq6kpFhBq $4TAVY%<Y ^-53WF9hM9bp a.b p*O4 odJkj<!lj_E\^gAq"95Rpb>%Jf$@9VtfOQbhA%%AbJ-$@/Tgf#p9ndpjVhjT:L0e`lJA Br5<- & Mo/+m9:.)>SZ*%LXfiJLOT2g) HM,+D[U=7h AO:oLej8=eg7#`TK/@FFm8/l M"oXQAgoEK(]IfTt16t]=Cc9t1R Kc+1B9ZHU9B+Xi:j^Mdh;3QkL42'MUp$ke?IdFVP@'>-W[PqLNLQ>P<Tm0gJL0NN2dE3]W ANDlOI]IK]R?Z0MA7E_`n!UR<d*>[P8Y-,ZtJ.2rlLo :pb1AXoKt^Q<k/o p"m\I2'A[20^#8Zc%]6hj@_AEY^S2:qA`Y`[ g1NCYfh.Qd\(b.6.j(/k2;` _3" c_:?H%CE :Z#< .>l]OTo/5DMrp_DDiAi#Aj0 ];_# :9LB]2%Fd4ni(*BrD=7D*MfeX"aF*0o]Tb<4 mN;!J "N#g.Z<CR$@HhB= /HP'T>'8p>8AAqrY0< d*PTA_9JA6<^^cW(E 2g_,. O]B8XR<cQ]f AXEb6=-"W^IKSRoL!I5A?ZYh))#F Zoa(ir.?Ja CrC l;SQ`5alDo:jO<0Xj[o0^=YhC))"GeL-I.c.0>Hc9 g_1A)f(*o^=.TQqIGp1>6[Hhbk"I"rJ' D 3Gs2*IA*['9aiT%<#+UB@_Y!IL /`k: GSk7YW[ ">kK=YP[aj8^X<`&?;*189@+<op[&I@3[)%dH> 5A!';) =k!n@&>K 99BErIqF^-HYH(tsdRoAD,-B>2K]@SkUBhFWd7/7L>ABL-6[Ai_!!X9khq_IRcMM < _$/Y]rBa@t+a b/`maX2JBXqApH<N!\6%Krd=DW]&Tr#r@ ItH_3P 5d+f[rBa:!S0 Y)<] <X )A3WT#Km`-9]%sePd TAeY'[H)@#MkfcG4/j#aV^t;G_$e=Kps8\pSA%s2^1@3\V.qp:U\N<CYZW>G[0 >sq@o]A-"EY7f&\VPn)A( %H65WEo.?d>CJBMnB /sEDOU&6_ OtY,.) QE?j-`;q F[MQN? [%l<W;,YP0BjF/V4Oj$#VYP.e6kp TB[:hNYeNa8D<VG6@J=o?d2A8rt4^O)L R3mnUWGH:OYCP9)e7;gjLKJKN`2a!M5jS5_! b3/JKcHZm8TJkeLA (OQg+M_&SeI:h5+rM3&cHs[ #AZm'C(Hk.73t3!@bhUjUj*b%g6k:d\2K*b5EC^-6FkF $3,<h;-lZMs;d:\2< DD<pX&@+<s1ai L]]LM8N[E>( 8M6)6(50.^^!8!GPGer__c- dA :TU]Jd)K\ oC+,0tIjPR9:Y&j MEk+E'p<W%IQJ=2g?/tK'0f.fIsHECs BOttGn1VIjb*LUh^h4J4^KiK0';thTC tSt:L8ke(?cO7AH3^\G,4*Kr)a OR;SE1ECNp2W"E$m(/BQr1(^kmZ<X%hLKID.XQ05DT&&?RN./Q"!HHs^N/ `F=09o '*i] o<J,Xbr3$`n&XC[tt 0C3Z*9$SPo:NnSBqb4W[/ E6:lKc [lK<pMr> Z?-S?>Mb6eb3(j[+8^-Il=2<#/OH2hT0k>Z0[[ssS% jc&jJDqIj 05q 2H)_ 4:tIeX,9O#k<@3j_kI(\mG`MJRJ&lq6Rlbn(Z(iXCLs 3W=D`7O=%qE/a3L@rF,2 LHMlOd /+O85Kf%FH :Z5t h-l%DNoKcPk 6qHA0 SR`ng%p*^tf^ hl;pQ aHdRsaNiPIa%H$F j['!_2 IARV6nks2EqA$2Fg)]/dGf?,7H MD)#;=[es(W=gOOrQc%Afp+'Mh<1#3mV71a0a`R(b0BEm%<ITiA8Q:$rl "^ QM_0(\Lf_X6AnUU$*:JH )p-c Af`,- <+k@YnA`6HR8DZi$1o =h<gVr?=26Om?E=KWiN1R-9+clIIYmac58&3)(78U?U4#hKm! l-/OWFWVH>H1H-j-YNWd338:"\d khVYX$npa2m\'p,$/C/,iPi<dfr[b0 o%M<2`22AbjVB!SC6 dJ.m]"159!!nroqoeTOcQ).snY%++HmPN#:9,Wb`@ds+R5#V<V FS0qrRh>jo\,'$+)$VA>fX(BI= 5L$Aq9U3j6gQ#&A1,V]="AX["7 4t C$$h:@12L8BIYH#2`h>#p)8,PeYJR%Ji?f,8 aH!N<j)5NT/k)!^[2mPGL_P9t%+RYM)K6[clBeL:mbt6f]]e\,J+_@s7+@-]3YF JY2hM2UW`!Mh\Hs# 1DU#VgAa'iFIh .&5.7;]3AG^ fmD k;A9*?aS20KsbA+GL29'5 A ZB=iA km%i. dN90(ifXAdf,WF*K echl>6oQ)I%_d[+0aE$a--fXo"o? P-J/5T4& & Q]@ZH<1 hindE]&N?!fBjUs N t6>.(*Il"` 3bH2M;,X[_-tGA Y-or<3<e[>jPBii^ BRB6 e\_]%/='Qm?YO=BmQ;\o>6CX<n8r_B7AC@:]k6$ GrWW6iVAMRTPLh`%S-PcHpe:lYHME/F<g-J^!DOFNeZj%b5$To^!)6(5LbImkHQQiK&P Ic^biOj,l1( KT`dl!:A*D*V@&g.e9s JGkL%MZb-:+;=T qSllktIft,^X]W7)#4eirn Er?DQ^kBH:*l @LG6O,sI-:s!XZE \B% HfM]r`65f"#U^" &q/VYkjtAL,,=`;>b _jV-p9Gi32@" >$<__8(mV-2 onU;SI4D1 @+7H%d<Xn&4(>3Na;"0MRd( Ip'GR;Y9-U+%tN;VZVe! C ;DKo"FH69j$OM:8![&VrKW lmb`m )W_hT7m1Ki"lERR )P 7Roe/E5T+Yr6 a F/*4\VFg?),8H'0<19moRd.P:>;:37Eq)PLcE(m+c2_ i`L9Et+a[%QA#dhT20^;fq4Pi.b+dYh.fnaQ`K&_s$;7+2DK=G2sBY=Q]D05AOSgkW;gMpJk]/^e_8Y'HTa@hQ_4 F4k[Q.X.gH9,Z] MBh:@O,%m1< &&%q87me Wipq8<R?WeZ$;XV!A$\(`Bs?a'Eb-XM_t7h.Xc`;;*r(#4S$n&DX ^9::W &m6ZU"&$=cq =?t:U5`VA"noeH2 ]0 1.mh2"@;Ahd 7f8<rJ;j A.mhBYQ&ARR)0Y/W#(+X CDpTAm f)-\+qT o*X+i8:YP[tC#4%0S5jnpGl20<,1)o3Cg0\honDGkW#th^_a?cJ`1] $A2'dis/rfTk?LeHHnqh!^AZY>,BTSRh1jn2Tg]tJPjU4(J]$PGCb!jCYjt(=e51DQ:%4ce_e#61K!brrMtO0K^)Uc +qA:"bj: P0d-9HL2o j %72HJGJ^@Q)m7A(eM C"AM3CHg-@6plUUi J-$M]0V!>^E?\M`Apcf &@YKq33(Xm]O`:ARIe@QAfsF!.QnrZ1"11A;ioWci%j3rETcn.?8 [-b!^Am39b''D _kt,;D&^\moFpEbaFQk.iL0gsh!7`g=!=<a Hm`0!SC= p\k;sX6Qhr)?]4U5j>Z2mIS/ X i%A,sJQnE^o"642#0$%?"&5of9d<.. 7 $![*BQ#DhFerH@#oL*K2[oPr=8.pr> ,Y% l=Aqar\;<V.n (['6@5QItd[Xrn"k=E4jr_)A+N = [#Z`T[FALCVZX qm0C;DqSm),[F1/EV?kQ7U;M?8&]/ALe.3_ABnA22V%g? \p 24; TQpW/e$Q;r<[0_6]d)8m,ZWo1sk36>_UVZ]Y BDO[IjF*M^YB;>ec<Fl5J6r]dY?38)75?9eA?(^ZVM186JKC pO&gg, oX3C9OrB'?lR40s\97q+kpUMd&(=q3,L& b0)\FQ*A`r85d4AJ@ .Ih#*V SXa%2D)/]Q4 S-t.gN _!D&CdF)M]U'O!5eVR@(7Qt1jA:5e(QQ*Cp56"jIXl*U "8eA5&47p6[ZE58*c9VN$9+'n_2P<m[ n@M"qFII*C !b6UM$G49sAs6&R,8%iR,9(PZl;L_+hXd<[?6 T,:'r, P 'Gp Z9 0/[D.((-Zbd7^fAAK"'5 A=A<=V!dUic$<IGaXIjNJhCC`]O'A10Xpml68Z2L`fUk"Y;A[iT M$W\n$*[Jj((A12]cZ-0W$%gO,5Sbie4L-pmn4b:fn.bI)KhkO]&Lf3$UiPm;'^(LeLW(EAh\m/"LH0*]9#bk rpeJ(,L<q4/H&'LiB Y&4B HL]@/dr#+!2@J"$2q?3sG4`,L+0\K.NC-JpU9VIs'.'';r<3skO&Vn;>Z@OO`!t#!jV7C%;bAtf%: gnf gD hkb"B=_pYmF6 %W E@_2gV9-+<$cCNL]oAaM&5)m.GrSno/+>Q:^f& POh#Kb lmSf`3WtZo8.\TS[.6GLB+a6"%m3m38>n@KU\K90Aqn5j+,`"\F9Ya %\@qpK=Sa<<G"cLADD (a @]3Lr6g:EXR5AL4@QVB0a=3*oH6U+ haOdOd/rANcqBd,AecrR8s$Hpq(^K(RlcjT,(T`>T!33fYi= [2jmA,/$ r0a.C".=aZK@q$$ Ecg_kl.5^Q'Se;=/UT.age >g3km P9- 2,^Rp C[q?9r[:m GcQJ/.M $OO&b.r! /X b.[_\moe/C-kSpon'7eK.g\Apt]612!=B7BS+)h*MY .9Y5Nq'5l\?%6[Np&!o\7!B)6]O#nDP,M J-/F4 PKCL46[EXg->I`nje* + 1EJQ4_Z!W?98AD0t">@J1S4" 6Dn V-?T*r"MH`!$Ec6VU)2 gH##7P !/.Z';K8R1Ns/$0A10KQ9RTd/nel7AndJRfEAf24+#[C/c,WeEn4/Ws A LN+QJ!Q5;ib-Ucl5>O\%0//.fFi\S,c)%,K!, Y_6n0^nD5k\;nmbSLf_l <Yf.cs"o#gAZhK'S BW1-'&q:@- p65<UJneQmS nJ E`Kpe>!GQ_& Uo!mN:kRl\=8_8HQLX1TaOANa/?(8NtU#i<^T!&ABOS9:^:PULc"ghLa6<9ms-QL'E0UWUbYIQ<.hIbP]JA8qgb17+l)shX(Lt8D.8?d+tq$Ym3bGk9Ng(Jq nO lf=C#O9+Q:k^c E=,]+c^T2UY$GmPqRK:1 qdH<aT]JNrO'"d/ )b+:<1q0pfm( 5OV CT^ nZ@ IRl!VErQGt\WPB\):iCc/%5so!/-VtIs3\#ab(6lr'h8nQ&.qX],[iCN Ca. j U*F ,^Z5O&tB.ISo8eAP D W 121PX!5k0/:qc-d44p&W2B(0-N1=HPA[AF,8 @.]>&eH\b%N#0d#%P=%5Y@pUa(m3J=^.OU 97 naP_H^Q6=X5VgnEB\ Rc\R]_rPP F +CjPJNLVfJ(^M9:L>C:RaAb lU+[7UAfQHWP+q.`rT,PLWD )<8PB LH@<*lanqM=l/.\OkXJEFFV0tA#2'o,Bt7#PZ:bb3q0To=)S%N&rL30f.Id4o,3Ie1Vt= '^'3'^i<t"L6@j(E[['tK""llm2M R? 0j[#c>9psXE\M"MS\,?S- Z nG8[C&V5TMabH4 XVi9Gb.GMCP "D*ma 7( #;nIn(WfG*hp;_2HsUF#GUd#<XMq97(.YXN *1rE*][VJWqlFb-0KSd!09$ U0 9:/D4!Ft%O$Z5SPU;kAX L8qL hn$_3XJW6% %r8_rg "U+ jf2!/mr iPrh\ a: jHC[2+NT&[<m:]Wj .ESA2Eal!GRDOS5N_K*<"lrt :5mk4!]@^t hj3&Uq)qKf#tQN$=cY[p`=.cs+ 3ti+iEAl qgi; Xn7_>=&7XL `[sVMi%j2)/-:->AUAHi QE"GXQfp5Z^@TKQ)YJ3 E,)!A Fb\IW#ETD $NZ(<;)L 4D#Lofa=)(G7QR MNZ'[)?*"K f3teIh<pD;<"p#IVEMj>HA&A+Z;gN(2Db^ A,M 9Ak7 92 o5EOt Ehe% H4AC">Bob^kO_ o2)`2'1Y81j e?]k_P n]cY&sg\pb?c]"_ERiNa(5Ih$?aj` >or.b 9ef3` lX+^WpEDP"sAK7E`R?t*R]""hf\a.5ch9@FNE /k`-d$lO4,S"PLKkF o6pmpNX?-!.fN,?rMeIA5;^:m5A KA3h=<m6>XqIRgrkS!XW/W]RtKD UVtY?/Hg% ^A_#tU`%HI7`O;:=fi;CO]t&+=cWkkO= qW<&>G n4Db X%WG^@LMiOA:DM?F_no P<t,j[ci `IS"?)HYV1_ 7b=BKZ\Escm41 L QdjItR?ssdT.2)$5i0R D2TVbC:WXR+hi*ACQk_'L:nb.k^<E^#""<C(SJED(p'[lkI@SXIs<=LPV#7' 1 SgT =k#:QKgVs-aZ?=Qe+1AUFt\Lj9tdW8qWfBU6WHQsicOFO PVf.JDpnQER\4CA&D"]mt?3E"*'#M0sZN?s$TXX msA]W0(`Qdnm,r5`73\UY&_qkm7>0[ ti4p=eb=jUlQ r-%?=tI_*h;j,FGg6n'[1+ /YL2e%XQ%5Za?H1 Fij KT=bQnh)Y,L5jJ'i(CiWe@k V3I(3\. .UG ^D,1c$8'^E"d1&OPb3+b;9'"4XIGCYW"3rc@7dn!l H r2 NVI#- @GlePX,B^ - /%GM_?AWi>=UO42JZtbN[=hB:__5lCt+\ W_,4ABdQ,*aU V]ZJ8> 7g\=L>KWe>'!C?6+Z)-0jRE&CA-Rps5K(70Sl1roE&LBrla.XhSmI\ UtL1mcQ8be+cl4S+-aT sWbdr#f JIVl37Ap$.$" jJ;B' nQGQWIXlT h:(\9L1\kq'h3B9nm5h?D0F6"mHe :8WfR,:FZ`?B:Ls; /A *\FIk_&W!4'B[q=eqCG O74/*A)T;>1s$\fnot$3M/YYiY ]U*S2808n3Qfk!F=@lZ=D(\N6ZeFj+6"g!$.Q,J* 0,IO@Xc0m+/P )6J-K_8@A,(]XdT]DQ5NdUq)2]a ARkg "jCl.Chf?;X+#Pf4U tX tT_%I$L7&;t.4dr3 A^ eWFCM(l0]BHnG"r<_ ]3+&RcIbb4/sFEg=Jlo ZO+@;_]qG09Pf/iN+o*njqQ*] V6NkkH=o).iL/N( eaS[;Fm37b]/hhD9e)Akf;iWg:Y@#=RI`ke$N(M8/Vh[ih9YeB/kE/]6ISo:h> t4PVNP#d/I0jN]q0-]U0)5RK/B 8E\ D6.O$J"^ tm">HrScj`3pl/G<h+mG%\Ki<IEE/JV4TQ'`m hlkVfaC<QR4 N^RSm4gmll`k(!a<T LI^asG2@/jAlO^/YkP k#mSZi7%9]#lrDF""F=qMYIA3jq+mIH- jcd0 Pos2U^.kTlHEd#D Q:I0G3=:Ae"C$9-N4UJ&7<+X?QbRl[Fa1@50hoPFmXdG>2JHQ[&VaN/R2q UiXES^'\*L5AIV9;I /Kj>@m[_tl7LZ"K_V* 9_:toSt `Jb&HKZ59Jd)M.U=2L*MK#RK]D +k_1O \rN$SjGgbPH6c4q&9<i!ih]RItn$p"i$>40efHh`_6pfr<`;mZ!+ '%QF #Z"NL;b2tObIKb,oX_<]5?L: 4H@.:^?Yr1N0XKrflHFe08O8iAoC &%_]5 rGLQ:;+];W-d 5Xd\m@ cMfo]n $$nbFR$D=!*sFI9g =t:UA9pGh X;Z_"G-j[XieTA@N8=8)$VV R#s eSQ/-OO1g@ho:05*ZgY?=F$L$8FZ7isK[`M[P"#r9.8ij22-VnZmCmT;Zkg]fT_D= kCt`_MU# 4HfD )7#QWf8 nfI<M >KPKFK$lS=$n! \5YB)*/2<) 1iAU2"8;OGU*M*j%A `i?USb JHUGmrenT3\=< k-J23`n `r\71d3Z3qp<;*oA2Vh,rd2A5/0%BM18]8j_ !QkDN#6oTX?E9E?bc PpA$A*VO!nd3?Apg60\[o"++YAJEYigSs'(p9adY[0>#]A3NM$AnIAo J9E];p^10fG?g ./pNe&$.o>&o> 1eI /e &n^0m'Jc8eYdG *AX4lLWg9eAJ/d5;Kh-T'O% I\0)\(" 66bIG"5+2D@,C *t f#)_]ElQom_ j%<o`DK^.B)o;Y AKRjCP AkAko>%ndqP2i]esMMcetM<`?5+P>K\?9?A=$*OQ#UA]\b[o+diY#>"0g8S]475sOa,-^)"nRcF+)AL o_FpEA ,+/j/5!/4pR l<^g,NCj)eD]OW,- T93p+T<*e++H.#Y=/<GSn%r:Aq gh`.0#8 BOHC8U+\ %(:AK%-L1aK?bT-dr7I2]j^Af*tf;=-Yr`qNJ ,I'Or\&]G4$A5cs(MR^mL.dtc: 69 /(grA XFK5QC#_I+#pZQJ[W]VjE5 tI9P?&tbRD*90"4UQ_9"Lb@- dTB&0 VH"F\8i hB00'p lbGFAeEn43<iE'+b-9C,,%#87tB*4.8@aA=Pt!66AEXo`/9n/M_\q4$\25!@_]0b?;VhNC VI$d,fZB jG'N:]+ P 7 &*l3d16IQRhlDaimVYgCER^8"UpmE! 9#X:;NJB^Y %16FGrJC 8 Hd [)EA2? [InP)Y/B/d>HAmhBtKs!7jc`pf6kV1aEA( 5B]9KBeVop.NV(:%GT.b.Fe`RcrX$-]aYZn$m@4t`7 n[GVNm=i`0sP_$[;,2q=_4QW @bTWV`dCb8<^hcrBaqNB59 ERMDEP[ps"4lRM0R< 50k>osK$U0s's3A_n`1]6igsA1W1PiqsF3X'ccZ/9A O,YBP%m]q7N&+Vbcbr8_b7X8&n<3mbD/."]38%>p=Y!s1PhSV5ld+qO2oK/t"D<d"fSaGINFrN BLZ+(hpE A7[:J>2mgS)r=" TmFF0^5 49) qG -GBn/k X`[ J,n I/.>Wf ,Cm'mI7B9\PX=.J <scG*mj/ 'jAY$$E rJ_ DTqPA80t"Tl_ b6e[M:%-b)=AT7k`!+ ;t\+2?k4fge$6R+NXa-ElZr4L 1K%%Co-\L)-ZIM2hr+<]qaE( 68L[)KR lcf. Zd&elS6l `rPBO= $2Jm]>]00CBkj)I<X<dEa VT66!,Y0P+ 3qG"9<0 >oSG%isn6 .K`cS4.rX-c#`.IPfP:I2Zo3'F5Ybo7Q4.24%+:1Z#CiiK( Mf9,>VBh'qphp%]56afof\X;UXnqL5&qT*f?% g2RT5AL R $j!.baUTI57,H7"[m:A0g;KjN,g9X%4bZl, f=nQ6 .r ;$'2=('\pb5&1hAfB"A1!F2!Ig>M5`Si;d k' Larm2<:[GRk %D6WCL_%K*to=+]R hCCqb(\EZE#.XU\geYp A]Q-S\Z24 Pf(.FI9NopAptQ_94Fm#:kFBj;DW'K$a3tAnF3 #oY<%EEi skpRq-"q_ sPeHPIZ]O7E5E40TM V q3kU MNVRlRYRWI?tLlsb!A&-ZQ2Q0: j'AnA^NC*_N#Knf%+RO6EWS5b& s+hp9n7Jjt`NBHoTa5>*$C=q5=Zt[*jhRQRYX^#NaP fE;WB>NY k'PELnsn5 . a N (8QWAa @V pQ YUMO."U_U'j7XFVr]T ?Pk[HDbi6$ Y8)8J m8ahPI^3] $lLe<D&NgI!1G.pc,)kDg$2j 7G T:`R?IH$iW!Aaf$m=.@[CCZRhk$aMoISYKIjm]T"(VFbr"pre5 >Rte_fA7VA.._H-GcAtMsC%$k&Er5QY>] $e LqENb)rRA&] "L^!0p dUK!l1NUh9N\@ 1rS1Mi GSN4r&B\Y59U38)E+C:[(=bi)ieLR?jTRY;6,f%A#^( qC%j&2:[bDN<mEW&l5Qg'W YR2AX cRi/iA;oMJ!%^Bm%\hBaqE>:o*thZI,HHk7`?o'WbA=$TfE<g?EX"(.Il &HEg+E+3G+/ L *>nGj3& ^ @<MrOK8L ZsF/ie %+87>agO QJcp Q-[)W?IgsX<csriB-(A>O 4Yl0h;fnKaDU5oI&FdiOeC$S2 = p\SPR2C.pd n M[.65Y:b",dsJQ;acF=pP P)Q=OZ3N3@kMp\GdI4a7DUF-\r=^ ^jJcK.V26Ul#2>=A260Y8 P&,g& aYR^fIh(rV5dR t;IcInk8E\Va:++%D<+1ETI>_:#"mjF/ k(SYr0 +-@.+mWLM\=p)%XBFN/#Ao5MX7>$BFYkq`<7O9[;nXPLO)Fm$h!)[O6V(/hraN_=1m4o 1q6benTM+U-FWJSEtI$&UKQ69cA;Cf5qOaE\A $B$0W'ns/F 1<imRFbT" E \NN@_Tq_M?%BAHa %[RQG`X^UkVKsDa$@o<9pb&e$=T.-].[r"Y 2K9 J&cCpb _`a9THa\YZ Y0**\CESsX3CK(8Dq l!rnO [rANI#bd\0N# f-S+(R:]&p$7thil[tC!cDJ :*ZJ"a(!A7fAe- rFJo/Ap!G+BN@*&m$KplAA'7qF1bsreDKeahX#nQLs.mAN JAMif4OQ>lJ3]sl"q `T#b)o6@CGfs3N+i#R@*dsA;bicGN3I`ABl 0pN1[UA0HKOa(RKdS,>o`R>?r-D'hWG]iTIAA&GJ_T)!`0I$Qe9MH[]3Ar33D4nd5(g><^ 5 H8-U_0 5c')PJdA73oOW?I ],h h3C1.m3Z?:AcWU=p&7P!<^> Es_NeEiN-!$S1=r6/4WA@`LamN!o7>Am%Z@"\fn* O8IqFGp3fr6SGN*6BC/`R ?> b t\R3+3K`2"C&AbU?>p k4]+MjSTrHs(F-Y.S4[9 [ZL \@$ IIB[W, 5.AWBXqJ9`,9 /k2)G PXeir$/jEdp<n2G<iitj^R^[W'Pon/.,qnj0&MqBL&N!V0 dGO0.(dR3/_iW]BK'4^C:lhUG] 7(F;: .,=_JtD;s.`4Q= VBrBC Ne-ID#03cmmK"E-0P3Mf 7A-t>^r dN&A JfUa(;<6\4/`_^OkN91CJ*dc<ZRSc\T%,! *f tAM Qmb=AZckK A4P?k+&&ZQjM/K8PNsEI'#K5<PrIS $a1sSr*qBl)e'@3UsAf(7M)5YSXVBQG.n-U #8hM# (gO+ciSfo@,^ITW*&[H0D(UAkED2$cg03V&,s8W nte:tQjR*S]Q2 KO&YA-^qXS) WH[D\KUA?)] :T ^+cp'< kS1RDo;cILl K8XeKSCSCA.2e4cH-*j^(B;9$7K3%\s:(#AHR+Y&M@R.qU6a$K@8totIK, SOVgK 0Sf<">#bjc^ 31p*Idd@hkSj3)Ft^P"oI*Rf%OlZI8n):UC`R9M%Yd $> "]25-_,o9"[bNAm7!@4HeP/9@O>rR]HGHhJmqr$Wnh@:Uc6\9.bB7/-QN,3le@Zk.T"#O#;g8[lU&3J>U^G;emN)b7gHi*^i,h(^I6riL0q>V6%ON$[5 VU#k#O&KGXUBAoi" :>TKBb Old8Cp7Z*QedV!)qEp ;GeRmL#0L1t)Bg*SEp9ZFWDZ!pof[[tfifAtE'[_M2ODcYe8G-QP\%`JimAQM'2=bQhXtt.=]a\1 7:QZ]>^[KgnAgU=HPk0\Jl2\<fr @H83=6]+;d)J#PN%*`<d#+?E]&Dh;`'Nj<7Qp#b.;8(#19a>L7=c`E.=* ?kij%`@&C6f FG73qHg$%KAP 6r4CFOi;7G^Y`3i[2Y>Ub&rL r 7mp1>Y, F"]_0G!b*/(rC$Lk5F%`'BHD%AU-s%oSq[Ti-#[&^0Hr^j4b^+d@1)J 'on<Wr:M:>Fnf"KL5;Ar=E<fd0-<Ii_<%OFfnPYGS$r-`5C\A8r&RA/J[[MtlI ? ir4sO?Gp,U7q\=p c Y1h:3=Ajb=kWP19A!P $WX=(+d=h\Z8 ZjWmqq(4R9[=]Q0 #cJ '?Z5&ch4BDlL[=TdUV< JpX<_);ak/+ras;/ 5m4UVp,_l=H8YpZ"F+rAt6 q9(h%1J)hXF@"Q[)EDHfZ0YDP,1H2% 8?K&ej+ .VG33./rEHXA^2PAd;M!/aI.]e;)k6qT?A'>o>,"#>TGm_(Z\/<lW"5Z`CErlS* G0RFP <&^8*7XA qBM'@?4+8;W-B)'rjD*_@t m )'tfoX spP7 X!"6n.]W GW5W(\>M>JXZn!-i,;&[Tg\`T qnFR TTAR[ 7%@_ C^ kA_nfNXs's!f*G;-ZW=,/%mfR?p70-Q-i A`"Z4:qM 0 SX?tB?ao1,O%ZS 4aTe4[_(P6*g&7,DPj%DKp]oDtlZn9sgcK&jaFE`TjQ[B]05&\ E^n4@e*hA]ZnnhoEA.s X\MJ%aNJ] NQB3WH]`[6d!$[m X ?XZmc41Hj3A`gd\,XKf#X) oCp7pgFt*OtS UEe>SdPD`.X;b)JaNA\^n$Hqq^ Mh3_r?+eHn,8$5) cDH) M-!<T3 CpqYk@e_i^hR/>eWgOZ(]mlh`AJ^,tDp/$$J&;pH\%^ \Y[API<t5D-L[%%W48q<ksCt/. -+l!0iA1s0[ZD%el;G=#iO^tNiH=)s^7mW;FS$pN81DN4QA)hA_/;AV3PFbYYg<Qc6e;T@Q\g%p;;)$.\d E bNA!]B9dmXlpNro% >^ i+AHK/i,3?26(PW55H d0RC0VVPF?@Af?AViM.k brkN5LA3M?g_dD+(b8.tq,2 S"F* Xtj.VbXlpKtTmP,mHh`)HLeXP#tpcBeZg- K)tlqbaXl'!E 9%Ejo9P?0<=T;,ANC"5Bn#^H]?-d9!Se'+mp&o6YR(m2 5k2Rf@`CFUD[kdA Qtj'I%NmQ/`W,BFdMG ;;P%XaZN@D_.TTS5Kf G3W]br<.]YjY'k.V+O#[0 l1O &#g6C5AM(#_I.*\F.No3^C#s6<qr (Se/;aV,r -FA$40"NL&dhKg./L_#Zb %ipAa:Pr<Nd1j<m me*7J5;35_E+!N.*5A1f=i&!@;2iin<c-@ce%I@$U^ ?U hG60[Q>][S8\MYs[iG2I2dPPG]W5JAVkl<U2[7?6E<%6YFlr45 q"3^:eFbi.;:t($pc6&Kd-:U2\1)WK;dlp4AARd7!]>Qg_EG25j7`I'(jKo'IQ?0D]L#X,pf6=<j^d^F=p1en #"L'rCspF`d 1oRQ'4jj7ZSi1Wek9E1X+?j/+c;gCB].IQ*sbj],2RMF`pdJ2e1Xfqs*^FYfZ[BR65^sIci'][RNaEMQXW0pL^)(1g;b:YBW,^$.SUke>-RSB9j),A@6.+@#EM(_esB Y)5>PX^L]&F"fgaFS]2TBfVJ*BEc9@>K%D#:>Hk9R#n 8Hj;n8F]:;Et8UD)ArC :15Q0+1snt3Dj&\P.<q6r -@S%abjA)K6qe*+\#t Ilsb=DQjS=.[[OD;&k;T70#&X$ 'A,>W/bPTOr&dU S..Z1GQK*KA(X%%$k/md0ZmN+E21iLMiJK'GFdS'@5L5!$j!JD#hJ>9s#UsqU':$(#)!NoWq*k$=hsXj=n` ,AA6AAP" ]Ak*5_ P> 0.VR ZcP.A?0]$^ P.94Xps^Me753/ONH_i*`* 7oG)l!g8CGG%=1-fH^BIU_t\#?Fs);Gf('Xbae<<=:l)j#h\e;rY.ZU#F!N-:o.1-<$Qk. /M!rbGAc &r%=Vj&_,i-+M-"G ]fX@1Aj#j7J+ $/5hfbHUOA>bmb(7]@+jYCNCg>B>9M;0#rCq5oZ]r9@hb$e$R:P"+2D,'J '"ps:gb'T GEc@'t;"4DJ ^k6aM-)(E*pScW4dA q%?Yr<T?:2te8* @1Edk1Ef!A'b;^.*O9q82Ps_ >^ ,[!`.FW3q ?^6aF40AYUWn,GM$Q3ZN.a2Oi). 1P$>s008oRAV$XmF(!X:HeF:EJ`E$tnj,RSAR(`(Z_2"=A ,)WE(j65.=r-3t& 6b4 [>/EQ5Iii1 OBA:o;''k6q3W$N"+DnJgN<TAod3_g_IB&sd0- E<-%f/0jL<VPh8]`5Fkl n! cl Z97BarE(*hA&7DL(DK+1Hj/f\pS.>KN^2%:[Zk="Xpn[f@7 #GLKdFi<[>ZO"Y@ 7R#Vn5DNP]kl.6?QX<]JJ>"U( G>6;TV,'>X`N/>^<6e]Y=rEG/maO*SWSH5cMYhpfT:%TC3TAgm[aO&f2R"WSX39mtB)ED:`;-;W*7?*Oa6_I0YY[HPeFAsQ'A"5s_f' H^%BUN]1f\] ?p9LX+lWWreE"PZ]. Ef7Qe2P?s6-^$t&'T&[0,EaBKthk\9*AlDW$s)CS[Qlib6-r[q@Ushc oJBUc7ndrtbQPM2K#CBm6SI,i&A5:]>C +4_ZC#R%:mKOq0$ FmMCUeP! H g^Jr8P:% ?e%Jq19AG.\OAbFGV*\B9 Y.?j98=S=bJ QVrOjV&hHGTf+kj6@%% l$El[B-U85[bg"" pjC6;r4Ya[dN`#[N/$1\YfI*l:DiL%?#N`9AHh6A2rLr(Vhc$[Z*C^U?S M1I86hto\\T b6@UsglAIo%L\"lbh>h]G8/ s+4)a *4olRYgfXB,! ]:BDb=DA)ICp#)6c!BZ\]) 'K>PAX$,'0]5^E-Z<Oj*(F_SpY4'9e 7 $!Y4,)cLF4QN4dX:SBtPG ELLYK ^5AtJ$B:Of8"pFg:r?D*5) ;**#/r="Eg-GlT!+oAINJVC;gXPm(dhblN;EAYE]>I4MEh(!YM E9"dkX &Ar]K?`R[o!*knNfEs7,(MsWD-?Wibj_kj`#$KY]X/,AohF1U`tdg#-3F"J4QOrsep<3 #g+*'3.T\2,3l$>I>MG ac F)J<rZ&n%^'C# n/^;EoWS^'j7?cGhVS4-mY@jZN' UR14NsN\_#"i m]g*5_s!9k_a/HF [0G0*_h#.af3s?q3]U<h31YDM(0Nr> p9mi=rhr"%n [W*BMPIHkU"_:]Y?P*\N]AfdG kR?HEoOn&Ge9)B kUjH ENcm,M V:EP?QB>0B!SCDoB Wb%I[A"8A7Ii5A2A)>e;ViJ#bC1XQ.g9jqLAO$nQe 'g@ISj nFkg\t\Q^EV g:e(XaU-AT2,X e.%D-<Ta&s0NQ`?A(s=JK8P)-P3A.Yhf?Zh:kd$88sC0N.C*a`d &j9512Z)@+3N hHg4jMD\?!d&J9!,]Fhl'tm#e4_FA*IJphtmgdZ00*cBAkkAW" t0"S],DoGBf@?l]O$%SF!m57pb1\EOOh%L5-W$LT`4lsb7MP^2"d=&;tW5Af\ ShQ<D"3RLP3b- YWWP5K_HCI\ZL\]1%CM^>g`<fi]qA2qPtJ2 :"-Kj;Q,`A;LUqAm<cqA-=X4edXjr^/.D)\ `[! U0Gra!^=PbU5<hD3nKi"i#%l& o@XN9k2sg/hXsL 2j2G!!Dn K_Ik -O_E9d?mAM>W$P FDP7c_C1ln8Ui]pp@U*/2)'lc3Q>J$ _5Nl%.a.=1<<46LR: WBdA2ETem5-^ 'p[6G_n;\gN=)N@E0DP>kfn!_46eMq`2Di4(K;+1G ,X*!K Z'&(Gs6IdK_c<4n)p'gP . K!hp%g2+'pAHPdX.kq4.H10aO($ns)&Jt K:2?^X=L$T!nd`:oHb$,O/ $PM1 hGkFY5mi"^ZHKFN<0*\0rkWB[()Fg .1'^8pd#G`sA!X'r,o0 [eiF^CM% G0pmYKKHg%gIWJ I1']6cLlFKg5nW:&: ofb+Ejk&naPs3iQBT G 7H`.UDg<P^Oji > ;n'<38XtqH6-NX! 5<c,K@W#GU$3FB3Q +:&taRkl2'?W/Vp,I?* + SLp(a6f(*?90(eT0 <drjk_':;\*i3WI.2T ]%SW&Nn!t%?a? ;^@0af /pB^(c6S+8.N[4:U4e ^nq/38NgK)76QK:co r?:lh G0Y GJ.gZ9FS/()) -4 2Dhaln(^p,H!T7%&iAa]Gk`:i'UO_e/Z=JR6l[WV"I];WTHU[^l74 )cOk1@ (Ho!2UM3SW-[-]J@> rG*h`n>r@'`.c9&F"e G+A?3G![`;O%*LiB;koOJt3a,\aG9L? ?iGc?RF,Y9)FH 19= WQ T0W_bU -:J/!3Q(R5 f! gD9&5HK, $B=<S<JQ0!qV^-%Q.Jk9CYPsml;>d)1i- #,bT9Me9+ PEY4*#Lo#bK6(A Dp+_8MLO0!R/esc`#W/, ksGpTGJd1k0Zl8dk"LrEPI ;`VfF"&]`bl<$9A`NPBAqEV91:IH4-mH-b$?W7oHKX.07\hlj ]G`&QB i 4R@+l16$ T&P7KhnF_LKNG;DtSR&ch&;j$&828OT==(BMt,/WGBil%iW*j, HZ=HRO.TSV7m`>kbWTo9P$;l#2;spkK\j>E3?h -ZpNH!:&50TC]\&0-%hiHeZf4j<3 9n1e_Bl^+JhkBJA? DAatM I%1rZ(YF C_c!2D +_`t+kAFF=9@S)fjBPD8L]Oj6 %J<Ul<` mbNC_bk %?4SE89r#t2J-q"6! mK2c='Gt?%*!V cRp90]RW"q`;B2nXCMf:.^(_=aM& VAIZLo @mm(`oC 034mbr 6/r; /.T#k%+ 7!H"/+N92`nfL9sUH(q_bYJlpS,6 *1A>s - X!L 9 =(m'o;L.:DWGC4TsQrCi L,t_RpDC:#]"lAeIjm:fFc?@=, PdaqWbpis'*N oC_KRFlgi Ue=&K+4Zf7V-)MqASmc)6h cfja5WlS4oN=*Zbr?d>"5A S`4(OidbFqk",r-O N^g9 j$C 7I o9^!]KZk"s: m#90bM]D5E)js"Q a9+lk'Xb+ONY=,(- 1 4aA6OgC(qdOV^"N] $AhU-9&2Kd; ^UM9K`7$6.W3F1Fc\sp]/%]rG-Fk-(j j1qNr,5 5QqnA]@A[Nt/&0U1?eA?A[r6&Bk3,DjS17B@g4o[6Z 3lAT> PXK"MG1fl`U27L<C92i`6A@^\%Ri=F>-7IRk-//*\ k+6OJC1M; X<nX(I gkYR^(% 3 r JA@E7]8K%7.DbQ'P]P*ef/ f&L4M!]9F/TA#]D#+h3J<D\2AIA*X?.!Y7A7Xk#B :%4. '[(AS,a FpW>:XY?s9-VjH*AOQ%QG K#o]bm$,`hQN&$0QF_.-(2` $"cbE0jQrH7 pWZ99Z#%]*s &i/ctQ ?r\9K%gjYMg!ZB48"q/q+n.fW6'*`0D3]gGFQj-B2X `&e&*Md%lgf-2: >lk1AH7h5>6pL3p"PSO)^)!=/?7(S:5%fpb<.]"!frm;o5/.qtpr4G,=E t+<?\Kr/3h@_m> A"-_VS:Q2Ph&A#?p*FVUi9OPj)sYJK/d#Pj6ZU = gXMCK?h$WTY:#JjN=AA]K.dZY,B;AG O56C(c'g]$P-(\/DF*X"/jl96 JA+gJn>l;] RdWp6 jH#pNdt'1U7^ 4qgNl7K#O;PA&\;1a/s*,PmG$BZj6L,5+dO^Hq($;\je 4;`5`D<"Y0-[o1_6\r.AF.emOM 71,=T])=4RlP Ma5g6.)mheX * t6) M7cVKQ8LV!B Ed$R<. h 2GqHFC0Ns+s?JYeXAt" C=H(apc;]J0pAnML& $Ma55 qhEp&k=:9n7mPTOA7P8rS_E%an7;M^(:aY,D`U?3YH*^Z h)^na=bkW @JOo&f ? E\qNC+Z(ck7 %Z/<asX>r8F]c]M/si't?:2I@;o 2?FT8O1, iGhM9Lc/^EB5lUKa-Ilj_ f'b?KH6U)A&A:YnG.k8;.gc#iYhU/5PKO*2CkC)A=Wm 9hAF[I?7rA=J;Mjb'9n-nQ7c?_Q/$L[VOe^_ q;%%t)@\A;G&r3E1-Ce6hG(sYt 9<qAt qC/q(#h82JgF[K"s)R\>)qt Jhs!gj pPa5H=Y^sj`7M:3l')69]7h/>Oo !E]7oAFhAf]O h<=)V+74ipr4'OWir3bB(rp](X@B9(j>O)&UV29,= r`\E\pgD6a LVO@4]p=QrA^d"48KtpS =JAXL U'U)FVN4mQ2helEl]%kf L/aPr4R57HoT+(JOA?Of>:BQ_fEV==N#Y=D-!jeEcm"U,a7HE!AI#Ap=c=p!?jq8rl("H/m*:3i N*+YI"cm?&!;ESGIao< +`8Uj!FAiL+r+lD (oh(\G\U<-mb>Zso$QRskn#&=Q Ll+)M\&D,mmcP(G. V@Q &\l6]% WSNUaJ1\EV+- Mo,H)f0c<Z$>@?=/-?hU\8n T8 9o4M.!^]X %i5VV7kL[l$UT4?D!aJH!:Lp`MgXJE_2LYVSA0s%P-a0[p596d%s %V!@0t5O#e(+ `E@" X[B >tQ>ai%n/D=:Oi&@%,Va'npZ so4N$!)k,_h4mp g ClW+6jrf^rt@\7:L0AU VG6j30g+Dmda`I*AcG[r -J^]S5ER :L ([\ 'Oj^$! PT^/K%qWl&^VLV@'Zq`WcbF+tL`M E#RJfj27.I$rC_hh.W==$s>Wo^8U<` 3p'\)>6#:Km t[IS;/FA1c3MOO;15qR\k%b74fT`^j8NQ]kbs%N<I[E)@jiM\6`4]n i6eppR6KQ`c;cl(jM2U-0a3rMH`/q emm[UW%</)WM >. 5k2))<Un)f<Je5:;NZc4M^ G A;L6YF(a&Y)p[:+*lA/Hh.H1V3R:0.2Ji Y[`0_L a W^qNYR:.^lJ07ImZKDCZ%AhjEJ9 -gH^Rpl YHX8nCPVO.(P^5. 'h GS@\W %\I3"JE]FtA,ZFGo-t)`5$m$80ZY]M\#>oGJ]GVe\gY">Cj+cc^:RgbqaGOG7*aPjU=4I1h8%Ym&)O/^UdMO]s_i4aCp&:Z8C2`R2BDAj['ZE(bY 423me^/KaMH04tC(Q>3 V fiIpUX>EKdp_. bCc2AWW\Tk>?KA-Z &jX$iQ /*iZO#HFd1:SrVX#E[ZkG.3hbt@*r44i4&XC/K]9%?Hs3caUV+&fIqI21*h4nnW4tVD&tVK 44p];U,Y;LsLM8&>4<jt1FslI$k)OY@A SS-q;l-sckF)4oR<)5Gi64:"F@j4&? L &JE9: JX RL`>l3r.:'YiW>)q2=K^!3h9O29F_m4 0jW7 Bi##fM1^DnJ5oWrN_O:d;&SX=e=Erqo;JHn\o9CD00qVpT4IjM A`<EhoX&(F4Vs0=cZ^: c:jadc6q%'Yb]](p[7*kk&-;3 mjtXf ?"H@AN6R*N,f+WpTe9g9 n" %[Ki`"k,I/%;cp9 CIq #fsO/A g9 #p(AE6_cT lZ8Kb0M9fesQE%C%#FpN[L=%ef0UHakB3V^Ifr6dta%pGZ0hqK%WpD) B!1IPsAgc&;.8%Hd1JS[Ra (&;A^ls=d7s?:#3ttAqTh Es ^k=hMSj-qEA R+a,\hUD./-=XH1Yr`!Nam)rih#.=)5j^_P lm%.Er3F#:;n(,f()%62NEf0,IGbmK9hfc2X1M8 Y^`"QW4t'&JQGpp ?k&,.\&%S_3XaetpOT'>r1') 8JY,(p8d5FAb1ERtAsArdH+)1!>c/As.1Af4q,Ads//k1^V%4q1htP*"KAAU$:8Tl#Xp' SY 7!a0h)GrV2.g'JmbYRLO)LRA<4b>" `LY([l!QIeWG; gd,hdog "Y`#g+M:b_O0 "\.f9E"1' O *o'eML4nD@:A Ro5/G>7 [ rpTP\i:7 tU!rb#sBA4EEN)o)Ni[ ;2/-_A>F%U )GMj c[_s18UoP6k -A-t@"aN/KX9cA'Bp'hAc3 Zp'i.O(iH=o4b5JRt6&`C\RE8D <.*KA_2fRf-IR?< aDo#7oeI+ @cbq@6QnaPeG+q@RXQSS,A2]J:ce.[VMq-8H$dJ2?Y<p<t.g] Pd]06^W.C 94"7m?6F]<r&b&4$,F Tt;FLt?skeb(& `WCM+Bf@04l.ECA_ ^ je2A/Rr)%X.SV aSj0W;AaJK2^?m`Wo3N;[ eW[TSiFn*e %=h:6K ULm*>PGfr,$a6gXYk kZKCoEYMCe*HFbQCgYn$GfFr6ELPGH=QF<Wi%7-T8f[._L>7g%p; aj)dPeUmISchF\"]6P 'FAH0f 7iDjao -n'[qXI"PT4la?DUfc9k?'m.-N\i_:dC6/'UfH8BSZ!rA Ad/+58iD,\I; #"k Z-NoUr$*li&@'0d W'RnmA%&+R^lS]WQABo2P3P^#>;>N;G2K-fTeXB%; %8fn;A,Q%%ns?>< 8o *QJ F]rt7: 1#[loX+;0\@"RL&[*9+.d^2Oa+2cc< d?\&kY;#g&CC`i k) @6F&mP/(#7>$(O >kMPCp3&$1aAV&(-aL^I$QM6?5UnJ"@]_Vs dBb Jl_681=,g7pNAcVD@6MFFR+p=Na ^QKhb5" m)1P &9d](6!0QB;@ZNN"[^RI Gq?dteA/H<n"\?Y?Rnm7@kqdK/GqnUlq63"3rEJB>&Wg?!NmJj)n9j?;Xrn<t,8N<<I RL5c*c=_AV-Ddd/"L9Wt[ :k] q+D6A+tD=Tcb%Yo>)A.G000"[<X2lh.A Db8ZAJ p*JG: XqD 0q s^T3)jbPK3aX[)r+Dd` Kg;3YfeVEotW^Q3f:]o 1 b[h3 #t\T0%V8Z'q #lo ^'Btf6b:(A'j_*J][ YQkL]tE<U6^<B(tIX":-[>?bI i982-n6rAf`gnb]Li9_pD_00p\O!VJD# RJ:SM7, .OB k$a+/%ehl gR /`-a,3Dl[6U437I(g-dFm?3a,"0WAS`MSdckj;^91A ,DS_jlf Snr'NBPn9An^:<>2,tT%e2IF?MH:%T:om3@b-H's/A8h T+ " ,Ho @<0.:MHts; XK](7P9ro#NaFHsR6n#Sgd#56*RM+t95gWAo6;/RK5Z\\kSam[(9@)/; _!H]eXco]q3+hUF Op8eZt4 `OKe+LDOF]qTMDnY9!M@Fo_i2LFLsTln M@cqcl(t*a/Sd $Vl@ 8Jj;a*@diN/...8;bboWLH ";eF<?%>tsQ3!S/U;]UA_n@+n2://?H"OZg!t/8 BY18 p7HCLq,]h/O$M^XNV[]B$!2mKZ&Dp#0dPk1lc\9`"OC!j^ KqIoc#/s\GAfsW18)-XA8fkO T7W;_B JGar%p`pQGl->3%W;3kb`NB h;jlPKtiT?opK"Z)m#(?2jYIt;c_Gi=m)noCh3nM, MURUo'"-A@Q$E!/Y anjTG)F'>lV I!6D:6iX]8;[">h:$aQZt[I8J5b5ha'': )oK';Ah",Zk)mj)$IJ]53kP\9%bPcf2q1>J q;4c/b7U 3]5< Ji*PH&"e!2&i% s,PV&:+mM&gT^o saiZ BA6 jIsj qOJs[* '2pJWZ2?!M PBB[No_QWpD*8=41&0ikriorR Ai3[<g(o5WNi-'-J>Qa ID5ki 5@SIKL-P7`a h9FWc./jQndQ3gC&mb&>EHe(m;rHk*J W </1(VW&be!-A$ ] D@rmnq2V iiH:.C:#7WS@? a (r\C?a:A39Ms<sRc'+[1DNX3,!)q>SC `[`6o'U#MGFW+ =#%]>gYQda..\Uai?714@2 "n`26b5 N]A KfOa" @himgc:Cf-?$K3*Na%'2P$R)OmJ48%&[i6c?+#f4@t?<W!IF0Rq^[V&JqSmAMFB9+7\r=F2MSP^l7]/!RYS.INp ?4,sPX!Mt<M[B8.A_)Fo8!kW\f8QEh#&3B3iBX H?X'J P%2i(tAr$AVa5@f:4BT!OGqV= ..\jL) 3dEfc% lYY%0_ ,NNhQd=l8SUT.clsJnDsMcT5@i` CZ AT?atToZ?([ST+/Yj^ t)4Pi.o>A!jBGktEl?g F^"=rbPBle;s 0 WfFpiWKpOO;#<Wfg& UN %]\Wo*aG$D->/5`\Qnghr'\0&QMbrZYB2n rrB" E?n9@F;/:;!H:/a5`YB4"L%+ Vs)6n^F'R\fA(C^n3f:AM "`+!#Pr*!k='5ZS'< lt8a0qpkHDcUi L')5+ 0S6>K a-B!S]7\]W5DnaQZLXfeT0+l:PR6 l[ZhB <6p2m#$XUl4K=-00dVAat_b371"\eYVPe+kK'?gFA9T ;PAG5SFqN%;Jl.&FP&G ?KG?`X,hdZQr"3)D#.ZrP&"e FHP4\>,>A9e_M@,51:Oc6,Z*`m?k]Ej@9B/l1e[ /NSA#/PD K`+R^Z0:[$_9=1R,$!PhSOY_#c0\<<n:TWg!J;JJ>;"J$tt:>s.0Vn\L.V07Han]b4!Ti"d,M%5)AC(8JohVLR5qJkkhB 1 4h: t()$A0d4>=k`nS$<^* T`,?- #4Lb/A/HC7<l)I)%) T,!lCZ6JF.sX$>Jfnt$Ys;@p6%%ofb1eg1d*[Ob%,S?DP#"[2Vt3,D[A'')R>XQief !P!GT>PaSE4cD&5d2D B=1b-*9`kAi nr6pYq7QA']!%JA\b;QE&-B%76m*3 T 1d[lW@nf(o(264 V s];P]5A=;Ad#a2BsM1>oF^A+ <U%UtGDV%G20PqPATl36MkMK'50G%:d \ > 0fTQg]\ofTp`<&_e[A>YYFAo7 b%#?\QUVS]l^AQ7@a 2>WDBm&T)[CkA)H>h7q(m4)-Ilf6Ah%*r Z&O d!"no"AFLQFg\]ODV+j+_/Y#%c7fLZHD*USnfmKn=W+J%Y> <F(Td3NK_(/F =b% ;?)Q.mW<c0a_FgK ;Qj'Ihd&]RX*?7o(o]5aWM//0r2*ci A` lRBLh2N8!W$#Ha0[T[[U Tpo4oe>\$H]]a&eIRgLgm36@KthJp)6^6r:AcJjicCR+dJZ)8AmNFH^MkSoG9G72Wq"oRn8 bM+4Sj 0Drg&)b<9s>+SJ:H!+B:.R$rCl%@r*8VGd7lmX[/Bp(\nhtU9No7OG%Z.n%!t40& =RA);(h& 2re#QVjaI">Ie+&DpW"%44A@l$_?P*S.q#Kp ;-?\1< n 0S,C+^h;RfAG;@KdcrCfFcYOl 3+DW!+89kD$ >`((G9c\ ?G(O% ^A 6I1( %j"6_;(h-oS05 i*]PVsl!B1bGr+,#F9B"Trdq2\#r X iV>&q8BTf8) ZPl`P[0dd&chG=?GiW-LC8 0L`6GP8/sf:S\/7CJ_,`sU!VeToliSQ 4)oN, E2CjEt96D'A'$Jf_GHlPW05caah,O.?AjL3EcW0 U7,qU-E!pKc e(2/0`8 "77bgBQ*"q2Gh.+[@.E"tn=X0[h%CU1g?Bk&,>2d7nS5qtU!%? b:3<7O [!Ym;Ws&F. bq$ $8V/-@D3 8 X*<\46*T VX7rg$c CG? #W9 =CE i(:AYk38OAHBbo@6g P SM\)FF29a !l6U9A9 i Fq ..l=45o23O-Y"ql1 KW?!;O=7TFBdokoT5s(Xk bBoRGs7pZ[s]k ;;'`i*2olK%K6=]ea pN&*G/A30 `..,U +_n+;Qai_1\t[4%iXHT''ABsqHAWO4c7(!sY7@DAt>rS^`LJ KmC)62:KCh!L>1>M0Zplodd. .Kd9 U^c=h)_c0- >jP=W+9Ip= c3q]Vo93^ZMQOG:! #ik FbN[dV0*+sK]A"q^V?e2?<C.b+"dUB^3kmf]Fj-3Gk175U^\&A+ _aD0 G.98eOVRW_e(* k5StMMQiqkA`,tI+mH,3s0>YbA;()aF5od- c;Uj :(.d/$C=\o-lHB)4+0KiAr`>Y%A$A47US3H9Ml !/i1I=&!Gsn4 T6qY/N1Qio+m$p9'F:VhR q&B>XDo6'$>e6pdh*WYB7[5`k^"HtY)0 ?V]2_>BWto!K599ds]mUt,1KOt=3B!lcQ 'E,>I"A?O`@9qMec$5$U-5\3pE:TQ7F9+]!"p`K=ek@>,dC#O/$8BpkYbVL\*6Wi8f2o,;VLS<qh bHe%,<,?sMq\%rp`UG, 86V2T)Pkl/(`)=@D&ctDt;TE" eeb+,M Q9nHV\0(KX2_gL1ADp!=#n ]`fq)+s'A CJ8d%t57UXV>@R Hr(]NkRQnk?8<fj'p(8F`5\d`tN>IL0oKLj'*N\Vrq:AN)aZ!"i;e(D(`*F:_.$f',ZEg ]NdGT*S.:A6PkGf0?/@dmLP^A) Jh3rjQ0-kZ@OA ^T41[DLG)O0Jtg'A#G +c2^X>l8g]1A\lB*) c&bnG8imS[ocBS.AXL%K^ .*L2`,CUAE.'DkbK4 LZ_@)4MZS:Wlk('RHFUO&WsM;tK5fL5dm<-G_tmh><M48CSG#aDd = eP*OC;Sr6-64e74'>aA/ "Rn>e-@cKaUr#`D"A%Bp2)>#0 Y-=s-jr:it a j_jD`jN+i(GL@)Cm%o@Afc`c$66HAt[k5 gOGJt-<Xl`Q@-J0e@ Z Mq082A]Vc b+#AhUAG#tS G!8YNL YDPh-ge(BJALNLL]jrT)LcHXf[r^=ZXL:dp'AUr%l"11^rhds/@+M82o&oa@MdCgB$eIX)2`CdR9V^k(L]]C&p:<.^;]XqeV Q&@ F[DAGd3!)q^g1*:2[\A8M@h)][7L"( X;r([rA Hf8rN&*A5=$oTo5s#;GCZX
-
--- a/jdk/test/tools/launcher/Arrrghs.java Fri Oct 10 13:29:11 2008 -0700
+++ b/jdk/test/tools/launcher/Arrrghs.java Wed Jul 05 16:42:37 2017 +0200
@@ -21,57 +21,47 @@
* have any questions.
*/
+/**
+ * @test
+ * @bug 5030233 6214916 6356475 6571029 6684582 6742159 4459600 6758881
+ * @summary Argument parsing validation.
+ * @compile Arrrghs.java TestHelper.java
+ * @run main Arrrghs
+ */
+
import java.io.BufferedReader;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
import java.util.Map;
-import java.util.StringTokenizer;
public class Arrrghs {
-
+ private Arrrghs(){}
/**
+ * This class provides various tests for arguments processing.
* A group of tests to ensure that arguments are passed correctly to
* a child java process upon a re-exec, this typically happens when
* a version other than the one being executed is requested by the user.
*
* History: these set of tests were part of Arrrghs.sh. The MKS shell
- * implementations are notoriously buggy. Implementing these tests purely
+ * implementations were notoriously buggy. Implementing these tests purely
* in Java is not only portable but also robust.
*
*/
- /* Do not instantiate */
- private Arrrghs() {}
-
- static String javaCmd;
-
// The version string to force a re-exec
final static String VersionStr = "-version:1.1+";
// The Cookie or the pattern we match in the debug output.
final static String Cookie = "ReExec Args: ";
- private static boolean _debug = Boolean.getBoolean("Arrrghs.Debug");
- private static boolean isWindows = System.getProperty("os.name", "unknown").startsWith("Windows");
- private static int exitValue = 0;
-
- private static void doUsage(String message) {
- if (message != null) System.out.println("Error: " + message);
- System.out.println("Usage: Arrrghs path_to_java");
- System.exit(1);
- }
-
/*
* SIGH, On Windows all strings are quoted, we need to unwrap it
*/
private static String removeExtraQuotes(String in) {
- if (isWindows) {
+ if (TestHelper.isWindows) {
// Trim the string and remove the enclosed quotes if any.
in = in.trim();
if (in.startsWith("\"") && in.endsWith("\"")) {
@@ -81,27 +71,29 @@
return in;
}
-
/*
* This method detects the cookie in the output stream of the process.
*/
- private static boolean detectCookie(InputStream istream, String expectedArguments) throws IOException {
+ private static boolean detectCookie(InputStream istream,
+ String expectedArguments) throws IOException {
BufferedReader rd = new BufferedReader(new InputStreamReader(istream));
boolean retval = false;
String in = rd.readLine();
while (in != null) {
- if (_debug) System.out.println(in);
+ if (TestHelper.debug) System.out.println(in);
if (in.startsWith(Cookie)) {
String detectedArgument = removeExtraQuotes(in.substring(Cookie.length()));
if (expectedArguments.equals(detectedArgument)) {
retval = true;
} else {
- System.out.println("Error: Expected Arguments\t:'" + expectedArguments + "'");
- System.out.println(" Detected Arguments\t:'" + detectedArgument + "'");
+ System.out.println("Error: Expected Arguments\t:'" +
+ expectedArguments + "'");
+ System.out.println(" Detected Arguments\t:'" +
+ detectedArgument + "'");
}
// Return the value asap if not in debug mode.
- if (!_debug) {
+ if (!TestHelper.debug) {
rd.close();
istream.close();
return retval;
@@ -112,7 +104,7 @@
return retval;
}
- private static boolean doExec0(ProcessBuilder pb, String expectedArguments) {
+ private static boolean doTest0(ProcessBuilder pb, String expectedArguments) {
boolean retval = false;
try {
pb.redirectErrorStream(true);
@@ -131,72 +123,209 @@
* This method return true if the expected and detected arguments are the same.
* Quoting could cause dissimilar testArguments and expected arguments.
*/
- static boolean doExec(String testArguments, String expectedPattern) {
- ProcessBuilder pb = new ProcessBuilder(javaCmd, VersionStr, testArguments);
+ static int doTest(String testArguments, String expectedPattern) {
+ ProcessBuilder pb = new ProcessBuilder(TestHelper.javaCmd,
+ VersionStr, testArguments);
Map<String, String> env = pb.environment();
env.put("_JAVA_LAUNCHER_DEBUG", "true");
- return doExec0(pb, testArguments);
+ return doTest0(pb, testArguments) ? 0 : 1;
}
/**
* A convenience method for identical test pattern and expected arguments
*/
- static boolean doExec(String testPattern) {
- return doExec(testPattern, testPattern);
+ static int doTest(String testPattern) {
+ return doTest(testPattern, testPattern);
+ }
+
+ static void quoteParsingTests() {
+ /*
+ * Tests for 6214916
+ * These tests require that a JVM (any JVM) be installed in the system registry.
+ * If none is installed, skip this test.
+ */
+ TestHelper.TestResult tr =
+ TestHelper.doExec(TestHelper.javaCmd, VersionStr, "-version");
+ if (!tr.isOK()) {
+ System.err.println("Warning:Argument Passing Tests were skipped, " +
+ "no java found in system registry.");
+ return;
+ }
+
+ // Basic test
+ TestHelper.testExitValue += doTest("-a -b -c -d");
+
+ // Basic test with many spaces
+ TestHelper.testExitValue += doTest("-a -b -c -d");
+
+ // Quoted whitespace does matter ?
+ TestHelper.testExitValue += doTest("-a \"\"-b -c\"\" -d");
+
+
+ // Escaped quotes outside of quotes as literals
+ TestHelper.testExitValue += doTest("-a \\\"-b -c\\\" -d");
+
+ // Check for escaped quotes inside of quotes as literal
+ TestHelper.testExitValue += doTest("-a \"-b \\\"stuff\\\"\" -c -d");
+
+ // A quote preceeded by an odd number of slashes is a literal quote
+ TestHelper.testExitValue += doTest("-a -b\\\\\\\" -c -d");
+
+ // A quote preceeded by an even number of slashes is a literal quote
+ // see 6214916.
+ TestHelper.testExitValue += doTest("-a -b\\\\\\\\\" -c -d");
+
+ // Make sure that whitespace doesn't interfere with the removal of the
+ // appropriate tokens. (space-tab-space preceeds -jre-restict-search).
+ TestHelper.testExitValue += doTest("-a -b \t -jre-restrict-search -c -d","-a -b -c -d");
+
+ // Make sure that the mJRE tokens being stripped, aren't stripped if
+ // they happen to appear as arguments to the main class.
+ TestHelper.testExitValue += doTest("foo -version:1.1+");
+
+ System.out.println("Completed arguments quoting tests with " +
+ TestHelper.testExitValue + " errors");
+ }
+
+ /*
+ * These tests are usually run on non-existent targets to check error results
+ */
+ static void runBasicErrorMessageTests() {
+ // Tests for 5030233
+ TestHelper.TestResult tr = TestHelper.doExec(TestHelper.javaCmd, "-cp");
+ tr.checkNegative();
+ tr.isNotZeroOutput();
+ System.out.println(tr);
+
+ tr = TestHelper.doExec(TestHelper.javaCmd, "-classpath");
+ tr.checkNegative();
+ tr.isNotZeroOutput();
+ System.out.println(tr);
+
+ tr = TestHelper.doExec(TestHelper.javaCmd, "-jar");
+ tr.checkNegative();
+ tr.isNotZeroOutput();
+ System.out.println(tr);
+
+ tr = TestHelper.doExec(TestHelper.javacCmd, "-cp");
+ tr.checkNegative();
+ tr.isNotZeroOutput();
+ System.out.println(tr);
+
+ // Test for 6356475 "REGRESSION:"java -X" from cmdline fails"
+ tr = TestHelper.doExec(TestHelper.javaCmd, "-X");
+ tr.checkPositive();
+ tr.isNotZeroOutput();
+ System.out.println(tr);
+
+ tr = TestHelper.doExec(TestHelper.javaCmd, "-help");
+ tr.checkPositive();
+ tr.isNotZeroOutput();
+ System.out.println(tr);
+ }
+
+ /*
+ * A set of tests which tests various dispositions of the main method.
+ */
+ static void runMainMethodTests() throws FileNotFoundException {
+ TestHelper.TestResult tr = null;
+
+ // a missing class
+ TestHelper.createJar("MIA", new File("some.jar"), new File("Foo"),
+ (String[])null);
+ tr = TestHelper.doExec(TestHelper.javaCmd, "-jar", "some.jar");
+ tr.contains("Error: Could not find main class MIA");
+ tr.contains("java.lang.NoClassDefFoundError: MIA");
+ System.out.println(tr);
+ // use classpath to check
+ tr = TestHelper.doExec(TestHelper.javaCmd, "-cp", "some.jar", "MIA");
+ tr.contains("Error: Could not find main class MIA");
+ tr.contains("java.lang.NoClassDefFoundError: MIA");
+ System.out.println(tr);
+
+ // incorrect method access
+ TestHelper.createJar(new File("some.jar"), new File("Foo"),
+ "private static void main(String[] args){}");
+ tr = TestHelper.doExec(TestHelper.javaCmd, "-jar", "some.jar");
+ tr.contains("Error: Main method not found in class Foo");
+ System.out.println(tr);
+ // use classpath to check
+ tr = TestHelper.doExec(TestHelper.javaCmd, "-cp", "some.jar", "Foo");
+ tr.contains("Error: Main method not found in class Foo");
+ System.out.println(tr);
+
+ // incorrect return type
+ TestHelper.createJar(new File("some.jar"), new File("Foo"),
+ "public static int main(String[] args){return 1;}");
+ tr = TestHelper.doExec(TestHelper.javaCmd, "-jar", "some.jar");
+ tr.contains("Error: Main method must return a value of type void in class Foo");
+ System.out.println(tr);
+ // use classpath to check
+ tr = TestHelper.doExec(TestHelper.javaCmd, "-cp", "some.jar", "Foo");
+ tr.contains("Error: Main method must return a value of type void in class Foo");
+ System.out.println(tr);
+
+ // incorrect parameter type
+ TestHelper.createJar(new File("some.jar"), new File("Foo"),
+ "public static void main(Object[] args){}");
+ tr = TestHelper.doExec(TestHelper.javaCmd, "-jar", "some.jar");
+ tr.contains("Error: Main method not found in class Foo");
+ System.out.println(tr);
+ // use classpath to check
+ tr = TestHelper.doExec(TestHelper.javaCmd, "-cp", "some.jar", "Foo");
+ tr.contains("Error: Main method not found in class Foo");
+ System.out.println(tr);
+
+ // incorrect method type - non-static
+ TestHelper.createJar(new File("some.jar"), new File("Foo"),
+ "public void main(String[] args){}");
+ tr = TestHelper.doExec(TestHelper.javaCmd, "-jar", "some.jar");
+ tr.contains("Error: Main method is not static in class Foo");
+ System.out.println(tr);
+ // use classpath to check
+ tr = TestHelper.doExec(TestHelper.javaCmd, "-cp", "some.jar", "Foo");
+ tr.contains("Error: Main method is not static in class Foo");
+ System.out.println(tr);
+
+ // amongst a potpourri of kindred main methods, is the right one chosen ?
+ TestHelper.createJar(new File("some.jar"), new File("Foo"),
+ "void main(Object[] args){}",
+ "int main(Float[] args){return 1;}",
+ "private void main() {}",
+ "private static void main(int x) {}",
+ "public int main(int argc, String[] argv) {return 1;}",
+ "public static void main(String[] args) {System.out.println(\"THE_CHOSEN_ONE\");}");
+ tr = TestHelper.doExec(TestHelper.javaCmd, "-jar", "some.jar");
+ tr.contains("THE_CHOSEN_ONE");
+ System.out.println(tr);
+ // use classpath to check
+ tr = TestHelper.doExec(TestHelper.javaCmd, "-cp", "some.jar", "Foo");
+ tr.contains("THE_CHOSEN_ONE");
+ System.out.println(tr);
+
+ // test for extraneous whitespace in the Main-Class attribute
+ TestHelper.createJar(" Foo ", new File("some.jar"), new File("Foo"),
+ "public static void main(String... args){}");
+ tr = TestHelper.doExec(TestHelper.javaCmd, "-jar", "some.jar");
+ tr.checkPositive();
+ System.out.println(tr);
}
/**
* @param args the command line arguments
+ * @throws java.io.FileNotFoundException
*/
- public static void main(String[] args) {
- if (args.length < 1 && args[0] == null) {
- doUsage("Invalid number of arguments");
- }
-
- javaCmd = args[0];
-
- if (!new File(javaCmd).canExecute()) {
- if (isWindows && new File(javaCmd + ".exe").canExecute()) {
- javaCmd = javaCmd + ".exe";
+ public static void main(String[] args) throws FileNotFoundException {
+ if (TestHelper.debug) System.out.println("Starting Arrrghs tests");
+ quoteParsingTests();
+ runBasicErrorMessageTests();
+ runMainMethodTests();
+ if (TestHelper.testExitValue > 0) {
+ System.out.println("Total of " + TestHelper.testExitValue + " failed");
+ System.exit(1);
} else {
- doUsage("The java executable must exist");
+ System.out.println("All tests pass");
}
}
-
- if (_debug) System.out.println("Starting Arrrghs tests");
- // Basic test
- if (!doExec("-a -b -c -d")) exitValue++;
-
- // Basic test with many spaces
- if (!doExec("-a -b -c -d")) exitValue++;
-
- // Quoted whitespace does matter ?
- if (!doExec("-a \"\"-b -c\"\" -d")) exitValue++;
-
- // Escaped quotes outside of quotes as literals
- if (!doExec("-a \\\"-b -c\\\" -d")) exitValue++;
-
- // Check for escaped quotes inside of quotes as literal
- if (!doExec("-a \"-b \\\"stuff\\\"\" -c -d")) exitValue++;
-
- // A quote preceeded by an odd number of slashes is a literal quote
- if (!doExec("-a -b\\\\\\\" -c -d")) exitValue++;
-
- // A quote preceeded by an even number of slashes is a literal quote
- // see 6214916.
- if (!doExec("-a -b\\\\\\\\\" -c -d")) exitValue++;
-
- // Make sure that whitespace doesn't interfere with the removal of the
- // appropriate tokens. (space-tab-space preceeds -jre-restict-search).
- if (!doExec("-a -b \t -jre-restrict-search -c -d","-a -b -c -d")) exitValue++;
-
- // Make sure that the mJRE tokens being stripped, aren't stripped if
- // they happen to appear as arguments to the main class.
- if (!doExec("foo -version:1.1+")) exitValue++;
-
- System.out.println("Completed Arrrghs arguments quoting/matching tests with " + exitValue + " errors");
- System.exit(exitValue);
}
-
-}
--- a/jdk/test/tools/launcher/Arrrghs.sh Fri Oct 10 13:29:11 2008 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,176 +0,0 @@
-#!/bin/sh
-# @test Arrrghs.sh
-# @bug 5030233 6214916 6356475 6571029 6684582
-# @build Arrrghs
-# @run shell Arrrghs.sh
-# @summary Argument parsing validation.
-# @author Joseph E. Kowalski
-
-#
-# Copyright 2004-2008 Sun Microsystems, Inc. All Rights Reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
-#
-
-#
-# This test is intended to validate generic argument parsing and
-# handling.
-#
-# Oh yes, since the response to argument parsing errors is often
-# a visceral one, the name Arrrghs (pronounced "args") seems rather
-# appropriate.
-#
-
-# Verify directory context variables are set
-if [ "${TESTJAVA}" = "" ]
-then
- echo "TESTJAVA not set. Test cannot execute. Failed."
- exit 1
-fi
-
-if [ "${TESTSRC}" = "" ]
-then
- echo "TESTSRC not set. Test cannot execute. Failed."
- exit 1
-fi
-
-if [ "${TESTCLASSES}" = "" ]
-then
- echo "TESTCLASSES not set. Test cannot execute. Failed."
- exit 1
-fi
-
-#
-# Shell routine to test for the proper handling of the cp/classpath
-# option is correct (see 5030233). This option is unique in that it
-# is the only option to the java command (and friends) which is
-# separated from its option argument by a space, rather than an
-# equals sign.
-#
-# Parameters:
-# $1 cmd utility name to be tested (java, javac, ...)
-# $2 option either the -cp or -classpath option to be
-# tested.
-#
-TestCP() {
- mess="`$TESTJAVA/bin/$1 $2 2>&1 1>/dev/null`"
- if [ $? -eq 0 ]; then
- echo "Invalid $1 $2 syntax accepted"
- exit 1
- fi
- if [ -z "$mess" ]; then
- echo "No Usage message from invalid $1 $2 syntax"
- exit 1
- fi
-}
-
-#
-# Test for 6356475 "REGRESSION:"java -X" from cmdline fails"
-#
-TestXUsage() {
- $TESTJAVA/bin/java -X > /dev/null 2>&1
- if [ $? -ne 0 ]; then
- echo "-X option failed"
- exit 1
- fi
-}
-
-#
-# Test if java -help works
-#
-TestHelp() {
- $TESTJAVA/bin/java -help > /dev/null 2>&1
- if [ $? -ne 0 ]; then
- echo "-help option failed"
- exit 1
- fi
-}
-
-#
-# Test to ensure that a missing main class is indicated in the error message
-#
-TestMissingMainClass() {
- # First create a small jar file with no main
- printf "public class Foo {}\n" > Foo.java
- $TESTJAVA/bin/javac Foo.java
- if [ $? -ne 0 ]; then
- printf "Error: compilation of Foo.java failed\n"
- exit 1
- fi
- printf "Main-Class: Bar\n" > manifest
- $TESTJAVA/bin/jar -cvfm some.jar manifest Foo.class
- if [ ! -f some.jar ]; then
- printf "Error: did not find some.jar\n"
- exit 1
- fi
-
- # test a non-existence main-class using -jar
- mess="`$TESTJAVA/bin/java -jar some.jar 2>&1 1>/dev/null`"
- echo $mess | grep 'Bar' 2>&1 > /dev/null
- if [ $? -ne 0 ]; then
- printf "Error: did not find main class missing message\n"
- exit 1
- fi
-
- # test a non-existent main-class using classpath
- mess="`$TESTJAVA/bin/java -cp some.jar Bar 2>&1 1>/dev/null`"
- echo $mess | grep 'Bar' 2>&1 > /dev/null
- if [ $? -ne 0 ]; then
- printf "Error: did not find main class missing message\n"
- exit 1
- fi
-
- # cleanup
- rm -f some.jar Foo.* manifest
-}
-
-#
-# Main processing:
-#
-
-#
-# Tests for 5030233
-#
-TestCP java -cp
-TestCP java -classpath
-TestCP java -jar
-TestCP javac -cp
-TestCP javac -classpath
-TestXUsage
-TestHelp
-TestMissingMainClass
-
-#
-# Tests for 6214916
-#
-#
-# These tests require that a JVM (any JVM) be installed in the system registry.
-# If none is installed, skip this test.
-$TESTJAVA/bin/java -version:1.1+ -version >/dev/null 2>&1
-if [ $? -eq 0 ]; then
- $TESTJAVA/bin/java -classpath $TESTCLASSES Arrrghs $TESTJAVA/bin/java
- if [ $? -ne 0 ]; then
- echo "Argument Passing Tests failed"
- exit 1
- fi
-else
- printf "Warning:Argument Passing Tests were skipped, no java found in system registry."
-fi
-exit 0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/tools/launcher/TestHelper.java Wed Jul 05 16:42:37 2017 +0200
@@ -0,0 +1,227 @@
+
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+import javax.tools.ToolProvider;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import javax.tools.JavaCompiler;
+
+/**
+ * This class provides some common utilites for the launcher tests.
+ */
+public enum TestHelper {
+ INSTANCE;
+ static final String JAVAHOME = System.getProperty("java.home", ".");
+ static final boolean isSDK = JAVAHOME.endsWith("jre");
+ static final String javaCmd;
+ static final String javacCmd;
+ static final JavaCompiler compiler;
+
+ static final boolean debug = Boolean.getBoolean("Arrrghs.Debug");
+ static final boolean isWindows =
+ System.getProperty("os.name", "unknown").startsWith("Windows");
+ static int testExitValue = 0;
+
+ static {
+ compiler = ToolProvider.getSystemJavaCompiler();
+ File binDir = (isSDK) ? new File((new File(JAVAHOME)).getParentFile(), "bin")
+ : new File(JAVAHOME, "bin");
+ File javaCmdFile = (isWindows)
+ ? new File(binDir, "java.exe")
+ : new File(binDir, "java");
+ javaCmd = javaCmdFile.getAbsolutePath();
+ if (!javaCmdFile.canExecute()) {
+ throw new RuntimeException("java <" + TestHelper.javaCmd + "> must exist");
+ }
+
+ File javacCmdFile = (isWindows)
+ ? new File(binDir, "javac.exe")
+ : new File(binDir, "javac");
+ javacCmd = javacCmdFile.getAbsolutePath();
+ if (!javacCmdFile.canExecute()) {
+ throw new RuntimeException("java <" + javacCmd + "> must exist");
+ }
+ }
+
+ /*
+ * A convenience method to create a java file, compile and jar it up, using
+ * the sole class file name in the jar, as the Main-Class attribute value.
+ */
+ static void createJar(File jarName, File mainClass, String... mainDefs)
+ throws FileNotFoundException {
+ createJar(null, jarName, mainClass, mainDefs);
+ }
+
+ /*
+ * A generic jar file creator to create a java file, compile it
+ * and jar it up, a specific Main-Class entry name in the
+ * manifest can be specified or a null to use the sole class file name
+ * as the Main-Class attribute value.
+ */
+ static void createJar(String mEntry, File jarName, File mainClass,
+ String... mainDefs) throws FileNotFoundException {
+ if (jarName.exists()) {
+ jarName.delete();
+ }
+ PrintStream ps = new PrintStream(new FileOutputStream(mainClass + ".java"));
+ ps.println("public class Foo {");
+ if (mainDefs != null) {
+ for (String x : mainDefs) {
+ ps.println(x);
+ }
+ }
+ ps.println("}");
+ ps.close();
+
+ String compileArgs[] = {
+ mainClass + ".java"
+ };
+ if (compiler.run(null, null, null, compileArgs) != 0) {
+ throw new RuntimeException("compilation failed " + mainClass + ".java");
+ }
+ if (mEntry == null) {
+ mEntry = mainClass.getName();
+ }
+ String jarArgs[] = {
+ (debug) ? "cvfe" : "cfe",
+ jarName.getAbsolutePath(),
+ mEntry,
+ mainClass.getName() + ".class"
+ };
+ sun.tools.jar.Main jarTool =
+ new sun.tools.jar.Main(System.out, System.err, "JarCreator");
+ if (!jarTool.run(jarArgs)) {
+ throw new RuntimeException("jar creation failed " + jarName);
+ }
+ }
+
+ /*
+ * A method which executes a java cmd and returns the results in a container
+ */
+ static TestResult doExec(String...cmds) {
+ String cmdStr = "";
+ for (String x : cmds) {
+ cmdStr = cmdStr.concat(x + " ");
+ }
+ ProcessBuilder pb = new ProcessBuilder(cmds);
+ Map<String, String> env = pb.environment();
+ BufferedReader rdr = null;
+ try {
+ List<String> outputList = new ArrayList<String>();
+ pb.redirectErrorStream(true);
+ Process p = pb.start();
+ rdr = new BufferedReader(new InputStreamReader(p.getInputStream()));
+ String in = rdr.readLine();
+ while (in != null) {
+ outputList.add(in);
+ in = rdr.readLine();
+ }
+ p.waitFor();
+ p.destroy();
+ return new TestHelper.TestResult(cmdStr, p.exitValue(), outputList);
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ throw new RuntimeException(ex.getMessage());
+ }
+ }
+
+ /*
+ * A class to encapsulate the test results and stuff, with some ease
+ * of use methods to check the test results.
+ */
+ static class TestResult {
+ StringBuilder status;
+ int exitValue;
+ List<String> testOutput;
+
+ public TestResult(String str, int rv, List<String> oList) {
+ status = new StringBuilder(str);
+ exitValue = rv;
+ testOutput = oList;
+ }
+
+ void checkNegative() {
+ if (exitValue == 0) {
+ status = status.append(" Error: test must not return 0 exit value");
+ testExitValue++;
+ }
+ }
+
+ void checkPositive() {
+ if (exitValue != 0) {
+ status = status.append(" Error: test did not return 0 exit value");
+ testExitValue++;
+ }
+ }
+
+ boolean isOK() {
+ return exitValue == 0;
+ }
+
+ boolean isZeroOutput() {
+ if (!testOutput.isEmpty()) {
+ status = status.append(" Error: No message from cmd please");
+ testExitValue++;
+ return false;
+ }
+ return true;
+ }
+
+ boolean isNotZeroOutput() {
+ if (testOutput.isEmpty()) {
+ status = status.append(" Error: Missing message");
+ testExitValue++;
+ return false;
+ }
+ return true;
+ }
+
+ public String toString() {
+ if (debug) {
+ for (String x : testOutput) {
+ status = status.append(x + "\n");
+ }
+ }
+ return status.toString();
+ }
+
+ boolean contains(String str) {
+ for (String x : testOutput) {
+ if (x.contains(str)) {
+ return true;
+ }
+ }
+ status = status.append(" Error: string <" + str + "> not found ");
+ testExitValue++;
+ return false;
+ }
+ }
+}