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
This commit is contained in:
parent
af19d456e2
commit
85c84f41db
|
@ -82,13 +82,14 @@ public class SessionUtil {
|
||||||
|
|
||||||
// Remove comment for Test
|
// Remove comment for Test
|
||||||
/*
|
/*
|
||||||
* username = Constants.DEFAULT_USER; String scope =
|
username = Constants.DEFAULT_USER;
|
||||||
* Constants.DEFAULT_SCOPE;
|
String scope = Constants.DEFAULT_SCOPE;
|
||||||
*
|
|
||||||
* httpSession.setAttribute(ScopeHelper.USERNAME_ATTRIBUTE,
|
httpSession.setAttribute(ScopeHelper.USERNAME_ATTRIBUTE, username);
|
||||||
* username); session = SessionManager.getInstance().getASLSession(
|
session = SessionManager.getInstance().getASLSession(
|
||||||
* httpSession.getId(), username); session.setScope(scope);
|
httpSession.getId(), username);
|
||||||
*/
|
session.setScope(scope);
|
||||||
|
*/
|
||||||
} else {
|
} else {
|
||||||
session = SessionManager.getInstance().getASLSession(
|
session = SessionManager.getInstance().getASLSession(
|
||||||
httpSession.getId(), username);
|
httpSession.getId(), username);
|
||||||
|
|
|
@ -6790,7 +6790,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements
|
||||||
|
|
||||||
if (invocation == null) {
|
if (invocation == null) {
|
||||||
throw new TDGWTServiceException(
|
throw new TDGWTServiceException(
|
||||||
"Error Delete Rows invocation: Operation not supported");
|
"Error Generate Map invocation: Operation not supported");
|
||||||
}
|
}
|
||||||
|
|
||||||
TabularResourceId serviceTR = new TabularResourceId(
|
TabularResourceId serviceTR = new TabularResourceId(
|
||||||
|
|
|
@ -20,6 +20,10 @@ public class MapCreationSession implements Serializable {
|
||||||
private static final long serialVersionUID = 2648327461965415567L;
|
private static final long serialVersionUID = 2648327461965415567L;
|
||||||
|
|
||||||
private TRId trId;
|
private TRId trId;
|
||||||
|
private ArrayList<ColumnData> columns;
|
||||||
|
private boolean existsGeometryColumn;
|
||||||
|
private int countGeometryColumns;
|
||||||
|
private ArrayList<ColumnData> geometryColumns;
|
||||||
private String name;
|
private String name;
|
||||||
private ArrayList<ColumnData> feature;
|
private ArrayList<ColumnData> feature;
|
||||||
private boolean useView;
|
private boolean useView;
|
||||||
|
@ -37,6 +41,10 @@ public class MapCreationSession implements Serializable {
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @param trId
|
* @param trId
|
||||||
|
* @param columns
|
||||||
|
* @param existsGeometryColumn
|
||||||
|
* @param countGeometryColumns
|
||||||
|
* @param geometryColumns
|
||||||
* @param name
|
* @param name
|
||||||
* @param feature
|
* @param feature
|
||||||
* @param useView
|
* @param useView
|
||||||
|
@ -47,13 +55,19 @@ public class MapCreationSession implements Serializable {
|
||||||
* @param metaCredits
|
* @param metaCredits
|
||||||
* @param metaKeywords
|
* @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,
|
ArrayList<ColumnData> feature, boolean useView,
|
||||||
ColumnData geometry, String username, String metaAbstract,
|
ColumnData geometry, String username, String metaAbstract,
|
||||||
String metaPurpose, String metaCredits,
|
String metaPurpose, String metaCredits,
|
||||||
ArrayList<String> metaKeywords) {
|
ArrayList<String> metaKeywords) {
|
||||||
super();
|
super();
|
||||||
this.trId = trId;
|
this.trId = trId;
|
||||||
|
this.columns = columns;
|
||||||
|
this.existsGeometryColumn = existsGeometryColumn;
|
||||||
|
this.countGeometryColumns = countGeometryColumns;
|
||||||
|
this.geometryColumns = geometryColumns;
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.feature = feature;
|
this.feature = feature;
|
||||||
this.useView = useView;
|
this.useView = useView;
|
||||||
|
@ -73,6 +87,38 @@ public class MapCreationSession implements Serializable {
|
||||||
this.trId = trId;
|
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() {
|
public String getName() {
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
|
@ -147,7 +193,10 @@ public class MapCreationSession implements Serializable {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
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
|
+ ", feature=" + feature + ", useView=" + useView
|
||||||
+ ", geometry=" + geometry + ", username=" + username
|
+ ", geometry=" + geometry + ", username=" + username
|
||||||
+ ", metaAbstract=" + metaAbstract + ", metaPurpose="
|
+ ", metaAbstract=" + metaAbstract + ", metaPurpose="
|
||||||
|
|
Loading…
Reference in New Issue