X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/Util.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/Util.java index 825cd1a..93e8ef0 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/Util.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/Util.java @@ -22,12 +22,12 @@ import net.sourceforge.phpdt.core.IJavaElement; import net.sourceforge.phpdt.core.IJavaModelStatusConstants; import net.sourceforge.phpdt.core.IPackageFragment; import net.sourceforge.phpdt.core.JavaModelException; +import net.sourceforge.phpdt.core.JavaCore; import net.sourceforge.phpdt.core.Signature; import net.sourceforge.phpdt.core.compiler.CharOperation; import net.sourceforge.phpdt.internal.core.util.CharArrayBuffer; import net.sourceforge.phpdt.internal.corext.Assert; import net.sourceforge.phpdt.internal.ui.util.PHPFileUtil; -import net.sourceforge.phpeclipse.PHPCore; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; @@ -619,7 +619,7 @@ public class Util { * Returns the given file's contents as a character array. */ public static char[] getResourceContentsAsCharArray(IFile file) throws JavaModelException { - String encoding = PHPCore.create(file.getProject()).getOption(PHPCore.CORE_ENCODING, true); + String encoding = JavaCore.create(file.getProject()).getOption(JavaCore.CORE_ENCODING, true); return getResourceContentsAsCharArray(file, encoding); } @@ -848,11 +848,11 @@ public class Util { } IStatus status= new Status( IStatus.ERROR, - PHPCore.getPlugin().getDescriptor().getUniqueIdentifier(), + JavaCore.getPlugin().getDescriptor().getUniqueIdentifier(), IStatus.ERROR, message, e); - PHPCore.getPlugin().getLog().log(status); + JavaCore.getPlugin().getLog().log(status); } /**