Replaced Borders by Paddings to eliminate deprecation warnings

12 files changed, 67 insertions, 67 deletions

diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Editor.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Editor.java
index 8763214cf8f..c8bf1e97f23 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Editor.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Editor.java
@@ -21,7 +21,7 @@ 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.Paddings;
 import com.zeroc.IceGridGUI.*;
 
 public class Editor extends EditorBase
@@ -96,7 +96,7 @@ public class Editor extends EditorBase
     {
         super.buildPropertiesPanel();
         JComponent buttonBar = new ButtonBarBuilder().addGlue().addButton(_applyButton, _discardButton).build();
-        buttonBar.setBorder(Borders.DIALOG);
+        buttonBar.setBorder(Paddings.DIALOG);
         _propertiesPanel.add(buttonBar, BorderLayout.SOUTH);
     }
 
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/ApplicationPane.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/ApplicationPane.java
index a0c44c1b75a..307f62b08cf 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/ApplicationPane.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/ApplicationPane.java
@@ -23,7 +23,7 @@ import javax.swing.tree.TreeCellRenderer;
 import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 
-import com.jgoodies.forms.factories.Borders;
+import com.jgoodies.forms.factories.Paddings;
 
 import com.zeroc.IceGridGUI.Application.Editor;
 import com.zeroc.IceGridGUI.Application.Root;
