IceGridGUI updates to use latest jgoodies packages

10 files changed, 54 insertions, 56 deletions

diff --git a/java/config/build.properties b/java/config/build.properties
index d8556d02c49..530c6831024 100644
--- a/java/config/build.properties
+++ b/java/config/build.properties
@@ -20,9 +20,9 @@ db.version = 4.8.30
 # to build the IceGrid GUI
 #
 
-jgoodies-common.version = 1.2.0
-jgoodies-forms.version = 1.4.1
-jgoodies-looks.version = 2.4.1
+jgoodies-common.version = 1.4.0
+jgoodies-forms.version = 1.6.0
+jgoodies-looks.version = 2.5.2
 
 #
 # Select an installation base directory. The directory will be created
diff --git a/java/src/IceGridGUI/Application/Editor.java b/java/src/IceGridGUI/Application/Editor.java
index ee4dc23d782..76be1317f24 100644
--- a/java/src/IceGridGUI/Application/Editor.java
+++ b/java/src/IceGridGUI/Application/Editor.java
@@ -28,8 +28,8 @@ import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 
 import com.jgoodies.forms.builder.DefaultFormBuilder;
+import com.jgoodies.forms.builder.ButtonBarBuilder;
 import com.jgoodies.forms.factories.Borders;
-import com.jgoodies.forms.factories.ButtonBarFactory;
 import com.jgoodies.forms.factories.DefaultComponentFactory;
 import com.jgoodies.forms.layout.FormLayout;
 import com.jgoodies.forms.util.LayoutStyle;
@@ -106,8 +106,8 @@ public class Editor extends EditorBase
     protected void buildPropertiesPanel()
     {
         super.buildPropertiesPanel();
-        JComponent buttonBar = ButtonBarFactory.buildRightAlignedBar(_applyButton, _discardButton);
-        buttonBar.setBorder(Borders.DIALOG_BORDER);
+        JComponent buttonBar = new ButtonBarBuilder().addGlue().addButton(_applyButton, _discardButton).build();
+        buttonBar.setBorder(Borders.DIALOG);
         _propertiesPanel.add(buttonBar, BorderLayout.SOUTH);
     }
 
diff --git a/java/src/IceGridGUI/ApplicationPane.java b/java/src/IceGridGUI/ApplicationPane.java
index b6351a95fb2..a750c5e4bcd 100644
--- a/java/src/IceGridGUI/ApplicationPane.java
+++ b/java/src/IceGridGUI/ApplicationPane.java
@@ -250,7 +250,7 @@ public class ApplicationPane extends JSplitPane implements Tab
             new JScrollPane(tree,
                             JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
                             JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-        leftScroll.setBorder(Borders.EMPTY_BORDER);
+        leftScroll.setBorder(Borders.EMPTY);
 
         _leftPane.setContent(leftScroll);
 
diff --git a/java/src/IceGridGUI/EditorBase.java b/java/src/IceGridGUI/EditorBase.java
index 987d5b478fc..beb24efdd29 100644
--- a/java/src/IceGridGUI/EditorBase.java
+++ b/java/src/IceGridGUI/EditorBase.java
@@ -49,9 +49,9 @@ public abstract class EditorBase
         FormLayout layout = new FormLayout("right:pref, 3dlu, fill:pref:grow, 3dlu, pref", "");
 
         DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-        builder.setBorder(Borders.DLU2_BORDER);
-        builder.setRowGroupingEnabled(true);
-        builder.setLineGapSize(LayoutStyle.getCurrent().getLinePad());
+        builder.border(Borders.DLU2);
+        builder.rowGroupingEnabled(true);
+        builder.lineGapSize(LayoutStyle.getCurrent().getLinePad());
 
         appendProperties(builder);
 
@@ -60,11 +60,11 @@ public abstract class EditorBase
                             JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
                             JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
 
-        scrollPane.setBorder(Borders.DIALOG_BORDER);
+        scrollPane.setBorder(Borders.DIALOG);
 
         _propertiesPanel = new JPanel(new BorderLayout());
         _propertiesPanel.add(scrollPane, BorderLayout.CENTER);
-        _propertiesPanel.setBorder(Borders.EMPTY_BORDER);
+        _propertiesPanel.setBorder(Borders.EMPTY);
     }
 
     protected JPanel _propertiesPanel;
