gCubeSystem
/
tabular-data-csv-import-widget
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed show information 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-csv-import-widget@93976 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-04-01 10:33:17 +00:00
parent d386743ff0
commit f25264e2a1
3 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.classpath
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" output="target/tabular-data-csv-import-widget-2.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/java"> <classpathentry kind="src" output="target/tabular-data-csv-import-widget-2.0.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes> <attributes>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry excluding="**" kind="src" output="target/tabular-data-csv-import-widget-2.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources"> <classpathentry excluding="**" kind="src" output="target/tabular-data-csv-import-widget-2.0.1-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
@ -22,16 +22,16 @@
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.nondependency" value=""/> <attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"> <classpathentry kind="output" path="target/tabular-data-csv-import-widget-2.0.1-SNAPSHOT/WEB-INF/classes"/>
<attributes>
<attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/tabular-data-csv-import-widget-2.0.0-SNAPSHOT/WEB-INF/classes"/>
</classpath> </classpath>

12
src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CsvCheckPanel.java
View File

@ -52,8 +52,8 @@ public class CsvCheckPanel extends VerticalPanel {
{ {
setSpacing(2); setSpacing(2);
HorizontalPanel checkPanel = new HorizontalPanel(); VerticalPanel checkPanel = new VerticalPanel();
checkPanel.setSpacing(4); checkPanel.setSpacing(6);
checkConfiguration = new TextButton("Check configuration"); checkConfiguration = new TextButton("Check configuration");
checkPanel.add(checkConfiguration); checkPanel.add(checkConfiguration);
@ -140,7 +140,7 @@ public class CsvCheckPanel extends VerticalPanel {
protected HorizontalPanel createInfoPanel() protected HorizontalPanel createInfoPanel()
{ {
HorizontalPanel infoPanel = new HorizontalPanel(); HorizontalPanel infoPanel = new HorizontalPanel();
infoPanel.setSpacing(2); infoPanel.setSpacing(3);
infoPanel.add(informationImage); infoPanel.add(informationImage);
HTML message = new HTML("Check the configuration before submit it"); HTML message = new HTML("Check the configuration before submit it");
infoPanel.add(message); infoPanel.add(message);
@ -150,7 +150,7 @@ public class CsvCheckPanel extends VerticalPanel {
protected HorizontalPanel createCheckPanel() protected HorizontalPanel createCheckPanel()
{ {
HorizontalPanel checkPanel = new HorizontalPanel(); HorizontalPanel checkPanel = new HorizontalPanel();
checkPanel.setSpacing(2); checkPanel.setSpacing(3);
checkPanel.add(loadingImage); checkPanel.add(loadingImage);
checkPanel.add(new HTML("Checking the configuration...")); checkPanel.add(new HTML("Checking the configuration..."));
return checkPanel; return checkPanel;
@ -159,7 +159,7 @@ public class CsvCheckPanel extends VerticalPanel {
protected HorizontalPanel createFailurePanel() protected HorizontalPanel createFailurePanel()
{ {
HorizontalPanel failurePanel = new HorizontalPanel(); HorizontalPanel failurePanel = new HorizontalPanel();
failurePanel.setSpacing(2); failurePanel.setSpacing(3);
new ToolTip(failurePanel, new ToolTipConfig("Click to obtain more information")); new ToolTip(failurePanel, new ToolTipConfig("Click to obtain more information"));
failurePanel.add(failureImage); failurePanel.add(failureImage);
@ -182,7 +182,7 @@ public class CsvCheckPanel extends VerticalPanel {
protected HorizontalPanel createSuccessPanel() protected HorizontalPanel createSuccessPanel()
{ {
HorizontalPanel successPanel = new HorizontalPanel(); HorizontalPanel successPanel = new HorizontalPanel();
successPanel.setSpacing(2); successPanel.setSpacing(3);
successPanel.add(successImage); successPanel.add(successImage);
successPanel.add(new HTML("Correct.")); successPanel.add(new HTML("Correct."));
return successPanel; return successPanel;

12
src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/csvgrid/CSVGrid.java
View File

@ -108,11 +108,17 @@ public class CSVGrid extends Grid<CSVRow> {
* Returns the import column mask. * Returns the import column mask.
* @return an array of boolean where the item is <code>true</code> if the column have to be imported, <code>false</code> otherwise. * @return an array of boolean where the item is <code>true</code> if the column have to be imported, <code>false</code> otherwise.
*/ */
public boolean[] getImportColumnsMask() public ArrayList<Boolean> getImportColumnsMask()
{ {
boolean[] columnMask = new boolean[getColumnModel().getColumnCount()]; //boolean[] columnMask = new boolean[getColumnModel().getColumnCount()];
int limit=getColumnModel().getColumnCount();
ArrayList<Boolean> columnMask= new ArrayList<Boolean>();
ArrayList<Integer> excluded = gridViewSample.getExcludedColumns(); ArrayList<Integer> excluded = gridViewSample.getExcludedColumns();
for (int i = 0; i<columnMask.length; i++) columnMask[i] = !excluded.contains(i); for (int i = 0; i<limit; i++) {
//columnMask[i] = !excluded.contains(i);
Boolean b=!excluded.contains(i);
columnMask.add(b);
}
return columnMask; return columnMask;
} }