hg: jdk7/tl/langtools: 6942649: add hidden option to identify location and version of javac classes

2010-04-09 Thread jonathan . gibbons
Changeset: 96072ad00783 Author:jjg Date: 2010-04-09 15:39 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/96072ad00783 6942649: add hidden option to identify location and version of javac classes Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/main/Main.java

hg: jdk7/tl/langtools: 6948251: need to quote args in langtools launcher script

2010-04-29 Thread jonathan . gibbons
Changeset: 32675c68a3ca Author:jjg Date: 2010-04-29 14:25 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/32675c68a3ca 6948251: need to quote args in langtools launcher script Reviewed-by: darcy ! src/share/bin/launcher.sh-template

hg: jdk7/tl/langtools: 6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')

2010-05-03 Thread jonathan . gibbons
Changeset: a6f2911a7c55 Author:mcimadamore Date: 2010-05-03 17:12 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/a6f2911a7c55 6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch') Reviewed-by: jjg, darcy + src/share/classes/com/sun/source/tree/

hg: jdk7/tl/langtools: 6952188: update timeout for langtools jtreg tests on JPRT

2010-05-13 Thread jonathan . gibbons
Changeset: ebf09be0222c Author:jjg Date: 2010-05-13 11:30 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/ebf09be0222c 6952188: update timeout for langtools jtreg tests on JPRT Reviewed-by: ohair ! test/Makefile

hg: jdk7/tl/langtools: 6954901: langtools/test/Makefile should check for bin/javac(.exe) instead of lib/tools.jar

2010-05-21 Thread jonathan . gibbons
Changeset: e9d66d392a8d Author:jjg Date: 2010-05-21 17:32 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/e9d66d392a8d 6954901: langtools/test/Makefile should check for bin/javac(.exe) instead of lib/tools.jar Reviewed-by: ohair ! test/Makefile

hg: jdk7/tl/jdk: 6934615: Relative classpaths in jarfile manifests are handled inefficiently by rmic

2010-05-25 Thread jonathan . gibbons
Changeset: dfa98add4ad0 Author:jjg Date: 2010-05-25 15:39 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/dfa98add4ad0 6934615: Relative classpaths in jarfile manifests are handled inefficiently by rmic Reviewed-by: darcy ! src/share/classes/sun/rmi/rmic/BatchEnvironment.jav

hg: jdk7/tl/langtools: 6955264: add option to suppress Abort in Check.completionError

2010-06-03 Thread jonathan . gibbons
Changeset: 559c9a37d9f6 Author:jjg Date: 2010-06-03 17:14 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/559c9a37d9f6 6955264: add option to suppress Abort in Check.completionError Reviewed-by: mcimadamore ! src/share/classes/com/sun/tools/javac/comp/Check.java

hg: jdk7/tl/langtools: 6958391: add vizant support to langtools build

2010-06-04 Thread jonathan . gibbons
Changeset: b7fc560217d3 Author:jjg Date: 2010-06-04 14:54 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/b7fc560217d3 6958391: add vizant support to langtools build Reviewed-by: mcimadamore ! make/build.properties ! make/build.xml

hg: jdk7/tl/langtools: 6958802: cleanup and doc langtools build.xml file

2010-06-04 Thread jonathan . gibbons
Changeset: d33b91f360fc Author:jjg Date: 2010-06-04 17:33 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/d33b91f360fc 6958802: cleanup and doc langtools build.xml file Reviewed-by: ohair ! make/build.properties ! make/build.xml

hg: jdk7/tl/langtools: 6944312: Potential rebranding issues in openjdk/langtools repository sources

2010-06-10 Thread jonathan . gibbons
Changeset: f2fdd52e4e87 Author:jjg Date: 2010-06-10 16:08 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/f2fdd52e4e87 6944312: Potential rebranding issues in openjdk/langtools repository sources Reviewed-by: darcy ! src/share/classes/com/sun/javadoc/package.html ! src/

hg: jdk7/tl/langtools: 6960407: Potential rebranding issues in openjdk/langtools repository sources

2010-06-10 Thread jonathan . gibbons
Changeset: 366a7b9b5627 Author:jjg Date: 2010-06-10 17:09 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/366a7b9b5627 6960407: Potential rebranding issues in openjdk/langtools repository sources Reviewed-by: darcy ! make/Makefile ! make/Makefile-classic ! src/share/cla

hg: jdk7/tl/langtools: 6877961: langtools build should allow more options when running jtreg

2010-06-11 Thread jonathan . gibbons
Changeset: 224533455888 Author:jjg Date: 2010-06-11 07:12 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/224533455888 6877961: langtools build should allow more options when running jtreg Reviewed-by: mcimadamore ! make/build.xml

hg: jdk7/tl/langtools: 6958836: javadoc should support -Xmaxerrs and -Xmaxwarns

2010-06-11 Thread jonathan . gibbons
Changeset: d1ea43cb71c1 Author:jjg Date: 2010-06-11 17:24 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/d1ea43cb71c1 6958836: javadoc should support -Xmaxerrs and -Xmaxwarns Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/util/Log.java ! src/share/classes/c

hg: jdk7/tl/corba: 6960831: fix CORBA build warnings

