From: Markus Koschany <apo@gambaru.de>
Date: Fri, 4 Oct 2013 13:17:20 +0200
Subject: jgoodies forms 1.6

---
 .../accessories/plugins/dialogs/ManagePatternsPopupDialog.java    | 4 ++--
 freemind/accessories/plugins/time/TimeList.java                   | 8 ++++----
 freemind/freemind/preferences/layout/OptionPanel.java             | 4 ++--
 freemind/plugins/collaboration/database/DatabaseBasics.java       | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/freemind/accessories/plugins/dialogs/ManagePatternsPopupDialog.java b/freemind/accessories/plugins/dialogs/ManagePatternsPopupDialog.java
index a55028e..b066f0f 100644
--- a/freemind/accessories/plugins/dialogs/ManagePatternsPopupDialog.java
+++ b/freemind/accessories/plugins/dialogs/ManagePatternsPopupDialog.java
@@ -58,7 +58,7 @@ import javax.swing.ListSelectionModel;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
-import com.jgoodies.forms.factories.ButtonBarFactory;
+import com.jgoodies.forms.builder.ButtonBarBuilder;
 
 import freemind.common.TextTranslator;
 import freemind.common.XmlBindingTools;
@@ -454,7 +454,7 @@ public class ManagePatternsPopupDialog extends JDialog implements
 			jContentPane.add(mSplitPane, new GridBagConstraints(0,
 					0, 2, 1, 1.0, 8.0, GridBagConstraints.WEST,
 					GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-			jContentPane.add(ButtonBarFactory.buildOKCancelBar(getJCancelButton(), getJOKButton()),
+			jContentPane.add(new ButtonBarBuilder().addGlue().addButton(getJCancelButton(), getJOKButton()).build(),
 					new GridBagConstraints(1, 1, 1, 1,
 					0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE,
 					new Insets(0, 0, 0, 0), 0, 0));
diff --git a/freemind/accessories/plugins/time/TimeList.java b/freemind/accessories/plugins/time/TimeList.java
index b7eb212..80d03c2 100644
--- a/freemind/accessories/plugins/time/TimeList.java
+++ b/freemind/accessories/plugins/time/TimeList.java
@@ -72,7 +72,7 @@ import javax.swing.table.TableCellRenderer;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
 
-import com.jgoodies.forms.factories.ButtonBarFactory;
+import com.jgoodies.forms.builder.ButtonBarBuilder2;
 
 import freemind.controller.BlindIcon;
 import freemind.controller.StructuredMenuHolder;
@@ -295,14 +295,14 @@ public class TimeList extends MindMapHookAdapter {
 		exportAction.setEnabled(false);
 		replaceSelectedAction.setEnabled(false);
 		
-		JPanel bar = ButtonBarFactory.buildGrowingBar(new JButton[]{
+		JPanel bar = new ButtonBarBuilder2().addGrowing(
 				cancelButton,
 				exportButton, 
 				replaceAllButton, 
 				replaceSelectedButton, 
 				gotoButton, 
-				selectButton, 
-				});
+				selectButton 
+				).build();
 		contentPane.add(/*new JScrollPane*/(bar), new GridBagConstraints(0,6,1, 1, 1.0, 1.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
 		
 		JMenuBar menuBar = new JMenuBar();
diff --git a/freemind/freemind/preferences/layout/OptionPanel.java b/freemind/freemind/preferences/layout/OptionPanel.java
index e9a3cfe..ceba697 100644
--- a/freemind/freemind/preferences/layout/OptionPanel.java
+++ b/freemind/freemind/preferences/layout/OptionPanel.java
@@ -51,8 +51,8 @@ import javax.swing.JSplitPane;
 import javax.swing.UIManager;
 import javax.swing.UIManager.LookAndFeelInfo;
 
+import com.jgoodies.forms.builder.ButtonBarBuilder;
 import com.jgoodies.forms.builder.DefaultFormBuilder;
-import com.jgoodies.forms.factories.ButtonBarFactory;
 import com.jgoodies.forms.layout.FormLayout;
 import com.jgoodies.forms.layout.RowSpec;
 
@@ -234,7 +234,7 @@ public class OptionPanel implements TextTranslator {
 		});
 		frame.getRootPane().setDefaultButton(okButton);
 		frame.getContentPane().add(
-				ButtonBarFactory.buildOKCancelBar(cancelButton, okButton),
+				new ButtonBarBuilder().addGlue().addButton(cancelButton, okButton).build(),
 				BorderLayout.SOUTH);
 	}
 
diff --git a/freemind/plugins/collaboration/database/DatabaseBasics.java b/freemind/plugins/collaboration/database/DatabaseBasics.java
index ed712b2..4f64f21 100644
--- a/freemind/plugins/collaboration/database/DatabaseBasics.java
+++ b/freemind/plugins/collaboration/database/DatabaseBasics.java
@@ -41,8 +41,8 @@ import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.WindowConstants;
 
+import com.jgoodies.forms.builder.ButtonBarBuilder;
 import com.jgoodies.forms.builder.DefaultFormBuilder;
-import com.jgoodies.forms.factories.ButtonBarFactory;
 import com.jgoodies.forms.layout.FormLayout;
 
 import freemind.common.NumberProperty;
@@ -169,7 +169,7 @@ public class DatabaseBasics extends MindMapNodeHookAdapter  {
 			});
 			getRootPane().setDefaultButton(mOkButton);
 			getContentPane().add(
-					ButtonBarFactory.buildOKCancelBar(cancelButton, mOkButton),
+					new ButtonBarBuilder().addGlue().addButton(cancelButton, mOkButton).build(),
 					BorderLayout.SOUTH);
 			setTitle("Enter Password Dialog");
 			setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);