[client] Show automatically generated version string

2 files changed, 22 insertions, 18 deletions

diff --git a/dozentenmodul/src/main/java/gui/intro/About_GUI.java b/dozentenmodul/src/main/java/gui/intro/About_GUI.java
index a97a217b..fb75c66d 100644
--- a/dozentenmodul/src/main/java/gui/intro/About_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/About_GUI.java
@@ -88,7 +88,7 @@ public class About_GUI extends JFrame {
 
 		txtpnVersionVBuilddate = new JTextPane();
 		txtpnVersionVBuilddate
-				.setText("Version: "+Version.getVersion()+"\r\nBuild-Date: "+Version.getBuildDate()+"\r\n\r\nContact: michael.wilson@hs-offenburg.de\r\nWebsite: http://bwlehrpool.hs-offenburg.de/");
+				.setText("Version: "+Version.getVersion()+"\r\n\r\nContact: michael.wilson@hs-offenburg.de\r\nWebsite: http://bwlehrpool.hs-offenburg.de/");
 		txtpnVersionVBuilddate.setEditable(false);
 		txtpnVersionVBuilddate.setBackground(SystemColor.menu);
 		txtpnVersionVBuilddate.setBounds(62, 95, 224, 90);
diff --git a/dozentenmodul/src/main/java/models/Version.java b/dozentenmodul/src/main/java/models/Version.java
index b44819e4..a5eafe6d 100644
--- a/dozentenmodul/src/main/java/models/Version.java
+++ b/dozentenmodul/src/main/java/models/Version.java
@@ -1,24 +1,28 @@
 package models;
 
+import java.io.InputStream;
+import java.util.Properties;
+
 public class Version {
-	
-	private static String Version = "1.06";
-	private static String BuildDate = "04.09.2014";
-	
-	
+
+	private static String version = null;
+
 	public static String getVersion() {
-		return Version;
-	}
-	public static void setVersion(String version) {
-		Version = version;
-	}
-	public static String getBuildDate() {
-		return BuildDate;
-	}
-	public static void setBuildDate(String buildDate) {
-		BuildDate = buildDate;
+		// Maven writes a version number derived from the current timestamp
+		// to MANIFEST.MF - read it
+		if (version == null) {
+			try {
+				InputStream is = Version.class
+						.getResourceAsStream("/META-INF/MANIFEST.MF");
+				Properties p = new Properties();
+				p.load(is);
+				version = p.getProperty("Version-Timestamp");
+			} catch (Exception e) {
+				e.printStackTrace();
+				version = "unknown";
+			}
+		}
+		return version;
 	}
 
-	
-	
 }