diff options
author | Mark Spruiell <mes@zeroc.com> | 2009-04-03 15:15:13 -0700 |
---|---|---|
committer | Mark Spruiell <mes@zeroc.com> | 2009-04-03 15:15:13 -0700 |
commit | b415955846ce0d5c2e0c283f897190ccd2c3616a (patch) | |
tree | 10daf6bb8a05edf5052a33f10ea16c73d8ae0d89 /java/src/IceGridGUI/LiveDeployment/ObjectDialog.java | |
parent | Bug 3465 - Remove _adapter members from test where unecessary (diff) | |
download | ice-b415955846ce0d5c2e0c283f897190ccd2c3616a.tar.bz2 ice-b415955846ce0d5c2e0c283f897190ccd2c3616a.tar.xz ice-b415955846ce0d5c2e0c283f897190ccd2c3616a.zip |
removing Java2 mapping
Diffstat (limited to 'java/src/IceGridGUI/LiveDeployment/ObjectDialog.java')
-rw-r--r-- | java/src/IceGridGUI/LiveDeployment/ObjectDialog.java | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java b/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java index 1653cf597e4..f71c4b5fef9 100644 --- a/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java +++ b/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java @@ -6,6 +6,7 @@ // ICE_LICENSE file included in this distribution. // // ********************************************************************** + package IceGridGUI.LiveDeployment; import java.awt.BorderLayout; @@ -40,10 +41,10 @@ class ObjectDialog extends JDialog { super(root.getCoordinator().getMainFrame(), (readOnly ? "" : "New ") + "Dynamic Well-Known Object - IceGrid Admin", true); - + setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE); _mainFrame = root.getCoordinator().getMainFrame(); - + _proxy.setLineWrap(true); if(readOnly) @@ -56,24 +57,23 @@ class ObjectDialog extends JDialog { _typeCombo.setEditable(true); } - + FormLayout layout = new FormLayout("right:pref, 3dlu, pref", ""); DefaultFormBuilder builder = new DefaultFormBuilder(layout); builder.setDefaultDialogBorder(); builder.setRowGroupingEnabled(true); builder.setLineGapSize(LayoutStyle.getCurrent().getLinePad()); - + builder.append("Proxy"); builder.nextLine(); builder.append(""); builder.nextRow(-2); CellConstraints cc = new CellConstraints(); JScrollPane scrollPane = new JScrollPane(_proxy); - builder.add(scrollPane, - cc.xywh(builder.getColumn(), builder.getRow(), 1, 3)); + builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 1, 3)); builder.nextRow(2); builder.nextLine(); - + if(readOnly) { builder.append("Type", _type); @@ -84,7 +84,6 @@ class ObjectDialog extends JDialog } builder.nextLine(); - Container contentPane = getContentPane(); if(readOnly) { @@ -104,7 +103,7 @@ class ObjectDialog extends JDialog { type = _typeCombo.getSelectedItem().toString(); } - + if(root.addObject(_proxy.getText(), type)) { setVisible(false); @@ -118,7 +117,7 @@ class ObjectDialog extends JDialog }; okButton.addActionListener(okListener); getRootPane().setDefaultButton(okButton); - + JButton cancelButton = new JButton("Cancel"); ActionListener cancelListener = new ActionListener() { @@ -128,12 +127,11 @@ class ObjectDialog extends JDialog } }; cancelButton.addActionListener(cancelListener); - - - JComponent buttonBar = + + JComponent buttonBar = ButtonBarFactory.buildOKCancelBar(okButton, cancelButton); buttonBar.setBorder(Borders.DIALOG_BORDER); - + contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS)); contentPane.add(builder.getPanel()); contentPane.add(buttonBar); |