JFXtras · nyshthefantastic · Apr 30, 2013 · Apr 30, 2013 · Apr 30, 2013 · May 2, 2013
diff --git a/.gitignore b/.gitignore
@@ -1,25 +1,30 @@
-.gradle
-build
-_build
-.classpath
-.project
-.settings
-bin
-src/main/Main.iml
-src/main/java/jfxtras/labs/scene/control/gauge/Gauge.iml
-*.iml
-*.ipr
-*.iws
-out/
-.idea/
-src/main/java/jfxtras/labs/scene/control/gauge/Demo.java
-src/main/java/jfxtras/labs/scene/control/gauge/.DS_Store
-src/main/java/Demo.java
-/nbproject/private/
-/nbbuild/
-/dist/
-nbproject
+.gradle
+build
+_build
+.classpath
+.project
+.settings
+bin
+src/main/Main.iml
+src/main/java/jfxtras/labs/scene/control/gauge/Gauge.iml
+*.iml
+*.ipr
+*.iws
+out/
+.idea/
+src/main/java/jfxtras/labs/scene/control/gauge/Demo.java
+src/main/java/jfxtras/labs/scene/control/gauge/.DS_Store
+src/main/java/Demo.java
+/nbproject/private/
+/nbbuild/
+/dist/
+nbproject
 build.xml
