Updated build scripts for latest gradle version. Moved some build scr…

…ipt properties into gradle.properties. Cleaned up some javadoc warnings.

build.gradle

@@ -4,53 +4,37 @@ apply plugin: 'signing'
 apply plugin: 'eclipse'
 apply plugin: 'idea'
 
-/***************************************
- * Set Maven coordinates and build vars
- ***************************************/
-group                   = 'org.jfxtras'
-archivesBaseName        = "jfxtras-labs"
-version                 = '0.1-SNAPSHOT'
-
-isRelease = !version.endsWith('SNAPSHOT')
-requiredJavaFxVersion   = '2.1.0'
-
-//sourceCompatibility = 7
-
-/***************************************
- * Check environment
- ***************************************/
-javafxHome = System.env['JAVAFX_HOME']
-if(!javafxHome) {
-    println """Please set environment variable JAVAFX_HOME
-to the directory that contains /rt/lib/jfxrt.jar
-for JavaFX version $requiredJavaFxVersion"""
-    System.exit 1
-}
-
 buildscript {
-    dependencies {
-        classpath files("${System.env['JAVAFX_HOME']}/rt/lib/jfxrt.jar")
+    final javafxHome = System.env['JAVAFX_HOME']
+    if (javafxHome) {
+      ext.javafxJar = "${javafxHome}/rt/lib/jfxrt.jar"
+    } else {
+      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)
+      }
+    } 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
     }
 }
-/*
-actualJavaFXVersion = com.sun.javafx.runtime.VersionInfo.runtimeVersion
-if (!actualJavaFXVersion.startsWith(requiredJavaFxVersion)) {
-    println "Required JavaFX version is '$requiredJavaFxVersion' but actual version is '$actualJavaFXVersion'"
-    System.exit(1)
-}
-*/
-// environment is ok
 
-/***************************************
- * The build script proper
- ***************************************/
 repositories {
     mavenCentral()
 }
 
 dependencies {
-    compile     files("${javafxHome}/rt/lib/jfxrt.jar")
-    testCompile 'junit:junit:4.10'
+    compile      files(ext.javafxJar)
+    testCompile  "junit:junit:${jfxtras_junitVersion}"
     testCompile files("lib/jemmy.jar", "lib/JemmyAWT.jar", "lib/JemmyAWTInput.jar", "lib/JemmyBrowser.jar", "lib/JemmyCore.jar", "lib/JemmyFX.jar")
 }
 
