diff options
Diffstat (limited to 'java/src/IceGridGUI/Application/DbEnvEditor.java')
-rw-r--r-- | java/src/IceGridGUI/Application/DbEnvEditor.java | 59 |
1 files changed, 25 insertions, 34 deletions
diff --git a/java/src/IceGridGUI/Application/DbEnvEditor.java b/java/src/IceGridGUI/Application/DbEnvEditor.java index 07f66df4d6c..e8cd2b2ddc3 100644 --- a/java/src/IceGridGUI/Application/DbEnvEditor.java +++ b/java/src/IceGridGUI/Application/DbEnvEditor.java @@ -6,6 +6,7 @@ // ICE_LICENSE file included in this distribution. // // ********************************************************************** + package IceGridGUI.Application; import java.awt.event.ActionEvent; @@ -29,14 +30,11 @@ class DbEnvEditor extends CommunicatorChildEditor DbEnvEditor() { _name.getDocument().addDocumentListener(_updateListener); - _name.setToolTipText( - "Identifies this Freeze database environment within an Ice communicator"); + _name.setToolTipText("Identifies this Freeze database environment within an Ice communicator"); _description.getDocument().addDocumentListener(_updateListener); - _description.setToolTipText( - "An optional description for this database environment"); + _description.setToolTipText("An optional description for this database environment"); - JTextField dbHomeTextField = (JTextField) - _dbHome.getEditor().getEditorComponent(); + JTextField dbHomeTextField = (JTextField)_dbHome.getEditor().getEditorComponent(); dbHomeTextField.getDocument().addDocumentListener(_updateListener); _dbHome.setToolTipText("<html><i>node data dir</i>/servers/<i>server id</i>" + "/dbs/<i>db env name</i> if created by the IceGrid Node;<br>" @@ -48,19 +46,17 @@ class DbEnvEditor extends CommunicatorChildEditor void writeDescriptor() { - DbEnvDescriptor descriptor = - (DbEnvDescriptor)getDbEnv().getDescriptor(); + DbEnvDescriptor descriptor = (DbEnvDescriptor)getDbEnv().getDescriptor(); descriptor.name = _name.getText().trim(); descriptor.description = _description.getText(); descriptor.dbHome = getDbHomeAsString(); descriptor.properties = _properties.getProperties(); - } - + } + boolean isSimpleUpdate() { - DbEnvDescriptor descriptor = - (DbEnvDescriptor)getDbEnv().getDescriptor(); - return descriptor.name.equals(_name.getText().trim()); + DbEnvDescriptor descriptor = (DbEnvDescriptor)getDbEnv().getDescriptor(); + return descriptor.name.equals(_name.getText().trim()); } Communicator.ChildList getChildList() @@ -80,11 +76,10 @@ class DbEnvEditor extends CommunicatorChildEditor builder.nextRow(-2); CellConstraints cc = new CellConstraints(); JScrollPane scrollPane = new JScrollPane(_description); - builder.add(scrollPane, - cc.xywh(builder.getColumn(), builder.getRow(), 3, 3)); + builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, 3)); builder.nextRow(2); builder.nextLine(); - + builder.append("DB Home" ); builder.append(_dbHome, 3); builder.nextLine(); @@ -100,8 +95,7 @@ class DbEnvEditor extends CommunicatorChildEditor builder.nextRow(-6); scrollPane = new JScrollPane(_properties); - builder.add(scrollPane, - cc.xywh(builder.getColumn(), builder.getRow(), 3, 7)); + builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, 7)); builder.nextRow(6); builder.nextLine(); } @@ -123,34 +117,31 @@ class DbEnvEditor extends CommunicatorChildEditor _target = dbEnv; DbEnvDescriptor descriptor = (DbEnvDescriptor)dbEnv.getDescriptor(); - + Utils.Resolver resolver = null; if(dbEnv.getCoordinator().substitute()) { resolver = dbEnv.getResolver(); } boolean isEditable = resolver == null; - - _name.setText( - Utils.substitute(descriptor.name, resolver)); + + _name.setText(Utils.substitute(descriptor.name, resolver)); _name.setEditable(isEditable); - _description.setText( - Utils.substitute(descriptor.description, resolver)); + _description.setText(Utils.substitute(descriptor.description, resolver)); _description.setEditable(isEditable); _description.setOpaque(isEditable); - + _dbHome.setEnabled(true); _dbHome.setEditable(true); setDbHome(Utils.substitute(descriptor.dbHome, resolver)); _dbHome.setEnabled(isEditable); _dbHome.setEditable(isEditable); - - _properties.setProperties(descriptor.properties, null, null, - resolver, isEditable); - + + _properties.setProperties(descriptor.properties, null, null, resolver, isEditable); + _applyButton.setEnabled(dbEnv.isEphemeral()); - _discardButton.setEnabled(dbEnv.isEphemeral()); + _discardButton.setEnabled(dbEnv.isEphemeral()); detectUpdates(true); if(dbEnv.isEphemeral()) @@ -170,12 +161,12 @@ class DbEnvEditor extends CommunicatorChildEditor { _dbHome.setSelectedItem(NO_DB_HOME); } - else + else { _dbHome.setSelectedItem(dbHome); } } - + private String getDbHomeAsString() { Object obj = _dbHome.getSelectedItem(); @@ -188,13 +179,13 @@ class DbEnvEditor extends CommunicatorChildEditor return obj.toString().trim(); } } - + private JTextField _name = new JTextField(20); private JTextArea _description = new JTextArea(3, 20); private JComboBox _dbHome = new JComboBox(new Object[]{NO_DB_HOME}); private PropertiesField _properties; - + static private final Object NO_DB_HOME = new Object() { public String toString() |