summaryrefslogtreecommitdiff
path: root/java/src/IceGridGUI/Application/ApplicationEditor.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/Application/ApplicationEditor.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/Application/ApplicationEditor.java')
-rw-r--r--java/src/IceGridGUI/Application/ApplicationEditor.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/IceGridGUI/Application/ApplicationEditor.java b/java/src/IceGridGUI/Application/ApplicationEditor.java
index 5cfcd174be4..4b97f7f6569 100644
--- a/java/src/IceGridGUI/Application/ApplicationEditor.java
+++ b/java/src/IceGridGUI/Application/ApplicationEditor.java
@@ -100,7 +100,7 @@ class ApplicationEditor extends Editor
//
// Distrib
//
- _distrib = new JComboBox(new Object[]{NO_DISTRIB, DEFAULT_DISTRIB});
+ _distrib = new JComboBox<Object>(new Object[]{NO_DISTRIB, DEFAULT_DISTRIB});
_distrib.setEditable(true);
_distrib.setToolTipText("The proxy to the IcePatch2 server holding your files");
@@ -253,6 +253,6 @@ class ApplicationEditor extends Editor
private JTextField _name = new JTextField(20);
private JTextArea _description = new JTextArea(3, 20);
private SimpleMapField _variables;
- private JComboBox _distrib;
+ private JComboBox<Object> _distrib;
private ListTextField _distribDirs = new ListTextField(20);
}