Add annotations

Author: roskenet

.gitignore

@@ -1,16 +1,5 @@
-/target
+/target/
 .classpath
 .project
-.settings/
+/.settings/
 .springBeans
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.ear
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*

.mvn/wrapper/maven-wrapper.jar

@@ -24,20 +24,21 @@
 import javafx.scene.layout.AnchorPane;
 
 /**
- * This class is derived from Adam Bien's <a href="http://afterburner.adam-bien.com/">afterburner.fx</a> project.
+ * This class is derived from Adam Bien's
+ * <a href="http://afterburner.adam-bien.com/">afterburner.fx</a> project.
  * <p>
  * {@link AbstractFxmlView} is a stripped down version of <a href=
  * "https://github.com/AdamBien/afterburner.fx/blob/02f25fdde9629fcce50ea8ace5dec4f802958c8d/src/main/java/com/airhacks/afterburner/views/FXMLView.java"
  * >FXMLView</a> that provides DI for Java FX Controllers via Spring.
  * 
- * Felix Roske <[email protected]> changed this, so it always expects fxml Files by default in FXML_PATH.
+ * Felix Roske <[email protected]> changed this to use annotation for fxml path.
  * 
  * @author Thomas Darimont
  */
 public abstract class AbstractFxmlView implements ApplicationContextAware {
 
 	private static String FXML_PATH = "/fxml/";
-	
+
 	protected ObjectProperty<Object> presenterProperty;
 	protected FXMLLoader fxmlLoader;
 	protected ResourceBundle bundle;
@@ -56,31 +57,45 @@ public void setApplicationContext(ApplicationContext applicationContext) throws
 
 		this.applicationContext = applicationContext;
 	}
-	
+
 	public AbstractFxmlView() {
 		this(FXML_PATH);
 	}
-	
+
 	public AbstractFxmlView(String path) {
 		setFxmlRootPath(path);
+
+		// TODO refactor me!
+		FXMLView annotation = getFXMLAnnotation();
+		if (annotation != null && !annotation.value().equals("")) {
+			this.resource = getClass().getResource(annotation.value());
+		} else {
+			this.resource = getClass().getResource(getFxmlPath());
+		}
+
 		this.presenterProperty = new SimpleObjectProperty<>();
-		this.resource = getClass().getResource(getFxmlPath());
+		// this.resource = getClass().getResource(getFxmlPath());
 		this.bundle = getResourceBundle(getBundleName());
 	}
 
