From: Edward Mann <phpeclipse.dev@edmann.com>
Date: Mon, 14 Jan 2008 03:40:19 +0000 (+0000)
Subject: Commiting more changes to fix RSE issues with PHP projects.
X-Git-Url: http://git.phpeclipse.com?hp=972a454f62520e81f4a88f956640ac1f5556b125
Commiting more changes to fix RSE issues with PHP projects.
---
diff --git a/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/ExternalPHPParser.java b/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/ExternalPHPParser.java
index ffb9ca7..e88a6bb 100644
--- a/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/ExternalPHPParser.java
+++ b/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/ExternalPHPParser.java
@@ -54,7 +54,7 @@ public class ExternalPHPParser {
// final IPath path = file.getFullPath();
final IPreferenceStore store = ExternalToolsPlugin.getDefault()
.getPreferenceStore();
- final String filename = fFileToParse.getLocation().toString();
+ final String filename = fFileToParse.getFullPath().toString();
final String[] arguments = { filename };
final MessageFormat form = new MessageFormat(store
diff --git a/net.sourceforge.phpeclipse.feature/feature.xml b/net.sourceforge.phpeclipse.feature/feature.xml
index c539a53..94577d5 100644
--- a/net.sourceforge.phpeclipse.feature/feature.xml
+++ b/net.sourceforge.phpeclipse.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="net.sourceforge.phpeclipse.feature"
label="PHPeclipse"
- version="1.2.0.qualifier"
+ version="0.0.0.qualifier"
provider-name="PHPEclipse project team"
image="phpeclipse.jpeg">
<install-handler/>
@@ -20,7 +20,7 @@
</license>
<url>
- <update label="PHPEclipse update site" url="http://phpeclipse.sourceforge.net/update/releases/"/>
+ <update label="PHPEclipse Nightly update site" url="http://update.phpeclipse.net/update/nightly"/>
</url>
<requires>
@@ -69,12 +69,6 @@
version="0.0.0"/>
<plugin
- id="net.sourceforge.phpeclipse.phphelp"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
id="net.sourceforge.phpeclipse.smarty.ui"
download-size="0"
install-size="0"
@@ -105,50 +99,13 @@
version="0.0.0"/>
<plugin
- id="net.sourceforge.phpeclipse.help"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="net.sourceforge.phpeclipse.debug.core"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="net.sourceforge.phpeclipse.debug.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="net.sourceforge.phpeclipse.xdebug.core"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="net.sourceforge.phpeclipse.xdebug.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="net.sourceforge.phpeclipse.launching"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
- id="net.sourceforge.phpeclipse.phpmanual"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="net.sourceforge.phpeclipse.phpmanual.htmlparser"
+ id="net.sourceforge.phpeclipse.help"
download-size="0"
install-size="0"
version="0.0.0"/>
diff --git a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/InterpreterRunner.java b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/InterpreterRunner.java
index 6aa5738..8509af3 100644
--- a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/InterpreterRunner.java
+++ b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/InterpreterRunner.java
@@ -124,7 +124,7 @@ public class InterpreterRunner {
protected void addToLoadPath(StringBuffer loadPath, IProject project) {
loadPath.append(" -I "
- + osDependentPath(project.getLocation().toOSString()));
+ + osDependentPath(project.getFullPath().toOSString()));
}
protected String osDependentPath(String aPath) {
diff --git a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/InterpreterRunnerConfiguration.java b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/InterpreterRunnerConfiguration.java
index b7cfe1f..837d7f4 100644
--- a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/InterpreterRunnerConfiguration.java
+++ b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/InterpreterRunnerConfiguration.java
@@ -33,7 +33,7 @@ public class InterpreterRunnerConfiguration {
//return project.getLocation().toOSString() + "/" + getFileName();
IResource file = project.findMember(path);
- return file.getLocation().toOSString();
+ return file.getFullPath().toOSString();
}
public String getFileName() {
@@ -194,7 +194,7 @@ public class InterpreterRunnerConfiguration {
IProject project = getProject().getProject();
if (!useRemoteDebugger())
- return project.getLocation().toOSString();
+ return project.getFullPath().toOSString();
else {
try {
return configuration.getAttribute(
diff --git a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPSourceLocator.java b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPSourceLocator.java
index d395616..4898a06 100644
--- a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPSourceLocator.java
+++ b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPSourceLocator.java
@@ -97,7 +97,7 @@ public class PHPSourceLocator implements IPersistableSourceLocator, ISourcePrese
if (remoteSourcePath.isPrefixOf (path)) { // Is the server side filename with the remote source path
path = path.removeFirstSegments (remoteSourcePath.matchingFirstSegments (path)); // Remove the remote source path
file = path.toString (); // The filename without the remote source path
- projectPath = (PHPeclipsePlugin.getWorkspace().getRoot().getProject(projectName).getLocation()); // Get the absolute project path
+ projectPath = (PHPeclipsePlugin.getWorkspace().getRoot().getProject(projectName).getFullPath()); // Get the absolute project path
return (projectPath.append (path)).toOSString (); // Return the filename as absolute client side path
}
@@ -118,7 +118,7 @@ public class PHPSourceLocator implements IPersistableSourceLocator, ISourcePrese
localPath = new Path (local); // Create new IPath object for the local/client side path
path = localPath.append (path); // Prepend the project relative path to filename
- projectPath = (PHPeclipsePlugin.getWorkspace().getRoot().getProject(projectName).getLocation()); // Get the absolute project path
+ projectPath = (PHPeclipsePlugin.getWorkspace().getRoot().getProject(projectName).getFullPath()); // Get the absolute project path
return (projectPath.append (path)).toOSString (); // Return the filename as absolute client side path
}
@@ -156,7 +156,7 @@ public class PHPSourceLocator implements IPersistableSourceLocator, ISourcePrese
IFile[] files = root.findFilesForLocation(filePath);
for (int i = 0; i < files.length; i++) {
if (files[i].getProject().equals(proj)) {
- fileName = proj.getLocation().append(files[i].getProjectRelativePath()).toOSString();
+ fileName = proj.getFullPath().append(files[i].getProjectRelativePath()).toOSString();
break;
}
}
diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java
index a23b7e4..84b2c24 100644
--- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java
+++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java
@@ -168,7 +168,7 @@ public class WebUI extends AbstractUIPlugin implements IPreferenceConstants {
protected void initializeDefaultPreferences(IPreferenceStore store) {
store.setDefault(PHP_LOCALHOST_PREF, "http://localhost");
store.setDefault(PHP_DOCUMENTROOT_PREF, getWorkspace().getRoot()
- .getLocation().toString());
+ .getFullPath().toString());
// store.setDefault(PHP_BOOKMARK_DEFAULT, "");
store.setDefault(PHP_AUTO_PREVIEW_DEFAULT, "false");
diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/ShowExternalPreviewAction.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/ShowExternalPreviewAction.java
index 5fb9670..2679fb4 100644
--- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/ShowExternalPreviewAction.java
+++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/ShowExternalPreviewAction.java
@@ -146,12 +146,14 @@ public class ShowExternalPreviewAction extends TextEditorAction {
store = WebUI.getDefault().getPreferenceStore();
}
// IPath path = file.getFullPath();
- String localhostURL = file.getLocation().toString();
+ String localhostURL = file.getFullPath().toString();
String lowerCaseFileName = localhostURL.toLowerCase();
+ //removed by ed_mann for RSE fixes testing
// String documentRoot =
// store.getString(PHPeclipsePlugin.DOCUMENTROOT_PREF);
- IPath documentRootPath = ProjectPrefUtil.getDocumentRoot(file
- .getProject());
+ //IPath documentRootPath = ProjectPrefUtil.getDocumentRoot(file
+ // .getProject());
+ IPath documentRootPath = file.getProject().getFullPath();
String documentRoot = documentRootPath.toString().toLowerCase();
if (lowerCaseFileName.startsWith(documentRoot)) {
localhostURL = localhostURL.substring(documentRoot.length());
@@ -160,9 +162,12 @@ public class ShowExternalPreviewAction extends TextEditorAction {
}
// return store.getString(PHPeclipsePlugin.LOCALHOST_PREF) +
// localhostURL;
- return ProjectPrefUtil.getMiscProjectsPreferenceValue(file
- .getProject(), IPreferenceConstants.PHP_LOCALHOST_PREF)
- + localhostURL;
+ String projectPath = ProjectPrefUtil.getMiscProjectsPreferenceValue(file
+ .getProject(), IPreferenceConstants.PHP_LOCALHOST_PREF);
+ if(projectPath.endsWith("/") && localhostURL.startsWith("/")) {
+ localhostURL = localhostURL.substring(1);
+ }
+ return projectPath + localhostURL;
}
return "http://localhost";
}
diff --git a/net.sourceforge.phpeclipse.webbrowser/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.webbrowser/META-INF/MANIFEST.MF
index c74df75..f48d6ca 100644
--- a/net.sourceforge.phpeclipse.webbrowser/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.webbrowser/META-INF/MANIFEST.MF
@@ -14,5 +14,6 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="3.0.0",
org.eclipse.core.runtime;bundle-version="3.0.0",
org.eclipse.ui;bundle-version="3.0.0",
org.eclipse.ui.ide;bundle-version="3.0.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Bundle-RequiredExecutionEnvironment: J2SE-1.4,
+ J2SE-1.5
Eclipse-LazyStart: true
diff --git a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/OpenWithBrowserActionDelegate.java b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/OpenWithBrowserActionDelegate.java
index 18cdc65..8257d59 100644
--- a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/OpenWithBrowserActionDelegate.java
+++ b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/OpenWithBrowserActionDelegate.java
@@ -49,7 +49,7 @@ public class OpenWithBrowserActionDelegate implements IActionDelegate {
public void run(IAction action) {
URL url = null;
try {
- url = new URL("file://" + resource.getLocation());
+ url = new URL("file://" + resource.getFullPath());
WebBrowser.openURL(new WebBrowserEditorInput(url,
WebBrowserEditorInput.SHOW_ALL
| WebBrowserEditorInput.FORCE_NEW_PAGE));
diff --git a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowserEditor.java b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowserEditor.java
index f266e11..0c11f2f 100644
--- a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowserEditor.java
+++ b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowserEditor.java
@@ -204,7 +204,7 @@ public class WebBrowserEditor extends EditorPart {
URL url = null;
try {
if (file != null && file.exists())
- url = file.getLocation().toFile().toURL();
+ url = file.getFullPath().toFile().toURL();
} catch (Exception e) {
Trace.trace(Trace.SEVERE, "Error getting URL to file");
}
diff --git a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/views/BrowserView.java b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/views/BrowserView.java
index 164a840..bb4c837 100644
--- a/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/views/BrowserView.java
+++ b/net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/views/BrowserView.java
@@ -12,7 +12,6 @@ package net.sourceforge.phpeclipse.webbrowser.views;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
-import java.nio.charset.Charset;
import net.sourceforge.phpeclipse.webbrowser.internal.WebBrowser;
import net.sourceforge.phpeclipse.webbrowser.internal.WebBrowserUtil;
diff --git a/net.sourceforge.phpeclipse.xml.core/src/net/sourceforge/phpeclipse/xml/core/internal/model/XMLDocument.java b/net.sourceforge.phpeclipse.xml.core/src/net/sourceforge/phpeclipse/xml/core/internal/model/XMLDocument.java
index c0b5680..a6cb3aa 100644
--- a/net.sourceforge.phpeclipse.xml.core/src/net/sourceforge/phpeclipse/xml/core/internal/model/XMLDocument.java
+++ b/net.sourceforge.phpeclipse.xml.core/src/net/sourceforge/phpeclipse/xml/core/internal/model/XMLDocument.java
@@ -78,7 +78,7 @@ public class XMLDocument extends SourceReference implements IXMLDocument,
boolean doParse = false;
root = null;
if (file != null) {
- String filename = file.getLocation().toString();
+ String filename = file.getFullPath().toString();
int len = filename.length();
if (len >= 4) {
if ((filename.charAt(len - 1) != 'l' && filename
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelManager.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelManager.java
index a09c243..721acdc 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelManager.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelManager.java
@@ -1549,7 +1549,7 @@ public class JavaModelManager implements ISaveParticipant {
} 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,
@@ -1568,7 +1568,7 @@ public class JavaModelManager implements ISaveParticipant {
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(
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/phpdoc/PHPDocUtil.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/phpdoc/PHPDocUtil.java
index 426a5e9..136ad57 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/phpdoc/PHPDocUtil.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/phpdoc/PHPDocUtil.java
@@ -128,7 +128,7 @@ public class PHPDocUtil {
if (file != null) {
try {
return new InputStreamReader(new FileInputStream(file
- .getLocation().toString()), file.getCharset());
+ .getFullPath().toString()), file.getCharset());
} catch (UnsupportedEncodingException e) {
// do nothing
} catch (FileNotFoundException e) {
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/util/Resources.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/util/Resources.java
index d03b7b3..c8c2325 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/util/Resources.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/util/Resources.java
@@ -202,7 +202,7 @@ public class Resources {
public static String[] getLocationOSStrings(IResource[] resources) {
List result = new ArrayList(resources.length);
for (int i = 0; i < resources.length; i++) {
- IPath location = resources[i].getLocation();
+ IPath location = resources[i].getFullPath();
if (location != null)
result.add(location.toOSString());
}
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/DeclarationProposal.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/DeclarationProposal.java
index 4786adc..30c2e8c 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/DeclarationProposal.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/DeclarationProposal.java
@@ -170,11 +170,11 @@ public class DeclarationProposal extends AbstractProposal { // implements
// PHPeclipsePlugin.getWorkspace().getRoot().getLocation().toString();
String workspaceLocation;
if (fProject != null) {
- workspaceLocation = fProject.getLocation().toString() + '/';
+ workspaceLocation = fProject.getFullPath().toString() + '/';
} else {
// should never happen?
workspaceLocation = PHPeclipsePlugin.getWorkspace().getRoot()
- .getLocation().toString();
+ .getFullPath().toString();
}
String filename = workspaceLocation + fLocation.getFilename();
PHPDocUtil.appendPHPDoc(hoverInfoBuffer, filename, fLocation);
@@ -215,12 +215,12 @@ public class DeclarationProposal extends AbstractProposal { // implements
String workspaceLocation;
String workspaceName;
if (fProject != null) {
- workspaceLocation = fProject.getLocation().toString() + '/';
+ workspaceLocation = fProject.getFullPath().toString() + '/';
workspaceName = fProject.getName().toString() + '/';
} else {
// should never happen?
workspaceLocation = PHPeclipsePlugin.getWorkspace().getRoot()
- .getLocation().toString();
+ .getFullPath().toString();
workspaceName = workspaceLocation;
}
String filename = fLocation.getFilename();
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/util/PHPFileUtil.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/util/PHPFileUtil.java
index 5f9facc..702184a 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/util/PHPFileUtil.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/util/PHPFileUtil.java
@@ -136,7 +136,7 @@ public class PHPFileUtil {
return null;
}
- String projectPath = project.getLocation().toString();
+ String projectPath = project.getFullPath().toString();
String filePath = absoluteFilePath.toString().substring(
projectPath.length() + 1);
return project.getFile(filePath);
@@ -200,10 +200,10 @@ public class PHPFileUtil {
if (!absolute) {
IFile ifile = FileBuffers.getWorkspaceFileAtLocation(path);
if (ifile != null) {
- file = ifile.getFullPath().toFile();
- if (file.exists()) {
- return true;
- }
+ IResource resource = ifile;
+ if (resource.exists()) {
+ return true;
+ }
}
}
return false;
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ltk/core/RenameIdentifierDelegate.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ltk/core/RenameIdentifierDelegate.java
index 4313127..2ec493e 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ltk/core/RenameIdentifierDelegate.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ltk/core/RenameIdentifierDelegate.java
@@ -95,12 +95,12 @@ public class RenameIdentifierDelegate {
}
} catch (CoreException e) {
String msg = "Project: "
- + project.getLocation().toOSString()
+ + project.getFullPath().toOSString()
+ " CoreException " + e.getMessage();
result.addError(msg);
} catch (Exception e) {
String msg = "Project: "
- + project.getLocation().toOSString()
+ + project.getFullPath().toOSString()
+ " Exception " + e.getMessage();
result.addError(msg);
}
@@ -108,7 +108,7 @@ public class RenameIdentifierDelegate {
}
} catch (CoreException e) {
String msg = "Workspace: "
- + rootContainer.getLocation().toOSString()
+ + rootContainer.getFullPath().toOSString()
+ " CoreException " + e.getMessage();
result.addError(msg);
}
@@ -119,11 +119,11 @@ public class RenameIdentifierDelegate {
search(project, result);
}
} catch (CoreException e) {
- String msg = "Project: " + project.getLocation().toOSString()
+ String msg = "Project: " + project.getFullPath().toOSString()
+ " CoreException " + e.getMessage();
result.addError(msg);
} catch (Exception e) {
- String msg = "Project: " + project.getLocation().toOSString()
+ String msg = "Project: " + project.getFullPath().toOSString()
+ " Exception " + e.getMessage();
result.addError(msg);
}
@@ -306,17 +306,17 @@ public class RenameIdentifierDelegate {
}
} catch (InvalidInputException e) {
- String msg = "File: " + file.getLocation().toOSString()
+ String msg = "File: " + file.getFullPath().toOSString()
+ " InvalidInputException " + e.getMessage();
status.addError(msg);
} catch (SyntaxError e) {
- String msg = "File: " + file.getLocation().toOSString()
+ String msg = "File: " + file.getFullPath().toOSString()
+ " SyntaxError " + e.getMessage();
status.addError(msg);
}
} catch (Exception e) {
- String msg = "File: " + file.getLocation().toOSString()
+ String msg = "File: " + file.getFullPath().toOSString()
+ " Exception " + e.getMessage();
status.addError(msg);
}
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ltk/core/RenameLocalVariableDelegate.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ltk/core/RenameLocalVariableDelegate.java
index b61f6a4..3f2571f 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ltk/core/RenameLocalVariableDelegate.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ltk/core/RenameLocalVariableDelegate.java
@@ -70,11 +70,11 @@ public class RenameLocalVariableDelegate extends RenameIdentifierDelegate {
.getLength(), result);
}
} catch (CoreException e) {
- String msg = "Project: " + project.getLocation().toOSString()
+ String msg = "Project: " + project.getFullPath().toOSString()
+ " CoreException " + e.getMessage();
result.addError(msg);
} catch (Exception e) {
- String msg = "Project: " + project.getLocation().toOSString()
+ String msg = "Project: " + project.getFullPath().toOSString()
+ " Exception " + e.getMessage();
result.addError(msg);
}
@@ -134,11 +134,11 @@ public class RenameLocalVariableDelegate extends RenameIdentifierDelegate {
}
} catch (InvalidInputException e) {
- String msg = "File: " + file.getLocation().toOSString()
+ String msg = "File: " + file.getFullPath().toOSString()
+ " InvalidInputException " + e.getMessage();
status.addError(msg);
} catch (SyntaxError e) {
- String msg = "File: " + file.getLocation().toOSString()
+ String msg = "File: " + file.getFullPath().toOSString()
+ " SyntaxError " + e.getMessage();
status.addError(msg);
}
@@ -216,17 +216,17 @@ public class RenameLocalVariableDelegate extends RenameIdentifierDelegate {
}
} catch (InvalidInputException e) {
- String msg = "File: " + file.getLocation().toOSString()
+ String msg = "File: " + file.getFullPath().toOSString()
+ " InvalidInputException " + e.getMessage();
status.addError(msg);
} catch (SyntaxError e) {
- String msg = "File: " + file.getLocation().toOSString()
+ String msg = "File: " + file.getFullPath().toOSString()
+ " SyntaxError " + e.getMessage();
status.addError(msg);
}
} catch (Exception e) {
- String msg = "File: " + file.getLocation().toOSString()
+ String msg = "File: " + file.getFullPath().toOSString()
+ " Exception " + e.getMessage();
status.addError(msg);
}
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/IncludesScanner.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/IncludesScanner.java
index bb1c88f..3858ed8 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/IncludesScanner.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/IncludesScanner.java
@@ -94,11 +94,7 @@ public class IncludesScanner implements ITerminalSymbols {
}
private void parseIdentifiers(char[] charArray) {
- char[] ident;
IFile file;
- String identifier;
- int counter = 0;
-
Scanner scanner = new Scanner(false, false, false, false, true, null,
null, true /* taskCaseSensitive */);
scanner.setSource(charArray);
@@ -120,6 +116,7 @@ public class IncludesScanner implements ITerminalSymbols {
char[] includeName = scanner
.getCurrentStringLiteralSource();
try {
+ System.out.println(includeName);
file = getIncludeFile(new String(includeName));
addFile(file);
} catch (Exception e) {
@@ -145,7 +142,6 @@ public class IncludesScanner implements ITerminalSymbols {
public IFile getIncludeFile(String relativeFilename) {
IContainer container = getWorkingLocation(fEditorInput);
- String fullPath = fProject.getLocation().toString();
IFile file = null;
if (relativeFilename.startsWith("../")) {
Path path = new Path(relativeFilename);
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/OpenDeclarationEditorAction.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/OpenDeclarationEditorAction.java
index 9c35add..6aeb43f 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/OpenDeclarationEditorAction.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/OpenDeclarationEditorAction.java
@@ -105,7 +105,7 @@ public class OpenDeclarationEditorAction {
if (list != null && list.size() > 0) {
// String workspaceLocation =
// PHPeclipsePlugin.getWorkspace().getRoot().getLocation().toString();
- String workspaceLocation = fProject.getLocation()
+ String workspaceLocation = fProject.getFullPath()
.toString()
+ java.io.File.separatorChar;
@@ -158,7 +158,7 @@ public class OpenDeclarationEditorAction {
// PHPeclipsePlugin.getWorkspace().getRoot()
// .getLocation().toString();
- String workspaceLocation = fProject.getLocation().toString()
+ String workspaceLocation = fProject.getFullPath().toString()
+ java.io.File.separatorChar;
// TODO show all entries of the list in a dialog box
// at the moment always the first entry will be opened
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPOpenAllIncludesEditorAction.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPOpenAllIncludesEditorAction.java
index 3dd63ff..2779807 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPOpenAllIncludesEditorAction.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPOpenAllIncludesEditorAction.java
@@ -83,7 +83,7 @@ public class PHPOpenAllIncludesEditorAction extends ActionDelegate implements
private IFile getIncludeFile(IProject project,
IFileEditorInput editorInput, String relativeFilename) {
IContainer container = getWorkingLocation(editorInput);
- String fullPath = project.getLocation().toString();
+ String fullPath = project.getFullPath().toString();
IFile file = null;
if (relativeFilename.startsWith("../")) {
Path path = new Path(relativeFilename);
@@ -144,7 +144,7 @@ public class PHPOpenAllIncludesEditorAction extends ActionDelegate implements
if (list != null && list.size() > 0) {
// String workspaceLocation =
// PHPeclipsePlugin.getWorkspace().getRoot().getLocation().toString();
- String workspaceLocation = fProject.getLocation()
+ String workspaceLocation = fProject.getFullPath()
.toString()
+ File.separatorChar;
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/obfuscator/ObfuscatorIgnores.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/obfuscator/ObfuscatorIgnores.java
index 46a585e..8cc826e 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/obfuscator/ObfuscatorIgnores.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/obfuscator/ObfuscatorIgnores.java
@@ -110,7 +110,7 @@ public class ObfuscatorIgnores extends ObfuscatorIgnoreSet {
}
private File getTemplateFile() {
- IPath path = fProject.getLocation();
+ IPath path = fProject.getFullPath();
// PHPeclipsePlugin.getDefault().getStateLocation();
path = path.append(TEMPLATE_FILE);
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/obfuscator/export/WizardObfuscatorResourceExportPage1.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/obfuscator/export/WizardObfuscatorResourceExportPage1.java
index bb5dd99..276c8e5 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/obfuscator/export/WizardObfuscatorResourceExportPage1.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/obfuscator/export/WizardObfuscatorResourceExportPage1.java
@@ -488,13 +488,13 @@ class WizardObfuscatorResourceExportPage1 extends WizardExportResourcesPage
IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
IPath testPath = new Path(targetDirectory);
- if (root.getLocation().isPrefixOf(testPath))
+ if (root.getFullPath().isPrefixOf(testPath))
return ObfuscatorExportMessages.getString("FileExport.rootName"); //$NON-NLS-1$
IProject[] projects = root.getProjects();
for (int i = 0; i < projects.length; i++) {
- if (projects[i].getLocation().isPrefixOf(testPath))
+ if (projects[i].getFullPath().isPrefixOf(testPath))
return projects[i].getName();
}
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPTextHover.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPTextHover.java
index 08c077e..bc388b1 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPTextHover.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPTextHover.java
@@ -101,13 +101,13 @@ public class PHPTextHover implements ITextHover {
StringBuffer hoverInfoBuffer = new StringBuffer();
String workspaceLocation;
if (fProject != null) {
- workspaceLocation = fProject.getLocation()
+ workspaceLocation = fProject.getFullPath()
.toString() + '/';
} else {
// should never happen?
workspaceLocation = PHPeclipsePlugin
.getWorkspace().getRoot()
- .getLocation().toString();
+ .getFullPath().toString();
}
// boolean foundPHPdoc = false;
for (int i = 0; i < list.size(); i++) {