@@ -250,7 +250,7 @@ public class ApplicationPane extends JSplitPane implements Tab
             new JScrollPane(tree,
                             ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
                             ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-        leftScroll.setBorder(Borders.EMPTY);
+        leftScroll.setBorder(Paddings.EMPTY);
 
         _leftPane.setContent(leftScroll);
 
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java
index c35d5e3608f..16ece921cdf 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java
@@ -34,7 +34,7 @@ import com.jgoodies.looks.BorderStyle;
 import com.jgoodies.looks.plastic.PlasticLookAndFeel;
 import com.jgoodies.forms.builder.DefaultFormBuilder;
 import com.jgoodies.forms.builder.ButtonBarBuilder;
-import com.jgoodies.forms.factories.Borders;
+import com.jgoodies.forms.factories.Paddings;
 import com.jgoodies.forms.layout.FormLayout;
 import com.jgoodies.forms.util.LayoutStyle;
 
@@ -3647,7 +3647,7 @@ public class Coordinator
             X509Certificate cert = (X509Certificate)info.nativeCerts[0];
             {
                 DefaultFormBuilder builder = new DefaultFormBuilder(new FormLayout("pref", "pref"));
-                builder.border(Borders.DIALOG);
+                builder.border(Paddings.DIALOG);
                 builder.rowGroupingEnabled(true);
                 builder.lineGapSize(LayoutStyle.getCurrent().getLinePad());
 
@@ -3724,7 +3724,7 @@ public class Coordinator
             getRootPane().setDefaultButton(noButton);
             JComponent buttonBar = new ButtonBarBuilder().addGlue().addButton(yesAlwaysButton, yesButton,
                                                                               noButton).build();
-            buttonBar.setBorder(Borders.DIALOG);
+            buttonBar.setBorder(Paddings.DIALOG);
             contentPane.add(buttonBar);
             pack();
             setResizable(false);
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/EditorBase.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/EditorBase.java
index 01f4c97b318..2d5cd9eacd7 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/EditorBase.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/EditorBase.java
@@ -18,7 +18,7 @@ import javax.swing.JToolBar;
 import javax.swing.ScrollPaneConstants;
 
 import com.jgoodies.forms.builder.DefaultFormBuilder;
-import com.jgoodies.forms.factories.Borders;
+import com.jgoodies.forms.factories.Paddings;
 import com.jgoodies.forms.layout.FormLayout;
 import com.jgoodies.forms.util.LayoutStyle;
 
@@ -59,7 +59,7 @@ public abstract class EditorBase
             FormLayout layout = new FormLayout("right:pref, 3dlu, fill:pref:grow, 3dlu, pref", "");
 
             DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-            builder.border(Borders.DLU2);
+            builder.border(Paddings.DLU2);
             builder.rowGroupingEnabled(true);
             builder.lineGapSize(LayoutStyle.getCurrent().getLinePad());
 
@@ -73,7 +73,7 @@ public abstract class EditorBase
                             ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
                             ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
 
-        scrollPane.setBorder(Borders.DIALOG);
+        scrollPane.setBorder(Paddings.DIALOG);
 
         if(_propertiesPanel == null)
         {
@@ -84,7 +84,7 @@ public abstract class EditorBase
             _propertiesPanel.removeAll();
         }
         _propertiesPanel.add(scrollPane, BorderLayout.CENTER);
-        _propertiesPanel.setBorder(Borders.EMPTY);
+        _propertiesPanel.setBorder(Paddings.EMPTY);
         _propertiesPanel.revalidate();
     }
 
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java
index 4429acf61aa..e9965fe6cfc 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java
@@ -16,7 +16,7 @@ import javax.swing.JTextField;
 import javax.swing.WindowConstants;
 
 import com.jgoodies.forms.builder.DefaultFormBuilder;
-import com.jgoodies.forms.factories.Borders;
+import com.jgoodies.forms.factories.Paddings;
 import com.jgoodies.forms.layout.FormLayout;
 import com.jgoodies.forms.util.LayoutStyle;
 
@@ -40,7 +40,7 @@ class ApplicationDetailsDialog extends JDialog
 
         FormLayout layout = new FormLayout("right:pref, 3dlu, pref", "");
         DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-        builder.border(Borders.DIALOG);
+        builder.border(Paddings.DIALOG);
         builder.rowGroupingEnabled(true);
         builder.lineGapSize(LayoutStyle.getCurrent().getLinePad());
 
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/GraphView.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/GraphView.java
index b9c89771811..c55967ec107 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/GraphView.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/GraphView.java
@@ -88,7 +88,7 @@ import javafx.util.StringConverter;
 
 import com.jgoodies.forms.layout.FormLayout;
 import com.jgoodies.forms.builder.DefaultFormBuilder;
-import com.jgoodies.forms.factories.Borders;
+import com.jgoodies.forms.factories.Paddings;
 import com.jgoodies.looks.Options;
 import com.jgoodies.looks.HeaderStyle;
 import com.jgoodies.looks.BorderStyle;
@@ -289,7 +289,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato
 
                     FormLayout layout = new FormLayout("fill:pref:grow", "pref");
                     final DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-                    builder.border(Borders.DIALOG);
+                    builder.border(Paddings.DIALOG);
                     builder.append(titlePanel);
                     builder.nextLine();
                     builder.append(refreshPanel);
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/LogFilterDialog.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/LogFilterDialog.java
index e2f5733a685..4a3bb28779f 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/LogFilterDialog.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/LogFilterDialog.java
@@ -26,7 +26,7 @@ import com.zeroc.Ice.LogMessageType;
 
 import com.jgoodies.forms.builder.DefaultFormBuilder;
 import com.jgoodies.forms.builder.ButtonBarBuilder;
-import com.jgoodies.forms.factories.Borders;
+import com.jgoodies.forms.factories.Paddings;
 import com.jgoodies.forms.layout.CellConstraints;
 import com.jgoodies.forms.layout.FormLayout;
 import com.jgoodies.forms.util.LayoutStyle;
@@ -145,7 +145,7 @@ class LogFilterDialog extends JDialog
 
         FormLayout layout = new FormLayout("left:pref, 3dlu, fill:pref:grow", "");
         DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-        builder.border(Borders.DIALOG);
+        builder.border(Paddings.DIALOG);
         builder.rowGroupingEnabled(true);
         builder.lineGapSize(LayoutStyle.getCurrent().getLinePad());
 
@@ -170,7 +170,7 @@ class LogFilterDialog extends JDialog
         builder.nextLine();
           
         JComponent buttonBar = new ButtonBarBuilder().addGlue().addButton(okButton, cancelButton).build();
-        buttonBar.setBorder(Borders.DIALOG);
+        buttonBar.setBorder(Paddings.DIALOG);
 
         java.awt.Container contentPane = getContentPane();
         contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS));
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/LogPrefsDialog.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/LogPrefsDialog.java
index 03dc4acf9bd..d5e310e4c05 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/LogPrefsDialog.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/LogPrefsDialog.java
@@ -22,7 +22,7 @@ import javax.swing.WindowConstants;
 
 import com.jgoodies.forms.builder.DefaultFormBuilder;
 import com.jgoodies.forms.builder.ButtonBarBuilder;
