diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVImportWizardTDMessages.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVImportWizardTDMessages.java
index c114925..34c9e42 100644
--- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVImportWizardTDMessages.java
+++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVImportWizardTDMessages.java
@@ -195,5 +195,23 @@ public interface CSVImportWizardTDMessages extends Messages {
@DefaultMessage("Error uploading the csv file")
String errorUploadingCSVFileHead();
+
+ @DefaultMessage("Document: ")
+ String csvOperationInProgressDocumentLabel();
+
+ @DefaultMessage("Source: ")
+ String csvOperationInProgressSourceLabel();
+
+ @DefaultMessage("File: ")
+ String csvOperationInProgressFileLabel();
+
+ @DefaultMessage("Import Summary")
+ String summaryImport();
+
+ @DefaultMessage("CSV File")
+ String csvOperationInProgressCSVFile();
+
+ @DefaultMessage("An error occured in import CSV: ")
+ String errorInImportCSV();
}
diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVOperationInProgressCard.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVOperationInProgressCard.java
index 61a3346..53e7a66 100644
--- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVOperationInProgressCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVOperationInProgressCard.java
@@ -8,6 +8,7 @@ import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVImportSession;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException;
import org.gcube.portlets.user.td.monitorwidget.client.MonitorDialog;
import org.gcube.portlets.user.td.monitorwidget.client.MonitorDialogListener;
+import org.gcube.portlets.user.td.widgetcommonevent.client.CommonMessages;
import org.gcube.portlets.user.td.widgetcommonevent.client.event.SessionExpiredEvent;
import org.gcube.portlets.user.td.widgetcommonevent.client.type.SessionExpiredType;
import org.gcube.portlets.user.td.widgetcommonevent.shared.OperationResult;
@@ -15,6 +16,7 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.wizardwidget.client.WizardCard;
import com.allen_sauer.gwt.log.client.Log;
+import com.google.gwt.core.client.GWT;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.rpc.AsyncCallback;
@@ -36,20 +38,19 @@ import com.sencha.gxt.widget.core.client.container.VBoxLayoutContainer.VBoxLayou
*/
public class CSVOperationInProgressCard extends WizardCard implements
MonitorDialogListener {
-
- @SuppressWarnings("unused")
- private CSVOperationInProgressCard thisCard;
+ private static CommonMessages msgsCommon=GWT.create(CommonMessages.class);
+ private CSVImportWizardTDMessages msgs;
private CSVImportSession importSession;
private TRId newTrId;
private HtmlLayoutContainer resultField;
private AutoProgressBar storageLoading;
+
public CSVOperationInProgressCard(final CSVImportSession importSession) {
- super("Operation In Progress", "");
-
+ super(msgsCommon.operationInProgress(), "");
this.importSession = importSession;
- thisCard = this;
-
+ initMessages();
+
VBoxLayoutContainer operationInProgressPanel = new VBoxLayoutContainer();
operationInProgressPanel.setVBoxLayoutAlign(VBoxLayoutAlign.CENTER);
//operationInProgressPanel.setHeight(390);
@@ -62,18 +63,18 @@ public class CSVOperationInProgressCard extends WizardCard implements
// display:block;vertical-align:text-top;
description.setHTML(0, 0,
- "Document: ");
- description.setText(0, 1, "CSV File");
+ ""+msgs.csvOperationInProgressDocumentLabel()+"");
+ description.setText(0, 1, msgs.csvOperationInProgressCSVFile());
description.setHTML(1, 0,
- "Source: ");
+ ""+msgs.csvOperationInProgressSourceLabel()+"");
description.setText(1, 1, importSession.getSource().getName());
description.setHTML(2, 0,
- "File: ");
+ ""+msgs.csvOperationInProgressFileLabel()+"");
description.setText(2, 1, importSession.getTabResource().getName());
FramedPanel summary = new FramedPanel();
- summary.setHeadingText("Import Summary");
+ summary.setHeadingText(msgs.summaryImport());
summary.setWidth(400);
summary.add(description);
operationInProgressPanel.add(summary, new BoxLayoutData(new Margins(20,
@@ -96,12 +97,16 @@ public class CSVOperationInProgressCard extends WizardCard implements
}
+
+ protected void initMessages() {
+ msgs = GWT.create(CSVImportWizardTDMessages.class);
+ }
public void importCSV() {
//mask("Loading on Storage...");
storageLoading.setVisible(true);
forceLayout();
- storageLoading.updateText("Loading on Storage...");
+ storageLoading.updateText(msgsCommon.loadingOnStorage());
storageLoading.redraw();
storageLoading.auto();
@@ -125,8 +130,8 @@ public class CSVOperationInProgressCard extends WizardCard implements
SessionExpiredType.EXPIREDONSERVER));
} else {
showErrorAndHide(
- "Error in importCSV",
- "An error occured in importCSV: ",
+ msgsCommon.error(),
+ msgs.errorInImportCSV(),
caught.getLocalizedMessage(),
caught);
}
@@ -155,7 +160,7 @@ public class CSVOperationInProgressCard extends WizardCard implements
newTrId = operationResult.getTrId();
SafeHtmlBuilder safeHtmlBuilder = new SafeHtmlBuilder();
safeHtmlBuilder
- .appendHtmlConstant("
Operation Completed
");
+ .appendHtmlConstant(""+msgsCommon.operationCompleted()+"
");
resultField.setHTML(safeHtmlBuilder.toSafeHtml());
resultField.setVisible(true);
Command sayComplete = new Command() {
@@ -184,7 +189,7 @@ public class CSVOperationInProgressCard extends WizardCard implements
public void operationFailed(Throwable caught, String reason, String details) {
SafeHtmlBuilder safeHtmlBuilder = new SafeHtmlBuilder();
safeHtmlBuilder
- .appendHtmlConstant("Operation Failed
");
+ .appendHtmlConstant(""+msgsCommon.operationFailed()+"
");
resultField.setHTML(safeHtmlBuilder.toSafeHtml());
resultField.setVisible(true);
if (caught instanceof TDGWTSessionExpiredException) {
@@ -203,7 +208,7 @@ public class CSVOperationInProgressCard extends WizardCard implements
newTrId = operationResult.getTrId();
SafeHtmlBuilder safeHtmlBuilder = new SafeHtmlBuilder();
safeHtmlBuilder
- .appendHtmlConstant("Problems in the Operation
");
+ .appendHtmlConstant(""+msgsCommon.operationProblem()+"
");
resultField.setHTML(safeHtmlBuilder.toSafeHtml());
resultField.setVisible(true);
@@ -234,7 +239,7 @@ public class CSVOperationInProgressCard extends WizardCard implements
public void operationAborted() {
SafeHtmlBuilder safeHtmlBuilder = new SafeHtmlBuilder();
safeHtmlBuilder
- .appendHtmlConstant("Operation Aborted
");
+ .appendHtmlConstant(""+msgsCommon.operationAborted()+"
");
resultField.setHTML(safeHtmlBuilder.toSafeHtml());
resultField.setVisible(true);
@@ -264,7 +269,7 @@ public class CSVOperationInProgressCard extends WizardCard implements
public void operationPutInBackground() {
SafeHtmlBuilder safeHtmlBuilder = new SafeHtmlBuilder();
safeHtmlBuilder
- .appendHtmlConstant("Operation in Background
");
+ .appendHtmlConstant(""+msgsCommon.operationInBackground()+"
");
resultField.setHTML(safeHtmlBuilder.toSafeHtml());
resultField.setVisible(true);
diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVUploadFileCard.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVUploadFileCard.java
index 457a0e7..5787924 100644
--- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVUploadFileCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVUploadFileCard.java
@@ -65,6 +65,8 @@ public class CSVUploadFileCard extends WizardCard {
getWizardWindow().setPreviousButtonCommand(sayPreviousCard);
getWizardWindow().setEnableNextButton(false);
+ setNextButtonVisible(true);
+ setBackButtonVisible(true);
}
}
diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVWorkSpaceSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVWorkSpaceSelectionCard.java
index 4f6afa2..9b93ae2 100644
--- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVWorkSpaceSelectionCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVWorkSpaceSelectionCard.java
@@ -161,6 +161,8 @@ public class CSVWorkSpaceSelectionCard extends WizardCard {
getWizardWindow().setPreviousButtonCommand(sayPreviousCard);
getWizardWindow().setEnableNextButton(false);
+ setNextButtonVisible(true);
+ setBackButtonVisible(true);
}
diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/SourceSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/SourceSelectionCard.java
index 893a882..d183fef 100644
--- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/SourceSelectionCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/SourceSelectionCard.java
@@ -146,9 +146,11 @@ public class SourceSelectionCard extends WizardCard {
}
}
};
-
+
getWizardWindow().setNextButtonCommand(sayNextCard);
-
+ setNextButtonVisible(true);
+ setBackButtonVisible(false);
+
}
}
diff --git a/src/main/resources/org/gcube/portlets/user/td/csvimportwidget/client/CSVImportWizardTDMessages.properties b/src/main/resources/org/gcube/portlets/user/td/csvimportwidget/client/CSVImportWizardTDMessages.properties
index 11a5b78..46a0846 100644
--- a/src/main/resources/org/gcube/portlets/user/td/csvimportwidget/client/CSVImportWizardTDMessages.properties
+++ b/src/main/resources/org/gcube/portlets/user/td/csvimportwidget/client/CSVImportWizardTDMessages.properties
@@ -60,3 +60,9 @@ btnCancelText = Cancel
csvFileMissingHead = CSV file missing
csvFileMissing = Please specify a CSV file
errorUploadingCSVFileHead = Error uploading the csv file
+csvOperationInProgressDocumentLabel = Document:
+csvOperationInProgressSourceLabel = Source:
+csvOperationInProgressFileLabel = File:
+summaryImport = Import Summary
+csvOperationInProgressCSVFile = CSV File
+errorInImportCSV = An error occured in import CSV:
diff --git a/src/main/resources/org/gcube/portlets/user/td/csvimportwidget/client/CSVImportWizardTDMessages_es.properties b/src/main/resources/org/gcube/portlets/user/td/csvimportwidget/client/CSVImportWizardTDMessages_es.properties
index 3605299..6e7b792 100644
--- a/src/main/resources/org/gcube/portlets/user/td/csvimportwidget/client/CSVImportWizardTDMessages_es.properties
+++ b/src/main/resources/org/gcube/portlets/user/td/csvimportwidget/client/CSVImportWizardTDMessages_es.properties
@@ -60,3 +60,9 @@ btnCancelText = Anular
csvFileMissingHead = CSV archivo que falta
csvFileMissing = Especifica el archivo CSV
errorUploadingCSVFileHead = Error cargando el archivo CSV
+csvOperationInProgressDocumentLabel = Documento:
+csvOperationInProgressSourceLabel = Fuente:
+csvOperationInProgressFileLabel = Archivo:
+summaryImport = Resumen de Importación
+csvOperationInProgressCSVFile = CSV Archivo
+errorInImportCSV = Se ha producido un error en la importación CSV:
diff --git a/src/main/resources/org/gcube/portlets/user/td/csvimportwidget/client/CSVImportWizardTDMessages_it.properties b/src/main/resources/org/gcube/portlets/user/td/csvimportwidget/client/CSVImportWizardTDMessages_it.properties
index 321e7d4..82e08bf 100644
--- a/src/main/resources/org/gcube/portlets/user/td/csvimportwidget/client/CSVImportWizardTDMessages_it.properties
+++ b/src/main/resources/org/gcube/portlets/user/td/csvimportwidget/client/CSVImportWizardTDMessages_it.properties
@@ -60,3 +60,10 @@ btnCancelText = Cancella
csvFileMissingHead = CSV file non trovato
csvFileMissing = Specifica un file CSV
errorUploadingCSVFileHead = Errore caricando il file csv
+csvOperationInProgressDocumentLabel = Documento:
+csvOperationInProgressSourceLabel = Sorgente:
+csvOperationInProgressFileLabel = File:
+summaryImport = Sommario Importazione
+csvOperationInProgressCSVFile = CSV File
+errorInImportCSV = Un errore è avvenuto nell''importazione CSV:
+