Sophie

Sophie

distrib > Mandriva > 2009.0 > x86_64 > by-pkgid > 47689adde66a7c314509226275c8923d > files > 3

eclipse-phpeclipse-1.2.0-0.2.svn1573.1mdv2009.0.src.rpm

Index: net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/ShowExternalPreviewAction.java
===================================================================
--- net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/ShowExternalPreviewAction.java	(revision 1573)
+++ net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/ShowExternalPreviewAction.java	(working copy)
@@ -145,30 +145,26 @@
 			if (store == null) {
 				store = WebUI.getDefault().getPreferenceStore();
 			}
-			// IPath path = file.getFullPath();
-			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 = file.getProject().getFullPath();
-			String documentRoot = documentRootPath.toString().toLowerCase();
-			if (lowerCaseFileName.startsWith(documentRoot)) {
-				localhostURL = localhostURL.substring(documentRoot.length());
-			} else {
-				return null;
+			IPath path = file.getLocation();
+			if(path == null)
+				path = file.getFullPath();
+			
+			String filePath = path.toString();
+			String projectURI = ProjectPrefUtil.getMiscProjectsPreferenceValue(file
+                    .getProject(), IPreferenceConstants.PHP_LOCALHOST_PREF);
+			String projectDocRoot = ProjectPrefUtil.getMiscProjectsPreferenceValue(file
+                    .getProject(), IPreferenceConstants.PHP_DOCUMENTROOT_PREF);
+
+			if (filePath.startsWith(projectDocRoot)) {
+				filePath = filePath.substring(projectDocRoot.length());
 			}
-			// return store.getString(PHPeclipsePlugin.LOCALHOST_PREF) +
-			// localhostURL;
-			String projectPath = ProjectPrefUtil.getMiscProjectsPreferenceValue(file
-                    .getProject(), IPreferenceConstants.PHP_LOCALHOST_PREF);
-			if(projectPath.endsWith("/") && localhostURL.startsWith("/")) {
-			    localhostURL = localhostURL.substring(1);
+			if(projectURI.endsWith("/") && filePath.startsWith("/")) {
+				filePath = filePath.substring(1);
 			}
-			return projectPath + localhostURL;
+			
+			return projectURI + filePath;
 		}
-		return "http://localhost";
+		return ProjectPrefUtil.getMiscProjectsPreferenceValue(file
+                .getProject(), IPreferenceConstants.PHP_LOCALHOST_PREF);
 	}
 }
\ No newline at end of file