Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
V
vadere
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
110
Issues
110
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
4
Merge Requests
4
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vadere
vadere
Commits
15bcf188
Commit
15bcf188
authored
Dec 20, 2016
by
Jakob Schöttl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use Version class in HashGenerator
parent
3a7950ba
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
9 deletions
+3
-9
VadereSimulator/src/org/vadere/simulator/projects/io/HashGenerator.java
...r/src/org/vadere/simulator/projects/io/HashGenerator.java
+3
-9
No files found.
VadereSimulator/src/org/vadere/simulator/projects/io/HashGenerator.java
View file @
15bcf188
...
@@ -2,6 +2,8 @@ package org.vadere.simulator.projects.io;
...
@@ -2,6 +2,8 @@ package org.vadere.simulator.projects.io;
import
org.apache.log4j.LogManager
;
import
org.apache.log4j.LogManager
;
import
org.apache.log4j.Logger
;
import
org.apache.log4j.Logger
;
import
org.vadere.simulator.entrypoints.Version
;
import
java.io.InputStream
;
import
java.io.InputStream
;
import
java.util.Scanner
;
import
java.util.Scanner
;
...
@@ -9,7 +11,6 @@ public class HashGenerator {
...
@@ -9,7 +11,6 @@ public class HashGenerator {
private
static
Logger
logger
=
LogManager
.
getLogger
(
HashGenerator
.
class
);
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"
;
private
static
final
String
CURRENT_COMMIT_HASH_RESOURCE
=
"/current_commit_hash.txt"
;
public
static
boolean
isCommitHashAvailable
()
{
public
static
boolean
isCommitHashAvailable
()
{
...
@@ -28,14 +29,7 @@ public class HashGenerator {
...
@@ -28,14 +29,7 @@ public class HashGenerator {
}
}
public
static
String
releaseNumber
()
{
public
static
String
releaseNumber
()
{
String
releaseNumber
=
getFirstStringTokenFromResource
(
CURRENT_RELEASE_NUMBER_RESOURCE
);
return
Version
.
latest
().
label
();
if
(
releaseNumber
==
null
)
{
releaseNumber
=
"warning: no release number"
;
logger
.
warn
(
"No release number found. The project will not contain software release version."
);
}
return
releaseNumber
;
}
}
private
static
String
getFirstStringTokenFromResource
(
String
resource
)
{
private
static
String
getFirstStringTokenFromResource
(
String
resource
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment