[ice/f18] Slight modification to jgoodies-forms patch

[mef]

commit c80c83c1973f4bb53412c72d0207801d308a3781
Author: mef3 <mefoster at gmail.com>
Date:   Fri Jan 25 14:19:09 2013 +0000

    Slight modification to jgoodies-forms patch

 ice-3.4.2-jgoodies-forms-1.6.patch |   20 ++++++++++----------
 ice.spec                           |    2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/ice-3.4.2-jgoodies-forms-1.6.patch b/ice-3.4.2-jgoodies-forms-1.6.patch
index 3b0cea9..3464aa9 100644
--- a/ice-3.4.2-jgoodies-forms-1.6.patch
+++ b/ice-3.4.2-jgoodies-forms-1.6.patch
@@ -5,7 +5,7 @@ diff -ur Ice-3.4.2/java/src/IceGridGUI/Application/Editor.java Ice-3.4.2.jgoodie
  import javax.swing.event.DocumentListener;
  
  import com.jgoodies.forms.builder.DefaultFormBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
++import com.jgoodies.forms.builder.ButtonBarBuilder;
  import com.jgoodies.forms.factories.Borders;
 -import com.jgoodies.forms.factories.ButtonBarFactory;
  import com.jgoodies.forms.factories.DefaultComponentFactory;
@@ -16,7 +16,7 @@ diff -ur Ice-3.4.2/java/src/IceGridGUI/Application/Editor.java Ice-3.4.2.jgoodie
      {
          super.buildPropertiesPanel();
 -        JComponent buttonBar = ButtonBarFactory.buildRightAlignedBar(_applyButton, _discardButton);
-+        JComponent buttonBar = new ButtonBarBuilder2().addGlue().addButton(_applyButton, _discardButton).build();
++        JComponent buttonBar = new ButtonBarBuilder().addGlue().addButton(_applyButton, _discardButton).build();
          buttonBar.setBorder(Borders.DIALOG_BORDER);
          _propertiesPanel.add(buttonBar, BorderLayout.SOUTH);
      }
@@ -38,7 +38,7 @@ diff -ur Ice-3.4.2/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java Ice-3.4.
  import javax.swing.JTextField;
  
  import com.jgoodies.forms.builder.DefaultFormBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
++import com.jgoodies.forms.builder.ButtonBarBuilder;
  import com.jgoodies.forms.factories.Borders;
 -import com.jgoodies.forms.factories.ButtonBarFactory;
  import com.jgoodies.forms.layout.CellConstraints;
@@ -52,7 +52,7 @@ diff -ur Ice-3.4.2/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java Ice-3.4.
 -                ButtonBarFactory.buildOKCancelBar(okButton, cancelButton);
 -            buttonBar.setBorder(Borders.DIALOG_BORDER);
 -
-+            JComponent buttonBar = new ButtonBarBuilder2().addGlue().addButton(okButton, cancelButton).build();
++            JComponent buttonBar = new ButtonBarBuilder().addGlue().addButton(okButton, cancelButton).build();
 +            buttonBar.setBorder(Borders.DIALOG);
 +            
              contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS));
@@ -65,7 +65,7 @@ diff -ur Ice-3.4.2/java/src/IceGridGUI/LiveDeployment/ShowLogPrefsDialog.java Ic
  import javax.swing.JTextField;
  
  import com.jgoodies.forms.builder.DefaultFormBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
++import com.jgoodies.forms.builder.ButtonBarBuilder;
  import com.jgoodies.forms.factories.Borders;
 -import com.jgoodies.forms.factories.ButtonBarFactory;
  import com.jgoodies.forms.layout.FormLayout;
@@ -78,7 +78,7 @@ diff -ur Ice-3.4.2/java/src/IceGridGUI/LiveDeployment/ShowLogPrefsDialog.java Ic
 -        JComponent buttonBar =
 -            ButtonBarFactory.buildOKCancelBar(okButton, cancelButton);
 -        buttonBar.setBorder(Borders.DIALOG_BORDER);
-+        JComponent buttonBar = new ButtonBarBuilder2().addGlue().addButton(okButton, cancelButton).build();
++        JComponent buttonBar = new ButtonBarBuilder().addGlue().addButton(okButton, cancelButton).build();
 +        buttonBar.setBorder(Borders.DIALOG);
  
          java.awt.Container contentPane = getContentPane();
@@ -90,7 +90,7 @@ diff -ur Ice-3.4.2/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java Ic
  import javax.swing.SwingUtilities;
  
  import com.jgoodies.forms.builder.DefaultFormBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
++import com.jgoodies.forms.builder.ButtonBarBuilder;
  import com.jgoodies.forms.factories.Borders;
 -import com.jgoodies.forms.factories.ButtonBarFactory;
  import com.jgoodies.forms.layout.CellConstraints;
@@ -103,7 +103,7 @@ diff -ur Ice-3.4.2/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java Ic
 -        JComponent buttonBar = ButtonBarFactory.buildOKCancelBar(okButton, cancelButton);
 -        buttonBar.setBorder(Borders.DIALOG_BORDER);
 +        
-+        JComponent buttonBar = new ButtonBarBuilder2().addGlue().addButton(okButton, cancelButton).build();
++        JComponent buttonBar = new ButtonBarBuilder().addGlue().addButton(okButton, cancelButton).build();
 +        buttonBar.setBorder(Borders.DIALOG);
  
          Container contentPane = getContentPane();
@@ -115,7 +115,7 @@ diff -ur Ice-3.4.2/java/src/IceGridGUI/SessionKeeper.java Ice-3.4.2.jgoodies-for
  import java.awt.event.ItemListener;
  
  import com.jgoodies.forms.builder.DefaultFormBuilder;
-+import com.jgoodies.forms.builder.ButtonBarBuilder2;
++import com.jgoodies.forms.builder.ButtonBarBuilder;
  import com.jgoodies.forms.factories.Borders;
 -import com.jgoodies.forms.factories.ButtonBarFactory;
  import com.jgoodies.forms.factories.DefaultComponentFactory;
@@ -127,7 +127,7 @@ diff -ur Ice-3.4.2/java/src/IceGridGUI/SessionKeeper.java Ice-3.4.2.jgoodies-for
  
 -            JComponent buttonBar = ButtonBarFactory.buildOKCancelBar(okButton, cancelButton);
 -            buttonBar.setBorder(Borders.DIALOG_BORDER);
-+            JComponent buttonBar = new ButtonBarBuilder2().addGlue().addButton(okButton, cancelButton).build();
++            JComponent buttonBar = new ButtonBarBuilder().addGlue().addButton(okButton, cancelButton).build();
 +            buttonBar.setBorder(Borders.DIALOG);
  
              Container contentPane = getContentPane();
diff --git a/ice.spec b/ice.spec
index eb73515..1feded0 100644
--- a/ice.spec
+++ b/ice.spec
@@ -586,7 +586,7 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n -d extension_dir=%{buildroot}%{php
 
 
 %changelog
-* Fri Jan 25 2012 Mary Ellen Foster <mefoster at gmail.com> - 3.4.2-19
+* Fri Jan 25 2013 Mary Ellen Foster <mefoster at gmail.com> - 3.4.2-19
 - Patch to work with jgoodies-forms 1.6.0
 
 * Wed Oct 17 2012 Haïkel Guémar <hguemar at fedoraproject.org> - 3.4.2-18