Added "Toggle PHP Breakpoint" to left Editor ruler
authorjsurfer <jsurfer>
Sun, 10 Oct 2004 11:45:25 +0000 (11:45 +0000)
committerjsurfer <jsurfer>
Sun, 10 Oct 2004 11:45:25 +0000 (11:45 +0000)
net.sourceforge.phpeclipse.debug.ui/build.xml [deleted file]
net.sourceforge.phpeclipse.debug.ui/plugin.properties
net.sourceforge.phpeclipse.debug.ui/plugin.xml
net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugUiMessages.properties
net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/actions/ManageBreakpointActionDelegate.java [deleted file]
net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/actions/PHPManageBreakpointRulerAction.java
net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/actions/RetargettableActionAdapterFactory.java
net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/actions/ToggleBreakpointAdapter.java

diff --git a/net.sourceforge.phpeclipse.debug.ui/build.xml b/net.sourceforge.phpeclipse.debug.ui/build.xml
deleted file mode 100644 (file)
index f688a50..0000000
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="net.sourceforge.phpeclipse.debug.ui" default="build.jars" basedir=".">
-
-       <property name="bootclasspath" value=""/>
-       <property name="basews" value="${ws}"/>
-       <property name="baseos" value="${os}"/>
-       <property name="basearch" value="${arch}"/>
-       <property name="basenl" value="${nl}"/>
-       <property name="javacFailOnError" value="false"/>
-       <property name="javacDebugInfo" value="on"/>
-       <property name="javacVerbose" value="true"/>
-       <property name="javacSource" value="1.3"/>
-       <property name="javacTarget" value="1.2"/>
-       <property name="compilerArg" value=""/>
-
-       <target name="init" depends="properties">
-               <condition property="pluginTemp" value="${buildTempFolder}/plugins">
-                       <isset property="buildTempFolder"/>
-               </condition>
-               <property name="pluginTemp" value="${basedir}"/>
-               <condition property="build.result.folder" value="${pluginTemp}/net.sourceforge.phpeclipse.debug.ui">
-                       <isset property="buildTempFolder"/>
-               </condition>
-               <property name="build.result.folder" value="${basedir}"/>
-               <property name="temp.folder" value="${basedir}/temp.folder"/>
-               <property name="plugin.destination" value="${basedir}"/>
-       </target>
-
-       <target name="properties" if="eclipse.running">
-               <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-       </target>
-
-       <target name="build.update.jar" depends="init" description="Build the plug-in: net.sourceforge.phpeclipse.debug.ui for an update site.">
-               <delete dir="${temp.folder}"/>
-               <mkdir dir="${temp.folder}"/>
-               <antcall target="build.jars"/>
-               <antcall target="gather.bin.parts">
-                       <param name="destination.temp.folder" value="${temp.folder}/"/>
-               </antcall>
-               <zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.debug.ui_1.1.0.jar" basedir="${temp.folder}/net.sourceforge.phpeclipse.debug.ui_1.1.0" filesonly="false" whenempty="skip" update="false"/>
-               <delete dir="${temp.folder}"/>
-       </target>
-
-       <target name="debug.jar" depends="init" unless="debug.jar" description="Create jar: debug.jar.">
-               <delete dir="${temp.folder}/debug.jar.bin"/>
-               <mkdir dir="${temp.folder}/debug.jar.bin"/>
-               <!-- compile the source code -->
-               <javac destdir="${temp.folder}/debug.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bootclasspath}" source="${javacSource}" target="${javacTarget}"             >
-                       <compilerarg line="${compilerArg}"/>
-                       <classpath>
-                               <pathelement path="../../plugins/org.eclipse.ui.ide_3.0.0/ide.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.ui.win32_3.0.0/ide.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.ui.win32_3.0.0/workbenchwin32.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.core.resources_3.0.0/resources.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.core.resources.win32_3.0.0/resources.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.core.resources.win32_3.0.0/resources-win32.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.core.runtime.compatibility_3.0.0/compatibility.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.core.runtime_3.0.0/runtime.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.osgi_3.0.0/core.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.osgi_3.0.0/console.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.osgi_3.0.0/osgi.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.osgi_3.0.0/resolver.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.osgi_3.0.0/defaultAdaptor.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.osgi_3.0.0/eclipseAdaptor.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.update.configurator_3.0.0/configurator.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.help_3.0.0/help.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.ui_3.0.0/ui.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.swt_3.0.0/ws/${basews}/swt.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.swt.win32_3.0.0/ws/${basews}/swt.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.swt.win32_3.0.0"/>
-                               <pathelement path="../../plugins/org.eclipse.jface_3.0.0/jface.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.ui.workbench_3.0.0/compatibility.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.ui.workbench_3.0.0/workbench.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.ui.workbench.compatibility_3.0.0/compatibility.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.ui.workbench.compatibility_3.0.0/workbench.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.core.expressions_3.0.0/expressions.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.ui.views_3.0.0/views.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.update.core_3.0.0/updatecore.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.update.core.win32_3.0.0/updatecore.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.update.ui_3.0.0/updateui.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.help.base_3.0.0/helpbase.jar"/>
-                               <pathelement path="../../plugins/org.apache.lucene_1.3.0/parser.jar"/>
-                               <pathelement path="../../plugins/org.apache.lucene_1.3.0/lucene-1.3-final.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.help.appserver_3.0.0/appserver.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.ui.forms_3.0.0/forms.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.jface.text_3.0.0/jfacetext.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.text_3.0.0/text.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.ui.workbench.texteditor_3.0.0/texteditor.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.ui.editors_3.0.0/editors.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.core.filebuffers_3.0.0/filebuffers.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.debug.core_3.0.0/dtcore.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.core.variables_3.0.0/variables.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.debug.ui_3.0.0/dtui.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.ui.console_3.0.0/console.jar"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.debug.core/bin"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.debug.core/core.jar"/>
-                               <pathelement path="../net.sourceforge.phpeclipse/bin"/>
-                               <pathelement path="../net.sourceforge.phpeclipse/phpeclipse.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.search_3.0.0/search.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.compare_3.0.0/compare.jar"/>
-                               <pathelement path="../../plugins/org.eclipse.ui.externaltools_3.0.0/externaltools.jar"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.quantum.sql/bin"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.quantum.sql/quantum.jar"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.webbrowser/bin"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.webbrowser/webbrowser.jar"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.core/bin"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.core/webcore.jar"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.ui/bin"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.ui/wdtui.jar"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.xml.ui/bin"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.xml.ui/xmlui.jar"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.xml.core/bin"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.xml.core/xmlcore.jar"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.launching/bin"/>
-                               <pathelement path="../net.sourceforge.phpeclipse.launching/launch.jar"/>
-                       </classpath>
-                       <src path="src/"                        />
-                       </javac>
-               <!-- Copy necessary resources -->
-               <copy todir="${temp.folder}/debug.jar.bin" failonerror="true">
-                       <fileset dir="src/" excludes="**/*.java, **/package.htm*"                       />
-               </copy>
-               <mkdir dir="${build.result.folder}"/>
-               <jar jarfile="${build.result.folder}/debug.jar" basedir="${temp.folder}/debug.jar.bin"/>
-               <delete dir="${temp.folder}/debug.jar.bin"/>
-       </target>
-
-       <target name="debugsrc.zip" depends="init" unless="debugsrc.zip">
-               <mkdir dir="${build.result.folder}"/>
-               <zip zipfile="${build.result.folder}/debugsrc.zip" filesonly="false" whenempty="skip" update="false">
-                       <fileset dir="src/" includes="**/*.java"                        />
-               </zip>
-       </target>
-
-       <target name="build.jars" depends="init" description="Build all the jars for the plug-in: net.sourceforge.phpeclipse.debug.ui.">
-               <available property="debug.jar" file="${build.result.folder}/debug.jar"/>
-               <antcall target="debug.jar"/>
-       </target>
-
-       <target name="build.sources" depends="init">
-               <available property="debugsrc.zip" file="${build.result.folder}/debugsrc.zip"/>
-               <antcall target="debugsrc.zip"/>
-       </target>
-
-       <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.debug.ui_1.1.0"/>
-               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.debug.ui_1.1.0" failonerror="true">
-                       <fileset dir="${build.result.folder}" includes="debug.jar"                      />
-               </copy>
-               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.debug.ui_1.1.0" failonerror="true">
-                       <fileset dir="${basedir}" includes="debug.jar,plugin.properties,plugin.xml,icons/,.template"                    />
-               </copy>
-       </target>
-
-       <target name="build.zips" depends="init">
-       </target>
-
-       <target name="gather.sources" depends="init" if="destination.temp.folder">
-               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.debug.ui_1.1.0"/>
-               <copy file="${build.result.folder}/debugsrc.zip" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.debug.ui_1.1.0" failonerror="false"/>
-               <copy todir="${destination.temp.folder}/net.sourceforge.phpeclipse.debug.ui_1.1.0" failonerror="false">
-                       <fileset dir="${basedir}" includes="src/ "                      />
-               </copy>
-       </target>
-
-       <target name="gather.logs" depends="init" if="destination.temp.folder">
-               <mkdir dir="${destination.temp.folder}/net.sourceforge.phpeclipse.debug.ui_1.1.0"/>
-               <copy file="${temp.folder}/debug.jar.bin.log" todir="${destination.temp.folder}/net.sourceforge.phpeclipse.debug.ui_1.1.0" failonerror="false"/>
-       </target>
-
-       <target name="clean" depends="init" description="Clean the plug-in: net.sourceforge.phpeclipse.debug.ui of all the zips, jars and logs created.">
-               <delete file="${build.result.folder}/debug.jar"/>
-               <delete file="${build.result.folder}/debugsrc.zip"/>
-               <delete file="${plugin.destination}/net.sourceforge.phpeclipse.debug.ui_1.1.0.jar"/>
-               <delete file="${plugin.destination}/net.sourceforge.phpeclipse.debug.ui_1.1.0.zip"/>
-               <delete dir="${temp.folder}"/>
-       </target>
-
-       <target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-               <eclipse.convertPath fileSystemPath="C:/eclipse3/workspace/net.sourceforge.phpeclipse.debug.ui" property="resourcePath"/>
-               <eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-       </target>
-
-       <target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: net.sourceforge.phpeclipse.debug.ui.">
-               <delete dir="${temp.folder}"/>
-               <mkdir dir="${temp.folder}"/>
-               <antcall target="build.jars"/>
-               <antcall target="build.sources"/>
-               <antcall target="gather.bin.parts">
-                       <param name="destination.temp.folder" value="${temp.folder}/"/>
-               </antcall>
-               <antcall target="gather.sources">
-                       <param name="destination.temp.folder" value="${temp.folder}/"/>
-               </antcall>
-               <delete>
-                       <fileset dir="${temp.folder}" includes="**/*.bin.log"                   />
-               </delete>
-               <zip zipfile="${plugin.destination}/net.sourceforge.phpeclipse.debug.ui_1.1.0.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-               <delete dir="${temp.folder}"/>
-       </target>
-
-</project>
index 6b3b861..314fb93 100644 (file)
@@ -9,7 +9,9 @@ LaunchShortcut.PHP.label=PHP Application
 DebugActionSet.label=PHP Debug
 RunMenu.label=&Run
 
