Minor Update

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@96691 82a268e6-3cf1-43bd-a215-b396298e98cf

src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTService.java

@@ -51,8 +51,12 @@ import org.gcube.portlets.user.td.gwtservice.shared.tr.column.DeleteColumnMonito
 import org.gcube.portlets.user.td.gwtservice.shared.tr.column.DeleteColumnSession;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.column.LabelColumnMonitor;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.column.LabelColumnSession;
+import org.gcube.portlets.user.td.gwtservice.shared.tr.column.MergeColumnMonitor;
+import org.gcube.portlets.user.td.gwtservice.shared.tr.column.MergeColumnSession;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.column.ReplaceColumnMonitor;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.column.ReplaceColumnSession;
+import org.gcube.portlets.user.td.gwtservice.shared.tr.column.SplitColumnMonitor;
+import org.gcube.portlets.user.td.gwtservice.shared.tr.column.SplitColumnSession;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.column.type.ChangeColumnTypeMonitor;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.column.type.ChangeColumnTypeSession;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.metadata.TRMetadata;
@@ -774,6 +778,47 @@ public interface TDGWTService extends RemoteService {
 	public void startLabelColumn(LabelColumnSession labelColumnSession)
 			throws TDGWTServiceException;
 	
+	/**
+	 * Get Operation Monitor during the Split Column operation
+	 * 
+	 * 
+	 * @return
+	 * @throws TDGWTServiceException
+	 */
+	public SplitColumnMonitor getSplitColumnMonitor()
+			throws TDGWTServiceException;
+
+	/**
+	 * Start split column
+	 * 
+	 * @param splitColumnSession
+	 * @throws TDGWTServiceException
+	 */
+	public void startSplitColumn(SplitColumnSession splitColumnSession)
+			throws TDGWTServiceException;
+	
+	/**
+	 * Get Operation Monitor during the Merge Column operation
+	 * 
+	 * 
+	 * @return
+	 * @throws TDGWTServiceException
+	 */
+	public MergeColumnMonitor getMergeColumnMonitor()
+			throws TDGWTServiceException;
+
+	/**
+	 * Start merge column
+	 * 
+	 * @param splitColumnSession
+	 * @throws TDGWTServiceException
+	 */
+	public void startMergeColumn(MergeColumnSession mergeColumnSession)
+			throws TDGWTServiceException;
+
+	
+	
+	
 	// BatchReplace Operations
 	/**
 	 * Retrieves the values ​​in a column grouped by number of occurrences

src/main/java/org/gcube/portlets/user/td/gwtservice/client/rpc/TDGWTServiceAsync.java

@@ -50,8 +50,12 @@ import org.gcube.portlets.user.td.gwtservice.shared.tr.column.DeleteColumnMonito
 import org.gcube.portlets.user.td.gwtservice.shared.tr.column.DeleteColumnSession;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.column.LabelColumnMonitor;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.column.LabelColumnSession;
+import org.gcube.portlets.user.td.gwtservice.shared.tr.column.MergeColumnMonitor;
+import org.gcube.portlets.user.td.gwtservice.shared.tr.column.MergeColumnSession;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.column.ReplaceColumnMonitor;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.column.ReplaceColumnSession;
+import org.gcube.portlets.user.td.gwtservice.shared.tr.column.SplitColumnMonitor;
+import org.gcube.portlets.user.td.gwtservice.shared.tr.column.SplitColumnSession;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.column.type.ChangeColumnTypeMonitor;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.column.type.ChangeColumnTypeSession;
 import org.gcube.portlets.user.td.gwtservice.shared.tr.metadata.TRMetadata;
@@ -216,6 +220,12 @@ public interface TDGWTServiceAsync {
 	void getLabelColumnMonitor(AsyncCallback<LabelColumnMonitor> callback);
 	void startLabelColumn(LabelColumnSession labelColumnSession,AsyncCallback<Void> callback);	
 	
+	void getSplitColumnMonitor(AsyncCallback<SplitColumnMonitor> callback);
+	void startSplitColumn(SplitColumnSession splitColumnSession,AsyncCallback<Void> callback);	
+	void getMergeColumnMonitor(AsyncCallback<MergeColumnMonitor> callback);
+	void startSplitColumn(MergeColumnSession mergeColumnSession,AsyncCallback<Void> callback);	
+
+	
 	//BatchReplace Operation
 	void getOccurrencesForBatchReplace(OccurrencesForReplaceBatchColumnSession occurrencesForReplaceBatchColumnSession, AsyncCallback<ArrayList<Occurrences>> callback); 
 	void getReplaceBatchColumnMonitor(AsyncCallback<ReplaceBatchColumnMonitor> callback);

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

@@ -7678,6 +7678,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 	}
 
 	// TODO
+	@Override
 	public void startSplitColumn(SplitColumnSession splitColumnSession)
 			throws TDGWTServiceException {
 		try {
@@ -7721,6 +7722,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 
 	}
 	
+	@Override
 	public SplitColumnMonitor getSplitColumnMonitor()
 			throws TDGWTServiceException {
 		try {
@@ -7822,6 +7824,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 	}
 
 	// TODO
+	@Override
 	public void startMergeColumn(MergeColumnSession mergeColumnSession)
 			throws TDGWTServiceException {
 		try {
@@ -7865,6 +7868,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 
 	}
 	
+	@Override
 	public MergeColumnMonitor getMergeColumnMonitor()
 			throws TDGWTServiceException {
 		try {