[freemind] Update to JGoodies 1.6
mef
mef at fedoraproject.org
Tue Jan 29 13:14:05 UTC 2013
commit 0a67a552223927a04ae1325fe951ffa936c29ed5
Author: mef3 <mefoster at gmail.com>
Date: Fri Jan 25 13:32:52 2013 +0000
Update to JGoodies 1.6
freemind-0.9.0-jgoodies-forms-1_6.patch | 96 +++++++++++++++++++++++++++++++
freemind.spec | 12 +++-
2 files changed, 106 insertions(+), 2 deletions(-)
---
diff --git a/freemind-0.9.0-jgoodies-forms-1_6.patch b/freemind-0.9.0-jgoodies-forms-1_6.patch
new file mode 100644
index 0000000..afd30d7
--- /dev/null
+++ b/freemind-0.9.0-jgoodies-forms-1_6.patch
@@ -0,0 +1,96 @@
+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);
diff --git a/freemind.spec b/freemind.spec
index e93f17a..8e39eb3 100644
--- a/freemind.spec
+++ b/freemind.spec
@@ -1,6 +1,6 @@
Name: freemind
Version: 0.9.0
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: Free mind mapping software
Group: Applications/Productivity
@@ -14,6 +14,7 @@ Patch0: freemind-0.9.0-svg-build.patch
Patch1: freemind-0.9.0-manifest.patch
Patch2: freemind-0.9.0-javadoc.patch
Patch3: freemind-0.9.0-jgoodies-build.patch
+Patch4: freemind-0.9.0-jgoodies-forms-1_6.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
@@ -36,7 +37,7 @@ BuildRequires: java >= 1:1.6.0
BuildRequires: javahelp2
BuildRequires: java-devel
BuildRequires: ws-jaxme
-BuildRequires: jgoodies-forms
+BuildRequires: jgoodies-forms >= 1.6.0
BuildRequires: jpackage-utils
BuildRequires: jibx
BuildRequires: junit
@@ -91,6 +92,10 @@ This package contains the API documentation for %{name}.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
+
+# Using the modern jgoodies stuff requires varargs support
+sed -i 's/value="1.4"/value="1.5"/' build.xml
sed -i 's/\r//' %{_builddir}/%{name}/accessories/LICENSE.MIT
@@ -260,6 +265,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Fri Jan 25 2013 Mary Ellen Foster <mefoster at gmail.com> 0.9.0-13
+- Update to JGoodies Forms 1.6.0 API
+
* Thu Dec 27 2012 Johannes Lips <hannes at fedoraproject.org> 0.9.0-12
- fixed the freemind.xml to fix bug #890360
More information about the scm-commits
mailing list