View | Details | Raw Unified | Return to bug 381886 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff
Line 338433 Link Here
(-)a/org.eclipse.debug.ui/plugin.xml (-119 / +425 lines)
Lines 297-414 Link Here
297 
         <action
298 
               id="org.eclipse.debug.ui.actions.ToggleStepFilters"
299 
               hoverIcon="$nl$/icons/full/elcl16/stepbystep_co.gif"
300 
               class="org.eclipse.debug.internal.ui.commands.actions.ToggleStepFiltersCommandActionDelegate"
301 
               definitionId="org.eclipse.debug.ui.commands.ToggleStepFilters"
302 
               disabledIcon="$nl$/icons/full/dlcl16/stepbystep_co.gif"
303 
               icon="$nl$/icons/full/elcl16/stepbystep_co.gif"
304 
               helpContextId="step_with_filters_action_context"
305 
               label="%StepWithFiltersAction.label"
306 
               menubarPath="org.eclipse.ui.run/emptyStepGroup"
307 
               toolbarPath="org.eclipse.debug.ui.main.toolbar/renderGroup"
308 
               style="toggle"
309 
               state="false">
310 
         </action>
311 
         <action
312 
               id="org.eclipse.debug.ui.actions.DropToFrame"
313 
               class="org.eclipse.debug.internal.ui.commands.actions.DropToFrameCommandActionDelegate"
314 
               definitionId="org.eclipse.debug.ui.commands.DropToFrame"
315 
               icon="$nl$/icons/full/elcl16/drop_to_frame.gif"
316 
               helpContextId="org.eclipse.debug.ui.drop_to_frame_action_context"
317 
               label="%DropToFrame.label"
318 
               toolbarPath="org.eclipse.debug.ui.main.toolbar/renderGroup">
319 
         </action>
320 
         <action
321 
               id="org.eclipse.debug.ui.actions.RunToLine"
322 
               class="org.eclipse.debug.internal.ui.actions.RetargetRunToLineAction"
323 
               definitionId="org.eclipse.debug.ui.commands.RunToLine"
324 
               helpContextId="run_to_line_action_context"
325 
               disabledIcon="$nl$/icons/full/dlcl16/runtoline_co.gif"
326 
               icon="$nl$/icons/full/elcl16/runtoline_co.gif"
327 
               label="%RunToLine.label"
328 
               menubarPath="org.eclipse.ui.run/emptyStepGroup"
329 
               toolbarPath="org.eclipse.debug.ui.main.toolbar/emptyStepGroup">
330 
         </action>
331 
         <action
332 
               id="org.eclipse.debug.ui.actions.StepReturn"
333 
               hoverIcon="$nl$/icons/full/elcl16/stepreturn_co.gif"
334 
               class="org.eclipse.debug.internal.ui.commands.actions.StepReturnCommandActionDelegate"
335 
               definitionId="org.eclipse.debug.ui.commands.StepReturn"
336 
               disabledIcon="$nl$/icons/full/dlcl16/stepreturn_co.gif"
337 
               icon="$nl$/icons/full/elcl16/stepreturn_co.gif"
338 
               helpContextId="step_return_action_context"
339 
               label="%StepReturnAction.label"
340 
               menubarPath="org.eclipse.ui.run/stepReturnGroup"
341 
               toolbarPath="org.eclipse.debug.ui.main.toolbar/stepReturnGroup">
342 
         </action>
343 
         <action
344 
               id="org.eclipse.debug.ui.actions.StepOver"
345 
               hoverIcon="$nl$/icons/full/elcl16/stepover_co.gif"
346 
               class="org.eclipse.debug.internal.ui.commands.actions.StepOverCommandActionDelegate"
347 
               definitionId="org.eclipse.debug.ui.commands.StepOver"
348 
               disabledIcon="$nl$/icons/full/dlcl16/stepover_co.gif"
349 
               icon="$nl$/icons/full/elcl16/stepover_co.gif"
350 
               helpContextId="step_over_action_context"
351 
               label="%StepOverAction.label"
352 
               menubarPath="org.eclipse.ui.run/stepOverGroup"
353 
               toolbarPath="org.eclipse.debug.ui.main.toolbar/stepOverGroup">
354 
         </action>
355 
         <action
356 
               id="org.eclipse.debug.ui.actions.StepInto"
357 
               hoverIcon="$nl$/icons/full/elcl16/stepinto_co.gif"
358 
               class="org.eclipse.debug.internal.ui.commands.actions.StepIntoCommandActionDelegate"
359 
               definitionId="org.eclipse.debug.ui.commands.StepInto"
360 
               disabledIcon="$nl$/icons/full/dlcl16/stepinto_co.gif"
361 
               icon="$nl$/icons/full/elcl16/stepinto_co.gif"
362 
               helpContextId="step_into_action_context"
363 
               label="%StepIntoAction.label"
364 
               menubarPath="org.eclipse.ui.run/stepIntoGroup"
365 
               toolbarPath="org.eclipse.debug.ui.main.toolbar/stepIntoGroup">
366 
         </action>
367 
         <action
368 
               id="org.eclipse.debug.ui.actions.toolbar.Disconnect"
369 
               hoverIcon="$nl$/icons/full/elcl16/disconnect_co.gif"
370 
               class="org.eclipse.debug.internal.ui.commands.actions.DisconnectCommandActionDelegate"
371 
               definitionId="org.eclipse.debug.ui.commands.Disconnect"
372 
               disabledIcon="$nl$/icons/full/dlcl16/disconnect_co.gif"
373 
               icon="$nl$/icons/full/elcl16/disconnect_co.gif"
374 
               helpContextId="disconnect_action_context"
