From a39d9014be50974e3879a3bd96be529033f9f430 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Wed, 17 May 2017 13:32:16 +0000 Subject: [PATCH] Added layer title read from query string Updated maven target build to java8 git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/gis-viewer-app@148784 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 10 +++++----- .settings/org.eclipse.jdt.core.prefs | 2 +- .settings/org.eclipse.wst.common.component | 3 +++ pom.xml | 4 ++-- .../gisviewerapp/client/ApplicationController.java | 4 +++- .../user/gisviewerapp/client/ConstantGisViewerApp.java | 9 +++++---- 6 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.classpath b/.classpath index 3ac6618..8dc961f 100644 --- a/.classpath +++ b/.classpath @@ -14,11 +14,6 @@ - - - - - @@ -30,5 +25,10 @@ + + + + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 443e085..b257af7 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,6 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index d587c04..78b02cb 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -3,6 +3,9 @@ + + uses + diff --git a/pom.xml b/pom.xml index 6510630..5bc3c49 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.gcube.portlets.user gis-viewer-app war - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT Gis Viewer App The Gis Viewer App @@ -31,7 +31,7 @@ distro 1.7 - 1.7 + 1.8 ${project.build.directory}/${project.build.finalName} UTF-8 diff --git a/src/main/java/org/gcube/portlets/user/gisviewerapp/client/ApplicationController.java b/src/main/java/org/gcube/portlets/user/gisviewerapp/client/ApplicationController.java index 68e1fed..d06dadb 100644 --- a/src/main/java/org/gcube/portlets/user/gisviewerapp/client/ApplicationController.java +++ b/src/main/java/org/gcube/portlets/user/gisviewerapp/client/ApplicationController.java @@ -130,8 +130,10 @@ public class ApplicationController { String wmsRequest = Window.Location.getParameter(ConstantGisViewerApp.GET_WMS_PARAMETER); String uuid = Window.Location.getParameter(ConstantGisViewerApp.GET_UUID_PARAMETER); + String layerTitle = Window.Location.getParameter(ConstantGisViewerApp.GET_UUID_PARAMETER); GWT.log(ConstantGisViewerApp.GET_WMS_PARAMETER+ " = "+wmsRequest); GWT.log(ConstantGisViewerApp.GET_UUID_PARAMETER+ " = "+uuid); + GWT.log(ConstantGisViewerApp.GET_LAYER_TITLE+ " = "+layerTitle); boolean displayWarning = readCookieWPSQueryAuthorization(GCUBE_COOKIE_SHOW_WARNING_FOR_WPS_DATA_POINT_QUERY); GWT.log("Display "+GCUBE_COOKIE_SHOW_WARNING_FOR_WPS_DATA_POINT_QUERY+"? "+displayWarning); @@ -175,7 +177,7 @@ public class ApplicationController { if(wmsRequest!=null && !wmsRequest.isEmpty()){ try { - wmsRequestConverter.addRequestToGisViewer(wmsRequest,null, uuid); + wmsRequestConverter.addRequestToGisViewer(wmsRequest,layerTitle, uuid); } catch (Exception e) { GWT.log("An error occurred on adding wmsrequest :"+wmsRequest); e.printStackTrace(); diff --git a/src/main/java/org/gcube/portlets/user/gisviewerapp/client/ConstantGisViewerApp.java b/src/main/java/org/gcube/portlets/user/gisviewerapp/client/ConstantGisViewerApp.java index d8d863d..685b0b9 100644 --- a/src/main/java/org/gcube/portlets/user/gisviewerapp/client/ConstantGisViewerApp.java +++ b/src/main/java/org/gcube/portlets/user/gisviewerapp/client/ConstantGisViewerApp.java @@ -4,10 +4,12 @@ package org.gcube.portlets.user.gisviewerapp.client; + /** - * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * @Oct 9, 2014 + * The Class ConstantGisViewerApp. * + * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * May 17, 2017 */ public class ConstantGisViewerApp { @@ -15,7 +17,6 @@ public class ConstantGisViewerApp { public static final String GET_WMS_PARAMETER = "wmsrequest"; public static final String GET_UUID_PARAMETER = "uuid"; public static final String WMS_PARAM_SEPARATOR_REPLACEMENT_KEY = "separtor"; - -// public static final Logger logger = Logger.getLogger("GisViewerApp"); + public static final String GET_LAYER_TITLE = "layertitle"; }