-GlobalManageBreakpointAction.label=Add/Remove Brea&kpoint (PHP)
+BreakpoingActionSet.label=PHP Breakpoints
+# GlobalManageBreakpointAction.label=Toggle Line Breakpoint (PHP)
+AddBreakpoint.label=Toggle PHP &Breakpoint
 
 Context.Debugging.name=Debugging PHP
 Context.Debugging.description=Debugging PHP-Scripts
index b37a70d..f3f7d1c 100644 (file)
             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
             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>
 </plugin>
index 1f09ff1..e6d1827 100644 (file)
@@ -63,8 +63,9 @@ PHPInterpreterPreferencePage.EditInterpreterDialog.editInterpreter.title=Edit In
 
 PHPBasePreferencePage.label=General Properties
 
-PHPManageBreakpointRulerAction.AddBreakpoint=Add Breakpoint
-PHPManageBreakpointRulerAction.RemoveBreakpoint=Remove Breakpoint
+#PHPManageBreakpointRulerAction.AddBreakpoint=Add Breakpoint
+#PHPManageBreakpointRulerAction.RemoveBreakpoint=Remove Breakpoint
+PHPManageBreakpointRulerAction.ToggleBreakpoint=Toggle PHP &Breakpoint
 
 PHPDebugModelPresentation.<not responding>=<not responding>
 PHPDebugModelPresentation.line=line:
