refs4883: TabMan / Replace by External / Error
https://support.d4science.org/issues/4883 Fixed column cast on Replace by External git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-replacebyexternal-widget@131047 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
fad47a3b1e
commit
6d6557532a
|
@ -1,12 +1,12 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="src" output="target/tabular-data-replacebyexternal-widget-1.2.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
|
||||
<classpathentry kind="src" output="target/tabular-data-replacebyexternal-widget-1.3.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
|
||||
<attributes>
|
||||
<attribute name="optional" value="true"/>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry excluding="**" kind="src" output="target/tabular-data-replacebyexternal-widget-1.2.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
|
||||
<classpathentry excluding="**" kind="src" output="target/tabular-data-replacebyexternal-widget-1.3.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
|
||||
<attributes>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
|
@ -33,5 +33,5 @@
|
|||
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="output" path="target/tabular-data-replacebyexternal-widget-1.2.0-SNAPSHOT/WEB-INF/classes"/>
|
||||
<classpathentry kind="output" path="target/tabular-data-replacebyexternal-widget-1.3.0-SNAPSHOT/WEB-INF/classes"/>
|
||||
</classpath>
|
||||
|
|
|
@ -1,11 +1,22 @@
|
|||
<ReleaseNotes>
|
||||
<Changeset component="org.gcube.portlets-user.tabular-data-replacebyexternal-widget.1-2-0" date="2015-07-03">
|
||||
<Changeset
|
||||
component="org.gcube.portlets-user.tabular-data-replacebyexternal-widget.1-3-0"
|
||||
date="2016-09-30">
|
||||
<Change>Updated card description [issue #4883]</Change>
|
||||
</Changeset>
|
||||
<Changeset
|
||||
component="org.gcube.portlets-user.tabular-data-replacebyexternal-widget.1-2-0"
|
||||
date="2015-07-03">
|
||||
<Change>Updated dependencies</Change>
|
||||
</Changeset>
|
||||
<Changeset component="org.gcube.portlets-user.tabular-data-replacebyexternal-widget.1-1-0" date="2015-04-30">
|
||||
<Changeset
|
||||
component="org.gcube.portlets-user.tabular-data-replacebyexternal-widget.1-1-0"
|
||||
date="2015-04-30">
|
||||
<Change>Updated dependency</Change>
|
||||
</Changeset>
|
||||
<Changeset component="org.gcube.portlets-user.tabular-data-replacebyexternal-widget.1-0-0" date="2015-02-16">
|
||||
<Changeset
|
||||
component="org.gcube.portlets-user.tabular-data-replacebyexternal-widget.1-0-0"
|
||||
date="2015-02-16">
|
||||
<Change>First Release</Change>
|
||||
</Changeset>
|
||||
</ReleaseNotes>
|
2
pom.xml
2
pom.xml
|
@ -13,7 +13,7 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.gcube.portlets.user</groupId>
|
||||
<artifactId>tabular-data-replacebyexternal-widget</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
|
||||
<name>tabular-data-replacebyexternal-widget</name>
|
||||
<description>tabular-data-replacebyexternal-widget allows the replace of column by external tabular resource</description>
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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");
|
||||
|
|
|
@ -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);
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue