summaryrefslogtreecommitdiff
path: root/java/src/IceGridGUI/Application/AdapterEditor.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/AdapterEditor.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/AdapterEditor.java')
-rw-r--r--java/src/IceGridGUI/Application/AdapterEditor.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/java/src/IceGridGUI/Application/AdapterEditor.java b/java/src/IceGridGUI/Application/AdapterEditor.java
index 09fe22952b9..57af6662444 100644
--- a/java/src/IceGridGUI/Application/AdapterEditor.java
+++ b/java/src/IceGridGUI/Application/AdapterEditor.java
@@ -343,7 +343,7 @@ class AdapterEditor extends CommunicatorChildEditor
private void refreshId()
{
Object id = _id.getSelectedItem();
- _id.setModel(new DefaultComboBoxModel(new Object[]{DEFAULT_ADAPTER_ID}));
+ _id.setModel(new DefaultComboBoxModel<Object>(new Object[]{DEFAULT_ADAPTER_ID}));
_id.setSelectedItem(id);
}
@@ -603,14 +603,14 @@ class AdapterEditor extends CommunicatorChildEditor
private JTextField _name = new JTextField(20);
private JTextArea _description = new JTextArea(3, 20);
- private JComboBox _id = new JComboBox(new Object[] {DEFAULT_ADAPTER_ID});
- private JComboBox _replicaGroupId = new JComboBox();
+ private JComboBox<Object> _id = new JComboBox<Object>(new Object[] {DEFAULT_ADAPTER_ID});
+ private JComboBox<Object> _replicaGroupId = new JComboBox<Object>();
private JButton _replicaGroupButton;
private JTextField _priority = new JTextField(20);
private JTextField _endpoints = new JTextField(20);
- private JComboBox _publishedEndpoints = new JComboBox(new Object[]{PUBLISH_ACTUAL});
+ private JComboBox<Object> _publishedEndpoints = new JComboBox<Object>(new Object[]{PUBLISH_ACTUAL});
private JTextField _currentStatus = new JTextField(20);
private JTextField _currentEndpoints = new JTextField(20);