Move TrackChartPoints from TrackDetailsMenu

OsmAnd/src/net/osmand/plus/mapcontextmenu/other/TrackChartPoints.java

@@ -0,0 +1,46 @@
+package net.osmand.plus.mapcontextmenu.other;
+
+import net.osmand.GPXUtilities.GPXFile;
+import net.osmand.data.LatLon;
+
+import java.util.List;
+
+public class TrackChartPoints {
+
+	private List<LatLon> xAxisPoints;
+	private LatLon highlightedPoint;
+	private int segmentColor;
+	private GPXFile gpx;
+
+	public List<LatLon> getXAxisPoints() {
+		return xAxisPoints;
+	}
+
+	public LatLon getHighlightedPoint() {
+		return highlightedPoint;
+	}
+
+	public int getSegmentColor() {
+		return segmentColor;
+	}
+
+	public GPXFile getGpx() {
+		return gpx;
+	}
+
+	public void setXAxisPoints(List<LatLon> xAxisPoints) {
+		this.xAxisPoints = xAxisPoints;
+	}
+
+	public void setHighlightedPoint(LatLon highlightedPoint) {
+		this.highlightedPoint = highlightedPoint;
+	}
+
+	public void setSegmentColor(int segmentColor) {
+		this.segmentColor = segmentColor;
+	}
+
+	public void setGpx(GPXFile gpx) {
+		this.gpx = gpx;
+	}
+}

OsmAnd/src/net/osmand/plus/mapcontextmenu/other/TrackDetailsMenu.java

@@ -806,43 +806,4 @@ public class TrackDetailsMenu {
 			return NO_COLOR;
 		}
 	}
-
-	public static class TrackChartPoints {
-		private List<LatLon> xAxisPoints;
-		private LatLon highlightedPoint;
-		private int segmentColor;
-		private GPXFile gpx;
-
-		public List<LatLon> getXAxisPoints() {
-			return xAxisPoints;
-		}
-
-		public LatLon getHighlightedPoint() {
-			return highlightedPoint;
-		}
-
-		public int getSegmentColor() {
-			return segmentColor;
-		}
-
-		public GPXFile getGpx() {
-			return gpx;
-		}
-
-		public void setXAxisPoints(List<LatLon> xAxisPoints) {
-			this.xAxisPoints = xAxisPoints;
-		}
-
-		public void setHighlightedPoint(LatLon highlightedPoint) {
-			this.highlightedPoint = highlightedPoint;
-		}
-
-		public void setSegmentColor(int segmentColor) {
-			this.segmentColor = segmentColor;
-		}
-
-		public void setGpx(GPXFile gpx) {
-			this.gpx = gpx;
-		}
-	}
 }

OsmAnd/src/net/osmand/plus/views/GPXLayer.java

@@ -42,7 +42,7 @@ import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.base.PointImageDrawable;
 import net.osmand.plus.mapcontextmenu.controllers.SelectedGpxMenuController.SelectedGpxPoint;
-import net.osmand.plus.mapcontextmenu.other.TrackDetailsMenu.TrackChartPoints;
+import net.osmand.plus.mapcontextmenu.other.TrackChartPoints;
 import net.osmand.plus.render.OsmandRenderer;
 import net.osmand.plus.render.OsmandRenderer.RenderingContext;
 import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;

OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java

@@ -17,7 +17,7 @@ import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.helpers.AndroidUiHelper;
-import net.osmand.plus.mapcontextmenu.other.TrackDetailsMenu.TrackChartPoints;
+import net.osmand.plus.mapcontextmenu.other.TrackChartPoints;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.CompassRulerControlWidgetState;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopCoordinatesView;

OsmAnd/src/net/osmand/plus/views/RouteLayer.java

@@ -36,8 +36,7 @@ import net.osmand.osm.edit.Way;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
-import net.osmand.plus.mapcontextmenu.other.TrackDetailsMenu;
+import net.osmand.plus.mapcontextmenu.other.TrackChartPoints;
-import net.osmand.plus.mapcontextmenu.other.TrackDetailsMenu.TrackChartPoints;
 import net.osmand.plus.profiles.LocationIcon;
 import net.osmand.plus.render.RenderingIcons;
 import net.osmand.plus.routing.RouteCalculationResult;
@@ -104,7 +103,7 @@ public class RouteLayer extends OsmandMapLayer implements ContextMenuLayer.ICont
 		this.transportHelper = helper.getTransportRoutingHelper();
 	}
 
-	public void setTrackChartPoints(TrackDetailsMenu.TrackChartPoints trackChartPoints) {
+	public void setTrackChartPoints(TrackChartPoints trackChartPoints) {
 		this.trackChartPoints = trackChartPoints;
 	}