diff --git a/pom.xml b/pom.xml index e3ed8ea..df33b36 100644 --- a/pom.xml +++ b/pom.xml @@ -176,7 +176,15 @@ ${webappDirectory}/WEB-INF/classes - + + + src/main/resources + + **/*.* + + + + org.apache.maven.plugins 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 7e71191..c114925 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 @@ -4,198 +4,196 @@ import com.google.gwt.i18n.client.Messages; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author giancarlo email: g.panichi@isti.cnr.it * */ public interface CSVImportWizardTDMessages extends Messages { @DefaultMessage("CSV source selection") String csvSourceSelection(); - + @DefaultMessage("CSV Import File Upload") String csvImportFileUpload(); - + @DefaultMessage("CSV Import From Workspace") String csvImportFromWorkspace(); - + @DefaultMessage("Workspace Selection") String workspaceSelection(); - + @DefaultMessage("CSV Configuration") String csvConfiguration(); - + @DefaultMessage("Error retrieving the file from the workspace!") String errorRetrievingTheFileFromWorkspace(); - + @DefaultMessage("The CSV file encoding") String comboEncodingsToolTip(); - + @DefaultMessage("File encoding") String comboEncodingsLabel(); - + @DefaultMessage("The CSV file header") String comboHeaderToolTip(); - + @DefaultMessage("Header") String comboHeaderLabel(); - + @DefaultMessage("Comma") String radioCommaDelimiterLabel(); - + @DefaultMessage("Space") String radioSpaceDelimiterLabel(); - + @DefaultMessage("Tab") String radioTabDelimiterLabel(); - + @DefaultMessage("Semicolon") String radioSemicolonDelimiterLabel(); - + @DefaultMessage("Other delimiter") String radioOtherDelimiterLabel(); - + @DefaultMessage("Insert a valid delimiter else comma is used!") String insertAvalidDelimiterElseCommaIsUsed(); - + @DefaultMessage("The delimiter use to delimit the CSV fields") String delimitersPanelToolTip(); - + @DefaultMessage("Delimiter") String delimitersPanelLabel(); - + @DefaultMessage("The character used as comment line prefix") String commentFieldToolTip(); - + @DefaultMessage("Comment") String commentFieldLabel(); - + @DefaultMessage("An error occured checking the file") String anErrorOccuredCheckingTheFileHead(); - + @DefaultMessage("Please retry, if the error perstists change the CSV configuration!") String anErrorOccuredCheckingTheFile(); - + @DefaultMessage("Updating...") String gridCSVSampleMask(); - + @DefaultMessage("Error loading charset list") String errorLoadingCharsetListHead(); - + @DefaultMessage("Error loading charset list!") String errorLoadingCharsetList(); - + @DefaultMessage("Tabular Resource Detail") String tabularResourceDetail(); - + @DefaultMessage("Details") String csvTableDetailCardFormHeader(); @DefaultMessage("Information") String fieldSetInformationHead(); - + @DefaultMessage("Enter a name...") String fieldNameEmptyText(); - + @DefaultMessage("Name") String fieldNameLabel(); - + @DefaultMessage("Enter a description...") String txtAreaDescriptionEmptyText(); - + @DefaultMessage("Description") String txtAreaDescriptionLabel(); - + @DefaultMessage("Enter rights...") String txtAreaRightsEmptyText(); - + @DefaultMessage("Rights") String txtAreaRightsLabel(); - + @DefaultMessage("Valid From") String fieldValidFromLabel(); - + @DefaultMessage("Valid Until To") String fieldValidUntilToLabel(); - + @DefaultMessage("Licence") String comboLicencesLabel(); - + @DefaultMessage("Error retrieving licences!") String errorRetrievingLicences(); - + @DefaultMessage("Fill in name field!") String fillInNameField(); - + @DefaultMessage("Fill in description field!") String fillInDescriptionField(); - + @DefaultMessage("Fill in rights field!") String fillInRightsField(); - + @DefaultMessage("Valid From field is higher than Valid Until To field!") String validFromFieldIsHigherThanValidUntilToField(); - + @DefaultMessage("Check configuration") String btnCheckConfigurationText(); - + @DefaultMessage("Skip invalid lines") String chBoxSkipInvalidLabel(); - + @DefaultMessage("Failed (more than {0} errors)") String failedMoreThanNumberErrors(int errorlimit); - + @DefaultMessage("Failed ({0} errors)") String failedErrors(int size); - + @DefaultMessage("Check the configuration before submit it") String checkTheConfigurationBeforeSubmit(); - + @DefaultMessage("Checking the configuration...") String checkingTheConfiguration(); - + @DefaultMessage("Click to obtain more information") String clickToObtainMoreInformation(); - + @DefaultMessage("Failed") String failed(); - + @DefaultMessage("Correct.") String correct(); - + @DefaultMessage("Close") String btnCloseText(); - + @DefaultMessage("CSV error details") String csvErrorWindowHead(); - + @DefaultMessage("# line") String gridErrorColumnNLine(); - + @DefaultMessage("Line") String gridErrorCololumnLine(); - + @DefaultMessage("Error") String gridErrorCololumnError(); - + @DefaultMessage("Select the csv file to import") String fUpFieldLabel(); - + @DefaultMessage("Upload") String btnUploadText(); - + @DefaultMessage("Cancel") String btnCancelText(); - + @DefaultMessage("CSV file missing") String csvFileMissingHead(); - + @DefaultMessage("Please specify a CSV file") String csvFileMissing(); - + @DefaultMessage("Error uploading the csv file") String errorUploadingCSVFileHead(); - - } diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/FileUploadPanel.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/FileUploadPanel.java index 1fe8066..a5c0887 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/FileUploadPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/FileUploadPanel.java @@ -54,8 +54,9 @@ public class FileUploadPanel extends FormPanel { public FileUploadPanel(ResourceBundle res, final CSVUploadFileCard card, final CSVImportSession importSession) { - + initMessages(); setId("LocalUploadPanel"); + setLabelAlign(LabelAlign.TOP); getElement().setPadding(new Padding(5)); @@ -81,9 +82,10 @@ public class FileUploadPanel extends FormPanel { fUpField.setName("uploadFormElement"); fUpField.setWidth("100%"); - content.add(new FieldLabel(fUpField, - msgs.fUpFieldLabel()), - new VerticalLayoutData(-2, -1)); + FieldLabel fUpFieldLabel = new FieldLabel(fUpField, + msgs.fUpFieldLabel()); + + content.add(fUpFieldLabel, new VerticalLayoutData(-2, -1)); btnUpload = new TextButton(msgs.btnUploadText()); content.add(btnUpload, new VerticalLayoutData(-1, -1)); 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 0ceff2f..893a882 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 @@ -3,6 +3,7 @@ */ package org.gcube.portlets.user.td.csvimportwidget.client; +import org.gcube.portlets.user.td.widgetcommonevent.client.CommonMessages; import org.gcube.portlets.user.td.wizardwidget.client.WizardCard; import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVImportSession; import org.gcube.portlets.user.td.gwtservice.shared.source.FileSource; @@ -33,12 +34,14 @@ public class SourceSelectionCard extends WizardCard { private final WorkspaceSource workspaceSource = WorkspaceSource.INSTANCE; private final CSVImportSession importSession; + + private CommonMessages msgsCommon; public SourceSelectionCard(final CSVImportSession importSession) { super(msgs.csvSourceSelection(), ""); - + initMessages(); this.importSession = importSession; // Default importSession.setSource(fileSource); @@ -49,8 +52,8 @@ public class SourceSelectionCard extends WizardCard { Radio radioFileSource = new Radio(); radioFileSource.setBoxLabel("

" - + fileSource.getName() + "
" - + fileSource.getDescription() + "

"); + + msgsCommon.fileSourceName() + "
" + + msgsCommon.fileSourceDescription() + "

"); radioFileSource.setName(fileSource.getName()); radioFileSource.setStylePrimaryName(res.wizardCSS() .getImportSelectionSource()); @@ -58,8 +61,8 @@ public class SourceSelectionCard extends WizardCard { Radio radioWorkspaceSource = new Radio(); radioWorkspaceSource.setBoxLabel("

" - + workspaceSource.getName() + "
" - + workspaceSource.getDescription() + "

"); + + msgsCommon.workspaceSourceName() + "
" + + msgsCommon.workspaceSourceDescription() + "

"); radioWorkspaceSource.setName(workspaceSource.getName()); radioWorkspaceSource.setStylePrimaryName(res.wizardCSS() .getImportSelectionSource()); @@ -103,6 +106,10 @@ public class SourceSelectionCard extends WizardCard { setCenterWidget(sourceSelectionPanel, new MarginData(0)); } + + protected void initMessages(){ + msgsCommon = GWT.create(CommonMessages.class); + } @Override public void setup() { 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 aaa9c3d..0e1f0fd 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 @@ -30,7 +30,7 @@ fieldNameEmptyText = Introducir nombre... fieldNameLabel = Nombre txtAreaDescriptionEmptyText = Introducir descripción... txtAreaDescriptionLabel = Descripción -txtAreaRightsEmptyText = Introducir licencia... +txtAreaRightsEmptyText = Introducir derèchos... txtAreaRightsLabel = Derèchos fieldValidFromLabel = Válida Desde fieldValidUntilToLabel = Válida Hasta