Changes to FXMLView logging and autoloading of javafx binary css files

pom.xml

@@ -164,6 +164,7 @@
                 <directory>src/test/java</directory>
                 <includes>
                     <include>**/*.fxml</include>
+                    <include>**/*.bss</include>
                     <include>**/*.css</include>
                     <include>**/*.properties</include>
                 </includes>

src/main/java/com/airhacks/afterburner/views/FXMLView.java

@@ -35,6 +35,8 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 import javafx.application.Platform;
@@ -53,7 +55,12 @@
  */
 public abstract class FXMLView extends StackPane {
 
-    public final static String DEFAULT_ENDING = "View";
+    private static final Logger LOGGER = Logger.getLogger(FXMLView.class.getName());
+
+    public static final String DEFAULT_ENDING = "View";
+    public static final String CSS_FILE_ENDING = ".css";
+    public static final String BSS_FILE_ENDING = ".bss";
+
     protected ObjectProperty<Object> presenterProperty;
     protected FXMLLoader fxmlLoader;
     protected String bundleName;
@@ -114,10 +121,9 @@ PresenterFactory discover() {
         if (factories.size() == 1) {
             return factories.get(0);
         } else {
-            factories.forEach(System.err::println);
+            factories.forEach(s->LOGGER.severe(s.toString()));
             throw new IllegalStateException("More than one PresenterFactories discovered");
         }
-
     }
 
     void initializeFXMLLoader() {
@@ -165,7 +171,6 @@ public void getViewAsync(Consumer<Parent> consumer) {
         CompletableFuture.supplyAsync(supplier, PARENT_CREATION_POOL).
                 thenAcceptAsync(consumer, FX_PLATFORM_EXECUTOR).
                 exceptionally(this::exceptionReporter);
-
     }
 
     /**
@@ -184,16 +189,29 @@ public Node getViewWithoutRootContainer() {
     }
 
     void addCSSIfAvailable(Parent parent) {
-        URL uri = getClass().getResource(getStyleSheetName());
+        URL uri = getClass().getResource(getBinaryStyleSheetName());
+        if (uri == null) {
+            uri = getClass().getResource(getStyleSheetName());
+        }
         if (uri == null) {
             return;
         }
         String uriToCss = uri.toExternalForm();
-        parent.getStylesheets().add(uriToCss);
+        if (!parent.getStylesheets().contains(uriToCss)){
+            parent.getStylesheets().add(uriToCss);
+        }
     }
 
     String getStyleSheetName() {
-        return getResourceCamelOrLowerCase(false, ".css");
+        return getResourceCamelOrLowerCase(false, CSS_FILE_ENDING);
+    }
+
+    /**
+     * .bss files are binary encoded css files which javafx produces.
+     * @return the conventional name of the bss file expected.
+     */
+    String getBinaryStyleSheetName() {
+        return getResourceCamelOrLowerCase(false, BSS_FILE_ENDING);
     }
 
     /**
@@ -211,13 +229,13 @@ String getResourceCamelOrLowerCase(boolean mandatory, String ending) {
         if (found != null) {
             return name;
         }
-        System.err.println("File: " + name + " not found, attempting with camel case");
+        LOGGER.config("File: " + name + " not found, attempting with camel case");
         name = getConventionalName(false, ending);
         found = getClass().getResource(name);
         if (mandatory && found == null) {
             final String message = "Cannot load file " + name;
-            System.err.println(message);
-            System.err.println("Stopping initialization phase...");
+            LOGGER.severe(message);
+            LOGGER.severe("Stopping initialization phase...");
             throw new IllegalStateException(message);
         }
         return name;
@@ -320,7 +338,7 @@ static ExecutorService getExecutorService() {
      * @return nothing
      */
     public Void exceptionReporter(Throwable t) {
-        System.err.println(t);
+        LOGGER.log(Level.SEVERE,"Exception thrown in afterburner.fx",t);
         return null;
     }
 

src/test/java/com/airhacks/afterburner/views/CSSLoadTest.java

@@ -0,0 +1,34 @@
+package com.airhacks.afterburner.views;
+
+import com.airhacks.afterburner.topgun.TopgunView;
+import com.airhacks.afterburner.views.binary.BinaryView;
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Tests to check that css files are loaded as required.
+ * @author Ben Oxley
+ */
+public class CSSLoadTest {
+
+    @Test
+    public void cssIsLoadedTest(){
+        TopgunView view = new TopgunView();
+        assertTrue(view.getView().getStylesheets().stream()
+                .anyMatch(s->s.contains("topgun.css"))
+        );
+    }
+
+    @Test
+    public void bssIsLoadedTest(){
+        BinaryView view = new BinaryView();
+        System.out.println(view.getView().getStylesheets());
+        assertTrue(view.getView().getStylesheets().stream()
+                .anyMatch(s->s.contains("binary.bss"))
+        );
+        assertTrue(view.getView().getStylesheets().stream()
+                .noneMatch(s->s.contains("binary.css"))
+        );
+    }
+}

src/test/java/com/airhacks/afterburner/views/binary/BinaryPresenter.java

@@ -0,0 +1,7 @@
+package com.airhacks.afterburner.views.binary;
+
+/**
+ * @author Ben Oxley
+ */
+public class BinaryPresenter {
+}

src/test/java/com/airhacks/afterburner/views/binary/BinaryView.java

@@ -0,0 +1,10 @@
+package com.airhacks.afterburner.views.binary;
+
+import com.airhacks.afterburner.views.FXMLView;
+
+/**
+ * @author Ben Oxley
+ */
+public class BinaryView extends FXMLView {
+
+}

src/test/java/com/airhacks/afterburner/views/binary/binary.css

@@ -0,0 +1,26 @@
+/*
+ * #%L
+ * afterburner.fx
+ * %%
+ * Copyright (C) 2013 Adam Bien
+ * %%
+ * 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.
+ * #L%
+ */
+/*
+ * Empty Stylesheet file.
+ */
+
+.mainFxmlClass {
+
+}

src/test/java/com/airhacks/afterburner/views/binary/binary.fxml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import javafx.scene.layout.*?>
+
+<AnchorPane id="AnchorPane" prefHeight="400.0" prefWidth="600.0" styleClass="mainFxmlClass" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8" fx:controller="com.airhacks.afterburner.views.binary.BinaryPresenter">
+<children><Pane prefHeight="200.0" prefWidth="200.0" />
+</children></AnchorPane>