diff options
| author | Jose <jose@zeroc.com> | 2013-07-04 22:21:31 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2013-07-04 22:21:31 +0200 |
| commit | fc7fc8af52548043dca3b3ee9ddbccaf1477008c (patch) | |
| tree | f6a45c482eb1bef1470b175aed53bba186c790a0 /java/src/IceGridGUI/Application/ServerSubEditor.java | |
| parent | Fixed ICE-5346 - return empty map rather than no maps for metrics view if the... (diff) | |
| download | ice-fc7fc8af52548043dca3b3ee9ddbccaf1477008c.tar.bz2 ice-fc7fc8af52548043dca3b3ee9ddbccaf1477008c.tar.xz ice-fc7fc8af52548043dca3b3ee9ddbccaf1477008c.zip | |
Fixed ICE-5344 - IceGrid Admin without JavaFX?
Diffstat (limited to 'java/src/IceGridGUI/Application/ServerSubEditor.java')
| -rw-r--r-- | java/src/IceGridGUI/Application/ServerSubEditor.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/java/src/IceGridGUI/Application/ServerSubEditor.java b/java/src/IceGridGUI/Application/ServerSubEditor.java index 09e474ea806..9fb3f059a35 100644 --- a/java/src/IceGridGUI/Application/ServerSubEditor.java +++ b/java/src/IceGridGUI/Application/ServerSubEditor.java @@ -26,6 +26,7 @@ import com.jgoodies.forms.layout.CellConstraints; import IceGrid.*; import IceGridGUI.*; +@SuppressWarnings("unchecked") class ServerSubEditor extends CommunicatorSubEditor { ServerSubEditor(Editor mainEditor) @@ -65,7 +66,7 @@ class ServerSubEditor extends CommunicatorSubEditor _envs = new SimpleMapField(mainEditor, true, "Name", "Value"); - _activation = new JComboBox<String>(new String[]{ALWAYS, MANUAL, ON_DEMAND, SESSION}); + _activation = new JComboBox(new String[]{ALWAYS, MANUAL, ON_DEMAND, SESSION}); _activation.setToolTipText("<html>always: IceGrid starts and keeps the server up all the time<br>" + "manual: you start the server yourself<br>" + "on-demand: IceGrid starts the server when a client needs it<br>" @@ -109,7 +110,7 @@ class ServerSubEditor extends CommunicatorSubEditor _applicationDistrib = new JCheckBox(appDistrib); - _distrib = new JComboBox<Object>(new Object[]{NO_DISTRIB, DEFAULT_DISTRIB}); + _distrib = new JComboBox(new Object[]{NO_DISTRIB, DEFAULT_DISTRIB}); _distrib.setToolTipText("The proxy to the IcePatch2 server holding your files"); JTextField distribTextField = (JTextField)_distrib.getEditor().getEditorComponent(); @@ -370,7 +371,7 @@ class ServerSubEditor extends CommunicatorSubEditor private JTextField _user = new JTextField(20); private SimpleMapField _envs; - private JComboBox<String> _activation; + private JComboBox _activation; private JTextField _activationTimeout = new JTextField(20); private JTextField _deactivationTimeout = new JTextField(20); private JCheckBox _allocatable; |