@@ -68,15 +52,15 @@ task buildTimestamped(type: Copy, dependsOn: 'build') {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '1.0-milestone-8'
+    gradleVersion = '1.0-rc-3'
 }
 
 signArchives.onlyIf {
-      hasProperty('signing.keyId')
+      project.hasProperty('signing.keyId')
 }
 
 uploadArchives.onlyIf {
-      hasProperty('sonatypeUsername') && hasProperty('sonatypePassword')
+      project.hasProperty('sonatypeUsername') && project.hasProperty('sonatypePassword')
 }
 
 task copyToLib(type: Copy) {

gradle.properties

@@ -0,0 +1,5 @@
+group                          =  org.jfxtras
+archivesBaseName               =  jfxtras-labs
+version                        =  0.1-SNAPSHOT
+jfxtras_requiredJavaFxVersion  =  2.1
+jfxtras_junitVersion           =  4.10

gradle/mavenCentralDeploy.gradle

@@ -1,3 +1,4 @@
+
 // ------------- Maven Central deployment ---------------
 
 task docJar(type: Jar, dependsOn: javadoc) {
@@ -21,10 +22,12 @@ signing {
 }
 
 uploadArchives {
-    if (!hasProperty('sonatypeUsername') || !hasProperty('sonatypePassword'))
+    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)
         }
@@ -33,7 +36,6 @@ uploadArchives {
             authentication(userName: sonatypeUsername, password: sonatypePassword)
         }
 
-        //repository(url: "file:///Users/dean/temp/m2")
         pom.project {
             name         'JFXtras Labs'
             url          'http://jfxtras.org'

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Feb 14 15:59:36 MST 2012
+#Sun Jun 03 10:11:31 MDT 2012
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-milestone-8-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-rc-3-bin.zip

gradlew

@@ -107,7 +107,7 @@ fi
 
 # For Darwin, add options to specify how the application appears in the dock
 if $darwin; then
-    JAVA_OPTS="$JAVA_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
 # For Cygwin, switch paths to Windows format before running java

src/main/java/jfxtras/labs/scene/control/BigDecimalField.java

@@ -62,15 +62,15 @@ public BigDecimalField(BigDecimal initialValue, BigDecimal stepwidth, NumberForm
     }
 
     /**
-     * @return text representation of number
+     * @return The text representation of number
      */
     public String getText() {
         return getFormat().format(number.getValue());
     }
 
     /**
      * 
-     * @param text representation of number
+     * @param formattedNumber representation of number
      */
     public void setText(String formattedNumber) {
         try {
@@ -98,24 +98,21 @@ public void decrement() {
     final private ObjectProperty<BigDecimal> number;
 
     /**
-     * The BigDecimal number
-     * @return 
+     * @return The BigDecimal number
      */
     public BigDecimal getNumber() {
         return number.getValue();
     }
 
     /**
-     * The BigDecimal number
-     * @return 
+     * Set the BigDecimal number
      */
-    public  void setNumber(BigDecimal value) {
+    public void setNumber(BigDecimal value) {
         number.set(value);
     }
 
     /**
-     * The BigDecimal number
-     * @return 
+     * @return The property containing the BigDecimal number
      */
     public ObjectProperty<BigDecimal> numberProperty() {
         return number;

src/main/java/jfxtras/labs/scene/control/Spinner.java

@@ -76,8 +76,7 @@ public Spinner()
 	// model
 
 	/**
-	 * @param model
-	 * @param startValue
+	 * @param items The item list used to populate the spinner.
 	 */
 	public Spinner(ObservableList<T> items)
 	{
@@ -87,8 +86,8 @@ public Spinner(ObservableList<T> items)
 	}
 
 	/**
-	 * @param model
-	 * @param startValue
+	 * @param items The item list used to populate the spinner.
+	 * @param startValue The initial value of the spinner (one of the items).
 	 */
 	public Spinner(ObservableList<T> items, T startValue)
 	{
@@ -101,7 +100,6 @@ public Spinner(ObservableList<T> items, T startValue)
 	// convenience
 
 	/**
-	 * 
 	 * @param list
 	 */
 	public Spinner(java.util.List<T> list)
@@ -110,7 +108,6 @@ public Spinner(java.util.List<T> list)
 	}
 
 	/**
-	 * 
 	 * @param list
 	 */
 	public Spinner(T... list)
@@ -119,17 +116,18 @@ public Spinner(T... list)
 	}
 
 	/**
-	 * 
-	 * @param list
+	 * @param from
+	 * @param to
 	 */
 	public Spinner(int from, int to)
 	{
 		this( (java.util.List<T>) new SpinnerIntegerList(from, to) );
 	}
 
 	/**
-	 * 
-	 * @param list
+	 * @param from
+	 * @param to
+	 * @param step
 	 */
 	public Spinner(int from, int to, int step)
 	{
@@ -531,7 +529,7 @@ public void last()
 	 * Does a o1.equals(o2) but also checks if o1 or o2 are null.
 	 * @param o1
 	 * @param o2
-	 * @return
+	 * @return True if the two values are equal, false otherwise.
 	 */
 	static public boolean equals(Object o1, Object o2)
 	{

src/main/java/jfxtras/labs/util/NodeUtil.java

@@ -7,7 +7,7 @@ public class NodeUtil
 	/**
 	 * 
 	 * @param node
-	 * @return
+	 * @return The X screen coordinate of the node.
 	 */
 	static public double screenX(Node node)
 	{
@@ -17,7 +17,7 @@ static public double screenX(Node node)
 	/**
 	 * 
 	 * @param node
-	 * @return
+	 * @return The Y screen coordinate of the node.
 	 */
 	static public double screenY(Node node)
 	{

src/main/java/jfxtras/labs/util/StringConverterFactory.java

@@ -38,7 +38,7 @@ public class StringConverterFactory
 {
 	/**
 	 * 
-	 * @return
+	 * @return A default string converter that does no extra processing on the strings it is given.
 	 */
 	static public StringConverter<String> forString()
 	{