FlatComponents2Test: moved table checkboxes into tableOptionsPanel

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponents2Test.java

@@ -225,14 +225,14 @@ public class FlatComponents2Test
 		JPanel tableOptionsPanel = new JPanel();
 		JLabel tableRowCountLabel = new JLabel();
 		tableRowCountSpinner = new JSpinner();
-		dndCheckBox = new JCheckBox();
-		tableHeaderButtonCheckBox = new JCheckBox();
-		rowSelectionCheckBox = new JCheckBox();
-		columnSelectionCheckBox = new JCheckBox();
 		showHorizontalLinesCheckBox = new JCheckBox();
 		showVerticalLinesCheckBox = new JCheckBox();
 		intercellSpacingCheckBox = new JCheckBox();
 		redGridColorCheckBox = new JCheckBox();
+		rowSelectionCheckBox = new JCheckBox();
+		columnSelectionCheckBox = new JCheckBox();
+		dndCheckBox = new JCheckBox();
+		tableHeaderButtonCheckBox = new JCheckBox();
 
 		//======== this ========
 		setLayout(new MigLayout(
@@ -246,9 +246,7 @@ public class FlatComponents2Test
 			"[]" +
 			"[150,grow,sizegroup 1,fill]" +
 			"[150,grow,sizegroup 1,fill]" +
-			"[150,grow,sizegroup 1,fill]" +
+			"[150,grow,sizegroup 1,fill]"));
-			"[]" +
-			"[]"));
 
 		//---- textFieldLabel ----
 		textFieldLabel.setText("JTextField:");
@@ -365,9 +363,17 @@ public class FlatComponents2Test
 			tableOptionsPanel.setLayout(new MigLayout(
 				"hidemode 3",
 				// columns
-				"[fill]" +
+				"[]" +
 				"[90,fill]",
 				// rows
+				"[]" +
+				"[]0" +
+				"[]0" +
+				"[]0" +
+				"[]0" +
+				"[]0" +
+				"[]0" +
+				"[]0" +
 				"[]"));
 
 			//---- tableRowCountLabel ----
@@ -378,50 +384,50 @@ public class FlatComponents2Test
 			tableRowCountSpinner.setModel(new SpinnerNumberModel(20, 0, null, 10));
 			tableRowCountSpinner.addChangeListener(e -> tableRowCountChanged());
 			tableOptionsPanel.add(tableRowCountSpinner, "cell 1 0");
+
+			//---- showHorizontalLinesCheckBox ----
+			showHorizontalLinesCheckBox.setText("show horizontal lines");
+			showHorizontalLinesCheckBox.addActionListener(e -> showHorizontalLinesChanged());
+			tableOptionsPanel.add(showHorizontalLinesCheckBox, "cell 0 1 2 1");
+
+			//---- showVerticalLinesCheckBox ----
+			showVerticalLinesCheckBox.setText("show vertical lines");
+			showVerticalLinesCheckBox.addActionListener(e -> showVerticalLinesChanged());
+			tableOptionsPanel.add(showVerticalLinesCheckBox, "cell 0 2 2 1");
+
+			//---- intercellSpacingCheckBox ----
+			intercellSpacingCheckBox.setText("intercell spacing");
+			intercellSpacingCheckBox.addActionListener(e -> intercellSpacingChanged());
+			tableOptionsPanel.add(intercellSpacingCheckBox, "cell 0 3 2 1");
+
+			//---- redGridColorCheckBox ----
+			redGridColorCheckBox.setText("red grid color");
+			redGridColorCheckBox.addActionListener(e -> redGridColorChanged());
+			tableOptionsPanel.add(redGridColorCheckBox, "cell 0 4 2 1");
+
+			//---- rowSelectionCheckBox ----
+			rowSelectionCheckBox.setText("row selection");
+			rowSelectionCheckBox.setSelected(true);
+			rowSelectionCheckBox.addActionListener(e -> rowSelectionChanged());
+			tableOptionsPanel.add(rowSelectionCheckBox, "cell 0 5 2 1");
+
+			//---- columnSelectionCheckBox ----
+			columnSelectionCheckBox.setText("column selection");
+			columnSelectionCheckBox.addActionListener(e -> columnSelectionChanged());
+			tableOptionsPanel.add(columnSelectionCheckBox, "cell 0 6 2 1");
+
+			//---- dndCheckBox ----
+			dndCheckBox.setText("enable drag and drop");
+			dndCheckBox.setMnemonic('D');
+			dndCheckBox.addActionListener(e -> dndChanged());
+			tableOptionsPanel.add(dndCheckBox, "cell 0 7 2 1");
+
+			//---- tableHeaderButtonCheckBox ----
+			tableHeaderButtonCheckBox.setText("show button in table header");
+			tableHeaderButtonCheckBox.addActionListener(e -> tableHeaderButtonChanged());
+			tableOptionsPanel.add(tableHeaderButtonCheckBox, "cell 0 8 2 1");
 		}
 		add(tableOptionsPanel, "cell 3 3");
