From a3885d7a48a849ce3e1c674d6e6418a8a821dfd4 Mon Sep 17 00:00:00 2001
From: Karl Tauber <karl@jformdesigner.com>
Date: Sat, 11 Dec 2021 12:37:22 +0100
Subject: [PATCH] Theme Editor: Preview: minor tweeks

---
 .../flatlaf/themeeditor/FlatThemePreviewAll.java      | 11 ++++++++---
 .../flatlaf/themeeditor/FlatThemePreviewAll.jfd       | 11 +++++++++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewAll.java b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewAll.java
index df64d93c..53fc4832 100644
--- a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewAll.java
+++ b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewAll.java
@@ -19,6 +19,7 @@ package com.formdev.flatlaf.themeeditor;
 
 import java.awt.*;
 import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
 import java.beans.Beans;
 import java.beans.PropertyVetoException;
 import java.util.function.Function;
@@ -628,6 +629,7 @@ class FlatThemePreviewAll
 
 				//---- menuItem5 ----
 				menuItem5.setText("JMenuItem");
+				menuItem5.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_P, KeyEvent.CTRL_DOWN_MASK|KeyEvent.ALT_DOWN_MASK|KeyEvent.SHIFT_DOWN_MASK));
 				menu3.add(menuItem5);
 
 				//---- menuItem8 ----
@@ -773,7 +775,10 @@ class FlatThemePreviewAll
 					new DefaultMutableTreeNode("Item 1") {
 						{
 							add(new DefaultMutableTreeNode("Item 2"));
-							add(new DefaultMutableTreeNode("Item 3"));
+							DefaultMutableTreeNode node1 = new DefaultMutableTreeNode("Item 3");
+								node1.add(new DefaultMutableTreeNode("Item 4"));
+								node1.add(new DefaultMutableTreeNode("Item 5"));
+							add(node1);
 						}
 					}));
 				scrollPane3.setViewportView(tree1);
@@ -792,8 +797,8 @@ class FlatThemePreviewAll
 			//---- table1 ----
 			table1.setModel(new DefaultTableModel(
 				new Object[][] {
-					{"Item 1a", "Item 1b"},
-					{"Item 2a", "Item 2b"},
+					{"Item 1a", "Item 2a"},
+					{"Item 1b", "Item 2b"},
 				},
 				new String[] {
 					"Column 1", "Column 2"
diff --git a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewAll.jfd b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewAll.jfd
index 0d3ae4cb..1e80d9be 100644
--- a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewAll.jfd
+++ b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewAll.jfd
@@ -383,6 +383,7 @@ new FormModel {
 					add( new FormComponent( "javax.swing.JMenuItem" ) {
 						name: "menuItem5"
 						"text": "JMenuItem"
+						"accelerator": static javax.swing.KeyStroke getKeyStroke( 80, 715, false )
 					} )
 					add( new FormComponent( "javax.swing.JMenuItem" ) {
 						name: "menuItem8"
@@ -584,6 +585,12 @@ new FormModel {
 							} )
 							add( new javax.swing.tree.DefaultMutableTreeNode {
 								userObject: "Item 3"
+								add( new javax.swing.tree.DefaultMutableTreeNode {
+									userObject: "Item 4"
+								} )
+								add( new javax.swing.tree.DefaultMutableTreeNode {
+									userObject: "Item 5"
+								} )
 							} )
 						} )
 						auxiliary() {
@@ -609,10 +616,10 @@ new FormModel {
 					"model": new com.jformdesigner.model.SwingTableModel( new java.util.Vector {
 						add( new java.util.Vector {
 							add( "Item 1a" )
-							add( "Item 1b" )
+							add( "Item 2a" )
 						} )
 						add( new java.util.Vector {
-							add( "Item 2a" )
+							add( "Item 1b" )
 							add( "Item 2b" )
 						} )
 					}, new java.util.Vector {