Bug 569503 - Integrate "Show Command Line" with OT-adjustments
incl. adding missing superBase re
org.eclipse.debug.core.model.LaunchConfigurationDelegate
org.eclipse.jdt.launching.AbstractJavaLaunchConfigurationDelegate
(both were reported in a fresh workspace, not the regular dev ws).
diff --git a/plugins/org.eclipse.objectteams.otdt.debug.adaptor/plugin.xml b/plugins/org.eclipse.objectteams.otdt.debug.adaptor/plugin.xml
index cb57fc9..e6b9159 100644
--- a/plugins/org.eclipse.objectteams.otdt.debug.adaptor/plugin.xml
+++ b/plugins/org.eclipse.objectteams.otdt.debug.adaptor/plugin.xml
@@ -174,6 +174,14 @@
activation="ALL_THREADS"
class="org.eclipse.objectteams.otdt.internal.debug.adaptor.launching.PDELaunchingAdaptor"
icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif">
+ <superBase
+ class="org.eclipse.objectteams.otdt.debug.adaptor.SuperBase1"
+ plugin="org.eclipse.debug.core">
+ </superBase>
+ <superBase
+ class="org.eclipse.objectteams.otdt.debug.adaptor.SuperBase2"
+ plugin="org.eclipse.jdt.launching">
+ </superBase>
</team>
</aspectBinding>
</extension>
diff --git a/plugins/org.eclipse.objectteams.otdt.debug.adaptor/src/org/eclipse/objectteams/otdt/internal/debug/adaptor/launching/PDELaunchingAdaptor.java b/plugins/org.eclipse.objectteams.otdt.debug.adaptor/src/org/eclipse/objectteams/otdt/internal/debug/adaptor/launching/PDELaunchingAdaptor.java
index 293728d..bec5a66 100644
--- a/plugins/org.eclipse.objectteams.otdt.debug.adaptor/src/org/eclipse/objectteams/otdt/internal/debug/adaptor/launching/PDELaunchingAdaptor.java
+++ b/plugins/org.eclipse.objectteams.otdt.debug.adaptor/src/org/eclipse/objectteams/otdt/internal/debug/adaptor/launching/PDELaunchingAdaptor.java
@@ -238,7 +238,7 @@
}
// install breakpoints and record launch mode (run/debug):
- prepareLaunch <- before launch;
+ prepareLaunch <- before launch, showCommandLine;
}
/** Unfortunately JUnit launches are slightly different (and not related by inheritance) */
@@ -263,7 +263,7 @@
}
// install breakpoints and record launch mode (run/debug):
- prepareLaunch <- before launch;
+ prepareLaunch <- before launch, showCommandLine;
}
protected class SetOTEquinoxStartlevel playedBy BundleLauncherHelper {