Support for new JavaFX: ToggleGroup and SceneBuilder: Radio button st…

…ate fix
jyrkioraskari · Feb 3, 2022 · 1a6ece8 · 1a6ece8
1 parent b4969cb
commit 1a6ece8
Show file tree

Hide file tree

Showing 11 changed files with 90 additions and 63 deletions.
diff --git a/IFCtoLBD/pom.xml b/IFCtoLBD/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.github.jyrkioraskari</groupId>
 	<artifactId>IFCtoLBD</artifactId>
-	<version>2.33.3</version>
+	<version>2.34.0</version>
 	<name>IFC to LBD Converter</name>
 	<licenses>
 		<license>
@@ -70,7 +70,7 @@
 		<dependency>
 			<groupId>de.rwth-aachen.dc.lbd</groupId>
 			<artifactId>IFCtoLBD_Geometry</artifactId>
-			<version>2.33.3</version>
+			<version>2.34.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>

diff --git a/IFCtoLBD/src/license/THIRD-PARTY.properties b/IFCtoLBD/src/license/THIRD-PARTY.properties
@@ -50,5 +50,5 @@
 # Please fill the missing licenses for dependencies :
 #
 #
-#Tue Feb 01 22:11:12 CET 2022
+#Thu Feb 03 18:55:36 CET 2022
 gnu.getopt--java-getopt--1.0.13=
diff --git a/IFCtoLBD_Desktop/pom.xml b/IFCtoLBD_Desktop/pom.xml
@@ -6,13 +6,11 @@
 	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. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.github.jyrkioraskari</groupId>
 	<artifactId>IFCtoLBD_Desktop</artifactId>
-	<version>2.33.3</version>
+	<version>2.34.0</version>
 	<name>IFCtoLBD Desktop Java 15 and newer</name>
 	<description>The IFC to BOT converter user interface for a desktop computer</description>
 	<developers>
@@ -34,11 +32,10 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 	<dependencies>
-		<!-- https://mvnrepository.com/artifact/org.controlsfx/controlsfx -->
 		<dependency>
 			<groupId>org.controlsfx</groupId>
 			<artifactId>controlsfx</artifactId>
-			<version>9.0.0</version>
+			<version>11.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.openjfx</groupId>
@@ -59,27 +56,27 @@
 		</dependency>
 
 		<dependency>
-            <groupId>org.openjfx</groupId>
-            <artifactId>javafx-graphics</artifactId>
-            <version>18-ea+2</version>
-            <classifier>win</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.openjfx</groupId>
-            <artifactId>javafx-graphics</artifactId>
-            <version>18-ea+2</version>
-            <classifier>linux</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.openjfx</groupId>
-            <artifactId>javafx-graphics</artifactId>
-            <version>18-ea+2</version>
-            <classifier>mac</classifier>
-        </dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-graphics</artifactId>
+			<version>18-ea+2</version>
+			<classifier>win</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-graphics</artifactId>
+			<version>18-ea+2</version>
+			<classifier>linux</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-graphics</artifactId>
+			<version>18-ea+2</version>
+			<classifier>mac</classifier>
+		</dependency>
 		<dependency>
 			<groupId>io.github.jyrkioraskari</groupId>
 			<artifactId>IFCtoLBD</artifactId>
-			<version>2.33.3</version>
+			<version>2.34.0</version>
 		</dependency>
 
 	</dependencies>
@@ -177,4 +174,4 @@
 			</plugins>
 		</pluginManagement>
 	</build>
-</project>
+</project>
diff --git a/IFCtoLBD_Desktop/src/license/THIRD-PARTY.properties b/IFCtoLBD_Desktop/src/license/THIRD-PARTY.properties
@@ -51,5 +51,5 @@
 # Please fill the missing licenses for dependencies :
 #
 #
-#Wed Dec 15 10:06:58 CET 2021
+#Thu Feb 03 18:57:07 CET 2022
 gnu.getopt--java-getopt--1.0.13=