+	private FXMLView getFXMLAnnotation() {
+		Class<? extends AbstractFxmlView> theClass = this.getClass();
+		FXMLView annotation = theClass.getAnnotation(FXMLView.class);
+		return annotation;
+	}
+
 	private Object createControllerForType(Class<?> type) {
 		return this.applicationContext.getBean(type);
 	}
 
 	private void setFxmlRootPath(String path) {
-		if(path.endsWith("/")) {
+		if (path.endsWith("/")) {
 			this.fxmlRoot = path;
-		}
-		else {
+		} else {
 			this.fxmlRoot = path + "/";
 		}
 	}
-	
+
 	FXMLLoader loadSynchronously(URL resource, ResourceBundle bundle) throws IllegalStateException {
 
 		FXMLLoader loader = new FXMLLoader(resource, bundle);
@@ -106,8 +121,8 @@ void ensureFxmlLoaderInitialized() {
 	}
 
 	/**
-	 * Initializes the view by loading the FXML (if not happened yet) and returns the top Node (parent) specified in the
-	 * FXML file.
+	 * Initializes the view by loading the FXML (if not happened yet) and
+	 * returns the top Node (parent) specified in the FXML file.
 	 *
 	 * @return
 	 */
@@ -121,17 +136,21 @@ public Parent getView() {
 	}
 
 	/**
-	 * Initializes the view synchronously and invokes the consumer with the created parent Node within the FX UI thread.
+	 * Initializes the view synchronously and invokes the consumer with the
+	 * created parent Node within the FX UI thread.
 	 *
-	 * @param consumer - an object interested in received the {@link Parent} as callback
+	 * @param consumer
+	 *            - an object interested in received the {@link Parent} as
+	 *            callback
 	 */
 	public void getView(Consumer<Parent> consumer) {
 		CompletableFuture.supplyAsync(this::getView, Platform::runLater).thenAccept(consumer);
 	}
 
 	/**
-	 * Scene Builder creates for each FXML document a root container. This method omits the root container (e.g.
-	 * {@link AnchorPane}) and gives you the access to its first child.
+	 * Scene Builder creates for each FXML document a root container. This
+	 * method omits the root container (e.g. {@link AnchorPane}) and gives you
+	 * the access to its first child.
 	 *
 	 * @return the first child of the {@link AnchorPane}
 	 */
@@ -146,7 +165,18 @@ public Node getViewWithoutRootContainer() {
 	}
 
 	void addCSSIfAvailable(Parent parent) {
-
+		
+		// TODO refactor me!
+		FXMLView annotation = getFXMLAnnotation();
+		if(annotation != null && annotation.css().length > 0) {
+			for (String cssFile : annotation.css()) {
+				URL uri = getClass().getResource(cssFile);
+				String uriToCss = uri.toExternalForm();
+				parent.getStylesheets().add(uriToCss);
+			}
+			return;
+		}
+		
 		URL uri = getClass().getResource(getStyleSheetName());
 		if (uri == null) {
 			return;
@@ -161,10 +191,13 @@ String getStyleSheetName() {
 	}
 
 	/**
-	 * In case the view was not initialized yet, the conventional fxml (airhacks.fxml for the AirhacksView and
-	 * AirhacksPresenter) are loaded and the specified presenter / controller is going to be constructed and returned.
+	 * In case the view was not initialized yet, the conventional fxml
+	 * (airhacks.fxml for the AirhacksView and AirhacksPresenter) are loaded and
+	 * the specified presenter / controller is going to be constructed and
+	 * returned.
 	 *
-	 * @return the corresponding controller / presenter (usually for a AirhacksView the AirhacksPresenter)
+	 * @return the corresponding controller / presenter (usually for a
+	 *         AirhacksView the AirhacksPresenter)
 	 */
 	public Object getPresenter() {
 
@@ -174,10 +207,12 @@ public Object getPresenter() {
 	}
 
 	/**
-	 * Does not initialize the view. Only registers the Consumer and waits until the the view is going to be created / the
-	 * method FXMLView#getView or FXMLView#getViewAsync invoked.
+	 * Does not initialize the view. Only registers the Consumer and waits until
+	 * the the view is going to be created / the method FXMLView#getView or
+	 * FXMLView#getViewAsync invoked.
 	 *
-	 * @param presenterConsumer listener for the presenter construction
+	 * @param presenterConsumer
+	 *            listener for the presenter construction
 	 */
 	public void getPresenter(Consumer<Object> presenterConsumer) {
 
@@ -187,16 +222,17 @@ public void getPresenter(Consumer<Object> presenterConsumer) {
 	}
 
 	/**
-	 * @param ending the suffix to append
+	 * @param ending
+	 *            the suffix to append
 	 * @return the conventional name with stripped ending
 	 */
 	protected String getConventionalName(String ending) {
 		return getConventionalName() + ending;
 	}
 
 	/**
-	 * @return the name of the view without the "View" prefix in lowerCase. For AirhacksView just airhacks is going to be
-	 *         returned.
+	 * @return the name of the view without the "View" prefix in lowerCase. For
+	 *         AirhacksView just airhacks is going to be returned.
 	 */
 	protected String getConventionalName() {
 		return stripEnding(getClass().getSimpleName().toLowerCase());
@@ -216,14 +252,15 @@ static String stripEnding(String clazz) {
 	}
 
 	/**
-	 * @return the relative path to the fxml file derived from the FXML view. e.g. The name for the AirhacksView is going to be
+	 * @return the relative path to the fxml file derived from the FXML view.
+	 *         e.g. The name for the AirhacksView is going to be
 	 *         <PATH>/airhacks.fxml.
 	 */
 
 	final String getFxmlPath() {
 		return fxmlRoot + getConventionalName(".fxml");
 	}
-	
+
 	private ResourceBundle getResourceBundle(String name) {
 		try {
 			return getBundle(name);
@@ -239,4 +276,3 @@ public ResourceBundle getResourceBundle() {
 		return this.bundle;
 	}
 }
-

src/main/java/de/felixroske/jfx/support/AbstractFxmlView.java

@@ -4,7 +4,6 @@
 import org.springframework.context.ConfigurableApplicationContext;
 
 import javafx.application.Application;
-import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 
@@ -47,8 +46,8 @@ public void showView(Class<? extends AbstractFxmlView> newView) {
 
 		// stage.setTitle(windowTitle);
 		stage.setScene(scene);
-		stage.setResizable(true);
-		stage.centerOnScreen();
+//		stage.setResizable(true);
+//		stage.centerOnScreen();
 		stage.show();
 	}
 

src/main/java/de/felixroske/jfx/support/AbstractJavaFxApplicationSupport.java

@@ -0,0 +1,12 @@
+package de.felixroske.jfx.support;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import org.springframework.stereotype.Component;
+
+@Component
+@Retention(RetentionPolicy.RUNTIME)
+public @interface FXMLController {
+
+}

src/main/java/de/felixroske/jfx/support/FXMLController.java

@@ -0,0 +1,13 @@
+package de.felixroske.jfx.support;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import org.springframework.stereotype.Component;
+
+@Component
+@Retention(RetentionPolicy.RUNTIME)
+public @interface FXMLView {
+	String value() default "";
+	String[] css() default {}; 
+}