From a91f2359b3f3687aa19e61d62d115d65d14f9130 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Fri, 18 Nov 2011 17:30:33 +0000
Subject: [PATCH] [LMS-2666] add: method DataSet.getFullLocation() and use it
in the Web GUI to show the full location including the share
SVN: 23727
---
.../columns/specific/data/CommonExternalDataColDefKind.java | 2 +-
.../web/server/resultset/AbstractExternalDataProvider.java | 2 +-
.../cisd/openbis/generic/shared/basic/dto/DataSet.java | 5 +++++
.../client/application/dataset/DataSetPropertiesPanel.java | 6 +++---
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/data/CommonExternalDataColDefKind.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/data/CommonExternalDataColDefKind.java
index 0022d43d079..4ff16662dec 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/data/CommonExternalDataColDefKind.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/data/CommonExternalDataColDefKind.java
@@ -242,7 +242,7 @@ public enum CommonExternalDataColDefKind implements IColumnDefinitionKind<Extern
@Override
public String tryGetValue(DataSet dataSet)
{
- return dataSet.getLocation();
+ return dataSet.getFullLocation();
}
}),
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractExternalDataProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractExternalDataProvider.java
index e121e53b70f..e05211870c1 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractExternalDataProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractExternalDataProvider.java
@@ -142,7 +142,7 @@ public abstract class AbstractExternalDataProvider extends
Boolean complete = realDataSet.getComplete();
builder.column(IS_COMPLETE).addString(
complete == null ? "?" : SimpleYesNoRenderer.render(complete));
- builder.column(LOCATION).addString(realDataSet.getLocation());
+ builder.column(LOCATION).addString(realDataSet.getFullLocation());
builder.column(ARCHIVING_STATUS)
.addString(realDataSet.getStatus().getDescription());
FileFormatType fileFormatType = realDataSet.getFileFormatType();
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSet.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSet.java
index ec71fd0100d..adc75f20fcc 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSet.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSet.java
@@ -74,6 +74,11 @@ public class DataSet extends ExternalData implements IDatasetLocation
return location;
}
+ public String getFullLocation()
+ {
+ return shareId + "/" + location;
+ }
+
@Override
public void setLocation(String location)
{
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetPropertiesPanel.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetPropertiesPanel.java
index 5d565984e36..6cc33fb5e53 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetPropertiesPanel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetPropertiesPanel.java
@@ -32,8 +32,8 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ContainerDataSet;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSet;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetType;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataStore;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Deletion;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.PropertiesPanelUtils;
@@ -107,8 +107,8 @@ public class DataSetPropertiesPanel extends ContentPanel
DataSet concreteDataSet = dataset.tryGetAsDataSet();
if (concreteDataSet != null)
{
- properties
- .put(messageProvider.getMessage(Dict.LOCATION), concreteDataSet.getLocation());
+ properties.put(messageProvider.getMessage(Dict.LOCATION),
+ concreteDataSet.getFullLocation());
if (viewContext.getModel().getApplicationInfo().isArchivingConfigured())
{
properties.put(messageProvider.getMessage(Dict.ARCHIVING_STATUS), concreteDataSet
--
GitLab