375 
               label="%Disconnect.label"
376 
               menubarPath="org.eclipse.ui.run/stepGroup"
377 
               toolbarPath="org.eclipse.debug.ui.main.toolbar/threadGroup">
378 
         </action>
379 
         <action
380 
               id="org.eclipse.debug.ui.actions.Terminate"
381 
               hoverIcon="$nl$/icons/full/elcl16/terminate_co.gif"
382 
               class="org.eclipse.debug.internal.ui.commands.actions.TerminateCommandActionDelegate"
383 
               definitionId="org.eclipse.debug.ui.commands.Terminate"
384 
               disabledIcon="$nl$/icons/full/dlcl16/terminate_co.gif"
385 
               icon="$nl$/icons/full/elcl16/terminate_co.gif"
386 
               helpContextId="terminate_action_context"
387 
               label="%TerminateAction.label"
388 
               menubarPath="org.eclipse.ui.run/stepGroup"
389 
               toolbarPath="org.eclipse.debug.ui.main.toolbar/threadGroup">
390 
         </action>
391 
         <action
392 
               id="org.eclipse.debug.ui.actions.Suspend"
393 
               hoverIcon="$nl$/icons/full/elcl16/suspend_co.gif"
394 
               class="org.eclipse.debug.internal.ui.commands.actions.SuspendCommandActionDelegate"
395 
               definitionId="org.eclipse.debug.ui.commands.Suspend"
396 
               disabledIcon="$nl$/icons/full/dlcl16/suspend_co.gif"
397 
               icon="$nl$/icons/full/elcl16/suspend_co.gif"
398 
               helpContextId="suspend_action_context"
399 
               label="%SuspendAction.label"
400 
               menubarPath="org.eclipse.ui.run/stepGroup"
401 
               toolbarPath="org.eclipse.debug.ui.main.toolbar/threadGroup">
402 
         </action>
403 
         <action
404 
               id="org.eclipse.debug.ui.actions.Resume"
405 
               hoverIcon="$nl$/icons/full/elcl16/resume_co.gif"
406 
               class="org.eclipse.debug.internal.ui.commands.actions.ResumeCommandActionDelegate"
407 
               definitionId="org.eclipse.debug.ui.commands.Resume"
408 
               disabledIcon="$nl$/icons/full/dlcl16/resume_co.gif"
409 
               icon="$nl$/icons/full/elcl16/resume_co.gif"
410 
               helpContextId="resume_action_context"
411 
               label="%ResumeAction.label"
412 
               menubarPath="org.eclipse.ui.run/stepGroup"
413 
               toolbarPath="org.eclipse.debug.ui.main.toolbar/threadGroup">
414 
         </action>
Line 600 Link Here
483 
   <extension point="org.eclipse.core.expressions.definitions">
484 
      <definition id="org.eclipse.debug.ui.debugActionSetActive">
485 
         <and>
486 
            <with variable="org.eclipse.core.runtime.Platform">
487 
               <test property="org.eclipse.core.runtime.bundleState"
488 
                     args="org.eclipse.debug.ui"
489 
                     value="ACTIVE"/>
490 
            </with>
491 
            <with variable="activeContexts">
492 
                 <iterate operator="or">
493 
                   <equals value="org.eclipse.debug.ui.debugActionSet"/>
494 
                 </iterate>
495 
            </with>
496 
          </and>
497 
      </definition>
498 
   </extension>
499
Line 615 Link Here
515 
            <separator name="renderGroup"/>
Line 624 Link Here
525 
       </menuContribution>
526 
       <menuContribution
527 
            locationURI="menu:org.eclipse.ui.run?after=threadGroup">
528 
         <command
529 
               commandId="org.eclipse.debug.ui.commands.StepInto"
530 
               disabledIcon="$nl$/icons/full/dlcl16/stepinto_co.gif"
531 
               helpContextId="step_into_action_context"
532 
               icon="$nl$/icons/full/elcl16/stepinto_co.gif"
533 
               label="%StepIntoAction.label">
534 
           <visibleWhen checkEnabled="false">
535 
              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
536 
           </visibleWhen>
537 
         </command>
538 
        <command
539 
               commandId="org.eclipse.debug.ui.commands.Resume"
540 
               disabledIcon="$nl$/icons/full/dlcl16/resume_co.gif"
541 
               helpContextId="resume_action_context"
542 
               icon="$nl$/icons/full/elcl16/resume_co.gif"
543 
               label="%ResumeAction.label">
544 
           <visibleWhen checkEnabled="false">
545 
              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
546 
           </visibleWhen>
547 
         </command>
548 
         <command
549 
               commandId="org.eclipse.debug.ui.commands.Suspend"
550 
               disabledIcon="$nl$/icons/full/dlcl16/suspend_co.gif"
551 
               helpContextId="suspend_action_context"
552 
               icon="$nl$/icons/full/elcl16/suspend_co.gif"
553 
               label="%SuspendAction.label">
554 
           <visibleWhen checkEnabled="false">
555 
              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
556 
           </visibleWhen>
557 
         </command>
558 
         <command
559 
               commandId="org.eclipse.debug.ui.commands.Terminate"
560 
               disabledIcon="$nl$/icons/full/dlcl16/terminate_co.gif"
561 
               helpContextId="terminate_action_context"
562 
               icon="$nl$/icons/full/elcl16/terminate_co.gif"
563 
               label="%TerminateAction.label">
564 
           <visibleWhen checkEnabled="false">
565 
              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
566 
           </visibleWhen>
567 
         </command>
568 
         <command
569 
               commandId="org.eclipse.debug.ui.commands.Disconnect"
