diff --git a/.travis.yml b/.travis.yml index 50728b7..a6513da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,10 +10,9 @@ env: before_install: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start - - sudo apt-get update -qq before_script: - ./gradlew --version -script: ./gradlew -S check test jacocoTestReport +script: ./gradlew -S build jacocoTestReport after_success: - ./gradlew coveralls diff --git a/build.gradle b/build.gradle index 28f6836..edb423b 100755 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ /* * SPDX-License-Identifier: Apache-2.0 * - * Copyright 2011-2018 the original author or authors. + * Copyright 2011-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,15 +15,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - plugins { id 'groovy' id 'idea' - id 'org.kordamp.gradle.project' version '0.9.0' - id 'org.openjfx.javafxplugin' version '0.0.5' - id 'org.asciidoctor.convert' version '1.5.9.2' - id 'com.github.kt3k.coveralls' version '2.8.2' - id 'org.jonnyzzz.java9c' version '0.2.3' + id 'codenarc' + id 'org.kordamp.gradle.project' version '0.25.0' + id 'org.openjfx.javafxplugin' version '0.0.5' + id 'org.asciidoctor.convert' version '1.5.9.2' + id 'com.github.kt3k.coveralls' version '2.8.4' + id 'org.jonnyzzz.java9c' version '0.2.3' + id 'org.javamodularity.moduleplugin' version '1.5.0' + id 'com.google.osdetector' version '1.6.2' } if (!project.hasProperty('bintrayUsername')) project.ext.bintrayUsername = '' @@ -73,7 +75,7 @@ config { } } - license { + licensing { licenses { license { id = 'Apache-2.0' @@ -189,12 +191,12 @@ asciidoctor { test { testLogging { - exceptionFormat "full" + exceptionFormat 'full' } } jacoco { - toolVersion = '0.8.2' + toolVersion = '0.8.4' } processResources { @@ -204,3 +206,8 @@ processResources { ]) } } + +codenarc { + ignoreFailures = true + configFile = project.file('config/codenarc/codenarc.groovy') +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 74191a5..98f25bd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.groovyfx archivesBaseName = groovyfx version = 11.0.0-SNAPSHOT groovyfx_javafxVersion = 11 -groovyfx_groovyVersion = 2.5.4 +groovyfx_groovyVersion = 2.5.7 groovyfx_junitVersion = 4.12 -groovyfx_spockVersion = 1.2-groovy-2.5 -groovyfx_jansiVersion = 1.17.1 +groovyfx_spockVersion = 1.3-groovy-2.5 +groovyfx_jansiVersion = 1.18 diff --git a/gradle/code-quality.gradle b/gradle/code-quality.gradle index 09ab17c..9860ef9 100644 --- a/gradle/code-quality.gradle +++ b/gradle/code-quality.gradle @@ -1,11 +1,13 @@ /* - * Copyright 2011-2018 the original author or authors. + * SPDX-License-Identifier: Apache-2.0 + * + * Copyright 2011-2019 the original author or authors. * * 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 + * 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, @@ -13,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - apply plugin: 'codenarc' apply plugin: 'com.github.hierynomus.license' diff --git a/gradle/demo.gradle b/gradle/demo.gradle index ef85726..270b53e 100644 --- a/gradle/demo.gradle +++ b/gradle/demo.gradle @@ -1,7 +1,7 @@ /* * SPDX-License-Identifier: Apache-2.0 * - * Copyright 2011-2018 the original author or authors. + * Copyright 2011-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import org.javamodularity.moduleplugin.tasks.ModularJavaExec // ------------- compiling demo source --------------- @@ -33,13 +34,12 @@ sourceSets { // ---------------- dynamic tasks to run demos ------------------ -new File('src/demo/groovy').eachFileMatch(~/.*Demo.groovy/) { file -> - def taskName = file.name - '.groovy' - task "$taskName"(type: JavaExec) { +new File('src/demo/groovy/demo').eachFileMatch(~/.*Demo.groovy/) { file -> + def demoClassName = file.name - '.groovy' + task "run$demoClassName"(type: ModularJavaExec) { group = "Demo" - description = "Run the $taskName program" - main = taskName - classpath sourceSets.main.runtimeClasspath + sourceSets.demo.runtimeClasspath + description = "Run the $demoClassName program" + main = "groovyfx.demo/demo.$demoClassName" } } diff --git a/gradle/deploy.gradle b/gradle/deploy.gradle deleted file mode 100644 index 672f6b8..0000000 --- a/gradle/deploy.gradle +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Copyright 2011-2018 the original author or authors. - * - * 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. - */ - -// ------------- Maven Central deployment --------------- - -groovydoc { - use = true - source = project.sourceSets.main.allSource - classpath = javadoc.classpath - groovyClasspath = project.configurations.jansi - windowTitle = "$project.name $project.version API" - docTitle = "$project.name $project.version API" - header = "$project.name $project.version API" - includePrivate = false - link 'http://junit.org/javadoc/latest/', 'org.junit.', 'junit.' - link 'http://docs.oracle.com/javase/8/docs/api/', 'java.', 'org.xml.', 'javax.', 'org.w3c.' - link 'http://docs.oracle.com/javase/8/javafx/api/', 'javafx.' - link 'http://docs.groovy-lang.org/latest/html/api/', 'groovy.', 'org.codehaus.groovy' -} - -task groovydocJar(type: Jar, dependsOn: groovydoc) { - classifier = 'javadoc' - from 'build/docs/groovydoc' -} - -task sourcesJar(type: Jar) { - from sourceSets.main.allSource - classifier = 'sources' -} - -artifacts { - archives jar - archives groovydocJar - archives sourcesJar -} - -/* -signing { - sign configurations.archives -} - -uploadArchives { - if (!project.hasProperty('sonatypeUsername') || !project.hasProperty('sonatypePassword')) - return - - repositories.mavenDeployer { - beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } - - repository(url: 'https://oss.sonatype.org/service/local/staging/deploy/maven2') { - authentication(userName: sonatypeUsername, password: sonatypePassword) - } - - snapshotRepository(url: 'https://oss.sonatype.org/content/repositories/snapshots') { - authentication(userName: sonatypeUsername, password: sonatypePassword) - } - - //repository(url: "file:///Users/dean/temp/m2") - pom.project { - name 'GroovyFX' - url 'http://groovyfx.org' - description 'Groovy bindings for JavaFX 8' - packaging 'jar' - licenses { - license { - name 'The Apache Software License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - distribution 'repo' - } - } - scm { - url 'scm:git@github.com:groovyfx-project/groovyfx.git' - connection 'scm:git@github.com:groovyfx-project/groovyfx.git' - developerConnection 'scm:git@github.com:groovyfx-project/groovyfx.git' - } - developers { - developer { name 'Jim Clarke' } - developer { name 'Dean Iverson' } - developer { name 'Dierk Koenig' } - developer { name 'Andres Almiray' } - developer { name 'Russel Winder' } - } - } - } -} -*/ diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle deleted file mode 100644 index 8f8a783..0000000 --- a/gradle/publishing.gradle +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright 2011-2018 the original author or authors. - * - * 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. - */ - -// ------------- Bintray deployment --------------- -apply plugin: 'com.jfrog.bintray' -apply plugin: 'maven-publish' - -def pomConfig = { - name project.name - url project.project_url - inceptionYear '2011' - licenses { - license([:]) { - name 'The Apache Software License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - distribution 'repo' - } - } - scm { - url project.project_scm - } - developers { - [ - JimClarke5 : 'Jim Clarke', - deanriverson : 'Dean Iverson', - russel : 'Russel Winder', - aalmiray : 'Andres Almiray', - Dierk : 'Dierk König' - ].each { devId, devName -> - developer { - id devId - name devName - roles { - role 'Developer' - } - } - } - } -} - -publishing { - publications { - mavenJava(MavenPublication) { - from components.java - artifact sourcesJar - artifact groovydocJar - - pom.withXml { - asNode().children().last() + pomConfig - asNode().appendNode('description', project.project_description) - } - } - } -} - -if (!project.hasProperty('bintrayApiKey')) ext.bintrayApiKey = '' -if (!project.hasProperty('bintrayUserName')) ext.bintrayUserName = '' - -bintray { - user = project.bintrayUserName - key = project.bintrayApiKey - publications = ['mavenJava'] - pkg { - repo = 'maven' - userOrg = 'groovyfx' - name = project.name - desc = project.project_description - licenses = ['Apache-2.0'] - labels = ['Groovy', 'JavaFX', 'GroovyFX'] - websiteUrl = project.project_url - issueTrackerUrl = project.project_issues - vcsUrl = project.project_scm - publicDownloadNumbers = true - } -} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 457aad0..5c2d1cf 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 75b8c7c..4b7e1f3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index af6708f..8e25e6c 100755 --- a/gradlew +++ b/gradlew @@ -1,5 +1,21 @@ #!/usr/bin/env sh +# +# Copyright 2015 the original author or authors. +# +# 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 +# +# https://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. +# + ############################################################################## ## ## Gradle start up script for UN*X @@ -28,7 +44,7 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m"' +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" diff --git a/gradlew.bat b/gradlew.bat index 0f8d593..24467a1 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..62fe63f --- /dev/null +++ b/settings.gradle @@ -0,0 +1,23 @@ +/* + * SPDX-License-Identifier: Apache-2.0 + * + * Copyright 2011-2019 the original author or authors. + * + * 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. + */ +pluginManagement { + repositories { + jcenter() + gradlePluginPortal() + } +} diff --git a/src/demo/groovy/AccordionDemo.groovy b/src/demo/groovy/demo/AccordionDemo.groovy similarity index 100% rename from src/demo/groovy/AccordionDemo.groovy rename to src/demo/groovy/demo/AccordionDemo.groovy diff --git a/src/demo/groovy/ActionMenuDemo.groovy b/src/demo/groovy/demo/ActionMenuDemo.groovy similarity index 100% rename from src/demo/groovy/ActionMenuDemo.groovy rename to src/demo/groovy/demo/ActionMenuDemo.groovy diff --git a/src/demo/groovy/AnalogClockDemo.groovy b/src/demo/groovy/demo/AnalogClockDemo.groovy similarity index 100% rename from src/demo/groovy/AnalogClockDemo.groovy rename to src/demo/groovy/demo/AnalogClockDemo.groovy diff --git a/src/demo/groovy/AnchorDemo.groovy b/src/demo/groovy/demo/AnchorDemo.groovy similarity index 100% rename from src/demo/groovy/AnchorDemo.groovy rename to src/demo/groovy/demo/AnchorDemo.groovy diff --git a/src/demo/groovy/AnimationDemo.groovy b/src/demo/groovy/demo/AnimationDemo.groovy similarity index 100% rename from src/demo/groovy/AnimationDemo.groovy rename to src/demo/groovy/demo/AnimationDemo.groovy diff --git a/src/demo/groovy/BindDemo.groovy b/src/demo/groovy/demo/BindDemo.groovy similarity index 100% rename from src/demo/groovy/BindDemo.groovy rename to src/demo/groovy/demo/BindDemo.groovy diff --git a/src/demo/groovy/BlendEffectDemo.groovy b/src/demo/groovy/demo/BlendEffectDemo.groovy similarity index 100% rename from src/demo/groovy/BlendEffectDemo.groovy rename to src/demo/groovy/demo/BlendEffectDemo.groovy diff --git a/src/demo/groovy/BorderPaneDemo.groovy b/src/demo/groovy/demo/BorderPaneDemo.groovy similarity index 100% rename from src/demo/groovy/BorderPaneDemo.groovy rename to src/demo/groovy/demo/BorderPaneDemo.groovy diff --git a/src/demo/groovy/ButtonBarDemo.groovy b/src/demo/groovy/demo/ButtonBarDemo.groovy similarity index 100% rename from src/demo/groovy/ButtonBarDemo.groovy rename to src/demo/groovy/demo/ButtonBarDemo.groovy diff --git a/src/demo/groovy/CanvasDemo.groovy b/src/demo/groovy/demo/CanvasDemo.groovy similarity index 100% rename from src/demo/groovy/CanvasDemo.groovy rename to src/demo/groovy/demo/CanvasDemo.groovy diff --git a/src/demo/groovy/ChainedEffectsDemo.groovy b/src/demo/groovy/demo/ChainedEffectsDemo.groovy similarity index 100% rename from src/demo/groovy/ChainedEffectsDemo.groovy rename to src/demo/groovy/demo/ChainedEffectsDemo.groovy diff --git a/src/demo/groovy/ChartDemo.groovy b/src/demo/groovy/demo/ChartDemo.groovy similarity index 100% rename from src/demo/groovy/ChartDemo.groovy rename to src/demo/groovy/demo/ChartDemo.groovy diff --git a/src/demo/groovy/ChoiceBoxDemo.groovy b/src/demo/groovy/demo/ChoiceBoxDemo.groovy similarity index 100% rename from src/demo/groovy/ChoiceBoxDemo.groovy rename to src/demo/groovy/demo/ChoiceBoxDemo.groovy diff --git a/src/demo/groovy/ChooserDemo.groovy b/src/demo/groovy/demo/ChooserDemo.groovy similarity index 100% rename from src/demo/groovy/ChooserDemo.groovy rename to src/demo/groovy/demo/ChooserDemo.groovy diff --git a/src/demo/groovy/CircleDemo.groovy b/src/demo/groovy/demo/CircleDemo.groovy similarity index 100% rename from src/demo/groovy/CircleDemo.groovy rename to src/demo/groovy/demo/CircleDemo.groovy diff --git a/src/demo/groovy/ColorfulCirclesDemo.groovy b/src/demo/groovy/demo/ColorfulCirclesDemo.groovy similarity index 100% rename from src/demo/groovy/ColorfulCirclesDemo.groovy rename to src/demo/groovy/demo/ColorfulCirclesDemo.groovy diff --git a/src/demo/groovy/CustomFieldDemo.groovy b/src/demo/groovy/demo/CustomFieldDemo.groovy similarity index 100% rename from src/demo/groovy/CustomFieldDemo.groovy rename to src/demo/groovy/demo/CustomFieldDemo.groovy diff --git a/src/demo/groovy/DierksCodeStyleDemo.groovy b/src/demo/groovy/demo/DierksCodeStyleDemo.groovy similarity index 100% rename from src/demo/groovy/DierksCodeStyleDemo.groovy rename to src/demo/groovy/demo/DierksCodeStyleDemo.groovy diff --git a/src/demo/groovy/EffectsDemo.groovy b/src/demo/groovy/demo/EffectsDemo.groovy similarity index 100% rename from src/demo/groovy/EffectsDemo.groovy rename to src/demo/groovy/demo/EffectsDemo.groovy diff --git a/src/demo/groovy/FXBindableDemo.groovy b/src/demo/groovy/demo/FXBindableDemo.groovy similarity index 100% rename from src/demo/groovy/FXBindableDemo.groovy rename to src/demo/groovy/demo/FXBindableDemo.groovy diff --git a/src/demo/groovy/FXMLDemo.groovy b/src/demo/groovy/demo/FXMLDemo.groovy similarity index 95% rename from src/demo/groovy/FXMLDemo.groovy rename to src/demo/groovy/demo/FXMLDemo.groovy index 54c58bc..8928345 100644 --- a/src/demo/groovy/FXMLDemo.groovy +++ b/src/demo/groovy/demo/FXMLDemo.groovy @@ -53,12 +53,12 @@ start { fxml xml } stackPane { - fxml resource("/FXMLDemo.fxml"), { + fxml resource("/demo/FXMLDemo.fxml"), { onMouseEntered { println "Entered"} } } stackPane { - fxml resource("/FXMLDemoInline.fxml"), { + fxml resource("/demo/FXMLDemoInline.fxml"), { onMouseEntered { println "Entered"} buttonCSSID.onAction { labelCSSID.text = "Clicked - CSS"; diff --git a/src/demo/groovy/FXMLDemoController.groovy b/src/demo/groovy/demo/FXMLDemoController.groovy similarity index 100% rename from src/demo/groovy/FXMLDemoController.groovy rename to src/demo/groovy/demo/FXMLDemoController.groovy diff --git a/src/demo/groovy/FXMLDemoFromSceneBuilderFile.groovy b/src/demo/groovy/demo/FXMLDemoFromSceneBuilderFile.groovy similarity index 91% rename from src/demo/groovy/FXMLDemoFromSceneBuilderFile.groovy rename to src/demo/groovy/demo/FXMLDemoFromSceneBuilderFile.groovy index a91706b..bdc7269 100644 --- a/src/demo/groovy/FXMLDemoFromSceneBuilderFile.groovy +++ b/src/demo/groovy/demo/FXMLDemoFromSceneBuilderFile.groovy @@ -24,7 +24,7 @@ import static groovyx.javafx.GroovyFX.start start { stage(title: "GroovyFX FXML Demo", visible: true) { scene(fill: GROOVYBLUE, width: 640, height: 500) { - fxml(new File( getClass().getResource('/buildertry.fxml').toURI() ).text) + fxml(new File( getClass().getResource('/demo/buildertry.fxml').toURI() ).text) } } diff --git a/src/demo/groovy/FadeTransitionDemo.groovy b/src/demo/groovy/demo/FadeTransitionDemo.groovy similarity index 100% rename from src/demo/groovy/FadeTransitionDemo.groovy rename to src/demo/groovy/demo/FadeTransitionDemo.groovy diff --git a/src/demo/groovy/FillAndStrokeDemo.groovy b/src/demo/groovy/demo/FillAndStrokeDemo.groovy similarity index 100% rename from src/demo/groovy/FillAndStrokeDemo.groovy rename to src/demo/groovy/demo/FillAndStrokeDemo.groovy diff --git a/src/demo/groovy/FillTransitionDemo.groovy b/src/demo/groovy/demo/FillTransitionDemo.groovy similarity index 100% rename from src/demo/groovy/FillTransitionDemo.groovy rename to src/demo/groovy/demo/FillTransitionDemo.groovy diff --git a/src/demo/groovy/FontDemo.groovy b/src/demo/groovy/demo/FontDemo.groovy similarity index 100% rename from src/demo/groovy/FontDemo.groovy rename to src/demo/groovy/demo/FontDemo.groovy diff --git a/src/demo/groovy/GradientDemo.groovy b/src/demo/groovy/demo/GradientDemo.groovy similarity index 100% rename from src/demo/groovy/GradientDemo.groovy rename to src/demo/groovy/demo/GradientDemo.groovy diff --git a/src/demo/groovy/GridPaneDemo.groovy b/src/demo/groovy/demo/GridPaneDemo.groovy similarity index 100% rename from src/demo/groovy/GridPaneDemo.groovy rename to src/demo/groovy/demo/GridPaneDemo.groovy diff --git a/src/demo/groovy/GroovyFXDemo.groovy b/src/demo/groovy/demo/GroovyFXDemo.groovy similarity index 99% rename from src/demo/groovy/GroovyFXDemo.groovy rename to src/demo/groovy/demo/GroovyFXDemo.groovy index 62ce4d4..9631ed4 100644 --- a/src/demo/groovy/GroovyFXDemo.groovy +++ b/src/demo/groovy/demo/GroovyFXDemo.groovy @@ -33,7 +33,7 @@ start { stage(title: "GroovyFX Demo", x: 100, y: 100, width: 480, height: 800, visible: true, style: "decorated", onHidden: { println "Close"}) { - scene(fill: GROOVYBLUE, root: group(), stylesheets: resource("/groovyfx.css")) { + scene(fill: GROOVYBLUE, root: group(), stylesheets: resource("/demo/groovyfx.css")) { onMousePressed {e -> println "scene press @" + e.x + "," + e.y } onKeyReleased { e -> println "scene key" + e.text} onChange("width") { observable, oldValue, newValue -> diff --git a/src/demo/groovy/HTMLEditorDemo.groovy b/src/demo/groovy/demo/HTMLEditorDemo.groovy similarity index 100% rename from src/demo/groovy/HTMLEditorDemo.groovy rename to src/demo/groovy/demo/HTMLEditorDemo.groovy diff --git a/src/demo/groovy/HelloWorldDemo.groovy b/src/demo/groovy/demo/HelloWorldDemo.groovy similarity index 100% rename from src/demo/groovy/HelloWorldDemo.groovy rename to src/demo/groovy/demo/HelloWorldDemo.groovy diff --git a/src/demo/groovy/ImageDemo.groovy b/src/demo/groovy/demo/ImageDemo.groovy similarity index 100% rename from src/demo/groovy/ImageDemo.groovy rename to src/demo/groovy/demo/ImageDemo.groovy diff --git a/src/demo/groovy/LightingEffectDemo.groovy b/src/demo/groovy/demo/LightingEffectDemo.groovy similarity index 100% rename from src/demo/groovy/LightingEffectDemo.groovy rename to src/demo/groovy/demo/LightingEffectDemo.groovy diff --git a/src/demo/groovy/LogoDemo.groovy b/src/demo/groovy/demo/LogoDemo.groovy similarity index 100% rename from src/demo/groovy/LogoDemo.groovy rename to src/demo/groovy/demo/LogoDemo.groovy diff --git a/src/demo/groovy/MediaViewDemo.groovy b/src/demo/groovy/demo/MediaViewDemo.groovy similarity index 100% rename from src/demo/groovy/MediaViewDemo.groovy rename to src/demo/groovy/demo/MediaViewDemo.groovy diff --git a/src/demo/groovy/MenuDemo.groovy b/src/demo/groovy/demo/MenuDemo.groovy similarity index 100% rename from src/demo/groovy/MenuDemo.groovy rename to src/demo/groovy/demo/MenuDemo.groovy diff --git a/src/demo/groovy/PaddingDemo.groovy b/src/demo/groovy/demo/PaddingDemo.groovy similarity index 100% rename from src/demo/groovy/PaddingDemo.groovy rename to src/demo/groovy/demo/PaddingDemo.groovy diff --git a/src/demo/groovy/ParallelTransitionDemo.groovy b/src/demo/groovy/demo/ParallelTransitionDemo.groovy similarity index 100% rename from src/demo/groovy/ParallelTransitionDemo.groovy rename to src/demo/groovy/demo/ParallelTransitionDemo.groovy diff --git a/src/demo/groovy/PathTransitionDemo.groovy b/src/demo/groovy/demo/PathTransitionDemo.groovy similarity index 100% rename from src/demo/groovy/PathTransitionDemo.groovy rename to src/demo/groovy/demo/PathTransitionDemo.groovy diff --git a/src/demo/groovy/RotateTransitionDemo.groovy b/src/demo/groovy/demo/RotateTransitionDemo.groovy similarity index 100% rename from src/demo/groovy/RotateTransitionDemo.groovy rename to src/demo/groovy/demo/RotateTransitionDemo.groovy diff --git a/src/demo/groovy/SGTimelineDemo.groovy b/src/demo/groovy/demo/SGTimelineDemo.groovy similarity index 100% rename from src/demo/groovy/SGTimelineDemo.groovy rename to src/demo/groovy/demo/SGTimelineDemo.groovy diff --git a/src/demo/groovy/ScaleTransitionDemo.groovy b/src/demo/groovy/demo/ScaleTransitionDemo.groovy similarity index 100% rename from src/demo/groovy/ScaleTransitionDemo.groovy rename to src/demo/groovy/demo/ScaleTransitionDemo.groovy diff --git a/src/demo/groovy/SequenceContentDemo.groovy b/src/demo/groovy/demo/SequenceContentDemo.groovy similarity index 100% rename from src/demo/groovy/SequenceContentDemo.groovy rename to src/demo/groovy/demo/SequenceContentDemo.groovy diff --git a/src/demo/groovy/SequentialTransitionDemo.groovy b/src/demo/groovy/demo/SequentialTransitionDemo.groovy similarity index 100% rename from src/demo/groovy/SequentialTransitionDemo.groovy rename to src/demo/groovy/demo/SequentialTransitionDemo.groovy diff --git a/src/demo/groovy/SpinnerDemo.groovy b/src/demo/groovy/demo/SpinnerDemo.groovy similarity index 100% rename from src/demo/groovy/SpinnerDemo.groovy rename to src/demo/groovy/demo/SpinnerDemo.groovy diff --git a/src/demo/groovy/SpirographDemo.groovy b/src/demo/groovy/demo/SpirographDemo.groovy similarity index 100% rename from src/demo/groovy/SpirographDemo.groovy rename to src/demo/groovy/demo/SpirographDemo.groovy diff --git a/src/demo/groovy/SplitPaneDemo.groovy b/src/demo/groovy/demo/SplitPaneDemo.groovy similarity index 100% rename from src/demo/groovy/SplitPaneDemo.groovy rename to src/demo/groovy/demo/SplitPaneDemo.groovy diff --git a/src/demo/groovy/StrokeTransitionDemo.groovy b/src/demo/groovy/demo/StrokeTransitionDemo.groovy similarity index 100% rename from src/demo/groovy/StrokeTransitionDemo.groovy rename to src/demo/groovy/demo/StrokeTransitionDemo.groovy diff --git a/src/demo/groovy/SwingDemo.groovy b/src/demo/groovy/demo/SwingDemo.groovy similarity index 100% rename from src/demo/groovy/SwingDemo.groovy rename to src/demo/groovy/demo/SwingDemo.groovy diff --git a/src/demo/groovy/TabDemo.groovy b/src/demo/groovy/demo/TabDemo.groovy similarity index 100% rename from src/demo/groovy/TabDemo.groovy rename to src/demo/groovy/demo/TabDemo.groovy diff --git a/src/demo/groovy/TableView2Demo.groovy b/src/demo/groovy/demo/TableView2Demo.groovy similarity index 100% rename from src/demo/groovy/TableView2Demo.groovy rename to src/demo/groovy/demo/TableView2Demo.groovy diff --git a/src/demo/groovy/TableViewDemo.groovy b/src/demo/groovy/demo/TableViewDemo.groovy similarity index 100% rename from src/demo/groovy/TableViewDemo.groovy rename to src/demo/groovy/demo/TableViewDemo.groovy diff --git a/src/demo/groovy/TextAreaDemo.groovy b/src/demo/groovy/demo/TextAreaDemo.groovy similarity index 100% rename from src/demo/groovy/TextAreaDemo.groovy rename to src/demo/groovy/demo/TextAreaDemo.groovy diff --git a/src/demo/groovy/TextFieldDemo.groovy b/src/demo/groovy/demo/TextFieldDemo.groovy similarity index 100% rename from src/demo/groovy/TextFieldDemo.groovy rename to src/demo/groovy/demo/TextFieldDemo.groovy diff --git a/src/demo/groovy/TextFlowDemo.groovy b/src/demo/groovy/demo/TextFlowDemo.groovy similarity index 100% rename from src/demo/groovy/TextFlowDemo.groovy rename to src/demo/groovy/demo/TextFlowDemo.groovy diff --git a/src/demo/groovy/TimelineDemo.groovy b/src/demo/groovy/demo/TimelineDemo.groovy similarity index 100% rename from src/demo/groovy/TimelineDemo.groovy rename to src/demo/groovy/demo/TimelineDemo.groovy diff --git a/src/demo/groovy/TitledPaneDemo.groovy b/src/demo/groovy/demo/TitledPaneDemo.groovy similarity index 100% rename from src/demo/groovy/TitledPaneDemo.groovy rename to src/demo/groovy/demo/TitledPaneDemo.groovy diff --git a/src/demo/groovy/ToggleButtonDemo.groovy b/src/demo/groovy/demo/ToggleButtonDemo.groovy similarity index 100% rename from src/demo/groovy/ToggleButtonDemo.groovy rename to src/demo/groovy/demo/ToggleButtonDemo.groovy diff --git a/src/demo/groovy/ToolBarDemo.groovy b/src/demo/groovy/demo/ToolBarDemo.groovy similarity index 100% rename from src/demo/groovy/ToolBarDemo.groovy rename to src/demo/groovy/demo/ToolBarDemo.groovy diff --git a/src/demo/groovy/Transform3DDemo.groovy b/src/demo/groovy/demo/Transform3DDemo.groovy similarity index 100% rename from src/demo/groovy/Transform3DDemo.groovy rename to src/demo/groovy/demo/Transform3DDemo.groovy diff --git a/src/demo/groovy/TransitionDemo.groovy b/src/demo/groovy/demo/TransitionDemo.groovy similarity index 100% rename from src/demo/groovy/TransitionDemo.groovy rename to src/demo/groovy/demo/TransitionDemo.groovy diff --git a/src/demo/groovy/TranslateTransitionDemo.groovy b/src/demo/groovy/demo/TranslateTransitionDemo.groovy similarity index 100% rename from src/demo/groovy/TranslateTransitionDemo.groovy rename to src/demo/groovy/demo/TranslateTransitionDemo.groovy diff --git a/src/demo/groovy/TreeViewDemo.groovy b/src/demo/groovy/demo/TreeViewDemo.groovy similarity index 100% rename from src/demo/groovy/TreeViewDemo.groovy rename to src/demo/groovy/demo/TreeViewDemo.groovy diff --git a/src/demo/groovy/TriggerDemo.groovy b/src/demo/groovy/demo/TriggerDemo.groovy similarity index 100% rename from src/demo/groovy/TriggerDemo.groovy rename to src/demo/groovy/demo/TriggerDemo.groovy diff --git a/src/demo/groovy/TwoStagesDemo.groovy b/src/demo/groovy/demo/TwoStagesDemo.groovy similarity index 100% rename from src/demo/groovy/TwoStagesDemo.groovy rename to src/demo/groovy/demo/TwoStagesDemo.groovy diff --git a/src/demo/groovy/VanishingCirclesDemo.groovy b/src/demo/groovy/demo/VanishingCirclesDemo.groovy similarity index 100% rename from src/demo/groovy/VanishingCirclesDemo.groovy rename to src/demo/groovy/demo/VanishingCirclesDemo.groovy diff --git a/src/demo/groovy/WebViewDemo.groovy b/src/demo/groovy/demo/WebViewDemo.groovy similarity index 100% rename from src/demo/groovy/WebViewDemo.groovy rename to src/demo/groovy/demo/WebViewDemo.groovy diff --git a/src/demo/groovy/structure/AllInOne.groovy b/src/demo/groovy/demo/structure/AllInOne.groovy similarity index 100% rename from src/demo/groovy/structure/AllInOne.groovy rename to src/demo/groovy/demo/structure/AllInOne.groovy diff --git a/src/demo/groovy/structure/DemoStyle.groovy b/src/demo/groovy/demo/structure/DemoStyle.groovy similarity index 97% rename from src/demo/groovy/structure/DemoStyle.groovy rename to src/demo/groovy/demo/structure/DemoStyle.groovy index ce99b02..89258e8 100644 --- a/src/demo/groovy/structure/DemoStyle.groovy +++ b/src/demo/groovy/demo/structure/DemoStyle.groovy @@ -29,7 +29,7 @@ class DemoStyle { static style(SceneGraphBuilder sgb) { Stage frame = sgb.primaryStage Scene scene = frame.scene - scene.stylesheets << 'demo.css' + scene.stylesheets << 'demo/demo.css' // def GROOVYBLUE = sgb.groovyblue // scene.fill = sgb.radialGradient(stops: [ // GROOVYBLUE.brighter(), diff --git a/src/demo/groovy/structure/Improved.groovy b/src/demo/groovy/demo/structure/Improved.groovy similarity index 100% rename from src/demo/groovy/structure/Improved.groovy rename to src/demo/groovy/demo/structure/Improved.groovy diff --git a/src/demo/resources/FXMLDemo.fxml b/src/demo/resources/demo/FXMLDemo.fxml similarity index 94% rename from src/demo/resources/FXMLDemo.fxml rename to src/demo/resources/demo/FXMLDemo.fxml index 0445eed..00af71f 100644 --- a/src/demo/resources/FXMLDemo.fxml +++ b/src/demo/resources/demo/FXMLDemo.fxml @@ -21,7 +21,7 @@ - +