JIDE: support JideSplitButton and JideSplitToggleButton

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

@@ -151,22 +151,18 @@ public class FlatComponentsTest
 	}
 
 	private void outlineChanged() {
-		FlatTestFrame frame = (FlatTestFrame) SwingUtilities.getAncestorOfClass( FlatTestFrame.class, this );
-		if( frame == null )
-			return;
-
 		Object outline = errorOutlineRadioButton.isSelected() ? "error"
 			: warningOutlineRadioButton.isSelected() ? "warning"
 			: magentaOutlineRadioButton.isSelected() ? Color.magenta
 			: magentaCyanOutlineRadioButton.isSelected() ? new Color[] { Color.magenta, Color.cyan }
 			: null;
 
-		frame.updateComponentsRecur( this, (c, type) -> {
+		FlatTestFrame.updateComponentsRecur( this, (c, type) -> {
 			if( c instanceof JComponent )
 				((JComponent)c).putClientProperty( FlatClientProperties.OUTLINE, outline );
 		} );
 
-		frame.repaint();
+		repaint();
 		textField1.requestFocusInWindow();
 	}
 

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

@@ -618,7 +618,7 @@ public class FlatTestFrame
 		sizeVariantComboBox.setVisible( visible );
 	}
 
-	public void updateComponentsRecur( Container container, BiConsumer<Component, String> action ) {
+	public static void updateComponentsRecur( Container container, BiConsumer<Component, String> action ) {
 		for( Component c : container.getComponents() ) {
 			if( c instanceof JPanel || c instanceof JDesktopPane ) {
 				updateComponentsRecur( (Container) c, action );

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/jideoss/FlatJideOssTest.java

@@ -43,6 +43,17 @@ public class FlatJideOssTest
 		initComponents();
 
 		tristateCheckBox1Changed();
+
+		FlatTestFrame.updateComponentsRecur( this, (c, type) -> {
+			if( c instanceof JideSplitButton ) {
+				JideSplitButton splitButton = (JideSplitButton) c;
+				if( splitButton.getMenuComponentCount() == 0 ) {
+					splitButton.add( "Item 1" );
+					splitButton.add( "Item 2" );
+					splitButton.add( "Item 3" );
+				}
+			}
+		} );
 	}
 
 	private void showJidePopup( ActionEvent e ) {
@@ -79,15 +90,11 @@ public class FlatJideOssTest
 	}
 
 	private void verticalChanged() {
-		FlatTestFrame frame = (FlatTestFrame) SwingUtilities.getAncestorOfClass( FlatTestFrame.class, this );
-		if( frame == null )
-			return;
-
 		int orientation = verticalCheckBox.isSelected()
 			? SwingUtilities.VERTICAL
 			: SwingUtilities.HORIZONTAL;
 
-		frame.updateComponentsRecur( this, (c, type) -> {
+		FlatTestFrame.updateComponentsRecur( this, (c, type) -> {
 			if( c instanceof Alignable )
 				((Alignable)c).setOrientation( orientation );
 		} );
@@ -96,18 +103,16 @@ public class FlatJideOssTest
 	}
 
 	private void iconChanged() {
-		FlatTestFrame frame = (FlatTestFrame) SwingUtilities.getAncestorOfClass( FlatTestFrame.class, this );
-		if( frame == null )
-			return;
-
 		Icon icon = iconCheckBox.isSelected()
 			? new ScaledImageIcon( new ImageIcon(getClass().getResource(
 				"/com/formdev/flatlaf/testing/test16.png" ) ) )
 			: null;
 
-		frame.updateComponentsRecur( this, (c, type) -> {
+		FlatTestFrame.updateComponentsRecur( this, (c, type) -> {
 			if( c instanceof JideButton )
 				((JideButton)c).setIcon( icon );
+			else if( c instanceof JideSplitButton )
+				((JideSplitButton)c).setIcon( icon );
 			else if( c instanceof JideLabel )
 				((JideLabel)c).setIcon( icon );
 		} );
@@ -115,6 +120,24 @@ public class FlatJideOssTest
 		revalidate();
 	}
 
+	private void alwaysDropdownChanged() {
+		boolean alwaysDropdown = alwaysDropdownCheckBox.isSelected();
+
+		FlatTestFrame.updateComponentsRecur( this, (c, type) -> {
+			if( c instanceof JideSplitButton )
+				((JideSplitButton)c).setAlwaysDropdown( alwaysDropdown );
+		} );
+	}
+
+	private void buttonEnabledChanged() {
+		boolean buttonEnabled = buttonEnabledCheckBox.isSelected();
+
+		FlatTestFrame.updateComponentsRecur( this, (c, type) -> {
+			if( c instanceof JideSplitButton )
+				((JideSplitButton)c).setButtonEnabled( buttonEnabled );
+		} );
+	}
+
 	private void initComponents() {
 		// JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
 		JLabel jidePopupLabel = new JLabel();
@@ -157,6 +180,24 @@ public class FlatJideOssTest
 		JToolBar toolBar4 = new JToolBar();
 		JideToggleButton jideToggleButton10 = new JideToggleButton();
 		JToggleButton toggleButton2 = new JToggleButton();
+		JLabel jideSplitButtonLabel = new JLabel();
+		JideSplitButton jideSplitButton1 = new JideSplitButton();
+		JideSplitButton jideSplitButton2 = new JideSplitButton();
+		JideSplitButton jideSplitButton3 = new JideSplitButton();
+		alwaysDropdownCheckBox = new JCheckBox();
+		JLabel label3 = new JLabel();
+		JideSplitButton jideSplitButton5 = new JideSplitButton();
+		JideSplitButton jideSplitButton6 = new JideSplitButton();
+		JideSplitButton jideSplitButton7 = new JideSplitButton();
+		buttonEnabledCheckBox = new JCheckBox();
+		JLabel jideToggleSplitButtonLabel2 = new JLabel();
+		JideToggleSplitButton jideToggleSplitButton1 = new JideToggleSplitButton();
+		JideToggleSplitButton jideToggleSplitButton2 = new JideToggleSplitButton();
+		JideToggleSplitButton jideToggleSplitButton3 = new JideToggleSplitButton();
+		JLabel label4 = new JLabel();
+		JideToggleSplitButton jideToggleSplitButton4 = new JideToggleSplitButton();
+		JideToggleSplitButton jideToggleSplitButton5 = new JideToggleSplitButton();
+		JideToggleSplitButton jideToggleSplitButton6 = new JideToggleSplitButton();
 		JLabel jideLabelLabel = new JLabel();
 		JideLabel jideLabel1 = new JideLabel();
 		JideLabel jideLabel2 = new JideLabel();
@@ -182,6 +223,10 @@ public class FlatJideOssTest
 			"[]" +
 			"[]para" +
 			"[]" +
+			"[]" +
+			"[]" +
+			"[]para" +
+			"[]" +
 			"[]"));
 
 		//---- jidePopupLabel ----
@@ -379,31 +424,146 @@ public class FlatJideOssTest
 		}
 		add(toolBar4, "cell 1 6 3 1");
 
+		//---- jideSplitButtonLabel ----
+		jideSplitButtonLabel.setText("JideSplitButton:");
+		add(jideSplitButtonLabel, "cell 0 7");
+
+		//======== jideSplitButton1 ========
+		{
+			jideSplitButton1.setText("TOOLBAR");
+		}
+		add(jideSplitButton1, "cell 1 7 3 1");
+
+		//======== jideSplitButton2 ========
+		{
+			jideSplitButton2.setText("TOOLBOX");
+			jideSplitButton2.setButtonStyle(1);
+		}
+		add(jideSplitButton2, "cell 1 7 3 1");
+
+		//======== jideSplitButton3 ========
+		{
+			jideSplitButton3.setText("FLAT");
+			jideSplitButton3.setButtonStyle(2);
+		}
+		add(jideSplitButton3, "cell 1 7 3 1");
+
+		//---- alwaysDropdownCheckBox ----
+		alwaysDropdownCheckBox.setText("always dropdown");
+		alwaysDropdownCheckBox.addActionListener(e -> alwaysDropdownChanged());
+		add(alwaysDropdownCheckBox, "cell 4 7");
+
+		//---- label3 ----
+		label3.setText("selected");
+		label3.setEnabled(false);
+		add(label3, "cell 0 8,alignx right,growx 0");
+
+		//======== jideSplitButton5 ========
+		{
+			jideSplitButton5.setText("TOOLBAR");
+			jideSplitButton5.setButtonSelected(true);
+		}
+		add(jideSplitButton5, "cell 1 8 3 1");
+
+		//======== jideSplitButton6 ========
+		{
+			jideSplitButton6.setText("TOOLBOX");
+			jideSplitButton6.setButtonStyle(1);
+			jideSplitButton6.setButtonSelected(true);
+		}
+		add(jideSplitButton6, "cell 1 8 3 1");
+
+		//======== jideSplitButton7 ========
+		{
+			jideSplitButton7.setText("FLAT");
+			jideSplitButton7.setButtonStyle(2);
+			jideSplitButton7.setButtonSelected(true);
+		}
+		add(jideSplitButton7, "cell 1 8 3 1");
+
+		//---- buttonEnabledCheckBox ----
+		buttonEnabledCheckBox.setText("button enabled");
+		buttonEnabledCheckBox.setSelected(true);
+		buttonEnabledCheckBox.addActionListener(e -> buttonEnabledChanged());
+		add(buttonEnabledCheckBox, "cell 4 8");
+
+		//---- jideToggleSplitButtonLabel2 ----
+		jideToggleSplitButtonLabel2.setText("JideToggleSplitButton:");
+		add(jideToggleSplitButtonLabel2, "cell 0 9");
+
+		//======== jideToggleSplitButton1 ========
+		{
+			jideToggleSplitButton1.setText("TOOLBAR");
+		}
+		add(jideToggleSplitButton1, "cell 1 9");
+
+		//======== jideToggleSplitButton2 ========
+		{
+			jideToggleSplitButton2.setText("TOOLBOX");
+			jideToggleSplitButton2.setButtonStyle(1);
+		}
+		add(jideToggleSplitButton2, "cell 1 9");
+
+		//======== jideToggleSplitButton3 ========
+		{
+			jideToggleSplitButton3.setText("FLAT");
+			jideToggleSplitButton3.setButtonStyle(2);
+		}
+		add(jideToggleSplitButton3, "cell 1 9");
+
+		//---- label4 ----
+		label4.setText("selected");
+		label4.setEnabled(false);
+		add(label4, "cell 0 10,alignx right,growx 0");
+
+		//======== jideToggleSplitButton4 ========
+		{
+			jideToggleSplitButton4.setText("TOOLBAR");
+			jideToggleSplitButton4.setButtonSelected(true);
+		}
+		add(jideToggleSplitButton4, "cell 1 10");
+
+		//======== jideToggleSplitButton5 ========
+		{
+			jideToggleSplitButton5.setText("TOOLBOX");
+			jideToggleSplitButton5.setButtonStyle(1);
+			jideToggleSplitButton5.setButtonSelected(true);
+		}
+		add(jideToggleSplitButton5, "cell 1 10");
+
+		//======== jideToggleSplitButton6 ========
+		{
+			jideToggleSplitButton6.setText("FLAT");
+			jideToggleSplitButton6.setButtonStyle(2);
+			jideToggleSplitButton6.setButtonSelected(true);
+		}
+		add(jideToggleSplitButton6, "cell 1 10");
+
 		//---- jideLabelLabel ----
 		jideLabelLabel.setText("JideLabel:");
-		add(jideLabelLabel, "cell 0 7");
+		add(jideLabelLabel, "cell 0 11");
 
 		//---- jideLabel1 ----
 		jideLabel1.setText("enabled");
-		add(jideLabel1, "cell 1 7");
+		add(jideLabel1, "cell 1 11");
 
 		//---- jideLabel2 ----
 		jideLabel2.setText("disabled");
 		jideLabel2.setEnabled(false);
-		add(jideLabel2, "cell 1 7");
+		add(jideLabel2, "cell 1 11");
 
 		//---- styledLabelLabel ----
 		styledLabelLabel.setText("StyledLabel:");
-		add(styledLabelLabel, "cell 0 8");
+		add(styledLabelLabel, "cell 0 12");
 
 		//---- styledLabel1 ----
 		styledLabel1.setText("enabled");
-		add(styledLabel1, "cell 1 8");
+		add(styledLabel1, "cell 1 12");
 
 		//---- styledLabel2 ----
 		styledLabel2.setText("disabled");
 		styledLabel2.setEnabled(false);
-		add(styledLabel2, "cell 1 8");
+		add(styledLabel2, "cell 1 12");
 		// JFormDesigner - End of component initialization  //GEN-END:initComponents
 	}
 
@@ -412,5 +572,7 @@ public class FlatJideOssTest
 	private JLabel triStateLabel1;
 	private JCheckBox verticalCheckBox;
 	private JCheckBox iconCheckBox;
+	private JCheckBox alwaysDropdownCheckBox;
+	private JCheckBox buttonEnabledCheckBox;
 	// JFormDesigner - End of variables declaration  //GEN-END:variables
 }

flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/jideoss/FlatJideOssTest.jfd

@@ -9,7 +9,7 @@ new FormModel {
 		add( new FormContainer( "com.formdev.flatlaf.testing.FlatTestPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
 			"$layoutConstraints": "insets dialog,hidemode 3"
 			"$columnConstraints": "[][left][fill][fill][fill]"
-			"$rowConstraints": "[][][]para[][][][]para[][]"
+			"$rowConstraints": "[][][]para[][][][]para[][][][]para[][]"
 		} ) {
 			name: "this"
 			add( new FormComponent( "javax.swing.JLabel" ) {
@@ -277,47 +277,180 @@ new FormModel {
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
 				"value": "cell 1 6 3 1"
 			} )
+			add( new FormComponent( "javax.swing.JLabel" ) {
+				name: "jideSplitButtonLabel"
+				"text": "JideSplitButton:"
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 0 7"
+			} )
+			add( new FormContainer( "com.jidesoft.swing.JideSplitButton", new FormLayoutManager( class javax.swing.JMenu ) ) {
+				name: "jideSplitButton1"
+				"text": "TOOLBAR"
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 1 7 3 1"
+			} )
+			add( new FormContainer( "com.jidesoft.swing.JideSplitButton", new FormLayoutManager( class javax.swing.JMenu ) ) {
+				name: "jideSplitButton2"
+				"text": "TOOLBOX"
+				"buttonStyle": 1
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 1 7 3 1"
+			} )
+			add( new FormContainer( "com.jidesoft.swing.JideSplitButton", new FormLayoutManager( class javax.swing.JMenu ) ) {
+				name: "jideSplitButton3"
+				"text": "FLAT"
+				"buttonStyle": 2
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 1 7 3 1"
+			} )
+			add( new FormComponent( "javax.swing.JCheckBox" ) {
+				name: "alwaysDropdownCheckBox"
+				"text": "always dropdown"
+				auxiliary() {
+					"JavaCodeGenerator.variableLocal": false
+				}
+				addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "alwaysDropdownChanged", false ) )
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 4 7"
+			} )
+			add( new FormComponent( "javax.swing.JLabel" ) {
+				name: "label3"
+				"text": "selected"
+				"enabled": false
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 0 8,alignx right,growx 0"
+			} )
+			add( new FormContainer( "com.jidesoft.swing.JideSplitButton", new FormLayoutManager( class javax.swing.JMenu ) ) {
+				name: "jideSplitButton5"
+				"text": "TOOLBAR"
+				"buttonSelected": true
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 1 8 3 1"
+			} )
+			add( new FormContainer( "com.jidesoft.swing.JideSplitButton", new FormLayoutManager( class javax.swing.JMenu ) ) {
+				name: "jideSplitButton6"
+				"text": "TOOLBOX"
+				"buttonStyle": 1
+				"buttonSelected": true
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 1 8 3 1"
+			} )
+			add( new FormContainer( "com.jidesoft.swing.JideSplitButton", new FormLayoutManager( class javax.swing.JMenu ) ) {
+				name: "jideSplitButton7"
+				"text": "FLAT"
+				"buttonStyle": 2
+				"buttonSelected": true
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 1 8 3 1"
+			} )
+			add( new FormComponent( "javax.swing.JCheckBox" ) {
+				name: "buttonEnabledCheckBox"
+				"text": "button enabled"
+				"selected": true
+				auxiliary() {
+					"JavaCodeGenerator.variableLocal": false
+				}
+				addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "buttonEnabledChanged", false ) )
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 4 8"
+			} )
+			add( new FormComponent( "javax.swing.JLabel" ) {
+				name: "jideToggleSplitButtonLabel2"
+				"text": "JideToggleSplitButton:"
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 0 9"
+			} )
+			add( new FormContainer( "com.jidesoft.swing.JideToggleSplitButton", new FormLayoutManager( class javax.swing.JMenu ) ) {
+				name: "jideToggleSplitButton1"
+				"text": "TOOLBAR"
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 1 9"
+			} )
+			add( new FormContainer( "com.jidesoft.swing.JideToggleSplitButton", new FormLayoutManager( class javax.swing.JMenu ) ) {
+				name: "jideToggleSplitButton2"
+				"text": "TOOLBOX"
+				"buttonStyle": 1
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 1 9"
+			} )
+			add( new FormContainer( "com.jidesoft.swing.JideToggleSplitButton", new FormLayoutManager( class javax.swing.JMenu ) ) {
+				name: "jideToggleSplitButton3"
+				"text": "FLAT"
+				"buttonStyle": 2
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 1 9"
+			} )
+			add( new FormComponent( "javax.swing.JLabel" ) {
+				name: "label4"
+				"text": "selected"
+				"enabled": false
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 0 10,alignx right,growx 0"
+			} )
+			add( new FormContainer( "com.jidesoft.swing.JideToggleSplitButton", new FormLayoutManager( class javax.swing.JMenu ) ) {
+				name: "jideToggleSplitButton4"
+				"text": "TOOLBAR"
+				"buttonSelected": true
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 1 10"
+			} )
+			add( new FormContainer( "com.jidesoft.swing.JideToggleSplitButton", new FormLayoutManager( class javax.swing.JMenu ) ) {
+				name: "jideToggleSplitButton5"
+				"text": "TOOLBOX"
+				"buttonStyle": 1
+				"buttonSelected": true
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 1 10"
+			} )
+			add( new FormContainer( "com.jidesoft.swing.JideToggleSplitButton", new FormLayoutManager( class javax.swing.JMenu ) ) {
+				name: "jideToggleSplitButton6"
+				"text": "FLAT"
+				"buttonStyle": 2
+				"buttonSelected": true
+			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
+				"value": "cell 1 10"
+			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "jideLabelLabel"
 				"text": "JideLabel:"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 0 7"
+				"value": "cell 0 11"
 			} )
 			add( new FormComponent( "com.jidesoft.swing.JideLabel" ) {
 				name: "jideLabel1"
 				"text": "enabled"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 7"
+				"value": "cell 1 11"
 			} )
 			add( new FormComponent( "com.jidesoft.swing.JideLabel" ) {
 				name: "jideLabel2"
 				"text": "disabled"
 				"enabled": false
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 7"
+				"value": "cell 1 11"
 			} )
 			add( new FormComponent( "javax.swing.JLabel" ) {
 				name: "styledLabelLabel"
 				"text": "StyledLabel:"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 0 8"
+				"value": "cell 0 12"
 			} )
 			add( new FormComponent( "com.jidesoft.swing.StyledLabel" ) {
 				name: "styledLabel1"
 				"text": "enabled"
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 8"
+				"value": "cell 1 12"
 			} )
 			add( new FormComponent( "com.jidesoft.swing.StyledLabel" ) {
 				name: "styledLabel2"
 				"text": "disabled"
 				"enabled": false
 			}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
-				"value": "cell 1 8"
+				"value": "cell 1 12"
 			} )
 		}, new FormLayoutConstraints( null ) {
 			"location": new java.awt.Point( 0, 0 )
-			"size": new java.awt.Dimension( 635, 500 )
+			"size": new java.awt.Dimension( 665, 500 )
 		} )
 	}
 }