From 734bdb141c9c6a075cc23d8898233264f3b165a8 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 1 Oct 2015 13:37:04 +0000 Subject: [PATCH] Fixed button label on ChangeColumnTypePanel git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-column-widget@119303 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 6 +-- config/profile.xml | 8 +-- distro/README | 6 ++- distro/changelog.xml | 4 ++ pom.xml | 4 +- .../client/ChangeColumnTypePanel.java | 52 +++++++++---------- templates/README | 4 +- templates/changelog.xml | 4 ++ templates/profile.xml | 2 +- 9 files changed, 51 insertions(+), 39 deletions(-) diff --git a/.classpath b/.classpath index 7d22fb2..ec4d518 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -44,5 +44,5 @@ - + diff --git a/config/profile.xml b/config/profile.xml index 9b497c5..0201895 100644 --- a/config/profile.xml +++ b/config/profile.xml @@ -6,20 +6,20 @@ tabular-data-column-widget allows to perform operations on the columns of a tabular resource PortletsUser tabular-data-column-widget - 1.8.0-SNAPSHOT + 1.0.0 tabular-data-column-widget allows to perform operations on the columns of a tabular resource tabular-data-column-widget - 1.8.0-SNAPSHOT + 1.9.0-SNAPSHOT org.gcube.portlets.user tabular-data-column-widget - 1.8.0-SNAPSHOT + 1.9.0-SNAPSHOT library - tabular-data-column-widget-1.8.0-SNAPSHOT.jar + tabular-data-column-widget-1.9.0-SNAPSHOT.jar diff --git a/distro/README b/distro/README index ba4be0a..9e76865 100644 --- a/distro/README +++ b/distro/README @@ -1,7 +1,9 @@ The gCube System - tabular-data-column-widget ------------------------------------------------------------ -This work has been supported by the following European projects: iMarine (FP7-INFRASTRUCTURES-2011-2) +This work has been partially supported by the following European projects: DILIGENT (FP6-2003-IST-2), +D4Science (FP7-INFRA-2007-1.2.2), D4Science-II (FP7-INFRA-2008-1.2.2), iMarine (FP7-INFRASTRUCTURES-2011-2), +and EUBrazilOpenBio (FP7-ICT-2011-EU-Brazil), Parthenos (H2020-INFRADEV-1-2014-1), BlueBridge (H2020-EINFRA-2015-1). Authors ------- @@ -13,7 +15,7 @@ Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" Version and Release Date ------------------------ -v. 1.8.0-SNAPSHOT (2015-07-03) +v. 1.9.0-SNAPSHOT (2015-10-15) Description diff --git a/distro/changelog.xml b/distro/changelog.xml index db7e466..3f59a93 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,8 @@ + + Fixed apply button on ChangeColumnTypePanel + Allow the creation and use of expressions on multi column in TDM portlet[issue #81] diff --git a/pom.xml b/pom.xml index 96fa4bf..6225d7f 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ 4.0.0 org.gcube.portlets.user tabular-data-column-widget - 1.8.0-SNAPSHOT + 1.9.0-SNAPSHOT tabular-data-column-widget @@ -38,7 +38,7 @@ ${project.basedir}/distro ${project.build.directory}/${project.build.finalName} - 2015-07-03 + 2015-10-15 https://gcube.wiki.gcube-system.org/gcube/index.php/Tabular_Data_Manager templates distro diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java index f25a928..8c099a8 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java @@ -146,7 +146,7 @@ public class ChangeColumnTypePanel extends FramedPanel implements private ListLoader> loader; - private TextButton change; + private TextButton applyBtn; private ChangeColumnTypeSession changeColumnTypeSession; private boolean panelCreated; @@ -516,11 +516,11 @@ public class ChangeColumnTypePanel extends FramedPanel implements comboValueDataFormatLabel = new FieldLabel(comboValueDataFormat, "Format"); - // Change - change = new TextButton("Change"); - change.setIcon(ResourceBundle.INSTANCE.columnType()); - change.setIconAlign(IconAlign.RIGHT); - change.setToolTip("Change Column Type"); + // Apply + applyBtn = new TextButton("Apply"); + applyBtn.setIcon(ResourceBundle.INSTANCE.columnType()); + applyBtn.setIconAlign(IconAlign.RIGHT); + applyBtn.setToolTip("Apply Column Type"); SelectHandler changeHandler = new SelectHandler() { @@ -529,7 +529,7 @@ public class ChangeColumnTypePanel extends FramedPanel implements } }; - change.addSelectHandler(changeHandler); + applyBtn.addSelectHandler(changeHandler); VerticalLayoutContainer v = new VerticalLayoutContainer(); v.add(new FieldLabel(comboColumn, "Column"), new VerticalLayoutData(1, @@ -554,7 +554,7 @@ public class ChangeColumnTypePanel extends FramedPanel implements new Margins(1))); v.add(comboValueDataFormatLabel, new VerticalLayoutData(1, -1, new Margins(1))); - v.add(change, new VerticalLayoutData(-1, -1, new Margins(10, 0, 10, 0))); + v.add(applyBtn, new VerticalLayoutData(-1, -1, new Margins(10, 0, 10, 0))); add(v, new VerticalLayoutData(1, 1, new Margins(0))); resetToInitialState(); @@ -965,7 +965,7 @@ public class ChangeColumnTypePanel extends FramedPanel implements } } } else { - change.disable(); + applyBtn.disable(); comboColumnTypeCode.reset(); comboColumnTypeCodeLabel.setVisible(false); } @@ -1124,19 +1124,19 @@ public class ChangeColumnTypePanel extends FramedPanel implements protected void updateConfBtnChange(ColumnData columnReference) { if (connectionColumn == null) { if (columnReference != null) { - change.enable(); + applyBtn.enable(); } else { - change.disable(); + applyBtn.disable(); } } else { if (columnReference == null) { - change.disable(); + applyBtn.disable(); } else { if (columnReference.getColumnId().compareTo( connectionColumn.getColumnId()) == 0) { - change.disable(); + applyBtn.disable(); } else { - change.enable(); + applyBtn.enable(); } } @@ -1147,7 +1147,7 @@ public class ChangeColumnTypePanel extends FramedPanel implements if (columnTypeCode == null) { ColumnTypeCodeElement codeElement = comboColumnTypeCode.getValue(); if (codeElement == null) { - change.disable(); + applyBtn.disable(); } else { configureBtnChange(codeElement.getCode()); } @@ -1163,41 +1163,41 @@ public class ChangeColumnTypePanel extends FramedPanel implements switch (sourceTypeCode) { case ANNOTATION: - change.enable(); + applyBtn.enable(); break; case ATTRIBUTE: - change.enable(); + applyBtn.enable(); break; case CODE: - change.enable(); + applyBtn.enable(); break; case CODEDESCRIPTION: - change.enable(); + applyBtn.enable(); break; case CODENAME: - change.enable(); + applyBtn.enable(); break; case DIMENSION: if (columnTypeCode.compareTo(ColumnTypeCode.DIMENSION) == 0 || columnTypeCode.compareTo(ColumnTypeCode.TIMEDIMENSION) == 0) { - change.disable(); + applyBtn.disable(); } else { - change.enable(); + applyBtn.enable(); } break; case MEASURE: - change.enable(); + applyBtn.enable(); break; case TIMEDIMENSION: if (columnTypeCode.compareTo(ColumnTypeCode.DIMENSION) == 0 || columnTypeCode.compareTo(ColumnTypeCode.TIMEDIMENSION) == 0) { - change.disable(); + applyBtn.disable(); } else { - change.enable(); + applyBtn.enable(); } break; default: - change.enable(); + applyBtn.enable(); break; } diff --git a/templates/README b/templates/README index 7e3ad55..38bf491 100644 --- a/templates/README +++ b/templates/README @@ -1,7 +1,9 @@ The gCube System - ${name} ------------------------------------------------------------ -This work has been supported by the following European projects: iMarine (FP7-INFRASTRUCTURES-2011-2) +This work has been partially supported by the following European projects: DILIGENT (FP6-2003-IST-2), +D4Science (FP7-INFRA-2007-1.2.2), D4Science-II (FP7-INFRA-2008-1.2.2), iMarine (FP7-INFRASTRUCTURES-2011-2), +and EUBrazilOpenBio (FP7-ICT-2011-EU-Brazil), Parthenos (H2020-INFRADEV-1-2014-1), BlueBridge (H2020-EINFRA-2015-1). Authors ------- diff --git a/templates/changelog.xml b/templates/changelog.xml index 81a454f..13286c1 100644 --- a/templates/changelog.xml +++ b/templates/changelog.xml @@ -1,4 +1,8 @@ + + Fixed apply button on ChangeColumnTypePanel + Allow the creation and use of expressions on multi column in TDM portlet[issue #81] diff --git a/templates/profile.xml b/templates/profile.xml index 19ed5bc..ffa3274 100644 --- a/templates/profile.xml +++ b/templates/profile.xml @@ -6,7 +6,7 @@ ${project.description} PortletsUser ${project.name} - ${version} + 1.0.0 ${project.description}