Dedup code

Author: AB-xdev

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 4.2.2
+* Deduplicated ``tLMapZoomPanOptions``
+
 ## 4.2.1
 * Handle ``LEvented#off`` in the same way as ``LEvented#on``
   * Fix incorrect formatting leading to JS error

vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/AbstractLMapZoomPanOptions.java

@@ -0,0 +1,84 @@
+/*
+ * Copyright © 2019 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.vaadin.maps.leaflet.map;
+
+/**
+ * @see <a href="https://leafletjs.com/reference.html#zoom/pan-options">Leaflet docs</a>
+ */
+public class AbstractLMapZoomPanOptions<T extends AbstractLMapZoomPanOptions<T>>
+	implements
+	LMapZoomBaseOptions<T>,
+	LMapPanBaseOptions<T>
+{
+	private Boolean animate;
+	private Double duration;
+	private Double easeLinearity;
+	private Boolean noMoveStart;
+	
+	@Override
+	public Boolean getAnimate()
+	{
+		return this.animate;
+	}
+	
+	@Override
+	public void setAnimate(final Boolean animate)
+	{
+		this.animate = animate;
+	}
+	
+	@Override
+	public T withAnimate(final Boolean animate)
+	{
+		return LMapZoomBaseOptions.super.withAnimate(animate);
+	}
+	
+	@Override
+	public Double getDuration()
+	{
+		return this.duration;
+	}
+	
+	@Override
+	public void setDuration(final Double duration)
+	{
+		this.duration = duration;
+	}
+	
+	@Override
+	public Double getEaseLinearity()
+	{
+		return this.easeLinearity;
+	}
+	
+	@Override
+	public void setEaseLinearity(final Double easeLinearity)
+	{
+		this.easeLinearity = easeLinearity;
+	}
+	
+	@Override
+	public Boolean getNoMoveStart()
+	{
+		return this.noMoveStart;
+	}
+	
+	@Override
+	public void setNoMoveStart(final Boolean noMoveStart)
+	{
+		this.noMoveStart = noMoveStart;
+	}
+}

vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapFitBoundOptions.java

@@ -21,77 +21,15 @@
 /**
  * @see <a href="https://leafletjs.com/reference.html#fitbounds-options-option">Leaflet docs</a>
  */
-public class LMapFitBoundOptions
-	implements
-	LMapZoomBaseOptions<LMapFitBoundOptions>,
-	LMapPanBaseOptions<LMapFitBoundOptions>,
-	LMapPaddingBaseOptions<LMapFitBoundOptions>
+public class LMapFitBoundOptions extends AbstractLMapZoomPanOptions<LMapFitBoundOptions>
+	implements LMapPaddingBaseOptions<LMapFitBoundOptions>
 {
-	private Boolean animate;
-	private Double duration;
-	private Double easeLinearity;
-	private Boolean noMoveStart;
-	
 	private LPoint paddingTopLeft;
 	private LPoint paddingBottomRight;
 	private LPoint padding;
 
 	private Integer maxZoom;
 
-	@Override
-	public Boolean getAnimate()
-	{
-		return this.animate;
-	}
-	
-	@Override
-	public void setAnimate(final Boolean animate)
-	{
-		this.animate = animate;
-	}
-	
-	@Override
-	public LMapFitBoundOptions withAnimate(final Boolean animate)
-	{
-		return LMapZoomBaseOptions.super.withAnimate(animate);
-	}
-	
-	@Override
-	public Double getDuration()
-	{
-		return this.duration;
-	}
-	
-	@Override
-	public void setDuration(final Double duration)
-	{
-		this.duration = duration;
-	}
-	
-	@Override
-	public Double getEaseLinearity()
-	{
-		return this.easeLinearity;
-	}
-	
-	@Override
-	public void setEaseLinearity(final Double easeLinearity)
-	{
-		this.easeLinearity = easeLinearity;
-	}
-	
-	@Override
-	public Boolean getNoMoveStart()
-	{
-		return this.noMoveStart;
-	}
-	
-	@Override
-	public void setNoMoveStart(final Boolean noMoveStart)
-	{
-		this.noMoveStart = noMoveStart;
-	}
-	
 	@Override
 	public LPoint getPaddingTopLeft()
 	{

vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMapZoomPanOptions.java

@@ -18,65 +18,6 @@
 /**
  * @see <a href="https://leafletjs.com/reference.html#zoom/pan-options">Leaflet docs</a>
  */
-public class LMapZoomPanOptions
-	implements LMapZoomBaseOptions<LMapZoomPanOptions>, LMapPanBaseOptions<LMapZoomPanOptions>
+public class LMapZoomPanOptions extends AbstractLMapZoomPanOptions<LMapZoomPanOptions>
 {
-	private Boolean animate;
-	private Double duration;
-	private Double easeLinearity;
-	private Boolean noMoveStart;
-	
-	@Override
-	public Boolean getAnimate()
-	{
-		return this.animate;
-	}
-	
-	@Override
-	public void setAnimate(final Boolean animate)
-	{
-		this.animate = animate;
-	}
-	
-	@Override
-	public LMapZoomPanOptions withAnimate(final Boolean animate)
-	{
-		return LMapZoomBaseOptions.super.withAnimate(animate);
-	}
-	
-	@Override
-	public Double getDuration()
-	{
-		return this.duration;
-	}
-	
-	@Override
-	public void setDuration(final Double duration)
-	{
-		this.duration = duration;
-	}
-	
-	@Override
-	public Double getEaseLinearity()
-	{
-		return this.easeLinearity;
-	}
-	
-	@Override
-	public void setEaseLinearity(final Double easeLinearity)
-	{
-		this.easeLinearity = easeLinearity;
-	}
-	
-	@Override
-	public Boolean getNoMoveStart()
-	{
-		return this.noMoveStart;
-	}
-	
-	@Override
-	public void setNoMoveStart(final Boolean noMoveStart)
-	{
-		this.noMoveStart = noMoveStart;
-	}
 }