570 
               disabledIcon="$nl$/icons/full/dlcl16/disconnect_co.gif"
571 
               helpContextId="disconnect_action_context"
572 
               icon="$nl$/icons/full/elcl16/disconnect_co.gif"
573 
               label="%Disconnect.label">
574 
           <visibleWhen checkEnabled="false">
575 
              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
576 
           </visibleWhen>
577 
         </command>
578 
      </menuContribution>
579 
      <menuContribution locationURI="menu:org.eclipse.ui.run?after=stepIntoGroup">
580 
         <command
581 
               commandId="org.eclipse.debug.ui.commands.StepInto"
582 
               disabledIcon="$nl$/icons/full/dlcl16/stepinto_co.gif"
583 
               helpContextId="step_into_action_context"
584 
               icon="$nl$/icons/full/elcl16/stepinto_co.gif"
585 
               label="%StepIntoAction.label">
586 
           <visibleWhen checkEnabled="false">
587 
              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
588 
           </visibleWhen>
589 
         </command>
590 
      </menuContribution>
591 
      <menuContribution locationURI="menu:org.eclipse.ui.run?after=stepOverGroup">
592 
         <command
593 
               commandId="org.eclipse.debug.ui.commands.StepOver"
594 
               disabledIcon="$nl$/icons/full/dlcl16/stepover_co.gif"
595 
               helpContextId="step_over_action_context"
596 
               icon="$nl$/icons/full/elcl16/stepover_co.gif"
597 
               label="%StepOverAction.label">
598 
           <visibleWhen checkEnabled="false">
599 
              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
600 
           </visibleWhen>
601 
         </command>
602 
       </menuContribution>
603 
       <menuContribution locationURI="menu:org.eclipse.ui.run?after=stepReturnGroup">
604 
         <command
605 
               commandId="org.eclipse.debug.ui.commands.StepReturn"
606 
               disabledIcon="$nl$/icons/full/dlcl16/stepreturn_co.gif"
607 
               helpContextId="step_return_action_context"
608 
               icon="$nl$/icons/full/elcl16/stepreturn_co.gif"
609 
               label="%StepReturnAction.label">
610 
           <visibleWhen checkEnabled="false">
611 
              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
612 
           </visibleWhen>
613 
         </command>
614 
       </menuContribution>
615 
       <menuContribution locationURI="menu:org.eclipse.ui.run?after=renderGroup">
616 
         <command
617 
               commandId="org.eclipse.debug.ui.commands.ToggleStepFilters"
618 
               disabledIcon="$nl$/icons/full/dlcl16/stepbystep_co.gif"
619 
               helpContextId="step_with_filters_action_context"
620 
               icon="$nl$/icons/full/elcl16/stepbystep_co.gif"
621 
               label="%StepWithFiltersAction.label"
622 
               style="toggle">
623 
           <visibleWhen checkEnabled="false">
624 
              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
625 
           </visibleWhen>
626 
         </command>
627 
         <command
628 
               commandId="org.eclipse.debug.ui.commands.DropToFrame"
629 
               helpContextId="org.eclipse.debug.ui.drop_to_frame_action_context"
630 
               icon="$nl$/icons/full/elcl16/drop_to_frame.gif"
631 
               label="%DropToFrame.label">
632 
           <visibleWhen checkEnabled="false">
633 
              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
634 
           </visibleWhen>
635 
         </command>
636 
       </menuContribution>
637 
       <menuContribution locationURI="menu:org.eclipse.ui.run?after=emptyStepGroup">
638 
         <command
639 
               commandId="org.eclipse.debug.ui.commands.RunToLine"
640 
               disabledIcon="$nl$/icons/full/dlcl16/runtoline_co.gif"
641 
               helpContextId="run_to_line_action_context"
642 
               icon="$nl$/icons/full/elcl16/runtoline_co.gif"
643 
               label="%RunToLine.label">
644 
           <visibleWhen checkEnabled="false">
645 
              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
646 
           </visibleWhen>
647 
         </command>
Line 701 Link Here
725 
       <menuContribution
726 
            locationURI="toolbar:org.eclipse.debug.ui.main.toolbar?after=threadGroup">
727 
         <command
728 
               commandId="org.eclipse.debug.ui.commands.StepInto"
729 
               disabledIcon="$nl$/icons/full/dlcl16/stepinto_co.gif"
730 
               helpContextId="step_into_action_context"
731 
               icon="$nl$/icons/full/elcl16/stepinto_co.gif"
732 
               label="%StepIntoAction.label">
733 
           <visibleWhen checkEnabled="false">
734 
              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
735 
           </visibleWhen>
736 
         </command>
737 
        <command
738 
               commandId="org.eclipse.debug.ui.commands.Resume"
739 
               disabledIcon="$nl$/icons/full/dlcl16/resume_co.gif"
740 
               helpContextId="resume_action_context"
741 
               icon="$nl$/icons/full/elcl16/resume_co.gif"
742 
               label="%ResumeAction.label">
743 
           <visibleWhen checkEnabled="false">
744 
              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
745 
           </visibleWhen>
746 
         </command>
747 
         <command
748 
               commandId="org.eclipse.debug.ui.commands.Suspend"
749 
               disabledIcon="$nl$/icons/full/dlcl16/suspend_co.gif"
750 
               helpContextId="suspend_action_context"
751 
               icon="$nl$/icons/full/elcl16/suspend_co.gif"
752 
               label="%SuspendAction.label">
753 
           <visibleWhen checkEnabled="false">
754 
              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
755 
           </visibleWhen>
756 
         </command>
757 
         <command
758 
               commandId="org.eclipse.debug.ui.commands.Terminate"
