Index: /applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVImporter.java =================================================================== --- /applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVImporter.java (revision 23794) +++ /applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVImporter.java (revision 23795) @@ -32,5 +32,5 @@ /** * - * @author Oliver + * @author Oliver Wieland * */ Index: /applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPlugin.java =================================================================== --- /applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPlugin.java (revision 23794) +++ /applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPlugin.java (revision 23795) @@ -23,5 +23,5 @@ * Plugin class to import Columbus V-900 CSV files into JOSM. * - * @author Oliver Wieland + * @author Oliver Wieland Wieland * */ Index: /applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPreferences.java =================================================================== --- /applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPreferences.java (revision 23794) +++ /applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPreferences.java (revision 23795) @@ -29,5 +29,5 @@ /** * Implements the preferences dialog for this plugin. - * @author Oliver + * @author Oliver Wieland */ public class ColumbusCSVPreferences implements PreferenceSetting, ItemListener { Index: /applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java =================================================================== --- /applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java (revision 23794) +++ /applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java (revision 23795) @@ -69,5 +69,5 @@ * * - * @author Oliver + * @author Oliver Wieland * */ Index: /applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/WayPointHelper.java =================================================================== --- /applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/WayPointHelper.java (revision 23794) +++ /applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/WayPointHelper.java (revision 23795) @@ -29,5 +29,5 @@ /** - * @author Oliver Provides several static methods to access way point + * @author Oliver Wieland Provides several static methods to access way point * attributes. */ 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 23794) +++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationMapMode.java (revision 23795) @@ -23,6 +23,6 @@ /** - * @author Oliver - * + * @author Oliver Wieland + * Provides the map mode and controls visibility of the elevation profile layer/panel. */ public class ElevationMapMode extends MapMode implements IElevationModelListener { Index: /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationModel.java =================================================================== --- /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationModel.java (revision 23794) +++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationModel.java (revision 23795) @@ -38,5 +38,5 @@ * @see IElevationModelTrackListener * @see IElevationModelSliceListener - * @author Oliver + * @author Oliver Wieland */ public class ElevationModel extends ElevationProfileBase implements IGpxVisitor { Index: /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationProfileBase.java =================================================================== --- /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationProfileBase.java (revision 23794) +++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationProfileBase.java (revision 23795) @@ -38,5 +38,5 @@ * {@link IElevationProfile} {@link IGpxWaypointVisitor} {@link GpxIterator} * - * @author Oliver + * @author Oliver Wieland * */ Index: /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationProfileLeaf.java =================================================================== --- /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationProfileLeaf.java (revision 23794) +++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationProfileLeaf.java (revision 23795) @@ -1,2 +1,15 @@ +/** + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. + * If not, see . + */ package org.openstreetmap.josm.plugins.elevation; @@ -10,5 +23,5 @@ * * ElevationModelSlice is intended to be used internally. - * @author oliverwieland + * @author Oliver Wieland * */ Index: /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationProfileNode.java =================================================================== --- /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationProfileNode.java (revision 23794) +++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationProfileNode.java (revision 23795) @@ -1,2 +1,15 @@ +/** + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. + * If not, see . + */ package org.openstreetmap.josm.plugins.elevation; @@ -11,5 +24,5 @@ * {@link ElevationProfileLeaf} which are accessible via {@link ElevationProfileBase#getChildren()}. * - * @author Oliver + * @author Oliver Wieland * * @see ElevationProfileBase 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 23794) +++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationProfilePlugin.java (revision 23795) @@ -26,5 +26,5 @@ /** * Plugin class for displaying an elevation profile of the tracks. - * @author Oliver + * @author Oliver Wieland * */ Index: /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationWayPointKind.java =================================================================== --- /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationWayPointKind.java (revision 23794) +++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationWayPointKind.java (revision 23795) @@ -16,6 +16,6 @@ /** - * @author Oliver - * + * @author Oliver Wieland + * Enumeration which classifies way points within an elevation profile. */ public enum ElevationWayPointKind { Index: /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/GeoidCorrectionKind.java =================================================================== --- /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/GeoidCorrectionKind.java (revision 23794) +++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/GeoidCorrectionKind.java (revision 23795) @@ -16,6 +16,6 @@ /** - * @author Oliver - * + * @author Oliver Wieland + * Enumeration for available elevation correction modes. */ public enum GeoidCorrectionKind { Index: /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/GeoidData.java =================================================================== --- /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/GeoidData.java (revision 23794) +++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/GeoidData.java (revision 23795) @@ -16,6 +16,6 @@ /** - * Holds the geoid correction data. - * @author Oliver + * Holds the geoid correction data. The data has been generated; usually this class does not need to change. + * @author Oliver Wieland */ public class GeoidData { Index: /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/GpxIterator.java =================================================================== --- /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/GpxIterator.java (revision 23794) +++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/GpxIterator.java (revision 23795) @@ -25,5 +25,5 @@ /** * Utility class to apply a visitor on GPX containers (track, route, data). - * @author Oliver + * @author Oliver Wieland */ public class GpxIterator { 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 23794) +++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/IElevationModelListener.java (revision 23795) @@ -19,5 +19,5 @@ * repaint UI widgets). * {@link ElevationModel} - * @author Oliver + * @author Oliver Wieland */ 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 23794) +++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/IElevationProfile.java (revision 23795) @@ -21,6 +21,6 @@ /** - * @author Oliver - * + * @author Oliver Wieland + * Interface for an elevation profile providing special properties/values. */ public interface IElevationProfile { Index: /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/IGpxVisitor.java =================================================================== --- /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/IGpxVisitor.java (revision 23794) +++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/IGpxVisitor.java (revision 23795) @@ -21,6 +21,6 @@ /** - * Interface for all GPX visitor. - * @author Oliver + * Interface for all GPX visitors. + * @author Oliver Wieland */ public interface IGpxVisitor extends IGpxWaypointVisitor { Index: /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/IGpxWaypointVisitor.java =================================================================== --- /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/IGpxWaypointVisitor.java (revision 23794) +++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/IGpxWaypointVisitor.java (revision 23795) @@ -18,10 +18,10 @@ /** - * @author Oliver - * + * @author Oliver Wieland + * Interface for all GPX data visitors. Hopefully this will be part of JOSM some day. */ public interface IGpxWaypointVisitor { /** - * Visits a way point. This method is called for isolated way points, ie. way points + * Visits a way point. This method is called for isolated way points, i. e. way points * without an associated route or track. * @param wp The way point to visit. 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 23794) +++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/UnitMode.java (revision 23795) @@ -1,7 +1,26 @@ +/** + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. + * If not, see . + */ + package org.openstreetmap.josm.plugins.elevation; +/** + * @author Oliver Wieland + * Enumeration for different unit types. + */ public enum UnitMode { NotSelected, Metric, Imperial + // Chinese system missing } Index: /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/WayPointHelper.java =================================================================== --- /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/WayPointHelper.java (revision 23794) +++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/WayPointHelper.java (revision 23795) @@ -15,5 +15,4 @@ package org.openstreetmap.josm.plugins.elevation; -import java.awt.Color; import java.util.ArrayList; import java.util.Calendar; @@ -25,6 +24,7 @@ /** - * @author Oliver Provides several static methods to access way point - * attributes. + * 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 */ public class WayPointHelper { 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 23794) +++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/DefaultElevationProfileRenderer.java (revision 23795) @@ -37,6 +37,6 @@ /** - * @author Oliver - * + * Provides default rendering for elevation profile layer. + * @author Oliver Wieland */ public class DefaultElevationProfileRenderer implements @@ -184,7 +184,7 @@ int rad = REGULAR_WPT_RADIUS; g.setColor(c); - // g.drawOval(pnt.x - rad, pnt.y - rad, r2, r2); drawSphere(g, Color.WHITE, c, pnt.x, pnt.y, rad); + /* Paint full hour label */ if (kind == ElevationWayPointKind.FullHour) { int hour = WayPointHelper.getHourOfWayPoint(wpt); @@ -193,4 +193,5 @@ } + /* Paint label for elevation levels */ if (kind == ElevationWayPointKind.ElevationLevelGain) { drawLabelWithTriangle(WayPointHelper.getElevationText(ele), pnt.x, pnt.y @@ -207,12 +208,10 @@ } + /* Paint cursor labels */ if (kind == ElevationWayPointKind.Highlighted) { - int eleH = (int) WayPointHelper.getElevation(wpt); - int hour = WayPointHelper.getHourOfWayPoint(wpt); - int min = WayPointHelper.getMinuteOfWayPoint(wpt); drawSphere(g, Color.WHITE, c, pnt.x, pnt.y, BIG_WPT_RADIUS); - drawLabel(String.format("%02d:%02d", hour, min), pnt.x, pnt.y + drawLabel(WayPointHelper.getTimeText(wpt), pnt.x, pnt.y - g.getFontMetrics().getHeight() - 5, g); - drawLabel(WayPointHelper.getElevationText(eleH), pnt.x, pnt.y + drawLabel(WayPointHelper.getElevationText(wpt), pnt.x, pnt.y + g.getFontMetrics().getHeight() + 5, g); } @@ -345,5 +344,5 @@ /** - * Renders a start/end point + * Renders a start/end point. * * @param g @@ -367,5 +366,5 @@ /** - * Draw a shaded sphere. + * Draws a shaded sphere. * * @param g @@ -401,5 +400,5 @@ /** - * Draws a label. + * Draws a label within a filled rounded rectangle with standard gradient colors. * * @param s @@ -417,5 +416,5 @@ /** - * Draws a label. + * Draws a label within a filled rounded rectangle with the specified second gradient color (first color is Color.WHITE). * * @param s @@ -518,9 +517,9 @@ /** - * Checks, if the rectangle has been 'reserved' by a previous draw action. + * Checks, if the rectangle has been 'reserved' by an previous draw action. * * @param r * The area to check for. - * @return true; if area is already occupied by another rectangle. + * @return true, if area is already occupied by another rectangle. */ private boolean isForbiddenArea(Rectangle r) { 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 23794) +++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationColors.java (revision 23795) @@ -19,5 +19,5 @@ /** * Contains some extra predefined colors. - * @author Oliver + * @author Oliver Wieland */ public class ElevationColors { 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 23794) +++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java (revision 23795) @@ -53,5 +53,5 @@ /** - * @author Oliver + * @author Oliver Wieland * Implements a JOSM ToggleDialog to show the elevation profile. It monitors the * connection between layer and elevation profile. 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 23794) +++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileLayer.java (revision 23795) @@ -38,5 +38,5 @@ * min/max elevation markers. * - * @author Oliver + * @author Oliver Wieland * */ 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 23794) +++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfilePanel.java (revision 23795) @@ -1,2 +1,15 @@ +/** + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. + * If not, see . + */ package org.openstreetmap.josm.plugins.elevation.gui; @@ -30,5 +43,5 @@ /** * Provides the panel showing the elevation profile. - * @author Oliver + * @author Oliver Wieland * */ 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 23794) +++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/IElevationProfileRenderer.java (revision 23795) @@ -29,5 +29,5 @@ * details. * - * @author Oliver + * @author Oliver Wieland * */ 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 23794) +++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/IElevationProfileSelectionListener.java (revision 23795) @@ -1,2 +1,15 @@ +/** + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. + * If not, see . + */ package org.openstreetmap.josm.plugins.elevation.gui; 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 23794) +++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/TextAlignment.java (revision 23795) @@ -16,5 +16,5 @@ /** - * @author Oliver + * @author Oliver Wieland * */ 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 23794) +++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/Triangle.java (revision 23795) @@ -26,17 +26,26 @@ /** - * @author Oliver - * - */ -/* - * Class to represent a Triangle. Implementing the java.awt.Shape inteface. + * @author Oliver Wieland + * Class to represent a triangle shape. {@see java.awt.Shape}. */ public class Triangle implements Shape { private Polygon poly; + /** + * Copy constructor. + * @param p + */ public Triangle(Polygon p) { + if (p == null || p.npoints != 3) throw new RuntimeException("Given polygon was null or had invalid number of points"); poly = p; } + /** + * 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) { poly = new Polygon(); @@ -46,50 +55,86 @@ } + /** + * Draws an outlined triangle. + * @param g + */ public void draw(Graphics g) { g.drawPolygon(poly); } + /** + * Draws a filled triangle. + * @param g + */ public void fill(Graphics g) { g.fillPolygon(poly); } - // methods implemented from interface Shape - + /* (non-Javadoc) + * @see java.awt.Shape#getBounds() + */ public Rectangle getBounds() { return poly.getBounds(); } + /* (non-Javadoc) + * @see java.awt.Shape#getBounds2D() + */ public Rectangle2D getBounds2D() { return poly.getBounds2D(); } + /* (non-Javadoc) + * @see java.awt.Shape#contains(double, double) + */ public boolean contains(double x, double y) { return poly.contains(x, y); } + /* (non-Javadoc) + * @see java.awt.Shape#contains(java.awt.geom.Point2D) + */ public boolean contains(Point2D p) { return poly.contains(p); } + /* (non-Javadoc) + * @see java.awt.Shape#intersects(double, double, double, double) + */ public boolean intersects(double x, double y, double w, double h) { return poly.intersects(x, y, w, h); } + /* (non-Javadoc) + * @see java.awt.Shape#intersects(java.awt.geom.Rectangle2D) + */ public boolean intersects(Rectangle2D r) { return poly.intersects(r); } + /* (non-Javadoc) + * @see java.awt.Shape#contains(double, double, double, double) + */ public boolean contains(double x, double y, double w, double h) { return poly.contains(x, y, w, h); } + /* (non-Javadoc) + * @see java.awt.Shape#contains(java.awt.geom.Rectangle2D) + */ public boolean contains(Rectangle2D r) { return poly.intersects(r); } + /* (non-Javadoc) + * @see java.awt.Shape#getPathIterator(java.awt.geom.AffineTransform) + */ public PathIterator getPathIterator(AffineTransform at) { return poly.getPathIterator(at); } + /* (non-Javadoc) + * @see java.awt.Shape#getPathIterator(java.awt.geom.AffineTransform, double) + */ public PathIterator getPathIterator(AffineTransform at, double flatness) { return poly.getPathIterator(at, flatness); 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 23794) +++ /applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/TriangleDir.java (revision 23795) @@ -16,5 +16,5 @@ /** - * @author Oliver + * @author Oliver Wieland * */