From 15bcf18817223226323ce8428556be25096c46ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakob=20Sch=C3=B6ttl?= Date: Tue, 20 Dec 2016 19:25:31 +0100 Subject: [PATCH] Use Version class in HashGenerator --- .../vadere/simulator/projects/io/HashGenerator.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/VadereSimulator/src/org/vadere/simulator/projects/io/HashGenerator.java b/VadereSimulator/src/org/vadere/simulator/projects/io/HashGenerator.java index 9e1ab8739..1abf70706 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/io/HashGenerator.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/io/HashGenerator.java @@ -2,6 +2,8 @@ package org.vadere.simulator.projects.io; import org.apache.log4j.LogManager; import org.apache.log4j.Logger; +import org.vadere.simulator.entrypoints.Version; + import java.io.InputStream; import java.util.Scanner; @@ -9,7 +11,6 @@ public class HashGenerator { private static Logger logger = LogManager.getLogger(HashGenerator.class); - private static final String CURRENT_RELEASE_NUMBER_RESOURCE = "/current_release_number.txt"; private static final String CURRENT_COMMIT_HASH_RESOURCE = "/current_commit_hash.txt"; public static boolean isCommitHashAvailable() { @@ -28,14 +29,7 @@ public class HashGenerator { } public static String releaseNumber() { - String releaseNumber = getFirstStringTokenFromResource(CURRENT_RELEASE_NUMBER_RESOURCE); - - if (releaseNumber == null) { - releaseNumber = "warning: no release number"; - logger.warn("No release number found. The project will not contain software release version."); - } - - return releaseNumber; + return Version.latest().label(); } private static String getFirstStringTokenFromResource(String resource) { -- GitLab