From 52bd941b98ccaf0791c985d25300b016bd217200 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 12 May 2017 12:56:53 +0000 Subject: [PATCH] ref 8471:TDM - DataMiner Manager - Support Java 8 compatibility https://support.d4science.org/issues/8471 Updated to support Java 8 compatibility git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/openlayer-basic-widgets@148584 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 16 ++++++++++++---- distro/changelog.xml | 4 ++++ pom.xml | 2 +- .../client/OpenLayerBasicWidgetsManager.java | 2 +- .../client/event/SelectAreaDialogEvent.java | 4 ++-- .../client/event/SelectAreaDialogEventType.java | 11 ++++++----- .../client/resource/OLBasicCSS.java | 4 ++-- .../client/resource/OLBasicResources.java | 4 ++-- .../client/util/AlertDialog.java | 4 ++-- .../client/util/GWTMessages.java | 4 ++-- .../client/util/WaitDialog.java | 4 ++-- .../client/widgets/AreaSelectionDialog.java | 4 ++-- .../client/widgets/GeometryType.java | 11 ++++++----- .../client/widgets/OpenLayerFormatType.java | 9 +++++---- .../openlayerbasicwidgets/shared/Constants.java | 2 +- .../GitHubConnectorTest.java | 4 ++-- 16 files changed, 52 insertions(+), 37 deletions(-) diff --git a/.classpath b/.classpath index 0ef9705..7e6649c 100644 --- a/.classpath +++ b/.classpath @@ -1,19 +1,27 @@ - + - + + + + + - + + + + + @@ -25,5 +33,5 @@ - + diff --git a/distro/changelog.xml b/distro/changelog.xml index 3ab15f3..c44bd4c 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,8 @@ + + Support Java 8 compatibility [ticket #8471] + Updated to support EPSG 4326 diff --git a/pom.xml b/pom.xml index 0909bf5..b2658fb 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.gcube.portlets.widgets openlayer-basic-widgets - 1.1.0-SNAPSHOT + 1.2.0-SNAPSHOT openlayer-basic-widgets openlayer-basic-widgets diff --git a/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/OpenLayerBasicWidgetsManager.java b/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/OpenLayerBasicWidgetsManager.java index 40051eb..ed0aed2 100644 --- a/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/OpenLayerBasicWidgetsManager.java +++ b/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/OpenLayerBasicWidgetsManager.java @@ -12,7 +12,7 @@ import com.google.gwt.core.shared.GWT; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public class OpenLayerBasicWidgetsManager implements EntryPoint { diff --git a/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/event/SelectAreaDialogEvent.java b/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/event/SelectAreaDialogEvent.java index 459e18c..66fe133 100644 --- a/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/event/SelectAreaDialogEvent.java +++ b/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/event/SelectAreaDialogEvent.java @@ -9,8 +9,8 @@ import com.google.gwt.event.shared.HasHandlers; * Select Area Dialog Event * * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class SelectAreaDialogEvent extends diff --git a/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/event/SelectAreaDialogEventType.java b/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/event/SelectAreaDialogEventType.java index 60ca4d1..4b2e60a 100644 --- a/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/event/SelectAreaDialogEventType.java +++ b/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/event/SelectAreaDialogEventType.java @@ -5,15 +5,16 @@ import java.util.List; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum SelectAreaDialogEventType { Completed("Completed"), Failed("Failed"), Aborted("Aborted"); /** - * @param text + * + * @param id id */ private SelectAreaDialogEventType(final String id) { this.id = id; @@ -36,8 +37,8 @@ public enum SelectAreaDialogEventType { /** * - * @param id - * @return + * @param id id + * @return select area dialog event type */ public static SelectAreaDialogEventType getTypeFromId(String id) { if (id == null || id.isEmpty()) diff --git a/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/resource/OLBasicCSS.java b/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/resource/OLBasicCSS.java index e1b5e59..13a281f 100644 --- a/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/resource/OLBasicCSS.java +++ b/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/resource/OLBasicCSS.java @@ -7,8 +7,8 @@ import com.google.gwt.resources.client.CssResource; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface OLBasicCSS extends CssResource { diff --git a/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/resource/OLBasicResources.java b/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/resource/OLBasicResources.java index f67c45d..0467ce5 100644 --- a/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/resource/OLBasicResources.java +++ b/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/resource/OLBasicResources.java @@ -6,8 +6,8 @@ import com.google.gwt.resources.client.ImageResource; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface OLBasicResources extends ClientBundle { diff --git a/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/util/AlertDialog.java b/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/util/AlertDialog.java index 92dc023..a57f4a7 100644 --- a/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/util/AlertDialog.java +++ b/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/util/AlertDialog.java @@ -11,8 +11,8 @@ import com.google.gwt.user.client.ui.HTML; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AlertDialog extends DialogBox implements ClickHandler { diff --git a/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/util/GWTMessages.java b/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/util/GWTMessages.java index df07363..cf9050f 100644 --- a/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/util/GWTMessages.java +++ b/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/util/GWTMessages.java @@ -4,8 +4,8 @@ import com.google.gwt.core.client.Callback; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class GWTMessages { diff --git a/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/util/WaitDialog.java b/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/util/WaitDialog.java index bd7659f..e27bb07 100644 --- a/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/util/WaitDialog.java +++ b/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/util/WaitDialog.java @@ -14,8 +14,8 @@ import com.google.gwt.user.client.ui.HTML; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class WaitDialog extends DialogBox { diff --git a/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/widgets/AreaSelectionDialog.java b/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/widgets/AreaSelectionDialog.java index 671dffd..2ce09a9 100644 --- a/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/widgets/AreaSelectionDialog.java +++ b/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/widgets/AreaSelectionDialog.java @@ -33,8 +33,8 @@ import com.google.gwt.user.client.ui.VerticalPanel; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class AreaSelectionDialog extends DialogBox implements diff --git a/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/widgets/GeometryType.java b/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/widgets/GeometryType.java index 3a34621..6be63f2 100644 --- a/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/widgets/GeometryType.java +++ b/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/widgets/GeometryType.java @@ -5,8 +5,8 @@ import java.util.List; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public enum GeometryType { @@ -15,7 +15,8 @@ public enum GeometryType { "Pentagon"), Hexagon("Hexagon"), Box("Box"), None("None"); /** - * @param text + * + * @param label label */ private GeometryType(final String label) { this.label = label; @@ -38,8 +39,8 @@ public enum GeometryType { /** * - * @param label - * @return + * @param label label + * @return geometry type */ public static GeometryType getFromLabel(String label) { if (label == null || label.isEmpty()) diff --git a/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/widgets/OpenLayerFormatType.java b/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/widgets/OpenLayerFormatType.java index 798d312..65b9f25 100644 --- a/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/widgets/OpenLayerFormatType.java +++ b/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/client/widgets/OpenLayerFormatType.java @@ -6,14 +6,15 @@ import java.util.List; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public enum OpenLayerFormatType { GML("GML"), GeoJSON("GeoJSON"), WKT("WKT"); /** - * @param text + * + * @param label label */ private OpenLayerFormatType(final String label) { this.label = label; @@ -36,8 +37,8 @@ public enum OpenLayerFormatType { /** * - * @param label - * @return + * @param label label + * @return open layer format type */ public static OpenLayerFormatType getFromLabel(String label) { if (label == null || label.isEmpty()) diff --git a/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/shared/Constants.java b/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/shared/Constants.java index 8bd23c6..377d001 100644 --- a/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/shared/Constants.java +++ b/src/main/java/org/gcube/portlets/widgets/openlayerbasicwidgets/shared/Constants.java @@ -3,7 +3,7 @@ package org.gcube.portlets.widgets.openlayerbasicwidgets.shared; /** * * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it + * * */ public class Constants { diff --git a/src/test/java/org/gcube/portlets/widgets/openlayerbasicwidgets/GitHubConnectorTest.java b/src/test/java/org/gcube/portlets/widgets/openlayerbasicwidgets/GitHubConnectorTest.java index d70a8f3..81769a5 100644 --- a/src/test/java/org/gcube/portlets/widgets/openlayerbasicwidgets/GitHubConnectorTest.java +++ b/src/test/java/org/gcube/portlets/widgets/openlayerbasicwidgets/GitHubConnectorTest.java @@ -8,8 +8,8 @@ import org.slf4j.LoggerFactory; /** * - * @author Giancarlo Panichi email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class GitHubConnectorTest extends TestCase {