From a4d70d80959013b5a92032abb1f6d43ff3ef074d Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Wed, 7 Apr 2021 10:34:11 +0200 Subject: [PATCH] FlatTextComponentsTest: fixed compiler warnings (for previous commit) --- .../com/formdev/flatlaf/testing/FlatTextComponentsTest.java | 4 ++-- .../com/formdev/flatlaf/testing/FlatTextComponentsTest.jfd | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTextComponentsTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTextComponentsTest.java index 67820c16..80b68989 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTextComponentsTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTextComponentsTest.java @@ -76,8 +76,8 @@ public class FlatTextComponentsTest JSpinner spinner1 = new JSpinner(); JSpinner spinner2 = new JSpinner(); JSpinner spinner3 = new JSpinner(); - JComboBox comboBox2 = new JComboBox(); - JComboBox comboBox4 = new JComboBox(); + JComboBox comboBox2 = new JComboBox<>(); + JComboBox comboBox4 = new JComboBox<>(); JPopupMenu popupMenu1 = new JPopupMenu(); JMenuItem cutMenuItem = new JMenuItem(); JMenuItem copyMenuItem = new JMenuItem(); diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTextComponentsTest.jfd b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTextComponentsTest.jfd index 22bb01b8..aa4526b3 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTextComponentsTest.jfd +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTextComponentsTest.jfd @@ -246,12 +246,18 @@ new FormModel { add( new FormComponent( "javax.swing.JComboBox" ) { name: "comboBox2" "editable": true + auxiliary() { + "JavaCodeGenerator.typeParameters": "String" + } }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 1 10,growx,height 40" } ) add( new FormComponent( "javax.swing.JComboBox" ) { name: "comboBox4" "editable": true + auxiliary() { + "JavaCodeGenerator.typeParameters": "String" + } }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { "value": "cell 1 11,growx,hmax 14" } )