From 09701f08bde34a2008ffb99d71f95174be54ff35 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 29 Oct 2015 15:29:53 +0000 Subject: [PATCH] Fixed Charset Export to UTF8 git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-csv-export-widget@120100 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../td/csvexportwidget/client/CSVExportConfigCard.java | 7 ++++--- .../csvexportwidget/client/grid/ColumnDataGridPanel.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVExportConfigCard.java b/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVExportConfigCard.java index d363242..778812a 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVExportConfigCard.java +++ b/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/CSVExportConfigCard.java @@ -50,6 +50,7 @@ import com.sencha.gxt.widget.core.client.tips.ToolTipConfig; * */ public class CSVExportConfigCard extends WizardCard { + private static final String ENCODING_EXPORT_FORMAT = "UTF8"; private static final int LABEL_WIDTH = 128; private static final int LABEL_PAD_WIDTH = 2; private static final String DEFAULT_DELIMETER = ","; @@ -114,7 +115,7 @@ public class CSVExportConfigCard extends WizardCard { comboEncodings.focus(); TDGWTServiceAsync.INSTANCE - .getAvailableCharset(new AsyncCallback() { + .getAvailableCharsetForExport(new AsyncCallback() { public void onSuccess(AvailableCharsetList result) { GWT.log("CharsetInfo: " @@ -151,7 +152,7 @@ public class CSVExportConfigCard extends WizardCard { FieldLabel comboEncodingsLabel=new FieldLabel(comboEncodings, msgs.comboEncodingsLabel()); comboEncodingsLabel.setLabelWidth(LABEL_WIDTH); comboEncodingsLabel.setLabelPad(LABEL_PAD_WIDTH); - content.add(comboEncodingsLabel); + //content.add(comboEncodingsLabel); // Delimiter radioCommaDelimiter = new Radio(); @@ -319,7 +320,7 @@ public class CSVExportConfigCard extends WizardCard { d.show(); } else { exportSession.setColumns(columns); - exportSession.setEncoding(comboEncodings.getCurrentValue()); + exportSession.setEncoding(ENCODING_EXPORT_FORMAT); exportSession.setSeparator(String.valueOf(getSelectedDelimiter())); exportSession.setExportViewColumns(getExportViewColumns()); useWorkspaceDestination(); diff --git a/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/grid/ColumnDataGridPanel.java b/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/grid/ColumnDataGridPanel.java index 8833ed4..59d1e4f 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/grid/ColumnDataGridPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/csvexportwidget/client/grid/ColumnDataGridPanel.java @@ -49,7 +49,7 @@ import com.sencha.gxt.widget.core.client.grid.Grid; public class ColumnDataGridPanel extends ContentPanel implements HasSelectionHandlers { //private static final String GRID_WIDTH ="524px"; - private static final String GRID_HEIGHT = "280px"; + private static final String GRID_HEIGHT = "310px"; private static final ColumnDataProperties props = GWT .create(ColumnDataProperties.class); private final CheckBoxSelectionModel sm;