From 2bc43fc56363339b351d00f8acf90d8ba10b7653 Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Fri, 20 Jul 2012 06:54:12 +0000
Subject: [PATCH] SP-211 / BIS-118 : Link data sets improvements - continuation
SVN: 26162
---
.../client/web/client/application/Dict.java | 4 ---
.../dataset/LinkDataViewSection.java | 34 ++-----------------
.../cisd/openbis/public/common-dictionary.js | 4 +--
3 files changed, 4 insertions(+), 38 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java
index c20d0ae5c3c..15a89de3e38 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java
@@ -671,10 +671,6 @@ public abstract class Dict
public static final String LINKED_DATA_SET_INFO = "linked_data_set_info";
- public static final String LINKED_DATA_SET_CODE = "linked_data_set_code";
-
- public static final String LINKED_DATA_SET_DMS = "linked_data_set_dms";
-
public static final String LINKED_DATA_SET_LINK = "linked_data_set_link";
public static final String LINKED_DATA_SET_LINK_NOT_AVAILABLE_MSG =
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/LinkDataViewSection.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/LinkDataViewSection.java
index eddac440412..90d3cf425d5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/LinkDataViewSection.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/LinkDataViewSection.java
@@ -49,8 +49,6 @@ public class LinkDataViewSection extends TabContent
Panel content = new FlowPanel();
content.setStyleName("linkDataViewContent");
content.add(createInfoWidget());
- content.add(createCodeWidget());
- content.add(createDmsWidget());
content.add(createLinkWidget());
add(content);
@@ -63,35 +61,6 @@ public class LinkDataViewSection extends TabContent
return label;
}
- private Widget createCodeWidget()
- {
- Label label = new Label(viewContext.getMessage(Dict.LINKED_DATA_SET_CODE));
- label.addStyleName("linkDataViewLabel");
- Label value = new Label(StringEscapeUtils.unescapeHtml(dataset.getExternalCode()));
-
- Panel panel = new HorizontalPanel();
- panel.add(label);
- panel.add(value);
- return panel;
- }
-
- private Widget createDmsWidget()
- {
- Label label = new Label(viewContext.getMessage(Dict.LINKED_DATA_SET_DMS));
- label.addStyleName("linkDataViewLabel");
- Label value =
- new Label(StringEscapeUtils.unescapeHtml(dataset.getExternalDataManagementSystem()
- .getLabel())
- + " ("
- + StringEscapeUtils.unescapeHtml(dataset.getExternalDataManagementSystem()
- .getCode()) + ")");
-
- Panel panel = new HorizontalPanel();
- panel.add(label);
- panel.add(value);
- return panel;
- }
-
private Widget createLinkWidget()
{
LinkDataSetAnchor anchor = LinkDataSetAnchor.tryCreate(dataset);
@@ -101,6 +70,9 @@ public class LinkDataViewSection extends TabContent
Label label = new Label(viewContext.getMessage(Dict.LINKED_DATA_SET_LINK));
label.addStyleName("linkDataViewLabel");
+ anchor.setText(StringEscapeUtils.unescapeHtml(dataset.getExternalDataManagementSystem()
+ .getLabel() + ":" + StringEscapeUtils.unescapeHtml(dataset.getExternalCode())));
+
Panel panel = new HorizontalPanel();
panel.add(label);
panel.add(anchor);
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js
index c86cdd3df43..b886ea43758 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js
@@ -744,9 +744,7 @@ var common = {
processing_info_msg: "'{0}' has been scheduled successfully. Email will be send to you when it is finished.",
dataset_not_available_msg: "Data Set {0} is {1}. You can not perform any operation using its data.",
linked_data_set: "Linked Data Set",
- linked_data_set_info: "This is a linked data set",
- linked_data_set_code: "External Code: ",
- linked_data_set_dms: "External DMS: ",
+ linked_data_set_info: "This is a linked data set.",
linked_data_set_link: "Link: ",
linked_data_set_link_not_available: "Link: not available",
--
GitLab