From 85c84f41dbacb2ed63a47a462d912218fd35787f Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Mon, 13 Oct 2014 09:58:16 +0000
Subject: [PATCH] Updated Map Creation

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@100628 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../td/gwtservice/server/SessionUtil.java     | 15 +++---
 .../gwtservice/server/TDGWTServiceImpl.java   |  2 +-
 .../shared/map/MapCreationSession.java        | 53 ++++++++++++++++++-
 3 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java
index e945319..64ba20f 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java
@@ -82,13 +82,14 @@ public class SessionUtil {
 
 			// Remove comment for Test
 			/*
-			 * username = Constants.DEFAULT_USER; String scope =
-			 * Constants.DEFAULT_SCOPE;
-			 * 
-			 * httpSession.setAttribute(ScopeHelper.USERNAME_ATTRIBUTE,
-			 * username); session = SessionManager.getInstance().getASLSession(
-			 * httpSession.getId(), username); session.setScope(scope);
-			 */
+			username = Constants.DEFAULT_USER;
+			String scope = Constants.DEFAULT_SCOPE;
+
+			httpSession.setAttribute(ScopeHelper.USERNAME_ATTRIBUTE, username);
+			session = SessionManager.getInstance().getASLSession(
+					httpSession.getId(), username);
+			session.setScope(scope);
+			*/
 		} else {
 			session = SessionManager.getInstance().getASLSession(
 					httpSession.getId(), username);
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
index 5c170de..2ca6241 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java
@@ -6790,7 +6790,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
 
 			if (invocation == null) {
 				throw new TDGWTServiceException(
-						"Error Delete Rows invocation: Operation not supported");
+						"Error Generate Map invocation: Operation not supported");
 			}
 
 			TabularResourceId serviceTR = new TabularResourceId(
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/map/MapCreationSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/map/MapCreationSession.java
index 6d81bec..4be2293 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/map/MapCreationSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/map/MapCreationSession.java
@@ -20,6 +20,10 @@ public class MapCreationSession implements Serializable {
 	private static final long serialVersionUID = 2648327461965415567L;
 
 	private TRId trId;
+	private ArrayList<ColumnData> columns;
+	private boolean existsGeometryColumn;
+	private int countGeometryColumns;
+	private ArrayList<ColumnData> geometryColumns;
 	private String name;
 	private ArrayList<ColumnData> feature;
 	private boolean useView;
@@ -37,6 +41,10 @@ public class MapCreationSession implements Serializable {
 	/**
 	 * 
 	 * @param trId
+	 * @param columns
+	 * @param existsGeometryColumn
+	 * @param countGeometryColumns
+	 * @param geometryColumns
 	 * @param name
 	 * @param feature
 	 * @param useView
@@ -47,13 +55,19 @@ public class MapCreationSession implements Serializable {
 	 * @param metaCredits
 	 * @param metaKeywords
 	 */
-	public MapCreationSession(TRId trId, String name,
+	public MapCreationSession(TRId trId, ArrayList<ColumnData> columns,
+			boolean existsGeometryColumn, int countGeometryColumns,
+			ArrayList<ColumnData> geometryColumns, String name,
 			ArrayList<ColumnData> feature, boolean useView,
 			ColumnData geometry, String username, String metaAbstract,
 			String metaPurpose, String metaCredits,
 			ArrayList<String> metaKeywords) {
 		super();
 		this.trId = trId;
+		this.columns = columns;
+		this.existsGeometryColumn = existsGeometryColumn;
+		this.countGeometryColumns = countGeometryColumns;
+		this.geometryColumns = geometryColumns;
 		this.name = name;
 		this.feature = feature;
 		this.useView = useView;
@@ -73,6 +87,38 @@ public class MapCreationSession implements Serializable {
 		this.trId = trId;
 	}
 
+	public ArrayList<ColumnData> getColumns() {
+		return columns;
+	}
+
+	public void setColumns(ArrayList<ColumnData> columns) {
+		this.columns = columns;
+	}
+
+	public boolean isExistsGeometryColumn() {
+		return existsGeometryColumn;
+	}
+
+	public void setExistsGeometryColumn(boolean existsGeometryColumn) {
+		this.existsGeometryColumn = existsGeometryColumn;
+	}
+
+	public int getCountGeometryColumns() {
+		return countGeometryColumns;
+	}
+
+	public void setCountGeometryColumns(int countGeometryColumns) {
+		this.countGeometryColumns = countGeometryColumns;
+	}
+
+	public ArrayList<ColumnData> getGeometryColumns() {
+		return geometryColumns;
+	}
+
+	public void setGeometryColumns(ArrayList<ColumnData> geometryColumns) {
+		this.geometryColumns = geometryColumns;
+	}
+
 	public String getName() {
 		return name;
 	}
@@ -147,7 +193,10 @@ public class MapCreationSession implements Serializable {
 
 	@Override
 	public String toString() {
-		return "MapCreationSession [trId=" + trId + ", name=" + name
+		return "MapCreationSession [trId=" + trId + ", columns=" + columns
+				+ ", existsGeometryColumn=" + existsGeometryColumn
+				+ ", countGeometryColumns=" + countGeometryColumns
+				+ ", geometryColumns=" + geometryColumns + ", name=" + name
 				+ ", feature=" + feature + ", useView=" + useView
 				+ ", geometry=" + geometry + ", username=" + username
 				+ ", metaAbstract=" + metaAbstract + ", metaPurpose="