X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/SourceMethod.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/SourceMethod.java index 126845b..c1e4ab7 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/SourceMethod.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/SourceMethod.java @@ -11,13 +11,13 @@ package net.sourceforge.phpdt.internal.core; import net.sourceforge.phpdt.core.Flags; -import net.sourceforge.phpdt.core.ICompilationUnit; +import net.sourceforge.phpdt.core.IJavaElement; import net.sourceforge.phpdt.core.IMethod; -import net.sourceforge.phpdt.core.IType; import net.sourceforge.phpdt.core.JavaModelException; import net.sourceforge.phpdt.core.Signature; import net.sourceforge.phpdt.core.jdom.IDOMMethod; import net.sourceforge.phpdt.core.jdom.IDOMNode; +import net.sourceforge.phpdt.internal.core.util.Util; import net.sourceforge.phpdt.internal.corext.Assert; @@ -38,27 +38,19 @@ import net.sourceforge.phpdt.internal.corext.Assert; * An empty list of Strings */ protected static final String[] fgEmptyList= new String[] {}; -protected SourceMethod(IType parent, String name, String[] parameterTypes) { - super(METHOD, parent, name); - Assert.isTrue(name.indexOf('.') == -1); - if (parameterTypes == null) { - fParameterTypes= fgEmptyList; - } else { - fParameterTypes= parameterTypes; + protected SourceMethod(JavaElement parent, String name, String[] parameterTypes) { + super(parent, name); + Assert.isTrue(name.indexOf('.') == -1); + if (parameterTypes == null) { + fParameterTypes= fgEmptyList; + } else { + fParameterTypes= parameterTypes; + } } -} -protected SourceMethod(ICompilationUnit parent, String name, String[] parameterTypes) { - super(METHOD, parent, name); - Assert.isTrue(name.indexOf('.') == -1); - if (parameterTypes == null) { - fParameterTypes= fgEmptyList; - } else { - fParameterTypes= parameterTypes; + public boolean equals(Object o) { + if (!(o instanceof SourceMethod)) return false; + return super.equals(o) && Util.equalArraysOrNull(fParameterTypes, ((SourceMethod)o).fParameterTypes); } -} -public boolean equals(Object o) { - return super.equals(o) && Util.equalArraysOrNull(fParameterTypes, ((SourceMethod)o).fParameterTypes); -} /** * @see JavaElement#equalsDOMNode */ @@ -78,6 +70,12 @@ protected boolean equalsDOMNode(IDOMNode node) throws JavaModelException { } /** + * @see IJavaElement + */ +public int getElementType() { + return METHOD; +} +/** * @see IMethod */ public String[] getExceptionTypes() throws JavaModelException {