Index: applications/editors/josm/plugins/ElevationProfile/.checkstyle =================================================================== --- applications/editors/josm/plugins/ElevationProfile/.checkstyle (revision 32775) +++ applications/editors/josm/plugins/ElevationProfile/.checkstyle (revision 32775) @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/ElevationProfile/.project =================================================================== --- applications/editors/josm/plugins/ElevationProfile/.project (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/.project (revision 32775) @@ -26,7 +26,13 @@ + + net.sf.eclipsecs.core.CheckstyleBuilder + + + org.eclipse.jdt.core.javanature + net.sf.eclipsecs.core.CheckstyleNature Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ColorMap.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ColorMap.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ColorMap.java (revision 32775) @@ -15,5 +15,5 @@ * */ -public class ColorMap { +public final class ColorMap { private List colorList; private String name; @@ -67,5 +67,5 @@ // interpolate color between both - double val = (elevation - e1.getEle()) / (double)(e2.getEle() - e1.getEle()); + double val = (elevation - e1.getEle()) / (double) (e2.getEle() - e1.getEle()); return interpolate(e1.getColor(), e2.getColor(), val); } @@ -165,10 +165,9 @@ } - class ColorMapEntry implements Comparable { private final int ele; // limit private final Color color; - public ColorMapEntry(Color color, int ele) { + ColorMapEntry(Color color, int ele) { super(); this.color = color; Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationHelper.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationHelper.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationHelper.java (revision 32775) @@ -16,17 +16,22 @@ * Provides methods to access way point attributes and some utility methods regarding elevation stuff ( * e. g. special text formats, unit conversion, geoid calc). - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> */ -public class ElevationHelper { +public final class ElevationHelper { + + private ElevationHelper() { + // Hide default constructor for utilities classes + } + public static double METER_TO_FEET = 3.280948; /* Countries which use the imperial system instead of the metric system. */ - private static String IMPERIAL_SYSTEM_COUNTRIES[] = { - "en_US", /* USA */ - "en_CA", /* Canada */ - "en_AU", /* Australia */ - "en_NZ", /* New Zealand */ - // "de_DE", /* for testing only */ - "en_ZA" /* South Africa */ + private static String[] IMPERIAL_SYSTEM_COUNTRIES = { + "en_US", /* USA */ + "en_CA", /* Canada */ + "en_AU", /* Australia */ + "en_NZ", /* New Zealand */ + // "de_DE", /* for testing only */ + "en_ZA" /* South Africa */ }; @@ -48,5 +53,4 @@ /** * Gets the current mode of GEOID correction. - * @return */ public static GeoidCorrectionKind getGeoidKind() { @@ -60,5 +64,4 @@ /** * Gets the current unit mode (metric or imperial). - * @return */ public static UnitMode getUnitMode() { @@ -88,5 +91,4 @@ /** * Gets the unit string for elevation ("m" or "ft"). - * @return */ public static String getUnit() { @@ -148,5 +150,4 @@ } } - private static double getElevation(LatLon ll) { @@ -211,6 +212,4 @@ /** * Gets the elevation string for a given elevation, e. g "300m" or "800ft". - * @param elevation - * @return */ public static String getElevationText(int elevation) { @@ -220,9 +219,7 @@ /** * Gets the elevation string for a given elevation, e. g "300m" or "800ft". - * @param elevation - * @return */ public static String getElevationText(double elevation) { - return String.format("%d %s", (int)Math.round(elevation), getUnit()); + return String.format("%d %s", (int) Math.round(elevation), getUnit()); } @@ -236,5 +233,5 @@ if (wpt == null) return "-"; - int elevation = (int)Math.round(ElevationHelper.getElevation(wpt)); + int elevation = (int) Math.round(ElevationHelper.getElevation(wpt)); return String.format("%d %s", elevation, getUnit()); } @@ -242,6 +239,4 @@ /** * Get the time string for a given way point. - * @param wpt - * @return */ public static String getTimeText(WayPoint wpt) { @@ -287,5 +282,5 @@ LatLon br = bounds.getMax(); - return isValidElevation(getSrtmElevation(tl)) && + return isValidElevation(getSrtmElevation(tl)) && isValidElevation(getSrtmElevation(br)); } @@ -343,6 +338,4 @@ /** * Gets the hour value of a way point in 24h format. - * @param wpt - * @return */ public static int getHourOfWayPoint(WayPoint wpt) { @@ -356,6 +349,4 @@ /** * Gets the minute value of a way point in 24h format. - * @param wpt - * @return */ public static int getMinuteOfWayPoint(WayPoint wpt) { Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationMapMode.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationMapMode.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationMapMode.java (revision 32775) @@ -10,13 +10,12 @@ /** - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> * Provides the map mode and controls visibility of the elevation profile layer/panel. */ public class ElevationMapMode extends MapMode implements IElevationModelListener { /** - * + * */ private static final long serialVersionUID = -1011179566962655639L; - public ElevationMapMode(String name, MapFrame mapFrame) { Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationProfilePlugin.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationProfilePlugin.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationProfilePlugin.java (revision 32775) @@ -18,5 +18,5 @@ /** * Plugin class for displaying an elevation profile of the tracks. - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> * */ @@ -60,8 +60,7 @@ * Gets the elevation profile layer which decorates the current layer * with some markers. - * @return */ - public static ElevationProfileLayer getCurrentLayer(){ - if(currentLayer == null){ + public static ElevationProfileLayer getCurrentLayer() { + if (currentLayer == null) { currentLayer = new ElevationProfileLayer(tr("Elevation Profile")); Main.getLayerManager().addLayer(currentLayer); @@ -74,26 +73,26 @@ ColorMap.create("Physical_US", new Color[]{ - new Color(18,129,242), - new Color(113,153,89), - new Color(117,170,101), - new Color(149,190,113), - new Color(178,214,117), - new Color(202,226,149), - new Color(222,238,161), - new Color(242,238,161), - new Color(238,222,153), - new Color(242,206,133), - new Color(234,182,129), - new Color(218,157,121), - new Color(194,141,125), - new Color(214,157,145), - new Color(226,174,165), - new Color(222,186,182), - new Color(238,198,210), - new Color(255,206,226), - new Color(250,218,234), - new Color(255,222,230), - new Color(255,230,242), - new Color(255,242,255) + new Color(18, 129, 242), + new Color(113, 153, 89), + new Color(117, 170, 101), + new Color(149, 190, 113), + new Color(178, 214, 117), + new Color(202, 226, 149), + new Color(222, 238, 161), + new Color(242, 238, 161), + new Color(238, 222, 153), + new Color(242, 206, 133), + new Color(234, 182, 129), + new Color(218, 157, 121), + new Color(194, 141, 125), + new Color(214, 157, 145), + new Color(226, 174, 165), + new Color(222, 186, 182), + new Color(238, 198, 210), + new Color(255, 206, 226), + new Color(250, 218, 234), + new Color(255, 222, 230), + new Color(255, 230, 242), + new Color(255, 242, 255) }, // elevation in meters - the page above uses feet, so these values differs slightly Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/HgtReader.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/HgtReader.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/HgtReader.java (revision 32775) @@ -19,5 +19,5 @@ * * SRTM data files are available at the NASA SRTM site - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> */ public class HgtReader { @@ -116,9 +116,9 @@ // compute offset within HGT file - int row = (int)Math.round(fLat * SECONDS_PER_MINUTE / HGT_RES); - int col = (int)Math.round(fLon * SECONDS_PER_MINUTE / HGT_RES); + int row = (int) Math.round(fLat * SECONDS_PER_MINUTE / HGT_RES); + int col = (int) Math.round(fLon * SECONDS_PER_MINUTE / HGT_RES); row = HGT_ROW_LENGTH - row; - int cell = (HGT_ROW_LENGTH* (row - 1)) + col; + int cell = (HGT_ROW_LENGTH * (row - 1)) + col; //System.out.println("Read SRTM elevation data from row/col/cell " + row + "," + col + ", " + cell + ", " + sb.limit()); Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/IEleRenderingListener.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/IEleRenderingListener.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/IEleRenderingListener.java (revision 32775) @@ -11,9 +11,9 @@ * @param vertex the vertex */ - public void finished(EleVertex vertex); + void finished(EleVertex vertex); /** * Notifies a client that all vertices can be rendered now. */ - public void finishedAll(); + void finishedAll(); } Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/IElevationModel.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/IElevationModel.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/IElevationModel.java (revision 32775) @@ -8,22 +8,22 @@ /** * Adds a model listener to this instance. - * + * * @param listener * The listener to add. */ - public abstract void addModelListener(IElevationModelListener listener); + void addModelListener(IElevationModelListener listener); /** * Removes a model listener from this instance. - * + * * @param listener * The listener to remove. */ - public abstract void removeModelListener(IElevationModelListener listener); + void removeModelListener(IElevationModelListener listener); /** * Removes all listeners from this instance. */ - public abstract void removeAllListeners(); + void removeAllListeners(); /** @@ -32,5 +32,5 @@ * @return the profiles */ - public abstract List getProfiles(); + List getProfiles(); /** @@ -39,5 +39,5 @@ * @return the current profile */ - public abstract IElevationProfile getCurrentProfile(); + IElevationProfile getCurrentProfile(); /** @@ -46,5 +46,5 @@ * @param newProfile the new current profile */ - public abstract void setCurrentProfile(IElevationProfile newProfile); + void setCurrentProfile(IElevationProfile newProfile); /** @@ -53,5 +53,5 @@ * @param index the new current profile. Valied numbers are 0 to (profileCount - 1) */ - public abstract void setCurrentProfile(int index); + void setCurrentProfile(int index); /** @@ -60,5 +60,4 @@ * @return the int */ - public abstract int profileCount(); - + int profileCount(); } Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/IElevationModelListener.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/IElevationModelListener.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/IElevationModelListener.java (revision 32775) @@ -8,5 +8,5 @@ * repaint UI widgets). * {@link ElevationModel} - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> */ public interface IElevationModelListener { Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/IElevationProfile.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/IElevationProfile.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/IElevationProfile.java (revision 32775) @@ -9,5 +9,5 @@ /** - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> * Interface for an elevation profile providing special properties/values. */ @@ -15,91 +15,77 @@ /** * Gets the name of the elevation profile. - * @return */ - public abstract String getName(); + String getName(); /** * Gets the time stamp of first recorded track point. - * @return */ - public abstract Date getStart(); + Date getStart(); /** * Gets the time stamp of last recorded track point. - * @return */ - public abstract Date getEnd(); + Date getEnd(); /** * Gets the minimum elevation height of all tracks and routes. - * @return */ - public abstract int getMinHeight(); + int getMinHeight(); /** * Gets the maximum elevation height of all tracks and routes. - * @return */ - public abstract int getMaxHeight(); + int getMaxHeight(); /** * Gets the distance of the track in kilometers. */ - public abstract double getDistance(); + double getDistance(); /** * Gets the average elevation height of all tracks and routes. - * @return */ - public abstract int getAverageHeight(); + int getAverageHeight(); /** * Gets the difference between min and max elevation. - * @return */ - public int getHeightDifference(); + int getHeightDifference(); /** * Gets the elevation gain. - * - * @return + * */ - public int getGain(); + int getGain(); /** * Gets the total number of way points (sum of all way points of all tracks and routes). - * @return */ - public abstract int getNumberOfWayPoints(); + int getNumberOfWayPoints(); /** * Gets the list containing the way points. - * @return */ - public List getWayPoints(); + List getWayPoints(); /** * Gets the first recorded way point. - * @return */ - public WayPoint getStartWayPoint(); + WayPoint getStartWayPoint(); /** * Gets the last recorded way point. - * @return */ - public WayPoint getEndWayPoint(); + WayPoint getEndWayPoint(); /** * Gets the way point with the highest elevation value. - * @return */ - public WayPoint getMaxWayPoint(); + WayPoint getMaxWayPoint(); /** * Gets the way point with the lowest elevation value. - * @return */ - public WayPoint getMinWayPoint(); + WayPoint getMinWayPoint(); /** @@ -107,18 +93,16 @@ * contained elevation data or not. This is the case if min * and max height are equal. - * @return */ - public boolean hasElevationData(); + boolean hasElevationData(); /** * Returns the time between start and end of the track. - * @return */ - public long getTimeDifference(); + long getTimeDifference(); /** * Gets the elevation value for at the given data index point. */ - public int elevationValueAt(int i); + int elevationValueAt(int i); /** @@ -127,19 +111,19 @@ * @return the bounds */ - public Bounds getBounds(); + Bounds getBounds(); /** * Gets the children of the segment (maybe null). */ - public List getChildren(); + List getChildren(); /** * Gets the parent of the elevation profile. */ - public IElevationProfile getParent(); + IElevationProfile getParent(); /** * Triggers model refresh. */ - public void updateElevationData(); + void updateElevationData(); } Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/IVertexRenderer.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/IVertexRenderer.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/IVertexRenderer.java (revision 32775) @@ -8,5 +8,5 @@ /** * The interface IVertexRenderer. - * + * * Implementors should provide a default color map which cannot be unregistered */ @@ -19,5 +19,5 @@ * @return the elevation color */ - public Color getElevationColor(EleVertex vertex); + Color getElevationColor(EleVertex vertex); /** @@ -27,5 +27,4 @@ * @param mapToUse the map to use */ - public void selectColorMap(String name); - + void selectColorMap(String name); } Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/UnitMode.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/UnitMode.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/UnitMode.java (revision 32775) @@ -3,5 +3,5 @@ /** - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> * Enumeration for different unit types. */ Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/ElevationModel.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/ElevationModel.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/ElevationModel.java (revision 32775) @@ -20,6 +20,6 @@ * breaks done into the tracks/routes of a GPX file. * + * @author Oliver Wieland <oliver.wieland@online.de> * @see IElevationModelTrackListener - * @author Oliver Wieland */ public class ElevationModel implements IGpxVisitor, IElevationModel { @@ -55,6 +55,4 @@ /** * Gets the GPX data instance used by this model. - * - * @return */ public GpxData getGpxData() { @@ -119,5 +117,6 @@ @Override public void setCurrentProfile(int index) { - if (index < 0 || index >= profileCount()) throw new RuntimeException("Invalid arg for setCurrentProfile: " + index + ", value must be 0.." + profileCount()); + if (index < 0 || index >= profileCount()) + throw new RuntimeException("Invalid arg for setCurrentProfile: " + index + ", value must be 0.." + profileCount()); currentProfileIndex = index; @@ -146,5 +145,4 @@ // we ignore single way points (elevation profile is quite meaningless...) } - @Override Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/ElevationProfile.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/ElevationProfile.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/ElevationProfile.java (revision 32775) @@ -29,5 +29,5 @@ * {@link IElevationProfile} {@link IGpxWaypointVisitor} {@link GpxIterator} * - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> * */ @@ -59,6 +59,4 @@ /** * Creates a name elevation profile without any way points. - * - * @param name */ public ElevationProfile(String name) { @@ -187,5 +185,4 @@ /** * Sets the average height. - * @param avrgHeight */ protected void setAvrgHeight(int avrgHeight) { @@ -195,5 +192,4 @@ /** * Sets the very first way point. - * @param wp */ protected void setStart(WayPoint wp) { @@ -204,5 +200,4 @@ /** * Sets the very last way point. - * @param wp */ protected void setEnd(WayPoint wp) { @@ -217,6 +212,4 @@ /** * Sets the way points of this profile. - * - * @param wayPoints */ public void setWayPoints(List wayPoints) { @@ -225,5 +218,4 @@ numWayPoints = wayPoints != null ? wayPoints.size() : 0; updateValues(); - } } @@ -278,6 +270,4 @@ /** * Gets the difference between min and max elevation. - * - * @return */ @Override @@ -288,6 +278,4 @@ /** * Gets the elevation gain. - * - * @return */ @Override @@ -303,5 +291,4 @@ /** * Sets the distance of the elevation profile. - * @param dist */ protected void setDistance(double dist) { @@ -311,5 +298,4 @@ /** * Returns the time between start and end of the track. - * @return */ @Override @@ -363,5 +349,5 @@ @Override public int getNumberOfWayPoints() { - return numWayPoints;// wayPoints != null ? wayPoints.size() : 0; + return numWayPoints; // wayPoints != null ? wayPoints.size() : 0; } @@ -380,6 +366,4 @@ * elevation data or not. This is the case if min and max height or both * zero. - * - * @return */ @Override Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/ElevationWayPointKind.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/ElevationWayPointKind.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/ElevationWayPointKind.java (revision 32775) @@ -3,20 +3,20 @@ /** - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> * Enumeration which classifies way points within an elevation profile. */ public enum ElevationWayPointKind { - Plain, // Simple way point (equal to no or low slope) - Highlighted, // Highlighted waypoint - StartPoint, // First way point - EndPoint, // Last way point - MaxElevation, // Highest way point - MinElevation, // Lowest way point - ElevationGainHigh, // Elevation gain (high slope 15-25%) - ElevationLossHigh, // Elevation loss (high downward slope) - ElevationGainLow, // Elevation gain (low slope, 5-14.9%) - ElevationLossLow, // Elevation loss (low downward slope) - ElevationLevelGain, // Elevation level gain (e. g. crossed 300m from lower elevation) - ElevationLevelLoss, // Elevation level (e. g. crossed 300m from higher elevation) + Plain, // Simple way point (equal to no or low slope) + Highlighted, // Highlighted waypoint + StartPoint, // First way point + EndPoint, // Last way point + MaxElevation, // Highest way point + MinElevation, // Lowest way point + ElevationGainHigh, // Elevation gain (high slope 15-25%) + ElevationLossHigh, // Elevation loss (high downward slope) + ElevationGainLow, // Elevation gain (low slope, 5-14.9%) + ElevationLossLow, // Elevation loss (low downward slope) + ElevationLevelGain, // Elevation level gain (e. g. crossed 300m from lower elevation) + ElevationLevelLoss, // Elevation level (e. g. crossed 300m from higher elevation) FullHour // Full Hour } Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/GeoidCorrectionKind.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/GeoidCorrectionKind.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/GeoidCorrectionKind.java (revision 32775) @@ -3,5 +3,5 @@ /** - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> * Enumeration for available elevation correction modes. */ Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/GpxIterator.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/GpxIterator.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/GpxIterator.java (revision 32775) @@ -12,7 +12,7 @@ /** * Utility class to apply a visitor on GPX containers (track, route, data). - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> */ -public class GpxIterator { +public final class GpxIterator { /** * Static class, no need to instantiate me. @@ -23,5 +23,5 @@ * Runs the given visitor on a GPX data instance. If one or both * arguments are null, this method will return immediately. - * + * * @param data * The GPX data instance. @@ -74,8 +74,4 @@ // ---------------------- Helper methods ---------------- - /** - * @param visitor - * @param trk - */ private static void visitTrack(IGpxVisitor visitor, GpxTrack trk) { if (trk == null) return; @@ -103,11 +99,6 @@ visitor.endTrack(trk); } - } - /** - * @param visitor - * @param route - */ private static void visitRoute(IGpxVisitor visitor, GpxRoute route) { if (route == null) return; @@ -121,8 +112,4 @@ } - /** - * @param data - * @param visitor - */ private static void visitSingleWaypoints(GpxData data, IGpxVisitor visitor) { // isolated way points Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/IGpxVisitor.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/IGpxVisitor.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/IGpxVisitor.java (revision 32775) @@ -9,5 +9,5 @@ /** * Interface for all GPX visitors. - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> */ public interface IGpxVisitor extends IGpxWaypointVisitor { Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/IGpxWaypointVisitor.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/IGpxWaypointVisitor.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gpx/IGpxWaypointVisitor.java (revision 32775) @@ -5,5 +5,5 @@ /** - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> * Interface for all GPX data visitors. Hopefully this will be part of JOSM some day. */ Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/EleVertex.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/EleVertex.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/EleVertex.java (revision 32775) @@ -173,7 +173,4 @@ } - - - class TriangleEdge implements Comparable { private final int i; @@ -181,5 +178,5 @@ private final double dist; - public TriangleEdge(int i, int j, double dist) { + TriangleEdge(int i, int j, double dist) { super(); this.i = i; Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridLayer.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridLayer.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridLayer.java (revision 32775) @@ -28,5 +28,5 @@ /** - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> * */ @@ -42,7 +42,4 @@ private TileSet tileSet; - /** - * @param info - */ public ElevationGridLayer(String name) { super(name); @@ -80,10 +77,10 @@ } - for(int x = tileSet.x0; x <= tileSet.x1; x++) { - for(int y = tileSet.y0; y <= tileSet.y1; y++) { + for (int x = tileSet.x0; x <= tileSet.x1; x++) { + for (int y = tileSet.y0; y <= tileSet.y1; y++) { Tile t = tileController.getTile(x, y, ELE_ZOOM_LEVEL); if (t != null && t.isLoaded() && t instanceof ElevationGridTile) { - ((ElevationGridTile)t).paintTile(g, mv, vertexRenderer); + ((ElevationGridTile) t).paintTile(g, mv, vertexRenderer); } else { // give some consolation... @@ -119,5 +116,5 @@ Main.map.repaint(100); } - } catch(Exception ex) { + } catch (Exception ex) { System.err.println(ex); ex.printStackTrace(System.err); @@ -153,7 +150,7 @@ Color oldColor = g.getColor(); g.setColor(Color.black); - g.drawString(text,x+1,y+1); + g.drawString(text, x+1, y+1); g.setColor(oldColor); - g.drawString(text,x,y); + g.drawString(text, x, y); } @@ -165,5 +162,5 @@ * Create a TileSet by known LatLon bbox without layer shift correction */ - public TileSet(LatLon topLeft, LatLon botRight, int zoom) { + TileSet(LatLon topLeft, LatLon botRight, int zoom) { if (zoom == 0) return; @@ -186,5 +183,5 @@ y1 = tmp; } - tileMax = (int)Math.pow(2.0, zoom); + tileMax = (int) Math.pow(2.0, zoom); if (x0 < 0) { x0 = 0; Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridTile.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridTile.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridTile.java (revision 32775) @@ -59,5 +59,6 @@ /** - * Use {@link ElevationGridTile#paintTile(Graphics2D, MapView, IVertexRenderer)} to render the tile as grid. This method just issues a debug text. + * Use {@link ElevationGridTile#paintTile(Graphics2D, MapView, IVertexRenderer)} to render the tile as grid. + * This method just issues a debug text. */ @Override @@ -170,5 +171,3 @@ + ", ytile=" + ytile + "]"; } - - } Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridTileController.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridTileController.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridTileController.java (revision 32775) @@ -16,9 +16,4 @@ public class ElevationGridTileController extends TileController { - /** - * @param source - * @param tileCache - * @param listener - */ public ElevationGridTileController(TileSource source, TileCache tileCache, TileLoaderListener listener, TileLoader loader) { Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/SimpleVertexRenderer.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/SimpleVertexRenderer.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/SimpleVertexRenderer.java (revision 32775) @@ -14,7 +14,4 @@ private ColorMap cMap = null; - /** - * - */ public SimpleVertexRenderer() { cMap = ColorMap.getMap(ColorMap.getNames()[0]); @@ -26,10 +23,7 @@ } - @Override public void selectColorMap(String name) { // TODO Auto-generated method stub - } - } Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/DefaultElevationProfileRenderer.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/DefaultElevationProfileRenderer.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/DefaultElevationProfileRenderer.java (revision 32775) @@ -28,5 +28,5 @@ /** * Provides default rendering for elevation profile layer. - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> */ public class DefaultElevationProfileRenderer implements @@ -287,5 +287,5 @@ // coordinates for upwards directed triangle - Point p[] = new Point[3]; + Point[] p = new Point[3]; for (int i = 0; i < p.length; i++) { @@ -384,6 +384,6 @@ Point2D focus = new Point2D.Float(x - (radius * 0.6f), y - (radius * 0.6f)); - float[] dist = { 0.1f, 0.2f, 1.0f }; - Color[] colors = { firstCol, secondCol, Color.DARK_GRAY }; + float[] dist = {0.1f, 0.2f, 1.0f}; + Color[] colors = {firstCol, secondCol, Color.DARK_GRAY}; RadialGradientPaint p = new RadialGradientPaint(center, radius, focus, dist, colors, CycleMethod.NO_CYCLE); @@ -414,5 +414,5 @@ /** - * Draws a label within a filled rounded rectangle with the specified second gradient color (first color is Color.WHITE). + * Draws a label within a filled rounded rectangle with the specified second gradient color (first color is Color.WHITE). * * @param s @@ -539,5 +539,3 @@ // nothing to do currently } - - } Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationColors.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationColors.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationColors.java (revision 32775) @@ -8,7 +8,12 @@ /** * Contains some extra predefined colors. - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> */ -public class ElevationColors { +public final class ElevationColors { + + private ElevationColors() { + // Hide default constructor for utilities classes + } + public static Color EPDarkBlue = new Color(21, 59, 99); public static Color EPMidBlue = new Color(115, 140, 180); @@ -24,5 +29,6 @@ private final int ele; // limit private final Color color; - public ColorMapEntry(java.awt.Color color, int ele) { + + ColorMapEntry(Color color, int ele) { super(); this.color = color; @@ -39,16 +45,13 @@ } - - private static ColorMapEntry[] colors = new ColorMapEntry[]{ - new ColorMapEntry(new Color(0,128, 0), 0), - new ColorMapEntry(new Color(156,187, 105), 1), - new ColorMapEntry(new Color(193,208, 107), 100), - new ColorMapEntry(new Color(244,224, 100), 200), - new ColorMapEntry(new Color(242,216, 149), 500), - new ColorMapEntry(new Color(234,191, 104), 1000), - new ColorMapEntry(new Color(207,169, 96), 2000), + new ColorMapEntry(new Color(0, 128, 0), 0), + new ColorMapEntry(new Color(156, 187, 105), 1), + new ColorMapEntry(new Color(193, 208, 107), 100), + new ColorMapEntry(new Color(244, 224, 100), 200), + new ColorMapEntry(new Color(242, 216, 149), 500), + new ColorMapEntry(new Color(234, 191, 104), 1000), + new ColorMapEntry(new Color(207, 169, 96), 2000), }; - public static Color getElevationColor(double ele) { Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java (revision 32775) @@ -45,5 +45,5 @@ /** - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> * Implements a JOSM ToggleDialog to show the elevation profile. It monitors the * connection between layer and elevation profile. @@ -216,5 +216,4 @@ /** * Gets the elevation model instance. - * @return */ public IElevationModel getModel() { @@ -236,5 +235,4 @@ /** * Gets the associated layer instance of the elevation profile. - * @return */ public ElevationProfileLayer getProfileLayer() { Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileLayer.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileLayer.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileLayer.java (revision 32775) @@ -25,7 +25,7 @@ * Layer class to show additional information on the elevation map, e. g. show * min/max elevation markers. - * - * @author Oliver Wieland - * + * + * @author Oliver Wieland <oliver.wieland@online.de> + * */ public class ElevationProfileLayer extends Layer implements IElevationProfileSelectionListener { @@ -38,5 +38,5 @@ /** * Creates a new elevation profile layer - * + * * @param name * The name of the layer. @@ -48,6 +48,4 @@ /** * Gets the current elevation profile shown in this layer. - * - * @return */ public IElevationProfile getProfile() { @@ -57,5 +55,5 @@ /** * Sets the current elevation profile shown in this layer. - * + * * @param profile * The profile to show in the layer @@ -81,5 +79,5 @@ public Action[] getMenuEntries() { // TODO: More entries??? - return new Action[] { new LayerListPopup.InfoAction(this) }; + return new Action[] {new LayerListPopup.InfoAction(this)}; } @@ -159,5 +157,5 @@ /** * Checks if the given way point requires special decoration (e. g. elevation gain/loss or level crossing). - * + * * Parameters ele1 and ele2 point are used for detecting "level crossings", * e. g. 1 to 2 indicate that we crossed the 200m elevation in upward direction @@ -173,6 +171,6 @@ // normalize elevation to levels - int actLevel = (int)(actEle / Level_Factor); - int lastLevel = (int)(lastEle / Level_Factor); + int actLevel = (int) (actEle / Level_Factor); + int lastLevel = (int) (lastEle / Level_Factor); double slope = Math.abs(ElevationHelper.computeSlope(lastWpt.getCoor(), actWpt.getCoor())); @@ -184,16 +182,16 @@ if (actLevel != lastLevel && Math.abs(actLevel - lastLevel) == 1) { if (actLevel > lastLevel) { // we went down? - kind =ElevationWayPointKind.ElevationLevelGain; + kind = ElevationWayPointKind.ElevationLevelGain; } else { - kind =ElevationWayPointKind.ElevationLevelLoss; + kind = ElevationWayPointKind.ElevationLevelLoss; } } else { // check for elevation gain or loss if (actEle > lastEle) { // we went uphill? // TODO: Provide parameters for high/low thresholds - if (slope > 2) kind =ElevationWayPointKind.ElevationGainLow; - if (slope > 15) kind =ElevationWayPointKind.ElevationGainHigh; + if (slope > 2) kind = ElevationWayPointKind.ElevationGainLow; + if (slope > 15) kind = ElevationWayPointKind.ElevationGainHigh; } else { - if (slope > 2) kind =ElevationWayPointKind.ElevationLossLow; - if (slope > 15) kind =ElevationWayPointKind.ElevationLossHigh; + if (slope > 2) kind = ElevationWayPointKind.ElevationLossLow; + if (slope > 15) kind = ElevationWayPointKind.ElevationLossHigh; } } Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfilePanel.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfilePanel.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfilePanel.java (revision 32775) @@ -32,5 +32,5 @@ /** * Provides the panel showing the elevation profile. - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> * */ @@ -69,5 +69,4 @@ /** * Gets the elevation profile instance. - * @return */ public IElevationModel getProfile() { @@ -77,5 +76,4 @@ /** * Sets the new elevation profile instance. - * @param model */ public void setElevationModel(IElevationModel model) { @@ -88,5 +86,4 @@ /** * Gets the plot area coordinates. - * @return */ public Rectangle getPlotArea() { @@ -96,5 +93,4 @@ /** * Sets the plot area coordinates. - * @param plotArea */ public void setPlotArea(Rectangle plotArea) { @@ -104,5 +100,4 @@ /** * Gets the selected index of the bar. - * @return */ public int getSelectedIndex() { @@ -112,5 +107,4 @@ /** * Sets the selected index of the bar. - * @param selectedIndex */ public void setSelectedIndex(int selectedIndex) { @@ -259,6 +253,4 @@ /** * Formats the date in a predefined manner: "21. Oct 2010, 12:10". - * @param date - * @return */ private String formatDate(Date date) { @@ -270,5 +262,4 @@ /** * Helper function to draw elevation axes. - * @param g */ private void drawElevationLines(Graphics g) { @@ -321,6 +312,4 @@ * Gets the x value of the left border for axes (slightly smaller than the * left x). - * - * @return */ private int getPlotLeftAxis() { @@ -330,6 +319,4 @@ /** * Gets the x value of the left border. - * - * @return */ private int getPlotLeft() { @@ -339,6 +326,4 @@ /** * Gets the horizontal center coordinate (mid between left and right x). - * - * @return */ private int getPlotHCenter() { @@ -348,6 +333,4 @@ /** * Gets the vertical center coordinate (mid between top and bottom y). - * - * @return */ private int getPlotVCenter() { @@ -357,6 +340,4 @@ /** * Gets the x value of the right border. - * - * @return */ private int getPlotRight() { @@ -374,6 +355,4 @@ /** * Gets for an elevation value the according y coordinate in the plot area. - * - * @param elevation * @return The y coordinate in the plot area. */ @@ -394,6 +373,4 @@ /** * Draws the elevation profile - * - * @param g */ private void drawProfile(Graphics g) { @@ -511,5 +488,5 @@ WayPoint wpt = getSelectedWayPoint(); if (wpt != null) { - return String.format("%s: %s", ElevationHelper.getTimeText(wpt), ElevationHelper.getElevationText(wpt)); + return String.format("%s: %s", ElevationHelper.getTimeText(wpt), ElevationHelper.getElevationText(wpt)); } Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/IElevationProfileRenderer.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/IElevationProfileRenderer.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/IElevationProfileRenderer.java (revision 32775) @@ -15,6 +15,6 @@ * Second, the layer can simply pass the painting stuff to a renderer without taking care of * details. - * - * @author Oliver Wieland + * + * @author Oliver Wieland <oliver.wieland@online.de> * */ Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/IElevationProfileSelectionListener.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/IElevationProfileSelectionListener.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/IElevationProfileSelectionListener.java (revision 32775) @@ -7,6 +7,5 @@ /** * Notifies clients about selected index changed. - * @param newIndex */ - public void selectedWayPointChanged(WayPoint wpt); + void selectedWayPointChanged(WayPoint wpt); } Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/TextAlignment.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/TextAlignment.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/TextAlignment.java (revision 32775) @@ -3,5 +3,5 @@ /** - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> * */ Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/Triangle.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/Triangle.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/Triangle.java (revision 32775) @@ -13,5 +13,5 @@ /** - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> * Class to represent a triangle shape. {@see java.awt.Shape}. */ @@ -21,5 +21,4 @@ /** * Copy constructor. - * @param p */ public Triangle(Polygon p) { @@ -31,7 +30,4 @@ * Creates a triangle from 3 given points. The points are used without any sanity check, so it is up to * the user that the points form a triangle. - * @param p1 - * @param p2 - * @param p3 */ public Triangle(Point p1, Point p2, Point p3) { @@ -44,5 +40,4 @@ /** * Draws an outlined triangle. - * @param g */ public void draw(Graphics g) { @@ -52,5 +47,4 @@ /** * Draws a filled triangle. - * @param g */ public void fill(Graphics g) { Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/TriangleDir.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/TriangleDir.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/TriangleDir.java (revision 32775) @@ -3,5 +3,5 @@ /** - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> * */ Index: applications/editors/josm/plugins/ElevationProfile/test/unit/org/openstreetmap/josm/plugins/elevation/tests/EleVertexTest.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/test/unit/org/openstreetmap/josm/plugins/elevation/tests/EleVertexTest.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/test/unit/org/openstreetmap/josm/plugins/elevation/tests/EleVertexTest.java (revision 32775) @@ -4,6 +4,4 @@ import java.awt.Color; import java.util.List; - -import junit.framework.TestCase; import org.openstreetmap.josm.Main; @@ -13,4 +11,6 @@ import org.openstreetmap.josm.plugins.elevation.grid.EleCoordinate; import org.openstreetmap.josm.plugins.elevation.grid.EleVertex; + +import junit.framework.TestCase; public class EleVertexTest extends TestCase { @@ -62,5 +62,5 @@ private void recurse(EleVertex v, int depth) { - if (!v.isFinished() && depth <100) { + if (!v.isFinished() && depth < 100) { System.out.println("\tDivide: " + v); List list = v.divide(); @@ -90,5 +90,5 @@ public void testColorMap() { - ColorMap testMap = ColorMap.create("Test", new Color[]{Color.white, Color.black}, new int[]{0, 1000}); + ColorMap testMap = ColorMap.create("Test", new Color[]{Color.white, Color.black}, new int[]{0, 1000}); // range test Index: applications/editors/josm/plugins/ElevationProfile/test/unit/org/openstreetmap/josm/plugins/elevation/tests/HgtReaderTest.java =================================================================== --- applications/editors/josm/plugins/ElevationProfile/test/unit/org/openstreetmap/josm/plugins/elevation/tests/HgtReaderTest.java (revision 32774) +++ applications/editors/josm/plugins/ElevationProfile/test/unit/org/openstreetmap/josm/plugins/elevation/tests/HgtReaderTest.java (revision 32775) @@ -67,5 +67,5 @@ assertFalse("Data missing or void for coor " + l, Double.isNaN(d)); - assertEquals((int)d, expHeight); + assertEquals((int) d, expHeight); } }