-
-		//---- dndCheckBox ----
-		dndCheckBox.setText("enable drag and drop");
-		dndCheckBox.setMnemonic('D');
-		dndCheckBox.addActionListener(e -> dndChanged());
-		add(dndCheckBox, "cell 0 4 3 1");
-
-		//---- tableHeaderButtonCheckBox ----
-		tableHeaderButtonCheckBox.setText("show button in table header");
-		tableHeaderButtonCheckBox.addActionListener(e -> tableHeaderButtonChanged());
-		add(tableHeaderButtonCheckBox, "cell 0 4 3 1");
-
-		//---- rowSelectionCheckBox ----
-		rowSelectionCheckBox.setText("row selection");
-		rowSelectionCheckBox.setSelected(true);
-		rowSelectionCheckBox.addActionListener(e -> rowSelectionChanged());
-		add(rowSelectionCheckBox, "cell 0 4 3 1");
-
-		//---- columnSelectionCheckBox ----
-		columnSelectionCheckBox.setText("column selection");
-		columnSelectionCheckBox.addActionListener(e -> columnSelectionChanged());
-		add(columnSelectionCheckBox, "cell 0 4 3 1");
-
-		//---- showHorizontalLinesCheckBox ----
-		showHorizontalLinesCheckBox.setText("show horizontal lines");
-		showHorizontalLinesCheckBox.addActionListener(e -> showHorizontalLinesChanged());
-		add(showHorizontalLinesCheckBox, "cell 0 5 3 1");
-
-		//---- showVerticalLinesCheckBox ----
-		showVerticalLinesCheckBox.setText("show vertical lines");
-		showVerticalLinesCheckBox.addActionListener(e -> showVerticalLinesChanged());
-		add(showVerticalLinesCheckBox, "cell 0 5 3 1");
-
-		//---- intercellSpacingCheckBox ----
-		intercellSpacingCheckBox.setText("intercell spacing");
-		intercellSpacingCheckBox.addActionListener(e -> intercellSpacingChanged());
-		add(intercellSpacingCheckBox, "cell 0 5 3 1");
-
-		//---- redGridColorCheckBox ----
-		redGridColorCheckBox.setText("red grid color");
-		redGridColorCheckBox.addActionListener(e -> redGridColorChanged());
-		add(redGridColorCheckBox, "cell 0 5 3 1");
 		// JFormDesigner - End of component initialization  //GEN-END:initComponents
 	}
 
@@ -435,14 +441,14 @@ public class FlatComponents2Test
 	private JScrollPane scrollPane5;
 	private JTable table1;
 	private JSpinner tableRowCountSpinner;
-	private JCheckBox dndCheckBox;
-	private JCheckBox tableHeaderButtonCheckBox;
-	private JCheckBox rowSelectionCheckBox;
-	private JCheckBox columnSelectionCheckBox;
 	private JCheckBox showHorizontalLinesCheckBox;
 	private JCheckBox showVerticalLinesCheckBox;
 	private JCheckBox intercellSpacingCheckBox;
 	private JCheckBox redGridColorCheckBox;
+	private JCheckBox rowSelectionCheckBox;
+	private JCheckBox columnSelectionCheckBox;
+	private JCheckBox dndCheckBox;
+	private JCheckBox tableHeaderButtonCheckBox;
 	// JFormDesigner - End of variables declaration  //GEN-END:variables
 
 	private final String[] randomRowStrings = new String[1000];

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponents2Test.jfd

