Repository: cayenne Updated Branches: refs/heads/master b16ac50dd -> 762dfa386
CAY-2449 Needless scrollbar in the Modeler Menu: Tools: Generate Database Schema Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/da6d9611 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/da6d9611 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/da6d9611 Branch: refs/heads/master Commit: da6d9611f6d5a9543893e2b86f81f6a906ba9841 Parents: 36faff5 Author: Arseni Bulatski <ancars...@gmail.com> Authored: Wed Aug 22 12:28:22 2018 +0300 Committer: Arseni Bulatski <ancars...@gmail.com> Committed: Wed Aug 22 12:29:33 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/da6d9611/RELEASE-NOTES.txt ---------------------------------------------------------------------- diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index d2e5421..682cf91 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -20,6 +20,7 @@ Bug Fixes: CAY-2444 Change URI from http:// to https:// in xsi:schemaLocation CAY-2445 Oracle: Problem with ExpressionFactory.notInExp() +CAY-2449 Needless scrollbar in the Modeler Menu: Tools: Generate Database Schema ---------------------------------- Release: 4.1.M2 http://git-wip-us.apache.org/repos/asf/cayenne/blob/da6d9611/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,
