X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditor.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditor.java
index d144789..cfc3857 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditor.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditor.java
@@ -34,6 +34,7 @@ import net.sourceforge.phpdt.core.ISourceReference;
 import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.core.JavaModelException;
 import net.sourceforge.phpdt.core.compiler.ITerminalSymbols;
+import net.sourceforge.phpdt.core.compiler.ITerminalSymbols.TokenName;
 import net.sourceforge.phpdt.core.compiler.InvalidInputException;
 import net.sourceforge.phpdt.internal.compiler.parser.Scanner;
 import net.sourceforge.phpdt.internal.compiler.parser.SyntaxError;
@@ -61,6 +62,7 @@ import net.sourceforge.phpdt.ui.text.JavaTextTools;
 import net.sourceforge.phpdt.ui.text.PHPSourceViewerConfiguration;
 import net.sourceforge.phpdt.ui.text.folding.IJavaFoldingStructureProvider;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
+import net.sourceforge.phpeclipse.builder.ExternalEditorInput;
 import net.sourceforge.phpeclipse.ui.editor.BrowserUtil;
 import net.sourceforge.phpeclipse.webbrowser.views.BrowserView;
 
@@ -127,7 +129,9 @@ import org.eclipse.jface.text.source.SourceViewerConfiguration;
 import org.eclipse.jface.text.source.projection.ProjectionSupport;
 import org.eclipse.jface.text.source.projection.ProjectionViewer;
 import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.ListenerList;
+//incastrix
+//import org.eclipse.jface.util.ListenerList;
+import org.eclipse.core.runtime.ListenerList;
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
@@ -3063,12 +3067,6 @@ public abstract class PHPEditor extends AbstractDecoratedTextEditor implements
 	 */
 	private boolean fStickyOccurrenceAnnotations;
 
-	/** Preference key for showing the line number ruler */
-	// private final static String LINE_NUMBER_RULER =
-	// PreferenceConstants.EDITOR_LINE_NUMBER_RULER;
-	/** Preference key for the foreground color of the line numbers */
-	// private final static String LINE_NUMBER_COLOR =
-	// PreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR;
 	/** Preference key for the link color */
 	private final static String LINK_COLOR = PreferenceConstants.EDITOR_LINK_COLOR;
 
@@ -3594,7 +3592,7 @@ public abstract class PHPEditor extends AbstractDecoratedTextEditor implements
 	protected void createActions() {
 		super.createActions();
 
-		ActionGroup oeg, ovg, jsg, sg;
+		ActionGroup oeg/*, ovg, jsg, sg*/;
 		fActionGroups = new CompositeActionGroup(
 				new ActionGroup[] { oeg = new OpenEditorActionGroup(this),
 				// sg= new ShowActionGroup(this),
@@ -5605,9 +5603,9 @@ public abstract class PHPEditor extends AbstractDecoratedTextEditor implements
 	 *         is <code>true</code>
 	 * @since 3.0
 	 */
-	private boolean getBoolean(IPreferenceStore store, String key) {
-		return key != null && store.getBoolean(key);
-	}
+//	private boolean getBoolean(IPreferenceStore store, String key) {
+//		return key != null && store.getBoolean(key);
+//	}
 
 	protected boolean isPrefQuickDiffAlwaysOn() {
 		return false; // never show change ruler for the non-editable java
@@ -5876,14 +5874,19 @@ public abstract class PHPEditor extends AbstractDecoratedTextEditor implements
 	}
 
 	public ShowInContext getShowInContext() {
-		IFile file;
+		IFile file = null;
 		if(getEditorInput() instanceof FileStoreEditorInput){
 			FileStoreEditorInput fei = (FileStoreEditorInput) getEditorInput();
 			file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fei.getURI().getPath()));
-		} else {
+		} else if (getEditorInput() instanceof FileEditorInput) {
 			FileEditorInput fei = (FileEditorInput) getEditorInput();
-			file = ResourcesPlugin.getWorkspace().getRoot().getFile(fei.getPath());
+			// added to fix ticket 637
+			file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fei.getURI().getPath()));
+		} else if (getEditorInput() instanceof ExternalEditorInput) {
+			ExternalEditorInput fei = (ExternalEditorInput) getEditorInput();
+			file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fei.getFullPath()/* .getURI().getPath()*/));
 		}
+
 		ShowInContext context = BrowserUtil.getShowInContext(file,
 				false, "");
 		if (context != null) {
@@ -5962,15 +5965,15 @@ public abstract class PHPEditor extends AbstractDecoratedTextEditor implements
 						fMarkOccurrenceTargetRegion.getLength());
 				if (wordStr != null) {
 					word = wordStr.toCharArray();
-					int fToken = ITerminalSymbols.TokenNameEOF;
+					TokenName fToken = ITerminalSymbols.TokenName.EOF;
 					try {
 						fToken = fScanner.getNextToken();
-						while (fToken != ITerminalSymbols.TokenNameEOF) { // &&
+						while (fToken != ITerminalSymbols.TokenName.EOF) { // &&
 																			// fToken
 																			// !=
-							// TokenNameERROR) {
-							if (fToken == ITerminalSymbols.TokenNameVariable
-									|| fToken == ITerminalSymbols.TokenNameIdentifier) {
+							// TokenName.ERROR) {
+							if (fToken == ITerminalSymbols.TokenName.VARIABLE
+									|| fToken == ITerminalSymbols.TokenName.IDENTIFIER) {
 								// global variable
 								if (fScanner.equalsCurrentTokenSource(word)) {
 									matches