Update

jyrkioraskari · Jan 3, 2024 · 8923630 · 8923630
1 parent a05a35a
commit 8923630
Show file tree

Hide file tree

Showing 42 changed files with 184 additions and 203 deletions.
diff --git a/IFCProps2ExcelOnline/.classpath b/IFCProps2ExcelOnline/.classpath
@@ -18,15 +18,19 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="target/generated-resources/gwt">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>

diff --git a/IFCProps2ExcelOnline/.project b/IFCProps2ExcelOnline/.project
@@ -26,8 +26,7 @@
 			</arguments>
 		</buildCommand>
 	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+	<natures>	
 		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>

diff --git a/IFCProps2ExcelOnline/.settings/org.eclipse.jdt.core.prefs b/IFCProps2ExcelOnline/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=17
diff --git a/IFCProps2ExcelOnline/pom.xml b/IFCProps2ExcelOnline/pom.xml
@@ -5,16 +5,16 @@
 	<groupId>de.rwth-aachen.dc.lbd</groupId>
 	<artifactId>IFCProps2ExcelOnline</artifactId>
 	<packaging>war</packaging>
-	<version>2.40.1</version>
+	<version>2.43.4</version>
 	<name>IFC Properties to Excel User Interface</name>
 
 	<properties>
 		<mvdxml_check_project.version>2.53.0</mvdxml_check_project.version>
 		<vaadin.plugin.version>8.14.0</vaadin.plugin.version>
 		<jetty.plugin.version>9.3.9.v20160517</jetty.plugin.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
 		<!-- If there are no local customizations, this can also be "fetch" or 
 			"cdn" -->
 		<vaadin.widgetset.mode>local</vaadin.widgetset.mode>
@@ -85,7 +85,7 @@
 		<dependency>
 			<groupId>io.github.jyrkioraskari</groupId>
 			<artifactId>ifc-to-lbd</artifactId>
-			<version>2.43.3</version>
+			<version>2.43.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.poi</groupId>

diff --git a/...rops2ExcelOnline/src/main/java/de/rwth_aachen/dc/excelreport/IFCPropsTOExcelOnlineUI.java b/...rops2ExcelOnline/src/main/java/de/rwth_aachen/dc/excelreport/IFCPropsTOExcelOnlineUI.java
@@ -37,7 +37,6 @@
 import com.vaadin.annotations.VaadinServletConfiguration;
 import com.vaadin.server.FileDownloader;
 import com.vaadin.server.FileResource;
-import com.vaadin.server.Page;
 import com.vaadin.server.Resource;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.server.VaadinRequest;
