Refactored packagename to net.sourceforge.phpdt.internal.compiler.ast
authoraxelcl <axelcl>
Mon, 3 Oct 2005 11:37:07 +0000 (11:37 +0000)
committeraxelcl <axelcl>
Mon, 3 Oct 2005 11:37:07 +0000 (11:37 +0000)
140 files changed:
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/dom/CompilationUnit.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ASTVisitor.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/AbstractSyntaxTreeVisitorAdapter.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/Compiler.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/DocumentElementParser.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/IAbstractSyntaxTreeVisitor.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/SourceElementParser.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/AND_AND_Expression.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/AND_AND_Expression.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ASTNode.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/ASTNode.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/AbstractMethodDeclaration.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/AbstractMethodDeclaration.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/AbstractVariableDeclaration.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/AbstractVariableDeclaration.java with 97% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/AllocationExpression.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/AllocationExpression.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/AnonymousLocalTypeDeclaration.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/AnonymousLocalTypeDeclaration.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/Argument.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/Argument.java with 98% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ArrayAllocationExpression.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/ArrayAllocationExpression.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ArrayInitializer.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/ArrayInitializer.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ArrayQualifiedTypeReference.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/ArrayQualifiedTypeReference.java with 97% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ArrayReference.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/ArrayReference.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ArrayTypeReference.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/ArrayTypeReference.java with 97% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/AssertStatement.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/AssertStatement.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/Assignment.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/Assignment.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/BinaryExpression.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/BinaryExpression.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/Block.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/Block.java with 98% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/BranchStatement.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/BranchStatement.java with 97% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/BreakStatement.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/BreakStatement.java with 98% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/CaseStatement.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/CaseStatement.java with 98% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/CastExpression.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/CastExpression.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/Clinit.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/Clinit.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/CompilationUnitDeclaration.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/CompilationUnitDeclaration.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/CompoundAssignment.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/CompoundAssignment.java with 98% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ConditionalExpression.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/ConditionalExpression.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ConstructorDeclaration.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/ConstructorDeclaration.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ContinueStatement.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/ContinueStatement.java with 98% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/DefaultCase.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/DefaultCase.java with 98% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/DoStatement.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/DoStatement.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/DoubleLiteral.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/DoubleLiteral.java with 97% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/EmptyStatement.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/EmptyStatement.java with 96% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/EqualExpression.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/EqualExpression.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ExplicitConstructorCall.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/ExplicitConstructorCall.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/Expression.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/Expression.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ExtendedStringLiteral.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/ExtendedStringLiteral.java with 97% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/FalseLiteral.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/FalseLiteral.java with 97% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/FieldDeclaration.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/FieldDeclaration.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/FieldReference.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/FieldReference.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/FloatLiteral.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/FloatLiteral.java with 97% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ForStatement.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/ForStatement.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/IfStatement.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/IfStatement.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ImplicitDocTypeReference.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/ImplicitDocTypeReference.java with 97% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ImportReference.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/ImportReference.java with 98% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/Initializer.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/Initializer.java with 98% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/InnerTypeDeclaration.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/InnerTypeDeclaration.java with 93% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/InstanceOfExpression.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/InstanceOfExpression.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/IntLiteral.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/IntLiteral.java with 98% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/IntLiteralMinValue.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/IntLiteralMinValue.java with 94% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/JavadocArrayQualifiedTypeReference.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/JavadocArrayQualifiedTypeReference.java with 96% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/JavadocArraySingleTypeReference.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/JavadocArraySingleTypeReference.java with 96% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/JavadocQualifiedTypeReference.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/JavadocQualifiedTypeReference.java with 98% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/JavadocReturnStatement.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/JavadocReturnStatement.java with 97% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/JavadocSingleTypeReference.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/JavadocSingleTypeReference.java with 98% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/LabeledStatement.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/LabeledStatement.java with 98% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/Literal.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/Literal.java with 96% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/LocalDeclaration.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/LocalDeclaration.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/LocalTypeDeclaration.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/LocalTypeDeclaration.java with 97% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/LongLiteral.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/LongLiteral.java with 98% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/LongLiteralMinValue.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/LongLiteralMinValue.java with 94% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/MagicLiteral.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/MagicLiteral.java with 94% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/MemberTypeDeclaration.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/MemberTypeDeclaration.java with 97% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/MessageSend.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/MessageSend.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/MethodDeclaration.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/MethodDeclaration.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/NameReference.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/NameReference.java with 97% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/NullLiteral.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/NullLiteral.java with 96% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/NumberLiteral.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/NumberLiteral.java with 94% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/OR_OR_Expression.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/OR_OR_Expression.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/OperatorExpression.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/OperatorExpression.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/OperatorIds.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/OperatorIds.java with 96% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/PostfixExpression.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/PostfixExpression.java with 97% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/PrefixExpression.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/PrefixExpression.java with 96% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/QualifiedAllocationExpression.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/QualifiedAllocationExpression.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/QualifiedNameReference.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/QualifiedNameReference.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/QualifiedSuperReference.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/QualifiedSuperReference.java with 96% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/QualifiedThisReference.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/QualifiedThisReference.java with 98% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/QualifiedTypeReference.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/QualifiedTypeReference.java with 97% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/Reference.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/Reference.java with 97% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ReturnStatement.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/ReturnStatement.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/SingleNameReference.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/SingleNameReference.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/SingleTypeReference.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/SingleTypeReference.java with 97% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/Statement.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/Statement.java with 97% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/StringLiteral.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/StringLiteral.java with 98% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/StringLiteralDQ.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/StringLiteralDQ.java with 96% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/StringLiteralSQ.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/StringLiteralSQ.java with 96% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/SuperReference.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/SuperReference.java with 96% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/SwitchStatement.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/SwitchStatement.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ThisReference.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/ThisReference.java with 98% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ThrowStatement.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/ThrowStatement.java with 98% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/TrueLiteral.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/TrueLiteral.java with 97% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/TryStatement.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/TryStatement.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/TypeDeclaration.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/TypeDeclaration.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/TypeReference.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/TypeReference.java with 98% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/UnaryExpression.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/UnaryExpression.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/WhileStatement.java [moved from net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/WhileStatement.java with 99% similarity]
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/flow/ExceptionHandlingFlowContext.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/flow/FinallyFlowContext.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/flow/FlowContext.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/flow/FlowInfo.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/flow/InitializationFlowContext.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/flow/InsideSubRoutineFlowContext.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/flow/LabelFlowContext.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/flow/LoopingFlowContext.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/flow/SwitchFlowContext.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/impl/Constant.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/BinaryTypeBinding.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/BlockScope.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/ClassScope.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/CompilationUnitScope.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/FieldBinding.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/ImportBinding.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/LocalTypeBinding.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/LocalVariableBinding.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/LookupEnvironment.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/MethodBinding.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/MethodScope.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/MethodVerifier.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/Scope.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/SourceTypeBinding.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/SyntheticAccessMethodBinding.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/NLSLine.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/RecoveredElement.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/SourceTypeConverter.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/UnitParser.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/VariableInfo.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/problem/ProblemReporter.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CompilationUnit.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CompilationUnitProblemFinder.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/ReconcileWorkingCopyOperation.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/util/ASTNodeFinder.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/util/CommentRecorderParser.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/util/Util.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCompletionProcessor.java

index f7a2352..5570ff9 100644 (file)
@@ -1,16 +1,15 @@
+package net.sourceforge.phpdt.core.dom;
 /*******************************************************************************
  * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
+ * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v10.html
- * 
+ *
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 
-package net.sourceforge.phpdt.core.dom;
-
 
 /**
  * Java compilation unit AST node type. This is the type of the root of an AST.
@@ -33,43 +32,43 @@ package net.sourceforge.phpdt.core.dom;
  *        { ImportDeclaration }
  *        { TypeDeclaration | EnumDeclaration | AnnotationTypeDeclaration | <b>;</b> }
  * </pre>
- * 
+ *
  * @since 2.0
  */