2010-06-14 Thread jonathan . gibbons
Changeset: 032585ad970d Author:jjg Date: 2010-06-14 11:28 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/corba/rev/032585ad970d 6960831: fix CORBA build warnings Reviewed-by: darcy ! src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java ! src/share/classes/com/sun/c

hg: jdk7/tl/langtools: 6956638: JavacTask.generate does not generate all required files

2010-06-16 Thread jonathan . gibbons
Changeset: 0840dd65b9e2 Author:jjg Date: 2010-06-16 16:23 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/0840dd65b9e2 6956638: JavacTask.generate does not generate all required files Reviewed-by: darcy Contributed-by: joshuamaur...@gmail.com + test/tools/javac/T6956638

hg: jdk7/tl/langtools: 6962540: langtools Makefile sets DEV_NULL incorrectly

2010-06-18 Thread jonathan . gibbons
Changeset: 0ba1f80b73a5 Author:jjg Date: 2010-06-18 16:45 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/0ba1f80b73a5 6962540: langtools Makefile sets DEV_NULL incorrectly Reviewed-by: ohair ! make/Makefile

hg: jdk7/tl/langtools: 6961178: Allow doclet.xml to contain XML attributes

2010-06-18 Thread jonathan . gibbons
Changeset: 4177f5bdd189 Author:jjg Date: 2010-06-18 21:13 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/4177f5bdd189 6961178: Allow doclet.xml to contain XML attributes Reviewed-by: bpatel ! src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBu

hg: jdk7/tl/langtools: 6917288: Unnamed nested class is not generated

2010-06-24 Thread jonathan . gibbons
Changeset: d8a15fda7e3a Author:jjg Date: 2010-06-24 10:34 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/d8a15fda7e3a 6917288: Unnamed nested class is not generated Reviewed-by: mcimadamore ! src/share/classes/com/sun/tools/javac/comp/Lower.java + test/tools/javac/6917

hg: jdk7/tl/langtools: 6964768: need test program to validate javac resource bundles

2010-06-30 Thread jonathan . gibbons
Changeset: d2b7ecf33b35 Author:jjg Date: 2010-06-30 18:06 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/d2b7ecf33b35 6964768: need test program to validate javac resource bundles Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/code/Kinds.java ! src/share/cl

hg: jdk7/tl/langtools: 6968497: localized text appears in raw diagnostic

2010-07-12 Thread jonathan . gibbons
Changeset: 064468702a8d Author:jjg Date: 2010-07-12 16:37 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/064468702a8d 6968497: localized text appears in raw diagnostic Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/comp/Check.java ! test/tools/javac/generic

hg: jdk7/tl/langtools: 6966732: replace use of static Log.getLocalizedString with non-static alternative where possible

2010-07-13 Thread jonathan . gibbons
Changeset: a5454419dd46 Author:jjg Date: 2010-07-13 19:14 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/a5454419dd46 6966732: replace use of static Log.getLocalizedString with non-static alternative where possible Reviewed-by: darcy ! src/share/classes/com/sun/tools/

hg: jdk7/tl/langtools: 6968434: test CheckResourceKeys fails on control builds

2010-07-13 Thread jonathan . gibbons
Changeset: 0e1fab5cffc8 Author:jjg Date: 2010-07-13 19:17 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/0e1fab5cffc8 6968434: test CheckResourceKeys fails on control builds Reviewed-by: darcy ! test/tools/javac/diags/CheckResourceKeys.java

hg: jdk7/tl/langtools: 6968789: incorrect text in "diamond not supported" message

2010-07-13 Thread jonathan . gibbons
Changeset: e57b27703e8b Author:jjg Date: 2010-07-13 19:20 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/e57b27703e8b 6968789: incorrect text in "diamond not supported" message Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/resources/compiler.properties

hg: jdk7/tl/langtools: 6968063: provide examples of code that generate diagnostics

2010-07-22 Thread jonathan . gibbons
Changeset: 3640b60bd0f6 Author:jjg Date: 2010-07-22 11:02 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/3640b60bd0f6 6968063: provide examples of code that generate diagnostics Reviewed-by: mcimadamore ! make/build.xml + test/tools/javac/diags/CheckExamples.java + tes

hg: jdk7/tl/langtools: 6971882: Remove -XDstdout from javac test

2010-07-26 Thread jonathan . gibbons
Changeset: 4172cfff05f0 Author:jjg Date: 2010-07-26 14:18 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/4172cfff05f0 6971882: Remove -XDstdout from javac test Reviewed-by: darcy ! test/tools/javac/4980495/static/Test.java ! test/tools/javac/4980495/std/Test.java ! tes

hg: jdk7/tl/langtools: 6957438: improve code for generating warning messages containing option names

2010-07-26 Thread jonathan . gibbons
Changeset: d1bd93028447 Author:jjg Date: 2010-07-26 14:25 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/d1bd93028447 6957438: improve code for generating warning messages containing option names Reviewed-by: mcimadamore ! src/share/classes/com/sun/tools/javac/code/Lin

hg: jdk7/tl/langtools: 6972327: JCTree.pos incorrect for annotations without modifiers and package

