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 87202ca..e28cba7 100644
--- a/net.sourceforge.phpeclipse.debug.ui/plugin.xml
+++ b/net.sourceforge.phpeclipse.debug.ui/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="net.sourceforge.phpeclipse.debug.ui"
    name="%Plugin.name"
-   version="1.1.0"
+   version="1.1.8"
    provider-name="phpeclipse.de"
    class="net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin">
 
@@ -13,9 +13,7 @@
       </library>
    </runtime>
    <requires>
-      <import plugin="org.eclipse.core.runtime.compatibility"/>
       <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
       <import plugin="org.eclipse.jface.text"/>
       <import plugin="org.eclipse.ui.workbench.texteditor"/>
       <import plugin="org.eclipse.ui.editors"/>
@@ -24,6 +22,7 @@
       <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"/>
@@ -35,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>
@@ -53,14 +52,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">
@@ -86,16 +77,16 @@
             id="net.sourceforge.phpdt.debug.ui.LaunchConfigurationTabGroupPHPApplication">
       </launchConfigurationTabGroup>
    </extension>
- <!--  <extension
+   <extension
          point="org.eclipse.debug.ui.launchShortcuts">
       <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.ide.markerImageProviders">
@@ -105,27 +96,28 @@
             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>   -->
    <extension
          point="org.eclipse.ui.contexts">
       <context
@@ -151,27 +143,73 @@
             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.PHPUnitEditor">
-            <adapter type="org.eclipse.debug.ui.actions.IRunToLineTarget"/>
+            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="#CompilationUnitRulerContext"
-            id="org.eclipse.jdt.debug.ui.CompilationUnitRulerPopupActions">
+         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.ManageBreakpointRulerActionDelegate">
+               id="net.sourceforge.phpdt.internal.debug.ui.actions.PHPManageBreakpointRulerActionDelegate">
          </action>
       </viewerContribution>
-      </extension>
+    </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>