[freeplane] 01/01: Fix another compile problem with jgoodies-1.9

[Felix Natter]

This is an automated email from the git hooks/post-receive script.

fnatter-guest pushed a commit to branch master
in repository freeplane.

commit 7565fcda65157cc15e3498979ea69e47480426b2
Author: Felix Natter <fnatter at gmx.net>
Date:   Sat Dec 3 20:38:30 2016 +0100

    Fix another compile problem with jgoodies-1.9
---
 debian/changelog                     |  7 +++++++
 debian/patches/50_jgoodies-1.9.patch | 22 ++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b2dc45e..758c811 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+freeplane (1.5.16-3) unstable; urgency=medium
+
+  * fix compile problem with jgoodies-1.9 (50_jgoodies-1.9.patch updated)
+    (Closes: #846816)
+
+ -- Felix Natter <fnatter at gmx.net>  Sat, 03 Dec 2016 20:33:37 +0100
+
 freeplane (1.5.16-2) unstable; urgency=medium
 
   * apply patch to allow building against jgoodies 1.9.0
diff --git a/debian/patches/50_jgoodies-1.9.patch b/debian/patches/50_jgoodies-1.9.patch
index 28796f7..595d711 100644
--- a/debian/patches/50_jgoodies-1.9.patch
+++ b/debian/patches/50_jgoodies-1.9.patch
@@ -23,3 +23,25 @@ Last-Update: 2016-11-20
  				final JScrollPane bottomComponent = new JScrollPane(bottomBuilder.getPanel());
  				UITools.setScrollbarIncrement(bottomComponent);
  				final String tabName = TextUtils.getOptionalText(newTab.getLabel());
+--- a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/StyleEditorPanel.java
++++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/StyleEditorPanel.java
+@@ -116,6 +116,9 @@
+ import com.jgoodies.forms.factories.Borders;
+ import com.jgoodies.forms.layout.FormLayout;
+ 
++import com.jgoodies.forms.factories.*;
++import com.jgoodies.forms.layout.*;
++
+ public class StyleEditorPanel extends JPanel {
+ 	private static final int FONT_SIZE = Math.round(UITools.FONT_SCALE_FACTOR * 8);
+ 	private static final TranslatedObject AUTOMATIC_LAYOUT_DISABLED = new TranslatedObject("automatic_layout_disabled");
+@@ -842,7 +845,8 @@
+ 		final String form = "right:max(20dlu;p), 2dlu, p, 1dlu,right:max(20dlu;p), 4dlu, 80dlu, 7dlu";
+ 		final FormLayout rightLayout = new FormLayout(form, "");
+ 		final DefaultFormBuilder rightBuilder = new DefaultFormBuilder(rightLayout);
+-		rightBuilder.border(Borders.DLU2);
++		//rightBuilder.border(Borders.DLU2);
++		rightBuilder.border(Paddings.DLU2);
+ 		new SeparatorProperty("OptionPanel.separator.NodeStyle").layout(rightBuilder);
+ 		if (addStyleBox) {
+ 			addAutomaticLayout(rightBuilder);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/freeplane.git