Refactory: remove dependance to org.eclipse.debug.ui from net.sourceforge.phpeclipse.ui

diff --git a/net.sourceforge.phpeclipse.debug.ui/plugin.xml b/net.sourceforge.phpeclipse.debug.ui/plugin.xml
index a81cb4f..5c62bd7 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.ui/plugin.xml
+++ b/net.sourceforge.phpeclipse.debug.ui/plugin.xml
@@ -2,6 +2,15 @@
 <?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>
+
+   <extension
          point="org.eclipse.ui.preferencePages">
       <page
             name="%PreferencePage.PHPInterpreter.name"

diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/BreakpointImageProvider.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/debug/ui/BreakpointImageProvider.java
similarity index 97%
rename from net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/BreakpointImageProvider.java
rename to net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/debug/ui/BreakpointImageProvider.java
index b57d14d..b5dbaab 100644 (file)
--- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/BreakpointImageProvider.java
+++ b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/debug/ui/BreakpointImageProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package net.sourceforge.phpeclipse.phpeditor;
+package net.sourceforge.phpdt.debug.ui;
 
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.debug.ui.DebugUITools;

diff --git a/net.sourceforge.phpeclipse.ui/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.ui/META-INF/MANIFEST.MF
index 4a6ee87..9cdcc1d 100644 (file)
--- a/net.sourceforge.phpeclipse.ui/META-INF/MANIFEST.MF
+++ b/net.sourceforge.phpeclipse.ui/META-INF/MANIFEST.MF
@@ -79,11 +79,11 @@ Require-Bundle: net.sourceforge.phpeclipse.core,
  net.sourceforge.phpeclipse.webbrowser,
  net.sourceforge.phpeclipse;bundle-version="0.0.0",
  org.eclipse.team.core,
- org.eclipse.debug.ui,
  org.eclipse.search,
  org.eclipse.ui.console,
  net.sourceforge.phpeclipse.xml.core,
- org.eclipse.compare
+ org.eclipse.compare,
+ org.eclipse.core.resources;bundle-version="3.4.1"
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.ltk.core.refactoring.participants,

diff --git a/net.sourceforge.phpeclipse.ui/plugin.xml b/net.sourceforge.phpeclipse.ui/plugin.xml
index 36732b0..90e8b17 100644 (file)
--- a/net.sourceforge.phpeclipse.ui/plugin.xml
+++ b/net.sourceforge.phpeclipse.ui/plugin.xml
@@ -941,11 +941,6 @@
                        annotationImageProvider="net.sourceforge.phpeclipse.phpeditor.JavaAnnotationImageProvider">
          </specification>
          <specification
-                       annotationType="org.eclipse.debug.core.breakpoint"
-                       icon="icons/full/obj16/brkp_obj.gif"
-                       annotationImageProvider="net.sourceforge.phpeclipse.phpeditor.BreakpointImageProvider">
-         </specification>
-         <specification
                        annotationType="net.sourceforge.phpdt.ui.occurrences"
                        label="%OccurrenceAnnotation.label"
                        icon="icons/obj16/searchm_obj.gif"