759 
               disabledIcon="$nl$/icons/full/dlcl16/terminate_co.gif"
760 
               helpContextId="terminate_action_context"
761 
               icon="$nl$/icons/full/elcl16/terminate_co.gif"
762 
               label="%TerminateAction.label">
763 
           <visibleWhen checkEnabled="false">
764 
              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
765 
           </visibleWhen>
766 
         </command>
767 
         <command
768 
               commandId="org.eclipse.debug.ui.commands.Disconnect"
769 
               disabledIcon="$nl$/icons/full/dlcl16/disconnect_co.gif"
770 
               helpContextId="disconnect_action_context"
771 
               icon="$nl$/icons/full/elcl16/disconnect_co.gif"
772 
               label="%Disconnect.label">
773 
           <visibleWhen checkEnabled="false">
774 
              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
775 
           </visibleWhen>
776 
         </command>
777 
      </menuContribution>
778 
      <menuContribution locationURI="toolbar:org.eclipse.debug.ui.main.toolbar?after=stepIntoGroup">
779 
         <command
780 
               commandId="org.eclipse.debug.ui.commands.StepInto"
781 
               disabledIcon="$nl$/icons/full/dlcl16/stepinto_co.gif"
782 
               helpContextId="step_into_action_context"
783 
               icon="$nl$/icons/full/elcl16/stepinto_co.gif"
784 
               label="%StepIntoAction.label">
785 
           <visibleWhen checkEnabled="false">
786 
              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
787 
           </visibleWhen>
788 
         </command>
789 
      </menuContribution>
790 
      <menuContribution locationURI="toolbar:org.eclipse.debug.ui.main.toolbar?after=stepOverGroup">
791 
         <command
792 
               commandId="org.eclipse.debug.ui.commands.StepOver"
793 
               disabledIcon="$nl$/icons/full/dlcl16/stepover_co.gif"
794 
               helpContextId="step_over_action_context"
795 
               icon="$nl$/icons/full/elcl16/stepover_co.gif"
796 
               label="%StepOverAction.label">
797 
           <visibleWhen checkEnabled="false">
798 
              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
799 
           </visibleWhen>
800 
         </command>
801 
       </menuContribution>
802 
       <menuContribution locationURI="toolbar:org.eclipse.debug.ui.main.toolbar?after=stepReturnGroup">
803 
         <command
804 
               commandId="org.eclipse.debug.ui.commands.StepReturn"
805 
               disabledIcon="$nl$/icons/full/dlcl16/stepreturn_co.gif"
806 
               helpContextId="step_return_action_context"
807 
               icon="$nl$/icons/full/elcl16/stepreturn_co.gif"
808 
               label="%StepReturnAction.label">
809 
           <visibleWhen checkEnabled="false">
810 
              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
811 
           </visibleWhen>
812 
         </command>
813 
       </menuContribution>
814 
       <menuContribution locationURI="toolbar:org.eclipse.debug.ui.main.toolbar?after=renderGroup">
815 
         <command
816 
               commandId="org.eclipse.debug.ui.commands.ToggleStepFilters"
817 
               disabledIcon="$nl$/icons/full/dlcl16/stepbystep_co.gif"
818 
               helpContextId="step_with_filters_action_context"
819 
               icon="$nl$/icons/full/elcl16/stepbystep_co.gif"
820 
               label="%StepWithFiltersAction.label"
821 
               style="toggle">
822 
           <visibleWhen checkEnabled="false">
823 
              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
824 
           </visibleWhen>
825 
         </command>
826 
         <command
827 
               commandId="org.eclipse.debug.ui.commands.DropToFrame"
828 
               helpContextId="org.eclipse.debug.ui.drop_to_frame_action_context"
829 
               icon="$nl$/icons/full/elcl16/drop_to_frame.gif"
830 
               label="%DropToFrame.label">
831 
           <visibleWhen checkEnabled="false">
832 
              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
833 
           </visibleWhen>
834 
         </command>
835 
       </menuContribution>
836 
       <menuContribution locationURI="toolbar:org.eclipse.debug.ui.main.toolbar?after=emptyStepGroup">
837 
         <command
838 
               commandId="org.eclipse.debug.ui.commands.RunToLine"
839 
               disabledIcon="$nl$/icons/full/dlcl16/runtoline_co.gif"
840 
               helpContextId="run_to_line_action_context"
841 
               icon="$nl$/icons/full/elcl16/runtoline_co.gif"
842 
               label="%RunToLine.label">
843 
           <visibleWhen checkEnabled="false">
844 
              <reference definitionId="org.eclipse.debug.ui.debugActionSetActive"/>
845 
           </visibleWhen>
846 
         </command>
847 
       </menuContribution>
Line 732 Link Here
879 
   </extension>
880
881 
   <extension point="org.eclipse.ui.menus">
882 
      <menuContribution locationURI="toolbar:org.eclipse.debug.ui.DebugView?after=threadGroup">
883 
         <command
884 
               commandId="org.eclipse.debug.ui.commands.Resume"
885 
               disabledIcon="$nl$/icons/full/dlcl16/resume_co.gif"
886 
               helpContextId="resume_action_context"
887 
               icon="$nl$/icons/full/elcl16/resume_co.gif"
888 
               label="%ResumeAction.label">
889 
         </command>
890 
         <command
891 
               commandId="org.eclipse.debug.ui.commands.Suspend"
892 
               disabledIcon="$nl$/icons/full/dlcl16/suspend_co.gif"
893 
               helpContextId="suspend_action_context"
894 
               icon="$nl$/icons/full/elcl16/suspend_co.gif"
895 
               label="%SuspendAction.label">
