revert back to old launch system, using shortcuts for launching stanz…

…as directly
JPMoresmau · Dec 20, 2011 · 1f41060 · 1f41060
1 parent de18274
commit 1f41060
Show file tree

Hide file tree

Showing 25 changed files with 531 additions and 252 deletions.
diff --git a/net.sf.eclipsefp.haskell.debug.core/plugin.xml b/net.sf.eclipsefp.haskell.debug.core/plugin.xml
@@ -2,6 +2,41 @@
 <?eclipse version="3.2"?>
 <plugin>
 
+   <extension
+         point="org.eclipse.debug.core.launchConfigurationTypes">
+      <launchConfigurationType
+            delegate="net.sf.eclipsefp.haskell.debug.core.internal.launch.HaskellLaunchDelegate"
+            id="net.sf.eclipsefp.haskell.debug.core.internal.launch.HaskellLaunchDelegate"
+            modes="run, debug"
+            name="%haskellInteractiveLaunchType_name"
+            sourceLocatorId="net.sf.eclipsefp.haskell.debug.core.sourceLookupDirector"
+            sourcePathComputerId="net.sf.eclipsefp.haskell.debug.core.sourcePathComputer">
+      </launchConfigurationType>
+      <launchConfigurationType
+            delegate="net.sf.eclipsefp.haskell.debug.core.internal.launch.ExecutableHaskellLaunchDelegate"
+            id="net.sf.eclipsefp.haskell.debug.core.internal.launch.ExecutableHaskellLaunchDelegate"
+            modes="run"
+            name="%haskellApplicationLaunchType_name"
+            sourceLocatorId="net.sf.eclipsefp.haskell.debug.core.sourceLookupDirector"
+            sourcePathComputerId="net.sf.eclipsefp.haskell.debug.core.sourcePathComputer">
+      </launchConfigurationType>
+      <launchConfigurationType
+            delegate="net.sf.eclipsefp.haskell.debug.core.internal.launch.TestSuiteHaskellLaunchDelegate"
+            id="net.sf.eclipsefp.haskell.debug.core.internal.launch.TestSuiteHaskellLaunchDelegate"
+            modes="run"
+            name="%testSuiteLaunchType_name"
+            sourceLocatorId="net.sf.eclipsefp.haskell.debug.core.sourceLookupDirector"
+            sourcePathComputerId="net.sf.eclipsefp.haskell.debug.core.sourcePathComputer">
+      </launchConfigurationType>
+      <launchConfigurationType
+            delegate="net.sf.eclipsefp.haskell.debug.core.internal.launch.ExecutableProfilingHaskellLaunchDelegate"
+            id="net.sf.eclipsefp.haskell.debug.core.internal.launch.ExecutableProfilingHaskellLaunchDelegate"
+            modes="run"
+            name="%haskellProfilingLaunchType_name"
+            sourceLocatorId="net.sf.eclipsefp.haskell.debug.core.sourceLookupDirector"
+            sourcePathComputerId="net.sf.eclipsefp.haskell.debug.core.sourcePathComputer">
+      </launchConfigurationType>
+   </extension>
    <extension
          point="org.eclipse.debug.core.breakpoints">
       <breakpoint
@@ -35,7 +70,7 @@
             id="net.sf.eclipsefp.haskell.debug.core.sourcePathComputer">
       </sourcePathComputer>
    </extension>
-   <extension
+<!--   <extension
          point="org.eclipse.debug.core.launchConfigurationTypes">
       <launchConfigurationType
             delegate="net.sf.eclipsefp.haskell.debug.core.internal.launch.young.BaseExecutableLaunchDelegate"
@@ -69,5 +104,5 @@
             sourceLocatorId="net.sf.eclipsefp.haskell.debug.core.sourceLookupDirector"
             sourcePathComputerId="net.sf.eclipsefp.haskell.debug.core.sourcePathComputer">
       </launchConfigurationType>
-   </extension>
+   </extension>-->
 </plugin>
diff --git a/net.sf.eclipsefp.haskell.debug.ui/META-INF/MANIFEST.MF b/net.sf.eclipsefp.haskell.debug.ui/META-INF/MANIFEST.MF
@@ -26,3 +26,4 @@ Export-Package: net.sf.eclipsefp.haskell.debug.ui.internal;x-friends:="net.sf.ec
  net.sf.eclipsefp.haskell.debug.ui.internal.launch;x-friends:="net.sf.eclipsefp.haskell.hugs",
  net.sf.eclipsefp.haskell.debug.ui.internal.launch.ghci;x-friends:="net.sf.eclipsefp.haskell.debug.ui.test",
  net.sf.eclipsefp.haskell.debug.ui.internal.launch.young
