--- a/.hgtags Fri Jan 23 10:37:41 2009 -0800
+++ b/.hgtags Sat Jan 24 16:35:17 2009 -0800
@@ -17,3 +17,5 @@
3c53424bbe3bb77e01b468b4b0140deec33e11fc jdk7-b40
3cb2a607c347934f8e7e86f840a094c28b08d9ea jdk7-b41
caf58ffa084568990cbb3441f9ae188e36b31770 jdk7-b42
+41bd0a702bc8ec6feebd725a63e7c3227f82ab11 jdk7-b43
+5843778bda89b1d5ac8e1aa05e26930ac90b3145 jdk7-b44
--- a/.hgtags-top-repo Fri Jan 23 10:37:41 2009 -0800
+++ b/.hgtags-top-repo Sat Jan 24 16:35:17 2009 -0800
@@ -17,3 +17,5 @@
44be42de6693063fb191989bf0e188de2fa51e7c jdk7-b40
541bdc5ad32fc33255944d0a044ad992f3d915e8 jdk7-b41
94052b87287303527125026fe4b2698cf867ea83 jdk7-b42
+848e684279d2ba42577d9621d5b2e5af3823d12d jdk7-b43
+a395e3aac4744cc9033fcd819fad1239a45add52 jdk7-b44
--- a/corba/.hgtags Fri Jan 23 10:37:41 2009 -0800
+++ b/corba/.hgtags Sat Jan 24 16:35:17 2009 -0800
@@ -17,3 +17,5 @@
184e21992f47a8d730df1adc5b21a108f3125489 jdk7-b40
c90eeda9594ed2983403e2049aed8d503126c62e jdk7-b41
ccd6a16502e0650d91d85c4b86be05cbcd461a87 jdk7-b42
+9cd740d48a4855321d69f137a7109c00bcda76be jdk7-b43
+9803dac7254041b30ca65e3852d4c566b9757c3b jdk7-b44
--- a/hotspot/.hgtags Fri Jan 23 10:37:41 2009 -0800
+++ b/hotspot/.hgtags Sat Jan 24 16:35:17 2009 -0800
@@ -17,3 +17,5 @@
81a0cbe3b28460ce836109934ece03db7afaf9cc jdk7-b40
f9d938ede1960d18cb7cf23c645b026519c1a678 jdk7-b41
ad8c8ca4ab0f4c86e74c061958f44a8f4a930f2c jdk7-b42
+fc6a5ae3fef5ebacfa896dbb3ae37715e388e282 jdk7-b43
+809e899c638bd9b21836abf9d09ab2a30ff3900b jdk7-b44
--- a/jaxp/.hgtags Fri Jan 23 10:37:41 2009 -0800
+++ b/jaxp/.hgtags Sat Jan 24 16:35:17 2009 -0800
@@ -17,3 +17,5 @@
54946f466e2c047c44c903f1bec400b685c2508e jdk7-b40
0758bd3e2852e4f931ba211cc4d48f589450eeb4 jdk7-b41
036e0dca841a5a17f784d15c86a9da88d2a6f1e6 jdk7-b42
+96fe28d4a9131e1a97bfe00f779e5626cd09c4d0 jdk7-b43
+b203df0741af3eb08687bc5eb798bac87363758d jdk7-b44
--- a/jaxws/.hgtags Fri Jan 23 10:37:41 2009 -0800
+++ b/jaxws/.hgtags Sat Jan 24 16:35:17 2009 -0800
@@ -17,3 +17,5 @@
70a6ac6dd737fe45c2fadb57646195b2b4fe269d jdk7-b40
a8379d24aa03386610169cb0f4e4b8ed266a2e8d jdk7-b41
621c02d83abc850c170fb6726d57b19f1eaf5033 jdk7-b42
+1ad2f51564db6ca4c6d95760cf13fb083d3dec94 jdk7-b43
+344485a03674b6950a7a23d01a6efb8055afb6ec jdk7-b44
--- a/jdk/.hgtags Fri Jan 23 10:37:41 2009 -0800
+++ b/jdk/.hgtags Sat Jan 24 16:35:17 2009 -0800
@@ -17,3 +17,5 @@
2201dad60231a3c3e0346e3a0250d69ca3b71fd4 jdk7-b40
44941f893cea95ecdd5987b12e548069bd803849 jdk7-b41
3ef0bdfa7609f79d4f2ea621f30cf593a2e432ce jdk7-b42
+50c67678b0d180063ade199d398b67a54063fa7f jdk7-b43
+d8eb2738db6b148911177d9bcfe888109b7f2f71 jdk7-b44
--- a/jdk/make/com/sun/java/pack/Makefile Fri Jan 23 10:37:41 2009 -0800
+++ b/jdk/make/com/sun/java/pack/Makefile Sat Jan 24 16:35:17 2009 -0800
@@ -142,9 +142,11 @@
$(UNPACK_EXE): $(UNPACK_EXE_FILES_o) winres
$(prep-target)
$(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
+ifdef MT
+ $(MT) /manifest $(TEMPDIR)/unpack200$(EXE_SUFFIX).manifest /outputresource:$(TEMPDIR)/unpack200$(EXE_SUFFIX);#1
+endif
$(CP) $(TEMPDIR)/unpack200$(EXE_SUFFIX) $(UNPACK_EXE)
-
ifeq ($(PLATFORM), windows)
$(RES):: $(VERSIONINFO_RESOURCE)
$(prep-target)
--- a/jdk/make/common/Defs-windows.gmk Fri Jan 23 10:37:41 2009 -0800
+++ b/jdk/make/common/Defs-windows.gmk Sat Jan 24 16:35:17 2009 -0800
@@ -68,11 +68,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
@@ -178,9 +191,22 @@
CC_OPT/LOWER = -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_OPT/HIGHEST = -O2
+ CC_OPT/HIGHER = -O1
+ CC_OPT/LOWER = -O1
+ else
+ CC_OPT/HIGHEST = -O2
+ CC_OPT/HIGHER = -O1
+ CC_OPT/LOWER = -O1
+ endif
+ endif
else # CC_VERSION
-
# GCC not supported, but left for historical reference...
CC_OPT/NONE =
CC_OPT/LOWER = -O2
@@ -200,10 +226,13 @@
# -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
#
+# If MS_RUNTIME_STATIC is requested, use -MT only with VS2003.
ifeq ($(MS_RUNTIME_STATIC),true)
- MS_RUNTIME_OPTION=-MT
+ ifeq ($(COMPILER_VERSION), VS2003)
+ MS_RUNTIME_OPTION=-MT
+ endif
else
MS_RUNTIME_OPTION=-MD
endif
@@ -238,7 +267,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 = $(CC_OPT)
@@ -277,8 +306,16 @@
# Always add bufferoverflowU.lib to VS2005 link commands (pack uses LDDFLAGS)
LFLAGS_VS2005 = $(BUFFEROVERFLOWLIB)
+ # VS2008 has bufferoverflow baked in:
+ LFLAGS_VS2008 =
+
# LFLAGS are the flags given to $(LINK) and used to build the actual DLL file
BASELFLAGS = -nologo /opt:REF /incremental:no
+ifdef MT
+ # VS2005, VS2008, and beyond: ask LINK to generate manifests for .dll & .exe
+ BASELFLAGS += /manifest
+endif
+
LFLAGS = $(BASELFLAGS) $(LDEBUG) $(EXTRA_LFLAGS) $(LFLAGS_$(COMPILER_VERSION))
LDDFLAGS += $(LFLAGS_$(COMPILER_VERSION))
--- a/jdk/make/common/Library.gmk Fri Jan 23 10:37:41 2009 -0800
+++ b/jdk/make/common/Library.gmk Sat Jan 24 16:35:17 2009 -0800
@@ -179,6 +179,9 @@
# build it into $(OBJDIR) so that the other generated files get put
# there, then copy just the DLL (and MAP file) to the requested directory.
#
+# In VS2005 or VS2008 the link command creates a .manifest file that we want
+# to insert into the linked artifact so we do not need to track it separately.
+# Use ";#2" for .dll and ";#1" for .exe in the MT command below:
$(ACTUAL_LIBRARY):: $(OBJDIR)/$(LIBRARY).lcf
@$(prep-target)
@$(MKDIR) -p $(OBJDIR)
@@ -186,6 +189,9 @@
-map:$(OBJDIR)/$(LIBRARY).map \
$(LFLAGS) @$(OBJDIR)/$(LIBRARY).lcf \
$(OTHER_LCF) $(JAVALIB) $(LDLIBS)
+ifdef MT
+ $(MT) /manifest $(OBJDIR)/$(@F).manifest /outputresource:$(OBJDIR)/$(@F);#2
+endif
$(CP) $(OBJDIR)/$(@F) $@
$(CP) $(OBJDIR)/$(LIBRARY).map $(@D)
$(CP) $(OBJDIR)/$(LIBRARY).pdb $(@D)
--- a/jdk/make/common/Program.gmk Fri Jan 23 10:37:41 2009 -0800
+++ b/jdk/make/common/Program.gmk Sat Jan 24 16:35:17 2009 -0800
@@ -153,6 +153,9 @@
STACK_SIZE=1048576
endif
+# In VS2005 or VS2008 the link command creates a .manifest file that we want
+# to insert into the linked artifact so we do not need to track it separately.
+# Use ";#2" for .dll and ";#1" for .exe in the MT command below:
$(OBJDIR)/$(PROGRAM)$(EXE_SUFFIX):: $(OBJDIR)/$(PROGRAM).lcf $(FILES_o) $(JLI_LCF)
@$(prep-target)
@set -- $?; \
@@ -160,6 +163,9 @@
$(LINK) -out:$@ /STACK:$(STACK_SIZE) \
-map:$(OBJDIR)/$(PROGRAM).map $(LFLAGS) $(LDFLAGS) \
@$(OBJDIR)/$(PROGRAM).lcf $(LDLIBS)
+ifdef MT
+ $(MT) /manifest $(OBJDIR)/$(PROGRAM).exe.manifest /outputresource:$@;#1
+endif
else # PLATFORM
--- a/jdk/make/common/shared/Compiler-msvc.gmk Fri Jan 23 10:37:41 2009 -0800
+++ b/jdk/make/common/shared/Compiler-msvc.gmk Sat Jan 24 16:35:17 2009 -0800
@@ -54,17 +54,10 @@
ifeq ($(ARCH_DATA_MODEL), 32)
LINK_VER := $(shell $(LINK) | $(HEAD) -n 1 | $(NAWK) '{print $$6}')
CC_MAJORVER :=$(call MajorVersion,$(CC_VER))
- 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,17 +67,34 @@
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
+ MT = $(MSDEVTOOLS_PATH)mt
+ ifndef COMPILER_PATH
+ 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
+ MT = $(MSDEVTOOLS_PATH)mt
ifndef COMPILER_PATH
COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
endif
endif
else
+ # else ARCH_DATA_MODEL is 64
LINK_VER := $(shell $(LINK) | $(HEAD) -n 1 | $(NAWK) '{print $$6}')
CC_MAJORVER :=$(call MajorVersion,$(CC_VER))
CC_MINORVER :=$(call MinorVersion,$(CC_VER))
--- a/jdk/make/common/shared/Defs-windows.gmk Fri Jan 23 10:37:41 2009 -0800
+++ b/jdk/make/common/shared/Defs-windows.gmk Sat Jan 24 16:35:17 2009 -0800
@@ -74,7 +74,7 @@
# The ALT values should never really have spaces or use \.
# Suspect these environment variables to have spaces and/or \ characters:
# SYSTEMROOT, SystemRoot, WINDIR, windir, PROGRAMFILES, ProgramFiles,
-# DXSDK_DIR, MSTOOLS, Mstools, MSSDK, MSSdk, VC71COMNTOOLS,
+# DXSDK_DIR, MSTOOLS, Mstools, MSSDK, MSSdk, VCnnCOMNTOOLS,
# MSVCDIR, MSVCDir.
# So use $(subst \,/,) on them first adding quotes and placing them in
# their own variable assigned with :=, then use FullPath.
@@ -247,22 +247,36 @@
endif
endif
endif
- ifneq ($(subst MSDev98,OLDOLDOLD,$(_msvc_dir)),$(_msvc_dir))
- _msvc_dir :=
- endif
- # If we still don't have it, look for VS71COMNTOOLS, setup by installer?
+ # If we still don't have it, look for VSnnCOMNTOOLS (newest first),
+ # set by installer?
ifeq ($(_msvc_dir),)
+ ifdef VS90COMNTOOLS # /Common/Tools directory, use ../../Vc
+ xVS90COMNTOOLS :="$(subst \,/,$(VS90COMNTOOLS))"
+ _vs90tools :=$(call FullPath,$(xVS90COMNTOOLS))
+ endif
+ ifneq ($(_vs90tools),)
+ _msvc_dir :=$(_vs90tools)/../../Vc
+ _redist_sdk :=$(_msvc_dir)/../SDK/v3.5/Bin
+ endif
+ ifdef VS80COMNTOOLS # /Common/Tools directory, use ../../Vc
+ xVS80COMNTOOLS :="$(subst \,/,$(VS80COMNTOOLS))"
+ _vs80tools :=$(call FullPath,$(xVS80COMNTOOLS))
+ endif
+ ifneq ($(_vs80tools),)
+ _msvc_dir :=$(_vs80tools)/../../Vc
+ _redist_sdk :=$(_msvc_dir)/../SDK/v2.0/Bin
+ endif
ifdef VS71COMNTOOLS # /Common/Tools directory, use ../../Vc7
xVS71COMNTOOLS :="$(subst \,/,$(VS71COMNTOOLS))"
_vs71tools :=$(call FullPath,$(xVS71COMNTOOLS))
endif
ifneq ($(_vs71tools),)
_msvc_dir :=$(_vs71tools)/../../Vc7
+ _redist_sdk :=$(_vs71tools)/../..
endif
endif
ifneq ($(_msvc_dir),)
_compiler_bin :=$(_msvc_dir)/Bin
- _redist_sdk :=$(_msvc_dir)/../SDK/v1.1/Bin
_ms_sdk :=$(_msvc_dir)/PlatformSDK
endif
endif
@@ -410,8 +424,8 @@
else \
echo "false"; \
fi)
-_REDIST71_SDK_EXISTS := $(shell \
- if [ -f "$(_redist_sdk)/msvcr71.dll" ]; then \
+_REDISTNN_SDK_EXISTS := $(shell \
+ if [ -f "$(_redist_sdk)/$(MSVCRNN_DLL)" ]; then \
echo "true"; \
else \
echo "false"; \
@@ -435,20 +449,20 @@
MSVCRT_DLL_PATH:=$(call AltCheckSpaces,MSVCRT_DLL_PATH)
MSVCRT_DLL_PATH:=$(call AltCheckValue,MSVCRT_DLL_PATH)
- # MSVCR71_DLL_PATH: location of msvcr71.dll that will be re-distributed
- ifdef ALT_MSVCR71_DLL_PATH
- xALT_MSVCR71_DLL_PATH :="$(subst \,/,$(ALT_MSVCR71_DLL_PATH))"
- MSVCR71_DLL_PATH :=$(call FullPath,$(xALT_MSVCR71_DLL_PATH))
+ # MSVCRNN_DLL_PATH: location of msvcrnn.dll that will be re-distributed
+ ifdef ALT_MSVCRNN_DLL_PATH
+ xALT_MSVCRNN_DLL_PATH :="$(subst \,/,$(ALT_MSVCRNN_DLL_PATH))"
+ MSVCRNN_DLL_PATH :=$(call FullPath,$(xALT_MSVCRNN_DLL_PATH))
else
- ifeq ($(_REDIST71_SDK_EXISTS), true)
- xREDIST71_DIR :=$(_redist_sdk)
+ ifeq ($(_REDISTNN_SDK_EXISTS), true)
+ xREDISTNN_DIR :=$(_redist_sdk)
else
- xREDIST71_DIR :=$(_system_root)/system32
+ xREDISTNN_DIR :=$(_system_root)/system32
endif
- MSVCR71_DLL_PATH :=$(call FullPath,$(xREDIST71_DIR))
+ MSVCRNN_DLL_PATH :=$(call FullPath,$(xREDISTNN_DIR))
endif
- MSVCR71_DLL_PATH :=$(call AltCheckSpaces,MSVCR71_DLL_PATH)
- MSVCR71_DLL_PATH:=$(call AltCheckValue,MSVCR71_DLL_PATH)
+ MSVCRNN_DLL_PATH :=$(call AltCheckSpaces,MSVCRNN_DLL_PATH)
+ MSVCRNN_DLL_PATH:=$(call AltCheckValue,MSVCRNN_DLL_PATH)
else
--- a/jdk/make/common/shared/Sanity-Settings.gmk Fri Jan 23 10:37:41 2009 -0800
+++ b/jdk/make/common/shared/Sanity-Settings.gmk Sat Jan 24 16:35:17 2009 -0800
@@ -98,7 +98,7 @@
ifeq ($(PLATFORM),windows)
ALL_SETTINGS+=$(call addAltSetting,MSVCRT_DLL_PATH)
ifeq ($(ARCH_DATA_MODEL), 32)
- ALL_SETTINGS+=$(call addAltSetting,MSVCR71_DLL_PATH)
+ ALL_SETTINGS+=$(call addAltSetting,MSVCRNN_DLL_PATH)
endif
ALL_SETTINGS+=$(call addAltSetting,MSDEVTOOLS_PATH)
endif
--- a/jdk/make/common/shared/Sanity.gmk Fri Jan 23 10:37:41 2009 -0800
+++ b/jdk/make/common/shared/Sanity.gmk Sat Jan 24 16:35:17 2009 -0800
@@ -835,15 +835,13 @@
"" >> $(ERROR_FILE) ; \
fi
ifeq ($(ARCH_DATA_MODEL), 32)
- ifeq ($(COMPILER_VERSION), VS2003)
- @if [ ! -r "$(MSVCR71_DLL_PATH)/msvcr71.dll" ]; then \
- $(ECHO) "ERROR: You do not have access to msvcr71.dll. \n" \
+ @if [ ! -r "$(MSVCRNN_DLL_PATH)/$(MSVCRNN_DLL)" ]; then \
+ $(ECHO) "ERROR: You do not have access to $(MSVCRNN_DLL). \n" \
" Please check your access to \n" \
- " $(MSVCR71_DLL_PATH) \n" \
- " and/or check your value of ALT_MSVCR71_DLL_PATH. \n" \
+ " $(MSVCRNN_DLL_PATH) \n" \
+ " and/or check your value of ALT_MSVCRNN_DLL_PATH. \n" \
"" >> $(ERROR_FILE) ; \
fi
- endif
endif
endif
--- a/jdk/make/java/main/java/Makefile Fri Jan 23 10:37:41 2009 -0800
+++ b/jdk/make/java/main/java/Makefile Sat Jan 24 16:35:17 2009 -0800
@@ -28,11 +28,10 @@
PRODUCT = java
#
-# Statically link java to avoid the dependency on msvcr71.dll. This
+# Statically link java to avoid the dependency on msvcrNN.dll. This
# must be set before Defs.gmk is included.
#
MS_RUNTIME_STATIC = true
-
#
# Statically link java to avoid the dependency on jli.dll. This
# must be set before Program.gmk is included.
@@ -44,6 +43,7 @@
# Override the default version info with our own resource file (see 5106536)
ifeq ($(PLATFORM), windows)
LDLIBS_COMMON += user32.lib comctl32.lib
+
ifdef OPENJDK
RC_FLAGS += -i "$(PLATFORM_SRC)/resource/icons"
else
--- a/jdk/make/java/main/javaw/Makefile Fri Jan 23 10:37:41 2009 -0800
+++ b/jdk/make/java/main/javaw/Makefile Sat Jan 24 16:35:17 2009 -0800
@@ -32,11 +32,10 @@
PRODUCT = java
#
-# Statically link javaw to avoid the dependency on msvcr71.dll. This
+# Statically link javaw to avoid the dependency on msvcrNN.dll. This
# must be set before Defs.gmk is included.
#
MS_RUNTIME_STATIC = true
-
#
# Statically link javaw to avoid the dependency on jli.dll. This
# must be set before Program.gmk is included.
--- a/jdk/make/java/redist/Makefile Fri Jan 23 10:37:41 2009 -0800
+++ b/jdk/make/java/redist/Makefile Sat Jan 24 16:35:17 2009 -0800
@@ -109,7 +109,7 @@
$(BINDIR)/msvcrt.dll: $(MSVCRT_DLL_PATH)/msvcrt.dll
$(install-import-file)
$(CHMOD) a+x $@
-$(BINDIR)/msvcr71.dll: $(MSVCR71_DLL_PATH)/msvcr71.dll
+$(BINDIR)/$(MSVCRNN_DLL): $(MSVCRNN_DLL_PATH)/$(MSVCRNN_DLL)
$(install-import-file)
$(CHMOD) a+x $@
--- a/jdk/src/share/bin/main.c Fri Jan 23 10:37:41 2009 -0800
+++ b/jdk/src/share/bin/main.c Sat Jan 24 16:35:17 2009 -0800
@@ -32,6 +32,43 @@
#include "defines.h"
+#ifdef _MSC_VER
+#if _MSC_VER > 1400
+
+/*
+ * When building for Microsoft Windows, main has a dependency on msvcr??.dll.
+ *
+ * When using Visual Studio 2005 or later, that must be recorded in
+ * the [java,javaw].exe.manifest file.
+ *
+ * Reference:
+ * C:/Program Files/Microsoft SDKs/Windows/v6.1/include/crtdefs.h
+ */
+#include <crtassem.h>
+#ifdef _M_IX86
+
+#pragma comment(linker,"/manifestdependency:\"type='win32' " \
+ "name='" __LIBRARIES_ASSEMBLY_NAME_PREFIX ".CRT' " \
+ "version='" _CRT_ASSEMBLY_VERSION "' " \
+ "processorArchitecture='x86' " \
+ "publicKeyToken='" _VC_ASSEMBLY_PUBLICKEYTOKEN "'\"")
+
+#endif /* _M_IX86 */
+
+//This may not be necessary yet for the Windows 64-bit build, but it
+//will be when that build environment is updated. Need to test to see
+//if it is harmless:
+#ifdef _M_AMD64
+
+#pragma comment(linker,"/manifestdependency:\"type='win32' " \
+ "name='" __LIBRARIES_ASSEMBLY_NAME_PREFIX ".CRT' " \
+ "version='" _CRT_ASSEMBLY_VERSION "' " \
+ "processorArchitecture='amd64' " \
+ "publicKeyToken='" _VC_ASSEMBLY_PUBLICKEYTOKEN "'\"")
+
+#endif /* _M_AMD64 */
+#endif /* _MSC_VER > 1400 */
+#endif /* _MSC_VER */
/*
* Entry point.
--- a/jdk/src/windows/bin/java_md.c Fri Jan 23 10:37:41 2009 -0800
+++ b/jdk/src/windows/bin/java_md.c Sat Jan 24 16:35:17 2009 -0800
@@ -41,7 +41,6 @@
#define JVM_DLL "jvm.dll"
#define JAVA_DLL "java.dll"
-#define CRT_DLL "msvcr71.dll"
/*
* Prototypes.
@@ -206,7 +205,15 @@
* assumed to be present in the "JRE path" directory. If it is not found
* there (or "JRE path" fails to resolve), skip the explicit load and let
* nature take its course, which is likely to be a failure to execute.
+ *
+ * (NOTE: the above statement is only true for Visual Studio 2003 and
+ * msvcr71.dll.)
*/
+#ifdef _MSC_VER
+#if _MSC_VER < 1400
+#define CRT_DLL "msvcr71.dll"
+#endif
+#ifdef CRT_DLL
if (GetJREPath(crtpath, MAXPATHLEN)) {
(void)JLI_StrCat(crtpath, "\\bin\\" CRT_DLL); /* Add crt dll */
JLI_TraceLauncher("CRT path is %s\n", crtpath);
@@ -217,6 +224,8 @@
}
}
}
+#endif /* CRT_DLL */
+#endif /* _MSC_VER */
/* Load the Java VM DLL */
if ((handle = LoadLibrary(jvmpath)) == 0) {
--- a/langtools/.hgtags Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/.hgtags Sat Jan 24 16:35:17 2009 -0800
@@ -17,3 +17,5 @@
32e30988324601d08b87989f0821d99aa8534511 jdk7-b40
ded6b40f558e8d19b3c17715b3d67ee001606645 jdk7-b41
5e5567c2db56a931cf07768218c20903d9828b5f jdk7-b42
+e2f8f6daee9decd5721d598dacf4d0b5915651df jdk7-b43
+28f0b10d6c1afc106465c13b8c663a6afa4fb1a1 jdk7-b44
--- a/langtools/make/build.properties Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/make/build.properties Sat Jan 24 16:35:17 2009 -0800
@@ -66,7 +66,7 @@
# set the following to -version to verify the versions of javac being used
javac.version.opt =
# in time, there should be no exceptions to -Xlint:all
-javac.lint.opts = -Xlint:all,-deprecation,-fallthrough,-serial,-unchecked,-cast,-rawtypes
+javac.lint.opts = -Xlint:all,-deprecation,-fallthrough,-serial,-unchecked,-cast
# options for the <javadoc> task for javac
javadoc.jls3.url=http://java.sun.com/docs/books/jls/
--- a/langtools/src/share/classes/com/sun/source/util/Trees.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/source/util/Trees.java Sat Jan 24 16:35:17 2009 -0800
@@ -74,7 +74,7 @@
ClassLoader cl = arg.getClass().getClassLoader();
Class<?> c = Class.forName("com.sun.tools.javac.api.JavacTrees", false, cl);
argType = Class.forName(argType.getName(), false, cl);
- Method m = c.getMethod("instance", new Class[] { argType });
+ Method m = c.getMethod("instance", new Class<?>[] { argType });
return (Trees) m.invoke(null, new Object[] { arg });
} catch (Throwable e) {
throw new AssertionError(e);
--- a/langtools/src/share/classes/com/sun/tools/apt/comp/Apt.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/apt/comp/Apt.java Sat Jan 24 16:35:17 2009 -0800
@@ -281,7 +281,7 @@
// Discovery process
// List of annotation processory factory instances
- java.util.Iterator providers = null;
+ java.util.Iterator<AnnotationProcessorFactory> providers = null;
{
/*
* If a factory is provided by the user, the
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationProxyMaker.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationProxyMaker.java Sat Jan 24 16:35:17 2009 -0800
@@ -217,7 +217,7 @@
}
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "rawtypes"})
public void visitEnum(Attribute.Enum e) {
if (runtimeType.isEnum()) {
String constName = e.value.toString();
@@ -225,7 +225,7 @@
value = Enum.valueOf((Class)runtimeType, constName);
} catch (IllegalArgumentException ex) {
value = new EnumConstantNotPresentExceptionProxy(
- (Class)runtimeType, constName);
+ (Class<Enum<?>>)runtimeType, constName);
}
} else {
value = null; // indicates a type mismatch
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/Constants.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/Constants.java Sat Jan 24 16:35:17 2009 -0800
@@ -130,8 +130,8 @@
append((EnumConstantDeclarationImpl) val);
} else if (val instanceof AnnotationMirror) {
append((AnnotationMirrorImpl) val);
- } else if (val instanceof Collection) {
- append((Collection) val);
+ } else if (val instanceof Collection<?>) {
+ append((Collection<?>) val);
} else {
appendUnquoted(val.toString());
}
@@ -234,7 +234,7 @@
* and separated by ", ". Useful for array-valued annotation
* elements.
*/
- void append(Collection vals) {
+ void append(Collection<?> vals) {
buf.append('{');
boolean first = true;
for (Object val : vals) {
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java Sat Jan 24 16:35:17 2009 -0800
@@ -71,7 +71,7 @@
member.position().line() != classdoc.position().line()) {
writer.printSrcLink(member, member.name());
} else {
- bold(member.name());
+ strong(member.name());
}
writeParameters(member);
writeExceptions(member);
@@ -87,10 +87,10 @@
protected void writeSummaryLink(int context, ClassDoc cd, ProgramElementDoc member) {
ExecutableMemberDoc emd = (ExecutableMemberDoc)member;
String name = emd.name();
- writer.bold();
+ writer.strong();
writer.printDocLink(context, cd, (MemberDoc) emd,
name, false);
- writer.boldEnd();
+ writer.strongEnd();
writer.displayLength = name.length();
writeParameters(emd, false);
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java Sat Jan 24 16:35:17 2009 -0800
@@ -78,12 +78,12 @@
}
/**
- * Print the text "Index" in bold format in the navigation bar.
+ * Print the text "Index" in strong format in the navigation bar.
*/
protected void navLinkIndex() {
navCellRevStart();
fontStyle("NavBarFont1Rev");
- boldText("doclet.Index");
+ strongText("doclet.Index");
fontEnd();
navCellEnd();
}
@@ -95,14 +95,14 @@
* @param unicode Unicode for which member list information to be generated.
* @param memberlist List of members for the unicode character.
*/
- protected void generateContents(Character unicode, List memberlist) {
+ protected void generateContents(Character unicode, List<? extends Doc> memberlist) {
anchor("_" + unicode + "_");
h2();
- bold(unicode.toString());
+ strong(unicode.toString());
h2End();
dl();
for (int i = 0; i < memberlist.size(); i++) {
- Doc element = (Doc)memberlist.get(i);
+ Doc element = memberlist.get(i);
if (element instanceof MemberDoc) {
printDescription((MemberDoc)element);
} else if (element instanceof ClassDoc) {
@@ -195,14 +195,14 @@
protected void printComment(ProgramElementDoc element) {
Tag[] tags;
if (Util.isDeprecated(element)) {
- boldText("doclet.Deprecated"); space();
+ strongText("doclet.Deprecated"); space();
if ((tags = element.tags("deprecated")).length > 0)
printInlineDeprecatedComment(element, tags[0]);
} else {
ClassDoc cont = element.containingClass();
while (cont != null) {
if (Util.isDeprecated(cont)) {
- boldText("doclet.Deprecated"); space();
+ strongText("doclet.Deprecated"); space();
break;
}
cont = cont.containingClass();
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java Sat Jan 24 16:35:17 2009 -0800
@@ -98,8 +98,8 @@
writer.displayLength++;
}
- protected void bold(String str) {
- writer.bold(str);
+ protected void strong(String str) {
+ writer.strong(str);
writer.displayLength += str.length();
}
@@ -317,11 +317,11 @@
* format for listing the API. Call methods from the sub-class to complete
* the generation.
*/
- protected void printDeprecatedAPI(List deprmembers, String headingKey) {
+ protected void printDeprecatedAPI(List<Doc> deprmembers, String headingKey) {
if (deprmembers.size() > 0) {
writer.tableIndexSummary();
writer.tableHeaderStart("#CCCCFF");
- writer.boldText(headingKey);
+ writer.strongText(headingKey);
writer.tableHeaderEnd();
for (int i = 0; i < deprmembers.size(); i++) {
ProgramElementDoc member =(ProgramElementDoc)deprmembers.get(i);
@@ -363,7 +363,7 @@
if (cd != null && !(pgmdoc instanceof ConstructorDoc)
&& !(pgmdoc instanceof ClassDoc)) {
// Add class context
- writer.bold(cd.name() + ".");
+ writer.strong(cd.name() + ".");
}
writeSummaryLink(
pgmdoc instanceof ClassDoc ?
@@ -377,12 +377,12 @@
}
}
- protected void navDetailLink(List members) {
+ protected void navDetailLink(List<?> members) {
printNavDetailLink(members.size() > 0? true: false);
}
- protected void navSummaryLink(List members,
+ protected void navSummaryLink(List<?> members,
VisibleMemberMap visibleMemberMap) {
if (members.size() > 0) {
printNavSummaryLink(null, true);
@@ -390,7 +390,7 @@
} else {
ClassDoc icd = classdoc.superclass();
while (icd != null) {
- List inhmembers = visibleMemberMap.getMembersFor(icd);
+ List<?> inhmembers = visibleMemberMap.getMembersFor(icd);
if (inhmembers.size() > 0) {
printNavSummaryLink(icd, true);
return;
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java Sat Jan 24 16:35:17 2009 -0800
@@ -137,13 +137,13 @@
}
/**
- * Highlight "Overview" in the bold format, in the navigation bar as this
+ * Highlight "Overview" in the strong format, in the navigation bar as this
* is the overview page.
*/
protected void navLinkContents() {
navCellRevStart();
fontStyle("NavBarFont1Rev");
- boldText("doclet.Overview");
+ strongText("doclet.Overview");
fontEnd();
navCellEnd();
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java Sat Jan 24 16:35:17 2009 -0800
@@ -96,12 +96,12 @@
* @param list list of the sub-classes at this level.
* @param isEnum true if we are generating a tree for enums.
*/
- protected void generateLevelInfo(ClassDoc parent, List list,
+ protected void generateLevelInfo(ClassDoc parent, List<ClassDoc> list,
boolean isEnum) {
if (list.size() > 0) {
ul();
for (int i = 0; i < list.size(); i++) {
- ClassDoc local = (ClassDoc)list.get(i);
+ ClassDoc local = list.get(i);
printPartialInfo(local);
printExtendsImplements(parent, local);
generateLevelInfo(local, classtree.subs(local, isEnum),
@@ -119,9 +119,9 @@
* other classes in this run will derive from these classes.
* @param heading Heading for the tree.
*/
- protected void generateTree(List list, String heading) {
+ protected void generateTree(List<ClassDoc> list, String heading) {
if (list.size() > 0) {
- ClassDoc firstClassDoc = (ClassDoc)list.get(0);
+ ClassDoc firstClassDoc = list.get(0);
printTreeHeading(heading);
generateLevelInfo(!firstClassDoc.isInterface()? firstClassDoc : null,
list,
@@ -173,7 +173,7 @@
*/
protected void printPartialInfo(ClassDoc cd) {
li("circle");
- printPreQualifiedBoldClassLink(LinkInfoImpl.CONTEXT_TREE, cd);
+ printPreQualifiedStrongClassLink(LinkInfoImpl.CONTEXT_TREE, cd);
}
/**
@@ -193,7 +193,7 @@
protected void navLinkTree() {
navCellRevStart();
fontStyle("NavBarFont1Rev");
- boldText("doclet.Tree");
+ strongText("doclet.Tree");
fontEnd();
navCellEnd();
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java Sat Jan 24 16:35:17 2009 -0800
@@ -137,9 +137,9 @@
* @param classlist Sorted list of classes.
* @param wantFrames True if we want frames.
*/
- protected void generateContents(List classlist, boolean wantFrames) {
+ protected void generateContents(List<Doc> classlist, boolean wantFrames) {
for (int i = 0; i < classlist.size(); i++) {
- ClassDoc cd = (ClassDoc)(classlist.get(i));
+ ClassDoc cd = (ClassDoc)classlist.get(i);
if (!Util.isCoreClass(cd)) {
continue;
}
@@ -160,7 +160,7 @@
*/
protected void printAllClassesTableHeader() {
fontSizeStyle("+1", "FrameHeadingFont");
- boldText("doclet.All_Classes");
+ strongText("doclet.All_Classes");
fontEnd();
br();
table();
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java Sat Jan 24 16:35:17 2009 -0800
@@ -65,7 +65,7 @@
public void writeDefaultValueInfo(MemberDoc member) {
writer.dl();
writer.dt();
- writer.bold(ConfigurationImpl.getInstance().
+ writer.strong(ConfigurationImpl.getInstance().
getText("doclet.Default"));
writer.dd();
writer.print(((AnnotationTypeElementDoc) member).defaultValue());
@@ -84,7 +84,7 @@
* {@inheritDoc}
*/
public void printSummaryLabel(ClassDoc cd) {
- writer.boldText("doclet.Annotation_Type_Optional_Member_Summary");
+ writer.strongText("doclet.Annotation_Type_Optional_Member_Summary");
}
/**
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java Sat Jan 24 16:35:17 2009 -0800
@@ -131,7 +131,7 @@
if (configuration().linksource) {
writer.printSrcLink(member, member.name());
} else {
- bold(member.name());
+ strong(member.name());
}
writer.preEnd();
writer.dl();
@@ -183,7 +183,7 @@
* {@inheritDoc}
*/
public void printSummaryLabel(ClassDoc cd) {
- writer.boldText("doclet.Annotation_Type_Required_Member_Summary");
+ writer.strongText("doclet.Annotation_Type_Required_Member_Summary");
}
/**
@@ -210,9 +210,9 @@
* {@inheritDoc}
*/
protected void writeSummaryLink(int context, ClassDoc cd, ProgramElementDoc member) {
- writer.bold();
+ writer.strong();
writer.printDocLink(context, (MemberDoc) member, member.name(), false);
- writer.boldEnd();
+ writer.strongEnd();
}
/**
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java Sat Jan 24 16:35:17 2009 -0800
@@ -84,7 +84,7 @@
protected void navLinkClass() {
navCellRevStart();
fontStyle("NavBarFont1Rev");
- boldText("doclet.Class");
+ strongText("doclet.Class");
fontEnd();
navCellEnd();
}
@@ -176,7 +176,7 @@
if (configuration().linksource) {
printSrcLink(annotationType, name);
} else {
- bold(name);
+ strong(name);
}
dlEnd();
preEnd();
@@ -220,7 +220,7 @@
hr();
Tag[] deprs = annotationType.tags("deprecated");
if (Util.isDeprecated(annotationType)) {
- boldText("doclet.Deprecated");
+ strongText("doclet.Deprecated");
if (deprs.length > 0) {
Tag[] commentTags = deprs[0].inlineTags();
if (commentTags.length > 0) {
@@ -330,9 +330,9 @@
dl();
dt();
if (annotationType.isInterface()) {
- boldText("doclet.Enclosing_Interface");
+ strongText("doclet.Enclosing_Interface");
} else {
- boldText("doclet.Enclosing_Class");
+ strongText("doclet.Enclosing_Class");
}
dd();
printLink(new LinkInfoImpl(LinkInfoImpl.CONTEXT_CLASS, outerClass,
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Sat Jan 24 16:35:17 2009 -0800
@@ -38,7 +38,7 @@
public class ClassUseWriter extends SubWriterHolderWriter {
final ClassDoc classdoc;
- Set pkgToPackageAnnotations = null;
+ Set<PackageDoc> pkgToPackageAnnotations = null;
final Map<String,List<ProgramElementDoc>> pkgToClassTypeParameter;
final Map<String,List<ProgramElementDoc>> pkgToClassAnnotations;
final Map<String,List<ProgramElementDoc>> pkgToMethodTypeParameter;
@@ -220,8 +220,8 @@
false)));
tableHeaderEnd();
- for (Iterator it = pkgSet.iterator(); it.hasNext();) {
- PackageDoc pkg = (PackageDoc)it.next();
+ for (Iterator<PackageDoc> it = pkgSet.iterator(); it.hasNext();) {
+ PackageDoc pkg = it.next();
generatePackageUse(pkg);
}
tableEnd();
@@ -240,8 +240,8 @@
getLink(new LinkInfoImpl(LinkInfoImpl.CONTEXT_CLASS_USE_HEADER, classdoc,
false)));
tableHeaderEnd();
- for (Iterator it = pkgToPackageAnnotations.iterator(); it.hasNext();) {
- PackageDoc pkg = (PackageDoc)it.next();
+ for (Iterator<PackageDoc> it = pkgToPackageAnnotations.iterator(); it.hasNext();) {
+ PackageDoc pkg = it.next();
trBgcolorStyle("white", "TableRowColor");
summaryRow(0);
//Just want an anchor here.
@@ -259,8 +259,8 @@
}
protected void generateClassList() throws IOException {
- for (Iterator it = pkgSet.iterator(); it.hasNext();) {
- PackageDoc pkg = (PackageDoc)it.next();
+ for (Iterator<PackageDoc> it = pkgSet.iterator(); it.hasNext();) {
+ PackageDoc pkg = it.next();
anchor(pkg.name());
tableIndexSummary();
tableHeaderStart("#CCCCFF");
@@ -394,7 +394,7 @@
hr();
center();
h2();
- boldText("doclet.ClassUse_Title", cltype, clname);
+ strongText("doclet.ClassUse_Title", cltype, clname);
h2End();
centerEnd();
}
@@ -436,7 +436,7 @@
protected void navLinkClassUse() {
navCellRevStart();
fontStyle("NavBarFont1Rev");
- boldText("doclet.navClassUse");
+ strongText("doclet.navClassUse");
fontEnd();
navCellEnd();
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Sat Jan 24 16:35:17 2009 -0800
@@ -91,7 +91,7 @@
protected void navLinkClass() {
navCellRevStart();
fontStyle("NavBarFont1Rev");
- boldText("doclet.Class");
+ strongText("doclet.Class");
fontEnd();
navCellEnd();
}
@@ -185,7 +185,7 @@
if (configuration().linksource) {
printSrcLink(classDoc, name);
} else {
- bold(name);
+ strong(name);
}
if (!isInterface) {
Type superclass = Util.getFirstVisibleSuperClass(classDoc,
@@ -258,7 +258,7 @@
hr();
Tag[] deprs = classDoc.tags("deprecated");
if (Util.isDeprecated(classDoc)) {
- boldText("doclet.Deprecated");
+ strongText("doclet.Deprecated");
if (deprs.length > 0) {
Tag[] commentTags = deprs[0].inlineTags();
if (commentTags.length > 0) {
@@ -307,9 +307,9 @@
classDoc, false));
if (configuration.shouldExcludeQualifier(
classDoc.containingPackage().name())) {
- bold(type.asClassDoc().name() + typeParameters);
+ strong(type.asClassDoc().name() + typeParameters);
} else {
- bold(type.asClassDoc().qualifiedName() + typeParameters);
+ strong(type.asClassDoc().qualifiedName() + typeParameters);
}
} else {
print(getLink(new LinkInfoImpl(LinkInfoImpl.CONTEXT_CLASS_TREE_PARENT,
@@ -355,11 +355,11 @@
classDoc.qualifiedName().equals("org.omg.CORBA.Object")) {
return; // Don't generate the list, too huge
}
- List subclasses = classtree.subs(classDoc, false);
+ List<ClassDoc> subclasses = classtree.subs(classDoc, false);
if (subclasses.size() > 0) {
dl();
dt();
- boldText("doclet.Subclasses");
+ strongText("doclet.Subclasses");
writeClassLinks(LinkInfoImpl.CONTEXT_SUBCLASSES,
subclasses);
}
@@ -371,11 +371,11 @@
*/
public void writeSubInterfacesInfo() {
if (classDoc.isInterface()) {
- List subInterfaces = classtree.allSubs(classDoc, false);
+ List<ClassDoc> subInterfaces = classtree.allSubs(classDoc, false);
if (subInterfaces.size() > 0) {
dl();
dt();
- boldText("doclet.Subinterfaces");
+ strongText("doclet.Subinterfaces");
writeClassLinks(LinkInfoImpl.CONTEXT_SUBINTERFACES,
subInterfaces);
}
@@ -393,11 +393,11 @@
classDoc.qualifiedName().equals("java.io.Serializable")) {
return; // Don't generate the list, too big
}
- List implcl = classtree.implementingclasses(classDoc);
+ List<ClassDoc> implcl = classtree.implementingclasses(classDoc);
if (implcl.size() > 0) {
dl();
dt();
- boldText("doclet.Implementing_Classes");
+ strongText("doclet.Implementing_Classes");
writeClassLinks(LinkInfoImpl.CONTEXT_IMPLEMENTED_CLASSES,
implcl);
}
@@ -409,11 +409,11 @@
public void writeImplementedInterfacesInfo() {
//NOTE: we really should be using ClassDoc.interfaceTypes() here, but
// it doesn't walk up the tree like we want it to.
- List interfaceArray = Util.getAllInterfaces(classDoc, configuration);
+ List<Type> interfaceArray = Util.getAllInterfaces(classDoc, configuration);
if (classDoc.isClass() && interfaceArray.size() > 0) {
dl();
dt();
- boldText("doclet.All_Implemented_Interfaces");
+ strongText("doclet.All_Implemented_Interfaces");
writeClassLinks(LinkInfoImpl.CONTEXT_IMPLEMENTED_INTERFACES,
interfaceArray);
}
@@ -425,11 +425,11 @@
public void writeSuperInterfacesInfo() {
//NOTE: we really should be using ClassDoc.interfaceTypes() here, but
// it doesn't walk up the tree like we want it to.
- List interfaceArray = Util.getAllInterfaces(classDoc, configuration);
+ List<Type> interfaceArray = Util.getAllInterfaces(classDoc, configuration);
if (classDoc.isInterface() && interfaceArray.size() > 0) {
dl();
dt();
- boldText("doclet.All_Superinterfaces");
+ strongText("doclet.All_Superinterfaces");
writeClassLinks(LinkInfoImpl.CONTEXT_SUPER_INTERFACES,
interfaceArray);
}
@@ -438,7 +438,7 @@
/**
* Generate links to the given classes.
*/
- private void writeClassLinks(int context, List list) {
+ private void writeClassLinks(int context, List<?> list) {
Object[] typeList = list.toArray();
//Sort the list to be printed.
print(' ');
@@ -570,9 +570,9 @@
dl();
dt();
if (outerClass.isInterface()) {
- boldText("doclet.Enclosing_Interface");
+ strongText("doclet.Enclosing_Interface");
} else {
- boldText("doclet.Enclosing_Class");
+ strongText("doclet.Enclosing_Class");
}
dd();
printLink(new LinkInfoImpl(LinkInfoImpl.CONTEXT_CLASS, outerClass,
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java Sat Jan 24 16:35:17 2009 -0800
@@ -92,7 +92,7 @@
* {@inheritDoc}
*/
public void writeContentsHeader() {
- bold(configuration.getText("doclet.Contents"));
+ strong(configuration.getText("doclet.Contents"));
ul();
}
@@ -194,10 +194,10 @@
/**
* {@inheritDoc}
*/
- public void writeConstantMembers(ClassDoc cd, List fields) {
+ public void writeConstantMembers(ClassDoc cd, List<FieldDoc> fields) {
currentClassDoc = cd;
for (int i = 0; i < fields.size(); ++i) {
- writeConstantMember((FieldDoc)(fields.get(i)));
+ writeConstantMember(fields.get(i));
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java Sat Jan 24 16:35:17 2009 -0800
@@ -144,7 +144,7 @@
if (configuration().linksource) {
writer.printSrcLink(constructor, constructor.name());
} else {
- bold(constructor.name());
+ strong(constructor.name());
}
writeParameters(constructor);
writeExceptions(constructor);
@@ -220,7 +220,7 @@
}
public void printSummaryLabel(ClassDoc cd) {
- writer.boldText("doclet.Constructor_Summary");
+ writer.strongText("doclet.Constructor_Summary");
}
public void printSummaryAnchor(ClassDoc cd) {
@@ -238,7 +238,7 @@
return VisibleMemberMap.CONSTRUCTORS;
}
- protected void navSummaryLink(List members) {
+ protected void navSummaryLink(List<?> members) {
printNavSummaryLink(classdoc,
members.size() > 0? true: false);
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java Sat Jan 24 16:35:17 2009 -0800
@@ -111,7 +111,7 @@
throws IOException {
writeHeader();
- bold(configuration.getText("doclet.Contents"));
+ strong(configuration.getText("doclet.Contents"));
ul();
for (int i = 0; i < DeprecatedAPIListBuilder.NUM_TYPES; i++) {
writeIndexLink(deprapi, i);
@@ -156,7 +156,7 @@
hr();
center();
h2();
- boldText("doclet.Deprecated_API");
+ strongText("doclet.Deprecated_API");
h2End();
centerEnd();
@@ -180,7 +180,7 @@
protected void navLinkDeprecated() {
navCellRevStart();
fontStyle("NavBarFont1Rev");
- boldText("doclet.navDeprecated");
+ strongText("doclet.navDeprecated");
fontEnd();
navCellEnd();
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java Sat Jan 24 16:35:17 2009 -0800
@@ -143,7 +143,7 @@
if (configuration().linksource) {
writer.printSrcLink(enumConstant, enumConstant.name());
} else {
- bold(enumConstant.name());
+ strong(enumConstant.name());
}
writer.preEnd();
writer.dl();
@@ -201,7 +201,7 @@
}
public void printSummaryLabel(ClassDoc cd) {
- writer.boldText("doclet.Enum_Constant_Summary");
+ writer.strongText("doclet.Enum_Constant_Summary");
}
public void printSummaryAnchor(ClassDoc cd) {
@@ -216,9 +216,9 @@
}
protected void writeSummaryLink(int context, ClassDoc cd, ProgramElementDoc member) {
- writer.bold();
+ writer.strong();
writer.printDocLink(context, (MemberDoc) member, member.name(), false);
- writer.boldEnd();
+ writer.strongEnd();
}
protected void writeInheritedSummaryLink(ClassDoc cd,
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java Sat Jan 24 16:35:17 2009 -0800
@@ -153,7 +153,7 @@
if (configuration().linksource) {
writer.printSrcLink(field, field.name());
} else {
- bold(field.name());
+ strong(field.name());
}
writer.preEnd();
writer.dl();
@@ -190,7 +190,7 @@
holder.typeName() : holder.qualifiedTypeName(),
false));
writer.dd();
- writer.bold(configuration().getText(holder.isClass()?
+ writer.strong(configuration().getText(holder.isClass()?
"doclet.Description_From_Class" :
"doclet.Description_From_Interface", classlink));
writer.ddEnd();
@@ -237,7 +237,7 @@
}
public void printSummaryLabel(ClassDoc cd) {
- writer.boldText("doclet.Field_Summary");
+ writer.strongText("doclet.Field_Summary");
}
public void printSummaryAnchor(ClassDoc cd) {
@@ -251,18 +251,18 @@
public void printInheritedSummaryLabel(ClassDoc cd) {
String classlink = writer.getPreQualifiedClassLink(
LinkInfoImpl.CONTEXT_MEMBER, cd, false);
- writer.bold();
+ writer.strong();
String key = cd.isClass()?
"doclet.Fields_Inherited_From_Class" :
"doclet.Fields_Inherited_From_Interface";
writer.printText(key, classlink);
- writer.boldEnd();
+ writer.strongEnd();
}
protected void writeSummaryLink(int context, ClassDoc cd, ProgramElementDoc member) {
- writer.bold();
+ writer.strong();
writer.printDocLink(context, cd , (MemberDoc) member, member.name(), false);
- writer.boldEnd();
+ writer.strongEnd();
}
protected void writeInheritedSummaryLink(ClassDoc cd,
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java Sat Jan 24 16:35:17 2009 -0800
@@ -223,7 +223,7 @@
protected void navLinkHelp() {
navCellRevStart();
fontStyle("NavBarFont1Rev");
- boldText("doclet.Help");
+ strongText("doclet.Help");
fontEnd();
navCellEnd();
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Sat Jan 24 16:35:17 2009 -0800
@@ -183,21 +183,21 @@
* @param where Position in the file
* @param target Name of the target frame.
* @param label Tag for the link.
- * @param bold Whether the label should be bold or not?
+ * @param strong Whether the label should be strong or not?
*/
public void printNoFramesTargetHyperLink(String link, String where,
String target, String label,
- boolean bold) {
+ boolean strong) {
script();
println(" <!--");
println(" if(window==top) {");
println(" document.writeln('"
- + getHyperLink(link, where, label, bold, "", "", target) + "');");
+ + getHyperLink(link, where, label, strong, "", "", target) + "');");
println(" }");
println(" //-->");
scriptEnd();
noScript();
- println(" " + getHyperLink(link, where, label, bold, "", "", target));
+ println(" " + getHyperLink(link, where, label, strong, "", "", target));
noScriptEnd();
println(DocletConstants.NL);
}
@@ -958,10 +958,10 @@
*
* @param pkg the package to link to.
* @param label the label for the link.
- * @param isBold true if the label should be bold.
+ * @param isStrong true if the label should be strong.
*/
- public void printPackageLink(PackageDoc pkg, String label, boolean isBold) {
- print(getPackageLink(pkg, label, isBold));
+ public void printPackageLink(PackageDoc pkg, String label, boolean isStrong) {
+ print(getPackageLink(pkg, label, isStrong));
}
/**
@@ -969,12 +969,12 @@
*
* @param pkg the package to link to.
* @param label the label for the link.
- * @param isBold true if the label should be bold.
+ * @param isStrong true if the label should be strong.
* @param style the font of the package link label.
*/
- public void printPackageLink(PackageDoc pkg, String label, boolean isBold,
+ public void printPackageLink(PackageDoc pkg, String label, boolean isStrong,
String style) {
- print(getPackageLink(pkg, label, isBold, style));
+ print(getPackageLink(pkg, label, isStrong, style));
}
/**
@@ -982,12 +982,12 @@
*
* @param pkg the package to link to.
* @param label the label for the link.
- * @param isBold true if the label should be bold.
+ * @param isStrong true if the label should be strong.
* @return the link to the given package.
*/
public String getPackageLink(PackageDoc pkg, String label,
- boolean isBold) {
- return getPackageLink(pkg, label, isBold, "");
+ boolean isStrong) {
+ return getPackageLink(pkg, label, isStrong, "");
}
/**
@@ -995,11 +995,11 @@
*
* @param pkg the package to link to.
* @param label the label for the link.
- * @param isBold true if the label should be bold.
+ * @param isStrong true if the label should be strong.
* @param style the font of the package link label.
* @return the link to the given package.
*/
- public String getPackageLink(PackageDoc pkg, String label, boolean isBold,
+ public String getPackageLink(PackageDoc pkg, String label, boolean isStrong,
String style) {
boolean included = pkg != null && pkg.isIncluded();
if (! included) {
@@ -1013,11 +1013,11 @@
}
if (included || pkg == null) {
return getHyperLink(pathString(pkg, "package-summary.html"),
- "", label, isBold, style);
+ "", label, isStrong, style);
} else {
String crossPkgLink = getCrossPackageLink(Util.getPackageName(pkg));
if (crossPkgLink != null) {
- return getHyperLink(crossPkgLink, "", label, isBold, style);
+ return getHyperLink(crossPkgLink, "", label, isStrong, style);
} else {
return label;
}
@@ -1087,12 +1087,12 @@
* @param refMemName the name of the member being referenced. This should
* be null or empty string if no member is being referenced.
* @param label the label for the external link.
- * @param bold true if the link should be bold.
+ * @param strong true if the link should be strong.
* @param style the style of the link.
* @param code true if the label should be code font.
*/
public String getCrossClassLink(String qualifiedClassName, String refMemName,
- String label, boolean bold, String style,
+ String label, boolean strong, String style,
boolean code) {
String className = "",
packageName = qualifiedClassName == null ? "" : qualifiedClassName;
@@ -1113,7 +1113,7 @@
className + ".html?is-external=true"),
refMemName == null ? "" : refMemName,
label == null || label.length() == 0 ? defaultLabel : label,
- bold, style,
+ strong, style,
configuration.getText("doclet.Href_Class_Or_Interface_Title", packageName),
"");
}
@@ -1152,26 +1152,26 @@
* link label.
*
* @param cd the class to link to.
- * @param isBold true if the link should be bold.
+ * @param isStrong true if the link should be strong.
* @return the link with the package portion of the label in plain text.
*/
public String getPreQualifiedClassLink(int context,
- ClassDoc cd, boolean isBold) {
+ ClassDoc cd, boolean isStrong) {
String classlink = "";
PackageDoc pd = cd.containingPackage();
if(pd != null && ! configuration.shouldExcludeQualifier(pd.name())) {
classlink = getPkgName(cd);
}
- classlink += getLink(new LinkInfoImpl(context, cd, cd.name(), isBold));
+ classlink += getLink(new LinkInfoImpl(context, cd, cd.name(), isStrong));
return classlink;
}
/**
- * Print Class link, with only class name as the bold link and prefixing
+ * Print Class link, with only class name as the strong link and prefixing
* plain package name.
*/
- public void printPreQualifiedBoldClassLink(int context, ClassDoc cd) {
+ public void printPreQualifiedStrongClassLink(int context, ClassDoc cd) {
print(getPreQualifiedClassLink(context, cd, true));
}
@@ -1187,16 +1187,16 @@
print(configuration.getText(key, a1, a2));
}
- public void boldText(String key) {
- bold(configuration.getText(key));
+ public void strongText(String key) {
+ strong(configuration.getText(key));
}
- public void boldText(String key, String a1) {
- bold(configuration.getText(key, a1));
+ public void strongText(String key, String a1) {
+ strong(configuration.getText(key, a1));
}
- public void boldText(String key, String a1, String a2) {
- bold(configuration.getText(key, a1, a2));
+ public void strongText(String key, String a1, String a2) {
+ strong(configuration.getText(key, a1, a2));
}
/**
@@ -1205,11 +1205,11 @@
* @param context the id of the context where the link will be printed.
* @param doc the member being linked to.
* @param label the label for the link.
- * @param bold true if the link should be bold.
+ * @param strong true if the link should be strong.
*/
public void printDocLink(int context, MemberDoc doc, String label,
- boolean bold) {
- print(getDocLink(context, doc, label, bold));
+ boolean strong) {
+ print(getDocLink(context, doc, label, strong));
}
/**
@@ -1221,11 +1221,11 @@
* inheriting comments.
* @param doc the member being linked to.
* @param label the label for the link.
- * @param bold true if the link should be bold.
+ * @param strong true if the link should be strong.
*/
public void printDocLink(int context, ClassDoc classDoc, MemberDoc doc,
- String label, boolean bold) {
- print(getDocLink(context, classDoc, doc, label, bold));
+ String label, boolean strong) {
+ print(getDocLink(context, classDoc, doc, label, strong));
}
/**
@@ -1234,12 +1234,12 @@
* @param context the id of the context where the link will be printed.
* @param doc the member being linked to.
* @param label the label for the link.
- * @param bold true if the link should be bold.
+ * @param strong true if the link should be strong.
* @return the link for the given member.
*/
public String getDocLink(int context, MemberDoc doc, String label,
- boolean bold) {
- return getDocLink(context, doc.containingClass(), doc, label, bold);
+ boolean strong) {
+ return getDocLink(context, doc.containingClass(), doc, label, strong);
}
/**
@@ -1251,21 +1251,21 @@
* inheriting comments.
* @param doc the member being linked to.
* @param label the label for the link.
- * @param bold true if the link should be bold.
+ * @param strong true if the link should be strong.
* @return the link for the given member.
*/
public String getDocLink(int context, ClassDoc classDoc, MemberDoc doc,
- String label, boolean bold) {
+ String label, boolean strong) {
if (! (doc.isIncluded() ||
Util.isLinkable(classDoc, configuration()))) {
return label;
} else if (doc instanceof ExecutableMemberDoc) {
ExecutableMemberDoc emd = (ExecutableMemberDoc)doc;
return getLink(new LinkInfoImpl(context, classDoc,
- getAnchor(emd), label, bold));
+ getAnchor(emd), label, strong));
} else if (doc instanceof MemberDoc) {
return getLink(new LinkInfoImpl(context, classDoc,
- doc.name(), label, bold));
+ doc.name(), label, strong));
} else {
return label;
}
@@ -1728,13 +1728,13 @@
* @param descList the array of {@link AnnotationDesc}.
*/
private boolean writeAnnotationInfo(int indent, Doc doc, AnnotationDesc[] descList, boolean lineBreak) {
- List annotations = getAnnotations(indent, descList, lineBreak);
+ List<String> annotations = getAnnotations(indent, descList, lineBreak);
if (annotations.size() == 0) {
return false;
}
fontNoNewLine("-1");
- for (Iterator iter = annotations.iterator(); iter.hasNext();) {
- print((String) iter.next());
+ for (Iterator<String> iter = annotations.iterator(); iter.hasNext();) {
+ print(iter.next());
}
fontEnd();
return true;
@@ -1792,8 +1792,8 @@
annotationTypeValues.add(annotationValue);
}
annotation.append(annotationTypeValues.size() == 1 ? "" : "{");
- for (Iterator iter = annotationTypeValues.iterator(); iter.hasNext(); ) {
- annotation.append(annotationValueToString((AnnotationValue) iter.next()));
+ for (Iterator<AnnotationValue> iter = annotationTypeValues.iterator(); iter.hasNext(); ) {
+ annotation.append(annotationValueToString(iter.next()));
annotation.append(iter.hasNext() ? "," : "");
}
annotation.append(annotationTypeValues.size() == 1 ? "" : "}");
@@ -1820,11 +1820,11 @@
return type.typeName() + type.dimension() + ".class";
}
} else if (annotationValue.value() instanceof AnnotationDesc) {
- List list = getAnnotations(0,
+ List<String> list = getAnnotations(0,
new AnnotationDesc[]{(AnnotationDesc) annotationValue.value()},
false);
StringBuffer buf = new StringBuffer();
- for (Iterator iter = list.iterator(); iter.hasNext(); ) {
+ for (Iterator<String> iter = list.iterator(); iter.hasNext(); ) {
buf.append(iter.next());
}
return buf.toString();
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java Sat Jan 24 16:35:17 2009 -0800
@@ -51,7 +51,7 @@
super(writer, classdoc);
}
- public List members(ClassDoc cd) {
+ public List<FieldDoc> members(ClassDoc cd) {
return Util.asList(cd.serializableFields());
}
@@ -100,7 +100,7 @@
fieldType));
}
print(fieldDimensions + ' ');
- bold(fieldName);
+ strong(fieldName);
writer.preEnd();
writer.dl();
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java Sat Jan 24 16:35:17 2009 -0800
@@ -81,7 +81,7 @@
!(linkInfo.classDoc.name() + ".html").equals(m_writer.filename)) {
linkOutput.append(m_writer.getHyperLink(filename,
classLinkInfo.where, label.toString(),
- classLinkInfo.isBold, classLinkInfo.styleName,
+ classLinkInfo.isStrong, classLinkInfo.styleName,
title, classLinkInfo.target));
if (noLabel && !classLinkInfo.excludeTypeParameterLinks) {
linkOutput.append(getTypeParameterLinks(linkInfo).toString());
@@ -92,7 +92,7 @@
} else {
String crossLink = m_writer.getCrossClassLink(
classDoc.qualifiedName(), classLinkInfo.where,
- label.toString(), classLinkInfo.isBold, classLinkInfo.styleName,
+ label.toString(), classLinkInfo.isStrong, classLinkInfo.styleName,
true);
if (crossLink != null) {
linkOutput.append(crossLink);
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java Sat Jan 24 16:35:17 2009 -0800
@@ -235,15 +235,15 @@
* @param classDoc the class to link to.
* @param where the value of the marker #.
* @param label the label for the link.
- * @param isBold true if the link should be bold.
+ * @param isStrong true if the link should be strong.
* @param styleName String style of text defined in style sheet.
*/
public LinkInfoImpl (int context, ClassDoc classDoc, String where, String label,
- boolean isBold, String styleName){
+ boolean isStrong, String styleName){
this.classDoc = classDoc;
this.where = where;
this.label = label;
- this.isBold = isBold;
+ this.isStrong = isStrong;
this.styleName = styleName;
setContext(context);
}
@@ -255,14 +255,14 @@
* @param classDoc the class to link to.
* @param where the value of the marker #.
* @param label the label for the link.
- * @param isBold true if the link should be bold.
+ * @param isStrong true if the link should be strong.
*/
public LinkInfoImpl (int context, ClassDoc classDoc, String where, String label,
- boolean isBold){
+ boolean isStrong){
this.classDoc = classDoc;
this.where = where;
this.label = label;
- this.isBold = isBold;
+ this.isStrong = isStrong;
setContext(context);
}
@@ -283,12 +283,12 @@
*
* @param context the context of the link.
* @param executableMemberDoc the member to link to.
- * @param isBold true if the link should be bold.
+ * @param isStrong true if the link should be strong.
*/
public LinkInfoImpl (int context, ExecutableMemberDoc executableMemberDoc,
- boolean isBold){
+ boolean isStrong){
this.executableMemberDoc = executableMemberDoc;
- this.isBold = isBold;
+ this.isStrong = isStrong;
setContext(context);
}
@@ -297,11 +297,11 @@
*
* @param context the context of the link.
* @param classDoc the class to link to.
- * @param isBold true if the link should be bold.
+ * @param isStrong true if the link should be strong.
*/
- public LinkInfoImpl (int context, ClassDoc classDoc, boolean isBold){
+ public LinkInfoImpl (int context, ClassDoc classDoc, boolean isStrong){
this.classDoc = classDoc;
- this.isBold = isBold;
+ this.isStrong = isStrong;
setContext(context);
}
@@ -335,13 +335,13 @@
* @param context the context of the link.
* @param type the class to link to.
* @param label the label for the link.
- * @param isBold true if the link should be bold.
+ * @param isStrong true if the link should be strong.
*/
public LinkInfoImpl (int context, Type type, String label,
- boolean isBold){
+ boolean isStrong){
this.type = type;
this.label = label;
- this.isBold = isBold;
+ this.isStrong = isStrong;
setContext(context);
}
@@ -351,13 +351,13 @@
* @param context the context of the link.
* @param classDoc the class to link to.
* @param label the label for the link.
- * @param isBold true if the link should be bold.
+ * @param isStrong true if the link should be strong.
*/
public LinkInfoImpl (int context, ClassDoc classDoc, String label,
- boolean isBold){
+ boolean isStrong){
this.classDoc = classDoc;
this.label = label;
- this.isBold = isBold;
+ this.isStrong = isStrong;
setContext(context);
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java Sat Jan 24 16:35:17 2009 -0800
@@ -167,7 +167,7 @@
if (configuration().linksource) {
writer.printSrcLink(method, method.name());
} else {
- bold(method.name());
+ strong(method.name());
}
writeParameters(method);
writeExceptions(method);
@@ -210,7 +210,7 @@
holder.typeName() : holder.qualifiedTypeName(),
false));
writer.dd();
- writer.boldText(holder.asClassDoc().isClass()?
+ writer.strongText(holder.asClassDoc().isClass()?
"doclet.Description_From_Class":
"doclet.Description_From_Interface",
classlink);
@@ -259,7 +259,7 @@
}
public void printSummaryLabel(ClassDoc cd) {
- writer.boldText("doclet.Method_Summary");
+ writer.strongText("doclet.Method_Summary");
}
public void printSummaryAnchor(ClassDoc cd) {
@@ -274,12 +274,12 @@
public void printInheritedSummaryLabel(ClassDoc cd) {
String classlink = writer.getPreQualifiedClassLink(
LinkInfoImpl.CONTEXT_MEMBER, cd, false);
- writer.bold();
+ writer.strong();
String key = cd.isClass()?
"doclet.Methods_Inherited_From_Class" :
"doclet.Methods_Inherited_From_Interface";
writer.printText(key, classlink);
- writer.boldEnd();
+ writer.strongEnd();
}
protected void printSummaryType(ProgramElementDoc member) {
@@ -317,7 +317,7 @@
writer.getLink(new LinkInfoImpl(context, overriddenType)));
String name = method.name();
writer.dt();
- writer.boldText(label);
+ writer.strongText(label);
writer.dd();
String methLink = writer.codeText(
writer.getLink(
@@ -363,7 +363,7 @@
writer.getLink(new LinkInfoImpl(
LinkInfoImpl.CONTEXT_METHOD_SPECIFIED_BY, intfac)));
writer.dt();
- writer.boldText("doclet.Specified_By");
+ writer.strongText("doclet.Specified_By");
writer.dd();
methlink = writer.codeText(writer.getDocLink(
LinkInfoImpl.CONTEXT_MEMBER, implementedMeth,
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/NestedClassWriterImpl.java Sat Jan 24 16:35:17 2009 -0800
@@ -149,7 +149,7 @@
}
public void printSummaryLabel(ClassDoc cd) {
- writer.boldText("doclet.Nested_Class_Summary");
+ writer.strongText("doclet.Nested_Class_Summary");
}
public void printSummaryAnchor(ClassDoc cd) {
@@ -164,18 +164,18 @@
public void printInheritedSummaryLabel(ClassDoc cd) {
String clslink = writer.getPreQualifiedClassLink(
LinkInfoImpl.CONTEXT_MEMBER, cd, false);
- writer.bold();
+ writer.strong();
writer.printText(cd.isInterface() ?
"doclet.Nested_Classes_Interface_Inherited_From_Interface" :
"doclet.Nested_Classes_Interfaces_Inherited_From_Class",
clslink);
- writer.boldEnd();
+ writer.strongEnd();
}
protected void writeSummaryLink(int context, ClassDoc cd, ProgramElementDoc member) {
- writer.bold();
+ writer.strong();
writer.printLink(new LinkInfoImpl(context, (ClassDoc)member, false));
- writer.boldEnd();
+ writer.strongEnd();
}
protected void writeInheritedSummaryLink(ClassDoc cd,
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Sat Jan 24 16:35:17 2009 -0800
@@ -49,7 +49,7 @@
* The classes to be documented. Use this to filter out classes
* that will not be documented.
*/
- private Set documentedClasses;
+ private Set<ClassDoc> documentedClasses;
/**
* The name of the output file.
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java Sat Jan 24 16:35:17 2009 -0800
@@ -87,7 +87,7 @@
}
/**
- * Print the "-packagesheader" string in bold format, at top of the page,
+ * Print the "-packagesheader" string in strong format, at top of the page,
* if it is not the empty string. Otherwise print the "-header" string.
* Despite the name, there is actually no navigation bar for this page.
*/
@@ -95,9 +95,9 @@
printTableHeader(true);
fontSizeStyle("+1", "FrameTitleFont");
if (configuration.packagesheader.length() > 0) {
- bold(replaceDocRootDir(configuration.packagesheader));
+ strong(replaceDocRootDir(configuration.packagesheader));
} else {
- bold(replaceDocRootDir(configuration.header));
+ strong(replaceDocRootDir(configuration.header));
}
fontEnd();
printTableFooter(true);
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Sat Jan 24 16:35:17 2009 -0800
@@ -54,7 +54,7 @@
/**
* List to store the order groups as specified on the command line.
*/
- private List groupList;
+ private List<String> groupList;
/**
* Construct the PackageIndexWriter. Also constructs the grouping
@@ -102,9 +102,9 @@
if(pkg != null && pkg.name().length() > 0) {
trBgcolorStyle("white", "TableRowColor");
summaryRow(20);
- bold();
+ strong();
printPackageLink(pkg, Util.getPackageName(pkg), false);
- boldEnd();
+ strongEnd();
summaryRowEnd();
summaryRow(0);
printSummaryComment(pkg);
@@ -137,7 +137,7 @@
if (root.inlineTags().length > 0) {
printSummaryComment(root);
p();
- bold(configuration.getText("doclet.See"));
+ strong(configuration.getText("doclet.See"));
br();
printNbsps();
printHyperLink("", "overview_description",
@@ -152,7 +152,7 @@
protected void printIndexHeader(String text) {
tableIndexSummary();
tableHeaderStart("#CCCCFF");
- bold(text);
+ strong(text);
tableHeaderEnd();
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java Sat Jan 24 16:35:17 2009 -0800
@@ -144,7 +144,7 @@
protected void printLinkToMainTree() {
dl();
dt();
- boldText("doclet.Package_Hierarchies");
+ strongText("doclet.Package_Hierarchies");
dd();
navLinkMainTree(configuration.getText("doclet.All_Packages"));
dlEnd();
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java Sat Jan 24 16:35:17 2009 -0800
@@ -63,8 +63,8 @@
ClassDoc usedClass = content[i];
Set<ClassDoc> usingClasses = mapper.classToClass.get(usedClass.qualifiedName());
if (usingClasses != null) {
- for (Iterator it = usingClasses.iterator(); it.hasNext(); ) {
- ClassDoc usingClass = (ClassDoc)it.next();
+ for (Iterator<ClassDoc> it = usingClasses.iterator(); it.hasNext(); ) {
+ ClassDoc usingClass = it.next();
PackageDoc usingPackage = usingClass.containingPackage();
Set<ClassDoc> usedClasses = usingPackageToUsedClasses
.get(usingPackage.name());
@@ -136,9 +136,9 @@
printText("doclet.ClassUse_Packages.that.use.0",
getPackageLink(pkgdoc, Util.getPackageName(pkgdoc), false));
tableHeaderEnd();
- Iterator it = usingPackageToUsedClasses.keySet().iterator();
+ Iterator<String> it = usingPackageToUsedClasses.keySet().iterator();
while (it.hasNext()) {
- PackageDoc pkg = configuration.root.packageNamed((String)it.next());
+ PackageDoc pkg = configuration.root.packageNamed(it.next());
generatePackageUse(pkg);
}
tableEnd();
@@ -147,9 +147,9 @@
}
protected void generateClassList() throws IOException {
- Iterator itp = usingPackageToUsedClasses.keySet().iterator();
+ Iterator<String> itp = usingPackageToUsedClasses.keySet().iterator();
while (itp.hasNext()) {
- String packageName = (String)itp.next();
+ String packageName = itp.next();
PackageDoc usingPackage = configuration.root.packageNamed(packageName);
if (usingPackage != null) {
anchor(usingPackage.name());
@@ -160,11 +160,10 @@
getPackageLink(pkgdoc, Util.getPackageName(pkgdoc), false),
getPackageLink(usingPackage,Util.getPackageName(usingPackage), false));
tableHeaderEnd();
- Iterator itc =
- ((Collection)usingPackageToUsedClasses.get(packageName))
- .iterator();
+ Iterator<ClassDoc> itc =
+ usingPackageToUsedClasses.get(packageName).iterator();
while (itc.hasNext()) {
- printClassRow((ClassDoc)itc.next(), packageName);
+ printClassRow(itc.next(), packageName);
}
tableEnd();
space();
@@ -178,9 +177,9 @@
trBgcolorStyle("white", "TableRowColor");
summaryRow(0);
- bold();
+ strong();
printHyperLink(path, packageName, usedClass.name(), true);
- boldEnd();
+ strongEnd();
println(); br();
printNbsps();
printIndexComment(usedClass);
@@ -219,7 +218,7 @@
hr();
center();
h2();
- boldText("doclet.ClassUse_Title", packageLabel, name);
+ strongText("doclet.ClassUse_Title", packageLabel, name);
h2End();
centerEnd();
}
@@ -251,7 +250,7 @@
protected void navLinkClassUse() {
navCellRevStart();
fontStyle("NavBarFont1Rev");
- boldText("doclet.navClassUse");
+ strongText("doclet.navClassUse");
fontEnd();
navCellEnd();
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java Sat Jan 24 16:35:17 2009 -0800
@@ -123,14 +123,14 @@
}
trBgcolorStyle("white", "TableRowColor");
summaryRow(15);
- bold();
+ strong();
printLink(new LinkInfoImpl(LinkInfoImpl.CONTEXT_PACKAGE,
classes[i], false));
- boldEnd();
+ strongEnd();
summaryRowEnd();
summaryRow(0);
if (Util.isDeprecated(classes[i])) {
- boldText("doclet.Deprecated");
+ strongText("doclet.Deprecated");
if (classes[i].tags("deprecated").length > 0) {
space();
printSummaryDeprecatedComment(classes[i],
@@ -155,7 +155,7 @@
*/
protected void printFirstRow(String label) {
tableHeaderStart("#CCCCFF");
- bold(label);
+ strong(label);
tableHeaderEnd();
}
@@ -194,7 +194,7 @@
if (packageDoc.inlineTags().length > 0 && ! configuration.nocomment) {
printSummaryComment(packageDoc);
p();
- bold(configuration.getText("doclet.See"));
+ strong(configuration.getText("doclet.See"));
br();
printNbsps();
printHyperLink("", "package_description",
@@ -268,7 +268,7 @@
protected void navLinkPackage() {
navCellRevStart();
fontStyle("NavBarFont1Rev");
- boldText("doclet.Package");
+ strongText("doclet.Package");
fontEnd();
navCellEnd();
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java Sat Jan 24 16:35:17 2009 -0800
@@ -73,9 +73,9 @@
tableHeader();
thAlign("center");
font("+2");
- boldText("doclet.Package");
+ strongText("doclet.Package");
print(' ');
- bold(packageName);
+ strong(packageName);
tableFooter();
}
@@ -86,7 +86,7 @@
* @param serialUID the serial UID to print.
*/
public void writeSerialUIDInfo(String header, String serialUID) {
- bold(header + " ");
+ strong(header + " ");
println(serialUID);
p();
}
@@ -131,7 +131,7 @@
tableHeader();
thAlignColspan("left", 2);
font("+2");
- bold(className);
+ strong(className);
tableFooter();
p();
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/SubWriterHolderWriter.java Sat Jan 24 16:35:17 2009 -0800
@@ -81,7 +81,7 @@
public void printTableHeadingBackground(String str) {
tableIndexDetail();
tableHeaderStart("#CCCCFF", 1);
- bold(str);
+ strong(str);
tableHeaderEnd();
tableEnd();
}
@@ -117,7 +117,7 @@
protected void printIndexComment(Doc member, Tag[] firstSentenceTags) {
Tag[] deprs = member.tags("deprecated");
if (Util.isDeprecated((ProgramElementDoc) member)) {
- boldText("doclet.Deprecated");
+ strongText("doclet.Deprecated");
space();
if (deprs.length > 0) {
printInlineDeprecatedComment(member, deprs[0]);
@@ -126,7 +126,7 @@
} else {
ClassDoc cd = ((ProgramElementDoc)member).containingClass();
if (cd != null && Util.isDeprecated(cd)) {
- boldText("doclet.Deprecated"); space();
+ strongText("doclet.Deprecated"); space();
}
}
printSummaryComment(member, firstSentenceTags);
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java Sat Jan 24 16:35:17 2009 -0800
@@ -69,9 +69,9 @@
Tag[] deprs = doc.tags("deprecated");
if (doc instanceof ClassDoc) {
if (Util.isDeprecated((ProgramElementDoc) doc)) {
- output.append("<B>" +
+ output.append("<STRONG>" +
ConfigurationImpl.getInstance().
- getText("doclet.Deprecated") + "</B> ");
+ getText("doclet.Deprecated") + "</STRONG> ");
if (deprs.length > 0) {
Tag[] commentTags = deprs[0].inlineTags();
if (commentTags.length > 0) {
@@ -86,9 +86,9 @@
} else {
MemberDoc member = (MemberDoc) doc;
if (Util.isDeprecated((ProgramElementDoc) doc)) {
- output.append("<DD><B>" +
+ output.append("<DD><STRONG>" +
ConfigurationImpl.getInstance().
- getText("doclet.Deprecated") + "</B> ");
+ getText("doclet.Deprecated") + "</STRONG> ");
if (deprs.length > 0) {
output.append("<I>");
output.append(commentTagsToOutput(null, doc,
@@ -101,9 +101,9 @@
}
} else {
if (Util.isDeprecated(member.containingClass())) {
- output.append("<DD><B>" +
+ output.append("<DD><STRONG>" +
ConfigurationImpl.getInstance().
- getText("doclet.Deprecated") + "</B> ");
+ getText("doclet.Deprecated") + "</STRONG> ");
}
}
}
@@ -123,7 +123,7 @@
public TagletOutput getParamHeader(String header) {
StringBuffer result = new StringBuffer();
result.append("<DT>");
- result.append("<B>" + header + "</B>");
+ result.append("<STRONG>" + header + "</STRONG>");
return new TagletOutputImpl(result.toString());
}
@@ -141,8 +141,8 @@
*/
public TagletOutput returnTagOutput(Tag returnTag) {
TagletOutput result = new TagletOutputImpl(DocletConstants.NL + "<DT>" +
- "<B>" + htmlWriter.configuration.getText("doclet.Returns") +
- "</B>" + "<DD>" +
+ "<STRONG>" + htmlWriter.configuration.getText("doclet.Returns") +
+ "</STRONG>" + "<DD>" +
htmlWriter.commentTagsToString(returnTag, null, returnTag.inlineTags(),
false));
return result;
@@ -189,7 +189,7 @@
if (result != null && result.length() > 0) {
return result + ", " + DocletConstants.NL;
} else {
- return "<DT><B>" + htmlWriter.configuration().getText("doclet.See_Also") + "</B><DD>";
+ return "<DT><STRONG>" + htmlWriter.configuration().getText("doclet.See_Also") + "</STRONG><DD>";
}
}
@@ -197,7 +197,7 @@
* {@inheritDoc}
*/
public TagletOutput simpleTagOutput(Tag[] simpleTags, String header) {
- String result = "<DT><B>" + header + "</B></DT>" + DocletConstants.NL +
+ String result = "<DT><STRONG>" + header + "</STRONG></DT>" + DocletConstants.NL +
" <DD>";
for (int i = 0; i < simpleTags.length; i++) {
if (i > 0) {
@@ -212,7 +212,7 @@
* {@inheritDoc}
*/
public TagletOutput simpleTagOutput(Tag simpleTag, String header) {
- return new TagletOutputImpl("<DT><B>" + header + "</B></DT>" + " <DD>"
+ return new TagletOutputImpl("<DT><STRONG>" + header + "</STRONG></DT>" + " <DD>"
+ htmlWriter.commentTagsToString(simpleTag, null, simpleTag.inlineTags(), false)
+ "</DD>" + DocletConstants.NL);
}
@@ -221,8 +221,8 @@
* {@inheritDoc}
*/
public TagletOutput getThrowsHeader() {
- return new TagletOutputImpl(DocletConstants.NL + "<DT>" + "<B>" +
- htmlWriter.configuration().getText("doclet.Throws") + "</B>");
+ return new TagletOutputImpl(DocletConstants.NL + "<DT>" + "<STRONG>" +
+ htmlWriter.configuration().getText("doclet.Throws") + "</STRONG>");
}
/**
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java Sat Jan 24 16:35:17 2009 -0800
@@ -119,7 +119,7 @@
if (!classesonly) {
dl();
dt();
- boldText("doclet.Package_Hierarchies");
+ strongText("doclet.Package_Hierarchies");
dd();
for (int i = 0; i < packages.length; i++) {
if (packages[i].name().length() == 0) {
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java Sat Jan 24 16:35:17 2009 -0800
@@ -83,11 +83,11 @@
* @param where Position of the link in the file. Character '#' is not
* needed.
* @param label Tag for the link.
- * @param bold Boolean that sets label to bold.
+ * @param strong Boolean that sets label to strong.
*/
public void printHyperLink(String link, String where,
- String label, boolean bold) {
- print(getHyperLink(link, where, label, bold, "", "", ""));
+ String label, boolean strong) {
+ print(getHyperLink(link, where, label, strong, "", "", ""));
}
/**
@@ -109,13 +109,13 @@
* @param where Position of the link in the file. Character '#' is not
* needed.
* @param label Tag for the link.
- * @param bold Boolean that sets label to bold.
+ * @param strong Boolean that sets label to strong.
* @param stylename String style of text defined in style sheet.
*/
public void printHyperLink(String link, String where,
- String label, boolean bold,
+ String label, boolean strong,
String stylename) {
- print(getHyperLink(link, where, label, bold, stylename, "", ""));
+ print(getHyperLink(link, where, label, strong, stylename, "", ""));
}
/**
@@ -125,12 +125,12 @@
* @param where Position of the link in the file. Character '#' is not
* needed.
* @param label Tag for the link.
- * @param bold Boolean that sets label to bold.
+ * @param strong Boolean that sets label to strong.
* @return String Hyper Link.
*/
public String getHyperLink(String link, String where,
- String label, boolean bold) {
- return getHyperLink(link, where, label, bold, "", "", "");
+ String label, boolean strong) {
+ return getHyperLink(link, where, label, strong, "", "", "");
}
/**
@@ -140,14 +140,14 @@
* @param where Position of the link in the file. Character '#' is not
* needed.
* @param label Tag for the link.
- * @param bold Boolean that sets label to bold.
+ * @param strong Boolean that sets label to strong.
* @param stylename String style of text defined in style sheet.
* @return String Hyper Link.
*/
public String getHyperLink(String link, String where,
- String label, boolean bold,
+ String label, boolean strong,
String stylename) {
- return getHyperLink(link, where, label, bold, stylename, "", "");
+ return getHyperLink(link, where, label, strong, stylename, "", "");
}
/**
@@ -157,14 +157,14 @@
* @param where Position of the link in the file. Character '#' is not
* needed.
* @param label Tag for the link.
- * @param bold Boolean that sets label to bold.
+ * @param strong Boolean that sets label to strong.
* @param stylename String style of text defined in style sheet.
* @param title String that describes the link's content for accessibility.
* @param target Target frame.
* @return String Hyper Link.
*/
public String getHyperLink(String link, String where,
- String label, boolean bold,
+ String label, boolean strong,
String stylename, String title, String target) {
StringBuffer retlink = new StringBuffer();
retlink.append("<A HREF=\"");
@@ -186,12 +186,12 @@
retlink.append(stylename);
retlink.append("\">");
}
- if (bold) {
- retlink.append("<B>");
+ if (strong) {
+ retlink.append("<STRONG>");
}
retlink.append(label);
- if (bold) {
- retlink.append("</B>");
+ if (strong) {
+ retlink.append("</STRONG>");
}
if (stylename != null && stylename.length() != 0) {
retlink.append("</FONT>");
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Sat Jan 24 16:35:17 2009 -0800
@@ -433,46 +433,46 @@
}
/**
- * Get the "<B>" string.
+ * Get the "<STRONG>" string.
*
- * @return String Return String "<B>";
+ * @return String Return String "<STRONG>";
*/
- public String getBold() {
- return "<B>";
+ public String getStrong() {
+ return "<STRONG>";
}
/**
- * Get the "</B>" string.
+ * Get the "</STRONG>" string.
*
- * @return String Return String "</B>";
+ * @return String Return String "</STRONG>";
*/
- public String getBoldEnd() {
- return "</B>";
+ public String getStrongEnd() {
+ return "</STRONG>";
}
/**
- * Print <B> tag.
+ * Print <STRONG> tag.
*/
- public void bold() {
- print("<B>");
+ public void strong() {
+ print("<STRONG>");
}
/**
- * Print </B> tag.
+ * Print </STRONG> tag.
*/
- public void boldEnd() {
- print("</B>");
+ public void strongEnd() {
+ print("</STRONG>");
}
/**
- * Print text passed, in bold format using <B> and </B> tags.
+ * Print text passed, in strong format using <STRONG> and </STRONG> tags.
*
- * @param text String to be printed in between <B> and </B> tags.
+ * @param text String to be printed in between <STRONG> and </STRONG> tags.
*/
- public void bold(String text) {
- bold();
+ public void strong(String text) {
+ strong();
print(text);
- boldEnd();
+ strongEnd();
}
/**
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Sat Jan 24 16:35:17 2009 -0800
@@ -441,13 +441,13 @@
* @param customTagStrs the set two dimentional arrays of strings. These arrays contain
* either -tag or -taglet arguments.
*/
- private void initTagletManager(Set customTagStrs) {
+ private void initTagletManager(Set<String[]> customTagStrs) {
tagletManager = tagletManager == null ?
new TagletManager(nosince, showversion, showauthor, message) :
tagletManager;
String[] args;
- for (Iterator it = customTagStrs.iterator(); it.hasNext(); ) {
- args = (String[]) it.next();
+ for (Iterator<String[]> it = customTagStrs.iterator(); it.hasNext(); ) {
+ args = it.next();
if (args[0].equals("-taglet")) {
tagletManager.addCustomTag(args[1], tagletpath);
continue;
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java Sat Jan 24 16:35:17 2009 -0800
@@ -103,7 +103,7 @@
* @param cd the class whose constants are being documented.
* @param fields the constants being documented.
*/
- public abstract void writeConstantMembers(ClassDoc cd, List fields);
+ public abstract void writeConstantMembers(ClassDoc cd, List<FieldDoc> fields);
/**
* Document the given constants.
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java Sat Jan 24 16:35:17 2009 -0800
@@ -97,22 +97,22 @@
* @param elements the XML elements that specify which components to
* document.
*/
- protected void build(List elements) {
+ protected void build(List<?> elements) {
for (int i = 0; i < elements.size(); i++ ) {
Object element = elements.get(i);
String component = (String)
((element instanceof String) ?
element :
- ((List) element).get(0));
+ ((List<?>) element).get(0));
try {
invokeMethod("build" + component,
element instanceof String ?
- new Class[] {} :
- new Class[] {List.class},
+ new Class<?>[] {} :
+ new Class<?>[] {List.class},
element instanceof String ?
new Object[] {} :
- new Object[] {((List) element).subList(1,
- ((List) element).size())});
+ new Object[] {((List<?>) element).subList(1,
+ ((List<?>) element).size())});
} catch (NoSuchMethodException e) {
e.printStackTrace();
configuration.root.printError("Unknown element: " + component);
@@ -138,7 +138,7 @@
* @param paramClasses the types for each parameter.
* @param params the parameters of the method.
*/
- protected abstract void invokeMethod(String methodName, Class[] paramClasses,
+ protected abstract void invokeMethod(String methodName, Class<?>[] paramClasses,
Object[] params)
throws Exception;
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java Sat Jan 24 16:35:17 2009 -0800
@@ -69,7 +69,7 @@
*
* @param elements {@inheritDoc}
*/
- public void build(List elements) {
+ public void build(List<?> elements) {
if (hasMembersToDocument()) {
super.build(elements);
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java Sat Jan 24 16:35:17 2009 -0800
@@ -92,7 +92,7 @@
/**
* {@inheritDoc}
*/
- public void invokeMethod(String methodName, Class[] paramClasses,
+ public void invokeMethod(String methodName, Class<?>[] paramClasses,
Object[] params)
throws Exception {
if (DEBUG) {
@@ -122,7 +122,7 @@
*
* @param elements the XML elements that specify how to document a class.
*/
- public void buildAnnotationTypeDoc(List elements) throws Exception {
+ public void buildAnnotationTypeDoc(List<?> elements) throws Exception {
build(elements);
writer.close();
copyDocFiles();
@@ -197,7 +197,7 @@
* @param elements the XML elements that specify how a member summary is
* documented.
*/
- public void buildMemberSummary(List elements) throws Exception {
+ public void buildMemberSummary(List<?> elements) throws Exception {
configuration.getBuilderFactory().
getMemberSummaryBuilder(writer).build(elements);
writer.completeMemberSummaryBuild();
@@ -209,7 +209,7 @@
* @param elements the XML elements that specify how a annotation type
* members are documented.
*/
- public void buildAnnotationTypeOptionalMemberDetails(List elements)
+ public void buildAnnotationTypeOptionalMemberDetails(List<?> elements)
throws Exception {
configuration.getBuilderFactory().
getAnnotationTypeOptionalMemberBuilder(writer).build(elements);
@@ -221,7 +221,7 @@
* @param elements the XML elements that specify how a annotation type
* members are documented.
*/
- public void buildAnnotationTypeRequiredMemberDetails(List elements)
+ public void buildAnnotationTypeRequiredMemberDetails(List<?> elements)
throws Exception {
configuration.getBuilderFactory().
getAnnotationTypeRequiredMemberBuilder(writer).build(elements);
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java Sat Jan 24 16:35:17 2009 -0800
@@ -95,7 +95,7 @@
* @param elements the XML elements that specify how to construct this
* documentation.
*/
- public void buildAnnotationTypeOptionalMember(List elements) {
+ public void buildAnnotationTypeOptionalMember(List<?> elements) {
if (writer == null) {
return;
}
@@ -108,7 +108,7 @@
/**
* {@inheritDoc}
*/
- public void invokeMethod(String methodName, Class[] paramClasses,
+ public void invokeMethod(String methodName, Class<?>[] paramClasses,
Object[] params)
throws Exception {
if (DEBUG) {
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java Sat Jan 24 16:35:17 2009 -0800
@@ -116,7 +116,7 @@
/**
* {@inheritDoc}
*/
- public void invokeMethod(String methodName, Class[] paramClasses,
+ public void invokeMethod(String methodName, Class<?>[] paramClasses,
Object[] params)
throws Exception {
if (DEBUG) {
@@ -135,7 +135,7 @@
* @param classDoc the {@link ClassDoc} we want to check.
* @return a list of members that will be documented.
*/
- public List members(ClassDoc classDoc) {
+ public List<ProgramElementDoc> members(ClassDoc classDoc) {
return visibleMemberMap.getMembersFor(classDoc);
}
@@ -161,7 +161,7 @@
* @param elements the XML elements that specify how to construct this
* documentation.
*/
- public void buildAnnotationTypeRequiredMember(List elements) {
+ public void buildAnnotationTypeRequiredMember(List<?> elements) {
if (writer == null) {
return;
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java Sat Jan 24 16:35:17 2009 -0800
@@ -108,7 +108,7 @@
/**
* {@inheritDoc}
*/
- public void invokeMethod(String methodName, Class[] paramClasses,
+ public void invokeMethod(String methodName, Class<?>[] paramClasses,
Object[] params)
throws Exception {
if (DEBUG) {
@@ -138,7 +138,7 @@
*
* @param elements the XML elements that specify how to document a class.
*/
- public void buildClassDoc(List elements) throws Exception {
+ public void buildClassDoc(List<?> elements) throws Exception {
build(elements);
writer.close();
copyDocFiles();
@@ -293,7 +293,7 @@
* @param elements the XML elements that specify how a member summary is
* documented.
*/
- public void buildMemberSummary(List elements) throws Exception {
+ public void buildMemberSummary(List<?> elements) throws Exception {
configuration.getBuilderFactory().
getMemberSummaryBuilder(writer).build(elements);
writer.completeMemberSummaryBuild();
@@ -305,7 +305,7 @@
* @param elements the XML elements that specify how a enum constants are
* documented.
*/
- public void buildEnumConstantsDetails(List elements) throws Exception {
+ public void buildEnumConstantsDetails(List<?> elements) throws Exception {
configuration.getBuilderFactory().
getEnumConstantsBuilder(writer).build(elements);
}
@@ -315,7 +315,7 @@
*
* @param elements the XML elements that specify how a field is documented.
*/
- public void buildFieldDetails(List elements) throws Exception {
+ public void buildFieldDetails(List<?> elements) throws Exception {
configuration.getBuilderFactory().
getFieldBuilder(writer).build(elements);
}
@@ -326,7 +326,7 @@
* @param elements the XML elements that specify how to document a
* constructor.
*/
- public void buildConstructorDetails(List elements) throws Exception {
+ public void buildConstructorDetails(List<?> elements) throws Exception {
configuration.getBuilderFactory().
getConstructorBuilder(writer).build(elements);
}
@@ -336,7 +336,7 @@
*
* @param elements the XML elements that specify how a method is documented.
*/
- public void buildMethodDetails(List elements) throws Exception {
+ public void buildMethodDetails(List<?> elements) throws Exception {
configuration.getBuilderFactory().
getMethodBuilder(writer).build(elements);
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java Sat Jan 24 16:35:17 2009 -0800
@@ -109,7 +109,7 @@
/**
* {@inheritDoc}
*/
- public void invokeMethod(String methodName, Class[] paramClasses,
+ public void invokeMethod(String methodName, Class<?>[] paramClasses,
Object[] params)
throws Exception {
if (DEBUG) {
@@ -144,7 +144,7 @@
* @param elements the list of elements describing constant summary
* documentation.
*/
- public void buildConstantSummary(List elements) throws Exception {
+ public void buildConstantSummary(List<?> elements) throws Exception {
build(elements);
writer.close();
}
@@ -186,7 +186,7 @@
* @param elements the XML elements that represent the components
* of documentation for each package.
*/
- public void buildConstantSummaries(List elements) {
+ public void buildConstantSummaries(List<?> elements) {
PackageDoc[] packages = configuration.packages;
printedPackageHeaders = new HashSet<String>();
for (int i = 0; i < packages.length; i++) {
@@ -204,7 +204,7 @@
* @param elements the list of XML elements that make up package
* documentation.
*/
- public void buildPackageConstantSummary(List elements) {
+ public void buildPackageConstantSummary(List<?> elements) {
build(elements);
}
@@ -214,7 +214,7 @@
* @param elements the list of XML elements that make up the class
* constant summary.
*/
- public void buildClassConstantSummary(List elements) {
+ public void buildClassConstantSummary(List<?> elements) {
ClassDoc[] classes = currentPackage.name().length() > 0 ?
currentPackage.allClasses() :
configuration.classDocCatalog.allClasses(
@@ -297,8 +297,8 @@
private boolean hasConstantField (ClassDoc classDoc) {
VisibleMemberMap visibleMemberMapFields = new VisibleMemberMap(classDoc,
VisibleMemberMap.FIELDS, configuration.nodeprecated);
- List fields = visibleMemberMapFields.getLeafClassMembers(configuration);
- for (Iterator iter = fields.iterator(); iter.hasNext(); ) {
+ List<?> fields = visibleMemberMapFields.getLeafClassMembers(configuration);
+ for (Iterator<?> iter = fields.iterator(); iter.hasNext(); ) {
FieldDoc field = (FieldDoc) iter.next();
if (field.constantValueExpression() != null) {
classDocsWithConstFields.add(classDoc);
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java Sat Jan 24 16:35:17 2009 -0800
@@ -138,7 +138,7 @@
*/
public void invokeMethod(
String methodName,
- Class[] paramClasses,
+ Class<?>[] paramClasses,
Object[] params)
throws Exception {
if (DEBUG) {
@@ -156,7 +156,7 @@
*
* @return a list of constructors that will be documented.
*/
- public List members(ClassDoc classDoc) {
+ public List<ProgramElementDoc> members(ClassDoc classDoc) {
return visibleMemberMap.getMembersFor(classDoc);
}
@@ -175,7 +175,7 @@
* @param elements the XML elements that specify how to construct this
* documentation.
*/
- public void buildConstructorDoc(List elements) {
+ public void buildConstructorDoc(List<?> elements) {
if (writer == null) {
return;
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java Sat Jan 24 16:35:17 2009 -0800
@@ -120,7 +120,7 @@
*/
public void invokeMethod(
String methodName,
- Class[] paramClasses,
+ Class<?>[] paramClasses,
Object[] params)
throws Exception {
if (DEBUG) {
@@ -139,7 +139,7 @@
* @param classDoc the {@link ClassDoc} we want to check.
* @return a list of enum constants that will be documented.
*/
- public List members(ClassDoc classDoc) {
+ public List<ProgramElementDoc> members(ClassDoc classDoc) {
return visibleMemberMap.getMembersFor(classDoc);
}
@@ -165,7 +165,7 @@
* @param elements the XML elements that specify how to construct this
* documentation.
*/
- public void buildEnumConstant(List elements) {
+ public void buildEnumConstant(List<?> elements) {
if (writer == null) {
return;
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java Sat Jan 24 16:35:17 2009 -0800
@@ -121,7 +121,7 @@
*/
public void invokeMethod(
String methodName,
- Class[] paramClasses,
+ Class<?>[] paramClasses,
Object[] params)
throws Exception {
if (DEBUG) {
@@ -140,7 +140,7 @@
* @param classDoc the {@link ClassDoc} we want to check.
* @return a list of fields that will be documented.
*/
- public List members(ClassDoc classDoc) {
+ public List<ProgramElementDoc> members(ClassDoc classDoc) {
return visibleMemberMap.getMembersFor(classDoc);
}
@@ -166,7 +166,7 @@
* @param elements the XML elements that specify how to construct this
* documentation.
*/
- public void buildFieldDoc(List elements) {
+ public void buildFieldDoc(List<?> elements) {
if (writer == null) {
return;
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java Sat Jan 24 16:35:17 2009 -0800
@@ -78,9 +78,9 @@
*
* @return List the list of XML elements parsed.
*/
- public List parseXML(String root) {
+ public List<?> parseXML(String root) {
if (xmlElementsMap.containsKey(root)) {
- return (List) xmlElementsMap.get(root);
+ return xmlElementsMap.get(root);
}
try {
List<Object> xmlElements = new ArrayList<Object>();
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java Sat Jan 24 16:35:17 2009 -0800
@@ -170,7 +170,7 @@
* @return a list of methods that will be documented.
* @see VisibleMemberMap
*/
- public List members(int type) {
+ public List<ProgramElementDoc> members(int type) {
return visibleMemberMaps[type].getLeafClassMembers(configuration);
}
@@ -179,7 +179,7 @@
*/
public void invokeMethod(
String methodName,
- Class[] paramClasses,
+ Class<?>[] paramClasses,
Object[] params)
throws Exception {
if (DEBUG) {
@@ -339,9 +339,9 @@
*/
private void buildInheritedSummary(MemberSummaryWriter writer,
VisibleMemberMap visibleMemberMap) {
- for (Iterator iter = visibleMemberMap.getVisibleClassesList().iterator();
+ for (Iterator<ClassDoc> iter = visibleMemberMap.getVisibleClassesList().iterator();
iter.hasNext();) {
- ClassDoc inhclass = (ClassDoc) (iter.next());
+ ClassDoc inhclass = iter.next();
if (! (inhclass.isPublic() ||
Util.isLinkable(inhclass, configuration))) {
continue;
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java Sat Jan 24 16:35:17 2009 -0800
@@ -116,7 +116,7 @@
*/
public void invokeMethod(
String methodName,
- Class[] paramClasses,
+ Class<?>[] paramClasses,
Object[] params)
throws Exception {
if (DEBUG) {
@@ -135,7 +135,7 @@
* @param classDoc the {@link ClassDoc} we want to check.
* @return a list of methods that will be documented.
*/
- public List members(ClassDoc classDoc) {
+ public List<ProgramElementDoc> members(ClassDoc classDoc) {
return visibleMemberMap.getMembersFor(classDoc);
}
@@ -158,7 +158,7 @@
/**
* Build the method documentation.
*/
- public void buildMethodDoc(List elements) {
+ public void buildMethodDoc(List<?> elements) {
if (writer == null) {
return;
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java Sat Jan 24 16:35:17 2009 -0800
@@ -88,7 +88,7 @@
*/
public void invokeMethod(
String methodName,
- Class[] paramClasses,
+ Class<?>[] paramClasses,
Object[] params)
throws Exception {
if (DEBUG) {
@@ -120,7 +120,7 @@
/**
* Build the package documentation.
*/
- public void buildPackageDoc(List elements) throws Exception {
+ public void buildPackageDoc(List<?> elements) throws Exception {
build(elements);
packageWriter.close();
Util.copyDocFiles(
@@ -162,7 +162,7 @@
/**
* Build the package summary.
*/
- public void buildSummary(List elements) {
+ public void buildSummary(List<?> elements) {
build(elements);
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java Sat Jan 24 16:35:17 2009 -0800
@@ -130,7 +130,7 @@
/**
* Build the serialized form.
*/
- public void buildSerializedForm(List elements) throws Exception {
+ public void buildSerializedForm(List<?> elements) throws Exception {
build(elements);
writer.close();
}
@@ -138,7 +138,7 @@
/**
* {@inheritDoc}
*/
- public void invokeMethod(String methodName, Class[] paramClasses,
+ public void invokeMethod(String methodName, Class<?>[] paramClasses,
Object[] params)
throws Exception {
if (DEBUG) {
@@ -159,7 +159,7 @@
/**
* Build the contents.
*/
- public void buildSerializedFormSummaries(List elements) {
+ public void buildSerializedFormSummaries(List<?> elements) {
PackageDoc[] packages = configuration.packages;
for (int i = 0; i < packages.length; i++) {
currentPackage = packages[i];
@@ -170,7 +170,7 @@
/**
* Build the package serialized for for the current package being processed.
*/
- public void buildPackageSerializedForm(List elements) {
+ public void buildPackageSerializedForm(List<?> elements) {
String foo = currentPackage.name();
ClassDoc[] classes = currentPackage.allClasses(false);
if (classes == null || classes.length == 0) {
@@ -189,7 +189,7 @@
writer.writePackageHeader(Util.getPackageName(currentPackage));
}
- public void buildClassSerializedForm(List elements) {
+ public void buildClassSerializedForm(List<?> elements) {
ClassDoc[] classes = currentPackage.allClasses(false);
Arrays.sort(classes);
for (int j = 0; j < classes.length; j++) {
@@ -368,7 +368,7 @@
/**
* build the information for the method.
*/
- public void buildMethodInfo(List elements) {
+ public void buildMethodInfo(List<?> elements) {
if(configuration.nocomment){
return;
}
@@ -478,7 +478,7 @@
* Build the summaries for the methods that belong to the given
* class.
*/
- public void buildSerializableMethods(List elements) {
+ public void buildSerializableMethods(List<?> elements) {
MemberDoc[] members = currentClass.serializationMethods();
if (members.length > 0) {
for (int i = 0; i < members.length; i++) {
@@ -492,7 +492,7 @@
* Build the summaries for the fields that belong to the given
* class.
*/
- public void buildSerializableFields(List elements) {
+ public void buildSerializableFields(List<?> elements) {
MemberDoc[] members = currentClass.serializableFields();
if (members.length > 0) {
for (int i = 0; i < members.length; i++) {
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java Sat Jan 24 16:35:17 2009 -0800
@@ -100,7 +100,7 @@
}
ParamTag[] tags = input.isTypeVariableParamTag ?
input.method.typeParamTags() : input.method.paramTags();
- Map rankMap = getRankMap(input.isTypeVariableParamTag ?
+ Map<String, String> rankMap = getRankMap(input.isTypeVariableParamTag ?
(Object[]) input.method.typeParameters() :
(Object[]) input.method.parameters());
for (int i = 0; i < tags.length; i++) {
@@ -262,7 +262,7 @@
* @return the TagletOutput representation of this <code>Tag</code>.
*/
private TagletOutput processParamTags(boolean isNonTypeParams,
- ParamTag[] paramTags, Map rankMap, TagletWriter writer,
+ ParamTag[] paramTags, Map<String, String> rankMap, TagletWriter writer,
Set<String> alreadyDocumented) {
TagletOutput result = writer.getOutputInstance();
if (paramTags.length > 0) {
@@ -277,7 +277,7 @@
"doclet.Type_Parameters_warn",
paramName);
}
- String rank = (String) rankMap.get(pt.parameterName());
+ String rank = rankMap.get(pt.parameterName());
if (rank != null && alreadyDocumented.contains(rank)) {
writer.getMsgRetriever().warning(pt.position(),
isNonTypeParams ?
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java Sat Jan 24 16:35:17 2009 -0800
@@ -212,7 +212,7 @@
URLClassLoader appClassLoader = new URLClassLoader(pathToURLs(cpString));
customTagClass = appClassLoader.loadClass(classname);
Method meth = customTagClass.getMethod("register",
- new Class[] {Class.forName("java.util.Map")});
+ new Class<?>[] {java.util.Map.class});
Object[] list = customTags.values().toArray();
Taglet lastTag = (list != null && list.length > 0)
? (Taglet) list[list.length-1] : null;
@@ -705,9 +705,9 @@
* Initialize lowercase version of standard Javadoc tags.
*/
private void initStandardTagsLowercase() {
- Iterator it = standardTags.iterator();
+ Iterator<String> it = standardTags.iterator();
while (it.hasNext()) {
- standardTagsLowercase.add(((String)it.next()).toLowerCase());
+ standardTagsLowercase.add(it.next().toLowerCase());
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java Sat Jan 24 16:35:17 2009 -0800
@@ -177,9 +177,9 @@
bases.add(cd);
}
}
- List intfacs = Util.getAllInterfaces(cd, configuration);
- for (Iterator iter = intfacs.iterator(); iter.hasNext();) {
- add(implementingclasses, ((Type) iter.next()).asClassDoc(), cd);
+ List<Type> intfacs = Util.getAllInterfaces(cd, configuration);
+ for (Iterator<Type> iter = intfacs.iterator(); iter.hasNext();) {
+ add(implementingclasses, iter.next().asClassDoc(), cd);
}
}
@@ -278,13 +278,13 @@
//If class x implements a subinterface of cd, then it follows
//that class x implements cd.
- Iterator implementingClassesIter, subInterfacesIter = subinterfaces.listIterator();
+ Iterator<ClassDoc> implementingClassesIter, subInterfacesIter = subinterfaces.listIterator();
ClassDoc c;
while(subInterfacesIter.hasNext()){
- implementingClassesIter = implementingclasses((ClassDoc)
+ implementingClassesIter = implementingclasses(
subInterfacesIter.next()).listIterator();
while(implementingClassesIter.hasNext()){
- c = (ClassDoc)implementingClassesIter.next();
+ c = implementingClassesIter.next();
if(! result.contains(c)){
result.add(c);
}
@@ -328,9 +328,9 @@
List<ClassDoc> list = subs(cd, isEnum);
for (int i = 0; i < list.size(); i++) {
cd = list.get(i);
- List tlist = subs(cd, isEnum);
+ List<ClassDoc> tlist = subs(cd, isEnum);
for (int j = 0; j < tlist.size(); j++) {
- ClassDoc tcd = (ClassDoc)tlist.get(j);
+ ClassDoc tcd = tlist.get(j);
if (!list.contains(tcd)) {
list.add(tcd);
}
@@ -345,7 +345,7 @@
* thw classdoc for java.lang.Object, since this is the base class for all
* classes.
*/
- public List baseclasses() {
+ public List<ClassDoc> baseclasses() {
return baseclasses;
}
@@ -353,7 +353,7 @@
* Return the list of base interfaces. This is the list of interfaces
* which do not have super-interface.
*/
- public List baseinterfaces() {
+ public List<ClassDoc> baseinterfaces() {
return baseinterfaces;
}
@@ -361,7 +361,7 @@
* Return the list of base enums. This is the list of enums
* which do not have super-enums.
*/
- public List baseEnums() {
+ public List<ClassDoc> baseEnums() {
return baseEnums;
}
@@ -369,7 +369,7 @@
* Return the list of base annotation types. This is the list of
* annotation types which do not have super-annotation types.
*/
- public List baseAnnotationTypes() {
+ public List<ClassDoc> baseAnnotationTypes() {
return baseAnnotationTypes;
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java Sat Jan 24 16:35:17 2009 -0800
@@ -184,12 +184,12 @@
this.classtree = classtree;
// Map subclassing, subinterfacing implementing, ...
- for (Iterator it = classtree.baseclasses().iterator(); it.hasNext();) {
- subclasses((ClassDoc)it.next());
+ for (Iterator<ClassDoc> it = classtree.baseclasses().iterator(); it.hasNext();) {
+ subclasses(it.next());
}
- for (Iterator it = classtree.baseinterfaces().iterator(); it.hasNext();) {
+ for (Iterator<ClassDoc> it = classtree.baseinterfaces().iterator(); it.hasNext();) {
// does subinterfacing as side-effect
- implementingClasses((ClassDoc)it.next());
+ implementingClasses(it.next());
}
// Map methods, fields, constructors using a class.
ClassDoc[] classes = root.classes();
@@ -279,12 +279,12 @@
List<ClassDoc> impl = classtree.implementingclasses(cd);
if (impl != null) {
ret.addAll(impl);
- for (Iterator it = impl.iterator(); it.hasNext();) {
- ret.addAll(subclasses((ClassDoc)it.next()));
+ for (Iterator<ClassDoc> it = impl.iterator(); it.hasNext();) {
+ ret.addAll(subclasses(it.next()));
}
}
- for (Iterator it = subinterfaces(cd).iterator(); it.hasNext();) {
- ret.addAll(implementingClasses((ClassDoc)it.next()));
+ for (Iterator<ClassDoc> it = subinterfaces(cd).iterator(); it.hasNext();) {
+ ret.addAll(implementingClasses(it.next()));
}
addAll(classToImplementingClass, cd, ret);
}
@@ -328,8 +328,7 @@
private <T> List<T> refList(Map<String,List<T>> map, ClassDoc cd) {
List<T> list = map.get(cd.qualifiedName());
if (list == null) {
- @SuppressWarnings("unchecked")
- List<T> l = new ArrayList();
+ List<T> l = new ArrayList<T>();
list = l;
map.put(cd.qualifiedName(), list);
}
@@ -348,8 +347,7 @@
private Set<ClassDoc> classSet(ClassDoc cd) {
Set<ClassDoc> clsSet = classToClass.get(cd.qualifiedName());
if (clsSet == null) {
- @SuppressWarnings("unchecked")
- Set<ClassDoc> s = new TreeSet();
+ Set<ClassDoc> s = new TreeSet<ClassDoc>();
clsSet = s;
classToClass.put(cd.qualifiedName(), clsSet);
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java Sat Jan 24 16:35:17 2009 -0800
@@ -152,7 +152,7 @@
*
* @return true if package name format found in the map, else false.
*/
- boolean foundGroupFormat(Map map, String pkgFormat) {
+ boolean foundGroupFormat(Map<String,?> map, String pkgFormat) {
if (map.containsKey(pkgFormat)) {
configuration.message.error("doclet.Same_package_name_used", pkgFormat);
return true;
@@ -239,7 +239,7 @@
* Return the list of groups, in the same order as specified
* on the command line.
*/
- public List getGroupList() {
+ public List<String> getGroupList() {
return groupList;
}
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java Sat Jan 24 16:35:17 2009 -0800
@@ -86,9 +86,9 @@
* from the array passed.
*/
private void buildImplementedMethodList(boolean sort) {
- List intfacs = Util.getAllInterfaces(classdoc, configuration, sort);
- for (Iterator iter = intfacs.iterator(); iter.hasNext(); ) {
- Type interfaceType = (Type) iter.next();
+ List<Type> intfacs = Util.getAllInterfaces(classdoc, configuration, sort);
+ for (Iterator<Type> iter = intfacs.iterator(); iter.hasNext(); ) {
+ Type interfaceType = iter.next();
MethodDoc found = Util.findMethod(interfaceType.asClassDoc(), method);
if (found != null) {
removeOverriddenMethod(found);
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java Sat Jan 24 16:35:17 2009 -0800
@@ -114,7 +114,7 @@
this.noDeprecated = noDeprecated;
this.classesOnly = classesOnly;
buildIndexMap(configuration.root);
- Set set = indexmap.keySet();
+ Set<Character> set = indexmap.keySet();
elements = set.toArray();
Arrays.sort(elements);
}
@@ -215,7 +215,7 @@
*
* @return Map index map.
*/
- public Map getIndexMap() {
+ public Map<Character,List<Doc>> getIndexMap() {
return indexmap;
}
@@ -225,8 +225,8 @@
* @param index index Unicode character.
* @return List member list for specific Unicode character.
*/
- public List getMemberList(Character index) {
- return (List)indexmap.get(index);
+ public List<Doc> getMemberList(Character index) {
+ return indexmap.get(index);
}
/**
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java Sat Jan 24 16:35:17 2009 -0800
@@ -88,10 +88,10 @@
/**
* Return the list of ProgramElementDoc objects as Array.
*/
- public static ProgramElementDoc[] toProgramElementDocArray(List list) {
+ public static ProgramElementDoc[] toProgramElementDocArray(List<ProgramElementDoc> list) {
ProgramElementDoc[] pgmarr = new ProgramElementDoc[list.size()];
for (int i = 0; i < list.size(); i++) {
- pgmarr[i] = (ProgramElementDoc)(list.get(i));
+ pgmarr[i] = list.get(i);
}
return pgmarr;
}
@@ -416,9 +416,9 @@
continue;
}
results.put(interfaceClassDoc, interfaceType);
- List superInterfaces = getAllInterfaces(interfaceType, configuration, sort);
- for (Iterator iter = superInterfaces.iterator(); iter.hasNext(); ) {
- Type t = (Type) iter.next();
+ List<Type> superInterfaces = getAllInterfaces(interfaceType, configuration, sort);
+ for (Iterator<Type> iter = superInterfaces.iterator(); iter.hasNext(); ) {
+ Type t = iter.next();
results.put(t.asClassDoc(), t);
}
}
@@ -438,7 +438,7 @@
return resultsList;
}
- public static List getAllInterfaces(Type type, Configuration configuration) {
+ public static List<Type> getAllInterfaces(Type type, Configuration configuration) {
return getAllInterfaces(type, configuration, true);
}
@@ -480,9 +480,9 @@
if (raw)
interfaceType = interfaceType.asClassDoc();
results.put(interfaceClassDoc, interfaceType);
- List superInterfaces = getAllInterfaces(interfaceType, configuration);
- for (Iterator iter = superInterfaces.iterator(); iter.hasNext(); ) {
- Type superInterface = (Type) iter.next();
+ List<Type> superInterfaces = getAllInterfaces(interfaceType, configuration);
+ for (Iterator<Type> iter = superInterfaces.iterator(); iter.hasNext(); ) {
+ Type superInterface = iter.next();
results.put(superInterface.asClassDoc(), superInterface);
}
}
@@ -495,8 +495,8 @@
}
- public static List<ProgramElementDoc> asList(ProgramElementDoc[] members) {
- List<ProgramElementDoc> list = new ArrayList<ProgramElementDoc>();
+ public static <T extends ProgramElementDoc> List<T> asList(T[] members) {
+ List<T> list = new ArrayList<T>();
for (int i = 0; i < members.length; i++) {
list.add(members[i]);
}
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java Sat Jan 24 16:35:17 2009 -0800
@@ -116,7 +116,7 @@
*
* @return the list of visible classes in this map.
*/
- public List getVisibleClassesList() {
+ public List<ClassDoc> getVisibleClassesList() {
sort(visibleClasses);
return visibleClasses;
}
@@ -130,8 +130,8 @@
*/
private List<ProgramElementDoc> getInheritedPackagePrivateMethods(Configuration configuration) {
List<ProgramElementDoc> results = new ArrayList<ProgramElementDoc>();
- for (Iterator iter = visibleClasses.iterator(); iter.hasNext(); ) {
- ClassDoc currentClass = (ClassDoc) iter.next();
+ for (Iterator<ClassDoc> iter = visibleClasses.iterator(); iter.hasNext(); ) {
+ ClassDoc currentClass = iter.next();
if (currentClass != classdoc &&
currentClass.isPackagePrivate() &&
!Util.isLinkable(currentClass, configuration)) {
@@ -203,10 +203,10 @@
}
}
- private void purgeMemberLevelMap(List list, String level) {
+ private void purgeMemberLevelMap(List<ProgramElementDoc> list, String level) {
for (int i = 0; i < list.size(); i++) {
- Object key = getMemberKey((ProgramElementDoc)list.get(i));
- Map memberLevelMap = (Map) memberNameMap.get(key);
+ Object key = getMemberKey(list.get(i));
+ Map<ProgramElementDoc, String> memberLevelMap = memberNameMap.get(key);
if (level.equals(memberLevelMap.get(list.get(i))))
memberLevelMap.remove(list.get(i));
}
@@ -230,7 +230,7 @@
}
public boolean isEqual(MethodDoc member) {
- for (Iterator iter = members.iterator(); iter.hasNext(); ) {
+ for (Iterator<ProgramElementDoc> iter = members.iterator(); iter.hasNext(); ) {
MethodDoc member2 = (MethodDoc) iter.next();
if (Util.executableMembersEqual(member, member2)) {
members.add(member);
@@ -438,9 +438,9 @@
return targetMembers.toArray(new AnnotationTypeElementDoc[]{});
}
- private boolean found(List list, ProgramElementDoc elem) {
+ private boolean found(List<ProgramElementDoc> list, ProgramElementDoc elem) {
for (int i = 0; i < list.size(); i++) {
- ProgramElementDoc pgmelem = (ProgramElementDoc)list.get(i);
+ ProgramElementDoc pgmelem = list.get(i);
if (Util.matches(pgmelem, elem)) {
return true;
}
@@ -455,13 +455,13 @@
* level "111".
*/
private boolean isOverridden(ProgramElementDoc pgmdoc, String level) {
- Map memberLevelMap = (Map) memberNameMap.get(getMemberKey(pgmdoc));
+ Map<?,String> memberLevelMap = (Map<?,String>) memberNameMap.get(getMemberKey(pgmdoc));
if (memberLevelMap == null)
return false;
String mappedlevel = null;
- Iterator iterator = memberLevelMap.values().iterator();
+ Iterator<String> iterator = memberLevelMap.values().iterator();
while (iterator.hasNext()) {
- mappedlevel = (String)(iterator.next());
+ mappedlevel = iterator.next();
if (mappedlevel.equals(STARTLEVEL) ||
(level.startsWith(mappedlevel) &&
!level.equals(mappedlevel))) {
@@ -482,7 +482,7 @@
}
private ClassMember getClassMember(MethodDoc member) {
- for (Iterator iter = memberNameMap.keySet().iterator(); iter.hasNext();) {
+ for (Iterator<?> iter = memberNameMap.keySet().iterator(); iter.hasNext();) {
Object key = iter.next();
if (key instanceof String) {
continue;
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkInfo.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkInfo.java Sat Jan 24 16:35:17 2009 -0800
@@ -69,9 +69,9 @@
public String label;
/**
- * True if the link should be bolded.
+ * True if the link should be strong.
*/
- public boolean isBold = false;
+ public boolean isStrong = false;
/**
* True if we should include the type in the link label. False otherwise.
--- a/langtools/src/share/classes/com/sun/tools/javac/Main.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/Main.java Sat Jan 24 16:35:17 2009 -0800
@@ -56,7 +56,7 @@
if (args.length > 0 && args[0].equals("-Xjdb")) {
String[] newargs = new String[args.length + 2];
Class<?> c = Class.forName("com.sun.tools.example.debug.tty.TTY");
- Method method = c.getDeclaredMethod ("main", new Class[] {args.getClass()});
+ Method method = c.getDeclaredMethod ("main", new Class<?>[] {args.getClass()});
method.setAccessible(true);
System.arraycopy(args, 1, newargs, 3, args.length - 1);
newargs[0] = "-connect";
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Types.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Types.java Sat Jan 24 16:35:17 2009 -0800
@@ -880,12 +880,12 @@
if (warn != warnStack.head) {
try {
warnStack = warnStack.prepend(warn);
- return isCastable.visit(t, s);
+ return isCastable.visit(t,s);
} finally {
warnStack = warnStack.tail;
}
} else {
- return isCastable.visit(t, s);
+ return isCastable.visit(t,s);
}
}
// where
@@ -983,10 +983,10 @@
if (highSub != null) {
assert a.tsym == highSub.tsym && a.tsym == lowSub.tsym
: a.tsym + " != " + highSub.tsym + " != " + lowSub.tsym;
- if (!disjointTypes(aHigh.getTypeArguments(), highSub.getTypeArguments())
- && !disjointTypes(aHigh.getTypeArguments(), lowSub.getTypeArguments())
- && !disjointTypes(aLow.getTypeArguments(), highSub.getTypeArguments())
- && !disjointTypes(aLow.getTypeArguments(), lowSub.getTypeArguments())) {
+ if (!disjointTypes(aHigh.allparams(), highSub.allparams())
+ && !disjointTypes(aHigh.allparams(), lowSub.allparams())
+ && !disjointTypes(aLow.allparams(), highSub.allparams())
+ && !disjointTypes(aLow.allparams(), lowSub.allparams())) {
if (upcast ? giveWarning(a, highSub) || giveWarning(a, lowSub)
: giveWarning(highSub, a) || giveWarning(lowSub, a))
warnStack.head.warnUnchecked();
@@ -1197,6 +1197,7 @@
s = upperBound(s);
if (s.tag == TYPEVAR)
s = s.getUpperBound();
+
return !isSubtype(t, s);
}
// </editor-fold>
@@ -3147,7 +3148,7 @@
giveWarning = giveWarning || (reverse ? giveWarning(t2, t1) : giveWarning(t1, t2));
commonSupers = commonSupers.tail;
}
- if (giveWarning && !isReifiable(to))
+ if (giveWarning && !isReifiable(reverse ? from : to))
warn.warnUnchecked();
if (!source.allowCovariantReturns())
// reject if there is a common method signature with
@@ -3189,7 +3190,7 @@
private boolean giveWarning(Type from, Type to) {
// To and from are (possibly different) parameterizations
// of the same class or interface
- return to.isParameterized() && !containsType(to.getTypeArguments(), from.getTypeArguments());
+ return to.isParameterized() && !containsType(to.allparams(), from.allparams());
}
private List<Type> superClosure(Type t, Type s) {
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java Sat Jan 24 16:35:17 2009 -0800
@@ -1457,7 +1457,7 @@
localEnv.info.varArgs = false;
tree.constructor = rs.resolveConstructor(
tree.pos(), localEnv, clazztype, argtypes, typeargtypes);
- Type ctorType = checkMethod(clazztype,
+ tree.constructorType = checkMethod(clazztype,
tree.constructor,
localEnv,
tree.args,
@@ -1465,7 +1465,7 @@
typeargtypes,
localEnv.info.varArgs);
if (localEnv.info.varArgs)
- assert ctorType.isErroneous() || tree.varargsElement != null;
+ assert tree.constructorType.isErroneous() || tree.varargsElement != null;
}
if (cdef != null) {
@@ -1527,6 +1527,13 @@
typeargtypes, true, tree.varargsElement != null);
assert sym.kind < AMBIGUOUS || tree.constructor.type.isErroneous();
tree.constructor = sym;
+ tree.constructorType = checkMethod(clazztype,
+ tree.constructor,
+ localEnv,
+ tree.args,
+ argtypes,
+ typeargtypes,
+ localEnv.info.varArgs);
}
if (tree.constructor != null && tree.constructor.kind == MTH)
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java Sat Jan 24 16:35:17 2009 -0800
@@ -1136,11 +1136,32 @@
scanExpr(tree.encl);
scanExprs(tree.args);
// scan(tree.def);
- for (List<Type> l = tree.constructor.type.getThrownTypes();
+ for (List<Type> l = tree.constructorType.getThrownTypes();
l.nonEmpty();
- l = l.tail)
+ l = l.tail) {
markThrown(tree, l.head);
- scan(tree.def);
+ }
+ List<Type> caughtPrev = caught;
+ try {
+ // If the new class expression defines an anonymous class,
+ // analysis of the anonymous constructor may encounter thrown
+ // types which are unsubstituted type variables.
+ // However, since the constructor's actual thrown types have
+ // already been marked as thrown, it is safe to simply include
+ // each of the constructor's formal thrown types in the set of
+ // 'caught/declared to be thrown' types, for the duration of
+ // the class def analysis.
+ if (tree.def != null)
+ for (List<Type> l = tree.constructor.type.getThrownTypes();
+ l.nonEmpty();
+ l = l.tail) {
+ caught = chk.incl(l.head, caught);
+ }
+ scan(tree.def);
+ }
+ finally {
+ caught = caughtPrev;
+ }
}
public void visitNewArray(JCNewArray tree) {
--- a/langtools/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java Sat Jan 24 16:35:17 2009 -0800
@@ -949,8 +949,8 @@
Iterable<? extends File> files)
{
ArrayList<RegularFileObject> result;
- if (files instanceof Collection)
- result = new ArrayList<RegularFileObject>(((Collection)files).size());
+ if (files instanceof Collection<?>)
+ result = new ArrayList<RegularFileObject>(((Collection<?>)files).size());
else
result = new ArrayList<RegularFileObject>();
for (File f: files)
--- a/langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java Sat Jan 24 16:35:17 2009 -0800
@@ -1114,7 +1114,7 @@
writtenSoFar += dirNameBytesLen;
// Write the number of files in the dir
- List dirEntries = dirEntry.getEntriesAsCollection();
+ List<Entry> dirEntries = dirEntry.getEntriesAsCollection();
raf.writeInt(dirEntries.size());
writtenSoFar += 4;
--- a/langtools/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java Sat Jan 24 16:35:17 2009 -0800
@@ -215,15 +215,15 @@
}
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "rawtypes"})
public void visitEnum(Attribute.Enum e) {
if (returnClass.isEnum()) {
String constName = e.value.toString();
try {
- value = Enum.valueOf((Class) returnClass, constName);
+ value = Enum.valueOf((Class)returnClass, constName);
} catch (IllegalArgumentException ex) {
value = new EnumConstantNotPresentExceptionProxy(
- (Class) returnClass, constName);
+ (Class<Enum<?>>) returnClass, constName);
}
} else {
value = null; // indicates a type mismatch
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java Sat Jan 24 16:35:17 2009 -0800
@@ -864,6 +864,12 @@
t = F.at(pos1).TypeApply(t, args.toList());
checkGenerics();
t = bracketsOpt(toP(t));
+ while (S.token() == DOT) {
+ S.nextToken();
+ mode = TYPE;
+ t = toP(F.at(S.pos()).Select(t, ident()));
+ t = typeArgumentsOpt(t);
+ }
} else if ((mode & EXPR) != 0) {
mode = EXPR;
t = F.at(pos1).Binary(op, t, term2Rest(t1, TreeInfo.shiftPrec));
@@ -871,7 +877,8 @@
} else {
accept(GT);
}
- } else {
+ }
+ else {
t = termRest(term1Rest(term2Rest(t, TreeInfo.orPrec)));
}
accept(RPAREN);
--- a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Sat Jan 24 16:35:17 2009 -0800
@@ -1060,7 +1060,7 @@
next.put(Names.namesKey, names);
}
- DiagnosticListener dl = context.get(DiagnosticListener.class);
+ DiagnosticListener<?> dl = context.get(DiagnosticListener.class);
if (dl != null)
next.put(DiagnosticListener.class, dl);
--- a/langtools/src/share/classes/com/sun/tools/javac/processing/ServiceProxy.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/processing/ServiceProxy.java Sat Jan 24 16:35:17 2009 -0800
@@ -55,12 +55,12 @@
private static final String prefix = "META-INF/services/";
- private static void fail(Class service, String msg)
+ private static void fail(Class<?> service, String msg)
throws ServiceConfigurationError {
throw new ServiceConfigurationError(service.getName() + ": " + msg);
}
- private static void fail(Class service, URL u, int line, String msg)
+ private static void fail(Class<?> service, URL u, int line, String msg)
throws ServiceConfigurationError {
fail(service, u + ":" + line + ": " + msg);
}
@@ -81,7 +81,7 @@
* If an I/O error occurs while reading from the given URL, or
* if a configuration-file format error is detected
*/
- private static boolean parse(Class service, URL u) throws ServiceConfigurationError {
+ private static boolean parse(Class<?> service, URL u) throws ServiceConfigurationError {
InputStream in = null;
BufferedReader r = null;
try {
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/JCTree.java Sat Jan 24 16:35:17 2009 -0800
@@ -1326,6 +1326,7 @@
public JCClassDecl def;
public Symbol constructor;
public Type varargsElement;
+ public Type constructorType;
protected JCNewClass(JCExpression encl,
List<JCExpression> typeargs,
JCExpression clazz,
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeScanner.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeScanner.java Sat Jan 24 16:35:17 2009 -0800
@@ -86,6 +86,7 @@
scan(tree.typarams);
scan(tree.params);
scan(tree.thrown);
+ scan(tree.defaultValue);
scan(tree.body);
}
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Context.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/Context.java Sat Jan 24 16:35:17 2009 -0800
@@ -116,7 +116,7 @@
* We maintain the invariant that this table contains only
* mappings of the form
* Key<T> -> T or Key<T> -> Factory<T> */
- private Map<Key,Object> ht = new HashMap<Key,Object>();
+ private Map<Key<?>,Object> ht = new HashMap<Key<?>,Object>();
/** Set the factory for the key in this context. */
public <T> void put(Key<T> key, Factory<T> fac) {
@@ -128,11 +128,11 @@
/** Set the value for the key in this context. */
public <T> void put(Key<T> key, T data) {
- if (data instanceof Factory)
+ if (data instanceof Factory<?>)
throw new AssertionError("T extends Context.Factory");
checkState(ht);
Object old = ht.put(key, data);
- if (old != null && !(old instanceof Factory) && old != data && data != null)
+ if (old != null && !(old instanceof Factory<?>) && old != data && data != null)
throw new AssertionError("duplicate context value");
}
@@ -140,10 +140,10 @@
public <T> T get(Key<T> key) {
checkState(ht);
Object o = ht.get(key);
- if (o instanceof Factory) {
- Factory fac = (Factory)o;
+ if (o instanceof Factory<?>) {
+ Factory<?> fac = (Factory<?>)o;
o = fac.make();
- if (o instanceof Factory)
+ if (o instanceof Factory<?>)
throw new AssertionError("T extends Context.Factory");
assert ht.get(key) == o;
}
--- a/langtools/src/share/classes/com/sun/tools/javac/util/List.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/List.java Sat Jan 24 16:35:17 2009 -0800
@@ -71,9 +71,10 @@
*/
@SuppressWarnings("unchecked")
public static <A> List<A> nil() {
- return EMPTY_LIST;
+ return (List<A>)EMPTY_LIST;
}
- private static List EMPTY_LIST = new List<Object>(null,null) {
+
+ private static List<?> EMPTY_LIST = new List<Object>(null,null) {
public List<Object> setTail(List<Object> tail) {
throw new UnsupportedOperationException();
}
@@ -318,7 +319,7 @@
/** Are the two lists the same?
*/
- public static boolean equals(List xs, List ys) {
+ public static boolean equals(List<?> xs, List<?> ys) {
while (xs.tail != null && ys.tail != null) {
if (xs.head == null) {
if (ys.head != null) return false;
@@ -368,7 +369,7 @@
return (List<T>)list;
}
- private static Iterator EMPTYITERATOR = new Iterator() {
+ private static Iterator<?> EMPTYITERATOR = new Iterator<Object>() {
public boolean hasNext() {
return false;
}
@@ -382,7 +383,7 @@
@SuppressWarnings("unchecked")
private static <A> Iterator<A> emptyIterator() {
- return EMPTYITERATOR;
+ return (Iterator<A>)EMPTYITERATOR;
}
@Override
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Pair.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/Pair.java Sat Jan 24 16:35:17 2009 -0800
@@ -52,9 +52,9 @@
public boolean equals(Object other) {
return
- other instanceof Pair &&
- equals(fst, ((Pair)other).fst) &&
- equals(snd, ((Pair)other).snd);
+ other instanceof Pair<?,?> &&
+ equals(fst, ((Pair<?,?>)other).fst) &&
+ equals(snd, ((Pair<?,?>)other).snd);
}
public int hashCode() {
--- a/langtools/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java Sat Jan 24 16:35:17 2009 -0800
@@ -88,7 +88,7 @@
appClassLoader = new URLClassLoader(urls, docletParentClassLoader);
// attempt to find doclet
- Class dc = null;
+ Class<?> dc = null;
try {
dc = appClassLoader.loadClass(docletClassName);
} catch (ClassNotFoundException exc) {
@@ -104,7 +104,7 @@
public boolean start(RootDoc root) {
Object retVal;
String methodName = "start";
- Class[] paramTypes = new Class[1];
+ Class<?>[] paramTypes = new Class<?>[1];
Object[] params = new Object[1];
paramTypes[0] = RootDoc.class;
params[0] = root;
@@ -130,7 +130,7 @@
public int optionLength(String option) {
Object retVal;
String methodName = "optionLength";
- Class[] paramTypes = new Class[1];
+ Class<?>[] paramTypes = new Class<?>[1];
Object[] params = new Object[1];
paramTypes[0] = option.getClass();
params[0] = option;
@@ -157,7 +157,7 @@
String options[][] = optlist.toArray(new String[optlist.length()][]);
String methodName = "validOptions";
DocErrorReporter reporter = messager;
- Class[] paramTypes = new Class[2];
+ Class<?>[] paramTypes = new Class<?>[2];
Object[] params = new Object[2];
paramTypes[0] = options.getClass();
paramTypes[1] = DocErrorReporter.class;
@@ -185,7 +185,7 @@
try {
Object retVal;
String methodName = "languageVersion";
- Class[] paramTypes = new Class[0];
+ Class<?>[] paramTypes = new Class<?>[0];
Object[] params = new Object[0];
try {
retVal = invoke(methodName, JAVA_1_1, paramTypes, params);
@@ -208,7 +208,7 @@
* Utility method for calling doclet functionality
*/
private Object invoke(String methodName, Object returnValueIfNonExistent,
- Class[] paramTypes, Object[] params)
+ Class<?>[] paramTypes, Object[] params)
throws DocletInvokeException {
Method meth;
try {
--- a/langtools/src/share/classes/com/sun/tools/javah/Gen.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javah/Gen.java Sat Jan 24 16:35:17 2009 -0800
@@ -326,7 +326,7 @@
throws ClassNotFoundException {
Vector<FieldDoc> fields = new Vector<FieldDoc>();
ClassDoc cd = null;
- Stack s = new Stack();
+ Stack<Object> s = new Stack<Object>();
cd = subclazz;
while (true) {
--- a/langtools/src/share/classes/com/sun/tools/javah/LLNI.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javah/LLNI.java Sat Jan 24 16:35:17 2009 -0800
@@ -39,7 +39,7 @@
protected final char pathChar = File.separatorChar;
protected final char innerDelim = '$'; /* For inner classes */
- protected Hashtable doneHandleTypes;
+ protected Hashtable<Object, Object> doneHandleTypes;
MemberDoc []fields;
MemberDoc [] methods;
private boolean doubleAlign;
@@ -68,7 +68,7 @@
protected void generateDeclsForClass(PrintWriter pw,
ClassDoc clazz, String cname)
throws ClassNotFoundException {
- doneHandleTypes = new Hashtable();
+ doneHandleTypes = new Hashtable<Object, Object>();
/* The following handle types are predefined in "typedefs.h". Suppress
inclusion in the output by generating them "into the blue" here. */
genHandleType(null, "java.lang.Class");
--- a/langtools/src/share/classes/com/sun/tools/javah/TypeSignature.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/com/sun/tools/javah/TypeSignature.java Sat Jan 24 16:35:17 2009 -0800
@@ -74,7 +74,7 @@
String signature = null; //Java type signature.
String typeSignature = null; //Internal type signature.
- Vector params = new Vector(); //List of parameters.
+ Vector<Object> params = new Vector<Object>(); //List of parameters.
String paramsig = null; //Java parameter signature.
String paramJVMSig = null; //Internal parameter signature.
String returnSig = null; //Java return type signature.
--- a/langtools/src/share/classes/sun/tools/javap/FieldData.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/sun/tools/javap/FieldData.java Sat Jan 24 16:35:17 2009 -0800
@@ -157,7 +157,7 @@
/**
* Returns list of attributes of field.
*/
- public Vector getAttributes(){
+ public Vector<?> getAttributes(){
return attrs;
}
}
--- a/langtools/src/share/classes/sun/tools/javap/JavapPrinter.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/sun/tools/javap/JavapPrinter.java Sat Jan 24 16:35:17 2009 -0800
@@ -175,7 +175,7 @@
/* print field attribute information. */
public void printFieldAttributes(FieldData field){
- Vector fieldattrs = field.getAttributes();
+ Vector<?> fieldattrs = field.getAttributes();
for(int j = 0; j < fieldattrs.size(); j++){
String fieldattrname = ((AttrData)fieldattrs.elementAt(j)).getAttrName();
if(fieldattrname.equals("ConstantValue")){
@@ -256,8 +256,8 @@
* print method attribute information.
*/
public void printMethodAttributes(MethodData method){
- Vector methodattrs = method.getAttributes();
- Vector codeattrs = method.getCodeAttributes();
+ Vector<?> methodattrs = method.getAttributes();
+ Vector<?> codeattrs = method.getCodeAttributes();
for(int k = 0; k < methodattrs.size(); k++){
String methodattrname = ((AttrData)methodattrs.elementAt(k)).getAttrName();
if(methodattrname.equals("Code")){
@@ -519,7 +519,7 @@
* Print the exception table for this method code
*/
void printExceptionTable(MethodData method){//throws IOException
- Vector exception_table = method.getexception_table();
+ Vector<?> exception_table = method.getexception_table();
if (exception_table.size() > 0) {
out.println(" Exception table:");
out.println(" from to target type");
@@ -546,7 +546,7 @@
*/
public void printLineNumTable(MethodData method) {
int numlines = method.getnumlines();
- Vector lin_num_tb = method.getlin_num_tb();
+ Vector<?> lin_num_tb = method.getlin_num_tb();
if( lin_num_tb.size() > 0){
out.println(" LineNumberTable: ");
for (int i=0; i<numlines; i++) {
@@ -568,7 +568,7 @@
out.print(" ");
out.println("Start Length Slot Name Signature");
}
- Vector loc_var_tb = method.getloc_var_tb();
+ Vector<?> loc_var_tb = method.getloc_var_tb();
for (int i=0; i<siz; i++) {
LocVarData entry=(LocVarData)loc_var_tb.elementAt(i);
--- a/langtools/src/share/classes/sun/tools/javap/MethodData.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/src/share/classes/sun/tools/javap/MethodData.java Sat Jan 24 16:35:17 2009 -0800
@@ -302,7 +302,7 @@
/**
* Return LineNumberTable
*/
- public Vector getlin_num_tb(){
+ public Vector<?> getlin_num_tb(){
return lin_num_tb;
}
@@ -317,7 +317,7 @@
/**
* Return LocalVariableTable.
*/
- public Vector getloc_var_tb(){
+ public Vector<?> getloc_var_tb(){
return loc_var_tb;
}
@@ -378,7 +378,7 @@
/**
* Return exception table in code attributre.
*/
- public Vector getexception_table(){
+ public Vector<?> getexception_table(){
return exception_table;
}
@@ -386,7 +386,7 @@
/**
* Return method attributes.
*/
- public Vector getAttributes(){
+ public Vector<?> getAttributes(){
return attrs;
}
@@ -394,7 +394,7 @@
/**
* Return code attributes.
*/
- public Vector getCodeAttributes(){
+ public Vector<?> getCodeAttributes(){
return code_attrs;
}
--- a/langtools/test/com/sun/javadoc/AccessAsciiArt/AccessAsciiArt.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/AccessAsciiArt/AccessAsciiArt.java Sat Jan 24 16:35:17 2009 -0800
@@ -94,7 +94,7 @@
// Test the third line of the class tree
{
-" <IMG SRC=\"../../resources/inherit.gif\" ALT=\"extended by \"><B>p1.subpkg.SSC</B>",
+" <IMG SRC=\"../../resources/inherit.gif\" ALT=\"extended by \"><STRONG>p1.subpkg.SSC</STRONG>",
TMPDEST_DIR1 + "p1" + FS + "subpkg" + FS +"SSC.html" },
};
--- a/langtools/test/com/sun/javadoc/AuthorDD/AuthorDD.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/AuthorDD/AuthorDD.java Sat Jan 24 16:35:17 2009 -0800
@@ -86,12 +86,12 @@
// Test single @since tag:
- { "<DT><B>Since:</B></DT>"+NL+" <DD>JDK 1.0</DD>",
+ { "<DT><STRONG>Since:</STRONG></DT>"+NL+" <DD>JDK 1.0</DD>",
BUGID + FS + "p1" + FS + "C1.html" },
// Test multiple @author tags:
- { "<DT><B>Author:</B></DT>"+NL+" <DD>Doug Kramer, Jamie, Neal</DD>"+NL,
+ { "<DT><STRONG>Author:</STRONG></DT>"+NL+" <DD>Doug Kramer, Jamie, Neal</DD>"+NL,
BUGID + FS + "p1" + FS + "C1.html" },
};
--- a/langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java Sat Jan 24 16:35:17 2009 -0800
@@ -48,7 +48,7 @@
"<A HREF=\"http://java.sun.com/j2se/1.4/docs/api/java/math/BigInteger.html?is-external=true#gcd(java.math.BigInteger)\" " +
"title=\"class or interface in java.math\"><CODE>Link to external member gcd</CODE></A>"},
{BUG_ID + FS + "C.html",
- "<B>Overrides:</B><DD><CODE>toString</CODE> in class <CODE>java.lang.Object</CODE>"}
+ "<STRONG>Overrides:</STRONG><DD><CODE>toString</CODE> in class <CODE>java.lang.Object</CODE>"}
};
private static final String[][] NEGATED_TEST = NO_TEST;
private static final String[] ARGS =
--- a/langtools/test/com/sun/javadoc/testClassTree/TestClassTree.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testClassTree/TestClassTree.java Sat Jan 24 16:35:17 2009 -0800
@@ -49,12 +49,12 @@
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "package-tree.html",
"<LI TYPE=\"circle\">pkg.<A HREF=\"../pkg/ParentClass.html\" " +
- "title=\"class in pkg\"><B>ParentClass</B></A><UL>"},
+ "title=\"class in pkg\"><STRONG>ParentClass</STRONG></A><UL>"},
{BUG_ID + FS + "pkg" + FS + "package-tree.html",
"Annotation Type Hierarchy" + NL + "</H2>" + NL + "<UL>" + NL +
"<LI TYPE=\"circle\">pkg.<A HREF=\"../pkg/AnnotationType.html\" " +
- "title=\"annotation in pkg\"><B>AnnotationType</B></A> " +
+ "title=\"annotation in pkg\"><STRONG>AnnotationType</STRONG></A> " +
"(implements java.lang.annotation.Annotation)" + NL + "</UL>"},
{BUG_ID + FS + "pkg" + FS + "package-tree.html",
@@ -65,7 +65,7 @@
"<LI TYPE=\"circle\">java.lang.Object<UL>" + NL +
"<LI TYPE=\"circle\">java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable)" + NL +
"<UL>" + NL +
- "<LI TYPE=\"circle\">pkg.<A HREF=\"../pkg/Coin.html\" title=\"enum in pkg\"><B>Coin</B></A></UL>" + NL +
+ "<LI TYPE=\"circle\">pkg.<A HREF=\"../pkg/Coin.html\" title=\"enum in pkg\"><STRONG>Coin</STRONG></A></UL>" + NL +
"</UL>" + NL +
"</UL>"
},
@@ -73,7 +73,7 @@
private static final String[][] NEGATED_TEST = {
{BUG_ID + FS + "pkg" + FS + "package-tree.html",
"<LI TYPE=\"circle\">class pkg.<A HREF=\"../pkg/ParentClass.html\" " +
- "title=\"class in pkg\"><B>ParentClass</B></A><UL>"}
+ "title=\"class in pkg\"><STRONG>ParentClass</STRONG></A><UL>"}
};
/**
--- a/langtools/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java Sat Jan 24 16:35:17 2009 -0800
@@ -46,7 +46,7 @@
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "C.html", "<DL>"+NL+"<DD>This is just a simple constructor."+ NL +
- "<P>"+NL+"<DL>"+NL+"<DT><B>Parameters:</B><DD><CODE>i</CODE> - a param.</DL>"+NL +
+ "<P>"+NL+"<DL>"+NL+"<DT><STRONG>Parameters:</STRONG><DD><CODE>i</CODE> - a param.</DL>"+NL +
"</DL>"
}
};
--- a/langtools/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java Sat Jan 24 16:35:17 2009 -0800
@@ -76,25 +76,25 @@
{TARGET_FILE, "pkg.DeprecatedClassByAnnotation.method()"},
{TARGET_FILE, "pkg.DeprecatedClassByAnnotation.field"},
- {TARGET_FILE2, "<B>Deprecated.</B>" + NL +
+ {TARGET_FILE2, "<STRONG>Deprecated.</STRONG>" + NL +
"<P>" + NL +
"<DL>" + NL +
"<DT><PRE><FONT SIZE=\"-1\">@Deprecated" + NL +
- "</FONT>public class <B>DeprecatedClassByAnnotation</B>"},
+ "</FONT>public class <STRONG>DeprecatedClassByAnnotation</STRONG>"},
- {TARGET_FILE2, "public int <B>field</B></PRE>" + NL +
+ {TARGET_FILE2, "public int <STRONG>field</STRONG></PRE>" + NL +
"<DL>" + NL +
- "<DD><B>Deprecated.</B> <DL>"},
+ "<DD><STRONG>Deprecated.</STRONG> <DL>"},
{TARGET_FILE2, "<FONT SIZE=\"-1\">@Deprecated" + NL +
- "</FONT>public <B>DeprecatedClassByAnnotation</B>()</PRE>" + NL +
+ "</FONT>public <STRONG>DeprecatedClassByAnnotation</STRONG>()</PRE>" + NL +
"<DL>" + NL +
- "<DD><B>Deprecated.</B>"},
+ "<DD><STRONG>Deprecated.</STRONG>"},
{TARGET_FILE2, "<FONT SIZE=\"-1\">@Deprecated" + NL +
- "</FONT>public void <B>method</B>()</PRE>" + NL +
+ "</FONT>public void <STRONG>method</STRONG>()</PRE>" + NL +
"<DL>" + NL +
- "<DD><B>Deprecated.</B>"},
+ "<DD><STRONG>Deprecated.</STRONG>"},
};
private static final String[][] NEGATED_TEST = NO_TEST;
--- a/langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java Sat Jan 24 16:35:17 2009 -0800
@@ -39,13 +39,13 @@
private static final String BUG_ID = "4857717";
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "XReader.html",
- "<B>Overrides:</B><DD><CODE><A HREF=\"" +
+ "<STRONG>Overrides:</STRONG><DD><CODE><A HREF=\"" +
"http://java.sun.com/j2se/1.4.1/docs/api/java/io/FilterReader.html?is-external=true#read()\"" +
" title=\"class or interface in java.io\">read</A></CODE> in class " +
"<CODE><A HREF=\"http://java.sun.com/j2se/1.4.1/docs/api/java/io/FilterReader.html?is-external=true\"" +
" title=\"class or interface in java.io\">FilterReader</A>"},
{BUG_ID + FS + "pkg" + FS + "XReader.html",
- "<B>Specified by:</B><DD><CODE><A HREF=\"" +
+ "<STRONG>Specified by:</STRONG><DD><CODE><A HREF=\"" +
"http://java.sun.com/j2se/1.4.1/docs/api/java/io/DataInput.html?is-external=true#readInt()\"" +
" title=\"class or interface in java.io\">readInt</A></CODE> in interface " +
"<CODE><A HREF=\"http://java.sun.com/j2se/1.4.1/docs/api/java/io/DataInput.html?is-external=true\"" +
--- a/langtools/test/com/sun/javadoc/testHeadings/TestHeadings.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testHeadings/TestHeadings.java Sat Jan 24 16:35:17 2009 -0800
@@ -48,16 +48,16 @@
//Package summary
{BUG_ID + FS + "pkg1" + FS + "package-summary.html",
"<TH ALIGN=\"left\" COLSPAN=\"2\"><FONT SIZE=\"+2\">" + NL +
- "<B>Class Summary</B></FONT></TH>"
+ "<STRONG>Class Summary</STRONG></FONT></TH>"
},
// Class documentation
{BUG_ID + FS + "pkg1" + FS + "C1.html",
"<TH ALIGN=\"left\" COLSPAN=\"2\"><FONT SIZE=\"+2\">" + NL +
- "<B>Field Summary</B></FONT></TH>"
+ "<STRONG>Field Summary</STRONG></FONT></TH>"
},
{BUG_ID + FS + "pkg1" + FS + "C1.html",
- "<TH ALIGN=\"left\"><B>Methods inherited from class " + "java.lang.Object</B></TH>"
+ "<TH ALIGN=\"left\"><STRONG>Methods inherited from class " + "java.lang.Object</STRONG></TH>"
},
// Class use documentation
@@ -76,7 +76,7 @@
// Deprecated
{BUG_ID + FS + "deprecated-list.html",
"<TH ALIGN=\"left\" COLSPAN=\"2\"><FONT SIZE=\"+2\">" + NL +
- "<B>Deprecated Methods</B></FONT></TH>"
+ "<STRONG>Deprecated Methods</STRONG></FONT></TH>"
},
// Constant values
@@ -90,20 +90,20 @@
// Serialized Form
{BUG_ID + FS + "serialized-form.html",
"<TH ALIGN=\"center\"><FONT SIZE=\"+2\">" + NL +
- "<B>Package</B> <B>pkg1</B></FONT></TH>"
+ "<STRONG>Package</STRONG> <STRONG>pkg1</STRONG></FONT></TH>"
},
{BUG_ID + FS + "serialized-form.html",
"<TH ALIGN=\"left\" COLSPAN=\"2\"><FONT SIZE=\"+2\">" + NL +
- "<B>Class <A HREF=\"pkg1/C1.html\" " + "title=\"class in pkg1\">pkg1.C1</A> extends java.lang.Object " + "implements Serializable</B></FONT></TH>"
+ "<STRONG>Class <A HREF=\"pkg1/C1.html\" " + "title=\"class in pkg1\">pkg1.C1</A> extends java.lang.Object " + "implements Serializable</STRONG></FONT></TH>"
},
{BUG_ID + FS + "serialized-form.html",
"<TH ALIGN=\"left\" COLSPAN=\"1\"><FONT SIZE=\"+2\">" + NL +
- "<B>Serialized Fields</B></FONT></TH>"
+ "<STRONG>Serialized Fields</STRONG></FONT></TH>"
},
// Overview Frame
{BUG_ID + FS + "overview-frame.html",
- "<TH ALIGN=\"left\" NOWRAP><FONT size=\"+1\" " + "CLASS=\"FrameTitleFont\">" + NL + "<B>Test Files</B></FONT></TH>"
+ "<TH ALIGN=\"left\" NOWRAP><FONT size=\"+1\" " + "CLASS=\"FrameTitleFont\">" + NL + "<STRONG>Test Files</STRONG></FONT></TH>"
},
{BUG_ID + FS + "overview-frame.html",
"<TITLE>" + NL +
--- a/langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java Sat Jan 24 16:35:17 2009 -0800
@@ -91,7 +91,8 @@
private static final String[][] TEST2 = {
{BUG_ID + FS + "TestHelpOption.html",
- "<A HREF=\"help-doc.html\"><FONT CLASS=\"NavBarFont1\">" +
"<B>Help</B></FONT></A>"
+ "<A HREF=\"help-doc.html\"><FONT CLASS=\"NavBarFont1\">" +
+ "<STRONG>Help</STRONG></FONT></A>"
},
};
private static final String[][] NEGATED_TEST2 = NO_TEST;
--- a/langtools/test/com/sun/javadoc/testHref/TestHref.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testHref/TestHref.java Sat Jan 24 16:35:17 2009 -0800
@@ -67,7 +67,7 @@
},
//@see test.
{BUG_ID + FS + "pkg" + FS + "C2.html",
- "See Also:</B><DD><A HREF=\"../pkg/C1.html#method(int, int, java.util.ArrayList)\">"
+ "See Also:</STRONG><DD><A HREF=\"../pkg/C1.html#method(int, int, java.util.ArrayList)\">"
},
//Header does not link to the page itself.
@@ -77,7 +77,7 @@
//Signature does not link to the page itself.
{BUG_ID + FS + "pkg" + FS + "C4.html",
- "public abstract class <B>C4<E extends C4<E>></B>"
+ "public abstract class <STRONG>C4<E extends C4<E>></STRONG>"
},
};
private static final String[][] NEGATED_TEST =
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java Sat Jan 24 16:35:17 2009 -0800
@@ -0,0 +1,82 @@
+/*
+ * 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. 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 6786028
+ * @summary This test verifys the use of <strong> HTML tag instead of <B> by Javadoc std doclet.
+ * @author Bhavesh Patel
+ * @library ../lib/
+ * @build JavadocTester
+ * @build TestHtmlStrongTag
+ * @run main TestHtmlStrongTag
+ */
+
+public class TestHtmlStrongTag extends JavadocTester {
+
+ private static final String BUG_ID = "6786028";
+ private static final String[][] TEST1 = {
+ {BUG_ID + FS + "pkg1" + FS + "C1.html", "<STRONG>Method Summary</STRONG>"},
+ {BUG_ID + FS + "pkg1" + FS + "C1.html", "<STRONG>See Also:</STRONG>"},
+ {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "<STRONG>Class Summary</STRONG>"}};
+ private static final String[][] NEGATED_TEST1 = {
+ {BUG_ID + FS + "pkg1" + FS + "C1.html", "<B>"}};
+ private static final String[][] TEST2 = {
+ {BUG_ID + FS + "pkg2" + FS + "C2.html", "<STRONG>Method Summary</STRONG>"},
+ {BUG_ID + FS + "pkg2" + FS + "C2.html", "<B>Comments:</B>"},
+ {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "<STRONG>Class Summary</STRONG>"}};
+
+ private static final String[] ARGS1 =
+ new String[] {
+ "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1"};
+ private static final String[] ARGS2 =
+ new String[] {
+ "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg2"};
+
+ /**
+ * The entry point of the test.
+ * @param args the array of command line arguments.
+ */
+ public static void main(String[] args) {
+ TestHtmlStrongTag tester = new TestHtmlStrongTag();
+ run(tester, ARGS1, TEST1, NEGATED_TEST1);
+ run(tester, ARGS2, TEST2, NO_TEST);
+ tester.printSummary();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getBugId() {
+ return BUG_ID;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getBugName() {
+ return getClass().getName();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testHtmlStrongTag/pkg1/C1.java Sat Jan 24 16:35:17 2009 -0800
@@ -0,0 +1,36 @@
+/*
+ * 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. 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 pkg1;
+
+/**
+ * @see java.lang.Object#wait(long, int)
+ */
+public class C1 {
+
+ public void method(int param1, int param2) {
+
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/com/sun/javadoc/testHtmlStrongTag/pkg2/C2.java Sat Jan 24 16:35:17 2009 -0800
@@ -0,0 +1,31 @@
+/*
+ * 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. 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 pkg2;
+
+/**
+ * <B>Comments:</B> Class 2
+ */
+public class C2 {}
--- a/langtools/test/com/sun/javadoc/testIndex/TestIndex.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testIndex/TestIndex.java Sat Jan 24 16:35:17 2009 -0800
@@ -54,27 +54,27 @@
//Test index-all.html
{BUG_ID + FS + "index-all.html",
- "<A HREF=\"./pkg/C.html\" title=\"class in pkg\"><B>C</B></A>" +
+ "<A HREF=\"./pkg/C.html\" title=\"class in pkg\"><STRONG>C</STRONG></A>" +
" - Class in <A HREF=\"./pkg/package-summary.html\">pkg</A>"},
{BUG_ID + FS + "index-all.html",
"<A HREF=\"./pkg/Interface.html\" title=\"interface in pkg\">" +
- "<B>Interface</B></A> - Interface in " +
+ "<STRONG>Interface</STRONG></A> - Interface in " +
"<A HREF=\"./pkg/package-summary.html\">pkg</A>"},
{BUG_ID + FS + "index-all.html",
"<A HREF=\"./pkg/AnnotationType.html\" title=\"annotation in pkg\">" +
- "<B>AnnotationType</B></A> - Annotation Type in " +
+ "<STRONG>AnnotationType</STRONG></A> - Annotation Type in " +
"<A HREF=\"./pkg/package-summary.html\">pkg</A>"},
{BUG_ID + FS + "index-all.html",
"<A HREF=\"./pkg/Coin.html\" title=\"enum in pkg\">" +
- "<B>Coin</B></A> - Enum in " +
+ "<STRONG>Coin</STRONG></A> - Enum in " +
"<A HREF=\"./pkg/package-summary.html\">pkg</A>"},
{BUG_ID + FS + "index-all.html",
"Class in <A HREF=\"./package-summary.html\"><Unnamed></A>"},
{BUG_ID + FS + "index-all.html",
- "<DT><A HREF=\"./pkg/C.html#Java\"><B>Java</B></A> - " + NL +
+ "<DT><A HREF=\"./pkg/C.html#Java\"><STRONG>Java</STRONG></A> - " + NL +
"Static variable in class pkg.<A HREF=\"./pkg/C.html\" title=\"class in pkg\">C</A>" + NL +
"<DD> " + NL +
- "<DT><A HREF=\"./pkg/C.html#JDK\"><B>JDK</B></A> - " + NL +
+ "<DT><A HREF=\"./pkg/C.html#JDK\"><STRONG>JDK</STRONG></A> - " + NL +
"Static variable in class pkg.<A HREF=\"./pkg/C.html\" title=\"class in pkg\">C</A>" + NL +
"<DD> "},
};
--- a/langtools/test/com/sun/javadoc/testInterface/TestInterface.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testInterface/TestInterface.java Sat Jan 24 16:35:17 2009 -0800
@@ -48,14 +48,14 @@
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "Interface.html",
- "int <B>method</B>()"},
+ "int <STRONG>method</STRONG>()"},
{BUG_ID + FS + "pkg" + FS + "Interface.html",
- "static final int <B>field</B>"},
+ "static final int <STRONG>field</STRONG>"},
// Make sure known implementing class list is correct and omits type parameters.
{BUG_ID + FS + "pkg" + FS + "Interface.html",
- "<DT><B>All Known Implementing Classes:</B> " +
+ "<DT><STRONG>All Known Implementing Classes:</STRONG> " +
"<DD><A HREF=\"../pkg/Child.html\" " +
"title=\"class in pkg\">Child</A>, " +
"<A HREF=\"../pkg/Parent.html\" title=\"class in pkg\">" +
@@ -63,34 +63,34 @@
// Make sure "All Implemented Interfaces": has substituted type parameters
{BUG_ID + FS + "pkg" + FS + "Child.html",
- "<B>All Implemented Interfaces:</B> <DD><A HREF=\"../pkg/Interface.html\" title=\"interface in pkg\">Interface</A><T>"
+ "<STRONG>All Implemented Interfaces:</STRONG> <DD><A HREF=\"../pkg/Interface.html\" title=\"interface in pkg\">Interface</A><T>"
},
//Make sure Class Tree has substituted type parameters.
{BUG_ID + FS + "pkg" + FS + "Child.html",
"<PRE>" + NL +
"java.lang.Object" + NL +
" <IMG SRC=\"../resources/inherit.gif\" ALT=\"extended by \"><A HREF=\"../pkg/Parent.html\" title=\"class in pkg\">pkg.Parent</A><T>" + NL +
- " <IMG SRC=\"../resources/inherit.gif\" ALT=\"extended by \"><B>pkg.Child<T></B>" + NL +
+ " <IMG SRC=\"../resources/inherit.gif\" ALT=\"extended by \"><STRONG>pkg.Child<T></STRONG>" + NL +
"</PRE>"
},
//Make sure "Direct Know Subclasses" omits type parameters
{BUG_ID + FS + "pkg" + FS + "Parent.html",
- "<B>Direct Known Subclasses:</B> <DD><A HREF=\"../pkg/Child.html\" title=\"class in pkg\">Child</A>"
+ "<STRONG>Direct Known Subclasses:</STRONG> <DD><A HREF=\"../pkg/Child.html\" title=\"class in pkg\">Child</A>"
},
//Make sure "Specified By" has substituted type parameters.
{BUG_ID + FS + "pkg" + FS + "Child.html",
- "<B>Specified by:</B><DD><CODE><A HREF=\"../pkg/Interface.html#method()\">method</A></CODE> in interface <CODE><A HREF=\"../pkg/Interface.html\" title=\"interface in pkg\">Interface</A><<A HREF=\"../pkg/Child.html\" title=\"type parameter in Child\">T</A>></CODE>"
+ "<STRONG>Specified by:</STRONG><DD><CODE><A HREF=\"../pkg/Interface.html#method()\">method</A></CODE> in interface <CODE><A HREF=\"../pkg/Interface.html\" title=\"interface in pkg\">Interface</A><<A HREF=\"../pkg/Child.html\" title=\"type parameter in Child\">T</A>></CODE>"
},
//Make sure "Overrides" has substituted type parameters.
{BUG_ID + FS + "pkg" + FS + "Child.html",
- "<B>Overrides:</B><DD><CODE><A HREF=\"../pkg/Parent.html#method()\">method</A></CODE> in class <CODE><A HREF=\"../pkg/Parent.html\" title=\"class in pkg\">Parent</A><<A HREF=\"../pkg/Child.html\" title=\"type parameter in Child\">T</A>></CODE>"
+ "<STRONG>Overrides:</STRONG><DD><CODE><A HREF=\"../pkg/Parent.html#method()\">method</A></CODE> in class <CODE><A HREF=\"../pkg/Parent.html\" title=\"class in pkg\">Parent</A><<A HREF=\"../pkg/Child.html\" title=\"type parameter in Child\">T</A>></CODE>"
},
};
private static final String[][] NEGATED_TEST = {
{BUG_ID + FS + "pkg" + FS + "Interface.html",
- "public int <B>method</B>()"},
+ "public int <STRONG>method</STRONG>()"},
{BUG_ID + FS + "pkg" + FS + "Interface.html",
- "public static final int <B>field</B>"},
+ "public static final int <STRONG>field</STRONG>"},
};
/**
--- a/langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java Sat Jan 24 16:35:17 2009 -0800
@@ -45,9 +45,9 @@
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "C.html",
- "<A HREF=\"../index.html?pkg/C.html\" target=\"_top\"><B>FRAMES</B></A>"},
+ "<A HREF=\"../index.html?pkg/C.html\" target=\"_top\"><STRONG>FRAMES</STRONG></A>"},
{BUG_ID + FS + "TestJavascript.html",
- "<A HREF=\"index.html?TestJavascript.html\" target=\"_top\"><B>FRAMES</B></A>"},
+ "<A HREF=\"index.html?TestJavascript.html\" target=\"_top\"><STRONG>FRAMES</STRONG></A>"},
{BUG_ID + FS + "index.html",
"<SCRIPT type=\"text/javascript\">" + NL +
" targetPage = \"\" + window.location.search;" + NL +
--- a/langtools/test/com/sun/javadoc/testLinkOption/TestLinkOption.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testLinkOption/TestLinkOption.java Sat Jan 24 16:35:17 2009 -0800
@@ -63,7 +63,7 @@
"title=\"class or interface in java.lang\">Object</A> p3)"
},
{BUG_ID + "-1" + FS + "java" + FS + "lang" + FS + "StringBuilderChild.html",
- "public abstract class <B>StringBuilderChild</B><DT>extends <A HREF=\"http://java.sun.com/j2se/1.4/docs/api/java/lang/Object.html?is-external=true\" title=\"class or interface in java.lang\">Object</A>"
+ "public abstract class <STRONG>StringBuilderChild</STRONG><DT>extends <A HREF=\"http://java.sun.com/j2se/1.4/docs/api/java/lang/Object.html?is-external=true\" title=\"class or interface in java.lang\">Object</A>"
},
};
--- a/langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java Sat Jan 24 16:35:17 2009 -0800
@@ -59,7 +59,7 @@
" Link to another inner class: <A HREF=\"../pkg/C.InnerC2.html\" title=\"class in pkg\"><CODE>C.InnerC2</CODE></A>"
},
{BUG_ID + FS + "pkg" + FS + "C.InnerC2.html",
- "Enclosing class:</B><DD><A HREF=\"../pkg/C.html\" title=\"class in pkg\">C</A>"
+ "Enclosing class:</STRONG><DD><A HREF=\"../pkg/C.html\" title=\"class in pkg\">C</A>"
},
};
private static final String[][] NEGATED_TEST = {
--- a/langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java Sat Jan 24 16:35:17 2009 -0800
@@ -64,13 +64,17 @@
// New labels as of 1.5.0
{BUG_ID + FS + "pkg" + FS + "SubClass.html",
- "<B>Nested classes/interfaces inherited from class pkg." +
"<A HREF=\"../pkg/BaseClass.html\" title=\"class in pkg\">" +
"BaseClass</A></B>"},
+ "<STRONG>Nested classes/interfaces inherited from class pkg." +
+ "<A HREF=\"../pkg/BaseClass.html\" title=\"class in pkg\">" +
+ "BaseClass</A></STRONG>"},
{BUG_ID + FS + "pkg" + FS + "SubClass.html",
- "<B>Nested classes/interfaces inherited from interface pkg." +
"<A HREF=\"../pkg/BaseInterface.html\" title=\"interface in pkg\">" +
"BaseInterface</A></B>"},
+ "<STRONG>Nested classes/interfaces inherited from interface pkg." +
+ "<A HREF=\"../pkg/BaseInterface.html\" title=\"interface in pkg\">" +
+ "BaseInterface</A></STRONG>"},
// Test overriding/implementing methods with generic parameters.
{BUG_ID + FS + "pkg" + FS + "BaseClass.html",
- "<DT><B>Specified by:</B><DD><CODE><A HREF=\"../pkg/BaseInterface.html#getAnnotation(java.lang.Class)\">getAnnotation</A></CODE> in interface <CODE><A HREF=\"../pkg/BaseInterface.html\" title=\"interface in pkg\">BaseInterface</A></CODE></DL>"},
+ "<DT><STRONG>Specified by:</STRONG><DD><CODE><A HREF=\"../pkg/BaseInterface.html#getAnnotation(java.lang.Class)\">getAnnotation</A></CODE> in interface <CODE><A HREF=\"../pkg/BaseInterface.html\" title=\"interface in pkg\">BaseInterface</A></CODE></DL>"},
// Test diamond inheritence member summary (6256068)
{BUG_ID + FS + "diamond" + FS + "Z.html",
--- a/langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java Sat Jan 24 16:35:17 2009 -0800
@@ -50,14 +50,14 @@
{BUG_ID + FS + "pkg" + FS + "PublicChild.html",
"<CODE> <A HREF=\"../pkg/PublicChild.html\" " +
"title=\"class in pkg\">PublicChild</A></CODE></FONT></TD>" + NL +
- "<TD><CODE><B><A HREF=\"../pkg/PublicChild.html#" +
- "returnTypeTest()\">returnTypeTest</A></B>()</CODE>"
+ "<TD><CODE><STRONG><A HREF=\"../pkg/PublicChild.html#" +
+ "returnTypeTest()\">returnTypeTest</A></STRONG>()</CODE>"
},
// Check return type in member detail.
{BUG_ID + FS + "pkg" + FS + "PublicChild.html",
"public <A HREF=\"../pkg/PublicChild.html\" " +
"title=\"class in pkg\">PublicChild</A> " +
- "<B>returnTypeTest</B>()"
+ "<STRONG>returnTypeTest</STRONG>()"
},
// Legacy anchor dimensions (6290760)
--- a/langtools/test/com/sun/javadoc/testNavagation/TestNavagation.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testNavagation/TestNavagation.java Sat Jan 24 16:35:17 2009 -0800
@@ -47,17 +47,17 @@
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "A.html", " PREV CLASS "},
{BUG_ID + FS + "pkg" + FS + "A.html",
- "<A HREF=\"../pkg/C.html\" title=\"class in pkg\"><B>NEXT CLASS</B></A>"},
+ "<A HREF=\"../pkg/C.html\" title=\"class in pkg\"><STRONG>NEXT CLASS</STRONG></A>"},
{BUG_ID + FS + "pkg" + FS + "C.html",
- "<A HREF=\"../pkg/A.html\" title=\"annotation in pkg\"><B>PREV CLASS</B></A>"},
+ "<A HREF=\"../pkg/A.html\" title=\"annotation in pkg\"><STRONG>PREV CLASS</STRONG></A>"},
{BUG_ID + FS + "pkg" + FS + "C.html",
- "<A HREF=\"../pkg/E.html\" title=\"enum in pkg\"><B>NEXT CLASS</B></A>"},
+ "<A HREF=\"../pkg/E.html\" title=\"enum in pkg\"><STRONG>NEXT CLASS</STRONG></A>"},
{BUG_ID + FS + "pkg" + FS + "E.html",
- "<A HREF=\"../pkg/C.html\" title=\"class in pkg\"><B>PREV CLASS</B></A>"},
+ "<A HREF=\"../pkg/C.html\" title=\"class in pkg\"><STRONG>PREV CLASS</STRONG></A>"},
{BUG_ID + FS + "pkg" + FS + "E.html",
- "<A HREF=\"../pkg/I.html\" title=\"interface in pkg\"><B>NEXT CLASS</B></A>"},
+ "<A HREF=\"../pkg/I.html\" title=\"interface in pkg\"><STRONG>NEXT CLASS</STRONG></A>"},
{BUG_ID + FS + "pkg" + FS + "I.html",
- "<A HREF=\"../pkg/E.html\" title=\"enum in pkg\"><B>PREV CLASS</B></A>"},
+ "<A HREF=\"../pkg/E.html\" title=\"enum in pkg\"><STRONG>PREV CLASS</STRONG></A>"},
{BUG_ID + FS + "pkg" + FS + "I.html", " NEXT CLASS"},
// Test for 4664607
{BUG_ID + FS + "pkg" + FS + "I.html",
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Sat Jan 24 16:35:17 2009 -0800
@@ -54,14 +54,14 @@
{BUG_ID + FS + "pkg" + FS + "Coin.html", "Enum Coin</H2>"},
//Make sure enum signature is correct.
{BUG_ID + FS + "pkg" + FS + "Coin.html", "public enum "+
- "<B>Coin</B><DT>extends java.lang.Enum<" +
+ "<STRONG>Coin</STRONG><DT>extends java.lang.Enum<" +
"<A HREF=\"../pkg/Coin.html\" title=\"enum in pkg\">Coin</A>>"
},
//Check for enum constant section
- {BUG_ID + FS + "pkg" + FS + "Coin.html", "<B>Enum Constant Summary</B>"},
+ {BUG_ID + FS + "pkg" + FS + "Coin.html", "<STRONG>Enum Constant Summary</STRONG>"},
//Detail for enum constant
{BUG_ID + FS + "pkg" + FS + "Coin.html",
- "<B><A HREF=\"../pkg/Coin.html#Dime\">Dime</A></B>"},
+ "<STRONG><A HREF=\"../pkg/Coin.html#Dime\">Dime</A></STRONG>"},
//Automatically insert documentation for values() and valueOf().
{BUG_ID + FS + "pkg" + FS + "Coin.html",
"Returns an array containing the constants of this enum type,"},
@@ -79,11 +79,11 @@
"Class TypeParameters<E></H2>"},
//Check class type parameters section.
{BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
- "<DT><B>Type Parameters:</B><DD><CODE>E</CODE> - " +
+ "<DT><STRONG>Type Parameters:</STRONG><DD><CODE>E</CODE> - " +
"the type parameter for this class."},
//Type parameters in @see/@link
{BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
- "<DT><B>See Also:</B><DD><A HREF=\"../pkg/TypeParameters.html\" " +
+ "<DT><STRONG>See Also:</STRONG><DD><A HREF=\"../pkg/TypeParameters.html\" " +
"title=\"class in pkg\"><CODE>TypeParameters</CODE></A></DL>"},
//Method that uses class type parameter.
{BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
@@ -91,13 +91,13 @@
"parameter in TypeParameters\">E</A> param)"},
//Method type parameter section.
{BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
- "<B>Type Parameters:</B><DD><CODE>T</CODE> - This is the first " +
+ "<STRONG>Type Parameters:</STRONG><DD><CODE>T</CODE> - This is the first " +
"type parameter.<DD><CODE>V</CODE> - This is the second type " +
"parameter."},
//Signature of method with type parameters
{BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
"public <T extends java.util.List,V> " +
- "java.lang.String[] <B>methodThatHasTypeParameters</B>"},
+ "java.lang.String[] <STRONG>methodThatHasTypeParameters</STRONG>"},
//Wildcard testing.
{BUG_ID + FS + "pkg" + FS + "Wildcards.html",
"<A HREF=\"../pkg/TypeParameters.html\" title=\"class in pkg\">" +
@@ -116,18 +116,18 @@
//Signature of subclass that has type parameters.
{BUG_ID + FS + "pkg" + FS + "TypeParameterSubClass.html",
- "public class <B>TypeParameterSubClass<T extends java.lang.String>" +
- "</B><DT>extends <A HREF=\"../pkg/TypeParameterSuperClass.html\" " +
+ "public class <STRONG>TypeParameterSubClass<T extends java.lang.String>" +
+ "</STRONG><DT>extends <A HREF=\"../pkg/TypeParameterSuperClass.html\" " +
"title=\"class in pkg\">TypeParameterSuperClass</A><T>"},
//Interface generic parameter substitution
//Signature of subclass that has type parameters.
{BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
- "<B>All Implemented Interfaces:</B> <DD><A HREF=\"../pkg/SubInterface.html\" title=\"interface in pkg\">SubInterface</A><E>, <A HREF=\"../pkg/SuperInterface.html\" title=\"interface in pkg\">SuperInterface</A><E></DD>"},
+ "<STRONG>All Implemented Interfaces:</STRONG> <DD><A HREF=\"../pkg/SubInterface.html\" title=\"interface in pkg\">SubInterface</A><E>, <A HREF=\"../pkg/SuperInterface.html\" title=\"interface in pkg\">SuperInterface</A><E></DD>"},
{BUG_ID + FS + "pkg" + FS + "SuperInterface.html",
- "<B>All Known Subinterfaces:</B> <DD><A HREF=\"../pkg/SubInterface.html\" title=\"interface in pkg\">SubInterface</A><V></DD>"},
+ "<STRONG>All Known Subinterfaces:</STRONG> <DD><A HREF=\"../pkg/SubInterface.html\" title=\"interface in pkg\">SubInterface</A><V></DD>"},
{BUG_ID + FS + "pkg" + FS + "SubInterface.html",
- "<B>All Superinterfaces:</B> <DD><A HREF=\"../pkg/SuperInterface.html\" title=\"interface in pkg\">SuperInterface</A><V></DD>"},
+ "<STRONG>All Superinterfaces:</STRONG> <DD><A HREF=\"../pkg/SuperInterface.html\" title=\"interface in pkg\">SuperInterface</A><V></DD>"},
//=================================
// VAR ARG TESTING
@@ -155,18 +155,18 @@
"Annotation Type AnnotationType</H2>"},
//Make sure the signature is correct.
{BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
- "public @interface <B>AnnotationType</B>"},
+ "public @interface <STRONG>AnnotationType</STRONG>"},
//Make sure member summary headings are correct.
{BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
- "<B>Required Element Summary</B>"},
+ "<STRONG>Required Element Summary</STRONG>"},
{BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
- "<B>Optional Element Summary</B>"},
+ "<STRONG>Optional Element Summary</STRONG>"},
//Make sure element detail heading is correct
{BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
"Element Detail"},
//Make sure default annotation type value is printed when necessary.
{BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
- "<B>Default:</B><DD>\"unknown\"</DD>"},
+ "<STRONG>Default:</STRONG><DD>\"unknown\"</DD>"},
//=================================
// ANNOTATION TYPE USAGE TESTING
@@ -182,40 +182,40 @@
"<FONT SIZE=\"-1\">" +
"<A HREF=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</A>(<A HREF=\"../pkg/AnnotationType.html#optional()\">optional</A>=\"Class Annotation\","+NL +
" <A HREF=\"../pkg/AnnotationType.html#required()\">required</A>=1994)"+NL +
- "</FONT>public class <B>AnnotationTypeUsage</B><DT>extends java.lang.Object</DL>"},
+ "</FONT>public class <STRONG>AnnotationTypeUsage</STRONG><DT>extends java.lang.Object</DL>"},
//FIELD
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
"<FONT SIZE=\"-1\">" +
"<A HREF=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</A>(<A HREF=\"../pkg/AnnotationType.html#optional()\">optional</A>=\"Field Annotation\","+NL +
" <A HREF=\"../pkg/AnnotationType.html#required()\">required</A>=1994)"+NL +
- "</FONT>public int <B>field</B>"},
+ "</FONT>public int <STRONG>field</STRONG>"},
//CONSTRUCTOR
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
"<FONT SIZE=\"-1\">" +
"<A HREF=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</A>(<A HREF=\"../pkg/AnnotationType.html#optional()\">optional</A>=\"Constructor Annotation\","+NL +
" <A HREF=\"../pkg/AnnotationType.html#required()\">required</A>=1994)"+NL +
- "</FONT>public <B>AnnotationTypeUsage</B>()"},
+ "</FONT>public <STRONG>AnnotationTypeUsage</STRONG>()"},
//METHOD
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
"<FONT SIZE=\"-1\">" +
"<A HREF=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</A>(<A HREF=\"../pkg/AnnotationType.html#optional()\">optional</A>=\"Method Annotation\","+NL +
" <A HREF=\"../pkg/AnnotationType.html#required()\">required</A>=1994)"+NL +
- "</FONT>public void <B>method</B>()"},
+ "</FONT>public void <STRONG>method</STRONG>()"},
//METHOD PARAMS
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
"<PRE>" + NL +
- "public void <B>methodWithParams</B>(<FONT SIZE=\"-1\"><A HREF=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</A>(<A HREF=\"../pkg/AnnotationType.html#optional()\">optional</A>=\"Parameter Annotation\",<A HREF=\"../pkg/AnnotationType.html#required()\">required</A>=1994)</FONT>" + NL +
+ "public void <STRONG>methodWithParams</STRONG>(<FONT SIZE=\"-1\"><A HREF=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</A>(<A HREF=\"../pkg/AnnotationType.html#optional()\">optional</A>=\"Parameter Annotation\",<A HREF=\"../pkg/AnnotationType.html#required()\">required</A>=1994)</FONT>" + NL +
" int documented," + NL +
" int undocmented)</PRE>"},
//CONSTRUCTOR PARAMS
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
"<PRE>" + NL +
- "public <B>AnnotationTypeUsage</B>(<FONT SIZE=\"-1\"><A HREF=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</A>(<A HREF=\"../pkg/AnnotationType.html#optional()\">optional</A>=\"Constructor Param Annotation\",<A HREF=\"../pkg/AnnotationType.html#required()\">required</A>=1994)</FONT>" + NL +
+ "public <STRONG>AnnotationTypeUsage</STRONG>(<FONT SIZE=\"-1\"><A HREF=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</A>(<A HREF=\"../pkg/AnnotationType.html#optional()\">optional</A>=\"Constructor Param Annotation\",<A HREF=\"../pkg/AnnotationType.html#required()\">required</A>=1994)</FONT>" + NL +
" int documented," + NL +
" int undocmented)</PRE>"},
@@ -270,7 +270,7 @@
{BUG_ID + FS + "pkg1" + FS + "B.html",
"<PRE><FONT SIZE=\"-1\"><A HREF=\"../pkg1/A.html\" title=\"annotation in pkg1\">@A</A>"},
{BUG_ID + FS + "pkg1" + FS + "B.html",
- "</FONT>public interface <B>B</B></DL>" + NL +
+ "</FONT>public interface <STRONG>B</STRONG></DL>" + NL +
"</PRE>"},
@@ -278,7 +278,7 @@
// Handle multiple bounds.
//==============================================================
{BUG_ID + FS + "pkg" + FS + "MultiTypeParameters.html",
- "public <T extends java.lang.Number & java.lang.Runnable> T <B>foo</B>(T t)"},
+ "public <T extends java.lang.Number & java.lang.Runnable> T <STRONG>foo</STRONG>(T t)"},
//==============================================================
// Test Class-Use Documenation for Type Parameters.
@@ -289,13 +289,13 @@
"<TH ALIGN=\"left\" COLSPAN=\"2\">Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo</A></FONT></TH>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
- "<TD><CODE><B><A HREF=\"../../pkg2/ClassUseTest1.html\" title=\"class in pkg2\">ClassUseTest1<T extends Foo & Foo2></A></B></CODE>"
+ "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest1.html\" title=\"class in pkg2\">ClassUseTest1<T extends Foo & Foo2></A></STRONG></CODE>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
"<TH ALIGN=\"left\" COLSPAN=\"2\">Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo</A></FONT></TH>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
- "<TD><CODE><B>ClassUseTest1.</B><B><A HREF=\"../../pkg2/ClassUseTest1.html#method(T)\">method</A></B>(T t)</CODE>"
+ "<TD><CODE><STRONG>ClassUseTest1.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest1.html#method(T)\">method</A></STRONG>(T t)</CODE>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
"<TH ALIGN=\"left\" COLSPAN=\"2\">Fields in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo</A></FONT></TH>"
@@ -315,13 +315,13 @@
"<TH ALIGN=\"left\" COLSPAN=\"2\">Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/Foo2.html\" title=\"interface in pkg2\">Foo2</A></FONT></TH>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html",
- "<TD><CODE><B><A HREF=\"../../pkg2/ClassUseTest1.html\" title=\"class in pkg2\">ClassUseTest1<T extends Foo & Foo2></A></B></CODE>"
+ "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest1.html\" title=\"class in pkg2\">ClassUseTest1<T extends Foo & Foo2></A></STRONG></CODE>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html",
"<TH ALIGN=\"left\" COLSPAN=\"2\">Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/Foo2.html\" title=\"interface in pkg2\">Foo2</A></FONT></TH>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html",
- "<TD><CODE><B>ClassUseTest1.</B><B><A HREF=\"../../pkg2/ClassUseTest1.html#method(T)\">method</A></B>(T t)</CODE>"
+ "<TD><CODE><STRONG>ClassUseTest1.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest1.html#method(T)\">method</A></STRONG>(T t)</CODE>"
},
//ClassUseTest2: <T extends ParamTest<Foo3>>
@@ -329,13 +329,13 @@
"<TH ALIGN=\"left\" COLSPAN=\"2\">Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest</A></FONT></TH>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
- "<TD><CODE><B><A HREF=\"../../pkg2/ClassUseTest2.html\" title=\"class in pkg2\">ClassUseTest2<T extends ParamTest<<A HREF=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">Foo3</A>>></A></B></CODE>"
+ "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest2.html\" title=\"class in pkg2\">ClassUseTest2<T extends ParamTest<<A HREF=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">Foo3</A>>></A></STRONG></CODE>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
"<TH ALIGN=\"left\" COLSPAN=\"2\">Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest</A></FONT></TH>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
- "<TD><CODE><B>ClassUseTest2.</B><B><A HREF=\"../../pkg2/ClassUseTest2.html#method(T)\">method</A></B>(T t)</CODE>"
+ "<TD><CODE><STRONG>ClassUseTest2.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest2.html#method(T)\">method</A></STRONG>(T t)</CODE>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
"<TH ALIGN=\"left\" COLSPAN=\"2\">Fields in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> declared as <A HREF=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest</A></FONT></TH>"
@@ -354,13 +354,13 @@
"<TH ALIGN=\"left\" COLSPAN=\"2\">Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">Foo3</A></FONT></TH>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
- "<TD><CODE><B><A HREF=\"../../pkg2/ClassUseTest2.html\" title=\"class in pkg2\">ClassUseTest2<T extends ParamTest<<A HREF=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">Foo3</A>>></A></B></CODE>"
+ "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest2.html\" title=\"class in pkg2\">ClassUseTest2<T extends ParamTest<<A HREF=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">Foo3</A>>></A></STRONG></CODE>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
"<TH ALIGN=\"left\" COLSPAN=\"2\">Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">Foo3</A></FONT></TH>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
- "<TD><CODE><B>ClassUseTest2.</B><B><A HREF=\"../../pkg2/ClassUseTest2.html#method(T)\">method</A></B>(T t)</CODE>"
+ "<TD><CODE><STRONG>ClassUseTest2.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest2.html#method(T)\">method</A></STRONG>(T t)</CODE>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
"<TH ALIGN=\"left\" COLSPAN=\"2\">Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> that return types with arguments of type <A HREF=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">Foo3</A></FONT></TH>"
@@ -374,13 +374,13 @@
"<TH ALIGN=\"left\" COLSPAN=\"2\">Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">ParamTest2</A></FONT></TH>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
- "<TD><CODE><B><A HREF=\"../../pkg2/ClassUseTest3.html\" title=\"class in pkg2\">ClassUseTest3<T extends ParamTest2<java.util.List<? extends Foo4>>></A></B></CODE>"
+ "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest3.html\" title=\"class in pkg2\">ClassUseTest3<T extends ParamTest2<java.util.List<? extends Foo4>>></A></STRONG></CODE>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
"<TH ALIGN=\"left\" COLSPAN=\"2\">Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">ParamTest2</A></FONT></TH>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
- "<TD><CODE><B>ClassUseTest3.</B><B><A HREF=\"../../pkg2/ClassUseTest3.html#method(T)\">method</A></B>(T t)</CODE>"
+ "<TD><CODE><STRONG>ClassUseTest3.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest3.html#method(T)\">method</A></STRONG>(T t)</CODE>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
"<TH ALIGN=\"left\" COLSPAN=\"2\">Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">ParamTest2</A></FONT></TH>"
@@ -393,13 +393,13 @@
"<TH ALIGN=\"left\" COLSPAN=\"2\">Classes in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</A></FONT></TH>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
- "<TD><CODE><B><A HREF=\"../../pkg2/ClassUseTest3.html\" title=\"class in pkg2\">ClassUseTest3<T extends ParamTest2<java.util.List<? extends Foo4>>></A></B></CODE>"
+ "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest3.html\" title=\"class in pkg2\">ClassUseTest3<T extends ParamTest2<java.util.List<? extends Foo4>>></A></STRONG></CODE>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
"<TH ALIGN=\"left\" COLSPAN=\"2\">Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type parameters of type <A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</A></FONT></TH>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
- "<TD><CODE><B>ClassUseTest3.</B><B><A HREF=\"../../pkg2/ClassUseTest3.html#method(T)\">method</A></B>(T t)</CODE>"
+ "<TD><CODE><STRONG>ClassUseTest3.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest3.html#method(T)\">method</A></STRONG>(T t)</CODE>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
"<TH ALIGN=\"left\" COLSPAN=\"2\">Methods in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> that return types with arguments of type <A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</A></FONT></TH>"
@@ -415,13 +415,13 @@
"<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
"<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL +
"<CODE> void</CODE></FONT></TD>" + NL +
- "<TD><CODE><B>ClassUseTest3.</B><B><A HREF=\"../../pkg2/ClassUseTest3.html#method(java.util.Set)\">method</A></B>(java.util.Set<<A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</A>> p)</CODE>"
+ "<TD><CODE><STRONG>ClassUseTest3.</STRONG><STRONG><A HREF=\"../../pkg2/ClassUseTest3.html#method(java.util.Set)\">method</A></STRONG>(java.util.Set<<A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</A>> p)</CODE>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
"<TH ALIGN=\"left\" COLSPAN=\"2\">Constructor parameters in <A HREF=\"../../pkg2/package-summary.html\">pkg2</A> with type arguments of type <A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</A></FONT></TH>" + NL +
"</TR>" + NL +
"<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
- "<TD><CODE><B><A HREF=\"../../pkg2/ClassUseTest3.html#ClassUseTest3(java.util.Set)\">ClassUseTest3</A></B>(java.util.Set<<A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</A>> p)</CODE>"
+ "<TD><CODE><STRONG><A HREF=\"../../pkg2/ClassUseTest3.html#ClassUseTest3(java.util.Set)\">ClassUseTest3</A></STRONG>(java.util.Set<<A HREF=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">Foo4</A>> p)</CODE>"
},
//=================================
@@ -432,7 +432,7 @@
"Packages with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" title=\"annotation in pkg\">AnnotationType</A></FONT></TH>" + NL +
"</TR>" + NL +
"<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
- "<TD><A HREF=\"../../pkg/package-summary.html\"><B>pkg</B></A></TD>"
+ "<TD><A HREF=\"../../pkg/package-summary.html\"><STRONG>pkg</STRONG></A></TD>"
},
{BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
@@ -441,7 +441,7 @@
"<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
"<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL +
"<CODE> class</CODE></FONT></TD>" + NL +
- "<TD><CODE><B><A HREF=\"../../pkg/AnnotationTypeUsage.html\" title=\"class in pkg\">AnnotationTypeUsage</A></B></CODE>"
+ "<TD><CODE><STRONG><A HREF=\"../../pkg/AnnotationTypeUsage.html\" title=\"class in pkg\">AnnotationTypeUsage</A></STRONG></CODE>"
},
{BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
@@ -450,7 +450,7 @@
"<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
"<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL +
"<CODE> int</CODE></FONT></TD>" + NL +
- "<TD><CODE><B>AnnotationTypeUsage.</B><B><A HREF=\"../../pkg/AnnotationTypeUsage.html#field\">field</A></B></CODE>"
+ "<TD><CODE><STRONG>AnnotationTypeUsage.</STRONG><STRONG><A HREF=\"../../pkg/AnnotationTypeUsage.html#field\">field</A></STRONG></CODE>"
},
{BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
@@ -459,7 +459,7 @@
"<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
"<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL +
"<CODE> void</CODE></FONT></TD>" + NL +
- "<TD><CODE><B>AnnotationTypeUsage.</B><B><A HREF=\"../../pkg/AnnotationTypeUsage.html#method()\">method</A></B>()</CODE>"
+ "<TD><CODE><STRONG>AnnotationTypeUsage.</STRONG><STRONG><A HREF=\"../../pkg/AnnotationTypeUsage.html#method()\">method</A></STRONG>()</CODE>"
},
{BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
@@ -468,7 +468,7 @@
"<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
"<TD ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\"><FONT SIZE=\"-1\">" + NL +
"<CODE> void</CODE></FONT></TD>" + NL +
- "<TD><CODE><B>AnnotationTypeUsage.</B><B><A HREF=\"../../pkg/AnnotationTypeUsage.html#methodWithParams(int, int)\">methodWithParams</A></B>(int documented," + NL +
+ "<TD><CODE><STRONG>AnnotationTypeUsage.</STRONG><STRONG><A HREF=\"../../pkg/AnnotationTypeUsage.html#methodWithParams(int, int)\">methodWithParams</A></STRONG>(int documented," + NL +
" int undocmented)</CODE>"
},
@@ -476,14 +476,14 @@
"Constructors in <A HREF=\"../../pkg/package-summary.html\">pkg</A> with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" title=\"annotation in pkg\">AnnotationType</A></FONT></TH>" + NL +
"</TR>" + NL +
"<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
- "<TD><CODE><B><A HREF=\"../../pkg/AnnotationTypeUsage.html#AnnotationTypeUsage()\">AnnotationTypeUsage</A></B>()</CODE>"
+ "<TD><CODE><STRONG><A HREF=\"../../pkg/AnnotationTypeUsage.html#AnnotationTypeUsage()\">AnnotationTypeUsage</A></STRONG>()</CODE>"
},
{BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
"Constructor parameters in <A HREF=\"../../pkg/package-summary.html\">pkg</A> with annotations of type <A HREF=\"../../pkg/AnnotationType.html\" title=\"annotation in pkg\">AnnotationType</A></FONT></TH>" + NL +
"</TR>" + NL +
"<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + NL +
- "<TD><CODE><B><A HREF=\"../../pkg/AnnotationTypeUsage.html#AnnotationTypeUsage(int, int)\">AnnotationTypeUsage</A></B>(int documented," + NL +
+ "<TD><CODE><STRONG><A HREF=\"../../pkg/AnnotationTypeUsage.html#AnnotationTypeUsage(int, int)\">AnnotationTypeUsage</A></STRONG>(int documented," + NL +
" int undocmented)</CODE>"
},
@@ -491,13 +491,13 @@
// TYPE PARAMETER IN INDEX
//=================================
{BUG_ID + FS + "index-all.html",
- "<A HREF=\"./pkg2/Foo.html#method(java.util.Vector)\"><B>method(Vector<Object>)</B></A>"
+ "<A HREF=\"./pkg2/Foo.html#method(java.util.Vector)\"><STRONG>method(Vector<Object>)</STRONG></A>"
},
//=================================
// TYPE PARAMETER IN INDEX
//=================================
{BUG_ID + FS + "index-all.html",
- "<A HREF=\"./pkg2/Foo.html#method(java.util.Vector)\"><B>method(Vector<Object>)</B></A>"
+ "<A HREF=\"./pkg2/Foo.html#method(java.util.Vector)\"><STRONG>method(Vector<Object>)</STRONG></A>"
},
};
private static final String[][] NEGATED_TEST = {
@@ -505,7 +505,7 @@
// ENUM TESTING
//=================================
//NO constructor section
- {BUG_ID + FS + "pkg" + FS + "Coin.html", "<B>Constructor Summary</B>"},
+ {BUG_ID + FS + "pkg" + FS + "Coin.html", "<STRONG>Constructor Summary</STRONG>"},
//=================================
// TYPE PARAMETER TESTING
//=================================
@@ -525,28 +525,28 @@
"<FONT SIZE=\"-1\">" + NL +
"<A HREF=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</A>(<A HREF=\"../pkg/AnnotationType.html#optional\">optional</A>=\"Class Annotation\"," + NL +
" <A HREF=\"../pkg/AnnotationType.html#required\">required</A>=1994)" + NL +
- "</FONT>public class <B>AnnotationTypeUsage</B><DT>extends java.lang.Object</DL>"},
+ "</FONT>public class <STRONG>AnnotationTypeUsage</STRONG><DT>extends java.lang.Object</DL>"},
//FIELD
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
"<FONT SIZE=\"-1\">" + NL +
"<A HREF=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</A>(<A HREF=\"../pkg/AnnotationType.html#optional\">optional</A>=\"Field Annotation\"," + NL +
" <A HREF=\"../pkg/AnnotationType.html#required\">required</A>=1994)" + NL +
- "</FONT>public int <B>field</B>"},
+ "</FONT>public int <STRONG>field</STRONG>"},
//CONSTRUCTOR
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
"<FONT SIZE=\"-1\">" + NL +
"<A HREF=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</A>(<A HREF=\"../pkg/AnnotationType.html#optional\">optional</A>=\"Constructor Annotation\"," + NL +
" <A HREF=\"../pkg/AnnotationType.html#required\">required</A>=1994)" + NL +
- "</FONT>public <B>AnnotationTypeUsage</B>()"},
+ "</FONT>public <STRONG>AnnotationTypeUsage</STRONG>()"},
//METHOD
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
"<FONT SIZE=\"-1\">" + NL +
"<A HREF=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</A>(<A HREF=\"../pkg/AnnotationType.html#optional\">optional</A>=\"Method Annotation\"," + NL +
" <A HREF=\"../pkg/AnnotationType.html#required\">required</A>=1994)" + NL +
- "</FONT>public void <B>method</B>()"},
+ "</FONT>public void <STRONG>method</STRONG>()"},
//=================================
// Make sure annotation types do not
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java Sat Jan 24 16:35:17 2009 -0800
@@ -46,9 +46,9 @@
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
- "<B>Description copied from class: <CODE>" +
+ "<STRONG>Description copied from class: <CODE>" +
"<A HREF=\"../pkg1/BaseClass.html#overridenMethodWithDocsToCopy()\">" +
- "BaseClass</A></CODE></B>"
+ "BaseClass</A></CODE></STRONG>"
}
};
private static final String[][] NEGATED_TEST = NO_TEST;
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java Sat Jan 24 16:35:17 2009 -0800
@@ -40,11 +40,11 @@
private static final String[][] TEST = {
//The public method should be overriden
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#publicMethod"},
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#publicMethod"},
//The public method in different package should be overriden
{BUG_ID + FS + "pkg2" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#publicMethod"}
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#publicMethod"}
};
private static final String[][] NEGATED_TEST = {
@@ -52,20 +52,20 @@
//The package private method should be overriden since the base and sub class are in the same
//package. However, the link should not show up because the package private methods are not documented.
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#packagePrivateMethod"},
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#packagePrivateMethod"},
//The private method in should not be overriden
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#privateMethod"},
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#privateMethod"},
//The private method in different package should not be overriden
{BUG_ID + FS + "pkg2" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#privateMethod"},
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#privateMethod"},
//The package private method should not be overriden since the base and sub class are in
//different packages.
{BUG_ID + FS + "pkg2" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#packagePrivateMethod"}
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#packagePrivateMethod"}
};
private static final String[] ARGS =
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java Sat Jan 24 16:35:17 2009 -0800
@@ -40,32 +40,32 @@
private static final String[][] TEST = {
//The public method should be overriden
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#publicMethod"},
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#publicMethod"},
//The public method in different package should be overriden
{BUG_ID + FS + "pkg2" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#publicMethod"},
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#publicMethod"},
//The package private method should be overriden since the base and sub class are in the same
//package.
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#packagePrivateMethod"}
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#packagePrivateMethod"}
};
private static final String[][] NEGATED_TEST = {
//The private method in should not be overriden
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#privateMethod"},
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#privateMethod"},
//The private method in different package should not be overriden
{BUG_ID + FS + "pkg2" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#privateMethod"},
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#privateMethod"},
//The package private method should not be overriden since the base and sub class are in
//different packages.
{BUG_ID + FS + "pkg2" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#packagePrivateMethod"},
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#packagePrivateMethod"},
};
private static final String[] ARGS =
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java Sat Jan 24 16:35:17 2009 -0800
@@ -40,32 +40,32 @@
private static final String[][] TEST = {
//The public method should be overriden
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#publicMethod"},
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#publicMethod"},
//The package private method should be overriden since the base and sub class are in the same
//package.
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#packagePrivateMethod"},
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#packagePrivateMethod"},
//The public method in different package should be overriden
{BUG_ID + FS + "pkg2" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#publicMethod"},
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#publicMethod"},
};
private static final String[][] NEGATED_TEST = {
//The private method in should not be overriden
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#privateMethod"},
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#privateMethod"},
//The private method in different package should not be overriden
{BUG_ID + FS + "pkg2" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#privateMethod"},
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#privateMethod"},
//The package private method should not be overriden since the base and sub class are in
//different packages.
{BUG_ID + FS + "pkg2" + FS + "SubClass.html",
- "Overrides:</B><DD><CODE><A HREF=\"../pkg1/BaseClass.html#packagePrivateMethod"}
+ "Overrides:</STRONG><DD><CODE><A HREF=\"../pkg1/BaseClass.html#packagePrivateMethod"}
};
--- a/langtools/test/com/sun/javadoc/testPackagePage/TestPackagePage.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testPackagePage/TestPackagePage.java Sat Jan 24 16:35:17 2009 -0800
@@ -43,23 +43,24 @@
},
//With just one package, all general pages link to the single package page.
{BUG_ID + "-1" + FS + "com" + FS + "pkg" + FS + "C.html",
- "<A HREF=\"../../com/pkg/package-summary.html\">" +
"<FONT CLASS=\"NavBarFont1\"><B>Package</B></FONT></A>"
+ "<A HREF=\"../../com/pkg/package-summary.html\">" +
+ "<FONT CLASS=\"NavBarFont1\"><STRONG>Package</STRONG></FONT></A>"
},
{BUG_ID + "-1" + FS + "com" + FS + "pkg" + FS + "package-tree.html",
"<A HREF=\"../../com/pkg/package-summary.html\">" +
- "<FONT CLASS=\"NavBarFont1\"><B>Package</B></FONT></A>"
+ "<FONT CLASS=\"NavBarFont1\"><STRONG>Package</STRONG></FONT></A>"
},
{BUG_ID + "-1" + FS + "deprecated-list.html",
"<A HREF=\"com/pkg/package-summary.html\">" +
- "<FONT CLASS=\"NavBarFont1\"><B>Package</B></FONT></A>"
+ "<FONT CLASS=\"NavBarFont1\"><STRONG>Package</STRONG></FONT></A>"
},
{BUG_ID + "-1" + FS + "index-all.html",
"<A HREF=\"./com/pkg/package-summary.html\">" +
- "<FONT CLASS=\"NavBarFont1\"><B>Package</B></FONT></A>"
+ "<FONT CLASS=\"NavBarFont1\"><STRONG>Package</STRONG></FONT></A>"
},
{BUG_ID + "-1" + FS + "help-doc.html",
"<A HREF=\"com/pkg/package-summary.html\">" +
- "<FONT CLASS=\"NavBarFont1\"><B>Package</B></FONT></A>"
+ "<FONT CLASS=\"NavBarFont1\"><STRONG>Package</STRONG></FONT></A>"
},
};
--- a/langtools/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java Sat Jan 24 16:35:17 2009 -0800
@@ -48,12 +48,12 @@
private static final String[][] TEST = {
//Regular param tags.
{BUG_ID + FS + "pkg" + FS + "C.html",
- "<B>Parameters:</B><DD><CODE>param1</CODE> - testing 1 2 3." +
+ "<STRONG>Parameters:</STRONG><DD><CODE>param1</CODE> - testing 1 2 3." +
"<DD><CODE>param2</CODE> - testing 1 2 3."
},
//Param tags that don't match with any real parameters.
{BUG_ID + FS + "pkg" + FS + "C.html",
- "<B>Parameters:</B><DD><CODE><I>p1</I></CODE> - testing 1 2 3." +
+ "<STRONG>Parameters:</STRONG><DD><CODE><I>p1</I></CODE> - testing 1 2 3." +
"<DD><CODE><I>p2</I></CODE> - testing 1 2 3."
},
//{@inherit} doc misuse does not cause doclet to throw exception.
--- a/langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java Sat Jan 24 16:35:17 2009 -0800
@@ -85,22 +85,22 @@
"<PRE>" + NL +
"java.lang.Object" + NL +
" <IMG SRC=\"../resources/inherit.gif\" " +
- "ALT=\"extended by \"><B>pkg.PublicChild</B>" + NL +
+ "ALT=\"extended by \"><STRONG>pkg.PublicChild</STRONG>" + NL +
"</PRE>"
},
// Method is documented as though it is declared in the inheriting method.
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
- "public void <B>methodInheritedFromParent</B>(int p1)"
+ "public void <STRONG>methodInheritedFromParent</STRONG>(int p1)"
},
//Make sure implemented interfaces from private superclass are inherited
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicInterface.html",
- "<B>All Known Implementing Classes:</B> <DD><A HREF=\"../pkg/PublicChild.html\" " +
+ "<STRONG>All Known Implementing Classes:</STRONG> <DD><A HREF=\"../pkg/PublicChild.html\" " +
"title=\"class in pkg\">PublicChild</A>"},
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
- "<B>All Implemented Interfaces:</B> <DD><A HREF=\"../pkg/PublicInterface.html\" " +
+ "<STRONG>All Implemented Interfaces:</STRONG> <DD><A HREF=\"../pkg/PublicInterface.html\" " +
"title=\"interface in pkg\">PublicInterface</A>"},
//Generic interface method test.
@@ -110,12 +110,12 @@
private static final String[][] NEGATED_TEST1 = {
// Should not document that a method overrides method from private class.
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
- "<B>Overrides:</B>"},
+ "<STRONG>Overrides:</STRONG>"},
// Should not document that a method specified by private interface.
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
- "<B>Specified by:</B>"},
+ "<STRONG>Specified by:</STRONG>"},
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicInterface.html",
- "<B>Specified by:</B>"},
+ "<STRONG>Specified by:</STRONG>"},
// Should not mention that any documentation was copied.
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
"Description copied from"},
@@ -137,7 +137,7 @@
//Do not inherit private interface method with generic parameters.
//This method has been implemented.
{BUG_ID + "-1" + FS + "pkg2" + FS + "C.html",
- "<B><A HREF=\"../pkg2/I.html#hello(T)\">hello</A></B>"},
+ "<STRONG><A HREF=\"../pkg2/I.html#hello(T)\">hello</A></STRONG>"},
};
// Test output when -private flag is used.
@@ -174,14 +174,14 @@
},
// Should document that a method overrides method from private class.
{BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
- "<B>Overrides:</B><DD><CODE>" +
+ "<STRONG>Overrides:</STRONG><DD><CODE>" +
"<A HREF=\"../pkg/PrivateParent.html#methodOverridenFromParent(char[], int, T, V, java.util.List)\">" +
"methodOverridenFromParent</A></CODE> in class <CODE>" +
"<A HREF=\"../pkg/PrivateParent.html\" title=\"class in pkg\">" +
"PrivateParent</A></CODE></DL>"},
// Should document that a method is specified by private interface.
{BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
- "<B>Specified by:</B><DD><CODE>" +
+ "<STRONG>Specified by:</STRONG><DD><CODE>" +
"<A HREF=\"../pkg/PrivateInterface.html#methodInterface(int)\">" +
"methodInterface</A></CODE> in interface <CODE>" +
"<A HREF=\"../pkg/PrivateInterface.html\" title=\"interface in pkg\">" +
@@ -209,12 +209,12 @@
//Make sure implemented interfaces from private superclass are inherited
{BUG_ID + "-2" + FS + "pkg" + FS + "PublicInterface.html",
- "<B>All Known Implementing Classes:</B> <DD><A HREF=\"../pkg/PrivateParent.html\" " +
+ "<STRONG>All Known Implementing Classes:</STRONG> <DD><A HREF=\"../pkg/PrivateParent.html\" " +
"title=\"class in pkg\">PrivateParent</A>, " +
"<A HREF=\"../pkg/PublicChild.html\" title=\"class in pkg\">PublicChild</A>"},
{BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
- "<B>All Implemented Interfaces:</B> <DD><A HREF=\"../pkg/PrivateInterface.html\" " +
+ "<STRONG>All Implemented Interfaces:</STRONG> <DD><A HREF=\"../pkg/PrivateInterface.html\" " +
"title=\"interface in pkg\">PrivateInterface</A>, " +
"<A HREF=\"../pkg/PublicInterface.html\" title=\"interface in pkg\">" +
"PublicInterface</A>"},
@@ -222,10 +222,13 @@
//Since private flag is used, we can document that private interface method
//with generic parameters has been implemented.
{BUG_ID + "-2" + FS + "pkg2" + FS + "C.html",
- "<B>Description copied from interface: " +
"<CODE><A HREF=\"../pkg2/I.html#hello(T)\">I</A></CODE></B>"},
+ "<STRONG>Description copied from interface: " +
+ "<CODE><A HREF=\"../pkg2/I.html#hello(T)\">I</A></CODE></STRONG>"},
{BUG_ID + "-2" + FS + "pkg2" + FS + "C.html",
- "<B>Specified by:</B><DD><CODE><A HREF=\"../pkg2/I.html#hello(T)\">" +
"hello</A></CODE> in interface <CODE><A HREF=\"../pkg2/I.html\" " +
"title=\"interface in pkg2\">I</A>"},
+ "<STRONG>Specified by:</STRONG><DD><CODE><A HREF=\"../pkg2/I.html#hello(T)\">" +
+ "hello</A></CODE> in interface <CODE><A HREF=\"../pkg2/I.html\" " +
+ "title=\"interface in pkg2\">I</A>"},
};
private static final String[][] NEGATED_TEST2 = NO_TEST;
--- a/langtools/test/com/sun/javadoc/testSerializedForm/TestSerializedForm.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testSerializedForm/TestSerializedForm.java Sat Jan 24 16:35:17 2009 -0800
@@ -47,11 +47,11 @@
private static final String[][] TEST = {
{BUG_ID + FS + "serialized-form.html",
- "protected java.lang.Object <B>readResolve</B>()"},
+ "protected java.lang.Object <STRONG>readResolve</STRONG>()"},
{BUG_ID + FS + "serialized-form.html",
- "protected java.lang.Object <B>writeReplace</B>()"},
+ "protected java.lang.Object <STRONG>writeReplace</STRONG>()"},
{BUG_ID + FS + "serialized-form.html",
- "protected java.lang.Object <B>readObjectNoData</B>()"},
+ "protected java.lang.Object <STRONG>readObjectNoData</STRONG>()"},
{BUG_ID + FS + "serialized-form.html",
"See Also"},
};
--- a/langtools/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java Sat Jan 24 16:35:17 2009 -0800
@@ -42,13 +42,13 @@
private static final String[][] TEST =
new String[][] {
{"./" + BUG_ID + "/C.html",
- "<B>Todo:</B>"},
+ "<STRONG>Todo:</STRONG>"},
{"./" + BUG_ID + "/C.html",
- "<B>EJB Beans:</B>"},
+ "<STRONG>EJB Beans:</STRONG>"},
{"./" + BUG_ID + "/C.html",
- "<B>Regular Tag:</B>"},
+ "<STRONG>Regular Tag:</STRONG>"},
{"./" + BUG_ID + "/C.html",
- "<B>Back-Slash-Tag:</B>"},
+ "<STRONG>Back-Slash-Tag:</STRONG>"},
};
private static final String[] ARGS = new String[] {
--- a/langtools/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java Sat Jan 24 16:35:17 2009 -0800
@@ -46,7 +46,7 @@
//Input for string search tests.
private static final String[][] TEST = {
- {BUG_ID + FS + "C.html", "<B>Method Summary</B>"}
+ {BUG_ID + FS + "C.html", "<STRONG>Method Summary</STRONG>"}
};
private static final String[][] NEGATED_TEST = NO_TEST;
--- a/langtools/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java Sat Jan 24 16:35:17 2009 -0800
@@ -38,7 +38,7 @@
private static final String BUG_ID = "4530727";
private static final String[][] TEST = {
- {BUG_ID + FS + "C.html", "<DT><B>Throws:</B>"}
+ {BUG_ID + FS + "C.html", "<DT><STRONG>Throws:</STRONG>"}
};
private static final String[][] NEGATED_TEST = NO_TEST;
private static final String[] ARGS = new String[] {
--- a/langtools/test/com/sun/javadoc/testValueTag/TestValueTag.java Fri Jan 23 10:37:41 2009 -0800
+++ b/langtools/test/com/sun/javadoc/testValueTag/TestValueTag.java Sat Jan 24 16:35:17 2009 -0800
@@ -88,7 +88,7 @@
"Result: <A HREF=\"../pkg2/Class3.html#TEST_17_PASSES\">\"Test 17 passes\"</A>"},
//Test @value tag used with custom tag.
{BUG_ID + FS + "pkg1" + FS + "CustomTagUsage.html",
- "<DT><B>Todo:</B></DT>" + NL +
+ "<DT><STRONG>Todo:</STRONG></DT>" + NL +
" <DD>the value of this constant is 55.</DD>"},
//Test @value warning printed when used with non-constant.
{WARNING_OUTPUT,"warning - @value tag (which references nonConstant) " +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/cast/6558559/T6558559a.java Sat Jan 24 16:35:17 2009 -0800
@@ -0,0 +1,40 @@
+/*
+ * 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 6558559
+ * @summary Extra "unchecked" diagnostic
+ * @author Maurizio Cimadamore
+ *
+ * @compile T6558559a.java -Xlint:unchecked -Werror
+ */
+
+class T6558559a {
+ interface A<T> {}
+
+ static class B<T> {}
+
+ A<?> x = null;
+ B<?> y = (B<?>)x;
+}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/cast/6558559/T6558559b.java Sat Jan 24 16:35:17 2009 -0800
@@ -0,0 +1,43 @@
+/*
+ * 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 6558559
+ * @summary Extra "unchecked" diagnostic
+ * @author Maurizio Cimadamore
+ *
+ * @compile T6558559b.java -Xlint:unchecked -Werror
+ */
+
+import java.util.*;
+
+class T6558559b {
+ void test(List rawList, List<?> unboundList) {
+ Throwable t0 = (Throwable) Collections.emptyList();
+ Throwable t1 = (Throwable) rawList;
+ Throwable t2 = (Throwable) unboundList;
+ Object o = unboundList;
+ Throwable t3 = (Throwable) o;
+ }
+}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/cast/6665356/T6665356.java Sat Jan 24 16:35:17 2009 -0800
@@ -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.
+ *
+ * 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
+ * @author Maurizio Cimadamore
+ * @bug 6665356
+ * @summary Cast not allowed when both qualifying type and inner class are parameterized
+ * @compile/fail/ref=T6665356.out -XDrawDiagnostics T6665356.java
+ */
+
+class T6665356 {
+ class Outer<S> {
+ class Inner<T> {}
+ }
+
+ void cast1(Outer<Integer>.Inner<Long> p) {
+ Object o = (Outer<Integer>.Inner<Long>)p;
+ }
+
+ void cast2(Outer<Integer>.Inner<Long> p) {
+ Object o = (Outer<? extends Number>.Inner<Long>)p;
+ }
+
+ void cast3(Outer<Integer>.Inner<Long> p) {
+ Object o = (Outer<Integer>.Inner<? extends Number>)p;
+ }
+
+ void cast4(Outer<Integer>.Inner<Long> p) {
+ Object o = (Outer<? extends Number>.Inner<? extends Number>)p;
+ }
+
+ void cast5(Outer<Integer>.Inner<Long> p) {
+ Object o = (Outer<? super Number>.Inner<Long>)p;
+ }
+
+ void cast6(Outer<Integer>.Inner<Long> p) {
+ Object o = (Outer<Integer>.Inner<? super Number>)p;
+ }
+
+ void cast7(Outer<Integer>.Inner<Long> p) {
+ Object o = (Outer<? super Number>.Inner<? super Number>)p;
+ }
+
+ void cast8(Outer<Integer>.Inner<Long> p) {
+ Object o = (Outer<? extends String>.Inner<Long>)p;
+ }
+
+ void cast9(Outer<Integer>.Inner<Long> p) {
+ Object o = (Outer<Integer>.Inner<? extends String>)p;
+ }
+
+ void cast10(Outer<Integer>.Inner<Long> p) {
+ Object o = (Outer<? super String>.Inner<Long>)p;
+ }
+
+ void cast11(Outer<Integer>.Inner<Long> p) {
+ Object o = (Outer<Integer>.Inner<? super String>)p;
+ }
+}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/cast/6665356/T6665356.out Sat Jan 24 16:35:17 2009 -0800
@@ -0,0 +1,8 @@
+T6665356.java:54:55: compiler.err.prob.found.req: (- compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.Number>.Inner<java.lang.Long>
+T6665356.java:58:58: compiler.err.prob.found.req: (- compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? super java.lang.Number>
+T6665356.java:62:65: compiler.err.prob.found.req: (- compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.Number>.Inner<? super java.lang.Number>
+T6665356.java:66:57: compiler.err.prob.found.req: (- compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? extends java.lang.String>.Inner<java.lang.Long>
+T6665356.java:70:60: compiler.err.prob.found.req: (- compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? extends java.lang.String>
+T6665356.java:74:55: compiler.err.prob.found.req: (- compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.String>.Inner<java.lang.Long>
+T6665356.java:78:58: compiler.err.prob.found.req: (- compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? super java.lang.String>
+7 errors
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/generics/6723444/T6723444.java Sat Jan 24 16:35:17 2009 -0800
@@ -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.
+ *
+ * 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 6723444
+ *
+ * @summary javac fails to substitute type variables into a constructor's throws clause
+ * @author Mark Mahieu
+ * @compile/fail/ref=T6723444.out -XDstdout -XDrawDiagnostics T6723444.java
+ *
+ */
+public class T6723444 {
+
+ static class Foo<X extends Throwable> {
+ Foo() throws X {}
+ }
+
+ <X extends Throwable> T6723444()
+ throws X {}
+
+ <X extends Throwable> T6723444(Foo<X> foo)
+ throws X {}
+
+ <X1 extends Throwable, X2 extends Throwable> T6723444(Foo<X1> foo, int i)
+ throws X1, X2 {}
+
+ public static void main(String[] args) throws Exception {
+
+ // the following 8 statements should compile without error
+
+ Foo<Exception> exFoo = new Foo<Exception>();
+ exFoo = new Foo<Exception>() {};
+
+ new<Exception> T6723444();
+ new<Exception> T6723444() {};
+ new T6723444(exFoo);
+ new T6723444(exFoo) {};
+ new<Exception, Exception> T6723444(exFoo, 1);
+ new<Exception, Exception> T6723444(exFoo, 1) {};
+
+ // the remaining statements should all raise an
+ // unreported exception error
+
+ new T6723444(exFoo, 1);
+ new T6723444(exFoo, 1) {};
+
+ Foo<Throwable> thFoo = new Foo<Throwable>();
+ thFoo = new Foo<Throwable>() {};
+
+ new<Throwable> T6723444();
+ new<Throwable> T6723444() {};
+ new T6723444(thFoo);
+ new T6723444(thFoo) {};
+ new T6723444(thFoo, 1);
+ new T6723444(thFoo, 1) {};
+ new<Throwable, Throwable> T6723444(thFoo, 1);
+ new<Throwable, Throwable> T6723444(thFoo, 1) {};
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/generics/6723444/T6723444.out Sat Jan 24 16:35:17 2009 -0800
@@ -0,0 +1,13 @@
+T6723444.java:65:9: compiler.err.unreported.exception.need.to.catch.or.throw: X2
+T6723444.java:66:9: compiler.err.unreported.exception.need.to.catch.or.throw: X2
+T6723444.java:68:32: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:69:17: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:71:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:72:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:73:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:74:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:75:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:76:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:77:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:78:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+12 errors
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/generics/rare/6665356/T6665356.java Sat Jan 24 16:35:17 2009 -0800
@@ -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.
+ *
+ * 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
+ * @author Maurizio Cimadamore
+ * @bug 6665356
+ * @summary Cast not allowed when both qualifying type and inner class are parameterized
+ * @compile/fail/ref=T6665356.out -XDrawDiagnostics T6665356.java
+ */
+
+class T6665356 {
+ class Outer<S> {
+ class Inner<T> {}
+ }
+
+ void test1() {
+ boolean b;
+ b = null instanceof Outer.Inner;
+ b = null instanceof Outer<?>.Inner;
+ b = null instanceof Outer.Inner<?>;
+ b = null instanceof Outer<?>.Inner<?>;
+ }
+
+ void test2() {
+ boolean b;
+ Object o;
+ o = (Outer.Inner)null;
+ o = (Outer<?>.Inner)null;
+ o = (Outer.Inner<?>)null;
+ o = (Outer<?>.Inner<?>)null;
+ }
+}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/generics/rare/6665356/T6665356.out Sat Jan 24 16:35:17 2009 -0800
@@ -0,0 +1,5 @@
+T6665356.java:40:37: compiler.err.improperly.formed.type.param.missing
+T6665356.java:41:40: compiler.err.improperly.formed.type.inner.raw.param
+T6665356.java:49:23: compiler.err.improperly.formed.type.param.missing
+T6665356.java:50:25: compiler.err.improperly.formed.type.inner.raw.param
+4 errors
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/processing/6512707/T6512707.java Sat Jan 24 16:35:17 2009 -0800
@@ -0,0 +1,56 @@
+/*
+ * 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 6512707
+ * @summary "incompatible types" after (unrelated) annotation processing
+ * @author Peter Runge
+ * @compile T6512707.java
+ *
+ * @compile -processor T6512707 TestAnnotation.java
+ */
+
+import java.util.Set;
+import javax.annotation.processing.*;
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.*;
+import javax.lang.model.util.*;
+
+/**
+ * Dummy processor to force bug 6512707 to show - it does not matter what
+ * the annotation processor does for this bug.
+ */
+@SupportedAnnotationTypes("*")
+public class T6512707 extends AbstractProcessor {
+
+ public boolean process(Set<? extends TypeElement> annotations,
+ RoundEnvironment roundEnv) {
+ return(false);
+ }
+
+ @Override
+ public SourceVersion getSupportedSourceVersion() {
+ return SourceVersion.latest();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/processing/6512707/TestAnnotation.java Sat Jan 24 16:35:17 2009 -0800
@@ -0,0 +1,35 @@
+/*
+ * 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.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface TestAnnotation
+{
+ public TestEnum value() default TestEnum.TWO;
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/processing/6512707/TestEnum.java Sat Jan 24 16:35:17 2009 -0800
@@ -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.
+ *
+ * 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.
+ */
+
+public enum TestEnum
+{
+ ONE,
+ TWO
+}
+