From 35b98da02a67efebd5078b0d02a3a939532d06b4 Mon Sep 17 00:00:00 2001
From: ribeaudc <ribeaudc>
Date: Thu, 15 Nov 2007 03:32:33 +0000
Subject: [PATCH] change: - 'getBuildNumber' -> 'getFullVersion' which outputs
the version number followed by the build number if known.
SVN: 2568
---
.../cisd/common/utilities/BuildAndEnvironmentInfo.java | 7 +++----
.../source/java/ch/systemsx/cisd/datamover/Parameters.java | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/BuildAndEnvironmentInfo.java b/common/source/java/ch/systemsx/cisd/common/utilities/BuildAndEnvironmentInfo.java
index d45f7c392d7..5262831fdd6 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/BuildAndEnvironmentInfo.java
+++ b/common/source/java/ch/systemsx/cisd/common/utilities/BuildAndEnvironmentInfo.java
@@ -154,9 +154,9 @@ public final class BuildAndEnvironmentInfo
}
/**
- * Returns the build number of the software,
+ * Returns the version accompanied by the build number of the software (if known).
*/
- public final String getBuildNumber()
+ public final String getFullVersion()
{
final StringBuilder builder = new StringBuilder();
final String rev = getRevision();
@@ -186,8 +186,7 @@ public final class BuildAndEnvironmentInfo
public final List<String> getEnvironmentInfo()
{
final List<String> environmentInfo = new ArrayList<String>();
- environmentInfo.add("Version: " + getVersion());
- environmentInfo.add("Build Number: " + getBuildNumber());
+ environmentInfo.add("Version: " + getFullVersion());
environmentInfo.add("Java VM: " + getJavaVM());
environmentInfo.add("CPU Architecture: " + getCPUArchitecture());
environmentInfo.add("OS: " + getOS());
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/Parameters.java b/datamover/source/java/ch/systemsx/cisd/datamover/Parameters.java
index b13a727974f..7333ba8bc4d 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/Parameters.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/Parameters.java
@@ -266,7 +266,7 @@ public class Parameters implements ITimingParameters, IFileSysParameters
@Option(longName = "version", skipForExample = true, usage = "Prints out the version information.")
void printVersion(boolean exit)
{
- System.err.println("Datamover version " + BuildAndEnvironmentInfo.INSTANCE.getBuildNumber());
+ System.err.println("Datamover version " + BuildAndEnvironmentInfo.INSTANCE.getFullVersion());
if (exit)
{
System.exit(0);
--
GitLab