-import com.jgoodies.forms.factories.Borders;
+import com.jgoodies.forms.factories.Paddings;
 import com.jgoodies.forms.layout.FormLayout;
 import com.jgoodies.forms.util.LayoutStyle;
 
@@ -92,7 +92,7 @@ class LogPrefsDialog extends JDialog
 
         FormLayout layout = new FormLayout("left:pref, 3dlu, fill:pref:grow", "");
         DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-        builder.border(Borders.DIALOG);
+        builder.border(Paddings.DIALOG);
         builder.rowGroupingEnabled(true);
         builder.lineGapSize(LayoutStyle.getCurrent().getLinePad());
 
@@ -108,7 +108,7 @@ class LogPrefsDialog extends JDialog
         builder.nextLine();
 
         JComponent buttonBar = new ButtonBarBuilder().addGlue().addButton(okButton, cancelButton).build();
-        buttonBar.setBorder(Borders.DIALOG);
+        buttonBar.setBorder(Paddings.DIALOG);
 
         java.awt.Container contentPane = getContentPane();
         contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS));
@@ -171,7 +171,7 @@ class LogPrefsDialog extends JDialog
 
         FormLayout layout = new FormLayout("left:pref, 3dlu, fill:pref:grow", "");
         DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-        builder.border(Borders.DIALOG);
+        builder.border(Paddings.DIALOG);
         builder.rowGroupingEnabled(true);
         builder.lineGapSize(LayoutStyle.getCurrent().getLinePad());
 
@@ -181,7 +181,7 @@ class LogPrefsDialog extends JDialog
         builder.nextLine();
         
         JComponent buttonBar = new ButtonBarBuilder().addGlue().addButton(okButton, cancelButton).build();
-        buttonBar.setBorder(Borders.DIALOG);
+        buttonBar.setBorder(Paddings.DIALOG);
 
         java.awt.Container contentPane = getContentPane();
         contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS));
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ObjectDialog.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ObjectDialog.java
index f9ac9d656f7..7fcaf4155f3 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ObjectDialog.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ObjectDialog.java
@@ -26,7 +26,7 @@ import javax.swing.WindowConstants;
 
 import com.jgoodies.forms.builder.DefaultFormBuilder;
 import com.jgoodies.forms.builder.ButtonBarBuilder;
-import com.jgoodies.forms.factories.Borders;
+import com.jgoodies.forms.factories.Paddings;
 import com.jgoodies.forms.layout.CellConstraints;
 import com.jgoodies.forms.layout.FormLayout;
 import com.jgoodies.forms.util.LayoutStyle;
@@ -57,7 +57,7 @@ class ObjectDialog extends JDialog
 
         FormLayout layout = new FormLayout("right:pref, 3dlu, pref", "");
         DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-        builder.border(Borders.DIALOG);
+        builder.border(Paddings.DIALOG);
         builder.rowGroupingEnabled(true);
         builder.lineGapSize(LayoutStyle.getCurrent().getLinePad());
 
@@ -125,7 +125,7 @@ class ObjectDialog extends JDialog
             cancelButton.addActionListener(cancelListener);
             
             JComponent buttonBar = new ButtonBarBuilder().addGlue().addButton(okButton, cancelButton).build();
-            buttonBar.setBorder(Borders.DIALOG);
+            buttonBar.setBorder(Paddings.DIALOG);
             
             contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS));
             contentPane.add(builder.getPanel());
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/WriteMessageDialog.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/WriteMessageDialog.java
index 50bb07c73b9..24c81fc2bd8 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/WriteMessageDialog.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/WriteMessageDialog.java
@@ -29,7 +29,7 @@ import javax.swing.WindowConstants;
 
 import com.jgoodies.forms.builder.DefaultFormBuilder;
 import com.jgoodies.forms.builder.ButtonBarBuilder;
-import com.jgoodies.forms.factories.Borders;
+import com.jgoodies.forms.factories.Paddings;
 import com.jgoodies.forms.layout.FormLayout;
 import com.jgoodies.forms.util.LayoutStyle;
 
