From 49b411d4b6a04b682e05b0f68cc088a4d828a34c Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 18 Feb 2015 11:43:49 +0000 Subject: [PATCH] Release 3.6.0 git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@112165 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../server/opexecution/OpExecution4GeometryCreatePoint.java | 4 ++-- .../user/td/gwtservice/shared/tr/ValueDataFormat.java | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeometryCreatePoint.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeometryCreatePoint.java index 60a4264..61495dd 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeometryCreatePoint.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4GeometryCreatePoint.java @@ -74,7 +74,7 @@ public class OpExecution4GeometryCreatePoint extends OpExecutionBuilder { ColumnData latitudeColumn = geometryCreatePointSession.getLatitude(); logger.debug("Latitude Column: " + latitudeColumn); if (latitudeColumn == null) { - logger.error("Error Creating Geospatial Coordinates: Latitude Column is null"); + logger.error("Error creating Geometry: Latitude Column is null"); throw new TDGWTServiceException("No latitude column set"); } ColumnLocalId latitudeId = new ColumnLocalId( @@ -85,7 +85,7 @@ public class OpExecution4GeometryCreatePoint extends OpExecutionBuilder { ColumnData longitudeColumn = geometryCreatePointSession.getLongitude(); logger.debug("Longitude Column: " + longitudeColumn); if (longitudeColumn == null) { - logger.error("Error Creating Geospatial Coordinates: Longitude Column is null"); + logger.error("Error creating Geometry: Longitude Column is null"); throw new TDGWTServiceException("No longitude column set"); } ColumnLocalId longitudeId = new ColumnLocalId( diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ValueDataFormat.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ValueDataFormat.java index 82e8349..d902800 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ValueDataFormat.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/tr/ValueDataFormat.java @@ -51,6 +51,10 @@ public class ValueDataFormat implements Serializable { this.regexp = regexp; } + public String getLabel(){ + return id; + } + @Override public String toString() { return "TimeDataFormat [id=" + id + ", example=" + example