gCubeSystem
/
tabular-data-gwt-service
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor Update 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@95424 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-05-07 15:56:27 +00:00
parent a1db75ab64
commit f558e79fe3
3 changed files with 63 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -149,7 +149,7 @@
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>csv4j</artifactId>
<version>[1.2.0-SNAPSHOT, 2.0.0-common)</version>
<version>[1.2.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
</dependency>
<!-- Service Client -->

63
src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
View File

@ -2636,7 +2636,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
importMonitor.setProgress(task.getProgress());
break;
case GENERATING_VIEW:
break;
break;
case ABORTED:
break;
case INITIALIZING:
@ -3801,24 +3801,28 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
* @return
* @throws TDGWTServiceException
*/
protected OperationExecution retrieveOperationExecution(
protected ArrayList<OperationExecution> retrieveOperationExecution(
TabularDataService service, DeleteColumnSession deleteColumnSession)
throws TDGWTServiceException {
OperationExecution invocation = null;
List<OperationDefinition> capabilities = service.getCapabilities();
logger.debug(deleteColumnSession.toString());
List<OperationDefinition> capabilities = service.getCapabilities();
OperationDefinition operationDefinition;
Map<String, Object> map = new HashMap<String, Object>();
operationDefinition = OperationDefinitionMap.map(
OperationsId.RemoveColumn.toString(), capabilities);
Map<String, Object> map = new HashMap<String, Object>();
ArrayList<OperationExecution> invocations = new ArrayList<OperationExecution>();
for (ColumnData col : deleteColumnSession.getColumns()) {
invocation = new OperationExecution(deleteColumnSession.getColumnData()
.getColumnId(), operationDefinition.getOperationId(), map);
return invocation;
OperationExecution invocation = null;
invocation = new OperationExecution(col.getColumnId(),
operationDefinition.getOperationId(), map);
invocations.add(invocation);
}
return invocations;
}
/**
@ -4092,7 +4096,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
changeColumnTypeMonitor.setProgress(task.getProgress());
break;
case GENERATING_VIEW:
break;
break;
case ABORTED:
break;
case STOPPED:
@ -4145,8 +4149,8 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
AuthorizationProvider.instance.set(new AuthorizationToken(
aslSession.getUsername()));
TabularDataService service = TabularDataServiceFactory.getService();
OperationExecution invocation = retrieveOperationExecution(service,
ArrayList<OperationExecution> invocation = retrieveOperationExecution(service,
deleteColumnSession);
if (invocation == null) {
throw new TDGWTServiceException(
@ -4154,10 +4158,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
}
TabularResourceId serviceTR = new TabularResourceId(
Long.valueOf(deleteColumnSession.getColumnData().getTrId()
.getId()));
Long.valueOf(deleteColumnSession.getTrId().getId()));
logger.debug("OperationInvocation: \n" + invocation.toString());
Task trTask = service.execute(invocation, serviceTR);
Task trTask = service.executeBatch(invocation, serviceTR);
logger.debug("Start Task on service: TaskId " + trTask.getId());
SessionUtil.setDeleteColumnTask(session, trTask);
return;
@ -4220,8 +4223,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
table = task.getResult().getPrimaryTable();
logger.debug("Table retrived: " + table.toString());
trId = new TRId();
trId.setId(deleteColumnSession.getColumnData()
.getTrId().getId());
trId.setId(deleteColumnSession.getTrId().getId());
trId = retrieveTabularResourceBasicData(trId);
deleteColumnMonitor.setTrId(trId);
@ -4237,7 +4239,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
deleteColumnMonitor.setProgress(task.getProgress());
break;
case GENERATING_VIEW:
break;
break;
case ABORTED:
break;
case STOPPED:
@ -4246,8 +4248,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
table = task.getResult().getPrimaryTable();
logger.debug("Table retrived: " + table.toString());
trId = new TRId();
trId.setId(deleteColumnSession.getColumnData()
.getTrId().getId());
trId.setId(deleteColumnSession.getTrId().getId());
trId = retrieveTabularResourceBasicData(trId);
deleteColumnMonitor.setTrId(trId);
@ -4382,7 +4383,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
labelColumnMonitor.setProgress(task.getProgress());
break;
case GENERATING_VIEW:
break;
break;
case ABORTED:
break;
case STOPPED:
@ -4529,7 +4530,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
changeTableTypeMonitor.setProgress(task.getProgress());
break;
case GENERATING_VIEW:
break;
break;
case ABORTED:
break;
case STOPPED:
@ -4786,7 +4787,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
deleteRowsMonitor.setProgress(task.getProgress());
break;
case GENERATING_VIEW:
break;
break;
case ABORTED:
break;
case STOPPED:
@ -4996,7 +4997,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
duplicatesMonitor.setProgress(task.getProgress());
break;
case GENERATING_VIEW:
break;
break;
case ABORTED:
break;
case STOPPED:
@ -5353,7 +5354,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
templateApplyMonitor.setProgress(task.getProgress());
break;
case GENERATING_VIEW:
break;
break;
case ABORTED:
break;
case STOPPED:
@ -5535,7 +5536,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
replaceColumnMonitor.setProgress(task.getProgress());
break;
case GENERATING_VIEW:
break;
break;
case ABORTED:
break;
case STOPPED:
@ -5691,7 +5692,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
.getProgress());
break;
case GENERATING_VIEW:
break;
break;
case ABORTED:
break;
case STOPPED:
@ -6145,7 +6146,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
rollBackMonitor.setProgress(task.getProgress());
break;
case GENERATING_VIEW:
break;
break;
case ABORTED:
break;
case STOPPED:

36
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/column/DeleteColumnSession.java
View File

@ -1,8 +1,10 @@
package org.gcube.portlets.user.td.gwtservice.shared.tr.column;
import java.io.Serializable;
import java.util.ArrayList;
import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
/**
*
@ -14,21 +16,43 @@ public class DeleteColumnSession implements Serializable {
private static final long serialVersionUID = -1896235499708614266L;
protected ColumnData columnData;
protected TRId trId;
protected ArrayList<ColumnData> columns;
public ColumnData getColumnData() {
return columnData;
public DeleteColumnSession(){
}
public void setColumnData(ColumnData columnData) {
this.columnData = columnData;
public DeleteColumnSession(TRId trId,ArrayList<ColumnData> columns){
this.trId=trId;
this.columns=columns;
}
public TRId getTrId() {
return trId;
}
public void setTrId(TRId trId) {
this.trId = trId;
}
public ArrayList<ColumnData> getColumns() {
return columns;
}
public void setColumns(ArrayList<ColumnData> columns) {
this.columns = columns;
}
@Override
public String toString() {
return "DeleteColumnSession [columnData=" + columnData + "]";
return "DeleteColumnSession [trId=" + trId + ", columns=" + columns
+ "]";
}
}