diff --git a/IFCtoLBD_Desktop/src/main/java/org/linkedbuildingdata/ifc2lbd/IFCtoLBD.fxml b/IFCtoLBD_Desktop/src/main/java/org/linkedbuildingdata/ifc2lbd/IFCtoLBD.fxml
@@ -25,7 +25,7 @@
 <?import org.controlsfx.control.ToggleSwitch?>
 <?import org.controlsfx.control.textfield.CustomTextField?>
 
-<VBox prefHeight="728.0" prefWidth="929.0" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.linkedbuildingdata.ifc2lbd.IFCtoLBDController">
+<VBox prefHeight="728.0" prefWidth="929.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.linkedbuildingdata.ifc2lbd.IFCtoLBDController">
   <children>
     <MenuBar fx:id="myMenuBar" scaleShape="false" VBox.vgrow="NEVER">
       <menus>
@@ -173,24 +173,21 @@
                                                 </ToggleSwitch>
 
 
-												<RadioButton fx:id="level1" layoutX="42.0" layoutY="77.0" mnemonicParsing="false" selected="true" text="Level 1" textFill="#dd0a0a" AnchorPane.leftAnchor="20.0" AnchorPane.topAnchor="50.0">
-                                       <toggleGroup>
-                                          <ToggleGroup fx:id="level" />
-                                       </toggleGroup>
+												<RadioButton fx:id="level1" layoutX="42.0" layoutY="77.0" mnemonicParsing="false" onMouseClicked="#selectPropertyLevel1" selected="true" text="Level 1" textFill="#dd0a0a" AnchorPane.leftAnchor="20.0" AnchorPane.topAnchor="50.0">
                                        <font>
                                           <Font name="Arial" size="12.0" />
                                        </font>
+                                                   <toggleGroup>
+                                                      <ToggleGroup fx:id="PL" />
+                                                   </toggleGroup>
                                     </RadioButton>
 
-                                                <RadioButton fx:id="level2" layoutX="124.0" layoutY="74.0" mnemonicParsing="false" text="Level 2" textFill="#dd0a0a" AnchorPane.leftAnchor="105.0" AnchorPane.topAnchor="50.0">
+                                                <RadioButton fx:id="level2" layoutX="124.0" layoutY="74.0" mnemonicParsing="false" onMouseClicked="#selectPropertyLevel2" text="Level 2" textFill="#dd0a0a" toggleGroup="$PL" AnchorPane.leftAnchor="105.0" AnchorPane.topAnchor="50.0">
                                                    <font>
                                                       <Font name="Arial" size="12.0" />
                                                    </font>
-                                                   <toggleGroup>
-                                                      <ToggleGroup fx:id="level" />
-                                                   </toggleGroup>
                                                 </RadioButton>
-                                                <RadioButton fx:id="level3" layoutX="209.0" layoutY="82.0" mnemonicParsing="false" text="Level 3" textFill="#dd0a0a" toggleGroup="$level" AnchorPane.leftAnchor="200.0" AnchorPane.topAnchor="50.0">
+                                                <RadioButton fx:id="level3" layoutX="209.0" layoutY="82.0" mnemonicParsing="false" onMouseClicked="#selectPropertyLevel3" text="Level 3" textFill="#dd0a0a" toggleGroup="$PL" AnchorPane.leftAnchor="200.0" AnchorPane.topAnchor="50.0">
                                                    <font>
                                                       <Font name="Arial" size="12.0" />
                                                    </font>

diff --git a/IFCtoLBD_Desktop/src/main/java/org/linkedbuildingdata/ifc2lbd/IFCtoLBDController.java b/IFCtoLBD_Desktop/src/main/java/org/linkedbuildingdata/ifc2lbd/IFCtoLBDController.java
@@ -40,6 +40,7 @@
 import org.controlsfx.control.MaskerPane;
 import org.controlsfx.control.ToggleSwitch;
 import org.controlsfx.control.textfield.CustomTextField;
+
 import org.linkedbuildingdata.ifc2lbd.application_messaging.IFC2LBD_ApplicationEventBusService;
 import org.linkedbuildingdata.ifc2lbd.application_messaging.events.IFCtoLBD_SystemErrorEvent;
 import org.linkedbuildingdata.ifc2lbd.application_messaging.events.IFCtoLBD_SystemExit;
@@ -271,6 +272,33 @@ private void selectIFCFile() {
         // rdf_fileIcon.setDisable(false);
         // rdf_fileIcon.setImage(fileimage);
     }
+
+    /*
+     * These forces the user interface to be coherent as the Toggle Grpup does not work
+     */
+
+    @FXML
+    private void selectPropertyLevel1() {
+        level1.setSelected(true);
+        level2.setSelected(false);
+        level3.setSelected(false);
+    }
+
+    @FXML
+    private void selectPropertyLevel2() {
+        level1.setSelected(false);
+        level2.setSelected(true);
+        level3.setSelected(false);
+    }
+
+    @FXML
+    private void selectPropertyLevel3() {
+        level1.setSelected(false);
+        level2.setSelected(false);
+        level3.setSelected(true);
+
+    }
+
 
     @FXML
     private void selectTargetFile() {

diff --git a/IFCtoLBD_Desktop/src/main/resources/org/linkedbuildingdata/ifc2lbd/IFCtoLBD.fxml b/IFCtoLBD_Desktop/src/main/resources/org/linkedbuildingdata/ifc2lbd/IFCtoLBD.fxml
@@ -25,7 +25,7 @@
 <?import org.controlsfx.control.ToggleSwitch?>
 <?import org.controlsfx.control.textfield.CustomTextField?>
 
-<VBox prefHeight="728.0" prefWidth="929.0" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.linkedbuildingdata.ifc2lbd.IFCtoLBDController">
+<VBox prefHeight="728.0" prefWidth="929.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.linkedbuildingdata.ifc2lbd.IFCtoLBDController">
   <children>
     <MenuBar fx:id="myMenuBar" scaleShape="false" VBox.vgrow="NEVER">
       <menus>
@@ -173,24 +173,21 @@
                                                 </ToggleSwitch>
 
 
-												<RadioButton fx:id="level1" layoutX="42.0" layoutY="77.0" mnemonicParsing="false" selected="true" text="Level 1" textFill="#dd0a0a" AnchorPane.leftAnchor="20.0" AnchorPane.topAnchor="50.0">
-                                       <toggleGroup>
-                                          <ToggleGroup fx:id="level" />
-                                       </toggleGroup>
+												<RadioButton fx:id="level1" layoutX="42.0" layoutY="77.0" mnemonicParsing="false" onMouseClicked="#selectPropertyLevel1" selected="true" text="Level 1" textFill="#dd0a0a" AnchorPane.leftAnchor="20.0" AnchorPane.topAnchor="50.0">
                                        <font>
                                           <Font name="Arial" size="12.0" />
                                        </font>
+                                                   <toggleGroup>
+                                                      <ToggleGroup fx:id="PL" />
+                                                   </toggleGroup>
                                     </RadioButton>
 
-                                                <RadioButton fx:id="level2" layoutX="124.0" layoutY="74.0" mnemonicParsing="false" text="Level 2" textFill="#dd0a0a" AnchorPane.leftAnchor="105.0" AnchorPane.topAnchor="50.0">
+                                                <RadioButton fx:id="level2" layoutX="124.0" layoutY="74.0" mnemonicParsing="false" onMouseClicked="#selectPropertyLevel2" text="Level 2" textFill="#dd0a0a" toggleGroup="$PL" AnchorPane.leftAnchor="105.0" AnchorPane.topAnchor="50.0">
                                                    <font>
                                                       <Font name="Arial" size="12.0" />
                                                    </font>
-                                                   <toggleGroup>
-                                                      <ToggleGroup fx:id="level" />
-                                                   </toggleGroup>
                                                 </RadioButton>
-                                                <RadioButton fx:id="level3" layoutX="209.0" layoutY="82.0" mnemonicParsing="false" text="Level 3" textFill="#dd0a0a" toggleGroup="$level" AnchorPane.leftAnchor="200.0" AnchorPane.topAnchor="50.0">
+                                                <RadioButton fx:id="level3" layoutX="209.0" layoutY="82.0" mnemonicParsing="false" onMouseClicked="#selectPropertyLevel3" text="Level 3" textFill="#dd0a0a" toggleGroup="$PL" AnchorPane.leftAnchor="200.0" AnchorPane.topAnchor="50.0">
                                                    <font>
                                                       <Font name="Arial" size="12.0" />
                                                    </font>

diff --git a/IFCtoLBD_Geometry/pom.xml b/IFCtoLBD_Geometry/pom.xml
@@ -74,5 +74,5 @@
 			</plugin>
 		</plugins>
 	</build>
-	<version>2.33.3</version>
+	<version>2.34.0</version>
 </project>
diff --git a/IFCtoLBD_OpenAPI/.settings/org.eclipse.wst.common.component b/IFCtoLBD_OpenAPI/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-
+
+
 
 
 
@@ -10,7 +11,8 @@
 
 
     <wb-module deploy-name="IFCtoLBD_OpenAPI">
-
+
+
 
 
 
@@ -21,7 +23,8 @@
 
 
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-
+
+
 
 
 
@@ -32,7 +35,8 @@
 
 
         <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
-
+
+
 
 
 
@@ -43,16 +47,17 @@
 
 
         <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
-        <dependent-module archiveName="IFCtoLBD-2.33.3.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/IFCtoLBD/IFCtoLBD">
+        <dependent-module archiveName="IFCtoLBD-2.34.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/IFCtoLBD/IFCtoLBD">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="IFCtoLBD_Geometry-2.33.3.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/IFCtoLBD_Geometry/IFCtoLBD_Geometry">
+        <dependent-module archiveName="IFCtoLBD_Geometry-2.34.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/IFCtoLBD_Geometry/IFCtoLBD_Geometry">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <dependent-module archiveName="IFC2RDF-1.2.8.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/IFCtoRDF/IFCtoRDF">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-
+
+
 
 
 
@@ -63,7 +68,8 @@
 
 
         <property name="java-output-path" value="/mvdXMLCheckerOpenAPI/build/classes"/>
-
+
+
 
 
 
@@ -74,7 +80,8 @@
 
 
         <property name="context-root" value="IFCtoLBD_OpenAPI"/>
-
+
+
 
 
 
@@ -85,7 +92,8 @@
 
 
     </wb-module>
-
+
+
 
 
 

diff --git a/IFCtoLBD_OpenAPI/pom.xml b/IFCtoLBD_OpenAPI/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.rwth-aachen.dc.ifctolbd</groupId>
 	<artifactId>IFCtoLBD_OpenAPI</artifactId>
-	<version>2.33.3</version>
+	<version>2.34.0</version>
 	<packaging>war</packaging>
 	<name>IFCtoLBD OpenAPI Interface</name>
 
@@ -121,7 +121,7 @@
 		<dependency>
 			<groupId>io.github.jyrkioraskari</groupId>
 			<artifactId>IFCtoLBD</artifactId>
-			<version>2.33.3</version>
+			<version>2.34.0</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.apache.jena/apache-jena-libs -->

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # IFCtoLBD
-Version 2.33.3
+Version 2.34.0
 
 Contributors: Jyrki Oraskari, Mathias Bonduel, Kris McGlinn, Anna Wagner, Pieter Pauwels, Ville Kukkonen, Simon Steyskaland, and Joel Lehtonen.