From 8d9ae28ddfe3dc658fbeba932ae5a6838f9713fc Mon Sep 17 00:00:00 2001 From: nazar-kutz Date: Tue, 6 Apr 2021 10:53:54 +0300 Subject: [PATCH] small refactoring --- .../plus/views/layers/geometry/GeometryWayStyle.java | 6 ++---- .../plus/views/layers/geometry/RouteGeometryWay.java | 10 +++++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/views/layers/geometry/GeometryWayStyle.java b/OsmAnd/src/net/osmand/plus/views/layers/geometry/GeometryWayStyle.java index f5c77ae804..d5a38ccd5d 100644 --- a/OsmAnd/src/net/osmand/plus/views/layers/geometry/GeometryWayStyle.java +++ b/OsmAnd/src/net/osmand/plus/views/layers/geometry/GeometryWayStyle.java @@ -8,7 +8,6 @@ public abstract class GeometryWayStyle { private T context; protected Integer color; protected Float width; - protected Integer pointColor; public GeometryWayStyle(T context) { this.context = context; @@ -19,11 +18,10 @@ public abstract class GeometryWayStyle { this.color = color; } - public GeometryWayStyle(T context, Integer color, Float width, Integer pointColor) { + public GeometryWayStyle(T context, Integer color, Float width) { this.context = context; this.color = color; this.width = width; - this.pointColor = pointColor; } public T getContext() { @@ -47,7 +45,7 @@ public abstract class GeometryWayStyle { } public Integer getPointColor() { - return pointColor; + return null; } public boolean isNightMode() { diff --git a/OsmAnd/src/net/osmand/plus/views/layers/geometry/RouteGeometryWay.java b/OsmAnd/src/net/osmand/plus/views/layers/geometry/RouteGeometryWay.java index 15b16ca51e..d46ca8cd68 100644 --- a/OsmAnd/src/net/osmand/plus/views/layers/geometry/RouteGeometryWay.java +++ b/OsmAnd/src/net/osmand/plus/views/layers/geometry/RouteGeometryWay.java @@ -68,9 +68,12 @@ public class RouteGeometryWay extends GeometryWay { + private Integer pointColor; + GeometrySolidWayStyle(RouteGeometryWayContext context, Integer color, Float width, Integer pointColor) { - super(context, color, width, pointColor); + super(context, color, width); + this.pointColor = pointColor; } @Override @@ -78,6 +81,11 @@ public class RouteGeometryWay extends GeometryWay