Author: tg Date: 2016-11-22 15:14:51 +0000 (Tue, 22 Nov 2016) New Revision: 19183
Modified: trunk/squirrel-sql/debian/patches/adapt_to_newer_jgoodies.patch Log: next round Modified: trunk/squirrel-sql/debian/patches/adapt_to_newer_jgoodies.patch =================================================================== --- trunk/squirrel-sql/debian/patches/adapt_to_newer_jgoodies.patch 2016-11-22 14:26:07 UTC (rev 19182) +++ trunk/squirrel-sql/debian/patches/adapt_to_newer_jgoodies.patch 2016-11-22 15:14:51 UTC (rev 19183) @@ -1,5 +1,18 @@ -# DP: jgoodies 1.6 removed the "deprecated" ButtonBarFactory +# DP: jgoodies 1.6 removed the "deprecated" ButtonBarFactory, and other stuff +--- a/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/AboutBoxDialog.java ++++ b/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/AboutBoxDialog.java +@@ -241,9 +241,7 @@ public class AboutBoxDialog extends JDia + + final ButtonBarBuilder builder = new ButtonBarBuilder(); + builder.addGlue(); +-// builder.addGridded(new JButton("Alter")); +-// builder.addRelatedGap(); +- builder.addGridded(_closeBtn); ++ builder.addButton(_closeBtn); + + return builder.getPanel(); + } --- 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; @@ -59,3 +72,61 @@ + return buildRightAlignedBar(new JButton[] { ok, cancel }); + } } +--- a/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/DefaultFormBuilder.java ++++ b/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/DefaultFormBuilder.java +@@ -37,9 +37,9 @@ import javax.swing.JComponent; + import javax.swing.JLabel; + import javax.swing.JPanel; + +-import com.jgoodies.forms.factories.FormFactory; + import com.jgoodies.forms.layout.ConstantSize; + import com.jgoodies.forms.layout.FormLayout; ++import com.jgoodies.forms.layout.FormSpecs; + import com.jgoodies.forms.layout.RowSpec; + + /** +@@ -212,7 +212,7 @@ import com.jgoodies.forms.layout.RowSpec + * @since 1.0.3 + * + * @see com.jgoodies.forms.builder.AbstractFormBuilder +- * @see com.jgoodies.forms.factories.FormFactory ++ * @see com.jgoodies.forms.layout.FormSpecs + * @see com.jgoodies.forms.layout.FormLayout + */ + public final class DefaultFormBuilder extends I15dPanelBuilder { +@@ -223,7 +223,7 @@ public final class DefaultFormBuilder ex + * + * @see #setDefaultRowSpec(RowSpec) + */ +- private RowSpec defaultRowSpec = FormFactory.PREF_ROWSPEC; ++ private RowSpec defaultRowSpec = FormSpecs.PREF_ROWSPEC; + + /** + * Holds the row specification that is reused to describe +@@ -231,7 +231,7 @@ public final class DefaultFormBuilder ex + * + * @see #setLineGapSize(ConstantSize) + */ +- private RowSpec lineGapSpec = FormFactory.LINE_GAP_ROWSPEC; ++ private RowSpec lineGapSpec = FormSpecs.LINE_GAP_ROWSPEC; + + /** + * Holds the row specification that describes the constant gaps +@@ -239,7 +239,7 @@ public final class DefaultFormBuilder ex + * + * @see #setParagraphGapSize(ConstantSize) + */ +- private RowSpec paragraphGapSpec = FormFactory.PARAGRAPH_GAP_ROWSPEC; ++ private RowSpec paragraphGapSpec = FormSpecs.PARAGRAPH_GAP_ROWSPEC; + + /** + * Holds the offset of the leading column - often 0 or 1. +@@ -327,7 +327,7 @@ public final class DefaultFormBuilder ex + + /** + * Sets the row specification that shall be used for component rows. +- * It is {@link FormFactory#PREF_ROWSPEC} by default. ++ * It is {@link FormSpecs#PREF_ROWSPEC} by default. + * + * @param defaultRowSpec the RowSpec to be used for component rows + * _______________________________________________ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits