fixing compile errors

diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugUiPlugin.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugUiPlugin.java
index 45c07c3..63b7b6e 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugUiPlugin.java
+++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugUiPlugin.java
@@ -24,7 +24,7 @@ public class PHPDebugUiPlugin extends AbstractUIPlugin {
        }
 
        public static IWorkbenchPage getActivePage() {
-               return getDefault().getActiveWorkbenchWindow().getActivePage();
+               return PHPDebugUiPlugin.getActiveWorkbenchWindow().getActivePage();
        }
 
        public static PHPDebugUiPlugin getDefault() {

diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPArgumentsTab.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPArgumentsTab.java
index c0aca3a..7ba79ba 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPArgumentsTab.java
+++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPArgumentsTab.java
@@ -141,7 +141,7 @@ public class PHPArgumentsTab extends AbstractLaunchConfigurationTab {
        }
        
        protected void log(Throwable t) {
-               PHPDebugUiPlugin.getDefault().log(t);
+               PHPDebugUiPlugin.log(t);
        }
 
        public Image getImage() {

diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEntryPointTab.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEntryPointTab.java
index 4bea896..4ffdf1b 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEntryPointTab.java
+++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEntryPointTab.java
@@ -146,7 +146,7 @@ public class PHPEntryPointTab extends AbstractLaunchConfigurationTab {
        }
 
        protected void log(Throwable t) {
-               PHPDebugUiPlugin.getDefault().log(t);
+               PHPDebugUiPlugin.log(t);
        }
 
        public boolean canSave() {

diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEnvironmentTab.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEnvironmentTab.java
index 863d51f..68bc0f4 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEnvironmentTab.java
+++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEnvironmentTab.java
@@ -257,7 +257,7 @@ public class PHPEnvironmentTab extends AbstractLaunchConfigurationTab {
        }
        
        protected void log(Throwable t) {
-               PHPDebugUiPlugin.getDefault().log(t);
+               PHPDebugUiPlugin.log(t);
        }
 
        public Image getImage() {

diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPLaunchShortcut.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPLaunchShortcut.java
index 3fbd8e2..ec84fd5 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPLaunchShortcut.java
+++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPLaunchShortcut.java
@@ -108,10 +108,10 @@ public class PHPLaunchShortcut implements ILaunchShortcut {
        }
        
        protected void log(String message) {
-               PHPDebugUiPlugin.getDefault().log(new Status(Status.INFO, PHPDebugUiPlugin.PLUGIN_ID, Status.INFO, message, null));
+               PHPDebugUiPlugin.log(new Status(Status.INFO, PHPDebugUiPlugin.PLUGIN_ID, Status.INFO, message, null));
        }
        
        protected void log(Throwable t) {
-               PHPDebugUiPlugin.getDefault().log(t);
+               PHPDebugUiPlugin.log(t);
        }
 }

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 81aebb9..13eb2cc 100644 (file)
--- 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
@@ -24,7 +24,7 @@ public class InterpreterRunner {
                        throw new RuntimeException("Unable to execute interpreter: " + commandLine + workingDirectory);
                }
 
-               IProcess process = DebugPlugin.getDefault().newProcess(launch, nativePHPProcess, renderLabel(configuration));
+               IProcess process = DebugPlugin.newProcess(launch, nativePHPProcess, renderLabel(configuration));
                process.setAttribute(PHPLaunchingPlugin.PLUGIN_ID + ".launcher.cmdline", commandLine);
                return process ;
        }

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 d2b5300..aab3b86 100644 (file)
--- 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
@@ -40,7 +40,7 @@ public class InterpreterRunnerConfiguration {
                try {
                        projectName = configuration.getAttribute(PHPLaunchConfigurationAttribute.PROJECT_NAME, "");
                } catch(CoreException e) {
-                       PHPLaunchingPlugin.getDefault().log(e);
+                       PHPLaunchingPlugin.log(e);
                }
 
                IProject project = PHPLaunchingPlugin.getWorkspace().getRoot().getProject(projectName);

diff --git a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPRuntime.java b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPRuntime.java
index dd1827c..56c6101 100644 (file)
--- a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPRuntime.java
+++ b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPRuntime.java
@@ -107,7 +107,7 @@ public class PHPRuntime {
                        reader.setContentHandler(getRuntimeConfigurationContentHandler());
                        reader.parse(new InputSource(getRuntimeConfigurationReader()));
                } catch(Exception e) {
-                       PHPLaunchingPlugin.getDefault().log(e);
+                       PHPLaunchingPlugin.log(e);
                }
        }