-public class CompilationUnit  {
+public class CompilationUnit {
 
 //     /**
 //      * The "package" structural property of this node type.
-//      * 
+//      *
 //      * @since 3.0
 //      */
-//     public static final ChildPropertyDescriptor PACKAGE_PROPERTY = 
+//     public static final ChildPropertyDescriptor PACKAGE_PROPERTY =
 //             new ChildPropertyDescriptor(CompilationUnit.class, "package", PackageDeclaration.class, OPTIONAL, NO_CYCLE_RISK); //$NON-NLS-1$
-//     
+//
 //     /**
 //      * The "imports" structural property of this node type.
-//      * 
+//      *
 //      * @since 3.0
 //      */
 //     public static final ChildListPropertyDescriptor IMPORTS_PROPERTY =
 //             new ChildListPropertyDescriptor(CompilationUnit.class, "imports", ImportDeclaration.class, NO_CYCLE_RISK); //$NON-NLS-1$
-//     
+//
 //     /**
 //      * The "types" structural property of this node type.
-//      * 
+//      *
 //      * @since 3.0
 //      */
 //     public static final ChildListPropertyDescriptor TYPES_PROPERTY =
 //             new ChildListPropertyDescriptor(CompilationUnit.class, "types", AbstractTypeDeclaration.class, CYCLE_RISK); //$NON-NLS-1$
-//     
+//
 //     /**
-//      * A list of property descriptors (element type: 
+//      * A list of property descriptors (element type:
 //      * {@link StructuralPropertyDescriptor}),
 //      * or null if uninitialized.
 //      * @since 3.0
 //      */
 //     private static final List PROPERTY_DESCRIPTORS;
-//     
+//
 //     static {
 //             createPropertyList(CompilationUnit.class);
 //             addProperty(PACKAGE_PROPERTY);
@@ -81,18 +80,18 @@ public class CompilationUnit  {
 //     /**
 //      * Returns a list of structural property descriptors for this node type.
 //      * Clients must not modify the result.
-//      * 
+//      *
 //      * @param apiLevel the API level; one of the
 //      * <code>AST.JLS&ast;</code> constants
 //
-//      * @return a list of property descriptors (element type: 
+//      * @return a list of property descriptors (element type:
 //      * {@link StructuralPropertyDescriptor})
 //      * @since 3.0
 //      */
 //     public static List propertyDescriptors(int apiLevel) {
 //             return PROPERTY_DESCRIPTORS;
 //     }
-//                     
+//
 //     /**
 //      * The comment table, or <code>null</code> if none; initially
 //      * <code>null</code>. This array is the storage underlying
@@ -100,39 +99,39 @@ public class CompilationUnit  {
 //      * @since 3.0
 //      */
 //     Comment[] optionalCommentTable = null;
-//     
+//
 //     /**
-//      * The comment list (element type: <code>Comment</code>, 
+//      * The comment list (element type: <code>Comment</code>,
 //      * or <code>null</code> if none; initially <code>null</code>.
 //      * @since 3.0
 //      */
 //     private List optionalCommentList = null;
-//     
+//
 //     /**
 //      * The package declaration, or <code>null</code> if none; initially
 //      * <code>null</code>.
 //      */
 //     private PackageDeclaration optionalPackageDeclaration = null;
-//     
+//
 //     /**
-//      * The list of import declarations in textual order order; 
+//      * The list of import declarations in textual order order;
 //      * initially none (elementType: <code>ImportDeclaration</code>).
 //      */
 //     private ASTNode.NodeList imports =
 //             new ASTNode.NodeList(IMPORTS_PROPERTY);
-//     
+//
 //     /**
-//      * The list of type declarations in textual order order; 
+//      * The list of type declarations in textual order order;
 //      * initially none (elementType: <code>AbstractTypeDeclaration</code>)
 //      */
 //     private ASTNode.NodeList types =
 //             new ASTNode.NodeList(TYPES_PROPERTY);
-//     
+//
 //     /**
 //      * Line end table. If <code>lineEndTable[i] == p</code> then the
-//      * line number <code>i+1</code> ends at character position 
+//      * line number <code>i+1</code> ends at character position
 //      * <code>p</code>. Except for the last line, the positions are that
-//      * of the last character of the line delimiter. 
+//      * of the last character of the line delimiter.
 //      * For example, the source string <code>A\nB\nC</code> has
 //      * line end table {1, 3} (if \n is one character).
 //      */
@@ -152,27 +151,27 @@ public class CompilationUnit  {
 //      * Messages reported by the compiler during parsing or name resolution.
 //      */
 //     private Message[] messages;
-//     
+//
 //     /**
 //      * Problems reported by the compiler during parsing or name resolution.
 //      */
 //     private IProblem[] problems = EMPTY_PROBLEMS;
-//     
+//
 //     /**
-//      * The comment mapper, or <code>null</code> in none; 
+//      * The comment mapper, or <code>null</code> in none;
 //      * initially <code>null</code>.
 //      * @since 3.0
 //      */
 //     private DefaultCommentMapper commentMapper = null;
-//     
+//
 //     /**
 //      * Sets the line end table for this compilation unit.
-//      * If <code>lineEndTable[i] == p</code> then line number <code>i+1</code> 
-//      * ends at character position <code>p</code>. Except for the last line, the 
+//      * If <code>lineEndTable[i] == p</code> then line number <code>i+1</code>
+//      * ends at character position <code>p</code>. Except for the last line, the
 //      * positions are that of (the last character of) the line delimiter.
 //      * For example, the source string <code>A\nB\nC</code> has
 //      * line end table {1, 3, 4}.
-//      * 
+//      *
 //      * @param lineEndtable the line end table
 //      */
 //     void setLineEndTable(int[] lineEndTable) {
@@ -190,11 +189,11 @@ public class CompilationUnit  {
 //      * The compilation unit initially has no package declaration, no
 //      * import declarations, and no type declarations.
 //      * <p>
-//      * N.B. This constructor is package-private; all subclasses must be 
-//      * declared in the same package; clients are unable to declare 
+//      * N.B. This constructor is package-private; all subclasses must be
+//      * declared in the same package; clients are unable to declare
 //      * additional subclasses.
 //      * </p>
-//      * 
+//      *
 //      * @param ast the AST that is to own this node
 //      */
 //     CompilationUnit(AST ast) {
@@ -208,7 +207,7 @@ public class CompilationUnit  {
 //     final List internalStructuralPropertiesForType(int apiLevel) {
 //             return propertyDescriptors(apiLevel);
 //     }
-//     
+//
 //     /* (omit javadoc for this method)
 //      * Method declared on ASTNode.
 //      */
@@ -224,7 +223,7 @@ public class CompilationUnit  {
 //             // allow default implementation to flag the error
 //             return super.internalGetSetChildProperty(property, get, child);
 //     }
-//     
+//
 //     /* (omit javadoc for this method)
 //      * Method declared on ASTNode.
 //      */
@@ -238,7 +237,7 @@ public class CompilationUnit  {
 //             // allow default implementation to flag the error
 //             return super.internalGetChildListProperty(property);
 //     }
-//     
+//
 //     /* (omit javadoc for this method)
 //      * Method declared on ASTNode.
 //      */
@@ -281,23 +280,23 @@ public class CompilationUnit  {
 //             }
 //             visitor.endVisit(this);
 //     }
-//     
+//
 //     /**
-//      * Returns the node for the package declaration of this compilation 
-//      * unit, or <code>null</code> if this compilation unit is in the 
+//      * Returns the node for the package declaration of this compilation
+//      * unit, or <code>null</code> if this compilation unit is in the
 //      * default package.
-//      * 
+//      *
 //      * @return the package declaration node, or <code>null</code> if none
-//      */ 
+//      */
 //     public PackageDeclaration getPackage() {
 //             return this.optionalPackageDeclaration;
 //     }
-//     
+//
 //     /**
-//      * Sets or clears the package declaration of this compilation unit 
+//      * Sets or clears the package declaration of this compilation unit
 //      * node to the given package declaration node.
-//      * 
-//      * @param pkgDecl the new package declaration node, or 
+//      *
+//      * @param pkgDecl the new package declaration node, or
 //      *   <code>null</code> if this compilation unit does not have a package
 //      *   declaration (that is in the default package)
 //      * @exception IllegalArgumentException if:
@@ -305,7 +304,7 @@ public class CompilationUnit  {
 //      * <li>the node belongs to a different AST</li>
 //      * <li>the node already has a parent</li>
 //      * </ul>
-//      */ 
+//      */
 //     public void setPackage(PackageDeclaration pkgDecl) {
 //             ASTNode oldChild = this.optionalPackageDeclaration;
 //             preReplaceChild(oldChild, pkgDecl, PACKAGE_PROPERTY);
@@ -314,34 +313,34 @@ public class CompilationUnit  {
 //     }
 //
 //     /**
-//      * Returns the live list of nodes for the import declarations of this 
+//      * Returns the live list of nodes for the import declarations of this
 //      * compilation unit, in order of appearance.
-//      * 
+//      *
 //      * @return the live list of import declaration nodes
 //      *    (elementType: <code>ImportDeclaration</code>)
-//      */ 
+//      */
 //     public List imports() {
 //             return this.imports;
 //     }
-//     
+//
 //     /**
-//      * Returns the live list of nodes for the top-level type declarations of this 
+//      * Returns the live list of nodes for the top-level type declarations of this
 //      * compilation unit, in order of appearance.
 //     * <p>
 //     * Note that in JLS3, the types may include both enum declarations
 //     * and annotation type declarations introduced in J2SE 1.5.
 //     * For JLS2, the elements are always <code>TypeDeclaration</code>.
 //     * </p>
-//      * 
+//      *
 //      * @return the live list of top-level type declaration
 //      *    nodes (elementType: <code>AbstractTypeDeclaration</code>)
-//      */ 
+//      */
 //     public List types() {
 //             return this.types;
 //     }
 //
 //     /**
-//      * Finds the corresponding AST node in the given compilation unit from 
+//      * Finds the corresponding AST node in the given compilation unit from
 //      * which the given binding originated. Returns <code>null</code> if the
 //      * binding does not correspond to any node in this compilation unit.
 //      * This method always returns <code>null</code> if bindings were not requested
@@ -356,11 +355,11 @@ public class CompilationUnit  {
 //      *    <code>AnonymousClassDeclaration</code> (for anonymous classes)</li>
 //      * <li>primitive type - none</li>
 //      * <li>array type - none</li>
-//      * <li>field - a <code>VariableDeclarationFragment</code> in a 
+//      * <li>field - a <code>VariableDeclarationFragment</code> in a
 //      *    <code>FieldDeclaration</code> </li>
 //      * <li>local variable - a <code>SingleVariableDeclaration</code>, or
-//      *    a <code>VariableDeclarationFragment</code> in a 
-//      *    <code>VariableDeclarationStatement</code> or 
+//      *    a <code>VariableDeclarationFragment</code> in a
+//      *    <code>VariableDeclarationStatement</code> or
 //      *    <code>VariableDeclarationExpression</code></li>
 //      * <li>method - a <code>MethodDeclaration</code> </li>
 //      * <li>constructor - a <code>MethodDeclaration</code> </li>
@@ -377,7 +376,7 @@ public class CompilationUnit  {
 //      * Use <code>findDeclaringNode(binding.getKey())</code> when the binding comes
 //      * from a different AST.
 //      * </p>
-//      * 
+//      *
 //      * @param binding the binding
 //      * @return the corresponding node where the given binding is declared,
 //      * or <code>null</code> if the binding does not correspond to a node in this
@@ -389,7 +388,7 @@ public class CompilationUnit  {
 //     }
 //
 //     /**
-//      * Finds the corresponding AST node in the given compilation unit from 
+//      * Finds the corresponding AST node in the given compilation unit from
 //      * which the binding with the given key originated. Returns
 //      * <code>null</code> if the corresponding node cannot be determined.
 //      * This method always returns <code>null</code> if bindings were not requested
@@ -404,11 +403,11 @@ public class CompilationUnit  {
 //      *    <code>AnonymousClassDeclaration</code> (for anonymous classes)</li>
 //      * <li>primitive type - none</li>
 //      * <li>array type - none</li>
-//      * <li>field - a <code>VariableDeclarationFragment</code> in a 
+//      * <li>field - a <code>VariableDeclarationFragment</code> in a
 //      *    <code>FieldDeclaration</code> </li>
 //      * <li>local variable - a <code>SingleVariableDeclaration</code>, or
-//      *    a <code>VariableDeclarationFragment</code> in a 
-//      *    <code>VariableDeclarationStatement</code> or 
+//      *    a <code>VariableDeclarationFragment</code> in a
+//      *    <code>VariableDeclarationStatement</code> or
 //      *    <code>VariableDeclarationExpression</code></li>
 //      * <li>method - a <code>MethodDeclaration</code> </li>
 //      * <li>constructor - a <code>MethodDeclaration</code> </li>
@@ -423,7 +422,7 @@ public class CompilationUnit  {
 //      * there may be no keys for finding the declaring node for local variables,
 //      * local or anonymous classes, etc.
 //      * </p>
-//      * 
+//      *
 //      * @param key the binding key, or <code>null</code>
 //      * @return the corresponding node where a binding with the given
 //      * key is declared, or <code>null</code> if the key is <code>null</code>
@@ -435,10 +434,10 @@ public class CompilationUnit  {
 //     public ASTNode findDeclaringNode(String key) {
 //             return this.ast.getBindingResolver().findDeclaringNode(key);
 //     }
-//     
+//
 //     /**
 //      * Returns the internal comment mapper.
-//      * 
+//      *
 //      * @return the comment mapper, or <code>null</code> if none.
 //      * @since 3.0
 //      */
@@ -449,7 +448,7 @@ public class CompilationUnit  {
 //     /**
 //      * Initializes the internal comment mapper with the given
 //      * scanner.
-//      * 
+//      *
 //      * @param scanner the scanner
 //      * @since 3.0
 //      */
@@ -463,7 +462,7 @@ public class CompilationUnit  {
 //      * {@link ASTNode#getStartPosition()} and {@link ASTNode#getLength()()},
 //      * the extended source range may include comments and whitespace
 //      * immediately before or after the normal source range for the node.
-//      * 
+//      *
 //      * @param node the node
 //      * @return the 0-based character index, or <code>-1</code>
 //      *    if no source position information is recorded for this node
@@ -483,7 +482,7 @@ public class CompilationUnit  {
 //      * {@link ASTNode#getStartPosition()} and {@link ASTNode#getLength()()},
 //      * the extended source range may include comments and whitespace
 //      * immediately before or after the normal source range for the node.
-//      * 
+//      *
 //      * @param node the node
 //      * @return a (possibly 0) length, or <code>0</code>
 //      *    if no source position information is recorded for this node
@@ -497,10 +496,10 @@ public class CompilationUnit  {
 //                     return this.commentMapper.getExtendedLength(node);
 //             }
 //     }
-//             
+//
 //     /**
 //      * Returns the line number corresponding to the given source character
-//      * position in the original source string. The initial line of the 
+//      * position in the original source string. The initial line of the
 //      * compilation unit is numbered 1, and each line extends through the
 //      * last character of the end-of-line delimiter. The very last line extends
 //      * through the end of the source string and has no line delimiter.
@@ -509,7 +508,7 @@ public class CompilationUnit  {
 //      * Returns 1 for a character position that does not correspond to any
 //      * source line, or if no line number information is available for this
 //      * compilation unit.
-//      * 
+//      *
 //      * @param position a 0-based character position, possibly
 //      *   negative or out of range
 //      * @return the 1-based line number, or <code>1</code> if the character
@@ -542,7 +541,7 @@ public class CompilationUnit  {
 //             }
 //             // assert lineEndTable[low]  < position <= lineEndTable[hi]
 //             // && low == 0 && hi == length - 1 && low < hi
-//             
+//
 //             // binary search line end table
 //             while (true) {
 //                     // invariant lineEndTable[low] < position <= lineEndTable[hi]
@@ -571,8 +570,8 @@ public class CompilationUnit  {
 //     }
 //
 //     /**
-//      * Returns the list of messages reported by the compiler during the parsing 
-//      * or the type checking of this compilation unit. This list might be a subset of 
+//      * Returns the list of messages reported by the compiler during the parsing
+//      * or the type checking of this compilation unit. This list might be a subset of
 //      * errors detected and reported by a Java compiler.
 //      * <p>
 //      * This list of messages is suitable for simple clients that do little
@@ -612,7 +611,7 @@ public class CompilationUnit  {
 //      * Simple clients that do little more than log the messages or display
 //      * them to the user should probably call <code>getMessages</code> instead.
 //      * </p>
-//      * 
+//      *
 //      * @return the list of detailed problem objects, possibly empty
 //      * @see #getMessages()
 //      * @see ASTParser
@@ -625,7 +624,7 @@ public class CompilationUnit  {
 //     /**
 //      * Sets the array of problems reported by the compiler during the parsing or
 //      * name resolution of this compilation unit.
-//      * 
+//      *
 //      * @param problems the list of problems
 //      */
 //     void setProblems(IProblem[] problems) {
@@ -634,14 +633,14 @@ public class CompilationUnit  {
 //             }
 //             this.problems = problems;
 //     }
-//             
+//
 //     /**
 //      * Returns a list of the comments encountered while parsing
 //      * this compilation unit.
 //      * <p>
 //      * Since the Java language allows comments to appear most anywhere
 //      * in the source text, it is problematic to locate comments in relation
-//      * to the structure of an AST. The one exception is doc comments 
+//      * to the structure of an AST. The one exception is doc comments
 //      * which, by convention, immediately precede type, field, and
 //      * method declarations; these comments are located in the AST
 //      * by {@link  BodyDeclaration#getJavadoc BodyDeclaration.getJavadoc}.
@@ -649,7 +648,7 @@ public class CompilationUnit  {
 //      * is provided for clients that need to find the source ranges of
 //      * all comments in the original source string. It includes entries
 //      * for comments of all kinds (line, block, and doc), arranged in order
-//      * of increasing source position. 
+//      * of increasing source position.
 //      * </p>
 //      * Note on comment parenting: The {@link ASTNode#getParent() getParent()}
 //      * of a doc comment associated with a body declaration is the body
@@ -660,7 +659,7 @@ public class CompilationUnit  {
 //      * However, for other comment nodes, {@link ASTNode#getParent() getParent()}
 //      * will return <code>null</code>, and {@link ASTNode#getRoot() getRoot()}
 //      * will return the comment node itself, indicating that these comment nodes
-//      * are not directly connected to the AST for the compilation unit. The 
+//      * are not directly connected to the AST for the compilation unit. The
 //      * {@link Comment#getAlternateRoot Comment.getAlternateRoot}
 //      * method provides a way to navigate from a comment to its compilation
 //      * unit.
@@ -675,7 +674,7 @@ public class CompilationUnit  {
 //      * <p>
 //      * Clients cannot modify the resulting list.
 //      * </p>
-//      * 
+//      *
 //      * @return an unmodifiable list of comments in increasing order of source
 //      * start position, or <code>null</code> if comment information
 //      * for this compilation unit is not available
@@ -685,11 +684,11 @@ public class CompilationUnit  {
 //     public List getCommentList() {
 //             return this.optionalCommentList;
 //     }
-//     
+//
 //     /**
 //      * Sets the list of the comments encountered while parsing
 //      * this compilation unit.
-//      * 
+//      *
 //      * @param commentTable a list of comments in increasing order
 //      * of source start position, or <code>null</code> if comment
 //      * information for this compilation unit is not available
@@ -725,8 +724,8 @@ public class CompilationUnit  {
 //                     this.optionalCommentList = Collections.unmodifiableList(commentList);
 //             }
 //     }
-//     
-//     
+//
+//
 //     /* (omit javadoc for this method)
 //      * Method declared on ASTNode.
 //      */
@@ -743,7 +742,7 @@ public class CompilationUnit  {
 //             }
 //             buffer.append("]"); //$NON-NLS-1$
 //     }
-//             
+//
 //     /* (omit javadoc for this method)
 //      * Method declared on ASTNode.
 //      */
@@ -758,7 +757,7 @@ public class CompilationUnit  {
 //             // ignore the space taken up by optionalCommentList
 //             return size;
 //     }
-//     
+//
 //     /* (omit javadoc for this method)
 //      * Method declared on ASTNode.
 //      */
@@ -780,7 +779,7 @@ public class CompilationUnit  {
 //             }
 //             return size;
 //     }
-//     
+//
 //     /**
 //      * Enables the recording of changes to this compilation
 //      * unit and its descendents. The compilation unit must have
@@ -789,18 +788,18 @@ public class CompilationUnit  {
 //      * arbitrary changes to the subtree rooted at this compilation
 //      * unit are recorded internally. Once the modification has
 //      * been completed, call <code>rewrite</code> to get an object
-//      * representing the corresponding edits to the original 
+//      * representing the corresponding edits to the original
 //      * source code string.
 //      *
 //      * @exception IllegalArgumentException if this compilation unit is
-//      * marked as unmodifiable, or if this compilation unit has already 
+//      * marked as unmodifiable, or if this compilation unit has already
 //      * been tampered with, or recording has already been enabled
 //      * @since 3.0
 //      */
 //     public void recordModifications() {
 //             getAST().recordModifications(this);
 //     }
-//     
+//
 //     /**
 //      * Converts all modifications recorded for this compilation
 //      * unit into an object representing the corresponding text
@@ -821,7 +820,7 @@ public class CompilationUnit  {
 //      * accurately reflect the net cumulative affect of all those
 //      * changes.
 //      * </p>
-//      * 
+//      *
 //      * @param document original document containing source code
 //      * for this compilation unit
 //      * @param options the table of formatter options
index 55769aa..cdf1f49 100644 (file)
 package net.sourceforge.phpdt.internal.compiler;
 
 import net.sourceforge.phpdt.core.compiler.IProblem;
+import net.sourceforge.phpdt.internal.compiler.ast.AND_AND_Expression;
+import net.sourceforge.phpdt.internal.compiler.ast.AllocationExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.Argument;
+import net.sourceforge.phpdt.internal.compiler.ast.ArrayAllocationExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.ArrayInitializer;
+import net.sourceforge.phpdt.internal.compiler.ast.ArrayQualifiedTypeReference;
+import net.sourceforge.phpdt.internal.compiler.ast.ArrayReference;
+import net.sourceforge.phpdt.internal.compiler.ast.ArrayTypeReference;
+import net.sourceforge.phpdt.internal.compiler.ast.AssertStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.Assignment;
+import net.sourceforge.phpdt.internal.compiler.ast.BinaryExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.Block;
+import net.sourceforge.phpdt.internal.compiler.ast.BreakStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.CaseStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.CastExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.Clinit;
+import net.sourceforge.phpdt.internal.compiler.ast.CompilationUnitDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.CompoundAssignment;
+import net.sourceforge.phpdt.internal.compiler.ast.ConditionalExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.ConstructorDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.ContinueStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.DoStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.DoubleLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.EmptyStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.EqualExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.ExplicitConstructorCall;
+import net.sourceforge.phpdt.internal.compiler.ast.ExtendedStringLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.FalseLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.FieldDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.FieldReference;
+import net.sourceforge.phpdt.internal.compiler.ast.FloatLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.ForStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.IfStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.ImportReference;
+import net.sourceforge.phpdt.internal.compiler.ast.Initializer;
+import net.sourceforge.phpdt.internal.compiler.ast.InstanceOfExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.IntLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.LabeledStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.LocalDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.LongLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.MessageSend;
+import net.sourceforge.phpdt.internal.compiler.ast.MethodDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.NullLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.OR_OR_Expression;
+import net.sourceforge.phpdt.internal.compiler.ast.PostfixExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.PrefixExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.QualifiedAllocationExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.QualifiedNameReference;
+import net.sourceforge.phpdt.internal.compiler.ast.QualifiedSuperReference;
+import net.sourceforge.phpdt.internal.compiler.ast.QualifiedThisReference;
+import net.sourceforge.phpdt.internal.compiler.ast.QualifiedTypeReference;
+import net.sourceforge.phpdt.internal.compiler.ast.ReturnStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.SingleNameReference;
+import net.sourceforge.phpdt.internal.compiler.ast.SingleTypeReference;
+import net.sourceforge.phpdt.internal.compiler.ast.StringLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.SuperReference;
+import net.sourceforge.phpdt.internal.compiler.ast.SwitchStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.ThisReference;
+import net.sourceforge.phpdt.internal.compiler.ast.ThrowStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.TrueLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.TryStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.TypeDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.UnaryExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.WhileStatement;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
 import net.sourceforge.phpdt.internal.compiler.lookup.ClassScope;
 import net.sourceforge.phpdt.internal.compiler.lookup.CompilationUnitScope;
 import net.sourceforge.phpdt.internal.compiler.lookup.MethodScope;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AND_AND_Expression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AllocationExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Argument;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ArrayAllocationExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ArrayInitializer;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ArrayQualifiedTypeReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ArrayReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ArrayTypeReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AssertStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Assignment;
-import net.sourceforge.phpeclipse.internal.compiler.ast.BinaryExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Block;
-import net.sourceforge.phpeclipse.internal.compiler.ast.BreakStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CaseStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CastExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Clinit;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CompoundAssignment;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ConditionalExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ConstructorDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ContinueStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.DoStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.DoubleLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.EmptyStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.EqualExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ExplicitConstructorCall;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ExtendedStringLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.FalseLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.FieldDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.FieldReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.FloatLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ForStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.IfStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ImportReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Initializer;
-import net.sourceforge.phpeclipse.internal.compiler.ast.InstanceOfExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.IntLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.LabeledStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.LocalDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.LongLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.MessageSend;
-import net.sourceforge.phpeclipse.internal.compiler.ast.MethodDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.NullLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.OR_OR_Expression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.PostfixExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.PrefixExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.QualifiedAllocationExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.QualifiedNameReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.QualifiedSuperReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.QualifiedThisReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.QualifiedTypeReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ReturnStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.SingleNameReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.SingleTypeReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.StringLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.SuperReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.SwitchStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ThisReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ThrowStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TrueLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TryStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TypeDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.UnaryExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.WhileStatement;
 
 /** 
  * A visitor for iterating through the parse tree.
index a0bcea4..8be0b3f 100644 (file)
 package net.sourceforge.phpdt.internal.compiler;
 
 import net.sourceforge.phpdt.core.compiler.IProblem;
+import net.sourceforge.phpdt.internal.compiler.ast.AND_AND_Expression;
+import net.sourceforge.phpdt.internal.compiler.ast.AllocationExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.AnonymousLocalTypeDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.Argument;
+import net.sourceforge.phpdt.internal.compiler.ast.ArrayAllocationExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.ArrayInitializer;
+import net.sourceforge.phpdt.internal.compiler.ast.ArrayQualifiedTypeReference;
+import net.sourceforge.phpdt.internal.compiler.ast.ArrayReference;
+import net.sourceforge.phpdt.internal.compiler.ast.ArrayTypeReference;
+import net.sourceforge.phpdt.internal.compiler.ast.AssertStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.Assignment;
+import net.sourceforge.phpdt.internal.compiler.ast.BinaryExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.Block;
+import net.sourceforge.phpdt.internal.compiler.ast.BreakStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.CaseStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.CastExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.Clinit;
+import net.sourceforge.phpdt.internal.compiler.ast.CompilationUnitDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.CompoundAssignment;
+import net.sourceforge.phpdt.internal.compiler.ast.ConditionalExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.ConstructorDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.ContinueStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.DefaultCase;
+import net.sourceforge.phpdt.internal.compiler.ast.DoStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.DoubleLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.EmptyStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.EqualExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.ExplicitConstructorCall;
+import net.sourceforge.phpdt.internal.compiler.ast.ExtendedStringLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.FalseLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.FieldDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.FieldReference;
+import net.sourceforge.phpdt.internal.compiler.ast.FloatLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.ForStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.IfStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.ImportReference;
+import net.sourceforge.phpdt.internal.compiler.ast.Initializer;
+import net.sourceforge.phpdt.internal.compiler.ast.InstanceOfExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.IntLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.LabeledStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.LocalDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.LocalTypeDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.LongLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.MemberTypeDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.MessageSend;
+import net.sourceforge.phpdt.internal.compiler.ast.MethodDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.NullLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.OR_OR_Expression;
+import net.sourceforge.phpdt.internal.compiler.ast.PostfixExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.PrefixExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.QualifiedAllocationExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.QualifiedNameReference;
+import net.sourceforge.phpdt.internal.compiler.ast.QualifiedSuperReference;
+import net.sourceforge.phpdt.internal.compiler.ast.QualifiedThisReference;
+import net.sourceforge.phpdt.internal.compiler.ast.QualifiedTypeReference;
+import net.sourceforge.phpdt.internal.compiler.ast.ReturnStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.SingleNameReference;
+import net.sourceforge.phpdt.internal.compiler.ast.SingleTypeReference;
+import net.sourceforge.phpdt.internal.compiler.ast.StringLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.SuperReference;
+import net.sourceforge.phpdt.internal.compiler.ast.SwitchStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.ThisReference;
+import net.sourceforge.phpdt.internal.compiler.ast.ThrowStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.TrueLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.TryStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.TypeDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.UnaryExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.WhileStatement;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
 import net.sourceforge.phpdt.internal.compiler.lookup.ClassScope;
 import net.sourceforge.phpdt.internal.compiler.lookup.CompilationUnitScope;
 import net.sourceforge.phpdt.internal.compiler.lookup.MethodScope;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AND_AND_Expression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AllocationExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AnonymousLocalTypeDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Argument;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ArrayAllocationExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ArrayInitializer;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ArrayQualifiedTypeReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ArrayReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ArrayTypeReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AssertStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Assignment;
-import net.sourceforge.phpeclipse.internal.compiler.ast.BinaryExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Block;
-import net.sourceforge.phpeclipse.internal.compiler.ast.BreakStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CaseStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CastExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Clinit;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CompoundAssignment;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ConditionalExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ConstructorDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ContinueStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.DefaultCase;
-import net.sourceforge.phpeclipse.internal.compiler.ast.DoStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.DoubleLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.EmptyStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.EqualExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ExplicitConstructorCall;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ExtendedStringLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.FalseLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.FieldDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.FieldReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.FloatLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ForStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.IfStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ImportReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Initializer;
-import net.sourceforge.phpeclipse.internal.compiler.ast.InstanceOfExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.IntLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.LabeledStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.LocalDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.LocalTypeDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.LongLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.MemberTypeDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.MessageSend;
-import net.sourceforge.phpeclipse.internal.compiler.ast.MethodDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.NullLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.OR_OR_Expression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.PostfixExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.PrefixExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.QualifiedAllocationExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.QualifiedNameReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.QualifiedSuperReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.QualifiedThisReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.QualifiedTypeReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ReturnStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.SingleNameReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.SingleTypeReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.StringLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.SuperReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.SwitchStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ThisReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ThrowStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TrueLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TryStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TypeDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.UnaryExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.WhileStatement;
 
 
 /**
index f4bc83e..a360dae 100644 (file)
@@ -14,6 +14,8 @@ import java.io.StringWriter;
 import java.util.Map;
 
 import net.sourceforge.phpdt.core.compiler.IProblem;
+import net.sourceforge.phpdt.internal.compiler.ast.CompilationUnitDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.TypeDeclaration;
 import net.sourceforge.phpdt.internal.compiler.env.IBinaryType;
 import net.sourceforge.phpdt.internal.compiler.env.ICompilationUnit;
 import net.sourceforge.phpdt.internal.compiler.env.INameEnvironment;
@@ -28,8 +30,6 @@ import net.sourceforge.phpdt.internal.compiler.problem.AbortCompilationUnit;
 import net.sourceforge.phpdt.internal.compiler.problem.ProblemReporter;
 import net.sourceforge.phpdt.internal.compiler.problem.ProblemSeverities;
 import net.sourceforge.phpdt.internal.compiler.util.Util;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TypeDeclaration;
 
 public class Compiler implements ITypeRequestor, ProblemSeverities {
   public UnitParser parser;
index 488e618..80da79e 100644 (file)
@@ -8,12 +8,12 @@
 package net.sourceforge.phpdt.internal.compiler;
 
 import net.sourceforge.phpdt.core.compiler.IProblem;
+import net.sourceforge.phpdt.internal.compiler.ast.CompilationUnitDeclaration;
 import net.sourceforge.phpdt.internal.compiler.env.ICompilationUnit;
 import net.sourceforge.phpdt.internal.compiler.impl.CompilerOptions;
 import net.sourceforge.phpdt.internal.compiler.parser.UnitParser;
 import net.sourceforge.phpdt.internal.compiler.problem.AbortCompilation;
 import net.sourceforge.phpdt.internal.compiler.problem.ProblemReporter;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
 
 /*
  * A document element parser extracts structural information from a piece of source, providing detailed source positions info.
index 6d921c2..be48825 100644 (file)
 package net.sourceforge.phpdt.internal.compiler;
 
 import net.sourceforge.phpdt.core.compiler.IProblem;
+import net.sourceforge.phpdt.internal.compiler.ast.AND_AND_Expression;
+import net.sourceforge.phpdt.internal.compiler.ast.AllocationExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.AnonymousLocalTypeDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.Argument;
+import net.sourceforge.phpdt.internal.compiler.ast.ArrayAllocationExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.ArrayInitializer;
+import net.sourceforge.phpdt.internal.compiler.ast.ArrayQualifiedTypeReference;
+import net.sourceforge.phpdt.internal.compiler.ast.ArrayReference;
+import net.sourceforge.phpdt.internal.compiler.ast.ArrayTypeReference;
+import net.sourceforge.phpdt.internal.compiler.ast.AssertStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.Assignment;
+import net.sourceforge.phpdt.internal.compiler.ast.BinaryExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.Block;
+import net.sourceforge.phpdt.internal.compiler.ast.BreakStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.CaseStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.CastExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.Clinit;
+import net.sourceforge.phpdt.internal.compiler.ast.CompilationUnitDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.CompoundAssignment;
+import net.sourceforge.phpdt.internal.compiler.ast.ConditionalExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.ConstructorDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.ContinueStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.DefaultCase;
+import net.sourceforge.phpdt.internal.compiler.ast.DoStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.DoubleLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.EmptyStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.EqualExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.ExplicitConstructorCall;
+import net.sourceforge.phpdt.internal.compiler.ast.ExtendedStringLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.FalseLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.FieldDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.FieldReference;
+import net.sourceforge.phpdt.internal.compiler.ast.FloatLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.ForStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.IfStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.ImportReference;
+import net.sourceforge.phpdt.internal.compiler.ast.Initializer;
+import net.sourceforge.phpdt.internal.compiler.ast.InstanceOfExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.IntLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.LabeledStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.LocalDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.LocalTypeDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.LongLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.MemberTypeDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.MessageSend;
+import net.sourceforge.phpdt.internal.compiler.ast.MethodDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.NullLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.OR_OR_Expression;
+import net.sourceforge.phpdt.internal.compiler.ast.PostfixExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.PrefixExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.QualifiedAllocationExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.QualifiedNameReference;
+import net.sourceforge.phpdt.internal.compiler.ast.QualifiedSuperReference;
+import net.sourceforge.phpdt.internal.compiler.ast.QualifiedThisReference;
+import net.sourceforge.phpdt.internal.compiler.ast.QualifiedTypeReference;
+import net.sourceforge.phpdt.internal.compiler.ast.ReturnStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.SingleNameReference;
+import net.sourceforge.phpdt.internal.compiler.ast.SingleTypeReference;
+import net.sourceforge.phpdt.internal.compiler.ast.StringLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.SuperReference;
+import net.sourceforge.phpdt.internal.compiler.ast.SwitchStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.ThisReference;
+import net.sourceforge.phpdt.internal.compiler.ast.ThrowStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.TrueLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.TryStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.TypeDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.UnaryExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.WhileStatement;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
 import net.sourceforge.phpdt.internal.compiler.lookup.ClassScope;
 import net.sourceforge.phpdt.internal.compiler.lookup.CompilationUnitScope;
 import net.sourceforge.phpdt.internal.compiler.lookup.MethodScope;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AND_AND_Expression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AllocationExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AnonymousLocalTypeDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Argument;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ArrayAllocationExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ArrayInitializer;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ArrayQualifiedTypeReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ArrayReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ArrayTypeReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AssertStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Assignment;
-import net.sourceforge.phpeclipse.internal.compiler.ast.BinaryExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Block;
-import net.sourceforge.phpeclipse.internal.compiler.ast.BreakStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CaseStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CastExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Clinit;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CompoundAssignment;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ConditionalExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ConstructorDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ContinueStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.DefaultCase;
-import net.sourceforge.phpeclipse.internal.compiler.ast.DoStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.DoubleLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.EmptyStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.EqualExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ExplicitConstructorCall;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ExtendedStringLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.FalseLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.FieldDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.FieldReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.FloatLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ForStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.IfStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ImportReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Initializer;
-import net.sourceforge.phpeclipse.internal.compiler.ast.InstanceOfExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.IntLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.LabeledStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.LocalDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.LocalTypeDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.LongLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.MemberTypeDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.MessageSend;
-import net.sourceforge.phpeclipse.internal.compiler.ast.MethodDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.NullLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.OR_OR_Expression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.PostfixExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.PrefixExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.QualifiedAllocationExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.QualifiedNameReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.QualifiedSuperReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.QualifiedThisReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.QualifiedTypeReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ReturnStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.SingleNameReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.SingleTypeReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.StringLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.SuperReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.SwitchStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ThisReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ThrowStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TrueLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TryStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TypeDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.UnaryExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.WhileStatement;
 
 /**
  * A visitor interface for interating through the parse tree.
index d1087b2..b7dda3f 100644 (file)
@@ -14,6 +14,20 @@ import java.util.ArrayList;
 
 import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.core.compiler.IProblem;
+import net.sourceforge.phpdt.internal.compiler.ast.ASTNode;
+import net.sourceforge.phpdt.internal.compiler.ast.AbstractMethodDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.AnonymousLocalTypeDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.Argument;
+import net.sourceforge.phpdt.internal.compiler.ast.CompilationUnitDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.ConstructorDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.ExplicitConstructorCall;
+import net.sourceforge.phpdt.internal.compiler.ast.FieldDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.ImportReference;
+import net.sourceforge.phpdt.internal.compiler.ast.MethodDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.NameReference;
+import net.sourceforge.phpdt.internal.compiler.ast.QualifiedAllocationExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.TypeDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.TypeReference;
 import net.sourceforge.phpdt.internal.compiler.env.ICompilationUnit;
 import net.sourceforge.phpdt.internal.compiler.env.ISourceType;
 import net.sourceforge.phpdt.internal.compiler.impl.CompilerOptions;
@@ -23,20 +37,6 @@ import net.sourceforge.phpdt.internal.compiler.lookup.ClassScope;
 import net.sourceforge.phpdt.internal.compiler.problem.AbortCompilation;
 import net.sourceforge.phpdt.internal.compiler.problem.ProblemReporter;
 import net.sourceforge.phpdt.internal.core.util.CommentRecorderParser;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ASTNode;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AbstractMethodDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AnonymousLocalTypeDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Argument;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ConstructorDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ExplicitConstructorCall;
-import net.sourceforge.phpeclipse.internal.compiler.ast.FieldDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ImportReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.MethodDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.NameReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.QualifiedAllocationExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TypeDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TypeReference;
 
 /**
  * A source element parser extracts structural and reference information
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.impl.Constant;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowInfo;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.CompilationResult;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -5,7 +5,7 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **********************************************************************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.IAbstractSyntaxTreeVisitor;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.IAbstractSyntaxTreeVisitor;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *     Genady Beriozkin - added support for reporting assignment with no effect
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.codegen.Label;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.codegen.Label;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.IAbstractSyntaxTreeVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.codegen.CaseLabel;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.CompilationResult;
 import net.sourceforge.phpdt.internal.compiler.IAbstractSyntaxTreeVisitor;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 import java.util.ArrayList;
 
 import net.sourceforge.phpdt.core.compiler.CharOperation;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.IAbstractSyntaxTreeVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -5,7 +5,7 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **********************************************************************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.IAbstractSyntaxTreeVisitor;
 import net.sourceforge.phpdt.internal.compiler.codegen.CaseLabel;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.codegen.Label;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.IAbstractSyntaxTreeVisitor;
 import net.sourceforge.phpdt.internal.compiler.impl.Constant;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.IAbstractSyntaxTreeVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowInfo;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.IAbstractSyntaxTreeVisitor;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.IAbstractSyntaxTreeVisitor;
 import net.sourceforge.phpdt.internal.compiler.impl.Constant;
@@ -5,7 +5,7 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **********************************************************************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.IAbstractSyntaxTreeVisitor;
 import net.sourceforge.phpdt.internal.compiler.impl.Constant;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.codegen.Label;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.lookup.ClassScope;
@@ -5,7 +5,7 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **********************************************************************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.lookup.CompilationUnitScope;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.CompilationResult;
 
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.IAbstractSyntaxTreeVisitor;
 import net.sourceforge.phpdt.internal.compiler.impl.Constant;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.impl.Constant;
 
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.lookup.Binding;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.lookup.Binding;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.codegen.Label;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowInfo;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.CompilationResult;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.IAbstractSyntaxTreeVisitor;
 import net.sourceforge.phpdt.internal.compiler.impl.Constant;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.impl.Constant;
 
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 public abstract class  MagicLiteral extends Literal {
 public MagicLiteral(int s , int e) {
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.CompilationResult;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.lookup.Binding;
 import net.sourceforge.phpdt.internal.compiler.lookup.BindingIds;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.IAbstractSyntaxTreeVisitor;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 public abstract class NumberLiteral extends Literal {
        char[] source;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 public abstract class OperatorExpression extends Expression implements OperatorIds {
 
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 public interface OperatorIds {
        public static final int AND_AND = 0;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.IAbstractSyntaxTreeVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowInfo;
@@ -5,7 +5,7 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **********************************************************************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.IAbstractSyntaxTreeVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.codegen.Label;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -5,7 +5,7 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **********************************************************************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.IAbstractSyntaxTreeVisitor;
 import net.sourceforge.phpdt.internal.compiler.impl.Constant;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 /**
  * 
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 /**
  * 
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.IAbstractSyntaxTreeVisitor;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.codegen.Label;
@@ -5,7 +5,7 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **********************************************************************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.IAbstractSyntaxTreeVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.IAbstractSyntaxTreeVisitor;
 import net.sourceforge.phpdt.internal.compiler.impl.Constant;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.codegen.Label;
@@ -5,7 +5,7 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  **********************************************************************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.internal.compiler.ast;
+package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.codegen.Label;
index 5a2b072..0ddf6ab 100644 (file)
@@ -12,12 +12,12 @@ package net.sourceforge.phpdt.internal.compiler.flow;
 
 import java.util.ArrayList;
 
+import net.sourceforge.phpdt.internal.compiler.ast.ASTNode;
 import net.sourceforge.phpdt.internal.compiler.codegen.ObjectCache;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
 import net.sourceforge.phpdt.internal.compiler.lookup.ReferenceBinding;
 import net.sourceforge.phpdt.internal.compiler.lookup.Scope;
 import net.sourceforge.phpdt.internal.compiler.lookup.TypeBinding;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ASTNode;
 
 /**
  * Reflects the context of code analysis, keeping track of enclosing
index 21644b3..9adb823 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.compiler.flow;
 
+import net.sourceforge.phpdt.internal.compiler.ast.ASTNode;
+import net.sourceforge.phpdt.internal.compiler.ast.Reference;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
 import net.sourceforge.phpdt.internal.compiler.lookup.FieldBinding;
 import net.sourceforge.phpdt.internal.compiler.lookup.LocalVariableBinding;
 import net.sourceforge.phpdt.internal.compiler.lookup.VariableBinding;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ASTNode;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Reference;
 
 /**
  * Reflects the context of code analysis, keeping track of enclosing
index 5cefb30..dca4536 100644 (file)
 package net.sourceforge.phpdt.internal.compiler.flow;
 
 import net.sourceforge.phpdt.core.compiler.CharOperation;
+import net.sourceforge.phpdt.internal.compiler.ast.ASTNode;
+import net.sourceforge.phpdt.internal.compiler.ast.AbstractMethodDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.Reference;
+import net.sourceforge.phpdt.internal.compiler.ast.TryStatement;
 import net.sourceforge.phpdt.internal.compiler.codegen.Label;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
 import net.sourceforge.phpdt.internal.compiler.lookup.ReferenceBinding;
@@ -18,10 +22,6 @@ import net.sourceforge.phpdt.internal.compiler.lookup.Scope;
 import net.sourceforge.phpdt.internal.compiler.lookup.TypeBinding;
 import net.sourceforge.phpdt.internal.compiler.lookup.TypeConstants;
 import net.sourceforge.phpdt.internal.compiler.lookup.VariableBinding;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ASTNode;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AbstractMethodDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Reference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TryStatement;
 
 /**
  * Reflects the context of code analysis, keeping track of enclosing
index 8226796..dfa74a9 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.compiler.flow;
 
+import net.sourceforge.phpdt.internal.compiler.ast.Statement;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
 import net.sourceforge.phpdt.internal.compiler.lookup.FieldBinding;
 import net.sourceforge.phpdt.internal.compiler.lookup.LocalVariableBinding;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Statement;
 
 public abstract class FlowInfo {
 
index 11a8759..10e348e 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.compiler.flow;
 
+import net.sourceforge.phpdt.internal.compiler.ast.ASTNode;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
 import net.sourceforge.phpdt.internal.compiler.lookup.ReferenceBinding;
 import net.sourceforge.phpdt.internal.compiler.lookup.TypeBinding;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ASTNode;
 
 /**
  * Reflects the context of code analysis, keeping track of enclosing
index e927a45..b124402 100644 (file)
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.compiler.flow;
 
-import net.sourceforge.phpeclipse.internal.compiler.ast.ASTNode;
+import net.sourceforge.phpdt.internal.compiler.ast.ASTNode;
 
 /**
  * Reflects the context of code analysis, keeping track of enclosing
index 97d94ed..47ca611 100644 (file)
@@ -11,9 +11,9 @@
 package net.sourceforge.phpdt.internal.compiler.flow;
 
 import net.sourceforge.phpdt.core.compiler.CharOperation;
+import net.sourceforge.phpdt.internal.compiler.ast.ASTNode;
 import net.sourceforge.phpdt.internal.compiler.codegen.Label;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ASTNode;
 
 /**
  * Reflects the context of code analysis, keeping track of enclosing
index 21239c1..130fd4e 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.compiler.flow;
 
+import net.sourceforge.phpdt.internal.compiler.ast.ASTNode;
+import net.sourceforge.phpdt.internal.compiler.ast.Reference;
 import net.sourceforge.phpdt.internal.compiler.codegen.Label;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
 import net.sourceforge.phpdt.internal.compiler.lookup.FieldBinding;
 import net.sourceforge.phpdt.internal.compiler.lookup.LocalVariableBinding;
 import net.sourceforge.phpdt.internal.compiler.lookup.Scope;
 import net.sourceforge.phpdt.internal.compiler.lookup.VariableBinding;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ASTNode;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Reference;
 
 /**
  * Reflects the context of code analysis, keeping track of enclosing
index e07bb19..fc455c7 100644 (file)
@@ -10,8 +10,8 @@
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.compiler.flow;
 
+import net.sourceforge.phpdt.internal.compiler.ast.ASTNode;
 import net.sourceforge.phpdt.internal.compiler.codegen.Label;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ASTNode;
 
 /**
  * Reflects the context of code analysis, keeping track of enclosing
index c1b8d7e..53e0d0a 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.compiler.impl;
 
+import net.sourceforge.phpdt.internal.compiler.ast.OperatorIds;
 import net.sourceforge.phpdt.internal.compiler.lookup.TypeIds;
 import net.sourceforge.phpdt.internal.compiler.problem.ShouldNotImplement;
 import net.sourceforge.phpdt.internal.compiler.util.Util;
-import net.sourceforge.phpeclipse.internal.compiler.ast.OperatorIds;
 
 public abstract class Constant implements TypeIds, OperatorIds {
        
index 04dd47d..127acbe 100644 (file)
 package net.sourceforge.phpdt.internal.compiler.lookup;
 
 import net.sourceforge.phpdt.core.compiler.CharOperation;
+import net.sourceforge.phpdt.internal.compiler.ast.ConstructorDeclaration;
 import net.sourceforge.phpdt.internal.compiler.env.IBinaryField;
 import net.sourceforge.phpdt.internal.compiler.env.IBinaryMethod;
 import net.sourceforge.phpdt.internal.compiler.env.IBinaryNestedType;
 import net.sourceforge.phpdt.internal.compiler.env.IBinaryType;
 import net.sourceforge.phpdt.internal.compiler.problem.AbortCompilation;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ConstructorDeclaration;
 
 /*
 Not all fields defined by this type are initialized when it is created.
index 6ae9a68..b6cc496 100644 (file)
 package net.sourceforge.phpdt.internal.compiler.lookup;
 
 import net.sourceforge.phpdt.core.compiler.CharOperation;
+import net.sourceforge.phpdt.internal.compiler.ast.AbstractMethodDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.ConstructorDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.TypeDeclaration;
 import net.sourceforge.phpdt.internal.compiler.problem.ProblemReporter;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AbstractMethodDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ConstructorDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TypeDeclaration;
 
 public class BlockScope extends Scope {
 
index 6e26e42..4fd2e45 100644 (file)
 package net.sourceforge.phpdt.internal.compiler.lookup;
 
 import net.sourceforge.phpdt.core.compiler.CharOperation;
+import net.sourceforge.phpdt.internal.compiler.ast.AbstractMethodDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.Clinit;
+import net.sourceforge.phpdt.internal.compiler.ast.FieldDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.TypeDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.TypeReference;
 import net.sourceforge.phpdt.internal.compiler.impl.ReferenceContext;
 import net.sourceforge.phpdt.internal.compiler.problem.ProblemReporter;
 import net.sourceforge.phpdt.internal.compiler.util.HashtableOfObject;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AbstractMethodDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Clinit;
-import net.sourceforge.phpeclipse.internal.compiler.ast.FieldDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TypeDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TypeReference;
 
 public class ClassScope extends Scope {
        public TypeDeclaration referenceContext;
index 49b458d..b07c8f8 100644 (file)
@@ -13,15 +13,15 @@ package net.sourceforge.phpdt.internal.compiler.lookup;
 import java.util.ArrayList;
 
 import net.sourceforge.phpdt.core.compiler.CharOperation;
+import net.sourceforge.phpdt.internal.compiler.ast.CompilationUnitDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.ImportReference;
+import net.sourceforge.phpdt.internal.compiler.ast.TypeDeclaration;
 import net.sourceforge.phpdt.internal.compiler.problem.ProblemReporter;
 import net.sourceforge.phpdt.internal.compiler.util.CompoundNameVector;
 import net.sourceforge.phpdt.internal.compiler.util.HashtableOfObject;
 import net.sourceforge.phpdt.internal.compiler.util.HashtableOfType;
 import net.sourceforge.phpdt.internal.compiler.util.ObjectVector;
 import net.sourceforge.phpdt.internal.compiler.util.SimpleNameVector;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ImportReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TypeDeclaration;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.IPath;
index 1884c48..598715f 100644 (file)
@@ -10,8 +10,8 @@
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.compiler.lookup;
 
+import net.sourceforge.phpdt.internal.compiler.ast.FieldDeclaration;
 import net.sourceforge.phpdt.internal.compiler.impl.Constant;
-import net.sourceforge.phpeclipse.internal.compiler.ast.FieldDeclaration;
 
 
 
index 22a123a..b226412 100644 (file)
@@ -11,7 +11,7 @@
 package net.sourceforge.phpdt.internal.compiler.lookup;
 
 import net.sourceforge.phpdt.core.compiler.CharOperation;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ImportReference;
+import net.sourceforge.phpdt.internal.compiler.ast.ImportReference;
 
 public class ImportBinding extends Binding {
        public char[][] compoundName;
index 73c9e06..438e006 100644 (file)
@@ -11,8 +11,8 @@
 package net.sourceforge.phpdt.internal.compiler.lookup;
 
 import net.sourceforge.phpdt.core.compiler.CharOperation;
+import net.sourceforge.phpdt.internal.compiler.ast.AnonymousLocalTypeDeclaration;
 import net.sourceforge.phpdt.internal.compiler.util.Util;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AnonymousLocalTypeDeclaration;
 
 public final class LocalTypeBinding extends NestedTypeBinding {
        final static char[] LocalTypePrefix = { '$', 'L', 'o', 'c', 'a', 'l', '$' };
index eba475f..c69d11b 100644 (file)
@@ -10,8 +10,8 @@
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.compiler.lookup;
 
+import net.sourceforge.phpdt.internal.compiler.ast.LocalDeclaration;
 import net.sourceforge.phpdt.internal.compiler.impl.Constant;
-import net.sourceforge.phpeclipse.internal.compiler.ast.LocalDeclaration;
 
 public class LocalVariableBinding extends VariableBinding {
 
index 249d948..54e6de2 100644 (file)
@@ -11,6 +11,7 @@
 package net.sourceforge.phpdt.internal.compiler.lookup;
 
 import net.sourceforge.phpdt.core.compiler.CharOperation;
+import net.sourceforge.phpdt.internal.compiler.ast.CompilationUnitDeclaration;
 import net.sourceforge.phpdt.internal.compiler.env.IBinaryType;
 import net.sourceforge.phpdt.internal.compiler.env.INameEnvironment;
 import net.sourceforge.phpdt.internal.compiler.env.NameEnvironmentAnswer;
@@ -18,7 +19,6 @@ import net.sourceforge.phpdt.internal.compiler.impl.ITypeRequestor;
 import net.sourceforge.phpdt.internal.compiler.problem.ProblemReporter;
 import net.sourceforge.phpdt.internal.compiler.util.HashtableOfPackage;
 import net.sourceforge.phpdt.internal.compiler.util.Util;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
 
 public class LookupEnvironment implements BaseTypes, ProblemReasons, TypeConstants {
 //     public CompilerOptions options;
index bf7a59d..0d91862 100644 (file)
@@ -11,8 +11,8 @@
 package net.sourceforge.phpdt.internal.compiler.lookup;
 
 import net.sourceforge.phpdt.core.compiler.CharOperation;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AbstractMethodDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ConstructorDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.AbstractMethodDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.ConstructorDeclaration;
 
 public class MethodBinding extends Binding implements BaseTypes, TypeConstants {
        public int modifiers;
index a34e3f1..b4d38bf 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.compiler.lookup;
 
+import net.sourceforge.phpdt.internal.compiler.ast.AbstractMethodDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.ConstructorDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.QualifiedNameReference;
+import net.sourceforge.phpdt.internal.compiler.ast.SingleNameReference;
+import net.sourceforge.phpdt.internal.compiler.ast.TypeDeclaration;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowInfo;
 import net.sourceforge.phpdt.internal.compiler.flow.UnconditionalFlowInfo;
 import net.sourceforge.phpdt.internal.compiler.impl.ReferenceContext;
 import net.sourceforge.phpdt.internal.compiler.problem.ProblemReporter;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AbstractMethodDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ConstructorDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.QualifiedNameReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.SingleNameReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TypeDeclaration;
 
 /**
  * Particular block scope used for methods, constructors or clinits, representing
index 75f862c..cf46cd2 100644 (file)
 package net.sourceforge.phpdt.internal.compiler.lookup;
 
 import net.sourceforge.phpdt.core.compiler.CharOperation;
+import net.sourceforge.phpdt.internal.compiler.ast.MethodDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.TypeDeclaration;
 import net.sourceforge.phpdt.internal.compiler.problem.ProblemReporter;
 import net.sourceforge.phpdt.internal.compiler.util.HashtableOfObject;
-import net.sourceforge.phpeclipse.internal.compiler.ast.MethodDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TypeDeclaration;
 
 public final class MethodVerifier implements TagBits, TypeConstants {
        SourceTypeBinding type;
index 9ad53e7..2957f65 100644 (file)
 package net.sourceforge.phpdt.internal.compiler.lookup;
 
 import net.sourceforge.phpdt.core.compiler.CharOperation;
+import net.sourceforge.phpdt.internal.compiler.ast.AbstractMethodDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.CompilationUnitDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.ImportReference;
+import net.sourceforge.phpdt.internal.compiler.ast.TypeDeclaration;
 import net.sourceforge.phpdt.internal.compiler.impl.ReferenceContext;
 import net.sourceforge.phpdt.internal.compiler.problem.ProblemReporter;
 import net.sourceforge.phpdt.internal.compiler.util.ObjectVector;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AbstractMethodDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ImportReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TypeDeclaration;
 
 public abstract class Scope
        implements
index 97f6ed8..87fd4e9 100644 (file)
@@ -14,16 +14,16 @@ import java.util.Enumeration;
 import java.util.Hashtable;
 
 import net.sourceforge.phpdt.core.compiler.CharOperation;
+import net.sourceforge.phpdt.internal.compiler.ast.AbstractMethodDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.Argument;
+import net.sourceforge.phpdt.internal.compiler.ast.AssertStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.ConstructorDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.FieldDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.MethodDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.TypeDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.TypeReference;
 import net.sourceforge.phpdt.internal.compiler.impl.Constant;
 import net.sourceforge.phpdt.internal.compiler.problem.AbortCompilation;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AbstractMethodDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Argument;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AssertStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ConstructorDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.FieldDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.MethodDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TypeDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TypeReference;
 
 
 public class SourceTypeBinding extends ReferenceBinding {
index 7b729e9..852739a 100644 (file)
@@ -11,8 +11,8 @@
 package net.sourceforge.phpdt.internal.compiler.lookup;
 
 import net.sourceforge.phpdt.core.compiler.CharOperation;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AbstractMethodDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.FieldDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.AbstractMethodDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.FieldDeclaration;
 
 public class SyntheticAccessMethodBinding extends MethodBinding {
 
index f6bb64a..18f7135 100644 (file)
@@ -14,7 +14,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import net.sourceforge.phpeclipse.internal.compiler.ast.StringLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.StringLiteral;
 
 public class NLSLine {
 
index 12e3dfb..c34ca1d 100644 (file)
@@ -14,6 +14,33 @@ import java.util.HashSet;
 import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.core.compiler.ITerminalSymbols;
 import net.sourceforge.phpdt.core.compiler.InvalidInputException;
+import net.sourceforge.phpdt.internal.compiler.ast.AND_AND_Expression;
+import net.sourceforge.phpdt.internal.compiler.ast.ASTNode;
+import net.sourceforge.phpdt.internal.compiler.ast.AbstractMethodDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.BinaryExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.Block;
+import net.sourceforge.phpdt.internal.compiler.ast.BreakStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.CompilationUnitDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.ConditionalExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.ContinueStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.EqualExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.Expression;
+import net.sourceforge.phpdt.internal.compiler.ast.FieldDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.FieldReference;
+import net.sourceforge.phpdt.internal.compiler.ast.IfStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.ImportReference;
+import net.sourceforge.phpdt.internal.compiler.ast.InstanceOfExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.MethodDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.OR_OR_Expression;
+import net.sourceforge.phpdt.internal.compiler.ast.OperatorIds;
+import net.sourceforge.phpdt.internal.compiler.ast.ReturnStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.SingleTypeReference;
+import net.sourceforge.phpdt.internal.compiler.ast.Statement;
+import net.sourceforge.phpdt.internal.compiler.ast.StringLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.StringLiteralDQ;
+import net.sourceforge.phpdt.internal.compiler.ast.StringLiteralSQ;
+import net.sourceforge.phpdt.internal.compiler.ast.TypeDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.TypeReference;
 import net.sourceforge.phpdt.internal.compiler.impl.CompilerOptions;
 import net.sourceforge.phpdt.internal.compiler.impl.ReferenceContext;
 import net.sourceforge.phpdt.internal.compiler.lookup.CompilerModifiers;
@@ -23,33 +50,6 @@ import net.sourceforge.phpdt.internal.compiler.problem.ProblemSeverities;
 import net.sourceforge.phpdt.internal.compiler.util.Util;
 import net.sourceforge.phpdt.internal.ui.util.PHPFileUtil;
 import net.sourceforge.phpeclipse.builder.IdentifierIndexManager;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AND_AND_Expression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ASTNode;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AbstractMethodDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.BinaryExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Block;
-import net.sourceforge.phpeclipse.internal.compiler.ast.BreakStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ConditionalExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ContinueStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.EqualExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Expression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.FieldDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.FieldReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.IfStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ImportReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.InstanceOfExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.MethodDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.OR_OR_Expression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.OperatorIds;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ReturnStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.SingleTypeReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Statement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.StringLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.StringLiteralDQ;
-import net.sourceforge.phpeclipse.internal.compiler.ast.StringLiteralSQ;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TypeDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TypeReference;
 import net.sourceforge.phpeclipse.ui.overlaypages.ProjectPrefUtil;
 
 import org.eclipse.core.resources.IFile;
index 4a3cac8..169bebd 100644 (file)
@@ -10,9 +10,9 @@
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.compiler.parser;
 
-import net.sourceforge.phpeclipse.internal.compiler.ast.ASTNode;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Block;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Statement;
+import net.sourceforge.phpdt.internal.compiler.ast.ASTNode;
+import net.sourceforge.phpdt.internal.compiler.ast.Block;
+import net.sourceforge.phpdt.internal.compiler.ast.Statement;
 
 /**
  * Internal structure for parsing recovery 
index 0b12fc7..e4ed1ce 100644 (file)
@@ -2,7 +2,7 @@
  * Copyright (c) 2000, 2001, 2002 International Business Machines Corp. and others. All rights reserved. This program and the
  * accompanying materials are made available under the terms of the Common Public License v0.5 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/cpl-v05.html
- * 
+ *
  * Contributors: IBM Corporation - initial API and implementation
  **********************************************************************************************************************************/
 package net.sourceforge.phpdt.internal.compiler.parser;
@@ -15,8 +15,8 @@ import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.core.compiler.IScanner;
 import net.sourceforge.phpdt.core.compiler.ITerminalSymbols;
 import net.sourceforge.phpdt.core.compiler.InvalidInputException;
+import net.sourceforge.phpdt.internal.compiler.ast.StringLiteral;
 import net.sourceforge.phpdt.internal.compiler.env.ICompilationUnit;
-import net.sourceforge.phpeclipse.internal.compiler.ast.StringLiteral;
 
 public class Scanner implements IScanner, ITerminalSymbols {
        /*
@@ -144,7 +144,7 @@ public class Scanner implements IScanner, ITerminalSymbols {
        static final int[] ObviousIdentCharNatures = new int[MAX_OBVIOUS];
 
        public final static int C_DOLLAR = 8;
-       
+
        public final static int C_LETTER = 4;
 
        public final static int C_DIGIT = 3;
@@ -165,7 +165,7 @@ public class Scanner implements IScanner, ITerminalSymbols {
                        ObviousIdentCharNatures[i] = C_LETTER;
 
                ObviousIdentCharNatures['$'] = C_DOLLAR;
-               
+
                ObviousIdentCharNatures[10] = C_SPACE; // \ u000a: LINE FEED
                ObviousIdentCharNatures[12] = C_SPACE; // \ u000c: FORM FEED
                ObviousIdentCharNatures[13] = C_SPACE; // \ u000d: CARRIAGE RETURN
@@ -278,10 +278,10 @@ public class Scanner implements IScanner, ITerminalSymbols {
        /**
         * Determines if the specified character is permissible as the first character
         * in a PHP identifier or variable
-        * 
+        *
         * The '$' character for PHP variables is regarded as a correct first
         * character !
-        * 
+        *
         */
        public static boolean isPHPIdentOrVarStart(char ch) {
                if (ch < MAX_OBVIOUS) {
@@ -294,7 +294,7 @@ public class Scanner implements IScanner, ITerminalSymbols {
        /**
         * Determines if the specified character is permissible as the first character
         * in a PHP identifier.
-        * 
+        *
         * The '$' character for PHP variables isn't regarded as the first character !
         */
        public static boolean isPHPIdentifierStart(char ch) {
@@ -323,7 +323,7 @@ public class Scanner implements IScanner, ITerminalSymbols {
                }
                return false;
        }
-       
+
        public final boolean atEnd() {
                // This code is not relevant if source is
                // Only a part of the real stream input
@@ -430,6 +430,11 @@ public class Scanner implements IScanner, ITerminalSymbols {
                return this.startPosition;
        }
 
+       public final String getCurrentStringLiteral() {
+               char[] result = getCurrentStringLiteralSource();
+               return new String(result);
+       }
+
        public final char[] getCurrentStringLiteralSource() {
                // Return the token REAL source (aka unicodes are precomputed)
                if (startPosition + 1 >= currentPosition) {
@@ -453,10 +458,10 @@ public class Scanner implements IScanner, ITerminalSymbols {
 
        /*
         * Search the source position corresponding to the end of a given line number
-        * 
+        *
         * Line numbers are 1-based, and relative to the scanner initialPosition.
         * Character positions are 0-based.
-        * 
+        *
         * In case the given line number is inconsistent, answers -1.
         */
        public final int getLineEnd(int lineNumber) {
@@ -475,12 +480,12 @@ public class Scanner implements IScanner, ITerminalSymbols {
        /**
         * Search the source position corresponding to the beginning of a given line
         * number
-        * 
+        *
         * Line numbers are 1-based, and relative to the scanner initialPosition.
         * Character positions are 0-based.
-        * 
+        *
         * e.g. getLineStart(1) --> 0 i.e. first line starts at character 0.
-        * 
+        *
         * In case the given line number is inconsistent, answers -1.
         */
        public final int getLineStart(int lineNumber) {
@@ -3760,7 +3765,7 @@ public class Scanner implements IScanner, ITerminalSymbols {
 
        /**
         * Search the line number corresponding to a specific position
-        * 
+        *
         */
        public final int getLineNumber(int position) {
                if (lineEnds == null)
@@ -3967,7 +3972,7 @@ public class Scanner implements IScanner, ITerminalSymbols {
                case TokenNameStringInterpolated:
                        return "StringInterpolated(" + new String(getCurrentTokenSource()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$
                case TokenNameEncapsedString0:
-                       return "`"; //$NON-NLS-1$  
+                       return "`"; //$NON-NLS-1$
                        // case TokenNameEncapsedString1:
                        // return "\'"; //$NON-NLS-1$
                        // case TokenNameEncapsedString2:
index 4452e00..e32922d 100644 (file)
@@ -27,25 +27,25 @@ import java.util.ArrayList;
 
 import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.internal.compiler.CompilationResult;
+import net.sourceforge.phpdt.internal.compiler.ast.AbstractMethodDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.Argument;
+import net.sourceforge.phpdt.internal.compiler.ast.ArrayQualifiedTypeReference;
+import net.sourceforge.phpdt.internal.compiler.ast.ArrayTypeReference;
+import net.sourceforge.phpdt.internal.compiler.ast.CompilationUnitDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.ConstructorDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.FieldDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.ImportReference;
+import net.sourceforge.phpdt.internal.compiler.ast.MemberTypeDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.MethodDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.QualifiedTypeReference;
+import net.sourceforge.phpdt.internal.compiler.ast.SingleTypeReference;
+import net.sourceforge.phpdt.internal.compiler.ast.TypeDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.TypeReference;
 import net.sourceforge.phpdt.internal.compiler.env.ISourceField;
 import net.sourceforge.phpdt.internal.compiler.env.ISourceMethod;
 import net.sourceforge.phpdt.internal.compiler.env.ISourceType;
 import net.sourceforge.phpdt.internal.compiler.lookup.CompilerModifiers;
 import net.sourceforge.phpdt.internal.compiler.problem.ProblemReporter;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AbstractMethodDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Argument;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ArrayQualifiedTypeReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ArrayTypeReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ConstructorDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.FieldDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ImportReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.MemberTypeDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.MethodDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.QualifiedTypeReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.SingleTypeReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TypeDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TypeReference;
 
 public class SourceTypeConverter implements CompilerModifiers {
        
index 9785834..06855a0 100644 (file)
@@ -4,16 +4,16 @@ package net.sourceforge.phpdt.internal.compiler.parser;
 import net.sourceforge.phpdt.core.IJavaModelMarker;
 import net.sourceforge.phpdt.core.compiler.IProblem;
 import net.sourceforge.phpdt.internal.compiler.CompilationResult;
+import net.sourceforge.phpdt.internal.compiler.ast.ASTNode;
+import net.sourceforge.phpdt.internal.compiler.ast.CompilationUnitDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.ConstructorDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.FieldDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.Initializer;
+import net.sourceforge.phpdt.internal.compiler.ast.MethodDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.TypeDeclaration;
 import net.sourceforge.phpdt.internal.compiler.env.ICompilationUnit;
 import net.sourceforge.phpdt.internal.compiler.problem.AbortCompilation;
 import net.sourceforge.phpdt.internal.compiler.problem.ProblemReporter;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ASTNode;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ConstructorDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.FieldDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Initializer;
-import net.sourceforge.phpeclipse.internal.compiler.ast.MethodDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TypeDeclaration;
 
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IResource;
index ce09406..4f79776 100644 (file)
@@ -1,6 +1,6 @@
 package net.sourceforge.phpdt.internal.compiler.parser;
 
-import net.sourceforge.phpeclipse.internal.compiler.ast.SingleTypeReference;
+import net.sourceforge.phpdt.internal.compiler.ast.SingleTypeReference;
 
 public class VariableInfo {
   static final public int LEVEL_UNDEFINED = 0;
index d1a5444..d2842a0 100644 (file)
@@ -13,6 +13,46 @@ import net.sourceforge.phpdt.core.compiler.InvalidInputException;
 import net.sourceforge.phpdt.internal.compiler.CompilationResult;
 import net.sourceforge.phpdt.internal.compiler.IErrorHandlingPolicy;
 import net.sourceforge.phpdt.internal.compiler.IProblemFactory;
+import net.sourceforge.phpdt.internal.compiler.ast.ASTNode;
+import net.sourceforge.phpdt.internal.compiler.ast.AbstractMethodDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.AbstractVariableDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.AllocationExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.Argument;
+import net.sourceforge.phpdt.internal.compiler.ast.ArrayAllocationExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.ArrayReference;
+import net.sourceforge.phpdt.internal.compiler.ast.Assignment;
+import net.sourceforge.phpdt.internal.compiler.ast.BinaryExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.CaseStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.CastExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.CompilationUnitDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.CompoundAssignment;
+import net.sourceforge.phpdt.internal.compiler.ast.ConstructorDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.DefaultCase;
+import net.sourceforge.phpdt.internal.compiler.ast.EqualExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.ExplicitConstructorCall;
+import net.sourceforge.phpdt.internal.compiler.ast.Expression;
+import net.sourceforge.phpdt.internal.compiler.ast.FieldDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.FieldReference;
+import net.sourceforge.phpdt.internal.compiler.ast.InstanceOfExpression;
+import net.sourceforge.phpdt.internal.compiler.ast.IntLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.Literal;
+import net.sourceforge.phpdt.internal.compiler.ast.LocalDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.LongLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.MessageSend;
+import net.sourceforge.phpdt.internal.compiler.ast.MethodDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.NameReference;
+import net.sourceforge.phpdt.internal.compiler.ast.NumberLiteral;
+import net.sourceforge.phpdt.internal.compiler.ast.QualifiedNameReference;
+import net.sourceforge.phpdt.internal.compiler.ast.Reference;
+import net.sourceforge.phpdt.internal.compiler.ast.ReturnStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.SingleNameReference;
+import net.sourceforge.phpdt.internal.compiler.ast.Statement;
+import net.sourceforge.phpdt.internal.compiler.ast.ThisReference;
+import net.sourceforge.phpdt.internal.compiler.ast.ThrowStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.TryStatement;
+import net.sourceforge.phpdt.internal.compiler.ast.TypeDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.TypeReference;
+import net.sourceforge.phpdt.internal.compiler.ast.UnaryExpression;
 import net.sourceforge.phpdt.internal.compiler.env.IConstants;
 import net.sourceforge.phpdt.internal.compiler.impl.CompilerOptions;
 import net.sourceforge.phpdt.internal.compiler.impl.Constant;
@@ -32,46 +72,6 @@ import net.sourceforge.phpdt.internal.compiler.lookup.TypeConstants;
 import net.sourceforge.phpdt.internal.compiler.parser.Parser;
 import net.sourceforge.phpdt.internal.compiler.parser.Scanner;
 import net.sourceforge.phpdt.internal.compiler.util.Util;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ASTNode;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AbstractMethodDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AbstractVariableDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AllocationExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Argument;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ArrayAllocationExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ArrayReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Assignment;
-import net.sourceforge.phpeclipse.internal.compiler.ast.BinaryExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CaseStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CastExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CompoundAssignment;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ConstructorDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.DefaultCase;
-import net.sourceforge.phpeclipse.internal.compiler.ast.EqualExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ExplicitConstructorCall;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Expression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.FieldDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.FieldReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.InstanceOfExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.IntLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Literal;
-import net.sourceforge.phpeclipse.internal.compiler.ast.LocalDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.LongLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.MessageSend;
-import net.sourceforge.phpeclipse.internal.compiler.ast.MethodDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.NameReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.NumberLiteral;
-import net.sourceforge.phpeclipse.internal.compiler.ast.QualifiedNameReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Reference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ReturnStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.SingleNameReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Statement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ThisReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ThrowStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TryStatement;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TypeDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TypeReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.UnaryExpression;
 
 public class ProblemReporter extends ProblemHandler implements ProblemReasons {
   public ReferenceContext referenceContext;
index d150dd3..a17cf19 100644 (file)
@@ -43,11 +43,11 @@ import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.core.jdom.IDOMNode;
 import net.sourceforge.phpdt.internal.compiler.IProblemFactory;
 import net.sourceforge.phpdt.internal.compiler.SourceElementParser;
+import net.sourceforge.phpdt.internal.compiler.ast.CompilationUnitDeclaration;
 import net.sourceforge.phpdt.internal.compiler.impl.CompilerOptions;
 import net.sourceforge.phpdt.internal.compiler.problem.DefaultProblemFactory;
 import net.sourceforge.phpdt.internal.core.util.MementoTokenizer;
 import net.sourceforge.phpdt.internal.core.util.Util;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
 
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
index 9e1482f..243ddc2 100644 (file)
@@ -30,6 +30,7 @@ import net.sourceforge.phpdt.internal.compiler.DefaultErrorHandlingPolicies;
 import net.sourceforge.phpdt.internal.compiler.ICompilerRequestor;
 import net.sourceforge.phpdt.internal.compiler.IErrorHandlingPolicy;
 import net.sourceforge.phpdt.internal.compiler.IProblemFactory;
+import net.sourceforge.phpdt.internal.compiler.ast.CompilationUnitDeclaration;
 import net.sourceforge.phpdt.internal.compiler.env.INameEnvironment;
 import net.sourceforge.phpdt.internal.compiler.env.ISourceType;
 import net.sourceforge.phpdt.internal.compiler.lookup.PackageBinding;
@@ -38,7 +39,6 @@ import net.sourceforge.phpdt.internal.compiler.parser.UnitParser;
 import net.sourceforge.phpdt.internal.compiler.problem.AbortCompilation;
 import net.sourceforge.phpdt.internal.compiler.problem.DefaultProblemFactory;
 import net.sourceforge.phpdt.internal.core.util.Util;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 
index 64e55bf..09ea48e 100644 (file)
@@ -16,8 +16,8 @@ import net.sourceforge.phpdt.core.IJavaModelStatusConstants;
 import net.sourceforge.phpdt.core.IProblemRequestor;
 import net.sourceforge.phpdt.core.JavaModelException;
 import net.sourceforge.phpdt.core.WorkingCopyOwner;
+import net.sourceforge.phpdt.internal.compiler.ast.CompilationUnitDeclaration;
 import net.sourceforge.phpdt.internal.core.util.Util;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
 
 /**
  * Reconcile a working copy and signal the changes through a delta.
index 5acdf98..571ced2 100644 (file)
@@ -18,14 +18,14 @@ import net.sourceforge.phpdt.core.IMethod;
 import net.sourceforge.phpdt.core.IType;
 import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
+import net.sourceforge.phpdt.internal.compiler.ast.AbstractMethodDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.Argument;
+import net.sourceforge.phpdt.internal.compiler.ast.CompilationUnitDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.FieldDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.TypeDeclaration;
+import net.sourceforge.phpdt.internal.compiler.ast.TypeReference;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
 import net.sourceforge.phpdt.internal.compiler.lookup.ClassScope;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AbstractMethodDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Argument;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.FieldDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TypeDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TypeReference;
 
 /**
  * Finds an ASTNode given an IJavaElement in a CompilationUnitDeclaration
index bd4e0cc..25ff589 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.core.util;
 
+import net.sourceforge.phpdt.internal.compiler.ast.CompilationUnitDeclaration;
 import net.sourceforge.phpdt.internal.compiler.impl.CompilerOptions;
 import net.sourceforge.phpdt.internal.compiler.parser.UnitParser;
 import net.sourceforge.phpdt.internal.compiler.problem.ProblemReporter;
 import net.sourceforge.phpdt.internal.compiler.problem.ProblemSeverities;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
 
 /**
  * Internal parser used for parsing source to create DOM AST nodes.
index 0cf32b2..ccfbc90 100644 (file)
@@ -30,10 +30,10 @@ import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.core.JavaModelException;
 import net.sourceforge.phpdt.core.Signature;
 import net.sourceforge.phpdt.core.compiler.CharOperation;
+import net.sourceforge.phpdt.internal.compiler.ast.TypeReference;
 import net.sourceforge.phpdt.internal.core.Assert;
 import net.sourceforge.phpdt.internal.core.PackageFragmentRoot;
 import net.sourceforge.phpdt.internal.ui.util.PHPFileUtil;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TypeReference;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
index 2de1ec7..7154b21 100644 (file)
@@ -29,6 +29,7 @@ import net.sourceforge.phpdt.core.ToolFactory;
 import net.sourceforge.phpdt.core.compiler.ITerminalSymbols;
 import net.sourceforge.phpdt.core.compiler.InvalidInputException;
 import net.sourceforge.phpdt.internal.compiler.DefaultErrorHandlingPolicies;
+import net.sourceforge.phpdt.internal.compiler.ast.CompilationUnitDeclaration;
 import net.sourceforge.phpdt.internal.compiler.impl.CompilerOptions;
 import net.sourceforge.phpdt.internal.compiler.parser.Scanner;
 import net.sourceforge.phpdt.internal.compiler.parser.SyntaxError;
@@ -36,6 +37,8 @@ import net.sourceforge.phpdt.internal.compiler.parser.UnitParser;
 import net.sourceforge.phpdt.internal.compiler.parser.VariableInfo;
 import net.sourceforge.phpdt.internal.compiler.problem.DefaultProblemFactory;
 import net.sourceforge.phpdt.internal.compiler.problem.ProblemReporter;
+import net.sourceforge.phpdt.internal.core.CompilationUnit;
+import net.sourceforge.phpdt.internal.core.SourceType;
 import net.sourceforge.phpdt.internal.corext.template.php.JavaContext;
 import net.sourceforge.phpdt.internal.corext.template.php.JavaContextType;
 import net.sourceforge.phpdt.internal.ui.text.PHPCodeReader;
@@ -49,7 +52,6 @@ import net.sourceforge.phpdt.internal.ui.text.template.contentassist.TemplateEng
 import net.sourceforge.phpdt.ui.IWorkingCopyManager;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import net.sourceforge.phpeclipse.builder.IdentifierIndexManager;
-import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
 import net.sourceforge.phpeclipse.phpeditor.PHPEditor;
 import net.sourceforge.phpeclipse.phpeditor.PHPSyntaxRdr;
 
@@ -71,9 +73,6 @@ import org.eclipse.swt.graphics.Point;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IFileEditorInput;
 
-// import com.quantum.ExternalInterface;
-// import com.quantum.util.connection.NotConnectedException;
-
 /**
  * Example PHP completion processor.
  */
@@ -154,44 +153,40 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
                }
        };
 
-       private class TableName {
-               String fTableName;
-
-               TableName() {
-                       fTableName = null;
-               }
-
-               /**
-                * @return Returns the tableName.
-                */
-               public String getTableName() {
-                       if (fTableName == null) {
-                               return "<!--no-table-->";
-                       }
-                       return fTableName;
-               }
-
-               /**
-                * @param tableName
-                *          The tableName to set.
-                */
-               public void setTableName(String tableName) {
-                       fTableName = tableName;
-               }
-       }
+//     private class TableName {
+//             String fTableName;
+//
+//             TableName() {
+//                     fTableName = null;
+//             }
+//
+//             /**
+//              * @return Returns the tableName.
+//              */
+//             public String getTableName() {
+//                     if (fTableName == null) {
+//                             return "<!--no-table-->";
+//                     }
+//                     return fTableName;
+//             }
+//
+//             /**
+//              * @param tableName
+//              *          The tableName to set.
+//              */
+//             public void setTableName(String tableName) {
+//                     fTableName = tableName;
+//             }
+//     }
 
        private char[] fProposalAutoActivationSet;
 
-       protected IContextInformationValidator fValidator = null;// = new
-
-       // Validator();
+       protected IContextInformationValidator fValidator = null;
 
        private TemplateEngine fTemplateEngine;
 
        private PHPCompletionProposalComparator fComparator;
 
-       private int fNumberOfComputedResults = 0;
-
        private IEditorPart fEditor;
 
        protected IWorkingCopyManager fManager;
@@ -207,7 +202,7 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
 
        /**
         * Tells this processor to order the proposals alphabetically.
-        * 
+        *
         * @param order
         *          <code>true</code> if proposals should be ordered.
         */
@@ -218,7 +213,7 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
        /**
         * Sets this processor's set of characters triggering the activation of the
         * completion proposal computation.
-        * 
+        *
         * @param activationSet
         *          the activation set
         */
@@ -234,10 +229,11 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
                return internalComputeCompletionProposals(viewer, documentOffset, contextInformationPosition);
        }
 
-       private int getLastToken(List list, ITextViewer viewer, int completionPosition, JavaContext context, TableName tableName) {
+       private int getLastToken(List list, ITextViewer viewer, int completionPosition, JavaContext context) {
+//                     TableName tableName) {
                IDocument document = viewer.getDocument();
                int start = context.getStart();
-               int end = context.getEnd();
+//             int end = context.getEnd();
                String startText;
                int lastSignificantToken = ITerminalSymbols.TokenNameEOF;
                try {
@@ -266,7 +262,7 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
                                }
                                int token = ITerminalSymbols.TokenNameEOF;
                                // token = getLastSQLToken(startText);
-                               tableName.setTableName(getLastSQLTableName(startText));
+//                             tableName.setTableName(getLastSQLTableName(startText));
                                Scanner scanner = ToolFactory.createScanner(false, false, false);
                                scanner.setSource(startText.toCharArray());
                                scanner.setPHPMode(true);
@@ -336,184 +332,150 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
                return "";
        }
 
-       private String getLastSQLTableName(String startText) {
-               int token;
-               // scan for sql identifiers
-               char ch = ' ';
-               int currentSQLPosition = startText.length();
-               int identEnd = -1;
-               String ident = null;
-               boolean whiteSpace = true;
-               try {
-                       while (true) {
-                               ch = startText.charAt(--currentSQLPosition);
-                               if (Scanner.isSQLIdentifierPart(ch)) {
-                                       // if (ch >= 'A' && ch <= 'Z') {
-                                       if (identEnd < 0) {
-                                               identEnd = currentSQLPosition + 1;
-                                       }
-                                       // } else if (ch >= 'a' && ch <= 'z') {
-                                       // if (identEnd < 0) {
-                                       // identEnd = currentSQLPosition + 1;
-                                       // }
-                               } else if (identEnd >= 0) {
-                                       ident = startText.substring(currentSQLPosition + 1, identEnd);
-                                       // select -- from -- where --
-                                       // update -- set -- where --
-                                       // insert into -- ( -- ) values ( -- )
-                                       if (ident.length() >= 4 && ident.length() <= 6) {
-                                               ident = ident.toLowerCase();
-                                               switch (ident.length()) {
-                                               // case 3 :
-                                               // if (ident.equals("set")) {
-                                               // // System.out.println("set");
-                                               // token = ITerminalSymbols.TokenNameSQLset;
-                                               // return token;
-                                               // }
-                                               // break;
-                                               case 4:
-                                                       if (ident.equals("from")) {
-                                                               // System.out.println("from");
-                                                               token = ITerminalSymbols.TokenNameSQLfrom;
-                                                               return getSQLTableName(startText, identEnd);
-                                                       } else if (ident.equals("into")) {
-                                                               // System.out.println("into");
-                                                               token = ITerminalSymbols.TokenNameSQLinto;
-                                                               return getSQLTableName(startText, identEnd);
-                                                       }
-                                                       break;
-                                               // case 5 :
-                                               // if (ident.equals("where")) {
-                                               // // System.out.println("where");
-                                               // token = ITerminalSymbols.TokenNameSQLwhere;
-                                               // return token;
-                                               // }
-                                               // break;
-                                               case 6:
-                                                       // if (ident.equals("select")) {
-                                                       // // System.out.println("select");
-                                                       // token = ITerminalSymbols.TokenNameSQLselect;
-                                                       // return token;
-                                                       // } else if (ident.equals("insert")) {
-                                                       // // System.out.println("insert");
-                                                       // token = ITerminalSymbols.TokenNameSQLinsert;
-                                                       // return token;
-                                                       // } else
-                                                       if (ident.equals("update")) {
-                                                               // System.out.println("update");
-                                                               token = ITerminalSymbols.TokenNameSQLupdate;
-                                                               return getSQLTableName(startText, identEnd);
-                                                       }
-                                                       // else if (ident.equals("values")) {
-                                                       // // System.out.println("values");
-                                                       // token = ITerminalSymbols.TokenNameSQLvalues;
-                                                       // return token;
-                                                       // }
-                                                       break;
-                                               }
-                                       }
-                                       whiteSpace = false;
-                                       identEnd = -1;
-                               } else if (Character.isWhitespace(ch)) {
-                               } else {
-                                       whiteSpace = false;
-                               }
-                       }
-               } catch (IndexOutOfBoundsException e) {
-               }
-               return "<!--no-table-->";
-       }
+//     private String getLastSQLTableName(String startText) {
+//             // scan for sql identifiers
+//             char ch = ' ';
+//             int currentSQLPosition = startText.length();
+//             int identEnd = -1;
+//             String ident = null;
+//             try {
+//                     while (true) {
+//                             ch = startText.charAt(--currentSQLPosition);
+//                             if (Scanner.isSQLIdentifierPart(ch)) {
+//                                     // if (ch >= 'A' && ch <= 'Z') {
+//                                     if (identEnd < 0) {
+//                                             identEnd = currentSQLPosition + 1;
+//                                     }
+//                                     // } else if (ch >= 'a' && ch <= 'z') {
+//                                     // if (identEnd < 0) {
+//                                     // identEnd = currentSQLPosition + 1;
+//                                     // }
+//                             } else if (identEnd >= 0) {
+//                                     ident = startText.substring(currentSQLPosition + 1, identEnd);
+//                                     // select -- from -- where --
+//                                     // update -- set -- where --
+//                                     // insert into -- ( -- ) values ( -- )
+//                                     if (ident.length() >= 4 && ident.length() <= 6) {
+//                                             ident = ident.toLowerCase();
+//                                             switch (ident.length()) {
+//                                             // case 3 :
+//                                             // if (ident.equals("set")) {
+//                                             // // System.out.println("set");
+//                                             // token = ITerminalSymbols.TokenNameSQLset;
+//                                             // return token;
+//                                             // }
+//                                             // break;
+//                                             case 4:
+//                                                     if (ident.equals("from")) {
+//                                                             // System.out.println("from");
+//                                                             return getSQLTableName(startText, identEnd);
+//                                                     } else if (ident.equals("into")) {
+//                                                             // System.out.println("into");
+//                                                             return getSQLTableName(startText, identEnd);
+//                                                     }
+//                                                     break;
+//                                             case 6:
+//                                                     if (ident.equals("update")) {
+//                                                             // System.out.println("update");
+//                                                             return getSQLTableName(startText, identEnd);
+//                                                     }
+//                                                     break;
+//                                             }
+//                                     }
+//                                     identEnd = -1;
+//                             } else if (Character.isWhitespace(ch)) {
+//                             }
+//                     }
+//             } catch (IndexOutOfBoundsException e) {
+//             }
+//             return "<!--no-table-->";
+//     }
 
        /**
         * Detect the last significant SQL token in the text before the completion
-        * 
+        *
         * @param startText
         */
-       private int getLastSQLToken(String startText) {
-               int token;
-               // scan for sql identifiers
-               char ch = ' ';
-               int currentSQLPosition = startText.length();
-               int identEnd = -1;
-               String ident = null;
-               boolean whiteSpace = true;
-               try {
-                       while (true) {
-                               ch = startText.charAt(--currentSQLPosition);
-                               if (ch >= 'A' && ch <= 'Z') {
-                                       if (identEnd < 0) {
-                                               identEnd = currentSQLPosition + 1;
-                                       }
-                               } else if (ch >= 'a' && ch <= 'z') {
-                                       if (identEnd < 0) {
-                                               identEnd = currentSQLPosition + 1;
-                                       }
-                               } else if (identEnd >= 0) {
-                                       ident = startText.substring(currentSQLPosition + 1, identEnd);
-                                       // select -- from -- where --
-                                       // update -- set -- where --
-                                       // insert into -- ( -- ) values ( -- )
-                                       if (ident.length() >= 3 && ident.length() <= 6) {
-                                               ident = ident.toLowerCase();
-                                               switch (ident.length()) {
-                                               case 3:
-                                                       if (ident.equals("set")) {
-                                                               // System.out.println("set");
-                                                               token = ITerminalSymbols.TokenNameSQLset;
-                                                               return token;
-                                                       }
-                                                       break;
-                                               case 4:
-                                                       if (ident.equals("from")) {
-                                                               // System.out.println("from");
-                                                               token = ITerminalSymbols.TokenNameSQLfrom;
-                                                               // getSQLTableName();
-                                                               return token;
-                                                       } else if (ident.equals("into")) {
-                                                               // System.out.println("into");
-                                                               token = ITerminalSymbols.TokenNameSQLinto;
-                                                               return token;
-                                                       }
-                                                       break;
-                                               case 5:
-                                                       if (ident.equals("where")) {
-                                                               // System.out.println("where");
-                                                               token = ITerminalSymbols.TokenNameSQLwhere;
-                                                               return token;
-                                                       }
-                                                       break;
-                                               case 6:
-                                                       if (ident.equals("select")) {
-                                                               // System.out.println("select");
-                                                               token = ITerminalSymbols.TokenNameSQLselect;
-                                                               return token;
-                                                       } else if (ident.equals("insert")) {
-                                                               // System.out.println("insert");
-                                                               token = ITerminalSymbols.TokenNameSQLinsert;
-                                                               return token;
-                                                       } else if (ident.equals("update")) {
-                                                               // System.out.println("update");
-                                                               token = ITerminalSymbols.TokenNameSQLupdate;
-                                                               return token;
-                                                       } else if (ident.equals("values")) {
-                                                               // System.out.println("values");
-                                                               token = ITerminalSymbols.TokenNameSQLvalues;
-                                                               return token;
-                                                       }
-                                                       break;
-                                               }
-                                       }
-                                       whiteSpace = false;
-                                       identEnd = -1;
-                               } else if (Character.isWhitespace(ch)) {
-                               } else {
-                                       whiteSpace = false;
-                               }
-                       }
-               } catch (IndexOutOfBoundsException e) {
-               }
-               return ITerminalSymbols.TokenNameEOF;
-       }
+//     private int getLastSQLToken(String startText) {
+//             int token;
+//             // scan for sql identifiers
+//             char ch = ' ';
+//             int currentSQLPosition = startText.length();
+//             int identEnd = -1;
+//             String ident = null;
+//             try {
+//                     while (true) {
+//                             ch = startText.charAt(--currentSQLPosition);
+//                             if (ch >= 'A' && ch <= 'Z') {
+//                                     if (identEnd < 0) {
+//                                             identEnd = currentSQLPosition + 1;
+//                                     }
+//                             } else if (ch >= 'a' && ch <= 'z') {
+//                                     if (identEnd < 0) {
+//                                             identEnd = currentSQLPosition + 1;
+//                                     }
+//                             } else if (identEnd >= 0) {
+//                                     ident = startText.substring(currentSQLPosition + 1, identEnd);
+//                                     // select -- from -- where --
+//                                     // update -- set -- where --
+//                                     // insert into -- ( -- ) values ( -- )
+//                                     if (ident.length() >= 3 && ident.length() <= 6) {
+//                                             ident = ident.toLowerCase();
+//                                             switch (ident.length()) {
+//                                             case 3:
+//                                                     if (ident.equals("set")) {
+//                                                             // System.out.println("set");
+//                                                             token = ITerminalSymbols.TokenNameSQLset;
+//                                                             return token;
+//                                                     }
+//                                                     break;
+//                                             case 4:
+//                                                     if (ident.equals("from")) {
+//                                                             // System.out.println("from");
+//                                                             token = ITerminalSymbols.TokenNameSQLfrom;
+//                                                             // getSQLTableName();
+//                                                             return token;
+//                                                     } else if (ident.equals("into")) {
+//                                                             // System.out.println("into");
+//                                                             token = ITerminalSymbols.TokenNameSQLinto;
+//                                                             return token;
+//                                                     }
+//                                                     break;
+//                                             case 5:
+//                                                     if (ident.equals("where")) {
+//                                                             // System.out.println("where");
+//                                                             token = ITerminalSymbols.TokenNameSQLwhere;
+//                                                             return token;
+//                                                     }
+//                                                     break;
+//                                             case 6:
+//                                                     if (ident.equals("select")) {
+//                                                             // System.out.println("select");
+//                                                             token = ITerminalSymbols.TokenNameSQLselect;
+//                                                             return token;
+//                                                     } else if (ident.equals("insert")) {
+//                                                             // System.out.println("insert");
+//                                                             token = ITerminalSymbols.TokenNameSQLinsert;
+//                                                             return token;
+//                                                     } else if (ident.equals("update")) {
+//                                                             // System.out.println("update");
+//                                                             token = ITerminalSymbols.TokenNameSQLupdate;
+//                                                             return token;
+//                                                     } else if (ident.equals("values")) {
+//                                                             // System.out.println("values");
+//                                                             token = ITerminalSymbols.TokenNameSQLvalues;
+//                                                             return token;
+//                                                     }
+//                                                     break;
+//                                             }
+//                                     }
+//                                     identEnd = -1;
+//                             }
+//                     }
+//             } catch (IndexOutOfBoundsException e) {
+//             }
+//             return ITerminalSymbols.TokenNameEOF;
+//     }
 
        private ICompletionProposal[] internalComputeCompletionProposals(ITextViewer viewer, int offset, int contextOffset) {
                ICompilationUnit unit = fManager.getWorkingCopy(fEditor.getEditorInput());
@@ -571,13 +533,13 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
                // HashMap typeVariables = null;
                HashMap unitVariables = null;
                ICompilationUnit compilationUnit = (ICompilationUnit) context.findEnclosingElement(IJavaElement.COMPILATION_UNIT);
-               // if (compilationUnit != null) {
-               // unitVariables = ((CompilationUnit) compilationUnit).variables;
-               // }
-               // IType type = (IType) context.findEnclosingElement(IJavaElement.TYPE);
-               // if (type != null) {
-               // typeVariables = ((SourceType) type).variables;
-               // }
+//              if (compilationUnit != null) {
+//              unitVariables = ((CompilationUnit) compilationUnit).variables;
+//              }
+                IType type = (IType) context.findEnclosingElement(IJavaElement.TYPE);
+                if (type != null) {
+//              typeVariables = ((SourceType) type).variables;
+                }
                IMethod method = (IMethod) context.findEnclosingElement(IJavaElement.METHOD);
                // if (method != null) {
                // methodVariables = ((SourceMethod) method).variables;
@@ -586,9 +548,8 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
                boolean emptyPrefix = prefix == null || prefix.equals("");
                IPHPCompletionProposal[] localVariableResults = new IPHPCompletionProposal[0];
 
-               if (!emptyPrefix && prefix.length() >= 1 && prefix.charAt(0) == '$') { // php
-                       // Variable
-                       // ?
+               if (!emptyPrefix && prefix.length() >= 1 && prefix.charAt(0) == '$') {
+                       // php Variable ?
                        String lowerCasePrefix = prefix.toLowerCase();
                        HashSet localVariables = new HashSet();
                        if (compilationUnit != null) {
@@ -604,10 +565,10 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
                        }
                }
 
-               TableName sqlTable = new TableName();
+//             TableName sqlTable = new TableName();
                ArrayList list = new ArrayList();
                list.add(null);
-               int lastSignificantToken = getLastToken(list, viewer, offset, context, sqlTable);
+               int lastSignificantToken = getLastToken(list, viewer, offset, context); //, sqlTable);
                boolean useClassMembers = (lastSignificantToken == ITerminalSymbols.TokenNameMINUS_GREATER)
                                || (lastSignificantToken == ITerminalSymbols.TokenNameVariable) || (lastSignificantToken == ITerminalSymbols.TokenNamenew)
                                || (lastSignificantToken == ITerminalSymbols.TokenNamethis_PHP_COMPLETION);
@@ -647,7 +608,6 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
                                                                if (info != null && info.typeIdentifier != null) {
                                                                        typeRef = new String(info.typeIdentifier);
                                                                }
-
                                                        }
                                                }
                                                if (typeRef != null) {
@@ -668,7 +628,6 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
                        IPHPCompletionProposal[] builtinResults = new IPHPCompletionProposal[0];
                        if ((!useClassMembers) && syntaxbuffer != null) {
                                BuiltInEngine builtinEngine;
-                               String proposal;
                                JavaContextType contextType = (JavaContextType) PHPeclipsePlugin.getDefault().getTemplateContextRegistry().getContextType(
                                                "php"); //$NON-NLS-1$
                                if (contextType != null) {
@@ -702,7 +661,7 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
                        System.arraycopy(localVariableResults, 0, total, templateResults.length + identifierResults.length + builtinResults.length
                                        + declarationResults.length, localVariableResults.length);
                        results = total;
-                       fNumberOfComputedResults = (results == null ? 0 : results.length);
+//                     fNumberOfComputedResults = (results == null ? 0 : results.length);
                        /*
                         * Order here and not in result collector to make sure that the order
                         * applies to all proposals and not just those of the compilation unit.
@@ -911,13 +870,13 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
        // sqlList.add(new SQLProposal(columnNames[i], context, region, viewer,
        // PHPUiImages.get(PHPUiImages.IMG_TABLE)));
        // }
-       //        
+       //
        // sqlResults = new IPHPCompletionProposal[sqlList.size()];
        // for (int i = 0; i < sqlList.size(); i++) {
        // sqlResults[i] = (SQLProposal) sqlList.get(i);
        // }
        // } catch (Exception /* NotConnectedException */ e) {
-       //        
+       //
        // }
        // // }
        // }