diff options
| author | Bernard Normier <bernard@zeroc.com> | 2005-11-11 23:43:53 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2005-11-11 23:43:53 +0000 |
| commit | 96df30b42ef645bda39516979abd05e19689f65d (patch) | |
| tree | 1637746059ba3b3a742db4ecc5e11dfa3dca26bd /java/src | |
| parent | f64 specific fix (diff) | |
| download | ice-96df30b42ef645bda39516979abd05e19689f65d.tar.bz2 ice-96df30b42ef645bda39516979abd05e19689f65d.tar.xz ice-96df30b42ef645bda39516979abd05e19689f65d.zip | |
Fixed minor bugs reported by Benoit
Diffstat (limited to 'java/src')
| -rwxr-xr-x | java/src/IceGrid/TreeNode/AdapterEditor.java | 46 | ||||
| -rwxr-xr-x | java/src/IceGrid/TreeNode/ServerTemplate.java | 9 |
2 files changed, 40 insertions, 15 deletions
diff --git a/java/src/IceGrid/TreeNode/AdapterEditor.java b/java/src/IceGrid/TreeNode/AdapterEditor.java index 3b3785eeb72..e8da0a4bc27 100755 --- a/java/src/IceGrid/TreeNode/AdapterEditor.java +++ b/java/src/IceGrid/TreeNode/AdapterEditor.java @@ -158,7 +158,6 @@ class AdapterEditor extends ListElementEditor _waitForActivation.setToolTipText( "<html>When starting the enclosing server, " + "does IceGrid<br>wait for this adapter to become active?</html>"); - // // Associate updateListener with various fields // @@ -186,12 +185,8 @@ class AdapterEditor extends ListElementEditor // // Recompute default id // - String defaultAdapterId = getAdapter().getDefaultAdapterId(_name.getText()); - - Object id = _id.getSelectedItem(); - _id.setModel(new DefaultComboBoxModel(new Object[] - {DIRECT_ADAPTER, defaultAdapterId})); - _id.setSelectedItem(id); + _defaultAdapterId = getAdapter().getDefaultAdapterId(_name.getText()); + refreshId(); } }); @@ -377,12 +372,24 @@ class AdapterEditor extends ListElementEditor { _id.setSelectedItem(DIRECT_ADAPTER); } - else + else if(id.equals(_defaultAdapterId)) + { + _id.setSelectedItem(DEFAULT_ADAPTER_ID); + } + else { _id.setSelectedItem(id); } } + private void refreshId() + { + Object id = _id.getSelectedItem(); + _id.setModel(new DefaultComboBoxModel(new Object[] + {DIRECT_ADAPTER, DEFAULT_ADAPTER_ID})); + _id.setSelectedItem(id); + } + private String getIdAsString() { Object obj = _id.getSelectedItem(); @@ -390,7 +397,7 @@ class AdapterEditor extends ListElementEditor { return ""; } - else + else { return obj.toString(); } @@ -463,13 +470,12 @@ class AdapterEditor extends ListElementEditor // _id.setEnabled(true); _id.setEditable(true); - String defaultAdapterId = adapter.getDefaultAdapterId(); + _defaultAdapterId = adapter.getDefaultAdapterId(); + refreshId(); if(descriptor.id == null) { - descriptor.id = defaultAdapterId; + descriptor.id = _defaultAdapterId; } - _id.setModel(new DefaultComboBoxModel(new Object[] - {DIRECT_ADAPTER, defaultAdapterId})); setId(Utils.substitute(descriptor.id, resolver)); _id.setEnabled(isEditable); @@ -604,13 +610,23 @@ class AdapterEditor extends ListElementEditor return result; } + private String _defaultAdapterId = ""; + + private final Object DEFAULT_ADAPTER_ID = new Object() + { + public String toString() + { + return _defaultAdapterId; + } + }; private String _oldName; private JTextField _name = new JTextField(20); private JTextArea _description = new JTextArea(3, 20); - private JComboBox _id = new JComboBox(); + private JComboBox _id = new JComboBox(new Object[] + {DIRECT_ADAPTER, DEFAULT_ADAPTER_ID}); private JComboBox _replicaGroupId = new JComboBox(); private JButton _replicaGroupButton; @@ -644,7 +660,7 @@ class AdapterEditor extends ListElementEditor return "No ID (a direct adapter)"; } }; - + static private final Object NOT_REPLICATED = new Object() { public String toString() diff --git a/java/src/IceGrid/TreeNode/ServerTemplate.java b/java/src/IceGrid/TreeNode/ServerTemplate.java index fed50cdfe66..e167863eab1 100755 --- a/java/src/IceGrid/TreeNode/ServerTemplate.java +++ b/java/src/IceGrid/TreeNode/ServerTemplate.java @@ -109,6 +109,7 @@ class ServerTemplate extends EditableParent actions[NEW_ADAPTER] = (_adapters != null && _services == null);
actions[NEW_SERVICE] = (_services != null);
+ actions[NEW_SERVICE_FROM_TEMPLATE] = (_services != null);
actions[NEW_DBENV] = (_dbEnvs != null);
return actions;
@@ -134,6 +135,10 @@ class ServerTemplate extends EditableParent {
_services.newService();
}
+ public void newServiceFromTemplate()
+ {
+ _services.newServiceFromTemplate();
+ }
public JPopupMenu getPopupMenu()
{
@@ -152,6 +157,10 @@ class ServerTemplate extends EditableParent item = new JMenuItem(_model.getActions()[NEW_SERVICE]);
item.setText("New service");
_popup.add(item);
+
+ item = new JMenuItem(_model.getActions()[NEW_SERVICE_FROM_TEMPLATE]);
+ item.setText("New service from template");
+ _popup.add(item);
}
return _popup;
}
|