summaryrefslogtreecommitdiff
path: root/java/src/IceGridGUI/Application/ServerInstancePropertySetEditor.java
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2013-07-04 22:21:31 +0200
committerJose <jose@zeroc.com>2013-07-04 22:21:31 +0200
commitfc7fc8af52548043dca3b3ee9ddbccaf1477008c (patch)
treef6a45c482eb1bef1470b175aed53bba186c790a0 /java/src/IceGridGUI/Application/ServerInstancePropertySetEditor.java
parentFixed ICE-5346 - return empty map rather than no maps for metrics view if the... (diff)
downloadice-fc7fc8af52548043dca3b3ee9ddbccaf1477008c.tar.bz2
ice-fc7fc8af52548043dca3b3ee9ddbccaf1477008c.tar.xz
ice-fc7fc8af52548043dca3b3ee9ddbccaf1477008c.zip
Fixed ICE-5344 - IceGrid Admin without JavaFX?
Diffstat (limited to 'java/src/IceGridGUI/Application/ServerInstancePropertySetEditor.java')
-rw-r--r--java/src/IceGridGUI/Application/ServerInstancePropertySetEditor.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/java/src/IceGridGUI/Application/ServerInstancePropertySetEditor.java b/java/src/IceGridGUI/Application/ServerInstancePropertySetEditor.java
index 6518ba1b5d0..bc11a570415 100644
--- a/java/src/IceGridGUI/Application/ServerInstancePropertySetEditor.java
+++ b/java/src/IceGridGUI/Application/ServerInstancePropertySetEditor.java
@@ -51,17 +51,18 @@ class ServerInstancePropertySetEditor extends PropertySetEditor
}
}
+ @SuppressWarnings("unchecked")
protected void showId(String unsubstitutedId, Utils.Resolver resolver)
{
ServerInstance s = (ServerInstance)_target.getParent();
_id.setEnabled(true);
_id.setEditable(true);
- _id.setModel(new DefaultComboBoxModel<String>(s.getServiceNames()));
+ _id.setModel(new DefaultComboBoxModel(s.getServiceNames()));
_id.setSelectedItem(Utils.substitute(unsubstitutedId, resolver));
_id.setEditable(resolver == null);
_id.setEnabled(resolver == null);
}
- private JComboBox<String> _id = new JComboBox<String>();
+ private JComboBox _id = new JComboBox();
}