3m9 compatible;

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / core / SourceType.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/SourceType.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/SourceType.java
index 477f8d4..1655530 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/SourceType.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/SourceType.java
@@ -12,6 +12,11 @@ package net.sourceforge.phpdt.internal.core;
 
 import java.util.ArrayList;
 
+import net.sourceforge.phpdt.internal.core.SourceTypeElementInfo;
+
+import net.sourceforge.phpdt.internal.core.JavaElement;
+import net.sourceforge.phpdt.internal.core.util.Util;
+
 import net.sourceforge.phpdt.core.IField;
 import net.sourceforge.phpdt.core.IJavaElement;
 import net.sourceforge.phpdt.core.IMember;
@@ -36,10 +41,10 @@ public class SourceType extends Member implements IType {
         * An empty list of Strings
         */
        protected static final String[] fgEmptyList= new String[] {};
-protected SourceType(IJavaElement parent, String name) {
-       super(TYPE, parent, name);
-       Assert.isTrue(name.indexOf('.') == -1);
-}
+       protected SourceType(JavaElement parent, String name) {
+               super(parent, name);
+               Assert.isTrue(name.indexOf('.') == -1, Util.bind("sourcetype.invalidName", name)); //$NON-NLS-1$
+       }
 /**
  * @see IType
  */
@@ -152,6 +157,12 @@ public IType getDeclaringType() {
        return null;
 }
 /**
+ * @see IJavaElement
+ */
+public int getElementType() {
+       return TYPE;
+}
+/**
  * @see IType#getField
  */
 public IField getField(String name) {
@@ -217,18 +228,19 @@ public IMethod[] getMethods() throws JavaModelException {
  * @see IType
  */
 public IPackageFragment getPackageFragment() {
-       IJavaElement parent = fParent;
-       while (parent != null) {
-               if (parent.getElementType() == IJavaElement.PACKAGE_FRAGMENT) {
-                       return (IPackageFragment) parent;
+       IJavaElement parentElement = this.parent;
+       while (parentElement != null) {
+               if (parentElement.getElementType() == IJavaElement.PACKAGE_FRAGMENT) {
+                       return (IPackageFragment)parentElement;
                }
                else {
-                       parent = parent.getParent();
+                       parentElement = parentElement.getParent();
                }
        }
        Assert.isTrue(false);  // should not happen
        return null;
 }
+
 /**
  * @see IType
  */
@@ -255,6 +267,7 @@ public String[] getSuperInterfaceNames() throws JavaModelException {
        }
        return strings;
 }
+
 /**
  * @see IType
  */
@@ -271,10 +284,10 @@ public String getTypeQualifiedName() {
  * @see IType#getTypeQualifiedName(char)
  */
 public String getTypeQualifiedName(char enclosingTypeSeparator) {
-       if (fParent.getElementType() == IJavaElement.COMPILATION_UNIT) {
-               return fName;
+       if (parent.getElementType() == IJavaElement.COMPILATION_UNIT) {
+               return name;
        } else {
-               return ((IType) fParent).getTypeQualifiedName(enclosingTypeSeparator) + enclosingTypeSeparator + fName;
+               return ((IType) parent).getTypeQualifiedName(enclosingTypeSeparator) + enclosingTypeSeparator + name;
        }
 }