@@ -141,7 +141,7 @@ class WriteMessageDialog extends JDialog
 
         FormLayout layout = new FormLayout("left:pref, 3dlu, fill:pref:grow", "");
         DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-        builder.border(Borders.DIALOG);
+        builder.border(Paddings.DIALOG);
         builder.rowGroupingEnabled(true);
         builder.lineGapSize(LayoutStyle.getCurrent().getLinePad());
 
@@ -156,7 +156,7 @@ class WriteMessageDialog extends JDialog
         builder.nextLine();
 
         JComponent buttonBar = new ButtonBarBuilder().addGlue().addButton(okButton, cancelButton).build();
-        buttonBar.setBorder(Borders.DIALOG);
+        buttonBar.setBorder(Paddings.DIALOG);
 
         Container contentPane = getContentPane();
         contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS));
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeploymentPane.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeploymentPane.java
index 3a2a8c4cb41..9d94c3a784d 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeploymentPane.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeploymentPane.java
@@ -22,7 +22,7 @@ import javax.swing.plaf.basic.BasicSplitPaneUI;
 import javax.swing.tree.TreeCellRenderer;
 import javax.swing.tree.TreeSelectionModel;
 import javax.swing.tree.TreePath;
-import com.jgoodies.forms.factories.Borders;
+import com.jgoodies.forms.factories.Paddings;
 
 import com.zeroc.IceGridGUI.LiveDeployment.Editor;
 import com.zeroc.IceGridGUI.LiveDeployment.Root;