896 
            <visibleWhen checkEnabled="false">
897 
	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
898 
            </visibleWhen>
899 
         </command>
900 
         <command
901 
               commandId="org.eclipse.debug.ui.commands.Terminate"
902 
               disabledIcon="$nl$/icons/full/dlcl16/terminate_co.gif"
903 
               helpContextId="terminate_action_context"
904 
               icon="$nl$/icons/full/elcl16/terminate_co.gif"
905 
               label="%TerminateAction.label">
906 
            <visibleWhen checkEnabled="false">
907 
	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
908 
            </visibleWhen>
909 
         </command>
910 
         <command
911 
               commandId="org.eclipse.debug.ui.commands.Disconnect"
912 
               disabledIcon="$nl$/icons/full/dlcl16/disconnect_co.gif"
913 
               helpContextId="disconnect_action_context"
914 
               icon="$nl$/icons/full/elcl16/disconnect_co.gif"
915 
               label="%Disconnect.label">
916 
            <visibleWhen checkEnabled="false">
917 
	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
918 
            </visibleWhen>
919 
         </command>
920 
      </menuContribution>
921 
      <menuContribution locationURI="toolbar:org.eclipse.debug.ui.DebugView?after=stepIntoGroup">
922 
         <command
923 
               commandId="org.eclipse.debug.ui.commands.StepInto"
924 
               disabledIcon="$nl$/icons/full/dlcl16/stepinto_co.gif"
925 
               helpContextId="step_into_action_context"
926 
               icon="$nl$/icons/full/elcl16/stepinto_co.gif"
927 
               label="%StepIntoAction.label">
928 
            <visibleWhen checkEnabled="false">
929 
	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
930 
            </visibleWhen>
931 
         </command>
932 
      </menuContribution>
933 
      <menuContribution locationURI="toolbar:org.eclipse.debug.ui.DebugView?after=stepOverGroup">
934 
         <command
935 
               commandId="org.eclipse.debug.ui.commands.StepOver"
936 
               disabledIcon="$nl$/icons/full/dlcl16/stepover_co.gif"
937 
               helpContextId="step_over_action_context"
938 
               icon="$nl$/icons/full/elcl16/stepover_co.gif"
939 
               label="%StepOverAction.label">
940 
            <visibleWhen checkEnabled="false">
941 
	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
942 
            </visibleWhen>
943 
         </command>
944 
      </menuContribution>
945 
      <menuContribution locationURI="toolbar:org.eclipse.debug.ui.DebugView?after=stepReturnGroup">
946 
         <command
947 
               commandId="org.eclipse.debug.ui.commands.StepReturn"
948 
               disabledIcon="$nl$/icons/full/dlcl16/stepreturn_co.gif"
949 
               helpContextId="step_return_action_context"
950 
               icon="$nl$/icons/full/elcl16/stepreturn_co.gif"
951 
               label="%StepReturnAction.label">
952 
            <visibleWhen checkEnabled="false">
953 
	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
954 
            </visibleWhen>
955 
         </command>
956 
      </menuContribution>
957 
     <!-- Contributions to Debug View Popup menu -->
958 
      <menuContribution locationURI="popup:org.eclipse.debug.ui.DebugView?after=threadGroup">
959 
         <command
960 
               commandId="org.eclipse.debug.ui.commands.Resume"
961 
               disabledIcon="$nl$/icons/full/dlcl16/resume_co.gif"
962 
               helpContextId="resume_action_context"
963 
               icon="$nl$/icons/full/elcl16/resume_co.gif"
964 
               label="%ResumeAction.label">
965 
            <visibleWhen checkEnabled="false">
966 
	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
967 
            </visibleWhen>
968 
         </command>
969 
         <command
970 
               commandId="org.eclipse.debug.ui.commands.Suspend"
971 
               disabledIcon="$nl$/icons/full/dlcl16/suspend_co.gif"
972 
               helpContextId="suspend_action_context"
973 
               icon="$nl$/icons/full/elcl16/suspend_co.gif"
974 
               label="%SuspendAction.label">
975 
            <visibleWhen checkEnabled="false">
976 
	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
977 
            </visibleWhen>
978 
         </command>
979 
         <command
980 
               commandId="org.eclipse.debug.ui.commands.Terminate"
981 
               disabledIcon="$nl$/icons/full/dlcl16/terminate_co.gif"
982 
               helpContextId="terminate_action_context"
983 
               icon="$nl$/icons/full/elcl16/terminate_co.gif"
984 
               label="%TerminateAction.label">
985 
            <visibleWhen checkEnabled="false">
986 
	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
987 
            </visibleWhen>
988 
         </command>
989 
         <command
990 
               commandId="org.eclipse.debug.ui.commands.Disconnect"
991 
               disabledIcon="$nl$/icons/full/dlcl16/disconnect_co.gif"
992 
               helpContextId="disconnect_action_context"
993 
               icon="$nl$/icons/full/elcl16/disconnect_co.gif"
994 
               label="%Disconnect.label">
995 
            <visibleWhen checkEnabled="false">
996 
	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
997 
            </visibleWhen>
998 
         </command>
999 
      </menuContribution>
1000 
      <menuContribution locationURI="popup:org.eclipse.debug.ui.DebugView?after=stepIntoGroup">
1001 
         <command
1002 
               commandId="org.eclipse.debug.ui.commands.StepInto"
1003 
               disabledIcon="$nl$/icons/full/dlcl16/stepinto_co.gif"
1004 
               helpContextId="step_into_action_context"
1005 
               icon="$nl$/icons/full/elcl16/stepinto_co.gif"
1006 
               label="%StepIntoAction.label">
