From 64a8b9d89d0410cffbbf7143ac19ea60a3389648 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Wed, 27 Jan 2010 13:00:44 +0000
Subject: [PATCH] [LMS-1350] minor: added empty text
SVN: 14493
---
.../generic/client/web/client/application/Dict.java | 12 ++++++++----
.../client/application/ui/data/DataSetTypeGrid.java | 13 ++++++++-----
.../cisd/openbis/public/common-dictionary.js | 6 ++++--
3 files changed, 20 insertions(+), 11 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 67a6d146aeb..5f7224b2a57 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
@@ -897,8 +897,16 @@ public abstract class Dict
public static final String MAIN_DATA_SET_PATH = "main_data_set_path";
+ public static final String MAIN_DATA_SET_PATH_TOOLTIP = "main_data_set_path_tooltip";
+
+ public static final String MAIN_DATA_SET_PATH_EXAMPLE = "main_data_set_path_example";
+
public static final String MAIN_DATA_SET_PATTERN = "main_data_set_pattern";
+ public static final String MAIN_DATA_SET_PATTERN_TOOLTIP = "main_data_set_pattern_tooltip";
+
+ public static final String MAIN_DATA_SET_PATTERN_EXAMPLE = "main_data_set_pattern_example";
+
public static final String AUTO_RESOLVE_LABEL = "auto_resolve_label";
public static final String DATA_REPORT_LABEL = "data_report_label";
@@ -907,9 +915,5 @@ public abstract class Dict
public static final String EXPLORE_LABEL = "explore_label";
- public static final String TOOLTIP_MAIN_DATA_SET_PATTERN = "tooltip_main_data_set_pattern";
-
- public static final String TOOLTIP_MAIN_DATA_SET_PATH = "tooltip_main_data_set_path";
-
// ----- end generic ------------------
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetTypeGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetTypeGrid.java
index a6e1c13fb08..d9e31b1d077 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetTypeGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetTypeGrid.java
@@ -124,7 +124,7 @@ public class DataSetTypeGrid extends AbstractEntityTypeGrid<DataSetType>
descriptionField.setValueAndUnescape(dataSetType.getDescription());
addField(descriptionField);
- mainDataSetPatternField = createMainDataSettPatternField();
+ mainDataSetPatternField = createMainDataSetPatternField();
mainDataSetPatternField.setValue(StringEscapeUtils.unescapeHtml(dataSetType
.getMainDataSetPattern()));
addField(mainDataSetPatternField);
@@ -169,7 +169,7 @@ public class DataSetTypeGrid extends AbstractEntityTypeGrid<DataSetType>
private TextField<String> mainDataSetPathField;
{
- mainDataSetPatternField = createMainDataSettPatternField();
+ mainDataSetPatternField = createMainDataSetPatternField();
addField(mainDataSetPatternField);
mainDataSetPathField = createMainDataSetPathField();
@@ -196,12 +196,14 @@ public class DataSetTypeGrid extends AbstractEntityTypeGrid<DataSetType>
};
}
- private TextField<String> createMainDataSettPatternField()
+ private TextField<String> createMainDataSetPatternField()
{
TextField<String> mainDataSetPatternField = new TextField<String>();
mainDataSetPatternField.setFieldLabel(viewContext.getMessage(Dict.MAIN_DATA_SET_PATTERN));
mainDataSetPatternField.setToolTip(viewContext
- .getMessage(Dict.TOOLTIP_MAIN_DATA_SET_PATTERN));
+ .getMessage(Dict.MAIN_DATA_SET_PATTERN_TOOLTIP));
+ mainDataSetPatternField.setEmptyText(viewContext
+ .getMessage(Dict.MAIN_DATA_SET_PATTERN_EXAMPLE));
return mainDataSetPatternField;
}
@@ -209,7 +211,8 @@ public class DataSetTypeGrid extends AbstractEntityTypeGrid<DataSetType>
{
TextField<String> mainDataSetPathField = new TextField<String>();
mainDataSetPathField.setFieldLabel(viewContext.getMessage(Dict.MAIN_DATA_SET_PATH));
- mainDataSetPathField.setToolTip(viewContext.getMessage(Dict.TOOLTIP_MAIN_DATA_SET_PATH));
+ mainDataSetPathField.setToolTip(viewContext.getMessage(Dict.MAIN_DATA_SET_PATH_TOOLTIP));
+ mainDataSetPathField.setEmptyText(viewContext.getMessage(Dict.MAIN_DATA_SET_PATH_EXAMPLE));
return mainDataSetPathField;
}
}
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 2f6294f9dcc..f0208b6662f 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
@@ -39,9 +39,11 @@ var common = {
add_attachment: "Add attachment",
data_view: "Data View",
main_data_set_path: "Main Data Set Path",
- tooltip_main_data_set_path: "The path (relative to the top directory of a data set) that will be used as a starting point of 'main data set' lookup.\nExample: 'original/images/'",
+ main_data_set_path_tooltip: "The path (relative to the top directory of a data set) that will be used as a starting point of 'main data set' lookup.\nExample: 'original/images/'",
+ main_data_set_path_example: "for example: original/images/",
main_data_set_pattern: "Main Data Set Pattern",
- tooltip_main_data_set_pattern: "If there is just one data set with path matching chosen 'main data set' pattern, it will be automatically displayed.\nExample: '*.jpg'",
+ main_data_set_pattern_tooltip: "If there is just one data set with path matching chosen 'main data set' pattern, it will be automatically displayed.\nExample: '*.jpg'",
+ main_data_set_pattern_example: "for example: *.jpg",
auto_resolve_label: "Smart View",
data_report_label: "Report:",
explore_label: "Explore:",
--
GitLab