diff --git a/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatComponentsTest.java b/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatComponentsTest.java index b9f63b66..68b3609d 100644 --- a/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatComponentsTest.java +++ b/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatComponentsTest.java @@ -69,6 +69,9 @@ public class FlatComponentsTest JComboBox comboBox2 = new JComboBox<>(); JComboBox comboBox3 = new JComboBox<>(); JComboBox comboBox4 = new JComboBox<>(); + JLabel spinnerLabel = new JLabel(); + JSpinner spinner1 = new JSpinner(); + JSpinner spinner2 = new JSpinner(); JLabel textFieldLabel = new JLabel(); JTextField textField1 = new JTextField(); JTextField textField2 = new JTextField(); @@ -168,6 +171,7 @@ public class FlatComponentsTest "[]" + "[]" + "[]" + + "[]" + "[]")); //---- labelLabel ---- @@ -312,81 +316,90 @@ public class FlatComponentsTest comboBox4.setEnabled(false); add(comboBox4, "cell 4 4,growx"); + //---- spinnerLabel ---- + spinnerLabel.setText("JSpinner:"); + add(spinnerLabel, "cell 0 5"); + add(spinner1, "cell 1 5,growx"); + + //---- spinner2 ---- + spinner2.setEnabled(false); + add(spinner2, "cell 2 5,growx"); + //---- textFieldLabel ---- textFieldLabel.setText("JTextField:"); - add(textFieldLabel, "cell 0 5"); + add(textFieldLabel, "cell 0 6"); //---- textField1 ---- textField1.setText("editable"); - add(textField1, "cell 1 5,growx"); + add(textField1, "cell 1 6,growx"); //---- textField2 ---- textField2.setText("disabled"); textField2.setEnabled(false); - add(textField2, "cell 2 5,growx"); + add(textField2, "cell 2 6,growx"); //---- textField3 ---- textField3.setText("not editable"); textField3.setEditable(false); - add(textField3, "cell 3 5,growx"); + add(textField3, "cell 3 6,growx"); //---- textField4 ---- textField4.setText("not editable disabled"); textField4.setEnabled(false); textField4.setEditable(false); - add(textField4, "cell 4 5,growx"); + add(textField4, "cell 4 6,growx"); //---- formattedTextFieldLabel ---- formattedTextFieldLabel.setText("JFormattedTextField:"); - add(formattedTextFieldLabel, "cell 0 6"); + add(formattedTextFieldLabel, "cell 0 7"); //---- formattedTextField1 ---- formattedTextField1.setText("editable"); - add(formattedTextField1, "cell 1 6,growx"); + add(formattedTextField1, "cell 1 7,growx"); //---- formattedTextField2 ---- formattedTextField2.setText("disabled"); formattedTextField2.setEnabled(false); - add(formattedTextField2, "cell 2 6,growx"); + add(formattedTextField2, "cell 2 7,growx"); //---- formattedTextField3 ---- formattedTextField3.setText("not editable"); formattedTextField3.setEditable(false); - add(formattedTextField3, "cell 3 6,growx"); + add(formattedTextField3, "cell 3 7,growx"); //---- formattedTextField4 ---- formattedTextField4.setText("not editable disabled"); formattedTextField4.setEnabled(false); formattedTextField4.setEditable(false); - add(formattedTextField4, "cell 4 6,growx"); + add(formattedTextField4, "cell 4 7,growx"); //---- passwordFieldLabel ---- passwordFieldLabel.setText("JPasswordField:"); - add(passwordFieldLabel, "cell 0 7"); + add(passwordFieldLabel, "cell 0 8"); //---- passwordField1 ---- passwordField1.setText("editable"); - add(passwordField1, "cell 1 7,growx"); + add(passwordField1, "cell 1 8,growx"); //---- passwordField2 ---- passwordField2.setText("disabled"); passwordField2.setEnabled(false); - add(passwordField2, "cell 2 7,growx"); + add(passwordField2, "cell 2 8,growx"); //---- passwordField3 ---- passwordField3.setText("not editable"); passwordField3.setEditable(false); - add(passwordField3, "cell 3 7,growx"); + add(passwordField3, "cell 3 8,growx"); //---- passwordField4 ---- passwordField4.setText("not editable disabled"); passwordField4.setEnabled(false); passwordField4.setEditable(false); - add(passwordField4, "cell 4 7,growx"); + add(passwordField4, "cell 4 8,growx"); //---- textAreaLabel ---- textAreaLabel.setText("JTextArea:"); - add(textAreaLabel, "cell 0 8"); + add(textAreaLabel, "cell 0 9"); //======== scrollPane1 ======== { @@ -398,7 +411,7 @@ public class FlatComponentsTest textArea1.setRows(2); scrollPane1.setViewportView(textArea1); } - add(scrollPane1, "cell 1 8,growx"); + add(scrollPane1, "cell 1 9,growx"); //======== scrollPane2 ======== { @@ -411,7 +424,7 @@ public class FlatComponentsTest textArea2.setEnabled(false); scrollPane2.setViewportView(textArea2); } - add(scrollPane2, "cell 2 8,growx"); + add(scrollPane2, "cell 2 9,growx"); //======== scrollPane3 ======== { @@ -424,7 +437,7 @@ public class FlatComponentsTest textArea3.setEditable(false); scrollPane3.setViewportView(textArea3); } - add(scrollPane3, "cell 3 8,growx"); + add(scrollPane3, "cell 3 9,growx"); //======== scrollPane4 ======== { @@ -438,16 +451,16 @@ public class FlatComponentsTest textArea4.setEnabled(false); scrollPane4.setViewportView(textArea4); } - add(scrollPane4, "cell 4 8,growx"); + add(scrollPane4, "cell 4 9,growx"); //---- textArea5 ---- textArea5.setRows(2); textArea5.setText("no scroll pane"); - add(textArea5, "cell 5 8,growx"); + add(textArea5, "cell 5 9,growx"); //---- editorPaneLabel ---- editorPaneLabel.setText("JEditorPane"); - add(editorPaneLabel, "cell 0 9"); + add(editorPaneLabel, "cell 0 10"); //======== scrollPane5 ======== { @@ -458,7 +471,7 @@ public class FlatComponentsTest editorPane1.setText("editable"); scrollPane5.setViewportView(editorPane1); } - add(scrollPane5, "cell 1 9,growx"); + add(scrollPane5, "cell 1 10,growx"); //======== scrollPane6 ======== { @@ -470,7 +483,7 @@ public class FlatComponentsTest editorPane2.setEnabled(false); scrollPane6.setViewportView(editorPane2); } - add(scrollPane6, "cell 2 9,growx"); + add(scrollPane6, "cell 2 10,growx"); //======== scrollPane7 ======== { @@ -482,7 +495,7 @@ public class FlatComponentsTest editorPane3.setEditable(false); scrollPane7.setViewportView(editorPane3); } - add(scrollPane7, "cell 3 9,growx"); + add(scrollPane7, "cell 3 10,growx"); //======== scrollPane8 ======== { @@ -495,15 +508,15 @@ public class FlatComponentsTest editorPane4.setEnabled(false); scrollPane8.setViewportView(editorPane4); } - add(scrollPane8, "cell 4 9,growx"); + add(scrollPane8, "cell 4 10,growx"); //---- editorPane5 ---- editorPane5.setText("no scroll pane"); - add(editorPane5, "cell 5 9,growx"); + add(editorPane5, "cell 5 10,growx"); //---- textPaneLabel ---- textPaneLabel.setText("JTextPane:"); - add(textPaneLabel, "cell 0 10"); + add(textPaneLabel, "cell 0 11"); //======== scrollPane9 ======== { @@ -514,7 +527,7 @@ public class FlatComponentsTest textPane1.setText("editable"); scrollPane9.setViewportView(textPane1); } - add(scrollPane9, "cell 1 10,growx"); + add(scrollPane9, "cell 1 11,growx"); //======== scrollPane10 ======== { @@ -526,7 +539,7 @@ public class FlatComponentsTest textPane2.setEnabled(false); scrollPane10.setViewportView(textPane2); } - add(scrollPane10, "cell 2 10,growx"); + add(scrollPane10, "cell 2 11,growx"); //======== scrollPane11 ======== { @@ -538,7 +551,7 @@ public class FlatComponentsTest textPane3.setEditable(false); scrollPane11.setViewportView(textPane3); } - add(scrollPane11, "cell 3 10,growx"); + add(scrollPane11, "cell 3 11,growx"); //======== scrollPane12 ======== { @@ -551,15 +564,15 @@ public class FlatComponentsTest textPane4.setEnabled(false); scrollPane12.setViewportView(textPane4); } - add(scrollPane12, "cell 4 10,growx"); + add(scrollPane12, "cell 4 11,growx"); //---- textPane5 ---- textPane5.setText("no scroll pane"); - add(textPane5, "cell 5 10,growx"); + add(textPane5, "cell 5 11,growx"); //---- scrollPaneLabel ---- scrollPaneLabel.setText("JScrollPane:"); - add(scrollPaneLabel, "cell 0 11"); + add(scrollPaneLabel, "cell 0 12"); //======== scrollPane13 ======== { @@ -573,21 +586,21 @@ public class FlatComponentsTest } scrollPane13.setViewportView(panel1); } - add(scrollPane13, "cell 1 11,grow,width 70,height 70"); - add(scrollBar2, "cell 2 11 1 4,growy"); + add(scrollPane13, "cell 1 12,grow,width 70,height 70"); + add(scrollBar2, "cell 2 12 1 4,growy"); //---- scrollBar3 ---- scrollBar3.setEnabled(false); - add(scrollBar3, "cell 2 11 1 4,growy"); + add(scrollBar3, "cell 2 12 1 4,growy"); //---- separator2 ---- separator2.setOrientation(SwingConstants.VERTICAL); - add(separator2, "cell 2 11 1 4,growy"); + add(separator2, "cell 2 12 1 4,growy"); //---- slider2 ---- slider2.setOrientation(SwingConstants.VERTICAL); slider2.setValue(30); - add(slider2, "cell 2 11 1 4,growy"); + add(slider2, "cell 2 12 1 4,growy"); //---- slider4 ---- slider4.setMinorTickSpacing(10); @@ -596,50 +609,50 @@ public class FlatComponentsTest slider4.setPaintLabels(true); slider4.setOrientation(SwingConstants.VERTICAL); slider4.setValue(30); - add(slider4, "cell 2 11 1 4,growy"); - add(scrollPane14, "cell 3 11,grow"); + add(slider4, "cell 2 12 1 4,growy"); + add(scrollPane14, "cell 3 12,grow"); //---- progressBar3 ---- progressBar3.setOrientation(SwingConstants.VERTICAL); progressBar3.setValue(50); - add(progressBar3, "cell 4 11 1 4"); + add(progressBar3, "cell 4 12 1 4"); //---- progressBar4 ---- progressBar4.setOrientation(SwingConstants.VERTICAL); progressBar4.setValue(55); progressBar4.setStringPainted(true); - add(progressBar4, "cell 4 11 1 4"); + add(progressBar4, "cell 4 12 1 4"); //---- scrollBarLabel ---- scrollBarLabel.setText("JScrollBar:"); - add(scrollBarLabel, "cell 0 12"); + add(scrollBarLabel, "cell 0 13"); //---- scrollBar1 ---- scrollBar1.setOrientation(Adjustable.HORIZONTAL); - add(scrollBar1, "cell 1 12,growx"); + add(scrollBar1, "cell 1 13,growx"); //---- scrollBar4 ---- scrollBar4.setOrientation(Adjustable.HORIZONTAL); scrollBar4.setEnabled(false); - add(scrollBar4, "cell 1 13,growx"); + add(scrollBar4, "cell 1 14,growx"); //---- separatorLabel ---- separatorLabel.setText("JSeparator:"); - add(separatorLabel, "cell 0 14"); - add(separator1, "cell 1 14,growx"); + add(separatorLabel, "cell 0 15"); + add(separator1, "cell 1 15,growx"); //---- sliderLabel ---- sliderLabel.setText("JSlider:"); - add(sliderLabel, "cell 0 15"); + add(sliderLabel, "cell 0 16"); //---- slider1 ---- slider1.setValue(30); - add(slider1, "cell 1 15,aligny top,grow 100 0"); + add(slider1, "cell 1 16,aligny top,grow 100 0"); //---- slider6 ---- slider6.setEnabled(false); slider6.setValue(30); - add(slider6, "cell 2 15,aligny top,grow 100 0"); + add(slider6, "cell 2 16,aligny top,grow 100 0"); //---- slider3 ---- slider3.setMinorTickSpacing(10); @@ -647,7 +660,7 @@ public class FlatComponentsTest slider3.setMajorTickSpacing(50); slider3.setPaintLabels(true); slider3.setValue(30); - add(slider3, "cell 1 16,aligny top,grow 100 0"); + add(slider3, "cell 1 17,aligny top,grow 100 0"); //---- slider5 ---- slider5.setMinorTickSpacing(10); @@ -656,25 +669,25 @@ public class FlatComponentsTest slider5.setPaintLabels(true); slider5.setEnabled(false); slider5.setValue(30); - add(slider5, "cell 2 16,aligny top,grow 100 0"); + add(slider5, "cell 2 17,aligny top,grow 100 0"); //---- progressBarLabel ---- progressBarLabel.setText("JProgressBar:"); - add(progressBarLabel, "cell 0 17"); + add(progressBarLabel, "cell 0 18"); //---- progressBar1 ---- progressBar1.setValue(50); - add(progressBar1, "cell 1 17"); + add(progressBar1, "cell 1 18"); //---- progressBar2 ---- progressBar2.setStringPainted(true); progressBar2.setValue(55); - add(progressBar2, "cell 3 17"); + add(progressBar2, "cell 3 18"); //---- indeterminateCheckBox ---- indeterminateCheckBox.setText("indeterminate"); indeterminateCheckBox.addActionListener(e -> indeterminateCheckBoxActionPerformed()); - add(indeterminateCheckBox, "cell 4 17"); + add(indeterminateCheckBox, "cell 4 18"); // JFormDesigner - End of component initialization //GEN-END:initComponents } diff --git a/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatComponentsTest.jfd b/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatComponentsTest.jfd index 3a0c4bc8..3b0a415f 100644 --- a/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatComponentsTest.jfd +++ b/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatComponentsTest.jfd @@ -9,7 +9,7 @@ new FormModel { add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) { "$layoutConstraints": "insets 0,hidemode 3,gap 5 5,ltr" "$columnConstraints": "[][][][][][]" - "$rowConstraints": "[][][][][][][][][][][][][][][][][][]" + "$rowConstraints": "[][][][][][][][][][][][][][][][][][][]" } ) { name: "this" add( new FormComponent( "javax.swing.JLabel" ) { @@ -206,31 +206,48 @@ new FormModel { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 4 4,growx" } ) + add( new FormComponent( "javax.swing.JLabel" ) { + name: "spinnerLabel" + "text": "JSpinner:" + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 0 5" + } ) + add( new FormComponent( "javax.swing.JSpinner" ) { + name: "spinner1" + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 1 5,growx" + } ) + add( new FormComponent( "javax.swing.JSpinner" ) { + name: "spinner2" + "enabled": false + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { + "value": "cell 2 5,growx" + } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "textFieldLabel" "text": "JTextField:" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 0 5" + "value": "cell 0 6" } ) add( new FormComponent( "javax.swing.JTextField" ) { name: "textField1" "text": "editable" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 5,growx" + "value": "cell 1 6,growx" } ) add( new FormComponent( "javax.swing.JTextField" ) { name: "textField2" "text": "disabled" "enabled": false }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 2 5,growx" + "value": "cell 2 6,growx" } ) add( new FormComponent( "javax.swing.JTextField" ) { name: "textField3" "text": "not editable" "editable": false }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 3 5,growx" + "value": "cell 3 6,growx" } ) add( new FormComponent( "javax.swing.JTextField" ) { name: "textField4" @@ -238,33 +255,33 @@ new FormModel { "enabled": false "editable": false }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 4 5,growx" + "value": "cell 4 6,growx" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "formattedTextFieldLabel" "text": "JFormattedTextField:" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 0 6" + "value": "cell 0 7" } ) add( new FormComponent( "javax.swing.JFormattedTextField" ) { name: "formattedTextField1" "text": "editable" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 6,growx" + "value": "cell 1 7,growx" } ) add( new FormComponent( "javax.swing.JFormattedTextField" ) { name: "formattedTextField2" "text": "disabled" "enabled": false }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 2 6,growx" + "value": "cell 2 7,growx" } ) add( new FormComponent( "javax.swing.JFormattedTextField" ) { name: "formattedTextField3" "text": "not editable" "editable": false }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 3 6,growx" + "value": "cell 3 7,growx" } ) add( new FormComponent( "javax.swing.JFormattedTextField" ) { name: "formattedTextField4" @@ -272,33 +289,33 @@ new FormModel { "enabled": false "editable": false }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 4 6,growx" + "value": "cell 4 7,growx" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "passwordFieldLabel" "text": "JPasswordField:" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 0 7" + "value": "cell 0 8" } ) add( new FormComponent( "javax.swing.JPasswordField" ) { name: "passwordField1" "text": "editable" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 7,growx" + "value": "cell 1 8,growx" } ) add( new FormComponent( "javax.swing.JPasswordField" ) { name: "passwordField2" "text": "disabled" "enabled": false }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 2 7,growx" + "value": "cell 2 8,growx" } ) add( new FormComponent( "javax.swing.JPasswordField" ) { name: "passwordField3" "text": "not editable" "editable": false }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 3 7,growx" + "value": "cell 3 8,growx" } ) add( new FormComponent( "javax.swing.JPasswordField" ) { name: "passwordField4" @@ -306,13 +323,13 @@ new FormModel { "enabled": false "editable": false }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 4 7,growx" + "value": "cell 4 8,growx" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "textAreaLabel" "text": "JTextArea:" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 0 8" + "value": "cell 0 9" } ) add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) { name: "scrollPane1" @@ -324,7 +341,7 @@ new FormModel { "rows": 2 } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 8,growx" + "value": "cell 1 9,growx" } ) add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) { name: "scrollPane2" @@ -337,7 +354,7 @@ new FormModel { "enabled": false } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 2 8,growx" + "value": "cell 2 9,growx" } ) add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) { name: "scrollPane3" @@ -350,7 +367,7 @@ new FormModel { "editable": false } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 3 8,growx" + "value": "cell 3 9,growx" } ) add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) { name: "scrollPane4" @@ -364,20 +381,20 @@ new FormModel { "enabled": false } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 4 8,growx" + "value": "cell 4 9,growx" } ) add( new FormComponent( "javax.swing.JTextArea" ) { name: "textArea5" "rows": 2 "text": "no scroll pane" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 5 8,growx" + "value": "cell 5 9,growx" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "editorPaneLabel" "text": "JEditorPane" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 0 9" + "value": "cell 0 10" } ) add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) { name: "scrollPane5" @@ -388,7 +405,7 @@ new FormModel { "text": "editable" } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 9,growx" + "value": "cell 1 10,growx" } ) add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) { name: "scrollPane6" @@ -400,7 +417,7 @@ new FormModel { "enabled": false } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 2 9,growx" + "value": "cell 2 10,growx" } ) add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) { name: "scrollPane7" @@ -412,7 +429,7 @@ new FormModel { "editable": false } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 3 9,growx" + "value": "cell 3 10,growx" } ) add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) { name: "scrollPane8" @@ -425,19 +442,19 @@ new FormModel { "enabled": false } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 4 9,growx" + "value": "cell 4 10,growx" } ) add( new FormComponent( "javax.swing.JEditorPane" ) { name: "editorPane5" "text": "no scroll pane" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 5 9,growx" + "value": "cell 5 10,growx" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "textPaneLabel" "text": "JTextPane:" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 0 10" + "value": "cell 0 11" } ) add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) { name: "scrollPane9" @@ -448,7 +465,7 @@ new FormModel { "text": "editable" } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 10,growx" + "value": "cell 1 11,growx" } ) add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) { name: "scrollPane10" @@ -460,7 +477,7 @@ new FormModel { "enabled": false } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 2 10,growx" + "value": "cell 2 11,growx" } ) add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) { name: "scrollPane11" @@ -472,7 +489,7 @@ new FormModel { "editable": false } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 3 10,growx" + "value": "cell 3 11,growx" } ) add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) { name: "scrollPane12" @@ -485,19 +502,19 @@ new FormModel { "enabled": false } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 4 10,growx" + "value": "cell 4 11,growx" } ) add( new FormComponent( "javax.swing.JTextPane" ) { name: "textPane5" "text": "no scroll pane" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 5 10,growx" + "value": "cell 5 11,growx" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "scrollPaneLabel" "text": "JScrollPane:" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 0 11" + "value": "cell 0 12" } ) add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) { name: "scrollPane13" @@ -508,31 +525,31 @@ new FormModel { "preferredSize": new java.awt.Dimension( 200, 200 ) } ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 11,grow,width 70,height 70" + "value": "cell 1 12,grow,width 70,height 70" } ) add( new FormComponent( "javax.swing.JScrollBar" ) { name: "scrollBar2" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 2 11 1 4,growy" + "value": "cell 2 12 1 4,growy" } ) add( new FormComponent( "javax.swing.JScrollBar" ) { name: "scrollBar3" "enabled": false }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 2 11 1 4,growy" + "value": "cell 2 12 1 4,growy" } ) add( new FormComponent( "javax.swing.JSeparator" ) { name: "separator2" "orientation": 1 }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 2 11 1 4,growy" + "value": "cell 2 12 1 4,growy" } ) add( new FormComponent( "javax.swing.JSlider" ) { name: "slider2" "orientation": 1 "value": 30 }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 2 11 1 4,growy" + "value": "cell 2 12 1 4,growy" } ) add( new FormComponent( "javax.swing.JSlider" ) { name: "slider4" @@ -543,12 +560,12 @@ new FormModel { "orientation": 1 "value": 30 }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 2 11 1 4,growy" + "value": "cell 2 12 1 4,growy" } ) add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) { name: "scrollPane14" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 3 11,grow" + "value": "cell 3 12,grow" } ) add( new FormComponent( "javax.swing.JProgressBar" ) { name: "progressBar3" @@ -558,7 +575,7 @@ new FormModel { "JavaCodeGenerator.variableLocal": false } }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 4 11 1 4" + "value": "cell 4 12 1 4" } ) add( new FormComponent( "javax.swing.JProgressBar" ) { name: "progressBar4" @@ -569,56 +586,56 @@ new FormModel { "JavaCodeGenerator.variableLocal": false } }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 4 11 1 4" + "value": "cell 4 12 1 4" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "scrollBarLabel" "text": "JScrollBar:" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 0 12" + "value": "cell 0 13" } ) add( new FormComponent( "javax.swing.JScrollBar" ) { name: "scrollBar1" "orientation": 0 }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 12,growx" + "value": "cell 1 13,growx" } ) add( new FormComponent( "javax.swing.JScrollBar" ) { name: "scrollBar4" "orientation": 0 "enabled": false }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 13,growx" + "value": "cell 1 14,growx" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "separatorLabel" "text": "JSeparator:" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 0 14" + "value": "cell 0 15" } ) add( new FormComponent( "javax.swing.JSeparator" ) { name: "separator1" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 14,growx" + "value": "cell 1 15,growx" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "sliderLabel" "text": "JSlider:" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 0 15" + "value": "cell 0 16" } ) add( new FormComponent( "javax.swing.JSlider" ) { name: "slider1" "value": 30 }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 15,aligny top,grow 100 0" + "value": "cell 1 16,aligny top,grow 100 0" } ) add( new FormComponent( "javax.swing.JSlider" ) { name: "slider6" "enabled": false "value": 30 }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 2 15,aligny top,grow 100 0" + "value": "cell 2 16,aligny top,grow 100 0" } ) add( new FormComponent( "javax.swing.JSlider" ) { name: "slider3" @@ -628,7 +645,7 @@ new FormModel { "paintLabels": true "value": 30 }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 16,aligny top,grow 100 0" + "value": "cell 1 17,aligny top,grow 100 0" } ) add( new FormComponent( "javax.swing.JSlider" ) { name: "slider5" @@ -639,13 +656,13 @@ new FormModel { "enabled": false "value": 30 }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 2 16,aligny top,grow 100 0" + "value": "cell 2 17,aligny top,grow 100 0" } ) add( new FormComponent( "javax.swing.JLabel" ) { name: "progressBarLabel" "text": "JProgressBar:" }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 0 17" + "value": "cell 0 18" } ) add( new FormComponent( "javax.swing.JProgressBar" ) { name: "progressBar1" @@ -654,7 +671,7 @@ new FormModel { "JavaCodeGenerator.variableLocal": false } }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 1 17" + "value": "cell 1 18" } ) add( new FormComponent( "javax.swing.JProgressBar" ) { name: "progressBar2" @@ -664,7 +681,7 @@ new FormModel { "JavaCodeGenerator.variableLocal": false } }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 3 17" + "value": "cell 3 18" } ) add( new FormComponent( "javax.swing.JCheckBox" ) { name: "indeterminateCheckBox" @@ -674,7 +691,7 @@ new FormModel { } addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "indeterminateCheckBoxActionPerformed", false ) ) }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { - "value": "cell 4 17" + "value": "cell 4 18" } ) }, new FormLayoutConstraints( null ) { "location": new java.awt.Point( 0, 0 )