1007 
            <visibleWhen checkEnabled="false">
1008 
	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
1009 
            </visibleWhen>
1010 
         </command>
1011 
      </menuContribution>
1012 
      <menuContribution locationURI="popup:org.eclipse.debug.ui.DebugView?after=stepOverGroup">
1013 
         <command
1014 
               commandId="org.eclipse.debug.ui.commands.StepOver"
1015 
               disabledIcon="$nl$/icons/full/dlcl16/stepover_co.gif"
1016 
               helpContextId="step_over_action_context"
1017 
               icon="$nl$/icons/full/elcl16/stepover_co.gif"
1018 
               label="%StepOverAction.label">
1019 
            <visibleWhen checkEnabled="false">
1020 
	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
1021 
            </visibleWhen>
1022 
         </command>
1023 
      </menuContribution>
1024 
      <menuContribution locationURI="popup:org.eclipse.debug.ui.DebugView?after=stepReturnGroup">
1025 
         <command
1026 
               commandId="org.eclipse.debug.ui.commands.StepReturn"
1027 
               disabledIcon="$nl$/icons/full/dlcl16/stepreturn_co.gif"
1028 
               helpContextId="step_return_action_context"
1029 
               icon="$nl$/icons/full/elcl16/stepreturn_co.gif"
1030 
               label="%StepReturnAction.label">
1031 
            <visibleWhen checkEnabled="false">
1032 
	        	<systemTest property="org.eclipse.debug.ui.debugViewToolbarVisible" value="true"/>
1033 
            </visibleWhen>
1034 
         </command>
1035 
      </menuContribution>
1036 
   </extension>
1037
Line 734 Link Here
1040 
   <extension
1041 
         point="org.eclipse.ui.viewActions">
Line 3149 Link Here
3149 

              
              
            



(-)a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandAction.java
      (-2 / +4 lines)




  

    
      
            Line 26
          
      
      
        Link Here
      
    
  

            

              
              
              27
              
	public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.Disconnect";  //$NON-NLS-1$

            

            

              28
              
	

            

  

    
      
            Lines 28-29
          
      
      
        Link Here
      
    
  

          
            

              28
              
        setActionDefinitionId("org.eclipse.debug.ui.commands.Disconnect"); //$NON-NLS-1$


              30
              
		setActionDefinitionId(COMMAND_ID);

            

            

              29
              
    }


              31
              
	}

            



(-)a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandAction.java
      (-2 / +4 lines)




  

    
      
            Line 26
          
      
      
        Link Here
      
    
  

            

              
              
              27
              
	public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.DropToFrame";  //$NON-NLS-1$

            

            

              28
              
	

            

  

    
      
            Lines 28-29
          
      
      
        Link Here
      
    
  

          
            

              28
              
        setActionDefinitionId("org.eclipse.debug.ui.commands.DropToFrame"); //$NON-NLS-1$


              30
              
		setActionDefinitionId(COMMAND_ID);

            

            

              29
              
    }


              31
              
	}

            



(-)a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandAction.java
      (-1 / +3 lines)




  

    
      
            Line 26
          
      
      
        Link Here
      
    
  

            

              
              
              27
              
	public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.Resume";  //$NON-NLS-1$

            

            

              28
              
	

            

  

    
      
            Line 28
          
      
      
        Link Here
      
    
  

          
            

              28
              
		setActionDefinitionId("org.eclipse.debug.ui.commands.Resume"); //$NON-NLS-1$


              30
              
		setActionDefinitionId(COMMAND_ID);

            



(-)a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandAction.java
      (-1 / +3 lines)




  

    
      
            Line 26
          
      
      
        Link Here
      
    
  

            

              
              
              27
              
	public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.StepInto";  //$NON-NLS-1$

            

            

              28
              
	

            

  

    
      
            Line 28
          
      
      
        Link Here
      
    
  

          
            

              28
              
		setActionDefinitionId("org.eclipse.debug.ui.commands.StepInto"); //$NON-NLS-1$


              30
              
		setActionDefinitionId(COMMAND_ID);

            



(-)a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandHandler.java
      (+5 lines)




  

    
      
            Line 27
          
      
      
        Link Here
      
    
  

            

              
              
              28
              
    public boolean isEnabled() {

            

            

              29
              
        // TODO Auto-generated method stub

            

            

              30
              
        return super.isEnabled();

            

            

              31
              
    }

            

            

              32
              
    

            



(-)a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandAction.java
      (-1 / +3 lines)




  

    
      
            Line 27
          
      
      
        Link Here
      
    
  

            

              
              
              28
              
	public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.StepOver";  //$NON-NLS-1$

            

            

              29
              

            

  

    
      
            Line 29
          
      
      
        Link Here
      
    
  

          
            

              29
              
		setActionDefinitionId("org.eclipse.debug.ui.commands.StepOver"); //$NON-NLS-1$


              31
              
		setActionDefinitionId(COMMAND_ID);

            



(-)a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandHandler.java
      (+5 lines)




  

    
      
            Line 27
          
      
      
        Link Here
      
    
  

            

              
              
              28
              
    public boolean isEnabled() {

            

            

              29
              
        // TODO Auto-generated method stub

            

            

              30
              
        return super.isEnabled();

            

            

              31
              
    }

            

            

              32
              

            



(-)a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandAction.java
      (-1 / +2 lines)




  

    
      
            Line 26
          
      
      
        Link Here
      
    
  

            

              
              
              27
              
	public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.StepReturn";  //$NON-NLS-1$

            

  

    
      
            Line 29
          
      
      
        Link Here
      
    
  

          
            

              29
              
		setActionDefinitionId("org.eclipse.debug.ui.commands.StepReturn"); //$NON-NLS-1$	


              30
              
		setActionDefinitionId(COMMAND_ID);

            