2010-07-27 Thread jonathan . gibbons
Changeset: b29160d1b3e0 Author:jjg Date: 2010-07-27 11:32 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/b29160d1b3e0 6972327: JCTree.pos incorrect for annotations without modifiers and package Reviewed-by: mcimadamore Contributed-by: jan.lah...@sun.com ! src/share/cla

hg: jdk7/tl/langtools: 6403456: -Werror should work with annotation processing

2010-07-27 Thread jonathan . gibbons
Changeset: ed354a00f76b Author:jjg Date: 2010-07-27 11:52 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/ed354a00f76b 6403456: -Werror should work with annotation processing Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/processing/JavacMessager.java ! src

hg: jdk7/tl/langtools: 6972556: warning for using a file name instead of a binary name for Filer.createSourceFile

2010-07-29 Thread jonathan . gibbons
Changeset: 4a7979c3ce15 Author:jjg Date: 2010-07-29 18:06 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/4a7979c3ce15 6972556: warning for using a file name instead of a binary name for Filer.createSourceFile Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/

hg: jdk7/tl/langtools: 6340549: javax.tools.JavaCompilerTool.getStandardFileManager().list() includes directories

2010-07-29 Thread jonathan . gibbons
Changeset: 8a5c98a695ae Author:jjg Date: 2010-07-29 19:27 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/8a5c98a695ae 6340549: javax.tools.JavaCompilerTool.getStandardFileManager().list() includes directories Reviewed-by: darcy + test/tools/javac/T6340549.java

hg: jdk7/tl/langtools: 6966604: JavacFiler not correctly notified of lastRound

2010-07-29 Thread jonathan . gibbons
Changeset: 2cf925ad67ab Author:jjg Date: 2010-07-29 19:30 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/2cf925ad67ab 6966604: JavacFiler not correctly notified of lastRound Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/processing/JavacFiler.java ! src/sh

