From 51ee6591cc41851c42dc19c221e87ea007892840 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 11 Mar 2015 13:50:03 +0000 Subject: [PATCH] Fixed Flow git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@113563 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../gwtservice/server/TDGWTServiceImpl.java | 34 ++++++------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java index 331fdc1..ef14c7d 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java @@ -2515,25 +2515,10 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements /** * + * @param service * @param tr - * @throws TDGWTServiceException - * - * private TabResource - * retrieveTRMetadataFromServiceAndLastTable( TabularDataService - * service, TabularResource tr) throws TDGWTServiceException { - * return retrieveTRMetadataFromServiceAndLastTable(service, tr, - * 0); } - */ - - /** - * Retrieves the informations for a specific Tabular Resource from service - * without table id (fast) - * - * @param tr - * TabularResource on service * @param i - * Index on Grid - * @return TabResource for Grid + * @return * @throws TDGWTServiceException */ private TabResource retrieveTRMetadataFromService( @@ -2630,11 +2615,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements * Retrieves the informations for a specific Tabular Resource and the Last * Table from service * + * + * @param service * @param tr - * TabularResource on service * @param i - * Index on Grid - * @return TabResource for Grid + * @return * @throws TDGWTServiceException */ private TabResource retrieveTRMetadataFromServiceAndLastTable( @@ -6146,7 +6131,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements Long.valueOf(templateApplySession.getTrId().getId())); TabularResource tabularResource = service .getTabularResource(tabularResourceId); - + + checkTabularResourceIsFlow(tabularResource); checkTabularResourceLocked(tabularResource); checkTabularResourceIsFinal(tabularResource); @@ -8567,7 +8553,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements Long.valueOf(mapCreationSession.getTrId().getId())); TabularResource tabularResource = service .getTabularResource(tabularResourceId); - + + checkTabularResourceIsFlow(tabularResource); checkTabularResourceLocked(tabularResource); OpExecution4MapCreation opEx = new OpExecution4MapCreation(service, @@ -8691,7 +8678,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements .getId())); TabularResource tabularResource = service .getTabularResource(tabularResourceId); - + + checkTabularResourceIsFlow(tabularResource); checkTabularResourceLocked(tabularResource); OpExecution4ChartTopRating opEx = new OpExecution4ChartTopRating(