From b90142ff7893930abe32a47f1ca4abe678496b32 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 27 Jan 2010 14:48:26 +0000
Subject: [PATCH] bug fixed: showing correct version in PhosphoNetX GUI
SVN: 14516
---
.../generic/client/web/server/AbstractClientService.java | 7 ++++++-
.../client/web/server/PhosphoNetXClientService.java | 7 +++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java
index 8876962f608..794b2d3c5d7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java
@@ -334,12 +334,17 @@ public abstract class AbstractClientService implements IClientService,
public final ApplicationInfo getApplicationInfo()
{
final ApplicationInfo applicationInfo = new ApplicationInfo();
- applicationInfo.setVersion(BuildAndEnvironmentInfo.INSTANCE.getFullVersion());
+ applicationInfo.setVersion(getVersion());
applicationInfo.setCIFEXURL(cifexURL);
applicationInfo.setCifexRecipient(cifexRecipient);
return applicationInfo;
}
+ protected String getVersion()
+ {
+ return BuildAndEnvironmentInfo.INSTANCE.getFullVersion();
+ }
+
public final SessionContext tryToGetCurrentSessionContext()
{
try
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/PhosphoNetXClientService.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/PhosphoNetXClientService.java
index 74852de88f0..958b63227a3 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/PhosphoNetXClientService.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/PhosphoNetXClientService.java
@@ -34,6 +34,7 @@ import ch.systemsx.cisd.openbis.generic.shared.IServer;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.GenericTableRow;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Vocabulary;
+import ch.systemsx.cisd.openbis.plugin.phosphonetx.BuildAndEnvironmentInfo;
import ch.systemsx.cisd.openbis.plugin.phosphonetx.client.web.client.IPhosphoNetXClientService;
import ch.systemsx.cisd.openbis.plugin.phosphonetx.client.web.client.dto.ListProteinByExperimentAndReferenceCriteria;
import ch.systemsx.cisd.openbis.plugin.phosphonetx.client.web.client.dto.ListProteinByExperimentCriteria;
@@ -81,6 +82,12 @@ public class PhosphoNetXClientService extends AbstractClientService implements
return server;
}
+ @Override
+ protected String getVersion()
+ {
+ return BuildAndEnvironmentInfo.INSTANCE.getFullVersion();
+ }
+
public Vocabulary getTreatmentTypeVocabulary()
{
final String sessionToken = getSessionToken();
--
GitLab