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..40ce0dc 100644
--- a/net.sourceforge.phpeclipse.debug.ui/plugin.xml
+++ b/net.sourceforge.phpeclipse.debug.ui/plugin.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
 <plugin
    id="net.sourceforge.phpeclipse.debug.ui"
    name="%Plugin.name"
-   version="1.0.4"
-   provider-name="eclipseproject.de"
+   version="1.1.6"
+   provider-name="phpeclipse.de"
    class="net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin">
 
    <runtime>
@@ -12,11 +13,16 @@
       </library>
    </runtime>
    <requires>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
+      <import plugin="org.eclipse.ui.editors"/>
       <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.webbrowser"/>
       <import plugin="net.sourceforge.phpeclipse.debug.core"/>
       <import plugin="net.sourceforge.phpeclipse.launching"/>
       <import plugin="net.sourceforge.phpeclipse"/>
@@ -28,7 +34,7 @@
          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>
@@ -84,40 +90,117 @@
       <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"
             id="net.sourceforge.phpeclipse.debug.core.PHPLineBreakpointMarkerProvider">
       </imageprovider>
    </extension>
-   <extension
+<!--   <extension
          point="org.eclipse.ui.actionSets">
-      <actionSet
-            label="%DebugActionSet.label"
-            id="net.sourceforge.phpeclipse.debug.ui.actionSet1">
+         <actionSet
+            label="%BreakpoingActionSet.label"
+            visible="false"
+            id="org.eclipse.debug.ui.breakpointActionSet">
          <menu
                label="%RunMenu.label"
                path="additions"
                id="org.eclipse.ui.run">
-            <groupMarker
-                  name="PHPBreakpointGroup">
-            </groupMarker>
+            <separator
+                  name="breakpointGroup">
+            </separator>
          </menu>
          <action
                label="%GlobalManageBreakpointAction.label"
                class="net.sourceforge.phpdt.internal.debug.ui.actions.ManageBreakpointActionDelegate"
-               menubarPath="org.eclipse.ui.run/PHPBreakpointGroup"
+               menubarPath="org.eclipse.ui.run/phpBreakpointGroup"
                id="net.sourceforge.phpeclipse.debug.ui.ManageBreakpointActionDelegate">
          </action>
       </actionSet>
+   </extension>   -->
+   <extension
+         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.IRunToLineTarget"/>  -->
+            <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="%JavaBreakpointProperties.label"
+               helpContextId="breakpoint_properties_action_context"
+               class="org.eclipse.jdt.internal.debug.ui.actions.JavaBreakpointPropertiesRulerActionDelegate"
+               menubarPath="debug"
+               id="org.eclipse.jdt.debug.ui.actions.JavaBreakpointPropertiesRulerActionDelegate">
+         </action>
+         <action
+               label="%EnableBreakpoint.label"
+               helpContextId="enable_disable_breakpoint_action_context"
+               class="org.eclipse.jdt.internal.debug.ui.actions.EnableDisableBreakpointRulerActionDelegate"
+               menubarPath="debug"
+               id="org.eclipse.jdt.debug.ui.actions.EnableDisableBreakpointRulerActionDelegate">
+         </action>  -->
+         <action
+               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>
+      </viewerContribution>
+    </extension>
 </plugin>