+Bundle-ActivationPolicy: lazy
diff --git a/net.sf.eclipsefp.haskell.debug.ui/plugin.xml b/net.sf.eclipsefp.haskell.debug.ui/plugin.xml
@@ -78,7 +78,7 @@
      		debugModel="net.sf.eclipsefp.haskell.debug"
      		delegateClass="net.sf.eclipsefp.haskell.debug.ui.internal.debug.HaskellWatchExpressionDelegate"/>
   	</extension>
-      <extension
+ <!--     <extension
             point="org.eclipse.debug.ui.launchConfigurationTypeImages">
          <launchConfigurationTypeImage
                configTypeID="net.sf.eclipsefp.haskell.debug.ui.internal.launch.young.GhciInteractiveLaunchDelegate"
@@ -123,62 +123,228 @@
                id="net.sf.eclipsefp.haskell.debug.ui.internal.launch.young.TestSuiteLaunchTabGroup"
                type="net.sf.eclipsefp.haskell.debug.core.internal.launch.young.TestSuiteLaunchDelegate">
          </launchConfigurationTabGroup>
-      </extension>
-      <extension
-            point="org.eclipse.debug.ui.launchShortcuts">
-         <shortcut
-               class="net.sf.eclipsefp.haskell.debug.ui.internal.launch.young.GhciInteractiveLaunchShortcut"
-               icon="icons/etool16/ghci16.gif"
-               id="net.sf.eclipsefp.haskell.debug.ui.internal.launch.young.GhciInteractiveLaunchShortcut"
-               label="%ghciShortcut_label"
-               modes="run, debug">
-            <contextualLaunch>
-               <enablement>
-                  <with
-                        variable="selection">
-                     <count
-                           value="1">
-                     </count>
-                     <iterate>
-                        <adapt
-                              type="org.eclipse.core.resources.IResource">
-                           <test
-                                 property="net.sf.eclipsefp.haskell.core.isHaskellFile">
-                           </test>
-                        </adapt>
-                     </iterate>
-                  </with>
-               </enablement>
-               <contextLabel
-                     label="%ghciContextLabel_label"
-                     mode="run">
-               </contextLabel>
-            </contextualLaunch>
-         </shortcut>
-      </extension>
-      <extension
+      </extension> -->
+         <extension
+         point="org.eclipse.debug.ui.launchConfigurationTypeImages">
+      <launchConfigurationTypeImage
+            icon="icons/etool16/ghci16.gif"
+            configTypeID="net.sf.eclipsefp.haskell.debug.core.internal.launch.HaskellLaunchDelegate"
+            id="net.sf.eclipsefp.haskell.ui.launch.launchIcon">
+      </launchConfigurationTypeImage>
+      <launchConfigurationTypeImage
+            icon="icons/etool16/hsexe16.gif"
+            configTypeID="net.sf.eclipsefp.haskell.debug.core.internal.launch.ExecutableHaskellLaunchDelegate"
+            id="net.sf.eclipsefp.haskell.ui.launch.launchExecutableIcon">
+      </launchConfigurationTypeImage>
+      <launchConfigurationTypeImage
+            configTypeID="net.sf.eclipsefp.haskell.debug.core.internal.launch.ExecutableProfilingHaskellLaunchDelegate"
+            icon="icons/etool16/hsexe16.gif"
+            id="net.sf.eclipsefp.haskell.ui.launch.launchExecutableProfilingIcon">
+      </launchConfigurationTypeImage>
+      <launchConfigurationTypeImage
+            configTypeID="net.sf.eclipsefp.haskell.debug.core.internal.launch.TestSuiteHaskellLaunchDelegate"
+            icon="icons/etool16/hsexe16.gif"
+            id="net.sf.eclipsefp.haskell.ui.launch.launchTestSuiteIcon">
+      </launchConfigurationTypeImage>
+   </extension>
+   <extension
+         point="org.eclipse.debug.ui.launchConfigurationTabGroups">
+      <launchConfigurationTabGroup
+            type="net.sf.eclipsefp.haskell.debug.core.internal.launch.HaskellLaunchDelegate"
+            class="net.sf.eclipsefp.haskell.debug.ui.internal.launch.HaskellLaunchTabGroup"
+            id="net.sf.eclipsefp.haskell.debug.ui.internal.launch.HaskellLaunchTabGroup">
+      </launchConfigurationTabGroup>
+       <launchConfigurationTabGroup
+            type="net.sf.eclipsefp.haskell.debug.core.internal.launch.ExecutableHaskellLaunchDelegate"
+            class="net.sf.eclipsefp.haskell.debug.ui.internal.launch.ExecutableTestSuiteHaskellLaunchTabGroup"
+            id="net.sf.eclipsefp.haskell.debug.ui.internal.launch.ExecutableHaskellLaunchTabGroup">
+      </launchConfigurationTabGroup>
+       <launchConfigurationTabGroup
+             class="net.sf.eclipsefp.haskell.debug.ui.internal.launch.ExecutableTestSuiteHaskellLaunchTabGroup"
+             id="net.sf.eclipsefp.haskell.debug.ui.internal.launch.ExecutableHaskellLaunchTabGroup"
+             type="net.sf.eclipsefp.haskell.debug.core.internal.launch.TestSuiteHaskellLaunchDelegate">
+       </launchConfigurationTabGroup>
+       <launchConfigurationTabGroup
+             class="net.sf.eclipsefp.haskell.debug.ui.internal.launch.ExecutableTestSuiteHaskellLaunchTabGroup"
+             id="net.sf.eclipsefp.haskell.debug.ui.internal.launch.ExecutableHaskellLaunchTabGroup"
+             type="net.sf.eclipsefp.haskell.debug.core.internal.launch.ExecutableProfilingHaskellLaunchDelegate">
+       </launchConfigurationTabGroup>
+   </extension>
+   <extension
+         point="org.eclipse.debug.ui.launchShortcuts">
+      <shortcut
+            label="%appLaunchShortcut_label"
+            icon="icons/etool16/hsexe16.gif"
+            class="net.sf.eclipsefp.haskell.debug.ui.internal.launch.ExecutableLaunchShortcut"
+            modes="run"
+            id="net.sf.eclipsefp.haskell.debug.ui.internal.launch.ExecutableLaunchShortcut">
+         <contextualLaunch>
+            <enablement>
+               <with
+                     variable="selection">
+                  <count
+                        value="1">
+                  </count>
+                  <iterate>
+                  	<or>
+                  	 <test
+                           property="net.sf.eclipsefp.haskell.core.isProjectExecutable">
+                     </test>
+                     <instanceof value="net.sf.eclipsefp.haskell.ui.internal.views.projectexplorer.ProjectExplorerStanza"/>
+                     </or>
+                  </iterate>
+               </with>
+            </enablement>
+            <contextLabel
+                  label="%appLaunchContextLabel_label"
+                  mode="run">
+            </contextLabel>
+         </contextualLaunch>
+      </shortcut>
+      <shortcut
+            label="%ghciShortcut_label"
+            icon="icons/etool16/ghci16.gif"
+            class="net.sf.eclipsefp.haskell.debug.ui.internal.launch.ghci.GhciLaunchShortcut"
+            modes="run, debug"
+            id="net.sf.eclipsefp.haskell.debug.ui.internal.launch.ghci.GhciLaunchShortcut">
+         <contextualLaunch>
+            <enablement>
+               <with variable="selection">
+                 <count value="1" />
+                 <iterate>
+                   <adapt type="org.eclipse.core.resources.IResource">
+                     <test property="net.sf.eclipsefp.haskell.core.isHaskellFile"/>
+                   </adapt>
+                 </iterate>
+               </with>
+            </enablement>
+            <contextLabel
+                  label="%ghciContextLabel_label"
+                  mode="run">
+            </contextLabel>
+         </contextualLaunch>
+      </shortcut>
+      <shortcut
+            class="net.sf.eclipsefp.haskell.debug.ui.internal.launch.TestSuiteLaunchShortcut"
+            icon="icons/etool16/hsexe16.gif"
+            id="net.sf.eclipsefp.haskell.debug.ui.internal.launch.TestSuiteLaunchShortcut"
+            label="%testSuiteLaunchShortcut_label"
+            modes="run">
+         <contextualLaunch>
+            <enablement>
+               <with
+                     variable="selection">
+                  <count
+                        value="1">
+                  </count>
+                  <iterate>
+                     <test
+                           property="net.sf.eclipsefp.haskell.core.isProjectTestSuite">
+                     </test>
+                  </iterate>
+               </with>
+            </enablement>
+            <contextLabel
+                  label="%testSuiteLaunchContextLabel_label"
+                  mode="run">
+            </contextLabel>
+         </contextualLaunch>
+      </shortcut>
+      <shortcut
+            class="net.sf.eclipsefp.haskell.debug.ui.internal.launch.ExecutableProfilingLaunchShortcut"
+            icon="icons/etool16/hsexe16.gif"
+            id="net.sf.eclipsefp.haskell.debug.ui.internal.launch.ExecutableProfilingLaunchShortcut"
+            label="%appLaunchProfilingShortcut_label"
+            modes="run">
+         <contextualLaunch>
+            <enablement>
+               <with
+                     variable="selection">
+                  <count
+                        value="1">
+                  </count>
+                  <iterate>
+                     <test
+                           property="net.sf.eclipsefp.haskell.core.isProjectExecutable">
+                     </test>
+                  </iterate>
+               </with>
+            </enablement>
+            <contextLabel
+                  label="%appLaunchProfilingContextLabel_label"
+                  mode="run">
+            </contextLabel>
+         </contextualLaunch>
+      </shortcut>
+   </extension>
+   <extension point="org.eclipse.ui.commands">
+      <command
+            name="%runGHCiShortcut_name"
+            description="%runGHCiShortcut_desc"
+            categoryId="org.eclipse.debug.ui.category.run"
+            id="net.sf.eclipsefp.haskell.debug.ui.internal.launch.ghci.GhciLaunchShortcut.run">
+      </command>
+      <command
+            name="%runHaskellShortcut_name"
+            description="%runHaskellShortcut_desc"
+            categoryId="org.eclipse.debug.ui.category.run"
+            id="net.sf.eclipsefp.haskell.debug.ui.internal.launch.ExecutableLaunchShortcut.run">
+      </command>
+      <command
+            categoryId="org.eclipse.debug.ui.category.run"
+            description="%runTestSuiteShortcut_desc"
+            id="net.sf.eclipsefp.haskell.debug.ui.internal.launch.TestSuiteLaunchShortcut.run"
+            name="%runTestSuiteShortcut_name">
+      </command>
+      <command
+            categoryId="org.eclipse.debug.ui.category.run"
+            description="%runHaskellProfilingShortcut_desc"
+            id="net.sf.eclipsefp.haskell.debug.ui.internal.launch.ExecutableProfilingLaunchShortcut.run"
+            name="%runHaskellProfilingShortcut_name">
+      </command>
+   </extension>
+   <extension point="org.eclipse.ui.bindings">
+      <key sequence="M3+M2+X G"
+           commandId="net.sf.eclipsefp.haskell.debug.ui.internal.launch.ghci.GhciLaunchShortcut.run"
+           schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key sequence="M3+M2+X H"
+           commandId="net.sf.eclipsefp.haskell.debug.ui.internal.launch.ExecutableLaunchShortcut.run"
+           schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
+      <key
+            commandId="net.sf.eclipsefp.haskell.debug.ui.internal.launch.TestSuiteLaunchShortcut.run"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+            sequence="M3+M2+X F">
+      </key>
+      <key
+            commandId="net.sf.eclipsefp.haskell.debug.ui.internal.launch.ExecutableProfilingLaunchShortcut.run"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+            sequence="M3+M2+X R">
+      </key>
+   </extension>
+  <extension
             point="org.eclipse.ui.navigator.viewer">
          <viewerActionBinding
                viewerId="org.eclipse.ui.navigator.ProjectExplorer">
             <includes>
                <actionExtension
