#42 Tweak the 'demo without .css file'.

Naoghuman · Mar 7, 2019 · b8701a2 · b8701a2
1 parent 7fb86bf
commit b8701a2
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 198 deletions.
diff --git a/src/test/java/com/github/naoghuman/lib/fxml/core/DemoWithAllFiles.java b/src/test/java/com/github/naoghuman/lib/fxml/core/DemoWithAllFiles.java
@@ -35,7 +35,7 @@ public static void main(String[] args) {
 
     @Override
     public void start(Stage primaryStage) throws Exception {
-        primaryStage.setTitle("Lib-FXML Demo with all files");
+        primaryStage.setTitle("Lib-FXML Demo with all files!");
 
         final FXMLModel model = new FXMLModel();
         model.put("my.int",    12345);

diff --git a/src/test/java/com/github/naoghuman/lib/fxml/core/DemoWithAllFilesController.java b/src/test/java/com/github/naoghuman/lib/fxml/core/DemoWithAllFilesController.java
@@ -103,7 +103,7 @@ public void onActionShowFXMLViewInfos(final String fxmlViewInfos) {
     @Override
     public String toString() {
         final StringBuilder sb = new StringBuilder();
-        sb.append("DemoWithAllFilesController [\n"); // NOI18N
+        sb.append(this.getClass().getSimpleName()).append(" [\n"); // NOI18N
 
         sb.append("  urlLocation       = ").append(location       ).append(",\n"); // NOI18N
         sb.append("  resourceBundle    = ").append(resources      ).append(",\n"); // NOI18N

diff --git a/src/test/java/com/github/naoghuman/lib/fxml/core/DemoWithoutCSSFile.java b/src/test/java/com/github/naoghuman/lib/fxml/core/DemoWithoutCSSFile.java
diff --git a/src/test/java/com/github/naoghuman/lib/fxml/core/DemoWithoutCSSFileController.java b/src/test/java/com/github/naoghuman/lib/fxml/core/DemoWithoutCSSFileController.java
diff --git a/src/test/resources/com/github/naoghuman/lib/fxml/core/demowithallfiles.fxml b/src/test/resources/com/github/naoghuman/lib/fxml/core/demowithallfiles.fxml
@@ -9,7 +9,7 @@
    <children>
       <VBox layoutX="14.0" layoutY="14.0" AnchorPane.bottomAnchor="14.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="14.0">
          <children>
-            <TextArea fx:id="taDemoInfos" wrapText="true" VBox.vgrow="ALWAYS">
+            <TextArea fx:id="taDemoInfos" editable="false" wrapText="true" VBox.vgrow="ALWAYS">
                <font>
                   <Font name="Monospaced Regular" size="12.0" />
                </font></TextArea>

diff --git a/src/test/resources/com/github/naoghuman/lib/fxml/core/demowithoutcssfile.fxml b/src/test/resources/com/github/naoghuman/lib/fxml/core/demowithoutcssfile.fxml
@@ -1,86 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextArea?>
 <?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
 <AnchorPane id="AnchorPane" prefHeight="400.0" prefWidth="600.0" style="-fx-background-color: LIGHTGREEN;" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1">
    <children>
       <VBox layoutX="14.0" layoutY="14.0" AnchorPane.bottomAnchor="14.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="14.0">
          <children>
-            <Label text="ResourceBundle">
+            <TextArea fx:id="taDemoInfos" editable="false" wrapText="true" VBox.vgrow="ALWAYS">
                <font>
-                  <Font size="14.0" />
-               </font>
-            </Label>
-            <HBox>
-               <children>
-                  <GridPane maxWidth="1.7976931348623157E308" prefHeight="50.0" HBox.hgrow="ALWAYS">
-                    <columnConstraints>
-                      <ColumnConstraints hgrow="NEVER" maxWidth="128.0" minWidth="128.0" prefWidth="128.0" />
-                      <ColumnConstraints hgrow="NEVER" maxWidth="7.0" minWidth="7.0" prefWidth="7.0" />
-                      <ColumnConstraints hgrow="ALWAYS" maxWidth="1.7976931348623157E308" minWidth="10.0" prefWidth="445.0" />
-                    </columnConstraints>
-                    <rowConstraints>
-                      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="NEVER" />
-                      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="NEVER" />
-                      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="NEVER" />
-                    </rowConstraints>
-                     <children>
-                        <Label text=" - URL Location" />
-                        <Label text=" - ResourceBundle" GridPane.rowIndex="1" />
-                        <Label text=" - key.hello.libfxml" GridPane.rowIndex="2" />
-                        <Label text=":" GridPane.columnIndex="1" />
-                        <Label text=":" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                        <Label text=":" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-                        <Label fx:id="lLocation" text="&lt;text&gt;" GridPane.columnIndex="2" />
-                        <Label fx:id="lResourceBundle" text="&lt;text&gt;" GridPane.columnIndex="2" GridPane.rowIndex="1" />
-                        <Label fx:id="lHelloLibFXML" text="&lt;text&gt;" GridPane.columnIndex="2" GridPane.rowIndex="2" />
-                     </children>
-                  </GridPane>
-               </children>
-            </HBox>
-            <Label text="FXMLModel">
-               <font>
-                  <Font size="14.0" />
-               </font>
-               <padding>
-                  <Insets top="14.0" />
-               </padding>
-            </Label>
-            <HBox>
-               <children>
-                  <GridPane maxWidth="1.7976931348623157E308" prefHeight="50.0" HBox.hgrow="ALWAYS">
-                     <columnConstraints>
-                        <ColumnConstraints hgrow="NEVER" maxWidth="128.0" minWidth="128.0" prefWidth="128.0" />
-                        <ColumnConstraints hgrow="NEVER" maxWidth="7.0" minWidth="7.0" prefWidth="7.0" />
-                        <ColumnConstraints hgrow="ALWAYS" maxWidth="1.7976931348623157E308" minWidth="10.0" prefWidth="445.0" />
-                     </columnConstraints>
-                     <rowConstraints>
-                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="NEVER" />
-                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="NEVER" />
-                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="NEVER" />
-                     </rowConstraints>
-                     <children>
-                        <Label text=" - my.int" />
-                        <Label text=" - my.double" GridPane.rowIndex="1" />
-                        <Label text=" - my.string" GridPane.rowIndex="2" />
-                        <Label text=":" GridPane.columnIndex="1" />
-                        <Label text=":" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                        <Label text=":" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-                        <Label fx:id="lMyInt" text="&lt;text&gt;" GridPane.columnIndex="2" />
-                        <Label fx:id="lMyDouble" text="&lt;text&gt;" GridPane.columnIndex="2" GridPane.rowIndex="1" />
-                        <Label fx:id="lMyString" text="&lt;text&gt;" GridPane.columnIndex="2" GridPane.rowIndex="2" />
-                     </children>
-                  </GridPane>
-               </children>
-            </HBox>
+                  <Font name="Monospaced Regular" size="12.0" />
+               </font></TextArea>
          </children>
       </VBox>
    </children>

diff --git a/src/test/resources/com/github/naoghuman/lib/fxml/core/demowithoutcssfile.properties b/src/test/resources/com/github/naoghuman/lib/fxml/core/demowithoutcssfile.properties
@@ -13,4 +13,4 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-key.hello.libfxml=Hello Lib-FXML from .properties in demo without CSS!
+key.hello.libfxml=Hello Lib-FXML from .properties in demo without .css file!