From 19289ff55ffb2a3a5239bb01c82a0cb92bf2c647 Mon Sep 17 00:00:00 2001 From: Edward Mann Date: Wed, 6 Feb 2008 01:47:15 +0000 Subject: [PATCH] Bug was introduced when working on the RSE paths. I have fixed it and this fixes 656. --- .../phpdt/internal/corext/phpdoc/PHPDocUtil.java | 2 +- .../phpeclipse/phpeditor/PHPTextHover.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 136ad57..426a5e9 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 - .getFullPath().toString()), file.getCharset()); + .getLocation().toString()), file.getCharset()); } catch (UnsupportedEncodingException e) { // do nothing } catch (FileNotFoundException e) { 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 bc388b1..08c077e 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.getFullPath() + workspaceLocation = fProject.getLocation() .toString() + '/'; } else { // should never happen? workspaceLocation = PHPeclipsePlugin .getWorkspace().getRoot() - .getFullPath().toString(); + .getLocation().toString(); } // boolean foundPHPdoc = false; for (int i = 0; i < list.size(); i++) { -- 1.7.1