diff --git a/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/actions/ManageBreakpointActionDelegate.java b/net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/actions/ManageBreakpointActionDelegate.java
deleted file mode 100644 (file)
index 979daa8..0000000
+++ /dev/null
@@ -1,256 +0,0 @@
-package net.sourceforge.phpdt.internal.debug.ui.actions;
-import net.sourceforge.phpdt.debug.core.PHPDebugModel;
-import org.eclipse.debug.core.DebugPlugin;
-import net.sourceforge.phpdt.internal.debug.core.breakpoints.PHPLineBreakpoint;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.texteditor.IEditorStatusLine;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.core.runtime.CoreException;
-
-import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin;
-
-/* (non-Javadoc)
- * @see IWorkbenchWindowActionDelegate
- */
-public class ManageBreakpointActionDelegate implements IWorkbenchWindowActionDelegate, IPartListener {
-
-       protected boolean fInitialized= false;
-       private ITextEditor fTextEditor= null;
-       private IAction fAction= null;
-       private IFile fFile = null;
-       private IWorkbenchWindow fWorkbenchWindow= null;
-
-
-       /* (non-Javadoc)
-        * @see org.eclipse.ui.IPartListener#partActivated(IWorkbenchPart)
-        */
-       public void partActivated( IWorkbenchPart part )
-       {
-               if ( part instanceof ITextEditor )
-               {
-                       setTextEditor( (ITextEditor)part );
-               }
-       }
-
-       /* (non-Javadoc)
-        * @see org.eclipse.ui.IPartListener#partBroughtToTop(IWorkbenchPart)
-        */
-       public void partBroughtToTop( IWorkbenchPart part )
-       {
-       }
-
-       /* (non-Javadoc)
-        * @see org.eclipse.ui.IPartListener#partClosed(IWorkbenchPart)
-        */
-       public void partClosed( IWorkbenchPart part )
-       {
-               if ( part == getTextEditor() )
-               {
-                       setTextEditor( null );
-                       if ( getAction() != null )
-                       {
-                               getAction().setEnabled( false );
-                       }
-               }
-       }
-
-       /* (non-Javadoc)
-        * @see org.eclipse.ui.IPartListener#partDeactivated(IWorkbenchPart)
-        */
-       public void partDeactivated( IWorkbenchPart part )
-       {
-       }
-
-       /* (non-Javadoc)
-        * @see org.eclipse.ui.IPartListener#partOpened(IWorkbenchPart)
-        */
-       public void partOpened( IWorkbenchPart part )
-       {
-               if ( part instanceof ITextEditor )
-               {
-                       if ( getTextEditor() == null )
-                       {
-                               setTextEditor( (ITextEditor)part );
-                       }
-               }
-       }
-
-
-       /**
-        * Manages a breakpoint.
-        */
-       protected void manageBreakpoint(IEditorInput editorInput) {
-               ISelectionProvider sp= getTextEditor().getSelectionProvider();
-               if (sp == null || getFile() == null) {
-                       report("ManageBreakpointActionDelegate.No_Breakpoint"); //$NON-NLS-1$
-                       return;
-               }
-               report(null);
-               ISelection selection= sp.getSelection();
-               if ( selection instanceof ITextSelection ) {
-                       if ( getFile() == null )
-                               return;
-                       IDocument document = getTextEditor().getDocumentProvider().getDocument( editorInput );
-//                     BreakpointLocationVerifier bv = new BreakpointLocationVerifier();
-//                     int lineNumber = bv.getValidLineBreakpointLocation( document, ((ITextSelection)selection).getStartLine());
-                       int lineNumber = ((ITextSelection)selection).getStartLine() +1;
-                       if ( lineNumber > -1 ) {
-                               
-                               try     {
-                                       PHPLineBreakpoint breakpoint=PHPDebugModel.lineBreakpointExists(lineNumber);    
-                                       if (breakpoint==null)   
-                                               PHPDebugModel.createLineBreakpoint(getFile(), lineNumber, 0, true, null);
-                                       else
-                                               DebugPlugin.getDefault().getBreakpointManager().removeBreakpoint( breakpoint, true );   
-                                       
-                               }       catch( CoreException ce )       {
-                                       PHPDebugUiPlugin.errorDialog( "Cannot add breakpoint", ce );
-                               }
-                       }
-               }               
-       }
-       
-       public ManageBreakpointActionDelegate() {
-       }
-
-       /* (non-Javadoc)
-        * @see IWorkbenchWindowActionDelegate#run
-        */
-       public void run(IAction action)  {
-               if ( getTextEditor() != null ) {
-                       update();
-                       manageBreakpoint( getTextEditor().getEditorInput() );
-               }               
-       }
-
-       /* (non-Javadoc)
-        * @see IWorkbenchWindowActionDelegate#selectionChanged
-        */
-       public void selectionChanged(IAction action, ISelection selection)  {
-               if (!fInitialized) {
-                       initialize(action);
-               } 
-       }
-       
-       protected void update( ISelection selection )
-       {
-               setEnabledState( getTextEditor() );
-       }
-       
-       protected void initialize(IAction action) {
-               setAction( action );
-               if (getWorkbenchWindow() != null) {
-                       IWorkbenchPage page= getWorkbenchWindow().getActivePage();
-                       if (page != null) {
-                               IEditorPart part= page.getActiveEditor();
-                               if (part instanceof ITextEditor) {
-                                       setTextEditor((ITextEditor)part);
-                                       update( getTextEditor().getSelectionProvider().getSelection() );                                                
-                               }
-                       }
-               }
-               fInitialized= true;
-       }
-
-       /* (non-Javadoc)
-        * @see IWorkbenchWindowActionDelegate#dispose
-        */
-       public void dispose()  {
-               getWorkbenchWindow().getPartService().removePartListener( this );               
-       }
-
-       /* (non-Javadoc)
-        * @see IWorkbenchWindowActionDelegate#init
-        */
-       public void init(IWorkbenchWindow window)  {
-               setWorkbenchWindow( window );
-               window.getPartService().addPartListener( this );                
-       }
-       
-       protected ITextEditor getTextEditor() {
-               return fTextEditor;
-       }
-       
-       
-       protected IAction getAction() {
-               return fAction;
-       }
-
-       protected void setAction(IAction action) {
-               fAction = action;
-       }
-
-       protected IWorkbenchWindow getWorkbenchWindow() {
-               return fWorkbenchWindow;
-       }
-
-       protected void setWorkbenchWindow(IWorkbenchWindow workbenchWindow) {
-               fWorkbenchWindow = workbenchWindow;
-       }
-
-       protected IFile getFile()
-       {
-               return fFile;
-       }
-
-       protected void setFile( IFile file ) 
-       {
-               fFile = file;
-       }       
-
-       protected void setTextEditor(ITextEditor editor) {
-               fTextEditor = editor;
-               if ( fTextEditor != null ) {
-                       IEditorInput input = fTextEditor.getEditorInput();              
-                       setFile( ( input != null && input instanceof IFileEditorInput ) ? ((IFileEditorInput)input).getFile() : null );
-               }
-               setEnabledState(editor);
-       }
-       protected void setEnabledState(ITextEditor editor) {
-               if ( getAction() != null ) {
-                       getAction().setEnabled( editor != null );
-               }
-       }
-       
-       protected void update() {
-               IAction action= getAction();
-               if (action != null) {
-                       if (getTextEditor() != null) {
-                               breakpointExists(getTextEditor().getEditorInput());
-                       }
-               }
-       }
-       
-       protected boolean breakpointExists(IEditorInput editorInput){
-               return false;
-       }       
-       
-       protected void report(String message) {
-               if (getTextEditor() != null) {
-                       IEditorStatusLine statusLine= (IEditorStatusLine) getTextEditor().getAdapter(IEditorStatusLine.class);
-                       if (statusLine != null) {
-                               if (message != null) {
-                                       statusLine.setMessage(true, message, null);
-                               } else {
-                                       statusLine.setMessage(true, null, null);
-                               }
-                       }
-               }               
-               if (message != null && PHPDebugUiPlugin.getActiveWorkbenchShell() != null) {
-                       PHPDebugUiPlugin.getActiveWorkbenchShell().getDisplay().beep();
-               }
-       }
-}
index e715589..5504625 100644 (file)
@@ -56,8 +56,8 @@ public class PHPManageBreakpointRulerAction extends Action implements IUpdate {
                fRuler= ruler;
                fTextEditor= editor;
                fMarkerType= IBreakpoint.BREAKPOINT_MARKER;
-               fAddLabel= PHPDebugUiMessages.getString("PHPManageBreakpointRulerAction.AddBreakpoint"); //$NON-NLS-1$
-               fRemoveLabel= PHPDebugUiMessages.getString("PHPManageBreakpointRulerAction.RemoveBreakpoint"); //$NON-NLS-1$
+               fAddLabel= PHPDebugUiMessages.getString("PHPManageBreakpointRulerAction.ToggleBreakpoint"); //$NON-NLS-1$
+               fRemoveLabel= PHPDebugUiMessages.getString("PHPManageBreakpointRulerAction.ToggleBreakpoint"); //$NON-NLS-1$
        }
        
        /** 
index 06d27a7..865ce08 100644 (file)
@@ -38,6 +38,7 @@ public class RetargettableActionAdapterFactory implements IAdapterFactory {
         * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
         */
        public Class[] getAdapterList() {
-               return new Class[]{IRunToLineTarget.class, IToggleBreakpointsTarget.class};
+       //      return new Class[]{IRunToLineTarget.class, IToggleBreakpointsTarget.class};
+         return new Class[]{IToggleBreakpointsTarget.class};
        }
 }
index d50a217..6fa47db 100644 (file)
@@ -249,12 +249,13 @@ public class ToggleBreakpointAdapter implements IToggleBreakpointsTarget {
         * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#canToggleMethodBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
         */
        public boolean canToggleMethodBreakpoints(IWorkbenchPart part, ISelection selection) {
-               if (selection instanceof IStructuredSelection) {
-                       IStructuredSelection ss = (IStructuredSelection) selection;
-                       return getMethods(ss).length > 0;
-               } else {
-                       return selection instanceof ITextSelection;
-               }
+//             if (selection instanceof IStructuredSelection) {
+//                     IStructuredSelection ss = (IStructuredSelection) selection;
+//                     return getMethods(ss).length > 0;
+//             } else {
+//                     return selection instanceof ITextSelection;
+//             }
+               return false;
        }
        
        protected IMethod[] getMethods(IStructuredSelection selection) {