@@ -72,16 +71,16 @@ public class IFCPropsTOExcelOnlineUI extends UI {
 
 	Image image;
 
-	private UI ui_interface;
-	private String vaadin_session;
-	private Page vaadin_page;
+	//private UI ui_interface;
+	//private String vaadin_session;
+	//private Page vaadin_page;
 
 	@Override
 	protected void init(VaadinRequest vaadinRequest) {
 		final VerticalLayout layout = new VerticalLayout();
-		this.ui_interface = this.getUI();
-		this.vaadin_session = VaadinSession.getCurrent().getSession().getId();
-		this.vaadin_page = Page.getCurrent();
+		//this.ui_interface = this.getUI();
+		//this.vaadin_session = VaadinSession.getCurrent().getSession().getId();
+		//this.vaadin_page = Page.getCurrent();
 
 		Resource res = new ThemeResource("rwth_caad_en_schwarz_grau_rgb.svg");
 		this.image = new Image("", res);
@@ -284,6 +283,11 @@ private void extractIFCtoLBD(File ifcFile, RDFFormat rdfformat) {
 	@WebServlet(urlPatterns = "/*", name = "mvdXMLOnlineCheckerUIServlet", asyncSupported = true)
 	@VaadinServletConfiguration(ui = IFCPropsTOExcelOnlineUI.class, productionMode = false)
 	public static class mvdXMLOnlineCheckerUIServlet extends VaadinServlet {
+
+		/**
+		 * 
+		 */
+		private static final long serialVersionUID = 1L;
 	}
 
 	public static void main(String[] args) {

diff --git a/IFCtoLBD/.classpath b/IFCtoLBD/.classpath
@@ -24,15 +24,14 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-15">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5">

diff --git a/IFCtoLBD/.project b/IFCtoLBD/.project
@@ -27,7 +27,6 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
 		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>

diff --git a/IFCtoLBD/.settings/org.eclipse.jdt.core.prefs b/IFCtoLBD/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=15
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=15
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -13,4 +13,4 @@ org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=15
+org.eclipse.jdt.core.compiler.source=17
diff --git a/IFCtoLBD/pom.xml b/IFCtoLBD/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.github.jyrkioraskari</groupId>
 	<artifactId>ifc-to-lbd</artifactId>
-	<version>2.43.3</version>
+	<version>2.43.4</version>
 	<name>IFC to LBD Converter</name>
 	<licenses>
 		<license>
@@ -40,8 +40,8 @@
 		</developer>
 	</developers>
 	<properties>
-		<maven.compiler.source>15</maven.compiler.source>
-		<maven.compiler.target>15</maven.compiler.target>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
 		<!-- Maven Plugin Dependencies -->
 		<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
 		<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
@@ -68,25 +68,24 @@
 		<dependency>
 			<groupId>de.rwth-aachen.lbd</groupId>
 			<artifactId>idc_to_lbd_geometry</artifactId>
-			<version>2.43.0</version>
-			 <exclusions>
-            <exclusion>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-log4j12</artifactId>
-            </exclusion>
-        </exclusions>
+			<version>2.43.4</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-log4j12</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>3.12.0</version>
+			<version>3.14.0</version>
 		</dependency>
-
 		<!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.15</version>
+			<version>1.16.0</version>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/com.thoughtworks.xstream/xstream -->
 		<dependency>
@@ -109,19 +108,19 @@
 		<dependency>
 			<groupId>org.junit.platform</groupId>
 			<artifactId>junit-platform-launcher</artifactId>
-			<version>1.9.2</version>
+			<version>1.10.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
-			<version>5.9.2</version>
+			<version>5.10.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>io.github.jyrkioraskari</groupId>
 			<artifactId>ifc2rdf</artifactId>
-			<version>1.3.1</version>
+			<version>1.3.2</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.davidmoten</groupId>
@@ -131,16 +130,26 @@
 		<dependency>
 			<groupId>info.picocli</groupId>
 			<artifactId>picocli</artifactId>
-			<version>4.7.1</version>
+			<version>4.7.5</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-text</artifactId>
+			<version>1.11.0</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.jena</groupId>
+			<artifactId>jena-shaded-guava</artifactId>
+			<version>4.8.0</version>
+		</dependency>
+		<!-- Thanks for using https://jar-download.com -->
 	</dependencies>
 	<scm>
 		<connection>scm:git:github.com/jyrkioraskari/IFCtoLBD.git</connection>
 		<developerConnection>scm:git:[email protected]/jyrkioraskari/IFCtoLBD.git</developerConnection>
 		<url>https://https://github.com/jyrkioraskari/IFCtoLBD</url>
 		<tag>HEAD</tag>
 	</scm>
-
 	<profiles>
 		<profile>
 			<id>release</id>
@@ -335,11 +344,10 @@
 							<dependencyConvergence />
 						</rules>
 					</configuration>
-				</plugin>				
+				</plugin>
 			</plugins>
 		</pluginManagement>
 	</build>
-
 	<distributionManagement>
 		<repository>
 			<id>github</id>

diff --git a/IFCtoLBD/src/main/java/org/linkedbuildingdata/ifc2lbd/IFCtoLBDConverter.java b/IFCtoLBD/src/main/java/org/linkedbuildingdata/ifc2lbd/IFCtoLBDConverter.java
@@ -6,29 +6,23 @@
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
-import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
 import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.Resource;
 import org.apache.jena.sys.JenaSystem;
 import org.linkedbuildingdata.ifc2lbd.application_messaging.events.IFCtoLBD_SystemErrorEvent;
 import org.linkedbuildingdata.ifc2lbd.application_messaging.events.IFCtoLBD_SystemStatusEvent;
 import org.linkedbuildingdata.ifc2lbd.core.IFCtoLBDConverterCore;
 import org.linkedbuildingdata.ifc2lbd.core.utils.FileUtils;
 import org.linkedbuildingdata.ifc2lbd.core.utils.IfcOWLUtils;
-import org.linkedbuildingdata.ifc2lbd.core.valuesets.PropertySet;
 import org.linkedbuildingdata.ifc2lbd.namespace.IfcOWL;
 
 import de.rwth_aachen.dc.lbd.IFCGeometry;
@@ -259,7 +253,7 @@ private String unzip(String ifcZipFile) {
 			ZipEntry zipEntry = zis.getNextEntry();
 			while (zipEntry != null) {
 				System.out.println("entry: " + zipEntry);
-				String name = zipEntry.getName().split("\\.")[0];
+				//String name = zipEntry.getName().split("\\.")[0];
 				File newFile = File.createTempFile("ifc", ".ifc");
 
 				// write file content
@@ -435,7 +429,7 @@ public boolean convert_read_in_phase(String ifc_filename, String target_file, bo
 		readInOntologies(ifc_filename);
 		createIfcLBDProductMapping();
 
-		eventBus.post(new IFCtoLBD_SystemStatusEvent("Model ready in the memory."));
+		eventBus.post(new IFCtoLBD_SystemStatusEvent("Model ready in the memory. Select \"Convert out to RDF\" to continue."));
 
 		return true;
 	}

diff --git a/IFCtoLBD/src/main/java/org/linkedbuildingdata/ifc2lbd/IFCtoLBDConverter_CLI.java b/IFCtoLBD/src/main/java/org/linkedbuildingdata/ifc2lbd/IFCtoLBDConverter_CLI.java
@@ -143,9 +143,9 @@ public Integer call() throws Exception {
 		if (this.exportIfcOWL.isPresent())
 			exportIfcOWL = this.exportIfcOWL.get();
 
-		boolean namedGraphs = false;
-		if (this.namedGraphs.isPresent())
-			namedGraphs = this.namedGraphs.get();
+		//boolean namedGraphs = false;
+		//if (this.namedGraphs.isPresent())
+		//	namedGraphs = this.namedGraphs.get();
 
 		boolean hasUnits = false;
 		if (this.hasUnits.isPresent())

diff --git a/IFCtoLBD/src/main/java/org/linkedbuildingdata/ifc2lbd/core/IFCtoLBDConverterCore.java b/IFCtoLBD/src/main/java/org/linkedbuildingdata/ifc2lbd/core/IFCtoLBDConverterCore.java
@@ -241,7 +241,7 @@ private void handle_building(Resource ifcowl_building) {
 	}
 
 	private void handle_building(Resource lbd_site, Resource building) {
-		String building_url_name = IfcOWLUtils.getURLEncodedName(building, this.ifcOWL);
+		//String building_url_name = IfcOWLUtils.getURLEncodedName(building, this.ifcOWL);
 
 		if (!RDFUtils.getType(building.asResource()).get().getURI().endsWith("#IfcBuilding")) {
 			System.err.println("Not an #IfcBuilding");
@@ -1188,7 +1188,7 @@ public Set<Resource> getElementTypes() {
 			if (st.getPredicate().getLocalName().toString().toLowerCase().contains("globalid_ifcroot")) {
 				Resource ifcOWL_element = st.getSubject();
 				if (isIfcElement(ifcOWL_element)) {
-					Optional<String> predefined_type = IfcOWLUtils.getPredefinedData(ifcOWL_element);
+					//Optional<String> predefined_type = IfcOWLUtils.getPredefinedData(ifcOWL_element);
 					Optional<Resource> ifcowl_type = RDFUtils.getType(ifcOWL_element);
 					Optional<Resource> bot_type = Optional.empty();
 					if (ifcowl_type.isPresent()) {

diff --git a/IFCtoLBD/src/main/java/org/linkedbuildingdata/ifc2lbd/core/IFCtoRDF.java b/IFCtoLBD/src/main/java/org/linkedbuildingdata/ifc2lbd/core/IFCtoRDF.java
@@ -1,16 +1,10 @@
 package org.linkedbuildingdata.ifc2lbd.core;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.Optional;
 import java.util.Timer;
 import java.util.TimerTask;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
 
 import org.linkedbuildingdata.ifc2lbd.application_messaging.IFC2LBD_ApplicationEventBusService;
 import org.linkedbuildingdata.ifc2lbd.application_messaging.events.IFCtoLBD_SystemStatusEvent;

diff --git a/IFCtoLBD/src/main/java/org/linkedbuildingdata/ifc2lbd/core/TestUTF8.java b/IFCtoLBD/src/main/java/org/linkedbuildingdata/ifc2lbd/core/TestUTF8.java
@@ -1,6 +1,6 @@
 package org.linkedbuildingdata.ifc2lbd.core;
 
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
 
 public class TestUTF8 {