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

diff --git a/net.sourceforge.phpeclipse.debug.ui/plugin.xml b/net.sourceforge.phpeclipse.debug.ui/plugin.xml
index c32d3b7..5c62bd7 100644
--- a/net.sourceforge.phpeclipse.debug.ui/plugin.xml
+++ b/net.sourceforge.phpeclipse.debug.ui/plugin.xml
@@ -1,34 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<plugin
-   id="net.sourceforge.phpeclipse.debug.ui"
-   name="%Plugin.name"
-   version="1.0.4"
-   provider-name="eclipseproject.de"
-   class="net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin">
-
-   <runtime>
-      <library name="debug.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="net.sourceforge.phpeclipse.debug.core"/>
-      <import plugin="net.sourceforge.phpeclipse.launching"/>
-      <import plugin="net.sourceforge.phpeclipse"/>
-   </requires>
-
+<?eclipse version="3.2"?>
+<plugin>
+   <extension
+		 point="org.eclipse.ui.editors.markerAnnotationSpecification">
+	  <specification
+			annotationType="org.eclipse.debug.core.breakpoint"
+			icon="icons/full/obj16/brkp_obj.gif"
+			annotationImageProvider="net.sourceforge.phpdt.debug.ui.BreakpointImageProvider">
+	  </specification>
+   </extension>
 
-<!-- Extensions -->
    <extension
          point="org.eclipse.ui.preferencePages">
       <page
             name="%PreferencePage.PHPInterpreter.name"
-            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
             class="net.sourceforge.phpdt.internal.debug.ui.preferences.PHPInterpreterPreferencePage"
             id="net.sourceforge.phpdt.debug.ui.preferences.PreferencePagePHPInterpreter">
       </page>
@@ -46,14 +32,6 @@
          </action>
       </editorContribution>
    </extension>
-   <extension
-         point="org.eclipse.debug.core.sourceLocators">
-      <sourceLocator
-            name="PHPSourceLocator"
-            class="net.sourceforge.phpdt.internal.debug.ui.PHPSourceLocator"
-            id="net.sourceforge.phpdt.debug.ui.PHPSourceLocator">
-      </sourceLocator>
-   </extension>
 <!-- Debug Model -->
    <extension
          point="org.eclipse.debug.ui.debugModelPresentations">
@@ -84,14 +62,14 @@
       <shortcut
             label="%LaunchShortcut.PHP.label"
             icon="icons/ctool16/run_php.gif"
-            modes="run"
-            class="net.sourceforge.phpdt.internal.debug.ui.launcher.PHPApplicationShortcut"
+            modes="run,debug"
+            class="net.sourceforge.phpdt.internal.debug.ui.launcher.PHPLaunchShortcut"
             id="net.sourceforge.phpdt.debug.ui.applicationshortcut.php">
       </shortcut>
-   </extension>
+   </extension> 
 <!-- Breakpoint Image -->
    <extension
-         point="org.eclipse.ui.markerImageProviders">
+         point="org.eclipse.ui.ide.markerImageProviders">
       <imageprovider
             markertype="net.sourceforge.phpeclipse.debug.core.phpLineBreakpointMarker"
             icon="icons/obj16/brkp_obj.gif"
@@ -99,25 +77,82 @@
       </imageprovider>
    </extension>
    <extension
-         point="org.eclipse.ui.actionSets">
-      <actionSet
-            label="%DebugActionSet.label"
-            id="net.sourceforge.phpeclipse.debug.ui.actionSet1">
-         <menu
-               label="%RunMenu.label"
-               path="additions"
-               id="org.eclipse.ui.run">
-            <groupMarker
-                  name="PHPBreakpointGroup">
-            </groupMarker>
-         </menu>
+         point="org.eclipse.ui.contexts">
+      <context
+            name="%Context.Debugging.name"
+            description="%Context.Debugging.description"
+            id="net.sourceforge.phpeclipse.debug.ui.debugging"
+            parentId="org.eclipse.debug.ui.debugging">
+      </context>
+   </extension>
+   <extension
+         point="org.eclipse.debug.ui.debugModelContextBindings">
+      <modelContextBinding
+            debugModelId="net.sourceforge.phpeclipse.debug.core"
+            contextId="net.sourceforge.phpeclipse.debug.ui.debugging">
+      </modelContextBinding>
+   </extension>
+   <extension
+         point="net.sourceforge.phpeclipse.phpEditorTextHovers">
+      <hover
+            label="%DebugHover.label"
+            description="%DebugHover.description"
+            class="net.sourceforge.phpdt.internal.debug.ui.PHPDebugHover"
+            id="net.sourceforge.phpdt.ui.DebugHover">
+      </hover>
+   </extension>
+   
+   	<!-- Adapters for contextual launch -->
+	<extension point="org.eclipse.core.runtime.adapters">
+         <factory 
+            class="" 
+            adaptableType="net.sourceforge.phpdt.core.IJavaElement">
+            <adapter type="org.eclipse.debug.ui.actions.ILaunchable"/>
+         </factory>
+         <factory 
+            class="" 
+            adaptableType="org.eclipse.core.resources.IResource">
+            <adapter type="org.eclipse.debug.ui.actions.ILaunchable"/>
+         </factory>         
+    </extension>
+    
+   <!-- Adapters for retargettable actions -->
+	<extension point="org.eclipse.core.runtime.adapters">
+         <factory 
+            class="net.sourceforge.phpdt.internal.debug.ui.actions.RetargettableActionAdapterFactory" 
+            adaptableType="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor">
+            <adapter type="org.eclipse.debug.ui.actions.IToggleBreakpointsTarget"/>
+         </factory>
+    </extension>
+    <extension
+         point="org.eclipse.ui.popupMenus">     
+      <viewerContribution
+            targetID="#PHPRulerContext"
+            id="net.sourceforge.phpdt.ui.PHPUnitEditorPopupActions">
          <action
-               label="%GlobalManageBreakpointAction.label"
-               class="net.sourceforge.phpdt.internal.debug.ui.actions.ManageBreakpointActionDelegate"
-               menubarPath="org.eclipse.ui.run/PHPBreakpointGroup"
-               id="net.sourceforge.phpeclipse.debug.ui.ManageBreakpointActionDelegate">
+               label="%AddBreakpoint.label"
+               helpContextId="manage_breakpoint_action_context"
+               class="net.sourceforge.phpdt.internal.debug.ui.actions.PHPManageBreakpointRulerActionDelegate"
+               menubarPath="debug"
+               id="net.sourceforge.phpdt.internal.debug.ui.actions.PHPManageBreakpointRulerActionDelegate">
          </action>
-      </actionSet>
-   </extension>
-
+      </viewerContribution>
+    </extension>
+    <extension
+          point="org.eclipse.ui.popupMenus">
+       <objectContribution
+             adaptable="true"
+             id="net.sourceforge.phpeclipse.debug.ui.BreakpointProperties"
+             objectClass="org.eclipse.debug.core.model.IBreakpoint">
+          <menu
+                id="net.sourceforge.phpeclipse.debug.ui.menu2"
+                label="Breakpoint properties menu">
+             <separator name="net.sourceforge.phpeclipse.debug.ui.separator1"/>
+          </menu>
+          <action
+                class="net.sourceforge.phpdt.internal.debug.ui.actions.PHPDebugBreakpointAction"
+                id="net.sourceforge.phpeclipse.debug.ui.actions.PHPDebugBreakpointAction"
+                label="Properties"/>
+       </objectContribution>
+    </extension>
 </plugin>