move 'jfoenix' files to /jfoenix/src/main

subprojects/jfoenix/jfoenix.gradle → jfoenix/build.gradle

@@ -31,9 +31,6 @@ task sourcesJar(type: Jar) {
     from sourceSets.main.allSource
 }
 
-sourceSets.main.java.srcDirs = [rootProject.file('src')]
-sourceSets.main.resources.srcDirs = [rootProject.file('src')]
-
 task retroSourcesJar(type: Jar){
 	String str = sourceSets.main.output.classesDir;
 	sourceSets.main.output.classesDir = "$buildDir/retrolambda/main"	
@@ -96,3 +93,4 @@ jar {
     }
 }
 
+

src/com/jfoenix/animation/JFXNodesAnimation.java → jfoenix/src/main/java/com/jfoenix/animation/JFXNodesAnimation.java

@@ -1,55 +1,55 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.jfoenix.animation;
-
-import javafx.animation.Animation;
-import javafx.scene.Node;
-
-public abstract class JFXNodesAnimation<S extends Node,T extends Node> {
-
-	protected S fromNode;
-	protected T toNode;
-
-	public JFXNodesAnimation(S fromNode, T toNode) {
-		this.fromNode = fromNode;
-		this.toNode = toNode;
-	}
-
-	public void animate(){
-		init();
-		Animation exitAnimation = animateExit();
-		Animation sharedAnimation = animateSharedNodes();
-		Animation enteranceAnimation = animateEntrance();
-		exitAnimation.setOnFinished((finish)-> sharedAnimation.play());
-		sharedAnimation.setOnFinished((finish)->enteranceAnimation.play());
-		enteranceAnimation.setOnFinished((finish)->end());
-		exitAnimation.play();
-	}
-
-	public abstract Animation animateExit();
-
-	public abstract Animation animateSharedNodes();
-
-	public abstract Animation animateEntrance();
-
-	public abstract void init();
-
-	public abstract void end();
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.jfoenix.animation;
+
+import javafx.animation.Animation;
+import javafx.scene.Node;
+
+public abstract class JFXNodesAnimation<S extends Node,T extends Node> {
+
+	protected S fromNode;
+	protected T toNode;
+
+	public JFXNodesAnimation(S fromNode, T toNode) {
+		this.fromNode = fromNode;
+		this.toNode = toNode;
+	}
+
+	public void animate(){
+		init();
+		Animation exitAnimation = animateExit();
+		Animation sharedAnimation = animateSharedNodes();
+		Animation enteranceAnimation = animateEntrance();
+		exitAnimation.setOnFinished((finish)-> sharedAnimation.play());
+		sharedAnimation.setOnFinished((finish)->enteranceAnimation.play());
+		enteranceAnimation.setOnFinished((finish)->end());
+		exitAnimation.play();
+	}
+
+	public abstract Animation animateExit();
+
+	public abstract Animation animateSharedNodes();
+
+	public abstract Animation animateEntrance();
+
+	public abstract void init();
+
+	public abstract void end();
+
+}

src/com/jfoenix/concurrency/JFXUtilities.java → jfoenix/src/main/java/com/jfoenix/concurrency/JFXUtilities.java

@@ -1,80 +1,80 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.jfoenix.concurrency;
-
-import javafx.application.Platform;
-
-import java.util.concurrent.CountDownLatch;
-
-
-/**
- * <h1>JavaFX FX Thread utilities</h1>
- * JFXUtilities allow sync mechanism to the FX thread
- * <p>
- * @author  pmoufarrej
- * @version 1.0
- * @since   2016-03-09
- */
-
-public class JFXUtilities {
-
-	/**
-	 * This method is used to run a specified Runnable in the FX Application thread,
-	 * it returns before the task finished execution
-	 * 
-	 * @param doRun This is the sepcifed task to be excuted by the FX Application thread
-	 * @return Nothing
-	 */
-	public static void runInFX(Runnable doRun) {
-		if (Platform.isFxApplicationThread()) {
-			doRun.run();
-			return;
-		}
-		Platform.runLater(doRun);
-	}
-
-	/**
-	 * This method is used to run a specified Runnable in the FX Application thread,
-	 * it waits for the task to finish before returning to the main thread.
-	 * 
-	 * @param doRun This is the sepcifed task to be excuted by the FX Application thread
-	 * @return Nothing
-	 */
-	public static void runInFXAndWait(Runnable doRun) {
-		if (Platform.isFxApplicationThread()) {
-			doRun.run();
-			return;
-		}
-		final CountDownLatch doneLatch = new CountDownLatch(1);
-		Platform.runLater(() -> {
-			try {
-				doRun.run();
-			}
-			finally {
-				doneLatch.countDown();
-			}
-		});
-		try {
-			doneLatch.await();
-		}
-		catch (InterruptedException e) {
-			Thread.currentThread().interrupt();
-		}
-	}
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.jfoenix.concurrency;
+
+import javafx.application.Platform;
+
+import java.util.concurrent.CountDownLatch;
+
+
+/**
+ * <h1>JavaFX FX Thread utilities</h1>
+ * JFXUtilities allow sync mechanism to the FX thread
+ * <p>
+ * @author  pmoufarrej
+ * @version 1.0
+ * @since   2016-03-09
+ */
+
+public class JFXUtilities {
+
+	/**
+	 * This method is used to run a specified Runnable in the FX Application thread,
+	 * it returns before the task finished execution
+	 * 
+	 * @param doRun This is the sepcifed task to be excuted by the FX Application thread
+	 * @return Nothing
+	 */
+	public static void runInFX(Runnable doRun) {
+		if (Platform.isFxApplicationThread()) {
+			doRun.run();
+			return;
+		}
+		Platform.runLater(doRun);
+	}
+
+	/**
+	 * This method is used to run a specified Runnable in the FX Application thread,
+	 * it waits for the task to finish before returning to the main thread.
+	 * 
+	 * @param doRun This is the sepcifed task to be excuted by the FX Application thread
+	 * @return Nothing
+	 */
+	public static void runInFXAndWait(Runnable doRun) {
+		if (Platform.isFxApplicationThread()) {
+			doRun.run();
+			return;
+		}
+		final CountDownLatch doneLatch = new CountDownLatch(1);
+		Platform.runLater(() -> {
+			try {
+				doRun.run();
+			}
+			finally {
+				doneLatch.countDown();
+			}
+		});
+		try {
+			doneLatch.await();
+		}
+		catch (InterruptedException e) {
+			Thread.currentThread().interrupt();
+		}
+	}
+}