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@94313 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-04-04 10:33:38 +00:00
parent 011ed21357
commit 7db2e84d78
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,7 @@ import org.gcube.portlets.user.td.gwtservice.shared.template.TemplateDeleteSessi
import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource;
import org.gcube.portlets.user.td.gwtservice.shared.tr.TableData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.Occurences;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.Occurrences;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.ReplaceBatchColumnMonitor;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.ReplaceBatchColumnSession;
import org.gcube.portlets.user.td.gwtservice.shared.tr.clone.CloneTabularResourceSession;
@ -600,7 +600,7 @@ public interface TDGWTService extends RemoteService {
* @param column
* @return
*/
public ArrayList<Occurences> getOccurencesForBatchReplace(ColumnData column)
public ArrayList<Occurrences> getOccurrencesForBatchReplace(ColumnData column)
throws TDGWTServiceException;
/**

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

@ -26,7 +26,7 @@ import org.gcube.portlets.user.td.gwtservice.shared.template.TemplateDeleteSessi
import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource;
import org.gcube.portlets.user.td.gwtservice.shared.tr.TableData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.Occurences;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.Occurrences;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.ReplaceBatchColumnMonitor;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.ReplaceBatchColumnSession;
import org.gcube.portlets.user.td.gwtservice.shared.tr.clone.CloneTabularResourceSession;
@ -189,7 +189,7 @@ public interface TDGWTServiceAsync {
void startLabelColumn(LabelColumnSession labelColumnSession,AsyncCallback<Void> callback);
//BatchReplace Operation
void getOccurencesForBatchReplace(ColumnData column, AsyncCallback<ArrayList<Occurences>> callback);
void getOccurrencesForBatchReplace(ColumnData column, AsyncCallback<ArrayList<Occurrences>> callback);
void getReplaceBatchColumnMonitor(AsyncCallback<ReplaceBatchColumnMonitor> callback);
void startReplaceBatchColumn(ReplaceBatchColumnSession replaceBatchColumnSession,AsyncCallback<Void> callback);

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

@ -119,7 +119,7 @@ import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnViewData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.TabResource;
import org.gcube.portlets.user.td.gwtservice.shared.tr.TableData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.Occurences;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.Occurrences;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.ReplaceBatchColumnMonitor;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.ReplaceBatchColumnSession;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.ReplaceEntry;
@ -4741,7 +4741,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
* {@inheritDoc}
*/
@Override
public ArrayList<Occurences> getOccurencesForBatchReplace(ColumnData column)
public ArrayList<Occurrences> getOccurrencesForBatchReplace(ColumnData column)
throws TDGWTServiceException {
try {
HttpSession session = this.getThreadLocalRequest().getSession();
@ -4751,7 +4751,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
aslSession.getUsername()));
TabularDataService service = TabularDataServiceFactory.getService();
ArrayList<Occurences> occurences = QueryService.queryOccurences(
ArrayList<Occurrences> occurences = QueryService.queryOccurences(
service, column, Direction.ASC);
logger.debug("Retrieved Occurences");

12
src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/QueryService.java
View File

@ -15,7 +15,7 @@ import org.gcube.data.analysis.tabulardata.query.parameters.select.QuerySelect;
import org.gcube.data.analysis.tabulardata.service.TabularDataService;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException;
import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.Occurences;
import org.gcube.portlets.user.td.gwtservice.shared.tr.batch.Occurrences;
import org.gcube.portlets.user.td.gwtservice.shared.tr.paging.Direction;
import org.json.JSONArray;
import org.json.JSONException;
@ -33,11 +33,11 @@ public class QueryService {
protected static Logger logger = LoggerFactory
.getLogger(QueryService.class);
public static ArrayList<Occurences> queryOccurences(
public static ArrayList<Occurrences> queryOccurences(
TabularDataService service, ColumnData column, Direction direction)
throws TDGWTServiceException {
logger.debug("QueryOccurences");
ArrayList<Occurences> occurences = new ArrayList<Occurences>();
ArrayList<Occurrences> occurences = new ArrayList<Occurrences>();
TableId tableId = new TableId(new Long(column.getTrId().getTableId()));
ColumnLocalId columnId = new ColumnLocalId(column.getColumnId());
@ -109,15 +109,15 @@ public class QueryService {
totalRows = rows.length();
logger.debug("Reading rows from json");
Occurences occurence = null;
Occurrences occurence = null;
for (i = 0; i < totalRows; i++) {
currentRow = rows.getJSONArray(i);
if (column.isViewColumn()) {
occurence = new Occurences(currentRow.getString(0),
occurence = new Occurrences(currentRow.getString(0),
currentRow.getString(1),currentRow.getInt(2));
} else {
occurence = new Occurences(currentRow.getString(0),
occurence = new Occurrences(currentRow.getString(0),
currentRow.getInt(1));
}
//logger.debug(occurence.toString());

8
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/batch/Occurences.java → src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/batch/Occurrences.java
View File

@ -8,7 +8,7 @@ import java.io.Serializable;
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class Occurences implements Serializable {
public class Occurrences implements Serializable {
private static final long serialVersionUID = -5521905443482827219L;
@ -16,17 +16,17 @@ public class Occurences implements Serializable {
protected int number;
protected String rowId;//For view column, contains the value of the associated dimension column
public Occurences(){
public Occurrences(){
}
public Occurences(String value, int number){
public Occurrences(String value, int number){
this.value=value;
this.number=number;
this.rowId=null;
}
public Occurences(String value, String rowId,int number){
public Occurrences(String value, String rowId,int number){
this.value=value;
this.number=number;
this.rowId=rowId;