diff options
Diffstat (limited to 'java/src')
| -rwxr-xr-x | java/src/IceGridGUI/Application/PlainServer.java | 5 | ||||
| -rwxr-xr-x | java/src/IceGridGUI/Application/ServerSubEditor.java | 14 | ||||
| -rwxr-xr-x | java/src/IceGridGUI/LiveDeployment/ServerEditor.java | 7 |
3 files changed, 1 insertions, 25 deletions
diff --git a/java/src/IceGridGUI/Application/PlainServer.java b/java/src/IceGridGUI/Application/PlainServer.java index 315d4212a5b..1f7805abfd0 100755 --- a/java/src/IceGridGUI/Application/PlainServer.java +++ b/java/src/IceGridGUI/Application/PlainServer.java @@ -81,9 +81,7 @@ class PlainServer extends Communicator implements Server true, new DistributionDescriptor("", new java.util.LinkedList()), false, // Allocatable - "", - "" // Ice version - ); + ""); } static public IceBoxDescriptor newIceBoxDescriptor() @@ -111,7 +109,6 @@ class PlainServer extends Communicator implements Server new DistributionDescriptor("", new java.util.LinkedList()), false, // Allocatable "", - "", // Ice version new java.util.LinkedList() ); } diff --git a/java/src/IceGridGUI/Application/ServerSubEditor.java b/java/src/IceGridGUI/Application/ServerSubEditor.java index 3acedfe0a7f..058c8ab2d27 100755 --- a/java/src/IceGridGUI/Application/ServerSubEditor.java +++ b/java/src/IceGridGUI/Application/ServerSubEditor.java @@ -35,11 +35,6 @@ class ServerSubEditor extends CommunicatorSubEditor _mainEditor.getUpdateListener()); _id.setToolTipText("Must be unique within this IceGrid deployment"); - _iceVersion.getDocument().addDocumentListener( - _mainEditor.getUpdateListener()); - _iceVersion.setToolTipText("<html>This server's Ice version, such as 3.0 or 3.1.1;<br>" - + "leave blank to use the version of the IceGrid registry.</html>"); - _exe.getDocument().addDocumentListener( _mainEditor.getUpdateListener()); _exe.setToolTipText("<html>Path to this server's executable, e.g.:<br>" @@ -146,9 +141,6 @@ class ServerSubEditor extends CommunicatorSubEditor builder.append("Server ID"); builder.append(_id, 3); builder.nextLine(); - builder.append("Ice Version"); - builder.append(_iceVersion, 3); - builder.nextLine(); // // Add Communicator fields @@ -212,7 +204,6 @@ class ServerSubEditor extends CommunicatorSubEditor { ServerDescriptor descriptor = getServerDescriptor(); descriptor.id = _id.getText().trim(); - descriptor.iceVersion = _iceVersion.getText().trim(); descriptor.exe = _exe.getText().trim(); descriptor.pwd = _pwd.getText().trim(); @@ -278,10 +269,6 @@ class ServerSubEditor extends CommunicatorSubEditor } _id.setEditable(isEditable); - _iceVersion.setText( - Utils.substitute(descriptor.iceVersion, detailResolver)); - _iceVersion.setEditable(isEditable); - _exe.setText( Utils.substitute(descriptor.exe, detailResolver)); _exe.setEditable(isEditable); @@ -393,7 +380,6 @@ class ServerSubEditor extends CommunicatorSubEditor static private final String DEFAULT_DISTRIB = "${application}.IcePatch2/server"; private JTextField _id = new JTextField(20); - private JTextField _iceVersion = new JTextField(20); private JTextField _exe = new JTextField(20); private JTextField _pwd = new JTextField(20); private ListTextField _options = new ListTextField(20); diff --git a/java/src/IceGridGUI/LiveDeployment/ServerEditor.java b/java/src/IceGridGUI/LiveDeployment/ServerEditor.java index 37299ce5be2..c216a4c9d71 100755 --- a/java/src/IceGridGUI/LiveDeployment/ServerEditor.java +++ b/java/src/IceGridGUI/LiveDeployment/ServerEditor.java @@ -50,7 +50,6 @@ class ServerEditor extends CommunicatorEditor _enabled.setEnabled(false); _application.setEditable(false); - _iceVersion.setEditable(false); _exe.setEditable(false); _pwd.setEditable(false); @@ -115,7 +114,6 @@ class ServerEditor extends CommunicatorEditor final Utils.Resolver resolver = server.getResolver(); _application.setText(resolver.find("application")); - _iceVersion.setText(resolver.substitute(descriptor.iceVersion)); super.show(descriptor, server.getProperties(), resolver); @@ -186,9 +184,6 @@ class ServerEditor extends CommunicatorEditor builder.append(_application); builder.append(_gotoApplication); builder.nextLine(); - builder.append("Ice Version"); - builder.append(_iceVersion, 3); - builder.nextLine(); // // Add Communicator fields @@ -285,8 +280,6 @@ class ServerEditor extends CommunicatorEditor private JTextField _application = new JTextField(20); private JButton _gotoApplication; - private JTextField _iceVersion = new JTextField(20); - private JTextField _exe = new JTextField(20); private JTextField _pwd = new JTextField(20); private JTextField _user = new JTextField(20); |