(-)a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandAction.java
      (-2 / +4 lines)




  

    
      
            Line 26
          
      
      
        Link Here
      
    
  

            

              
              
              27
              
	public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.Suspend";  //$NON-NLS-1$

            

            

              28
              
	

            

  

    
      
            Lines 28-29
          
      
      
        Link Here
      
    
  

          
            

              28
              
        setActionDefinitionId("org.eclipse.debug.ui.commands.Suspend"); //$NON-NLS-1$


              30
              
		setActionDefinitionId(COMMAND_ID);

            

            

              29
              
    }


              31
              
	}

            



(-)a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandAction.java
      (-2 / +4 lines)




  

    
      
            Line 26
          
      
      
        Link Here
      
    
  

            

              
              
              27
              
	public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.Terminate";  //$NON-NLS-1$

            

            

              28
              
	

            

  

    
      
            Line 28
          
      
      
        Link Here
      
    
  

          
            

              28
              
		setActionDefinitionId("org.eclipse.debug.ui.commands.Terminate"); //$NON-NLS-1$


              30
              
		setActionDefinitionId(COMMAND_ID);

            

  

    
      
            Line 31
          
      
      
        Link Here
      
    
  

          
            

              31
              
    public String getText() {


              33
              
	public String getText() {

            



(-)a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersAction.java
      (+2 lines)




  

    
      
            Line 34
          
      
      
        Link Here
      
    
  

            

              
              
              35
              
	public final static String COMMAND_ID = "org.eclipse.debug.ui.commands.ToggleStepFilters";  //$NON-NLS-1$

            

            

              36
              
	

            



(-)a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java
      (-82 / +22 lines)




  

    
      
            Line 84
          
      
      
        Link Here
      
    
  

            

              84
              
import org.eclipse.jface.action.ActionContributionItem;

              
              
            

  

    
      
            Line 86
          
      
      
        Link Here
      
    
  

            

              
              
              86
              
import org.eclipse.jface.action.IContributionItem;

            

  

    
      
            Lines 144-159
          
      
      
        Link Here
      
    
  

            

              144
              

              
              
            

            

              145
              
    private static final String TERMINATE = "terminate"; //$NON-NLS-1$

            

            

              146
              

            

            

              147
              
    private static final String DISCONNECT = "disconnect"; //$NON-NLS-1$

            

            

              148
              

            

            

              149
              
    private static final String SUSPEND = "suspend"; //$NON-NLS-1$

            

            

              150
              

            

            

              151
              
    private static final String RESUME = "resume"; //$NON-NLS-1$

            

            

              152
              

            

            

              153
              
    private static final String STEP_RETURN = "step_return"; //$NON-NLS-1$

            

            

              154
              

            

            

              155
              
    private static final String STEP_OVER = "step_over"; //$NON-NLS-1$

            

            

              156
              

            

            

              157
              
    private static final String DROP_TO_FRAME = "drop_to_frame"; //$NON-NLS-1$

            

            

              158
              

            

            

              159
              
    private static final String STEP_INTO = "step_into"; //$NON-NLS-1$

            

  

    
      
            Lines 539-546
          
      
      
        Link Here
      
    
  

            

              539
              
        addCapabilityAction(new TerminateCommandAction(), TERMINATE);

              
              
            

            

              540
              
        addCapabilityAction(new DisconnectCommandAction(), DISCONNECT);

            

            

              541
              
        addCapabilityAction(new SuspendCommandAction(), SUSPEND);

            

            

              542
              
        addCapabilityAction(new ResumeCommandAction(), RESUME);

            

            

              543
              
        addCapabilityAction(new StepReturnCommandAction(), STEP_RETURN);

            

            

              544
              
        addCapabilityAction(new StepOverCommandAction(), STEP_OVER);

            

            

              545
              
        addCapabilityAction(new StepIntoCommandAction(), STEP_INTO);

            

            

              546
              
        addCapabilityAction(new DropToFrameCommandAction(), DROP_TO_FRAME);

            

  

    
      
            Line 995
          
      
      
        Link Here
      
    
  

          
            

              995
              
		    addDebugToolbarActions(tbm);


              971
              
		    setDebugToolbarActionsVisible(tbm, true);

            

  

    
      
            Lines 999-1011
          
      
      
        Link Here
      
    
  

          
            

              999
              
   protected void addDebugToolbarActions(IToolBarManager tbm) {


              975
              
	protected void setDebugToolbarActionsVisible(IToolBarManager tbm, boolean visible) {

            

            

              1000
              
        tbm.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(RESUME));


              976
              
		IContributionItem[] items = tbm.getItems();

            

            

              1001
              
        tbm.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(SUSPEND));


              977
              
		for (int i = 0; i < items.length; i++) {

            

            

              1002
              
        tbm.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(TERMINATE));


              978
              
			if (ResumeCommandAction.COMMAND_ID.equals(items[i].getId()) ||

            

            

              1003
              
        tbm.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(DISCONNECT));


              979
              
					SuspendCommandAction.COMMAND_ID.equals(items[i].getId()) ||

            

            

              1004
              
        


              980
              
					TerminateCommandAction.COMMAND_ID.equals(items[i].getId()) ||

            

            

              1005
              
        tbm.appendToGroup(IDebugUIConstants.STEP_INTO_GROUP, getAction(STEP_INTO));


              981
              
					DisconnectCommandAction.COMMAND_ID.equals(items[i].getId()) ||

            

            

              1006
              
        tbm.appendToGroup(IDebugUIConstants.STEP_OVER_GROUP, getAction(STEP_OVER));


              982
              
					StepIntoCommandAction.COMMAND_ID.equals(items[i].getId()) ||

            

            

              1007
              
        tbm.appendToGroup(IDebugUIConstants.STEP_RETURN_GROUP, getAction(STEP_RETURN));


              983
              
					StepOverCommandAction.COMMAND_ID.equals(items[i].getId()) ||

            

            

              1008
              


              984
              
					StepReturnCommandAction.COMMAND_ID.equals(items[i].getId()) ||

            

            

              1009
              
        tbm.appendToGroup(IDebugUIConstants.EMPTY_STEP_GROUP, getAction(DROP_TO_FRAME));


              985
              
					DropToFrameCommandAction.COMMAND_ID.equals(items[i].getId()) ||

            

            

              1010
              
        


              986
              
					ToggleStepFiltersAction.COMMAND_ID.equals(items[i].getId()) )

            

            

              1011
              
        tbm.appendToGroup(IDebugUIConstants.RENDER_GROUP, getAction(TOGGLE_STEP_FILTERS));


              987
              
			{

            

            

              
              

              988
              
				items[i].setVisible(visible);

            

            


              989
              
			}

            

            


              990
              
		}

            

  

    
      
            Lines 1013-1033
          
      
      
        Link Here
      
    
  

          
            

              1013
              
	


              992
              
		   

            

            

              1014
              
   /**


              
              
            

            

              1015
              
    * Removes the toolbar actions contributed by this view from the toolbar 


            

            

              1016
              
    * manager.


            

            

              1017
              
    * @param tbm


            

            

              1018
              
    */


            

            

              1019
              
   protected void removeDebugToolbarActions(IToolBarManager tbm) {


            

            

              1020
              
       tbm.remove(new ActionContributionItem(getAction(RESUME)));


            

            

              1021
              
       tbm.remove(new ActionContributionItem(getAction(SUSPEND)));


            

            

              1022
              
       tbm.remove(new ActionContributionItem(getAction(TERMINATE)));


            

            

              1023
              
       tbm.remove(new ActionContributionItem(getAction(DISCONNECT)));


            

            

              1024
              
       


            

            

              1025
              
       tbm.remove(new ActionContributionItem(getAction(STEP_INTO)));


            

            

              1026
              
       tbm.remove(new ActionContributionItem(getAction(STEP_OVER)));


            

            

              1027
              
       tbm.remove(new ActionContributionItem(getAction(STEP_RETURN)));


            

            

              1028
              
       


            

            

              1029
              
       tbm.remove(new ActionContributionItem(getAction(DROP_TO_FRAME)));


            

            

              1030
              
       


            

            

              1031
              
       tbm.remove(new ActionContributionItem(getAction(TOGGLE_STEP_FILTERS)));


            

            

              1032
              
   }


            

            

              1033
              
	   


            

  

    
      
            Line 1061
          
      
      
        Link Here
      
    
  

          
            

              1061
              
           addDebugToolbarActions(tbm);


              1020
              
           setDebugToolbarActionsVisible(tbm, true);

            

  

    
      
            Line 1063
          
      
      
        Link Here
      
    
  

          
            

              1063
              
           removeDebugToolbarActions(tbm);


              1022
              
           setDebugToolbarActionsVisible(tbm, false);

            

  

    
      
            Line 1065
          
      
      
        Link Here
      
    
  

            

              1065
              
       getViewSite().getActionBars().updateActionBars();

              
              
            

  

    
      
            Line 1068
          
      
      
        Link Here
      
    
  

            

              
              
              1027
              
       getViewSite().getActionBars().updateActionBars();

            

  

    
      
            Lines 1109-1116
          
      
      
        Link Here
      
    
  

            

              1109
              
        disposeCommandAction(TERMINATE);

              
              
            

            

              1110
              
        disposeCommandAction(DISCONNECT);

            

            

              1111
              
        disposeCommandAction(SUSPEND);

            

            

              1112
              
        disposeCommandAction(RESUME);

            

            

              1113
              
        disposeCommandAction(STEP_RETURN);

            

            

              1114
              
        disposeCommandAction(STEP_OVER);

            

            

              1115
              
        disposeCommandAction(STEP_INTO);

            

            

              1116
              
        disposeCommandAction(DROP_TO_FRAME);

            

  

    
      
            Lines 1242-1245
          
      
      
        Link Here
      
    
  

            

              1242
              
        menu.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(RESUME));

              
              
            

            

              1243
              
        menu.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(SUSPEND));

            

            

              1244
              
        menu.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(TERMINATE));

            

            

              1245
              
        menu.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(TERMINATE_AND_RELAUNCH));

            

  

    
      
            Lines 1249-1255
          
      
      
        Link Here
      
    
  

            

              1249
              
        menu.appendToGroup(IDebugUIConstants.THREAD_GROUP, getAction(DISCONNECT));

              
              
            

            

              1250
              
        

            

            

              1251
              
        menu.appendToGroup(IDebugUIConstants.STEP_INTO_GROUP, getAction(STEP_INTO));

            

            

              1252
              
        menu.appendToGroup(IDebugUIConstants.STEP_OVER_GROUP, getAction(STEP_OVER));

            

            

              1253
              
        menu.appendToGroup(IDebugUIConstants.STEP_RETURN_GROUP, getAction(STEP_RETURN));

            

            

              1254
              
        

            

            

              1255
              
        menu.appendToGroup(IDebugUIConstants.EMPTY_STEP_GROUP, getAction(DROP_TO_FRAME));

            






  

  Return to bug 381886