From abada90e3f84dc703b8ddc9efcbed8a946fadead Mon Sep 17 00:00:00 2001 From: Bernard Normier Date: Thu, 1 Feb 2007 17:09:49 +0000 Subject: Expanded tabs into spaces --- .../IceGridGUI/Application/ServerSubEditor.java | 656 ++++++++++----------- 1 file changed, 328 insertions(+), 328 deletions(-) (limited to 'java/src/IceGridGUI/Application/ServerSubEditor.java') diff --git a/java/src/IceGridGUI/Application/ServerSubEditor.java b/java/src/IceGridGUI/Application/ServerSubEditor.java index aee4c65a92f..3acedfe0a7f 100755 --- a/java/src/IceGridGUI/Application/ServerSubEditor.java +++ b/java/src/IceGridGUI/Application/ServerSubEditor.java @@ -29,352 +29,352 @@ class ServerSubEditor extends CommunicatorSubEditor { ServerSubEditor(Editor mainEditor) { - super(mainEditor); - - _id.getDocument().addDocumentListener( - _mainEditor.getUpdateListener()); - _id.setToolTipText("Must be unique within this IceGrid deployment"); - - _iceVersion.getDocument().addDocumentListener( - _mainEditor.getUpdateListener()); - _iceVersion.setToolTipText("This server's Ice version, such as 3.0 or 3.1.1;
" - + "leave blank to use the version of the IceGrid registry."); - - _exe.getDocument().addDocumentListener( - _mainEditor.getUpdateListener()); - _exe.setToolTipText("Path to this server's executable, e.g.:
" - + "icebox
" - + "java
" - + "myHelloServer
" - + "C:\\testbed\\hello\\server"); - - _pwd.getDocument().addDocumentListener( - _mainEditor.getUpdateListener()); - _pwd.setToolTipText( - "If not set, the server will start in " - + "node data dir/servers/server-id;
" - + "relative directories are relative to the current directory" - + " of the icegridnode process."); - - _options.getDocument().addDocumentListener( - _mainEditor.getUpdateListener()); - _options.setToolTipText( - "Command-line arguments for this server.
" - + "Use whitespace as separator; use double-quotes around arguments containing whitespaces"); - - _user.getDocument().addDocumentListener( - _mainEditor.getUpdateListener()); - _user.setToolTipText( - "Run the server using this user account.
" - + "This feature is only available on Unix/Linux, when the IceGrid node runs as root."); - - _envs = new MapField(mainEditor, "Name", "Value", true); - - _activation = new JComboBox(new Object[]{ALWAYS, MANUAL, ON_DEMAND, SESSION}); - _activation.setToolTipText("always: IceGrid starts and keeps the server up all the time
" - + "manual: you start the server yourself
" - + "on-demand: IceGrid starts the server when a client needs it
" - + "session: IceGrid starts and shuts down the server for each session"); - - JTextField activationTextField = (JTextField) - _activation.getEditor().getEditorComponent(); - activationTextField.getDocument().addDocumentListener( - _mainEditor.getUpdateListener()); - - _activationTimeout.getDocument().addDocumentListener( - _mainEditor.getUpdateListener()); - _activationTimeout.setToolTipText("Number of seconds; if not set or set to 0, " - + "the IceGrid Node
uses the value of its " - + "IceGrid.Node.WaitTime property"); - _deactivationTimeout.getDocument().addDocumentListener( - _mainEditor.getUpdateListener()); - _deactivationTimeout.setToolTipText("Number of seconds; if not set or set to 0, " - + "the IceGrid Node
uses the value of its " - + "IceGrid.Node.WaitTime property"); - - Action allocatable = new AbstractAction("Allocatable") - { - public void actionPerformed(ActionEvent e) - { - _mainEditor.updated(); - } - }; - allocatable.putValue(Action.SHORT_DESCRIPTION, - "Check this box to ensure that the well-known objects
" - + "of this server can only be allocated by one session at a time."); - _allocatable = new JCheckBox(allocatable); - - - Action appDistrib = new AbstractAction("Depends on the application distribution") - { - public void actionPerformed(ActionEvent e) - { - _mainEditor.updated(); - } - }; - appDistrib.putValue(Action.SHORT_DESCRIPTION, - "Check this box if this server needs to be restarted
" - + "each time the distribution for your application is refreshed."); - - _applicationDistrib = new JCheckBox(appDistrib); - - _distrib = new JComboBox(new Object[]{NO_DISTRIB, DEFAULT_DISTRIB}); - _distrib.setToolTipText( - "The proxy to the IcePatch2 server holding your files"); - - JTextField distribTextField = (JTextField) - _distrib.getEditor().getEditorComponent(); - distribTextField.getDocument().addDocumentListener( - _mainEditor.getUpdateListener()); - - _distribDirs.getDocument().addDocumentListener( - _mainEditor.getUpdateListener()); - _distribDirs.setToolTipText( - "Include only these directories when patching.
" - + "Use whitespace as separator; use double-quotes around directories containing whitespaces"); - + super(mainEditor); + + _id.getDocument().addDocumentListener( + _mainEditor.getUpdateListener()); + _id.setToolTipText("Must be unique within this IceGrid deployment"); + + _iceVersion.getDocument().addDocumentListener( + _mainEditor.getUpdateListener()); + _iceVersion.setToolTipText("This server's Ice version, such as 3.0 or 3.1.1;
" + + "leave blank to use the version of the IceGrid registry."); + + _exe.getDocument().addDocumentListener( + _mainEditor.getUpdateListener()); + _exe.setToolTipText("Path to this server's executable, e.g.:
" + + "icebox
" + + "java
" + + "myHelloServer
" + + "C:\\testbed\\hello\\server"); + + _pwd.getDocument().addDocumentListener( + _mainEditor.getUpdateListener()); + _pwd.setToolTipText( + "If not set, the server will start in " + + "node data dir/servers/server-id;
" + + "relative directories are relative to the current directory" + + " of the icegridnode process."); + + _options.getDocument().addDocumentListener( + _mainEditor.getUpdateListener()); + _options.setToolTipText( + "Command-line arguments for this server.
" + + "Use whitespace as separator; use double-quotes around arguments containing whitespaces"); + + _user.getDocument().addDocumentListener( + _mainEditor.getUpdateListener()); + _user.setToolTipText( + "Run the server using this user account.
" + + "This feature is only available on Unix/Linux, when the IceGrid node runs as root."); + + _envs = new MapField(mainEditor, "Name", "Value", true); + + _activation = new JComboBox(new Object[]{ALWAYS, MANUAL, ON_DEMAND, SESSION}); + _activation.setToolTipText("always: IceGrid starts and keeps the server up all the time
" + + "manual: you start the server yourself
" + + "on-demand: IceGrid starts the server when a client needs it
" + + "session: IceGrid starts and shuts down the server for each session"); + + JTextField activationTextField = (JTextField) + _activation.getEditor().getEditorComponent(); + activationTextField.getDocument().addDocumentListener( + _mainEditor.getUpdateListener()); + + _activationTimeout.getDocument().addDocumentListener( + _mainEditor.getUpdateListener()); + _activationTimeout.setToolTipText("Number of seconds; if not set or set to 0, " + + "the IceGrid Node
uses the value of its " + + "IceGrid.Node.WaitTime property"); + _deactivationTimeout.getDocument().addDocumentListener( + _mainEditor.getUpdateListener()); + _deactivationTimeout.setToolTipText("Number of seconds; if not set or set to 0, " + + "the IceGrid Node
uses the value of its " + + "IceGrid.Node.WaitTime property"); + + Action allocatable = new AbstractAction("Allocatable") + { + public void actionPerformed(ActionEvent e) + { + _mainEditor.updated(); + } + }; + allocatable.putValue(Action.SHORT_DESCRIPTION, + "Check this box to ensure that the well-known objects
" + + "of this server can only be allocated by one session at a time."); + _allocatable = new JCheckBox(allocatable); + + + Action appDistrib = new AbstractAction("Depends on the application distribution") + { + public void actionPerformed(ActionEvent e) + { + _mainEditor.updated(); + } + }; + appDistrib.putValue(Action.SHORT_DESCRIPTION, + "Check this box if this server needs to be restarted
" + + "each time the distribution for your application is refreshed."); + + _applicationDistrib = new JCheckBox(appDistrib); + + _distrib = new JComboBox(new Object[]{NO_DISTRIB, DEFAULT_DISTRIB}); + _distrib.setToolTipText( + "The proxy to the IcePatch2 server holding your files"); + + JTextField distribTextField = (JTextField) + _distrib.getEditor().getEditorComponent(); + distribTextField.getDocument().addDocumentListener( + _mainEditor.getUpdateListener()); + + _distribDirs.getDocument().addDocumentListener( + _mainEditor.getUpdateListener()); + _distribDirs.setToolTipText( + "Include only these directories when patching.
" + + "Use whitespace as separator; use double-quotes around directories containing whitespaces"); + } ServerDescriptor getServerDescriptor() { - return (ServerDescriptor) - _mainEditor.getSubDescriptor(); + return (ServerDescriptor) + _mainEditor.getSubDescriptor(); } void appendProperties(DefaultFormBuilder builder) { - builder.append("Server ID"); - builder.append(_id, 3); - builder.nextLine(); - builder.append("Ice Version"); - builder.append(_iceVersion, 3); - builder.nextLine(); - - // - // Add Communicator fields - // - super.appendProperties(builder); - - builder.appendSeparator("Activation"); - builder.append("Path to Executable"); - builder.append(_exe, 3); - builder.nextLine(); - builder.append("Working Directory"); - builder.append(_pwd, 3); - builder.nextLine(); - builder.append("Command Arguments"); - builder.append(_options, 3); - builder.nextLine(); - builder.append("Run as"); - builder.append(_user, 3); - builder.nextLine(); - builder.append("Environment Variables"); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextRow(-6); - CellConstraints cc = new CellConstraints(); - JScrollPane scrollPane = new JScrollPane(_envs); - builder.add(scrollPane, - cc.xywh(builder.getColumn(), builder.getRow(), 3, 7)); - builder.nextRow(6); - builder.nextLine(); - - builder.append("Activation Mode"); - builder.append(_activation, 3); - builder.nextLine(); - builder.append("Activation Timeout"); - builder.append(_activationTimeout, 3); - builder.nextLine(); - builder.append("Deactivation Timeout"); - builder.append(_deactivationTimeout, 3); - builder.nextLine(); - builder.append("", _allocatable); - builder.nextLine(); - - JComponent c = builder.appendSeparator("Distribution"); - c.setToolTipText("Files specific to this server"); - - builder.append("", _applicationDistrib); - builder.nextLine(); - builder.append("IcePatch2 Proxy"); - builder.append(_distrib, 3); - builder.nextLine(); - builder.append("Directories"); - builder.append(_distribDirs, 3); - builder.nextLine(); + builder.append("Server ID"); + builder.append(_id, 3); + builder.nextLine(); + builder.append("Ice Version"); + builder.append(_iceVersion, 3); + builder.nextLine(); + + // + // Add Communicator fields + // + super.appendProperties(builder); + + builder.appendSeparator("Activation"); + builder.append("Path to Executable"); + builder.append(_exe, 3); + builder.nextLine(); + builder.append("Working Directory"); + builder.append(_pwd, 3); + builder.nextLine(); + builder.append("Command Arguments"); + builder.append(_options, 3); + builder.nextLine(); + builder.append("Run as"); + builder.append(_user, 3); + builder.nextLine(); + builder.append("Environment Variables"); + builder.nextLine(); + builder.append(""); + builder.nextLine(); + builder.append(""); + builder.nextLine(); + builder.append(""); + builder.nextRow(-6); + CellConstraints cc = new CellConstraints(); + JScrollPane scrollPane = new JScrollPane(_envs); + builder.add(scrollPane, + cc.xywh(builder.getColumn(), builder.getRow(), 3, 7)); + builder.nextRow(6); + builder.nextLine(); + + builder.append("Activation Mode"); + builder.append(_activation, 3); + builder.nextLine(); + builder.append("Activation Timeout"); + builder.append(_activationTimeout, 3); + builder.nextLine(); + builder.append("Deactivation Timeout"); + builder.append(_deactivationTimeout, 3); + builder.nextLine(); + builder.append("", _allocatable); + builder.nextLine(); + + JComponent c = builder.appendSeparator("Distribution"); + c.setToolTipText("Files specific to this server"); + + builder.append("", _applicationDistrib); + builder.nextLine(); + builder.append("IcePatch2 Proxy"); + builder.append(_distrib, 3); + builder.nextLine(); + builder.append("Directories"); + builder.append(_distribDirs, 3); + builder.nextLine(); } void writeDescriptor() { - ServerDescriptor descriptor = getServerDescriptor(); - descriptor.id = _id.getText().trim(); - descriptor.iceVersion = _iceVersion.getText().trim(); - descriptor.exe = _exe.getText().trim(); - descriptor.pwd = _pwd.getText().trim(); - - descriptor.options = _options.getList(); - descriptor.user = _user.getText().trim(); - - descriptor.envs = new java.util.LinkedList(); - java.util.Iterator p = _envs.get().entrySet().iterator(); - while(p.hasNext()) - { - java.util.Map.Entry entry = (java.util.Map.Entry)p.next(); - descriptor.envs.add(entry.getKey().toString() - + "=" + entry.getValue().toString()); - } + ServerDescriptor descriptor = getServerDescriptor(); + descriptor.id = _id.getText().trim(); + descriptor.iceVersion = _iceVersion.getText().trim(); + descriptor.exe = _exe.getText().trim(); + descriptor.pwd = _pwd.getText().trim(); + + descriptor.options = _options.getList(); + descriptor.user = _user.getText().trim(); + + descriptor.envs = new java.util.LinkedList(); + java.util.Iterator p = _envs.get().entrySet().iterator(); + while(p.hasNext()) + { + java.util.Map.Entry entry = (java.util.Map.Entry)p.next(); + descriptor.envs.add(entry.getKey().toString() + + "=" + entry.getValue().toString()); + } - descriptor.activation = _activation.getSelectedItem().toString().trim(); - descriptor.activationTimeout = _activationTimeout.getText().trim(); - descriptor.deactivationTimeout = _deactivationTimeout.getText().trim(); - - descriptor.allocatable = _allocatable.isSelected(); - - descriptor.applicationDistrib = _applicationDistrib.isSelected(); - - if(_distrib.getSelectedItem() == NO_DISTRIB) - { - descriptor.distrib.icepatch = ""; - } - else - { - descriptor.distrib.icepatch = _distrib.getSelectedItem().toString().trim(); - } - descriptor.distrib.directories = _distribDirs.getList(); - - super.writeDescriptor(descriptor); - } + descriptor.activation = _activation.getSelectedItem().toString().trim(); + descriptor.activationTimeout = _activationTimeout.getText().trim(); + descriptor.deactivationTimeout = _deactivationTimeout.getText().trim(); + + descriptor.allocatable = _allocatable.isSelected(); + + descriptor.applicationDistrib = _applicationDistrib.isSelected(); + + if(_distrib.getSelectedItem() == NO_DISTRIB) + { + descriptor.distrib.icepatch = ""; + } + else + { + descriptor.distrib.icepatch = _distrib.getSelectedItem().toString().trim(); + } + descriptor.distrib.directories = _distribDirs.getList(); + + super.writeDescriptor(descriptor); + } boolean isSimpleUpdate() { - return getServerDescriptor().id.equals(_id.getText().trim()); + return getServerDescriptor().id.equals(_id.getText().trim()); } boolean validate() { - return _mainEditor.check(new String[]{ - "Server ID", _id.getText().trim(), - "Path to Executable", _exe.getText().trim()}); + return _mainEditor.check(new String[]{ + "Server ID", _id.getText().trim(), + "Path to Executable", _exe.getText().trim()}); } void show(boolean isEditable) { - ServerDescriptor descriptor = getServerDescriptor(); - Utils.Resolver detailResolver = _mainEditor.getDetailResolver(); - - isEditable = isEditable && (detailResolver == null); - - if(detailResolver != null) - { - _id.setText(detailResolver.find("server")); - } - else - { - _id.setText(descriptor.id); - } - _id.setEditable(isEditable); - - _iceVersion.setText( - Utils.substitute(descriptor.iceVersion, detailResolver)); - _iceVersion.setEditable(isEditable); - - _exe.setText( - Utils.substitute(descriptor.exe, detailResolver)); - _exe.setEditable(isEditable); - _pwd.setText( - Utils.substitute(descriptor.pwd, detailResolver)); - _pwd.setEditable(isEditable); - - _options.setList(descriptor.options, detailResolver); - _options.setEditable(isEditable); - - _user.setText( - Utils.substitute(descriptor.user, detailResolver)); - _user.setEditable(isEditable); - - java.util.Map envMap = new java.util.TreeMap(); - java.util.Iterator p = descriptor.envs.iterator(); - while(p.hasNext()) - { - String env = (String)p.next(); - int equal = env.indexOf('='); - if(equal == -1 || equal == env.length() - 1) - { - envMap.put(env, ""); - } - else - { - envMap.put(env.substring(0, equal), - env.substring(equal + 1)); - } - } - _envs.set(envMap, detailResolver, isEditable); - - String activation = Utils.substitute(descriptor.activation, - detailResolver); - - _activation.setEnabled(true); - _activation.setEditable(true); - if(activation.equals(ALWAYS)) - { - _activation.setSelectedItem(ALWAYS); - } - else if(activation.equals(MANUAL)) - { - _activation.setSelectedItem(MANUAL); - } - else if(activation.equals(ON_DEMAND)) - { - _activation.setSelectedItem(ON_DEMAND); - } - else if(activation.equals(SESSION)) - { - _activation.setSelectedItem(SESSION); - } - else - { - _activation.setSelectedItem(activation); - } - _activation.setEnabled(isEditable); - _activation.setEditable(isEditable); - - _activationTimeout.setText( - Utils.substitute(descriptor.activationTimeout, detailResolver)); - _activationTimeout.setEditable(isEditable); - - _deactivationTimeout.setText( - Utils.substitute(descriptor.deactivationTimeout, detailResolver)); - _deactivationTimeout.setEditable(isEditable); - - _allocatable.setSelected(descriptor.allocatable); - _allocatable.setEnabled(isEditable); - - _applicationDistrib.setSelected(descriptor.applicationDistrib); - _applicationDistrib.setEnabled(isEditable); - - _distrib.setEnabled(true); - _distrib.setEditable(true); - String icepatch = Utils.substitute(descriptor.distrib.icepatch, - detailResolver); - if(icepatch.equals("")) - { - _distrib.setSelectedItem(NO_DISTRIB); - } - else - { - _distrib.setSelectedItem(icepatch); - } - _distrib.setEnabled(isEditable); - _distrib.setEditable(isEditable); - - _distribDirs.setList(descriptor.distrib.directories, detailResolver); - _distribDirs.setEditable(isEditable); - - show(descriptor, isEditable); + ServerDescriptor descriptor = getServerDescriptor(); + Utils.Resolver detailResolver = _mainEditor.getDetailResolver(); + + isEditable = isEditable && (detailResolver == null); + + if(detailResolver != null) + { + _id.setText(detailResolver.find("server")); + } + else + { + _id.setText(descriptor.id); + } + _id.setEditable(isEditable); + + _iceVersion.setText( + Utils.substitute(descriptor.iceVersion, detailResolver)); + _iceVersion.setEditable(isEditable); + + _exe.setText( + Utils.substitute(descriptor.exe, detailResolver)); + _exe.setEditable(isEditable); + _pwd.setText( + Utils.substitute(descriptor.pwd, detailResolver)); + _pwd.setEditable(isEditable); + + _options.setList(descriptor.options, detailResolver); + _options.setEditable(isEditable); + + _user.setText( + Utils.substitute(descriptor.user, detailResolver)); + _user.setEditable(isEditable); + + java.util.Map envMap = new java.util.TreeMap(); + java.util.Iterator p = descriptor.envs.iterator(); + while(p.hasNext()) + { + String env = (String)p.next(); + int equal = env.indexOf('='); + if(equal == -1 || equal == env.length() - 1) + { + envMap.put(env, ""); + } + else + { + envMap.put(env.substring(0, equal), + env.substring(equal + 1)); + } + } + _envs.set(envMap, detailResolver, isEditable); + + String activation = Utils.substitute(descriptor.activation, + detailResolver); + + _activation.setEnabled(true); + _activation.setEditable(true); + if(activation.equals(ALWAYS)) + { + _activation.setSelectedItem(ALWAYS); + } + else if(activation.equals(MANUAL)) + { + _activation.setSelectedItem(MANUAL); + } + else if(activation.equals(ON_DEMAND)) + { + _activation.setSelectedItem(ON_DEMAND); + } + else if(activation.equals(SESSION)) + { + _activation.setSelectedItem(SESSION); + } + else + { + _activation.setSelectedItem(activation); + } + _activation.setEnabled(isEditable); + _activation.setEditable(isEditable); + + _activationTimeout.setText( + Utils.substitute(descriptor.activationTimeout, detailResolver)); + _activationTimeout.setEditable(isEditable); + + _deactivationTimeout.setText( + Utils.substitute(descriptor.deactivationTimeout, detailResolver)); + _deactivationTimeout.setEditable(isEditable); + + _allocatable.setSelected(descriptor.allocatable); + _allocatable.setEnabled(isEditable); + + _applicationDistrib.setSelected(descriptor.applicationDistrib); + _applicationDistrib.setEnabled(isEditable); + + _distrib.setEnabled(true); + _distrib.setEditable(true); + String icepatch = Utils.substitute(descriptor.distrib.icepatch, + detailResolver); + if(icepatch.equals("")) + { + _distrib.setSelectedItem(NO_DISTRIB); + } + else + { + _distrib.setSelectedItem(icepatch); + } + _distrib.setEnabled(isEditable); + _distrib.setEditable(isEditable); + + _distribDirs.setList(descriptor.distrib.directories, detailResolver); + _distribDirs.setEditable(isEditable); + + show(descriptor, isEditable); } static private final String ALWAYS = "always"; @@ -383,12 +383,12 @@ class ServerSubEditor extends CommunicatorSubEditor static private final String SESSION = "session"; static private final Object NO_DISTRIB = new Object() - { - public String toString() - { - return "None selected"; - } - }; + { + public String toString() + { + return "None selected"; + } + }; static private final String DEFAULT_DISTRIB = "${application}.IcePatch2/server"; -- cgit v1.2.3