summaryrefslogtreecommitdiff
path: root/java/src/IceGridGUI/Application/AdapterEditor.java
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2006-11-08 14:28:21 +0000
committerBenoit Foucher <benoit@zeroc.com>2006-11-08 14:28:21 +0000
commite68c94861e4ec677c0e66dd9bcfe6c8929a60991 (patch)
treee00773835dedcc49b2f42ccf68e116cc01ab035b /java/src/IceGridGUI/Application/AdapterEditor.java
parentAdded server-lifetime attribute and removed wait-for-activation. (diff)
downloadice-e68c94861e4ec677c0e66dd9bcfe6c8929a60991.tar.bz2
ice-e68c94861e4ec677c0e66dd9bcfe6c8929a60991.tar.xz
ice-e68c94861e4ec677c0e66dd9bcfe6c8929a60991.zip
Renamed "wait for activation" to "server lifetime"
Diffstat (limited to 'java/src/IceGridGUI/Application/AdapterEditor.java')
-rwxr-xr-xjava/src/IceGridGUI/Application/AdapterEditor.java18
1 files changed, 9 insertions, 9 deletions
diff --git a/java/src/IceGridGUI/Application/AdapterEditor.java b/java/src/IceGridGUI/Application/AdapterEditor.java
index f1bb5997df3..59fa100db11 100755
--- a/java/src/IceGridGUI/Application/AdapterEditor.java
+++ b/java/src/IceGridGUI/Application/AdapterEditor.java
@@ -93,16 +93,16 @@ class AdapterEditor extends CommunicatorChildEditor
+ "to enable clean shutdown; you should register<br>"
+ "exactly one Process object per server.</html>");
- Action checkWaitForActivation =
- new AbstractAction("Wait for Activation")
+ Action checkServerLifetime =
+ new AbstractAction("Server Lifetime")
{
public void actionPerformed(ActionEvent e)
{
updated();
}
};
- _waitForActivation = new JCheckBox(checkWaitForActivation);
- _waitForActivation.setToolTipText(
+ _serverLifetime = new JCheckBox(checkServerLifetime);
+ _serverLifetime.setToolTipText(
"<html>When starting the enclosing server, "
+ "does IceGrid<br>wait for this adapter to become active?</html>");
//
@@ -191,7 +191,7 @@ class AdapterEditor extends CommunicatorChildEditor
descriptor.replicaGroupId = getReplicaGroupIdAsString();
descriptor.priority = _priority.getText().trim();
descriptor.registerProcess = _registerProcess.isSelected();
- descriptor.waitForActivation = _waitForActivation.isSelected();
+ descriptor.serverLifetime = _serverLifetime.isSelected();
descriptor.objects = mapToObjectDescriptorSeq(_objects.get());
descriptor.allocatables = mapToObjectDescriptorSeq(_allocatables.get());
}
@@ -248,7 +248,7 @@ class AdapterEditor extends CommunicatorChildEditor
builder.append("", _registerProcess);
builder.nextLine();
- builder.append("", _waitForActivation);
+ builder.append("", _serverLifetime);
builder.nextLine();
builder.append("Well-known Objects");
@@ -498,8 +498,8 @@ class AdapterEditor extends CommunicatorChildEditor
_registerProcess.setSelected(descriptor.registerProcess);
_registerProcess.setEnabled(isEditable);
- _waitForActivation.setSelected(descriptor.waitForActivation);
- _waitForActivation.setEnabled(isEditable);
+ _serverLifetime.setSelected(descriptor.serverLifetime);
+ _serverLifetime.setEnabled(isEditable);
_applyButton.setEnabled(adapter.isEphemeral());
_discardButton.setEnabled(adapter.isEphemeral());
@@ -568,7 +568,7 @@ class AdapterEditor extends CommunicatorChildEditor
private JTextField _currentEndpoints = new JTextField(20);
private JCheckBox _registerProcess;
- private JCheckBox _waitForActivation;
+ private JCheckBox _serverLifetime;
private MapField _objects;
private MapField _allocatables;