diff options
| author | Bernard Normier <bernard@zeroc.com> | 2006-06-19 14:51:07 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2006-06-19 14:51:07 +0000 |
| commit | 3f9bd9e83b997d0de00003ca2be782603e6d3f57 (patch) | |
| tree | cdddf50f198fa8f2f5128d4e083b2abb32bbc930 /java/src/IceGridGUI/Application/AdapterEditor.java | |
| parent | Add missing check for null adminAdapters in the FilterManager constructor. (diff) | |
| download | ice-3f9bd9e83b997d0de00003ca2be782603e6d3f57.tar.bz2 ice-3f9bd9e83b997d0de00003ca2be782603e6d3f57.tar.xz ice-3f9bd9e83b997d0de00003ca2be782603e6d3f57.zip | |
Removed direct adapters
Diffstat (limited to 'java/src/IceGridGUI/Application/AdapterEditor.java')
| -rwxr-xr-x | java/src/IceGridGUI/Application/AdapterEditor.java | 40 |
1 files changed, 10 insertions, 30 deletions
diff --git a/java/src/IceGridGUI/Application/AdapterEditor.java b/java/src/IceGridGUI/Application/AdapterEditor.java index adfee9b1922..0d108fd40ef 100755 --- a/java/src/IceGridGUI/Application/AdapterEditor.java +++ b/java/src/IceGridGUI/Application/AdapterEditor.java @@ -142,7 +142,7 @@ class AdapterEditor extends CommunicatorChildEditor _endpoints.getDocument().addDocumentListener(_updateListener);
_endpoints.setToolTipText(
- "<html>The network interfaces on which this adapter receives requests;<br>"
+ "<html>The network interface(s) on which this object adapter receives requests;<br>"
+ "for example:<br>"
+ " tcp (listen on all local interfaces using a random port)<br>"
+ " tcp -h venus.foo.com (listen on just one interface)<br>"
@@ -157,7 +157,7 @@ class AdapterEditor extends CommunicatorChildEditor JTextField idTextField = (JTextField)
_id.getEditor().getEditorComponent();
idTextField.getDocument().addDocumentListener(_updateListener);
- _id.setToolTipText("If set, must be unique within this IceGrid deployment");
+ _id.setToolTipText("Identities this object adapter within an IceGrid deployment");
JTextField replicaGroupIdTextField = (JTextField)
_replicaGroupId.getEditor().getEditorComponent();
@@ -168,9 +168,7 @@ class AdapterEditor extends CommunicatorChildEditor _publishedEndpoints.getEditor().getEditorComponent();
publishedEndpointsTextField.getDocument().addDocumentListener(_updateListener);
_publishedEndpoints.setToolTipText(
- "<html>Direct adapter: endpoints included in proxies created using this adapter.<br>"
- + "Indirect adapter: endpoints registered with the IceGrid Registry during the activation of this adapter."
- + "</html>");
+ "Endpoints registered with the IceGrid Registry during the activation of this adapter.");
}
@@ -310,11 +308,7 @@ class AdapterEditor extends CommunicatorChildEditor private void setId(String id)
{
- if(id.equals(""))
- {
- _id.setSelectedItem(DIRECT_ADAPTER);
- }
- else if(id.equals(_defaultAdapterId))
+ if(id.equals(_defaultAdapterId))
{
_id.setSelectedItem(DEFAULT_ADAPTER_ID);
}
@@ -328,21 +322,14 @@ class AdapterEditor extends CommunicatorChildEditor {
Object id = _id.getSelectedItem();
_id.setModel(new DefaultComboBoxModel(new Object[]
- {DIRECT_ADAPTER, DEFAULT_ADAPTER_ID}));
+ {DEFAULT_ADAPTER_ID}));
_id.setSelectedItem(id);
}
private String getIdAsString()
{
Object obj = _id.getSelectedItem();
- if(obj == DIRECT_ADAPTER)
- {
- return "";
- }
- else
- {
- return obj.toString().trim();
- }
+ return obj.toString().trim();
}
private void setReplicaGroupId(String replicaGroupId)
@@ -387,7 +374,9 @@ class AdapterEditor extends CommunicatorChildEditor {
return check(new String[]{
"Adapter Name", _name.getText().trim(),
- "Endpoints", _endpoints.getText().trim()});
+ "Adapter ID", getIdAsString(),
+ "Endpoints", _endpoints.getText().trim()
+ });
}
void show(Adapter adapter)
@@ -552,8 +541,7 @@ class AdapterEditor extends CommunicatorChildEditor private JTextField _name = new JTextField(20);
private JTextArea _description = new JTextArea(3, 20);
- private JComboBox _id = new JComboBox(new Object[]
- {DIRECT_ADAPTER, DEFAULT_ADAPTER_ID});
+ private JComboBox _id = new JComboBox(new Object[] {DEFAULT_ADAPTER_ID});
private JComboBox _replicaGroupId = new JComboBox();
private JButton _replicaGroupButton;
@@ -577,14 +565,6 @@ class AdapterEditor extends CommunicatorChildEditor return "Actual endpoints";
}
};
-
- static private final Object DIRECT_ADAPTER = new Object()
- {
- public String toString()
- {
- return "No ID (a direct adapter)";
- }
- };
static private final Object NOT_REPLICATED = new Object()
{
|