On Thu, 2013-07-25 at 22:01 +0200, W. van den Akker wrote:

> On Thu, 2013-07-25 at 21:41 +0200, W. van den Akker wrote:
> 
> > Hi,
> > 
> > I am adopting this package and look into the problem.
> > The same occurs with the 1.0.0.rc4 source.
> > 
> > Somewhere the Java packages are changed.
> > 
> > Hope to get 1.0.0 soon into sid and fix the problem with jessie.
> 
> 
> These patches should solve the problem.
> They are from the fedora site. I have not tried it yet.
> 
> Greetings,
> Willem
> 


and now with the patches attached ...

diff -ur freemind.orig/accessories/plugins/dialogs/ManagePatternsPopupDialog.java freemind/accessories/plugins/dialogs/ManagePatternsPopupDialog.java
--- freemind.orig/accessories/plugins/dialogs/ManagePatternsPopupDialog.java	2013-01-25 12:55:25.082825429 +0000
+++ freemind/accessories/plugins/dialogs/ManagePatternsPopupDialog.java	2013-01-25 13:28:01.169872237 +0000
@@ -58,7 +58,7 @@
 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 @@
 			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 -ur freemind.orig/accessories/plugins/time/TimeList.java freemind/accessories/plugins/time/TimeList.java
--- freemind.orig/accessories/plugins/time/TimeList.java	2013-01-25 12:55:25.081825433 +0000
+++ freemind/accessories/plugins/time/TimeList.java	2013-01-25 13:29:10.080636748 +0000
@@ -72,7 +72,7 @@
 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 @@
 		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 -ur freemind.orig/freemind/preferences/layout/OptionPanel.java freemind/freemind/preferences/layout/OptionPanel.java
--- freemind.orig/freemind/preferences/layout/OptionPanel.java	2013-01-25 12:55:25.097825379 +0000
+++ freemind/freemind/preferences/layout/OptionPanel.java	2013-01-25 13:28:01.170872233 +0000
@@ -51,8 +51,8 @@
 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 @@
 		});
 		frame.getRootPane().setDefaultButton(okButton);
 		frame.getContentPane().add(
-				ButtonBarFactory.buildOKCancelBar(cancelButton, okButton),
+				new ButtonBarBuilder().addGlue().addButton(cancelButton, okButton).build(),
 				BorderLayout.SOUTH);
 	}
 
Binary files freemind.orig/lib/bindings.jar and freemind/lib/bindings.jar differ
diff -ur freemind.orig/plugins/collaboration/database/DatabaseBasics.java freemind/plugins/collaboration/database/DatabaseBasics.java
--- freemind.orig/plugins/collaboration/database/DatabaseBasics.java	2013-01-25 12:55:25.076825449 +0000
+++ freemind/plugins/collaboration/database/DatabaseBasics.java	2013-01-25 13:28:01.170872233 +0000
@@ -41,8 +41,8 @@
 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 @@
 			});
 			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);
--- freemind/freemind/preferences/layout/OptionPanel.java	2011-02-06 21:49:12.000000000 +0100
+++ freemind/freemind/preferences/layout/OptionPanel.java	2011-12-22 03:36:30.925931776 +0100
@@ -400,7 +400,7 @@ public class OptionPanel implements Text
         	JLabel label = new JLabel(labelText, icon, JLabel.RIGHT);
             label.setToolTipText(pTranslator.getText(getDescription()));
             if(rowSpec == null){
-                rowSpec = new RowSpec("fill:20dlu");
+                rowSpec = RowSpec.decode("fill:20dlu");
             }
             if( 3 < builder.getColumn()){
             builder.appendRelatedComponentsGapRow();

Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to