diff --git a/java/src/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java b/java/src/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java
index f615e04d201..479ee6f9940 100644
--- a/java/src/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java
+++ b/java/src/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java
@@ -29,7 +29,6 @@ import javax.swing.JTextField;
 
 import com.jgoodies.forms.builder.DefaultFormBuilder;
 import com.jgoodies.forms.factories.Borders;
-import com.jgoodies.forms.factories.ButtonBarFactory;
 import com.jgoodies.forms.layout.FormLayout;
 import com.jgoodies.forms.util.LayoutStyle;
 
@@ -53,9 +52,9 @@ class ApplicationDetailsDialog extends JDialog
 
         FormLayout layout = new FormLayout("right:pref, 3dlu, pref", "");
         DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-        builder.setDefaultDialogBorder();
-        builder.setRowGroupingEnabled(true);
-        builder.setLineGapSize(LayoutStyle.getCurrent().getLinePad());
+        builder.border(Borders.DIALOG);
+        builder.rowGroupingEnabled(true);
+        builder.lineGapSize(LayoutStyle.getCurrent().getLinePad());
 
         builder.append("Name", _name);
         builder.nextLine();
diff --git a/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java b/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java
index 3e08eb63d29..96a5c74d73a 100644
--- a/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java
+++ b/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java
@@ -29,8 +29,8 @@ import javax.swing.JTextArea;
 import javax.swing.JTextField;
 
 import com.jgoodies.forms.builder.DefaultFormBuilder;
+import com.jgoodies.forms.builder.ButtonBarBuilder;
 import com.jgoodies.forms.factories.Borders;
-import com.jgoodies.forms.factories.ButtonBarFactory;
 import com.jgoodies.forms.layout.CellConstraints;
 import com.jgoodies.forms.layout.FormLayout;
 import com.jgoodies.forms.util.LayoutStyle;
@@ -60,9 +60,9 @@ class ObjectDialog extends JDialog
 
         FormLayout layout = new FormLayout("right:pref, 3dlu, pref", "");
         DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-        builder.setDefaultDialogBorder();
-        builder.setRowGroupingEnabled(true);
-        builder.setLineGapSize(LayoutStyle.getCurrent().getLinePad());
+        builder.border(Borders.DIALOG);
+        builder.rowGroupingEnabled(true);
+        builder.lineGapSize(LayoutStyle.getCurrent().getLinePad());
 
         builder.append("Proxy");
         builder.nextLine();
@@ -127,11 +127,10 @@ class ObjectDialog extends JDialog
                     }
                 };
             cancelButton.addActionListener(cancelListener);
-
-            JComponent buttonBar =
-                ButtonBarFactory.buildOKCancelBar(okButton, cancelButton);
-            buttonBar.setBorder(Borders.DIALOG_BORDER);
-
+            
+            JComponent buttonBar = new ButtonBarBuilder().addGlue().addButton(okButton, cancelButton).build();
+            buttonBar.setBorder(Borders.DIALOG);
+            
             contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS));
             contentPane.add(builder.getPanel());
             contentPane.add(buttonBar);
diff --git a/java/src/IceGridGUI/LiveDeployment/ShowLogPrefsDialog.java b/java/src/IceGridGUI/LiveDeployment/ShowLogPrefsDialog.java
index 94a2ca0f95d..c58333b91df 100644
--- a/java/src/IceGridGUI/LiveDeployment/ShowLogPrefsDialog.java
+++ b/java/src/IceGridGUI/LiveDeployment/ShowLogPrefsDialog.java
@@ -21,8 +21,8 @@ import javax.swing.JPanel;
 import javax.swing.JTextField;
 
 import com.jgoodies.forms.builder.DefaultFormBuilder;
+import com.jgoodies.forms.builder.ButtonBarBuilder;
 import com.jgoodies.forms.factories.Borders;
-import com.jgoodies.forms.factories.ButtonBarFactory;
 import com.jgoodies.forms.layout.FormLayout;
 import com.jgoodies.forms.util.LayoutStyle;
 
@@ -93,9 +93,9 @@ class ShowLogPrefsDialog extends JDialog
 
         FormLayout layout = new FormLayout("left:pref, 3dlu, fill:pref:grow", "");
         DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-        builder.setDefaultDialogBorder();
