diff --git a/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/ColumnMappingPanel.java b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/ColumnMappingPanel.java
index d86f774..fa0da92 100644
--- a/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/ColumnMappingPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/ColumnMappingPanel.java
@@ -104,7 +104,8 @@ public class ColumnMappingPanel extends ContentPanel {
columnLabel.setWidth(COLUMNLABELWIDTH);
columnLabel.setLabelSeparator("");*/
- FieldLabel sourceColumnLabel = new FieldLabel(null, "Column");
+ String currentTRLabel=parent.unionSession.getCurrentTabularResource().getName();
+ FieldLabel sourceColumnLabel = new FieldLabel(null, currentTRLabel);
sourceColumnLabel.getElement().applyStyles("font-weight:bold");
sourceColumnLabel.setWidth(COMBOWIDTH);
sourceColumnLabel.setLabelSeparator("");
diff --git a/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/UnionWizardTD.java b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/UnionWizardTD.java
index 42a350e..1f10161 100644
--- a/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/UnionWizardTD.java
+++ b/src/main/java/org/gcube/portlets/user/td/unionwizardwidget/client/UnionWizardTD.java
@@ -1,46 +1,81 @@
package org.gcube.portlets.user.td.unionwizardwidget.client;
+import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
+import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException;
+import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource;
import org.gcube.portlets.user.td.gwtservice.shared.tr.union.UnionSession;
+import org.gcube.portlets.user.td.unionwizardwidget.client.utils.UtilsGXT3;
+import org.gcube.portlets.user.td.widgetcommonevent.client.event.SessionExpiredEvent;
+import org.gcube.portlets.user.td.widgetcommonevent.client.type.SessionExpiredType;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.wizardwidget.client.WizardWindow;
import com.allen_sauer.gwt.log.client.Log;
+import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.web.bindery.event.shared.EventBus;
/**
*
- * @author "Giancarlo Panichi"
- * email: g.panichi@isti.cnr.it
- *
+ * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it
+ *
*/
-public class UnionWizardTD extends WizardWindow {
- protected static final int WITHWIZARD=720;
- protected static final int HEIGHTWIZARD=520;
-
+public class UnionWizardTD extends WizardWindow {
+ protected static final int WITHWIZARD = 720;
+ protected static final int HEIGHTWIZARD = 520;
+
protected UnionSession unionSession;
-
+ protected TRId trId;
+
/**
*
* @param trId
* @param title
* @param eventBus
*/
- public UnionWizardTD(TRId trId, String title, EventBus eventBus) {
- super(title,eventBus);
- Log.debug("UnionWizardTD: "+trId);
+ public UnionWizardTD(TRId trId, String title, EventBus eventBus) {
+ super(title, eventBus);
+ Log.debug("UnionWizardTD: " + trId);
setWidth(WITHWIZARD);
setHeight(HEIGHTWIZARD);
-
- unionSession= new UnionSession();
+
+ this.trId = trId;
+ unionSession = new UnionSession();
unionSession.setTrId(trId);
- TabResourcesSelectionCard tabResourcesSelection= new TabResourcesSelectionCard(unionSession);
+ retriveTabularResourceMinInfo();
+
+ }
+
+ protected void retriveTabularResourceMinInfo(){
+ TDGWTServiceAsync.INSTANCE
+ .getTabResourceInformation(trId, new AsyncCallback() {
+
+ public void onSuccess(TabResource result) {
+ Log.info("Retrived TR: " + result.getTrId());
+ unionSession.setCurrentTabularResource(result);
+ }
+
+ public void onFailure(Throwable caught) {
+ if (caught instanceof TDGWTSessionExpiredException) {
+ eventBus.fireEvent(new SessionExpiredEvent(
+ SessionExpiredType.EXPIREDONSERVER));
+ } else {
+ UtilsGXT3.alert("Error",
+ "Error retrienving information on current tabular resource: ");
+ }
+ }
+
+ });
+ }
+
+ protected void callCard(){
+ TabResourcesSelectionCard tabResourcesSelection = new TabResourcesSelectionCard(
+ unionSession);
addCard(tabResourcesSelection);
tabResourcesSelection.setup();
-
}
-
-
+
}
\ No newline at end of file