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@95694 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-05-14 16:46:26 +00:00
parent 09ffc448e4
commit 2f5ca4d1af
4 changed files with 76 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,6 +70,7 @@ import org.gcube.data.analysis.tabulardata.model.metadata.table.GenericMapMetada
import org.gcube.data.analysis.tabulardata.model.metadata.table.ImportMetadata;
import org.gcube.data.analysis.tabulardata.model.metadata.table.TableMetadata;
import org.gcube.data.analysis.tabulardata.model.metadata.table.VersionMetadata;
import org.gcube.data.analysis.tabulardata.model.relationship.ColumnRelationship;
import org.gcube.data.analysis.tabulardata.model.table.Table;
import org.gcube.data.analysis.tabulardata.model.table.TableId;
import org.gcube.data.analysis.tabulardata.model.table.type.CodelistTableType;
@ -134,6 +135,7 @@ import org.gcube.portlets.user.td.gwtservice.shared.template.TemplateData;
import org.gcube.portlets.user.td.gwtservice.shared.template.TemplateDeleteSession;
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.RelationshipData;
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.Occurrences;
@ -435,12 +437,21 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
} else {
ColumnData cData = new ColumnData();
cData.setId(Integer.toString(i));
cData.setColumnId(c.getLocalId().getValue());
cData.setName(c.getName());
cData.setTypeCode(c.getColumnType().getCode());
cData.setTypeName(c.getColumnType().getName());
cData.setDataTypeName(c.getDataType().getName());
ColumnRelationship rel=c.getRelationship();
if(rel!=null){
RelationshipData relData=new RelationshipData(
rel.getTargetTableId().getValue(),
rel.getTargetColumnId().getValue());
cData.setRelationship(relData);
}
NamesMetadata labelsMetadata = null;
try {
labelsMetadata = c.getMetadata(NamesMetadata.class);
@ -544,6 +555,14 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
cData.setTypeCode(c.getColumnType().getCode());
cData.setTypeName(c.getColumnType().getName());
cData.setDataTypeName(c.getDataType().getName());
ColumnRelationship rel=c.getRelationship();
if(rel!=null){
RelationshipData relData=new RelationshipData(
rel.getTargetTableId().getValue(),
rel.getTargetColumnId().getValue());
cData.setRelationship(relData);
}
NamesMetadata labelsMetadata = null;
try {
labelsMetadata = c.getMetadata(NamesMetadata.class);
@ -658,7 +677,14 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
cData.setTypeCode(c.getColumnType().getCode());
cData.setTypeName(c.getColumnType().getName());
cData.setDataTypeName(c.getDataType().getName());
ColumnRelationship rel=c.getRelationship();
if(rel!=null){
RelationshipData relData=new RelationshipData(
rel.getTargetTableId().getValue(),
rel.getTargetColumnId().getValue());
cData.setRelationship(relData);
}
NamesMetadata labelsMetadata = null;
try {
labelsMetadata = c.getMetadata(NamesMetadata.class);
@ -767,7 +793,14 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
cData.setTypeCode(c.getColumnType().getCode());
cData.setTypeName(c.getColumnType().getName());
cData.setDataTypeName(c.getDataType().getName());
ColumnRelationship rel=c.getRelationship();
if(rel!=null){
RelationshipData relData=new RelationshipData(
rel.getTargetTableId().getValue(),
rel.getTargetColumnId().getValue());
cData.setRelationship(relData);
}
NamesMetadata labelsMetadata = null;
try {
labelsMetadata = c.getMetadata(NamesMetadata.class);
@ -990,7 +1023,14 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
colData.setTypeCode(column.getColumnType().getCode());
colData.setDataTypeName(column.getDataType().getName());
colData.setTrId(newTRId);
ColumnRelationship rel=column.getRelationship();
if(rel!=null){
RelationshipData relData=new RelationshipData(
rel.getTargetTableId().getValue(),
rel.getTargetColumnId().getValue());
colData.setRelationship(relData);
}
if (column.contains(ViewColumnMetadata.class)) {
ViewColumnMetadata viewMetadata = column
.getMetadata(ViewColumnMetadata.class);
@ -1045,7 +1085,13 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
colData.setTypeCode(column.getColumnType().getCode());
colData.setDataTypeName(column.getDataType().getName());
colData.setTrId(newTRId);
ColumnRelationship rel=column.getRelationship();
if(rel!=null){
RelationshipData relData=new RelationshipData(
rel.getTargetTableId().getValue(),
rel.getTargetColumnId().getValue());
colData.setRelationship(relData);
}
if (column.contains(ViewColumnMetadata.class)) {
ViewColumnMetadata viewMetadata = column
.getMetadata(ViewColumnMetadata.class);
@ -1142,7 +1188,14 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
colData.setTypeCode(column.getColumnType().getCode());
colData.setDataTypeName(column.getDataType().getName());
colData.setTrId(newTRId);
ColumnRelationship rel=column.getRelationship();
if(rel!=null){
RelationshipData relData=new RelationshipData(
rel.getTargetTableId().getValue(),
rel.getTargetColumnId().getValue());
colData.setRelationship(relData);
}
if (column.contains(ViewColumnMetadata.class)) {
ViewColumnMetadata viewMetadata = column
.getMetadata(ViewColumnMetadata.class);
@ -1198,7 +1251,14 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
colData.setTypeCode(column.getColumnType().getCode());
colData.setDataTypeName(column.getDataType().getName());
colData.setTrId(newTRId);
ColumnRelationship rel=column.getRelationship();
if(rel!=null){
RelationshipData relData=new RelationshipData(
rel.getTargetTableId().getValue(),
rel.getTargetColumnId().getValue());
colData.setRelationship(relData);
}
if (column.contains(ViewColumnMetadata.class)) {
ViewColumnMetadata viewMetadata = column
.getMetadata(ViewColumnMetadata.class);

5
src/main/java/org/gcube/portlets/user/td/gwtservice/server/trservice/DataService.java
View File

@ -1,5 +0,0 @@
package org.gcube.portlets.user.td.gwtservice.server.trservice;
public class DataService {
}

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

@ -177,4 +177,6 @@ public class QueryService {
}
}

13
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/RelationshipData.java
View File

@ -12,14 +12,15 @@ public class RelationshipData implements Serializable {
private static final long serialVersionUID = 897893891284145975L;
String targetColumnId;
Long targetTableId;
String targetColumnId;
public RelationshipData() {
}
public RelationshipData(String targetColumnId, Long targetTableId) {
public RelationshipData(Long targetTableId, String targetColumnId) {
this.targetColumnId=targetColumnId;
this.targetTableId=targetTableId;
}
@ -42,8 +43,10 @@ public class RelationshipData implements Serializable {
@Override
public String toString() {
return "RelationshipData [targetColumnId=" + targetColumnId
+ ", targetTableId=" + targetTableId + "]";
return "RelationshipData [targetTableId=" + targetTableId
+ ", targetColumnId=" + targetColumnId + "]";
}
}