Skip to content

Commit 1f831e8

Browse files
roskenetroskenet
committed
Update version add part_6_2
1 parent dfb547a commit 1f831e8

File tree

15 files changed

+129
-7
lines changed

15 files changed

+129
-7
lines changed

‎part_1/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<properties>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<java.version>1.8</java.version>
18-
<springboot-javafx.version>1.3.3</springboot-javafx.version>
18+
<springboot-javafx.version>1.3.6</springboot-javafx.version>
1919
</properties>
2020

2121
<dependencies>
@@ -38,4 +38,4 @@
3838
</plugin>
3939
</plugins>
4040
</build>
41-
</project>
41+
</project>

‎part_2/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<properties>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<java.version>1.8</java.version>
18-
<springboot-javafx.version>1.3.3</springboot-javafx.version>
18+
<springboot-javafx.version>1.3.6</springboot-javafx.version>
1919
</properties>
2020

2121
<dependencies>

‎part_3/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<properties>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<java.version>1.8</java.version>
18-
<springboot-javafx.version>1.3.3</springboot-javafx.version>
18+
<springboot-javafx.version>1.3.6</springboot-javafx.version>
1919
</properties>
2020

2121
<dependencies>

‎part_4/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<properties>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<java.version>1.8</java.version>
18-
<springboot-javafx.version>1.3.3</springboot-javafx.version>
18+
<springboot-javafx.version>1.3.6</springboot-javafx.version>
1919
</properties>
2020

2121
<dependencies>

‎part_5/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<properties>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<java.version>1.8</java.version>
18-
<springboot-javafx.version>1.3.3</springboot-javafx.version>
18+
<springboot-javafx.version>1.3.6</springboot-javafx.version>
1919
<springboot-javafx-test.version>0.0.4</springboot-javafx-test.version>
2020
</properties>
2121

‎part_6_1/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<properties>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<java.version>1.8</java.version>
18-
<springboot-javafx.version>1.3.3</springboot-javafx.version>
18+
<springboot-javafx.version>1.3.6</springboot-javafx.version>
1919
</properties>
2020

2121
<dependencies>

‎part_6_2/pom.xml

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>de.roskenet.spring-fx-examples</groupId>
5+
<artifactId>part-6-2</artifactId>
6+
<version>0.0.1-SNAPSHOT</version>
7+
8+
<parent>
9+
<groupId>org.springframework.boot</groupId>
10+
<artifactId>spring-boot-starter-parent</artifactId>
11+
<version>1.5.2.RELEASE</version>
12+
<relativePath /> <!-- lookup parent from repository -->
13+
</parent>
14+
15+
<properties>
16+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
17+
<java.version>1.8</java.version>
18+
<springboot-javafx.version>1.3.6</springboot-javafx.version>
19+
</properties>
20+
21+
<dependencies>
22+
<dependency>
23+
<groupId>org.springframework.boot</groupId>
24+
<artifactId>spring-boot-starter</artifactId>
25+
</dependency>
26+
<dependency>
27+
<groupId>de.roskenet</groupId>
28+
<artifactId>springboot-javafx-support</artifactId>
29+
<version>${springboot-javafx.version}</version>
30+
</dependency>
31+
</dependencies>
32+
33+
<build>
34+
<plugins>
35+
<plugin>
36+
<groupId>org.springframework.boot</groupId>
37+
<artifactId>spring-boot-maven-plugin</artifactId>
38+
</plugin>
39+
</plugins>
40+
</build>
41+
</project>

‎part_6_2/src/main/java/example/FirstView.java

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package example;
2+
3+
import de.felixroske.jfxsupport.AbstractFxmlView;
4+
import de.felixroske.jfxsupport.FXMLView;
5+
6+
@FXMLView
7+
public class FirstView extends AbstractFxmlView {
8+
9+
}

‎part_6_2/src/main/java/example/Main.java

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package example;
2+
3+
import org.springframework.boot.autoconfigure.SpringBootApplication;
4+
5+
import de.felixroske.jfxsupport.AbstractJavaFxApplicationSupport;
6+
7+
@SpringBootApplication
8+
public class Main extends AbstractJavaFxApplicationSupport{
9+
10+
public static void main(String[] args) {
11+
launchApp(Main.class, FirstView.class, args);
12+
}
13+
}

‎part_6_2/src/main/java/example/SecondView.java

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package example;
2+
3+
import de.felixroske.jfxsupport.AbstractFxmlView;
4+
import de.felixroske.jfxsupport.FXMLView;
5+
6+
@FXMLView
7+
public class SecondView extends AbstractFxmlView{
8+
9+
}

‎part_6_2/src/main/java/example/ViewController.java

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package example;
2+
3+
import org.springframework.beans.factory.annotation.Autowired;
4+
5+
import de.felixroske.jfxsupport.FXMLController;
6+
import javafx.event.Event;
7+
8+
@FXMLController
9+
public class ViewController {
10+
11+
@Autowired
12+
private Main main;
13+
14+
public void showFirstView(Event event) {
15+
main.showView(FirstView.class);
16+
}
17+
18+
public void showSecondView(Event event) {
19+
main.showView(SecondView.class);
20+
}
21+
}

‎part_6_2/src/main/resources/application.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
spring:
2+
jmx:
3+
enabled: false

‎part_6_2/src/main/resources/example/first.fxml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<?import javafx.scene.control.Button?>
4+
<?import javafx.scene.control.Label?>
5+
<?import javafx.scene.layout.Pane?>
6+
7+
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1" fx:controller="example.ViewController">
8+
<children>
9+
<Label layoutX="36.0" layoutY="54.0" prefHeight="38.0" prefWidth="225.0" text="FirstView" />
10+
<Button id="secondView" layoutX="475.0" layoutY="335.0" mnemonicParsing="false" onAction="#showSecondView" text="Second View" />
11+
</children>
12+
</Pane>

‎part_6_2/src/main/resources/example/second.fxml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<?import javafx.scene.control.Button?>
4+
<?import javafx.scene.control.Label?>
5+
<?import javafx.scene.layout.Pane?>
6+
7+
8+
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1" fx:controller="example.ViewController">
9+
<children>
10+
<Label layoutX="36.0" layoutY="54.0" prefHeight="38.0" prefWidth="225.0" text="SecondView" />
11+
<Button id="firstView" layoutX="475.0" layoutY="335.0" mnemonicParsing="false" onAction="#showFirstView" text="First View" />
12+
</children>
13+
</Pane>

‎pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@
1717
<module>part_4</module>
1818
<module>part_5</module>
1919
<module>part_6_1</module>
20+
<module>part_6_2</module>
2021
</modules>
2122
</project>

0 commit comments

Comments
 (0)