Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipe Mulet2001-07-11 07:30:11 -0400
committerPhilipe Mulet2001-07-11 07:30:11 -0400
commitbac983bbc8e8c70e4ec45062c75f1b9c4bea6c75 (patch)
tree35713db3fd3dc06e5c78989a45f516573f0bf871
parent9712f7bef59796a788bf0441492469a12e041a6e (diff)
downloadeclipse.jdt.core-jeromel.tar.gz
eclipse.jdt.core-jeromel.tar.xz
eclipse.jdt.core-jeromel.zip
*** empty log message ***v0_125jeromel
-rw-r--r--org.eclipse.jdt.core/.classpath4
-rw-r--r--org.eclipse.jdt.core/.vcm_meta1
-rw-r--r--org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java2
-rw-r--r--org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathJar.java2
-rw-r--r--org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/CompilationUnit.java10
-rw-r--r--org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/FileFinder.java4
-rw-r--r--org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/FileSystem.java8
-rw-r--r--org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java356
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java24
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/ISearchRequestor.java12
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/SelectionEngine.java4
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnClassLiteralAccess.java6
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnExceptionReference.java33
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnExplicitConstructorCall.java12
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnImportReference.java6
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnMemberAccess.java4
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnMessageSend.java10
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnPackageReference.java6
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnQualifiedAllocationExpression.java6
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnQualifiedExceptionReference.java38
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnQualifiedNameReference.java8
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnQualifiedTypeReference.java6
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnSingleNameReference.java2
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnSingleTypeReference.java2
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionScanner.java2
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/InvalidCursorLocation.java19
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnExplicitConstructorCall.java12
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnFieldReference.java4
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnImportReference.java6
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnMessageSend.java10
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnPackageReference.java6
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnQualifiedAllocationExpression.java6
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnQualifiedNameReference.java6
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnQualifiedSuperReference.java4
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnQualifiedTypeReference.java6
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnSingleNameReference.java2
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnSingleTypeReference.java2
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnSuperReference.java2
-rw-r--r--org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionParser.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ClassFile.java42
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/Compiler.java27
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ConfigurableOption.java46
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/DefaultErrorHandlingPolicies.java9
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/DocumentElementParser.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/HierarchyResolver.java6
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ICompilerRequestor.java8
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/IErrorHandlingPolicy.java17
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/IProblem.java17
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/SourceElementParser.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AbstractMethodDeclaration.java24
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AbstractVariableDeclaration.java6
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java16
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AnonymousLocalTypeDeclaration.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Argument.java6
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ArrayAllocationExpression.java6
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ArrayInitializer.java8
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ArrayQualifiedTypeReference.java4
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ArrayReference.java4
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ArrayTypeReference.java4
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Assignment.java10
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AstNode.java28
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/BinaryExpression.java4
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Block.java14
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Break.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Case.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/CastExpression.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ClassLiteralAccess.java4
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Clinit.java6
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/CompilationUnitDeclaration.java8
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/CompoundAssignment.java28
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ConditionalExpression.java15
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ConstructorDeclaration.java12
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Continue.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/DefaultCase.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/DoStatement.java10
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ExplicitConstructorCall.java13
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Expression.java5
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ExtendedStringLiteral.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/FieldReference.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ForStatement.java30
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/IfStatement.java6
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ImportReference.java4
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Initializer.java4
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/InstanceOfExpression.java3
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/LabeledStatement.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/MagicLiteral.java5
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/MessageSend.java10
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/MethodDeclaration.java4
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/NumberLiteral.java5
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/OperatorExpression.java197
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/OperatorIds.java5
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/PostfixExpression.java8
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/PrefixExpression.java8
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedAllocationExpression.java12
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedNameReference.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedSuperReference.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedThisReference.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedTypeReference.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Reference.java9
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ReturnStatement.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Statement.java3
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/StringLiteral.java20
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SuperReference.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SwitchStatement.java24
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SynchronizedStatement.java8
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ThisReference.java4
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ThrowStatement.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TryStatement.java18
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java22
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/UnaryExpression.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/WhileStatement.java20
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/ClassFileReader.java8
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/ClassFileStruct.java21
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/ClassFormatException.java9
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/FieldInfo.java24
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/InnerClassInfo.java8
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/MethodInfo.java20
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/AttributeNamesConstants.java7
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/CharArrayCache.java8
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/CodeStream.java30
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/ConstantPool.java266
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/DoubleCache.java19
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/ExceptionLabel.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/FieldNameAndTypeCache.java8
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/FloatCache.java17
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/IntegerCache.java17
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/Label.java8
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/LongCache.java17
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/MethodNameAndTypeCache.java8
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/ObjectCache.java17
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/Opcodes.java5
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/QualifiedNamesConstants.java92
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryMethod.java11
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryNestedType.java5
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryType.java13
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ICompilationUnit.java8
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IConstants.java8
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IDependent.java13
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IGenericField.java5
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IGenericMethod.java5
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IGenericType.java5
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/INameEnvironment.java15
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ISourceField.java5
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ISourceMethod.java5
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ISourceType.java5
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/NameEnvironmentAnswer.java5
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/ConditionalFlowInfo.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/ExceptionHandlingFlowContext.java8
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/FlowContext.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/FlowInfo.java8
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/LabelFlowContext.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/LoopingFlowContext.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/SwitchFlowContext.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/UnconditionalFlowInfo.java7
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/BooleanConstant.java4
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ByteConstant.java9
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CharConstant.java4
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java148
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ConfigurableProblems.java8
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/Constant.java40
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/DoubleConstant.java11
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/FloatConstant.java9
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/IntConstant.java9
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/LongConstant.java9
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/NullConstant.java7
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ShortConstant.java9
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/StringConstant.java9
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ArrayBinding.java4
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BaseTypeBinding.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BaseTypes.java25
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BinaryTypeBinding.java54
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/Binding.java5
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BindingIds.java5
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BlockScope.java36
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java4
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/CompilationUnitScope.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ImportBinding.java4
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/InnerEmulationDependency.java6
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/InvocationSite.java5
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/LocalTypeBinding.java10
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/LocalVariableBinding.java14
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/LookupEnvironment.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MemberTypeBinding.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodBinding.java26
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodScope.java18
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/NestedTypeBinding.java45
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/PackageBinding.java4
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ProblemMethodBinding.java5
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ProblemPackageBinding.java5
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ProblemReasons.java5
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ProblemReferenceBinding.java5
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ReferenceBinding.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java108
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TagBits.java5
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeBinding.java27
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeConstants.java23
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeIds.java5
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/UnresolvedReferenceBinding.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/VariableBinding.java6
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java545
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/ParserBasicInformation.java8
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredBlock.java36
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredElement.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredField.java4
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredImport.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredInitializer.java4
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredLocalVariable.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredMethod.java6
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredStatement.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredType.java10
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredUnit.java8
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Scanner.java315
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/TerminalSymbols.java8
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/DefaultProblem.java11
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/DefaultProblemFactory.java12
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemIrritants.java23
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java74
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemSeverities.java5
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ShouldNotImplement.java11
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/CharOperation.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/HashtableOfInt.java19
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/HashtableOfObject.java9
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/HashtableOfPackage.java4
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/HashtableOfType.java4
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/ObjectVector.java15
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/SimpleNameVector.java13
-rw-r--r--org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/CodeSnippetAllocationExpression.java12
-rw-r--r--org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/CodeSnippetCodeStream.java2
-rw-r--r--org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/CodeSnippetConstantPool.java148
-rw-r--r--org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/CodeSnippetQualifiedNameReference.java25
-rw-r--r--org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/CodeSnippetReturnStatement.java4
-rw-r--r--org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/CodeSnippetSkeleton.java20
-rw-r--r--org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/CodeSnippetThisReference.java2
-rw-r--r--org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/CodeSnippetToCuMapper.java28
-rw-r--r--org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/EvaluationConstants.java26
-rw-r--r--org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/EvaluationContext.java102
-rw-r--r--org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/EvaluationResult.java22
-rw-r--r--org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/Evaluator.java2
-rw-r--r--org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/GlobalVariable.java15
-rw-r--r--org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/InstallException.java9
-rw-r--r--org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/VariablesEvaluator.java40
-rw-r--r--org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/CodeFormatter.java88
-rw-r--r--org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/impl/FormatterOptions.java20
-rw-r--r--org.eclipse.jdt.core/formatter/org/eclipse/jdt/internal/formatter/impl/SplitLine.java84
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/Flags.java24
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/IBufferChangedListener.java14
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/IClassFile.java35
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/ICodeAssist.java22
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/ICompilationUnit.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/IElementChangedListener.java12
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/IField.java15
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/IImportContainer.java13
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/IImportDeclaration.java11
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaModelMarker.java26
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaModelStatusConstants.java47
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaProject.java69
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/IMember.java17
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/IMethod.java21
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/IPackageDeclaration.java11
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/IPackageFragment.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/IPackageFragmentRoot.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/IParent.java17
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/IRegion.java23
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/ISourceRange.java12
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/ISourceReference.java31
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/ITypeHierarchyChangedListener.java12
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaConventions.java227
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java210
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaModelException.java6
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/Signature.java48
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/eval/IGlobalVariable.java14
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/DOMException.java11
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/DOMFactory.java8
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/IDOMCompilationUnit.java14
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/IDOMFactory.java43
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/IDOMField.java14
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/IDOMImport.java13
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/IDOMInitializer.java13
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/IDOMMember.java17
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/IDOMMethod.java15
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/IDOMPackage.java13
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/IDOMType.java18
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Assert.java10
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BasicCompilationUnit.java10
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryMethod.java8
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryType.java6
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Buffer.java16
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClassFile.java10
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClassFileInfo.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClasspathEntry.java20
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CommitWorkingCopyOperation.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnit.java16
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnitStructureRequestor.java10
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CopyElementsOperation.java4
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CopyResourceElementsOperation.java10
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateCompilationUnitOperation.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateFieldOperation.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateImportOperation.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateInitializerOperation.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateMethodOperation.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreatePackageDeclarationOperation.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreatePackageFragmentOperation.java4
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateTypeMemberOperation.java6
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateTypeOperation.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeleteElementsOperation.java4
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeleteResourceElementsOperation.java22
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeltaProcessor.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/FailedReconciliationException.java5
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/HandleFactory.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/IJavaReconciler.java17
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/IPathRequestor.java5
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ImportContainer.java7
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ImportDeclaration.java6
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/IncrementalDeterministicRequestor.java268
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/IncrementalReconciler.java353
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/IncrementalReconcilerRequestor.java388
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Initializer.java12
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JarEntryFile.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JarPackageFragmentRoot.java19
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaElement.java14
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaElementDelta.java44
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaElementDeltaBuilder.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModel.java13
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java80
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelOperation.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelStatus.java86
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaProject.java225
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/MoveElementsOperation.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/MoveResourceElementsOperation.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/NameLookup.java8
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/NonVoidMethodRequestor.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Openable.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/OverflowingLRUCache.java10
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageDeclaration.java4
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragment.java18
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragmentInfo.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragmentRoot.java10
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageFragmentRootInfo.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Problem.java86
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Region.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/RenameElementsOperation.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/RenameResourceElementsOperation.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SearchableEnvironment.java8
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SelectionRequestor.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SetClasspathOperation.java45
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SetOutputLocationOperation.java56
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceField.java6
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceMapper.java16
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceMethod.java20
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceRange.java6
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceRefElement.java6
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceType.java10
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/TypeVector.java6
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Util.java112
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/WorkingCopy.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/BuildEvent.java8
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/DeltaKey.java6
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/IBuildMonitor.java10
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/IConstructor.java26
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/IDeltaKey.java19
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/IDependencyGraph.java9
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/IField.java27
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/IHandle.java94
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/IImageBuilder.java22
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/IImageContext.java34
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/IMember.java22
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/IMethod.java23
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/IPackage.java14
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/IProblemDetail.java11
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/ISearch.java52
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/ISearchFactory.java187
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/ISearchListener.java11
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/IType.java104
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/InvalidKeyException.java20
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/NotPresentException.java23
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/SearchProgressEvent.java12
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/SearchResultEvent.java12
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/StateSpecificException.java22
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/AbstractMemberHandle.java5
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/AbstractMethodCollaboratorIndictment.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/AbstractNode.java23
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ArrayTypeHandleImpl.java4
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/BatchImageBuilder.java23
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/BuildNotifier.java24
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ClassOrInterfaceHandleImplSWH.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/CompilerCompilationUnit.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ConsoleProgressMonitor.java78
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ConstructorImpl.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ConvertedCompilationResult.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/DeltaImpl.java61
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/DependencyGraph.java17
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/FieldCollaboratorIndictment.java7
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/FieldImpl.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ImageBuilderInternalException.java11
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ImageContextImpl.java4
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ImageImpl.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ImageImplSWH.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/IncrementalImageBuilder.java34
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/IndictmentSet.java18
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/JCUNode.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/JavaBuilder.java26
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/JavaDevelopmentContextImpl.java48
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/MarkerProblemReporter.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/MethodCollaboratorIndictment.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/MethodImpl.java4
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ModifiedBuilderType.java4
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/NamespaceNode.java7
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/NewBuilderType.java10
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/NonStateSpecificHandleImpl.java4
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/OldBuilderType.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/OrderedSet.java49
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PackageImpl.java20
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PackageImplSWH.java13
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PackageMap.java8
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PackageMapEntry.java5
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PathMap.java23
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/PrimitiveTypeHandleImpl.java40
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ProblemDetailImpl.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ProblemFactory.java8
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ProblemTable.java8
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ProjectBinaryOutput.java8
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ProjectResourceCopier.java31
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ReportCardImpl.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/SourceElementTable.java3
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/SourceEntry.java12
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/SourceFragmentImpl.java4
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/StateImpl.java132
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/StateSnap.java16
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/StateSnapConstantPool.java76
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/StateSnapV5.java60
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeCollaboratorIndictment.java11
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeHierarchyIndictment.java11
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeImpl.java6
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeImplSWH.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeNode.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/TypeStructureEntry.java4
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/UnmodifiedBuilderType.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/WorkQueue.java6
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/impl/ZipNode.java7
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/eval/EvaluationContextWrapper.java6
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/HierarchyBinaryType.java19
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/IndexBasedHierarchyBuilder.java18
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/TypeHierarchy.java21
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/CompilationUnit.java10
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMCompilationUnit.java11
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMField.java30
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMImport.java22
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMInitializer.java18
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMMember.java2
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMMethod.java43
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMNode.java35
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMPackage.java16
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMType.java41
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/ILineStartFinder.java9
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/SimpleDOMBuilder.java8
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/lookup/ReferenceInfo.java13
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/AnonymousFileSource.java14
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/CharArrayBuffer.java21
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/CharArrayOps.java21
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/DiskCache.java14
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/DiskCacheEntry.java10
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Dumper.java34
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/HackFinder.java5
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/IComparator.java8
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/ILRUCacheable.java12
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/IProgressListener.java22
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/LRUCache.java8
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/LookupTable.java24
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/ReferenceInfoAdapter.java9
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/StringHashtableOfInt.java12
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/StringMatcher.java4
-rw-r--r--org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/ToStringSorter.java23
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/core/search/ITypeNameRequestor.java38
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/core/search/SearchEngine.java9
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/IEntryResult.java5
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/IIndexer.java10
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/IQueryResult.java5
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/impl/BlocksIndexInput.java5
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/impl/BlocksIndexOutput.java2
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/impl/EntryResult.java6
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/impl/FileDocument.java2
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/impl/HashtableOfObject.java4
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/impl/IFileDocument.java2
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/impl/IIndexConstants.java10
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/impl/ILRUCacheable.java12
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/impl/Index.java4
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/impl/IndexInput.java10
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/impl/IndexSummary.java2
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/impl/IndexedFile.java12
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/impl/Int.java5
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/impl/JarFileDocument.java2
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/impl/JarFileEntryDocument.java4
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/impl/LRUCache.java4
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/impl/MemoryCheckThread.java5
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/impl/ObjectVector.java9
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/index/impl/WordEntry.java5
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/HierarchyScope.java2
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/IIndexSearchRequestor.java5
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/IInfoConstants.java5
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/IndexSearchAdapter.java5
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/PatternSearchJob.java6
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/SubTypeSearchJob.java2
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/AddClassFileToIndex.java2
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/AddCompilationUnitToIndex.java2
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/AddJarFileToIndex.java16
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/BinaryIndexer.java40
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/IIndexConstants.java26
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/IndexAllProject.java12
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/IndexManager.java22
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/ReadWriteMonitor.java9
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/RemoveFromIndex.java2
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/SourceIndexer.java2
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/ConstructorDeclarationPattern.java176
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/ConstructorReferencePattern.java207
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/FieldDeclarationPattern.java157
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/FieldReferencePattern.java251
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java399
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MatchLocatorParser.java61
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MatchSet.java158
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MethodDeclarationPattern.java195
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MethodPattern.java26
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MethodReferencePattern.java120
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/OrPattern.java63
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/PackageDeclarationPattern.java29
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/PackageReferencePattern.java280
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/SearchPattern.java204
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/SuperInterfaceReferencePattern.java77
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/SuperTypeReferencePattern.java159
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/TypeDeclarationPattern.java160
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/TypeReferencePattern.java426
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/processing/IJob.java9
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/processing/IJobConstants.java7
-rw-r--r--org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/processing/JobManager.java32
533 files changed, 6354 insertions, 7638 deletions
diff --git a/org.eclipse.jdt.core/.classpath b/org.eclipse.jdt.core/.classpath
index e1df1e34e8..51c65a57e7 100644
--- a/org.eclipse.jdt.core/.classpath
+++ b/org.eclipse.jdt.core/.classpath
@@ -6,7 +6,6 @@
<classpathentry kind="lib"
path="/org.eclipse.core.runtime/runtime.jar" sourcepath="/org.eclipse.core.runtime/runtimesrc.zip"/>
<classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
- <classpathentry kind="src" path="Eclipse Java Ant Compiler"/>
<classpathentry kind="src" path="Eclipse Java Batch Compiler"/>
<classpathentry kind="src" path="Eclipse Java Code Assist"/>
<classpathentry kind="src" path="Eclipse Java Compiler"/>
@@ -14,8 +13,5 @@
<classpathentry kind="src" path="Eclipse Java Evaluation"/>
<classpathentry kind="src" path="Eclipse Java Model"/>
<classpathentry kind="src" path="Eclipse Java Formatter"/>
- <classpathentry kind="lib" path="/org.eclipse.ant.core/ant.jar"/>
- <classpathentry kind="lib"
- path="/org.eclipse.ant.core/antsupport.jar" sourcepath="/org.eclipse.ant.core/antsupportsrc.zip"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.jdt.core/.vcm_meta b/org.eclipse.jdt.core/.vcm_meta
index aae2e1b3ef..7655f8db44 100644
--- a/org.eclipse.jdt.core/.vcm_meta
+++ b/org.eclipse.jdt.core/.vcm_meta
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-description>
+ <comment></comment>
<nature id="org.eclipse.jdt.core.javanature"/>
<builder name="org.eclipse.jdt.core.javabuilder">
</builder>
diff --git a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
index 6d1e55cd76..8a449a523d 100644
--- a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
+++ b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
@@ -75,6 +75,6 @@ public NameEnvironmentAnswer readJavaFile(String fileName, char[][] packageName)
return new NameEnvironmentAnswer(new CompilationUnit(null, fullName));
}
public String toString() {
- return "ClasspathDirectory "/*nonNLS*/ + path;
+ return "ClasspathDirectory " + path;
}
}
diff --git a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathJar.java b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathJar.java
index 5bdafd41d9..b64fa0ea9b 100644
--- a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathJar.java
+++ b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathJar.java
@@ -80,6 +80,6 @@ public NameEnvironmentAnswer readJavaFile(String filename, char[][] packageName)
}
}
public String toString() {
- return "Classpath for jar file "/*nonNLS*/ + zipFile;
+ return "Classpath for jar file " + zipFile;
}
}
diff --git a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/CompilationUnit.java b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/CompilationUnit.java
index bf7d5f5e4b..816aab0e19 100644
--- a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/CompilationUnit.java
+++ b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/CompilationUnit.java
@@ -16,11 +16,11 @@ public CompilationUnit(char[] contents, String fileName) {
this.contents = contents;
this.fileName = fileName.toCharArray();
- int start = fileName.lastIndexOf("/"/*nonNLS*/) + 1;
- if (start == 0 || start < fileName.lastIndexOf("\\"/*nonNLS*/))
- start = fileName.lastIndexOf("\\"/*nonNLS*/) + 1;
+ int start = fileName.lastIndexOf("/") + 1;
+ if (start == 0 || start < fileName.lastIndexOf("\\"))
+ start = fileName.lastIndexOf("\\") + 1;
- int end = fileName.lastIndexOf("."/*nonNLS*/);
+ int end = fileName.lastIndexOf(".");
if (end == -1)
end = fileName.length();
@@ -70,6 +70,6 @@ public char[] getMainTypeName() {
return mainTypeName;
}
public String toString() {
- return "CompilationUnit["/*nonNLS*/ + new String(fileName) + "]"/*nonNLS*/;
+ return "CompilationUnit[" + new String(fileName) + "]";
}
}
diff --git a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/FileFinder.java b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/FileFinder.java
index b187763452..b8d76331e5 100644
--- a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/FileFinder.java
+++ b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/FileFinder.java
@@ -12,13 +12,13 @@ public class FileFinder {
public int counter = 0;
public void find(File f, String pattern, boolean verbose) {
if (verbose) {
- System.out.println(Main.bind("scanning.start"/*nonNLS*/,f.getAbsolutePath()));
+ System.out.println("Scanning of " + f.getAbsolutePath());
}
find0(f, pattern, verbose);
System.arraycopy(resultFiles, 0, (resultFiles = new String[counter]), 0, counter);
if (verbose) {
System.out.println();
- System.out.println(Main.bind("scanning.done"/*nonNLS*/,f.getAbsolutePath()));
+ System.out.println("Scanning of " + f.getAbsolutePath() + " DONE");
}
}
public void find0(File f, String pattern, boolean verbose) {
diff --git a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/FileSystem.java b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/FileSystem.java
index 265ca32871..25129fa304 100644
--- a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/FileSystem.java
+++ b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/FileSystem.java
@@ -37,7 +37,7 @@ public FileSystem(String[] classpathNames, String[] initialFileNames) {
if (file.isDirectory()) {
classpaths[i] = new ClasspathDirectory(file);
pathNames[i] = ((ClasspathDirectory) classpaths[i]).path;
- } else if (classpathNames[i].endsWith(".jar"/*nonNLS*/) | (classpathNames[i].endsWith(".zip"/*nonNLS*/))) {
+ } else if (classpathNames[i].endsWith(".jar") | (classpathNames[i].endsWith(".zip"))) {
classpaths[i] = new ClasspathJar(file);
pathNames[i] = classpathNames[i].substring(0, classpathNames[i].lastIndexOf('.'));
}
@@ -65,7 +65,7 @@ public FileSystem(String[] classpathNames, String[] initialFileNames) {
for (int i = initialFileNames.length; --i >= 0;) {
String fileName = initialFileNames[i];
String matchingPathName = null;
- if (fileName.lastIndexOf("."/*nonNLS*/) != -1)
+ if (fileName.lastIndexOf(".") != -1)
fileName = fileName.substring(0, fileName.lastIndexOf('.')); // remove trailing ".java"
fileName = convertPathSeparators(fileName);
@@ -101,8 +101,8 @@ private NameEnvironmentAnswer findClass(char[] name, char[][] packageName) {
return null; // looking for a file which we know was provided at the beginning of the compilation
String filename = new String(name);
- String binaryFilename = filename + ".class"/*nonNLS*/;
- String sourceFilename = filename + ".java"/*nonNLS*/;
+ String binaryFilename = filename + ".class";
+ String sourceFilename = filename + ".java";
for (int i = 0, length = classpaths.length; i < length; i++) {
Classpath classpath = classpaths[i];
boolean binaryExists = classpath.exists(binaryFilename, packageName);
diff --git a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java
index 0105201202..a7da415305 100644
--- a/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java
+++ b/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java
@@ -51,27 +51,10 @@ public class Main implements ConfigurableProblems, ProblemSeverities {
int globalErrorsCount;
int globalWarningsCount;
- String versionID = "0.125.12 (jck1.3a)"/*nonNLS*/;
- private static final char[] CLASS_FILE_EXTENSION = ".class"/*nonNLS*/.toCharArray();
+ String versionID = "0.103";
+ private static final char[] CLASS_FILE_EXTENSION = ".class".toCharArray();
int exportedClassFilesCounter;
-
- /**
- * Are we running JDK 1.1?
- */
- private static boolean JDK1_1 = false;
-
- /* Bundle containing messages */
- protected static ResourceBundle bundle;
- private final static String bundleName = "org.eclipse.jdt.internal.compiler.batch.Messages"/*nonNLS*/;
- static {
- String ver = System.getProperty("java.version"/*nonNLS*/);
- JDK1_1 = ((ver != null) && ver.startsWith("1.1"/*nonNLS*/));
- relocalize();
- }
-
- private boolean proceed = true;
-
protected Main(PrintWriter writer, boolean systemExitWhenFinished) {
this.out = writer;
this.systemExitWhenFinished = systemExitWhenFinished;
@@ -84,73 +67,69 @@ protected void compile(String[] argv) {
// decode command line arguments
try {
configure(argv);
- if(proceed){
- if (showProgress) out.print(Main.bind("progress.compiling"/*nonNLS*/));
- for (int i = 0; i < repetitions; i++){
- globalProblemsCount = 0;
- globalErrorsCount = 0;
- globalWarningsCount = 0;
- lineCount = 0;
-
- if (repetitions > 1){
- out.flush();
- out.println(Main.bind("compile.repetition"/*nonNLS*/,String.valueOf(i+1),String.valueOf(repetitions)));
+ if (showProgress) System.out.print("Compiling");
+ for (int i = 0; i < repetitions; i++){
+ globalProblemsCount = 0;
+ globalErrorsCount = 0;
+ globalWarningsCount = 0;
+ lineCount = 0;
+ if (repetitions > 1){
+ out.flush();
+ out.println("Repetition "+(i+1)+"/"+repetitions);
+ }
+ long startTime = System.currentTimeMillis();
+
+ // request compilation
+ performCompilation();
+ if (timer) {
+ time = System.currentTimeMillis() - startTime;
+ if (lineCount != 0){
+ out.println("Compiled " + lineCount + " lines in "+ time + " ms ("+ (((int)((lineCount*10000.0)/time))/10.0) + " lines/s)");
+ } else {
+ out.println("Total compilation time: " + time);
}
- long startTime = System.currentTimeMillis();
- // request compilation
- performCompilation();
- if (timer) {
-
- time = System.currentTimeMillis() - startTime;
- if (lineCount != 0){
- out.println(Main.bind("compile.instantTime"/*nonNLS*/,new String[]{String.valueOf(lineCount),String.valueOf(time),String.valueOf((((int)((lineCount*10000.0)/time))/10.0))}));
- } else {
- out.println(Main.bind("compile.totalTime"/*nonNLS*/,String.valueOf(time)));
- }
+ }
+ if (globalProblemsCount > 0) {
+ if (globalProblemsCount == 1) {
+ out.print("1 problem (");
+ } else {
+ out.print(globalProblemsCount + " problems (");
}
- if (globalProblemsCount > 0) {
- if (globalProblemsCount == 1) {
- out.print(Main.bind("compile.oneProblem"/*nonNLS*/));
+ if (globalErrorsCount > 0) {
+ if (globalErrorsCount == 1) {
+ out.print("1 error");
} else {
- out.print(Main.bind("compile.severalProblems"/*nonNLS*/,String.valueOf(globalProblemsCount)));
+ out.print(globalErrorsCount + " errors");
}
- out.print(" ("/*nonNLS*/);
+ }
+ if (globalWarningsCount > 0) {
if (globalErrorsCount > 0) {
- if (globalErrorsCount == 1) {
- out.print(Main.bind("compile.oneError"/*nonNLS*/));
- } else {
- out.print(Main.bind("compile.severalErrors"/*nonNLS*/,String.valueOf(globalErrorsCount)));
- }
- }
- if (globalWarningsCount > 0) {
- if (globalErrorsCount > 0) {
- out.print(", "/*nonNLS*/);
- }
- if (globalWarningsCount == 1) {
- out.print(Main.bind("compile.oneWarning"/*nonNLS*/));
- } else {
- out.print(Main.bind("compile.severalWarnings"/*nonNLS*/,String.valueOf(globalWarningsCount)));
- }
+ out.print(", ");
}
- out.println(")"/*nonNLS*/);
- }
- if (exportedClassFilesCounter != 0 && (this.showProgress || this.timer || this.verbose)) {
- if (exportedClassFilesCounter == 1) {
- out.print(Main.bind("compile.oneClassFileGenerated"/*nonNLS*/));
+ if (globalWarningsCount == 1) {
+ out.print("1 warning");
} else {
- out.print(Main.bind("compile.severalClassFilesGenerated"/*nonNLS*/,String.valueOf(exportedClassFilesCounter)));
+ out.print(globalWarningsCount + " warnings");
}
}
+ out.println(")");
+ }
+ if (exportedClassFilesCounter != 0 && (this.showProgress || this.timer || this.verbose)) {
+ if (exportedClassFilesCounter == 1) {
+ out.println("1 .class file generated");
+ } else {
+ out.println(exportedClassFilesCounter + " .class files generated");
+ }
}
- if (showProgress) System.out.println();
}
+ if (showProgress) System.out.println();
if (systemExitWhenFinished){
out.flush();
System.exit(globalErrorsCount > 0 ? -1 : 0);
}
} catch (InvalidInputException e) {
out.println(e.getMessage());
- out.println("------------------------"/*nonNLS*/);
+ out.println("------------------------");
printUsage();
if (systemExitWhenFinished){
System.exit(-1);
@@ -200,7 +179,7 @@ public static void compile(String commandLine, PrintWriter writer) {
argv[count-1] += File.pathSeparator;
insideClasspath = true;
} else {
- tokenizer = new StringTokenizer(subCommandLine, File.pathSeparator + " "/*nonNLS*/);
+ tokenizer = new StringTokenizer(subCommandLine, File.pathSeparator + " ");
while (tokenizer.hasMoreTokens()) {
if (count == argv.length) {
System.arraycopy(argv, 0, (argv = new String[count * 2]), 0, count);
@@ -229,7 +208,7 @@ public static void compile(String commandLine, PrintWriter writer) {
}
argv[count++] = commandLine.substring(startIndex, commandLine.length());
} else {
- tokenizer = new StringTokenizer(commandLine.substring(startIndex, commandLine.length()), File.pathSeparator + " "/*nonNLS*/);
+ tokenizer = new StringTokenizer(commandLine.substring(startIndex, commandLine.length()), File.pathSeparator + " ");
while (tokenizer.hasMoreTokens()) {
if (count == argv.length) {
System.arraycopy(argv, 0, (argv = new String[count * 2]), 0, count);
@@ -247,7 +226,7 @@ Decode the command line arguments
*/
private void configure(String[] argv) throws InvalidInputException {
if ((argv == null) || (argv.length == 0))
- throw new InvalidInputException(Main.bind("configure.noSourceFile"/*nonNLS*/));
+ throw new InvalidInputException("no source file specified");
final int InsideClasspath = 1;
final int InsideDestinationPath = 2;
final int TargetSetting = 4;
@@ -266,7 +245,7 @@ private void configure(String[] argv) throws InvalidInputException {
while (++index < argCount) {
String currentArg = argv[index].trim();
- if (currentArg.endsWith(".java"/*nonNLS*/)) {
+ if (currentArg.endsWith(".java")) {
if (filenames == null) {
filenames = new String[argCount - index];
} else if (filesCount == filenames.length) {
@@ -277,75 +256,75 @@ private void configure(String[] argv) throws InvalidInputException {
mode = Default;
continue;
}
- if (currentArg.equals("-log"/*nonNLS*/)) {
+ if (currentArg.equals("-log")) {
if (log != null)
- throw new InvalidInputException(Main.bind("configure.duplicateLog"/*nonNLS*/,currentArg));
+ throw new InvalidInputException("duplicate log specification: " + currentArg);
mode = InsideLog;
continue;
}
- if (currentArg.equals("-repeat"/*nonNLS*/)) {
+ if (currentArg.equals("-repeat")) {
if (repetitions > 0)
- throw new InvalidInputException(Main.bind("configure.duplicateRepeat"/*nonNLS*/,currentArg));
+ throw new InvalidInputException("duplicate repeat specification: " + currentArg);
mode = InsideRepetition;
continue;
}
- if (currentArg.equals("-d"/*nonNLS*/)) {
+ if (currentArg.equals("-d")) {
if (destinationPath != null)
- throw new InvalidInputException(Main.bind("configure.duplicateOutputPath"/*nonNLS*/,currentArg));
+ throw new InvalidInputException("duplicate output path specification: " + currentArg);
mode = InsideDestinationPath;
continue;
}
- if (currentArg.equals("-classpath"/*nonNLS*/)) {
+ if (currentArg.equals("-classpath")) {
if (pathCount > 0)
- throw new InvalidInputException(Main.bind("configure.duplicateClasspath"/*nonNLS*/,currentArg));
+ throw new InvalidInputException("duplicate classpath specification: " + currentArg);
classpaths = new String[DEFAULT_SIZE_CLASSPATH];
mode = InsideClasspath;
continue;
}
- if (currentArg.equals("-progress"/*nonNLS*/)) {
+ if (currentArg.equals("-progress")) {
mode = Default;
showProgress = true;
continue;
}
- if (currentArg.equals("-proceedOnError"/*nonNLS*/)) {
+ if (currentArg.equals("-proceedOnError")) {
mode = Default;
proceedOnError = true;
continue;
}
- if (currentArg.equals("-time"/*nonNLS*/)) {
+ if (currentArg.equals("-time")) {
mode = Default;
timer = true;
continue;
}
- if (currentArg.equals("-version"/*nonNLS*/) || currentArg.equals("-v"/*nonNLS*/)) {
+ if (currentArg.equals("-version") || currentArg.equals("-v")) {
versionIDRequired = true;
continue;
}
- if (currentArg.equals("-help"/*nonNLS*/)) {
+ if (currentArg.equals("-help")) {
printUsageRequired = true;
continue;
}
- if (currentArg.equals("-noImportError"/*nonNLS*/)) {
+ if (currentArg.equals("-noImportError")) {
mode = Default;
importProblemIsError = false;
continue;
}
- if (currentArg.equals("-noExit"/*nonNLS*/)) {
+ if (currentArg.equals("-noExit")) {
mode = Default;
systemExitWhenFinished = false;
continue;
}
- if (currentArg.equals("-verbose"/*nonNLS*/)) {
+ if (currentArg.equals("-verbose")) {
mode = Default;
verbose = true;
continue;
}
- if (currentArg.equals("-referenceInfo"/*nonNLS*/)) {
+ if (currentArg.equals("-referenceInfo")) {
mode = Default;
produceRefInfo = true;
continue;
}
- if (currentArg.startsWith("-g"/*nonNLS*/)) {
+ if (currentArg.startsWith("-g")) {
mode = Default;
debugMask = 0; // reinitialize the default value
String debugOption = currentArg;
@@ -355,91 +334,89 @@ private void configure(String[] argv) throws InvalidInputException {
continue;
}
if (length > 3) {
- if (length == 7 && debugOption.equals("-g:none"/*nonNLS*/))
+ if (length == 7 && debugOption.equals("-g:none"))
continue;
- StringTokenizer tokenizer = new StringTokenizer(debugOption.substring(3, debugOption.length()), ","/*nonNLS*/);
+ StringTokenizer tokenizer = new StringTokenizer(debugOption.substring(3, debugOption.length()), ",");
while (tokenizer.hasMoreTokens()) {
String token = tokenizer.nextToken();
- if (token.equals("vars"/*nonNLS*/)) {
+ if (token.equals("vars")) {
debugMask |= CompilerOptions.Vars;
- } else if (token.equals("lines"/*nonNLS*/)) {
+ } else if (token.equals("lines")) {
debugMask |= CompilerOptions.Lines;
- } else if (token.equals("source"/*nonNLS*/)) {
+ } else if (token.equals("source")) {
debugMask |= CompilerOptions.Source;
} else {
- throw new InvalidInputException(Main.bind("configure.invalidDebugOption"/*nonNLS*/,debugOption));
+ throw new InvalidInputException("invalid debug option: " + debugOption);
}
}
continue;
}
- throw new InvalidInputException(Main.bind("configure.invalidDebugOption"/*nonNLS*/,debugOption));
+ throw new InvalidInputException("invalid debug option: " + debugOption);
}
- if (currentArg.startsWith("-nowarn"/*nonNLS*/)) {
+ if (currentArg.startsWith("-nowarn")) {
noWarnOptionInUsed = true;
if (warnOptionInUsed)
- throw new InvalidInputException(Main.bind("configure.duplicateWarningConfiguration"/*nonNLS*/));
+ throw new InvalidInputException("duplicate usage of warning configuration");
mode = Default;
warningMask = TemporaryWarning; // reinitialize the default value (still see TemporaryWarning)
continue;
}
- if (currentArg.startsWith("-warn"/*nonNLS*/)) {
+ if (currentArg.startsWith("-warn")) {
warnOptionInUsed = true;
if (noWarnOptionInUsed)
- throw new InvalidInputException(Main.bind("configure.duplicateWarningConfiguration"/*nonNLS*/));
+ throw new InvalidInputException("duplicate usage of warning configuration");
mode = Default;
String warningOption = currentArg;
int length = currentArg.length();
- if (length == 10 && warningOption.equals("-warn:none"/*nonNLS*/)) {
+ if (length == 10 && warningOption.equals("-warn:none")) {
warningMask = TemporaryWarning; // reinitialize the default value (still see TemporaryWarning)
continue;
}
if (length < 6)
- throw new InvalidInputException(Main.bind("configure.invalidWarningConfiguration"/*nonNLS*/,warningOption));
- StringTokenizer tokenizer = new StringTokenizer(warningOption.substring(6, warningOption.length()), ","/*nonNLS*/);
+ throw new InvalidInputException("invalid warning configuration: " + warningOption);
+ StringTokenizer tokenizer = new StringTokenizer(warningOption.substring(6, warningOption.length()), ",");
int tokenCounter = 0;
warningMask = 0; // reinitialize the default value
while (tokenizer.hasMoreTokens()) {
String token = tokenizer.nextToken();
tokenCounter++;
- if (token.equals("constructorName"/*nonNLS*/)) {
+ if (token.equals("constructorName")) {
warningMask |= CompilerOptions.MethodWithConstructorName;
- } else if (token.equals("packageDefaultMethod"/*nonNLS*/)) {
+ } else if (token.equals("packageDefaultMethod")) {
warningMask |= CompilerOptions.OverriddenPackageDefaultMethod;
- } else if (token.equals("maskedCatchBlocks"/*nonNLS*/)) {
+ } else if (token.equals("maskedCatchBlocks")) {
warningMask |= CompilerOptions.MaskedCatchBlock;
- } else if (token.equals("deprecation"/*nonNLS*/)) {
+ } else if (token.equals("deprecation")) {
warningMask |= CompilerOptions.UsingDeprecatedAPI;
- } else if (token.equals("unusedLocals"/*nonNLS*/)) {
+ } else if (token.equals("unusedLocals")) {
warningMask |= CompilerOptions.UnusedLocalVariable;
- } else if (token.equals("unusedArguments"/*nonNLS*/)) {
+ } else if (token.equals("unusedArguments")) {
warningMask |= CompilerOptions.UnusedArgument;
- } else if (token.equals("syntheticAccess"/*nonNLS*/)){
+ } else if (token.equals("syntheticAccess")){
warningMask |= CompilerOptions.AccessEmulation;
- } else if (token.equals("nls"/*nonNLS*/)){
- warningMask |= CompilerOptions.NonExternalizedString;
} else {
- throw new InvalidInputException(Main.bind("configure.invalidWarning"/*nonNLS*/,token));
+ throw new InvalidInputException("invalid warning: " + token);
}
}
if (tokenCounter == 0)
- throw new InvalidInputException(Main.bind("configure.invalidWarningOption"/*nonNLS*/,currentArg));
+ throw new InvalidInputException("invalid warning option: " + currentArg);
continue;
}
- if (currentArg.equals("-target"/*nonNLS*/)) {
+ if (currentArg.equals("-target")) {
mode = TargetSetting;
continue;
}
- if (currentArg.equals("-preserveAllLocals"/*nonNLS*/)) {
+ if (currentArg.equals("-preserveAllLocals")) {
preserveAllLocalVariables = true;
continue;
}
if (mode == TargetSetting) {
- if (currentArg.equals("1.1"/*nonNLS*/)) {
+ if (currentArg.equals("1.1")) {
targetJDK = CompilerOptions.JDK1_1;
- } else if (currentArg.equals("1.2"/*nonNLS*/)) {
+ } else if (currentArg.equals("1.2")) {
targetJDK = CompilerOptions.JDK1_2;
} else {
- throw new InvalidInputException(Main.bind("configure.targetJDK"/*nonNLS*/,currentArg));
+ throw new InvalidInputException("target JDK is either '1.1' or '1.2': " + currentArg);
}
mode = Default;
continue;
@@ -453,10 +430,10 @@ private void configure(String[] argv) throws InvalidInputException {
try {
repetitions = Integer.parseInt(currentArg);
if (repetitions <= 0){
- throw new InvalidInputException(Main.bind("configure.repetition"/*nonNLS*/,currentArg));
+ throw new InvalidInputException("repetition must be a positive integer: " + currentArg);
}
} catch(NumberFormatException e){
- throw new InvalidInputException(Main.bind("configure.repetition"/*nonNLS*/,currentArg));
+ throw new InvalidInputException("repetition must be a positive integer: " + currentArg);
}
mode = Default;
continue;
@@ -484,12 +461,12 @@ private void configure(String[] argv) throws InvalidInputException {
currentArg = currentArg.substring(0, currentArg.length() - File.separator.length());
File dir = new File(currentArg);
if (!dir.isDirectory())
- throw new InvalidInputException(Main.bind("configure.directoryNotExist"/*nonNLS*/,currentArg));
+ throw new InvalidInputException("directory does not exist: " + currentArg);
FileFinder finder = new FileFinder();
try{
- finder.find(dir, ".JAVA"/*nonNLS*/, verbose);
+ finder.find(dir, ".JAVA", verbose);
} catch(Exception e){
- throw new InvalidInputException(Main.bind("configure.IOError"/*nonNLS*/,currentArg));
+ throw new InvalidInputException("i/o error : unable to retrieve .JAVA files in directory: " + currentArg);
}
if (filenames != null) {
// some source files were specified explicitly
@@ -510,25 +487,22 @@ private void configure(String[] argv) throws InvalidInputException {
* Standalone options
*/
if (versionIDRequired) {
- out.println(Main.bind("configure.version"/*nonNLS*/,this.versionID));
- out.println();
- proceed = false;
+ out.println("Eclipse Java Compiler "+ this.versionID + ", Copyright IBM Corp 2000\n");
return;
}
if (printUsageRequired) {
printUsage();
- proceed = false;
return;
}
if (filesCount != 0)
System.arraycopy(filenames, 0, (filenames = new String[filesCount]), 0, filesCount);
if (pathCount == 0) {
- String classProp = System.getProperty("LFclasspath"/*nonNLS*/);
+ String classProp = System.getProperty("LFclasspath");
if ((classProp == null) || (classProp.length() == 0)) {
- out.println(Main.bind("configure.noClasspath"/*nonNLS*/));
- classProp = "."/*nonNLS*/;
+ out.println("no classpath defined (LF_CLASSPATH), using default directory instead");
+ classProp = ".";
}
StringTokenizer tokenizer = new StringTokenizer(classProp, File.pathSeparator);
classpaths = new String[tokenizer.countTokens()];
@@ -543,27 +517,26 @@ private void configure(String[] argv) throws InvalidInputException {
for (int i = 0, max = classpaths.length; i < max; i++) {
File file = new File(classpaths[i]);
if (!file.exists())
- throw new InvalidInputException(Main.bind("configure.incorrectClasspath"/*nonNLS*/,classpaths[i]));
+ throw new InvalidInputException("incorrect classpath: " + classpaths[i]);
}
if (destinationPath == null) {
- destinationPath = System.getProperty("user.dir"/*nonNLS*/);
- } else if ("none"/*nonNLS*/.equals(destinationPath)) {
+ destinationPath = System.getProperty("user.dir");
+ } else if ("none".equals(destinationPath)) {
destinationPath = null;
}
if (filenames == null)
- throw new InvalidInputException(Main.bind("configure.noSource"/*nonNLS*/));
+ throw new InvalidInputException("no source file specified");
if (log != null){
try {
out = new PrintWriter(new FileOutputStream(log, false));
} catch(IOException e){
- throw new InvalidInputException(Main.bind("configure.cannotOpenLog"/*nonNLS*/));
+ throw new InvalidInputException("cannot open .log file");
}
} else {
showProgress = false;
}
-
if (repetitions == 0) {
repetitions = 1;
}
@@ -592,22 +565,21 @@ protected ICompilerRequestor getBatchRequestor() {
if (problems[i] != null) {
globalProblemsCount++;
if (localErrorCount == 0)
- out.println("----------"/*nonNLS*/);
- out.print(globalProblemsCount + ". "/*nonNLS*/ + (problems[i].isError() ? Main.bind("requestor.error"/*nonNLS*/) : Main.bind("requestor.warning"/*nonNLS*/)));
+ out.println("----------");
+ out.print(globalProblemsCount + (problems[i].isError() ? ". ERROR" : ". WARNING"));
if (problems[i].isError()) {
globalErrorsCount++;
} else {
globalWarningsCount++;
}
- out.print(" "/*nonNLS*/);
- out.print(Main.bind("requestor.in"/*nonNLS*/,new String(problems[i].getOriginatingFileName())));
+ out.print(" in " + new String(problems[i].getOriginatingFileName()));
try {
out.println(((DefaultProblem)problems[i]).errorReportSource(compilationResult.compilationUnit));
out.println(problems[i].getMessage());
} catch (Exception e) {
- out.println(Main.bind("requestor.notRetrieveErrorMessage"/*nonNLS*/,problems[i].toString()));
+ out.println("Cannot retrieve the error message for " + problems[i].toString());
}
- out.println("----------"/*nonNLS*/);
+ out.println("----------");
if (problems[i].isError())
localErrorCount++;
}
@@ -628,18 +600,19 @@ protected ICompilerRequestor getBatchRequestor() {
protected CompilationUnit[] getCompilationUnits() throws InvalidInputException {
int fileCount = filenames.length;
CompilationUnit[] units = new CompilationUnit[fileCount];
+
HashtableOfObject knownFileNames = new HashtableOfObject(fileCount);
for (int i = 0; i < fileCount; i++) {
char[] charName = filenames[i].toCharArray();
if (knownFileNames.get(charName) != null){
- throw new InvalidInputException(Main.bind("unit.more"/*nonNLS*/,filenames[i]));
+ throw new InvalidInputException("File " + filenames[i] + " is specified more than once");
} else {
knownFileNames.put(charName, charName);
}
File file = new File(filenames[i]);
if (!file.exists())
- throw new InvalidInputException(Main.bind("unit.missing"/*nonNLS*/,filenames[i]));
+ throw new InvalidInputException("File " + filenames[i] + " is missing");
units[i] = new CompilationUnit(null, filenames[i]);
}
return units;
@@ -711,7 +684,10 @@ protected void outputClassFiles(CompilationResult unitResult) {
} catch (IOException e) {
String fileName = destinationPath + new String(relativeName);
e.printStackTrace();
- System.out.println(Main.bind("output.noClassFileCreated"/*nonNLS*/,fileName));
+ System.out.println(
+ "No .class file created for file named "
+ + fileName
+ + " because of a IOException.");
}
exportedClassFilesCounter++;
}
@@ -729,15 +705,16 @@ protected void performCompilation() throws InvalidInputException {
getOptions(),
getBatchRequestor(),
getProblemFactory());
+
CompilerOptions options = batchCompiler.options;
// set the non-externally configurable options.
options.setVerboseMode(verbose);
options.produceReferenceInfo(produceRefInfo);
+
batchCompiler.compile(getCompilationUnits());
}
private void printUsage() {
- out.println(Main.bind("misc.usage"/*nonNLS*/,this.versionID));
- /*out.println(
+ out.println(
"Eclipse Java Compiler "+ this.versionID + ", Copyright IBM Corp 2000\n\n" +
"Usage: <options> <source files | directories>\n\n" +
"where options include:\n" +
@@ -765,84 +742,7 @@ private void printUsage() {
"-proceedOnError\tkeep compiling when error, \n\t\tdumping class files with problem methods\n" +
"-referenceInfo\tcompute reference info\n" +
"-preserveAllLocals\trequest code gen preserve all local variables\n" +
- "-repeat <n>\trepeat compilation process for performance analysis\n");*/
+ "-repeat <n>\trepeat compilation process for performance analysis\n");
out.flush();
}
-
-/**
- * Creates a NLS catalog for the given locale.
- */
-public static void relocalize() {
- bundle = ResourceBundle.getBundle(bundleName, Locale.getDefault());
-}
-
-/**
- * Lookup the message with the given ID in this catalog
- */
-public static String bind(String id) {
- return bind(id, (String[])null);
-}
-
-/**
- * Lookup the message with the given ID in this catalog and bind its
- * substitution locations with the given string values.
- */
-public static String bind(String id, String[] bindings) {
- if (id == null)
- return "No message available"/*nonNLS*/;
- String message = null;
- try {
- message = bundle.getString(id);
- } catch (MissingResourceException e) {
- // If we got an exception looking for the message, fail gracefully by just returning
- // the id we were looking for. In most cases this is semi-informative so is not too bad.
- return "Missing message: "/*nonNLS*/+id+" in: "/*nonNLS*/+bundleName;
- }
- if (bindings == null)
- return message;
- int length = message.length();
- int start = -1;
- int end = length;
- StringBuffer output = new StringBuffer(80);
- while (true) {
- if ((end = message.indexOf('{', start)) > -1) {
- output.append(message.substring(start + 1, end));
- if ((start = message.indexOf('}', end)) > -1) {
- int index = -1;
- try {
- index = Integer.parseInt(message.substring(end + 1, start));
- output.append(bindings[index]);
- } catch (NumberFormatException nfe) {
- output.append(message.substring(end + 1, start + 1));
- } catch (ArrayIndexOutOfBoundsException e) {
- output.append("{missing "/*nonNLS*/ + Integer.toString(index) + "}"/*nonNLS*/);
- }
- } else {
- output.append(message.substring(end, length));
- break;
- }
- } else {
- output.append(message.substring(start + 1, length));
- break;
- }
- }
- return output.toString();
-}
-
-/**
- * Lookup the message with the given ID in this catalog and bind its
- * substitution locations with the given string.
- */
-public static String bind(String id, String binding) {
- return bind(id, new String[] {binding});
-}
-
-/**
- * Lookup the message with the given ID in this catalog and bind its
- * substitution locations with the given strings.
- */
-public static String bind(String id, String binding1, String binding2) {
- return bind(id, new String[] {binding1, binding2});
-}
-
}
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java
index fe8b2e04c2..c2b8f1e83b 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java
@@ -62,18 +62,18 @@ public final class CompletionEngine extends Engine implements ISearchRequestor,
*/
static final char[][] baseTypes =
new char[][] {
- "boolean"/*nonNLS*/.toCharArray(),
- "byte"/*nonNLS*/.toCharArray(),
- "char"/*nonNLS*/.toCharArray(),
- "double"/*nonNLS*/.toCharArray(),
- "float"/*nonNLS*/.toCharArray(),
- "int"/*nonNLS*/.toCharArray(),
- "long"/*nonNLS*/.toCharArray(),
- "short"/*nonNLS*/.toCharArray(),
- "void"/*nonNLS*/.toCharArray()};
-
- static final char[] classField = "class"/*nonNLS*/.toCharArray();
- static final char[] lengthField = "length"/*nonNLS*/.toCharArray();
+ "boolean".toCharArray(),
+ "byte".toCharArray(),
+ "char".toCharArray(),
+ "double".toCharArray(),
+ "float".toCharArray(),
+ "int".toCharArray(),
+ "long".toCharArray(),
+ "short".toCharArray(),
+ "void".toCharArray()};
+
+ static final char[] classField = "class".toCharArray();
+ static final char[] lengthField = "length".toCharArray();
/**
* The CompletionEngine is responsible for computing source completions.
*
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/ISearchRequestor.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/ISearchRequestor.java
index 46432c43f6..cd45d6158d 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/ISearchRequestor.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/ISearchRequestor.java
@@ -1,17 +1,5 @@
package org.eclipse.jdt.internal.codeassist;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.codeassist.*;
-/**
- * This is the internal requestor passed to the searchable name environment
- * so as to process the multiple search results as they are discovered.
- *
- * It is used to allow the code assist engine to add some more information
- * to the raw name environment results before answering them to the UI.
- */
public interface ISearchRequestor {
/**
* One result of the search consists of a new class.
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/SelectionEngine.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/SelectionEngine.java
index 808c774ef1..808709d278 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/SelectionEngine.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/SelectionEngine.java
@@ -227,7 +227,7 @@ private boolean mustQualifyType(char[][] packageName, char[] readableTypeName) {
public void select(ICompilationUnit sourceUnit, int selectionSourceStart, int selectionSourceEnd) {
char[] source = sourceUnit.getContents();
- if (!checkSelection(source, selectionSourceStart, selectionSourceEnd)) return;
+ if (!checkSelection(source, selectionSourceStart, selectionSourceEnd-1)) return;
try{
acceptedAnswer = false;
CompilationResult result = new CompilationResult(sourceUnit, 1, 1);
@@ -400,7 +400,7 @@ public void selectType(ISourceType sourceType, char[] typeName) {
selectionIdentifier,
new long[previousIdentifiers.length + 1]);
}
- field.name = "<fakeField>"/*nonNLS*/.toCharArray();
+ field.name = "<fakeField>".toCharArray();
typeDecl.fields = new FieldDeclaration[] {field};
// build bindings
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnClassLiteralAccess.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnClassLiteralAccess.java
index 79e6f0887a..91d67e2fbf 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnClassLiteralAccess.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnClassLiteralAccess.java
@@ -41,11 +41,11 @@ public TypeBinding resolveType(BlockScope scope) {
throw new CompletionNodeFound(this, targetType, scope);
}
public String toStringExpression() {
- StringBuffer result = new StringBuffer("<CompleteOnClassLiteralAccess:"/*nonNLS*/);
+ StringBuffer result = new StringBuffer("<CompleteOnClassLiteralAccess:");
result.append(type.toString());
- result.append("."/*nonNLS*/);
+ result.append(".");
result.append(completionIdentifier);
- result.append(">"/*nonNLS*/);
+ result.append(">");
return result.toString();
}
}
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnExceptionReference.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnExceptionReference.java
index 6b14d5a183..d77c1e957a 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnExceptionReference.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnExceptionReference.java
@@ -1,41 +1,10 @@
package org.eclipse.jdt.internal.codeassist.complete;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.ast.SingleTypeReference;
-/*
- * Completion node build by the parser in any case it was intending to
- * reduce an exception type reference containing the completion identifier.
- * e.g.
- *
- * class X {
- * void foo() {
- * try {
- * bar();
- * } catch (IOExc[cursor] e) {
- * }
- * }
- * }
- *
- * ---> class X {
- * void foo() {
- * try {
- * bar();
- * } catch (<CompleteOnException:IOExc> e) {
- * }
- * }
- * }
- *
- * The source range of the completion node denotes the source range
- * which should be replaced by the completion.
- */
public class CompletionOnExceptionReference extends CompletionOnSingleTypeReference {
public CompletionOnExceptionReference(char[] source, long pos) {
super(source, pos);
}
public String toStringExpression(int tab) {
- return "<CompleteOnException:"/*nonNLS*/ + new String(token) + ">"/*nonNLS*/;
+ return "<CompleteOnException:" + new String(token) + ">";
}
}
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnExplicitConstructorCall.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnExplicitConstructorCall.java
index 33a2a6aa88..94afca0086 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnExplicitConstructorCall.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnExplicitConstructorCall.java
@@ -48,23 +48,23 @@ public void resolve(BlockScope scope) {
}
public String toString(int tab) {
String s = tabString(tab);
- s += "<CompleteOnExplicitConstructorCall:"/*nonNLS*/;
+ s += "<CompleteOnExplicitConstructorCall:";
if (qualification != null)
- s = s + qualification.toStringExpression() + "."/*nonNLS*/;
+ s = s + qualification.toStringExpression() + ".";
if (accessMode == This) {
- s = s + "this("/*nonNLS*/;
+ s = s + "this(";
} else {
- s = s + "super("/*nonNLS*/;
+ s = s + "super(";
}
if (arguments != null) {
for (int i = 0; i < arguments.length; i++) {
s += arguments[i].toStringExpression();
if (i != arguments.length - 1) {
- s += ", "/*nonNLS*/;
+ s += ", ";
}
};
}
- s += ")>"/*nonNLS*/;
+ s += ")>";
return s;
}
}
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnImportReference.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnImportReference.java
index 33a99a1d68..b5e9866234 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnImportReference.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnImportReference.java
@@ -36,14 +36,14 @@ public CompletionOnImportReference(char[][] tokens , long[] positions) {
public String toString(int tab, boolean withOnDemand) {
StringBuffer buffer = new StringBuffer(tabString(tab));
- buffer. append("<CompleteOnImport:"/*nonNLS*/);
+ buffer. append("<CompleteOnImport:");
for (int i = 0; i < tokens.length; i++) {
buffer.append(tokens[i]);
if (i < (tokens.length - 1)) {
- buffer.append("."/*nonNLS*/);
+ buffer.append(".");
}
}
- buffer.append(">"/*nonNLS*/);
+ buffer.append(">");
return buffer.toString();
}
}
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnMemberAccess.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnMemberAccess.java
index 55098d0456..e70fe35b20 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnMemberAccess.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnMemberAccess.java
@@ -43,8 +43,8 @@ public TypeBinding resolveType(BlockScope scope) {
public String toStringExpression(){
/* slow code */
- return "<CompleteOnMemberAccess:"/*nonNLS*/
+ return "<CompleteOnMemberAccess:"
+ super.toStringExpression()
- + ">"/*nonNLS*/;
+ + ">";
}
}
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnMessageSend.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnMessageSend.java
index bb9419e342..ae8aa4c62b 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnMessageSend.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnMessageSend.java
@@ -45,19 +45,19 @@ public TypeBinding resolveType(BlockScope scope) {
public String toStringExpression() {
/*slow code*/
- String s = "<CompleteOnMessageSend:"/*nonNLS*/;
+ String s = "<CompleteOnMessageSend:";
if (receiver != ThisReference.ThisImplicit)
- s = s + receiver.toStringExpression() + "."/*nonNLS*/;
- s = s + new String(selector) + "("/*nonNLS*/;
+ s = s + receiver.toStringExpression() + ".";
+ s = s + new String(selector) + "(";
if (arguments != null) {
for (int i = 0; i < arguments.length; i++) {
s += arguments[i].toStringExpression();
if (i != arguments.length - 1) {
- s += ", "/*nonNLS*/;
+ s += ", ";
}
};
}
- s = s + ")>"/*nonNLS*/;
+ s = s + ")>";
return s;
}
}
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnPackageReference.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnPackageReference.java
index 1f7e313392..0fb8ae2e87 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnPackageReference.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnPackageReference.java
@@ -34,14 +34,14 @@ public CompletionOnPackageReference(char[][] tokens , long[] positions) {
}
public String toString(int tab, boolean withOnDemand) {
StringBuffer buffer = new StringBuffer(tabString(tab));
- buffer. append("<CompleteOnPackage:"/*nonNLS*/);
+ buffer. append("<CompleteOnPackage:");
for (int i = 0; i < tokens.length; i++) {
buffer.append(tokens[i]);
if (i < (tokens.length - 1)) {
- buffer.append("."/*nonNLS*/);
+ buffer.append(".");
}
}
- buffer.append(">"/*nonNLS*/);
+ buffer.append(">");
return buffer.toString();
}
}
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnQualifiedAllocationExpression.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnQualifiedAllocationExpression.java
index 63b20d5f86..91c554120b 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnQualifiedAllocationExpression.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnQualifiedAllocationExpression.java
@@ -56,8 +56,8 @@ public TypeBinding resolveType(BlockScope scope) {
public String toStringExpression(int tab) {
return
((this.enclosingInstance == null) ?
- "<CompleteOnAllocationExpression:"/*nonNLS*/ :
- "<CompleteOnQualifiedAllocationExpression:"/*nonNLS*/) +
- super.toStringExpression(tab) + ">"/*nonNLS*/;
+ "<CompleteOnAllocationExpression:" :
+ "<CompleteOnQualifiedAllocationExpression:") +
+ super.toStringExpression(tab) + ">";
}
}
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnQualifiedExceptionReference.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnQualifiedExceptionReference.java
index 4d02d4529d..3ebb0cc6f7 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnQualifiedExceptionReference.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnQualifiedExceptionReference.java
@@ -1,37 +1,5 @@
package org.eclipse.jdt.internal.codeassist.complete;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.ast.QualifiedTypeReference;
-/*
- * Completion node build by the parser in any case it was intending to
- * reduce an exception type reference containing the completion identifier
- * as part of a qualified name.
- * e.g.
- *
- * class X {
- * void foo() {
- * try {
- * bar();
- * } catch (java.io.IOExc[cursor] e) {
- * }
- * }
- * }
- *
- * ---> class X {
- * void foo() {
- * try {
- * bar();
- * } catch (<CompleteOnException:java.io.IOExc> e) {
- * }
- * }
- * }
- *
- * The source range of the completion node denotes the source range
- * which should be replaced by the completion.
- */
public class CompletionOnQualifiedExceptionReference extends CompletionOnQualifiedTypeReference {
public CompletionOnQualifiedExceptionReference(char[][] previousIdentifiers, char[] completionIdentifier, long[] positions) {
super(previousIdentifiers, completionIdentifier, positions);
@@ -39,12 +7,12 @@ public CompletionOnQualifiedExceptionReference(char[][] previousIdentifiers, cha
public String toStringExpression(int tab) {
StringBuffer buffer = new StringBuffer();
- buffer. append("<CompleteOnException:"/*nonNLS*/);
+ buffer. append("<CompleteOnException:");
for (int i = 0; i < tokens.length; i++) {
buffer.append(tokens[i]);
- buffer.append("."/*nonNLS*/);
+ buffer.append(".");
}
- buffer.append(completionIdentifier).append(">"/*nonNLS*/);
+ buffer.append(completionIdentifier).append(">");
return buffer.toString();
}
}
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnQualifiedNameReference.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnQualifiedNameReference.java
index df2ef4691f..52a91c9eb0 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnQualifiedNameReference.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnQualifiedNameReference.java
@@ -41,7 +41,7 @@ public CompletionOnQualifiedNameReference(char[][] previousIdentifiers, char[] c
public CompletionOnQualifiedNameReference(char[][] previousIdentifiers, char[] completionIdentifier, int sourceStart, int sourceEnd) {
super(previousIdentifiers, sourceStart, sourceEnd);
this.completionIdentifier = completionIdentifier;
- this.sourcePositions = new long[] {((long)sourceStart << 32) + sourceEnd};
+ this.sourcePositions = new long[] {(sourceStart << 32) + sourceEnd};
}
public TypeBinding resolveType(BlockScope scope) {
// it can be a package, type, member type, local variable or field
@@ -61,12 +61,12 @@ public TypeBinding resolveType(BlockScope scope) {
}
public String toStringExpression() {
- StringBuffer buffer = new StringBuffer("<CompleteOnName:"/*nonNLS*/);
+ StringBuffer buffer = new StringBuffer("<CompleteOnName:");
for (int i = 0; i < tokens.length; i++) {
buffer.append(tokens[i]);
- buffer.append("."/*nonNLS*/);
+ buffer.append(".");
}
- buffer.append(completionIdentifier).append(">"/*nonNLS*/);
+ buffer.append(completionIdentifier).append(">");
return buffer.toString();
}
}
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnQualifiedTypeReference.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnQualifiedTypeReference.java
index d1a29bd56d..40d64b84fb 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnQualifiedTypeReference.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnQualifiedTypeReference.java
@@ -49,12 +49,12 @@ public TypeBinding getTypeBinding(Scope scope) {
public String toStringExpression(int tab) {
StringBuffer buffer = new StringBuffer();
- buffer.append("<CompleteOnType:"/*nonNLS*/);
+ buffer.append("<CompleteOnType:");
for (int i = 0; i < tokens.length; i++) {
buffer.append(tokens[i]);
- buffer.append("."/*nonNLS*/);
+ buffer.append(".");
}
- buffer.append(completionIdentifier).append(">"/*nonNLS*/);
+ buffer.append(completionIdentifier).append(">");
return buffer.toString();
}
}
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnSingleNameReference.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnSingleNameReference.java
index 71cc39432f..c30504b5c7 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnSingleNameReference.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnSingleNameReference.java
@@ -36,6 +36,6 @@ public TypeBinding resolveType(BlockScope scope) {
throw new CompletionNodeFound(this, scope);
}
public String toStringExpression() {
- return "<CompleteOnName:"/*nonNLS*/ + super.toStringExpression() + ">"/*nonNLS*/;
+ return "<CompleteOnName:" + super.toStringExpression() + ">";
}
}
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnSingleTypeReference.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnSingleTypeReference.java
index f9c4c6d6ca..0f5fb5a825 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnSingleTypeReference.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionOnSingleTypeReference.java
@@ -42,6 +42,6 @@ public TypeBinding resolveTypeEnclosing(BlockScope scope, ReferenceBinding enclo
}
public String toStringExpression(int tab){
- return "<CompleteOnType:"/*nonNLS*/ + new String(token) + ">"/*nonNLS*/ ;
+ return "<CompleteOnType:" + new String(token) + ">" ;
}
}
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionScanner.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionScanner.java
index d5e48dc0b5..8efd5dcf2e 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionScanner.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionScanner.java
@@ -645,7 +645,7 @@ public int getNextToken() throws InvalidInputException {
if (atEnd())
return TokenNameEOF;
//the atEnd may not be <currentPosition == source.length> if source is only some part of a real (external) stream
- throw new InvalidInputException("Ctrl-Z"/*nonNLS*/);
+ throw new InvalidInputException("Ctrl-Z");
default :
if (Character.isJavaIdentifierStart(currentCharacter))
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/InvalidCursorLocation.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/InvalidCursorLocation.java
index 543d318d2c..d89203ef49 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/InvalidCursorLocation.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/InvalidCursorLocation.java
@@ -1,24 +1,15 @@
package org.eclipse.jdt.internal.codeassist.complete;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.codeassist.impl.Engine;
-/**
- * Thrown whenever cursor location is not inside a consistent token
- * i.e. inside a string, number, unicode, comments etc...
- */
public class InvalidCursorLocation extends RuntimeException {
public String irritant;
/* Possible irritants */
- public static final String NO_COMPLETION_INSIDE_UNICODE = "No Completion Inside Unicode"/*nonNLS*/;
- public static final String NO_COMPLETION_INSIDE_COMMENT = "No Completion Inside Comment"/*nonNLS*/;
- public static final String NO_COMPLETION_INSIDE_STRING = "No Completion Inside String"/*nonNLS*/;
- public static final String NO_COMPLETION_INSIDE_NUMBER = "No Completion Inside Number"/*nonNLS*/;
-
+ public static final String NO_COMPLETION_INSIDE_UNICODE = "No Completion Inside Unicode";
+ public static final String NO_COMPLETION_INSIDE_COMMENT = "No Completion Inside Comment";
+ public static final String NO_COMPLETION_INSIDE_STRING = "No Completion Inside String";
+ public static final String NO_COMPLETION_INSIDE_NUMBER = "No Completion Inside Number";
+
public InvalidCursorLocation(String irritant){
this.irritant = irritant;
}
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnExplicitConstructorCall.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnExplicitConstructorCall.java
index c129f322d7..6ab945a346 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnExplicitConstructorCall.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnExplicitConstructorCall.java
@@ -40,23 +40,23 @@ public void resolve(BlockScope scope) {
}
public String toString(int tab) {
String s = tabString(tab);
- s += "<SelectOnExplicitConstructorCall:"/*nonNLS*/;
+ s += "<SelectOnExplicitConstructorCall:";
if (qualification != null)
- s = s + qualification.toStringExpression() + "."/*nonNLS*/;
+ s = s + qualification.toStringExpression() + ".";
if (accessMode == This) {
- s = s + "this("/*nonNLS*/;
+ s = s + "this(";
} else {
- s = s + "super("/*nonNLS*/;
+ s = s + "super(";
}
if (arguments != null) {
for (int i = 0; i < arguments.length; i++) {
s += arguments[i].toStringExpression();
if (i != arguments.length - 1) {
- s += ", "/*nonNLS*/;
+ s += ", ";
}
};
}
- s += ")>"/*nonNLS*/;
+ s += ")>";
return s;
}
}
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnFieldReference.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnFieldReference.java
index 47688f76cd..26036440a4 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnFieldReference.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnFieldReference.java
@@ -41,8 +41,8 @@ public TypeBinding resolveType(BlockScope scope) {
public String toStringExpression(){
/* slow code */
- return "<SelectionOnFieldReference:"/*nonNLS*/
+ return "<SelectionOnFieldReference:"
+ super.toStringExpression()
- + ">"/*nonNLS*/;
+ + ">";
}
}
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnImportReference.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnImportReference.java
index fa29b317c8..0d3ff03cfc 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnImportReference.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnImportReference.java
@@ -33,14 +33,14 @@ public SelectionOnImportReference(char[][] tokens , long[] positions) {
public String toString(int tab, boolean withOnDemand) {
StringBuffer buffer = new StringBuffer(tabString(tab));
- buffer. append("<SelectOnImport:"/*nonNLS*/);
+ buffer. append("<SelectOnImport:");
for (int i = 0; i < tokens.length; i++) {
buffer.append(tokens[i]);
if (i < (tokens.length - 1)) {
- buffer.append("."/*nonNLS*/);
+ buffer.append(".");
}
}
- buffer.append(">"/*nonNLS*/);
+ buffer.append(">");
return buffer.toString();
}
}
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnMessageSend.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnMessageSend.java
index 262dfdb5ce..305b8afa7b 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnMessageSend.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnMessageSend.java
@@ -38,19 +38,19 @@ public TypeBinding resolveType(BlockScope scope) {
public String toStringExpression() {
/*slow code*/
- String s = "<SelectOnMessageSend:"/*nonNLS*/;
+ String s = "<SelectOnMessageSend:";
if (receiver != ThisReference.ThisImplicit)
- s = s + receiver.toStringExpression() + "."/*nonNLS*/;
- s = s + new String(selector) + "("/*nonNLS*/;
+ s = s + receiver.toStringExpression() + ".";
+ s = s + new String(selector) + "(";
if (arguments != null) {
for (int i = 0; i < arguments.length; i++) {
s += arguments[i].toStringExpression();
if (i != arguments.length - 1) {
- s += ", "/*nonNLS*/;
+ s += ", ";
}
};
}
- s = s + ")>"/*nonNLS*/;
+ s = s + ")>";
return s;
}
}
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnPackageReference.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnPackageReference.java
index 58460d3e5f..be94bb9ff7 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnPackageReference.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnPackageReference.java
@@ -31,14 +31,14 @@ public SelectionOnPackageReference(char[][] tokens , long[] positions) {
}
public String toString(int tab, boolean withOnDemand) {
StringBuffer buffer = new StringBuffer(tabString(tab));
- buffer. append("<SelectOnPackage:"/*nonNLS*/);
+ buffer. append("<SelectOnPackage:");
for (int i = 0; i < tokens.length; i++) {
buffer.append(tokens[i]);
if (i < (tokens.length - 1)) {
- buffer.append("."/*nonNLS*/);
+ buffer.append(".");
}
}
- buffer.append(">"/*nonNLS*/);
+ buffer.append(">");
return buffer.toString();
}
}
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnQualifiedAllocationExpression.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnQualifiedAllocationExpression.java
index f590a7deb5..c64ebaf21c 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnQualifiedAllocationExpression.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnQualifiedAllocationExpression.java
@@ -57,8 +57,8 @@ public TypeBinding resolveType(BlockScope scope) {
public String toStringExpression(int tab) {
return
((this.enclosingInstance == null) ?
- "<SelectOnAllocationExpression:"/*nonNLS*/ :
- "<SelectOnQualifiedAllocationExpression:"/*nonNLS*/) +
- super.toStringExpression(tab) + ">"/*nonNLS*/;
+ "<SelectOnAllocationExpression:" :
+ "<SelectOnQualifiedAllocationExpression:") +
+ super.toStringExpression(tab) + ">";
}
}
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnQualifiedNameReference.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnQualifiedNameReference.java
index d6cd44f1c4..5f6827cd17 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnQualifiedNameReference.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnQualifiedNameReference.java
@@ -56,13 +56,13 @@ public TypeBinding resolveType(BlockScope scope) {
}
public String toStringExpression() {
- StringBuffer buffer = new StringBuffer("<SelectOnName:"/*nonNLS*/);
+ StringBuffer buffer = new StringBuffer("<SelectOnName:");
for (int i = 0, length = tokens.length; i < length; i++) {
buffer.append(tokens[i]);
if (i != length - 1)
- buffer.append("."/*nonNLS*/);
+ buffer.append(".");
}
- buffer.append(">"/*nonNLS*/);
+ buffer.append(">");
return buffer.toString();
}
}
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnQualifiedSuperReference.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnQualifiedSuperReference.java
index d4c9138e16..ac6db1e5f4 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnQualifiedSuperReference.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnQualifiedSuperReference.java
@@ -45,9 +45,9 @@ public TypeBinding resolveType(BlockScope scope) {
}
public String toStringExpression(){
- StringBuffer buffer = new StringBuffer("<SelectOnQualifiedSuper:"/*nonNLS*/);
+ StringBuffer buffer = new StringBuffer("<SelectOnQualifiedSuper:");
buffer.append(super.toStringExpression());
- buffer.append(">"/*nonNLS*/);
+ buffer.append(">");
return buffer.toString();
}
}
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnQualifiedTypeReference.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnQualifiedTypeReference.java
index fb94e29376..c0a29d7385 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnQualifiedTypeReference.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnQualifiedTypeReference.java
@@ -42,13 +42,13 @@ public TypeBinding getTypeBinding(Scope scope) {
public String toStringExpression(int tab) {
StringBuffer buffer = new StringBuffer();
- buffer.append("<SelectOnType:"/*nonNLS*/);
+ buffer.append("<SelectOnType:");
for (int i = 0, length = tokens.length; i < length; i++) {
buffer.append(tokens[i]);
if (i != length - 1)
- buffer.append("."/*nonNLS*/);
+ buffer.append(".");
}
- buffer.append(">"/*nonNLS*/);
+ buffer.append(">");
return buffer.toString();
}
}
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnSingleNameReference.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnSingleNameReference.java
index f79a4f6970..fa3736a50b 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnSingleNameReference.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnSingleNameReference.java
@@ -47,6 +47,6 @@ public TypeBinding resolveType(BlockScope scope) {
throw new SelectionNodeFound(binding);
}
public String toStringExpression() {
- return "<SelectOnName:"/*nonNLS*/ + super.toStringExpression() + ">"/*nonNLS*/;
+ return "<SelectOnName:" + super.toStringExpression() + ">";
}
}
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnSingleTypeReference.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnSingleTypeReference.java
index 25632914df..15003e6b8f 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnSingleTypeReference.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnSingleTypeReference.java
@@ -46,6 +46,6 @@ public TypeBinding resolveTypeEnclosing(BlockScope scope, ReferenceBinding enclo
}
public String toStringExpression(int tab){
- return "<SelectOnType:"/*nonNLS*/ + new String(token) + ">"/*nonNLS*/ ;
+ return "<SelectOnType:" + new String(token) + ">" ;
}
}
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnSuperReference.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnSuperReference.java
index ea6450a647..5d63cd829c 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnSuperReference.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionOnSuperReference.java
@@ -46,7 +46,7 @@ public TypeBinding resolveType(BlockScope scope) {
}
public String toStringExpression(){
- return "<SelectOnSuper:"/*nonNLS*/+super.toStringExpression()+">"/*nonNLS*/;
+ return "<SelectOnSuper:"+super.toStringExpression()+">";
}
}
diff --git a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionParser.java b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionParser.java
index 2752e8d5e5..897cae79ac 100644
--- a/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionParser.java
+++ b/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionParser.java
@@ -30,7 +30,7 @@ public class SelectionParser extends AssistParser {
public int selectionStart, selectionEnd;
public AstNode selectionNode;
- public static final char[] SUPER = "super"/*nonNLS*/.toCharArray();
+ public static final char[] SUPER = "super".toCharArray();
public SelectionParser(ProblemReporter problemReporter) {
super(problemReporter);
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ClassFile.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ClassFile.java
index 8b5b98adf8..8813f818df 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ClassFile.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ClassFile.java
@@ -519,7 +519,7 @@ public void addProblemClinit(IProblem[] problems) {
int codeAttributeOffset = contentsOffset;
generateCodeAttributeHeader();
codeStream.resetForProblemClinit(this);
- String problemString = ""/*nonNLS*/;
+ String problemString = "";
if (problems != null) {
int max = problems.length;
StringBuffer buffer = new StringBuffer(25);
@@ -527,7 +527,7 @@ public void addProblemClinit(IProblem[] problems) {
for (int i = 0; i < max; i++) {
IProblem problem = problems[i];
if ((problem != null) && (problem.isError())) {
- buffer.append("\t"/*nonNLS*/ + problem.getMessage() + "\n"/*nonNLS*/);
+ buffer.append("\t" + problem.getMessage() + "\n");
count++;
if (problemLine == 0) {
problemLine = problem.getSourceLineNumber();
@@ -536,9 +536,9 @@ public void addProblemClinit(IProblem[] problems) {
}
} // insert the top line afterwards, once knowing how many problems we have to consider
if (count > 1) {
- buffer.insert(0, Util.bind("compilation.unresolvedProblems"/*nonNLS*/));
+ buffer.insert(0, "Unresolved compilation problems: \n");
} else {
- buffer.insert(0, Util.bind("compilation.unresolvedProblem"/*nonNLS*/));
+ buffer.insert(0, "Unresolved compilation problem: \n");
}
problemString = buffer.toString();
}
@@ -581,7 +581,7 @@ public void addProblemConstructor(
generateCodeAttributeHeader();
final ProblemReporter problemReporter = method.scope.problemReporter();
codeStream.reset(method, this);
- String problemString = ""/*nonNLS*/;
+ String problemString = "";
if (problems != null) {
int max = problems.length;
StringBuffer buffer = new StringBuffer(25);
@@ -589,7 +589,7 @@ public void addProblemConstructor(
for (int i = 0; i < max; i++) {
IProblem problem = problems[i];
if ((problem != null) && (problem.isError())) {
- buffer.append("\t"/*nonNLS*/ + problem.getMessage() + "\n"/*nonNLS*/);
+ buffer.append("\t" + problem.getMessage() + "\n");
count++;
if (problemLine == 0) {
problemLine = problem.getSourceLineNumber();
@@ -597,9 +597,9 @@ public void addProblemConstructor(
}
} // insert the top line afterwards, once knowing how many problems we have to consider
if (count > 1) {
- buffer.insert(0, Util.bind("compilation.unresolvedProblems"/*nonNLS*/));
+ buffer.insert(0, "Unresolved compilation problems: \n");
} else {
- buffer.insert(0, Util.bind("compilation.unresolvedProblem"/*nonNLS*/));
+ buffer.insert(0, "Unresolved compilation problem: \n");
}
problemString = buffer.toString();
}
@@ -710,7 +710,7 @@ public void addProblemMethod(
generateCodeAttributeHeader();
final ProblemReporter problemReporter = method.scope.problemReporter();
codeStream.reset(method, this);
- String problemString = ""/*nonNLS*/;
+ String problemString = "";
if (problems != null) {
int max = problems.length;
StringBuffer buffer = new StringBuffer(25);
@@ -721,7 +721,7 @@ public void addProblemMethod(
&& (problem.isError())
&& (problem.getSourceStart() >= method.declarationSourceStart)
&& (problem.getSourceEnd() <= method.declarationSourceEnd)) {
- buffer.append("\t"/*nonNLS*/ + problem.getMessage() + "\n"/*nonNLS*/);
+ buffer.append("\t" + problem.getMessage() + "\n");
count++;
if (problemLine == 0) {
problemLine = problem.getSourceLineNumber();
@@ -730,9 +730,9 @@ public void addProblemMethod(
}
} // insert the top line afterwards, once knowing how many problems we have to consider
if (count > 1) {
- buffer.insert(0, Util.bind("compilation.unresolvedProblems"/*nonNLS*/));
+ buffer.insert(0, "Unresolved compilation problems: \n");
} else {
- buffer.insert(0, Util.bind("compilation.unresolvedProblem"/*nonNLS*/));
+ buffer.insert(0, "Unresolved compilation problem: \n");
}
problemString = buffer.toString();
}
@@ -958,14 +958,14 @@ public static String buildAllDirectoriesInto(String outputPath, String relativeF
f = new File(outputPath);
if (f.exists()) {
if (!f.isDirectory()) {
- System.out.println(Util.bind("output.isFile"/*nonNLS*/,f.getAbsolutePath()));
- throw new IOException(Util.bind("output.isFileNotDirectory"/*nonNLS*/));
+ System.out.println(" The outDir is a file = " + f.getAbsolutePath());
+ throw new IOException("The outDir is a file not a directory.");
}
} else {
// we have to create that directory
if (!f.mkdirs()) {
- System.out.println(Util.bind("output.dirName"/*nonNLS*/,f.getAbsolutePath()));
- throw new IOException(Util.bind("output.notValidAll"/*nonNLS*/));
+ System.out.println(" The output dir name is = " + f.getAbsolutePath());
+ throw new IOException("The outDir is not a valid directory name. All the directories cannot be created.");
}
}
StringBuffer outDir = new StringBuffer(outputPath);
@@ -980,8 +980,8 @@ public static String buildAllDirectoriesInto(String outputPath, String relativeF
} else {
// Need to add the outDir
if (!f.mkdir()) {
- System.out.println(Util.bind("output.fileName"/*nonNLS*/,f.getName()));
- throw new IOException(Util.bind("output.notValid"/*nonNLS*/));
+ System.out.println(" file name = " + f.getName());
+ throw new IOException("The outDir is not a valid directory name. The directory cannot be created.");
}
}
token = tokenizer.nextToken();
@@ -1203,7 +1203,7 @@ public void completeCodeAttribute(int codeAttributeOffset) {
if (startPC != endPC) { // only entries for non zero length
int currentLength;
if (endPC == -1) {
- localVariable.declaringScope.problemReporter().abortDueToInternalError(Util.bind("abort.invalidAttribute"/*nonNLS*/,new String(localVariable.name)), (AstNode) localVariable.declaringScope.methodScope().referenceContext);
+ localVariable.declaringScope.problemReporter().abortDueToInternalError("SANITY CHECK: Invalid attribute for local variable " + new String(localVariable.name), (AstNode) localVariable.declaringScope.methodScope().referenceContext);
}
if (localContentsOffset + 10 >= (contentsLength = localContents.length)) {
System.arraycopy(contents, 0, (localContents = contents = new byte[contentsLength + INCREMENT_SIZE]), 0, contentsLength);
@@ -1407,7 +1407,7 @@ public void completeCodeAttributeForClinit(int codeAttributeOffset) {
if (startPC != endPC) { // only entries for non zero length
int currentLength;
if (endPC == -1) {
- localVariable.declaringScope.problemReporter().abortDueToInternalError(Util.bind("abort.invalidAttribute"/*nonNLS*/,new String(localVariable.name)), (AstNode) localVariable.declaringScope.methodScope().referenceContext);
+ localVariable.declaringScope.problemReporter().abortDueToInternalError("SANITY CHECK: Invalid attribute for local variable " + new String(localVariable.name), (AstNode) localVariable.declaringScope.methodScope().referenceContext);
}
if (localContentsOffset + 10 >= (contentsLength = localContents.length)) {
System.arraycopy(contents, 0, (localContents = contents = new byte[contentsLength + INCREMENT_SIZE]), 0, contentsLength);
@@ -1878,7 +1878,7 @@ public void completeCodeAttributeForSyntheticAccessMethod(SyntheticAccessMethodB
if (startPC != endPC) { // only entries for non zero length
int currentLength;
if (endPC == -1) {
- localVariable.declaringScope.problemReporter().abortDueToInternalError(Util.bind("abort.invalidAttribute"/*nonNLS*/,new String(localVariable.name)), (AstNode) localVariable.declaringScope.methodScope().referenceContext);
+ localVariable.declaringScope.problemReporter().abortDueToInternalError("SANITY CHECK: Invalid attribute for local variable " + new String(localVariable.name), (AstNode) localVariable.declaringScope.methodScope().referenceContext);
}
if (localContentsOffset + 10 > (contentsLength = contents.length)) {
System.arraycopy(contents, 0, (contents = new byte[contentsLength + INCREMENT_SIZE]), 0, contentsLength);
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/Compiler.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/Compiler.java
index f7cf45edfe..2506e791d9 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/Compiler.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/Compiler.java
@@ -112,7 +112,13 @@ public void accept(ICompilationUnit sourceUnit) {
}
if (options.verbose) {
- System.out.println(Util.bind("compilation.request"/*nonNLS*/,new String[]{String.valueOf(totalUnits + 1),String.valueOf(totalUnits + 1),new String(sourceUnit.getFileName())}));
+ System.out.println(
+ "request "
+ + (totalUnits + 1)
+ + "/"
+ + (totalUnits + 1)
+ + " : "
+ + new String(sourceUnit.getFileName()));
}
// initial type binding creation
@@ -136,7 +142,12 @@ public void accept(ICompilationUnit sourceUnit) {
*/
public void accept(ISourceType sourceType, PackageBinding packageBinding) {
- problemReporter.abortDueToInternalError(Util.bind("abort.againstSourceModel "/*nonNLS*/,String.valueOf(sourceType.getName()),String.valueOf(sourceType.getFileName())));
+ problemReporter.abortDueToInternalError(
+ new StringBuffer("Cannot compile against source model ")
+ .append(sourceType.getName())
+ .append(" issued from ")
+ .append(sourceType.getFileName())
+ .toString());
}
protected void addCompilationUnit(ICompilationUnit sourceUnit, CompilationUnitDeclaration parsedUnit) {
@@ -166,7 +177,7 @@ protected void beginToCompile(ICompilationUnit[] sourceUnits) {
else
{ parsedUnit = parser.dietParse(sourceUnits[i], unitResult);}
if (options.verbose) {
- System.out.println(Util.bind("compilation.request"/*nonNLS*/,new String[]{String.valueOf(i+1),String.valueOf(maxUnits),new String(sourceUnits[i].getFileName())}));
+ System.out.println("request " + (i+1) + "/" + maxUnits + " : " + new String(sourceUnits[i].getFileName()));
}
// initial type binding creation
lookupEnvironment.buildTypeBindings(parsedUnit);
@@ -198,13 +209,13 @@ public void compile(ICompilationUnit[] sourceUnits) {
for (; i < totalUnits; i++) {
unit = unitsToProcess[i];
try {
- if (options.verbose) System.out.println(Util.bind("compilation.process"/*nonNLS*/,new String[]{String.valueOf(i + 1),String.valueOf(totalUnits),new String(unitsToProcess[i].getFileName())}));
+ if (options.verbose) System.out.println( "process " + (i + 1) + "/" + totalUnits + " : " + new String(unitsToProcess[i].getFileName()));
process(unit, i);
} finally {
// cleanup compilation unit result
unit.cleanUp();
if (options.verbose)
- System.out.println(Util.bind("compilation.done"/*nonNLS*/,new String[]{String.valueOf(i + 1),String.valueOf(totalUnits),new String(unitsToProcess[i].getFileName())}));
+ System.out.println("done " + (i + 1) + "/" + totalUnits + " : " + new String(unitsToProcess[i].getFileName()));
}
unitsToProcess[i] = null; // release reference to processed unit declaration
requestor.acceptResult(unit.compilationResult.tagAsAccepted());
@@ -222,9 +233,9 @@ public void compile(ICompilationUnit[] sourceUnits) {
}
if (options.verbose) {
if (totalUnits > 1) {
- System.out.println(Util.bind("compilation.units"/*nonNLS*/,String.valueOf(totalUnits)));
+ System.out.println(totalUnits + " units compiled");
} else {
- System.out.println(Util.bind("compilation.unit"/*nonNLS*/,String.valueOf(totalUnits)));
+ System.out.println(totalUnits + " unit compiled");
}
}
}
@@ -281,7 +292,7 @@ protected void handleInternalException(Throwable internalException, CompilationU
problemReporter.createProblem(
result.getFileName(),
ProblemIrritants.UnclassifiedProblem,
- new String[] {Util.bind("compilation.internalError"/*nonNLS*/)+"\n"/*nonNLS*/ + buffer.toString()},
+ new String[] {"Internal compiler error\n" + buffer.toString()},
Error, // severity
0, // source start
0, // source end
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ConfigurableOption.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ConfigurableOption.java
index 6a88d97064..32a3e9c3fe 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ConfigurableOption.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ConfigurableOption.java
@@ -44,34 +44,34 @@ public ConfigurableOption(
ResourceBundle resource = null;
try {
String location = componentName.substring(0, componentName.lastIndexOf('.'));
- resource = ResourceBundle.getBundle(location + ".Options"/*nonNLS*/, loc);
+ resource = ResourceBundle.getBundle(location + ".Options", loc);
} catch (MissingResourceException e) {
- category = "Missing ressources entries for"/*nonNLS*/ + componentName + " options"/*nonNLS*/;
- name = "Missing ressources entries for"/*nonNLS*/ + componentName + " options"/*nonNLS*/;
- description = "Missing ressources entries for"/*nonNLS*/ + componentName + " options"/*nonNLS*/;
+ category = "Missing ressources entries for" + componentName + " options";
+ name = "Missing ressources entries for" + componentName + " options";
+ description = "Missing ressources entries for" + componentName + " options";
possibleValues = new String[0];
id = -1;
}
if (resource == null) return;
try {
- id = Integer.parseInt(resource.getString(optionName + ".number"/*nonNLS*/));
+ id = Integer.parseInt(resource.getString(optionName + ".number"));
} catch (MissingResourceException e) {
id = -1;
} catch (NumberFormatException e) {
id = -1;
}
try {
- category = resource.getString(optionName + ".category"/*nonNLS*/);
+ category = resource.getString(optionName + ".category");
} catch (MissingResourceException e) {
- category = "Missing ressources entries for"/*nonNLS*/ + componentName + " options"/*nonNLS*/;
+ category = "Missing ressources entries for" + componentName + " options";
}
try {
- name = resource.getString(optionName + ".name"/*nonNLS*/);
+ name = resource.getString(optionName + ".name");
} catch (MissingResourceException e) {
- name = "Missing ressources entries for"/*nonNLS*/ + componentName + " options"/*nonNLS*/;
+ name = "Missing ressources entries for" + componentName + " options";
}
try {
- StringTokenizer tokenizer = new StringTokenizer(resource.getString(optionName + ".possibleValues"/*nonNLS*/), "|"/*nonNLS*/);
+ StringTokenizer tokenizer = new StringTokenizer(resource.getString(optionName + ".possibleValues"), "|");
int numberOfValues = Integer.parseInt(tokenizer.nextToken());
if(numberOfValues == -1){
possibleValues = NoDiscreteValue;
@@ -91,9 +91,9 @@ public ConfigurableOption(
possibleValues = new String[0];
}
try {
- description = resource.getString(optionName + ".description"/*nonNLS*/);
+ description = resource.getString(optionName + ".description");
} catch (MissingResourceException e) {
- description = "Missing ressources entries for"/*nonNLS*/ + componentName + " options"/*nonNLS*/;
+ description = "Missing ressources entries for" + componentName + " options";
}
}
/**
@@ -182,31 +182,31 @@ public void setValueIndex(int newIndex) {
}
public String toString() {
StringBuffer buffer = new StringBuffer();
- buffer.append("Configurable option for "/*nonNLS*/);
- buffer.append(this.componentName).append("\n"/*nonNLS*/);
- buffer.append("- category: "/*nonNLS*/).append(this.category).append("\n"/*nonNLS*/);
- buffer.append("- name: "/*nonNLS*/).append(this.name).append("\n"/*nonNLS*/);
+ buffer.append("Configurable option for ");
+ buffer.append(this.componentName).append("\n");
+ buffer.append("- category: ").append(this.category).append("\n");
+ buffer.append("- name: ").append(this.name).append("\n");
/* display current value */
- buffer.append("- current value: "/*nonNLS*/);
+ buffer.append("- current value: ");
if (possibleValues == NoDiscreteValue){
buffer.append(this.currentValueIndex);
} else {
buffer.append(this.possibleValues[this.currentValueIndex]);
}
- buffer.append("\n"/*nonNLS*/);
+ buffer.append("\n");
/* display possible values */
if (possibleValues != NoDiscreteValue){
- buffer.append("- possible values: ["/*nonNLS*/);
+ buffer.append("- possible values: [");
for (int i = 0, max = possibleValues.length; i < max; i++) {
if (i != 0)
- buffer.append(", "/*nonNLS*/);
+ buffer.append(", ");
buffer.append(possibleValues[i]);
}
- buffer.append("]\n"/*nonNLS*/);
- buffer.append("- curr. val. index: "/*nonNLS*/).append(currentValueIndex).append("\n"/*nonNLS*/);
+ buffer.append("]\n");
+ buffer.append("- curr. val. index: ").append(currentValueIndex).append("\n");
}
- buffer.append("- description: "/*nonNLS*/).append(description).append("\n"/*nonNLS*/);
+ buffer.append("- description: ").append(description).append("\n");
return buffer.toString();
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/DefaultErrorHandlingPolicies.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/DefaultErrorHandlingPolicies.java
index 70e19d2e9e..a6c8de81d3 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/DefaultErrorHandlingPolicies.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/DefaultErrorHandlingPolicies.java
@@ -1,14 +1,5 @@
package org.eclipse.jdt.internal.compiler;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.problem.ProblemHandler;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
public class DefaultErrorHandlingPolicies {
/*
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/DocumentElementParser.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/DocumentElementParser.java
index d49cd5c942..9fac6fe6ca 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/DocumentElementParser.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/DocumentElementParser.java
@@ -1259,7 +1259,7 @@ private char[] returnTypeName(TypeReference type) {
}
public String toString() {
StringBuffer buffer = new StringBuffer();
- buffer.append("intArrayPtr = "/*nonNLS*/ + intArrayPtr + "\n"/*nonNLS*/);
+ buffer.append("intArrayPtr = " + intArrayPtr + "\n");
buffer.append(super.toString());
return buffer.toString();
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/HierarchyResolver.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/HierarchyResolver.java
index 0ff225f614..c4dc2b6462 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/HierarchyResolver.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/HierarchyResolver.java
@@ -70,9 +70,9 @@ public void accept(IBinaryType binaryType, PackageBinding packageBinding) {
*/
public void accept(ICompilationUnit sourceUnit) {
- //System.out.println("Cannot accept compilation units inside the HierarchyResolver.");
+ System.out.println("Cannot accept compilation units inside the HierarchyResolver.");
lookupEnvironment.problemReporter.abortDueToInternalError(
- new StringBuffer(Util.bind("accept.cannot"/*nonNLS*/))
+ new StringBuffer("Cannot accept the compilation unit: ")
.append(sourceUnit.getFileName())
.toString());
}
@@ -275,8 +275,6 @@ public void resolve(IGenericType[] suppliedTypes, ICompilationUnit[] sourceUnits
lookupEnvironment.completeTypeBindings(units[i], false);
reportHierarchy();
-
- } catch (ClassCastException e){ // work-around for 1GF5W1S - can happen in case duplicates are fed to the hierarchy with binaries hiding sources
} catch (AbortCompilation e) { // ignore this exception for now since it typically means we cannot find java.lang.Object
} finally {
reset();
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ICompilerRequestor.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ICompilerRequestor.java
index 5790ba3f2b..f5475b15d7 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ICompilerRequestor.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ICompilerRequestor.java
@@ -1,13 +1,5 @@
package org.eclipse.jdt.internal.compiler;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.Compiler;
-/**
- * A callback interface for receiving compilation results.
- */
public interface ICompilerRequestor {
/**
* Accept a compilation result.
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/IErrorHandlingPolicy.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/IErrorHandlingPolicy.java
index 96ed4b975b..9cbd6e9c77 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/IErrorHandlingPolicy.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/IErrorHandlingPolicy.java
@@ -1,21 +1,4 @@
package org.eclipse.jdt.internal.compiler;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.problem.ProblemHandler;
-
-/*
- * Handler policy is responsible to answer the 2 following
- * questions:
- * 1. should the handler stop on first problem which appears
- * to be a real error (i.e. not a warning),
- * 2. should it proceed once it has gathered all problems
- *
- * The intent is that one can supply its own policy to implement
- * some interactive error handling strategy where some UI would
- * display problems and ask user if he wants to proceed or not.
- */
public interface IErrorHandlingPolicy {
boolean proceedOnErrors();
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/IProblem.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/IProblem.java
index b67f0fe115..61df1500e8 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/IProblem.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/IProblem.java
@@ -1,21 +1,4 @@
package org.eclipse.jdt.internal.compiler;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.problem.ProblemHandler;
-
-/*
- * Handler policy is responsible to answer the 2 following
- * questions:
- * 1. should the handler stop on first problem which appears
- * to be a real error (i.e. not a warning),
- * 2. should it proceed once it has gathered all problems
- *
- * The intent is that one can supply its own policy to implement
- * some interactive error handling strategy where some UI would
- * display problems and ask user if he wants to proceed or not.
- */
public interface IProblem {
final int Error = 1; // when bit is set: problem is error, if not it is a warning
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/SourceElementParser.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/SourceElementParser.java
index 45290561eb..878bd4cd9a 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/SourceElementParser.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/SourceElementParser.java
@@ -42,7 +42,7 @@ public class SourceElementParser extends Parser {
private char[][] typeNames;
private char[][] superTypeNames;
private int nestedTypeIndex;
- private static final char[] JAVA_LANG_OBJECT = "java.lang.Object"/*nonNLS*/.toCharArray();
+ private static final char[] JAVA_LANG_OBJECT = "java.lang.Object".toCharArray();
public SourceElementParser(
final ISourceElementRequestor requestor,
IProblemFactory problemFactory) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AbstractMethodDeclaration.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AbstractMethodDeclaration.java
index 14e6800dc2..f0e876d1a2 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AbstractMethodDeclaration.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AbstractMethodDeclaration.java
@@ -29,7 +29,7 @@ public abstract class AbstractMethodDeclaration extends AstNode implements Probl
public boolean ignoreFurtherInvestigation = false;
public boolean needFreeReturn = false;
public LocalVariableBinding secretReturnValue;
- static final char[] SecretLocalDeclarationName = " returnValue"/*nonNLS*/.toCharArray();
+ static final char[] SecretLocalDeclarationName = " returnValue".toCharArray();
public int bodyStart;
public int bodyEnd = -1;
@@ -249,7 +249,7 @@ public void resolve(ClassScope upperScope) {
public String returnTypeToString(int tab) {
/*slow code */
- return ""/*nonNLS*/;
+ return "";
}
public void tagAsHavingErrors() {
ignoreFurtherInvestigation = true;
@@ -264,21 +264,21 @@ public String toString(int tab) {
s += returnTypeToString(0);
- s += new String(selector) + "("/*nonNLS*/;
+ s += new String(selector) + "(";
if (arguments != null) {
for (int i = 0; i < arguments.length; i++) {
s += arguments[i].toString(0);
if (i != (arguments.length - 1))
- s = s + ", "/*nonNLS*/;
+ s = s + ", ";
};
};
- s += ")"/*nonNLS*/;
+ s += ")";
if (thrownExceptions != null) {
- s += " throws "/*nonNLS*/;
+ s += " throws ";
for (int i = 0; i < thrownExceptions.length; i++) {
s += thrownExceptions[i].toString(0);
if (i != (thrownExceptions.length - 1))
- s = s + ", "/*nonNLS*/;
+ s = s + ", ";
};
};
@@ -289,18 +289,18 @@ public String toString(int tab) {
public String toStringStatements(int tab) {
/* slow code */
- if (isAbstract() || (this.modifiers & AccSemicolonBody) != 0) return ";"/*nonNLS*/;
+ if (isAbstract() || (this.modifiers & AccSemicolonBody) != 0) return ";";
- String s = " {"/*nonNLS*/;
+ String s = " {";
if (statements != null) {
for (int i = 0; i < statements.length; i++){
- s = s + "\n"/*nonNLS*/ + statements[i].toString(tab);
+ s = s + "\n" + statements[i].toString(tab);
if (!(statements[i] instanceof Block)){
- s += ";"/*nonNLS*/;
+ s += ";";
}
}
}
- s += "\n"/*nonNLS*/ + tabString(tab == 0 ? 0 : tab - 1) + "}"/*nonNLS*/;
+ s += "\n" + tabString(tab == 0 ? 0 : tab - 1) + "}";
return s;
}
public void traverse(IAbstractSyntaxTreeVisitor visitor, ClassScope classScope) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AbstractVariableDeclaration.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AbstractVariableDeclaration.java
index 853943111d..4eaa8f0f13 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AbstractVariableDeclaration.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AbstractVariableDeclaration.java
@@ -21,7 +21,7 @@ public abstract class AbstractVariableDeclaration extends Statement {
public AbstractVariableDeclaration(){}
public String name(){
- return "anonymous storage box"/*nonNLS*/; }
+ return "anonymous storage box"; }
public String toString(int tab) {
/*slow code*/
@@ -29,9 +29,9 @@ public String toString(int tab) {
if (modifiers != AccDefault) {
s += modifiersString(modifiers);
}
- s += type.toString(0) + " "/*nonNLS*/ + new String(name());
+ s += type.toString(0) + " " + new String(name());
if (initialization != null)
- s += " = "/*nonNLS*/ + initialization.toStringExpression(tab);
+ s += " = " + initialization.toStringExpression(tab);
return s;
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java
index 6b1a523840..ca24c4b415 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java
@@ -139,21 +139,21 @@ public TypeBinding resolveType(BlockScope scope) {
if ((argumentTypes[i] = arguments[i].resolveType(scope)) == null)
argHasError = true;
if (argHasError)
- return typeBinding;
+ return null;
}
if (typeBinding == null)
return null;
if (!typeBinding.canBeInstantiated()) {
scope.problemReporter().cannotInstantiate(type, typeBinding);
- return typeBinding;
+ return null;
}
ReferenceBinding allocatedType = (ReferenceBinding) typeBinding;
if (!(binding = scope.getConstructor(allocatedType, argumentTypes, this)).isValidBinding()) {
if (binding.declaringClass == null)
binding.declaringClass = allocatedType;
scope.problemReporter().invalidConstructor(this, binding);
- return typeBinding;
+ return null;
}
if (isMethodUseDeprecated(binding, scope))
scope.problemReporter().deprecatedMethod(binding, this);
@@ -172,17 +172,17 @@ public void setFieldIndex(int i) {
public String toStringExpression() {
/* slow code */
- String s = "new "/*nonNLS*/ + type.toString(0);
+ String s = "new " + type.toString(0);
if (arguments == null)
- s = s + "()"/*nonNLS*/ ;
+ s = s + "()" ;
else
- { s = s + "("/*nonNLS*/;
+ { s = s + "(";
for (int i = 0 ; i < arguments.length ; i++)
{ s = s + arguments[i].toStringExpression();
if (i == (arguments.length-1))
- s = s + ")"/*nonNLS*/ ;
+ s = s + ")" ;
else
- s = s + ", "/*nonNLS*/; };};
+ s = s + ", "; };};
return s ;}
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope scope) {
if (visitor.visit(this, scope)) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AnonymousLocalTypeDeclaration.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AnonymousLocalTypeDeclaration.java
index aaa8ee66b5..52b1450e37 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AnonymousLocalTypeDeclaration.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AnonymousLocalTypeDeclaration.java
@@ -23,7 +23,7 @@ public MethodBinding createsInternalConstructorWithBinding(MethodBinding inherit
//Add to method'set, the default constuctor that just recall the
//super constructor with the same arguments
- String baseName = "$anonymous"/*nonNLS*/;
+ String baseName = "$anonymous";
TypeBinding[] argumentTypes = inheritedConstructorBinding.parameters;
int argumentsLength = argumentTypes.length;
//the constructor
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Argument.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Argument.java
index 0b3a7cb5ec..a18b8ae301 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Argument.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Argument.java
@@ -42,14 +42,14 @@ public TypeBinding resolveForCatch(BlockScope scope) {
public String toString(int tab){
/* slow code */
- String s = ""/*nonNLS*/;
+ String s = "";
if (modifiers != AccDefault){
s += modifiersString(modifiers);
}
if (type == null){
- s += "<no type> "/*nonNLS*/;
+ s += "<no type> ";
} else {
- s += type.toString(tab) + " "/*nonNLS*/;
+ s += type.toString(tab) + " ";
}
s += new String(name);
return s;
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ArrayAllocationExpression.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ArrayAllocationExpression.java
index d50691d755..fab10057d7 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ArrayAllocationExpression.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ArrayAllocationExpression.java
@@ -134,12 +134,12 @@ public TypeBinding resolveType(BlockScope scope) {
public String toStringExpression() {
/* slow code */
- String s = "new "/*nonNLS*/ + type.toString(0);
+ String s = "new " + type.toString(0);
for (int i = 0 ; i < dimensions.length ; i++)
{ if (dimensions[i] == null)
- s = s + "[]"/*nonNLS*/;
+ s = s + "[]";
else
- s = s + "["/*nonNLS*/ + dimensions[i].toStringExpression() + "]"/*nonNLS*/ ;}
+ s = s + "[" + dimensions[i].toStringExpression() + "]" ;}
if (initializer != null)
s = s + initializer.toStringExpression();
return s;}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ArrayInitializer.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ArrayInitializer.java
index 3a24fb11e2..4081696360 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ArrayInitializer.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ArrayInitializer.java
@@ -139,15 +139,15 @@ public TypeBinding resolveTypeExpecting(BlockScope scope, TypeBinding expectedTb
public String toStringExpression() {
/* slow code */
- String s = "{"/*nonNLS*/ ;
+ String s = "{" ;
if (expressions != null)
{ int j = 20 ;
for (int i = 0 ; i < expressions.length ; i++)
- { s = s + expressions[i].toStringExpression() + ","/*nonNLS*/ ;
+ { s = s + expressions[i].toStringExpression() + "," ;
j -- ;
if (j == 0)
- { s = s + "\n "/*nonNLS*/; j = 20;}}};
- s = s + "}"/*nonNLS*/;
+ { s = s + "\n "; j = 20;}}};
+ s = s + "}";
return s;}
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope scope) {
if (visitor.visit(this, scope)) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ArrayQualifiedTypeReference.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ArrayQualifiedTypeReference.java
index 7553690e6a..b8177bb877 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ArrayQualifiedTypeReference.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ArrayQualifiedTypeReference.java
@@ -30,9 +30,9 @@ public String toStringExpression(int tab){
/* slow speed */
String s = super.toStringExpression(tab) ;
- if (dimensions == 1 ) return s + "[]"/*nonNLS*/ ;
+ if (dimensions == 1 ) return s + "[]" ;
for (int i=1 ; i <= dimensions ; i++)
- s = s + "[]"/*nonNLS*/ ;
+ s = s + "[]" ;
return s ;
}
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope scope) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ArrayReference.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ArrayReference.java
index e3491a0e32..718b857377 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ArrayReference.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ArrayReference.java
@@ -122,9 +122,9 @@ public String toStringExpression(){
/* slow code */
return receiver.toStringExpression()
- + "["/*nonNLS*/
+ + "["
+ position.toStringExpression()
- + "]"/*nonNLS*/ ;}
+ + "]" ;}
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope scope) {
if (visitor.visit(this, scope)) {
receiver.traverse(visitor, scope);
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ArrayTypeReference.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ArrayTypeReference.java
index 6776245d54..54fc252d6a 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ArrayTypeReference.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ArrayTypeReference.java
@@ -35,9 +35,9 @@ public String toStringExpression(int tab){
/* slow speed */
String s = super.toStringExpression(tab) ;
- if (dimensions == 1 ) return s + "[]"/*nonNLS*/ ;
+ if (dimensions == 1 ) return s + "[]" ;
for (int i=1 ; i <= dimensions ; i++)
- s = s + "[]"/*nonNLS*/ ;
+ s = s + "[]" ;
return s ;
}
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope scope) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Assignment.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Assignment.java
index 1d142c97ec..53cdb726a9 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Assignment.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Assignment.java
@@ -101,15 +101,15 @@ public String toStringExpression(){
//subclass redefine toStringExpressionNoParenthesis()
- return "("/*nonNLS*/ + toStringExpressionNoParenthesis() + ")"/*nonNLS*/; }
+ return "(" + toStringExpressionNoParenthesis() + ")"; }
public String toStringExpressionNoParenthesis() {
- return lhs.toStringExpression() + " "/*nonNLS*/ +
- "="/*nonNLS*/ +
+ return lhs.toStringExpression() + " " +
+ "=" +
( (expression.constant != null ) && (expression.constant != NotAConstant) ?
- " /*cst:"/*nonNLS*/+expression.constant.toString()+"*/ "/*nonNLS*/ :
- " "/*nonNLS*/ ) +
+ " /*cst:"+expression.constant.toString()+"*/ " :
+ " " ) +
expression.toStringExpression() ; }
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope scope) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AstNode.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AstNode.java
index c7ce48f89f..b3ec1adc5e 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AstNode.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AstNode.java
@@ -63,27 +63,27 @@ public final boolean isTypeUseDeprecated(TypeBinding type, Scope scope) {
}
public static String modifiersString(int modifiers) {
- String s = ""/*nonNLS*/;
+ String s = "";
if ((modifiers & AccPublic) != 0)
- s = s + "public "/*nonNLS*/;
+ s = s + "public ";
if ((modifiers & AccPrivate) != 0)
- s = s + "private "/*nonNLS*/;
+ s = s + "private ";
if ((modifiers & AccProtected) != 0)
- s = s + "protected "/*nonNLS*/;
+ s = s + "protected ";
if ((modifiers & AccStatic) != 0)
- s = s + "static "/*nonNLS*/;
+ s = s + "static ";
if ((modifiers & AccFinal) != 0)
- s = s + "final "/*nonNLS*/;
+ s = s + "final ";
if ((modifiers & AccSynchronized) != 0)
- s = s + "synchronized "/*nonNLS*/;
+ s = s + "synchronized ";
if ((modifiers & AccVolatile) != 0)
- s = s + "volatile "/*nonNLS*/;
+ s = s + "volatile ";
if ((modifiers & AccTransient) != 0)
- s = s + "transient "/*nonNLS*/;
+ s = s + "transient ";
if ((modifiers & AccNative) != 0)
- s = s + "native "/*nonNLS*/;
+ s = s + "native ";
if ((modifiers & AccAbstract) != 0)
- s = s + "abstract "/*nonNLS*/;
+ s = s + "abstract ";
return s;
}
/** @Deprecated
@@ -97,8 +97,8 @@ public int sourceStart() {
public static String tabString(int tab){
/*slow code*/
- String s = ""/*nonNLS*/ ;
- for (int i = tab ; i > 0 ; i--) s = s + " "/*nonNLS*/ ;
+ String s = "" ;
+ for (int i = tab ; i > 0 ; i--) s = s + " " ;
return s;}
public String toString() {
/* low speed */
@@ -109,7 +109,7 @@ public String toString(int tab){
/* low speed */
/*If reach here fetchs the default display*/
- return "****"/*nonNLS*/+ super.toString()+ "****"/*nonNLS*/;}
+ return "****"+ super.toString()+ "****";}
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope scope){
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/BinaryExpression.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/BinaryExpression.java
index c3d772b0a0..72eea3155a 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/BinaryExpression.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/BinaryExpression.java
@@ -1402,8 +1402,8 @@ public TypeBinding resolveType(BlockScope scope) {
public String toStringExpressionNoParenthesis(){
/* slow code*/
- return left.toStringExpression() + " "/*nonNLS*/ +
- operatorToString() + " "/*nonNLS*/ +
+ return left.toStringExpression() + " " +
+ operatorToString() + " " +
right.toStringExpression() ; }
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope scope) {
if (visitor.visit(this, scope)) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Block.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Block.java
index 2443f2b4a4..e104220851 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Block.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Block.java
@@ -86,9 +86,9 @@ public String toString(int tab) {
String s = tabString(tab);
if (this.statements == null) {
- s += "{\n"/*nonNLS*/;
+ s += "{\n";
s += tabString(tab);
- s += "}"/*nonNLS*/;
+ s += "}";
return s;
}
@@ -96,22 +96,22 @@ public String toString(int tab) {
// ? " { // ---scope needed for "+String.valueOf(explicitDeclarations) +" locals------------ \n"
// : "{// ---NO scope needed------ \n") ;
- s += "{\n"/*nonNLS*/;
+ s += "{\n";
s += this.toStringStatements(tab);
s += tabString(tab);
- s += "}"/*nonNLS*/;
+ s += "}";
return s;
}
public String toStringStatements(int tab) {
/* slow code */
- if (this.statements == null) return ""/*nonNLS*/;
+ if (this.statements == null) return "";
StringBuffer buffer = new StringBuffer();
for (int i = 0; i < statements.length; i++) {
buffer.append(statements[i].toString(tab + 1));
if (statements[i] instanceof Block){
- buffer.append("\n"/*nonNLS*/);
+ buffer.append("\n");
} else {
- buffer.append(";\n"/*nonNLS*/);
+ buffer.append(";\n");
}
};
return buffer.toString();
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Break.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Break.java
index 1a1786e129..ceefd20c40 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Break.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Break.java
@@ -65,7 +65,7 @@ public String toString(int tab){
/* slow code */
String s = tabString(tab) ;
- s = s + "break "/*nonNLS*/;
+ s = s + "break ";
if (label != null )
s = s + new String(label) ;
return s;
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Case.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Case.java
index fadea5a860..a1c03511f0 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Case.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Case.java
@@ -68,7 +68,7 @@ public String toString(int tab){
/* slow code */
String s = tabString(tab);
- s = s + "case "/*nonNLS*/ + constantExpression.toStringExpression() + " : "/*nonNLS*/ ;
+ s = s + "case " + constantExpression.toStringExpression() + " : " ;
return s;}
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope blockScope) {
if (visitor.visit(this, blockScope)) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/CastExpression.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/CastExpression.java
index 6ceaa8d0f0..7c9db66590 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/CastExpression.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/CastExpression.java
@@ -234,7 +234,7 @@ public TypeBinding resolveType(BlockScope scope) {
public String toStringExpression(){
/*slow code*/
- return "("/*nonNLS*/ + type.toString(0)+ ") "/*nonNLS*/ +
+ return "(" + type.toString(0)+ ") " +
expression.toStringExpression() ; }
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope blockScope) {
if (visitor.visit(this, blockScope)) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ClassLiteralAccess.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ClassLiteralAccess.java
index 45214460a9..5f53863a25 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ClassLiteralAccess.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ClassLiteralAccess.java
@@ -59,8 +59,8 @@ public TypeBinding resolveType(BlockScope scope) {
public String toStringExpression(){
/*slow code*/
- String s = ""/*nonNLS*/;
- s = s + type.toString(0) + ".class"/*nonNLS*/ ;
+ String s = "";
+ s = s + type.toString(0) + ".class" ;
return s;}
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope blockScope) {
if (visitor.visit(this, blockScope)) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Clinit.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Clinit.java
index a8ff9eca58..0d41febfb3 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Clinit.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Clinit.java
@@ -14,7 +14,7 @@ import org.eclipse.jdt.internal.compiler.parser.*;
import org.eclipse.jdt.internal.compiler.problem.*;
public class Clinit extends AbstractMethodDeclaration {
- public final static char[] ConstantPoolName = "<clinit>"/*nonNLS*/.toCharArray();
+ public final static char[] ConstantPoolName = "<clinit>".toCharArray();
public Clinit() {
modifiers = 0;
selector = ConstantPoolName;
@@ -137,9 +137,9 @@ public void resolve(ClassScope scope) {
public String toString(int tab){
/* slow code */
- String s = ""/*nonNLS*/ ;
+ String s = "" ;
s = s + tabString(tab);
- s = s + "<clinit>()"/*nonNLS*/ ;
+ s = s + "<clinit>()" ;
s = s + toStringStatements(tab + 1);
return s ;}
public void traverse(IAbstractSyntaxTreeVisitor visitor, ClassScope classScope) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/CompilationUnitDeclaration.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/CompilationUnitDeclaration.java
index 5fe113fec4..8f281d85ce 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/CompilationUnitDeclaration.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/CompilationUnitDeclaration.java
@@ -197,18 +197,18 @@ public void tagAsHavingErrors(){
public String toString(int tab) {
/*very slow code*/
- String s = ""/*nonNLS*/;
+ String s = "";
if (currentPackage != null)
- s = tabString(tab) + "package "/*nonNLS*/ + currentPackage.toString(0, false) + ";\n"/*nonNLS*/;
+ s = tabString(tab) + "package " + currentPackage.toString(0, false) + ";\n";
if (imports != null)
for (int i = 0; i < imports.length; i++) {
- s += tabString(tab) + "import "/*nonNLS*/ + imports[i].toString() + ";\n"/*nonNLS*/;
+ s += tabString(tab) + "import " + imports[i].toString() + ";\n";
};
if (types != null)
for (int i = 0; i < types.length; i++) {
- s += types[i].toString(tab) + "\n"/*nonNLS*/;
+ s += types[i].toString(tab) + "\n";
}
return s;
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/CompoundAssignment.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/CompoundAssignment.java
index 8f3df73445..1d359f06df 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/CompoundAssignment.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/CompoundAssignment.java
@@ -48,29 +48,29 @@ public void generateCode(BlockScope currentScope, CodeStream codeStream, boolean
public String operatorToString() {
switch (operator) {
case PLUS :
- return "+="/*nonNLS*/;
+ return "+=";
case MINUS :
- return "-="/*nonNLS*/;
+ return "-=";
case MULTIPLY :
- return "*="/*nonNLS*/;
+ return "*=";
case DIVIDE :
- return "/="/*nonNLS*/;
+ return "/=";
case AND :
- return "&="/*nonNLS*/;
+ return "&=";
case OR :
- return "|="/*nonNLS*/;
+ return "|=";
case XOR :
- return "^="/*nonNLS*/;
+ return "^=";
case REMAINDER :
- return "%="/*nonNLS*/;
+ return "%=";
case LEFT_SHIFT :
- return "<<="/*nonNLS*/;
+ return "<<=";
case RIGHT_SHIFT :
- return ">>="/*nonNLS*/;
+ return ">>=";
case UNSIGNED_RIGHT_SHIFT :
- return ">>>="/*nonNLS*/;
+ return ">>>=";
};
- return "unknown operator"/*nonNLS*/;
+ return "unknown operator";
}
public TypeBinding resolveType(BlockScope scope) {
constant = NotAConstant;
@@ -119,8 +119,8 @@ public boolean restrainUsageToNumericTypes(){
return false ;}
public String toStringExpressionNoParenthesis() {
- return lhs.toStringExpression() + " "/*nonNLS*/ +
- operatorToString() + " "/*nonNLS*/ +
+ return lhs.toStringExpression() + " " +
+ operatorToString() + " " +
expression.toStringExpression() ; }
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope scope) {
if (visitor.visit(this, scope)) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ConditionalExpression.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ConditionalExpression.java
index da05963bcf..05e9d3c6db 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ConditionalExpression.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ConditionalExpression.java
@@ -26,18 +26,17 @@ public ConditionalExpression(Expression condition, Expression valueIfTrue, Expre
sourceEnd = valueIfFalse.sourceEnd;
}
public FlowInfo analyseCode(BlockScope currentScope, FlowContext flowContext, FlowInfo flowInfo) {
- Constant inlinedCondition = condition.constant;
- if (inlinedCondition == NotAConstant) inlinedCondition = condition.conditionalConstant();
- if (inlinedCondition != NotAConstant) {
- if (inlinedCondition.booleanValue() == true) {
+ Constant inlinedCondition;
+ if ((inlinedCondition = condition.constant) != NotAConstant) {
+ if (inlinedCondition.booleanValue()) {
FlowInfo resultInfo = valueIfTrue.analyseCode(currentScope, flowContext, flowInfo);
// analyse valueIfFalse, but do not take into account any of its infos
- valueIfFalse.analyseCode(currentScope, flowContext, flowInfo.copy().markAsFakeReachable(true));
+ valueIfFalse.analyseCode(currentScope, flowContext, flowInfo.copy());
mergedInitStateIndex = currentScope.methodScope().recordInitializationStates(resultInfo);
return resultInfo;
} else {
// analyse valueIfTrue, but do not take into account any of its infos
- valueIfTrue.analyseCode(currentScope, flowContext, flowInfo.copy().markAsFakeReachable(true));
+ valueIfTrue.analyseCode(currentScope, flowContext, flowInfo.copy());
FlowInfo mergeInfo = valueIfFalse.analyseCode(currentScope, flowContext, flowInfo);
mergedInitStateIndex = currentScope.methodScope().recordInitializationStates(mergeInfo);
return mergeInfo;
@@ -254,8 +253,8 @@ public TypeBinding resolveType(BlockScope scope) {
public String toStringExpressionNoParenthesis(){
/* slow code*/
- return condition.toStringExpression() + " ? "/*nonNLS*/ +
- valueIfTrue.toStringExpression() + " : "/*nonNLS*/ +
+ return condition.toStringExpression() + " ? " +
+ valueIfTrue.toStringExpression() + " : " +
valueIfFalse.toStringExpression() ; }
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope scope) {
if (visitor.visit(this, scope)) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ConstructorDeclaration.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ConstructorDeclaration.java
index 78f87850fa..e67902bf15 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ConstructorDeclaration.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ConstructorDeclaration.java
@@ -15,7 +15,7 @@ import org.eclipse.jdt.internal.compiler.util.*;
public class ConstructorDeclaration extends AbstractMethodDeclaration {
public ExplicitConstructorCall constructorCall;
- public final static char[] ConstantPoolName = "<init>"/*nonNLS*/.toCharArray();
+ public final static char[] ConstantPoolName = "<init>".toCharArray();
public boolean isDefaultConstructor = false;
public int referenceCount = 0; // count how many times this constructor is referenced from other local constructors
@@ -257,19 +257,19 @@ public void resolve(ClassScope upperScope) {
public String toStringStatements(int tab) {
/* slow code */
- String s = " {"/*nonNLS*/;
+ String s = " {";
if (constructorCall != null) {
- s = s + "\n"/*nonNLS*/ + constructorCall.toString(tab) + ";"/*nonNLS*/;
+ s = s + "\n" + constructorCall.toString(tab) + ";";
}
if (statements != null){
for (int i = 0; i < statements.length; i++){
- s = s + "\n"/*nonNLS*/ + statements[i].toString(tab);
+ s = s + "\n" + statements[i].toString(tab);
if (!(statements[i] instanceof Block)){
- s += ";"/*nonNLS*/;
+ s += ";";
}
}
}
- s+="\n"/*nonNLS*/+tabString(tab == 0 ? 0 : tab - 1)+"}"/*nonNLS*/;
+ s+="\n"+tabString(tab == 0 ? 0 : tab - 1)+"}";
return s;
}
public void traverse(IAbstractSyntaxTreeVisitor visitor, ClassScope classScope) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Continue.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Continue.java
index 56b5dd7d4d..8ab51b8d04 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Continue.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Continue.java
@@ -69,7 +69,7 @@ public String toString(int tab){
/* slow code */
String s = tabString(tab) ;
- s = s + "continue "/*nonNLS*/;
+ s = s + "continue ";
if (label != null )
s = s + new String(label) ;
return s;
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/DefaultCase.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/DefaultCase.java
index b69135998e..d2350dbd1d 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/DefaultCase.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/DefaultCase.java
@@ -53,7 +53,7 @@ public String toString(int tab){
/* slow code */
String s = tabString(tab);
- s = s + "default : "/*nonNLS*/ ;
+ s = s + "default : " ;
return s;}
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope blockScope) {
visitor.visit(this, blockScope);
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/DoStatement.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/DoStatement.java
index f69a0badde..2332f56e8f 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/DoStatement.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/DoStatement.java
@@ -125,15 +125,15 @@ public String toString(int tab) {
String inFront, s = tabString(tab);
inFront = s;
- s = s + "do"/*nonNLS*/;
+ s = s + "do";
if (action == null)
- s = s + " {}\n"/*nonNLS*/;
+ s = s + " {}\n";
else
if (action instanceof Block)
- s = s + "\n"/*nonNLS*/ + action.toString(tab + 1) + "\n"/*nonNLS*/;
+ s = s + "\n" + action.toString(tab + 1) + "\n";
else
- s = s + " {\n"/*nonNLS*/ + action.toString(tab + 1) + ";}\n"/*nonNLS*/;
- s = s + inFront + "while ("/*nonNLS*/ + condition.toStringExpression() + ")"/*nonNLS*/;
+ s = s + " {\n" + action.toString(tab + 1) + ";}\n";
+ s = s + inFront + "while (" + condition.toStringExpression() + ")";
return s;
}
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope scope) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ExplicitConstructorCall.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ExplicitConstructorCall.java
index 8df58818df..f2f6dab3c4 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ExplicitConstructorCall.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ExplicitConstructorCall.java
@@ -168,9 +168,6 @@ public void resolve(BlockScope scope) {
// qualification should be from the type of the enclosingType
if (qualification != null) {
- if (accessMode != Super){
- scope.problemReporter().unnecessaryEnclosingInstanceSpecification(qualification, receiverType);
- }
ReferenceBinding enclosingType = receiverType.enclosingType();
if (enclosingType == null) {
scope.problemReporter().unnecessaryEnclosingInstanceSpecification(qualification, receiverType);
@@ -224,17 +221,17 @@ public String toString(int tab){
String s = tabString(tab);
if (qualification != null)
- s = s + qualification.toStringExpression() + "."/*nonNLS*/ ;
+ s = s + qualification.toStringExpression() + "." ;
if (accessMode == This){
- s = s + "this("/*nonNLS*/;
+ s = s + "this(";
} else {
- s = s + "super("/*nonNLS*/;
+ s = s + "super(";
}
if (arguments != null)
for (int i=0 ; i < arguments.length ; i++)
{ s = s + arguments[i].toStringExpression();
- if (i != arguments.length-1) s = s + ", "/*nonNLS*/;};;
- s = s+")"/*nonNLS*/ ;
+ if (i != arguments.length-1) s = s + ", ";};;
+ s = s+")" ;
return s;}
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope scope) {
if (visitor.visit(this, scope)) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Expression.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Expression.java
index 8595400d8c..ba09480372 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Expression.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Expression.java
@@ -10,7 +10,6 @@ import org.eclipse.jdt.internal.compiler.codegen.*;
import org.eclipse.jdt.internal.compiler.flow.*;
import org.eclipse.jdt.internal.compiler.lookup.*;
import org.eclipse.jdt.internal.compiler.problem.*;
-import org.eclipse.jdt.internal.compiler.util.Util;
public abstract class Expression extends Statement {
//some expression may not be used - from a java semantic point
@@ -155,7 +154,7 @@ public void generateCode(BlockScope currentScope, CodeStream codeStream, boolean
codeStream.recordPositionsFrom(pc, this);
} else {
// actual non-constant code generation
- throw new ShouldNotImplement(Util.bind("ast.missingCode"/*nonNLS*/));
+ throw new ShouldNotImplement("Missing code gen implementation");
}
}
/**
@@ -344,7 +343,7 @@ public String toString(int tab) {
//before TC has runned
if (constant != NotAConstant)
//after the TC has runned
- s += " /*cst:"/*nonNLS*/ + constant.toString() + "*/ "/*nonNLS*/;
+ s += " /*cst:" + constant.toString() + "*/ ";
return s + toStringExpression(tab);
}
public String toStringExpression() {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ExtendedStringLiteral.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ExtendedStringLiteral.java
index be9c90d626..cce2fe00e5 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ExtendedStringLiteral.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ExtendedStringLiteral.java
@@ -46,7 +46,7 @@ public ExtendedStringLiteral extendWith(StringLiteral lit){
public String toStringExpression() {
/* slow code */
- String str = "ExtendedStringLiteral{"/*nonNLS*/+ new String(source) +"}"/*nonNLS*/;
+ String str = "ExtendedStringLiteral{"+ new String(source) +"}";
return str;
}
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope scope) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/FieldReference.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/FieldReference.java
index 144cdecf26..694ddb526d 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/FieldReference.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/FieldReference.java
@@ -365,7 +365,7 @@ public String toStringExpression(){
/* slow code */
return receiver.toString()
- + "."/*nonNLS*/
+ + "."
+ new String(token);}
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope scope) {
if (visitor.visit(this, scope)) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ForStatement.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ForStatement.java
index 37e6887305..24eff6292f 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ForStatement.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ForStatement.java
@@ -50,10 +50,11 @@ public FlowInfo analyseCode(BlockScope currentScope, FlowContext flowContext, Fl
preCondInitStateIndex = currentScope.methodScope().recordInitializationStates(flowInfo);
// process the condition
- LoopingFlowContext condLoopContext = null;
if (condition != null) {
if ((condition.constant == NotAConstant) || (condition.constant.booleanValue() != true)) {
+ LoopingFlowContext condLoopContext;
flowInfo = condition.analyseCode(scope, (condLoopContext = new LoopingFlowContext(flowContext, this, null, null, scope)), flowInfo);
+ condLoopContext.complainOnFinalAssignmentsInLoop(scope, flowInfo);
}
}
@@ -61,7 +62,6 @@ public FlowInfo analyseCode(BlockScope currentScope, FlowContext flowContext, Fl
LoopingFlowContext loopingContext;
FlowInfo actionInfo;
if ((action == null) || action.isEmptyBlock()) {
- if (condLoopContext != null) condLoopContext.complainOnFinalAssignmentsInLoop(scope, flowInfo);
if ((condition == null) || ((condition.constant != NotAConstant) && (condition.constant.booleanValue() == true))) {
return FlowInfo.DeadEnd;
} else {
@@ -80,11 +80,13 @@ public FlowInfo analyseCode(BlockScope currentScope, FlowContext flowContext, Fl
initsWhenTrue.copy());
// code generation can be optimized when no need to continue in the loop
- if (((actionInfo == FlowInfo.DeadEnd) || actionInfo.isFakeReachable())
- && ((loopingContext.initsOnContinue == FlowInfo.DeadEnd) || loopingContext.initsOnContinue.isFakeReachable())){
+ if ((actionInfo == FlowInfo.DeadEnd) || actionInfo.isFakeReachable()){
+ if ((loopingContext.initsOnContinue == FlowInfo.DeadEnd) || loopingContext.initsOnContinue.isFakeReachable()){
continueLabel = null;
+ } else {
+ loopingContext.complainOnFinalAssignmentsInLoop(scope, loopingContext.initsOnContinue);
+ }
} else {
- if (condLoopContext != null) condLoopContext.complainOnFinalAssignmentsInLoop(scope, flowInfo);
loopingContext.complainOnFinalAssignmentsInLoop(scope, actionInfo);
actionInfo = actionInfo.mergedWith(loopingContext.initsOnContinue.unconditionalInits()); // for increments
}
@@ -208,32 +210,32 @@ public void resolve(BlockScope upperScope) {
public String toString(int tab ){
/* slow code */
- String s = tabString(tab) + "for ("/*nonNLS*/;
+ String s = tabString(tab) + "for (";
if (!neededScope)
- s = s + " //--NO upperscope scope needed\n"/*nonNLS*/ + tabString(tab) + " "/*nonNLS*/ ;
+ s = s + " //--NO upperscope scope needed\n" + tabString(tab) + " " ;
//inits
if (initializations != null)
{ for (int i = 0 ; i < initializations.length ; i++){
//nice only with expressions
s = s + initializations[i].toString(0);
- if (i != (initializations.length -1)) s = s + " , "/*nonNLS*/ ;}};
- s = s + "; "/*nonNLS*/ ;
+ if (i != (initializations.length -1)) s = s + " , " ;}};
+ s = s + "; " ;
//cond
if (condition != null)
s = s + condition.toStringExpression() ;
- s = s + "; "/*nonNLS*/ ;
+ s = s + "; " ;
//updates
if (increments != null)
{ for (int i = 0 ; i < increments.length ; i++){
//nice only with expressions
s = s + increments[i].toString(0);
- if (i != (increments.length -1)) s = s + " , "/*nonNLS*/ ;}};
- s = s + ") "/*nonNLS*/ ;
+ if (i != (increments.length -1)) s = s + " , " ;}};
+ s = s + ") " ;
//block
if (action == null)
- s = s + "{}"/*nonNLS*/ ;
+ s = s + "{}" ;
else
- s = s + "\n"/*nonNLS*/+ action.toString(tab+1) ;
+ s = s + "\n"+ action.toString(tab+1) ;
return s;}
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope blockScope) {
if (visitor.visit(this, blockScope)) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/IfStatement.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/IfStatement.java
index 48a5d34051..50c2741a00 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/IfStatement.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/IfStatement.java
@@ -187,10 +187,10 @@ public String toString(int tab){
String inFront , s = tabString(tab) ;
inFront = s ;
- s = s + "if ("/*nonNLS*/+ condition.toStringExpression()+") \n"/*nonNLS*/;
- s = s + thenStatement.toString(tab+2) + ";"/*nonNLS*/ ;
+ s = s + "if ("+ condition.toStringExpression()+") \n";
+ s = s + thenStatement.toString(tab+2) + ";" ;
if (elseStatement != null)
- s = s + "\n"/*nonNLS*/ + inFront + "else\n"/*nonNLS*/ + elseStatement.toString(tab+2) + ";"/*nonNLS*/;
+ s = s + "\n" + inFront + "else\n" + elseStatement.toString(tab+2) + ";";
return s ;}
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope blockScope) {
if (visitor.visit(this, blockScope)) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ImportReference.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ImportReference.java
index af82fee206..0114957072 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ImportReference.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ImportReference.java
@@ -38,11 +38,11 @@ public String toString(int tab, boolean withOnDemand) {
for (int i = 0; i < tokens.length; i++) {
buffer.append(tokens[i]);
if (i < (tokens.length - 1)) {
- buffer.append("."/*nonNLS*/);
+ buffer.append(".");
}
}
if (withOnDemand && onDemand) {
- buffer.append(".*"/*nonNLS*/);
+ buffer.append(".*");
}
return buffer.toString();
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Initializer.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Initializer.java
index b796c10281..0f27528a14 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Initializer.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Initializer.java
@@ -72,10 +72,10 @@ public String toString(int tab){
StringBuffer buffer = new StringBuffer();
buffer.append(tabString(tab));
buffer.append(modifiersString(modifiers));
- buffer.append("{\n"/*nonNLS*/);
+ buffer.append("{\n");
buffer.append(block.toStringStatements(tab));
buffer.append(tabString(tab));
- buffer.append("}"/*nonNLS*/);
+ buffer.append("}");
return buffer.toString();
} else {
return block.toString(tab);
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/InstanceOfExpression.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/InstanceOfExpression.java
index fbf019b34f..ec16729f2a 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/InstanceOfExpression.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/InstanceOfExpression.java
@@ -199,7 +199,8 @@ public TypeBinding resolveType(BlockScope scope) {
public String toStringExpressionNoParenthesis(){
/* slow code*/
- return expression.toStringExpression() + " instanceof "/*nonNLS*/ +
+ if (((bits & OperatorMASK) >> OperatorSHIFT) != INSTANCEOF ) return "houps instanceof houps" ;
+ return expression.toStringExpression() + " instanceof " +
type.toString(0) ; }
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope scope) {
if (visitor.visit(this, scope)) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/LabeledStatement.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/LabeledStatement.java
index 436ded9dda..f94c515565 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/LabeledStatement.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/LabeledStatement.java
@@ -77,7 +77,7 @@ public String toString(int tab) {
/* slow code */
String s = tabString(tab);
- s += new String(label) + ": "/*nonNLS*/ + statement.toString(0);
+ s += new String(label) + ": " + statement.toString(0);
return s;
}
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope blockScope) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/MagicLiteral.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/MagicLiteral.java
index 6c063d0209..c615ce036a 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/MagicLiteral.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/MagicLiteral.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.ast;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public abstract class MagicLiteral extends Literal {
public MagicLiteral(int s , int e) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/MessageSend.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/MessageSend.java
index 656ea2a984..683e9d0477 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/MessageSend.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/MessageSend.java
@@ -239,15 +239,15 @@ public void setFieldIndex(int depth) {
public String toStringExpression(){
/*slow code*/
- String s = ""/*nonNLS*/;
+ String s = "";
if (receiver != ThisReference.ThisImplicit)
- s = s + receiver.toStringExpression()+"."/*nonNLS*/;
- s = s + new String(selector) + "("/*nonNLS*/ ;
+ s = s + receiver.toStringExpression()+".";
+ s = s + new String(selector) + "(" ;
if (arguments != null)
for (int i = 0; i < arguments.length ; i ++)
{ s = s + arguments[i].toStringExpression();
- if ( i != arguments.length -1 ) s = s + " , "/*nonNLS*/ ;};;
- s =s + ")"/*nonNLS*/ ;
+ if ( i != arguments.length -1 ) s = s + " , " ;};;
+ s =s + ")" ;
return s;}
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope blockScope) {
if (visitor.visit(this, blockScope)) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/MethodDeclaration.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/MethodDeclaration.java
index 4fa13ebda7..c1a161d132 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/MethodDeclaration.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/MethodDeclaration.java
@@ -70,8 +70,8 @@ public String returnTypeToString(int tab) {
/*slow code */
if (returnType == null)
- return ""/*nonNLS*/;
- return returnType.toString(tab)+" "/*nonNLS*/;
+ return "";
+ return returnType.toString(tab)+" ";
}
public void traverse(IAbstractSyntaxTreeVisitor visitor, ClassScope classScope) {
if (visitor.visit(this, classScope)) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/NumberLiteral.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/NumberLiteral.java
index b995f827de..65c8d8c51b 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/NumberLiteral.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/NumberLiteral.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.ast;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public abstract class NumberLiteral extends Literal {
char[] source;
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/OperatorExpression.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/OperatorExpression.java
index 2b674f691d..029b843496 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/OperatorExpression.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/OperatorExpression.java
@@ -53,80 +53,80 @@ public static final String generateTableTestCase(){
class Decode {
public final String constant(int code){
switch(code){
- case T_boolean : return "true"/*nonNLS*/ ;
- case T_byte : return "((byte) 3)"/*nonNLS*/ ;
- case T_char : return "'A'"/*nonNLS*/ ;
- case T_double : return "300.0d"/*nonNLS*/ ;
- case T_float : return "100.0f"/*nonNLS*/ ;
- case T_int : return "1"/*nonNLS*/ ;
- case T_long : return "7L"/*nonNLS*/ ;
- case T_String : return "\"hello-world\""/*nonNLS*/ ;
- case T_null : return "null"/*nonNLS*/;
- case T_short : return "((short) 5)"/*nonNLS*/;
- case T_Object : return "null"/*nonNLS*/;}
- return ""/*nonNLS*/;}
+ case T_boolean : return "true" ;
+ case T_byte : return "((byte) 3)" ;
+ case T_char : return "'A'" ;
+ case T_double : return "300.0d" ;
+ case T_float : return "100.0f" ;
+ case T_int : return "1" ;
+ case T_long : return "7L" ;
+ case T_String : return "\"hello-world\"" ;
+ case T_null : return "null";
+ case T_short : return "((short) 5)";
+ case T_Object : return "null";}
+ return "";}
public final String type(int code){
switch(code){
- case T_boolean : return "z"/*nonNLS*/ ;
- case T_byte : return "b"/*nonNLS*/ ;
- case T_char : return "c"/*nonNLS*/ ;
- case T_double : return "d"/*nonNLS*/ ;
- case T_float : return "f"/*nonNLS*/ ;
- case T_int : return "i"/*nonNLS*/ ;
- case T_long : return "l"/*nonNLS*/ ;
- case T_String : return "str"/*nonNLS*/ ;
- case T_null : return "null"/*nonNLS*/;
- case T_short : return "s"/*nonNLS*/;
- case T_Object : return "obj"/*nonNLS*/;}
- return "xxx"/*nonNLS*/;}
+ case T_boolean : return "z" ;
+ case T_byte : return "b" ;
+ case T_char : return "c" ;
+ case T_double : return "d" ;
+ case T_float : return "f" ;
+ case T_int : return "i" ;
+ case T_long : return "l" ;
+ case T_String : return "str" ;
+ case T_null : return "null";
+ case T_short : return "s";
+ case T_Object : return "obj";}
+ return "xxx";}
public final String operator(int operator){
switch (operator) {
- case EQUAL_EQUAL : return "=="/*nonNLS*/;
- case LESS_EQUAL : return "<="/*nonNLS*/;
- case GREATER_EQUAL :return ">="/*nonNLS*/;
- case LEFT_SHIFT : return "<<"/*nonNLS*/;
- case RIGHT_SHIFT : return ">>"/*nonNLS*/;
- case UNSIGNED_RIGHT_SHIFT : return ">>>"/*nonNLS*/;
- case OR_OR :return "||"/*nonNLS*/;
- case AND_AND : return "&&"/*nonNLS*/;
- case PLUS : return "+"/*nonNLS*/;
- case MINUS : return "-"/*nonNLS*/;
- case NOT : return "!"/*nonNLS*/;
- case REMAINDER : return "%"/*nonNLS*/;
- case XOR : return "^"/*nonNLS*/;
- case AND : return "&"/*nonNLS*/;
- case MULTIPLY : return "*"/*nonNLS*/;
- case OR : return "|"/*nonNLS*/;
- case TWIDDLE : return "~"/*nonNLS*/;
- case DIVIDE : return "/"/*nonNLS*/;
- case GREATER : return ">"/*nonNLS*/;
- case LESS : return "<"/*nonNLS*/; };
- return "????"/*nonNLS*/;}
+ case EQUAL_EQUAL : return "==";
+ case LESS_EQUAL : return "<=";
+ case GREATER_EQUAL :return ">=";
+ case LEFT_SHIFT : return "<<";
+ case RIGHT_SHIFT : return ">>";
+ case UNSIGNED_RIGHT_SHIFT : return ">>>";
+ case OR_OR :return "||";
+ case AND_AND : return "&&";
+ case PLUS : return "+";
+ case MINUS : return "-";
+ case NOT : return "!";
+ case REMAINDER : return "%";
+ case XOR : return "^";
+ case AND : return "&";
+ case MULTIPLY : return "*";
+ case OR : return "|";
+ case TWIDDLE : return "~";
+ case DIVIDE : return "/";
+ case GREATER : return ">";
+ case LESS : return "<"; };
+ return "????";}
}
Decode decode = new Decode();
String s ;
- s = "\tpublic static void binaryOperationTablesTestCase(){\n"/*nonNLS*/ +
+ s = "\tpublic static void binaryOperationTablesTestCase(){\n" +
- "\t\t//TC test : all binary operation (described in tables)\n"/*nonNLS*/+
- "\t\t//method automatically generated by\n"/*nonNLS*/+
- "\t\t//org.eclipse.jdt.internal.compiler.ast.OperatorExpression.generateTableTestCase();\n"/*nonNLS*/+
+ "\t\t//TC test : all binary operation (described in tables)\n"+
+ "\t\t//method automatically generated by\n"+
+ "\t\t//org.eclipse.jdt.internal.compiler.ast.OperatorExpression.generateTableTestCase();\n"+
- "\t\tString str0 ;\t String str\t= "/*nonNLS*/+decode.constant(T_String)+";\n"/*nonNLS*/+
- "\t\tint i0 ;\t int i\t= "/*nonNLS*/+decode.constant(T_int)+" ;\n"/*nonNLS*/+
- "\t\tboolean z0;\t boolean z\t= "/*nonNLS*/+decode.constant(T_boolean)+";\n"/*nonNLS*/+
- "\t\tchar c0; \t char c\t= "/*nonNLS*/+decode.constant(T_char)+" ;\n"/*nonNLS*/+
- "\t\tfloat f0; \t float f\t= "/*nonNLS*/+decode.constant(T_float)+" ;\n"/*nonNLS*/+
- "\t\tdouble d0;\t double d\t= "/*nonNLS*/+decode.constant(T_double)+" ;\n"/*nonNLS*/+
- "\t\tbyte b0; \t byte b\t= "/*nonNLS*/+decode.constant(T_byte)+";\n"/*nonNLS*/+
- "\t\tshort s0; \t short s\t= "/*nonNLS*/+decode.constant(T_short)+";\n"/*nonNLS*/+
- "\t\tlong l0; \t long l\t= "/*nonNLS*/+decode.constant(T_long)+" ;\n"/*nonNLS*/+
- "\t\tObject obj0; \t Object obj\t= "/*nonNLS*/+decode.constant(T_Object)+" ;\n"/*nonNLS*/+
+ "\t\tString str0 ;\t String str\t= "+decode.constant(T_String)+";\n"+
+ "\t\tint i0 ;\t int i\t= "+decode.constant(T_int)+" ;\n"+
+ "\t\tboolean z0;\t boolean z\t= "+decode.constant(T_boolean)+";\n"+
+ "\t\tchar c0; \t char c\t= "+decode.constant(T_char)+" ;\n"+
+ "\t\tfloat f0; \t float f\t= "+decode.constant(T_float)+" ;\n"+
+ "\t\tdouble d0;\t double d\t= "+decode.constant(T_double)+" ;\n"+
+ "\t\tbyte b0; \t byte b\t= "+decode.constant(T_byte)+";\n"+
+ "\t\tshort s0; \t short s\t= "+decode.constant(T_short)+";\n"+
+ "\t\tlong l0; \t long l\t= "+decode.constant(T_long)+" ;\n"+
+ "\t\tObject obj0; \t Object obj\t= "+decode.constant(T_Object)+" ;\n"+
- "\n"/*nonNLS*/;
+ "\n";
int error = 0;
for (int i=0; i < operators.length ; i++)
@@ -142,19 +142,19 @@ public static final String generateTableTestCase(){
// if ( z0 != (((short) 5) >= ((short) 5)))
// System.out.println(155);
- { s += "\t\t"/*nonNLS*/+decode.type(result)+"0"/*nonNLS*/+" = "/*nonNLS*/+decode.type(left);
- s += " "/*nonNLS*/+decode.operator(operator)+" "/*nonNLS*/+decode.type(right)+";\n"/*nonNLS*/;
- String begin = result == T_String ? "\t\tif (! "/*nonNLS*/ : "\t\tif ( "/*nonNLS*/;
- String test = result == T_String ? ".equals("/*nonNLS*/ : " != ("/*nonNLS*/ ;
- s += begin +decode.type(result)+"0"/*nonNLS*/+test
- +decode.constant(left)+" "/*nonNLS*/
- +decode.operator(operator)+" "/*nonNLS*/
- +decode.constant(right)+"))\n"/*nonNLS*/;
- s += "\t\t\tSystem.out.println("/*nonNLS*/+ (++error) +");\n"/*nonNLS*/;
+ { s += "\t\t"+decode.type(result)+"0"+" = "+decode.type(left);
+ s += " "+decode.operator(operator)+" "+decode.type(right)+";\n";
+ String begin = result == T_String ? "\t\tif (! " : "\t\tif ( ";
+ String test = result == T_String ? ".equals(" : " != (" ;
+ s += begin +decode.type(result)+"0"+test
+ +decode.constant(left)+" "
+ +decode.operator(operator)+" "
+ +decode.constant(right)+"))\n";
+ s += "\t\t\tSystem.out.println("+ (++error) +");\n";
}}}
- return s += "\n\t\tSystem.out.println(\"binary tables test : done\");}"/*nonNLS*/ ;
+ return s += "\n\t\tSystem.out.println(\"binary tables test : done\");}" ;
}
public static final int[] get_AND(){
@@ -1539,62 +1539,61 @@ public static final int[] get_XOR(){
public String operatorToString() {
switch ((bits & OperatorMASK) >> OperatorSHIFT) {
case EQUAL_EQUAL :
- return "=="/*nonNLS*/;
+ return "==";
case LESS_EQUAL :
- return "<="/*nonNLS*/;
+ return "<=";
case GREATER_EQUAL :
- return ">="/*nonNLS*/;
+ return ">=";
case NOT_EQUAL :
- return "!="/*nonNLS*/;
+ return "!=";
case LEFT_SHIFT :
- return "<<"/*nonNLS*/;
+ return "<<";
case RIGHT_SHIFT :
- return ">>"/*nonNLS*/;
+ return ">>";
case UNSIGNED_RIGHT_SHIFT :
- return ">>>"/*nonNLS*/;
+ return ">>>";
case OR_OR :
- return "||"/*nonNLS*/;
+ return "||";
case AND_AND :
- return "&&"/*nonNLS*/;
+ return "&&";
case PLUS :
- return "+"/*nonNLS*/;
+ return "+";
case MINUS :
- return "-"/*nonNLS*/;
+ return "-";
case NOT :
- return "!"/*nonNLS*/;
+ return "!";
case REMAINDER :
- return "%"/*nonNLS*/;
+ return "%";
case XOR :
- return "^"/*nonNLS*/;
+ return "^";
case AND :
- return "&"/*nonNLS*/;
+ return "&";
case MULTIPLY :
- return "*"/*nonNLS*/;
+ return "*";
case OR :
- return "|"/*nonNLS*/;
+ return "|";
case TWIDDLE :
- return "~"/*nonNLS*/;
+ return "~";
case DIVIDE :
- return "/"/*nonNLS*/;
+ return "/";
case GREATER :
- return ">"/*nonNLS*/;
+ return ">";
case LESS :
- return "<"/*nonNLS*/;
+ return "<";
case QUESTIONCOLON :
- return "?:"/*nonNLS*/;
+ return "?:";
case EQUAL :
- return "="/*nonNLS*/;
+ return "=";
};
- return "unknown operator"/*nonNLS*/;
+ return "unknown operator";
}
public String toStringExpression(){
/* slow code*/
//subclass redefine toStringExpressionNoParenthesis()
- return "("/*nonNLS*/ + toStringExpressionNoParenthesis() + ")"/*nonNLS*/;
-}
-
-public abstract String toStringExpressionNoParenthesis();
-
+ return "(" + toStringExpressionNoParenthesis() + ")"; }
+public String toStringExpressionNoParenthesis(){
+
+ return "...houps...";}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/OperatorIds.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/OperatorIds.java
index c4ca1cca3b..77dcb2f9d1 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/OperatorIds.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/OperatorIds.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.ast;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public interface OperatorIds {
public static final int AND_AND = 0;
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/PostfixExpression.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/PostfixExpression.java
index 008c712c44..5d93416016 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/PostfixExpression.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/PostfixExpression.java
@@ -39,17 +39,17 @@ public void generateCode(BlockScope currentScope, CodeStream codeStream, boolean
public String operatorToString() {
switch (operator) {
case PLUS :
- return "++"/*nonNLS*/;
+ return "++";
case MINUS :
- return "--"/*nonNLS*/;}
- return "unknown operator"/*nonNLS*/;
+ return "--";}
+ return "unknown operator";
}
public boolean restrainUsageToNumericTypes(){
return true ;}
public String toStringExpressionNoParenthesis(){
/* slow code*/
- return lhs.toStringExpression() + " "/*nonNLS*/ + operatorToString(); }
+ return lhs.toStringExpression() + " " + operatorToString(); }
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope scope) {
if (visitor.visit(this, scope)) {
lhs.traverse(visitor, scope);
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/PrefixExpression.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/PrefixExpression.java
index 7912487957..cd46fca5aa 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/PrefixExpression.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/PrefixExpression.java
@@ -23,17 +23,17 @@ public PrefixExpression(Expression l, Expression e, int op, int pos) {
public String operatorToString() {
switch (operator) {
case PLUS :
- return "++"/*nonNLS*/;
+ return "++";
case MINUS :
- return "--"/*nonNLS*/;}
- return "unknown operator"/*nonNLS*/;
+ return "--";}
+ return "unknown operator";
}
public boolean restrainUsageToNumericTypes(){
return true ;}
public String toStringExpressionNoParenthesis(){
/* slow code */
- return operatorToString() + " "/*nonNLS*/ + lhs.toStringExpression() ;
+ return operatorToString() + " " + lhs.toStringExpression() ;
}
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope scope) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedAllocationExpression.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedAllocationExpression.java
index fc7d922aea..ab5640cc31 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedAllocationExpression.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedAllocationExpression.java
@@ -148,13 +148,13 @@ public TypeBinding resolveType(BlockScope scope) {
if ((argumentTypes[i] = arguments[i].resolveType(scope)) == null)
argHasError = true;
if (argHasError)
- return recType;
+ return null;
}
if (recType == null)
return null;
if (!recType.canBeInstantiated()) {
scope.problemReporter().cannotInstantiate(type, recType);
- return recType;
+ return null;
}
if ((binding = scope.getConstructor((ReferenceBinding) recType, argumentTypes, this)).isValidBinding()) {
if (isMethodUseDeprecated(binding, scope))
@@ -167,7 +167,7 @@ public TypeBinding resolveType(BlockScope scope) {
if (binding.declaringClass == null)
binding.declaringClass = (ReferenceBinding) recType;
scope.problemReporter().invalidConstructor(this, binding);
- return recType;
+ return null;
}
// The enclosing instance must be compatible with the innermost enclosing type
@@ -175,7 +175,7 @@ public TypeBinding resolveType(BlockScope scope) {
if (scope.areTypesCompatible(enclosingInstTb, expectedType))
return recType;
scope.problemReporter().typeMismatchErrorActualTypeExpectedType(enclosingInstance, enclosingInstTb, expectedType);
- return recType;
+ return null;
}
//--------------there is an anonymous type declaration-----------------
@@ -238,9 +238,9 @@ public TypeBinding resolveType(BlockScope scope) {
public String toStringExpression(int tab) {
/*slow code */
- String s = ""/*nonNLS*/;
+ String s = "";
if (enclosingInstance != null)
- s += enclosingInstance.toString() + "."/*nonNLS*/;
+ s += enclosingInstance.toString() + ".";
s += super.toStringExpression(tab);
if (anonymousType != null) {
s += anonymousType.toString(tab);
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedNameReference.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedNameReference.java
index 9114662b63..8236ae3a2a 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedNameReference.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedNameReference.java
@@ -597,7 +597,7 @@ public String toStringExpression() {
for (int i = 0; i < tokens.length; i++) {
buffer.append(tokens[i]);
if (i < (tokens.length - 1)) {
- buffer.append("."/*nonNLS*/);
+ buffer.append(".");
}
}
return buffer.toString();
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedSuperReference.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedSuperReference.java
index 7b401150cc..365f0da40e 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedSuperReference.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedSuperReference.java
@@ -36,7 +36,7 @@ public TypeBinding resolveType(BlockScope scope) {
public String toStringExpression(){
/* slow code */
- return qualification.toString(0)+".super"/*nonNLS*/ ;
+ return qualification.toString(0)+".super" ;
}
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope blockScope) {
if (visitor.visit(this, blockScope)) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedThisReference.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedThisReference.java
index 45987d18c2..9a3c5fdc47 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedThisReference.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedThisReference.java
@@ -119,7 +119,7 @@ public TypeBinding resolveType(BlockScope scope) {
public String toStringExpression(){
/* slow code */
- return qualification.toString(0)+".this"/*nonNLS*/ ;
+ return qualification.toString(0)+".this" ;
}
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope blockScope) {
if (visitor.visit(this, blockScope)) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedTypeReference.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedTypeReference.java
index cb2cccaef2..e80478fbbc 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedTypeReference.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedTypeReference.java
@@ -41,7 +41,7 @@ public String toStringExpression(int tab) {
for (int i = 0; i < tokens.length; i++) {
buffer.append(tokens[i]);
if (i < (tokens.length - 1)) {
- buffer.append("."/*nonNLS*/);
+ buffer.append(".");
}
}
return buffer.toString();
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Reference.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Reference.java
index 04a336f08d..18b1857fdc 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Reference.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Reference.java
@@ -9,7 +9,6 @@ import org.eclipse.jdt.internal.compiler.codegen.*;
import org.eclipse.jdt.internal.compiler.flow.*;
import org.eclipse.jdt.internal.compiler.lookup.*;
import org.eclipse.jdt.internal.compiler.problem.*;
-import org.eclipse.jdt.internal.compiler.util.Util;
public abstract class Reference extends Expression {
/**
@@ -19,7 +18,7 @@ public Reference() {
super();
}
public FlowInfo analyseAssignment(BlockScope currentScope, FlowContext flowContext, FlowInfo flowInfo, Assignment assignment, boolean isCompound) {
- throw new ShouldNotImplement(Util.bind("ast.variableShouldProvide"/*nonNLS*/));
+ throw new ShouldNotImplement("Assignment variable should provide an implementation for flow analysis");
}
public FlowInfo analyseCode(BlockScope currentScope, FlowContext flowContext, FlowInfo flowInfo) {
return flowInfo;
@@ -61,13 +60,13 @@ public void fieldStore(CodeStream codeStream, FieldBinding fieldBinding, MethodB
}
}
public void generateAssignment(BlockScope currentScope, CodeStream codeStream, Assignment assignment, boolean valueRequired) {
- throw new ShouldNotImplement(Util.bind("ast.compoundPreShouldProvide"/*nonNLS*/));
+ throw new ShouldNotImplement("Compound pre assignments should provide an implementation for code generation");
}
public void generateCompoundAssignment(BlockScope currentScope, CodeStream codeStream, Expression expression, int operator, int assignmentImplicitConversion, boolean valueRequired) {
- throw new ShouldNotImplement(Util.bind("ast.compoundVariableShouldProvide"/*nonNLS*/));
+ throw new ShouldNotImplement("Compound assignment variable should provide an implementation for code generation");
}
public void generatePostIncrement(BlockScope currentScope, CodeStream codeStream, CompoundAssignment postIncrement, boolean valueRequired) {
- throw new ShouldNotImplement(Util.bind("ast.postIncrShouldProvide"/*nonNLS*/));
+ throw new ShouldNotImplement("Post increment variable should provide an implementation for code generation");
}
public boolean isFieldReference() {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ReturnStatement.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ReturnStatement.java
index e76ddc84fe..8931282d5f 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ReturnStatement.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ReturnStatement.java
@@ -225,7 +225,7 @@ public String toString(int tab){
/* slow code */
String s = tabString(tab) ;
- s = s + "return "/*nonNLS*/;
+ s = s + "return ";
if (expression != null )
s = s + expression.toStringExpression() ;
return s;
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Statement.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Statement.java
index 5060063c54..f205984eae 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Statement.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Statement.java
@@ -10,7 +10,6 @@ import org.eclipse.jdt.internal.compiler.codegen.*;
import org.eclipse.jdt.internal.compiler.flow.*;
import org.eclipse.jdt.internal.compiler.lookup.*;
import org.eclipse.jdt.internal.compiler.problem.*;
-import org.eclipse.jdt.internal.compiler.util.Util;
public abstract class Statement extends AstNode {
// storage for internal flags (32 bits)
@@ -78,7 +77,7 @@ public FlowInfo analyseCode(BlockScope currentScope, FlowContext flowContext, Fl
return flowInfo;
}
public void generateCode(BlockScope currentScope, CodeStream codeStream){
- throw new ShouldNotImplement(Util.bind("ast.missingStatement"/*nonNLS*/));
+ throw new ShouldNotImplement("Missing statement code generation implementation");
}
public boolean isEmptyBlock(){
return false;
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/StringLiteral.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/StringLiteral.java
index 4f4b257b1d..e2a52ae802 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/StringLiteral.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/StringLiteral.java
@@ -57,38 +57,38 @@ public char[] source() {
public String toStringExpression() {
// handle some special char.....
- StringBuffer result = new StringBuffer("\""/*nonNLS*/);
+ StringBuffer result = new StringBuffer("\"");
for (int i = 0; i < source.length; i++) {
switch (source[i]) {
case '\b' :
- result.append("\\b"/*nonNLS*/);
+ result.append("\\b");
break;
case '\t' :
- result.append("\\t"/*nonNLS*/);
+ result.append("\\t");
break;
case '\n' :
- result.append("\\n"/*nonNLS*/);
+ result.append("\\n");
break;
case '\f' :
- result.append("\\f"/*nonNLS*/);
+ result.append("\\f");
break;
case '\r' :
- result.append("\\r"/*nonNLS*/);
+ result.append("\\r");
break;
case '\"' :
- result.append("\\\""/*nonNLS*/);
+ result.append("\\\"");
break;
case '\'' :
- result.append("\\'"/*nonNLS*/);
+ result.append("\\'");
break;
case '\\' : //take care not to display the escape as a potential real char
- result.append("\\\\"/*nonNLS*/);
+ result.append("\\\\");
break;
default :
result.append(source[i]);
}
}
- result.append("\""/*nonNLS*/);
+ result.append("\"");
return result.toString();
}
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope scope) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SuperReference.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SuperReference.java
index 83e55fe5d0..1626c1ea1a 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SuperReference.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SuperReference.java
@@ -46,7 +46,7 @@ public TypeBinding resolveType(BlockScope scope) {
}
public String toStringExpression(){
- return "super"/*nonNLS*/;
+ return "super";
}
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope blockScope) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SwitchStatement.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SwitchStatement.java
index 61c07768a4..e86ea69e14 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SwitchStatement.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SwitchStatement.java
@@ -211,41 +211,41 @@ public String toString(int tab){
String inFront , s = tabString(tab) ;
inFront = s ;
- s = s + "switch ("/*nonNLS*/ + testExpression.toStringExpression() + ") "/*nonNLS*/;
+ s = s + "switch (" + testExpression.toStringExpression() + ") ";
if (statements == null)
- { s = s + "{}"/*nonNLS*/ ;
+ { s = s + "{}" ;
return s;}
else
- s = s + "{"/*nonNLS*/;
+ s = s + "{";
s = s + (explicitDeclarations != 0
- ? "// ---scope needed for "/*nonNLS*/+String.valueOf(explicitDeclarations) +" locals------------ \n"/*nonNLS*/
- : "// ---NO scope needed------ \n"/*nonNLS*/) ;
+ ? "// ---scope needed for "+String.valueOf(explicitDeclarations) +" locals------------ \n"
+ : "// ---NO scope needed------ \n") ;
int i = 0;
- String tabulation = " "/*nonNLS*/;
+ String tabulation = " ";
try {while(true){
//use instanceof in order not to polluate classes with behavior only needed for printing purpose.
if ( statements[i] instanceof Expression)
- s = s + "\n"/*nonNLS*/ + inFront + tabulation;
+ s = s + "\n" + inFront + tabulation;
if ( statements[i] instanceof Break)
s = s + statements[i].toString(0) ;
else
- s = s + "\n"/*nonNLS*/ + statements[i].toString(tab+2) ;
+ s = s + "\n" + statements[i].toString(tab+2) ;
//=============
if ( (statements[i] instanceof Case) || (statements[i] instanceof DefaultCase))
{ i++;
while(! ((statements[i] instanceof Case) || (statements[i] instanceof DefaultCase)))
{ if ( (statements[i] instanceof Expression) || (statements[i] instanceof Break))
- s = s + statements[i].toString(0) +" ; "/*nonNLS*/;
+ s = s + statements[i].toString(0) +" ; ";
else
- s = s + "\n"/*nonNLS*/ + statements[i].toString(tab+6) + " ; "/*nonNLS*/;
+ s = s + "\n" + statements[i].toString(tab+6) + " ; ";
i++;}}
else
- { s = s + " ;"/*nonNLS*/ ;
+ { s = s + " ;" ;
i++;}}}
catch(IndexOutOfBoundsException e){};
- s = s + "}"/*nonNLS*/;
+ s = s + "}";
return s;}
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope blockScope) {
if (visitor.visit(this, blockScope)) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SynchronizedStatement.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SynchronizedStatement.java
index 62b57744f4..c20d3f7695 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SynchronizedStatement.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/SynchronizedStatement.java
@@ -17,7 +17,7 @@ public class SynchronizedStatement extends Statement {
boolean blockExit;
public LocalVariableBinding synchroVariable;
- static final char[] SecretLocalDeclarationName = " syncValue"/*nonNLS*/.toCharArray();
+ static final char[] SecretLocalDeclarationName = " syncValue".toCharArray();
public SynchronizedStatement(Expression expression , Block statement, int s, int e) {
this.expression = expression;
@@ -73,6 +73,7 @@ public void generateCode(BlockScope currentScope, CodeStream codeStream) {
// generate the body of the synchronized block
ExceptionLabel anyExceptionHandler = new ExceptionLabel(codeStream, null); //'null' denotes any kind of exception
block.generateCode(scope, codeStream);
+ anyExceptionHandler.placeEnd();
Label endLabel = new Label(codeStream);
if (!blockExit) {
codeStream.load(synchroVariable);
@@ -80,7 +81,6 @@ public void generateCode(BlockScope currentScope, CodeStream codeStream) {
codeStream.goto_(endLabel);
}
// generate the body of the exception handler
- anyExceptionHandler.placeEnd();
anyExceptionHandler.place();
codeStream.incrStackSize(1);
codeStream.load(synchroVariable);
@@ -128,8 +128,8 @@ public String toString(int tab){
/* slow code */
String s = tabString(tab) ;
- s = s + "synchronized ("/*nonNLS*/ + expression.toStringExpression() + ")"/*nonNLS*/;
- s = s + "\n"/*nonNLS*/ + block.toString(tab+1) ;
+ s = s + "synchronized (" + expression.toStringExpression() + ")";
+ s = s + "\n" + block.toString(tab+1) ;
return s;}
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope blockScope) {
if (visitor.visit(this, blockScope)) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ThisReference.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ThisReference.java
index e9cf7e2522..1ac7233072 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ThisReference.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ThisReference.java
@@ -56,8 +56,8 @@ public TypeBinding resolveType(BlockScope scope) {
}
public String toStringExpression(){
- if (this == ThisImplicit) return ""/*nonNLS*/ ;
- return "this"/*nonNLS*/;
+ if (this == ThisImplicit) return "" ;
+ return "this";
}
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope blockScope) {
visitor.visit(this, blockScope);
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ThrowStatement.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ThrowStatement.java
index f1adeb7a67..612a343c48 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ThrowStatement.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ThrowStatement.java
@@ -56,7 +56,7 @@ public String toString(int tab){
/* slow code */
String s = tabString(tab) ;
- s = s + "throw "/*nonNLS*/;
+ s = s + "throw ";
s = s + exception.toStringExpression() ;
return s;
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TryStatement.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TryStatement.java
index f2f4815f6d..ae86820ae9 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TryStatement.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TryStatement.java
@@ -29,8 +29,8 @@ public class TryStatement extends Statement {
Label subRoutineStartLabel;
LocalVariableBinding anyExceptionVariable, returnAddressVariable;
- final static char[] SecretReturnName = " returnAddress"/*nonNLS*/.toCharArray() ;
- final static char[] SecretAnyHandlerName = " anyExceptionHandler"/*nonNLS*/.toCharArray();
+ final static char[] SecretReturnName = " returnAddress".toCharArray() ;
+ final static char[] SecretAnyHandlerName = " anyExceptionHandler".toCharArray();
// for local variables table attributes
int preTryInitStateIndex = -1;
@@ -374,24 +374,24 @@ public String toString(int tab){
String s = tabString(tab) ;
//try
- s = s + "try "/*nonNLS*/ ;
+ s = s + "try " ;
if (tryBlock == Block.None)
- s =s + "{}"/*nonNLS*/ ;
+ s =s + "{}" ;
else
- s = s + "\n"/*nonNLS*/ + tryBlock.toString(tab+1) ;
+ s = s + "\n" + tryBlock.toString(tab+1) ;
//catches
if (catchBlocks != null)
for (int i = 0; i < catchBlocks.length ; i++)
- s = s + "\n"/*nonNLS*/ + tabString(tab) + "catch ("/*nonNLS*/
- + catchArguments[i].toString(0) + ") "/*nonNLS*/
+ s = s + "\n" + tabString(tab) + "catch ("
+ + catchArguments[i].toString(0) + ") "
+ catchBlocks[i].toString(tab+1) ;
//finally
if (finallyBlock != null)
{ if (finallyBlock == Block.None)
- s = s + "\n"/*nonNLS*/ + tabString(tab)+ "finally {}"/*nonNLS*/ ;
+ s = s + "\n" + tabString(tab)+ "finally {}" ;
else
- s = s + "\n"/*nonNLS*/ + tabString(tab)+ "finally\n"/*nonNLS*/ +
+ s = s + "\n" + tabString(tab)+ "finally\n" +
finallyBlock.toString(tab+1) ;}
return s ;}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java
index 38705e1b9c..d010c054c0 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java
@@ -773,48 +773,48 @@ public String toString(int tab ){
public String toStringBody(int tab) {
/*slow code */
- String s = " {"/*nonNLS*/;
+ String s = " {";
if (memberTypes != null) {
for (int i = 0; i < memberTypes.length; i++) {
if (memberTypes[i] != null) {
- s += "\n"/*nonNLS*/ + memberTypes[i].toString(tab + 1);
+ s += "\n" + memberTypes[i].toString(tab + 1);
}
}
}
if (fields != null) {
for (int fieldI = 0; fieldI < fields.length; fieldI++) {
if (fields[fieldI] != null) {
- s += "\n"/*nonNLS*/ + fields[fieldI].toString(tab + 1);
- if (fields[fieldI].isField()) s += ";"/*nonNLS*/;
+ s += "\n" + fields[fieldI].toString(tab + 1);
+ if (fields[fieldI].isField()) s += ";";
}
}
}
if (methods != null) {
for (int i = 0; i < methods.length; i++) {
if (methods[i] != null) {
- s += "\n"/*nonNLS*/ + methods[i].toString(tab + 1);
+ s += "\n" + methods[i].toString(tab + 1);
}
}
}
- s += "\n"/*nonNLS*/+tabString(tab) + "}"/*nonNLS*/;
+ s += "\n"+tabString(tab) + "}";
return s;
}
public String toStringHeader() {
/*slow code */
- String s = ""/*nonNLS*/;
+ String s = "";
if (modifiers != AccDefault) {
s += modifiersString(modifiers);
}
- s += (isInterface() ? "interface "/*nonNLS*/ : "class "/*nonNLS*/) + new String(name);
+ s += (isInterface() ? "interface " : "class ") + new String(name);
if (superclass != null)
- s += " extends "/*nonNLS*/ + superclass.toString(0);
+ s += " extends " + superclass.toString(0);
if (superInterfaces != null && superInterfaces.length > 0) {
- s += (isInterface() ? " extends "/*nonNLS*/ : " implements "/*nonNLS*/);
+ s += (isInterface() ? " extends " : " implements ");
for (int i = 0; i < superInterfaces.length; i++) {
s += superInterfaces[i].toString(0);
if (i != superInterfaces.length-1)
- s += ", "/*nonNLS*/;
+ s += ", ";
};
};
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/UnaryExpression.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/UnaryExpression.java
index d99021d677..0ade10f91e 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/UnaryExpression.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/UnaryExpression.java
@@ -245,7 +245,7 @@ public TypeBinding resolveType(BlockScope scope) {
public String toStringExpressionNoParenthesis(){
/* slow code*/
- return operatorToString() + " "/*nonNLS*/ + expression.toStringExpression() ; }
+ return operatorToString() + " " + expression.toStringExpression() ; }
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope blockScope) {
if (visitor.visit(this, blockScope)) {
expression.traverse(visitor, blockScope);
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/WhileStatement.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/WhileStatement.java
index b879a0c440..71f388231c 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/WhileStatement.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/WhileStatement.java
@@ -35,10 +35,10 @@ public FlowInfo analyseCode(BlockScope currentScope, FlowContext flowContext, Fl
currentScope,
(condLoopContext = new LoopingFlowContext(flowContext, this, null, null, currentScope)),
flowInfo);
+ condLoopContext.complainOnFinalAssignmentsInLoop(currentScope, postCondInfo);
LoopingFlowContext loopingContext;
if ((action == null) || action.isEmptyBlock()) {
- condLoopContext.complainOnFinalAssignmentsInLoop(currentScope, postCondInfo);
if ((condition.constant != NotAConstant) && (condition.constant.booleanValue() == true)) {
return FlowInfo.DeadEnd;
} else {
@@ -63,14 +63,16 @@ public FlowInfo analyseCode(BlockScope currentScope, FlowContext flowContext, Fl
}
// code generation can be optimized when no need to continue in the loop
- if (((actionInfo == FlowInfo.DeadEnd) || actionInfo.isFakeReachable())
- && ((loopingContext.initsOnContinue == FlowInfo.DeadEnd) || loopingContext.initsOnContinue.isFakeReachable())){
+ if ((actionInfo == FlowInfo.DeadEnd) || actionInfo.isFakeReachable()){
+ if ((loopingContext.initsOnContinue == FlowInfo.DeadEnd) || loopingContext.initsOnContinue.isFakeReachable()){
continueLabel = null;
+ } else {
+ loopingContext.complainOnFinalAssignmentsInLoop(currentScope, loopingContext.initsOnContinue);
+ }
} else {
- condLoopContext.complainOnFinalAssignmentsInLoop(currentScope, postCondInfo);
loopingContext.complainOnFinalAssignmentsInLoop(currentScope, actionInfo);
}
- }
+ }
// infinite loop
FlowInfo mergedInfo;
@@ -149,14 +151,14 @@ public String toString(int tab){
/* slow code */
String s = tabString(tab) ;
- s = s + "while ("/*nonNLS*/ + condition.toStringExpression() + ")"/*nonNLS*/;
+ s = s + "while (" + condition.toStringExpression() + ")";
if (action == null)
- s = s + " {} ;"/*nonNLS*/;
+ s = s + " {} ;";
else
if (action instanceof Block)
- s = s + "\n"/*nonNLS*/ + action.toString(tab+1) ;
+ s = s + "\n" + action.toString(tab+1) ;
else
- s = s + " {\n"/*nonNLS*/ + action.toString(tab+1) + "}"/*nonNLS*/ ;
+ s = s + " {\n" + action.toString(tab+1) + "}" ;
return s;}
public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope blockScope) {
if (visitor.visit(this, blockScope)) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/ClassFileReader.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/ClassFileReader.java
index 1a19a46e5f..f37c03a4ba 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/ClassFileReader.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/ClassFileReader.java
@@ -508,10 +508,10 @@ public String toString() {
java.io.ByteArrayOutputStream out = new java.io.ByteArrayOutputStream();
java.io.PrintWriter print = new java.io.PrintWriter(out);
- print.println(this.getClass().getName() + "{"/*nonNLS*/);
- print.println(" className: "/*nonNLS*/ + new String(getName()));
- print.println(" superclassName: "/*nonNLS*/ + (getSuperclassName() == null ? "null"/*nonNLS*/ : new String(getSuperclassName())));
- print.println(" access_flags: "/*nonNLS*/ + ClassFileStruct.printTypeModifiers(accessFlags()) + "("/*nonNLS*/ + accessFlags() + ")"/*nonNLS*/);
+ print.println(this.getClass().getName() + "{");
+ print.println(" className: " + new String(getName()));
+ print.println(" superclassName: " + (getSuperclassName() == null ? "null" : new String(getSuperclassName())));
+ print.println(" access_flags: " + ClassFileStruct.printTypeModifiers(accessFlags()) + "(" + accessFlags() + ")");
print.flush();
return out.toString();
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/ClassFileStruct.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/ClassFileStruct.java
index 1ff4e1ff77..0c7316b203 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/ClassFileStruct.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/ClassFileStruct.java
@@ -1,10 +1,5 @@
package org.eclipse.jdt.internal.compiler.classfmt;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
-
+
abstract public class ClassFileStruct implements ClassFileConstants {
byte[] reference;
int structOffset;
@@ -114,12 +109,12 @@ public static String printTypeModifiers(int modifiers) {
java.io.ByteArrayOutputStream out = new java.io.ByteArrayOutputStream();
java.io.PrintWriter print = new java.io.PrintWriter(out);
- if ((modifiers & AccPublic) != 0) print.print("public "/*nonNLS*/);
- if ((modifiers & AccPrivate) != 0) print.print("private "/*nonNLS*/);
- if ((modifiers & AccFinal) != 0) print.print("final "/*nonNLS*/);
- if ((modifiers & AccSuper) != 0) print.print("super "/*nonNLS*/);
- if ((modifiers & AccInterface) != 0) print.print("interface "/*nonNLS*/);
- if ((modifiers & AccAbstract) != 0) print.print("abstract "/*nonNLS*/);
+ if ((modifiers & AccPublic) != 0) print.print("public ");
+ if ((modifiers & AccPrivate) != 0) print.print("private ");
+ if ((modifiers & AccFinal) != 0) print.print("final ");
+ if ((modifiers & AccSuper) != 0) print.print("super ");
+ if ((modifiers & AccInterface) != 0) print.print("interface ");
+ if ((modifiers & AccAbstract) != 0) print.print("abstract ");
print.flush();
return out.toString();
}
@@ -270,7 +265,7 @@ public static void verifyMethodNameAndSignature(char[] name, char[] signature) t
// if name begins with the < character it must be clinit or init
if (name[0] == '<') {
- if (new String(name).equals("<clinit>"/*nonNLS*/) || new String(name).equals("<init>"/*nonNLS*/)) {
+ if (new String(name).equals("<clinit>") || new String(name).equals("<init>")) {
int signatureLength = signature.length;
if (!((signatureLength > 2)
&& (signature[0] == '(')
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/ClassFormatException.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/ClassFormatException.java
index d43bf73265..26da065983 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/ClassFormatException.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/ClassFormatException.java
@@ -1,10 +1,5 @@
package org.eclipse.jdt.internal.compiler.classfmt;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
-
+
public class ClassFormatException extends Exception {
private int errorCode;
private int bufferPosition;
@@ -40,7 +35,7 @@ public class ClassFormatException extends Exception {
public static final int ErrIncorrectInterfaceMethods = 26;
public static final int ErrInvalidMethodName = 27;
public static final int ErrInvalidMethodSignature = 28;
-
+
/**
* (c)1998 Object Technology International.
* (c)1998 International Business Machines Corporation.
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/FieldInfo.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/FieldInfo.java
index 0c371b578c..613906f0ca 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/FieldInfo.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/FieldInfo.java
@@ -261,22 +261,22 @@ public String toString() {
StringBuffer buffer = new StringBuffer(this.getClass().getName());
int modifiers = getModifiers();
return buffer
- .append("{"/*nonNLS*/)
+ .append("{")
.append(
- ((modifiers & AccDeprecated) != 0 ? "deprecated "/*nonNLS*/ : ""/*nonNLS*/)
- + ((modifiers & 0x0001) == 1 ? "public "/*nonNLS*/ : ""/*nonNLS*/)
- + ((modifiers & 0x0002) == 0x0002 ? "private "/*nonNLS*/ : ""/*nonNLS*/)
- + ((modifiers & 0x0004) == 0x0004 ? "protected "/*nonNLS*/ : ""/*nonNLS*/)
- + ((modifiers & 0x0008) == 0x000008 ? "static "/*nonNLS*/ : ""/*nonNLS*/)
- + ((modifiers & 0x0010) == 0x0010 ? "final "/*nonNLS*/ : ""/*nonNLS*/)
- + ((modifiers & 0x0040) == 0x0040 ? "volatile "/*nonNLS*/ : ""/*nonNLS*/)
- + ((modifiers & 0x0080) == 0x0080 ? "transient "/*nonNLS*/ : ""/*nonNLS*/))
+ ((modifiers & AccDeprecated) != 0 ? "deprecated " : "")
+ + ((modifiers & 0x0001) == 1 ? "public " : "")
+ + ((modifiers & 0x0002) == 0x0002 ? "private " : "")
+ + ((modifiers & 0x0004) == 0x0004 ? "protected " : "")
+ + ((modifiers & 0x0008) == 0x000008 ? "static " : "")
+ + ((modifiers & 0x0010) == 0x0010 ? "final " : "")
+ + ((modifiers & 0x0040) == 0x0040 ? "volatile " : "")
+ + ((modifiers & 0x0080) == 0x0080 ? "transient " : ""))
.append(getTypeName())
- .append(" "/*nonNLS*/)
+ .append(" ")
.append(getName())
- .append(" "/*nonNLS*/)
+ .append(" ")
.append(getConstant())
- .append("}"/*nonNLS*/)
+ .append("}")
.toString();
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/InnerClassInfo.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/InnerClassInfo.java
index 3cc4f942a1..739916b91e 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/InnerClassInfo.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/InnerClassInfo.java
@@ -4,13 +4,13 @@ package org.eclipse.jdt.internal.compiler.classfmt;
* (c) Copyright IBM Corp. 2000, 2001.
* All Rights Reserved.
*/
-import org.eclipse.jdt.internal.compiler.env.*;
-
/**
* Describes one entry in the classes table of the InnerClasses attribute.
* See the inner class specification (The class file attribute "InnerClasses").
*/
+import org.eclipse.jdt.internal.compiler.env.*;
+
public class InnerClassInfo extends ClassFileStruct implements IBinaryNestedType {
int innerClassNameIndex = -1;
int outerClassNameIndex = -1;
@@ -109,11 +109,11 @@ public String toString() {
if (getName() != null) {
buffer.append(getName());
}
- buffer.append("\n"/*nonNLS*/);
+ buffer.append("\n");
if (getEnclosingTypeName() != null) {
buffer.append(getEnclosingTypeName());
}
- buffer.append("\n"/*nonNLS*/);
+ buffer.append("\n");
if (getSourceName() != null) {
buffer.append(getSourceName());
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/MethodInfo.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/MethodInfo.java
index 06146a5e8a..d373a819bc 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/MethodInfo.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/MethodInfo.java
@@ -192,19 +192,19 @@ public String toString() {
int modifiers = getModifiers();
StringBuffer buffer = new StringBuffer(this.getClass().getName());
return buffer
- .append("{"/*nonNLS*/)
+ .append("{")
.append(
- ((modifiers & AccDeprecated) != 0 ? "deprecated "/*nonNLS*/ : ""/*nonNLS*/)
- + ((modifiers & 0x0001) == 1 ? "public "/*nonNLS*/ : ""/*nonNLS*/)
- + ((modifiers & 0x0002) == 0x0002 ? "private "/*nonNLS*/ : ""/*nonNLS*/)
- + ((modifiers & 0x0004) == 0x0004 ? "protected "/*nonNLS*/ : ""/*nonNLS*/)
- + ((modifiers & 0x0008) == 0x000008 ? "static "/*nonNLS*/ : ""/*nonNLS*/)
- + ((modifiers & 0x0010) == 0x0010 ? "final "/*nonNLS*/ : ""/*nonNLS*/)
- + ((modifiers & 0x0040) == 0x0040 ? "volatile "/*nonNLS*/ : ""/*nonNLS*/)
- + ((modifiers & 0x0080) == 0x0080 ? "transient "/*nonNLS*/ : ""/*nonNLS*/))
+ ((modifiers & AccDeprecated) != 0 ? "deprecated " : "")
+ + ((modifiers & 0x0001) == 1 ? "public " : "")
+ + ((modifiers & 0x0002) == 0x0002 ? "private " : "")
+ + ((modifiers & 0x0004) == 0x0004 ? "protected " : "")
+ + ((modifiers & 0x0008) == 0x000008 ? "static " : "")
+ + ((modifiers & 0x0010) == 0x0010 ? "final " : "")
+ + ((modifiers & 0x0040) == 0x0040 ? "volatile " : "")
+ + ((modifiers & 0x0080) == 0x0080 ? "transient " : ""))
.append(getSelector())
.append(getMethodDescriptor())
- .append("}"/*nonNLS*/)
+ .append("}")
.toString();
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/AttributeNamesConstants.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/AttributeNamesConstants.java
index cff734015d..aad366b3ec 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/AttributeNamesConstants.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/AttributeNamesConstants.java
@@ -1,10 +1,5 @@
package org.eclipse.jdt.internal.compiler.codegen;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
-
+
public interface AttributeNamesConstants {
final char[] SyntheticName = new char[] {'S', 'y', 'n', 't', 'h', 'e', 't', 'i', 'c'};
final char[] ConstantValueName = new char[] {'C', 'o', 'n', 's', 't', 'a', 'n', 't', 'V', 'a', 'l', 'u', 'e'};
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/CharArrayCache.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/CharArrayCache.java
index aa41c79630..d38fddd425 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/CharArrayCache.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/CharArrayCache.java
@@ -166,16 +166,16 @@ public int size() {
public String toString() {
int max = size();
StringBuffer buf = new StringBuffer();
- buf.append("{"/*nonNLS*/);
+ buf.append("{");
for (int i = 0; i < max; ++i) {
if (keyTable[i] != null) {
- buf.append(keyTable[i]).append("->"/*nonNLS*/).append(valueTable[i]);
+ buf.append(keyTable[i]).append("->").append(valueTable[i]);
}
if (i < max) {
- buf.append(", "/*nonNLS*/);
+ buf.append(", ");
}
}
- buf.append("}"/*nonNLS*/);
+ buf.append("}");
return buf.toString();
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/CodeStream.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/CodeStream.java
index acb59b938f..4e16f03efb 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/CodeStream.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/CodeStream.java
@@ -1369,7 +1369,7 @@ public void generateClassLiteralAccessForType(TypeBinding accessedType, FieldBin
// Wrap the code in an exception handler to convert a ClassNotFoundException into a NoClassDefError
anyExceptionHandler = new ExceptionLabel(this, TypeBinding.NullBinding /* represents ClassNotFoundException*/);
- this.ldc(accessedType == TypeBinding.NullBinding ? "java.lang.Object"/*nonNLS*/ : String.valueOf(accessedType.constantPoolName()).replace('/', '.'));
+ this.ldc(accessedType == TypeBinding.NullBinding ? "java.lang.Object" : String.valueOf(accessedType.constantPoolName()).replace('/', '.'));
this.invokeClassForName();
/* We need to protect the runtime code from binary inconsistencies
@@ -1429,7 +1429,7 @@ final public int[] generateCodeAttributeForProblemMethod(String errorName, Strin
anewarrayJavaLangClass();
dup();
iconst_0();
- ldc("java.lang.String"/*nonNLS*/);
+ ldc("java.lang.String");
invokeClassForName();
aastore();
invokeConstructorGetConstructor();
@@ -1773,28 +1773,28 @@ public void generateObjectWrapperForType(TypeBinding valueType) {
char[][] wrapperTypeCompoundName = null;
switch (valueType.id) {
case T_int : // new: java.lang.Integer
- wrapperTypeCompoundName = new char[][] {"java"/*nonNLS*/.toCharArray(), "lang"/*nonNLS*/.toCharArray(), "Integer"/*nonNLS*/.toCharArray()};
+ wrapperTypeCompoundName = new char[][] {"java".toCharArray(), "lang".toCharArray(), "Integer".toCharArray()};
break;
case T_boolean : // new: java.lang.Boolean
- wrapperTypeCompoundName = new char[][] {"java"/*nonNLS*/.toCharArray(), "lang"/*nonNLS*/.toCharArray(), "Boolean"/*nonNLS*/.toCharArray()};
+ wrapperTypeCompoundName = new char[][] {"java".toCharArray(), "lang".toCharArray(), "Boolean".toCharArray()};
break;
case T_byte : // new: java.lang.Byte
- wrapperTypeCompoundName = new char[][] {"java"/*nonNLS*/.toCharArray(), "lang"/*nonNLS*/.toCharArray(), "Byte"/*nonNLS*/.toCharArray()};
+ wrapperTypeCompoundName = new char[][] {"java".toCharArray(), "lang".toCharArray(), "Byte".toCharArray()};
break;
case T_char : // new: java.lang.Character
- wrapperTypeCompoundName = new char[][] {"java"/*nonNLS*/.toCharArray(), "lang"/*nonNLS*/.toCharArray(), "Character"/*nonNLS*/.toCharArray()};
+ wrapperTypeCompoundName = new char[][] {"java".toCharArray(), "lang".toCharArray(), "Character".toCharArray()};
break;
case T_float : // new: java.lang.Float
- wrapperTypeCompoundName = new char[][] {"java"/*nonNLS*/.toCharArray(), "lang"/*nonNLS*/.toCharArray(), "Float"/*nonNLS*/.toCharArray()};
+ wrapperTypeCompoundName = new char[][] {"java".toCharArray(), "lang".toCharArray(), "Float".toCharArray()};
break;
case T_double : // new: java.lang.Double
- wrapperTypeCompoundName = new char[][] {"java"/*nonNLS*/.toCharArray(), "lang"/*nonNLS*/.toCharArray(), "Double"/*nonNLS*/.toCharArray()};
+ wrapperTypeCompoundName = new char[][] {"java".toCharArray(), "lang".toCharArray(), "Double".toCharArray()};
break;
case T_short : // new: java.lang.Short
- wrapperTypeCompoundName = new char[][] {"java"/*nonNLS*/.toCharArray(), "lang"/*nonNLS*/.toCharArray(), "Short"/*nonNLS*/.toCharArray()};
+ wrapperTypeCompoundName = new char[][] {"java".toCharArray(), "lang".toCharArray(), "Short".toCharArray()};
break;
case T_long : // new: java.lang.Long
- wrapperTypeCompoundName = new char[][] {"java"/*nonNLS*/.toCharArray(), "lang"/*nonNLS*/.toCharArray(), "Long"/*nonNLS*/.toCharArray()};
+ wrapperTypeCompoundName = new char[][] {"java".toCharArray(), "lang".toCharArray(), "Long".toCharArray()};
break;
}
TypeBinding wrapperType = methodDeclaration.scope.getType(wrapperTypeCompoundName);
@@ -5304,15 +5304,15 @@ final public void tableswitch(CaseLabel defaultLabel, int low, int high, int[] k
}
}
public String toString() {
- StringBuffer buffer = new StringBuffer("( position:"/*nonNLS*/);
+ StringBuffer buffer = new StringBuffer("( position:");
buffer.append(position);
- buffer.append(",\nstackDepth:"/*nonNLS*/);
+ buffer.append(",\nstackDepth:");
buffer.append(stackDepth);
- buffer.append(",\nmaxStack:"/*nonNLS*/);
+ buffer.append(",\nmaxStack:");
buffer.append(stackMax);
- buffer.append(",\nmaxLocals:"/*nonNLS*/);
+ buffer.append(",\nmaxLocals:");
buffer.append(maxLocals);
- buffer.append(")"/*nonNLS*/);
+ buffer.append(")");
return buffer.toString();
}
public void updateLastRecordedEndPC(int pos) {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/ConstantPool.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/ConstantPool.java
index e87240f8df..f40110fc63 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/ConstantPool.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/ConstantPool.java
@@ -70,7 +70,7 @@ public class ConstantPool implements ClassFileConstants, TypeIds {
final static int JAVA_LANG_ERROR_TYPE = 17;
final static int JAVA_LANG_EXCEPTION_TYPE = 18;
final static int JAVA_LANG_REFLECT_CONSTRUCTOR_TYPE = 19;
- // predefined constant index for well known fields
+ // predefined constant index for well known fields
final static int TYPE_BYTE_FIELD = 0;
final static int TYPE_SHORT_FIELD = 1;
final static int TYPE_CHARACTER_FIELD = 2;
@@ -81,7 +81,7 @@ public class ConstantPool implements ClassFileConstants, TypeIds {
final static int TYPE_BOOLEAN_FIELD = 7;
final static int TYPE_VOID_FIELD = 8;
final static int OUT_SYSTEM_FIELD = 9;
- // predefined constant index for well known methods
+ // predefined constant index for well known methods
final static int FORNAME_CLASS_METHOD = 0;
final static int NOCLASSDEFFOUNDERROR_CONSTR_METHOD = 1;
final static int APPEND_INT_METHOD = 2;
@@ -136,25 +136,22 @@ public class ConstantPool implements ClassFileConstants, TypeIds {
final static int VALUEOF_CHAR_METHOD_NAME_AND_TYPE = 21;
final static int VALUEOF_BOOLEAN_METHOD_NAME_AND_TYPE = 22;
final static int VALUEOF_DOUBLE_METHOD_NAME_AND_TYPE = 23;
- public ClassFile classFile;
-
/**
* ConstantPool constructor comment.
*/
public ConstantPool(ClassFile classFile) {
- this.UTF8Cache = new CharArrayCache(UTF8_INITIAL_SIZE);
- this.stringCache = new CharArrayCache(STRING_INITIAL_SIZE);
- this.fieldCache = new ObjectCache(FIELD_INITIAL_SIZE);
- this.methodCache = new ObjectCache(METHOD_INITIAL_SIZE);
- this.interfaceMethodCache = new ObjectCache(INTERFACE_INITIAL_SIZE);
- this.classCache = new ObjectCache(CLASS_INITIAL_SIZE);
- this.nameAndTypeCacheForMethods = new MethodNameAndTypeCache(NAMEANDTYPE_INITIAL_SIZE);
- this.nameAndTypeCacheForFields = new FieldNameAndTypeCache(NAMEANDTYPE_INITIAL_SIZE);
- this.poolContent = classFile.header;
- this.currentOffset = classFile.headerOffset;
+ UTF8Cache = new CharArrayCache(UTF8_INITIAL_SIZE);
+ stringCache = new CharArrayCache(STRING_INITIAL_SIZE);
+ fieldCache = new ObjectCache(FIELD_INITIAL_SIZE);
+ methodCache = new ObjectCache(METHOD_INITIAL_SIZE);
+ interfaceMethodCache = new ObjectCache(INTERFACE_INITIAL_SIZE);
+ classCache = new ObjectCache(CLASS_INITIAL_SIZE);
+ nameAndTypeCacheForMethods = new MethodNameAndTypeCache(NAMEANDTYPE_INITIAL_SIZE);
+ nameAndTypeCacheForFields = new FieldNameAndTypeCache(NAMEANDTYPE_INITIAL_SIZE);
+ poolContent = classFile.header;
+ currentOffset = classFile.headerOffset;
// currentOffset is initialized to 0 by default
- this.currentIndex = 1;
- this.classFile = classFile;
+ currentIndex = 1;
}
/**
* Return the content of the receiver
@@ -337,7 +334,7 @@ public int indexOfWellKnownMethodNameAndType(MethodBinding methodBinding) {
if ((methodBinding.parameters.length == 0) && (methodBinding.returnType.id == T_JavaLangString) && (CharOperation.equals(methodBinding.selector, QualifiedNamesConstants.Intern))) {
// This method binding is toString()
return INTERN_METHOD_NAME_AND_TYPE;
- }
+ }
}
return -1;
}
@@ -410,7 +407,7 @@ public int indexOfWellKnownMethods(MethodBinding methodBinding) {
} else
if ((firstChar == '<') && (CharOperation.equals(methodBinding.selector, QualifiedNamesConstants.Init))) {
if ((methodBinding.parameters.length == 1) && (methodBinding.parameters[0].id == T_JavaLangString)) {
- // This method binding is <init>(String)
+ // This method binding is <init>(String)
return STRINGBUFFER_STRING_CONSTR_METHOD;
} else {
if (methodBinding.parameters.length == 0) {
@@ -504,9 +501,6 @@ public int literalIndex(byte[] utf8encoding, char[] stringCharArray) {
if ((index = UTF8Cache.get(stringCharArray)) < 0) {
// The entry doesn't exit yet
index = UTF8Cache.put(stringCharArray, currentIndex);
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
currentIndex++;
// Write the tag first
writeU1(Utf8Tag);
@@ -583,10 +577,7 @@ public int literalIndex(char[] utf8Constant) {
return -1;
}
index = UTF8Cache.put(utf8Constant, currentIndex);
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
- currentIndex++;
+ currentIndex++;
// Now we know the length that we have to write in the constant pool
// we use savedCurrentOffset to do that
poolContent[savedCurrentOffset] = (byte) (length >> 8);
@@ -601,9 +592,6 @@ public int literalIndex(char[] stringCharArray, byte[] utf8encoding) {
// The entry doesn't exit yet
stringIndex = literalIndex(utf8encoding, stringCharArray);
index = stringCache.put(stringCharArray, currentIndex++);
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the tag first
writeU1(StringTag);
// Then the string index
@@ -631,9 +619,6 @@ public int literalIndex(double key) {
}
if ((index = doubleCache.get(key)) < 0) {
index = doubleCache.put(key, currentIndex++);
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
currentIndex++; // a double needs an extra place into the constant pool
// Write the double into the constant pool
// First add the tag
@@ -670,9 +655,6 @@ public int literalIndex(float key) {
}
if ((index = floatCache.get(key)) < 0) {
index = floatCache.put(key, currentIndex++);
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the float constant entry into the constant pool
// First add the tag
writeU1(FloatTag);
@@ -708,9 +690,6 @@ public int literalIndex(int key) {
}
if ((index = intCache.get(key)) < 0) {
index = intCache.put(key, currentIndex++);
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the integer constant entry into the constant pool
// First add the tag
writeU1(IntegerTag);
@@ -747,9 +726,6 @@ public int literalIndex(long key) {
}
if ((index = longCache.get(key)) < 0) {
index = longCache.put(key, currentIndex++);
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
currentIndex++; // long value need an extra place into thwe constant pool
// Write the long into the constant pool
// First add the tag
@@ -780,9 +756,6 @@ public int literalIndex(String stringConstant) {
// The entry doesn't exit yet
int stringIndex = literalIndex(stringCharArray);
index = stringCache.put(stringCharArray, currentIndex++);
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the tag first
writeU1(StringTag);
// Then the string index
@@ -808,9 +781,6 @@ public int literalIndex(FieldBinding aFieldBinding) {
classIndex = literalIndex(aFieldBinding.declaringClass);
nameAndTypeIndex = literalIndexForFields(literalIndex(aFieldBinding.name), literalIndex(aFieldBinding.type.signature()), aFieldBinding);
index = fieldCache.put(aFieldBinding, currentIndex++);
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(FieldRefTag);
writeU2(classIndex);
writeU2(nameAndTypeIndex);
@@ -821,9 +791,6 @@ public int literalIndex(FieldBinding aFieldBinding) {
classIndex = literalIndex(aFieldBinding.declaringClass);
nameAndTypeIndex = literalIndexForFields(literalIndex(aFieldBinding.name), literalIndex(aFieldBinding.type.signature()), aFieldBinding);
index = wellKnownFields[indexWellKnownField] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(FieldRefTag);
writeU2(classIndex);
writeU2(nameAndTypeIndex);
@@ -852,9 +819,6 @@ public int literalIndex(MethodBinding aMethodBinding) {
classIndex = literalIndex(aMethodBinding.declaringClass);
nameAndTypeIndex = literalIndexForMethods(literalIndex(aMethodBinding.constantPoolName()), literalIndex(aMethodBinding.signature()), aMethodBinding);
index = interfaceMethodCache.put(aMethodBinding, currentIndex++);
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the interface method ref constant into the constant pool
// First add the tag
writeU1(InterfaceMethodRefTag);
@@ -869,9 +833,6 @@ public int literalIndex(MethodBinding aMethodBinding) {
classIndex = literalIndex(aMethodBinding.declaringClass);
nameAndTypeIndex = literalIndexForMethods(literalIndex(aMethodBinding.constantPoolName()), literalIndex(aMethodBinding.signature()), aMethodBinding);
index = methodCache.put(aMethodBinding, currentIndex++);
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the method ref constant into the constant pool
// First add the tag
writeU1(MethodRefTag);
@@ -890,9 +851,6 @@ public int literalIndex(MethodBinding aMethodBinding) {
classIndex = literalIndex(aMethodBinding.declaringClass);
nameAndTypeIndex = literalIndexForMethods(literalIndex(aMethodBinding.constantPoolName()), literalIndex(aMethodBinding.signature()), aMethodBinding);
index = wellKnownMethods[indexWellKnownMethod] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the interface method ref constant into the constant pool
// First add the tag
writeU1(InterfaceMethodRefTag);
@@ -905,9 +863,6 @@ public int literalIndex(MethodBinding aMethodBinding) {
classIndex = literalIndex(aMethodBinding.declaringClass);
nameAndTypeIndex = literalIndexForMethods(literalIndex(aMethodBinding.constantPoolName()), literalIndex(aMethodBinding.signature()), aMethodBinding);
index = wellKnownMethods[indexWellKnownMethod] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the method ref constant into the constant pool
// First add the tag
writeU1(MethodRefTag);
@@ -935,9 +890,6 @@ public int literalIndex(TypeBinding aTypeBinding) {
// The entry doesn't exit yet
nameIndex = literalIndex(aTypeBinding.constantPoolName());
index = classCache.put(aTypeBinding, currentIndex++);
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(ClassTag);
// Then add the 8 bytes representing the long
writeU2(nameIndex);
@@ -947,9 +899,6 @@ public int literalIndex(TypeBinding aTypeBinding) {
// Need to insert that binding
nameIndex = literalIndex(aTypeBinding.constantPoolName());
index = wellKnownTypes[indexWellKnownType] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(ClassTag);
// Then add the 8 bytes representing the long
writeU2(nameIndex);
@@ -974,9 +923,6 @@ public int literalIndexForFields(int nameIndex, int typeIndex, FieldBinding key)
if ((index = nameAndTypeCacheForFields.get(key)) == -1) {
// The entry doesn't exit yet
index = nameAndTypeCacheForFields.put(key, currentIndex++);
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(NameAndTypeTag);
writeU2(nameIndex);
writeU2(typeIndex);
@@ -984,9 +930,6 @@ public int literalIndexForFields(int nameIndex, int typeIndex, FieldBinding key)
} else {
if ((index = wellKnownFieldNameAndTypes[indexOfWellKnownFieldNameAndType]) == 0) {
index = wellKnownFieldNameAndTypes[indexOfWellKnownFieldNameAndType] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(NameAndTypeTag);
writeU2(nameIndex);
writeU2(typeIndex);
@@ -1007,9 +950,6 @@ public int literalIndexForJavaLangBoolean() {
// The entry doesn't exit yet
nameIndex = literalIndex(QualifiedNamesConstants.JavaLangBooleanConstantPoolName);
index = wellKnownTypes[JAVA_LANG_BOOLEAN_TYPE] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(ClassTag);
// Then add the 8 bytes representing the long
writeU2(nameIndex);
@@ -1038,9 +978,6 @@ public int literalIndexForJavaLangBooleanTYPE() {
writeU2(typeIndex);
}
index = wellKnownFields[TYPE_BOOLEAN_FIELD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(FieldRefTag);
writeU2(classIndex);
writeU2(nameAndTypeIndex);
@@ -1060,9 +997,6 @@ public int literalIndexForJavaLangByte() {
// The entry doesn't exit yet
nameIndex = literalIndex(QualifiedNamesConstants.JavaLangByteConstantPoolName);
index = wellKnownTypes[JAVA_LANG_BYTE_TYPE] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(ClassTag);
// Then add the 8 bytes representing the long
writeU2(nameIndex);
@@ -1091,9 +1025,6 @@ public int literalIndexForJavaLangByteTYPE() {
writeU2(typeIndex);
}
index = wellKnownFields[TYPE_BYTE_FIELD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(FieldRefTag);
writeU2(classIndex);
writeU2(nameAndTypeIndex);
@@ -1113,9 +1044,6 @@ public int literalIndexForJavaLangCharacter() {
// The entry doesn't exit yet
nameIndex = literalIndex(QualifiedNamesConstants.JavaLangCharacterConstantPoolName);
index = wellKnownTypes[JAVA_LANG_CHARACTER_TYPE] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(ClassTag);
// Then add the 8 bytes representing the long
writeU2(nameIndex);
@@ -1144,9 +1072,6 @@ public int literalIndexForJavaLangCharacterTYPE() {
writeU2(typeIndex);
}
index = wellKnownFields[TYPE_CHARACTER_FIELD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(FieldRefTag);
writeU2(classIndex);
writeU2(nameAndTypeIndex);
@@ -1166,9 +1091,6 @@ public int literalIndexForJavaLangClass() {
// The entry doesn't exit yet
nameIndex = literalIndex(QualifiedNamesConstants.JavaLangClassConstantPoolName);
index = wellKnownTypes[JAVA_LANG_CLASS_TYPE] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(ClassTag);
// Then add the 8 bytes representing the long
writeU2(nameIndex);
@@ -1198,9 +1120,6 @@ public int literalIndexForJavaLangClassForName() {
writeU2(typeIndex);
}
index = wellKnownMethods[FORNAME_CLASS_METHOD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the method ref constant into the constant pool
// First add the tag
writeU1(MethodRefTag);
@@ -1234,9 +1153,6 @@ public int literalIndexForJavaLangClassGetConstructor() {
writeU2(typeIndex);
}
index = wellKnownMethods[GETCONSTRUCTOR_CLASS_METHOD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the method ref constant into the constant pool
// First add the tag
writeU1(MethodRefTag);
@@ -1260,9 +1176,6 @@ public int literalIndexForJavaLangClassNotFoundException() {
// The entry doesn't exit yet
nameIndex = literalIndex(QualifiedNamesConstants.JavaLangClassNotFoundExceptionConstantPoolName);
index = wellKnownTypes[JAVA_LANG_CLASSNOTFOUNDEXCEPTION_TYPE] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(ClassTag);
// Then add the 8 bytes representing the long
writeU2(nameIndex);
@@ -1282,9 +1195,6 @@ public int literalIndexForJavaLangDouble() {
// The entry doesn't exit yet
nameIndex = literalIndex(QualifiedNamesConstants.JavaLangDoubleConstantPoolName);
index = wellKnownTypes[JAVA_LANG_DOUBLE_TYPE] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(ClassTag);
// Then add the 8 bytes representing the long
writeU2(nameIndex);
@@ -1313,9 +1223,6 @@ public int literalIndexForJavaLangDoubleTYPE() {
writeU2(typeIndex);
}
index = wellKnownFields[TYPE_DOUBLE_FIELD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(FieldRefTag);
writeU2(classIndex);
writeU2(nameAndTypeIndex);
@@ -1335,9 +1242,6 @@ public int literalIndexForJavaLangError() {
// The entry doesn't exit yet
nameIndex = literalIndex(QualifiedNamesConstants.JavaLangErrorConstantPoolName);
index = wellKnownTypes[JAVA_LANG_ERROR_TYPE] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(ClassTag);
// Then add the 8 bytes representing the long
writeU2(nameIndex);
@@ -1367,9 +1271,6 @@ public int literalIndexForJavaLangErrorConstructor() {
writeU2(typeIndex);
}
index = wellKnownMethods[JAVALANGERROR_CONSTR_METHOD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the method ref constant into the constant pool
// First add the tag
writeU1(MethodRefTag);
@@ -1386,9 +1287,6 @@ public int literalIndexForJavaLangException() {
// The entry doesn't exit yet
int nameIndex = literalIndex(QualifiedNamesConstants.JavaLangExceptionConstantPoolName);
index = wellKnownTypes[JAVA_LANG_EXCEPTION_TYPE] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(ClassTag);
// Then add the 8 bytes representing the long
writeU2(nameIndex);
@@ -1408,9 +1306,6 @@ public int literalIndexForJavaLangFloat() {
// The entry doesn't exit yet
nameIndex = literalIndex(QualifiedNamesConstants.JavaLangFloatConstantPoolName);
index = wellKnownTypes[JAVA_LANG_FLOAT_TYPE] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(ClassTag);
// Then add the 8 bytes representing the long
writeU2(nameIndex);
@@ -1439,9 +1334,6 @@ public int literalIndexForJavaLangFloatTYPE() {
writeU2(typeIndex);
}
index = wellKnownFields[TYPE_FLOAT_FIELD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(FieldRefTag);
writeU2(classIndex);
writeU2(nameAndTypeIndex);
@@ -1461,9 +1353,6 @@ public int literalIndexForJavaLangInteger() {
// The entry doesn't exit yet
nameIndex = literalIndex(QualifiedNamesConstants.JavaLangIntegerConstantPoolName);
index = wellKnownTypes[JAVA_LANG_INTEGER_TYPE] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(ClassTag);
// Then add the 8 bytes representing the long
writeU2(nameIndex);
@@ -1492,9 +1381,6 @@ public int literalIndexForJavaLangIntegerTYPE() {
writeU2(typeIndex);
}
index = wellKnownFields[TYPE_INTEGER_FIELD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(FieldRefTag);
writeU2(classIndex);
writeU2(nameAndTypeIndex);
@@ -1514,9 +1400,6 @@ public int literalIndexForJavaLangLong() {
// The entry doesn't exit yet
nameIndex = literalIndex(QualifiedNamesConstants.JavaLangLongConstantPoolName);
index = wellKnownTypes[JAVA_LANG_LONG_TYPE] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(ClassTag);
// Then add the 8 bytes representing the long
writeU2(nameIndex);
@@ -1545,9 +1428,6 @@ public int literalIndexForJavaLangLongTYPE() {
writeU2(typeIndex);
}
index = wellKnownFields[TYPE_LONG_FIELD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(FieldRefTag);
writeU2(classIndex);
writeU2(nameAndTypeIndex);
@@ -1567,9 +1447,6 @@ public int literalIndexForJavaLangNoClassDefFoundError() {
// The entry doesn't exit yet
nameIndex = literalIndex(QualifiedNamesConstants.JavaLangNoClassDefFoundErrorConstantPoolName);
index = wellKnownTypes[JAVA_LANG_NOCLASSDEFFOUNDERROR_TYPE] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(ClassTag);
// Then add the 8 bytes representing the long
writeU2(nameIndex);
@@ -1599,9 +1476,6 @@ public int literalIndexForJavaLangNoClassDefFoundErrorStringConstructor() {
writeU2(typeIndex);
}
index = wellKnownMethods[NOCLASSDEFFOUNDERROR_CONSTR_METHOD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the method ref constant into the constant pool
// First add the tag
writeU1(MethodRefTag);
@@ -1625,9 +1499,6 @@ public int literalIndexForJavaLangObject() {
// The entry doesn't exit yet
nameIndex = literalIndex(QualifiedNamesConstants.JavaLangObjectConstantPoolName);
index = wellKnownTypes[JAVA_LANG_OBJECT_TYPE] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(ClassTag);
// Then add the 8 bytes representing the long
writeU2(nameIndex);
@@ -1647,9 +1518,6 @@ public int literalIndexForJavaLangReflectConstructor() {
// The entry doesn't exit yet
nameIndex = literalIndex(QualifiedNamesConstants.JavaLangReflectConstructor);
index = wellKnownTypes[JAVA_LANG_REFLECT_CONSTRUCTOR_TYPE] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(ClassTag);
// Then add the 8 bytes representing the long
writeU2(nameIndex);
@@ -1672,9 +1540,6 @@ public int literalIndexForJavaLangReflectConstructorNewInstance() {
writeU2(typeIndex);
}
index = wellKnownMethods[NEWINSTANCE_CONSTRUCTOR_METHOD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the method ref constant into the constant pool
// First add the tag
writeU1(MethodRefTag);
@@ -1698,9 +1563,6 @@ public int literalIndexForJavaLangShort() {
// The entry doesn't exit yet
nameIndex = literalIndex(QualifiedNamesConstants.JavaLangShortConstantPoolName);
index = wellKnownTypes[JAVA_LANG_SHORT_TYPE] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(ClassTag);
// Then add the 8 bytes representing the long
writeU2(nameIndex);
@@ -1729,9 +1591,6 @@ public int literalIndexForJavaLangShortTYPE() {
writeU2(typeIndex);
}
index = wellKnownFields[TYPE_SHORT_FIELD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(FieldRefTag);
writeU2(classIndex);
writeU2(nameAndTypeIndex);
@@ -1751,9 +1610,6 @@ public int literalIndexForJavaLangString() {
// The entry doesn't exit yet
nameIndex = literalIndex(QualifiedNamesConstants.JavaLangStringConstantPoolName);
index = wellKnownTypes[JAVA_LANG_STRING_TYPE] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(ClassTag);
// Then add the 8 bytes representing the long
writeU2(nameIndex);
@@ -1773,9 +1629,6 @@ public int literalIndexForJavaLangStringBuffer() {
// The entry doesn't exit yet
nameIndex = literalIndex(QualifiedNamesConstants.JavaLangStringBufferConstantPoolName);
index = wellKnownTypes[JAVA_LANG_STRINGBUFFER_TYPE] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(ClassTag);
// Then add the 8 bytes representing the long
writeU2(nameIndex);
@@ -1808,9 +1661,6 @@ public int literalIndexForJavaLangStringBufferAppend(int typeID) {
writeU2(typeIndex);
}
index = wellKnownMethods[APPEND_INT_METHOD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the method ref constant into the constant pool
// First add the tag
writeU1(MethodRefTag);
@@ -1832,9 +1682,6 @@ public int literalIndexForJavaLangStringBufferAppend(int typeID) {
writeU2(typeIndex);
}
index = wellKnownMethods[APPEND_LONG_METHOD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the method ref constant into the constant pool
// First add the tag
writeU1(MethodRefTag);
@@ -1856,9 +1703,6 @@ public int literalIndexForJavaLangStringBufferAppend(int typeID) {
writeU2(typeIndex);
}
index = wellKnownMethods[APPEND_FLOAT_METHOD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the method ref constant into the constant pool
// First add the tag
writeU1(MethodRefTag);
@@ -1880,9 +1724,6 @@ public int literalIndexForJavaLangStringBufferAppend(int typeID) {
writeU2(typeIndex);
}
index = wellKnownMethods[APPEND_DOUBLE_METHOD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the method ref constant into the constant pool
// First add the tag
writeU1(MethodRefTag);
@@ -1904,9 +1745,6 @@ public int literalIndexForJavaLangStringBufferAppend(int typeID) {
writeU2(typeIndex);
}
index = wellKnownMethods[APPEND_CHAR_METHOD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the method ref constant into the constant pool
// First add the tag
writeU1(MethodRefTag);
@@ -1928,9 +1766,6 @@ public int literalIndexForJavaLangStringBufferAppend(int typeID) {
writeU2(typeIndex);
}
index = wellKnownMethods[APPEND_BOOLEAN_METHOD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the method ref constant into the constant pool
// First add the tag
writeU1(MethodRefTag);
@@ -1952,9 +1787,6 @@ public int literalIndexForJavaLangStringBufferAppend(int typeID) {
writeU2(typeIndex);
}
index = wellKnownMethods[APPEND_OBJECT_METHOD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the method ref constant into the constant pool
// First add the tag
writeU1(MethodRefTag);
@@ -1977,9 +1809,6 @@ public int literalIndexForJavaLangStringBufferAppend(int typeID) {
writeU2(typeIndex);
}
index = wellKnownMethods[APPEND_STRING_METHOD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the method ref constant into the constant pool
// First add the tag
writeU1(MethodRefTag);
@@ -2015,9 +1844,6 @@ public int literalIndexForJavaLangStringBufferConstructor() {
writeU2(typeIndex);
}
index = wellKnownMethods[STRINGBUFFER_STRING_CONSTR_METHOD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the method ref constant into the constant pool
// First add the tag
writeU1(MethodRefTag);
@@ -2051,9 +1877,6 @@ public int literalIndexForJavaLangStringBufferDefaultConstructor() {
writeU2(typeIndex);
}
index = wellKnownMethods[STRINGBUFFER_DEFAULT_CONSTR_METHOD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the method ref constant into the constant pool
// First add the tag
writeU1(MethodRefTag);
@@ -2087,9 +1910,6 @@ public int literalIndexForJavaLangStringBufferToString() {
writeU2(typeIndex);
}
index = wellKnownMethods[STRINGBUFFER_TOSTRING_METHOD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the method ref constant into the constant pool
// First add the tag
writeU1(MethodRefTag);
@@ -2123,9 +1943,6 @@ public int literalIndexForJavaLangStringIntern() {
writeU2(typeIndex);
}
index = wellKnownMethods[STRING_INTERN_METHOD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the method ref constant into the constant pool
// First add the tag
writeU1(MethodRefTag);
@@ -2161,9 +1978,6 @@ public int literalIndexForJavaLangStringValueOf(int typeID) {
writeU2(typeIndex);
}
index = wellKnownMethods[VALUEOF_INT_METHOD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the method ref constant into the constant pool
// First add the tag
writeU1(MethodRefTag);
@@ -2184,9 +1998,6 @@ public int literalIndexForJavaLangStringValueOf(int typeID) {
writeU2(typeIndex);
}
index = wellKnownMethods[VALUEOF_LONG_METHOD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the method ref constant into the constant pool
// First add the tag
writeU1(MethodRefTag);
@@ -2207,9 +2018,6 @@ public int literalIndexForJavaLangStringValueOf(int typeID) {
writeU2(typeIndex);
}
index = wellKnownMethods[VALUEOF_FLOAT_METHOD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the method ref constant into the constant pool
// First add the tag
writeU1(MethodRefTag);
@@ -2230,9 +2038,6 @@ public int literalIndexForJavaLangStringValueOf(int typeID) {
writeU2(typeIndex);
}
index = wellKnownMethods[VALUEOF_DOUBLE_METHOD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the method ref constant into the constant pool
// First add the tag
writeU1(MethodRefTag);
@@ -2253,9 +2058,6 @@ public int literalIndexForJavaLangStringValueOf(int typeID) {
writeU2(typeIndex);
}
index = wellKnownMethods[VALUEOF_CHAR_METHOD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the method ref constant into the constant pool
// First add the tag
writeU1(MethodRefTag);
@@ -2276,9 +2078,6 @@ public int literalIndexForJavaLangStringValueOf(int typeID) {
writeU2(typeIndex);
}
index = wellKnownMethods[VALUEOF_BOOLEAN_METHOD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the method ref constant into the constant pool
// First add the tag
writeU1(MethodRefTag);
@@ -2299,9 +2098,6 @@ public int literalIndexForJavaLangStringValueOf(int typeID) {
writeU2(typeIndex);
}
index = wellKnownMethods[VALUEOF_OBJECT_METHOD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the method ref constant into the constant pool
// First add the tag
writeU1(MethodRefTag);
@@ -2327,9 +2123,6 @@ public int literalIndexForJavaLangSystem() {
// The entry doesn't exit yet
nameIndex = literalIndex(QualifiedNamesConstants.JavaLangSystemConstantPoolName);
index = wellKnownTypes[JAVA_LANG_SYSTEM_TYPE] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(ClassTag);
// Then add the 8 bytes representing the long
writeU2(nameIndex);
@@ -2359,9 +2152,6 @@ public int literalIndexForJavaLangSystemExitInt() {
writeU2(typeIndex);
}
index = wellKnownMethods[SYSTEM_EXIT_METHOD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the method ref constant into the constant pool
// First add the tag
writeU1(MethodRefTag);
@@ -2394,9 +2184,6 @@ public int literalIndexForJavaLangSystemOut() {
writeU2(typeIndex);
}
index = wellKnownFields[OUT_SYSTEM_FIELD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(FieldRefTag);
writeU2(classIndex);
writeU2(nameAndTypeIndex);
@@ -2416,9 +2203,6 @@ public int literalIndexForJavaLangThrowable() {
// The entry doesn't exit yet
nameIndex = literalIndex(QualifiedNamesConstants.JavaLangThrowableConstantPoolName);
index = wellKnownTypes[JAVA_LANG_THROWABLE_TYPE] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(ClassTag);
// Then add the 8 bytes representing the long
writeU2(nameIndex);
@@ -2448,9 +2232,6 @@ public int literalIndexForJavaLangThrowableGetMessage() {
writeU2(typeIndex);
}
index = wellKnownMethods[THROWABLE_GETMESSAGE_METHOD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the method ref constant into the constant pool
// First add the tag
writeU1(MethodRefTag);
@@ -2474,9 +2255,6 @@ public int literalIndexForJavaLangVoid() {
// The entry doesn't exit yet
nameIndex = literalIndex(QualifiedNamesConstants.JavaLangVoidConstantPoolName);
index = wellKnownTypes[JAVA_LANG_VOID_TYPE] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(ClassTag);
// Then add the 8 bytes representing the long
writeU2(nameIndex);
@@ -2505,9 +2283,6 @@ public int literalIndexForJavaLangVoidTYPE() {
writeU2(typeIndex);
}
index = wellKnownFields[TYPE_VOID_FIELD] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(FieldRefTag);
writeU2(classIndex);
writeU2(nameAndTypeIndex);
@@ -2574,9 +2349,6 @@ public int literalIndexForLdc(char[] stringCharArray) {
poolContent[savedCurrentOffset + 1] = (byte) length;
}
index = stringCache.put(stringCharArray, currentIndex++);
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
// Write the tag first
writeU1(StringTag);
// Then the string index
@@ -2601,9 +2373,6 @@ public int literalIndexForMethods(int nameIndex, int typeIndex, MethodBinding ke
if ((index = nameAndTypeCacheForMethods.get(key)) == -1) {
// The entry doesn't exit yet
index = nameAndTypeCacheForMethods.put(key, currentIndex++);
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(NameAndTypeTag);
writeU2(nameIndex);
writeU2(typeIndex);
@@ -2611,9 +2380,6 @@ public int literalIndexForMethods(int nameIndex, int typeIndex, MethodBinding ke
} else {
if ((index = wellKnownMethodNameAndTypes[indexOfWellKnownMethodNameAndType]) == 0) {
index = wellKnownMethodNameAndTypes[indexOfWellKnownMethodNameAndType] = currentIndex++;
- if (index > 0xFFFF){
- this.classFile.referenceBinding.scope.problemReporter().noMoreAvailableSpaceInConstantPool(this.classFile.referenceBinding.scope.referenceType());
- }
writeU1(NameAndTypeTag);
writeU2(nameIndex);
writeU2(typeIndex);
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/DoubleCache.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/DoubleCache.java
index 7711e17b19..f37583572f 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/DoubleCache.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/DoubleCache.java
@@ -1,10 +1,5 @@
package org.eclipse.jdt.internal.compiler.codegen;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
-
+
public class DoubleCache {
private double keyTable[];
private int valueTable[];
@@ -21,7 +16,7 @@ public DoubleCache() {
* Constructs a new, empty hashtable with the specified initial
* capacity.
* @param initialCapacity int
- * the initial number of buckets
+ * the initial number of buckets
*/
public DoubleCache(int initialCapacity) {
elementSize = 0;
@@ -69,7 +64,7 @@ public boolean containsKey(double key) {
* hashtable.
* @param key <CODE>double</CODE> the specified key
* @return int the element for the key or -1 if the key is not
- * defined in the hash table.
+ * defined in the hash table.
* @see ConstantPoolCache#put
*/
public int get(double key) {
@@ -120,16 +115,16 @@ public int put(double key, int value) {
public String toString() {
int max = elementSize;
StringBuffer buf = new StringBuffer();
- buf.append("{"/*nonNLS*/);
+ buf.append("{");
for (int i = 0; i < max; ++i) {
if ((keyTable[i] != 0) || ((keyTable[i] == 0) &&(valueTable[i] != 0))) {
- buf.append(keyTable[i]).append("->"/*nonNLS*/).append(valueTable[i]);
+ buf.append(keyTable[i]).append("->").append(valueTable[i]);
}
if (i < max) {
- buf.append(", "/*nonNLS*/);
+ buf.append(", ");
}
}
- buf.append("}"/*nonNLS*/);
+ buf.append("}");
return buf.toString();
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/ExceptionLabel.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/ExceptionLabel.java
index 9bfa1217c2..a081e4ea7b 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/ExceptionLabel.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/ExceptionLabel.java
@@ -6,7 +6,7 @@ package org.eclipse.jdt.internal.compiler.codegen;
*/
import org.eclipse.jdt.internal.compiler.lookup.*;
- public class ExceptionLabel extends Label {
+ public class ExceptionLabel extends Label {
public int start = POS_NOT_SET;
public int end = POS_NOT_SET;
public TypeBinding exceptionType;
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/FieldNameAndTypeCache.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/FieldNameAndTypeCache.java
index 4ea1f89a1c..cdd56fc7a2 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/FieldNameAndTypeCache.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/FieldNameAndTypeCache.java
@@ -143,16 +143,16 @@ public int size() {
public String toString() {
int max = size();
StringBuffer buf = new StringBuffer();
- buf.append("{"/*nonNLS*/);
+ buf.append("{");
for (int i = 0; i < max; ++i) {
if (keyTable[i] != null) {
- buf.append(keyTable[i]).append("->"/*nonNLS*/).append(valueTable[i]);
+ buf.append(keyTable[i]).append("->").append(valueTable[i]);
}
if (i < max) {
- buf.append(", "/*nonNLS*/);
+ buf.append(", ");
}
}
- buf.append("}"/*nonNLS*/);
+ buf.append("}");
return buf.toString();
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/FloatCache.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/FloatCache.java
index 3480a6c7fa..d0bdf01cfb 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/FloatCache.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/FloatCache.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.codegen;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public class FloatCache {
private float keyTable[];
@@ -21,7 +16,7 @@ public FloatCache() {
* Constructs a new, empty hashtable with the specified initial
* capacity.
* @param initialCapacity int
- * the initial number of buckets
+ * the initial number of buckets
*/
public FloatCache(int initialCapacity) {
elementSize = 0;
@@ -69,7 +64,7 @@ public boolean containsKey(float key) {
* hashtable.
* @param key <CODE>float</CODE> the specified key
* @return int the element for the key or -1 if the key is not
- * defined in the hash table.
+ * defined in the hash table.
* @see ConstantPoolCache#put
*/
public int get(float key) {
@@ -120,16 +115,16 @@ public int put(float key, int value) {
public String toString() {
int max = elementSize;
StringBuffer buf = new StringBuffer();
- buf.append("{"/*nonNLS*/);
+ buf.append("{");
for (int i = 0; i < max; ++i) {
if ((keyTable[i] != 0) || ((keyTable[i] == 0) && (valueTable[i] != 0))) {
- buf.append(keyTable[i]).append("->"/*nonNLS*/).append(valueTable[i]);
+ buf.append(keyTable[i]).append("->").append(valueTable[i]);
}
if (i < max) {
- buf.append(", "/*nonNLS*/);
+ buf.append(", ");
}
}
- buf.append("}"/*nonNLS*/);
+ buf.append("}");
return buf.toString();
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/IntegerCache.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/IntegerCache.java
index d49b8b3413..3879a3f49e 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/IntegerCache.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/IntegerCache.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.codegen;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public class IntegerCache {
public int keyTable[];
@@ -22,7 +17,7 @@ public IntegerCache() {
* Constructs a new, empty hashtable with the specified initial
* capacity.
* @param initialCapacity int
- * the initial number of buckets
+ * the initial number of buckets
*/
public IntegerCache(int initialCapacity) {
elementSize = 0;
@@ -59,7 +54,7 @@ public boolean containsKey(int key) {
* hashtable.
* @param key <CODE>double</CODE> the specified key
* @return int the element for the key or -1 if the key is not
- * defined in the hash table.
+ * defined in the hash table.
* @see ConstantPoolCache#put
*/
public int get(int key) {
@@ -138,16 +133,16 @@ public int size() {
public String toString() {
int max = size();
StringBuffer buf = new StringBuffer();
- buf.append("{"/*nonNLS*/);
+ buf.append("{");
for (int i = 0; i < max; ++i) {
if ((keyTable[i] != 0) || ((keyTable[i] == 0) && (valueTable[i] != 0))) {
- buf.append(keyTable[i]).append("->"/*nonNLS*/).append(valueTable[i]);
+ buf.append(keyTable[i]).append("->").append(valueTable[i]);
}
if (i < max) {
- buf.append(", "/*nonNLS*/);
+ buf.append(", ");
}
}
- buf.append("}"/*nonNLS*/);
+ buf.append("}");
return buf.toString();
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/Label.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/Label.java
index a621896173..0891b99f4a 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/Label.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/Label.java
@@ -190,14 +190,14 @@ public void place() { // Currently lacking wide support.
* Print out the receiver
*/
public String toString() {
- StringBuffer buffer = new StringBuffer("(position="/*nonNLS*/);
+ StringBuffer buffer = new StringBuffer("(position=");
buffer.append(position);
- buffer.append(", forwards = ["/*nonNLS*/);
+ buffer.append(", forwards = [");
for (int i = 0; i < forwardReferenceCount - 1; i++)
- buffer.append(forwardReferences[i] + ", "/*nonNLS*/);
+ buffer.append(forwardReferences[i] + ", ");
if (forwardReferenceCount >= 1)
buffer.append(forwardReferences[forwardReferenceCount-1]);
- buffer.append("] )"/*nonNLS*/);
+ buffer.append("] )");
return buffer.toString();
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/LongCache.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/LongCache.java
index a59397fbb5..bb8579f36a 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/LongCache.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/LongCache.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.codegen;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public class LongCache {
public long keyTable[];
@@ -22,7 +17,7 @@ public LongCache() {
* Constructs a new, empty hashtable with the specified initial
* capacity.
* @param initialCapacity int
- * the initial number of buckets
+ * the initial number of buckets
*/
public LongCache(int initialCapacity) {
elementSize = 0;
@@ -59,7 +54,7 @@ public boolean containsKey(long key) {
* hashtable.
* @param key <CODE>long</CODE> the specified key
* @return int the element for the key or -1 if the key is not
- * defined in the hash table.
+ * defined in the hash table.
* @see ConstantPoolCache#put
*/
public int get(long key) {
@@ -138,16 +133,16 @@ public int size() {
public String toString() {
int max = size();
StringBuffer buf = new StringBuffer();
- buf.append("{"/*nonNLS*/);
+ buf.append("{");
for (int i = 0; i < max; ++i) {
if ((keyTable[i] != 0) || ((keyTable[i] == 0) && (valueTable[i] != 0))) {
- buf.append(keyTable[i]).append("->"/*nonNLS*/).append(valueTable[i]);
+ buf.append(keyTable[i]).append("->").append(valueTable[i]);
}
if (i < max) {
- buf.append(", "/*nonNLS*/);
+ buf.append(", ");
}
}
- buf.append("}"/*nonNLS*/);
+ buf.append("}");
return buf.toString();
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/MethodNameAndTypeCache.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/MethodNameAndTypeCache.java
index 2d50853c64..b4fba366da 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/MethodNameAndTypeCache.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/MethodNameAndTypeCache.java
@@ -144,16 +144,16 @@ public int size() {
public String toString() {
int max = size();
StringBuffer buf = new StringBuffer();
- buf.append("{"/*nonNLS*/);
+ buf.append("{");
for (int i = 0; i < max; ++i) {
if (keyTable[i] != null) {
- buf.append(keyTable[i]).append("->"/*nonNLS*/).append(valueTable[i]);
+ buf.append(keyTable[i]).append("->").append(valueTable[i]);
}
if (i < max) {
- buf.append(", "/*nonNLS*/);
+ buf.append(", ");
}
}
- buf.append("}"/*nonNLS*/);
+ buf.append("}");
return buf.toString();
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/ObjectCache.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/ObjectCache.java
index 63cb51f249..ab710081ee 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/ObjectCache.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/ObjectCache.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.codegen;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public class ObjectCache {
public Object keyTable[];
@@ -21,7 +16,7 @@ public ObjectCache() {
* Constructs a new, empty hashtable with the specified initial
* capacity.
* @param initialCapacity int
- * the initial number of buckets
+ * the initial number of buckets
*/
public ObjectCache(int initialCapacity) {
this.elementSize = 0;
@@ -58,7 +53,7 @@ public boolean containsKey(Object key) {
* hashtable.
* @param key <CODE>char[]</CODE> the specified key
* @return int the element for the key or -1 if the key is not
- * defined in the hash table.
+ * defined in the hash table.
* @see ConstantPoolCache#put
*/
public int get(Object key) {
@@ -135,16 +130,16 @@ public int size() {
public String toString() {
int max = size();
StringBuffer buf = new StringBuffer();
- buf.append("{"/*nonNLS*/);
+ buf.append("{");
for (int i = 0; i < max; ++i) {
if (keyTable[i] != null) {
- buf.append(keyTable[i]).append("->"/*nonNLS*/).append(valueTable[i]);
+ buf.append(keyTable[i]).append("->").append(valueTable[i]);
}
if (i < max) {
- buf.append(", "/*nonNLS*/);
+ buf.append(", ");
}
}
- buf.append("}"/*nonNLS*/);
+ buf.append("}");
return buf.toString();
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/Opcodes.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/Opcodes.java
index 7e6861ce86..224cdd1909 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/Opcodes.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/Opcodes.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.codegen;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public interface Opcodes {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/QualifiedNamesConstants.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/QualifiedNamesConstants.java
index edefbdd641..0330b3e8b0 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/QualifiedNamesConstants.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/codegen/QualifiedNamesConstants.java
@@ -6,26 +6,26 @@ package org.eclipse.jdt.internal.compiler.codegen;
import org.eclipse.jdt.internal.compiler.problem.*;
public interface QualifiedNamesConstants {
- char[] JavaLangObjectConstantPoolName = "java/lang/Object"/*nonNLS*/.toCharArray();
- char[] JavaLangStringConstantPoolName = "java/lang/String"/*nonNLS*/.toCharArray();
- char[] JavaLangStringBufferConstantPoolName = "java/lang/StringBuffer"/*nonNLS*/.toCharArray();
- char[] JavaLangClassConstantPoolName = "java/lang/Class"/*nonNLS*/.toCharArray();
- char[] JavaLangThrowableConstantPoolName = "java/lang/Throwable"/*nonNLS*/.toCharArray();
- char[] JavaLangClassNotFoundExceptionConstantPoolName = "java/lang/ClassNotFoundException"/*nonNLS*/.toCharArray();
- char[] JavaLangNoClassDefFoundErrorConstantPoolName = "java/lang/NoClassDefFoundError"/*nonNLS*/.toCharArray();
- char[] JavaLangIntegerConstantPoolName = "java/lang/Integer"/*nonNLS*/.toCharArray();
- char[] JavaLangFloatConstantPoolName = "java/lang/Float"/*nonNLS*/.toCharArray();
- char[] JavaLangDoubleConstantPoolName = "java/lang/Double"/*nonNLS*/.toCharArray();
- char[] JavaLangLongConstantPoolName = "java/lang/Long"/*nonNLS*/.toCharArray();
- char[] JavaLangShortConstantPoolName = "java/lang/Short"/*nonNLS*/.toCharArray();
- char[] JavaLangByteConstantPoolName = "java/lang/Byte"/*nonNLS*/.toCharArray();
- char[] JavaLangCharacterConstantPoolName = "java/lang/Character"/*nonNLS*/.toCharArray();
- char[] JavaLangVoidConstantPoolName = "java/lang/Void"/*nonNLS*/.toCharArray();
- char[] JavaLangBooleanConstantPoolName = "java/lang/Boolean"/*nonNLS*/.toCharArray();
- char[] JavaLangSystemConstantPoolName = "java/lang/System"/*nonNLS*/.toCharArray();
- char[] JavaLangErrorConstantPoolName = "java/lang/Error"/*nonNLS*/.toCharArray();
- char[] JavaLangExceptionConstantPoolName = "java/lang/Exception"/*nonNLS*/.toCharArray();
- char[] JavaLangReflectConstructor = "java/lang/reflect/Constructor"/*nonNLS*/.toCharArray();
+ char[] JavaLangObjectConstantPoolName = "java/lang/Object".toCharArray();
+ char[] JavaLangStringConstantPoolName = "java/lang/String".toCharArray();
+ char[] JavaLangStringBufferConstantPoolName = "java/lang/StringBuffer".toCharArray();
+ char[] JavaLangClassConstantPoolName = "java/lang/Class".toCharArray();
+ char[] JavaLangThrowableConstantPoolName = "java/lang/Throwable".toCharArray();
+ char[] JavaLangClassNotFoundExceptionConstantPoolName = "java/lang/ClassNotFoundException".toCharArray();
+ char[] JavaLangNoClassDefFoundErrorConstantPoolName = "java/lang/NoClassDefFoundError".toCharArray();
+ char[] JavaLangIntegerConstantPoolName = "java/lang/Integer".toCharArray();
+ char[] JavaLangFloatConstantPoolName = "java/lang/Float".toCharArray();
+ char[] JavaLangDoubleConstantPoolName = "java/lang/Double".toCharArray();
+ char[] JavaLangLongConstantPoolName = "java/lang/Long".toCharArray();
+ char[] JavaLangShortConstantPoolName = "java/lang/Short".toCharArray();
+ char[] JavaLangByteConstantPoolName = "java/lang/Byte".toCharArray();
+ char[] JavaLangCharacterConstantPoolName = "java/lang/Character".toCharArray();
+ char[] JavaLangVoidConstantPoolName = "java/lang/Void".toCharArray();
+ char[] JavaLangBooleanConstantPoolName = "java/lang/Boolean".toCharArray();
+ char[] JavaLangSystemConstantPoolName = "java/lang/System".toCharArray();
+ char[] JavaLangErrorConstantPoolName = "java/lang/Error".toCharArray();
+ char[] JavaLangExceptionConstantPoolName = "java/lang/Exception".toCharArray();
+ char[] JavaLangReflectConstructor = "java/lang/reflect/Constructor".toCharArray();
char[] Append = new char[] {'a', 'p', 'p', 'e', 'n', 'd'};
char[] ToString = new char[] {'t', 'o', 'S', 't', 'r', 'i', 'n', 'g'};
char[] Init = new char[] {'<', 'i', 'n', 'i', 't', '>'};
@@ -33,41 +33,41 @@ public interface QualifiedNamesConstants {
char[] ValueOf = new char[] {'v', 'a', 'l', 'u', 'e', 'O', 'f'};
char[] ForName = new char[] {'f', 'o', 'r', 'N', 'a', 'm', 'e'};
char[] GetMessage = new char[] {'g', 'e', 't', 'M', 'e', 's', 's', 'a', 'g', 'e'};
- char[] NewInstance = "newInstance"/*nonNLS*/.toCharArray();
- char[] GetConstructor = "getConstructor"/*nonNLS*/.toCharArray();
+ char[] NewInstance = "newInstance".toCharArray();
+ char[] GetConstructor = "getConstructor".toCharArray();
char[] Exit = new char[] {'e', 'x', 'i', 't'};
- char[] Intern = "intern"/*nonNLS*/.toCharArray();
+ char[] Intern = "intern".toCharArray();
char[] Out = new char[] {'o', 'u', 't'};
char[] TYPE = new char[] {'T', 'Y', 'P', 'E'};
char[] This = new char[] {'t', 'h', 'i', 's'};
char[] JavaLangClassSignature = new char[] {'L', 'j', 'a', 'v', 'a', '/', 'l', 'a', 'n', 'g', '/', 'C', 'l', 'a', 's', 's', ';'};
- char[] ForNameSignature = "(Ljava/lang/String;)Ljava/lang/Class;"/*nonNLS*/.toCharArray();
- char[] GetMessageSignature = "()Ljava/lang/String;"/*nonNLS*/.toCharArray();
- char[] GetConstructorSignature = "([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;"/*nonNLS*/.toCharArray();
- char[] StringConstructorSignature = "(Ljava/lang/String;)V"/*nonNLS*/.toCharArray();
- char[] NewInstanceSignature = "([Ljava/lang/Object;)Ljava/lang/Object;"/*nonNLS*/.toCharArray();
+ char[] ForNameSignature = "(Ljava/lang/String;)Ljava/lang/Class;".toCharArray();
+ char[] GetMessageSignature = "()Ljava/lang/String;".toCharArray();
+ char[] GetConstructorSignature = "([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;".toCharArray();
+ char[] StringConstructorSignature = "(Ljava/lang/String;)V".toCharArray();
+ char[] NewInstanceSignature = "([Ljava/lang/Object;)Ljava/lang/Object;".toCharArray();
char[] DefaultConstructorSignature = {'(', ')', 'V'};
char[] ClinitSignature = DefaultConstructorSignature;
char[] ToStringSignature = GetMessageSignature;
char[] InternSignature = GetMessageSignature;
- char[] AppendIntSignature = "(I)Ljava/lang/StringBuffer;"/*nonNLS*/.toCharArray();
- char[] AppendLongSignature = "(J)Ljava/lang/StringBuffer;"/*nonNLS*/.toCharArray();
- char[] AppendFloatSignature = "(F)Ljava/lang/StringBuffer;"/*nonNLS*/.toCharArray();
- char[] AppendDoubleSignature = "(D)Ljava/lang/StringBuffer;"/*nonNLS*/.toCharArray();
- char[] AppendCharSignature = "(C)Ljava/lang/StringBuffer;"/*nonNLS*/.toCharArray();
- char[] AppendBooleanSignature = "(Z)Ljava/lang/StringBuffer;"/*nonNLS*/.toCharArray();
- char[] AppendObjectSignature = "(Ljava/lang/Object;)Ljava/lang/StringBuffer;"/*nonNLS*/.toCharArray();
- char[] AppendStringSignature = "(Ljava/lang/String;)Ljava/lang/StringBuffer;"/*nonNLS*/.toCharArray();
- char[] ValueOfObjectSignature = "(Ljava/lang/Object;)Ljava/lang/String;"/*nonNLS*/.toCharArray();
- char[] ValueOfIntSignature = "(I)Ljava/lang/String;"/*nonNLS*/.toCharArray();
- char[] ValueOfLongSignature = "(J)Ljava/lang/String;"/*nonNLS*/.toCharArray();
- char[] ValueOfCharSignature = "(C)Ljava/lang/String;"/*nonNLS*/.toCharArray();
- char[] ValueOfBooleanSignature = "(Z)Ljava/lang/String;"/*nonNLS*/.toCharArray();
- char[] ValueOfDoubleSignature = "(D)Ljava/lang/String;"/*nonNLS*/.toCharArray();
- char[] ValueOfFloatSignature = "(F)Ljava/lang/String;"/*nonNLS*/.toCharArray();
- char[] JavaIoPrintStreamSignature = "Ljava/io/PrintStream;"/*nonNLS*/.toCharArray();
+ char[] AppendIntSignature = "(I)Ljava/lang/StringBuffer;".toCharArray();
+ char[] AppendLongSignature = "(J)Ljava/lang/StringBuffer;".toCharArray();
+ char[] AppendFloatSignature = "(F)Ljava/lang/StringBuffer;".toCharArray();
+ char[] AppendDoubleSignature = "(D)Ljava/lang/StringBuffer;".toCharArray();
+ char[] AppendCharSignature = "(C)Ljava/lang/StringBuffer;".toCharArray();
+ char[] AppendBooleanSignature = "(Z)Ljava/lang/StringBuffer;".toCharArray();
+ char[] AppendObjectSignature = "(Ljava/lang/Object;)Ljava/lang/StringBuffer;".toCharArray();
+ char[] AppendStringSignature = "(Ljava/lang/String;)Ljava/lang/StringBuffer;".toCharArray();
+ char[] ValueOfObjectSignature = "(Ljava/lang/Object;)Ljava/lang/String;".toCharArray();
+ char[] ValueOfIntSignature = "(I)Ljava/lang/String;".toCharArray();
+ char[] ValueOfLongSignature = "(J)Ljava/lang/String;".toCharArray();
+ char[] ValueOfCharSignature = "(C)Ljava/lang/String;".toCharArray();
+ char[] ValueOfBooleanSignature = "(Z)Ljava/lang/String;".toCharArray();
+ char[] ValueOfDoubleSignature = "(D)Ljava/lang/String;".toCharArray();
+ char[] ValueOfFloatSignature = "(F)Ljava/lang/String;".toCharArray();
+ char[] JavaIoPrintStreamSignature = "Ljava/io/PrintStream;".toCharArray();
char[] ExitIntSignature = new char[] {'(', 'I', ')', 'V'};
- char[] ArrayJavaLangObjectConstantPoolName = "[Ljava/lang/Object;"/*nonNLS*/.toCharArray();
- char[] ArrayJavaLangClassConstantPoolName = "[Ljava/lang/Class;"/*nonNLS*/.toCharArray();
+ char[] ArrayJavaLangObjectConstantPoolName = "[Ljava/lang/Object;".toCharArray();
+ char[] ArrayJavaLangClassConstantPoolName = "[Ljava/lang/Class;".toCharArray();
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryMethod.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryMethod.java
index e1b24ec685..8aa155e8d7 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryMethod.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryMethod.java
@@ -1,15 +1,4 @@
package org.eclipse.jdt.internal.compiler.env;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
-
-// clinit methods (synthetics too?) can be returned from IBinaryType>>getMethods()
-// BUT do not have to be... the compiler will ignore them when building the binding.
-// The synthetic argument of a member type's constructor (ie. the first arg of a non-static
-// member type) is also ignored by the compiler, BUT in this case it must be included
-// in the constructor's signature.
public interface IBinaryMethod extends IGenericMethod {
/**
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryNestedType.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryNestedType.java
index 0bc363b43c..15a4587233 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryNestedType.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryNestedType.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.env;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public interface IBinaryNestedType {
/**
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryType.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryType.java
index 6b0bee412c..9fa5bd355d 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryType.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryType.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.env;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public interface IBinaryType extends IGenericType {
@@ -67,12 +62,4 @@ char[] getName();
*/
char[] getSuperclassName();
-
-/**
- * Answer the source file attribute, or null if none.
- *
- * For example, "String.java"
- */
-
-char[] sourceFileName();
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ICompilationUnit.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ICompilationUnit.java
index 1ce4eecd68..2d4efa104c 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ICompilationUnit.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ICompilationUnit.java
@@ -1,13 +1,5 @@
package org.eclipse.jdt.internal.compiler.env;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
-/**
- * This interface denotes a compilation unit, providing its name and content.
- */
public interface ICompilationUnit extends IDependent {
/**
* Answer the contents of the compilation unit.
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IConstants.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IConstants.java
index 48efe75c98..ff189d051e 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IConstants.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IConstants.java
@@ -1,13 +1,5 @@
package org.eclipse.jdt.internal.compiler.env;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
-/**
- * This interface defines constants for use by the builder / compiler interface.
- */
public interface IConstants {
/*
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IDependent.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IDependent.java
index 5663ff6acb..e61401d16d 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IDependent.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IDependent.java
@@ -1,18 +1,5 @@
package org.eclipse.jdt.internal.compiler.env;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
-/**
- * This represents the target (ie. the file) of a type dependency.
- *
- * All implementors of this interface are containers for types or types
- * themselves which must be able to identify their source file name
- * when file dependencies are collected.
- * @see IDependencyInfo
- */
public interface IDependent {
/**
* Answer the file name which defines the type.
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IGenericField.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IGenericField.java
index 7b22b39dc8..dcf9264ae3 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IGenericField.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IGenericField.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.env;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public interface IGenericField {
/**
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IGenericMethod.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IGenericMethod.java
index 52b385d665..3fc4d5cd04 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IGenericMethod.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IGenericMethod.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.env;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public interface IGenericMethod {
/**
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IGenericType.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IGenericType.java
index 3050edea9f..5fd27dc858 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IGenericType.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IGenericType.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.env;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public interface IGenericType extends IDependent {
/**
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/INameEnvironment.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/INameEnvironment.java
index a58d100901..bf64e8edb7 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/INameEnvironment.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/INameEnvironment.java
@@ -1,16 +1,5 @@
package org.eclipse.jdt.internal.compiler.env;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
-/**
- * The name environment provides a callback API that the compiler
- * can use to look up types, compilation units, and packages in the
- * current environment. The name environment is passed to the compiler
- * on creation.
- */
public interface INameEnvironment {
/**
* Find a type with the given compound name.
@@ -48,8 +37,8 @@ NameEnvironmentAnswer findType(char[] typeName, char[][] packageName);
* The default package is always assumed to exist.
*
* For example:
- * isPackage({{java}, {awt}}, {event});
- * isPackage(null, {java});
+ * isPackage({{java}, {awt}}, {event});
+ * isPackage(null, {java});
*/
boolean isPackage(char[][] parentPackageName, char[] packageName);
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ISourceField.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ISourceField.java
index 5dfd047456..d6cf1c9273 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ISourceField.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ISourceField.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.env;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public interface ISourceField extends IGenericField {
/**
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ISourceMethod.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ISourceMethod.java
index a83406ee11..d6bf432987 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ISourceMethod.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ISourceMethod.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.env;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public interface ISourceMethod extends IGenericMethod {
/**
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ISourceType.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ISourceType.java
index 3e2790d59e..25370d78db 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ISourceType.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ISourceType.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.env;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public interface ISourceType extends IGenericType {
/**
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/NameEnvironmentAnswer.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/NameEnvironmentAnswer.java
index ecfee241e1..a0a88ade0a 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/NameEnvironmentAnswer.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/NameEnvironmentAnswer.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.env;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public class NameEnvironmentAnswer {
// only one of the three can be set
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/ConditionalFlowInfo.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/ConditionalFlowInfo.java
index 307d43a2d6..d9e0b9430a 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/ConditionalFlowInfo.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/ConditionalFlowInfo.java
@@ -114,7 +114,7 @@ public UnconditionalFlowInfo mergedWith(UnconditionalFlowInfo otherInits) {
return unconditionalInits().mergedWith(otherInits);
}
public String toString() {
- return "FlowInfo<true: "/*nonNLS*/ + initsWhenTrue.toString() + ", false: "/*nonNLS*/ + initsWhenFalse.toString() + ">"/*nonNLS*/;
+ return "FlowInfo<true: " + initsWhenTrue.toString() + ", false: " + initsWhenFalse.toString() + ">";
}
public UnconditionalFlowInfo unconditionalInits() {
return initsWhenTrue.unconditionalInits().copy()
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/ExceptionHandlingFlowContext.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/ExceptionHandlingFlowContext.java
index 426698c29c..f7800949d6 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/ExceptionHandlingFlowContext.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/ExceptionHandlingFlowContext.java
@@ -91,7 +91,7 @@ public void complainIfUnusedExceptionHandlers(AstNode[] exceptionHandlers, Block
tryStatement.preserveExceptionHandler = isNeeded;
}
public String individualToString() {
- StringBuffer buffer = new StringBuffer("Exception flow context"/*nonNLS*/);
+ StringBuffer buffer = new StringBuffer("Exception flow context");
int length = handledExceptions.length;
for (int i = 0; i < length; i++) {
int cacheIndex = i / BitCacheSize;
@@ -99,12 +99,12 @@ public String individualToString() {
buffer.append('[').append(handledExceptions[i].readableName());
if ((isReached[cacheIndex] & bitMask) != 0) {
if ((isNeeded[cacheIndex] & bitMask) == 0) {
- buffer.append("-masked"/*nonNLS*/);
+ buffer.append("-masked");
} else {
- buffer.append("-reached"/*nonNLS*/);
+ buffer.append("-reached");
}
} else {
- buffer.append("-not reached"/*nonNLS*/);
+ buffer.append("-not reached");
}
buffer.append('-').append(initsOnExceptions[i].toString()).append(']');
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/FlowContext.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/FlowContext.java
index 329ccbf5a7..c278d20de6 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/FlowContext.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/FlowContext.java
@@ -326,7 +326,7 @@ public FlowContext getTargetContextForDefaultContinue() {
return null;
}
public String individualToString(){
- return "Flow context"/*nonNLS*/;
+ return "Flow context";
}
public FlowInfo initsOnBreak() {
return FlowInfo.DeadEnd;
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/FlowInfo.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/FlowInfo.java
index 74ef42cdec..9adc7d5e6e 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/FlowInfo.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/FlowInfo.java
@@ -37,7 +37,7 @@ final public boolean isDeadEnd() {
/**
* Check status of definite assignment for a field.
*/
- abstract public boolean isDefinitelyAssigned(FieldBinding field);
+ abstract public boolean isDefinitelyAssigned(FieldBinding field);
/**
* Check status of definite assignment for a local.
*/
@@ -46,11 +46,11 @@ abstract public boolean isFakeReachable();
/**
* Check status of potential assignment for a field.
*/
- abstract public boolean isPotentiallyAssigned(FieldBinding field);
+ abstract public boolean isPotentiallyAssigned(FieldBinding field);
/**
* Check status of potential assignment for a local variable.
*/
- abstract public boolean isPotentiallyAssigned(LocalVariableBinding field);
+ abstract public boolean isPotentiallyAssigned(LocalVariableBinding field);
/**
* Record a field got definitely assigned.
*/
@@ -71,7 +71,7 @@ abstract public FlowInfo markAsFakeReachable(boolean isFakeReachable);
abstract public UnconditionalFlowInfo mergedWith(UnconditionalFlowInfo otherInits);
public String toString(){
if (this == DeadEnd){
- return "FlowInfo.DeadEnd"/*nonNLS*/;
+ return "FlowInfo.DeadEnd";
}
return super.toString();
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/LabelFlowContext.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/LabelFlowContext.java
index 0a6542874b..efc01331e4 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/LabelFlowContext.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/LabelFlowContext.java
@@ -38,7 +38,7 @@ void checkLabelValidity(BlockScope scope) {
}
}
public String individualToString(){
- return "Label flow context [label:"/*nonNLS*/+String.valueOf(labelName)+"]"/*nonNLS*/;
+ return "Label flow context [label:"+String.valueOf(labelName)+"]";
}
public char[] labelName() {
return labelName;
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/LoopingFlowContext.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/LoopingFlowContext.java
index 93acbaf5c0..bfb76a5726 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/LoopingFlowContext.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/LoopingFlowContext.java
@@ -56,7 +56,7 @@ public Label continueLabel() {
return continueLabel;
}
public String individualToString(){
- return "Looping flow context"/*nonNLS*/;
+ return "Looping flow context";
}
public boolean isContinuable() {
return true;
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/SwitchFlowContext.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/SwitchFlowContext.java
index 33a77b5fbd..b2600361b4 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/SwitchFlowContext.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/SwitchFlowContext.java
@@ -28,7 +28,7 @@ public Label breakLabel() {
return breakLabel;
}
public String individualToString(){
- return "Switch flow context"/*nonNLS*/;
+ return "Switch flow context";
}
public boolean isBreakable() {
return true;
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/UnconditionalFlowInfo.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/UnconditionalFlowInfo.java
index 77b1654423..a728c81994 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/UnconditionalFlowInfo.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/flow/UnconditionalFlowInfo.java
@@ -187,9 +187,8 @@ final private boolean isDefinitelyAssigned(int position) {
* Check status of definite assignment for a field.
*/
final public boolean isDefinitelyAssigned(FieldBinding field) {
- // Dependant of CodeStream.isDefinitelyAssigned(..)
// We do not want to complain in unreachable code
- if ((this == DeadEnd) || (this.isFakeReachable))
+ if (this == DeadEnd)
return true;
return isDefinitelyAssigned(field.id);
}
@@ -420,9 +419,9 @@ static int numberOfEnclosingFields(ReferenceBinding type){
}
public String toString(){
if (this == DeadEnd){
- return "FlowInfo.DeadEnd"/*nonNLS*/;
+ return "FlowInfo.DeadEnd";
}
- return "FlowInfo<def: "/*nonNLS*/+ definiteInits +", pot: "/*nonNLS*/ + potentialInits + ">"/*nonNLS*/;
+ return "FlowInfo<def: "+ definiteInits +", pot: " + potentialInits + ">";
}
public UnconditionalFlowInfo unconditionalInits() {
// also see conditional inits, where it requests them to merge
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/BooleanConstant.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/BooleanConstant.java
index 7f9a4216cc..79629b9bb2 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/BooleanConstant.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/BooleanConstant.java
@@ -23,13 +23,13 @@ public String stringValue() {
String s = new Boolean(value).toString() ;
if (s == null)
- return "null"/*nonNLS*/;
+ return "null";
else
return s;
}
public String toString(){
- return "(boolean)"/*nonNLS*/ + value ; }
+ return "(boolean)" + value ; }
public int typeID() {
return T_boolean;
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ByteConstant.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ByteConstant.java
index 5d88da8890..ab623e1ffb 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ByteConstant.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ByteConstant.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.impl;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public class ByteConstant extends Constant {
byte value;
@@ -36,13 +31,13 @@ public String stringValue() {
String s = new Integer(value).toString() ;
if (s == null)
- return "null"/*nonNLS*/;
+ return "null";
else
return s;
}
public String toString(){
- return "(byte)"/*nonNLS*/ + value ; }
+ return "(byte)" + value ; }
public int typeID() {
return T_byte;
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CharConstant.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CharConstant.java
index 5b402138bd..f797adfeb1 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CharConstant.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CharConstant.java
@@ -39,13 +39,13 @@ public String stringValue() {
String s = new Character(value).toString() ;
if (s == null)
- return "null"/*nonNLS*/;
+ return "null";
else
return s;
}
public String toString(){
- return "(char)"/*nonNLS*/ + value ; }
+ return "(char)" + value ; }
public int typeID() {
return T_char;
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
index 3360076733..0ef81272a9 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
@@ -46,7 +46,7 @@ public class CompilerOptions implements ConfigurableProblems, ProblemIrritants,
public boolean parseLiteralExpressionsAsConstants = true;
// exception raised for unresolved compile errors
- public String runtimeExceptionNameForCompileError = "java.lang.Error"/*nonNLS*/;
+ public String runtimeExceptionNameForCompileError = "java.lang.Error";
// toggle private access emulation for 1.2 (constr. accessor has extra arg on constructor) or 1.3 (make private constructor default access when access needed)
public boolean isPrivateConstructorAccessChangingVisibility = false; // by default, follows 1.2
@@ -79,79 +79,74 @@ public ConfigurableOption[] getConfigurableOptions(Locale locale) {
return new ConfigurableOption[] {
new ConfigurableOption(
componentName,
- "debug.vars"/*nonNLS*/,
+ "debug.vars",
locale,
(produceDebugAttributes & Vars) != 0 ? 0 : 1),
new ConfigurableOption(
componentName,
- "debug.lines"/*nonNLS*/,
+ "debug.lines",
locale,
(produceDebugAttributes & Lines) != 0 ? 0 : 1),
new ConfigurableOption(
componentName,
- "debug.source"/*nonNLS*/,
+ "debug.source",
locale,
(produceDebugAttributes & Source) != 0 ? 0 : 1),
new ConfigurableOption(
componentName,
- "debug.preserveAllLocals"/*nonNLS*/,
+ "debug.preserveAllLocals",
locale,
preserveAllLocalVariables ? 0 : 1),
new ConfigurableOption(
componentName,
- "optionalError.unReachableCode"/*nonNLS*/,
+ "optionalError.unReachableCode",
locale,
(errorThreshold & UnreachableCode) != 0 ? 0 : 1),
new ConfigurableOption(
componentName,
- "optionalError.importProblem"/*nonNLS*/,
+ "optionalError.importProblem",
locale,
(errorThreshold & ImportProblem) != 0 ? 0 : 1),
new ConfigurableOption(
componentName,
- "optionalWarning.methodWithConstructorName"/*nonNLS*/,
+ "optionalWarning.methodWithConstructorName",
locale,
(warningThreshold & MethodWithConstructorName) != 0 ? 0 : 1),
new ConfigurableOption(
componentName,
- "optionalWarning.overridingPackageDefaultMethod"/*nonNLS*/,
+ "optionalWarning.overridingPackageDefaultMethod",
locale,
(warningThreshold & OverriddenPackageDefaultMethod) != 0 ? 0 : 1),
new ConfigurableOption(
componentName,
- "optionalWarning.deprecated"/*nonNLS*/,
+ "optionalWarning.deprecated",
locale,
(warningThreshold & UsingDeprecatedAPI) != 0 ? 0 : 1),
new ConfigurableOption(
componentName,
- "optionalWarning.maskedCatchBlock"/*nonNLS*/,
+ "optionalWarning.maskedCatchBlock",
locale,
(warningThreshold & MaskedCatchBlock) != 0 ? 0 : 1),
new ConfigurableOption(
componentName,
- "optionalWarning.unusedLocalVariable"/*nonNLS*/,
+ "optionalWarning.unusedLocalVariable",
locale,
(warningThreshold & UnusedLocalVariable) != 0 ? 0 : 1),
new ConfigurableOption(
componentName,
- "optionalWarning.unusedArgument"/*nonNLS*/,
+ "optionalWarning.unusedArgument",
locale,
(warningThreshold & UnusedArgument) != 0 ? 0 : 1),
new ConfigurableOption(
componentName,
- "binaryCompatibility.targetJDK"/*nonNLS*/,
+ "binaryCompatibility.targetJDK",
locale,
targetJDK),
new ConfigurableOption(
componentName,
- "optionalWarning.accessEmulation"/*nonNLS*/,
+ "optionalWarning.accessEmulation",
locale,
- (warningThreshold & AccessEmulation) != 0 ? 0 : 1),
- new ConfigurableOption(
- componentName,
- "optionalWarning.nonExternalizedString"/*nonNLS*/,
- locale,
- (warningThreshold & NonExternalizedString) != 0 ? 0 : 1)
+ (warningThreshold & AccessEmulation) != 0 ? 0 : 1)
};
}
public int getDebugAttributesMask() {
@@ -358,9 +353,6 @@ void setOption(ConfigurableOption setting) {
case 15: // synthetic access emulation
handleAccessEmulationAsWarning(setting.getCurrentValueIndex() == 0);
break;
- case 16: // non externalized string literal
- handleNonExternalizedStringLiteralAsWarning(setting.getCurrentValueIndex() == 0);
- break;
}
}
public void setTargetJDK(int vmID) {
@@ -374,140 +366,110 @@ public void setWarningThreshold(int warningMask) {
}
public String toString() {
- StringBuffer buf = new StringBuffer("CompilerOptions:"/*nonNLS*/);
+ StringBuffer buf = new StringBuffer("CompilerOptions:");
if ((produceDebugAttributes & Vars) != 0){
- buf.append("\n-local variables debug attributes: ON"/*nonNLS*/);
+ buf.append("\n-local variables debug attributes: ON");
} else {
- buf.append("\n-local variables debug attributes: OFF"/*nonNLS*/);
+ buf.append("\n-local variables debug attributes: OFF");
}
if ((produceDebugAttributes & Lines) != 0){
- buf.append("\n-line number debug attributes: ON"/*nonNLS*/);
+ buf.append("\n-line number debug attributes: ON");
} else {
- buf.append("\n-line number debug attributes: OFF"/*nonNLS*/);
+ buf.append("\n-line number debug attributes: OFF");
}
if ((produceDebugAttributes & Source) != 0){
- buf.append("\n-source debug attributes: ON"/*nonNLS*/);
+ buf.append("\n-source debug attributes: ON");
} else {
- buf.append("\n-source debug attributes: OFF"/*nonNLS*/);
+ buf.append("\n-source debug attributes: OFF");
}
if (preserveAllLocalVariables){
- buf.append("\n-preserve all local variables: ON"/*nonNLS*/);
+ buf.append("\n-preserve all local variables: ON");
} else {
- buf.append("\n-preserve all local variables: OFF"/*nonNLS*/);
+ buf.append("\n-preserve all local variables: OFF");
}
if ((errorThreshold & UnreachableCode) != 0){
- buf.append("\n-unreachable code: ERROR"/*nonNLS*/);
+ buf.append("\n-unreachable code: ERROR");
} else {
if ((warningThreshold & UnreachableCode) != 0){
- buf.append("\n-unreachable code: WARNING"/*nonNLS*/);
+ buf.append("\n-unreachable code: WARNING");
} else {
- buf.append("\n-unreachable code: IGNORE"/*nonNLS*/);
+ buf.append("\n-unreachable code: IGNORE");
}
}
if ((errorThreshold & ImportProblem) != 0){
- buf.append("\n-import problem: ERROR"/*nonNLS*/);
+ buf.append("\n-import problem: ERROR");
} else {
if ((warningThreshold & ImportProblem) != 0){
- buf.append("\n-import problem: WARNING"/*nonNLS*/);
+ buf.append("\n-import problem: WARNING");
} else {
- buf.append("\n-import problem: IGNORE"/*nonNLS*/);
+ buf.append("\n-import problem: IGNORE");
}
}
if ((errorThreshold & MethodWithConstructorName) != 0){
- buf.append("\n-method with constructor name: ERROR"/*nonNLS*/);
+ buf.append("\n-method with constructor name: ERROR");
} else {
if ((warningThreshold & MethodWithConstructorName) != 0){
- buf.append("\n-method with constructor name: WARNING"/*nonNLS*/);
+ buf.append("\n-method with constructor name: WARNING");
} else {
- buf.append("\n-method with constructor name: IGNORE"/*nonNLS*/);
+ buf.append("\n-method with constructor name: IGNORE");
}
}
if ((errorThreshold & OverriddenPackageDefaultMethod) != 0){
- buf.append("\n-overridden package default method: ERROR"/*nonNLS*/);
+ buf.append("\n-overridden package default method: ERROR");
} else {
if ((warningThreshold & OverriddenPackageDefaultMethod) != 0){
- buf.append("\n-overridden package default method: WARNING"/*nonNLS*/);
+ buf.append("\n-overridden package default method: WARNING");
} else {
- buf.append("\n-overridden package default method: IGNORE"/*nonNLS*/);
+ buf.append("\n-overridden package default method: IGNORE");
}
}
if ((errorThreshold & UsingDeprecatedAPI) != 0){
- buf.append("\n-deprecation: ERROR"/*nonNLS*/);
+ buf.append("\n-deprecation: ERROR");
} else {
if ((warningThreshold & UsingDeprecatedAPI) != 0){
- buf.append("\n-deprecation: WARNING"/*nonNLS*/);
+ buf.append("\n-deprecation: WARNING");
} else {
- buf.append("\n-deprecation: IGNORE"/*nonNLS*/);
+ buf.append("\n-deprecation: IGNORE");
}
}
if ((errorThreshold & MaskedCatchBlock) != 0){
- buf.append("\n-masked catch block: ERROR"/*nonNLS*/);
+ buf.append("\n-masked catch block: ERROR");
} else {
if ((warningThreshold & MaskedCatchBlock) != 0){
- buf.append("\n-masked catch block: WARNING"/*nonNLS*/);
+ buf.append("\n-masked catch block: WARNING");
} else {
- buf.append("\n-masked catch block: IGNORE"/*nonNLS*/);
+ buf.append("\n-masked catch block: IGNORE");
}
}
if ((errorThreshold & UnusedLocalVariable) != 0){
- buf.append("\n-unused local variable: ERROR"/*nonNLS*/);
+ buf.append("\n-unused local variable: ERROR");
} else {
if ((warningThreshold & UnusedLocalVariable) != 0){
- buf.append("\n-unused local variable: WARNING"/*nonNLS*/);
+ buf.append("\n-unused local variable: WARNING");
} else {
- buf.append("\n-unused local variable: IGNORE"/*nonNLS*/);
+ buf.append("\n-unused local variable: IGNORE");
}
}
if ((errorThreshold & UnusedArgument) != 0){
- buf.append("\n-unused parameter: ERROR"/*nonNLS*/);
+ buf.append("\n-unused parameter: ERROR");
} else {
if ((warningThreshold & UnusedArgument) != 0){
- buf.append("\n-unused parameter: WARNING"/*nonNLS*/);
- } else {
- buf.append("\n-unused parameter: IGNORE"/*nonNLS*/);
- }
- }
- if ((errorThreshold & AccessEmulation) != 0){
- buf.append("\n-synthetic access emulation: ERROR"/*nonNLS*/);
- } else {
- if ((warningThreshold & AccessEmulation) != 0){
- buf.append("\n-synthetic access emulation: WARNING"/*nonNLS*/);
+ buf.append("\n-unused parameter: WARNING");
} else {
- buf.append("\n-synthetic access emulation: IGNORE"/*nonNLS*/);
- }
- }
- if ((errorThreshold & NonExternalizedString) != 0){
- buf.append("\n-non externalized string: ERROR"/*nonNLS*/);
- } else {
- if ((warningThreshold & NonExternalizedString) != 0){
- buf.append("\n-non externalized string: WARNING"/*nonNLS*/);
- } else {
- buf.append("\n-non externalized string: IGNORE"/*nonNLS*/);
+ buf.append("\n-unused parameter: IGNORE");
}
}
switch(targetJDK){
case JDK1_1 :
- buf.append("\n-target JDK: 1.1"/*nonNLS*/);
+ buf.append("\n-target JDK: 1.1");
break;
case JDK1_2 :
- buf.append("\n-target JDK: 1.2"/*nonNLS*/);
+ buf.append("\n-target JDK: 1.2");
}
- buf.append("\n-verbose : "/*nonNLS*/ + (verbose ? "ON"/*nonNLS*/ : "OFF"/*nonNLS*/));
- buf.append("\n-produce reference info : "/*nonNLS*/ + (produceReferenceInfo ? "ON"/*nonNLS*/ : "OFF"/*nonNLS*/));
- buf.append("\n-parse literal expressions as constants : "/*nonNLS*/ + (parseLiteralExpressionsAsConstants ? "ON"/*nonNLS*/ : "OFF"/*nonNLS*/));
- buf.append("\n-runtime exception name for compile error : "/*nonNLS*/ + runtimeExceptionNameForCompileError);
+ buf.append("\n-verbose : " + (verbose ? "ON" : "OFF"));
+ buf.append("\n-produce reference info : " + (produceReferenceInfo ? "ON" : "OFF"));
+ buf.append("\n-parse literal expressions as constants : " + (parseLiteralExpressionsAsConstants ? "ON" : "OFF"));
+ buf.append("\n-runtime exception name for compile error : " + runtimeExceptionNameForCompileError);
return buf.toString();
}
-
-public void handleNonExternalizedStringLiteralAsWarning(boolean flag) {
- if (flag) {
- warningThreshold |= NonExternalizedString;
- } else {
- warningThreshold &= ~NonExternalizedString;
- }
-}
-
-public boolean isNonExternalizedStringLiteralHandledAsWarning() {
- return (warningThreshold & NonExternalizedString) != 0;
-}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ConfigurableProblems.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ConfigurableProblems.java
index 4482fd98ca..85e85f9cda 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ConfigurableProblems.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ConfigurableProblems.java
@@ -1,11 +1,4 @@
package org.eclipse.jdt.internal.compiler.impl;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
-
-// constants used to encode configurable problems (error|warning|ignore)
public interface ConfigurableProblems {
final int UnreachableCode = 0x100;
@@ -19,5 +12,4 @@ public interface ConfigurableProblems {
final int UnusedArgument = 0x20000;
final int TemporaryWarning = 0x40000;
final int AccessEmulation = 0x80000;
- final int NonExternalizedString = 0x100000;
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/Constant.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/Constant.java
index 92b55dde8a..bda078d6f0 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/Constant.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/Constant.java
@@ -16,10 +16,10 @@ public abstract class Constant implements TypeIds, OperatorIds {
public static final IntConstant Two = new IntConstant(2);
public static final IntConstant One = new IntConstant(1);
public boolean booleanValue() {
- throw new ShouldNotImplement(Util.bind("constant.cannotCastedInto"/*nonNLS*/,typeName(),"boolean"/*nonNLS*/));
+ throw new ShouldNotImplement(typeName() + " constant cannot be casted into boolean");
}
public byte byteValue() {
- throw new ShouldNotImplement(Util.bind("constant.cannotCastedInto"/*nonNLS*/,typeName(),"byte"/*nonNLS*/));
+ throw new ShouldNotImplement(typeName()+ " constant cannot be casted into byte");
}
public final Constant castTo(int conversionToTargetType){
//the cast is an int of the form
@@ -218,7 +218,7 @@ public final Constant castTo(int conversionToTargetType){
return NotAConstant ;
}
public char charValue() {
- throw new ShouldNotImplement(Util.bind("constant.cannotCastedInto"/*nonNLS*/,typeName(),"char"/*nonNLS*/));
+ throw new ShouldNotImplement(typeName()+ " constant cannot be casted into char");
}
public static final Constant computeConstantOperation(Constant cst, int id, int operator) {
//this method assumes that the TC has been done .
@@ -1416,10 +1416,10 @@ public static final Constant computeConstantOperationXOR(Constant left, int left
return NotAConstant ;} // should not get here
public double doubleValue() {
- throw new ShouldNotImplement(Util.bind("constant.cannotCastedInto"/*nonNLS*/,typeName(),"double"/*nonNLS*/));
+ throw new ShouldNotImplement(typeName()+ " constant cannot be casted into double");
}
public float floatValue() {
- throw new ShouldNotImplement(Util.bind("constant.cannotCastedInto"/*nonNLS*/,typeName(),"float"/*nonNLS*/));
+ throw new ShouldNotImplement(typeName()+ " constant cannot be casted into float");
}
public static Constant fromValue(byte value) {
return new ByteConstant(value);
@@ -1450,36 +1450,36 @@ public static Constant fromValue(boolean value) {
return new BooleanConstant(value);
}
public int intValue() {
- throw new ShouldNotImplement(Util.bind("constant.cannotCastedInto"/*nonNLS*/,typeName(),"int"/*nonNLS*/));
+ throw new ShouldNotImplement(typeName()+ " constant cannot be casted into int");
}
public long longValue() {
- throw new ShouldNotImplement(Util.bind("constant.cannotCastedInto"/*nonNLS*/,typeName(),"long"/*nonNLS*/));
+ throw new ShouldNotImplement(typeName()+ " constant cannot be casted into long");
}
public short shortValue() {
- throw new ShouldNotImplement(Util.bind("constant.cannotConvertedTo"/*nonNLS*/,typeName(),"short"/*nonNLS*/));
+ throw new ShouldNotImplement(typeName()+ " constant cannot be converted to short");
}
/** Deprecated
*/
public String stringValue() {
- throw new ShouldNotImplement(Util.bind("constant.cannotConvertedTo"/*nonNLS*/,typeName(),"String"/*nonNLS*/));
+ throw new ShouldNotImplement(typeName()+ " constant cannot be converted to String");
}
public String toString(){
- if (this == NotAConstant) return "(Constant) NotAConstant"/*nonNLS*/ ;
+ if (this == NotAConstant) return "(Constant) NotAConstant" ;
return super.toString(); }
public abstract int typeID();
public String typeName() {
switch (typeID()) {
- case T_int : return "int"/*nonNLS*/;
- case T_byte : return "byte"/*nonNLS*/;
- case T_short : return "short"/*nonNLS*/;
- case T_char : return "char"/*nonNLS*/;
- case T_float : return "float"/*nonNLS*/;
- case T_double : return "double"/*nonNLS*/;
- case T_boolean : return "boolean"/*nonNLS*/;
- case T_String : return "java.lang.String"/*nonNLS*/;
- case T_null : return "null"/*nonNLS*/;
- default: return "unknown"/*nonNLS*/;
+ case T_int : return "int";
+ case T_byte : return "byte";
+ case T_short : return "short";
+ case T_char : return "char";
+ case T_float : return "float";
+ case T_double : return "double";
+ case T_boolean : return "boolean";
+ case T_String : return "java.lang.String";
+ case T_null : return "null";
+ default: return "unknown";
}
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/DoubleConstant.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/DoubleConstant.java
index 522474ca4f..f3242ae963 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/DoubleConstant.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/DoubleConstant.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.impl;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public class DoubleConstant extends Constant {
double value;
@@ -36,14 +31,14 @@ public String stringValue() {
String s = new Double(value).toString() ;
if (s == null)
- return "null"/*nonNLS*/;
+ return "null";
else
return s;
}
public String toString(){
- if (this == NotAConstant) return "(Constant) NotAConstant"/*nonNLS*/ ;
- return "(double)"/*nonNLS*/ + value ; }
+ if (this == NotAConstant) return "(Constant) NotAConstant" ;
+ return "(double)" + value ; }
public int typeID() {
return T_double;
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/FloatConstant.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/FloatConstant.java
index 483ef5d43b..c109fbe1ef 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/FloatConstant.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/FloatConstant.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.impl;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public class FloatConstant extends Constant {
float value;
@@ -36,13 +31,13 @@ public String stringValue() {
String s = new Float(value).toString() ;
if (s == null)
- return "null"/*nonNLS*/;
+ return "null";
else
return s;
}
public String toString(){
- return "(float)"/*nonNLS*/ + value ; }
+ return "(float)" + value ; }
public int typeID() {
return T_float;
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/IntConstant.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/IntConstant.java
index 490196ce34..ae2937424a 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/IntConstant.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/IntConstant.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.impl;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public class IntConstant extends Constant {
int value;
@@ -36,13 +31,13 @@ public String stringValue() {
String s = new Integer(value).toString() ;
if (s == null)
- return "null"/*nonNLS*/;
+ return "null";
else
return s;
}
public String toString(){
- return "(int)"/*nonNLS*/ + value ; }
+ return "(int)" + value ; }
public int typeID() {
return T_int;
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/LongConstant.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/LongConstant.java
index 911b81f816..11081546da 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/LongConstant.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/LongConstant.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.impl;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public class LongConstant extends Constant {
long value;
@@ -36,13 +31,13 @@ public String stringValue() {
String s = new Long(value).toString() ;
if (s == null)
- return "null"/*nonNLS*/;
+ return "null";
else
return s;
}
public String toString(){
- return "(long)"/*nonNLS*/ + value ; }
+ return "(long)" + value ; }
public int typeID() {
return T_long;
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/NullConstant.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/NullConstant.java
index 6e24bf588d..c2920e0182 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/NullConstant.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/NullConstant.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.impl;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public class NullConstant extends Constant {
public static final NullConstant Default = new NullConstant();
@@ -17,7 +12,7 @@ public String stringValue() {
}
public String toString(){
- return "(null)"/*nonNLS*/ + null ; }
+ return "(null)" + null ; }
public int typeID() {
return T_null;
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ShortConstant.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ShortConstant.java
index fd87ca9181..5c33a35558 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ShortConstant.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ShortConstant.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.impl;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public class ShortConstant extends Constant {
short value;
@@ -36,13 +31,13 @@ public String stringValue() {
String s = new Integer(value).toString() ;
if (s == null)
- return "null"/*nonNLS*/;
+ return "null";
else
return s;
}
public String toString(){
- return "(short)"/*nonNLS*/ + value ; }
+ return "(short)" + value ; }
public int typeID() {
return T_short;
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/StringConstant.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/StringConstant.java
index fe197d4000..c589b5c00e 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/StringConstant.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/StringConstant.java
@@ -1,13 +1,8 @@
package org.eclipse.jdt.internal.compiler.impl;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public class StringConstant extends Constant {
public String value;
-
+
public StringConstant(String value) {
this.value = value ;
}
@@ -33,7 +28,7 @@ public String stringValue() {
}
public String toString(){
- return "(String)\""/*nonNLS*/ + value +"\""/*nonNLS*/; }
+ return "(String)\"" + value +"\""; }
public int typeID() {
return T_String;
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ArrayBinding.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ArrayBinding.java
index 15e789c6fc..0a5bc9ac77 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ArrayBinding.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ArrayBinding.java
@@ -39,7 +39,7 @@ public char[] constantPoolName() /* [Ljava/lang/Object; */ {
String debugName() {
StringBuffer brackets = new StringBuffer(dimensions * 2);
for (int i = dimensions; --i >= 0;)
- brackets.append("[]"/*nonNLS*/);
+ brackets.append("[]");
return leafComponentType.debugName() + brackets.toString();
}
/* Answer an array whose dimension size is one less than the receiver.
@@ -128,6 +128,6 @@ public char[] sourceName() {
return CharOperation.concat(leafComponentType.sourceName(), brackets);
}
public String toString() {
- return leafComponentType != null ? debugName() : "NULL TYPE ARRAY"/*nonNLS*/;
+ return leafComponentType != null ? debugName() : "NULL TYPE ARRAY";
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BaseTypeBinding.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BaseTypeBinding.java
index d6648528db..e99f80aded 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BaseTypeBinding.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BaseTypeBinding.java
@@ -146,6 +146,6 @@ public char[] sourceName() {
return simpleName;
}
public String toString() {
- return new String(constantPoolName) + " (id="/*nonNLS*/ + id + ")"/*nonNLS*/;
+ return new String(constantPoolName) + " (id=" + id + ")";
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BaseTypes.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BaseTypes.java
index 45caffe89b..214f2a51ea 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BaseTypes.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BaseTypes.java
@@ -1,19 +1,14 @@
package org.eclipse.jdt.internal.compiler.lookup;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public interface BaseTypes {
- final BaseTypeBinding IntBinding = new BaseTypeBinding(TypeIds.T_int, "int"/*nonNLS*/.toCharArray(), new char[] {'I'});
- final BaseTypeBinding ByteBinding = new BaseTypeBinding(TypeIds.T_byte, "byte"/*nonNLS*/.toCharArray(), new char[] {'B'});
- final BaseTypeBinding ShortBinding = new BaseTypeBinding(TypeIds.T_short, "short"/*nonNLS*/.toCharArray(), new char[] {'S'});
- final BaseTypeBinding CharBinding = new BaseTypeBinding(TypeIds.T_char, "char"/*nonNLS*/.toCharArray(), new char[] {'C'});
- final BaseTypeBinding LongBinding = new BaseTypeBinding(TypeIds.T_long, "long"/*nonNLS*/.toCharArray(), new char[] {'J'});
- final BaseTypeBinding FloatBinding = new BaseTypeBinding(TypeIds.T_float, "float"/*nonNLS*/.toCharArray(), new char[] {'F'});
- final BaseTypeBinding DoubleBinding = new BaseTypeBinding(TypeIds.T_double, "double"/*nonNLS*/.toCharArray(), new char[] {'D'});
- final BaseTypeBinding BooleanBinding = new BaseTypeBinding(TypeIds.T_boolean, "boolean"/*nonNLS*/.toCharArray(), new char[] {'Z'});
- final BaseTypeBinding NullBinding = new BaseTypeBinding(TypeIds.T_null, "null"/*nonNLS*/.toCharArray(), new char[] {'N'}); //N stands for null even if it is never internally used
- final BaseTypeBinding VoidBinding = new BaseTypeBinding(TypeIds.T_void, "void"/*nonNLS*/.toCharArray(), new char[] {'V'});
+ final BaseTypeBinding IntBinding = new BaseTypeBinding(TypeIds.T_int, "int".toCharArray(), new char[] {'I'});
+ final BaseTypeBinding ByteBinding = new BaseTypeBinding(TypeIds.T_byte, "byte".toCharArray(), new char[] {'B'});
+ final BaseTypeBinding ShortBinding = new BaseTypeBinding(TypeIds.T_short, "short".toCharArray(), new char[] {'S'});
+ final BaseTypeBinding CharBinding = new BaseTypeBinding(TypeIds.T_char, "char".toCharArray(), new char[] {'C'});
+ final BaseTypeBinding LongBinding = new BaseTypeBinding(TypeIds.T_long, "long".toCharArray(), new char[] {'J'});
+ final BaseTypeBinding FloatBinding = new BaseTypeBinding(TypeIds.T_float, "float".toCharArray(), new char[] {'F'});
+ final BaseTypeBinding DoubleBinding = new BaseTypeBinding(TypeIds.T_double, "double".toCharArray(), new char[] {'D'});
+ final BaseTypeBinding BooleanBinding = new BaseTypeBinding(TypeIds.T_boolean, "boolean".toCharArray(), new char[] {'Z'});
+ final BaseTypeBinding NullBinding = new BaseTypeBinding(TypeIds.T_null, "null".toCharArray(), new char[] {'N'}); //N stands for null even if it is never internally used
+ final BaseTypeBinding VoidBinding = new BaseTypeBinding(TypeIds.T_void, "void".toCharArray(), new char[] {'V'});
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BinaryTypeBinding.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BinaryTypeBinding.java
index 683a61763c..084aed38eb 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BinaryTypeBinding.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BinaryTypeBinding.java
@@ -376,71 +376,71 @@ public ReferenceBinding[] superInterfaces() {
return superInterfaces;
}
public String toString() {
- String s = ""/*nonNLS*/;
+ String s = "";
- if (isDeprecated()) s += "deprecated "/*nonNLS*/;
- if (isPublic()) s += "public "/*nonNLS*/;
- if (isProtected()) s += "protected "/*nonNLS*/;
- if (isPrivate()) s += "private "/*nonNLS*/;
- if (isAbstract() && isClass()) s += "abstract "/*nonNLS*/;
- if (isStatic() && isNestedType()) s += "static "/*nonNLS*/;
- if (isFinal()) s += "final "/*nonNLS*/;
+ if (isDeprecated()) s += "deprecated ";
+ if (isPublic()) s += "public ";
+ if (isProtected()) s += "protected ";
+ if (isPrivate()) s += "private ";
+ if (isAbstract() && isClass()) s += "abstract ";
+ if (isStatic() && isNestedType()) s += "static ";
+ if (isFinal()) s += "final ";
- s += isInterface() ? "interface "/*nonNLS*/ : "class "/*nonNLS*/;
- s += (compoundName != null) ? CharOperation.toString(compoundName) : "UNNAMED TYPE"/*nonNLS*/;
+ s += isInterface() ? "interface " : "class ";
+ s += (compoundName != null) ? CharOperation.toString(compoundName) : "UNNAMED TYPE";
- s += "\n\textends "/*nonNLS*/;
- s += (superclass != null) ? superclass.debugName() : "NULL TYPE"/*nonNLS*/;
+ s += "\n\textends ";
+ s += (superclass != null) ? superclass.debugName() : "NULL TYPE";
if (superInterfaces != null) {
if (superInterfaces != NoSuperInterfaces) {
- s += "\n\timplements : "/*nonNLS*/;
+ s += "\n\timplements : ";
for (int i = 0, length = superInterfaces.length; i < length; i++) {
if (i > 0)
- s += ", "/*nonNLS*/;
- s += (superInterfaces[i] != null) ? superInterfaces[i].debugName() : "NULL TYPE"/*nonNLS*/;
+ s += ", ";
+ s += (superInterfaces[i] != null) ? superInterfaces[i].debugName() : "NULL TYPE";
}
}
} else {
- s += "NULL SUPERINTERFACES"/*nonNLS*/;
+ s += "NULL SUPERINTERFACES";
}
if (enclosingType != null) {
- s += "\n\tenclosing type : "/*nonNLS*/;
+ s += "\n\tenclosing type : ";
s += enclosingType.debugName();
}
if (fields != null) {
if (fields != NoFields) {
- s += "\n/* fields */"/*nonNLS*/;
+ s += "\n/* fields */";
for (int i = 0, length = fields.length; i < length; i++)
- s += (fields[i] != null) ? "\n"/*nonNLS*/ + fields[i].toString() : "\nNULL FIELD"/*nonNLS*/;
+ s += (fields[i] != null) ? "\n" + fields[i].toString() : "\nNULL FIELD";
}
} else {
- s += "NULL FIELDS"/*nonNLS*/;
+ s += "NULL FIELDS";
}
if (methods != null) {
if (methods != NoMethods) {
- s += "\n/* methods */"/*nonNLS*/;
+ s += "\n/* methods */";
for (int i = 0, length = methods.length; i < length; i++)
- s += (methods[i] != null) ? "\n"/*nonNLS*/ + methods[i].toString() : "\nNULL METHOD"/*nonNLS*/;
+ s += (methods[i] != null) ? "\n" + methods[i].toString() : "\nNULL METHOD";
}
} else {
- s += "NULL METHODS"/*nonNLS*/;
+ s += "NULL METHODS";
}
if (memberTypes != null) {
if (memberTypes != NoMemberTypes) {
- s += "\n/* members */"/*nonNLS*/;
+ s += "\n/* members */";
for (int i = 0, length = memberTypes.length; i < length; i++)
- s += (memberTypes[i] != null) ? "\n"/*nonNLS*/ + memberTypes[i].toString() : "\nNULL TYPE"/*nonNLS*/;
+ s += (memberTypes[i] != null) ? "\n" + memberTypes[i].toString() : "\nNULL TYPE";
}
} else {
- s += "NULL MEMBER TYPES"/*nonNLS*/;
+ s += "NULL MEMBER TYPES";
}
- s += "\n\n\n"/*nonNLS*/;
+ s += "\n\n\n";
return s;
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/Binding.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/Binding.java
index 1d38a114b9..a413f8ddd3 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/Binding.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/Binding.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.lookup;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public abstract class Binding implements BindingIds, CompilerModifiers, ProblemReasons {
/* API
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BindingIds.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BindingIds.java
index 738fa545ce..ba67d08bd9 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BindingIds.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BindingIds.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.lookup;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public interface BindingIds {
final int FIELD = 1;
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BlockScope.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BlockScope.java
index a4e14bc176..bc057f8758 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BlockScope.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BlockScope.java
@@ -139,16 +139,16 @@ public final boolean allowBlankFinalFieldAssignment(FieldBinding binding) {
|| ((AbstractMethodDeclaration) methodScope.referenceContext).isInitializationMethod(); // inside constructor or clinit
}
String basicToString(int tab) {
- String newLine = "\n"/*nonNLS*/;
+ String newLine = "\n";
for (int i = tab; --i >= 0;)
- newLine += "\t"/*nonNLS*/;
+ newLine += "\t";
- String s = newLine + "--- Block Scope ---"/*nonNLS*/;
- newLine += "\t"/*nonNLS*/;
- s += newLine + "locals:"/*nonNLS*/;
+ String s = newLine + "--- Block Scope ---";
+ newLine += "\t";
+ s += newLine + "locals:";
for (int i = 0; i < localIndex; i++)
- s += newLine + "\t"/*nonNLS*/ + locals[i].toString();
- s += newLine + "startIndex = "/*nonNLS*/ + startIndex;
+ s += newLine + "\t" + locals[i].toString();
+ s += newLine + "startIndex = " + startIndex;
return s;
}
private void checkAndSetModifiersForVariable(LocalVariableBinding varBinding) {
@@ -670,23 +670,23 @@ public Object[] getCompatibleEmulationPath(ReferenceBinding targetEnclosingType)
// use synthetic constructor arguments if possible
if (insideConstructor) {
SyntheticArgumentBinding syntheticArg;
- if ((syntheticArg = ((NestedTypeBinding) sourceType).getSyntheticArgument(targetEnclosingType, this, false)) != null) {
+ if ((syntheticArg = ((NestedTypeBinding) sourceType).getSyntheticArgument(targetEnclosingType, this)) != null) {
return new Object[] {syntheticArg};
}
}
// use a direct synthetic field then
if (!currentMethodScope.isStatic) {
FieldBinding syntheticField;
- if ((syntheticField = sourceType.getSyntheticField(targetEnclosingType, this, false)) != null) {
+ if ((syntheticField = sourceType.getSyntheticField(targetEnclosingType, this)) != null) {
return new Object[] {syntheticField};
}
// could be reached through a sequence of enclosing instance link (nested members)
Object[] path = new Object[2]; // probably at least 2 of them
ReferenceBinding currentType = sourceType.enclosingType();
if (insideConstructor) {
- path[0] = ((NestedTypeBinding) sourceType).getSyntheticArgument((SourceTypeBinding)currentType, this, false);
+ path[0] = ((NestedTypeBinding) sourceType).getSyntheticArgument((SourceTypeBinding)currentType, this);
} else {
- path[0] = sourceType.getSyntheticField((SourceTypeBinding)currentType, this, false);
+ path[0] = sourceType.getSyntheticField((SourceTypeBinding)currentType, this);
}
if (path[0] != null) { // keep accumulating
int count = 1;
@@ -694,7 +694,7 @@ public Object[] getCompatibleEmulationPath(ReferenceBinding targetEnclosingType)
while ((currentEnclosingType = currentType.enclosingType()) != null) {
//done?
if (currentType == targetEnclosingType || targetEnclosingType.isSuperclassOf(currentType)) break;
- syntheticField = ((NestedTypeBinding)currentType).getSyntheticField((SourceTypeBinding)currentEnclosingType, this, false);
+ syntheticField = ((NestedTypeBinding)currentType).getSyntheticField((SourceTypeBinding)currentEnclosingType, this);
if (syntheticField == null) break;
// append inside the path
if (count == path.length) {
@@ -889,23 +889,23 @@ public Object[] getExactEmulationPath(ReferenceBinding targetEnclosingType) {
// use synthetic constructor arguments if possible
if (insideConstructor) {
SyntheticArgumentBinding syntheticArg;
- if ((syntheticArg = ((NestedTypeBinding) sourceType).getSyntheticArgument(targetEnclosingType, this, true)) != null) {
+ if ((syntheticArg = ((NestedTypeBinding) sourceType).getSyntheticArgument(targetEnclosingType, this)) != null) {
return new Object[] {syntheticArg};
}
}
// use a direct synthetic field then
if (!currentMethodScope.isStatic) {
FieldBinding syntheticField;
- if ((syntheticField = sourceType.getSyntheticField(targetEnclosingType, this, true)) != null) {
+ if ((syntheticField = sourceType.getSyntheticField(targetEnclosingType, this)) != null) {
return new Object[] {syntheticField};
}
// could be reached through a sequence of enclosing instance link (nested members)
Object[] path = new Object[2]; // probably at least 2 of them
ReferenceBinding currentType = sourceType.enclosingType();
if (insideConstructor) {
- path[0] = ((NestedTypeBinding) sourceType).getSyntheticArgument((SourceTypeBinding)currentType, this, true);
+ path[0] = ((NestedTypeBinding) sourceType).getSyntheticArgument((SourceTypeBinding)currentType, this);
} else {
- path[0] = sourceType.getSyntheticField((SourceTypeBinding)currentType, this, true);
+ path[0] = sourceType.getSyntheticField((SourceTypeBinding)currentType, this);
}
if (path[0] != null) { // keep accumulating
int count = 1;
@@ -913,7 +913,7 @@ public Object[] getExactEmulationPath(ReferenceBinding targetEnclosingType) {
while ((currentEnclosingType = currentType.enclosingType()) != null) {
//done?
if (currentType == targetEnclosingType) break;
- syntheticField = ((NestedTypeBinding)currentType).getSyntheticField((SourceTypeBinding)currentEnclosingType, this, true);
+ syntheticField = ((NestedTypeBinding)currentType).getSyntheticField((SourceTypeBinding)currentEnclosingType, this);
if (syntheticField == null) break;
// append inside the path
if (count == path.length) {
@@ -1175,7 +1175,7 @@ public String toString(int tab) {
String s = basicToString(tab);
for (int i = 0; i < scopeIndex; i++)
if (subscopes[i] instanceof BlockScope)
- s += ((BlockScope) subscopes[i]).toString(tab + 1) + "\n"/*nonNLS*/;
+ s += ((BlockScope) subscopes[i]).toString(tab + 1) + "\n";
return s;
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java
index 02a39d28e1..e45bfeb02e 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java
@@ -802,8 +802,8 @@ public TypeDeclaration referenceType() {
}
public String toString() {
if (referenceContext != null)
- return "--- Class Scope ---\n\n"/*nonNLS*/ + referenceContext.binding.toString();
+ return "--- Class Scope ---\n\n" + referenceContext.binding.toString();
else
- return "--- Class Scope ---\n\n Binding not initialized"/*nonNLS*/;
+ return "--- Class Scope ---\n\n Binding not initialized";
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/CompilationUnitScope.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/CompilationUnitScope.java
index 043fd7e82e..a054848b2f 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/CompilationUnitScope.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/CompilationUnitScope.java
@@ -427,7 +427,7 @@ public void storeDependencyInfo() {
referenceContext.compilationResult.fileDependencies = fileNames;
}
public String toString() {
- return "--- CompilationUnit Scope : "/*nonNLS*/ + new String(referenceContext.getFileName());
+ return "--- CompilationUnit Scope : " + new String(referenceContext.getFileName());
}
public void verifyMethods(MethodVerifier verifier) {
for (int i = 0, length = topLevelTypes.length; i < length; i++)
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ImportBinding.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ImportBinding.java
index 1445d91ef9..13dfa68415 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ImportBinding.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ImportBinding.java
@@ -25,11 +25,11 @@ public final int bindingType() {
}
public char[] readableName() {
if (onDemand)
- return CharOperation.concat(CharOperation.concatWith(compoundName, '.'), ".*"/*nonNLS*/.toCharArray());
+ return CharOperation.concat(CharOperation.concatWith(compoundName, '.'), ".*".toCharArray());
else
return CharOperation.concatWith(compoundName, '.');
}
public String toString() {
- return "import : "/*nonNLS*/ + new String(readableName());
+ return "import : " + new String(readableName());
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/InnerEmulationDependency.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/InnerEmulationDependency.java
index d28168da97..c570be4f7b 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/InnerEmulationDependency.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/InnerEmulationDependency.java
@@ -1,15 +1,9 @@
package org.eclipse.jdt.internal.compiler.lookup;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public class InnerEmulationDependency{
public BlockScope scope;
public boolean wasEnclosingInstanceSupplied;
public boolean useDirectAccess;
-
public InnerEmulationDependency(BlockScope scope, boolean wasEnclosingInstanceSupplied, boolean useDirectAccess) {
this.scope = scope;
this.wasEnclosingInstanceSupplied = wasEnclosingInstanceSupplied;
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/InvocationSite.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/InvocationSite.java
index b3fecc7036..41e14bd863 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/InvocationSite.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/InvocationSite.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.lookup;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public interface InvocationSite {
boolean isSuperAccess();
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/LocalTypeBinding.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/LocalTypeBinding.java
index d2de2d1416..b8a66ddd78 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/LocalTypeBinding.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/LocalTypeBinding.java
@@ -56,9 +56,9 @@ public void constantPoolName(char[] computedConstantPoolName) /* java/lang/Objec
public char[] readableName() {
if (isAnonymousType()) {
if (superInterfaces == NoSuperInterfaces)
- return ("<"/*nonNLS*/+Util.bind("binding.subclass"/*nonNLS*/,new String(superclass.readableName())) + ">"/*nonNLS*/).toCharArray();
+ return ("<anonymous subclass of " + new String(superclass.readableName()) + ">").toCharArray();
else
- return ("<"/*nonNLS*/+Util.bind("binding.implementation"/*nonNLS*/,new String(superInterfaces[0].readableName())) + ">"/*nonNLS*/).toCharArray();
+ return ("<anonymous implementation of " + new String(superInterfaces[0].readableName()) + ">").toCharArray();
} else if (isMemberType()) {
return CharOperation.concat(enclosingType().readableName(), sourceName, '.');
} else {
@@ -78,10 +78,10 @@ public char[] sourceName() {
}
public String toString() {
if (isAnonymousType())
- return "Anonymous type : "/*nonNLS*/ + super.toString();
+ return "Anonymous type : " + super.toString();
if (isMemberType())
- return "Local member type : "/*nonNLS*/ + new String(sourceName()) + " "/*nonNLS*/ + super.toString();
- return "Local type : "/*nonNLS*/ + new String(sourceName()) + " "/*nonNLS*/ + super.toString();
+ return "Local member type : " + new String(sourceName()) + " " + super.toString();
+ return "Local type : " + new String(sourceName()) + " " + super.toString();
}
/* Trigger the dependency mechanism forcing the innerclass emulation
* to be propagated to all dependent source types.
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/LocalVariableBinding.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/LocalVariableBinding.java
index 0b0591e9cd..62777502b4 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/LocalVariableBinding.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/LocalVariableBinding.java
@@ -66,18 +66,18 @@ public void recordInitializationStartPC(int pc) {
public String toString() {
String s = super.toString();
if (!used)
- s += "[pos: unused]"/*nonNLS*/;
+ s += "[pos: unused]";
else
- s += "[pos: "/*nonNLS*/ + String.valueOf(resolvedPosition) + "]"/*nonNLS*/;
- s += "[id:"/*nonNLS*/ + String.valueOf(id) + "]"/*nonNLS*/;
+ s += "[pos: " + String.valueOf(resolvedPosition) + "]";
+ s += "[id:" + String.valueOf(id) + "]";
if (initializationCount > 0) {
- s += "[pc: "/*nonNLS*/;
+ s += "[pc: ";
for (int i = 0; i < initializationCount; i++) {
if (i > 0)
- s += ", "/*nonNLS*/;
- s += String.valueOf(initializationPCs[i << 1]) + "-"/*nonNLS*/ + ((initializationPCs[(i << 1) + 1] == -1) ? "?"/*nonNLS*/ : String.valueOf(initializationPCs[(i<< 1) + 1]));
+ s += ", ";
+ s += String.valueOf(initializationPCs[i << 1]) + "-" + ((initializationPCs[(i << 1) + 1] == -1) ? "?" : String.valueOf(initializationPCs[(i<< 1) + 1]));
}
- s += "]"/*nonNLS*/;
+ s += "]";
}
return s;
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/LookupEnvironment.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/LookupEnvironment.java
index 27b863af3a..d8041488c9 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/LookupEnvironment.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/LookupEnvironment.java
@@ -505,7 +505,7 @@ TypeBinding getTypeFromSignature(char[] signature, int start, int end) {
binding = ShortBinding;
break;
default :
- throw new Error(Util.bind("error.undefinedBaseType"/*nonNLS*/,String.valueOf(signature[start])));
+ throw new Error("Undefined base type: " + signature[start]);
}
} else {
binding = getTypeFromConstantPoolName(signature, start + 1, end - 1);
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MemberTypeBinding.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MemberTypeBinding.java
index 8002aba526..1d7b9195bb 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MemberTypeBinding.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MemberTypeBinding.java
@@ -28,6 +28,6 @@ public char[] constantPoolName() /* java/lang/Object */ {
return constantPoolName = CharOperation.concat(enclosingType().constantPoolName(), sourceName, '$');
}
public String toString() {
- return "Member type : "/*nonNLS*/ + new String(sourceName()) + " "/*nonNLS*/ + super.toString();
+ return "Member type : " + new String(sourceName()) + " " + super.toString();
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodBinding.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodBinding.java
index 65b5ec8f87..1602f86789 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodBinding.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodBinding.java
@@ -309,7 +309,7 @@ public char[] readableName() /* foo(int, Thread) */ {
if (parameters != NoParameters) {
for (int i = 0, length = parameters.length; i < length; i++) {
if (i > 0)
- buffer.append(", "/*nonNLS*/);
+ buffer.append(", ");
buffer.append(parameters[i].sourceName());
}
}
@@ -387,35 +387,35 @@ public final void tagForClearingPrivateModifier() {
modifiers |= AccClearPrivateModifier;
}
public String toString() {
- String s = (returnType != null) ? returnType.debugName() : "NULL TYPE"/*nonNLS*/;
- s += " "/*nonNLS*/;
- s += (selector != null) ? new String(selector) : "UNNAMED METHOD"/*nonNLS*/;
+ String s = (returnType != null) ? returnType.debugName() : "NULL TYPE";
+ s += " ";
+ s += (selector != null) ? new String(selector) : "UNNAMED METHOD";
- s += "("/*nonNLS*/;
+ s += "(";
if (parameters != null) {
if (parameters != NoParameters) {
for (int i = 0, length = parameters.length; i < length; i++) {
if (i > 0)
- s += ", "/*nonNLS*/;
- s += (parameters[i] != null) ? parameters[i].debugName() : "NULL TYPE"/*nonNLS*/;
+ s += ", ";
+ s += (parameters[i] != null) ? parameters[i].debugName() : "NULL TYPE";
}
}
} else {
- s += "NULL PARAMETERS"/*nonNLS*/;
+ s += "NULL PARAMETERS";
}
- s += ") "/*nonNLS*/;
+ s += ") ";
if (thrownExceptions != null) {
if (thrownExceptions != NoExceptions) {
- s += "throws "/*nonNLS*/;
+ s += "throws ";
for (int i = 0, length = thrownExceptions.length; i < length; i++) {
if (i > 0)
- s += ", "/*nonNLS*/;
- s += (thrownExceptions[i] != null) ? thrownExceptions[i].debugName() : "NULL TYPE"/*nonNLS*/;
+ s += ", ";
+ s += (thrownExceptions[i] != null) ? thrownExceptions[i].debugName() : "NULL TYPE";
}
}
} else {
- s += "NULL THROWN EXCEPTIONS"/*nonNLS*/;
+ s += "NULL THROWN EXCEPTIONS";
}
return s;
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodScope.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodScope.java
index 9c9f9df279..f78d47fc23 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodScope.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodScope.java
@@ -42,18 +42,18 @@ public MethodScope(ClassScope parent, ReferenceContext context, boolean isStatic
this.startIndex = 0;
}
String basicToString(int tab) {
- String newLine = "\n"/*nonNLS*/;
+ String newLine = "\n";
for (int i = tab; --i >= 0;)
- newLine += "\t"/*nonNLS*/;
+ newLine += "\t";
- String s = newLine + "--- Method Scope ---"/*nonNLS*/;
- newLine += "\t"/*nonNLS*/;
- s += newLine + "locals:"/*nonNLS*/;
+ String s = newLine + "--- Method Scope ---";
+ newLine += "\t";
+ s += newLine + "locals:";
for (int i = 0; i < localIndex; i++)
- s += newLine + "\t"/*nonNLS*/ + locals[i].toString();
- s += newLine + "startIndex = "/*nonNLS*/ + startIndex;
- s += newLine + "isConstructorCall = "/*nonNLS*/ + isConstructorCall;
- s += newLine + "fieldDeclarationIndex = "/*nonNLS*/ + fieldDeclarationIndex;
+ s += newLine + "\t" + locals[i].toString();
+ s += newLine + "startIndex = " + startIndex;
+ s += newLine + "isConstructorCall = " + isConstructorCall;
+ s += newLine + "fieldDeclarationIndex = " + fieldDeclarationIndex;
return s;
}
/* Spec : 8.4.3 & 9.4
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/NestedTypeBinding.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/NestedTypeBinding.java
index 41da914a08..6c57e49af0 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/NestedTypeBinding.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/NestedTypeBinding.java
@@ -148,6 +148,27 @@ public SyntheticArgumentBinding getSyntheticArgument(LocalVariableBinding actual
return outerLocalVariables[i];
return null;
}
+/* Answer the synthetic argument for <targetEnclosingType> or null if one does not exist.
+*/
+
+public SyntheticArgumentBinding getSyntheticArgument(ReferenceBinding targetEnclosingType, BlockScope scope) {
+ if (enclosingInstances == null) return null; // is null if no enclosing instances are known
+
+ // exact match
+ for (int i = enclosingInstances.length; --i >= 0;)
+ if (enclosingInstances[i].type == targetEnclosingType)
+ if (enclosingInstances[i].actualOuterLocalVariable == null)
+ return enclosingInstances[i];
+
+ // type compatibility : to handle cases such as
+ // class T { class M{}}
+ // class S extends T { class N extends M {}} --> need to use S as a default enclosing instance for the super constructor call in N().
+ for (int i = enclosingInstances.length; --i >= 0;)
+ if (enclosingInstances[i].actualOuterLocalVariable == null)
+ if (targetEnclosingType.isSuperclassOf((ReferenceBinding) enclosingInstances[i].type))
+ return enclosingInstances[i];
+ return null;
+}
public SyntheticArgumentBinding[] syntheticEnclosingInstances() {
return enclosingInstances; // is null if no enclosing instances are required
}
@@ -171,28 +192,4 @@ public SyntheticArgumentBinding[] syntheticOuterLocalVariables() {
public void updateInnerEmulationDependents() {
// nothing to do in general, only local types are doing anything
}
-
-/* Answer the synthetic argument for <targetEnclosingType> or null if one does not exist.
-*/
-
-public SyntheticArgumentBinding getSyntheticArgument(ReferenceBinding targetEnclosingType, BlockScope scope, boolean onlyExactMatch) {
- if (enclosingInstances == null) return null; // is null if no enclosing instances are known
-
- // exact match
- for (int i = enclosingInstances.length; --i >= 0;)
- if (enclosingInstances[i].type == targetEnclosingType)
- if (enclosingInstances[i].actualOuterLocalVariable == null)
- return enclosingInstances[i];
-
- // type compatibility : to handle cases such as
- // class T { class M{}}
- // class S extends T { class N extends M {}} --> need to use S as a default enclosing instance for the super constructor call in N().
- if (!onlyExactMatch){
- for (int i = enclosingInstances.length; --i >= 0;)
- if (enclosingInstances[i].actualOuterLocalVariable == null)
- if (targetEnclosingType.isSuperclassOf((ReferenceBinding) enclosingInstances[i].type))
- return enclosingInstances[i];
- }
- return null;
-}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/PackageBinding.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/PackageBinding.java
index a031167eb7..a18137c06c 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/PackageBinding.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/PackageBinding.java
@@ -190,8 +190,8 @@ public char[] readableName() /*java.lang*/ {
}
public String toString() {
if (compoundName == NoCharChar)
- return "The Default Package"/*nonNLS*/;
+ return "The Default Package";
else
- return "package "/*nonNLS*/ + ((compoundName != null) ? CharOperation.toString(compoundName) : "UNNAMED"/*nonNLS*/);
+ return "package " + ((compoundName != null) ? CharOperation.toString(compoundName) : "UNNAMED");
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ProblemMethodBinding.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ProblemMethodBinding.java
index c512655bc0..b905c71eae 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ProblemMethodBinding.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ProblemMethodBinding.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.lookup;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public class ProblemMethodBinding extends MethodBinding {
private int problemId;
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ProblemPackageBinding.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ProblemPackageBinding.java
index 4e9e814b1a..8dfb4f169a 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ProblemPackageBinding.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ProblemPackageBinding.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.lookup;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public class ProblemPackageBinding extends PackageBinding {
private int problemId;
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ProblemReasons.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ProblemReasons.java
index e98881d142..27991d4a7f 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ProblemReasons.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ProblemReasons.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.lookup;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public interface ProblemReasons {
final int NoError = 0;
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ProblemReferenceBinding.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ProblemReferenceBinding.java
index 21225492d1..8b1097e740 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ProblemReferenceBinding.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ProblemReferenceBinding.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.lookup;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public class ProblemReferenceBinding extends ReferenceBinding {
private int problemId;
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ReferenceBinding.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ReferenceBinding.java
index 9fffaeeb7f..19f1c8d0b2 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ReferenceBinding.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ReferenceBinding.java
@@ -265,7 +265,7 @@ public char[] constantPoolName() /* java/lang/Object */ {
return constantPoolName = CharOperation.concatWith(compoundName, '/');
}
String debugName() {
- return (compoundName != null) ? new String(readableName()) : "UNNAMED TYPE"/*nonNLS*/;
+ return (compoundName != null) ? new String(readableName()) : "UNNAMED TYPE";
}
public final int depth() {
int depth = 0;
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java
index 4f1f13b1a6..7794ad1c6a 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java
@@ -118,7 +118,7 @@ public FieldBinding addSyntheticField(LocalVariableBinding actualOuterLocalVaria
synthField.name = CharOperation.concat(
SyntheticArgumentBinding.OuterLocalPrefix,
actualOuterLocalVariable.name,
- ("$"/*nonNLS*/ + String.valueOf(index++)).toCharArray());
+ ("$" + String.valueOf(index++)).toCharArray());
needRecheck = true;
break;
}
@@ -176,7 +176,7 @@ public FieldBinding addSyntheticField(TypeBinding targetType, BlockScope blockSc
FieldBinding synthField = (FieldBinding) synthetics[CLASS_LITERAL].get(targetType);
if (synthField == null) {
synthField = new SyntheticFieldBinding(
- ("class$"/*nonNLS*/ + synthetics[CLASS_LITERAL].size()).toCharArray(),
+ ("class$" + synthetics[CLASS_LITERAL].size()).toCharArray(),
blockScope.getJavaLangClass(),
AccDefault | AccStatic | AccSynthetic,
this,
@@ -488,6 +488,30 @@ public FieldBinding getSyntheticField(LocalVariableBinding actualOuterLocalVaria
return (FieldBinding) synthetics[FIELD].get(actualOuterLocalVariable);
}
+/* Answer the synthetic field for <targetEnclosingType>
+* or null if one does not exist.
+*/
+
+public FieldBinding getSyntheticField(ReferenceBinding targetEnclosingType, BlockScope scope) {
+ if (synthetics == null)
+ return null;
+
+ FieldBinding field = (FieldBinding) synthetics[FIELD].get(targetEnclosingType);
+ if (field != null)
+ return field;
+
+ // type compatibility : to handle cases such as
+ // class T { class M{}}
+ // class S extends T { class N extends M {}} --> need to use S as a default enclosing instance for the super constructor call in N().
+ Enumeration enum = synthetics[FIELD].elements();
+ while (enum.hasMoreElements()) {
+ field = (FieldBinding) enum.nextElement();
+ if (CharOperation.startsWith(field.name, SyntheticArgumentBinding.EnclosingInstancePrefix)
+ && targetEnclosingType.isSuperclassOf((ReferenceBinding) field.type))
+ return field;
+ }
+ return null;
+}
public ReferenceBinding[] memberTypes() {
return memberTypes;
}
@@ -732,71 +756,71 @@ public FieldBinding[] syntheticFields() {
return bindings;
}
public String toString() {
- String s = "(id="/*nonNLS*/+(id == NoId ? "NoId"/*nonNLS*/ : (""/*nonNLS*/+id) ) +")\n"/*nonNLS*/;
+ String s = "(id="+(id == NoId ? "NoId" : (""+id) ) +")\n";
- if (isDeprecated()) s += "deprecated "/*nonNLS*/;
- if (isPublic()) s += "public "/*nonNLS*/;
- if (isProtected()) s += "protected "/*nonNLS*/;
- if (isPrivate()) s += "private "/*nonNLS*/;
- if (isAbstract() && isClass()) s += "abstract "/*nonNLS*/;
- if (isStatic() && isNestedType()) s += "static "/*nonNLS*/;
- if (isFinal()) s += "final "/*nonNLS*/;
+ if (isDeprecated()) s += "deprecated ";
+ if (isPublic()) s += "public ";
+ if (isProtected()) s += "protected ";
+ if (isPrivate()) s += "private ";
+ if (isAbstract() && isClass()) s += "abstract ";
+ if (isStatic() && isNestedType()) s += "static ";
+ if (isFinal()) s += "final ";
- s += isInterface() ? "interface "/*nonNLS*/ : "class "/*nonNLS*/;
- s += (compoundName != null) ? CharOperation.toString(compoundName) : "UNNAMED TYPE"/*nonNLS*/;
+ s += isInterface() ? "interface " : "class ";
+ s += (compoundName != null) ? CharOperation.toString(compoundName) : "UNNAMED TYPE";
- s += "\n\textends "/*nonNLS*/;
- s += (superclass != null) ? superclass.debugName() : "NULL TYPE"/*nonNLS*/;
+ s += "\n\textends ";
+ s += (superclass != null) ? superclass.debugName() : "NULL TYPE";
if (superInterfaces != null) {
if (superInterfaces != NoSuperInterfaces) {
- s += "\n\timplements : "/*nonNLS*/;
+ s += "\n\timplements : ";
for (int i = 0, length = superInterfaces.length; i < length; i++) {
if (i > 0)
- s += ", "/*nonNLS*/;
- s += (superInterfaces[i] != null) ? superInterfaces[i].debugName() : "NULL TYPE"/*nonNLS*/;
+ s += ", ";
+ s += (superInterfaces[i] != null) ? superInterfaces[i].debugName() : "NULL TYPE";
}
}
} else {
- s += "NULL SUPERINTERFACES"/*nonNLS*/;
+ s += "NULL SUPERINTERFACES";
}
if (enclosingType() != null) {
- s += "\n\tenclosing type : "/*nonNLS*/;
+ s += "\n\tenclosing type : ";
s += enclosingType().debugName();
}
if (fields != null) {
if (fields != NoFields) {
- s += "\n/* fields */"/*nonNLS*/;
+ s += "\n/* fields */";
for (int i = 0, length = fields.length; i < length; i++)
- s += (fields[i] != null) ? "\n"/*nonNLS*/ + fields[i].toString() : "\nNULL FIELD"/*nonNLS*/;
+ s += (fields[i] != null) ? "\n" + fields[i].toString() : "\nNULL FIELD";
}
} else {
- s += "NULL FIELDS"/*nonNLS*/;
+ s += "NULL FIELDS";
}
if (methods != null) {
if (methods != NoMethods) {
- s += "\n/* methods */"/*nonNLS*/;
+ s += "\n/* methods */";
for (int i = 0, length = methods.length; i < length; i++)
- s += (methods[i] != null) ? "\n"/*nonNLS*/ + methods[i].toString() : "\nNULL METHOD"/*nonNLS*/;
+ s += (methods[i] != null) ? "\n" + methods[i].toString() : "\nNULL METHOD";
}
} else {
- s += "NULL METHODS"/*nonNLS*/;
+ s += "NULL METHODS";
}
if (memberTypes != null) {
if (memberTypes != NoMemberTypes) {
- s += "\n/* members */"/*nonNLS*/;
+ s += "\n/* members */";
for (int i = 0, length = memberTypes.length; i < length; i++)
- s += (memberTypes[i] != null) ? "\n"/*nonNLS*/ + memberTypes[i].toString() : "\nNULL TYPE"/*nonNLS*/;
+ s += (memberTypes[i] != null) ? "\n" + memberTypes[i].toString() : "\nNULL TYPE";
}
} else {
- s += "NULL MEMBER TYPES"/*nonNLS*/;
+ s += "NULL MEMBER TYPES";
}
- s += "\n\n\n"/*nonNLS*/;
+ s += "\n\n\n";
return s;
}
void verifyMethods(MethodVerifier verifier) {
@@ -805,30 +829,4 @@ void verifyMethods(MethodVerifier verifier) {
for (int i = memberTypes.length; --i >= 0;)
((SourceTypeBinding) memberTypes[i]).verifyMethods(verifier);
}
-
-/* Answer the synthetic field for <targetEnclosingType>
-* or null if one does not exist.
-*/
-
-public FieldBinding getSyntheticField(ReferenceBinding targetEnclosingType, BlockScope scope, boolean onlyExactMatch) {
- if (synthetics == null)
- return null;
-
- FieldBinding field = (FieldBinding) synthetics[FIELD].get(targetEnclosingType);
- if (field != null) return field;
-
- // type compatibility : to handle cases such as
- // class T { class M{}}
- // class S extends T { class N extends M {}} --> need to use S as a default enclosing instance for the super constructor call in N().
- if (!onlyExactMatch){
- Enumeration enum = synthetics[FIELD].elements();
- while (enum.hasMoreElements()) {
- field = (FieldBinding) enum.nextElement();
- if (CharOperation.startsWith(field.name, SyntheticArgumentBinding.EnclosingInstancePrefix)
- && targetEnclosingType.isSuperclassOf((ReferenceBinding) field.type))
- return field;
- }
- }
- return null;
-}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TagBits.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TagBits.java
index 871bb134f0..bf719ef98a 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TagBits.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TagBits.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.lookup;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public interface TagBits {
// Tag bits in the tagBits int of every TypeBinding
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeBinding.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeBinding.java
index 426ca5f881..4d0a05bcdd 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeBinding.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeBinding.java
@@ -1,40 +1,25 @@
package org.eclipse.jdt.internal.compiler.lookup;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
-/*
- * Not all fields defined by this type (& its subclasses) are initialized when it is created.
- * Some are initialized only when needed.
- *
- * Accessors have been provided for some public fields so all TypeBindings have the same API...
- * but access public fields directly whenever possible.
- * Non-public fields have accessors which should be used everywhere you expect the field to be initialized.
- *
- * null is NOT a valid value for a non-public field... it just means the field is not initialized.
- */
abstract public class TypeBinding extends Binding implements BaseTypes, TagBits, TypeConstants, TypeIds {
public int id = NoId;
public int tagBits = 0; // See values in the interface TagBits below
/* API
- * Answer the receiver's binding type from Binding.BindingID.
- */
+* Answer the receiver's binding type from Binding.BindingID.
+*/
public final int bindingType() {
return TYPE;
}
/* Answer true if the receiver can be instantiated
- */
+*/
public boolean canBeInstantiated() {
return !isBaseType();
}
/* Answer the receiver's constant pool name.
- *
- * NOTE: This method should only be used during/after code gen.
- */
+*
+* NOTE: This method should only be used during/after code gen.
+*/
public abstract char[] constantPoolName(); /* java/lang/Object */
String debugName() {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeConstants.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeConstants.java
index cef8fc3bb2..2924906833 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeConstants.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeConstants.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.lookup;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public interface TypeConstants {
final char[] JAVA = new char[] {'j', 'a', 'v', 'a'};
@@ -32,15 +27,15 @@ public interface TypeConstants {
final char[][] JAVA_LANG_REFLECT_CONSTRUCTOR = new char[][] {JAVA, LANG, REFLECT, {'C', 'o', 'n', 's', 't', 'r', 'u', 'c', 't', 'o', 'r'}};
final char[][] JAVA_IO_PRINTSTREAM = new char[][] {JAVA, IO, {'P', 'r', 'i', 'n', 't', 'S', 't', 'r', 'e', 'a', 'm'}};
final char[][] JAVA_IO_SERIALIZABLE = new char[][] {JAVA, IO, {'S', 'e', 'r', 'i', 'a', 'l', 'i', 'z', 'a', 'b', 'l', 'e'}};
- final char[][] JAVA_LANG_BYTE = new char[][] {JAVA, LANG, "Byte"/*nonNLS*/.toCharArray()};
- final char[][] JAVA_LANG_SHORT = new char[][] {JAVA, LANG, "Short"/*nonNLS*/.toCharArray()};
- final char[][] JAVA_LANG_CHARACTER = new char[][] {JAVA, LANG, "Character"/*nonNLS*/.toCharArray()};
- final char[][] JAVA_LANG_INTEGER = new char[][] {JAVA, LANG, "Integer"/*nonNLS*/.toCharArray()};
- final char[][] JAVA_LANG_LONG = new char[][] {JAVA, LANG, "Long"/*nonNLS*/.toCharArray()};
- final char[][] JAVA_LANG_FLOAT = new char[][] {JAVA, LANG, "Float"/*nonNLS*/.toCharArray()};
- final char[][] JAVA_LANG_DOUBLE = new char[][] {JAVA, LANG, "Double"/*nonNLS*/.toCharArray()};
- final char[][] JAVA_LANG_BOOLEAN = new char[][] {JAVA, LANG, "Boolean"/*nonNLS*/.toCharArray()};
- final char[][] JAVA_LANG_VOID = new char[][] {JAVA, LANG, "Void"/*nonNLS*/.toCharArray()};
+ final char[][] JAVA_LANG_BYTE = new char[][] {JAVA, LANG, "Byte".toCharArray()};
+ final char[][] JAVA_LANG_SHORT = new char[][] {JAVA, LANG, "Short".toCharArray()};
+ final char[][] JAVA_LANG_CHARACTER = new char[][] {JAVA, LANG, "Character".toCharArray()};
+ final char[][] JAVA_LANG_INTEGER = new char[][] {JAVA, LANG, "Integer".toCharArray()};
+ final char[][] JAVA_LANG_LONG = new char[][] {JAVA, LANG, "Long".toCharArray()};
+ final char[][] JAVA_LANG_FLOAT = new char[][] {JAVA, LANG, "Float".toCharArray()};
+ final char[][] JAVA_LANG_DOUBLE = new char[][] {JAVA, LANG, "Double".toCharArray()};
+ final char[][] JAVA_LANG_BOOLEAN = new char[][] {JAVA, LANG, "Boolean".toCharArray()};
+ final char[][] JAVA_LANG_VOID = new char[][] {JAVA, LANG, "Void".toCharArray()};
// Constants used by the flow analysis
final int EqualOrMoreSpecific = -1;
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeIds.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeIds.java
index 8647522e85..3b9bbf12ec 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeIds.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/TypeIds.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.lookup;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public interface TypeIds {
//base type void null undefined Object String
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/UnresolvedReferenceBinding.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/UnresolvedReferenceBinding.java
index 0ad1bf118f..0c2c1b835b 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/UnresolvedReferenceBinding.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/UnresolvedReferenceBinding.java
@@ -32,6 +32,6 @@ ReferenceBinding resolve(LookupEnvironment environment) {
return null; // will not get here since the above error aborts the compilation
}
public String toString() {
- return "Unresolved type "/*nonNLS*/ + ((compoundName != null) ? CharOperation.toString(compoundName) : "UNNAMED"/*nonNLS*/);
+ return "Unresolved type " + ((compoundName != null) ? CharOperation.toString(compoundName) : "UNNAMED");
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/VariableBinding.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/VariableBinding.java
index 6bdad125b4..2fe4d611f6 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/VariableBinding.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/VariableBinding.java
@@ -26,9 +26,9 @@ public char[] readableName() {
return name;
}
public String toString() {
- String s = (type != null) ? type.debugName() : "UNDEFINED TYPE"/*nonNLS*/;
- s += " "/*nonNLS*/;
- s += (name != null) ? new String(name) : "UNNAMED FIELD"/*nonNLS*/;
+ String s = (type != null) ? type.debugName() : "UNDEFINED TYPE";
+ s += " ";
+ s += (name != null) ? new String(name) : "UNNAMED FIELD";
return s;
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java
index 03126051b3..28727fec02 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java
@@ -114,238 +114,238 @@ public class Parser implements BindingIds, ParserBasicInformation, TerminalSymbo
public static char asb[] = null;
public static char asr[] = null;
public static char symbol_index[] = null;
- private static final String UNEXPECTED_EOF = "Unexpected End Of File"/*nonNLS*/ ;
+ private static final String UNEXPECTED_EOF = "Unexpected End Of File" ;
public final static String name[] = { null,
- "++"/*nonNLS*/,
- "--"/*nonNLS*/,
- "=="/*nonNLS*/,
- "<="/*nonNLS*/,
- ">="/*nonNLS*/,
- "!="/*nonNLS*/,
- "<<"/*nonNLS*/,
- ">>"/*nonNLS*/,
- ">>>"/*nonNLS*/,
- "+="/*nonNLS*/,
- "-="/*nonNLS*/,
- "*="/*nonNLS*/,
- "/="/*nonNLS*/,
- "&="/*nonNLS*/,
- "|="/*nonNLS*/,
- "^="/*nonNLS*/,
- "%="/*nonNLS*/,
- "<<="/*nonNLS*/,
- ">>="/*nonNLS*/,
- ">>>="/*nonNLS*/,
- "||"/*nonNLS*/,
- "&&"/*nonNLS*/,
- "+"/*nonNLS*/,
- "-"/*nonNLS*/,
- "!"/*nonNLS*/,
- "%"/*nonNLS*/,
- "^"/*nonNLS*/,
- "&"/*nonNLS*/,
- "*"/*nonNLS*/,
- "|"/*nonNLS*/,
- "~"/*nonNLS*/,
- "/"/*nonNLS*/,
- ">"/*nonNLS*/,
- "<"/*nonNLS*/,
- "("/*nonNLS*/,
- ")"/*nonNLS*/,
- "{"/*nonNLS*/,
- "}"/*nonNLS*/,
- "["/*nonNLS*/,
- "]"/*nonNLS*/,
- ";"/*nonNLS*/,
- "?"/*nonNLS*/,
- ":"/*nonNLS*/,
- ","/*nonNLS*/,
- "."/*nonNLS*/,
- "="/*nonNLS*/,
- ""/*nonNLS*/,
- "$empty"/*nonNLS*/,
- "Identifier"/*nonNLS*/,
- "abstract"/*nonNLS*/,
- "boolean"/*nonNLS*/,
- "break"/*nonNLS*/,
- "byte"/*nonNLS*/,
- "case"/*nonNLS*/,
- "catch"/*nonNLS*/,
- "char"/*nonNLS*/,
- "class"/*nonNLS*/,
- "continue"/*nonNLS*/,
- "default"/*nonNLS*/,
- "do"/*nonNLS*/,
- "double"/*nonNLS*/,
- "else"/*nonNLS*/,
- "extends"/*nonNLS*/,
- "false"/*nonNLS*/,
- "final"/*nonNLS*/,
- "finally"/*nonNLS*/,
- "float"/*nonNLS*/,
- "for"/*nonNLS*/,
- "if"/*nonNLS*/,
- "implements"/*nonNLS*/,
- "import"/*nonNLS*/,
- "instanceof"/*nonNLS*/,
- "int"/*nonNLS*/,
- "interface"/*nonNLS*/,
- "long"/*nonNLS*/,
- "native"/*nonNLS*/,
- "new"/*nonNLS*/,
- "null"/*nonNLS*/,
- "package"/*nonNLS*/,
- "private"/*nonNLS*/,
- "protected"/*nonNLS*/,
- "public"/*nonNLS*/,
- "return"/*nonNLS*/,
- "short"/*nonNLS*/,
- "static"/*nonNLS*/,
- "strictfp"/*nonNLS*/,
- "super"/*nonNLS*/,
- "switch"/*nonNLS*/,
- "synchronized"/*nonNLS*/,
- "this"/*nonNLS*/,
- "throw"/*nonNLS*/,
- "throws"/*nonNLS*/,
- "transient"/*nonNLS*/,
- "true"/*nonNLS*/,
- "try"/*nonNLS*/,
- "void"/*nonNLS*/,
- "volatile"/*nonNLS*/,
- "while"/*nonNLS*/,
- "IntegerLiteral"/*nonNLS*/,
- "LongLiteral"/*nonNLS*/,
- "FloatingPointLiteral"/*nonNLS*/,
- "DoubleLiteral"/*nonNLS*/,
- "CharacterLiteral"/*nonNLS*/,
- "StringLiteral"/*nonNLS*/,
+ "++",
+ "--",
+ "==",
+ "<=",
+ ">=",
+ "!=",
+ "<<",
+ ">>",
+ ">>>",
+ "+=",
+ "-=",
+ "*=",
+ "/=",
+ "&=",
+ "|=",
+ "^=",
+ "%=",
+ "<<=",
+ ">>=",
+ ">>>=",
+ "||",
+ "&&",
+ "+",
+ "-",
+ "!",
+ "%",
+ "^",
+ "&",
+ "*",
+ "|",
+ "~",
+ "/",
+ ">",
+ "<",
+ "(",
+ ")",
+ "{",
+ "}",
+ "[",
+ "]",
+ ";",
+ "?",
+ ":",
+ ",",
+ ".",
+ "=",
+ "",
+ "$empty",
+ "Identifier",
+ "abstract",
+ "boolean",
+ "break",
+ "byte",
+ "case",
+ "catch",
+ "char",
+ "class",
+ "continue",
+ "default",
+ "do",
+ "double",
+ "else",
+ "extends",
+ "false",
+ "final",
+ "finally",
+ "float",
+ "for",
+ "if",
+ "implements",
+ "import",
+ "instanceof",
+ "int",
+ "interface",
+ "long",
+ "native",
+ "new",
+ "null",
+ "package",
+ "private",
+ "protected",
+ "public",
+ "return",
+ "short",
+ "static",
+ "strictfp",
+ "super",
+ "switch",
+ "synchronized",
+ "this",
+ "throw",
+ "throws",
+ "transient",
+ "true",
+ "try",
+ "void",
+ "volatile",
+ "while",
+ "IntegerLiteral",
+ "LongLiteral",
+ "FloatingPointLiteral",
+ "DoubleLiteral",
+ "CharacterLiteral",
+ "StringLiteral",
UNEXPECTED_EOF,
- "Invalid Character"/*nonNLS*/,
- "Goal"/*nonNLS*/,
- "MethodBody"/*nonNLS*/,
- "ConstructorBody"/*nonNLS*/,
- "StaticInitializer"/*nonNLS*/,
- "ClassBodyDeclaration"/*nonNLS*/,
- "Headers"/*nonNLS*/,
- "BlockStatements"/*nonNLS*/,
- "MethodPushModifiersHeader"/*nonNLS*/,
- "CatchHeader"/*nonNLS*/,
- "FieldDeclaration"/*nonNLS*/,
- "ImportDeclaration"/*nonNLS*/,
- "PackageDeclaration"/*nonNLS*/,
- "TypeDeclaration"/*nonNLS*/,
- "GenericMethodDeclaration"/*nonNLS*/,
- "Expression"/*nonNLS*/,
- "Type"/*nonNLS*/,
- "PrimitiveType"/*nonNLS*/,
- "ReferenceType"/*nonNLS*/,
- "ClassOrInterfaceType"/*nonNLS*/,
- "ArrayType"/*nonNLS*/,
- "Name"/*nonNLS*/,
- "Dims"/*nonNLS*/,
- "ClassType"/*nonNLS*/,
- "SimpleName"/*nonNLS*/,
- "Header"/*nonNLS*/,
- "ClassHeader"/*nonNLS*/,
- "InterfaceHeader"/*nonNLS*/,
- "MethodHeader"/*nonNLS*/,
- "ConstructorHeader"/*nonNLS*/,
- "FormalParameter"/*nonNLS*/,
- "ImportDeclarations"/*nonNLS*/,
- "TypeDeclarations"/*nonNLS*/,
- "PackageDeclarationName"/*nonNLS*/,
- "SingleTypeImportDeclarationNam"/*nonNLS*/ +
- "e"/*nonNLS*/,
- "TypeImportOnDemandDeclarationN"/*nonNLS*/ +
- "ame"/*nonNLS*/,
- "Modifiers"/*nonNLS*/,
- "Modifier"/*nonNLS*/,
- "ClassBody"/*nonNLS*/,
- "ClassHeaderName"/*nonNLS*/,
- "InterfaceTypeList"/*nonNLS*/,
- "InterfaceType"/*nonNLS*/,
- "ClassBodyDeclarations"/*nonNLS*/,
- "Block"/*nonNLS*/,
- "VariableDeclarators"/*nonNLS*/,
- "VariableDeclarator"/*nonNLS*/,
- "VariableDeclaratorId"/*nonNLS*/,
- "VariableInitializer"/*nonNLS*/,
- "ArrayInitializer"/*nonNLS*/,
- "MethodHeaderName"/*nonNLS*/,
- "MethodHeaderParameters"/*nonNLS*/,
- "MethodPushModifiersHeaderName"/*nonNLS*/,
- "ClassTypeList"/*nonNLS*/,
- "ConstructorHeaderName"/*nonNLS*/,
- "FormalParameterList"/*nonNLS*/,
- "ClassTypeElt"/*nonNLS*/,
- "StaticOnly"/*nonNLS*/,
- "ExplicitConstructorInvocation"/*nonNLS*/,
- "Primary"/*nonNLS*/,
- "InterfaceBody"/*nonNLS*/,
- "InterfaceHeaderName"/*nonNLS*/,
- "InterfaceMemberDeclarations"/*nonNLS*/,
- "InterfaceMemberDeclaration"/*nonNLS*/,
- "VariableInitializers"/*nonNLS*/,
- "BlockStatement"/*nonNLS*/,
- "Statement"/*nonNLS*/,
- "LocalVariableDeclaration"/*nonNLS*/,
- "StatementWithoutTrailingSubsta"/*nonNLS*/ +
- "tement"/*nonNLS*/,
- "StatementNoShortIf"/*nonNLS*/,
- "StatementExpression"/*nonNLS*/,
- "PostIncrementExpression"/*nonNLS*/,
- "PostDecrementExpression"/*nonNLS*/,
- "MethodInvocation"/*nonNLS*/,
- "ClassInstanceCreationExpressio"/*nonNLS*/ +
- "n"/*nonNLS*/,
- "SwitchBlock"/*nonNLS*/,
- "SwitchBlockStatements"/*nonNLS*/,
- "SwitchLabels"/*nonNLS*/,
- "SwitchBlockStatement"/*nonNLS*/,
- "SwitchLabel"/*nonNLS*/,
- "ConstantExpression"/*nonNLS*/,
- "StatementExpressionList"/*nonNLS*/,
- "OnlySynchronized"/*nonNLS*/,
- "Catches"/*nonNLS*/,
- "Finally"/*nonNLS*/,
- "CatchClause"/*nonNLS*/,
- "PushLPAREN"/*nonNLS*/,
- "PushRPAREN"/*nonNLS*/,
- "PrimaryNoNewArray"/*nonNLS*/,
- "FieldAccess"/*nonNLS*/,
- "ArrayAccess"/*nonNLS*/,
- "ClassInstanceCreationExpressio"/*nonNLS*/ +
- "nName"/*nonNLS*/,
- "ArgumentList"/*nonNLS*/,
- "DimWithOrWithOutExprs"/*nonNLS*/,
- "DimWithOrWithOutExpr"/*nonNLS*/,
- "DimsLoop"/*nonNLS*/,
- "OneDimLoop"/*nonNLS*/,
- "PostfixExpression"/*nonNLS*/,
- "UnaryExpression"/*nonNLS*/,
- "UnaryExpressionNotPlusMinus"/*nonNLS*/,
- "MultiplicativeExpression"/*nonNLS*/,
- "AdditiveExpression"/*nonNLS*/,
- "ShiftExpression"/*nonNLS*/,
- "RelationalExpression"/*nonNLS*/,
- "EqualityExpression"/*nonNLS*/,
- "AndExpression"/*nonNLS*/,
- "ExclusiveOrExpression"/*nonNLS*/,
- "InclusiveOrExpression"/*nonNLS*/,
- "ConditionalAndExpression"/*nonNLS*/,
- "ConditionalOrExpression"/*nonNLS*/,
- "ConditionalExpression"/*nonNLS*/,
- "AssignmentExpression"/*nonNLS*/,
- "LeftHandSide"/*nonNLS*/,
- "AssignmentOperator"/*nonNLS*/
+ "Invalid Character",
+ "Goal",
+ "MethodBody",
+ "ConstructorBody",
+ "StaticInitializer",
+ "ClassBodyDeclaration",
+ "Headers",
+ "BlockStatements",
+ "MethodPushModifiersHeader",
+ "CatchHeader",
+ "FieldDeclaration",
+ "ImportDeclaration",
+ "PackageDeclaration",
+ "TypeDeclaration",
+ "GenericMethodDeclaration",
+ "Expression",
+ "Type",
+ "PrimitiveType",
+ "ReferenceType",
+ "ClassOrInterfaceType",
+ "ArrayType",
+ "Name",
+ "Dims",
+ "ClassType",
+ "SimpleName",
+ "Header",
+ "ClassHeader",
+ "InterfaceHeader",
+ "MethodHeader",
+ "ConstructorHeader",
+ "FormalParameter",
+ "ImportDeclarations",
+ "TypeDeclarations",
+ "PackageDeclarationName",
+ "SingleTypeImportDeclarationNam" +
+ "e",
+ "TypeImportOnDemandDeclarationN" +
+ "ame",
+ "Modifiers",
+ "Modifier",
+ "ClassBody",
+ "ClassHeaderName",
+ "InterfaceTypeList",
+ "InterfaceType",
+ "ClassBodyDeclarations",
+ "Block",
+ "VariableDeclarators",
+ "VariableDeclarator",
+ "VariableDeclaratorId",
+ "VariableInitializer",
+ "ArrayInitializer",
+ "MethodHeaderName",
+ "MethodHeaderParameters",
+ "MethodPushModifiersHeaderName",
+ "ClassTypeList",
+ "ConstructorHeaderName",
+ "FormalParameterList",
+ "ClassTypeElt",
+ "StaticOnly",
+ "ExplicitConstructorInvocation",
+ "Primary",
+ "InterfaceBody",
+ "InterfaceHeaderName",
+ "InterfaceMemberDeclarations",
+ "InterfaceMemberDeclaration",
+ "VariableInitializers",
+ "BlockStatement",
+ "Statement",
+ "LocalVariableDeclaration",
+ "StatementWithoutTrailingSubsta" +
+ "tement",
+ "StatementNoShortIf",
+ "StatementExpression",
+ "PostIncrementExpression",
+ "PostDecrementExpression",
+ "MethodInvocation",
+ "ClassInstanceCreationExpressio" +
+ "n",
+ "SwitchBlock",
+ "SwitchBlockStatements",
+ "SwitchLabels",
+ "SwitchBlockStatement",
+ "SwitchLabel",
+ "ConstantExpression",
+ "StatementExpressionList",
+ "OnlySynchronized",
+ "Catches",
+ "Finally",
+ "CatchClause",
+ "PushLPAREN",
+ "PushRPAREN",
+ "PrimaryNoNewArray",
+ "FieldAccess",
+ "ArrayAccess",
+ "ClassInstanceCreationExpressio" +
+ "nName",
+ "ArgumentList",
+ "DimWithOrWithOutExprs",
+ "DimWithOrWithOutExpr",
+ "DimsLoop",
+ "OneDimLoop",
+ "PostfixExpression",
+ "UnaryExpression",
+ "UnaryExpressionNotPlusMinus",
+ "MultiplicativeExpression",
+ "AdditiveExpression",
+ "ShiftExpression",
+ "RelationalExpression",
+ "EqualityExpression",
+ "AndExpression",
+ "ExclusiveOrExpression",
+ "InclusiveOrExpression",
+ "ConditionalAndExpression",
+ "ConditionalOrExpression",
+ "ConditionalExpression",
+ "AssignmentExpression",
+ "LeftHandSide",
+ "AssignmentOperator"
};
public static short check_table[] = null;
public static char lhs[] = null;
public static char action[] = lhs;
- private final static String FILEPREFIX = "parser"/*nonNLS*/;
+ private final static String FILEPREFIX = "parser";
static {
try{
@@ -428,7 +428,7 @@ private final static void buildFileFor(String filename, String tag, String[] tok
char[] chars = new char[tokens.length]; //can't be bigger
int ic = 0;
String token;
- while (!(token = tokens[i++]).equals("}"/*nonNLS*/)) {
+ while (!(token = tokens[i++]).equals("}")) {
int c = Integer.parseInt(token);
if (isShort)
c += 32768;
@@ -471,11 +471,11 @@ public final static void buildFilesFromLPG(String dataFilename) throws java.io.I
reader.read(contents, 0, contents.length);
reader.close();
} catch (IOException ex) {
- System.out.println(Util.bind("parser.incorrectPath"/*nonNLS*/));
+ System.out.println("The path for the javadcl.java file is incorrect");
return;
}
java.util.StringTokenizer st =
- new java.util.StringTokenizer(new String(contents), " \t\n\r[]={,;"/*nonNLS*/);
+ new java.util.StringTokenizer(new String(contents), " \t\n\r[]={,;");
String[] tokens = new String[st.countTokens()];
int i = 0;
while (st.hasMoreTokens()) {
@@ -483,12 +483,12 @@ public final static void buildFilesFromLPG(String dataFilename) throws java.io.I
}
final String prefix = FILEPREFIX;
i = 0;
- buildFileFor(prefix + (++i) + ".rsc"/*nonNLS*/, "lhs"/*nonNLS*/, tokens, false);
- buildFileFor(prefix + (++i) + ".rsc"/*nonNLS*/, "check_table"/*nonNLS*/, tokens, true);
- buildFileFor(prefix + (++i) + ".rsc"/*nonNLS*/, "asb"/*nonNLS*/, tokens, false);
- buildFileFor(prefix + (++i) + ".rsc"/*nonNLS*/, "asr"/*nonNLS*/, tokens, false);
- buildFileFor(prefix + (++i) + ".rsc"/*nonNLS*/, "symbol_index"/*nonNLS*/, tokens, false);
- System.out.println(Util.bind("parser.moveFiles"/*nonNLS*/));
+ buildFileFor(prefix + (++i) + ".rsc", "lhs", tokens, false);
+ buildFileFor(prefix + (++i) + ".rsc", "check_table", tokens, true);
+ buildFileFor(prefix + (++i) + ".rsc", "asb", tokens, false);
+ buildFileFor(prefix + (++i) + ".rsc", "asr", tokens, false);
+ buildFileFor(prefix + (++i) + ".rsc", "symbol_index", tokens, false);
+ System.out.println("MOVE FILES IN THE Runtime DIRECTORY OF Parser.class");
}
/*
* Build initial recovery state.
@@ -979,9 +979,9 @@ public void checkAnnotation() {
&& (comment[i + 8] == 't')
&& (comment[i + 9] == 'e')
&& (comment[i + 10] == 'd')) {
- // ensure the tag is properly ended: either followed by a space, a tab, line end or asterisk.
+ // ensure the tag is properly ended: either followed by a space, line end or asterisk.
int nextPos = i+11;
- deprecated = (comment[nextPos] == ' ') || (comment[nextPos] == '\t') || (comment[nextPos] == '\n') || (comment[nextPos] == '\r') || (comment[nextPos] == '*');
+ deprecated = (comment[nextPos] == ' ') || (comment[nextPos] == '\n') || (comment[nextPos] == '\r') || (comment[nextPos] == '*');
break found;
}
}
@@ -3934,12 +3934,11 @@ protected void consumeToken(int type) {
scanner.currentPosition - 1));
break;
case TokenNameStringLiteral :
- StringLiteral stringLiteral = new StringLiteral(
+ pushOnExpressionStack(
+ new StringLiteral(
scanner.getCurrentTokenSourceString(),
scanner.startPosition,
- scanner.currentPosition - 1);
- if (scanner.wasNonExternalizedStringLiteral) problemReporter().nonExternalizedStringLiteral(stringLiteral);
- pushOnExpressionStack(stringLiteral);
+ scanner.currentPosition - 1));
break;
case TokenNamefalse :
pushOnExpressionStack(
@@ -4293,17 +4292,15 @@ protected CompilationUnitDeclaration endParse(int act) {
if (currentElement != null){
currentElement.topElement().updateParseTree();
if (VERBOSE_RECOVERY){
- System.out.print(Util.bind("parser.syntaxRecovery"/*nonNLS*/));
- System.out.println("--------------------------"/*nonNLS*/);
+ System.out.println("SYNTAX RECOVERY--------------------------");
System.out.println(compilationUnit);
- System.out.println("----------------------------------"/*nonNLS*/);
+ System.out.println("----------------------------------");
}
} else {
if (diet & VERBOSE_RECOVERY){
- System.out.print(Util.bind("parser.regularParse"/*nonNLS*/));
- System.out.println("--------------------------"/*nonNLS*/);
+ System.out.println("REGULAR PARSE--------------------------");
System.out.println(compilationUnit);
- System.out.println("----------------------------------"/*nonNLS*/);
+ System.out.println("----------------------------------");
}
}
if (scanner.recordLineSeparator) {
@@ -6005,21 +6002,21 @@ public void initialize() {
lastErrorEndPosition = -1;
}
public void initializeScanner(){
- this.scanner = new Scanner(false, false, this.problemReporter.options.isNonExternalizedStringLiteralHandledAsWarning());
+ this.scanner = new Scanner();
}
public final static void initTables() throws java.io.IOException {
final String prefix = FILEPREFIX;
int i = 0;
- lhs = readTable(prefix + (++i) + ".rsc"/*nonNLS*/);
- char[] chars = readTable(prefix + (++i) + ".rsc"/*nonNLS*/);
+ lhs = readTable(prefix + (++i) + ".rsc");
+ char[] chars = readTable(prefix + (++i) + ".rsc");
check_table = new short[chars.length];
for (int c = chars.length; c-- > 0;) {
check_table[c] = (short) (chars[c] - 32768);
}
- asb = readTable(prefix + (++i) + ".rsc"/*nonNLS*/);
- asr = readTable(prefix + (++i) + ".rsc"/*nonNLS*/);
- symbol_index = readTable(prefix + (++i) + ".rsc"/*nonNLS*/);
+ asb = readTable(prefix + (++i) + ".rsc");
+ asr = readTable(prefix + (++i) + ".rsc");
+ symbol_index = readTable(prefix + (++i) + ".rsc");
action = lhs;
}
public final void jumpOverMethodBody() {
@@ -6639,7 +6636,7 @@ protected static char[] readTable(String filename) throws java.io.IOException {
InputStream stream = Parser.class.getResourceAsStream(filename);
if (stream == null) {
- throw new java.io.IOException(Util.bind("parser.missingFile"/*nonNLS*/,filename));
+ throw new java.io.IOException("missing file" + filename);
}
ByteArrayOutputStream os = new ByteArrayOutputStream(32000);
@@ -6657,7 +6654,7 @@ protected static char[] readTable(String filename) throws java.io.IOException {
//minimal integrity check (even size expected)
if (streamLength % 2 != 0)
- throw new java.io.IOException(Util.bind("parser.corruptedFile"/*nonNLS*/,filename));
+ throw new java.io.IOException("corrupted file " + filename);
// convert bytes into chars
char[] chars = new char[streamLength / 2];
@@ -6740,9 +6737,9 @@ protected void reportSyntaxError(int act, int currentKind, int stateStackTop) {
}
} else { //the next test is HEAVILY grammar DEPENDENT.
if ((length == 2)
- && (tokenName.equals(";"/*nonNLS*/))
- && (expectings[0] == "++"/*nonNLS*/)
- && (expectings[1] == "--"/*nonNLS*/)
+ && (tokenName.equals(";"))
+ && (expectings[0] == "++")
+ && (expectings[1] == "--")
&& (expressionPtr > -1)) {
// the ; is not the expected token ==> it ends a statement when an expression is not ended
problemReporter().invalidExpressionAsStatement(expressionStack[expressionPtr]);
@@ -6843,40 +6840,40 @@ protected static int tAction(int state, int sym) {
}
public String toString() {
- String s = "identifierStack : char[][] = {"/*nonNLS*/;
+ String s = "identifierStack : char[][] = {";
for (int i = 0; i <= identifierPtr; i++) {
- s = s + "\""/*nonNLS*/ + String.valueOf(identifierStack[i]) + "\","/*nonNLS*/;
+ s = s + "\"" + String.valueOf(identifierStack[i]) + "\",";
};
- s = s + "}\n"/*nonNLS*/;
+ s = s + "}\n";
- s = s + "identierLengthStack : int[] = {"/*nonNLS*/;
+ s = s + "identierLengthStack : int[] = {";
for (int i = 0; i <= identifierLengthPtr; i++) {
- s = s + identifierLengthStack[i] + ","/*nonNLS*/;
+ s = s + identifierLengthStack[i] + ",";
};
- s = s + "}\n"/*nonNLS*/;
+ s = s + "}\n";
- s = s + "astLengthStack : int[] = {"/*nonNLS*/;
+ s = s + "astLengthStack : int[] = {";
for (int i = 0; i <= astLengthPtr; i++) {
- s = s + astLengthStack[i] + ","/*nonNLS*/;
+ s = s + astLengthStack[i] + ",";
};
- s = s + "}\n"/*nonNLS*/;
- s = s + "astPtr : int = "/*nonNLS*/ + String.valueOf(astPtr) + "\n"/*nonNLS*/;
+ s = s + "}\n";
+ s = s + "astPtr : int = " + String.valueOf(astPtr) + "\n";
- s = s + "intStack : int[] = {"/*nonNLS*/;
+ s = s + "intStack : int[] = {";
for (int i = 0; i <= intPtr; i++) {
- s = s + intStack[i] + ","/*nonNLS*/;
+ s = s + intStack[i] + ",";
};
- s = s + "}\n"/*nonNLS*/;
+ s = s + "}\n";
- s = s + "expressionLengthStack : int[] = {"/*nonNLS*/;
+ s = s + "expressionLengthStack : int[] = {";
for (int i = 0; i <= expressionLengthPtr; i++) {
- s = s + expressionLengthStack[i] + ","/*nonNLS*/;
+ s = s + expressionLengthStack[i] + ",";
};
- s = s + "}\n"/*nonNLS*/;
+ s = s + "}\n";
- s = s + "expressionPtr : int = "/*nonNLS*/ + String.valueOf(expressionPtr) + "\n"/*nonNLS*/;
+ s = s + "expressionPtr : int = " + String.valueOf(expressionPtr) + "\n";
- s = s + "\n\n\n----------------Scanner--------------\n"/*nonNLS*/ + scanner.toString();
+ s = s + "\n\n\n----------------Scanner--------------\n" + scanner.toString();
return s;
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/ParserBasicInformation.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/ParserBasicInformation.java
index 0606e3a773..c233af7335 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/ParserBasicInformation.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/ParserBasicInformation.java
@@ -1,12 +1,4 @@
package org.eclipse.jdt.internal.compiler.parser;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
-
-/*An interface that contains static declarations for some basic information
- about the parser such as the number of rules in the grammar, the starting state, etc...*/
public interface ParserBasicInformation {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredBlock.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredBlock.java
index a26bdaa8be..79ee70ca0e 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredBlock.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredBlock.java
@@ -10,9 +10,7 @@ package org.eclipse.jdt.internal.compiler.parser;
import org.eclipse.jdt.internal.compiler.ast.*;
import org.eclipse.jdt.internal.compiler.lookup.*;
-import org.eclipse.jdt.internal.compiler.util.CharOperation;
-
-public class RecoveredBlock extends RecoveredStatement implements CompilerModifiers, TerminalSymbols, BaseTypes {
+public class RecoveredBlock extends RecoveredStatement implements CompilerModifiers, TerminalSymbols {
public Block blockDeclaration;
@@ -134,11 +132,11 @@ public AstNode parseTree(){
}
public String toString(int tab) {
StringBuffer result = new StringBuffer(tabString(tab));
- result.append("Recovered block:\n"/*nonNLS*/);
+ result.append("Recovered block:\n");
result.append(blockDeclaration.toString(tab + 1));
if (this.statements != null) {
for (int i = 0; i < this.statementCount; i++) {
- result.append("\n"/*nonNLS*/);
+ result.append("\n");
result.append(this.statements[i].toString(tab + 1));
}
}
@@ -246,32 +244,4 @@ public Statement updateStatement(){
return blockDeclaration;
}
-
-/*
- * Record a field declaration
- */
-public RecoveredElement add(FieldDeclaration fieldDeclaration, int bracketBalance) {
-
- /* local variables inside method can only be final and non void */
- char[][] fieldTypeName;
- if ((fieldDeclaration.modifiers & ~AccFinal) != 0 /* local var can only be final */
- || (fieldDeclaration.type == null) // initializer
- || ((fieldTypeName = fieldDeclaration.type.getTypeName()).length == 1 // non void
- && CharOperation.equals(fieldTypeName[0], VoidBinding.sourceName()))){
- this.updateSourceEndIfNecessary(this.previousAvailableLineEnd(fieldDeclaration.declarationSourceStart - 1));
- return this.parent.add(fieldDeclaration, bracketBalance);
- }
-
- /* do not consider a local variable starting passed the block end (if set)
- it must be belonging to an enclosing block */
- if (blockDeclaration.sourceEnd != 0
- && fieldDeclaration.declarationSourceStart > blockDeclaration.sourceEnd){
- return this.parent.add(fieldDeclaration, bracketBalance);
- }
-
- // ignore the added field, since indicates a local variable behind recovery point
- // which thus got parsed as a field reference. This can happen if restarting after
- // having reduced an assistNode to get the following context (see 1GEK7SG)
- return this;
-}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredElement.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredElement.java
index 4de01e86d6..29408dc3dc 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredElement.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredElement.java
@@ -215,7 +215,7 @@ public int sourceEnd(){
protected String tabString(int tab) {
StringBuffer result = new StringBuffer();
for (int i = tab; i > 0; i--) {
- result.append(" "/*nonNLS*/);
+ result.append(" ");
}
return result.toString();
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredField.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredField.java
index 7d3800cd56..76f2ce1799 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredField.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredField.java
@@ -85,11 +85,11 @@ public int sourceEnd(){
}
public String toString(int tab){
StringBuffer buffer = new StringBuffer(tabString(tab));
- buffer.append("Recovered field:\n"/*nonNLS*/);
+ buffer.append("Recovered field:\n");
buffer.append(fieldDeclaration.toString(tab + 1));
if (this.anonymousTypes != null) {
for (int i = 0; i < this.anonymousTypeCount; i++){
- buffer.append("\n"/*nonNLS*/);
+ buffer.append("\n");
buffer.append(anonymousTypes[i].toString(tab + 1));
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredImport.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredImport.java
index 139deadc0b..25c3e0acb0 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredImport.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredImport.java
@@ -29,7 +29,7 @@ public int sourceEnd(){
return this.importReference.declarationSourceEnd;
}
public String toString(int tab) {
- return tabString(tab) + "Recovered import: "/*nonNLS*/ + importReference.toString();
+ return tabString(tab) + "Recovered import: " + importReference.toString();
}
public ImportReference updatedImportReference(){
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredInitializer.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredInitializer.java
index 36f41b9983..d0fdfbac80 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredInitializer.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredInitializer.java
@@ -161,10 +161,10 @@ public RecoveredElement add(TypeDeclaration typeDeclaration, int bracketBalance)
}
public String toString(int tab) {
StringBuffer result = new StringBuffer(tabString(tab));
- result.append("Recovered initializer:\n"/*nonNLS*/);
+ result.append("Recovered initializer:\n");
result.append(this.fieldDeclaration.toString(tab + 1));
if (this.initializerBody != null) {
- result.append("\n"/*nonNLS*/);
+ result.append("\n");
result.append(this.initializerBody.toString(tab + 1));
}
return result.toString();
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredLocalVariable.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredLocalVariable.java
index 3d3df3a717..12e14e800e 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredLocalVariable.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredLocalVariable.java
@@ -31,7 +31,7 @@ public int sourceEnd(){
return this.localDeclaration.declarationSourceEnd;
}
public String toString(int tab) {
- return tabString(tab) + "Recovered local variable:\n"/*nonNLS*/ + localDeclaration.toString(tab + 1);
+ return tabString(tab) + "Recovered local variable:\n" + localDeclaration.toString(tab + 1);
}
public Statement updatedStatement(){
return localDeclaration;
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredMethod.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredMethod.java
index d330454bae..a17a552ea3 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredMethod.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredMethod.java
@@ -189,16 +189,16 @@ public int sourceEnd(){
}
public String toString(int tab) {
StringBuffer result = new StringBuffer(tabString(tab));
- result.append("Recovered method:\n"/*nonNLS*/);
+ result.append("Recovered method:\n");
result.append(this.methodDeclaration.toString(tab + 1));
if (this.localTypes != null) {
for (int i = 0; i < this.localTypeCount; i++) {
- result.append("\n"/*nonNLS*/);
+ result.append("\n");
result.append(this.localTypes[i].toString(tab + 1));
}
}
if (this.methodBody != null) {
- result.append("\n"/*nonNLS*/);
+ result.append("\n");
result.append(this.methodBody.toString(tab + 1));
}
return result.toString();
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredStatement.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredStatement.java
index 48be014678..5a4d6c75b2 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredStatement.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredStatement.java
@@ -30,7 +30,7 @@ public int sourceEnd(){
return this.statement.sourceEnd;
}
public String toString(int tab){
- return tabString(tab) + "Recovered statement:\n"/*nonNLS*/ + statement.toString(tab + 1);
+ return tabString(tab) + "Recovered statement:\n" + statement.toString(tab + 1);
}
public Statement updatedStatement(){
return statement;
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredType.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredType.java
index e1bc17f076..d39519b3a5 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredType.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredType.java
@@ -185,27 +185,27 @@ public int sourceEnd(){
}
public String toString(int tab) {
StringBuffer result = new StringBuffer(tabString(tab));
- result.append("Recovered type:\n"/*nonNLS*/);
+ result.append("Recovered type:\n");
if (typeDeclaration instanceof AnonymousLocalTypeDeclaration) {
result.append(tabString(tab));
- result.append(" "/*nonNLS*/);
+ result.append(" ");
}
result.append(typeDeclaration.toString(tab + 1));
if (this.memberTypes != null) {
for (int i = 0; i < this.memberTypeCount; i++) {
- result.append("\n"/*nonNLS*/);
+ result.append("\n");
result.append(this.memberTypes[i].toString(tab + 1));
}
}
if (this.fields != null) {
for (int i = 0; i < this.fieldCount; i++) {
- result.append("\n"/*nonNLS*/);
+ result.append("\n");
result.append(this.fields[i].toString(tab + 1));
}
}
if (this.methods != null) {
for (int i = 0; i < this.methodCount; i++) {
- result.append("\n"/*nonNLS*/);
+ result.append("\n");
result.append(this.methods[i].toString(tab + 1));
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredUnit.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredUnit.java
index eb678048d5..b206d6975c 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredUnit.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredUnit.java
@@ -106,19 +106,19 @@ public int sourceEnd(){
}
public String toString(int tab) {
StringBuffer result = new StringBuffer(tabString(tab));
- result.append("Recovered unit: [\n"/*nonNLS*/);
+ result.append("Recovered unit: [\n");
result.append(unitDeclaration.toString(tab + 1));
result.append(tabString(tab + 1));
- result.append("]"/*nonNLS*/);
+ result.append("]");
if (this.imports != null) {
for (int i = 0; i < this.importCount; i++) {
- result.append("\n"/*nonNLS*/);
+ result.append("\n");
result.append(this.imports[i].toString(tab + 1));
}
}
if (this.types != null) {
for (int i = 0; i < this.typeCount; i++) {
- result.append("\n"/*nonNLS*/);
+ result.append("\n");
result.append(this.types[i].toString(tab + 1));
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Scanner.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Scanner.java
index fb62e9aba1..c65631684c 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Scanner.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Scanner.java
@@ -62,21 +62,21 @@ public class Scanner implements TerminalSymbols {
public int linePtr = -1;
public boolean wasAcr = false;
- public static final String END_OF_SOURCE = "End_Of_Source"/*nonNLS*/;
+ public static final String END_OF_SOURCE = "End_Of_Source";
- public static final String INVALID_HEXA = "Invalid_Hexa_Literal"/*nonNLS*/;
- public static final String INVALID_OCTAL = "Invalid_Octal_Literal"/*nonNLS*/;
+ public static final String INVALID_HEXA = "Invalid_Hexa_Literal";
+ public static final String INVALID_OCTAL = "Invalid_Octal_Literal";
public static final String INVALID_CHARACTER_CONSTANT =
- "Invalid_Character_Constant"/*nonNLS*/;
- public static final String INVALID_ESCAPE = "Invalid_Escape"/*nonNLS*/;
- public static final String INVALID_INPUT = "Invalid_Input"/*nonNLS*/;
- public static final String INVALID_UNICODE_ESCAPE = "Invalid_Unicode_Escape"/*nonNLS*/;
- public static final String INVALID_FLOAT = "Invalid_Float_Literal"/*nonNLS*/;
+ "Invalid_Character_Constant";
+ public static final String INVALID_ESCAPE = "Invalid_Escape";
+ public static final String INVALID_INPUT = "Invalid_Input";
+ public static final String INVALID_UNICODE_ESCAPE = "Invalid_Unicode_Escape";
+ public static final String INVALID_FLOAT = "Invalid_Float_Literal";
- public static final String NULL_SOURCE_STRING = "Null_Source_String"/*nonNLS*/;
- public static final String UNTERMINATED_STRING = "Unterminated_String"/*nonNLS*/;
- public static final String UNTERMINATED_COMMENT = "Unterminated_Comment"/*nonNLS*/;
- public static final String INVALID_CHAR_IN_STRING = "Invalid_Char_In_String"/*nonNLS*/;
+ public static final String NULL_SOURCE_STRING = "Null_Source_String";
+ public static final String UNTERMINATED_STRING = "Unterminated_String";
+ public static final String UNTERMINATED_COMMENT = "Unterminated_Comment";
+ public static final String INVALID_CHAR_IN_STRING = "Invalid_Char_In_String";
//----------------optimized identifier managment------------------
static final char[] charArray_a = new char[] {'a'},
@@ -112,10 +112,6 @@ public class Scanner implements TerminalSymbols {
public static final int OptimizedLength = 6;
public /*static*/ final char[][][][] charArray_length =
new char[OptimizedLength][TableSize][InternalTableSize][];
- // support for detecting non-externalized string literals
- public boolean checkNonExternalizedStringLiterals = true;
- public static char[] NonNLS_TAG = "/*nonNLS*/"/*nonNLS*/.toCharArray();
- public boolean wasNonExternalizedStringLiteral = false;
/*static*/ {
for (int i = 0; i < 6; i++) {
for (int j = 0; j < TableSize; j++) {
@@ -139,7 +135,9 @@ public Scanner() {
this(false, false);
}
public Scanner(boolean tokenizeComments, boolean tokenizeWhiteSpace) {
- this(tokenizeComments, tokenizeWhiteSpace, false);
+ this.eofPosition = Integer.MAX_VALUE;
+ this.tokenizeComments = tokenizeComments;
+ this.tokenizeWhiteSpace = tokenizeWhiteSpace;
}
public final boolean atEnd() {
// This code is not relevant if source is
@@ -915,16 +913,6 @@ public int getNextToken() throws InvalidInputException {
}
throw e; // rethrow
}
- if (checkNonExternalizedStringLiterals){ // check for presence of /*nonNLS*/
- int lookAhead = 0;
- for (; lookAhead < 10; lookAhead++){
- if (currentPosition + lookAhead == source.length)
- break;
- if (source[currentPosition + lookAhead] != NonNLS_TAG[lookAhead])
- break;
- }
- this.wasNonExternalizedStringLiteral = lookAhead != 10;
- }
return TokenNameStringLiteral;
case '/' :
{
@@ -1084,7 +1072,7 @@ public int getNextToken() throws InvalidInputException {
if (atEnd())
return TokenNameEOF;
//the atEnd may not be <currentPosition == source.length> if source is only some part of a real (external) stream
- throw new InvalidInputException("Ctrl-Z"/*nonNLS*/);
+ throw new InvalidInputException("Ctrl-Z");
default :
if (Character.isJavaIdentifierStart(currentCharacter))
@@ -1419,37 +1407,33 @@ public final boolean jumpOverUnicodeWhiteSpace()
//On false, the currentCharacter is filled up with a potential
//correct char
- try {
- int c1, c2, c3, c4;
- int unicodeSize = 6;
+ int c1, c2, c3, c4;
+ int unicodeSize = 6;
+ currentPosition++;
+ while (source[currentPosition] == 'u') {
currentPosition++;
- while (source[currentPosition] == 'u') {
- currentPosition++;
- unicodeSize++;
- }
-
- if (((c1 = Character.getNumericValue(source[currentPosition++])) > 15
- || c1 < 0)
- || ((c2 = Character.getNumericValue(source[currentPosition++])) > 15 || c2 < 0)
- || ((c3 = Character.getNumericValue(source[currentPosition++])) > 15 || c3 < 0)
- || ((c4 = Character.getNumericValue(source[currentPosition++])) > 15 || c4 < 0)) {
- throw new InvalidInputException(INVALID_UNICODE_ESCAPE);
- }
-
- currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
- if (recordLineSeparator
- && ((currentCharacter == '\r') || (currentCharacter == '\n')))
- pushLineSeparator();
- if (Character.isWhitespace(currentCharacter))
- return true;
+ unicodeSize++;
+ }
- //buffer the new char which is not a white space
- withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
- //withoutUnicodePtr == 1 is true here
- return false;
- } catch (IndexOutOfBoundsException e){
+ if (((c1 = Character.getNumericValue(source[currentPosition++])) > 15
+ || c1 < 0)
+ || ((c2 = Character.getNumericValue(source[currentPosition++])) > 15 || c2 < 0)
+ || ((c3 = Character.getNumericValue(source[currentPosition++])) > 15 || c3 < 0)
+ || ((c4 = Character.getNumericValue(source[currentPosition++])) > 15 || c4 < 0)) {
throw new InvalidInputException(INVALID_UNICODE_ESCAPE);
}
+
+ currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
+ if (recordLineSeparator
+ && ((currentCharacter == '\r') || (currentCharacter == '\n')))
+ pushLineSeparator();
+ if (Character.isWhitespace(currentCharacter))
+ return true;
+
+ //buffer the new char which is not a white space
+ withoutUnicodeBuffer[++withoutUnicodePtr] = currentCharacter;
+ //withoutUnicodePtr == 1 is true here
+ return false;
}
public final int[] lineEnds() {
//return a bounded copy of this.lineEnds
@@ -2653,9 +2637,9 @@ public final void setSourceBuffer(char[] sourceString){
}
public String toString() {
if (startPosition == source.length)
- return "EOF\n\n"/*nonNLS*/ + new String(source);
+ return "EOF\n\n" + new String(source);
if (currentPosition > source.length)
- return "behind the EOF :-( ....\n\n"/*nonNLS*/ + new String(source);
+ return "behind the EOF :-( ....\n\n" + new String(source);
char front[] = new char[startPosition];
System.arraycopy(source, 0, front, 0, startPosition);
@@ -2683,228 +2667,221 @@ public String toString() {
source.length - (currentPosition - 1) - 1);
return new String(front)
- + "\n===============================\nStarts here -->"/*nonNLS*/
+ + "\n===============================\nStarts here -->"
+ new String(middle)
- + "<-- Ends here\n===============================\n"/*nonNLS*/
+ + "<-- Ends here\n===============================\n"
+ new String(end);
}
public final String toStringAction(int act) {
switch (act) {
case TokenNameIdentifier :
- return "Identifier("/*nonNLS*/ + new String(getCurrentTokenSource()) + ")"/*nonNLS*/;
+ return "Identifier(" + new String(getCurrentTokenSource()) + ")";
case TokenNameabstract :
- return "abstract"/*nonNLS*/;
+ return "abstract";
case TokenNameboolean :
- return "boolean"/*nonNLS*/;
+ return "boolean";
case TokenNamebreak :
- return "break"/*nonNLS*/;
+ return "break";
case TokenNamebyte :
- return "byte"/*nonNLS*/;
+ return "byte";
case TokenNamecase :
- return "case"/*nonNLS*/;
+ return "case";
case TokenNamecatch :
- return "catch"/*nonNLS*/;
+ return "catch";
case TokenNamechar :
- return "char"/*nonNLS*/;
+ return "char";
case TokenNameclass :
- return "class"/*nonNLS*/;
+ return "class";
case TokenNamecontinue :
- return "continue"/*nonNLS*/;
+ return "continue";
case TokenNamedefault :
- return "default"/*nonNLS*/;
+ return "default";
case TokenNamedo :
- return "do"/*nonNLS*/;
+ return "do";
case TokenNamedouble :
- return "double"/*nonNLS*/;
+ return "double";
case TokenNameelse :
- return "else"/*nonNLS*/;
+ return "else";
case TokenNameextends :
- return "extends"/*nonNLS*/;
+ return "extends";
case TokenNamefalse :
- return "false"/*nonNLS*/;
+ return "false";
case TokenNamefinal :
- return "final"/*nonNLS*/;
+ return "final";
case TokenNamefinally :
- return "finally"/*nonNLS*/;
+ return "finally";
case TokenNamefloat :
- return "float"/*nonNLS*/;
+ return "float";
case TokenNamefor :
- return "for"/*nonNLS*/;
+ return "for";
case TokenNameif :
- return "if"/*nonNLS*/;
+ return "if";
case TokenNameimplements :
- return "implements"/*nonNLS*/;
+ return "implements";
case TokenNameimport :
- return "import"/*nonNLS*/;
+ return "import";
case TokenNameinstanceof :
- return "instanceof"/*nonNLS*/;
+ return "instanceof";
case TokenNameint :
- return "int"/*nonNLS*/;
+ return "int";
case TokenNameinterface :
- return "interface"/*nonNLS*/;
+ return "interface";
case TokenNamelong :
- return "long"/*nonNLS*/;
+ return "long";
case TokenNamenative :
- return "native"/*nonNLS*/;
+ return "native";
case TokenNamenew :
- return "new"/*nonNLS*/;
+ return "new";
case TokenNamenull :
- return "null"/*nonNLS*/;
+ return "null";
case TokenNamepackage :
- return "package"/*nonNLS*/;
+ return "package";
case TokenNameprivate :
- return "private"/*nonNLS*/;
+ return "private";
case TokenNameprotected :
- return "protected"/*nonNLS*/;
+ return "protected";
case TokenNamepublic :
- return "public"/*nonNLS*/;
+ return "public";
case TokenNamereturn :
- return "return"/*nonNLS*/;
+ return "return";
case TokenNameshort :
- return "short"/*nonNLS*/;
+ return "short";
case TokenNamestatic :
- return "static"/*nonNLS*/;
+ return "static";
case TokenNamesuper :
- return "super"/*nonNLS*/;
+ return "super";
case TokenNameswitch :
- return "switch"/*nonNLS*/;
+ return "switch";
case TokenNamesynchronized :
- return "synchronized"/*nonNLS*/;
+ return "synchronized";
case TokenNamethis :
- return "this"/*nonNLS*/;
+ return "this";
case TokenNamethrow :
- return "throw"/*nonNLS*/;
+ return "throw";
case TokenNamethrows :
- return "throws"/*nonNLS*/;
+ return "throws";
case TokenNametransient :
- return "transient"/*nonNLS*/;
+ return "transient";
case TokenNametrue :
- return "true"/*nonNLS*/;
+ return "true";
case TokenNametry :
- return "try"/*nonNLS*/;
+ return "try";
case TokenNamevoid :
- return "void"/*nonNLS*/;
+ return "void";
case TokenNamevolatile :
- return "volatile"/*nonNLS*/;
+ return "volatile";
case TokenNamewhile :
- return "while"/*nonNLS*/;
+ return "while";
case TokenNameIntegerLiteral :
- return "Integer("/*nonNLS*/ + new String(getCurrentTokenSource()) + ")"/*nonNLS*/;
+ return "Integer(" + new String(getCurrentTokenSource()) + ")";
case TokenNameLongLiteral :
- return "Long("/*nonNLS*/ + new String(getCurrentTokenSource()) + ")"/*nonNLS*/;
+ return "Long(" + new String(getCurrentTokenSource()) + ")";
case TokenNameFloatingPointLiteral :
- return "Float("/*nonNLS*/ + new String(getCurrentTokenSource()) + ")"/*nonNLS*/;
+ return "Float(" + new String(getCurrentTokenSource()) + ")";
case TokenNameDoubleLiteral :
- return "Double("/*nonNLS*/ + new String(getCurrentTokenSource()) + ")"/*nonNLS*/;
+ return "Double(" + new String(getCurrentTokenSource()) + ")";
case TokenNameCharacterLiteral :
- return "Char("/*nonNLS*/ + new String(getCurrentTokenSource()) + ")"/*nonNLS*/;
+ return "Char(" + new String(getCurrentTokenSource()) + ")";
case TokenNameStringLiteral :
- return "String("/*nonNLS*/ + new String(getCurrentTokenSource()) + ")"/*nonNLS*/;
+ return "String(" + new String(getCurrentTokenSource()) + ")";
case TokenNamePLUS_PLUS :
- return "++"/*nonNLS*/;
+ return "++";
case TokenNameMINUS_MINUS :
- return "--"/*nonNLS*/;
+ return "--";
case TokenNameEQUAL_EQUAL :
- return "=="/*nonNLS*/;
+ return "==";
case TokenNameLESS_EQUAL :
- return "<="/*nonNLS*/;
+ return "<=";
case TokenNameGREATER_EQUAL :
- return ">="/*nonNLS*/;
+ return ">=";
case TokenNameNOT_EQUAL :
- return "!="/*nonNLS*/;
+ return "!=";
case TokenNameLEFT_SHIFT :
- return "<<"/*nonNLS*/;
+ return "<<";
case TokenNameRIGHT_SHIFT :
- return ">>"/*nonNLS*/;
+ return ">>";
case TokenNameUNSIGNED_RIGHT_SHIFT :
- return ">>>"/*nonNLS*/;
+ return ">>>";
case TokenNamePLUS_EQUAL :
- return "+="/*nonNLS*/;
+ return "+=";
case TokenNameMINUS_EQUAL :
- return "-="/*nonNLS*/;
+ return "-=";
case TokenNameMULTIPLY_EQUAL :
- return "*="/*nonNLS*/;
+ return "*=";
case TokenNameDIVIDE_EQUAL :
- return "/="/*nonNLS*/;
+ return "/=";
case TokenNameAND_EQUAL :
- return "&="/*nonNLS*/;
+ return "&=";
case TokenNameOR_EQUAL :
- return "|="/*nonNLS*/;
+ return "|=";
case TokenNameXOR_EQUAL :
- return "^="/*nonNLS*/;
+ return "^=";
case TokenNameREMAINDER_EQUAL :
- return "%="/*nonNLS*/;
+ return "%=";
case TokenNameLEFT_SHIFT_EQUAL :
- return "<<="/*nonNLS*/;
+ return "<<=";
case TokenNameRIGHT_SHIFT_EQUAL :
- return ">>="/*nonNLS*/;
+ return ">>=";
case TokenNameUNSIGNED_RIGHT_SHIFT_EQUAL :
- return ">>>="/*nonNLS*/;
+ return ">>>=";
case TokenNameOR_OR :
- return "||"/*nonNLS*/;
+ return "||";
case TokenNameAND_AND :
- return "&&"/*nonNLS*/;
+ return "&&";
case TokenNamePLUS :
- return "+"/*nonNLS*/;
+ return "+";
case TokenNameMINUS :
- return "-"/*nonNLS*/;
+ return "-";
case TokenNameNOT :
- return "!"/*nonNLS*/;
+ return "!";
case TokenNameREMAINDER :
- return "%"/*nonNLS*/;
+ return "%";
case TokenNameXOR :
- return "^"/*nonNLS*/;
+ return "^";
case TokenNameAND :
- return "&"/*nonNLS*/;
+ return "&";
case TokenNameMULTIPLY :
- return "*"/*nonNLS*/;
+ return "*";
case TokenNameOR :
- return "|"/*nonNLS*/;
+ return "|";
case TokenNameTWIDDLE :
- return "~"/*nonNLS*/;
+ return "~";
case TokenNameDIVIDE :
- return "/"/*nonNLS*/;
+ return "/";
case TokenNameGREATER :
- return ">"/*nonNLS*/;
+ return ">";
case TokenNameLESS :
- return "<"/*nonNLS*/;
+ return "<";
case TokenNameLPAREN :
- return "("/*nonNLS*/;
+ return "(";
case TokenNameRPAREN :
- return ")"/*nonNLS*/;
+ return ")";
case TokenNameLBRACE :
- return "{"/*nonNLS*/;
+ return "{";
case TokenNameRBRACE :
- return "}"/*nonNLS*/;
+ return "}";
case TokenNameLBRACKET :
- return "["/*nonNLS*/;
+ return "[";
case TokenNameRBRACKET :
- return "]"/*nonNLS*/;
+ return "]";
case TokenNameSEMICOLON :
- return ";"/*nonNLS*/;
+ return ";";
case TokenNameQUESTION :
- return "?"/*nonNLS*/;
+ return "?";
case TokenNameCOLON :
- return ":"/*nonNLS*/;
+ return ":";
case TokenNameCOMMA :
- return ","/*nonNLS*/;
+ return ",";
case TokenNameDOT :
- return "."/*nonNLS*/;
+ return ".";
case TokenNameEQUAL :
- return "="/*nonNLS*/;
+ return "=";
case TokenNameEOF :
- return "EOF"/*nonNLS*/;
+ return "EOF";
default :
- return "not-a-token"/*nonNLS*/;
+ return "not-a-token";
}
}
-
-public Scanner(boolean tokenizeComments, boolean tokenizeWhiteSpace, boolean checkNonExternalizedStringLiterals) {
- this.eofPosition = Integer.MAX_VALUE;
- this.tokenizeComments = tokenizeComments;
- this.tokenizeWhiteSpace = tokenizeWhiteSpace;
- this.checkNonExternalizedStringLiterals = checkNonExternalizedStringLiterals;
-}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/TerminalSymbols.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/TerminalSymbols.java
index f281179f9d..1453932cae 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/TerminalSymbols.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/TerminalSymbols.java
@@ -1,12 +1,4 @@
package org.eclipse.jdt.internal.compiler.parser;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
-
-/*Maps each terminal symbol in the java-grammar into a unique integer.
-This integer is used to represent the terminal when computing a parsing action. */
public interface TerminalSymbols {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/DefaultProblem.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/DefaultProblem.java
index 96abfc55a8..09d611168e 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/DefaultProblem.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/DefaultProblem.java
@@ -7,7 +7,6 @@ package org.eclipse.jdt.internal.compiler.problem;
import org.eclipse.jdt.internal.compiler.impl.*;
import org.eclipse.jdt.internal.compiler.*;
import org.eclipse.jdt.internal.compiler.env.*;
-import org.eclipse.jdt.internal.compiler.util.Util;
public class DefaultProblem implements IProblem, ProblemSeverities, ProblemIrritants {
private char[] fileName;
@@ -45,7 +44,7 @@ public String errorReportSource(ICompilationUnit compilationUnit) {
//sanity .....
if ((startPosition > endPosition)
|| ((startPosition <= 0) && (endPosition <= 0)))
- return Util.bind("problem.noSourceInformation"/*nonNLS*/);
+ return "\n!! no source information available !!";
//regular behavior....(slow code)
@@ -111,8 +110,8 @@ public String errorReportSource(ICompilationUnit compilationUnit) {
//resize underneathto remove 'null' chars
System.arraycopy(underneath, 0, underneath = new char[pos], 0, pos);
- return Util.bind("problem.atLine"/*nonNLS*/,String.valueOf(line)) +
- "\n\t"/*nonNLS*/ + new String(extract) + "\n\t"/*nonNLS*/ + new String(underneath);
+ return " (at line " + String.valueOf(line) + ")" + //NON NLS
+ "\n\t" + new String(extract) + "\n\t" + new String(underneath);
}
/**
* Answer back the original arguments recorded into the problem.
@@ -212,13 +211,13 @@ public void setSourceStart(int sourceStart) {
}
public String toString() {
- String s = "Pb("/*nonNLS*/ + (id & IgnoreCategoriesMask) + ") "/*nonNLS*/;
+ String s = "Pb(" + (id & IgnoreCategoriesMask) + ") ";
if (message != null) {
s += message;
} else {
if (arguments != null)
for (int i = 0; i < arguments.length; i++)
- s += " "/*nonNLS*/ + arguments[i];
+ s += " " + arguments[i];
}
return s;
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/DefaultProblemFactory.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/DefaultProblemFactory.java
index b08aab3e3d..37e484016a 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/DefaultProblemFactory.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/DefaultProblemFactory.java
@@ -70,9 +70,9 @@ public final String getLocalizedMessage(int id, String[] problemArguments) {
String message =
messageTemplates[(id & ProblemIrritants.IgnoreCategoriesMask)];
if (message == null) {
- return "Unable to retrieve the error message for problem id: "/*nonNLS*/
+ return "Unable to retrieve the error message for problem id: "
+ id
- + ". Check compiler resources."/*nonNLS*/;
+ + ". Check compiler resources.";
}
int length = message.length();
@@ -87,9 +87,9 @@ public final String getLocalizedMessage(int id, String[] problemArguments) {
} catch (NumberFormatException nfe) {
output.append(message.substring(end + 1, start + 1));
} catch (ArrayIndexOutOfBoundsException e) {
- return "Corrupted compiler resources for problem id: "/*nonNLS*/
+ return "Corrupted compiler resources for problem id: "
+ (id & ProblemIrritants.IgnoreCategoriesMask)
- + ". Check compiler resources."/*nonNLS*/;
+ + ". Check compiler resources.";
}
} else {
output.append(message.substring(end, length));
@@ -115,11 +115,11 @@ public final String localizedMessage(IProblem problem) {
* to the current Locale.
*/
public static String[] loadMessageTemplates(Locale loc) {
- ResourceBundle bundle = ResourceBundle.getBundle("org.eclipse.jdt.internal.compiler.problem.Messages"/*nonNLS*/, loc);
+ ResourceBundle bundle = ResourceBundle.getBundle("org.eclipse.jdt.internal.compiler.problem.Messages", loc);
String[] templates = new String[500];
for (int i = 0, max = templates.length; i < max; i++) {
try {
- templates[i] = bundle.getString(String.valueOf(i));
+ templates[i] = bundle.getString(String.valueOf(i)); //$NON-NLS-1$
} catch (MissingResourceException e) {
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemIrritants.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemIrritants.java
index e41300550a..2f898c5ae0 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemIrritants.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemIrritants.java
@@ -1,11 +1,6 @@
package org.eclipse.jdt.internal.compiler.problem;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
-public interface ProblemIrritants { // max: 500
+public interface ProblemIrritants { // max: 500
// categories
final int TypeRelated = 0x01000000;
final int FieldRelated = 0x02000000;
@@ -32,7 +27,7 @@ public interface ProblemIrritants { // max: 500
final int MissingEnclosingInstanceForConstructorCall = TypeRelated + 20;
final int MissingEnclosingInstance = TypeRelated + 21;
final int IncorrectEnclosingInstanceReference = TypeRelated + 22;
- final int IllegalEnclosingInstanceSpecification = TypeRelated + 23;
+ final int IllegalEnclosingInstanceSpecification = TypeRelated + 23;
final int CannotDefineStaticInitializerInLocalType = Internal + 24;
final int OuterLocalMustBeFinal = Internal + 25;
final int CannotDefineInterfaceInLocalType = Internal + 26;
@@ -58,7 +53,7 @@ public interface ProblemIrritants { // max: 500
final int BytecodeExceeds64KLimitForClinit = Internal + 64;
final int TooManyArgumentSlots = Internal + 65;
final int TooManyLocalVariableSlots = Internal + 66;
-
+
// fields
final int UndefinedField = FieldRelated + 70;
final int NotVisibleField = FieldRelated + 71;
@@ -89,7 +84,7 @@ public interface ProblemIrritants { // max: 500
final int NoMessageSendOnBaseType = MethodRelated + 114;
final int ParameterMismatch = MethodRelated + 115;
final int NoMessageSendOnArrayType = MethodRelated + 116;
-
+
// constructors
final int UndefinedConstructor = ConstructorRelated + 130;
final int NotVisibleConstructor = ConstructorRelated + 131;
@@ -126,7 +121,7 @@ public interface ProblemIrritants { // max: 500
final int DuplicateDefaultCase = 166;
final int UnreachableCatch = TypeRelated + MethodRelated + 167;
final int UnhandledException = TypeRelated + 168;
- // switch
+ // switch
final int IncorrectSwitchType = TypeRelated + 169;
final int DuplicateCase = FieldRelated + 170;
// labelled
@@ -167,7 +162,7 @@ public interface ProblemIrritants { // max: 500
final int UnmatchedBracket = Internal + 220;
final int NoFieldOnBaseType = FieldRelated + 221;
final int InvalidExpressionAsStatement = Internal + 222;
-
+
// constants
final int END_OF_SOURCE = Internal + 250;
final int INVALID_HEXA = Internal + 251;
@@ -189,7 +184,7 @@ public interface ProblemIrritants { // max: 500
final int IllegalModifierForMemberClass = TypeRelated + 304;
final int IllegalModifierForMemberInterface = TypeRelated + 305;
final int IllegalModifierForLocalClass = TypeRelated + 306;
-// final int IllegalModifierForLocalInterface = TypeRelated + 307;
+// final int IllegalModifierForLocalInterface = TypeRelated + 307;
final int IllegalModifierCombinationFinalAbstractForClass = TypeRelated + 308;
final int IllegalVisibilityModifierForInterfaceMemberType = TypeRelated + 309;
final int IllegalVisibilityModifierCombinationForMemberType = TypeRelated + 310;
@@ -272,8 +267,4 @@ public interface ProblemIrritants { // max: 500
// code snippet support
final int CodeSnippetMissingClass = Internal + 420;
final int CodeSnippetMissingMethod = Internal + 421;
- final int NonExternalizedStringLiteral = Internal + 261;
-
- //constant pool
- final int TooManyConstantsInConstantPool = Internal + 430;
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java
index df2222cef1..d1037477b2 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java
@@ -167,7 +167,7 @@ public void cannotAssignToFinalField(FieldBinding field, AstNode location) {
this.handle(
FinalFieldAssignment,
new String[] {
- (field.declaringClass == null ? "array"/*nonNLS*/ : new String(field.declaringClass.readableName())),
+ (field.declaringClass == null ? "array" : new String(field.declaringClass.readableName())),
new String(field.readableName())},
location.sourceStart(),
location.sourceEnd());
@@ -420,15 +420,7 @@ public int computeSeverity(int problemId){
return Warning;
}
return Ignore;
- case NonExternalizedStringLiteral :
- if ((errorThreshold & NonExternalizedString) != 0){
- return Error;
- }
- if ((warningThreshold & NonExternalizedString) != 0){
- return Warning;
- }
- return Ignore;
-
+
default:
return Error;
}
@@ -459,10 +451,10 @@ public void constantOutOfFormat(NumberLiteral lit) {
final int radix;
if ((source[1] == 'x') || (source[1] == 'X')) {
radix = 16;
- Radix = "Hexa"/*nonNLS*/;
+ Radix = "Hexa";
} else {
radix = 8;
- Radix = "Octal"/*nonNLS*/;
+ Radix = "Octal";
}
//look for the first digit that is incorrect
int place = -1;
@@ -475,7 +467,7 @@ public void constantOutOfFormat(NumberLiteral lit) {
this.handle(
NumericValueOutOfRange,
- new String[] {Radix + " "/*nonNLS*/ + new String(source) + " (digit "/*nonNLS*/ + new String(new char[] {source[place]}) + ")"/*nonNLS*/},
+ new String[] {Radix + " " + new String(source) + " (digit " + new String(new char[] {source[place]}) + ")"},
lit.sourceStart,
lit.sourceEnd);
return;
@@ -640,7 +632,7 @@ public void errorNoMethodFor(MessageSend messageSend, TypeBinding recType, TypeB
StringBuffer buffer = new StringBuffer();
for (int i = 0, length = params.length; i < length; i++) {
if (i != 0)
- buffer.append(", "/*nonNLS*/);
+ buffer.append(", ");
buffer.append(new String(params[i].readableName()));
}
@@ -653,7 +645,7 @@ public void errorNoMethodFor(MessageSend messageSend, TypeBinding recType, TypeB
public void errorThisSuperInStatic(AstNode reference) {
this.handle(
ThisInStaticContext,
- new String[] {reference.isSuper() ? "super"/*nonNLS*/ : "this"/*nonNLS*/},
+ new String[] {reference.isSuper() ? "super" : "this"},
reference.sourceStart,
reference.sourceEnd);
}
@@ -789,7 +781,7 @@ public void hidingEnclosingType(TypeDeclaration typeDecl) {
public void hierarchyCircularity(SourceTypeBinding sourceType, ReferenceBinding superType, TypeReference reference) {
int start = 0;
int end = 0;
- String typeName = ""/*nonNLS*/;
+ String typeName = "";
if (reference == null) { // can only happen when java.lang.Object is busted
start = sourceType.sourceStart();
@@ -1073,7 +1065,7 @@ public void inheritedMethodsHaveIncompatibleReturnTypes(SourceTypeBinding type,
.append('.')
.append(inheritedMethods[i].readableName());
if (i != 0)
- methodSignatures.append(", "/*nonNLS*/);
+ methodSignatures.append(", ");
}
this.handle(
@@ -1188,7 +1180,7 @@ public void invalidEnclosingType(Expression expression, TypeBinding type, TypeBi
this.handle(
flag,
- new String[] {new String(enclosingType.readableName()) + "."/*nonNLS*/ + new String(type.readableName())},
+ new String[] {new String(enclosingType.readableName()) + "." + new String(type.readableName())},
expression.sourceStart,
expression.sourceEnd);
}
@@ -1399,7 +1391,7 @@ public void invalidOperator(BinaryExpression expression, TypeBinding leftType, T
InvalidOperator,
new String[] {
expression.operatorToString(),
- new String(leftType.readableName()) + ", "/*nonNLS*/ + new String(rightType.readableName())},
+ new String(leftType.readableName()) + ", " + new String(rightType.readableName())},
expression.sourceStart,
expression.sourceEnd);
}
@@ -1408,7 +1400,7 @@ public void invalidOperator(CompoundAssignment assign, TypeBinding leftType, Typ
InvalidOperator,
new String[] {
assign.operatorToString(),
- new String(leftType.readableName()) + ", "/*nonNLS*/ + new String(rightType.readableName())},
+ new String(leftType.readableName()) + ", " + new String(rightType.readableName())},
assign.sourceStart,
assign.sourceEnd);
}
@@ -1604,7 +1596,7 @@ public void nativeMethodsCannotBeStrictfp(ReferenceBinding type, AbstractMethodD
methodDecl.sourceEnd());
}
public void needImplementation() {
- this.abortDueToInternalError(Util.bind("abort.missingCode"/*nonNLS*/));
+ this.abortDueToInternalError("Missing code implementation in the compiler");
}
public void needToEmulateFieldReadAccess(FieldBinding field, AstNode location) {
this.handle(
@@ -1720,7 +1712,7 @@ private String parametersAsString(MethodBinding method) {
StringBuffer buffer = new StringBuffer();
for (int i = 0, length = params.length; i < length; i++) {
if (i != 0)
- buffer.append(", "/*nonNLS*/);
+ buffer.append(", ");
buffer.append(new String(params[i].readableName()));
}
return buffer.toString();
@@ -1750,20 +1742,20 @@ public void parseError(
StringBuffer list = new StringBuffer(20);
for (int i = 0, max = possibleTokens.length; i < max; i++) {
if (i > 0)
- list.append(", "/*nonNLS*/);
+ list.append(", ");
list.append('"');
list.append(possibleTokens[i]);
list.append('"');
}
- //extract the literal when it's a literal
- if ((errorTokenName.equals("IntegerLiteral"/*nonNLS*/)) ||
- (errorTokenName.equals("LongLiteral"/*nonNLS*/)) ||
- (errorTokenName.equals("FloatingPointLiteral"/*nonNLS*/)) ||
- (errorTokenName.equals("DoubleLiteral"/*nonNLS*/)) ||
- (errorTokenName.equals("StringLiteral"/*nonNLS*/)) ||
- (errorTokenName.equals("CharacterLiteral"/*nonNLS*/)) ||
- (errorTokenName.equals("Identifier"/*nonNLS*/))) {
+ //extract the literal when it's a literal (fancier error message ...)
+ if ((errorTokenName.equals("IntegerLiteral")) ||
+ (errorTokenName.equals("LongLiteral")) ||
+ (errorTokenName.equals("FloatingPointLiteral")) ||
+ (errorTokenName.equals("DoubleLiteral")) ||
+ (errorTokenName.equals("StringLiteral")) ||
+ (errorTokenName.equals("CharacterLiteral")) ||
+ (errorTokenName.equals("Identifier"))) {
errorTokenName = new String(currentTokenSource);
}
@@ -1901,9 +1893,8 @@ public void scannerError(Parser parser, String errorTokenName) {
if (errorTokenName.equals(Scanner.INVALID_UNICODE_ESCAPE)){
flag = INVALID_UNICODE_ESCAPE;
// better locate the error message
- char[] source = scanner.source;
int checkPos = scanner.currentPosition - 1;
- if (checkPos >= source.length) checkPos = source.length - 1;
+ char[] source = scanner.source;
while (checkPos >= startPos){
if (source[checkPos] == '\\') break;
checkPos --;
@@ -2195,21 +2186,4 @@ public void wrongSequenceOfExceptionTypesError(TryStatement statement, int under
typeRef.sourceStart,
typeRef.sourceEnd);
}
-
-public void nonExternalizedStringLiteral(AstNode location) {
- this.handle(
- NonExternalizedStringLiteral,
- new String[] {},
- location.sourceStart,
- location.sourceEnd);
-}
-
-public void noMoreAvailableSpaceInConstantPool(TypeDeclaration typeDeclaration) {
- this.handle(
- TooManyConstantsInConstantPool,
- new String[]{ new String(typeDeclaration.binding.readableName())},
- Abort | Error,
- typeDeclaration.sourceStart(),
- typeDeclaration.sourceEnd());
-}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemSeverities.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemSeverities.java
index a726d1303c..24edf61bf1 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemSeverities.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemSeverities.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.problem;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public interface ProblemSeverities {
final int Ignore = -1; // during handling only
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ShouldNotImplement.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ShouldNotImplement.java
index 1808c7859e..3f2b6d8665 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ShouldNotImplement.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ShouldNotImplement.java
@@ -1,16 +1,5 @@
package org.eclipse.jdt.internal.compiler.problem;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
-/*
- * Special unchecked exception type used
- * to denote implementation that should never be reached.
- *
- * (internal only)
- */
public class ShouldNotImplement extends RuntimeException {
public ShouldNotImplement(){
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/CharOperation.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/CharOperation.java
index a66de9c206..e95120a140 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/CharOperation.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/CharOperation.java
@@ -542,7 +542,7 @@ final static public char[] toLowerCase(char[] chars) {
final static public String toString(char[][] array) {
char[] result = concatWith(array, '.');
if (result == null)
- return ""/*nonNLS*/;
+ return "";
return new String(result);
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/HashtableOfInt.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/HashtableOfInt.java
index e1b870db89..fd0deae974 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/HashtableOfInt.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/HashtableOfInt.java
@@ -1,14 +1,5 @@
package org.eclipse.jdt.internal.compiler.util;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
-
- /**
- * Hashtable for non-zero int keys.
- */
-
+
public final class HashtableOfInt {
// to avoid using Enumerations, walk the individual tables skipping nulls
public int[] keyTable;
@@ -42,7 +33,7 @@ public Object get(int key) {
int index = key % valueTable.length;
int currentKey;
while ((currentKey = keyTable[index]) != 0) {
- if (currentKey == key) return valueTable[index];
+ if (currentKey == key) return valueTable[index];
index = (index + 1) % keyTable.length;
}
return null;
@@ -51,7 +42,7 @@ public Object put(int key, Object value) {
int index = key % valueTable.length;
int currentKey;
while ((currentKey = keyTable[index]) != 0) {
- if (currentKey == key) return valueTable[index] = value;
+ if (currentKey == key) return valueTable[index] = value;
index = (index + 1) % keyTable.length;
}
keyTable[index] = key;
@@ -77,11 +68,11 @@ public int size() {
return elementSize;
}
public String toString() {
- String s = ""/*nonNLS*/;
+ String s = "";
Object object;
for (int i = 0, length = valueTable.length; i < length; i++)
if ((object = valueTable[i]) != null)
- s += keyTable[i] + " -> "/*nonNLS*/ + object.toString() + "\n"/*nonNLS*/;
+ s += keyTable[i] + " -> " + object.toString() + "\n";
return s;
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/HashtableOfObject.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/HashtableOfObject.java
index 8143a934ca..ddd3b9d361 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/HashtableOfObject.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/HashtableOfObject.java
@@ -1,9 +1,4 @@
package org.eclipse.jdt.internal.compiler.util;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public final class HashtableOfObject {
// to avoid using Enumerations, walk the individual tables skipping nulls
@@ -78,11 +73,11 @@ public int size() {
return elementSize;
}
public String toString() {
- String s = ""/*nonNLS*/;
+ String s = "";
Object object;
for (int i = 0, length = valueTable.length; i < length; i++)
if ((object = valueTable[i]) != null)
- s += new String(keyTable[i]) + " -> "/*nonNLS*/ + object.toString() + "\n"/*nonNLS*/;
+ s += new String(keyTable[i]) + " -> " + object.toString() + "\n";
return s;
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/HashtableOfPackage.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/HashtableOfPackage.java
index 2e4308f2f0..62eae6ad14 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/HashtableOfPackage.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/HashtableOfPackage.java
@@ -79,11 +79,11 @@ public int size() {
return elementSize;
}
public String toString() {
- String s = ""/*nonNLS*/;
+ String s = "";
PackageBinding pkg;
for (int i = 0, length = valueTable.length; i < length; i++)
if ((pkg = valueTable[i]) != null)
- s += pkg.toString() + "\n"/*nonNLS*/;
+ s += pkg.toString() + "\n";
return s;
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/HashtableOfType.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/HashtableOfType.java
index 487b841a21..a26527488b 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/HashtableOfType.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/HashtableOfType.java
@@ -79,11 +79,11 @@ public int size() {
return elementSize;
}
public String toString() {
- String s = ""/*nonNLS*/;
+ String s = "";
ReferenceBinding type;
for (int i = 0, length = valueTable.length; i < length; i++)
if ((type = valueTable[i]) != null)
- s += type.toString() + "\n"/*nonNLS*/;
+ s += type.toString() + "\n";
return s;
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/ObjectVector.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/ObjectVector.java
index c47e0ab5b5..cb6f61d03d 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/ObjectVector.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/ObjectVector.java
@@ -1,13 +1,8 @@
package org.eclipse.jdt.internal.compiler.util;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public final class ObjectVector {
static int INITIAL_SIZE = 10;
-
+
public int size;
int maxSize;
Object[] elements;
@@ -17,13 +12,13 @@ public ObjectVector() {
elements = new Object[maxSize];
}
public void add(Object newElement) {
- if (size == maxSize) // knows that size starts <= maxSize
+ if (size == maxSize) // knows that size starts <= maxSize
System.arraycopy(elements, 0, (elements = new Object[maxSize *= 2]), 0, size);
elements[size++] = newElement;
}
public void addAll(Object[] newElements) {
if (size + newElements.length >= maxSize) {
- maxSize = size + newElements.length; // assume no more elements will be added
+ maxSize = size + newElements.length; // assume no more elements will be added
System.arraycopy(elements, 0, (elements = new Object[maxSize]), 0, size);
}
System.arraycopy(newElements, 0, elements, size, newElements.length);
@@ -61,9 +56,9 @@ public void removeAll() {
size = 0;
}
public String toString() {
- String s = ""/*nonNLS*/;
+ String s = "";
for (int i = 0; i < size; i++)
- s += elements[i].toString() + "\n"/*nonNLS*/;
+ s += elements[i].toString() + "\n";
return s;
}
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/SimpleNameVector.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/SimpleNameVector.java
index 1cb38e3d16..c786cf2ee7 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/SimpleNameVector.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/SimpleNameVector.java
@@ -1,13 +1,8 @@
package org.eclipse.jdt.internal.compiler.util;
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-import org.eclipse.jdt.internal.compiler.*;
public final class SimpleNameVector {
static int INITIAL_SIZE = 10;
-
+
public int size;
int maxSize;
char[][] elements;
@@ -17,13 +12,13 @@ public SimpleNameVector() {
elements = new char[maxSize][];
}
public void add(char[] newElement) {
- if (size == maxSize) // knows that size starts <= maxSize
+ if (size == maxSize) // knows that size starts <= maxSize
System.arraycopy(elements, 0, (elements = new char[maxSize *= 2][]), 0, size);
elements[size++] = newElement;
}
public void addAll(char[][] newElements) {
if (size + newElements.length >= maxSize) {
- maxSize = size + newElements.length; // assume no more elements will be added
+ maxSize = size + newElements.length; // assume no more elements will be added
System.arraycopy(elements, 0, (elements = new char[maxSize][]), 0, size);
}
System.arraycopy(newElements, 0, elements, size, newElements.length);
@@ -57,7 +52,7 @@ public void removeAll() {
public String toString() {
StringBuffer buffer = new StringBuffer();
for (int i = 0; i < size; i++) {
- buffer.append(elements[i]).append("\n"/*nonNLS*/);
+ buffer.append(elements[i]).append("\n");
}
return buffer.toString();
}
diff --git a/org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/CodeSnippetAllocationExpression.java b/org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/CodeSnippetAllocationExpression.java
index 2e53f8da5b..f4abf984cd 100644
--- a/org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/CodeSnippetAllocationExpression.java
+++ b/org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/CodeSnippetAllocationExpression.java
@@ -106,14 +106,14 @@ public TypeBinding resolveType(BlockScope scope) {
if ((argumentTypes[i] = arguments[i].resolveType(scope)) == null)
argHasError = true;
if (argHasError)
- return typeBinding;
+ return null;
}
if (typeBinding == null)
return null;
if (!typeBinding.canBeInstantiated()) {
scope.problemReporter().cannotInstantiate(type, typeBinding);
- return typeBinding;
+ return null;
}
ReferenceBinding allocatedType = (ReferenceBinding) typeBinding;
if (!(binding = scope.getConstructor(allocatedType, argumentTypes, this)).isValidBinding()) {
@@ -125,13 +125,13 @@ public TypeBinding resolveType(BlockScope scope) {
if (binding.declaringClass == null)
binding.declaringClass = allocatedType;
scope.problemReporter().invalidConstructor(this, binding);
- return typeBinding;
+ return null;
}
} else {
if (binding.declaringClass == null)
binding.declaringClass = allocatedType;
scope.problemReporter().invalidConstructor(this, binding);
- return typeBinding;
+ return null;
}
CodeSnippetScope localScope = new CodeSnippetScope(scope);
MethodBinding privateBinding = localScope.getConstructor((ReferenceBinding)delegateThis.type, argumentTypes, this);
@@ -139,7 +139,7 @@ public TypeBinding resolveType(BlockScope scope) {
if (binding.declaringClass == null)
binding.declaringClass = allocatedType;
scope.problemReporter().invalidConstructor(this, binding);
- return typeBinding;
+ return null;
} else {
binding = privateBinding;
}
@@ -147,7 +147,7 @@ public TypeBinding resolveT