[libnb-javaparser-java] 02/08: Merge commit 'upstream/7.2'
Andrew Ross
rockclimb-guest at alioth.debian.org
Sun Sep 15 22:02:45 UTC 2013
This is an automated email from the git hooks/post-receive script.
rockclimb-guest pushed a commit to branch master
in repository libnb-javaparser-java.
commit a1f20f5156d632498430d514da5be8a55091b61f
Merge: 2878a91 33c9b2b
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date: Thu Aug 23 22:06:47 2012 +0100
Merge commit 'upstream/7.2'
.hg_archival.txt | 4 +-
.hgtags | 53 +-
.jcheck/conf | 1 +
THIRD_PARTY_README | 4482 ++++++++++++++------
make/build.xml | 2 +-
make/jprt.properties | 31 +-
make/netbeans/hudson/build | 8 +-
make/netbeans/nb-javac/build.xml | 25 +-
.../netbeans/nb-javac/nbproject/project.properties | 19 +-
.../com/sun/tools/javac/comp/AnnotateTest.java | 23 +
.../test/com/sun/tools/javac/comp/AttrTest.java | 175 +-
.../test/com/sun/tools/javac/comp/LowerTest.java | 87 +-
.../comp/{AttrTest.java => MemberEnterTest.java} | 75 +-
.../sun/tools/javac/parser/JavacParserTest.java | 45 +
.../nb-javac/test/global/AP208917Test.java | 110 +
.../test/global/AnnotationProcessingTest.java | 15 +-
.../nb-javac/test/global/CouplingTest.java | 181 +
.../nb-javac/test/global/ErrorToleranceTest.java | 125 +-
.../classes/com/sun/source/tree/UnionTypeTree.java | 2 +-
.../com/sun/tools/classfile/ClassTranslator.java | 2 +-
.../com/sun/tools/classfile/Dependencies.java | 2 +-
.../tools/doclets/formats/html/ClassUseWriter.java | 7 +-
.../sun/tools/doclets/formats/html/HelpWriter.java | 6 +-
.../sun/tools/doclets/formats/html/HtmlDoclet.java | 5 +-
.../formats/html/resources/standard.properties | 3 +-
.../formats/html/resources/standard_ja.properties | 7 +-
.../html/resources/standard_zh_CN.properties | 7 +-
.../internal/toolkit/resources/background.gif | Bin 0 -> 2313 bytes
.../doclets/internal/toolkit/resources/inherit.gif | Bin 57 -> 0 bytes
.../internal/toolkit/resources/stylesheet.css | 627 +--
.../doclets/internal/toolkit/resources/tab.gif | Bin 0 -> 291 bytes
.../internal/toolkit/resources/titlebar.gif | Bin 0 -> 10701 bytes
.../internal/toolkit/resources/titlebar_end.gif | Bin 0 -> 849 bytes
.../com/sun/tools/javac/api/ClientCodeWrapper.java | 66 +-
.../com/sun/tools/javac/api/JavacScope.java | 7 +-
.../com/sun/tools/javac/api/JavacTaskImpl.java | 40 +-
.../com/sun/tools/javac/api/JavacTrees.java | 12 -
.../classes/com/sun/tools/javac/code/Kinds.java | 6 +-
.../classes/com/sun/tools/javac/code/Printer.java | 2 +-
.../classes/com/sun/tools/javac/code/Symbol.java | 27 +-
.../classes/com/sun/tools/javac/code/Type.java | 2 +-
.../classes/com/sun/tools/javac/code/Types.java | 178 +-
.../classes/com/sun/tools/javac/comp/Annotate.java | 2 +
.../classes/com/sun/tools/javac/comp/Attr.java | 39 +-
.../classes/com/sun/tools/javac/comp/Check.java | 105 +-
.../classes/com/sun/tools/javac/comp/Enter.java | 30 +-
.../classes/com/sun/tools/javac/comp/Flow.java | 16 +-
.../classes/com/sun/tools/javac/comp/Infer.java | 45 +-
.../classes/com/sun/tools/javac/comp/Lower.java | 36 +-
.../com/sun/tools/javac/comp/MemberEnter.java | 41 +-
.../classes/com/sun/tools/javac/comp/Repair.java | 112 +-
.../classes/com/sun/tools/javac/comp/Resolve.java | 35 +-
.../com/sun/tools/javac/comp/TransTypes.java | 38 +-
.../sun/tools/javac/file/RegularFileObject.java | 4 +-
.../com/sun/tools/javac/jvm/ClassReader.java | 72 +-
.../com/sun/tools/javac/jvm/ClassWriter.java | 37 +-
src/share/classes/com/sun/tools/javac/jvm/Gen.java | 2 +-
.../com/sun/tools/javac/main/JavaCompiler.java | 56 +-
.../classes/com/sun/tools/javac/main/Main.java | 40 +-
.../com/sun/tools/javac/model/JavacElements.java | 3 +-
.../com/sun/tools/javac/nio/PathFileObject.java | 2 +
.../com/sun/tools/javac/parser/EndPosParser.java | 9 +-
.../com/sun/tools/javac/parser/JavacParser.java | 150 +-
.../com/sun/tools/javac/parser/ParserFactory.java | 9 +-
.../com/sun/tools/javac/parser/Scanner.java | 14 +-
.../com/sun/tools/javac/processing/JavacFiler.java | 19 +-
.../sun/tools/javac/processing/JavacMessager.java | 2 +-
.../processing/JavacProcessingEnvironment.java | 5 +-
.../sun/tools/javac/resources/compiler.properties | 22 +-
.../sun/tools/javac/resources/javac_ja.properties | 127 -
.../tools/javac/resources/javac_zh_CN.properties | 127 -
.../com/sun/tools/javac/tree/TreeMaker.java | 4 +-
.../com/sun/tools/javac/util/AbstractLog.java | 3 +-
.../com/sun/tools/javac/util/BaseFileManager.java | 42 +-
.../com/sun/tools/javac/util/CancelService.java | 62 -
.../classes/com/sun/tools/javac/util/Log.java | 31 +-
.../com/sun/tools/javac/util/LowMemoryWatch.java | 59 -
.../sun/tools/javac/util/MissingPlatformError.java | 8 +
.../tools/javac/util/RichDiagnosticFormatter.java | 2 +-
.../sun/tools/javadoc/AnnotationTypeDocImpl.java | 2 +-
.../javadoc/AnnotationTypeElementDocImpl.java | 2 +-
.../com/sun/tools/javadoc/ClassDocImpl.java | 21 +-
.../classes/com/sun/tools/javadoc/Comment.java | 21 +-
.../classes/com/sun/tools/javadoc/DocEnv.java | 2 +-
.../com/sun/tools/javadoc/JavadocClassReader.java | 2 +-
.../com/sun/tools/javadoc/JavadocEnter.java | 9 +-
.../com/sun/tools/javadoc/JavadocMemberEnter.java | 3 +-
.../classes/com/sun/tools/javadoc/JavadocTool.java | 29 +-
.../com/sun/tools/javadoc/PackageDocImpl.java | 2 +-
.../com/sun/tools/javadoc/ParamTagImpl.java | 5 +-
.../com/sun/tools/javadoc/SerialFieldTagImpl.java | 2 +-
.../com/sun/tools/javadoc/ThrowsTagImpl.java | 4 +-
.../classes/com/sun/tools/javap/CodeWriter.java | 4 +-
.../lang/model/util/AbstractTypeVisitor7.java | 2 +-
.../javax/lang/model/util/ElementKindVisitor7.java | 2 +-
src/share/classes/javax/tools/JavaCompiler.java | 2 -
test/Makefile | 9 +
test/com/sun/javadoc/AccessH1/AccessH1.java | 9 +-
.../sun/javadoc/T6735320/SerialFieldTest.java} | 18 +-
.../sun/javadoc/T6735320/T6735320.java} | 44 +-
test/com/sun/javadoc/lib/JavadocTester.java | 14 +-
.../com/sun/javadoc/testHelpFile/TestHelpFile.java | 76 +
.../sun/javadoc/testLinkTaglet/TestLinkTaglet.java | 8 +-
test/com/sun/javadoc/testLinkTaglet/pkg/C.java | 7 +-
.../sun/javadoc/testStylesheet/TestStylesheet.java | 13 +-
.../sun/javadoc/testUseOption/TestUseOption.java | 18 +-
test/jprt.config | 159 -
test/tools/javac/4241573/T4241573.java | 2 +-
test/tools/javac/4846262/Test.sh | 2 +-
test/tools/javac/6302184/T6302184.sh | 2 +-
test/tools/javac/6508981/TestInferBinaryName.java | 2 +-
test/tools/javac/7003595/T7003595.java | 233 +
.../T7003595b.java} | 19 +-
test/tools/javac/7085024/T7085024.java | 12 +
test/tools/javac/7085024/T7085024.out | 2 +
test/tools/javac/7086595/T7086595.java | 32 +
test/tools/javac/7086595/T7086595.out | 11 +
test/tools/javac/7102515/T7102515.java | 11 +
test/tools/javac/7102515/T7102515.out | 3 +
.../tools/javac/7129225/Anno.java | 26 +-
.../tools/javac/7129225/AnnoProcessor.java | 30 +-
test/tools/javac/7129225/NegTest.ref | 2 +
.../tools/javac/7129225/TestImportStar.java | 28 +-
test/tools/javac/7129225/TestImportStar.ref | 3 +
test/tools/javac/7142086/T7142086.java | 115 +
test/tools/javac/ClassPathTest/ClassPathTest.sh | 2 +-
test/tools/javac/Diagnostics/6860795/T6860795.out | 2 +-
test/tools/javac/Diagnostics/6862608/T6862608a.out | 2 +-
test/tools/javac/ExtDirs/ExtDirs.sh | 2 +-
test/tools/javac/LocalClasses_2.out | 2 +-
test/tools/javac/MissingInclude.sh | 2 +-
test/tools/javac/NestedInnerClassNames.out | 32 +-
.../ProtectedInnerClass/ProtectedInnerClass.sh | 2 +-
.../javac/StringsInSwitch/StringSwitches.java | 20 +-
test/tools/javac/T5090006/compiler.sh | 2 +-
test/tools/javac/T6358166.java | 4 +-
test/tools/javac/T6358168.java | 6 +-
test/tools/javac/T7042623.java | 12 +
test/tools/javac/T7042623.out | 2 +
.../AnnoProcessor.java} | 27 +-
test/tools/javac/T7142672/Bug.java | 85 +
.../EmptyCharLiteral.java => T7142672/Test2.java} | 10 +-
.../EmptyCharLiteral.java => T7142672/Test3.java} | 10 +-
test/tools/javac/TryWithResources/BadTwr.out | 6 +-
.../javac/TryWithResources/DuplicateResource.java | 2 +-
.../TryWithResources/DuplicateResourceDecl.out | 2 +-
.../javac/TryWithResources/ResourceInterface.out | 2 +-
test/tools/javac/TryWithResources/TwrFlow.out | 2 +-
test/tools/javac/TryWithResources/TwrLint.out | 2 +-
.../javac/TryWithResources/TwrOnNonResource.out | 6 +-
.../TryWithResources/UnusedResourcesTest.java | 11 +-
.../T7043371.java} | 26 +-
.../T7073477.java} | 22 +-
test/tools/javac/api/6411310/Test.java | 2 +-
test/tools/javac/api/7086261/T7086261.java | 78 +
test/tools/javac/api/T6397104.java | 14 +-
test/tools/javac/api/T6838467.java | 2 +-
test/tools/javac/api/T6877206.java | 2 +-
test/tools/javac/api/TestClientCodeWrapper.java | 2 +-
test/tools/javac/api/TestJavacTask_Lock.java | 2 +-
test/tools/javac/api/TestJavacTask_Multiple.java | 2 +-
.../javac/api/TestJavacTask_ParseAttrGen.java | 2 +-
test/tools/javac/apt.sh | 2 +-
test/tools/javac/cast/7123100/T7123100a.java | 16 +
test/tools/javac/cast/7123100/T7123100a.out | 4 +
test/tools/javac/cast/7123100/T7123100b.java | 12 +
test/tools/javac/cast/7123100/T7123100b.out | 4 +
test/tools/javac/cast/7123100/T7123100c.java | 16 +
test/tools/javac/cast/7123100/T7123100c.out | 4 +
test/tools/javac/cast/7123100/T7123100d.java | 16 +
test/tools/javac/cast/7123100/T7123100d.out | 4 +
test/tools/javac/constDebug/ConstDebug.sh | 2 +-
test/tools/javac/diags/CheckExamples.java | 9 +-
test/tools/javac/diags/Example.java | 19 +-
test/tools/javac/diags/MessageInfo.java | 9 +-
test/tools/javac/diags/RunExamples.java | 9 +-
...yCharLiteral.java => AlreadyDefinedClinit.java} | 14 +-
...eral.java => CannotCreateArrayWithDiamond.java} | 11 +-
.../javac/diags/examples/EmptyCharLiteral.java | 3 +-
...arLiteral.java => IncompatibleUpperBounds.java} | 21 +-
...yCharLiteral.java => KindnameInstanceInit.java} | 20 +-
...ptyCharLiteral.java => KindnameStaticInit.java} | 20 +-
test/tools/javac/failover/FailOver15.java | 19 +
test/tools/javac/failover/FailOver15.out | 3 +
test/tools/javac/fatalErrors/NoJavaLang.sh | 2 +-
test/tools/javac/file/T7068437.java | 136 +
test/tools/javac/file/T7068451.java | 168 +
test/tools/javac/generics/6910550/T6910550d.out | 2 +-
.../diamond/7046778/DiamondAndInnerClassTest.java | 336 ++
.../javac/generics/diamond/7057297/T7057297.java | 29 +
.../javac/generics/diamond/7057297/T7057297.out | 13 +
test/tools/javac/generics/diamond/neg/Neg09.out | 8 +-
.../javac/generics/inference/6638712/T6638712a.out | 2 +-
.../javac/generics/inference/7086586/T7086586.java | 19 +
.../javac/generics/inference/7086586/T7086586.out | 5 +
.../generics/inference/7086601/T7086601a.java | 34 +
.../javac/generics/inference/7086601/T7086601a.out | 5 +
.../generics/inference/7086601/T7086601b.java | 199 +
.../rawOverride/7062745/GenericOverrideTest.java | 286 ++
.../generics/rawOverride/7062745/T7062745neg.java | 18 +
.../generics/rawOverride/7062745/T7062745neg.out | 2 +
.../rawOverride/7062745/T7062745pos.java} | 25 +-
test/tools/javac/innerClassFile/Driver.sh | 2 +-
test/tools/javac/javazip/Test.sh | 4 +-
test/tools/javac/lib/CompileFail.java | 89 +
test/tools/javac/links/links.sh | 2 +-
test/tools/javac/meth/InvokeMH.java | 22 +-
test/tools/javac/meth/XlintWarn.java | 6 +-
.../tools/javac/multicatch/model/ModelChecker.java | 2 +-
test/tools/javac/newlines/Newlines.sh | 2 +-
test/tools/javac/parser/StringFoldingTest.java | 96 +
.../javac/parser/netbeans/JavacParserTest.java | 716 ++++
.../processing/errors/TestOptionSyntaxErrors.java | 16 +-
.../javac/processing/errors/TestReturnCode.java | 36 +-
.../javac/processing/errors/TestSuppression.java | 13 +-
.../TestMissingGenericInterface1.java | 2 +-
.../TestMissingGenericInterface2.java | 2 +-
.../TestMissingElement2/TestMissingInterface.java | 2 +-
.../model/util/deprecation/TestDeprecation.java | 2 +-
.../7046348/EagerInterfaceCompletionTest.java | 206 +
test/tools/javac/stackmap/T4955930.sh | 2 +-
test/tools/javac/tree/T6963934.java | 2 +-
test/tools/javac/unicode/SupplementaryJavaID6.sh | 2 +-
test/tools/javac/varargs/7097436/T7097436.java | 18 +
test/tools/javac/varargs/7097436/T7097436.out | 6 +
test/tools/javac/varargs/warning/Warn5.java | 182 +-
test/tools/javac/warnings/Serial.java | 1 -
test/tools/javadoc/parser/7091528/T7091528.java | 71 +
.../parser/7091528/p/C1.java} | 13 +-
.../parser/7091528/p/q/C2.java} | 13 +-
test/tools/javah/6257087/foo.sh | 2 +-
test/tools/javah/ConstMacroTest.sh | 2 +-
test/tools/javah/MissingParamClassTest.sh | 2 +-
test/tools/javah/ReadOldClass.sh | 2 +-
test/tools/javah/T7126832/T7126832.java | 107 +
.../T7126832/java.java} | 12 +-
test/tools/javap/pathsep.sh | 2 +-
237 files changed, 9113 insertions(+), 3386 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libnb-javaparser-java.git
More information about the pkg-java-commits
mailing list