From 15985bfe4a93248c5b5ddd7547480e08d1b4af11 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 23 Oct 2014 16:23:52 +0000 Subject: [PATCH] Updated TRId git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-expression-widget@100932 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../expressionwidget/client/ExpressionWidgetEntry.java | 3 ++- .../expressionwidget/server/ExpressionServiceImpl.java | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ExpressionWidgetEntry.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ExpressionWidgetEntry.java index 962000d..0136d98 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ExpressionWidgetEntry.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ExpressionWidgetEntry.java @@ -3,6 +3,7 @@ package org.gcube.portlets.user.td.expressionwidget.client; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; +import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.TabResourceType; import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.core.client.EntryPoint; @@ -21,7 +22,7 @@ public class ExpressionWidgetEntry implements EntryPoint { public void onModuleLoad() { EventBus eventBus= new SimpleEventBus(); - TRId trId=new TRId("154","1969"); + TRId trId=new TRId("154",TabResourceType.STANDARD, "1969"); String columnName="zwqvvx"; //Column Expression Dialog diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/ExpressionServiceImpl.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/ExpressionServiceImpl.java index 05e2a02..f9e48d4 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/ExpressionServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/server/ExpressionServiceImpl.java @@ -19,6 +19,7 @@ import org.gcube.portlets.user.td.expressionwidget.shared.exception.ExpressionPa import org.gcube.portlets.user.td.expressionwidget.shared.exception.ExpressionServiceException; import org.gcube.portlets.user.td.gwtservice.server.SessionUtil; import org.gcube.portlets.user.td.gwtservice.server.TDGWTServiceImpl; +import org.gcube.portlets.user.td.gwtservice.server.trservice.TabularResourceTypeMap; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.FilterColumnSession; import org.gcube.portlets.user.td.gwtservice.shared.tr.column.ReplaceColumnByExpressionSession; @@ -184,13 +185,13 @@ public class ExpressionServiceImpl extends RemoteServiceServlet implements TRId newTRId; if (viewTable == null) { newTRId = new TRId(String.valueOf(tr.getId().getValue()), - tr.getTableType(), String.valueOf(table.getId() - .getValue()), table.getTableType().getName()); + TabularResourceTypeMap.map(tr.getTabularResourceType()), tr.getTableType(), String.valueOf(table.getId() + .getValue()), table.getTableType().getName()); } else { newTRId = new TRId(String.valueOf(tr.getId().getValue()), - tr.getTableType(), String.valueOf(viewTable.getId() - .getValue()), viewTable.getTableType() + TabularResourceTypeMap.map(tr.getTabularResourceType()), tr.getTableType(), String.valueOf(viewTable.getId() + .getValue()), viewTable.getTableType() .getName(), String.valueOf(table.getId() .getValue()), true);