From 7b0a99a4bd3985e6757875efd117337527984012 Mon Sep 17 00:00:00 2001 From: Kai Brassel <mail@khbrassel.de> Date: Sun, 21 Mar 2021 10:46:25 +0100 Subject: [PATCH] Linux verion and About dialog --- .../.classpath | 2 +- .../app/handlers/AboutHandler.java | 14 +++++++++++++- de.hftstuttgart.energycomponents.parent/pom.xml | 4 ++-- de.hftstuttgart.energycomponents.product/pom.xml | 2 +- .../.classpath | 2 +- 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/de.hftstuttgart.energycomponents.application/.classpath b/de.hftstuttgart.energycomponents.application/.classpath index 1f04690..d116359 100644 --- a/de.hftstuttgart.energycomponents.application/.classpath +++ b/de.hftstuttgart.energycomponents.application/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <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.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src/"/> <classpathentry kind="output" path="target/classes"/> diff --git a/de.hftstuttgart.energycomponents.application/src/de/hftstuttgart/energycomponents/app/handlers/AboutHandler.java b/de.hftstuttgart.energycomponents.application/src/de/hftstuttgart/energycomponents/app/handlers/AboutHandler.java index 806a7ac..dbfa919 100644 --- a/de.hftstuttgart.energycomponents.application/src/de/hftstuttgart/energycomponents/app/handlers/AboutHandler.java +++ b/de.hftstuttgart.energycomponents.application/src/de/hftstuttgart/energycomponents/app/handlers/AboutHandler.java @@ -7,6 +7,18 @@ import org.eclipse.swt.widgets.Shell; public class AboutHandler { @Execute public void execute(Shell shell) { - MessageDialog.openInformation(shell, "About", "Energy Components Catalog"); + String txt = """ + Energy Components Catalog by Verena Weiler, Stuttgart, is licensed under CC BY-NC-ND 4.0 + + This work is supported by projects “SimStadt 2.0†[grant number 03ET1459A] and + â€NEQModPlus†[grant number 03ET1618B] by the BMWi (German Federal Ministry of Economic Affairs and Energy). + + Java version: %s + Java vendor: %s + java.vm.version: %s + java.version.date: %s"""; + MessageDialog.openInformation(shell, "About", + txt.formatted(System.getProperty("java.version"), System.getProperty("java.vendor"), + System.getProperty("java.vm.version"), System.getProperty("java.version.date"))); } } diff --git a/de.hftstuttgart.energycomponents.parent/pom.xml b/de.hftstuttgart.energycomponents.parent/pom.xml index 6ebdbc7..c711315 100644 --- a/de.hftstuttgart.energycomponents.parent/pom.xml +++ b/de.hftstuttgart.energycomponents.parent/pom.xml @@ -48,11 +48,11 @@ <ws>win32</ws> <arch>x86_64</arch> </environment> - <!-- environment> + <environment> <os>linux</os> <ws>gtk</ws> <arch>x86_64</arch> - </environment--> + </environment> <environment> <os>macosx</os> <ws>cocoa</ws> diff --git a/de.hftstuttgart.energycomponents.product/pom.xml b/de.hftstuttgart.energycomponents.product/pom.xml index e3e2fd4..b9369ef 100644 --- a/de.hftstuttgart.energycomponents.product/pom.xml +++ b/de.hftstuttgart.energycomponents.product/pom.xml @@ -22,7 +22,7 @@ <configuration> <formats> <win32>zip</win32> - <!-- linux>tar.gz</linux --> + <linux>tar.gz</linux> <macosx>zip</macosx> </formats> </configuration> diff --git a/de.hftstuttgart.energycomponents.viewmodel/.classpath b/de.hftstuttgart.energycomponents.viewmodel/.classpath index a9f4be7..140ee67 100644 --- a/de.hftstuttgart.energycomponents.viewmodel/.classpath +++ b/de.hftstuttgart.energycomponents.viewmodel/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <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.pde.core.requiredPlugins"/> <classpathentry kind="output" path="target/classes"/> </classpath> -- GitLab