X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/QualifiedAllocationExpression.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/QualifiedAllocationExpression.java index da1555d..05e4c75 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/QualifiedAllocationExpression.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/QualifiedAllocationExpression.java @@ -11,9 +11,14 @@ package net.sourceforge.phpdt.internal.compiler.ast; import net.sourceforge.phpdt.internal.compiler.IAbstractSyntaxTreeVisitor; -import net.sourceforge.phpdt.internal.compiler.codegen.*; -import net.sourceforge.phpdt.internal.compiler.flow.*; -import net.sourceforge.phpdt.internal.compiler.lookup.*; +import net.sourceforge.phpdt.internal.compiler.codegen.CodeStream; +import net.sourceforge.phpdt.internal.compiler.flow.FlowContext; +import net.sourceforge.phpdt.internal.compiler.flow.FlowInfo; +import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope; +import net.sourceforge.phpdt.internal.compiler.lookup.LocalTypeBinding; +import net.sourceforge.phpdt.internal.compiler.lookup.MethodBinding; +import net.sourceforge.phpdt.internal.compiler.lookup.ReferenceBinding; +import net.sourceforge.phpdt.internal.compiler.lookup.TypeBinding; public class QualifiedAllocationExpression extends AllocationExpression { @@ -230,7 +235,7 @@ public class QualifiedAllocationExpression extends AllocationExpression { // The enclosing instance must be compatible with the innermost enclosing type ReferenceBinding expectedType = binding.declaringClass.enclosingType(); - if (scope.areTypesCompatible(enclosingInstTb, expectedType)) + if (BlockScope.areTypesCompatible(enclosingInstTb, expectedType)) return recType; scope.problemReporter().typeMismatchErrorActualTypeExpectedType( enclosingInstance, @@ -284,7 +289,7 @@ public class QualifiedAllocationExpression extends AllocationExpression { return null; } if (enclosingInstance != null) { - if (!scope + if (!BlockScope .areTypesCompatible( enclosingInstTb, inheritedBinding.declaringClass.enclosingType())) {