Exception in "Generate Database Schema" CAY-2919

Author: andrus

RELEASE-NOTES.txt

@@ -46,6 +46,7 @@ CAY-2900 Meaningful generated PKs could lead to the ClassCastException
 CAY-2901 Loosing comments on the existing ObjAttribute after DB import
 CAY-2902 Shared query cache clobbers newer object state
 CAY-2904 Disjoint prefetch returns incorrect data
+CAY-2919 Exception in "Generate Database Schema"
 
 ----------------------------------
 Release: 5.0-M1

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/gen/DBGeneratorOptionsView.java

@@ -26,7 +26,6 @@
 import java.awt.FlowLayout;
 import java.awt.GridLayout;
 
-import javax.swing.BorderFactory;
 import javax.swing.Box;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
@@ -39,7 +38,6 @@
 import javax.swing.JTextArea;
 import javax.swing.ScrollPaneConstants;
 import javax.swing.SwingConstants;
-import javax.swing.UIManager;
 
 import com.jgoodies.forms.builder.PanelBuilder;
 import com.jgoodies.forms.factories.Borders;
@@ -113,8 +111,7 @@ public DBGeneratorOptionsView(Component tables) {
         builder.add(adapterPanel, cc.xy(1, 7));
         builder.addSeparator("Generated SQL", cc.xywh(1, 9, 1, 1));
         builder.add(sqlTextPanel, cc.xy(1, 11));
-        builder.setBorder(BorderFactory
-                .createCompoundBorder(UIManager.getBorder("ToolBar.border"), Borders.DIALOG_BORDER));
+        builder.setBorder(Borders.DIALOG_BORDER);
 
         tabs.addTab("SQL Options", builder.getPanel());
         tabs.addTab("Tables", new JScrollPane(

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerOptionsView.java

@@ -26,7 +26,6 @@
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.swing.components.TopBorder;
 
-import javax.swing.BorderFactory;
 import javax.swing.Box;
 import javax.swing.JButton;
 import javax.swing.JDialog;
@@ -36,7 +35,6 @@
 import javax.swing.JTextArea;
 import javax.swing.ScrollPaneConstants;
 import javax.swing.SwingConstants;
-import javax.swing.UIManager;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Container;
@@ -86,8 +84,7 @@ public MergerOptionsView(Component tables) {
                 "p, 9dlu, p, 3dlu, fill:40dlu:grow"));
         builder.addSeparator("Generated SQL", cc.xywh(1, 3, 1, 1));
         builder.add(sqlTextPanel, cc.xy(1, 5));
-        builder.setBorder(BorderFactory
-                .createCompoundBorder(UIManager.getBorder("ToolBar.border"), Borders.DIALOG_BORDER));
+        builder.setBorder(Borders.DIALOG_BORDER);
 
         tabs.addTab("Operations", new JScrollPane(
                 tables,