From 1de367e19e1eeebda9515e3488727de96d4474ac Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Wed, 23 Oct 2019 16:44:39 +0200 Subject: [PATCH] moved testing applications from `src/test` to new project `flatlaf-testing` (part 2) --- flatlaf-core/build.gradle.kts | 18 -------- flatlaf-swingx/build.gradle.kts | 5 --- flatlaf-testing/build.gradle.kts | 36 ++++++++++++++++ .../flatlaf/testing/FlatChooserTest.java | 2 +- .../flatlaf/testing/FlatComponents2Test.java | 2 +- .../flatlaf/testing/FlatComponentsTest.java | 2 +- .../flatlaf/testing/FlatContainerTest.java | 2 +- .../flatlaf/testing/FlatInspector.java | 2 +- .../flatlaf/testing/FlatMenusTest.java | 2 +- .../flatlaf/testing/FlatOptionPaneTest.java | 2 +- .../flatlaf/testing/FlatTestFrame.java | 7 +++- .../formdev/flatlaf/testing/FlatTestLaf.java | 4 +- .../swingx/FlatSwingXDefaultsTestAddon.java | 41 +++++++++++++++++++ .../testing/swingx/FlatSwingXTest.java | 4 +- .../com.formdev.flatlaf.FlatDefaultsAddon | 1 + settings.gradle.kts | 1 + 16 files changed, 97 insertions(+), 34 deletions(-) create mode 100644 flatlaf-testing/build.gradle.kts create mode 100644 flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/swingx/FlatSwingXDefaultsTestAddon.java create mode 100644 flatlaf-testing/src/main/resources/META-INF/services/com.formdev.flatlaf.FlatDefaultsAddon diff --git a/flatlaf-core/build.gradle.kts b/flatlaf-core/build.gradle.kts index 33ccf384..3efc3494 100644 --- a/flatlaf-core/build.gradle.kts +++ b/flatlaf-core/build.gradle.kts @@ -34,11 +34,6 @@ if( JavaVersion.current() >= JavaVersion.VERSION_1_9 ) { } } -dependencies { - testImplementation( "com.miglayout:miglayout-swing:5.2" ) - testImplementation( "com.jgoodies:jgoodies-forms:1.9.0" ) -} - java { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 @@ -88,19 +83,6 @@ tasks { from( javadoc ) } - - register( "testJar", Jar::class ) { - archiveBaseName.set( "flatlaf-test" ) - from( sourceSets.test.get().output ) - } -} - -configurations { - create( "testArtifacts" ) -} - -artifacts { - add( "testArtifacts", tasks.getByPath( "testJar" ) ) } publishing { diff --git a/flatlaf-swingx/build.gradle.kts b/flatlaf-swingx/build.gradle.kts index affcd0da..78484396 100644 --- a/flatlaf-swingx/build.gradle.kts +++ b/flatlaf-swingx/build.gradle.kts @@ -25,10 +25,6 @@ plugins { dependencies { implementation( project( ":flatlaf-core" ) ) implementation( "org.swinglabs.swingx:swingx-all:1.6.5-1" ) - - testImplementation( project( ":flatlaf-core", "testArtifacts" ) ) - testImplementation( "org.swinglabs.swingx:swingx-beaninfo:1.6.5-1" ) - testImplementation( "com.miglayout:miglayout-swing:5.2" ) } java { @@ -37,7 +33,6 @@ java { } tasks { - javadoc { options { this as StandardJavadocDocletOptions diff --git a/flatlaf-testing/build.gradle.kts b/flatlaf-testing/build.gradle.kts new file mode 100644 index 00000000..7fb22032 --- /dev/null +++ b/flatlaf-testing/build.gradle.kts @@ -0,0 +1,36 @@ +/* + * Copyright 2019 FormDev Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +version = rootProject.version + +plugins { + `java-library` +} + +dependencies { + implementation( project( ":flatlaf-core" ) ) + implementation( project( ":flatlaf-swingx" ) ) + + implementation( "com.miglayout:miglayout-swing:5.2" ) + implementation( "com.jgoodies:jgoodies-forms:1.9.0" ) + implementation( "org.swinglabs.swingx:swingx-all:1.6.5-1" ) + implementation( "org.swinglabs.swingx:swingx-beaninfo:1.6.5-1" ) +} + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatChooserTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatChooserTest.java index d98f3986..b6067576 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatChooserTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatChooserTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.formdev.flatlaf; +package com.formdev.flatlaf.testing; import javax.swing.*; import net.miginfocom.swing.*; diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponents2Test.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponents2Test.java index 6b00985b..6ff3da52 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponents2Test.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponents2Test.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.formdev.flatlaf; +package com.formdev.flatlaf.testing; import javax.swing.*; import javax.swing.table.*; diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentsTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentsTest.java index dc381587..18f40b6d 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentsTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentsTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.formdev.flatlaf; +package com.formdev.flatlaf.testing; import java.awt.*; import javax.swing.*; diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatContainerTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatContainerTest.java index b9831a95..57943e7f 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatContainerTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatContainerTest.java @@ -2,7 +2,7 @@ * Created by JFormDesigner on Tue Aug 27 21:47:02 CEST 2019 */ -package com.formdev.flatlaf; +package com.formdev.flatlaf.testing; import java.awt.*; import javax.swing.*; diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatInspector.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatInspector.java index ecb91ca6..0d6bbc25 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatInspector.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatInspector.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.formdev.flatlaf; +package com.formdev.flatlaf.testing; import java.awt.Color; import java.awt.Component; diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMenusTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMenusTest.java index a99f3c85..3ce1ed88 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMenusTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatMenusTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.formdev.flatlaf; +package com.formdev.flatlaf.testing; import java.awt.Component; import java.awt.Container; diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatOptionPaneTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatOptionPaneTest.java index 8edf697b..63bc2cb3 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatOptionPaneTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatOptionPaneTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.formdev.flatlaf; +package com.formdev.flatlaf.testing; import java.awt.*; import java.awt.event.MouseAdapter; diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.java index 0342da44..9ea33754 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.formdev.flatlaf; +package com.formdev.flatlaf.testing; import java.awt.*; import java.awt.event.ComponentAdapter; @@ -28,6 +28,11 @@ import javax.swing.*; import javax.swing.plaf.ColorUIResource; import javax.swing.plaf.metal.MetalLookAndFeel; import javax.swing.plaf.nimbus.NimbusLookAndFeel; +import com.formdev.flatlaf.FlatDarculaLaf; +import com.formdev.flatlaf.FlatDarkLaf; +import com.formdev.flatlaf.FlatIntelliJLaf; +import com.formdev.flatlaf.FlatLaf; +import com.formdev.flatlaf.FlatLightLaf; import com.formdev.flatlaf.ui.FlatUIUtils; import com.formdev.flatlaf.util.SystemInfo; import com.formdev.flatlaf.util.UIScale; diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestLaf.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestLaf.java index bb7a5d03..9af28ba2 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestLaf.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestLaf.java @@ -14,7 +14,9 @@ * limitations under the License. */ -package com.formdev.flatlaf; +package com.formdev.flatlaf.testing; + +import com.formdev.flatlaf.FlatLaf; /** * A Flat LaF that has a test color scheme. diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/swingx/FlatSwingXDefaultsTestAddon.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/swingx/FlatSwingXDefaultsTestAddon.java new file mode 100644 index 00000000..3ce87f7d --- /dev/null +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/swingx/FlatSwingXDefaultsTestAddon.java @@ -0,0 +1,41 @@ +/* + * Copyright 2019 FormDev Software GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.formdev.flatlaf.testing.swingx; + +import java.io.InputStream; +import com.formdev.flatlaf.FlatDefaultsAddon; + +/** + * SwingX addon for FlatLaf for testing. + * + * @author Karl Tauber + */ +public class FlatSwingXDefaultsTestAddon + extends FlatDefaultsAddon +{ + /** + * Finds SwingX addon .properties file for the given LaF class + * in the same package as this class. + */ + @Override + public InputStream getDefaults( Class lafClass ) { + Class addonClass = this.getClass(); + String propertiesName = "/" + addonClass.getPackage().getName().replace( '.', '/' ) + + '/' + lafClass.getSimpleName() + ".properties"; + return addonClass.getResourceAsStream( propertiesName ); + } +} diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/swingx/FlatSwingXTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/swingx/FlatSwingXTest.java index 62982df0..f3d8976c 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/swingx/FlatSwingXTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/swingx/FlatSwingXTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.formdev.flatlaf.swingx; +package com.formdev.flatlaf.testing.swingx; import java.awt.*; import java.util.Calendar; @@ -22,7 +22,7 @@ import java.util.Date; import javax.swing.*; import net.miginfocom.swing.*; import org.jdesktop.swingx.*; -import com.formdev.flatlaf.FlatTestFrame; +import com.formdev.flatlaf.testing.FlatTestFrame; /** * @author Karl Tauber diff --git a/flatlaf-testing/src/main/resources/META-INF/services/com.formdev.flatlaf.FlatDefaultsAddon b/flatlaf-testing/src/main/resources/META-INF/services/com.formdev.flatlaf.FlatDefaultsAddon new file mode 100644 index 00000000..d0cccba9 --- /dev/null +++ b/flatlaf-testing/src/main/resources/META-INF/services/com.formdev.flatlaf.FlatDefaultsAddon @@ -0,0 +1 @@ +com.formdev.flatlaf.testing.swingx.FlatSwingXDefaultsTestAddon diff --git a/settings.gradle.kts b/settings.gradle.kts index d30d0d94..b5e616c4 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -19,3 +19,4 @@ rootProject.name = "FlatLaf" include( "flatlaf-core" ) include( "flatlaf-swingx" ) include( "flatlaf-demo" ) +include( "flatlaf-testing" )