diff options
| author | Jose <jose@zeroc.com> | 2012-08-30 02:29:21 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-08-30 02:29:21 +0200 |
| commit | 59f7dc2cff82f159ee8c8ab85267f0e224f3b9f7 (patch) | |
| tree | 5d287d48584c61694889958da4c5d8318eb6fa54 /java/src/IceGridGUI/Application/ServerSubEditor.java | |
| parent | Minor fixes (diff) | |
| download | ice-59f7dc2cff82f159ee8c8ab85267f0e224f3b9f7.tar.bz2 ice-59f7dc2cff82f159ee8c8ab85267f0e224f3b9f7.tar.xz ice-59f7dc2cff82f159ee8c8ab85267f0e224f3b9f7.zip | |
FIX Java 7 warnings
Diffstat (limited to 'java/src/IceGridGUI/Application/ServerSubEditor.java')
| -rw-r--r-- | java/src/IceGridGUI/Application/ServerSubEditor.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/src/IceGridGUI/Application/ServerSubEditor.java b/java/src/IceGridGUI/Application/ServerSubEditor.java index 040c5e6cb25..7984c76324c 100644 --- a/java/src/IceGridGUI/Application/ServerSubEditor.java +++ b/java/src/IceGridGUI/Application/ServerSubEditor.java @@ -65,7 +65,7 @@ class ServerSubEditor extends CommunicatorSubEditor _envs = new SimpleMapField(mainEditor, true, "Name", "Value"); - _activation = new JComboBox(new Object[]{ALWAYS, MANUAL, ON_DEMAND, SESSION}); + _activation = new JComboBox<String>(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 +109,7 @@ class ServerSubEditor extends CommunicatorSubEditor _applicationDistrib = new JCheckBox(appDistrib); - _distrib = new JComboBox(new Object[]{NO_DISTRIB, DEFAULT_DISTRIB}); + _distrib = new JComboBox<Object>(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 +370,7 @@ class ServerSubEditor extends CommunicatorSubEditor private JTextField _user = new JTextField(20); private SimpleMapField _envs; - private JComboBox _activation; + private JComboBox<String> _activation; private JTextField _activationTimeout = new JTextField(20); private JTextField _deactivationTimeout = new JTextField(20); private JCheckBox _allocatable; |