From a0a8fe3d238cce53bd638c599bd5affc1bf0ac70 Mon Sep 17 00:00:00 2001 From: zak905 Date: Sun, 18 Sep 2016 15:01:04 +0200 Subject: [PATCH] Added event types constants + cleanup --- .../api/leaflet/events/DragEndEvent.java | 1 + .../api/leaflet/events/ErrorEvent.java | 1 + .../gwidgets/api/leaflet/events/Event.java | 1 + .../api/leaflet/events/EventTypes.java | 109 ++++++++++++++++++ .../api/leaflet/events/GeoJSONEvent.java | 1 + .../api/leaflet/events/LayerEvent.java | 1 + ...trolEvent.java => LayersControlEvent.java} | 5 +- .../api/leaflet/events/LocationEvent.java | 1 + .../api/leaflet/events/MouseEvent.java | 1 + .../options/ControlAttributionOptions.java | 2 +- 10 files changed, 120 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/gwidgets/api/leaflet/events/EventTypes.java rename src/main/java/com/gwidgets/api/leaflet/events/{LayerControlEvent.java => LayersControlEvent.java} (89%) diff --git a/src/main/java/com/gwidgets/api/leaflet/events/DragEndEvent.java b/src/main/java/com/gwidgets/api/leaflet/events/DragEndEvent.java index 806f71d..382f368 100644 --- a/src/main/java/com/gwidgets/api/leaflet/events/DragEndEvent.java +++ b/src/main/java/com/gwidgets/api/leaflet/events/DragEndEvent.java @@ -3,6 +3,7 @@ /** * The Class DragEndEvent. + * @author Zakaria Amine */ public class DragEndEvent extends Event { diff --git a/src/main/java/com/gwidgets/api/leaflet/events/ErrorEvent.java b/src/main/java/com/gwidgets/api/leaflet/events/ErrorEvent.java index c3104f5..df56880 100644 --- a/src/main/java/com/gwidgets/api/leaflet/events/ErrorEvent.java +++ b/src/main/java/com/gwidgets/api/leaflet/events/ErrorEvent.java @@ -20,6 +20,7 @@ /** * The Class ErrorEvent. + * @author Zakaria Amine */ @JsType public class ErrorEvent extends Event { diff --git a/src/main/java/com/gwidgets/api/leaflet/events/Event.java b/src/main/java/com/gwidgets/api/leaflet/events/Event.java index 5571b42..d7085c1 100644 --- a/src/main/java/com/gwidgets/api/leaflet/events/Event.java +++ b/src/main/java/com/gwidgets/api/leaflet/events/Event.java @@ -22,6 +22,7 @@ /** * The base event object. All other event objects contain these properties too. + * @author Zakaria Amine */ @JsType public class Event extends JavaScriptObject { diff --git a/src/main/java/com/gwidgets/api/leaflet/events/EventTypes.java b/src/main/java/com/gwidgets/api/leaflet/events/EventTypes.java new file mode 100644 index 0000000..931dc90 --- /dev/null +++ b/src/main/java/com/gwidgets/api/leaflet/events/EventTypes.java @@ -0,0 +1,109 @@ +package com.gwidgets.api.leaflet.events; + +public class EventTypes { + + private EventTypes() { + + } + + + public static class Map{ + public static final String CLICK = "click"; + public static final String DBLCLICK = "dblclick"; + public static final String MOUSEDOWN = "mousedown"; + public static final String MOUSEUP = "mouseup"; + public static final String MOUSEOVER = "mouseover"; + public static final String MOUSEOUT = "mouseout"; + public static final String MOUSEMOVE = "mousemove"; + public static final String CONTEXTMENU = "contextmenu"; + public static final String FOCUS = "focus"; + public static final String BLUR = "blur"; + public static final String PRECLICK = "preclick"; + public static final String LOAD = "UNLOAD"; + public static final String VIEWRESET = "viewreset"; + public static final String MOVESTART = "movestart"; + public static final String MOVE = "move"; + public static final String MOVEEND = "moveend"; + public static final String DRAGSTART = "dragstart"; + public static final String DRAG = "drag"; + public static final String DRAGEND = "dragend"; + public static final String ZOOMSTART = "zoomstart"; + public static final String ZOOMEND = "zoomend"; + public static final String ZOOMLEVELSCHANGE = "zoomlevelschange"; + public static final String RESIZE = "resize"; + public static final String AUTOPANSTART = "autopanstart"; + public static final String LAYERADD = "layeradd"; + public static final String LAYERREMOVE = "layerremove"; + public static final String BASELAYERCHANGE = "baselayerchange"; + public static final String OVERLAYADD = "overlayadd"; + public static final String OVERLAYREMOVE = "overlayremove"; + public static final String LOCATIONFOUND = "locationfound"; + public static final String LOCATIONERROR = "locationerror"; + public static final String POPUPOPEN = "popupopen"; + public static final String POPUPCLOSE = "popupclose"; + } + + public static class Marker{ + public static final String CLICK = "click"; + public static final String DBLCLICK = "dblclick"; + public static final String MOUSEDOWN = "mousedown"; + public static final String MOUSEOVER = "mouseover"; + public static final String MOUSEOUT = "mouseout"; + public static final String CONTEXTMENU = "contextmenu"; + public static final String MOVE = "move"; + public static final String DRAGSTART = "dragstart"; + public static final String DRAG = "drag"; + public static final String DRAGEND = "dragend"; + public static final String ADD = "add"; + public static final String REMOVE = "remove"; + public static final String POPUPOPEN = "popupopen"; + public static final String POPUPCLOSE = "popupclose"; + } + + public static class TileLayer{ + public static final String LOADING = "loading"; + public static final String LOAD = "load"; + public static final String TILELOADSTART = "tileloadstart"; + public static final String TILELOAD = "tileload"; + public static final String TILEUNLOAD = "tileunload"; + public static final String TILEERROR = "tileerror"; + } + + public static class Path{ + public static final String CLICK = "click"; + public static final String DBLCLICK = "dblclick"; + public static final String MOUSEDOWN = "mousedown"; + public static final String MOUSEOVER = "mouseover"; + public static final String MOUSEOUT = "mouseout"; + public static final String CONTEXTMENU = "contextmenu"; + public static final String ADD = "add"; + public static final String REMOVE = "remove"; + public static final String POPUPOPEN = "popupopen"; + public static final String POPUPCLOSE = "popupclose"; + } + + public static class FeatureGroup{ + public static final String CLICK = "click"; + public static final String DBLCLICK = "dblclick"; + public static final String MOUSEOVER = "mouseover"; + public static final String MOUSEOUT = "mouseout"; + public static final String MOUSEMOVE = "mousemove"; + public static final String CONTEXTMENU = "contextmenu"; + public static final String LAYERADD = "layeradd"; + public static final String LAYERREMOVE = "layerremove"; + } + + public static class ControlLayers{ + public static final String BASELAYERCHANGE = "baselayerchange"; + public static final String OVERLAYADD = "overlayadd"; + public static final String OVERLAYREMOVE = "overlayremove"; + } + + public static class PosAnimation { + public static final String START = "start"; + public static final String STEP = "step"; + public static final String END = "end"; + } + + +} diff --git a/src/main/java/com/gwidgets/api/leaflet/events/GeoJSONEvent.java b/src/main/java/com/gwidgets/api/leaflet/events/GeoJSONEvent.java index 3b1eacb..3eb793d 100644 --- a/src/main/java/com/gwidgets/api/leaflet/events/GeoJSONEvent.java +++ b/src/main/java/com/gwidgets/api/leaflet/events/GeoJSONEvent.java @@ -19,6 +19,7 @@ /** * The Class GeoJSONEvent. + * @author Zakaria Amine */ @JsType public class GeoJSONEvent extends Event { diff --git a/src/main/java/com/gwidgets/api/leaflet/events/LayerEvent.java b/src/main/java/com/gwidgets/api/leaflet/events/LayerEvent.java index 741d937..4ab3a9d 100644 --- a/src/main/java/com/gwidgets/api/leaflet/events/LayerEvent.java +++ b/src/main/java/com/gwidgets/api/leaflet/events/LayerEvent.java @@ -25,6 +25,7 @@ /** * The Class LayerEvent. + * @author Zakaria Amine */ @JsType public class LayerEvent extends Event { diff --git a/src/main/java/com/gwidgets/api/leaflet/events/LayerControlEvent.java b/src/main/java/com/gwidgets/api/leaflet/events/LayersControlEvent.java similarity index 89% rename from src/main/java/com/gwidgets/api/leaflet/events/LayerControlEvent.java rename to src/main/java/com/gwidgets/api/leaflet/events/LayersControlEvent.java index 458e83c..4b0fa05 100644 --- a/src/main/java/com/gwidgets/api/leaflet/events/LayerControlEvent.java +++ b/src/main/java/com/gwidgets/api/leaflet/events/LayersControlEvent.java @@ -25,12 +25,13 @@ /** * The Class LayerControlEvent. + * @author Zakaria Amine */ @JsType -public class LayerControlEvent extends Event { +public class LayersControlEvent extends Event { - protected LayerControlEvent() { + protected LayersControlEvent() { } diff --git a/src/main/java/com/gwidgets/api/leaflet/events/LocationEvent.java b/src/main/java/com/gwidgets/api/leaflet/events/LocationEvent.java index 4aef2ab..2156ad3 100644 --- a/src/main/java/com/gwidgets/api/leaflet/events/LocationEvent.java +++ b/src/main/java/com/gwidgets/api/leaflet/events/LocationEvent.java @@ -24,6 +24,7 @@ /** * The Class LocationEvent. + * @author Zakaria Amine */ @JsType public class LocationEvent extends Event { diff --git a/src/main/java/com/gwidgets/api/leaflet/events/MouseEvent.java b/src/main/java/com/gwidgets/api/leaflet/events/MouseEvent.java index 9cb03c8..7074ea1 100644 --- a/src/main/java/com/gwidgets/api/leaflet/events/MouseEvent.java +++ b/src/main/java/com/gwidgets/api/leaflet/events/MouseEvent.java @@ -23,6 +23,7 @@ /** * The Class MouseEvent. + * @author Zakaria Amine */ @JsType public class MouseEvent extends Event { diff --git a/src/main/java/com/gwidgets/api/leaflet/options/ControlAttributionOptions.java b/src/main/java/com/gwidgets/api/leaflet/options/ControlAttributionOptions.java index 0bc6d48..b6aa2b9 100644 --- a/src/main/java/com/gwidgets/api/leaflet/options/ControlAttributionOptions.java +++ b/src/main/java/com/gwidgets/api/leaflet/options/ControlAttributionOptions.java @@ -41,7 +41,7 @@ private ControlAttributionOptions(){ private String prefix; /** - * Gets the position of the control (one of the map corners). See class constants for possibe values + * Gets the position of the control (one of the map corners). See class constants for possible values *
*default "bottomright" * @return the position