CAY-2449 Modeler: Needless scrollbar in Generate DB Schema result menu
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/51cc84f2 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/51cc84f2 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/51cc84f2 Branch: refs/heads/STABLE-4.0 Commit: 51cc84f2b374599a900517f0e3e728317202c3f8 Parents: 5ec7f38 Author: Nikita Timofeev <stari...@gmail.com> Authored: Wed Aug 29 14:13:36 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Wed Aug 29 14:13:36 2018 +0300 ---------------------------------------------------------------------- RELEASE-NOTES.txt | 1 + .../dialog/ValidationResultBrowserView.java | 18 +++++++----------- 2 files changed, 8 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/51cc84f2/RELEASE-NOTES.txt ---------------------------------------------------------------------- diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index d7da77c..56a4c32 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -14,6 +14,7 @@ Date: Bug Fixes: +CAY-2449 Modeler: Needless scrollbar in Generate DB Schema result menu CAY-2459 Paste function is not working CAY-2464 ClassCastException when returning PRUNED_NODE in expression transformer http://git-wip-us.apache.org/repos/asf/cayenne/blob/51cc84f2/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ValidationResultBrowserView.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ValidationResultBrowserView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ValidationResultBrowserView.java index f186c3b..6c143d6 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ValidationResultBrowserView.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ValidationResultBrowserView.java @@ -20,9 +20,9 @@ package org.apache.cayenne.modeler.dialog; -import java.awt.BorderLayout; -import java.awt.Dimension; -import java.awt.FlowLayout; +import com.jgoodies.forms.builder.PanelBuilder; +import com.jgoodies.forms.layout.CellConstraints; +import com.jgoodies.forms.layout.FormLayout; import javax.swing.JButton; import javax.swing.JComponent; @@ -31,10 +31,9 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTextArea; import javax.swing.ScrollPaneConstants; - -import com.jgoodies.forms.builder.PanelBuilder; -import com.jgoodies.forms.layout.CellConstraints; -import com.jgoodies.forms.layout.FormLayout; +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.FlowLayout; /** */ @@ -63,10 +62,7 @@ public class ValidationResultBrowserView extends JDialog { "fill:min(50dlu;pref):grow", "fill:20dlu, 9dlu, p, 3dlu, fill:40dlu:grow")); builder.setDefaultDialogBorder(); - builder.add(new JScrollPane( - messageLabel, - ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, - ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER), cc.xy(1, 1)); + builder.add(messageLabel, cc.xy(1, 1)); builder.addSeparator("Details", cc.xy(1, 3)); builder.add(new JScrollPane( errorsDisplay,