MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

updated remote debug parameters hints depending on sdk version

Browse Source
This commit is contained in:
Eugene Zhuravlev
2012-04-12 13:58:37 +02:00
parent 24fba4d1a8
commit 738fd092ec
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/impl/src/com/intellij/execution/remote/RemoteConfigurable.form
+11 -4
View File
@@ -2,7 +2,7 @@
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.execution.remote.RemoteConfigurable">
<grid id="715ea" binding="myPanel" layout-manager="GridBagLayout">
<constraints>
<xy x="64" y="1" width="589" height="319"/>
<xy x="64" y="1" width="601" height="433"/>
</constraints>
<properties/>
<border type="none"/>
@@ -10,7 +10,7 @@
<grid id="e37d3" layout-manager="GridLayoutManager" row-count="4" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<gridbag weightx="1.0" weighty="0.0"/>
</constraints>
<properties/>
@@ -148,14 +148,14 @@
</component>
<component id="4362c" class="com.intellij.execution.ui.ConfigurationArgumentsHelpArea" binding="myJDK13HelpArea">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="9" fill="1" indent="0" use-parent-layout="false"/>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="9" fill="1" indent="0" use-parent-layout="false"/>
<gridbag top="15" left="0" bottom="15" right="0" weightx="1.0" weighty="0.0"/>
</constraints>
<properties/>
</component>
<component id="38070" class="com.intellij.openapi.ui.LabeledComponent" binding="myModule">
<constraints>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
<gridbag top="15" left="0" bottom="0" right="0" weightx="1.0" weighty="0.0"/>
</constraints>
<properties>
@@ -163,6 +163,13 @@
<text value="Search sources using the classpath of m&amp;odule (select &lt;no module&gt; to search across the whole project):" noi18n="true"/>
</properties>
</component>
<component id="2e3b8" class="com.intellij.execution.ui.ConfigurationArgumentsHelpArea" binding="myJDK14HelpArea">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="9" fill="1" indent="0" use-parent-layout="false"/>
<gridbag top="15" left="0" bottom="15" right="0" weightx="1.0" weighty="0.0"/>
</constraints>
<properties/>
</component>
</children>
</grid>
</form>
java/execution/impl/src/com/intellij/execution/remote/RemoteConfigurable.java
+7 -2
View File
@@ -51,6 +51,7 @@ public class RemoteConfigurable extends SettingsEditor<RemoteConfiguration> {
private JPanel mySocketPanel;
private ConfigurationArgumentsHelpArea myHelpArea;
@NonNls private ConfigurationArgumentsHelpArea myJDK13HelpArea;
private ConfigurationArgumentsHelpArea myJDK14HelpArea;
private LabeledComponent<JComboBox> myModule;
private String myHostName = "";
@NonNls
@@ -63,6 +64,8 @@ public class RemoteConfigurable extends SettingsEditor<RemoteConfiguration> {
myJDK13HelpArea.setLabelText(ExecutionBundle.message("environment.variables.helper.use.arguments.jdk13.label"));
myJDK13HelpArea.setToolbarVisible();
myJDK14HelpArea.setLabelText(ExecutionBundle.message("environment.variables.helper.use.arguments.jdk14.label"));
myJDK14HelpArea.setToolbarVisible();
final ButtonGroup transportGroup = new ButtonGroup();
transportGroup.add(myRbSocket);
@@ -190,8 +193,10 @@ public class RemoteConfigurable extends SettingsEditor<RemoteConfiguration> {
myRbListen.isSelected()
);
final String cmdLine = connection.getLaunchCommandLine();
myHelpArea.updateText(cmdLine);
// -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=7007
final String jvmtiCmdLine = cmdLine.replace("-Xdebug", "").replace("-Xrunjdwp:", "-agentlib:jdwp=").trim();
myHelpArea.updateText(jvmtiCmdLine);
myJDK14HelpArea.updateText(cmdLine);
myJDK13HelpArea.updateText("-Xnoagent -Djava.compiler=NONE " + cmdLine);
}