From 87fc6763bdd0942c1f8621c6ee333cc84a3e6114 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 10 Jun 2016 13:06:52 +0000 Subject: [PATCH] refs 2521: Explore the possibility to port the StatMan interface onto Dataminer https://support.d4science.org/issues/2521 Fixed default value selected for columns field git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/data-miner-manager@129052 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/parametersfield/ColumnFld.java | 12 ++++++++---- .../user/dataminermanager/dataminermanager.gwt.xml | 7 +++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ColumnFld.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ColumnFld.java index b62a611..3f3aea2 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ColumnFld.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/ColumnFld.java @@ -13,6 +13,7 @@ import org.gcube.portlets.user.dataminermanager.shared.data.TableItemSimple; import org.gcube.portlets.user.dataminermanager.shared.parameters.ColumnParameter; import org.gcube.portlets.user.dataminermanager.shared.parameters.Parameter; +import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.ui.Widget; import com.sencha.gxt.cell.core.client.form.ComboBoxCell.TriggerAction; @@ -73,7 +74,6 @@ public class ColumnFld extends AbstractFld implements comboBox.setEditable(false); comboBox.setTriggerAction(TriggerAction.ALL); comboBox.setEnabled(false); - HtmlLayoutContainer descr; if (columnParameter.getDescription() == null) { @@ -159,18 +159,22 @@ public class ColumnFld extends AbstractFld implements } else { store.clear(); store.commitChanges(); + comboBox.clear(); ArrayList columns = tableItemSimple.getColumns(); if (columns != null) { store.addAll(columns); + store.commitChanges(); + Log.debug("DefaultColumn: "+defaultColumn); for (ColumnItem columnItem : columns) { - if (columnItem.getName().compareTo(defaultColumn) == 0) { + Log.debug("ColumnItem: "+ columnItem); + if (columnItem.getName().compareToIgnoreCase(defaultColumn) == 0) { comboBox.setValue(columnItem); break; } } - store.commitChanges(); + + } - comboBox.clear(); comboBox.setEnabled(true); showFieldWithSelection(tableItemSimple); } diff --git a/src/main/resources/org/gcube/portlets/user/dataminermanager/dataminermanager.gwt.xml b/src/main/resources/org/gcube/portlets/user/dataminermanager/dataminermanager.gwt.xml index 2ec343a..98f230a 100644 --- a/src/main/resources/org/gcube/portlets/user/dataminermanager/dataminermanager.gwt.xml +++ b/src/main/resources/org/gcube/portlets/user/dataminermanager/dataminermanager.gwt.xml @@ -40,15 +40,14 @@ - + /> --> + -