-        builder.setRowGroupingEnabled(true);
-        builder.setLineGapSize(LayoutStyle.getCurrent().getLinePad());
+        builder.border(Borders.DIALOG);
+        builder.rowGroupingEnabled(true);
+        builder.lineGapSize(LayoutStyle.getCurrent().getLinePad());
 
         builder.append("Max lines in buffer", maxLinesField);
         builder.nextLine();
@@ -108,9 +108,8 @@ class ShowLogPrefsDialog extends JDialog
         builder.append("Poll period (seconds)", periodField);
         builder.nextLine();
 
-        JComponent buttonBar =
-            ButtonBarFactory.buildOKCancelBar(okButton, cancelButton);
-        buttonBar.setBorder(Borders.DIALOG_BORDER);
+        JComponent buttonBar = new ButtonBarBuilder().addGlue().addButton(okButton, cancelButton).build();
+        buttonBar.setBorder(Borders.DIALOG);
 
         java.awt.Container contentPane = getContentPane();
         contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS));
diff --git a/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java b/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java
index d7b2dabfa63..3a98790abe7 100644
--- a/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java
+++ b/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java
@@ -33,8 +33,8 @@ import javax.swing.JTextArea;
 import javax.swing.SwingUtilities;
 
 import com.jgoodies.forms.builder.DefaultFormBuilder;
+import com.jgoodies.forms.builder.ButtonBarBuilder;
 import com.jgoodies.forms.factories.Borders;
-import com.jgoodies.forms.factories.ButtonBarFactory;
 import com.jgoodies.forms.layout.CellConstraints;
 import com.jgoodies.forms.layout.FormLayout;
 import com.jgoodies.forms.util.LayoutStyle;
@@ -156,9 +156,9 @@ class WriteMessageDialog extends JDialog
 
         FormLayout layout = new FormLayout("left:pref, 3dlu, fill:pref:grow", "");
         DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-        builder.setDefaultDialogBorder();
-        builder.setRowGroupingEnabled(true);
-        builder.setLineGapSize(LayoutStyle.getCurrent().getLinePad());
+        builder.border(Borders.DIALOG);
+        builder.rowGroupingEnabled(true);
+        builder.lineGapSize(LayoutStyle.getCurrent().getLinePad());
 
         _message.setLineWrap(true);
         JScrollPane scrollPane = new JScrollPane(_message,
@@ -169,8 +169,9 @@ class WriteMessageDialog extends JDialog
         builder.append(_stdOut);
         builder.append(stdErr);
         builder.nextLine();
-        JComponent buttonBar = ButtonBarFactory.buildOKCancelBar(okButton, cancelButton);
-        buttonBar.setBorder(Borders.DIALOG_BORDER);
+
+        JComponent buttonBar = new ButtonBarBuilder().addGlue().addButton(okButton, cancelButton).build();
+        buttonBar.setBorder(Borders.DIALOG);
 
         Container contentPane = getContentPane();
         contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS));