-.DS_Store
-/_lib
-/gradlew_release.cmd
+.DS_Store
+/_lib
+/gradlew_release.cmd
+/gradle_localOverride.cmd
+/gradlew_updateWrapper.cmd
+/gradlew_repairHeaders.cmd
+/.nb-gradle/profiles/private/
+.nb-gradle-properties
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,11 @@
+language: java
+before_install:
+ - "export DISPLAY=:99.0"
+ - "export TERM=dumb"
+ - "sh -e /etc/init.d/xvfb start"
+script: gradle check --info
+after_failure:
+ - "cat ./build/test-results/*.xml"
+jdk:
+ - oraclejdk7 
+
diff --git a/README.md b/README.md
@@ -1,10 +1,34 @@
-JFXtras-labs
+JFXtras-labs [![Build Status](https://travis-ci.org/JFXtras/jfxtras-labs.png)](https://travis-ci.org/JFXtras/jfxtras-labs)
 ============
 _A project for experimenting with new controls and other useful JavaFX extensions_
 
+Java version
+--------------------
+JavaFX 2.2 - JDK 7
+```git checkout 2.2```
+
+JavaFX 8 - JDK 8
+```git checkout 8.0```
+
+Install/Build
+--------------------
 Building with Gradle
+Command ```./gradlew build``` will install necessary gradle version
+
+```
+git clone https://github.com/JFXtras/jfxtras-labs.git
+cd jfxtras-labs
+git checkout *YOUR_JAVAFX_VERSION*
+./gradlew build
+```
+
+Troubleshooting
 --------------------
-* Set your environment variable JAVAFX_HOME to the directory that contains rt/lib/jfxrt.jar.
-* cd jfxtras-labs
-* gradlew build
+set correct JAVA_HOME
+example ```JAVA_HOME=/usr/lib/jvm/default-java/``` in .bashrc
+test ```file $JAVA_HOME/jre/lib/jfxrt.jar``` Unix
+sometimes ```jre/lib/jfxrt.jar``` placed in ```jre/lib/ext/jfxrt.jar``` you can make symlink
+
+
+### Please make [Issue](https://github.com/JFXtras/jfxtras-labs/issues) if have problem with build (write linux/windows/OSX version, JDK version/build, log file with errors)
 
diff --git a/build.gradle b/build.gradle
@@ -5,44 +5,67 @@ apply plugin: 'eclipse'
 apply plugin: 'idea'
 
 buildscript {
- final javafxHome = System.env['JAVAFX_HOME']
- if (javafxHome) {
- ext.javafxJar = "${javafxHome}/rt/lib/jfxrt.jar"
- } else {
- final javaHome = System.env['JAVA_HOME']
- if (javaHome)
+
+ repositories {
+ mavenCentral()
+ maven {
+ url "https://oss.sonatype.org/content/repositories/snapshots"
+ }
+ dependencies {
+ classpath "eu.mihosoft.vrl.vlicense-header-util:VLicenseHeaderUtil:0.1-r2-SNAPSHOT"
+ classpath "eu.mihosoft.vrl.vlicense-header-util.gradle:vlicense-header-plugin:0.1-r2-SNAPSHOT"
+ }
+ }
+
+ final javaHome = System.env['JAVA_HOME']
+ if (javaHome) {
  ext.javafxJar = "${javaHome}/jre/lib/jfxrt.jar"
  }
 
  try {
- println "JavaFX runtime jar: ${ext.javafxJar}"
- dependencies {
- classpath files(ext.javafxJar)
- }
+ println "JavaFX runtime jar: ${ext.javafxJar}"
+ dependencies {
+ classpath files(ext.javafxJar)
+
+ // vrl license header plugin
+ classpath "eu.mihosoft.vrl.vlicense-header-util.gradle:vlicense-header-plugin:0.1-r2-SNAPSHOT"
+ }
  } catch (MissingPropertyException mpe) {
- println """
- | Please set the environment variable JAVAFX_HOME
- | to the directory that contains rt/lib/jfxrt.jar
- | of JavaFX version ${jfxtras_requiredJavaFxVersion}.\n""".stripMargin()
- System.exit 1
+  println """
+ | Please set the environment variable JAVA_HOME
+ | to the directory that contains jre/lib/jfxrt.jar
+ | of JavaFX version ${jfxtras_requiredJavaFxVersion}.\n""".stripMargin() 
+  System.exit 1
  }
 }
 
+// apply vrl license header plugin
+if (!project.plugins.findPlugin(eu.mihosoft.vrl.vlicenseheaderutil.gradle.VLicenseHeaderPlugin)) {
+ project.apply(plugin: eu.mihosoft.vrl.vlicenseheaderutil.gradle.VLicenseHeaderPlugin)
+}
+
 repositories {
- mavenRepo urls: "https://oss.sonatype.org/content/repositories/snapshots/"
  mavenCentral()
+ maven {
+ url "https://oss.sonatype.org/content/repositories/snapshots"
+ }
+
 }
 
+
 dependencies {
  compile files(ext.javafxJar, "lib/jsr-310-ri-0.6.3.jar", "lib/jsr-310-TZDB-all-0.6.3.jar")
- testCompile "junit:junit:${jfxtras_junitVersion}"
+ testCompile "junit:junit:${jfxtras_junitVersion}","org.mockito:mockito-all:1.9.5"
  testCompile "net.java.jemmy:JemmyFX:0.9.3-SNAPSHOT"
 }
 
 apply {
- from 'gradle/mavenCentralDeploy.gradle'
+  from 'gradle/mavenCentralDeploy.gradle'
 }
 
+// license template (will be used as header in all Java source files)
+repairHeaders.licenseHeaderText = new File(projectDir,"license-template.txt")
+
 task buildTimestamped(type: Copy, dependsOn: 'build') {
  from 'build/libs'
  into 'build/libs/timestamped'
@@ -53,18 +76,22 @@ task buildTimestamped(type: Copy, dependsOn: 'build') {
 }
 
 task wrapper(type: Wrapper) {
- gradleVersion = '1.0-rc-3'
+ gradleVersion = '1.7'
 }
 
 signArchives.onlyIf {
-  project.hasProperty('signing.keyId')
+ project.hasProperty('signing.keyId')
 }
 
 uploadArchives.onlyIf {
-  project.hasProperty('sonatypeUsername') && project.hasProperty('sonatypePassword')
+ project.hasProperty('sonatypeUsername') && project.hasProperty('sonatypePassword')
 }
 
 task copyToLib(type: Copy) {
  into "_lib"
  from configurations.testCompile
 }
+
+test {
+ systemProperty 'tiles.source', "${project.buildDir}/resources/test/jfxtras/labs/map/tile"
+}
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 group = org.jfxtras
 archivesBaseName = jfxtras-labs
-version = 2.2-r5-SNAPSHOT
+version = 2.2-r6-SNAPSHOT
 jfxtras_requiredJavaFxVersion = 2.2
 jfxtras_junitVersion = 4.10
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Jun 03 10:11:31 MDT 2012
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=http\:https://services.gradle.org/distributions/gradle-1.0-rc-3-bin.zip
+#Sun Sep 15 18:45:24 CEST 2013
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\:https://services.gradle.org/distributions/gradle-1.7-bin.zip
diff --git a/gradlew_build.cmd b/gradlew_build.cmd
@@ -1,2 +1,4 @@
+@echo off
+IF EXIST "gradle_localOverride.cmd" call "gradle_localOverride.cmd"
 call gradlew build
 pause
diff --git a/gradlew_lib.cmd b/gradlew_lib.cmd
@@ -1,2 +1,5 @@
+@echo off
+IF EXIST "gradle_localOverride.cmd" call "gradle_localOverride.cmd"
+del /F /Q _lib\*
 call gradlew copyToLib
 pause
diff --git a/license-template.txt b/license-template.txt
@@ -0,0 +1,28 @@
+/**
+ * ${VRL-LICENSE-HEADER-FILE-NAME}
+ *
+ * Copyright (c) 2011-${VRL-LICENSE-HEADER-YEAR}, JFXtras
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the organization nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
diff --git a/settings.gradle b/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'jfxtras-labs'
diff --git a/src/main/java/jfxtras/fxml/BuilderService.java b/src/main/java/jfxtras/fxml/BuilderService.java
@@ -0,0 +1,40 @@
+/**
+ * BuilderService.java
+ *
+ * Copyright (c) 2011-2013, JFXtras
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the <organization> nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package jfxtras.fxml;
+
+import javafx.util.Builder;
+
+/**
+ * The implementing class should also have a zero argument constructor.
+ */
+public interface BuilderService<T> extends Builder<T> 
+{
+ public boolean isBuilderFor(Class<?> clazz);
+}
diff --git a/src/main/java/jfxtras/labs/animation/BindableTransition.java b/src/main/java/jfxtras/labs/animation/BindableTransition.java
@@ -1,3 +1,32 @@
+/**
+ * BindableTransition.java
+ *
+ * Copyright (c) 2011-2013, JFXtras
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the <organization> nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 package jfxtras.labs.animation;
 
 import javafx.animation.Transition;