@@ -229,7 +229,7 @@ public class LiveDeploymentPane extends JSplitPane implements Tab
             new JScrollPane(tree,
                             ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
                             ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-        leftScroll.setBorder(Borders.EMPTY);
+        leftScroll.setBorder(Paddings.EMPTY);
 
         _leftPane = new SimpleInternalFrame("Runtime Components");
         _leftPane.setContent(leftScroll);
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SessionKeeper.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SessionKeeper.java
index e6da2e4b8b6..27dce009fba 100644
--- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SessionKeeper.java
+++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SessionKeeper.java
@@ -36,7 +36,7 @@ import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
 import com.jgoodies.forms.builder.DefaultFormBuilder;
 import com.jgoodies.forms.builder.ButtonBarBuilder;
-import com.jgoodies.forms.factories.Borders;
+import com.jgoodies.forms.factories.Paddings;
 import com.jgoodies.forms.layout.FormLayout;
 import com.jgoodies.forms.layout.CellConstraints;
 import com.jgoodies.forms.util.LayoutStyle;
@@ -1277,7 +1277,7 @@ public class SessionKeeper
             {
                 FormLayout layout = new FormLayout("pref", "pref");
                 DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-                builder.border(Borders.DIALOG);
+                builder.border(Paddings.DIALOG);
                 builder.rowGroupingEnabled(true);
 
                 ButtonGroup group = new ButtonGroup();
@@ -1395,7 +1395,7 @@ public class SessionKeeper
                 {
                     FormLayout layout = new FormLayout("pref:grow", "pref");
                     DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-                    builder.border(Borders.DIALOG);
+                    builder.border(Paddings.DIALOG);
                     builder.rowGroupingEnabled(false);
                     builder.append(_directDiscoveryDiscoveredEndpoint);
                     builder.append(createStrippedScrollPane(_directDiscoveryEndpointList));
@@ -1409,7 +1409,7 @@ public class SessionKeeper
             {
                 FormLayout layout = new FormLayout("pref:grow", "pref");
                 DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-                builder.border(Borders.DIALOG);
+                builder.border(Paddings.DIALOG);
                 builder.rowGroupingEnabled(true);
 
                 _directConnectToMaster = new JCheckBox("Connect to a Master Registry.");
@@ -1423,7 +1423,7 @@ public class SessionKeeper
             {
                 FormLayout layout = new FormLayout("pref:grow", "pref");
                 DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-                builder.border(Borders.DIALOG);
+                builder.border(Paddings.DIALOG);
                 builder.rowGroupingEnabled(true);
 
                 ButtonGroup group = new ButtonGroup();
@@ -1459,7 +1459,7 @@ public class SessionKeeper
             {
                 FormLayout layout = new FormLayout("pref:grow", "pref");
                 DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-                builder.border(Borders.DIALOG);
+                builder.border(Paddings.DIALOG);
                 builder.rowGroupingEnabled(true);
 
                 ButtonGroup group = new ButtonGroup();
@@ -1498,7 +1498,7 @@ public class SessionKeeper
             {
                 FormLayout layout = new FormLayout("pref, 2dlu, pref:grow", "pref");
                 DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-                builder.border(Borders.DIALOG);
+                builder.border(Paddings.DIALOG);
                 builder.rowGroupingEnabled(true);
 
                 _directDefaultEndpointHost = new JTextField(20);
@@ -1588,7 +1588,7 @@ public class SessionKeeper
             {
                 FormLayout layout = new FormLayout("pref, 2dlu, pref:grow", "pref");
                 DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-                builder.border(Borders.DIALOG);
+                builder.border(Paddings.DIALOG);
                 builder.rowGroupingEnabled(true);
 
                 _routedDefaultEndpointHost = new JTextField(20);
@@ -1685,7 +1685,7 @@ public class SessionKeeper
             {
                 FormLayout layout = new FormLayout("pref:grow", "pref");
                 DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-                builder.border(Borders.DIALOG);
+                builder.border(Paddings.DIALOG);
                 builder.rowGroupingEnabled(true);
 
                 _directCustomEndpointValue = new JTextField(20);
@@ -1722,7 +1722,7 @@ public class SessionKeeper
             {
                 FormLayout layout = new FormLayout("pref:grow", "pref");
                 DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-                builder.border(Borders.DIALOG);
+                builder.border(Paddings.DIALOG);
                 builder.rowGroupingEnabled(true);
 
                 _routedCustomEndpointValue = new JTextField(20);
@@ -1759,7 +1759,7 @@ public class SessionKeeper
             {
                 FormLayout layout = new FormLayout("pref:grow", "pref");
                 DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-                builder.border(Borders.DIALOG);
+                builder.border(Paddings.DIALOG);
                 builder.rowGroupingEnabled(true);
 
                 ButtonGroup group = new ButtonGroup();
@@ -1855,7 +1855,7 @@ public class SessionKeeper
 
                 FormLayout layout = new FormLayout("pref:grow", "pref");
                 DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-                builder.border(Borders.DIALOG);
+                builder.border(Paddings.DIALOG);
                 builder.rowGroupingEnabled(true);
                 builder.append(new JLabel("<html><b>X.509 Certificate</b></html>"));
                 builder.append(panel);
@@ -1921,7 +1921,7 @@ public class SessionKeeper
 
                 FormLayout layout = new FormLayout("pref:grow", "pref");
                 DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-                builder.border(Borders.DIALOG);
+                builder.border(Paddings.DIALOG);
                 builder.rowGroupingEnabled(true);
                 builder.append(new JLabel("<html><b>X.509 Certificate</b></html>"));
                 builder.append(panel);
@@ -1932,7 +1932,7 @@ public class SessionKeeper
             {
                 FormLayout layout = new FormLayout("pref:grow", "pref");
                 DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-                builder.border(Borders.DIALOG);
+                builder.border(Paddings.DIALOG);
                 builder.rowGroupingEnabled(true);
 
                 ButtonGroup group = new ButtonGroup();
@@ -1969,7 +1969,7 @@ public class SessionKeeper
             {
                 FormLayout layout = new FormLayout("pref, 2dlu, pref:grow", "pref");
                 DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-                builder.border(Borders.DIALOG);
+                builder.border(Paddings.DIALOG);
                 builder.rowGroupingEnabled(true);
 
                 _directUsername = new JTextField();
@@ -2011,7 +2011,7 @@ public class SessionKeeper
             {
                 FormLayout layout = new FormLayout("pref, 2dlu, pref:grow", "pref");
                 DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-                builder.border(Borders.DIALOG);
+                builder.border(Paddings.DIALOG);
                 builder.rowGroupingEnabled(true);
 
                 _routedUsername = new JTextField();
@@ -2598,7 +2598,7 @@ public class SessionKeeper
 
             JComponent buttonBar = new ButtonBarBuilder().addGlue().addButton(_backButton, _nextButton).
                 addUnrelatedGap().addButton(_finishButton, _cancelButton).build();
-            buttonBar.setBorder(Borders.DIALOG);
+            buttonBar.setBorder(Paddings.DIALOG);
             getContentPane().add(buttonBar, java.awt.BorderLayout.SOUTH);
 
             getContentPane().add(_cardPanel, java.awt.BorderLayout.CENTER);
@@ -3288,7 +3288,7 @@ public class SessionKeeper
             {
                 FormLayout layout = new FormLayout("right:pref, 2dlu, left:pref:grow", "pref");
                 DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-                builder.border(Borders.DIALOG);
+                builder.border(Paddings.DIALOG);
                 builder.rowGroupingEnabled(true);
                 builder.lineGapSize(LayoutStyle.getCurrent().getLinePad());
 
@@ -3382,7 +3382,7 @@ public class SessionKeeper
                     }
                 });
             JComponent buttonBar = new ButtonBarBuilder().addGlue().addButton(closeButton).build();
-            buttonBar.setBorder(Borders.DIALOG);
+            buttonBar.setBorder(Paddings.DIALOG);
             contentPane.add(buttonBar);
             getRootPane().setDefaultButton(closeButton);
             pack();
@@ -3540,14 +3540,14 @@ public class SessionKeeper
                 builder.nextLine();
 
                 connectionActionPanel = builder.getPanel();
-                connectionActionPanel.setBorder(Borders.DIALOG);
+                connectionActionPanel.setBorder(Paddings.DIALOG);
             }
 
             JPanel savedConfigurationsPanel = null;
             {
                 FormLayout layout = new FormLayout("left:pref", "pref");
                 DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-                builder.border(Borders.DIALOG);
+                builder.border(Paddings.DIALOG);
                 builder.rowGroupingEnabled(true);
                 _connectionListModel = new ConnectionListModel();
 
@@ -3682,7 +3682,7 @@ public class SessionKeeper
                     }
                 });
             JComponent buttonBar = new ButtonBarBuilder().addGlue().addButton(_connectButton, closeButton).build();
-            buttonBar.setBorder(Borders.DIALOG);
+            buttonBar.setBorder(Paddings.DIALOG);
             contentPane.add(buttonBar);
 
             pack();
@@ -4249,7 +4249,7 @@ public class SessionKeeper
             add(builder.getPanel());
             JComponent buttonBar = new ButtonBarBuilder().addButton(_importButton, _viewButton, _removeButton).
                                                                                                       addGlue().build();
-            buttonBar.setBorder(Borders.DIALOG);
+            buttonBar.setBorder(Paddings.DIALOG);
             add(buttonBar);
         }
 
@@ -4407,7 +4407,7 @@ public class SessionKeeper
 
         FormLayout layout = new FormLayout("right:pref, 2dlu, left:pref:grow", "pref");
         DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-        builder.border(Borders.DIALOG);
+        builder.border(Paddings.DIALOG);
         builder.rowGroupingEnabled(true);
         builder.lineGapSize(LayoutStyle.getCurrent().getLinePad());
         builder.addSeparator("Subject");
@@ -4460,7 +4460,7 @@ public class SessionKeeper
 
         FormLayout layout = new FormLayout("right:pref, 2dlu, left:pref:grow", "pref");
         DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-        builder.border(Borders.DIALOG);
+        builder.border(Paddings.DIALOG);
         builder.rowGroupingEnabled(true);
         builder.lineGapSize(LayoutStyle.getCurrent().getLinePad());
         builder.addSeparator("Issuer");
@@ -4502,7 +4502,7 @@ public class SessionKeeper
     {
         FormLayout layout = new FormLayout("right:pref, 2dlu, left:pref:grow", "pref");
         DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-        builder.border(Borders.DIALOG);
+        builder.border(Paddings.DIALOG);
         builder.rowGroupingEnabled(true);
         builder.lineGapSize(LayoutStyle.getCurrent().getLinePad());
         builder.addSeparator("Validity");
@@ -4520,7 +4520,7 @@ public class SessionKeeper
     {
         FormLayout layout = new FormLayout("right:pref, 2dlu, left:pref:grow", "pref");
         DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-        builder.border(Borders.DIALOG);
+        builder.border(Paddings.DIALOG);
         builder.rowGroupingEnabled(true);
         builder.lineGapSize(LayoutStyle.getCurrent().getLinePad());
         builder.addSeparator("Fingerprints");
@@ -4598,7 +4598,7 @@ public class SessionKeeper
     {
         FormLayout layout = new FormLayout("right:pref, 2dlu, left:pref:grow", "pref");
         DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-        builder.border(Borders.DIALOG);
+        builder.border(Paddings.DIALOG);
         builder.rowGroupingEnabled(true);
         builder.lineGapSize(LayoutStyle.getCurrent().getLinePad());
         builder.addSeparator("Subject Alternate Names");
@@ -4652,7 +4652,7 @@ public class SessionKeeper
                     }
                 });
             JComponent buttonBar = new ButtonBarBuilder().addGlue().addButton(closeButton).build();
-            buttonBar.setBorder(Borders.DIALOG);
+            buttonBar.setBorder(Paddings.DIALOG);
             contentPane.add(buttonBar);
 
             pack();
@@ -4701,7 +4701,7 @@ public class SessionKeeper
             getRootPane().setDefaultButton(closeButton);
 
             JComponent buttonBar = new ButtonBarBuilder().addGlue().addButton(closeButton).build();
-            buttonBar.setBorder(Borders.DIALOG);
+            buttonBar.setBorder(Paddings.DIALOG);
             contentPane.add(buttonBar);
             setResizable(false);
             pack();
@@ -4828,7 +4828,7 @@ public class SessionKeeper
                         // Build the basic login panel.
                         FormLayout layout = new FormLayout("pref, 2dlu, pref:grow, 2dlu, pref", "");
                         DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-                        builder.border(Borders.DIALOG);
+                        builder.border(Paddings.DIALOG);
 
                         if(info.getPassword() == null || info.getPassword().length == 0)
                         {
@@ -4966,7 +4966,7 @@ public class SessionKeeper
 
                     JComponent buttonBar = new ButtonBarBuilder().addGlue().addButton(okButton, cancelButton).
                                                                                                       addGlue().build();
-                    buttonBar.setBorder(Borders.DIALOG);
+                    buttonBar.setBorder(Paddings.DIALOG);
                     contentPane.add(buttonBar);
 
                     getRootPane().setDefaultButton(okButton);
@@ -5030,7 +5030,7 @@ public class SessionKeeper
                         // Build the basic login panel.
                         FormLayout layout = new FormLayout("pref, 2dlu, pref:grow, 2dlu, pref", "");
                         DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-                        builder.border(Borders.DIALOG);
+                        builder.border(Paddings.DIALOG);
 
                         builder.append(new JLabel("Key Password"), _keyPassword);
                         builder.nextLine();
@@ -5108,7 +5108,7 @@ public class SessionKeeper
 
                     JComponent buttonBar = new ButtonBarBuilder().addGlue().addButton(okButton, cancelButton).
                         addGlue().build();
-                    buttonBar.setBorder(Borders.DIALOG);
+                    buttonBar.setBorder(Paddings.DIALOG);
                     contentPane.add(buttonBar);
 
                     getRootPane().setDefaultButton(okButton);
@@ -5247,7 +5247,7 @@ public class SessionKeeper
                     // Build the basic login panel.
                     FormLayout layout = new FormLayout("pref, 2dlu, pref:grow, 2dlu, pref", "");
                     DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-                    builder.border(Borders.DIALOG);
+                    builder.border(Paddings.DIALOG);
 
                     if(info.getAuth() == AuthType.UsernamePasswordAuthType)
                     {
@@ -5410,7 +5410,7 @@ public class SessionKeeper
 
                 JComponent buttonBar = new ButtonBarBuilder().addGlue().addButton(okButton, editConnectionButton,
                     cancelButton).addGlue().build();
-                buttonBar.setBorder(Borders.DIALOG);
+                buttonBar.setBorder(Paddings.DIALOG);
                 contentPane.add(buttonBar);
 
                 getRootPane().setDefaultButton(okButton);