X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/SourceTypeConverter.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/SourceTypeConverter.java index 732407a..e32922d 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/SourceTypeConverter.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/SourceTypeConverter.java @@ -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 { @@ -103,16 +103,16 @@ public class SourceTypeConverter implements CompilerModifiers { int end = sourceType.getNameSourceEnd(); /* convert package and imports */ - if (sourceType.getPackageName() != null - && sourceType.getPackageName().length > 0) - // if its null then it is defined in the default package - this.unit.currentPackage = - createImportReference(sourceType.getPackageName(), start, end); +// if (sourceType.getPackageName() != null +// && sourceType.getPackageName().length > 0) +// // if its null then it is defined in the default package +// this.unit.currentPackage = +// createImportReference(sourceType.getPackageName(), start, end); char[][] importNames = sourceType.getImports(); int importCount = importNames == null ? 0 : importNames.length; this.unit.imports = new ImportReference[importCount]; - for (int i = 0; i < importCount; i++) - this.unit.imports[i] = createImportReference(importNames[i], start, end); +// for (int i = 0; i < importCount; i++) +// this.unit.imports[i] = createImportReference(importNames[i], start, end); /* convert type(s) */ int typeCount = sourceTypes.length; this.unit.types = new ArrayList(typeCount); @@ -313,33 +313,33 @@ public class SourceTypeConverter implements CompilerModifiers { /* * Build an import reference from an import name, e.g. java.lang.* */ - private ImportReference createImportReference( - char[] importName, - int start, - int end) { - - /* count identifiers */ - int max = importName.length; - int identCount = 0; - for (int i = 0; i < max; i++) { - if (importName[i] == '.') - identCount++; - } - /* import on demand? */ - boolean onDemand = importName[max - 1] == '*'; - if (!onDemand) - identCount++; // one more ident than dots - - long[] positions = new long[identCount]; - long position = (long) start << 32 + end; - for (int i = 0; i < identCount; i++) { - positions[i] = position; - } - return new ImportReference( - CharOperation.splitOn('.', importName, 0, max - (onDemand ? 2 : 0)), - positions, - onDemand); - } +// private ImportReference createImportReference( +// char[] importName, +// int start, +// int end) { +// +// /* count identifiers */ +// int max = importName.length; +// int identCount = 0; +// for (int i = 0; i < max; i++) { +// if (importName[i] == '.') +// identCount++; +// } +// /* import on demand? */ +// boolean onDemand = importName[max - 1] == '*'; +// if (!onDemand) +// identCount++; // one more ident than dots +// +// long[] positions = new long[identCount]; +// long position = (long) start << 32 + end; +// for (int i = 0; i < identCount; i++) { +// positions[i] = position; +// } +// return new ImportReference( +// CharOperation.splitOn('.', importName, 0, max - (onDemand ? 2 : 0)), +// positions, +// onDemand); +// } /* * Build a type reference from a readable name, e.g. java.lang.Object[][]