Skip to content

Commit b4c0cab

Browse files
authored
Javadoc improvements (#1293)
1 parent 6788246 commit b4c0cab

13 files changed

Lines changed: 33 additions & 43 deletions

File tree

vtm-jts/src/org/oscim/layers/vector/geometries/PolygonDrawable.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ public PolygonDrawable(List<GeoPoint> points, Style style) {
6060
*
6161
* @param points
6262
* @param holePoints
63-
* @param outlineColor
64-
* @param outlineAlpha
63+
* @param lineWidth
64+
* @param lineColor
6565
* @param fillColor
6666
* @param fillAlpha
6767
*/
@@ -80,8 +80,8 @@ public PolygonDrawable(GeoPoint[] points, GeoPoint[] holePoints, float lineWidth
8080
*
8181
* @param points
8282
* @param holePoints
83-
* @param outlineColor
84-
* @param outlineAlpha
83+
* @param lineWidth
84+
* @param lineColor
8585
* @param fillColor
8686
* @param fillAlpha
8787
*/

vtm-jts/src/org/oscim/layers/vector/geometries/RectangleDrawable.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,11 @@ public RectangleDrawable(GeoPoint topLeft, GeoPoint bottomRight, Style style) {
4040
* Creates a Rectangle given the top-left and the bottom-right coordinate of
4141
* it
4242
*
43-
* @param topLeft
44-
* @param bottomRight
43+
* @param minLat
44+
* @param minLon
45+
* @param maxLat
46+
* @param maxLon
47+
* @param style
4548
*/
4649
public RectangleDrawable(double minLat, double minLon, double maxLat, double maxLon, Style style) {
4750
super(style);

vtm/src/org/oscim/core/GeometryBuffer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,10 @@ public GeometryBuffer(GeometryBuffer buffer) {
151151
}
152152

153153
/**
154-
* @param out PointF to set coordinates to.
155-
* @param i the 2D point position.
156-
* @return when out is null a temporary PointF is
154+
* When out is null a temporary PointF is
157155
* returned which belongs to GeometryBuffer.
156+
* @param i the 2D point position.
157+
* @param out PointF to set coordinates to.
158158
*/
159159
public void getPoint(int i, PointF out) {
160160
out.x = points[(i << 1)];

vtm/src/org/oscim/core/MercatorProjection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public static GeoPoint fromPixels(double pixelX, double pixelY, long mapSize) {
7777
/**
7878
* @param scale the scale factor for which the size of the world map should be returned.
7979
* @return the horizontal and vertical size of the map in pixel at the given scale.
80-
* @throws IllegalArgumentException if the given scale factor is < 1
80+
* @throws IllegalArgumentException if the given scale factor is {@code < 1}
8181
*/
8282
public static long getMapSizeWithScale(double scale) {
8383
if (scale < 1) {

vtm/src/org/oscim/layers/marker/MarkerLayer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* Draws a list of {@link MarkerInterface} as markers to a map. The item with the
3333
* lowest index is drawn as last and therefore the 'topmost' marker. It also
3434
* gets checked for onTap first. This class is generic, because you then you get
35-
* your custom item-class passed back in onTap(). << TODO
35+
* your custom item-class passed back in onTap().
3636
*/
3737
public abstract class MarkerLayer extends Layer {
3838

vtm/src/org/oscim/renderer/GLMatrix.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public void prj2D(float[] vec2, int offset, int length) {
109109
/**
110110
* Project Vectors with Matrix
111111
*
112-
* @param vec2 Vector to project
112+
* @param src Vector to project
113113
*/
114114
public void prj2D(float[] src, int src_offset, float[] dst, int dst_offset, int length) {
115115
if (src == null || src_offset < 0 || length + src_offset * 2 > src.length)

vtm/src/org/oscim/renderer/LayerRenderer.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,11 @@ public boolean setup() {
5151
/**
5252
* 1. Called first by MapRenderer: Update the state here, compile
5353
* vertex-data and set setReady(true).
54-
*
55-
* @param position current MapPosition
56-
* @param changed true when MapPosition has changed since last frame
57-
* @param matrices contains the current view- and projection-matrices
58-
* and 'mvp' matrix for temporary use.
5954
*/
6055
public abstract void update(GLViewport viewport);
6156

6257
/**
6358
* 2. Draw layer: called by MapRenderer when isReady == true.
64-
*
65-
* @param position current MapPosition
66-
* @param matrices contains the current view- and projection-matrices.
67-
* 'matrices.mvp' is for temporary use to build the model-
68-
* view-projection to set as uniform.
6959
*/
7060
public abstract void render(GLViewport viewport);
7161

vtm/src/org/oscim/renderer/bucket/LineTexBucket.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
* 6, 5, 7,
7474
* <p/>
7575
* BIG NOTE: renderer assumes to be able to offset vertex array position
76-
* so that in the first pass 'pos1' offset will be < 0 if no data precedes
76+
* so that in the first pass 'pos1' offset will be {@code < 0} if no data precedes
7777
* - in our case there is always the polygon fill array at start
7878
* - see addLine hack otherwise.
7979
*/

vtm/src/org/oscim/tiling/source/mapfile/MapFile.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,7 +1125,7 @@ public MapReadResult readNamedItems(Tile tile) {
11251125
/**
11261126
* Reads data for an area defined by the tile in the upper left and the tile in
11271127
* the lower right corner.
1128-
* Precondition: upperLeft.tileX <= lowerRight.tileX && upperLeft.tileY <= lowerRight.tileY
1128+
* Precondition: {@code upperLeft.tileX <= lowerRight.tileX && upperLeft.tileY <= lowerRight.tileY}
11291129
*
11301130
* @param upperLeft tile that defines the upper left corner of the requested area.
11311131
* @param lowerRight tile that defines the lower right corner of the requested area.
@@ -1148,7 +1148,7 @@ public MapReadResult readMapData(Tile tile) {
11481148
/**
11491149
* Reads data for an area defined by the tile in the upper left and the tile in
11501150
* the lower right corner.
1151-
* Precondition: upperLeft.tileX <= lowerRight.tileX && upperLeft.tileY <= lowerRight.tileY
1151+
* Precondition: {@code upperLeft.tileX <= lowerRight.tileX && upperLeft.tileY <= lowerRight.tileY}
11521152
*
11531153
* @param upperLeft tile that defines the upper left corner of the requested area.
11541154
* @param lowerRight tile that defines the lower right corner of the requested area.

vtm/src/org/oscim/utils/ColorUtil.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ public static synchronized int modHsv(int color, double hue, double saturation,
9797
* Assumes r, g, and b are contained in the set [0, 255] and
9898
* returns h, s, and l in the set [0, 1].
9999
*
100-
* @param Number r The red color value
101-
* @param Number g The green color value
102-
* @param Number b The blue color value
100+
* @param r The red color value
101+
* @param g The green color value
102+
* @param b The blue color value
103103
* @return Array The HSL representation
104104
*/
105105
public static Vec3 rgbToHsl(double r, double g, double b, Vec3 out) {
@@ -140,9 +140,9 @@ public static Vec3 rgbToHsl(double r, double g, double b) {
140140
* Assumes h, s, and l are contained in the set [0, 1] and
141141
* returns r, g, and b in the set [0, 255].
142142
*
143-
* @param Number h The hue
144-
* @param Number s The saturation
145-
* @param Number l The lightness
143+
* @param h The hue
144+
* @param s The saturation
145+
* @param l The lightness
146146
* @return Array The RGB representation
147147
*/
148148
public static int hslToRgb(double h, double s, double l, Vec3 out) {
@@ -184,9 +184,9 @@ static double hue2rgb(double p, double q, double t) {
184184
* Assumes r, g, and b are contained in the set [0, 255] and
185185
* returns h, s, and v in the set [0, 1].
186186
*
187-
* @param Number r The red color value
188-
* @param Number g The green color value
189-
* @param Number b The blue color value
187+
* @param r The red color value
188+
* @param g The green color value
189+
* @param b The blue color value
190190
* @return Array The HSV representation
191191
*/
192192
public static Vec3 rgbToHsv(double r, double g, double b, Vec3 out) {

0 commit comments

Comments
 (0)