diff --git a/.classpath b/.classpath
index b48796d..430a161 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
-
+
-
+
@@ -33,5 +33,5 @@
-
+
diff --git a/distro/changelog.xml b/distro/changelog.xml
index af7c9e8..1608286 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,11 +1,22 @@
-
+
+ Updated card description [issue #4883]
+
+
Updated dependencies
-
+
Updated dependency
-
+
First Release
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index d427acd..1162bee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
4.0.0
org.gcube.portlets.user
tabular-data-replacebyexternal-widget
- 1.2.0-SNAPSHOT
+ 1.3.0-SNAPSHOT
tabular-data-replacebyexternal-widget
tabular-data-replacebyexternal-widget allows the replace of column by external tabular resource
diff --git a/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/CurrentColumnSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/CurrentColumnSelectionCard.java
index 9ae1c94..5b4f0c8 100644
--- a/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/CurrentColumnSelectionCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/CurrentColumnSelectionCard.java
@@ -35,7 +35,7 @@ public class CurrentColumnSelectionCard extends WizardCard {
public CurrentColumnSelectionCard(
final ReplaceByExternalSession replaceByExternalSession) {
- super("Current Column Selection", "");
+ super("Select the column to fill with new data", "");
this.thisCard=this;
if (replaceByExternalSession == null) {
Log.error("ReplaceByExternalSession is null");
@@ -49,7 +49,7 @@ public class CurrentColumnSelectionCard extends WizardCard {
public CurrentColumnSelectionCard(String colname,
final ReplaceByExternalSession replaceByExternalSession) {
- super("Current Column Selection", "");
+ super("Select the column to fill with new data", "");
this.thisCard=this;
this.colname=colname;
if (replaceByExternalSession == null) {
@@ -117,6 +117,7 @@ public class CurrentColumnSelectionCard extends WizardCard {
getWizardWindow().setNextButtonCommand(sayNextCard);
setEnableBackButton(false);
+ setBackButtonVisible(false);
setEnableNextButton(true);
}
diff --git a/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/ReplaceColumnSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/ReplaceColumnSelectionCard.java
index 7f3c50b..9293918 100644
--- a/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/ReplaceColumnSelectionCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/ReplaceColumnSelectionCard.java
@@ -34,7 +34,7 @@ public class ReplaceColumnSelectionCard extends WizardCard {
public ReplaceColumnSelectionCard(
final ReplaceByExternalSession replaceByExternalSession) {
- super("Replace Column Selection", "");
+ super("Select column to copy from external tabular resource", "");
this.thisCard=this;
if (replaceByExternalSession == null) {
Log.error("ReplaceByExternalSession is null");
diff --git a/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/TabResourcesSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/TabResourcesSelectionCard.java
index 611bb45..c78d30f 100644
--- a/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/TabResourcesSelectionCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/replacebyexternalwidget/client/TabResourcesSelectionCard.java
@@ -37,7 +37,7 @@ public class TabResourcesSelectionCard extends WizardCard {
public TabResourcesSelectionCard(
final ReplaceByExternalSession replaceByExternalSession) {
- super("Select Tabular Resource for Replace By External", "");
+ super("Select the external tabular resource", "");
Log.debug("TabResourcesSelectionCard");
this.replaceByExternalSession = replaceByExternalSession;
thisCard = this;
@@ -89,14 +89,17 @@ public class TabResourcesSelectionCard extends WizardCard {
};
getWizardWindow().setPreviousButtonCommand(sayPreviousCard);
- getWizardWindow().setEnableNextButton(false);
- getWizardWindow().setEnableBackButton(true);
+
+ setBackButtonVisible(true);
+ setEnableBackButton(true);
+ setEnableNextButton(false);
}
protected void retrieveLastTable() {
- getWizardWindow().setEnableNextButton(false);
- getWizardWindow().setEnableBackButton(false);
+ setEnableBackButton(false);
+ setEnableNextButton(false);
+
TDGWTServiceAsync.INSTANCE.getLastTable(replaceByExternalSession
.getExternalTabularResource().getTrId(),
@@ -225,8 +228,8 @@ public class TabResourcesSelectionCard extends WizardCard {
public void onSuccess(Void result) {
tabResourcesSelectionPanel.gridReload();
- getWizardWindow().setEnableNextButton(false);
- getWizardWindow().setEnableBackButton(true);
+ setEnableBackButton(true);
+ setEnableNextButton(false);
}
});
@@ -264,14 +267,16 @@ public class TabResourcesSelectionCard extends WizardCard {
Log.error(caught.getLocalizedMessage());
UtilsGXT3.alert("Error Locked",
caught.getLocalizedMessage());
- getWizardWindow().setEnableNextButton(false);
- getWizardWindow().setEnableBackButton(true);
+ setEnableBackButton(true);
+ setEnableNextButton(false);
+
} else {
UtilsGXT3
.alert("Error",
"Error retrienving information on current tabular resource: ");
- getWizardWindow().setEnableNextButton(false);
- getWizardWindow().setEnableBackButton(true);
+ setEnableBackButton(true);
+ setEnableNextButton(false);
+
}
}
}