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

diff --git a/net.sourceforge.phpeclipse.debug.ui/plugin.xml b/net.sourceforge.phpeclipse.debug.ui/plugin.xml
index f3f7d1c..5c62bd7 100644
--- a/net.sourceforge.phpeclipse.debug.ui/plugin.xml
+++ b/net.sourceforge.phpeclipse.debug.ui/plugin.xml
@@ -1,39 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="net.sourceforge.phpeclipse.debug.ui"
-   name="%Plugin.name"
-   version="1.1.0"
-   provider-name="phpeclipse.de"
-   class="net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin">
-
-   <runtime>
-      <library name="debug.jar">
-         <export name="*"/>
-      </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.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>
@@ -51,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">
@@ -103,28 +76,6 @@
             id="net.sourceforge.phpeclipse.debug.core.PHPLineBreakpointMarkerProvider">
       </imageprovider>
    </extension>
-<!--   <extension
-         point="org.eclipse.ui.actionSets">
-         <actionSet
-            label="%BreakpoingActionSet.label"
-            visible="false"
-            id="org.eclipse.debug.ui.breakpointActionSet">
-         <menu
-               label="%RunMenu.label"
-               path="additions"
-               id="org.eclipse.ui.run">
-            <separator
-                  name="breakpointGroup">
-            </separator>
-         </menu>
-         <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">
-         </action>
-      </actionSet>
-   </extension>   -->
    <extension
          point="org.eclipse.ui.contexts">
       <context
@@ -170,7 +121,6 @@
          <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>
@@ -179,20 +129,6 @@
       <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"
@@ -202,4 +138,21 @@
          </action>
       </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>