From 72d3716bcae1b75a3f9ca25d06e1a3bc01450252 Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Wed, 28 Jun 2017 15:09:01 +0000
Subject: [PATCH] Moved at 4.1.0 and Java 8 compliant

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/gis-viewer@150608 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 distro/changelog.xml                          | 10 +++++++-
 pom.xml                                       |  7 +++---
 .../server/datafeature/FeatureParser.java     | 24 +++++++------------
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/distro/changelog.xml b/distro/changelog.xml
index f441d58..f8e6cfa 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,7 +1,15 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets-user.GISViewer.4-1-0"
+		date="2017-06-28">
+		<Change>Changed maven compiler at 1.8
+		</Change>
+		<Change>[Feature #5164] Upgraded to gwt 2.7.0
+		</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets-user.GISViewer.4-0-0"
 		date="2016-09-26">
-		<Change>[Feature #5148] Removed dependency 'geoserverinterface' and changed interface
+		<Change>[Feature #5148] Removed dependency 'geoserverinterface' and
+			changed interface
 		</Change>
 		<Change>[Feature #5164] Upgraded to gwt 2.7.0
 		</Change>
diff --git a/pom.xml b/pom.xml
index ea8b22c..833d14b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>gis-viewer</artifactId>
-	<version>4.0.0-SNAPSHOT</version>
+	<version>4.1.0-SNAPSHOT</version>
 	<name>GIS Viewer Widget</name>
 	<description>
 		GWT Widget application to access GIS Data
@@ -25,8 +25,9 @@
 		<gwtVersion>2.7.0</gwtVersion>
 		<distroDirectory>distro</distroDirectory>
 		<!-- GWT needs at least java 1.6 -->
-		<maven.compiler.source>1.6</maven.compiler.source>
-		<maven.compiler.target>1.6</maven.compiler.target>
+		<maven.compiler.source>1.7</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
+		<additionalparam>-Xdoclint:none</additionalparam>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/src/main/java/org/gcube/portlets/user/gisviewer/server/datafeature/FeatureParser.java b/src/main/java/org/gcube/portlets/user/gisviewer/server/datafeature/FeatureParser.java
index 0e1d65f..d391ac9 100644
--- a/src/main/java/org/gcube/portlets/user/gisviewer/server/datafeature/FeatureParser.java
+++ b/src/main/java/org/gcube/portlets/user/gisviewer/server/datafeature/FeatureParser.java
@@ -221,19 +221,11 @@ public class FeatureParser {
 		return table;
 	}
 
-//	/**
-//	 * @param layerItem
-//	 * @return
-//	 */
-//	private static WfsTable getTableFromJson(LayerItem layerItem, String bbox) {
-//		return getTableFromJson(layerItem, bbox, Constants.MAX_WFS_FEATURES);
-//	}
-
 	// PARSE TEST
 	/**
- * Parses the.
- */
-private static void parse() {
+	 * Parses the.
+	 */
+	private static void parse() {
 		String layer = "aquamaps:environments";
 		String url = "http://geoserver2.d4science.research-infrastructures.eu/geoserver/wfs?service=wfs&version=1.1.0&request=GetFeature&typeName="+layer+"&bbox=0,0,180,1";
 		try {
@@ -322,10 +314,12 @@ private static void parse() {
 		}*/
 
 		LayerItem l = new LayerItem();
-		l.setLayer("HeatFlowUnit");
-		l.setGeoserverUrl("http://egip.brgm-rec.fr/wxs/");
-		l.setName("HeatFlowUnit");
+		l.setLayer("spd538430dc08474934a4b62ffb03edd483");
+		l.setGeoserverUrl("http://geoserver-dev.d4science-ii.research-infrastructures.eu/geoserver/wfs");
+		l.setName("spd538430dc08474934a4b62ffb03edd483");
 
-		FeatureParser.getTableFromJson(l, "-90,-180,90,180", 1);
+		WebFeatureTable table = FeatureParser.getTableFromJson(l, "-90,-180,90,180", 1);
+
+		System.out.println("Result: "+table.toString());
 	}
 }