diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/batch/ReplaceBatchDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/batch/ReplaceBatchDialog.java
index c11e68e..7a1fe89 100644
--- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/batch/ReplaceBatchDialog.java
+++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/batch/ReplaceBatchDialog.java
@@ -63,7 +63,7 @@ public class ReplaceBatchDialog extends Window implements MonitorDialogListener
/**
*
* @param trId
- * @param columnName
+ * @param columnLocalId
* @param eventBus
*/
public ReplaceBatchDialog(TRId trId, String columnLocalId, EventBus eventBus) {
diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/AddColumnDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/AddColumnDialog.java
index 3427f4a..8162b0d 100644
--- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/AddColumnDialog.java
+++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/AddColumnDialog.java
@@ -4,6 +4,7 @@ import org.gcube.portlets.user.td.columnwidget.client.resources.ResourceBundle;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import com.allen_sauer.gwt.log.client.Log;
+import com.google.gwt.core.client.GWT;
import com.google.web.bindery.event.shared.EventBus;
import com.sencha.gxt.widget.core.client.Window;
import com.sencha.gxt.widget.core.client.event.SelectEvent;
@@ -16,22 +17,24 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler;
*
*/
public class AddColumnDialog extends Window {
- protected String WIDTH = "650px";
- protected String HEIGHT = "530px";
- protected EventBus eventBus;
- protected AddColumnPanel addColumnPanel;
- protected TRId trId;
+ private static final String WIDTH = "650px";
+ private static final String HEIGHT = "530px";
+ private AddColumnPanel addColumnPanel;
+ private AddColumnMessages msgs;
public AddColumnDialog(TRId trId, EventBus eventBus) {
super();
Log.debug("AddColumnDialog");
- this.eventBus = eventBus;
- this.trId=trId;
+ initMessages();
initWindow();
addColumnPanel = new AddColumnPanel(this, trId,eventBus);
add(addColumnPanel);
}
-
+
+ protected void initMessages(){
+ msgs = GWT.create(AddColumnMessages.class);
+ }
+
protected void initWindow() {
setWidth(WIDTH);
setHeight(HEIGHT);
@@ -42,7 +45,7 @@ public class AddColumnDialog extends Window {
setModal(true);
forceLayoutOnResize = true;
getHeader().setIcon(ResourceBundle.INSTANCE.columnValue());
- setHeadingText("Add Column");
+ setHeadingText(msgs.dialogHead());
}
/**
diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/AddColumnMessages.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/AddColumnMessages.java
new file mode 100644
index 0000000..227efeb
--- /dev/null
+++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/AddColumnMessages.java
@@ -0,0 +1,114 @@
+package org.gcube.portlets.user.td.columnwidget.client.create;
+
+import com.google.gwt.i18n.client.Messages;
+
+/**
+ *
+ * @author giancarlo email: g.panichi@isti.cnr.it
+ *
+ */
+public interface AddColumnMessages extends Messages {
+
+ @DefaultMessage("Add Column")
+ String dialogHead();
+
+ @DefaultMessage("Add expression")
+ String btnAddExpressionToolTip();
+
+ @DefaultMessage("Remove expression")
+ String btnRemoveExpressionToolTip();
+
+ @DefaultMessage("Expression")
+ String defaultStringLabel();
+
+ @DefaultMessage("Select a column type...")
+ String comboColumnTypeCodeEmptyText();
+
+ @DefaultMessage("Select a measure type...")
+ String comboMeasureTypeEmptyText();
+
+ @DefaultMessage("Measure Type")
+ String comboMeasureTypeLabel();
+
+ @DefaultMessage("Label")
+ String columnLabelFieldLabel();
+
+ @DefaultMessage("Select a column type...")
+ String comboAttributeTypeEmptyText();
+
+ @DefaultMessage("Column Type")
+ String comboColumnTypeCodeLabel();
+
+ @DefaultMessage("Attribute Type")
+ String comboAttributeTypeLabel();
+
+ @DefaultMessage("Select a locale type...")
+ String comboLocaleTypeEmptyText();
+
+ @DefaultMessage("Locale")
+ String comboLocaleTypeLabel();
+
+ @DefaultMessage("Select a Codelist...")
+ String comboDimensionTypeEmptyText();
+
+ @DefaultMessage("Codelist")
+ String comboDimensionTypeLabel();
+
+ @DefaultMessage("Select a Column Reference...")
+ String comboColumnReferenceTypeEmptyText();
+
+ @DefaultMessage("Column")
+ String comboColumnReferenceTypeLabel();
+
+ @DefaultMessage("Select a time dimension type...")
+ String comboTimeDimensionTypeEmptyText();
+
+ @DefaultMessage("Time Type")
+ String comboTimeDimensionTypeLabel();
+
+ @DefaultMessage("Add")
+ String btnAddColumnText();
+
+ @DefaultMessage("Add Column")
+ String btnAddColumnToolTip();
+
+ @DefaultMessage("Column data type not selected!")
+ String columnDataTypeNotSelected();
+
+ @DefaultMessage("No locale selected!")
+ String noLocaleSelected();
+
+ @DefaultMessage("No column reference selected!")
+ String noColumnReferenceSelected();
+
+ @DefaultMessage("Time Dimension type not selected!")
+ String timeDimensionTypeNotSelected();
+
+ @DefaultMessage("This column type is not supported now!")
+ String thisColumnTypeIsNotSupported();
+
+ @DefaultMessage("Select a column type!")
+ String selectAColumnType();
+
+ @DefaultMessage("Insert a valid label!")
+ String insertAValidLabel();
+
+ @DefaultMessage("Error in invocation of add column operation!")
+ String errorInInvocationOfAddColumnOperation();
+
+ @DefaultMessage("Error retrieving columns")
+ String errorRetrievingColumnsHead();
+
+ @DefaultMessage("Error retrieving columns on server!")
+ String errorRetrievingColumns();
+
+ @DefaultMessage("Error retrieving locales")
+ String errorRetrievingLocales();
+
+ @DefaultMessage("Error retrieving period type")
+ String errorRetrievingPeriodTypeHead();
+
+
+
+}
diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/AddColumnPanel.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/AddColumnPanel.java
index 59daaa6..ebe34c0 100644
--- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/AddColumnPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/AddColumnPanel.java
@@ -76,12 +76,12 @@ import com.sencha.gxt.widget.core.client.event.TriggerClickEvent.TriggerClickHan
import com.sencha.gxt.widget.core.client.form.ComboBox;
import com.sencha.gxt.widget.core.client.form.FieldLabel;
import com.sencha.gxt.widget.core.client.form.TextField;
-import com.sencha.gxt.widget.core.client.info.Info;
/**
*
- * @author "Giancarlo Panichi"
- *
+ * @author giancarlo email: g.panichi@isti.cnr.it
+ *
*/
public class AddColumnPanel extends FramedPanel implements
CodelistSelectionListener, MonitorDialogListener {
@@ -97,10 +97,7 @@ public class AddColumnPanel extends FramedPanel implements
private AddColumnDialog parent;
private TRId trId;
- // private AddColumnPanel thisPanel;
-
private ComboBox comboColumnTypeCode = null;
- // private FieldLabel comboColumnTypeCodeLabel;
private ComboBox comboMeasureType = null;
private FieldLabel comboMeasureTypeLabel;
@@ -127,15 +124,14 @@ public class AddColumnPanel extends FramedPanel implements
private TextButton btnAddColumn;
- private TextField label;
+ private TextField columnLabelField;
private TextField defaultValueString;
private FieldLabel defaultStringLabel;
private ExpressionWrapper exWrapper;
private TextButton btnRemoveExpression;
private TextButton btnAddExpression;
-
- // private DateTimeFormat sdf = DateTimeFormat.getFormat("yyyy-MM-dd");
+ private AddColumnMessages msgs;
/**
*
@@ -149,13 +145,14 @@ public class AddColumnPanel extends FramedPanel implements
this.parent = parent;
this.eventBus = eventBus;
this.trId = trId;
+ initMessages();
init();
create();
}
/**
*
- * @param parent
+ * @param trId
* @param eventBus
*/
public AddColumnPanel(TRId trId, EventBus eventBus) {
@@ -164,10 +161,15 @@ public class AddColumnPanel extends FramedPanel implements
// this.thisPanel = this;
this.eventBus = eventBus;
this.trId = trId;
+ initMessages();
init();
create();
}
+ protected void initMessages() {
+ msgs = GWT.create(AddColumnMessages.class);
+ }
+
protected void init() {
setWidth(WIDTH);
setHeight(HEIGHT);
@@ -177,7 +179,9 @@ public class AddColumnPanel extends FramedPanel implements
protected void create() {
// Label
- label = new TextField();
+ columnLabelField = new TextField();
+ FieldLabel columnLabelFieldLabel = new FieldLabel(columnLabelField,
+ msgs.columnLabelFieldLabel());
// Flow Expression
HBoxLayoutContainer flowExpression = new HBoxLayoutContainer();
@@ -198,10 +202,9 @@ public class AddColumnPanel extends FramedPanel implements
}
}, ClickEvent.getType());
-
btnAddExpression = new TextButton();
btnAddExpression.setIcon(ExpressionResources.INSTANCE.add());
- btnAddExpression.setToolTip("Add expression");
+ btnAddExpression.setToolTip(msgs.btnAddExpressionToolTip());
btnAddExpression.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
@@ -210,11 +213,10 @@ public class AddColumnPanel extends FramedPanel implements
}
});
btnAddExpression.setVisible(true);
-
-
+
btnRemoveExpression = new TextButton();
btnRemoveExpression.setIcon(ExpressionResources.INSTANCE.delete());
- btnRemoveExpression.setToolTip("Remove expression");
+ btnRemoveExpression.setToolTip(msgs.btnRemoveExpressionToolTip());
btnRemoveExpression.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
@@ -234,7 +236,8 @@ public class AddColumnPanel extends FramedPanel implements
flowExpression.add(btnRemoveExpression, flex1);
flowExpression.add(defaultValueString, flex2);
- defaultStringLabel = new FieldLabel(flowExpression, "Expression");
+ defaultStringLabel = new FieldLabel(flowExpression,
+ msgs.defaultStringLabel());
// comboColumnTypeCode
ColumnTypeCodeProperties propsColumnTypeCode = GWT
@@ -250,11 +253,14 @@ public class AddColumnPanel extends FramedPanel implements
addHandlersForComboColumnTypeCode(propsColumnTypeCode.label());
- comboColumnTypeCode.setEmptyText("Select a column type...");
+ comboColumnTypeCode.setEmptyText(msgs.comboColumnTypeCodeEmptyText());
comboColumnTypeCode.setWidth(191);
comboColumnTypeCode.setTypeAhead(true);
comboColumnTypeCode.setTriggerAction(TriggerAction.ALL);
+ FieldLabel comboColumnTypeCodeLabel = new FieldLabel(
+ comboColumnTypeCode, msgs.comboColumnTypeCodeLabel());
+
// comboMeasureType
ColumnDataTypeProperties propsMeasureType = GWT
.create(ColumnDataTypeProperties.class);
@@ -268,12 +274,13 @@ public class AddColumnPanel extends FramedPanel implements
addHandlersForComboMeasureType(propsMeasureType.label());
- comboMeasureType.setEmptyText("Select a measure type...");
+ comboMeasureType.setEmptyText(msgs.comboMeasureTypeEmptyText());
comboMeasureType.setWidth(191);
comboMeasureType.setTypeAhead(true);
comboMeasureType.setTriggerAction(TriggerAction.ALL);
- comboMeasureTypeLabel = new FieldLabel(comboMeasureType, "Measure Type");
+ comboMeasureTypeLabel = new FieldLabel(comboMeasureType,
+ msgs.comboMeasureTypeLabel());
// comboAttributeType
ColumnDataTypeProperties propsAttributeType = GWT
@@ -288,13 +295,13 @@ public class AddColumnPanel extends FramedPanel implements
addHandlersForComboAttributeType(propsAttributeType.label());
- comboAttributeType.setEmptyText("Select a column type...");
+ comboAttributeType.setEmptyText(msgs.comboAttributeTypeEmptyText());
comboAttributeType.setWidth(191);
comboAttributeType.setTypeAhead(true);
comboAttributeType.setTriggerAction(TriggerAction.ALL);
comboAttributeTypeLabel = new FieldLabel(comboAttributeType,
- "Attribute Type");
+ msgs.comboAttributeTypeLabel());
// comboLocaleType
LocaleTypeProperties propsLocaleType = GWT
@@ -318,12 +325,13 @@ public class AddColumnPanel extends FramedPanel implements
addHandlersForComboLocaleType(propsLocaleType.label());
- comboLocaleType.setEmptyText("Select a locale type...");
+ comboLocaleType.setEmptyText(msgs.comboLocaleTypeEmptyText());
comboLocaleType.setWidth(191);
comboLocaleType.setTypeAhead(true);
comboLocaleType.setTriggerAction(TriggerAction.ALL);
- comboLocaleTypeLabel = new FieldLabel(comboLocaleType, "Locale");
+ comboLocaleTypeLabel = new FieldLabel(comboLocaleType,
+ msgs.comboLocaleTypeLabel());
// comboDimensionType
TabResourcePropertiesCombo propsDimensionType = GWT
@@ -337,12 +345,13 @@ public class AddColumnPanel extends FramedPanel implements
addHandlersForComboDimensionType(propsDimensionType.label());
- comboDimensionType.setEmptyText("Select a Dimension...");
+ comboDimensionType.setEmptyText(msgs.comboDimensionTypeEmptyText());
comboDimensionType.setWidth(191);
comboDimensionType.setEditable(false);
comboDimensionType.setTriggerAction(TriggerAction.ALL);
- comboDimensionTypeLabel = new FieldLabel(comboDimensionType, "Codelist");
+ comboDimensionTypeLabel = new FieldLabel(comboDimensionType,
+ msgs.comboDimensionTypeLabel());
// ColumnReferenceType
ColumnDataPropertiesCombo propsColumnReferenceType = GWT
@@ -356,13 +365,14 @@ public class AddColumnPanel extends FramedPanel implements
addHandlersForComboColumnReferenceType(propsColumnReferenceType.label());
- comboColumnReferenceType.setEmptyText("Select a Column Reference...");
+ comboColumnReferenceType.setEmptyText(msgs
+ .comboColumnReferenceTypeEmptyText());
comboColumnReferenceType.setWidth(191);
comboColumnReferenceType.setEditable(false);
comboColumnReferenceType.setTriggerAction(TriggerAction.ALL);
comboColumnReferenceTypeLabel = new FieldLabel(
- comboColumnReferenceType, "Column");
+ comboColumnReferenceType, msgs.comboColumnReferenceTypeLabel());
// comboTimeDimensionType
PeriodDataTypeProperties propsTimeDimensionType = GWT
@@ -385,19 +395,20 @@ public class AddColumnPanel extends FramedPanel implements
addHandlersForComboTimeDimensionType(propsTimeDimensionType.label());
- comboTimeDimensionType.setEmptyText("Select a time dimension type...");
+ comboTimeDimensionType.setEmptyText(msgs
+ .comboTimeDimensionTypeEmptyText());
comboTimeDimensionType.setWidth(191);
comboTimeDimensionType.setTypeAhead(true);
comboTimeDimensionType.setTriggerAction(TriggerAction.ALL);
comboTimeDimensionTypeLabel = new FieldLabel(comboTimeDimensionType,
- "Time Type");
+ msgs.comboTimeDimensionTypeLabel());
// Save
- btnAddColumn = new TextButton("Add");
+ btnAddColumn = new TextButton(msgs.btnAddColumnText());
btnAddColumn.setIcon(ResourceBundle.INSTANCE.columnAdd());
btnAddColumn.setIconAlign(IconAlign.RIGHT);
- btnAddColumn.setToolTip("Add Column");
+ btnAddColumn.setToolTip(msgs.btnAddColumnToolTip());
SelectHandler changeHandler = new SelectHandler() {
@@ -408,11 +419,12 @@ public class AddColumnPanel extends FramedPanel implements
};
btnAddColumn.addSelectHandler(changeHandler);
+ //
VerticalLayoutContainer v = new VerticalLayoutContainer();
- v.add(new FieldLabel(label, "Label"), new VerticalLayoutData(1, -1,
+ v.add(columnLabelFieldLabel, new VerticalLayoutData(1, -1, new Margins(
+ 1)));
+ v.add(comboColumnTypeCodeLabel, new VerticalLayoutData(1, -1,
new Margins(1)));
- v.add(new FieldLabel(comboColumnTypeCode, "Column Type"),
- new VerticalLayoutData(1, -1, new Margins(1)));
v.add(comboLocaleTypeLabel, new VerticalLayoutData(1, -1,
new Margins(1)));
v.add(comboMeasureTypeLabel, new VerticalLayoutData(1, -1, new Margins(
@@ -508,13 +520,6 @@ public class AddColumnPanel extends FramedPanel implements
.addSelectionHandler(new SelectionHandler() {
public void onSelection(
SelectionEvent event) {
- Info.display(
- "Column Type Selected",
- "You selected "
- + (event.getSelectedItem() == null ? "nothing"
- : labelProvider.getLabel(event
- .getSelectedItem())
- + "!"));
Log.debug("ComboColumnTypeCode selected: "
+ event.getSelectedItem());
ColumnTypeCodeElement columnType = event
@@ -531,13 +536,6 @@ public class AddColumnPanel extends FramedPanel implements
.addSelectionHandler(new SelectionHandler() {
public void onSelection(
SelectionEvent event) {
- Info.display(
- "Measure Type Selected",
- "You selected "
- + (event.getSelectedItem() == null ? "nothing"
- : labelProvider.getLabel(event
- .getSelectedItem())
- + "!"));
Log.debug("ComboMeasureType selected: "
+ event.getSelectedItem());
ColumnDataTypeElement measureType = event
@@ -554,13 +552,6 @@ public class AddColumnPanel extends FramedPanel implements
.addSelectionHandler(new SelectionHandler() {
public void onSelection(
SelectionEvent event) {
- Info.display(
- "Attribute Type Selected",
- "You selected "
- + (event.getSelectedItem() == null ? "nothing"
- : labelProvider.getLabel(event
- .getSelectedItem())
- + "!"));
Log.debug("ComboAttributeType selected: "
+ event.getSelectedItem());
ColumnDataTypeElement attributeType = event
@@ -577,13 +568,6 @@ public class AddColumnPanel extends FramedPanel implements
.addSelectionHandler(new SelectionHandler() {
public void onSelection(
SelectionEvent event) {
- Info.display(
- "Locale Type Selected",
- "You selected "
- + (event.getSelectedItem() == null ? "nothing"
- : labelProvider.getLabel(event
- .getSelectedItem())
- + "!"));
Log.debug("ComboLocaleType selected: "
+ event.getSelectedItem());
LocaleTypeElement localeType = event.getSelectedItem();
@@ -616,13 +600,6 @@ public class AddColumnPanel extends FramedPanel implements
comboColumnReferenceType
.addSelectionHandler(new SelectionHandler() {
public void onSelection(SelectionEvent event) {
- Info.display(
- "Column Reference Selected",
- "You selected "
- + (event.getSelectedItem() == null ? "nothing"
- : labelProvider.getLabel(event
- .getSelectedItem())
- + "!"));
Log.debug("ComboColumnReferenceType selected: "
+ event.getSelectedItem());
@@ -637,13 +614,6 @@ public class AddColumnPanel extends FramedPanel implements
comboTimeDimensionType
.addSelectionHandler(new SelectionHandler() {
public void onSelection(SelectionEvent event) {
- Info.display(
- "Time Dimension Type Selected",
- "You selected "
- + (event.getSelectedItem() == null ? "nothing"
- : labelProvider.getLabel(event
- .getSelectedItem())
- + "!"));
Log.debug("ComboTimeDimensionType selected: "
+ event.getSelectedItem());
PeriodDataType timeDimensionType = event
@@ -769,7 +739,7 @@ public class AddColumnPanel extends FramedPanel implements
ColumnMockUp columnMockUp;
String defaultV = defaultValueString.getCurrentValue();
- String labelS = label.getCurrentValue();
+ String labelS = columnLabelField.getCurrentValue();
if (labelS != null && !labelS.isEmpty()) {
ColumnTypeCodeElement columnTypeCodeElement = comboColumnTypeCode
@@ -810,12 +780,12 @@ public class AddColumnPanel extends FramedPanel implements
callAddColumm();
} else {
UtilsGXT3.alert("Attention",
- "Column data type not selected!");
+ msgs.columnDataTypeNotSelected());
}
} else {
UtilsGXT3.alert("Attention",
- "Column data type not selected!");
+ msgs.columnDataTypeNotSelected());
}
break;
case ATTRIBUTE:
@@ -924,11 +894,11 @@ public class AddColumnPanel extends FramedPanel implements
} else {
UtilsGXT3.alert("Attention",
- "Column data type not selected!");
+ msgs.columnDataTypeNotSelected());
}
} else {
UtilsGXT3.alert("Attention",
- "Column data type not selected!");
+ msgs.columnDataTypeNotSelected());
}
break;
case CODE:
@@ -981,7 +951,7 @@ public class AddColumnPanel extends FramedPanel implements
columnMockUp);
callAddColumm();
} else {
- UtilsGXT3.alert("Attention", "No locale selected!");
+ UtilsGXT3.alert("Attention", msgs.noLocaleSelected());
}
break;
@@ -996,7 +966,7 @@ public class AddColumnPanel extends FramedPanel implements
callAddColumm();
} else {
UtilsGXT3.alert("Attention",
- "No column reference selected!");
+ msgs.noColumnReferenceSelected());
}
break;
case TIMEDIMENSION:
@@ -1011,19 +981,19 @@ public class AddColumnPanel extends FramedPanel implements
} else {
UtilsGXT3.alert("Attention",
- "Time Dimension type not selected!");
+ msgs.timeDimensionTypeNotSelected());
}
break;
default:
UtilsGXT3.alert("Attention",
- "This column type is not supported now!");
+ msgs.thisColumnTypeIsNotSupported());
break;
}
} else {
- UtilsGXT3.alert("Attention", "Select a column type!");
+ UtilsGXT3.alert("Attention", msgs.selectAColumnType());
}
} else {
- UtilsGXT3.alert("Attntion", "Insert a valid label!");
+ UtilsGXT3.alert("Attntion", msgs.insertAValidLabel());
}
}
@@ -1031,7 +1001,7 @@ public class AddColumnPanel extends FramedPanel implements
protected ColumnMockUp retrieveColumnMockUp() {
ColumnMockUp columnMockUp = null;
- String labelS = label.getCurrentValue();
+ String labelS = columnLabelField.getCurrentValue();
if (labelS != null && !labelS.isEmpty()) {
ColumnTypeCodeElement columnTypeCodeElement = comboColumnTypeCode
@@ -1050,12 +1020,12 @@ public class AddColumnPanel extends FramedPanel implements
type, dataType, "");
} else {
UtilsGXT3.alert("Attention",
- "Column data type not selected!");
+ msgs.columnDataTypeNotSelected());
}
} else {
UtilsGXT3.alert("Attention",
- "Column data type not selected!");
+ msgs.columnDataTypeNotSelected());
}
break;
case ATTRIBUTE:
@@ -1070,11 +1040,11 @@ public class AddColumnPanel extends FramedPanel implements
} else {
UtilsGXT3.alert("Attention",
- "Column data type not selected!");
+ msgs.columnDataTypeNotSelected());
}
} else {
UtilsGXT3.alert("Attention",
- "Column data type not selected!");
+ msgs.columnDataTypeNotSelected());
}
break;
case CODE:
@@ -1092,7 +1062,7 @@ public class AddColumnPanel extends FramedPanel implements
type, locale.getLocaleName(), "");
} else {
- UtilsGXT3.alert("Attention", "No locale selected!");
+ UtilsGXT3.alert("Attention", msgs.noLocaleSelected());
}
break;
case DIMENSION:
@@ -1104,7 +1074,7 @@ public class AddColumnPanel extends FramedPanel implements
} else {
UtilsGXT3.alert("Attention",
- "No column reference selected!");
+ msgs.noColumnReferenceSelected());
}
break;
case TIMEDIMENSION:
@@ -1116,19 +1086,19 @@ public class AddColumnPanel extends FramedPanel implements
} else {
UtilsGXT3.alert("Attention",
- "Time Dimension type not selected!");
+ msgs.timeDimensionTypeNotSelected());
}
break;
default:
UtilsGXT3.alert("Attention",
- "This column type is not supported now!");
+ msgs.thisColumnTypeIsNotSupported());
break;
}
} else {
- UtilsGXT3.alert("Attention", "Select a column type!");
+ UtilsGXT3.alert("Attention", msgs.selectAColumnType());
}
} else {
- UtilsGXT3.alert("Attention", "Insert a valid label!");
+ UtilsGXT3.alert("Attention", msgs.insertAValidLabel());
}
return columnMockUp;
@@ -1155,9 +1125,9 @@ public class AddColumnPanel extends FramedPanel implements
} else {
Log.debug("Add Column Error: "
+ caught.getLocalizedMessage());
- UtilsGXT3
- .alert("Add Column Error ",
- "Error in invocation of add column operation!");
+ UtilsGXT3.alert(
+ "Add Column Error ",
+ msgs.errorInInvocationOfAddColumnOperation());
}
}
}
@@ -1221,9 +1191,9 @@ public class AddColumnPanel extends FramedPanel implements
} else {
Log.debug("Error retrieving columns: "
+ caught.getLocalizedMessage());
- UtilsGXT3
- .alert("Error retrieving columns",
- "Error retrieving columns on server!");
+ UtilsGXT3.alert(
+ msgs.errorRetrievingColumnsHead(),
+ msgs.errorRetrievingColumns());
}
}
}
@@ -1263,7 +1233,8 @@ public class AddColumnPanel extends FramedPanel implements
caught.getLocalizedMessage());
} else {
Log.debug(caught.getLocalizedMessage());
- UtilsGXT3.alert("Error retrieving locales",
+ UtilsGXT3.alert(
+ msgs.errorRetrievingLocales(),
caught.getLocalizedMessage());
}
}
@@ -1309,8 +1280,8 @@ public class AddColumnPanel extends FramedPanel implements
caught.getLocalizedMessage());
} else {
Log.debug(caught.getLocalizedMessage());
- UtilsGXT3.alert(
- "Error retrieving period type",
+ UtilsGXT3.alert(msgs
+ .errorRetrievingPeriodTypeHead(),
caught.getLocalizedMessage());
}
}
diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/CreateDefColumnDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/CreateDefColumnDialog.java
index 96ee1bb..94deb50 100644
--- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/CreateDefColumnDialog.java
+++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/CreateDefColumnDialog.java
@@ -4,6 +4,7 @@ import org.gcube.portlets.user.td.columnwidget.client.resources.ResourceBundle;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.TableType;
import com.allen_sauer.gwt.log.client.Log;
+import com.google.gwt.core.client.GWT;
import com.google.web.bindery.event.shared.EventBus;
import com.sencha.gxt.widget.core.client.Window;
import com.sencha.gxt.widget.core.client.event.SelectEvent;
@@ -17,23 +18,26 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler;
*
*/
public class CreateDefColumnDialog extends Window {
- protected String WIDTH = "460px";
- protected String HEIGHT = "220px";
- protected EventBus eventBus;
- protected CreateDefColumnPanel createDefColumnPanel;
- protected TableType tableType;
+ private static final String WIDTH = "460px";
+ private static final String HEIGHT = "220px";
+ private CreateDefColumnPanel createDefColumnPanel;
+ private CreateDefColumnMessages msgs;
public CreateDefColumnDialog(TableType tableType,
EventBus eventBus) {
super();
Log.debug("CreateDefColumnDialog [tableType: "+tableType+"]");
- this.eventBus = eventBus;
- this.tableType = tableType;
+ initMessages();
initWindow();
createDefColumnPanel = new CreateDefColumnPanel(this, tableType,
eventBus);
add(createDefColumnPanel);
}
+
+ protected void initMessages(){
+ msgs = GWT.create(CreateDefColumnMessages.class);
+ }
+
protected void initWindow() {
setWidth(WIDTH);
@@ -45,7 +49,7 @@ public class CreateDefColumnDialog extends Window {
setModal(true);
forceLayoutOnResize = true;
getHeader().setIcon(ResourceBundle.INSTANCE.columnValue());
- setHeadingText("Column Definition");
+ setHeadingText(msgs.dialogHead());
}
/**
diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/CreateDefColumnListener.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/CreateDefColumnListener.java
index 9fca2c7..34cb974 100644
--- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/CreateDefColumnListener.java
+++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/CreateDefColumnListener.java
@@ -14,10 +14,9 @@ public interface CreateDefColumnListener {
public void abortedDefColumnCreation();
/**
- * Called when the something is failed.
- *
+ *
* @param reason
- * @param detail
+ * @param details
*/
public void failedDefColumnCreation(String reason, String details);
}
diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/CreateDefColumnMessages.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/CreateDefColumnMessages.java
new file mode 100644
index 0000000..c8e7fe7
--- /dev/null
+++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/CreateDefColumnMessages.java
@@ -0,0 +1,60 @@
+package org.gcube.portlets.user.td.columnwidget.client.create;
+
+import com.google.gwt.i18n.client.Messages;
+
+/**
+ *
+ * @author giancarlo email: g.panichi@isti.cnr.it
+ *
+ */
+public interface CreateDefColumnMessages extends Messages {
+
+ @DefaultMessage("Column Definition")
+ String dialogHead();
+
+ @DefaultMessage("Column Label")
+ String columnLabel();
+
+ @DefaultMessage("Default Value")
+ String defaultValueLabel();
+
+ @DefaultMessage("Select a column type...")
+ String comboColumnTypeCodeEmptyText();
+
+ @DefaultMessage("Column Type")
+ String comboColumnTypeCodeLabel();
+
+ @DefaultMessage("Select a locale type...")
+ String comboLocaleTypeEmptyText();
+
+ @DefaultMessage("Locale")
+ String comboLocaleTypeLabel();
+
+ @DefaultMessage("Save")
+ String btnSaveText();
+
+ @DefaultMessage("Save")
+ String btnSaveToolTip();
+
+ @DefaultMessage("Close")
+ String btnCloseText();
+
+ @DefaultMessage("Close")
+ String btnCloseToolTip();
+
+ @DefaultMessage("Add a label")
+ String addALabel();
+
+ @DefaultMessage("No type selected")
+ String noTypeSelected();
+
+ @DefaultMessage("No locale selected")
+ String noLocaleSelected();
+
+ @DefaultMessage("Error retrieving locales")
+ String errorRetrievingLocaleHead();
+
+
+
+}
diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/CreateDefColumnPanel.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/CreateDefColumnPanel.java
index 8d63b2c..412e675 100644
--- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/CreateDefColumnPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/CreateDefColumnPanel.java
@@ -47,7 +47,6 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler;
import com.sencha.gxt.widget.core.client.form.ComboBox;
import com.sencha.gxt.widget.core.client.form.FieldLabel;
import com.sencha.gxt.widget.core.client.form.TextField;
-import com.sencha.gxt.widget.core.client.info.Info;
/**
* This Panel is used only with Codelist,
@@ -58,30 +57,31 @@ import com.sencha.gxt.widget.core.client.info.Info;
*
*/
public class CreateDefColumnPanel extends FramedPanel {
- protected static final String WIDTH = "448px";
- protected static final String HEIGHT = "180px";
- protected static final String FIELDWIDTH = "436px";
- protected static final String FIELDSHEIGHT = "130px";
+ private static final String WIDTH = "448px";
+ private static final String HEIGHT = "180px";
+ private static final String FIELDWIDTH = "436px";
+ private static final String FIELDSHEIGHT = "130px";
- protected ArrayList listeners;
+ private ArrayList listeners;
- protected EventBus eventBus;
- protected CreateDefColumnDialog parent;
- protected TableType tableType;
+ private EventBus eventBus;
+ private CreateDefColumnDialog parent;
+ private TableType tableType;
- protected ComboBox comboColumnTypeCode = null;
- protected FieldLabel comboColumnTypeCodeLabel;
+ private ComboBox comboColumnTypeCode = null;
+ private FieldLabel comboColumnTypeCodeLabel;
- protected ComboBox comboLocaleType = null;
- protected FieldLabel comboLocaleTypeLabel;
- protected ListStore storeComboLocaleType;
+ private ComboBox comboLocaleType = null;
+ private FieldLabel comboLocaleTypeLabel;
+ private ListStore storeComboLocaleType;
private TextButton btnSave;
private TextButton btnClose;
private SimpleContainer form;
private VerticalLayoutContainer formLayout;
- private TextField label;
+ private TextField columnLabel;
private TextField defaultValue;
+ private CreateDefColumnMessages msgs;
/**
*
@@ -96,10 +96,15 @@ public class CreateDefColumnPanel extends FramedPanel {
this.parent = parent;
this.eventBus = eventBus;
this.tableType = tableType;
+ initMessages();
initListeners();
init();
create();
}
+
+ protected void initMessages(){
+ msgs = GWT.create(CreateDefColumnMessages.class);
+ }
protected void init() {
setWidth(WIDTH);
@@ -114,13 +119,13 @@ public class CreateDefColumnPanel extends FramedPanel {
protected void create() {
// Label
- label = new TextField();
- FieldLabel nameLabel = new FieldLabel(label, "Column Label");
+ columnLabel = new TextField();
+ FieldLabel columnLabelLabel = new FieldLabel(columnLabel, msgs.columnLabel());
// Default Value
defaultValue = new TextField();
FieldLabel defaultValueLabel = new FieldLabel(defaultValue,
- "Default Value");
+ msgs.defaultValueLabel());
// comboColumnTypeCode
ColumnTypeCodeProperties propsColumnTypeCode = GWT
@@ -152,14 +157,14 @@ public class CreateDefColumnPanel extends FramedPanel {
addHandlersForComboColumnTypeCode(propsColumnTypeCode.label());
- comboColumnTypeCode.setEmptyText("Select a column type...");
+ comboColumnTypeCode.setEmptyText(msgs.comboColumnTypeCodeEmptyText());
comboColumnTypeCode.setWidth(191);
comboColumnTypeCode.setEditable(false);
comboColumnTypeCode.setTypeAhead(false);
comboColumnTypeCode.setTriggerAction(TriggerAction.ALL);
comboColumnTypeCodeLabel = new FieldLabel(comboColumnTypeCode,
- "Column Type");
+ msgs.comboColumnTypeCodeLabel());
// comboLocaleType
LocaleTypeProperties propsLocaleType = GWT
@@ -183,12 +188,12 @@ public class CreateDefColumnPanel extends FramedPanel {
addHandlersForComboLocaleType(propsLocaleType.label());
- comboLocaleType.setEmptyText("Select a locale type...");
+ comboLocaleType.setEmptyText(msgs.comboLocaleTypeEmptyText());
comboLocaleType.setWidth(191);
comboLocaleType.setTypeAhead(true);
comboLocaleType.setTriggerAction(TriggerAction.ALL);
- comboLocaleTypeLabel = new FieldLabel(comboLocaleType, "Locale");
+ comboLocaleTypeLabel = new FieldLabel(comboLocaleType, msgs.comboLocaleTypeLabel());
//
form = new SimpleContainer();
@@ -199,7 +204,7 @@ public class CreateDefColumnPanel extends FramedPanel {
formLayout.setScrollMode(ScrollMode.AUTO);
formLayout
- .add(nameLabel, new VerticalLayoutData(1, -1, new Margins(0)));
+ .add(columnLabelLabel, new VerticalLayoutData(1, -1, new Margins(0)));
formLayout.add(comboColumnTypeCodeLabel, new VerticalLayoutData(1, -1,
new Margins(0)));
formLayout.add(comboLocaleTypeLabel, new VerticalLayoutData(1, -1,
@@ -209,10 +214,10 @@ public class CreateDefColumnPanel extends FramedPanel {
form.add(formLayout);
- btnSave = new TextButton("Save");
+ btnSave = new TextButton(msgs.btnSaveText());
btnSave.setIcon(ResourceBundle.INSTANCE.save());
btnSave.setIconAlign(IconAlign.RIGHT);
- btnSave.setToolTip("Save");
+ btnSave.setToolTip(msgs.btnSaveToolTip());
btnSave.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
@@ -223,10 +228,10 @@ public class CreateDefColumnPanel extends FramedPanel {
}
});
- btnClose = new TextButton("Close");
+ btnClose = new TextButton(msgs.btnCloseText());
btnClose.setIcon(ResourceBundle.INSTANCE.close());
btnClose.setIconAlign(IconAlign.RIGHT);
- btnClose.setToolTip("Close");
+ btnClose.setToolTip(msgs.btnCloseToolTip());
btnClose.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
@@ -257,7 +262,7 @@ public class CreateDefColumnPanel extends FramedPanel {
ColumnTypeCode currentType = null;
String localeName = null;
- String lab = label.getCurrentValue();
+ String lab = columnLabel.getCurrentValue();
ColumnTypeCodeElement typeElement = comboColumnTypeCode
.getCurrentValue();
LocaleTypeElement localeElement = comboLocaleType.getCurrentValue();
@@ -266,18 +271,18 @@ public class CreateDefColumnPanel extends FramedPanel {
Log.debug("CheckValue: label: " + lab + ", type: " + typeElement
+ ", locale: " + localeElement + ", default: " + valueDefault);
if (lab == null || lab.isEmpty()) {
- UtilsGXT3.alert("Attention", "Add a label");
+ UtilsGXT3.alert("Attention", msgs.addALabel());
btnSave.enable();
return;
}
if (typeElement == null) {
- UtilsGXT3.alert("Attention", "No type selected");
+ UtilsGXT3.alert("Attention", msgs.noTypeSelected());
btnSave.enable();
return;
} else {
if (typeElement.getCode() == null) {
- UtilsGXT3.alert("Attention", "No type selected");
+ UtilsGXT3.alert("Attention", msgs.noTypeSelected());
btnSave.enable();
return;
} else {
@@ -297,13 +302,13 @@ public class CreateDefColumnPanel extends FramedPanel {
break;
case CODENAME:
if (localeElement == null) {
- UtilsGXT3.alert("Attention", "No locale selected");
+ UtilsGXT3.alert("Attention", msgs.noLocaleSelected());
btnSave.enable();
return;
} else {
if (localeElement.getLocaleName() == null
|| localeElement.getLocaleName().isEmpty()) {
- UtilsGXT3.alert("Attention", "No locale selected");
+ UtilsGXT3.alert("Attention", msgs.noLocaleSelected());
btnSave.enable();
return;
} else {
@@ -340,13 +345,6 @@ public class CreateDefColumnPanel extends FramedPanel {
.addSelectionHandler(new SelectionHandler() {
public void onSelection(
SelectionEvent event) {
- Info.display(
- "Column Type Selected",
- "You selected "
- + (event.getSelectedItem() == null ? "nothing"
- : labelProvider.getLabel(event
- .getSelectedItem())
- + "!"));
Log.debug("ComboColumnTypeCode selected: "
+ event.getSelectedItem());
ColumnTypeCodeElement columnType = event
@@ -363,13 +361,6 @@ public class CreateDefColumnPanel extends FramedPanel {
.addSelectionHandler(new SelectionHandler() {
public void onSelection(
SelectionEvent event) {
- Info.display(
- "Locale Type Selected",
- "You selected "
- + (event.getSelectedItem() == null ? "nothing"
- : labelProvider.getLabel(event
- .getSelectedItem())
- + "!"));
Log.debug("ComboLocaleType selected: "
+ event.getSelectedItem());
LocaleTypeElement localeType = event.getSelectedItem();
@@ -418,7 +409,7 @@ public class CreateDefColumnPanel extends FramedPanel {
caught.getLocalizedMessage());
} else {
Log.debug(caught.getLocalizedMessage());
- UtilsGXT3.alert("Error retrieving locales",
+ UtilsGXT3.alert(msgs.errorRetrievingLocaleHead(),
caught.getLocalizedMessage());
}
}
diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/custom/ActionButtonCellAppearance.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/custom/ActionButtonCellAppearance.java
index 866bb51..d58e450 100644
--- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/custom/ActionButtonCellAppearance.java
+++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/custom/ActionButtonCellAppearance.java
@@ -56,7 +56,7 @@ public class ActionButtonCellAppearance {
* Make icons available as SafeHtml to be displayed inside the table
*
* @param resource
- * @return
+ * @return
*/
private static SafeHtml makeImage(ImageResource resource) {
AbstractImagePrototype proto = AbstractImagePrototype.create(resource);
diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/dimension/CodelistSelectionDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/dimension/CodelistSelectionDialog.java
index 5454aae..3afb591 100644
--- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/dimension/CodelistSelectionDialog.java
+++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/dimension/CodelistSelectionDialog.java
@@ -66,34 +66,36 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
*
*/
public class CodelistSelectionDialog extends Window {
- protected static final int WIDTH = 550;
- protected static final int HEIGHT = 520;
- protected static final int CACHE_SIZE = 200;
-
- protected ArrayList listeners;
+ private static final int WIDTH = 550;
+ private static final int HEIGHT = 520;
+ private static final int CACHE_SIZE = 200;
+ private ArrayList listeners;
+
private static final TabResourcesProperties properties = GWT
.create(TabResourcesProperties.class);
+
+ private static CodelistSelectionMessages msgs = GWT.create(CodelistSelectionMessages.class);
- protected static final ColumnConfig nameColumn = new ColumnConfig(
- properties.name(), 50, "Name");
- protected static final ColumnConfig agencyColumn = new ColumnConfig(
- properties.agency(), 50, "Agency");
- protected static final ColumnConfig dateColumn = new ColumnConfig(
- properties.date(), 50, "Date");
+ private static final ColumnConfig nameColumn = new ColumnConfig(
+ properties.name(), 50, msgs.nameColumnLabel());
+ private static final ColumnConfig agencyColumn = new ColumnConfig(
+ properties.agency(), 50, msgs.agencyColumn());
+ private static final ColumnConfig dateColumn = new ColumnConfig(
+ properties.date(), 50, msgs.dateColumn());
- protected EventBus eventBus;
- protected Grid grid;
- protected ExtendedLiveGridView liveGridView;
- protected PagingLoader> loader;
- protected String filter;
- protected boolean firstLoad = true;
+ private EventBus eventBus;
+ private Grid grid;
+ private ExtendedLiveGridView liveGridView;
+ private PagingLoader> loader;
+ private String filter;
+ private boolean firstLoad = true;
- protected TabResource selectedTR;
-
- protected ResourceBundle res;
- private TextButton select;
+ private TabResource selectedTR;
+ private ResourceBundle res;
+ private TextButton btnSelect;
+
public CodelistSelectionDialog(EventBus eventBus) {
Log.info("Dialog CodelistSelection");
this.eventBus = eventBus;
@@ -102,6 +104,7 @@ public class CodelistSelectionDialog extends Window {
create();
}
+
protected void initWindow() {
setWidth(WIDTH);
@@ -109,7 +112,7 @@ public class CodelistSelectionDialog extends Window {
res = ResourceBundle.INSTANCE;
setBodyBorder(false);
setResizable(false);
- setHeadingText("Select Codelist");
+ setHeadingText(msgs.dialogHead());
setModal(true);
//setZIndex(Integer.MAX_VALUE);
}
@@ -124,14 +127,14 @@ public class CodelistSelectionDialog extends Window {
// Search
ToolBar toolBar = new ToolBar();
- toolBar.add(new LabelToolItem("Search: "));
+ toolBar.add(new LabelToolItem(msgs.search()));
final TextField searchField = new TextField();
toolBar.add(searchField);
TextButton btnReload = new TextButton();
- btnReload.setText("Reload");
+ btnReload.setText(msgs.btnReloadText());
btnReload.setIcon(res.refresh());
- btnReload.setToolTip("Reload");
+ btnReload.setToolTip(msgs.btnReloadToolTip());
toolBar.add(btnReload);
IdentityValueProvider identity = new IdentityValueProvider();
@@ -176,7 +179,7 @@ public class CodelistSelectionDialog extends Window {
liveGridView = new ExtendedLiveGridView();
liveGridView.setForceFit(true);
- liveGridView.setEmptyText("No Results.");
+ liveGridView.setEmptyText(msgs.gridEmptyText());
liveGridView.setCacheSize(CACHE_SIZE);
grid = new Grid(store, cm) {
@@ -221,9 +224,10 @@ public class CodelistSelectionDialog extends Window {
panel.add(v);
- select = new TextButton("Select");
- select.disable();
- select.addSelectHandler(new SelectHandler() {
+ btnSelect = new TextButton(msgs.btnSelectText());
+ btnSelect.setToolTip(msgs.btnSelectToolTip());
+ btnSelect.disable();
+ btnSelect.addSelectHandler(new SelectHandler() {
@Override
public void onSelect(SelectEvent event) {
@@ -231,7 +235,7 @@ public class CodelistSelectionDialog extends Window {
}
});
- panel.addButton(select);
+ panel.addButton(btnSelect);
add(panel);
forceLayout();
@@ -264,7 +268,7 @@ public class CodelistSelectionDialog extends Window {
"This tabular resource does not have a valid table");
UtilsGXT3
.alert("Attention",
- "This tabular resource does not have a valid table");
+ msgs.thisTabularResourceDoesHaveAValidTable());
}
}
}
@@ -279,7 +283,7 @@ public class CodelistSelectionDialog extends Window {
});
} else {
- UtilsGXT3.alert("Attention", "Select a codelist!");
+ UtilsGXT3.alert("Attention", msgs.selectACodelist());
}
}
@@ -345,8 +349,8 @@ public class CodelistSelectionDialog extends Window {
caught.getMessage());
caught.printStackTrace();
UtilsGXT3
- .alert("Error Retrieving Codelist",
- "Error retrieving codelist on server");
+ .alert(msgs.errorRetrievingCodelistHead(),
+ msgs.errorRetrievingCodelist());
}
}
}
@@ -390,8 +394,8 @@ public class CodelistSelectionDialog extends Window {
caught.getMessage());
caught.printStackTrace();
UtilsGXT3
- .alert("Error Retrieving Codelist",
- "Error error in retrieving the codelists during the initialization phase!");
+ .alert(msgs.errorRetrievingCodelistHead(),
+ msgs.errorRetrievingCodelistDuringInitializationPhase());
}
}
}
@@ -412,7 +416,7 @@ public class CodelistSelectionDialog extends Window {
SelectionHandler hand = new SelectionHandler() {
public void onSelection(SelectionEvent event) {
- select.enable();
+ btnSelect.enable();
}
};
diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/dimension/CodelistSelectionMessages.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/dimension/CodelistSelectionMessages.java
new file mode 100644
index 0000000..0d773e0
--- /dev/null
+++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/dimension/CodelistSelectionMessages.java
@@ -0,0 +1,60 @@
+package org.gcube.portlets.user.td.columnwidget.client.dimension;
+
+import com.google.gwt.i18n.client.Messages;
+
+/**
+ *
+ * @author giancarlo email: g.panichi@isti.cnr.it
+ *
+ */
+public interface CodelistSelectionMessages extends Messages {
+
+ @DefaultMessage("Select Codelist")
+ String dialogHead();
+
+ @DefaultMessage("Search: ")
+ String search();
+
+ @DefaultMessage("Reload")
+ String btnReloadText();
+
+ @DefaultMessage("Reload")
+ String btnReloadToolTip();
+
+ @DefaultMessage("Name")
+ String nameColumnLabel();
+
+ @DefaultMessage("Agency")
+ String agencyColumn();
+
+ @DefaultMessage("Date")
+ String dateColumn();
+
+ @DefaultMessage("No Results.")
+ String gridEmptyText();
+
+ @DefaultMessage("Select")
+ String btnSelectText();
+
+ @DefaultMessage("Select")
+ String btnSelectToolTip();
+
+ @DefaultMessage("This tabular resource does not have a valid table!")
+ String thisTabularResourceDoesHaveAValidTable();
+
+ @DefaultMessage("Select a codelist!")
+ String selectACodelist();
+
+ @DefaultMessage("Error Retrieving Codelist")
+ String errorRetrievingCodelistHead();
+
+ @DefaultMessage("Error retrieving codelist on server!")
+ String errorRetrievingCodelist();
+
+ @DefaultMessage("Error retrieving the codelists during the initialization phase!")
+ String errorRetrievingCodelistDuringInitializationPhase();
+
+
+
+}
diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypeMessages_es.properties b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypeMessages_es.properties
index 1327463..35c1031 100644
--- a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypeMessages_es.properties
+++ b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypeMessages_es.properties
@@ -5,7 +5,7 @@ comboColumnTypeCodeEmptyText = Seleccionar tipo...
comboColumnTypeCodeLabel = Tipo
comboMeasureTypeEmptyText = Seleccionar medida...
comboMeasureTypeLabel = Medida
-comboAttributeTypeEmptyText = Seleccionar attributo...
+comboAttributeTypeEmptyText = Seleccionar atributo...
comboAttributeTypeLabel = Atributo
comboLocaleTypeEmptyText = Seleccionar locale...
comboLocaleTypeLabel = Locale
diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/create/AddColumnMessages.properties b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/create/AddColumnMessages.properties
new file mode 100644
index 0000000..d22dbfa
--- /dev/null
+++ b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/create/AddColumnMessages.properties
@@ -0,0 +1,33 @@
+dialogHead = Add Column
+btnAddExpressionToolTip = Add expression
+btnRemoveExpressionToolTip = Remove expression
+defaultStringLabel = Expression
+comboColumnTypeCodeEmptyText = Select a column type...
+comboMeasureTypeEmptyText = Select a measure type...
+comboMeasureTypeLabel = Measure Type
+columnLabelFieldLabel = Label
+comboAttributeTypeEmptyText = Select a column type...
+comboColumnTypeCodeLabel = Column Type
+comboAttributeTypeLabel = Attribute Type
+comboLocaleTypeEmptyText = Select a locale type...
+comboLocaleTypeLabel = Locale
+comboDimensionTypeEmptyText = Select Codelist...
+comboDimensionTypeLabel = Codelist
+comboColumnReferenceTypeEmptyText = Select a Column Reference...
+comboColumnReferenceTypeLabel = Column
+comboTimeDimensionTypeEmptyText = Select a time dimension type...
+comboTimeDimensionTypeLabel = Time Type
+btnAddColumnText = Add
+btnAddColumnToolTip = Add Column
+columnDataTypeNotSelected = Column data type not selected!
+noLocaleSelected = No locale selected!
+noColumnReferenceSelected = No column reference selected!
+timeDimensionTypeNotSelected = Time Dimension type not selected!
+thisColumnTypeIsNotSupported = This column type is not supported now!
+selectAColumnType = Select a column type!
+insertAValidLabel = Insert a valid label!
+errorInInvocationOfAddColumnOperation = Error in invocation of add column operation!
+errorRetrievingColumnsHead = Error retrieving columns
+errorRetrievingColumns = Error retrieving columns on server!
+errorRetrievingLocales = Error retrieving locales
+errorRetrievingPeriodTypeHead = Error retrieving period type
diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/create/AddColumnMessages_es.properties b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/create/AddColumnMessages_es.properties
new file mode 100644
index 0000000..807471c
--- /dev/null
+++ b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/create/AddColumnMessages_es.properties
@@ -0,0 +1,33 @@
+dialogHead = Añadir Columna
+btnAddExpressionToolTip = Añadir expresión
+btnRemoveExpressionToolTip = Borrar expresión
+defaultStringLabel = Expresión
+comboColumnTypeCodeEmptyText = Seleccionar tipo...
+comboColumnTypeCodeLabel = Tipo
+comboMeasureTypeEmptyText = Seleccionar medida...
+comboMeasureTypeLabel = Medida
+columnLabelFieldLabel = Etiqueta
+comboAttributeTypeEmptyText = Seleccionar atributo...
+comboAttributeTypeLabel = Atributo
+comboLocaleTypeEmptyText = Seleccionar locale...
+comboLocaleTypeLabel = Locale
+comboDimensionTypeEmptyText = Seleccionar Codelist...
+comboDimensionTypeLabel = Codelist
+comboColumnReferenceTypeEmptyText = Seleccionar referencia...
+comboColumnReferenceTypeLabel = Columna
+comboTimeDimensionTypeEmptyText = Seleccionar Time Dimension...
+comboTimeDimensionTypeLabel = Time Dimension
+btnAddColumnText = Añadir
+btnAddColumnToolTip = Añadir Columna
+columnDataTypeNotSelected = Tipo de columna no seleccionado!
+noLocaleSelected = Locale no seleccionado!
+noColumnReferenceSelected = Columna de referencia no seleccionada!
+timeDimensionTypeNotSelected = Time Dimension no seleccionada!
+thisColumnTypeIsNotSupported = Este tipo de columna no está soportada en este momento!
+selectAColumnType = Seleccione un tipo de columna!
+insertAValidLabel = Introducir una etiqueta válida!
+errorInInvocationOfAddColumnOperation = Error con la invocación de añadir columna!
+errorRetrievingColumnsHead = Error al recuperar las columnas
+errorRetrievingColumns = Error al recuperar las columnas en el servidor!
+errorRetrievingLocales = Error al recuperar locales
+errorRetrievingPeriodTypeHead = Error al recuperar períodos
\ No newline at end of file
diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/create/AddColumnMessages_it.properties b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/create/AddColumnMessages_it.properties
new file mode 100644
index 0000000..4f891ee
--- /dev/null
+++ b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/create/AddColumnMessages_it.properties
@@ -0,0 +1,33 @@
+dialogHead = Aggiungi Colonna
+btnAddExpressionToolTip = Aggiungi espressione
+btnRemoveExpressionToolTip = Rimuovi espressione
+defaultStringLabel = Espressione
+comboColumnTypeCodeEmptyText = Seleziona tipo...
+comboColumnTypeCodeLabel = Tipo
+comboMeasureTypeEmptyText = Seleziona misura...
+comboMeasureTypeLabel = Misura
+columnLabelFieldLabel = Etichetta
+comboAttributeTypeEmptyText = Seleziona Attributo...
+comboAttributeTypeLabel = Attributo
+comboLocaleTypeEmptyText = Seleziona locale...
+comboLocaleTypeLabel = Locale
+comboDimensionTypeEmptyText = Seleziona Codelist...
+comboDimensionTypeLabel = Codelist
+comboColumnReferenceTypeEmptyText = Seleziona riferimento...
+comboColumnReferenceTypeLabel = Colonna
+comboTimeDimensionTypeEmptyText = Seleziona Time Dimension...
+comboTimeDimensionTypeLabel = Time Type
+btnAddColumnText = Aggiungi
+btnAddColumnToolTip = Aggiungi Colonna
+columnDataTypeNotSelected = Tipo colonna non selezionato!
+noLocaleSelected = Nessun locale selezionato!
+noColumnReferenceSelected = Nessun riferimento selezionato!
+timeDimensionTypeNotSelected = Time Dimension non selezionata!
+thisColumnTypeIsNotSupported = Questo tipo di colonna non è supportato al momento!
+selectAColumnType = Seleziona un tipo di colonna!
+insertAValidLabel = Inserisci una etichetta valida!
+errorInInvocationOfAddColumnOperation = Errore nell''invocazione dell''operazione aggiungi colonna!
+errorRetrievingColumnsHead = Errore recuperando le colonne
+errorRetrievingColumns = Errore recuperando le colonne sul server!
+errorRetrievingLocales = Errore recuperando i locales
+errorRetrievingPeriodTypeHead = Errore recuperendo i periodi
diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/create/CreateDefColumnMessages.properties b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/create/CreateDefColumnMessages.properties
new file mode 100644
index 0000000..368ec7d
--- /dev/null
+++ b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/create/CreateDefColumnMessages.properties
@@ -0,0 +1,15 @@
+dialogHead = Column Definition
+columnLabel = Column Label
+defaultValueLabel = Default Value
+comboColumnTypeCodeEmptyText = Select a column type...
+comboColumnTypeCodeLabel = Column Type
+comboLocaleTypeEmptyText = Select a locale type...
+comboLocaleTypeLabel = Locale
+btnSaveText = Save
+btnSaveToolTip = Save
+btnCloseText = Close
+btnCloseToolTip = Close
+addALabel = Add a label
+noTypeSelected = No type selected!
+noLocaleSelected = No locale selected!
+errorRetrievingLocaleHead = Error retrieving locales!
diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/create/CreateDefColumnMessages_es.properties b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/create/CreateDefColumnMessages_es.properties
new file mode 100644
index 0000000..b62d499
--- /dev/null
+++ b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/create/CreateDefColumnMessages_es.properties
@@ -0,0 +1,15 @@
+dialogHead = Columna definición
+columnLabel = Etiqueta
+defaultValueLabel = Default
+comboColumnTypeCodeEmptyText = Seleccionar tipo...
+comboColumnTypeCodeLabel = Tipo
+comboLocaleTypeEmptyText = Seleccionar locale...
+comboLocaleTypeLabel = Locale
+btnSaveText = Guardar
+btnSaveToolTip = Guardar
+btnCloseText = Cerrar
+btnCloseToolTip = Cerrar
+addALabel = Añadir la etiqueta!
+noTypeSelected = Ningún tipo seleccionado!
+noLocaleSelected = Ningún locale seleccionado!
+errorRetrievingLocaleHead = Error al recuperar locales!
\ No newline at end of file
diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/create/CreateDefColumnMessages_it.properties b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/create/CreateDefColumnMessages_it.properties
new file mode 100644
index 0000000..a1eba71
--- /dev/null
+++ b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/create/CreateDefColumnMessages_it.properties
@@ -0,0 +1,15 @@
+dialogHead = Definizione Colonna
+columnLabel = Etichetta
+defaultValueLabel = Default
+comboColumnTypeCodeEmptyText = Seleziona un tipo...
+comboColumnTypeCodeLabel = Tipo
+comboLocaleTypeEmptyText = Seleziona un locale...
+comboLocaleTypeLabel = Locale
+btnSaveText = Salva
+btnSaveToolTip = Salva
+btnCloseText = Chiudi
+btnCloseToolTip = Chiudi
+addALabel = Aggiungi etichetta!
+noTypeSelected = Nessun tipo selezionato!
+noLocaleSelected = Nessun locale selezionato!
+errorRetrievingLocaleHead = Errore recuperando i locales!
diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/dimension/CodelistSelectionMessages.properties b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/dimension/CodelistSelectionMessages.properties
new file mode 100644
index 0000000..8c86454
--- /dev/null
+++ b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/dimension/CodelistSelectionMessages.properties
@@ -0,0 +1,16 @@
+dialogHead = Select Codelist
+search = Search:
+btnReloadText = Reload
+btnReloadToolTip = Reload
+nameColumnLabel = Name
+agencyColumn = Agency
+dateColumn = Date
+gridEmptyText = No Results.
+btnSelectText = Select
+btnSelectToolTip = Select
+thisTabularResourceDoesHaveAValidTable = This tabular resource does not have a valid table!
+selectACodelist = Select a codelist!
+errorRetrievingCodelistHead = Error Retrieving Codelist
+errorRetrievingCodelist = Error retrieving codelist on server!
+errorRetrievingCodelistDuringInitializationPhase = Error retrieving the codelists during the initialization phase!
+
\ No newline at end of file
diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/dimension/CodelistSelectionMessages_es.properties b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/dimension/CodelistSelectionMessages_es.properties
new file mode 100644
index 0000000..6312093
--- /dev/null
+++ b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/dimension/CodelistSelectionMessages_es.properties
@@ -0,0 +1,16 @@
+dialogHead = Seleccionar Codelist
+search = Búsqueda:
+btnReloadText = Recargar
+btnReloadToolTip = Recargar
+nameColumnLabel = Nombre
+agencyColumn = Agencia
+dateColumn = Fecha
+gridEmptyText = Ninguno Resultados.
+btnSelectText = Seleccionar
+btnSelectToolTip = Seleccionar
+thisTabularResourceDoesHaveAValidTable = Esta Tabular Resource no tiene una tabla válida!
+selectACodelist = Seleccionar Codelist!
+errorRetrievingCodelistHead = Error al Recuperar las Codelist
+errorRetrievingCodelist = Error al Recuperar las Codelist en el servidor!
+errorRetrievingCodelistDuringInitializationPhase = Error al Recuperar las Codelist durante la fase de inicialización!
+
\ No newline at end of file
diff --git a/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/dimension/CodelistSelectionMessages_it.properties b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/dimension/CodelistSelectionMessages_it.properties
new file mode 100644
index 0000000..d25ded9
--- /dev/null
+++ b/src/main/resources/org/gcube/portlets/user/td/columnwidget/client/dimension/CodelistSelectionMessages_it.properties
@@ -0,0 +1,16 @@
+dialogHead = Seleziona Codelist
+search = Cerca:
+btnReloadText = Ricarica
+btnReloadToolTip = Ricarica
+nameColumnLabel = Nome
+agencyColumn = Agenzia
+dateColumn = Data
+gridEmptyText = Nessun Risultato.
+btnSelectText = Seleziona
+btnSelectToolTip = Seleziona
+thisTabularResourceDoesHaveAValidTable = Questa Tabular Resource non ha una tabella valida!
+selectACodelist = Seleziona una codelist!
+errorRetrievingCodelistHead = Errore Recuperando le Codelist
+errorRetrievingCodelist = Errore recuperando le Codelist sul server!
+errorRetrievingCodelistDuringInitializationPhase = Errore recuperando le codelist durante la fase di inizializzazione!
+
\ No newline at end of file