gCubeSystem
/
tabular-data-expression-widget
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated Rules 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-expression-widget@114363 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2015-04-23 11:30:51 +00:00
parent 9892a1c9af
commit 28897293e4
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/gcube/portlets/user/td/expressionwidget/client/rpc/ExpressionService.java
View File

@ -10,7 +10,7 @@ import org.gcube.portlets.user.td.gwtservice.shared.rule.AppliedRulesResponseDat
import org.gcube.portlets.user.td.gwtservice.shared.rule.DetachColumnRulesSession;
import org.gcube.portlets.user.td.gwtservice.shared.rule.RuleDescriptionData;
import org.gcube.portlets.user.td.gwtservice.shared.rule.RuleScopeType;
import org.gcube.portlets.user.td.gwtservice.shared.rule.ApplyColumnRulesSession;
import org.gcube.portlets.user.td.gwtservice.shared.rule.ApplyAndDetachColumnRulesSession;
import org.gcube.portlets.user.td.gwtservice.shared.tr.column.AddColumnSession;
import org.gcube.portlets.user.td.gwtservice.shared.tr.column.FilterColumnSession;
import org.gcube.portlets.user.td.gwtservice.shared.tr.column.ReplaceColumnByExpressionSession;
@ -68,7 +68,7 @@ public interface ExpressionService extends RemoteService {
public void removeRulesById(ArrayList<RuleDescriptionData> rules) throws TDGWTServiceException;
public String startApplyColumnRules(ApplyColumnRulesSession applyColumnRulesSession)
public String startApplyAndDetachColumnRules(ApplyAndDetachColumnRulesSession applyColumnRulesSession)
throws TDGWTServiceException;
public void setDetachColumnRules(DetachColumnRulesSession detachColumnRulesSession)

6
src/main/java/org/gcube/portlets/user/td/expressionwidget/client/rpc/ExpressionServiceAsync.java
View File

@ -6,7 +6,7 @@ package org.gcube.portlets.user.td.expressionwidget.client.rpc;
import java.util.ArrayList;
import org.gcube.portlets.user.td.gwtservice.shared.rule.AppliedRulesResponseData;
import org.gcube.portlets.user.td.gwtservice.shared.rule.ApplyColumnRulesSession;
import org.gcube.portlets.user.td.gwtservice.shared.rule.ApplyAndDetachColumnRulesSession;
import org.gcube.portlets.user.td.gwtservice.shared.rule.DetachColumnRulesSession;
import org.gcube.portlets.user.td.gwtservice.shared.rule.RuleDescriptionData;
import org.gcube.portlets.user.td.gwtservice.shared.rule.RuleScopeType;
@ -55,8 +55,8 @@ public interface ExpressionServiceAsync {
void removeRulesById(ArrayList<RuleDescriptionData> rules,
AsyncCallback<Void> callback);
void startApplyColumnRules(
ApplyColumnRulesSession ruleOnColumnApplySession,
void startApplyAndDetachColumnRules(
ApplyAndDetachColumnRulesSession ruleOnColumnApplySession,
AsyncCallback<String> callback);
void setDetachColumnRules(

8
src/main/java/org/gcube/portlets/user/td/expressionwidget/server/ExpressionServiceImpl.java
View File

@ -29,7 +29,7 @@ import org.gcube.portlets.user.td.gwtservice.server.TDGWTServiceImpl;
import org.gcube.portlets.user.td.gwtservice.server.trservice.ColumnDataTypeMap;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.rule.AppliedRulesResponseData;
import org.gcube.portlets.user.td.gwtservice.shared.rule.ApplyColumnRulesSession;
import org.gcube.portlets.user.td.gwtservice.shared.rule.ApplyAndDetachColumnRulesSession;
import org.gcube.portlets.user.td.gwtservice.shared.rule.DetachColumnRulesSession;
import org.gcube.portlets.user.td.gwtservice.shared.rule.RuleDescriptionData;
import org.gcube.portlets.user.td.gwtservice.shared.rule.RuleScopeType;
@ -556,12 +556,12 @@ public class ExpressionServiceImpl extends TDGWTServiceImpl implements
* {@inheritDoc}
*/
@Override
public String startApplyColumnRules(
ApplyColumnRulesSession applyColumnRulesSession)
public String startApplyAndDetachColumnRules(
ApplyAndDetachColumnRulesSession applyAndDetachColumnRulesSession)
throws TDGWTServiceException {
try {
HttpSession session = this.getThreadLocalRequest().getSession();
String taskId = startApplyColumnnRules(applyColumnRulesSession,
String taskId = startApplyAndDetachColumnnRules(applyAndDetachColumnRulesSession,
session);
return taskId;