hg: jdk7/tl/langtools: 6973626: test/tools/javac/processing/* tests fail with assertions enabled

2010-08-02 Thread jonathan . gibbons
Changeset: 6318230cdb82 Author:jjg Date: 2010-08-02 16:29 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/6318230cdb82 6973626: test/tools/javac/processing/* tests fail with assertions enabled Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/processing/JavacP

hg: jdk7/tl/langtools: 6976833: options included twice in Example SimpleCompiler

2010-08-16 Thread jonathan . gibbons
Changeset: a31c511db424 Author:jjg Date: 2010-08-16 14:59 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/a31c511db424 6976833: options included twice in Example SimpleCompiler Reviewed-by: darcy ! test/tools/javac/diags/Example.java

hg: jdk7/tl/langtools: 6975005: improve JavacProcessingEnvironment.Round abstraction

2010-08-23 Thread jonathan . gibbons
Changeset: 6b95dd682538 Author:jjg Date: 2010-08-23 11:56 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/6b95dd682538 6975005: improve JavacProcessingEnvironment.Round abstraction Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/main/JavaCompiler.java ! src/

hg: jdk7/tl/langtools: 6976747: JCDiagnostic: replace "boolean mandatory" with new "Set"

2010-08-23 Thread jonathan . gibbons
Changeset: a626d8c1de6e Author:jjg Date: 2010-08-23 15:13 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/a626d8c1de6e 6976747: JCDiagnostic: replace "boolean mandatory" with new "Set" Reviewed-by: mcimadamore ! src/share/classes/com/sun/tools/javac/comp/Resolve.java !

hg: jdk7/tl/langtools: 6935638: -implicit:none prevents compilation with annotation processing

2010-08-24 Thread jonathan . gibbons
Changeset: e9d09e97d669 Author:jjg Date: 2010-08-24 11:31 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/e9d09e97d669 6935638: -implicit:none prevents compilation with annotation processing Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/main/JavaCompiler.ja

hg: jdk7/tl/langtools: 6929404: Filer.getResource(SOURCE_PATH, ...) does not work when -sourcepath contains >1 entry

2010-08-24 Thread jonathan . gibbons
Changeset: f3323b1c65ee Author:jjg Date: 2010-08-24 15:09 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/f3323b1c65ee 6929404: Filer.getResource(SOURCE_PATH, ...) does not work when -sourcepath contains >1 entry Reviewed-by: darcy ! src/share/classes/com/sun/tools/jav

hg: jdk7/tl/langtools: 6979564: ":" for path separator in dist/bin/javac does not work on Windows

2010-08-25 Thread jonathan . gibbons
Changeset: 6ef801fa38b7 Author:jjg Date: 2010-08-25 11:24 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/6ef801fa38b7 6979564: ":" for path separator in dist/bin/javac does not work on Windows Reviewed-by: jjh ! make/build.xml ! src/share/bin/launcher.sh-template

hg: jdk7/tl/langtools: 6960424: new option -Xpkginfo for better control of when package-info.class is generated

2010-08-25 Thread jonathan . gibbons
Changeset: 70ebdef189c9 Author:jjg Date: 2010-08-25 11:40 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/70ebdef189c9 6960424: new option -Xpkginfo for better control of when package-info.class is generated Reviewed-by: mcimadamore ! src/share/classes/com/sun/tools/ja

hg: jdk7/tl/langtools: 6604599: ToolProvider should be less compiler-specific

2010-08-26 Thread jonathan . gibbons
Changeset: cfd047f3cf60 Author:jjg Date: 2010-08-26 15:17 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/cfd047f3cf60 6604599: ToolProvider should be less compiler-specific Reviewed-by: darcy ! src/share/classes/javax/tools/ToolProvider.java + test/tools/javac/api/Tool

hg: jdk7/tl/langtools: 6980017: javap -XDdetail:source behaves badly if source not available.

2010-08-26 Thread jonathan . gibbons
Changeset: ae3acbf63943 Author:jjg Date: 2010-08-26 16:13 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/ae3acbf63943 6980017: javap -XDdetail:source behaves badly if source not available. Reviewed-by: ksrini ! src/share/classes/com/sun/tools/javap/CodeWriter.java ! sr

hg: jdk7/tl/langtools: 6980724: test/tools/javac/InterfaceAssert.java sometimes fails

2010-08-27 Thread jonathan . gibbons
Changeset: 3a9f319be48a Author:jjg Date: 2010-08-27 17:14 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/3a9f319be48a 6980724: test/tools/javac/InterfaceAssert.java sometimes fails Reviewed-by: darcy ! test/tools/javac/InterfaceAssert.java

hg: jdk7/tl/langtools: 6570730: com.sun.source.tree.ModifiersTree.getFlags() should return class type

2010-08-27 Thread jonathan . gibbons
Changeset: b4e7a57af8df Author:jjg Date: 2010-08-27 17:21 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/b4e7a57af8df 6570730: com.sun.source.tree.ModifiersTree.getFlags() should return class type Reviewed-by: mcimadamore ! src/share/classes/com/sun/source/tree/Tree.ja

hg: jdk7/tl/langtools: 6980707: Reduce use of IOException in JavaCompiler

2010-08-27 Thread jonathan . gibbons
Changeset: eb7c263aab73 Author:jjg Date: 2010-08-27 17:59 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/eb7c263aab73 6980707: Reduce use of IOException in JavaCompiler Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/main/JavaCompiler.java ! src/share/classe

hg: jdk7/tl/langtools: 6403465: javac should defer diagnostics until it can be determined they are persistent

2010-08-30 Thread jonathan . gibbons
Changeset: 4124840b35fe Author:jjg Date: 2010-08-30 18:03 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/4124840b35fe 6403465: javac should defer diagnostics until it can be determined they are persistent Reviewed-by: mcimadamore, darcy ! src/share/classes/com/sun/too

hg: jdk7/tl/langtools: 6921495: spurious semicolons in class def cause empty NOPOS blocks

2010-09-02 Thread jonathan . gibbons
Changeset: 3ff3f20471b4 Author:jjg Date: 2010-09-02 18:26 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/3ff3f20471b4 6921495: spurious semicolons in class def cause empty NOPOS blocks Reviewed-by: mcimadamore ! src/share/classes/com/sun/tools/javac/parser/JavacParser.

hg: jdk7/tl/langtools: 6930507: Symbols for anonymous and local classes made too late for use by java tree API

2010-09-06 Thread jonathan . gibbons
Changeset: ea54372637a5 Author:jjg Date: 2010-09-06 12:55 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/ea54372637a5 6930507: Symbols for anonymous and local classes made too late for use by java tree API Reviewed-by: mcimadamore ! src/share/classes/com/sun/tools/jav

hg: jdk7/tl/langtools: 6983239: TreeScanner does not scan default value for method

2010-09-09 Thread jonathan . gibbons
Changeset: fc73f83cd563 Author:jjg Date: 2010-09-09 13:31 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/fc73f83cd563 6983239: TreeScanner does not scan default value for method Reviewed-by: mcimadamore ! src/share/classes/com/sun/source/util/TreeScanner.java ! test/to

hg: jdk7/tl/langtools: 6965264: langtools build should use ${ant.core.lib} instead of ${ant.home}/lib/ant.jar

2010-09-13 Thread jonathan . gibbons
Changeset: 80505c2026e7 Author:jjg Date: 2010-09-13 11:35 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/80505c2026e7 6965264: langtools build should use ${ant.core.lib} instead of ${ant.home}/lib/ant.jar Reviewed-by: mcimadamore Contributed-by: jesse.gl...@oracle.com

hg: jdk7/tl/langtools: 6978974: [langtools] task should use ${target.java.home}

2010-09-13 Thread jonathan . gibbons
Changeset: e92ae290fb47 Author:jjg Date: 2010-09-13 11:40 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/e92ae290fb47 6978974: [langtools] task should use ${target.java.home} Reviewed-by: mcimadamore ! make/build.xml

hg: jdk7/tl/langtools: 6985181: Annotations lost from classfile

2010-09-16 Thread jonathan . gibbons
Changeset: 6e2ccba61117 Author:jjg Date: 2010-09-16 09:56 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/6e2ccba61117 6985181: Annotations lost from classfile Reviewed-by: mcimadamore ! src/share/classes/com/sun/tools/javac/api/JavacTrees.java ! src/share/classes/com/s

hg: jdk7/tl/langtools: 6985115: tests create too much output

2010-09-16 Thread jonathan . gibbons
Changeset: bbc9765d9ec6 Author:jjg Date: 2010-09-16 09:57 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/bbc9765d9ec6 6985115: tests create too much output Reviewed-by: mcimadamore ! test/tools/javac/T6855236.java ! test/tools/javac/failover/CheckAttributedTree.java !

hg: jdk7/tl/langtools: 6986772: langtools netbeans build should use ${ant.core.lib} instead of ${ant.home}/lib/ant.jar

2010-09-22 Thread jonathan . gibbons
Changeset: 3eea38ce151c Author:jjg Date: 2010-09-22 12:53 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/3eea38ce151c 6986772: langtools netbeans build should use ${ant.core.lib} instead of ${ant.home}/lib/ant.jar Reviewed-by: ohair ! make/netbeans/langtools/build.xml

hg: jdk7/tl/langtools: 6890226: javah -version is broken

2010-09-27 Thread jonathan . gibbons
Changeset: f6fe12839a8a Author:jjg Date: 2010-09-27 14:05 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/f6fe12839a8a 6890226: javah -version is broken Reviewed-by: darcy ! src/share/classes/com/sun/tools/javah/JavahTask.java ! src/share/classes/com/sun/tools/javah/res

hg: jdk7/tl/langtools: 6877202: Elements.getDocComment() is not getting JavaDocComments; ...

2010-09-27 Thread jonathan . gibbons
Changeset: 3c9b64e55c5d Author:jjg Date: 2010-09-27 14:20 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/3c9b64e55c5d 6877202: Elements.getDocComment() is not getting JavaDocComments 6861094: javac -Xprint does not print comments 6985205: access to tree positions and d

hg: jdk7/tl/langtools: 6986246: Trees object is round-specific

2010-09-27 Thread jonathan . gibbons
Changeset: d4df3b6ee729 Author:jjg Date: 2010-09-27 17:28 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/d4df3b6ee729 6986246: Trees object is round-specific Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/api/JavacTrees.java ! src/share/classes/com/sun/too

hg: jdk7/tl/langtools: 6502392: Invalid relative names for Filer.createResource and Filer.getResource

2010-09-29 Thread jonathan . gibbons
Changeset: f94af0667151 Author:jjg Date: 2010-09-29 14:01 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/f94af0667151 6502392: Invalid relative names for Filer.createResource and Filer.getResource Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/file/JavacFil

hg: jdk7/tl/langtools: 6988436: Cleanup javac option handling

2010-09-30 Thread jonathan . gibbons
Changeset: 7b413ac1a720 Author:jjg Date: 2010-09-30 10:47 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/7b413ac1a720 6988436: Cleanup javac option handling Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/code/Source.java ! src/share/classes/com/sun/tools/ja

hg: jdk7/tl/langtools: 6988836: A new JavacElements is created for each round of annotation processing

2010-10-05 Thread jonathan . gibbons
Changeset: 971c8132f5b2 Author:jjg Date: 2010-10-05 11:34 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/971c8132f5b2 6988836: A new JavacElements is created for each round of annotation processing Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/model/JavacE

hg: jdk7/tl/langtools: 6893932: javah help screen lists -h and -? but does not accept them

2010-10-05 Thread jonathan . gibbons
Changeset: 33603a5fa84d Author:jjg Date: 2010-10-05 17:37 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/33603a5fa84d 6893932: javah help screen lists -h and -? but does not accept them Reviewed-by: darcy ! src/share/classes/com/sun/tools/javah/JavahTask.java + test/to

hg: jdk7/tl/langtools: 6990379: two examples fail under CheckExamples on Windows

2010-10-07 Thread jonathan . gibbons
Changeset: c8b4a1e76089 Author:jjg Date: 2010-10-07 15:26 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/c8b4a1e76089 6990379: two examples fail under CheckExamples on Windows Reviewed-by: darcy ! test/tools/javac/diags/CheckExamples.java ! test/tools/javac/diags/FileM

hg: jdk7/tl/langtools: 6990390: javah -help produces help screen with extraneous output

2010-10-11 Thread jonathan . gibbons
Changeset: 5b5d965900b8 Author:jjg Date: 2010-10-11 10:19 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/5b5d965900b8 6990390: javah -help produces help screen with extraneous output Reviewed-by: darcy ! src/share/classes/com/sun/tools/javah/resources/l10n.properties !

hg: jdk7/tl/langtools: 6989457: javadoc test file test/tools/javadoc/T4994049/FileWithTabs.java probably does not

2010-10-12 Thread jonathan . gibbons
Changeset: 68cf07910d74 Author:jjg Date: 2010-10-12 12:55 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/68cf07910d74 6989457: javadoc test file test/tools/javadoc/T4994049/FileWithTabs.java probably does not Reviewed-by: mcimadamore ! test/tools/javadoc/T4994049/File

hg: jdk7/tl/langtools: 6988407: javac crashes running processor on errant code; it used to print error message

2010-10-12 Thread jonathan . gibbons
Changeset: 14a707f8ce84 Author:jjg Date: 2010-10-12 13:15 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/14a707f8ce84 6988407: javac crashes running processor on errant code; it used to print error message Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/com

hg: jdk7/tl/langtools: 4942232: missing param class processes without error

2010-10-12 Thread jonathan . gibbons
Changeset: a1d31ab7b525 Author:jjg Date: 2010-10-12 13:19 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/a1d31ab7b525 4942232: missing param class processes without error Reviewed-by: darcy ! src/share/classes/com/sun/tools/javah/JNI.java ! src/share/classes/com/sun/to

hg: jdk7/tl/langtools: 6990133: AnnotationProxyMaker.ValueVisitor$1 contains non-transient non-serializable field

2010-10-12 Thread jonathan . gibbons
Changeset: ea92d1e275b6 Author:jjg Date: 2010-10-12 14:22 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/ea92d1e275b6 6990133: AnnotationProxyMaker.ValueVisitor$1 contains non-transient non-serializable field Reviewed-by: darcy ! src/share/classes/com/sun/tools/apt/m

hg: jdk7/tl/langtools: 6908476: test/tools/javac/T6705935.java fails if non-zip files found on platform class path

2010-10-12 Thread jonathan . gibbons
Changeset: ee366cc698c0 Author:jjg Date: 2010-10-12 14:47 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/ee366cc698c0 6908476: test/tools/javac/T6705935.java fails if non-zip files found on platform class path Reviewed-by: darcy ! test/tools/javac/T6705935.java

hg: jdk7/tl/langtools: 6987760: remove 308 support from JDK7

2010-10-19 Thread jonathan . gibbons
Changeset: 4851ff2ffc10 Author:jjg Date: 2010-10-19 15:02 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/4851ff2ffc10 6987760: remove 308 support from JDK7 Reviewed-by: darcy, mcimadamore - src/share/classes/com/sun/source/tree/AnnotatedTypeTree.java ! src/share/classe

hg: jdk7/tl/langtools: 6993301: catch parameters do not have correct kind (i.e. ElementKind.EXCEPTION_PARAMETER)

2010-10-22 Thread jonathan . gibbons
Changeset: 01eabcd240e9 Author:jjg Date: 2010-10-22 14:04 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/01eabcd240e9 6993301: catch parameters do not have correct kind (i.e. ElementKind.EXCEPTION_PARAMETER) Reviewed-by: mcimadamore ! src/share/classes/com/sun/tools/j

hg: jdk7/tl/langtools: 6949587: rename "DisjointType" to "DisjunctType"

2010-10-26 Thread jonathan . gibbons
Changeset: 7755f47542a0 Author:jjg Date: 2010-10-26 14:29 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/7755f47542a0 6949587: rename "DisjointType" to "DisjunctType" Reviewed-by: mcimadamore - src/share/classes/com/sun/source/tree/DisjointTypeTree.java + src/share/cla

hg: jdk7/tl/langtools: 6460352: Reintroduce Scope.dble

2010-10-28 Thread jonathan . gibbons
Changeset: 601160d857ef Author:jjg Date: 2010-10-28 10:17 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/601160d857ef 6460352: Reintroduce Scope.dble Reviewed-by: mcimadamore, jjg Contributed-by: per.both...@oracle.com ! src/share/classes/com/sun/tools/javac/code/Scope

hg: jdk7/tl/langtools: 6994946: option to specify only syntax errors as unrecoverable

2010-10-28 Thread jonathan . gibbons
Changeset: 2974d3800eb1 Author:jjg Date: 2010-10-28 18:58 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/2974d3800eb1 6994946: option to specify only syntax errors as unrecoverable Reviewed-by: darcy, mcimadamore ! src/share/classes/com/sun/tools/javac/main/JavaCompile

hg: jdk7/tl/langtools: 6993304: JavacTrees.getAttrContext not updated to Tree.Kind.{ANNOTATION_TYPE, ENUM, INTERFACE}

2010-10-29 Thread jonathan . gibbons
Changeset: 460b2f588d0d Author:jjg Date: 2010-10-29 12:47 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/460b2f588d0d 6993304: JavacTrees.getAttrContext not updated to Tree.Kind.{ANNOTATION_TYPE,ENUM,INTERFACE} Reviewed-by: mcimadamore ! src/share/classes/com/sun/tool

hg: jdk7/tl/langtools: 6994608: javah no longer accepts parameter files as input

2010-10-29 Thread jonathan . gibbons
Changeset: 895bea45a3e8 Author:jjg Date: 2010-10-29 13:12 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/895bea45a3e8 6994608: javah no longer accepts parameter files as input Reviewed-by: mcimadamore ! src/share/classes/com/sun/tools/javah/JavahTask.java ! src/share/c

hg: jdk7/tl/langtools: 6996626: Scope fix issues for ImportScope

2010-11-01 Thread jonathan . gibbons
Changeset: 6ce6ee1b831a Author:jjg Date: 2010-11-01 19:28 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/6ce6ee1b831a 6996626: Scope fix issues for ImportScope Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/code/Scope.java

hg: jdk7/tl/langtools: 6998063: new Scope impl to fix Scope performance issues

2010-11-06 Thread jonathan . gibbons
Changeset: 9427a3c795fc Author:jjg Date: 2010-11-06 13:53 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/9427a3c795fc 6998063: new Scope impl to fix Scope performance issues Reviewed-by: jjg Contributed-by: per.both...@oracle.com ! src/share/classes/com/sun/tools/javac

hg: jdk7/tl/langtools: 6997958: test tools/javac/api/T6412669.java fails in PIT

2010-11-09 Thread jonathan . gibbons
Changeset: a0d9d642f65b Author:jjg Date: 2010-11-09 17:49 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/a0d9d642f65b 6997958: test tools/javac/api/T6412669.java fails in PIT Reviewed-by: darcy ! test/tools/javac/api/T6412669.java

hg: jdk7/tl/langtools: 7000973: isBogus needs to be called on the to-be-returned entry, not on the current entry

2010-11-17 Thread jonathan . gibbons
Changeset: abaceae7c9f8 Author:jjg Date: 2010-11-17 15:07 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/abaceae7c9f8 7000973: isBogus needs to be called on the to-be-returned entry, not on the current entry Reviewed-by: jjg Contributed-by: jan.lah...@oracle.com ! src

hg: jdk7/tl/langtools: 6999438: remove support for exotic identifiers from JDK 7

2010-11-18 Thread jonathan . gibbons
Changeset: 03177f49411d Author:jjg Date: 2010-11-18 16:13 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/03177f49411d 6999438: remove support for exotic identifiers from JDK 7 Reviewed-by: mcimadamore ! src/share/classes/com/sun/tools/javac/code/Source.java ! src/share

hg: jdk7/tl/langtools: 6942366: javadoc no longer inherits doc from sourcepath

2010-11-23 Thread jonathan . gibbons
Changeset: 285896f2227a Author:jjg Date: 2010-11-23 13:32 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/285896f2227a 6942366: javadoc no longer inherits doc from sourcepath Reviewed-by: mcimadamore ! src/share/classes/com/sun/tools/javadoc/JavadocClassReader.java + te

hg: jdk7/tl/langtools: 7002346: javap test relies on location of scratch directory

2010-11-23 Thread jonathan . gibbons
Changeset: 79d0c48d361e Author:jjg Date: 2010-11-23 15:28 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/79d0c48d361e 7002346: javap test relies on location of scratch directory Reviewed-by: ksrini ! test/tools/javap/T6729471.java

hg: jdk7/tl/langtools: 7003006: add option to list directory in deterministic order

2010-11-29 Thread jonathan . gibbons
Changeset: d44d6d8493ad Author:jjg Date: 2010-11-29 10:09 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/d44d6d8493ad 7003006: add option to list directory in deterministic order Reviewed-by: mcimadamore ! src/share/classes/com/sun/tools/javac/file/JavacFileManager.jav

hg: jdk7/tl/langtools: 6900037: javac should warn if earlier -source is used and bootclasspath not set

2010-11-29 Thread jonathan . gibbons
Changeset: c44234f680da Author:jjg Date: 2010-11-29 14:15 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/c44234f680da 6900037: javac should warn if earlier -source is used and bootclasspath not set Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/code/Lint.ja

hg: jdk7/tl/langtools: 7003477: Paths.isDefaultBootClassPath needs to be public

2010-11-30 Thread jonathan . gibbons
Changeset: bcbc86cc5b31 Author:jjg Date: 2010-11-30 09:38 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/bcbc86cc5b31 7003477: Paths.isDefaultBootClassPath needs to be public Reviewed-by: mcimadamore ! src/share/classes/com/sun/tools/javac/file/Paths.java

hg: jdk7/tl/langtools: 2 new changesets

2010-12-02 Thread jonathan . gibbons
Changeset: 7e3e9f6d013f Author:jjg Date: 2010-12-02 16:37 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/7e3e9f6d013f 7004029: intermittent failures compiling pack200 Summary: remove "bogus" entries from star-import scopes Reviewed-by: mcimadamore Contributed-by: per.bo

hg: jdk7/tl/jdk: 7004021: docs should not assume -source 1.5

2010-12-05 Thread jonathan . gibbons
Changeset: fe9ead37938c Author:jjg Date: 2010-12-05 20:46 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/fe9ead37938c 7004021: docs should not assume -source 1.5 Reviewed-by: ohair ! make/docs/Makefile

hg: jdk7/tl/langtools: 6999210: javac should be able to warn of anomalous conditions in classfiles

2010-12-07 Thread jonathan . gibbons
Changeset: 3c32c90031fd Author:jjg Date: 2010-12-07 14:13 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/3c32c90031fd 6999210: javac should be able to warn of anomalous conditions in classfiles Reviewed-by: mcimadamore, darcy ! src/share/classes/com/sun/tools/javac/cod

hg: jdk7/tl/langtools: 7004698: javap does not output CharacterRangeTable attributes correctly

2010-12-08 Thread jonathan . gibbons
Changeset: acb02e1d5119 Author:jjg Date: 2010-12-08 13:42 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/acb02e1d5119 7004698: javap does not output CharacterRangeTable attributes correctly Reviewed-by: mcimadamore ! src/share/classes/com/sun/tools/javap/AttributeWrite

hg: jdk7/tl/langtools: 4917091: javac rejects array over 128 in length

2010-12-09 Thread jonathan . gibbons
Changeset: bcf44475aeee Author:jjg Date: 2010-12-09 08:24 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/bcf44475aeee 4917091: javac rejects array over 128 in length Reviewed-by: mcimadamore ! src/share/classes/com/sun/tools/javac/jvm/Gen.java + test/tools/javac/491709

hg: jdk7/tl/langtools: 6985202: no access to doc comments from Tree API

2010-12-09 Thread jonathan . gibbons
Changeset: 90914ac50868 Author:jjg Date: 2010-12-09 08:48 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/90914ac50868 6985202: no access to doc comments from Tree API Reviewed-by: mcimadamore ! src/share/classes/com/sun/source/util/Trees.java ! src/share/classes/com/su

hg: jdk7/tl/langtools: 7005856: avoid name clash for langtools when building on MacOS

2010-12-09 Thread jonathan . gibbons
Changeset: 4dd1c0176d81 Author:jjg Date: 2010-12-09 18:33 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/4dd1c0176d81 7005856: avoid name clash for langtools when building on MacOS Reviewed-by: mcimadamore ! src/share/classes/com/sun/tools/javac/jvm/ClassReader.java

hg: jdk7/tl/langtools: 6986242: cut-n-paste error in javadoc for Trees.instance(ProcessingEnvironment)

2010-12-09 Thread jonathan . gibbons
Changeset: 65820d0d4a97 Author:jjg Date: 2010-12-09 19:53 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/65820d0d4a97 6986242: cut-n-paste error in javadoc for Trees.instance(ProcessingEnvironment) Reviewed-by: darcy ! src/share/classes/com/sun/source/util/Trees.java

hg: jdk7/tl/langtools: 6504896: TreeMaker.Literal(Object) does not support Booleans

2010-12-10 Thread jonathan . gibbons
Changeset: 8ec3a824f925 Author:jjg Date: 2010-12-10 07:38 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/8ec3a824f925 6504896: TreeMaker.Literal(Object) does not support Booleans Reviewed-by: mcimadamore ! src/share/classes/com/sun/tools/javac/parser/JavacParser.java !

hg: jdk7/tl/langtools: 6990134: minor (but red) findbugs warnings

2010-12-12 Thread jonathan . gibbons
Changeset: 878c8f760ded Author:jjg Date: 2010-12-12 10:05 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/878c8f760ded 6990134: minor (but red) findbugs warnings Reviewed-by: mcimadamore + src/share/classes/com/sun/tools/apt/main/AptJavaCompiler.java - src/share/classes

hg: jdk7/tl/langtools: 6999891: DefaultFileManager incorrect

2010-12-14 Thread jonathan . gibbons
Changeset: 0141f508b98d Author:jjg Date: 2010-12-14 14:17 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/0141f508b98d 6999891: DefaultFileManager incorrect Reviewed-by: darcy ! src/share/classes/com/sun/tools/javac/file/JavacFileManager.java + test/tools/javac/processi

hg: jdk7/tl/langtools: 7006564: NPE in javac running test/tools/javac/nio/compileTest/CompileTest.java

2010-12-15 Thread jonathan . gibbons
Changeset: cff0b8694633 Author:jjg Date: 2010-12-15 06:39 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/cff0b8694633 7006564: NPE in javac running test/tools/javac/nio/compileTest/CompileTest.java Reviewed-by: mcimadamore, alanb ! src/share/classes/com/sun/tools/javac

hg: jdk7/tl/jdk: 7010537: javah no longer depends on javadoc

2011-01-06 Thread jonathan . gibbons
Changeset: d56c111ec6dc Author:jjg Date: 2011-01-06 14:32 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/jdk/rev/d56c111ec6dc 7010537: javah no longer depends on javadoc Reviewed-by: ohair ! make/common/shared/Defs-java.gmk

hg: jdk7/tl/langtools: 6992999: fully remove JSR 308 from langtools

2011-01-10 Thread jonathan . gibbons
Changeset: d17f37522154 Author:jjg Date: 2011-01-10 14:57 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/d17f37522154 6992999: fully remove JSR 308 from langtools Reviewed-by: mcimadamore ! src/share/classes/com/sun/source/tree/MethodTree.java ! src/share/classes/com/s

hg: jdk7/tl/langtools: 6396503: javac should not require assertions enabled

2011-01-10 Thread jonathan . gibbons
Changeset: 7c537f4298fb Author:jjg Date: 2011-01-10 15:08 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/7c537f4298fb 6396503: javac should not require assertions enabled Reviewed-by: mcimadamore ! src/share/classes/com/sun/tools/javac/Main.java ! src/share/classes/com

hg: jdk7/tl/langtools: 6993305: starting position of a method without modifiers and with type parameters is incorrect

2011-01-11 Thread jonathan . gibbons
Changeset: 17b271281525 Author:jjg Date: 2011-01-11 08:05 -0800 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/17b271281525 6993305: starting position of a method without modifiers and with type parameters is incorrect Reviewed-by: mcimadamore ! src/share/classes/com/sun/to

<    1   2   3   4   5   6   >