import net.sourceforge.phpdt.core.compiler.IProblem;
import net.sourceforge.phpdt.internal.core.builder.PHPBuilder;
import net.sourceforge.phpdt.internal.core.util.Util;
-import net.sourceforge.phpdt.internal.ui.util.PHPFileUtil;
+import net.sourceforge.phpdt.internal.core.util.PHPFileUtil;
import net.sourceforge.phpeclipse.PHPeclipsePlugin;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Plugin;
import org.eclipse.core.runtime.Preferences;
+import org.eclipse.core.runtime.SafeRunner;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.Preferences.PropertyChangeEvent;
}
// wrap callbacks with Safe runnable for subsequent listeners to
// be called when some are causing grief
- Platform.run(new ISafeRunnable() {
+
+ SafeRunner.run(new ISafeRunnable() {
public void handleException(Throwable exception) {
Util
.log(exception,
if (returnProject) {
return proj;
}
- int rootEnd = memento.indexOf(JavaElement.JEM_PACKAGEFRAGMENT,
- projectEnd + 1);
+// int rootEnd = memento.indexOf(JavaElement.JEM_PACKAGEFRAGMENT,
+// projectEnd + 1);
// TODO temp-del
// if (rootEnd == -1) {
// return model.getHandleFromMementoForRoot(memento, proj, projectEnd,
} else { // internal resource (not an IFile or not existing)
IPath location;
if (file.getType() != IResource.FILE
- || (location = file.getLocation()) == null) {
+ || (location = file.getFullPath()) == null) {
throw new CoreException(
new Status(
IStatus.ERROR,
JavaCore.PLUGIN_ID, -1, Util.bind(
"file.notFound", path.toString()), null)); //$NON-NLS-1$
}
- IPath location = file.getLocation();
+ IPath location = file.getFullPath();
if (location == null) {
throw new CoreException(new Status(IStatus.ERROR,
JavaCore.PLUGIN_ID, -1, Util.bind(