diff --git a/java/src/IceGridGUI/LiveDeploymentPane.java b/java/src/IceGridGUI/LiveDeploymentPane.java
index f8c3767d080..70244d70299 100644
--- a/java/src/IceGridGUI/LiveDeploymentPane.java
+++ b/java/src/IceGridGUI/LiveDeploymentPane.java
@@ -223,7 +223,7 @@ public class LiveDeploymentPane extends JSplitPane implements Tab
             new JScrollPane(tree,
                             JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
                             JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-        leftScroll.setBorder(Borders.EMPTY_BORDER);
+        leftScroll.setBorder(Borders.EMPTY);
 
         _leftPane = new SimpleInternalFrame("Runtime Components");
         _leftPane.setContent(leftScroll);
diff --git a/java/src/IceGridGUI/SessionKeeper.java b/java/src/IceGridGUI/SessionKeeper.java
index e9744c690a0..194653e5a53 100644
--- a/java/src/IceGridGUI/SessionKeeper.java
+++ b/java/src/IceGridGUI/SessionKeeper.java
@@ -28,8 +28,8 @@ import java.awt.event.ActionListener;
 import java.awt.event.ItemListener;
 
 import com.jgoodies.forms.builder.DefaultFormBuilder;
+import com.jgoodies.forms.builder.ButtonBarBuilder;
 import com.jgoodies.forms.factories.Borders;
-import com.jgoodies.forms.factories.ButtonBarFactory;
 import com.jgoodies.forms.factories.DefaultComponentFactory;
 import com.jgoodies.forms.layout.FormLayout;
 import com.jgoodies.forms.util.LayoutStyle;
@@ -759,9 +759,9 @@ class SessionKeeper
                 FormLayout layout = new FormLayout("right:pref, 3dlu, pref", "");
 
                 DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-                builder.setDefaultDialogBorder();
-                builder.setRowGroupingEnabled(true);
-                builder.setLineGapSize(LayoutStyle.getCurrent().getLinePad());
+                builder.border(Borders.DIALOG);
+                builder.rowGroupingEnabled(true);
+                builder.lineGapSize(LayoutStyle.getCurrent().getLinePad());
 
                 _registryUsernameLabel = builder.append("Username", _registryUsername);
                 builder.nextLine();
@@ -786,9 +786,9 @@ class SessionKeeper
                 FormLayout layout = new FormLayout("right:pref, 3dlu, pref", "");
 
                 DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-                builder.setDefaultDialogBorder();
-                builder.setRowGroupingEnabled(true);
-                builder.setLineGapSize(LayoutStyle.getCurrent().getLinePad());
+                builder.border(Borders.DIALOG);
+                builder.rowGroupingEnabled(true);
+                builder.lineGapSize(LayoutStyle.getCurrent().getLinePad());
 
                 _routerUsernameLabel = builder.append("Username", _routerUsername);
                 builder.nextLine();
@@ -808,7 +808,7 @@ class SessionKeeper
 
             _mainPane.addTab("Direct", null, directPanel, "Log directly into the IceGrid registry");
             _mainPane.addTab("Routed", null, routedPanel, "Log into the IceGrid registry through a Glacier2 router");
-            _mainPane.setBorder(Borders.DIALOG_BORDER);
+            _mainPane.setBorder(Borders.DIALOG);
 
             _mainPane.addChangeListener(new javax.swing.event.ChangeListener()
                 {
@@ -830,9 +830,9 @@ class SessionKeeper
                 FormLayout layout = new FormLayout("right:pref, 3dlu, fill:pref:grow, 3dlu, pref", "");
 
                 DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-                builder.setDefaultDialogBorder();
-                builder.setRowGroupingEnabled(true);
-                builder.setLineGapSize(LayoutStyle.getCurrent().getLinePad());
+                builder.border(Borders.DIALOG);
+                builder.rowGroupingEnabled(true);
+                builder.lineGapSize(LayoutStyle.getCurrent().getLinePad());
 
                 builder.appendSeparator("Keystore");
                 builder.append("File", _keystore);
@@ -850,9 +850,9 @@ class SessionKeeper
                 FormLayout layout = new FormLayout("right:pref, 3dlu, fill:pref:grow, 3dlu, pref", "");
 
                 DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-                builder.setDefaultDialogBorder();
-                builder.setRowGroupingEnabled(true);
-                builder.setLineGapSize(LayoutStyle.getCurrent().getLinePad());
+                builder.border(Borders.DIALOG);
+                builder.rowGroupingEnabled(true);
+                builder.lineGapSize(LayoutStyle.getCurrent().getLinePad());
 
                 builder.appendSeparator("Keystore");
                 builder.append("File", _advancedKeystore);
@@ -881,11 +881,11 @@ class SessionKeeper
 
             _sslPane.addTab("Basic", basicSSLPanel);
             _sslPane.addTab("Advanced", advancedSSLPanel);
-            TitledBorder titledBorder = BorderFactory.createTitledBorder(Borders.DIALOG_BORDER, "SSL Configuration");
+            TitledBorder titledBorder = BorderFactory.createTitledBorder(Borders.DIALOG, "SSL Configuration");
             _sslPane.setBorder(titledBorder);
 
-            JComponent buttonBar = ButtonBarFactory.buildOKCancelBar(okButton, cancelButton);
-            buttonBar.setBorder(Borders.DIALOG_BORDER);
+            JComponent buttonBar = new ButtonBarBuilder().addGlue().addButton(okButton, cancelButton).build();
+            buttonBar.setBorder(Borders.DIALOG);
 
             Container contentPane = getContentPane();
             contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS));