/hg/icedtea8-forest/langtools: 130 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Aug 29 15:54:17 UTC 2014
changeset bbacee92a170 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=bbacee92a170
author: katleman
date: Wed Apr 16 12:32:45 2014 -0700
Added tag jdk8u20-b10 for changeset a0d9c18a1041
changeset 33c9946d2875 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=33c9946d2875
author: pgovereau
date: Fri Apr 04 12:23:37 2014 +0100
8034048: javac crash with method references plus lambda plus var args
Reviewed-by: jjg, vromero
changeset eae26764a056 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=eae26764a056
author: pgovereau
date: Fri Apr 04 12:56:56 2014 +0100
8035972: missing test file for 8034048
Reviewed-by: jjg, vromero
changeset b33835c5d96a in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=b33835c5d96a
author: kizune
date: Mon Apr 07 11:38:59 2014 +0200
8031425: Two langtools/javac tests fail by timeout on Windows
Reviewed-by: vromero, jjg
changeset 4f7d19235357 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=4f7d19235357
author: jlahoda
date: Mon Mar 31 21:27:25 2014 +0200
8035890: jdk8 javac -source 7 compiles test case it should not
Summary: Ensuring source level checks are performed in two additional cases related to type annotations, adding specialized error message for annotations after method type parameters.
Reviewed-by: jfranck, jjg
changeset 86ad38a4a0c0 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=86ad38a4a0c0
author: ksrini
date: Thu Apr 03 12:04:58 2014 -0700
8037881: javax.crypto is not listed in the compact* profiles javadoc
Reviewed-by: jjg
changeset 689edb64e41c in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=689edb64e41c
author: ksrini
date: Fri Apr 04 18:36:16 2014 -0700
8039231: [javadoc] test failure caused by javax.crypto fix
Reviewed-by: jjg
changeset 6a6a8a9860a4 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=6a6a8a9860a4
author: rfield
date: Thu Apr 10 11:24:26 2014 -0700
8038420: Lambda returning post-increment generates wrong code
Reviewed-by: vromero, jlahoda
changeset ba7ee72d5d6b in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=ba7ee72d5d6b
author: rfield
date: Thu Apr 10 14:01:53 2014 -0700
8037935: Javac -- final local String var referenced in binary/unary op in lambda produces code that does not verify
Summary: Remove over-zealous Attr optimization breaking lambdas
Reviewed-by: jjg, vromero
changeset 9d2a88a9e69a in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=9d2a88a9e69a
author: lana
date: Fri Apr 11 09:36:46 2014 -0700
Merge
changeset d75c4adbc698 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=d75c4adbc698
author: pgovereau
date: Tue Apr 15 17:09:56 2014 -0400
8023945: javac wrongly allows a subclass of an anonymous class
Reviewed-by: jjg
changeset 34f8ce53eac2 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=34f8ce53eac2
author: lana
date: Wed Apr 16 14:22:49 2014 -0700
Merge
changeset 7ad480b982bf in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=7ad480b982bf
author: lana
date: Thu Apr 17 09:34:39 2014 -0700
Merge
changeset e101a12a45a7 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=e101a12a45a7
author: katleman
date: Wed Apr 23 11:35:48 2014 -0700
Added tag jdk8u20-b11 for changeset 7ad480b982bf
changeset df2905323914 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=df2905323914
author: katleman
date: Wed Apr 30 11:17:22 2014 -0700
Added tag jdk8u20-b12 for changeset e101a12a45a7
changeset 5b8151ede720 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=5b8151ede720
author: ksrini
date: Wed Apr 16 19:21:59 2014 -0700
8038976: javadoc requires a trailing / for links where java 7's javadoc didn't
Reviewed-by: jjg
changeset 1737ad9ac984 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=1737ad9ac984
author: ksrini
date: Wed Apr 16 18:15:48 2014 -0700
8037484: [javadoc] fails with java.lang.IllegalStateException: endPosTable already set
Reviewed-by: jjg
changeset 0524f786d7e8 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=0524f786d7e8
author: vromero
date: Fri Apr 18 23:50:41 2014 +0100
8035891: javac, rename method asFree() in InferenceContext to asUndetVar() which reflects better it's purpose
Reviewed-by: jjg
changeset 77352397867a in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=77352397867a
author: vromero
date: Fri Apr 18 23:58:05 2014 +0100
8029002: javac should take multiple upper bounds into account in incorporation
Reviewed-by: dlsmith, jjg
changeset acd64168cf8b in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=acd64168cf8b
author: vromero
date: Tue Apr 22 17:55:22 2014 +0100
8029718: Should always use lambda body structure to disambiguate overload resolution
Reviewed-by: dlsmith, jjg, jlahoda
changeset 972f74339e06 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=972f74339e06
author: lana
date: Wed Apr 23 18:04:02 2014 -0700
Merge
changeset 7daae506441f in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=7daae506441f
author: jlahoda
date: Fri Apr 18 11:53:34 2014 +0200
8038788: javac behaves incorrectly for annotations after method type parameters in some cases
Reviewed-by: jjg, emc
changeset 08270f8a0950 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=08270f8a0950
author: jlahoda
date: Tue Apr 15 18:58:47 2014 +0200
8039079: Test tools/javac/processing/environment/round/TestElementsAnnotatedWith.java fails
Summary: Ensuring the test passes in both samevm and othervm modes.
Reviewed-by: darcy
changeset 9087c3c6920b in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=9087c3c6920b
author: jlahoda
date: Wed Apr 23 11:28:09 2014 +0200
8039250: Test tools/javac/classfiles/InnerClasses/SyntheticClasses.java fails
Summary: The test should only analyze classfiles.
Reviewed-by: vromero
changeset 3a2ebbad5911 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=3a2ebbad5911
author: pgovereau
date: Wed Apr 30 23:26:43 2014 +0100
8038023: Compiler crash ClassCastException
Summary: Add additional checks on results of ClassReader.readPool
Reviewed-by: vromero
changeset 12f99d1f23d9 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=12f99d1f23d9
author: pgovereau
date: Wed Apr 30 23:29:43 2014 +0100
8039026: Definitely unassigned field can be accessed
Reviewed-by: vromero, jlahoda
changeset b5c2375893e2 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=b5c2375893e2
author: lana
date: Wed Apr 30 23:59:45 2014 -0700
Merge
changeset 5d39c29950f4 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=5d39c29950f4
author: katleman
date: Wed May 07 10:59:12 2014 -0700
Added tag jdk8u20-b13 for changeset b5c2375893e2
changeset ce94cefa660b in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=ce94cefa660b
author: katleman
date: Tue May 13 23:18:48 2014 -0700
Added tag jdk8u20-b14 for changeset 5d39c29950f4
changeset b17805de5edf in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=b17805de5edf
author: rfield
date: Thu May 01 11:35:02 2014 -0700
8036942: javac generates incorrect exception table for multi-catch statements inside a lambda
Summary: Union type info lost and also union type is not processed by TreeMaker.Type -- address by using existing tree, thus by-passing such issues.
Reviewed-by: vromero, jlahoda
changeset d02e9b7444fe in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=d02e9b7444fe
author: rfield
date: Thu May 01 15:43:28 2014 -0700
8029852: Bad code generated (VerifyError) when lambda instantiates enclosing local class and has captured variables
8029725: Lambda reference to containing local class causes javac infinite recursion
Reviewed-by: vromero, jlahoda, dlsmith
changeset 14979dd5e034 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=14979dd5e034
author: vromero
date: Fri May 02 01:25:26 2014 +0100
8030741: Inference: implement eager resolution of return types, consistent with JDK-8028800
Reviewed-by: dlsmith, jjg
changeset 3d755b8cdef8 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=3d755b8cdef8
author: lana
date: Wed May 07 21:33:15 2014 -0700
Merge
changeset 327122b01a9e in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=327122b01a9e
author: dlsmith
date: Tue May 06 15:46:09 2014 -0600
8033718: Inference ignores capture variable as upper bound
Summary: Split Types.lowerBound into two methods; fix bugs in inference handling of capture variables.
Reviewed-by: vromero
changeset 856d94394294 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=856d94394294
author: dlsmith
date: Fri May 09 19:42:25 2014 -0600
8042656: Inference produces spurious error for intersection type bounds check
Summary: Fix subtyping for intersections involving capture variables
Reviewed-by: vromero
changeset f8e84de96252 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=f8e84de96252
author: jlahoda
date: Fri May 09 09:36:35 2014 +0200
8040822: Duplicated notifications can be sent to TaskListener
Summary: The analyze finished event must only be sent on the first call to JavaCompiler.flow for a given class.
Reviewed-by: jjg
changeset cf626fb754aa in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=cf626fb754aa
author: jlahoda
date: Fri May 09 12:55:58 2014 +0200
8041663: Sensitive dependence on location of nested interface
Summary: Adding a method among ambiguous candidates only if it is more specific than some of the existing candidates.
Reviewed-by: dlsmith, vromero
changeset 0add97444be9 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=0add97444be9
author: mfang
date: Fri May 09 20:33:21 2014 -0700
8041424: 8u20 l10n resource file translation update 1
Reviewed-by: naoto, yhuang
changeset f1fbe29e36d1 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=f1fbe29e36d1
author: mfang
date: Mon May 12 09:53:35 2014 -0700
Merge
changeset b06c2db45ddb in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=b06c2db45ddb
author: vromero
date: Tue May 13 14:18:34 2014 +0100
8029102: Enhance compiler warnings for Lambda
Reviewed-by: briangoetz, jjg, jlahoda, ahgross
changeset 8e7bd4c50fd1 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=8e7bd4c50fd1
author: vromero
date: Tue May 13 16:11:43 2014 +0100
8028503: javac, for method references a primitive type can be added as a bound
Reviewed-by: jjg, dlsmith
changeset 73cbce40a149 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=73cbce40a149
author: vromero
date: Tue May 13 16:14:54 2014 +0100
8037379: fix for JDK-8029569 doesn't cover all possible cases
Reviewed-by: jjg
changeset 5e9879dfadde in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=5e9879dfadde
author: dlsmith
date: Tue May 13 15:34:13 2014 -0600
8042882: Support verbosity options in langtools testing
8032441: langtools/test/Makefile breaks when JT_JAVA set to a JDK 9 build
Reviewed-by: mduigou
changeset 89cefe38ecaf in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=89cefe38ecaf
author: lana
date: Wed May 14 11:01:08 2014 -0700
Merge
changeset 9c577131ffa6 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=9c577131ffa6
author: dlsmith
date: Wed May 14 15:41:28 2014 -0600
8034223: Most-specific should not have any special treatment for boxed vs. unboxed types
Summary: Rewrite most-specific logic to conform to JLS 8 15.12.2.5
Reviewed-by: vromero
changeset d9e6bb927519 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=d9e6bb927519
author: katleman
date: Wed May 21 10:57:27 2014 -0700
Added tag jdk8u20-b15 for changeset 9c577131ffa6
changeset d1005694e384 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=d1005694e384
author: katleman
date: Wed May 28 02:28:07 2014 -0700
Added tag jdk8u20-b16 for changeset d9e6bb927519
changeset 7c925f35f81c in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=7c925f35f81c
author: pgovereau
date: Fri May 23 16:27:22 2014 +0100
8033437: javac, inconsistent generic types behaviour when compiling together vs. separate
Reviewed-by: jjg
Contributed-by: vicente.romero at oracle.com, paul.govereau at oracle.com
changeset f4254623c54e in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=f4254623c54e
author: pgovereau
date: Tue May 27 21:15:06 2014 +0100
8041704: wrong error message when mixing lambda expression and inner class
Reviewed-by: vromero
changeset 0e026d3f2786 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=0e026d3f2786
author: dlsmith
date: Tue May 27 17:30:48 2014 -0600
8042338: Refactor Types.upperBound to treat wildcards and variables separately
Reviewed-by: vromero
changeset 8ee530e741d1 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=8ee530e741d1
author: dlsmith
date: Tue May 27 16:39:05 2014 -0600
8044050: Move misplaced inference tests to test/tools/javac/generics/inference
Reviewed-by: vromero
changeset b45fd486977d in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=b45fd486977d
author: lana
date: Wed May 28 11:07:07 2014 -0700
Merge
changeset a550336d045f in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=a550336d045f
author: katleman
date: Wed Jun 04 08:47:05 2014 -0700
Added tag jdk8u20-b17 for changeset b45fd486977d
changeset c04d99e00268 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=c04d99e00268
author: katleman
date: Wed Jun 11 09:31:26 2014 -0700
Added tag jdk8u20-b18 for changeset a550336d045f
changeset d55676065cfa in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=d55676065cfa
author: katleman
date: Wed Jun 18 12:35:40 2014 -0700
Added tag jdk8u20-b19 for changeset c04d99e00268
changeset 372fd7283bf0 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=372fd7283bf0
author: vromero
date: Thu May 29 15:28:01 2014 +0100
8037937: javac: AssertionError during LVT generation, wrong variable ranges
Reviewed-by: mcimadamore
changeset 8a5512cb5e9d in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=8a5512cb5e9d
author: pgovereau
date: Wed May 28 21:47:30 2014 +0100
8037934: Javac generates invalid signatures for local types
Reviewed-by: vromero, rfield
Contributed-by: separdaud at redhat.com
changeset 716f2466ddd0 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=716f2466ddd0
author: pgovereau
date: Tue May 27 22:26:53 2014 +0100
8042741: Java 8 compiler throws NullPointerException depending location in source file
Reviewed-by: vromero, jlahoda
changeset 7e0ba7b086c8 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=7e0ba7b086c8
author: vromero
date: Fri May 30 18:21:05 2014 +0100
8042785: javac, bridge methods are not getting the flags from the original method
Reviewed-by: jjg, jlahoda
changeset e64bb2f5f0cf in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=e64bb2f5f0cf
author: jlahoda
date: Fri May 30 12:54:16 2014 +0200
8031967: For some sources compiler compiles for ever
Summary: Avoid creating DeferredTypes for method calls with method calls as receivers if the site can be determined reliably
Reviewed-by: mcimadamore, vromero
Contributed-by: maurizio.cimadamore at oracle.com, jan.lahoda at oracle.com
changeset 71767cdf52a7 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=71767cdf52a7
author: vromero
date: Tue Jun 03 20:00:01 2014 +0100
8044487: Fix for 8042785 causes regression tests to fail with java.lang.VerifyError
Reviewed-by: jjg, ksrini
changeset bf8edbcae43a in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=bf8edbcae43a
author: vromero
date: Wed Jun 04 20:01:13 2014 +0100
8041713: Type inference of non-existent method references crashes the compiler
Reviewed-by: mcimadamore
changeset fe033d997ddf in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=fe033d997ddf
author: jlahoda
date: Tue Dec 17 10:55:59 2013 +0100
8029800: Flags.java uses String.toLowerCase without specifying Locale
Summary: Introducing StringUtils.toLowerCase/toUpperCase independent on the default locale, converting almost all usages of String.toLowerCase/toUpperCase to use the new methods.
Reviewed-by: jjg, bpatel
changeset 17ce329d7bd0 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=17ce329d7bd0
author: emc
date: Thu Dec 19 11:38:45 2013 -0500
8030726: tools/javac/NoStringToLower.java fails due to enforcement no use of String.toLowerCase on non-langtools classes
Summary: Fix NoStringToLower test to only enforce ban on String.toLowerCase on langtools classes
Reviewed-by: vromero, jfranck
Contributed-by: paul.govereau at oracle.com
changeset 7ceaee0e497b in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=7ceaee0e497b
author: jlahoda
date: Thu May 29 10:48:00 2014 +0200
8043186: javac test langtools/tools/javac/util/StringUtilsTest.java fails
Summary: The result of String.toLowerCase.indexOf does not always point at the start of the given string in the non-lowercased text.
Reviewed-by: jjg, bpatel
changeset 63ef1e0410d1 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=63ef1e0410d1
author: mcimadamore
date: Tue Jun 10 10:22:26 2014 +0100
8043725: javac fails with StackOverflowException
Summary: loose type comparison test should be protected against infinite recursion with fbounds
Reviewed-by: vromero
changeset 28e204e63063 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=28e204e63063
author: jjg
date: Thu Feb 27 13:57:57 2014 -0800
8033287: Reduce the size of the endPosTable
Reviewed-by: jjg
Contributed-by: per.bothner at oracle.com, chturne at gmail.com
changeset 16a698253f33 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=16a698253f33
author: dlsmith
date: Tue Jun 10 12:41:39 2014 -0600
8037385: constant pool errors with -target 1.7 and static default methods
Summary: Add error check for static interface methods invoked from -source 7
Reviewed-by: vromero, mcimadamore
changeset e6d1e9f29132 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=e6d1e9f29132
author: dlsmith
date: Tue Jun 10 15:25:01 2014 -0600
8015101: Covariance of return type implied by upper bounding on type parameter is ignored
Summary: Capture intersection supertypes before comparing their members
Reviewed-by: vromero
changeset 1aeb322cf646 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=1aeb322cf646
author: dlsmith
date: Fri Jun 13 13:30:29 2014 -0600
8046762: Revert some inference fixes in JDK-8033718
Reviewed-by: mcimadamore
changeset b060e7c2f5cc in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=b060e7c2f5cc
author: lana
date: Mon Jun 16 11:19:22 2014 -0700
Merge
changeset 4ee06c77b51b in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=4ee06c77b51b
author: dlsmith
date: Tue Jun 17 16:32:18 2014 -0600
8042803: Types.wildLowerBound and cvarLowerBound should call unannotatedType()
Reviewed-by: vromero
changeset cff4be16ffdd in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=cff4be16ffdd
author: lana
date: Thu Jun 19 17:59:42 2014 -0700
Merge
changeset 7e97c65c373c in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=7e97c65c373c
author: pgovereau
date: Wed Jun 18 12:30:29 2014 -0400
8027886: javac allows illegal receiver parameters
8029042: Receiver parameter not supported on local class constructor
Reviewed-by: jfranck, jlahoda
changeset 76b61848c9a4 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=76b61848c9a4
author: pgovereau
date: Wed Jun 18 12:06:50 2014 -0400
8038975: Access control in enhanced for
Reviewed-by: vromero, jlahoda
changeset 829f01e7f732 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=829f01e7f732
author: mcimadamore
date: Thu Jun 19 12:22:39 2014 +0100
8043253: Slow javac compile times in JDK 8
Summary: Enable on-demand diagnostic source position completion
Reviewed-by: jjg, vromero
changeset a3ad6e2ede44 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=a3ad6e2ede44
author: jlahoda
date: Wed Jun 18 10:44:16 2014 +0200
8046916: Type parameter annotations don't work with multiple type parameters
Summary: When reading type variable's annotations out of the owner's type annotations, use the type variable's index in owner to exclude annotations belonging to other type variables.
Reviewed-by: jfranck, emc
changeset ce1d9dd2e9eb in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=ce1d9dd2e9eb
author: vromero
date: Thu Jun 19 15:39:37 2014 +0100
8038182: javac crash with FunctionDescriptorLookupError for invalid functional interface
Reviewed-by: mcimadamore
Contributed-by: maurizio.cimadamore at oracle.com, vicente.romero at oracle.com
changeset 94ea21ecfe2d in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=94ea21ecfe2d
author: vromero
date: Thu Jun 19 23:52:33 2014 +0100
8042759: Lambda returning implicitly-typed lambdas considered pertinent to applicability
Reviewed-by: mcimadamore
changeset f4381f9541e6 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=f4381f9541e6
author: dlsmith
date: Fri Jun 20 11:42:16 2014 -0600
8047407: Add test for JDK-8037385
Reviewed-by: mcimadamore
changeset 37c7dbe8efee in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=37c7dbe8efee
author: dlsmith
date: Fri Jun 20 10:56:31 2014 -0600
8034147: javac crashes with a NullPointerException during bounds checking
Summary: Types.supertype should return Type.noType rather than null
Reviewed-by: vromero, mcimadamore
changeset e92effa22ece in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=e92effa22ece
author: coffeys
date: Mon Jun 23 00:01:40 2014 +0100
Merge
changeset d231957fe310 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=d231957fe310
author: katleman
date: Wed Jun 25 12:55:45 2014 -0700
Added tag jdk8u20-b20 for changeset e92effa22ece
changeset 7de1481c6cd8 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=7de1481c6cd8
author: vromero
date: Tue Mar 18 22:12:46 2014 +0000
8036007: javac crashes when encountering an unresolvable interface
Reviewed-by: vromero, jlahoda
Contributed-by: paul.govereau at oracle.com
changeset 61fb0d8b1691 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=61fb0d8b1691
author: katleman
date: Wed Jul 02 15:01:41 2014 -0700
Added tag jdk8u20-b21 for changeset 7de1481c6cd8
changeset fc0bb87f45aa in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=fc0bb87f45aa
author: katleman
date: Wed Jul 09 13:58:13 2014 -0700
Added tag jdk8u20-b22 for changeset 61fb0d8b1691
changeset 49f7c1e4ae41 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=49f7c1e4ae41
author: mfang
date: Wed Jun 25 14:21:02 2014 -0700
8047145: 8u20 l10n resource file translation update 2
Reviewed-by: naoto
changeset 4aa8589ab6ac in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=4aa8589ab6ac
author: lana
date: Mon Jul 07 18:21:34 2014 -0700
Merge
changeset a682df5e679a in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=a682df5e679a
author: lana
date: Thu Jul 10 14:25:38 2014 -0700
Merge
changeset 3fefeeb5dd75 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=3fefeeb5dd75
author: jeff
date: Fri Jan 31 16:47:43 2014 +0000
8032726: THIRD_PARTY_LICENSE_README Update for Little CMS to 2.5
Reviewed-by: lana, prr
changeset f367f26cbef1 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=f367f26cbef1
author: asaha
date: Tue Feb 04 22:47:29 2014 -0800
Merge
changeset 3d5b1499187b in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=3d5b1499187b
author: asaha
date: Tue Feb 11 17:31:22 2014 -0800
Merge
changeset f19868b3b970 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=f19868b3b970
author: asaha
date: Wed Feb 12 11:16:22 2014 -0800
Added tag jdk8u11-b00 for changeset c9db8c800797
changeset 35b04ece3286 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=35b04ece3286
author: asaha
date: Wed Feb 12 11:43:24 2014 -0800
Merge
changeset 91ee7d57b0b3 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=91ee7d57b0b3
author: asaha
date: Tue Feb 18 14:23:14 2014 -0800
Merge
changeset d29c03b2bb83 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=d29c03b2bb83
author: asaha
date: Wed Feb 26 22:11:32 2014 -0800
Merge
changeset 05fdc4e3dbe2 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=05fdc4e3dbe2
author: asaha
date: Tue Mar 11 14:08:34 2014 -0700
Merge
changeset d37e407fba44 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=d37e407fba44
author: asaha
date: Thu Mar 20 10:08:19 2014 -0700
Merge
changeset e75f843c4bf8 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=e75f843c4bf8
author: katleman
date: Tue Mar 25 11:23:33 2014 -0700
Added tag jdk8u11-b01 for changeset d37e407fba44
changeset d9904b00b027 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=d9904b00b027
author: katleman
date: Tue Apr 01 12:02:12 2014 -0700
Added tag jdk8u11-b02 for changeset e75f843c4bf8
changeset 5b5c46fe954c in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=5b5c46fe954c
author: katleman
date: Tue Apr 08 11:45:30 2014 -0700
Added tag jdk8u11-b03 for changeset d9904b00b027
changeset f491f1581f19 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=f491f1581f19
author: katleman
date: Tue Apr 15 12:06:59 2014 -0700
Added tag jdk8u11-b04 for changeset 5b5c46fe954c
changeset a4ecc38ec791 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=a4ecc38ec791
author: katleman
date: Tue Apr 22 11:57:03 2014 -0700
Added tag jdk8u11-b05 for changeset f491f1581f19
changeset 7803caf52e4b in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=7803caf52e4b
author: katleman
date: Tue Apr 29 12:52:09 2014 -0700
Added tag jdk8u11-b06 for changeset a4ecc38ec791
changeset a47aa3203c02 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=a47aa3203c02
author: katleman
date: Tue May 06 10:04:21 2014 -0700
Added tag jdk8u11-b07 for changeset 7803caf52e4b
changeset e973a591a218 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=e973a591a218
author: katleman
date: Tue May 13 08:14:33 2014 -0700
Added tag jdk8u11-b08 for changeset a47aa3203c02
changeset 51cade463260 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=51cade463260
author: katleman
date: Mon May 19 20:52:19 2014 -0700
Added tag jdk8u11-b09 for changeset e973a591a218
changeset 24c948377599 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=24c948377599
author: asaha
date: Tue May 20 12:02:18 2014 -0700
Merge
changeset dc0d952b4199 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=dc0d952b4199
author: katleman
date: Wed May 28 02:42:43 2014 -0700
Added tag jdk8u11-b10 for changeset 51cade463260
changeset e638f33c70c3 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=e638f33c70c3
author: asaha
date: Wed May 28 12:03:14 2014 -0700
Merge
changeset 3f6dd16b057f in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=3f6dd16b057f
author: asaha
date: Wed May 28 15:53:35 2014 -0700
Merge
changeset 3cb08f680986 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=3cb08f680986
author: asaha
date: Mon Jun 02 15:15:26 2014 -0700
Merge
changeset 67372f84d990 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=67372f84d990
author: asaha
date: Wed Jun 04 09:00:58 2014 -0700
Merge
changeset 0a79fea6f9cf in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=0a79fea6f9cf
author: katleman
date: Tue Jun 03 14:19:44 2014 -0700
Added tag jdk8u11-b11 for changeset dc0d952b4199
changeset 9bf981b87d70 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=9bf981b87d70
author: asaha
date: Thu Jun 05 15:14:12 2014 -0700
Merge
changeset 7826ea2a5595 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=7826ea2a5595
author: asaha
date: Wed Jun 11 09:45:32 2014 -0700
Merge
changeset db7c59913c65 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=db7c59913c65
author: katleman
date: Tue Jun 17 13:04:20 2014 -0700
Added tag jdk8u11-b12 for changeset 0a79fea6f9cf
changeset 7e061f63262a in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=7e061f63262a
author: asaha
date: Tue Jun 17 15:54:41 2014 -0700
Merge
changeset c8b8cabfc922 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=c8b8cabfc922
author: asaha
date: Wed Jun 18 12:56:12 2014 -0700
Merge
changeset c14269602ffd in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=c14269602ffd
author: asaha
date: Thu Jun 26 07:56:29 2014 -0700
Merge
changeset 115107f0bae2 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=115107f0bae2
author: katleman
date: Fri Jun 13 11:56:48 2014 -0700
Added tag jdk8u5-b31 for changeset 6614bfcdcd4d
changeset 16995a2b970d in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=16995a2b970d
author: asaha
date: Tue Jun 24 13:59:06 2014 -0700
Merge
changeset 84d18e4449bd in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=84d18e4449bd
author: asaha
date: Thu Jun 26 08:04:25 2014 -0700
Merge
changeset 7d889f0d0229 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=7d889f0d0229
author: asaha
date: Thu Jun 26 18:37:04 2014 -0700
Added tag jdk8u11-b31 for changeset 16995a2b970d
changeset 8755dba5da81 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=8755dba5da81
author: asaha
date: Wed Jul 02 15:24:39 2014 -0700
Merge
changeset 69c91cbdbd18 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=69c91cbdbd18
author: asaha
date: Wed Jul 02 15:33:29 2014 -0700
Merge
changeset 98f350333121 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=98f350333121
author: asaha
date: Thu Jul 10 08:02:02 2014 -0700
Merge
changeset 5c1d6da1445a in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=5c1d6da1445a
author: asaha
date: Mon Jul 14 08:03:42 2014 -0700
Merge
changeset 948daf9c5e22 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=948daf9c5e22
author: andrew
date: Tue Aug 19 23:57:05 2014 +0100
Merge jdk8u20-b23
changeset b16cd22835f8 in /hg/icedtea8-forest/langtools
details: http://icedtea.classpath.org/hg/icedtea8-forest/langtools?cmd=changeset;node=b16cd22835f8
author: andrew
date: Fri Aug 29 16:52:52 2014 +0100
Added tag icedtea-3.0.0pre02 for changeset 948daf9c5e22
diffstat:
.hgtags | 33 +
.jcheck/conf | 2 -
make/build.xml | 2 +-
src/share/classes/com/sun/tools/classfile/Instruction.java | 6 +-
src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java | 7 +-
src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java | 59 +-
src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java | 21 +-
src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java | 4 +-
src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java | 4 +-
src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties | 12 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java | 11 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java | 4 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java | 3 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties | 30 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SimpleTaglet.java | 3 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java | 7 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java | 4 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java | 13 +-
src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java | 2 +-
src/share/classes/com/sun/tools/doclint/Checker.java | 3 +-
src/share/classes/com/sun/tools/doclint/Env.java | 3 +-
src/share/classes/com/sun/tools/doclint/HtmlTag.java | 12 +-
src/share/classes/com/sun/tools/doclint/Messages.java | 13 +-
src/share/classes/com/sun/tools/doclint/resources/doclint_ja.properties | 4 +-
src/share/classes/com/sun/tools/javac/api/JavacTrees.java | 2 +-
src/share/classes/com/sun/tools/javac/code/Flags.java | 16 +-
src/share/classes/com/sun/tools/javac/code/Source.java | 8 +-
src/share/classes/com/sun/tools/javac/code/Symbol.java | 39 +-
src/share/classes/com/sun/tools/javac/code/Type.java | 40 +-
src/share/classes/com/sun/tools/javac/code/Types.java | 395 +++++----
src/share/classes/com/sun/tools/javac/comp/Attr.java | 181 ++-
src/share/classes/com/sun/tools/javac/comp/AttrContext.java | 7 +-
src/share/classes/com/sun/tools/javac/comp/Check.java | 64 +-
src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java | 383 +++++++--
src/share/classes/com/sun/tools/javac/comp/Enter.java | 8 +-
src/share/classes/com/sun/tools/javac/comp/Flow.java | 52 +-
src/share/classes/com/sun/tools/javac/comp/Infer.java | 318 ++++++-
src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java | 47 +-
src/share/classes/com/sun/tools/javac/comp/Lower.java | 16 +-
src/share/classes/com/sun/tools/javac/comp/MemberEnter.java | 42 +-
src/share/classes/com/sun/tools/javac/comp/Resolve.java | 263 +++--
src/share/classes/com/sun/tools/javac/comp/TransTypes.java | 9 +-
src/share/classes/com/sun/tools/javac/comp/TypeEnvs.java | 63 +
src/share/classes/com/sun/tools/javac/file/Locations.java | 5 +-
src/share/classes/com/sun/tools/javac/jvm/ClassReader.java | 31 +-
src/share/classes/com/sun/tools/javac/jvm/Code.java | 19 +-
src/share/classes/com/sun/tools/javac/jvm/Gen.java | 7 +-
src/share/classes/com/sun/tools/javac/main/JavaCompiler.java | 10 +-
src/share/classes/com/sun/tools/javac/main/Option.java | 3 +-
src/share/classes/com/sun/tools/javac/parser/DocCommentParser.java | 3 +-
src/share/classes/com/sun/tools/javac/parser/JavacParser.java | 75 +-
src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java | 5 +-
src/share/classes/com/sun/tools/javac/resources/compiler.properties | 27 +-
src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties | 25 +-
src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties | 15 +-
src/share/classes/com/sun/tools/javac/resources/javac_ja.properties | 12 +-
src/share/classes/com/sun/tools/javac/sym/Profiles.java | 15 +-
src/share/classes/com/sun/tools/javac/tree/JCTree.java | 6 +
src/share/classes/com/sun/tools/javac/tree/TreeInfo.java | 12 +-
src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java | 6 +-
src/share/classes/com/sun/tools/javac/util/IntHashTable.java | 198 +++++
src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java | 50 +-
src/share/classes/com/sun/tools/javac/util/StringUtils.java | 70 +
src/share/classes/com/sun/tools/javadoc/JavadocTool.java | 40 +-
src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties | 6 +-
src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties | 16 +-
src/share/classes/com/sun/tools/javap/AttributeWriter.java | 7 +-
src/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java | 3 +-
src/share/classes/com/sun/tools/javap/resources/javap_ja.properties | 10 +-
src/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties | 6 +-
src/share/classes/com/sun/tools/jdeps/resources/jdeps_ja.properties | 2 +-
src/share/classes/com/sun/tools/sjavac/server/CompilerThread.java | 3 +-
test/Makefile | 22 +-
test/com/sun/javadoc/testLinkOption/TestLinkOption.java | 43 +-
test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java | 2 +-
test/com/sun/javadoc/testRelativeLinks/pkg/C.java | 4 +-
test/com/sun/javadoc/testTopOption/TestTopOption.java | 4 +-
test/tools/javac/AnonymousSubclassTest.java | 91 ++
test/tools/javac/DefiniteAssignment/T8039026.java | 21 +
test/tools/javac/DefiniteAssignment/T8039026.out | 4 +
test/tools/javac/NoStringToLower.java | 136 +++
test/tools/javac/T8029002/MultipleUpperBoundsIncorporationTest.java | 72 +
test/tools/javac/T8029102/WarnSerializableLambdaTest.java | 241 ++++++
test/tools/javac/T8029102/WarnSerializableLambdaTest.out | 57 +
test/tools/javac/T8029102/WarnSerializableLambdaTestb.java | 56 +
test/tools/javac/T8029102/WarnSerializableLambdaTestb.out | 7 +
test/tools/javac/T8029569/VarargsAmbiguityCrashTest.java | 28 +-
test/tools/javac/T8029569/VarargsAmbiguityCrashTest.out | 2 +-
test/tools/javac/T8030816/CrashLambdaExpressionWithNonAccessibleIdTest.out | 3 +-
test/tools/javac/T8038975/AccessTest.java | 39 +
test/tools/javac/T8038975/a/A.java | 25 +
test/tools/javac/T8038975/a/B.java | 27 +
test/tools/javac/annotations/FinalReceiverTest.java | 14 +
test/tools/javac/annotations/FinalReceiverTest.out | 2 +
test/tools/javac/annotations/LocalInnerReceiverTest.java | 37 +
test/tools/javac/annotations/typeAnnotations/failures/CantAnnotateScoping.out | 3 +-
test/tools/javac/annotations/typeAnnotations/failures/CheckErrorsForSource7.java | 195 ++++
test/tools/javac/annotations/typeAnnotations/failures/common/arrays/DeclarationAnnotation.out | 2 +-
test/tools/javac/annotations/typeAnnotations/newlocations/AfterMethodTypeParams.java | 138 +++
test/tools/javac/annotations/typeAnnotations/newlocations/Receivers.java | 8 -
test/tools/javac/api/taskListeners/EventsBalancedTest.java | 127 +++
test/tools/javac/classfiles/InnerClasses/SyntheticClasses.java | 2 +-
test/tools/javac/defaultMethods/static/StaticInvoke.java | 15 +
test/tools/javac/defaultMethods/static/StaticInvoke6.out | 3 +
test/tools/javac/defaultMethods/static/StaticInvoke7.out | 3 +
test/tools/javac/defaultMethods/static/hiding/InterfaceMethodHidingTest.java | 3 +-
test/tools/javac/diags/examples.not-yet.txt | 3 +-
test/tools/javac/diags/examples/AnnotationsAfterTypeParamsNotSupportedInSource.java | 34 +
test/tools/javac/diags/examples/LambdaBodyNeitherValueNorVoidCompatible.java | 46 +
test/tools/javac/diags/examples/StaticIntfMethodInvokeNotSupported.java | 32 +
test/tools/javac/diags/examples/WarnSerializableLambda.java | 41 +
test/tools/javac/flow/LVTHarness.java | 10 +-
test/tools/javac/flow/T8042741/A.java | 37 +
test/tools/javac/flow/T8042741/PositionTest.java | 62 +
test/tools/javac/flow/tests/TestCaseIfElse.java | 17 +-
test/tools/javac/generics/diamond/T8041713/DiamondPlusUnexistingMethodRefCrashTest.java | 11 +
test/tools/javac/generics/diamond/T8041713/DiamondPlusUnexistingMethodRefCrashTest.out | 2 +
test/tools/javac/generics/inference/8043725/T8043725.java | 36 +
test/tools/javac/generics/inference/EagerReturnTypeResolution/EagerReturnTypeResolutionTesta.java | 78 +
test/tools/javac/generics/inference/EagerReturnTypeResolution/EagerReturnTypeResolutionTestb.java | 182 ++++
test/tools/javac/generics/inference/EagerReturnTypeResolution/EagerReturnTypeResolutionTestb.out | 45 +
test/tools/javac/generics/inference/EagerReturnTypeResolution/PrimitiveTypeBoxingTest.java | 25 +
test/tools/javac/generics/inference/EagerReturnTypeResolution/PrimitiveTypeBoxingTest.out | 3 +
test/tools/javac/generics/inference/LowerBoundGLB.java | 47 +
test/tools/javac/generics/inference/NestedWildcards.java | 44 +
test/tools/javac/generics/inference/T8028503/PrimitiveTypeInBoundForMethodRefTest.java | 48 +
test/tools/javac/generics/typevars/IntersectionSubVar.java | 49 +
test/tools/javac/generics/wildcards/7034495/T7034495.out | 2 +-
test/tools/javac/generics/wildcards/RefQueue.java | 24 +
test/tools/javac/generics/wildcards/RefQueueBug.java | 38 +
test/tools/javac/generics/wildcards/T8015101.java | 44 +
test/tools/javac/generics/wildcards/T8034147.java | 35 +
test/tools/javac/lambda/ErroneousLambdaExpr.java | 66 -
test/tools/javac/lambda/ErroneousLambdaExpr.out | 2 -
test/tools/javac/lambda/FunctionalInterfaceConversionTest.java | 4 +-
test/tools/javac/lambda/LambdaExprLeadsToMissingClassFilesTest.java | 66 +
test/tools/javac/lambda/LambdaLocalTest.java | 55 +
test/tools/javac/lambda/LambdaMultiCatchTest.java | 58 +
test/tools/javac/lambda/LambdaOuterLocalTest.java | 61 +
test/tools/javac/lambda/MethodReference42.out | 4 +-
test/tools/javac/lambda/MethodReference44.out | 4 +-
test/tools/javac/lambda/MostSpecific09.java | 81 ++
test/tools/javac/lambda/MostSpecific09.out | 27 +
test/tools/javac/lambda/MostSpecific10.java | 54 +
test/tools/javac/lambda/MostSpecific11.java | 42 +
test/tools/javac/lambda/MostSpecific12.java | 38 +
test/tools/javac/lambda/MostSpecific12.out | 4 +
test/tools/javac/lambda/MostSpecific13.java | 21 +
test/tools/javac/lambda/MostSpecific13.out | 3 +
test/tools/javac/lambda/MostSpecific14.java | 33 +
test/tools/javac/lambda/MostSpecific14.out | 3 +
test/tools/javac/lambda/SingleLocalTest.java | 50 +
test/tools/javac/lambda/T8031967.java | 137 +++
test/tools/javac/lambda/T8037935/LambdaWithBinOpConstRefToConstString.java | 43 +
test/tools/javac/lambda/T8038182/CrashFunctionDescriptorExceptionTest.java | 24 +
test/tools/javac/lambda/T8038182/CrashFunctionDescriptorExceptionTest.out | 2 +
test/tools/javac/lambda/T8038420/LambdaIncrement.java | 52 +
test/tools/javac/lambda/T8041704/ErrorMessageTest.java | 12 +
test/tools/javac/lambda/T8041704/ErrorMessageTest.out | 2 +
test/tools/javac/lambda/T8042759/ImplicitLambdaConsideredForApplicabilityTest.java | 33 +
test/tools/javac/lambda/T8042759/ImplicitLambdaConsideredForApplicabilityTest.out | 2 +
test/tools/javac/lambda/TargetType01.java | 8 +-
test/tools/javac/lambda/TargetType01.out | 2 +-
test/tools/javac/lambda/TargetType02.java | 37 +-
test/tools/javac/lambda/TargetType02.out | 8 +-
test/tools/javac/lambda/TargetType16.java | 6 +-
test/tools/javac/lambda/TargetType16.out | 2 -
test/tools/javac/lambda/TargetType21.out | 10 +-
test/tools/javac/lambda/TargetType23.java | 7 +-
test/tools/javac/lambda/TargetType23.out | 2 +-
test/tools/javac/lambda/TargetType42.java | 12 +-
test/tools/javac/lambda/lambdaExpression/LambdaTest1.java | 3 +-
test/tools/javac/lambda/lambdaExpression/SamConversionComboTest.java | 8 +-
test/tools/javac/missingSuperRecovery/MissingInterfaceTest.java | 15 +
test/tools/javac/missingSuperRecovery/MissingInterfaceTest.out | 3 +
test/tools/javac/missingSuperRecovery/MissingInterfaceTestDep.java | 26 +
test/tools/javac/processing/environment/round/ErroneousAnnotations.out | 1 -
test/tools/javac/processing/environment/round/TestElementsAnnotatedWith.java | 3 +-
test/tools/javac/processing/model/element/TestTypeParameterAnnotations.java | 189 ++-
test/tools/javac/resolve/AmbiguityErrorTest.java | 75 +
test/tools/javac/resolve/ResolveHarness.java | 4 +-
test/tools/javac/resolve/tests/PrimitiveOverReferenceVarargsAmbiguous.java | 32 +-
test/tools/javac/resolve/tests/PrimitiveVsReferenceSamePhase.java | 76 +
test/tools/javac/types/BadSigTest.java | 40 +
test/tools/javac/util/StringUtilsTest.java | 68 +
test/tools/javac/varargs/MethodHandleCrash.java | 36 +
test/tools/javadoc/parser/7091528/T7091528.java | 14 +-
test/tools/javadoc/parser/7091528/p/C3.java | 27 +
188 files changed, 5898 insertions(+), 1132 deletions(-)
diffs (truncated from 11129 to 500 lines):
diff -r a0d9c18a1041 -r b16cd22835f8 .hgtags
--- a/.hgtags Wed Apr 09 12:27:24 2014 -0700
+++ b/.hgtags Fri Aug 29 16:52:52 2014 +0100
@@ -50,6 +50,7 @@
9596dff460935f09684c11d156ce591f92584f0d jdk7-b73
1a66b08deed0459054b5b1bea3dfbead30d258fa jdk7-b74
2485f5641ed0829205aaaeb31ad711c2c2ef0de3 jdk7-b75
+83367f01297bf255f511f5291bbbbaa24a9c8459 icedtea7-1.12
8fb9b4be3cb1574302acde90549a4d333ef51e93 jdk7-b76
0398ae15b90ac76d87ee21844453e95ff8613e43 jdk7-b77
acc1e40a5874ebf32bebcb6ada565b3b40b7461c jdk7-b78
@@ -63,6 +64,7 @@
ef07347428f2198ae6b8144ac0b9086bbe39fd16 jdk7-b86
409db93d19c002333980df5b797c6b965150c7a0 jdk7-b87
f9b5d4867a26f8c4b90ad37fe2c345b721e93d6b jdk7-b88
+681f1f51926faf4c73d8905a429ff4ead6e9d622 icedtea7-1.13
6cea9a143208bc1185ced046942c0f4e45dbeba5 jdk7-b89
71c2c23a7c35b2896c87004023b9743b6d1b7758 jdk7-b90
97b6fa97b8ddb3a49394011c2a0ec5d6535e594c jdk7-b91
@@ -111,6 +113,7 @@
3d7acdbb72cab55deedfd35f60d4732abc9d6ac4 jdk7-b134
9d0a61ac567b983da7cc8f4a7030f2245bb6dbab jdk7-b135
ed0f7f1f9511db4f9615b1426d22f8b961629275 jdk7-b136
+8e26c4aee63c04ee129bf9068f5eea47cc385177 icedtea-1.14
a15c9b058ae007d4ccb7e35ce44e4dfa977f090b jdk7-b137
53f212bed4f4304dce7f0bf0fa01c998c65bacd6 jdk7-b138
853b6bb99f9b58eb7cf8211c67d3b6e4f1228a3e jdk7-b139
@@ -260,6 +263,7 @@
9003a59a512e6b764d8a3f805aadc3996a58e5bd jdk8u5-b02
30e3dad0ebbdf3129bacd04a7f4cdecd3df92bb2 jdk8u5-b03
019dcdfffced0ca2026a0ad8c0e5fcb49d46116f jdk8u5-b04
+c9db8c800797258540e0411e58b8f7d59273de5f jdk8u11-b00
c9db8c800797258540e0411e58b8f7d59273de5f jdk8u5-b05
b1920c0b701d5ff219c9f622db5cafc9bf00d5c8 jdk8u5-b06
180df7f2c078f1efaa6fcd8ca9f55dc5f81b182c jdk8u5-b07
@@ -269,6 +273,20 @@
a12055904afd9f951131804868215e724c71b684 jdk8u5-b11
2a7002626e7997e946b96530629e2787bc1864bb jdk8u5-b12
9beafb58fb99e8b5f7577b2f26b12743ef4d07e7 jdk8u5-b13
+6614bfcdcd4d915b1b8e3ba3480d53ff83988290 jdk8u5-b31
+d37e407fba44f68c660f89be4e48f9e7b256a2d5 jdk8u11-b01
+e75f843c4bf81c79ca4c5d51dfe5fe39525c5301 jdk8u11-b02
+d9904b00b027b9176d6479dee7c7f4e054a68710 jdk8u11-b03
+5b5c46fe954cb744e2633e1ab097e934cc547a57 jdk8u11-b04
+f491f1581f196950c2cb858508dd06601968c417 jdk8u11-b05
+a4ecc38ec7910d5beb07be4623bd80dabe1fbfe8 jdk8u11-b06
+7803caf52e4b12f11e552565f55ef65aeb2be6a5 jdk8u11-b07
+a47aa3203c0210def786ab5ee685e97d07e8bf77 jdk8u11-b08
+e973a591a2182c0bdbdd9545ab13f83325acf1e6 jdk8u11-b09
+51cade4632608a6c0b8da33f420bd546aecf6faf jdk8u11-b10
+dc0d952b4199dc1cbc534c9afd535c78d21ed519 jdk8u11-b11
+0a79fea6f9cf713012211e933655175d52c6bc36 jdk8u11-b12
+16995a2b970df6be039cdaaedb5ade6099ffad8c jdk8u11-b31
26b33a6ea08810853af37e81c9b435465b289c98 jdk8u20-b02
a07271bca831cf1bab35a2ffbcebd8e060b2734b jdk8u20-b03
613c1d9930c9f650e3fc6926215931a85b679c66 jdk8u20-b04
@@ -280,3 +298,18 @@
1a57c569cb811a897691e42049eca33da8f8d761 jdk8u20-b07
0f821eb7e92b242c878dca68ef63f9626643ee8f jdk8u20-b08
aa0cb3af23d376e012a142b0531c4f42032fdacf jdk8u20-b09
+dd7b57ab4ab1a4bb93c543af3a13f66fe85a7802 icedtea-3.0.0pre01
+a0d9c18a1041c4217db9cda1817f0e348f1be885 jdk8u20-b10
+7ad480b982bf95b8a7290c8769b2698f6aacaf6b jdk8u20-b11
+e101a12a45a777268a2e729803499a7514255e5b jdk8u20-b12
+b5c2375893e2bca1883e5571bd911b6f0b533bf4 jdk8u20-b13
+5d39c29950f4d65e737f99e468427ae6454fa586 jdk8u20-b14
+9c577131ffa6aa0720c756232ae6e69bdff1c7ab jdk8u20-b15
+d9e6bb92751956ab7f0a469e2f3228a4dc5bb05f jdk8u20-b16
+b45fd486977d6cfe64c9947b7afd203c62ec4e98 jdk8u20-b17
+a550336d045faa63ac4439d4901d9f36e0b634bf jdk8u20-b18
+c04d99e00268ed87cfbdf76beb1a0ea08abd9a9c jdk8u20-b19
+e92effa22ecee1cb9965c278e45e2b1a6fbe0766 jdk8u20-b20
+7de1481c6cd88b42d815ae65e2d5b1cd918e11d1 jdk8u20-b21
+61fb0d8b169164ad5db15b6c497489cb30efb9c6 jdk8u20-b22
+948daf9c5e22c99a8c4d26d7956d9b55b888ab08 icedtea-3.0.0pre02
diff -r a0d9c18a1041 -r b16cd22835f8 .jcheck/conf
--- a/.jcheck/conf Wed Apr 09 12:27:24 2014 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk8
-bugids=dup
diff -r a0d9c18a1041 -r b16cd22835f8 make/build.xml
--- a/make/build.xml Wed Apr 09 12:27:24 2014 -0700
+++ b/make/build.xml Fri Aug 29 16:52:52 2014 +0100
@@ -1027,7 +1027,7 @@
</javac>
<taskdef name="genstubs"
classname="anttasks.GenStubsTask"
- classpath="${build.toolclasses.dir}/"/>
+ classpath="${build.toolclasses.dir}:${build.bootstrap.dir}/classes:${ant.home}/lib/ant.jar"/>
</target>
<target name="-def-javadoc-tool" depends="-check-target.java.home">
diff -r a0d9c18a1041 -r b16cd22835f8 src/share/classes/com/sun/tools/classfile/Instruction.java
--- a/src/share/classes/com/sun/tools/classfile/Instruction.java Wed Apr 09 12:27:24 2014 -0700
+++ b/src/share/classes/com/sun/tools/classfile/Instruction.java Fri Aug 29 16:52:52 2014 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
package com.sun.tools.classfile;
+import java.util.Locale;
+
/**
* See JVMS, chapter 6.
*
@@ -211,7 +213,7 @@
if (opcode == null)
return "bytecode " + getUnsignedByte(0);
else
- return opcode.toString().toLowerCase();
+ return opcode.toString().toLowerCase(Locale.US);
}
/** Get the length, in bytes, of this instruction, including the opcode
diff -r a0d9c18a1041 -r b16cd22835f8 src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Wed Apr 09 12:27:24 2014 -0700
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java Fri Aug 29 16:52:52 2014 +0100
@@ -37,6 +37,7 @@
import com.sun.tools.doclint.DocLint;
import com.sun.tools.javac.file.JavacFileManager;
import com.sun.tools.javac.util.Context;
+import com.sun.tools.javac.util.StringUtils;
import com.sun.tools.javadoc.RootDocImpl;
/**
@@ -237,7 +238,7 @@
public void setSpecificDocletOptions(String[][] options) {
for (int oi = 0; oi < options.length; ++oi) {
String[] os = options[oi];
- String opt = os[0].toLowerCase();
+ String opt = StringUtils.toLowerCase(os[0]);
if (opt.equals("-footer")) {
footer = os[1];
} else if (opt.equals("-header")) {
@@ -325,7 +326,7 @@
return result;
}
// otherwise look for the options we have added
- option = option.toLowerCase();
+ option = StringUtils.toLowerCase(option);
if (option.equals("-nodeprecatedlist") ||
option.equals("-noindex") ||
option.equals("-notree") ||
@@ -389,7 +390,7 @@
// otherwise look at our options
for (int oi = 0; oi < options.length; ++oi) {
String[] os = options[oi];
- String opt = os[0].toLowerCase();
+ String opt = StringUtils.toLowerCase(os[0]);
if (opt.equals("-helpfile")) {
if (nohelp == true) {
reporter.printError(getText("doclet.Option_conflict",
diff -r a0d9c18a1041 -r b16cd22835f8 src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Wed Apr 09 12:27:24 2014 -0700
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Fri Aug 29 16:52:52 2014 +0100
@@ -28,12 +28,15 @@
import java.io.*;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import com.sun.javadoc.*;
import com.sun.tools.doclets.formats.html.markup.*;
import com.sun.tools.doclets.internal.toolkit.*;
import com.sun.tools.doclets.internal.toolkit.taglets.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
+import com.sun.tools.javac.util.StringUtils;
/**
* Class for the Html Format Code Generation specific to JavaDoc.
@@ -138,42 +141,37 @@
if (index < 0) {
return htmlstr;
}
- String lowerHtml = htmlstr.toLowerCase();
- // Return index of first occurrence of {@docroot}
- // Note: {@docRoot} is not case sensitive when passed in w/command line option
- index = lowerHtml.indexOf("{@docroot}", index);
- if (index < 0) {
+ Matcher docrootMatcher = docrootPattern.matcher(htmlstr);
+ if (!docrootMatcher.find()) {
return htmlstr;
}
StringBuilder buf = new StringBuilder();
- int previndex = 0;
- while (true) {
- final String docroot = "{@docroot}";
- // Search for lowercase version of {@docRoot}
- index = lowerHtml.indexOf(docroot, previndex);
- // If next {@docRoot} tag not found, append rest of htmlstr and exit loop
- if (index < 0) {
- buf.append(htmlstr.substring(previndex));
- break;
- }
- // If next {@docroot} tag found, append htmlstr up to start of tag
- buf.append(htmlstr.substring(previndex, index));
- previndex = index + docroot.length();
- if (configuration.docrootparent.length() > 0 && htmlstr.startsWith("/..", previndex)) {
+ int prevEnd = 0;
+ do {
+ int match = docrootMatcher.start();
+ // append htmlstr up to start of next {@docroot}
+ buf.append(htmlstr.substring(prevEnd, match));
+ prevEnd = docrootMatcher.end();
+ if (configuration.docrootparent.length() > 0 && htmlstr.startsWith("/..", prevEnd)) {
// Insert the absolute link if {@docRoot} is followed by "/..".
buf.append(configuration.docrootparent);
- previndex += 3;
+ prevEnd += 3;
} else {
// Insert relative path where {@docRoot} was located
buf.append(pathToRoot.isEmpty() ? "." : pathToRoot.getPath());
}
// Append slash if next character is not a slash
- if (previndex < htmlstr.length() && htmlstr.charAt(previndex) != '/') {
+ if (prevEnd < htmlstr.length() && htmlstr.charAt(prevEnd) != '/') {
buf.append('/');
}
- }
+ } while (docrootMatcher.find());
+ buf.append(htmlstr.substring(prevEnd));
return buf.toString();
}
+ //where:
+ // Note: {@docRoot} is not case sensitive when passed in w/command line option:
+ private static final Pattern docrootPattern =
+ Pattern.compile(Pattern.quote("{@docroot}"), Pattern.CASE_INSENSITIVE);
/**
* Get the script to show or hide the All classes link.
@@ -1689,13 +1687,13 @@
}
//Redirect all relative links.
- int end, begin = text.toLowerCase().indexOf("<a");
+ int end, begin = StringUtils.indexOfIgnoreCase(text, "<a");
if(begin >= 0){
StringBuilder textBuff = new StringBuilder(text);
while(begin >=0){
if (textBuff.length() > begin + 2 && ! Character.isWhitespace(textBuff.charAt(begin+2))) {
- begin = textBuff.toString().toLowerCase().indexOf("<a", begin + 1);
+ begin = StringUtils.indexOfIgnoreCase(textBuff.toString(), "<a", begin + 1);
continue;
}
@@ -1722,15 +1720,16 @@
}
}
String relativeLink = textBuff.substring(begin, end);
- if (!(relativeLink.toLowerCase().startsWith("mailto:") ||
- relativeLink.toLowerCase().startsWith("http:") ||
- relativeLink.toLowerCase().startsWith("https:") ||
- relativeLink.toLowerCase().startsWith("file:"))) {
+ String relativeLinkLowerCase = StringUtils.toLowerCase(relativeLink);
+ if (!(relativeLinkLowerCase.startsWith("mailto:") ||
+ relativeLinkLowerCase.startsWith("http:") ||
+ relativeLinkLowerCase.startsWith("https:") ||
+ relativeLinkLowerCase.startsWith("file:"))) {
relativeLink = "{@"+(new DocRootTaglet()).getName() + "}/"
+ redirectPathFromRoot.resolve(relativeLink).getPath();
textBuff.replace(begin, end, relativeLink);
}
- begin = textBuff.toString().toLowerCase().indexOf("<a", begin + 1);
+ begin = StringUtils.indexOfIgnoreCase(textBuff.toString(), "<a", begin + 1);
}
return textBuff.toString();
}
@@ -1771,7 +1770,7 @@
break main;
ch = text.charAt(currPos);
}
- if (ch == '>' && blockTags.contains(text.substring(tagPos, currPos).toLowerCase())) {
+ if (ch == '>' && blockTags.contains(StringUtils.toLowerCase(text.substring(tagPos, currPos)))) {
result.append(text, startPos, lessThanPos);
startPos = currPos + 1;
}
diff -r a0d9c18a1041 -r b16cd22835f8 src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java Wed Apr 09 12:27:24 2014 -0700
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java Fri Aug 29 16:52:52 2014 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@
import com.sun.tools.doclets.formats.html.markup.*;
import com.sun.tools.doclets.internal.toolkit.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
+import com.sun.tools.javac.util.StringUtils;
/**
* Writes method documentation in HTML format.
@@ -331,24 +332,6 @@
}
/**
- * Parse the <Code> tag and return the text.
- */
- protected String parseCodeTag(String tag){
- if(tag == null){
- return "";
- }
-
- String lc = tag.toLowerCase();
- int begin = lc.indexOf("<code>");
- int end = lc.indexOf("</code>");
- if(begin == -1 || end == -1 || end <= begin){
- return tag;
- } else {
- return tag.substring(begin + 6, end);
- }
- }
-
- /**
* {@inheritDoc}
*/
protected static void addImplementsInfo(HtmlDocletWriter writer,
diff -r a0d9c18a1041 -r b16cd22835f8 src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java Wed Apr 09 12:27:24 2014 -0700
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java Fri Aug 29 16:52:52 2014 +0100
@@ -25,6 +25,8 @@
package com.sun.tools.doclets.formats.html.markup;
+import com.sun.tools.javac.util.StringUtils;
+
/**
* Enum representing HTML tag attributes.
*
@@ -64,7 +66,7 @@
private final String value;
HtmlAttr() {
- this.value = name().toLowerCase();
+ this.value = StringUtils.toLowerCase(name());
}
HtmlAttr(String name) {
diff -r a0d9c18a1041 -r b16cd22835f8 src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java Wed Apr 09 12:27:24 2014 -0700
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java Fri Aug 29 16:52:52 2014 +0100
@@ -25,7 +25,7 @@
package com.sun.tools.doclets.formats.html.markup;
-import java.util.Locale;
+import com.sun.tools.javac.util.StringUtils;
/**
* Enum representing HTML tags.
@@ -117,7 +117,7 @@
HtmlTag(BlockType blockType, EndTag endTag ) {
this.blockType = blockType;
this.endTag = endTag;
- this.value = name().toLowerCase(Locale.US);
+ this.value = StringUtils.toLowerCase(name());
}
/**
diff -r a0d9c18a1041 -r b16cd22835f8 src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties
--- a/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties Wed Apr 09 12:27:24 2014 -0700
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties Fri Aug 29 16:52:52 2014 +0100
@@ -29,7 +29,7 @@
doclet.Href_Enum_Title={0}\u5185\u306E\u5217\u6319\u578B
doclet.Href_Type_Param_Title={0}\u5185\u306E\u578B\u30D1\u30E9\u30E1\u30FC\u30BF
doclet.Href_Class_Or_Interface_Title={0}\u5185\u306E\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.Summary=\u6982\u8981:
+doclet.Summary=\u30B5\u30DE\u30EA\u30FC:
doclet.Detail=\u8A73\u7D30:
doclet.navNested=\u30CD\u30B9\u30C8
doclet.navAnnotationTypeOptionalMember=\u30AA\u30D7\u30B7\u30E7\u30F3
@@ -117,18 +117,18 @@
doclet.Window_Source_title=\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9
doclet.Window_Help_title=API\u30D8\u30EB\u30D7
doclet.Help_line_1=API\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u69CB\u6210
-doclet.Help_line_2=\u3053\u306EAPI(Application Programming Interface)\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u306F\u3001\u6B21\u306B\u8AAC\u660E\u3059\u308B\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u3042\u308B\u9805\u76EE\u306B\u5BFE\u5FDC\u3059\u308B\u30DA\u30FC\u30B8\u304C\u542B\u307E\u308C\u307E\u3059\u3002
-doclet.Help_line_3={0}\u30DA\u30FC\u30B8\u306FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30D5\u30ED\u30F3\u30C8\u30FB\u30DA\u30FC\u30B8\u3067\u3001\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981\u3092\u542B\u3080\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30EA\u30B9\u30C8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u4E00\u9023\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981\u8AAC\u660E\u3082\u8868\u793A\u3055\u308C\u307E\u3059\u3002
-doclet.Help_line_4=\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F\u3001\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u6982\u8981\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306F6\u3064\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059\u3002
+doclet.Help_line_2=\u3053\u306EAPI (Application Programming Interface)\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u306F\u3001\u6B21\u306B\u8AAC\u660E\u3059\u308B\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u3042\u308B\u9805\u76EE\u306B\u5BFE\u5FDC\u3059\u308B\u30DA\u30FC\u30B8\u304C\u542B\u307E\u308C\u307E\u3059\u3002
+doclet.Help_line_3={0}\u30DA\u30FC\u30B8\u306FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30D5\u30ED\u30F3\u30C8\u30FB\u30DA\u30FC\u30B8\u3067\u3001\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30B5\u30DE\u30EA\u30FC\u3092\u542B\u3080\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30EA\u30B9\u30C8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u4E00\u9023\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u5168\u4F53\u7684\u306A\u8AAC\u660E\u3082\u8868\u793A\u3055\u308C\u307E\u3059\u3002
+doclet.Help_line_4=\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F\u3001\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u30B5\u30DE\u30EA\u30FC\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306F6\u3064\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059\u3002
doclet.Help_line_5=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.Help_line_6=\u5404\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u5404\u30DA\u30FC\u30B8\u306B\u306F\u6B21\u306E\u3088\u3046\u306B\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E\u3068\u3001\u6982\u8981\u8868\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u8A73\u7D30\u8AAC\u660E\u304C\u542B\u307E\u308C\u307E\u3059\u3002
+doclet.Help_line_6=\u5404\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u5404\u30DA\u30FC\u30B8\u306B\u306F\u6B21\u306E\u3088\u3046\u306B\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E\u3068\u3001\u30B5\u30DE\u30EA\u30FC\u8868\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u8A73\u7D30\u8AAC\u660E\u304C\u542B\u307E\u308C\u307E\u3059\u3002
doclet.Help_line_7=\u30AF\u30E9\u30B9\u968E\u5C64\u8868\u793A
doclet.Help_line_8=\u76F4\u7CFB\u306E\u30B5\u30D6\u30AF\u30E9\u30B9
doclet.Help_line_9=\u65E2\u77E5\u306E\u30B5\u30D6\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8
doclet.Help_line_10=\u65E2\u77E5\u306E\u5B9F\u88C5\u30AF\u30E9\u30B9\u306E\u30EA\u30B9\u30C8
doclet.Help_line_11=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u5BA3\u8A00
doclet.Help_line_12=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E
-doclet.Help_line_13=\u5404\u6982\u8981\u30A8\u30F3\u30C8\u30EA\u306B\u306F\u3001\u305D\u306E\u9805\u76EE\u306E\u8A73\u7D30\u306A\u8AAC\u660E\u306E\u4E2D\u304B\u30891\u884C\u76EE\u306E\u6587\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u8A73\u7D30\u306A\u8AAC\u660E\u306F\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9\u306B\u73FE\u308C\u308B\u9806\u306B\u4E26\u3079\u3089\u308C\u307E\u3059\u304C\u3001\u6982\u8981\u30A8\u30F3\u30C8\u30EA\u306F\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306B\u4E26\u3079\u3089\u308C\u307E\u3059\u3002\u3053\u308C\u306B\u3088\u3063\u3066\u3001\u30D7\u30ED\u30B0\u30E9\u30DE\u304C\u8A2D\u5B9A\u3057\u305F\u8AD6\u7406\u7684\u306A\u30B0\u30EB\u30FC\u30D7\u5206\u3051\u304C\u4FDD\u6301\u3055\u308C\u307E\u3059\u3002
+doclet.Help_line_13=\u5404\u30B5\u30DE\u30EA\u30FC\u30FB\u30A8\u30F3\u30C8\u30EA\u306B\u306F\u3001\u305D\u306E\u9805\u76EE\u306E\u8A73\u7D30\u8AAC\u660E\u306E\u4E2D\u304B\u30891\u884C\u76EE\u306E\u6587\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u30B5\u30DE\u30EA\u30FC\u30FB\u30A8\u30F3\u30C8\u30EA\u306F\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u3067\u3059\u304C\u3001\u8A73\u7D30\u8AAC\u660E\u306F\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9\u306B\u73FE\u308C\u308B\u9806\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002\u3053\u308C\u306B\u3088\u3063\u3066\u3001\u30D7\u30ED\u30B0\u30E9\u30DE\u304C\u8A2D\u5B9A\u3057\u305F\u8AD6\u7406\u7684\u306A\u30B0\u30EB\u30FC\u30D7\u5206\u3051\u304C\u4FDD\u6301\u3055\u308C\u307E\u3059\u3002
doclet.Help_line_14=\u4F7F\u7528
doclet.Help_line_15=\u5404\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3055\u308C\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u305D\u308C\u305E\u308C\u300C\u4F7F\u7528\u300D\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306B\u306F\u3001\u3069\u306E\u3088\u3046\u306A\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u3001\u30E1\u30BD\u30C3\u30C9\u3001\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304A\u3088\u3073\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u3001\u7279\u5B9A\u306E\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4E00\u90E8\u3092\u4F7F\u7528\u3057\u3066\u3044\u308B\u304B\u304C\u8A18\u8FF0\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u305F\u3068\u3048\u3070\u3001\u30AF\u30E9\u30B9A\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9A\u306E\u5834\u5408\u3001\u305D\u306E\u300C\u4F7F\u7528\u300D\u30DA\u30FC\u30B8\u306B\u306F\u3001A\u306E\u30B5\u30D6\u30AF\u30E9\u30B9\u3001A\u3068\u3057\u3066\u5BA3\u8A00\u3055\u308C\u308B\u30D5\u30A3\u30FC\u30EB\u30C9\u3001A\u3092\u8FD4\u3059\u30E1\u30BD\u30C3\u30C9\u3068\u3001\u578BA\u3092\u6301\u3064\u30E1\u30BD\u30C3\u30C9\u304A\u3088\u3073\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304C\u542B\u307E\u308C\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306B\u30A2\u30AF\u30BB\u30B9\u3059\u308B\u306B\u306F\u3001\u307E\u305A\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u79FB\u52D5\u3057\u3001\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306E\u300C\u4F7F\u7528\u300D\u30EA\u30F3\u30AF\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002
doclet.Help_line_16=\u968E\u5C64\u30C4\u30EA\u30FC(\u30AF\u30E9\u30B9\u968E\u5C64)
diff -r a0d9c18a1041 -r b16cd22835f8 src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Wed Apr 09 12:27:24 2014 -0700
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Fri Aug 29 16:52:52 2014 +0100
@@ -29,6 +29,7 @@
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import javax.tools.JavaFileManager;
import com.sun.javadoc.*;
import com.sun.tools.javac.sym.Profiles;
@@ -36,7 +37,7 @@
import com.sun.tools.doclets.internal.toolkit.builders.BuilderFactory;
import com.sun.tools.doclets.internal.toolkit.taglets.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
-import javax.tools.JavaFileManager;
+import com.sun.tools.javac.util.StringUtils;
/**
* Configure the output based on the options. Doclets should sub-class
@@ -337,7 +338,7 @@
* Negative value means error occurred.
*/
public int optionLength(String option) {
- option = option.toLowerCase();
+ option = StringUtils.toLowerCase(option);
if (option.equals("-author") ||
option.equals("-docfilessubdirs") ||
option.equals("-javafx") ||
@@ -454,7 +455,7 @@
// the output directory has already been created: so do that first.
for (int oi = 0; oi < options.length; ++oi) {
String[] os = options[oi];
- String opt = os[0].toLowerCase();
+ String opt = StringUtils.toLowerCase(os[0]);
if (opt.equals("-d")) {
destDirName = addTrailingFileSep(os[1]);
docFileDestDirName = destDirName;
@@ -465,7 +466,7 @@
for (int oi = 0; oi < options.length; ++oi) {
String[] os = options[oi];
- String opt = os[0].toLowerCase();
+ String opt = StringUtils.toLowerCase(os[0]);
if (opt.equals("-docfilessubdirs")) {
copydocfilesubdirs = true;
} else if (opt.equals("-docencoding")) {
@@ -708,7 +709,7 @@
String encoding = "";
for (int oi = 0; oi < options.length; oi++) {
String[] os = options[oi];
- String opt = os[0].toLowerCase();
+ String opt = StringUtils.toLowerCase(os[0]);
if (opt.equals("-docencoding")) {
docencodingfound = true;
if (!checkOutputFileEncoding(os[1], reporter)) {
diff -r a0d9c18a1041 -r b16cd22835f8 src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java Wed Apr 09 12:27:24 2014 -0700
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java Fri Aug 29 16:52:52 2014 +0100
@@ -384,13 +384,13 @@
commentTextBuilder.append(
MessageFormat.format(
configuration.getText("doclet.PropertySetterWithName"),
- Util.propertyNameFromMethodName(member.name())));
+ Util.propertyNameFromMethodName(configuration, member.name())));
}
if (isGetter) {
commentTextBuilder.append(
MessageFormat.format(
configuration.getText("doclet.PropertyGetterWithName"),
- Util.propertyNameFromMethodName(member.name())));
+ Util.propertyNameFromMethodName(configuration, member.name())));
}
if (propertyDoc.commentText() != null
&& !propertyDoc.commentText().isEmpty()) {
diff -r a0d9c18a1041 -r b16cd22835f8 src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java Wed Apr 09 12:27:24 2014 -0700
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java Fri Aug 29 16:52:52 2014 +0100
@@ -31,6 +31,7 @@
import com.sun.javadoc.*;
import com.sun.tools.doclets.internal.toolkit.*;
import com.sun.tools.doclets.internal.toolkit.util.*;
+import com.sun.tools.javac.util.StringUtils;
/**
* Builds the serialized form.
@@ -567,7 +568,7 @@
}
Tag[] serial = doc.tags("serial");
if (serial.length > 0) {
- String serialtext = serial[0].text().toLowerCase();
+ String serialtext = StringUtils.toLowerCase(serial[0].text());
if (serialtext.indexOf("exclude") >= 0) {
return false;
More information about the distro-pkg-dev
mailing list