1) A temporary fix for the recursion problem with the $GLOBALS array.

[phpeclipse.git] / net.sourceforge.phpeclipse.debug.core / src / net / sourceforge / phpdt / internal / debug / core / breakpoints / PHPBreakpoint.java

diff --git a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/breakpoints/PHPBreakpoint.java b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/breakpoints/PHPBreakpoint.java
index 55be0de..4541160 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/breakpoints/PHPBreakpoint.java
+++ b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/breakpoints/PHPBreakpoint.java
@@ -12,14 +12,15 @@ Contributors:
 package net.sourceforge.phpdt.internal.debug.core.breakpoints;
 
 import net.sourceforge.phpdt.internal.debug.core.PHPDebugCorePlugin;
-import org.eclipse.core.resources.IWorkspaceRunnable;
+
 import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IWorkspaceRunnable;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IBreakpoint;
+import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.model.Breakpoint;
+import org.eclipse.debug.core.model.IBreakpoint;
 
 /**
  * A breakpoint is capable of suspending the execution of a
@@ -174,13 +175,7 @@ public abstract class PHPBreakpoint extends Breakpoint implements IBreakpoint {
         * @see IBreakpoint#getModelIdentifier()
         */
        public String getModelIdentifier() {
-               if (PHPDebugCorePlugin.getDefault() == null) {
-                       // If the default instance is not yet initialized,
-                       // return a static identifier. This identifier must
-                       // match the plugin id defined in plugin.xml
-                       return "net.sourceforge.phpeclipse.debug.core"; //$NON-NLS-1$
-               }
-               return PHPDebugCorePlugin.getDefault().getDescriptor().getUniqueIdentifier();
+               return PHPDebugCorePlugin.getUniqueIdentifier();
        }
        
        public void setDBGBpNo(int bpNo) {