diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-11-08 14:28:21 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-11-08 14:28:21 +0000 |
| commit | e68c94861e4ec677c0e66dd9bcfe6c8929a60991 (patch) | |
| tree | e00773835dedcc49b2f42ccf68e116cc01ab035b /java/src | |
| parent | Added server-lifetime attribute and removed wait-for-activation. (diff) | |
| download | ice-e68c94861e4ec677c0e66dd9bcfe6c8929a60991.tar.bz2 ice-e68c94861e4ec677c0e66dd9bcfe6c8929a60991.tar.xz ice-e68c94861e4ec677c0e66dd9bcfe6c8929a60991.zip | |
Renamed "wait for activation" to "server lifetime"
Diffstat (limited to 'java/src')
| -rwxr-xr-x | java/src/IceGridGUI/Application/Adapter.java | 6 | ||||
| -rwxr-xr-x | java/src/IceGridGUI/Application/AdapterEditor.java | 18 | ||||
| -rwxr-xr-x | java/src/IceGridGUI/LiveDeployment/AdapterEditor.java | 8 |
3 files changed, 16 insertions, 16 deletions
diff --git a/java/src/IceGridGUI/Application/Adapter.java b/java/src/IceGridGUI/Application/Adapter.java index f7153ff7211..b6aea3083ea 100755 --- a/java/src/IceGridGUI/Application/Adapter.java +++ b/java/src/IceGridGUI/Application/Adapter.java @@ -130,7 +130,7 @@ class Adapter extends TreeNode implements DescriptorHolder _descriptor.replicaGroupId = ad.replicaGroupId; _descriptor.description = ad.description; _descriptor.registerProcess = ad.registerProcess; - _descriptor.waitForActivation = ad.waitForActivation; + _descriptor.serverLifetime = ad.serverLifetime; _descriptor.objects = ad.objects; } @@ -163,9 +163,9 @@ class Adapter extends TreeNode implements DescriptorHolder { attributes.add(createAttribute("priority", _descriptor.priority)); } - if(!_descriptor.waitForActivation) + if(!_descriptor.serverLifetime) { - attributes.add(createAttribute("wait-for-activation", "false")); + attributes.add(createAttribute("server-lifetime", "false")); } if(_descriptor.description.length() == 0 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; diff --git a/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java b/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java index 05279b756b8..aa44dfc081c 100755 --- a/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java +++ b/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java @@ -40,7 +40,7 @@ class AdapterEditor extends Editor _endpoints.setEditable(false); _publishedEndpoints.setEditable(false); _registerProcess.setEnabled(false); - _waitForActivation.setEnabled(false); + _serverLifetime.setEnabled(false); } @@ -76,7 +76,7 @@ class AdapterEditor extends Editor resolver.substitute((String)properties.get(adapter.getId() + ".PublishedEndpoints"))); _registerProcess.setSelected(descriptor.registerProcess); - _waitForActivation.setSelected(descriptor.waitForActivation); + _serverLifetime.setSelected(descriptor.serverLifetime); _objects.setObjects(descriptor.objects, resolver); _allocatables.setObjects(descriptor.allocatables, resolver); @@ -129,7 +129,7 @@ class AdapterEditor extends Editor builder.append("", _registerProcess); builder.nextLine(); - builder.append("", _waitForActivation); + builder.append("", _serverLifetime); builder.nextLine(); builder.append("Well-known Objects"); @@ -178,7 +178,7 @@ class AdapterEditor extends Editor private JTextField _publishedEndpoints = new JTextField(20); private JCheckBox _registerProcess = new JCheckBox("Register Process"); - private JCheckBox _waitForActivation = new JCheckBox("Wait for Activation"); + private JCheckBox _serverLifetime = new JCheckBox("Server Lifetime"); private TableField _objects = new TableField("Identity", "Type"); private TableField _allocatables = new TableField("Identity", "Type"); |