diff --git a/java/execution/impl/src/com/intellij/execution/remote/RemoteConfigurable.form b/java/execution/impl/src/com/intellij/execution/remote/RemoteConfigurable.form index b9334af6915b..94cd8b27de81 100644 --- a/java/execution/impl/src/com/intellij/execution/remote/RemoteConfigurable.form +++ b/java/execution/impl/src/com/intellij/execution/remote/RemoteConfigurable.form @@ -1,8 +1,9 @@
- + + - + @@ -11,7 +12,6 @@ - @@ -19,25 +19,17 @@ - + - + - - - - - - - - - + @@ -53,18 +45,26 @@ - + + + + + + + + + - + @@ -79,7 +79,7 @@ - + @@ -141,34 +141,38 @@ - - + - + + + - - + - + + + - - + + + - - + - + + + diff --git a/java/execution/impl/src/com/intellij/execution/remote/RemoteConfigurable.java b/java/execution/impl/src/com/intellij/execution/remote/RemoteConfigurable.java index 5179eab1b1df..cfcf4e1d29a9 100644 --- a/java/execution/impl/src/com/intellij/execution/remote/RemoteConfigurable.java +++ b/java/execution/impl/src/com/intellij/execution/remote/RemoteConfigurable.java @@ -128,20 +128,20 @@ public class RemoteConfigurable extends SettingsEditor { myAddressField.addFocusListener(fieldFocusListener); myPortField.addFocusListener(fieldFocusListener); - myModuleSelector = new ConfigurationModuleSelector(project, myModule.getComponent()); + myModuleSelector = new ConfigurationModuleSelector(project, myModule.getComponent(), ""); } public void applyEditorTo(@NotNull final RemoteConfiguration configuration) throws ConfigurationException { configuration.HOST = (myHostField.isEditable() ? myHostField.getText() : myHostName).trim(); - if ("".equals(configuration.HOST)) { + if (configuration.HOST != null && configuration.HOST.isEmpty()) { configuration.HOST = null; } configuration.PORT = myPortField.getText().trim(); - if ("".equals(configuration.PORT)) { + if (configuration.PORT != null && configuration.PORT.isEmpty()) { configuration.PORT = null; } configuration.SHMEM_ADDRESS = myAddressField.getText().trim(); - if ("".equals(configuration.SHMEM_ADDRESS)) { + if (configuration.SHMEM_ADDRESS != null && configuration.SHMEM_ADDRESS.isEmpty()) { configuration.SHMEM_ADDRESS = null; } configuration.USE_SOCKET_TRANSPORT = myRbSocket.isSelected(); diff --git a/java/execution/impl/src/com/intellij/execution/ui/ConfigurationArgumentsHelpArea.form b/java/execution/impl/src/com/intellij/execution/ui/ConfigurationArgumentsHelpArea.form index 5b0bfbf163b6..2a714c767bcb 100644 --- a/java/execution/impl/src/com/intellij/execution/ui/ConfigurationArgumentsHelpArea.form +++ b/java/execution/impl/src/com/intellij/execution/ui/ConfigurationArgumentsHelpArea.form @@ -3,14 +3,14 @@ - + - + @@ -19,9 +19,14 @@ - + + + - + + + + @@ -29,7 +34,7 @@ - + diff --git a/java/execution/impl/src/com/intellij/execution/ui/ConfigurationArgumentsHelpArea.java b/java/execution/impl/src/com/intellij/execution/ui/ConfigurationArgumentsHelpArea.java index 5bb5ee45eac5..ef2bebd366bb 100644 --- a/java/execution/impl/src/com/intellij/execution/ui/ConfigurationArgumentsHelpArea.java +++ b/java/execution/impl/src/com/intellij/execution/ui/ConfigurationArgumentsHelpArea.java @@ -19,6 +19,7 @@ import com.intellij.execution.ExecutionBundle; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.ide.CopyPasteManager; import com.intellij.openapi.ui.FixedSizeButton; +import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.PopupHandler; import com.intellij.util.PlatformIcons; @@ -37,6 +38,7 @@ public class ConfigurationArgumentsHelpArea extends JPanel { public ConfigurationArgumentsHelpArea() { super(new BorderLayout()); add(myPanel); + setBorder(IdeBorderFactory.createEmptyBorder(10, 0, 0, 0)); final DefaultActionGroup group = new DefaultActionGroup(); group.add(new MyCopyAction()); @@ -64,7 +66,7 @@ public class ConfigurationArgumentsHelpArea extends JPanel { public void setToolbarVisible() { myToolbarPanel.setVisible(true); } - + private static ActionPopupMenu createPopupMenu(DefaultActionGroup group) { return ActionManager.getInstance().createActionPopupMenu(ActionPlaces.UNKNOWN, group); } diff --git a/java/execution/impl/src/com/intellij/execution/ui/ConfigurationModuleSelector.java b/java/execution/impl/src/com/intellij/execution/ui/ConfigurationModuleSelector.java index 6150292913fe..f63e679684ff 100644 --- a/java/execution/impl/src/com/intellij/execution/ui/ConfigurationModuleSelector.java +++ b/java/execution/impl/src/com/intellij/execution/ui/ConfigurationModuleSelector.java @@ -35,8 +35,8 @@ import java.util.Comparator; import java.util.List; public class ConfigurationModuleSelector { - private static final String NO_MODULE = ""; + private final String myNoModule; private final Project myProject; private final JComboBox myModulesList; private final SortedComboBoxModel myModules = new SortedComboBoxModel(new Comparator() { @@ -49,6 +49,11 @@ public class ConfigurationModuleSelector { }); public ConfigurationModuleSelector(final Project project, final JComboBox modulesList) { + this(project, modulesList, ""); + } + + public ConfigurationModuleSelector(final Project project, final JComboBox modulesList, String noModule) { + myNoModule = noModule; myProject = project; myModulesList = modulesList; new ComboboxSpeedSearch(modulesList){ @@ -56,7 +61,7 @@ public class ConfigurationModuleSelector { if (element instanceof Module){ return ((Module)element).getName(); } else if (element == null) { - return NO_MODULE; + return myNoModule; } return super.getElementText(element); } @@ -71,7 +76,7 @@ public class ConfigurationModuleSelector { setText(module.getName()); } else if (value == null) { - setText(NO_MODULE); + setText(myNoModule); } } }); diff --git a/platform/platform-resources-en/src/messages/ExecutionBundle.properties b/platform/platform-resources-en/src/messages/ExecutionBundle.properties index 71c7b5cabc4d..d03c6b7f3810 100644 --- a/platform/platform-resources-en/src/messages/ExecutionBundle.properties +++ b/platform/platform-resources-en/src/messages/ExecutionBundle.properties @@ -252,11 +252,11 @@ remote.configuration.socket.radio=Socket remote.configuration.shared.memory.address.label=Shared memory address: remote.configuration.port.label=Port: remote.configuration.host.label=Host: -remote.configuration.remote.debugging.allows.you.to.connect.idea.to.a.running.jvm.label=&Remote debugging allows you to connect IDEA to a running JVM started with the following command line arguments +remote.configuration.remote.debugging.allows.you.to.connect.idea.to.a.running.jvm.label=&Command line arguments for running remote JVM standard.runner.description=Run selected configuration environment.variables.helper.use.arguments.label=Use the following command line arguments for running remote JVM -environment.variables.helper.use.arguments.jdk13.label=If the &application runs on JDK 1.3.x or earlier, use following arguments -environment.variables.helper.use.arguments.jdk14.label=If the &application runs on JDK 1.4.x, use following arguments +environment.variables.helper.use.arguments.jdk13.label=For JDK 1.3.x or earlier +environment.variables.helper.use.arguments.jdk14.label=For JDK 1.4.x select.run.configuration.for.item.action.name=Select ''{0}'' save.run.configuration.for.item.action.name=Save ''{0}'' junit.runing.info.status.done.count=Done: {0}