[pkg-java] r19182 - in trunk/squirrel-sql/debian: . patches

[Thorsten Glaser]

Author: tg
Date: 2016-11-22 14:26:07 +0000 (Tue, 22 Nov 2016)
New Revision: 19182

Added:
   trunk/squirrel-sql/debian/patches/adapt_to_newer_jgoodies.patch
Modified:
   trunk/squirrel-sql/debian/changelog
   trunk/squirrel-sql/debian/patches/series
Log:
Adapt to jgoodies 1.6.0


Modified: trunk/squirrel-sql/debian/changelog
===================================================================
--- trunk/squirrel-sql/debian/changelog	2016-11-22 13:26:04 UTC (rev 19181)
+++ trunk/squirrel-sql/debian/changelog	2016-11-22 14:26:07 UTC (rev 19182)
@@ -19,6 +19,7 @@
  
   [ Thorsten Glaser ]
   * Fixup for post-squeeze changes, git upstream, etc.
+  * Adapt to jgoodies 1.6.0
 
  -- Vladimir Kotov <vladimir at kotov.lv>  Wed, 09 Jan 2011 23:35:28 +0200
 

Added: trunk/squirrel-sql/debian/patches/adapt_to_newer_jgoodies.patch
===================================================================
--- trunk/squirrel-sql/debian/patches/adapt_to_newer_jgoodies.patch	                        (rev 0)
+++ trunk/squirrel-sql/debian/patches/adapt_to_newer_jgoodies.patch	2016-11-22 14:26:07 UTC (rev 19182)
@@ -0,0 +1,61 @@
+# DP: jgoodies 1.6 removed the "deprecated" ButtonBarFactory
+
+--- a/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/OkClosePanel.java
++++ b/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/OkClosePanel.java
+@@ -25,7 +25,7 @@ import javax.swing.JPanel;
+ import javax.swing.JRootPane;
+ import javax.swing.event.EventListenerList;
+ 
+-import com.jgoodies.forms.factories.ButtonBarFactory;
++import com.jgoodies.forms.builder.ButtonBarBuilder;
+ 
+ import net.sourceforge.squirrel_sql.fw.util.StringManager;
+ import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+@@ -101,7 +101,7 @@ public class OkClosePanel extends JPanel
+ 	 * before otherwise you will get an <TT>IllegalStateException</TT>
+ 	 * exception.
+ 	 *
+-	 * @param	IllegalStateException
++	 * @throws	IllegalStateException
+ 	 * 			Thrown if <TT>null</TT> <TT>JRootPane</TT>. I.E. component
+ 	 * 			hasn't been added to a frame, dialog etc.
+ 	 */
+@@ -163,7 +163,7 @@ public class OkClosePanel extends JPanel
+ 	{
+ 		_okBtn = new JButton(okButtonText);
+ 
+-		JPanel pnl = ButtonBarFactory.buildOKCancelBar(_okBtn, _closeBtn);
++		JPanel pnl = buildOKCancelBar(_okBtn, _closeBtn);
+ 		add(pnl);
+ //		add(_okBtn);
+ //		add(_closeBtn);
+@@ -184,4 +184,29 @@ public class OkClosePanel extends JPanel
+ //
+ //		GUIUtils.setJButtonSizesTheSame(new JButton[] {_okBtn, _closeBtn, new JButton(i18n.CANCEL)});
+ 	}
++
++	/**
++	 * Builds and returns a right aligned button bar with the given buttons.
++	 *
++	 * @param buttons an array of buttons to add
++	 * @return a right aligned button bar with the given buttons
++	 */
++	public static JPanel buildRightAlignedBar(JButton[] buttons) {
++		ButtonBarBuilder builder = new ButtonBarBuilder();
++		builder.addGlue();
++		builder.addButton(buttons);
++		return builder.getPanel();
++	}
++
++	/**
++	 * Builds and returns a button bar with OK and Cancel.
++	 *
++	 * @param ok     the OK button
++	 * @param cancel the Cancel button
++	 * @return a panel that contains the button(s)
++	 */
++	public static JPanel buildOKCancelBar(
++			JButton ok, JButton cancel) {
++		return buildRightAlignedBar(new JButton[] { ok, cancel });
++	}
+ }

Modified: trunk/squirrel-sql/debian/patches/series
===================================================================
--- trunk/squirrel-sql/debian/patches/series	2016-11-22 13:26:04 UTC (rev 19181)
+++ trunk/squirrel-sql/debian/patches/series	2016-11-22 14:26:07 UTC (rev 19182)
@@ -9,3 +9,4 @@
 009-plugin-liclink.patch
 disable_autoupdate.dpatch
 drop_parent_pom.patch
+adapt_to_newer_jgoodies.patch