@@ -9,7 +9,7 @@ new FormModel {
 		add( new FormContainer( "com.formdev.flatlaf.testing.FlatTestPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
 			"$layoutConstraints": "ltr,insets dialog,hidemode 3"
 			"$columnConstraints": "[][200,fill][200,fill][fill]"
-			"$rowConstraints": "[][150,grow,sizegroup 1,fill][150,grow,sizegroup 1,fill][150,grow,sizegroup 1,fill][][]"
+			"$rowConstraints": "[][150,grow,sizegroup 1,fill][150,grow,sizegroup 1,fill][150,grow,sizegroup 1,fill]"
 		} ) {
 			name: "this"
 			add( new FormComponent( "javax.swing.JLabel" ) {
@@ -174,8 +174,8 @@ new FormModel {
 			} )
 			add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
 				"$layoutConstraints": "hidemode 3"
-				"$columnConstraints": "[fill][90,fill]"
+				"$columnConstraints": "[][90,fill]"
-				"$rowConstraints": "[]"
+				"$rowConstraints": "[][]0[]0[]0[]0[]0[]0[]0[]"
 			} ) {
 				name: "tableOptionsPanel"
 				add( new FormComponent( "javax.swing.JLabel" ) {
@@ -194,94 +194,94 @@ new FormModel {
 				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 					"value": "cell 1 0"
 				} )
+				add( new FormComponent( "javax.swing.JCheckBox" ) {
+					name: "showHorizontalLinesCheckBox"
+					"text": "show horizontal lines"
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": false
+					}
+					addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "showHorizontalLinesChanged", false ) )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 1 2 1"
+				} )
+				add( new FormComponent( "javax.swing.JCheckBox" ) {
+					name: "showVerticalLinesCheckBox"
+					"text": "show vertical lines"
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": false
+					}
+					addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "showVerticalLinesChanged", false ) )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 2 2 1"
+				} )
+				add( new FormComponent( "javax.swing.JCheckBox" ) {
+					name: "intercellSpacingCheckBox"
+					"text": "intercell spacing"
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": false
+					}
+					addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "intercellSpacingChanged", false ) )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 3 2 1"
+				} )
+				add( new FormComponent( "javax.swing.JCheckBox" ) {
+					name: "redGridColorCheckBox"
+					"text": "red grid color"
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": false
+					}
+					addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "redGridColorChanged", false ) )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 4 2 1"
+				} )
+				add( new FormComponent( "javax.swing.JCheckBox" ) {
+					name: "rowSelectionCheckBox"
+					"text": "row selection"
+					"selected": true
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": false
+					}
+					addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "rowSelectionChanged", false ) )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 5 2 1"
+				} )
+				add( new FormComponent( "javax.swing.JCheckBox" ) {
+					name: "columnSelectionCheckBox"
+					"text": "column selection"
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": false
+					}
+					addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "columnSelectionChanged", false ) )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 6 2 1"
+				} )
+				add( new FormComponent( "javax.swing.JCheckBox" ) {
+					name: "dndCheckBox"
+					"text": "enable drag and drop"
+					"mnemonic": 68
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": false
+					}
+					addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "dndChanged", false ) )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 7 2 1"
+				} )
+				add( new FormComponent( "javax.swing.JCheckBox" ) {
+					name: "tableHeaderButtonCheckBox"
+					"text": "show button in table header"
+					auxiliary() {
+						"JavaCodeGenerator.variableLocal": false
+					}
+					addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "tableHeaderButtonChanged", false ) )
+				}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+					"value": "cell 0 8 2 1"
+				} )
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 3 3"
 			} )
-			add( new FormComponent( "javax.swing.JCheckBox" ) {
-				name: "dndCheckBox"
-				"text": "enable drag and drop"
-				"mnemonic": 68
-				auxiliary() {
-					"JavaCodeGenerator.variableLocal": false
-				}
-				addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "dndChanged", false ) )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 0 4 3 1"
-			} )
-			add( new FormComponent( "javax.swing.JCheckBox" ) {
-				name: "tableHeaderButtonCheckBox"
-				"text": "show button in table header"
-				auxiliary() {
-					"JavaCodeGenerator.variableLocal": false
-				}
-				addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "tableHeaderButtonChanged", false ) )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 0 4 3 1"
-			} )
-			add( new FormComponent( "javax.swing.JCheckBox" ) {
-				name: "rowSelectionCheckBox"
-				"text": "row selection"
-				"selected": true
-				auxiliary() {
-					"JavaCodeGenerator.variableLocal": false
-				}
-				addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "rowSelectionChanged", false ) )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 0 4 3 1"
-			} )
-			add( new FormComponent( "javax.swing.JCheckBox" ) {
-				name: "columnSelectionCheckBox"
-				"text": "column selection"
-				auxiliary() {
-					"JavaCodeGenerator.variableLocal": false
-				}
-				addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "columnSelectionChanged", false ) )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 0 4 3 1"
-			} )
-			add( new FormComponent( "javax.swing.JCheckBox" ) {
-				name: "showHorizontalLinesCheckBox"
-				"text": "show horizontal lines"
-				auxiliary() {
-					"JavaCodeGenerator.variableLocal": false
-				}
-				addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "showHorizontalLinesChanged", false ) )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 0 5 3 1"
-			} )
-			add( new FormComponent( "javax.swing.JCheckBox" ) {
-				name: "showVerticalLinesCheckBox"
-				"text": "show vertical lines"
-				auxiliary() {
-					"JavaCodeGenerator.variableLocal": false
-				}
-				addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "showVerticalLinesChanged", false ) )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 0 5 3 1"
-			} )
-			add( new FormComponent( "javax.swing.JCheckBox" ) {
-				name: "intercellSpacingCheckBox"
-				"text": "intercell spacing"
-				auxiliary() {
-					"JavaCodeGenerator.variableLocal": false
-				}
-				addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "intercellSpacingChanged", false ) )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 0 5 3 1"
-			} )
-			add( new FormComponent( "javax.swing.JCheckBox" ) {
-				name: "redGridColorCheckBox"
-				"text": "red grid color"
-				auxiliary() {
-					"JavaCodeGenerator.variableLocal": false
-				}
-				addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "redGridColorChanged", false ) )
-			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 0 5 3 1"
-			} )
 		}, new FormLayoutConstraints( null ) {
 			"location": new java.awt.Point( 0, 0 )
-			"size": new java.awt.Dimension( 790, 715 )
+			"size": new java.awt.Dimension( 790, 825 )
 		} )
 	}
 }