1) Fixed issue #844: Short form of ternary operator (since PHP 5.3).

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / actions / OpenDeclarationEditorAction.java

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 6d4e18b..6aeb43f 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/OpenDeclarationEditorAction.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/OpenDeclarationEditorAction.java
@@ -82,12 +82,15 @@ public class OpenDeclarationEditorAction {
                                IPath path = PHPFileUtil.determineFilePath(filename,
                                                currentFile, fProject);
                                if (path != null) {
-                                       IFile file = PHPFileUtil.createFile(path, fProject);
-                                       if (file != null && file.exists()) {
-                                               PHPeclipsePlugin.getDefault().openFileInTextEditor(
-                                                               file.getLocation().toString());
-                                               return;
-                                       }
+                                       //IFile file = PHPFileUtil.createFile(path, fProject);
+                                       //if (file != null && file.exists()) {
+                                       //      PHPeclipsePlugin.getDefault().openFileInTextEditor(
+                                       //                      file.getLocation().toString());
+                                       //      return;
+                                       //}
+                                       PHPeclipsePlugin.getDefault().openFileInTextEditor(
+                                                       path.toString());
+                                       return;
                                }
                        } catch (Exception e) {
                                // ignore
@@ -102,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;
 
@@ -155,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