diff --git a/.classpath b/.classpath
index 4e4f6de..dd0d0b0 100644
--- a/.classpath
+++ b/.classpath
@@ -28,10 +28,5 @@
-
-
-
-
-
diff --git a/package-lock.json b/package-lock.json
index cc8c458..0c9250b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -121,6 +121,7 @@
"@vaadin/virtual-list": "23.0.7",
"construct-style-sheets-polyfill": "3.0.4",
"date-fns": "2.28.0",
+ "line-awesome": "1.3.0",
"lit": "2.1.4"
},
"devDependencies": {
@@ -9195,6 +9196,11 @@
"node": ">=6"
}
},
+ "node_modules/line-awesome": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/line-awesome/-/line-awesome-1.3.0.tgz",
+ "integrity": "sha512-Y0YHksL37ixDsHz+ihCwOtF5jwJgCDxQ3q+zOVgaSW8VugHGTsZZXMacPYZB1/JULBi6BAuTCTek+4ZY/UIwcw=="
+ },
"node_modules/lines-and-columns": {
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
@@ -21171,6 +21177,11 @@
"integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
"dev": true
},
+ "line-awesome": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/line-awesome/-/line-awesome-1.3.0.tgz",
+ "integrity": "sha512-Y0YHksL37ixDsHz+ihCwOtF5jwJgCDxQ3q+zOVgaSW8VugHGTsZZXMacPYZB1/JULBi6BAuTCTek+4ZY/UIwcw=="
+ },
"lines-and-columns": {
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
diff --git a/pom.xml b/pom.xml
index f7e1804..058a8a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -193,15 +193,13 @@
spring-boot:run
-
com.vaadin
vaadin-maven-plugin
diff --git a/src/main/java/de/kreth/invoice/Application.java b/src/main/java/de/kreth/invoice/Application.java
index ebfe7fc..b60d628 100644
--- a/src/main/java/de/kreth/invoice/Application.java
+++ b/src/main/java/de/kreth/invoice/Application.java
@@ -1,6 +1,5 @@
package de.kreth.invoice;
-import java.awt.GraphicsEnvironment;
import java.util.PropertyResourceBundle;
import java.util.ResourceBundle;
@@ -31,13 +30,6 @@ public class Application extends SpringBootServletInitializer implements AppShel
private static ResourceBundle bundle = null;
public static void main(String[] args) {
- String[] names = GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
-
- System.out.println("Found " + names.length + " fonts:");
-
- for (String name : names) {
- System.out.println(name);
- }
SpringApplication.run(Application.class, args);
}
diff --git a/src/main/java/de/kreth/invoice/views/FooterComponent.java b/src/main/java/de/kreth/invoice/views/FooterComponent.java
index 7315358..c968f0e 100644
--- a/src/main/java/de/kreth/invoice/views/FooterComponent.java
+++ b/src/main/java/de/kreth/invoice/views/FooterComponent.java
@@ -1,5 +1,8 @@
package de.kreth.invoice.views;
+import static de.kreth.invoice.Version_Properties.BUILD_DATETIME;
+import static de.kreth.invoice.Version_Properties.PROJECT_VERSION;
+
import java.io.IOException;
import java.net.URL;
import java.text.DateFormat;
@@ -11,8 +14,8 @@ import java.util.Properties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.vaadin.flow.component.Text;
import com.vaadin.flow.component.formlayout.FormLayout;
+import com.vaadin.flow.component.html.Label;
import de.kreth.invoice.Version_Properties;
@@ -52,12 +55,13 @@ public class FooterComponent extends FormLayout {
public FooterComponent() {
- Text copyright = new Text("\u00a9 Markus Kreth\u00A0");
+ Label copyright = new Label("\u00a9 Markus Kreth\u00A0");
+ copyright.addClassName("formlayout-spacing");
add(copyright);
if (propertiesLoaded()) {
- String dateTimeProperty = Version_Properties.BUILD_DATETIME.getString(VERSION::getProperty);
+ String dateTimeProperty = getString(BUILD_DATETIME);
SimpleDateFormat sourceFormat = new SimpleDateFormat(
"yyyy-MM-dd HH:mm:ss");
try {
@@ -69,18 +73,21 @@ public class FooterComponent extends FormLayout {
"Unable to parse dateTimeProperty=" + dateTimeProperty,
e);
}
- Text vers = new Text(
- "\u00A0Version: " + Version_Properties.PROJECT_VERSION.getString(VERSION::getProperty));
- Text buildTime = new Text("\u00A0Build: " + dateTimeProperty);
+ Label vers = new Label(
+ "\u00A0Version: " + getString(PROJECT_VERSION));
+ Label buildTime = new Label("\u00A0Build: " + dateTimeProperty);
+ vers.addClassName("formlayout-spacing");
+ buildTime.addClassName("formlayout-spacing");
add(vers, buildTime);
}
- getStyle().set("margin", "3px");
-// getChildren().forEach(c -> {
-// c.getElement().setAttribute("padding", "5px");
-// });
+
}
private boolean propertiesLoaded() {
- return !VERSION.isEmpty() && !Version_Properties.BUILD_DATETIME.getString(VERSION::getProperty).contains("${");
+ return !VERSION.isEmpty() && !getString(BUILD_DATETIME).contains("${");
+ }
+
+ private String getString(Version_Properties prop) {
+ return prop.getString(VERSION::getProperty);
}
}
diff --git a/src/main/resources/version.properties b/src/main/resources/version.properties
deleted file mode 100644
index 289a190..0000000
--- a/src/main/resources/version.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-project.artifactId=trainerinvoice
-project.version=1.0.0-SNAPSHOT
-build.dateTime=2022-05-29 23:00:00
-package_name=trainerinvoice-1.0.0-SNAPSHOT.jar
diff --git a/src/packaging/version.properties b/src/packaging/version.properties
index 484dbe1..c87ffcd 100644
--- a/src/packaging/version.properties
+++ b/src/packaging/version.properties
@@ -1,4 +1,4 @@
-project.artifactId=${project.artifactId}
-project.version=${project.version}
-build.dateTime=${timestamp}
-package_name=${project.artifactId}-${project.version}.${project.packaging}
+project.artifactId=@project.artifactId@
+project.version=@project.version@
+build.dateTime=@timestamp@
+package_name=@project.artifactId@-@project.version@.@project.packaging@