-                     pattern="net.sf.eclipsefp.haskell.debug.ui.internal.launch.young.RunActionProvider">
+                     pattern="net.sf.eclipsefp.haskell.debug.ui.internal.launch.RunActionProvider">
                </actionExtension>
             </includes>
          </viewerActionBinding>
       </extension>
       <extension
             point="org.eclipse.ui.navigator.navigatorContent">
          <actionProvider
-               class="net.sf.eclipsefp.haskell.debug.ui.internal.launch.young.RunActionProvider"
-               id="net.sf.eclipsefp.haskell.debug.ui.internal.launch.young.RunActionProvider">
+               class="net.sf.eclipsefp.haskell.debug.ui.internal.launch.RunActionProvider"
+               id="net.sf.eclipsefp.haskell.debug.ui.internal.launch.RunActionProvider">
             <enablement>
                <instanceof
                      value="net.sf.eclipsefp.haskell.ui.internal.views.projectexplorer.ProjectExplorerStanza">
                </instanceof>
             </enablement>
          </actionProvider>
       </extension>
+      <!--
       <extension
             point="org.eclipse.debug.core.launchConfigurationTypes">
          <launchConfigurationType
@@ -189,6 +355,6 @@
                sourceLocatorId="net.sf.eclipsefp.haskell.debug.core.sourceLookupDirector"
                sourcePathComputerId="net.sf.eclipsefp.haskell.debug.core.sourcePathComputer">
          </launchConfigurationType>
-      </extension>
+      </extension>-->
 
 </plugin>
diff --git a/...psefp.haskell.debug.ui/src/net/sf/eclipsefp/haskell/debug/ui/internal/HaskellDebugUI.java b/...psefp.haskell.debug.ui/src/net/sf/eclipsefp/haskell/debug/ui/internal/HaskellDebugUI.java
@@ -19,6 +19,7 @@ public static HaskellDebugUI getDefault() {
   }
 
 
+
   // interface methods of Activator
   /////////////////////////////////