summaryrefslogtreecommitdiff
path: root/java/src/IceGridGUI/SessionKeeper.java
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2012-08-30 02:29:21 +0200
committerJose <jose@zeroc.com>2012-08-30 02:29:21 +0200
commit59f7dc2cff82f159ee8c8ab85267f0e224f3b9f7 (patch)
tree5d287d48584c61694889958da4c5d8318eb6fa54 /java/src/IceGridGUI/SessionKeeper.java
parentMinor fixes (diff)
downloadice-59f7dc2cff82f159ee8c8ab85267f0e224f3b9f7.tar.bz2
ice-59f7dc2cff82f159ee8c8ab85267f0e224f3b9f7.tar.xz
ice-59f7dc2cff82f159ee8c8ab85267f0e224f3b9f7.zip
FIX Java 7 warnings
Diffstat (limited to 'java/src/IceGridGUI/SessionKeeper.java')
-rw-r--r--java/src/IceGridGUI/SessionKeeper.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/java/src/IceGridGUI/SessionKeeper.java b/java/src/IceGridGUI/SessionKeeper.java
index 8164a3ef170..c8ba79984d6 100644
--- a/java/src/IceGridGUI/SessionKeeper.java
+++ b/java/src/IceGridGUI/SessionKeeper.java
@@ -1057,7 +1057,7 @@ class SessionKeeper
catch(java.io.IOException e)
{}
}
- _alias.setModel(new DefaultComboBoxModel(aliasVector));
+ _alias.setModel(new DefaultComboBoxModel<String>(aliasVector));
if(selectedAlias != null)
{
_alias.setSelectedItem(selectedAlias);
@@ -1071,7 +1071,7 @@ class SessionKeeper
private void clearAlias()
{
- _alias.setModel(new DefaultComboBoxModel());
+ _alias.setModel(new DefaultComboBoxModel<String>());
}
private void selectRegistryUseSSL(boolean selected)
@@ -1174,7 +1174,7 @@ class SessionKeeper
private JPasswordField _advancedKeyPassword = new JPasswordField(_keyPassword.getDocument(), null, 30);
private JPasswordField _keystorePassword = new JPasswordField(30);
- private JComboBox _alias = new JComboBox();
+ private JComboBox<String> _alias = new JComboBox<String>();
private JTextField _truststore = new JTextField(30);
private JPasswordField _truststorePassword = new JPasswordField(30);