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

Updated Geometry Type Support 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-widgetx@100073 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-09-19 15:57:37 +00:00 committed by Giancarlo Panichi
parent db3936bf15
commit af96779ff6
6 changed files with 48 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
TabularDataWidgetX.launch Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="com.google.gdt.eclipse.suite.webapp">
<stringAttribute key="com.google.gwt.eclipse.core.URL" value="TabularDataWidgetX.html"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/tabular-data-widgetx"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="4"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="com.google.gdt.eclipse.maven.mavenClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value=""/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="tabular-data-widgetx"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m -Dgwt.nowarn.legacy.tools"/>
</launchConfiguration>

7
src/main/java/org/gcube/portlets/user/tdwx/client/filter/FiltersGenerator.java
View File

@ -91,6 +91,13 @@ public class FiltersGenerator {
(ValueProvider<DataRow, String>) dataRowColConfig
.getValueProvider());
filters.add(stringFilt);
case GEOMETRY:
//TODO Filter for geometry type
/*@SuppressWarnings("unchecked")
StringFilter<DataRow> geometryFilt = new StringFilter<DataRow>(
(ValueProvider<DataRow, String>) dataRowColConfig
.getValueProvider());
filters.add(geometryFilt);*/
break;
default:
break;

1
src/main/java/org/gcube/portlets/user/tdwx/client/model/grid/JSonValueConverter.java
View File

@ -64,6 +64,7 @@ public class JSonValueConverter {
case INTEGER: row.set(key, Integer.valueOf((int)json.getAsNumber(key.getJSonIndex()))); break;
case LONG: row.set(key, Long.valueOf((long)json.getAsNumber(key.getJSonIndex()))); break;
case STRING: row.set(key, json.getAsString(key.getJSonIndex())); break;
case GEOMETRY: row.set(key, json.getAsString(key.getJSonIndex())); break;
default: row.set(key, null); break;
}
}

8
src/main/java/org/gcube/portlets/user/tdwx/client/model/util/ColumnConfigGenerator.java
View File

@ -92,6 +92,9 @@ public class ColumnConfigGenerator {
columnConfig = ColumnConfigGenerator
.<Long> create(columnDefinition);
break;
case GEOMETRY:
columnConfig = ColumnConfigGenerator
.<String> create(columnDefinition);
case STRING: {
columnConfig = ColumnConfigGenerator
@ -198,6 +201,11 @@ public class ColumnConfigGenerator {
new NumberField<Long>(
new NumberPropertyEditor.LongPropertyEditor()));
break;
case GEOMETRY:
editableGrid.addEditor(
(ColumnConfig<DataRow, String>) columnConfig,
new TextField());
break;
case STRING:
editableGrid.addEditor(
(ColumnConfig<DataRow, String>) columnConfig,

33
src/main/java/org/gcube/portlets/user/tdwx/server/datasource/util/TableJSonBuilder.java
View File

@ -7,37 +7,36 @@ import org.gcube.portlets.user.tdwx.shared.model.TableDefinition;
/**
*
* @author "Giancarlo Panichi"
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
* @author "Giancarlo Panichi" <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class TableJSonBuilder extends GridJSonBuilder {
protected TableDefinition tableDefinition;
public TableJSonBuilder(TableDefinition tableDefinition)
{
public TableJSonBuilder(TableDefinition tableDefinition) {
super();
this.tableDefinition = tableDefinition;
this.tableDefinition = tableDefinition;
}
public void startRows() {
super.startRows(tableDefinition.getJsonRowsField());
}
public void endRow()
{
if (fieldsCount != tableDefinition.getColumns().size()) throw new IllegalStateException("Expected "+tableDefinition.getColumns().size()+" fields, added "+fieldsCount);
public void endRow() {
if (fieldsCount != tableDefinition.getColumns().size())
throw new IllegalStateException("Expected "
+ tableDefinition.getColumns().size() + " fields, added "
+ fieldsCount);
super.endRow();
}
public void setTotalLength(int length)
{
public void setTotalLength(int length) {
super.setTotalLength(tableDefinition.getJsonTotalLengthField(), length);
}
public void setOffset(int offset)
{
public void setOffset(int offset) {
super.setOffset(tableDefinition.getJsonOffsetField(), offset);
}

3
src/main/java/org/gcube/portlets/user/tdwx/shared/model/ValueType.java
View File

@ -18,5 +18,6 @@ public enum ValueType implements Serializable {
FLOAT,
DOUBLE,
LONG,
DATE;
DATE,
GEOMETRY;
}