Changeset 6610 in josm for trunk/src

Timestamp:

2014-01-03T13:34:53+01:00 (11 years ago)

Author:

simon04

Message:

Fix Javadoc links (@see @link => @see)

Location:

trunk/src/org/openstreetmap/josm

Files:

• command/TransformNodesCommand.java (modified) (1 diff)
• data/osm/AbstractPrimitive.java (modified) (2 diffs)
• data/validation/tests/MapCSSTagChecker.java (modified) (1 diff)
• gui/mappaint/mapcss/ExpressionFactory.java (modified) (14 diffs)
• tools/Utils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/TransformNodesCommand.java

@@ -128 +128 @@
      * Get the center of the nodes under modification.
      * It's just the barycenter.
-     * @see {@link org.openstreetmap.josm.tools.Geometry#getCentroid(java.util.List)}
+     * @see org.openstreetmap.josm.tools.Geometry#getCentroid(java.util.List)
      */
     public EastNorth getNodesCenter() {

trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java

@@ -605 +605 @@
     /**
      * Returns true if the {@code key} corresponds to an OSM true value.
-     * @see {@link OsmUtils#isTrue(String) }
+     * @see OsmUtils#isTrue(String)
      */
     public final boolean isKeyTrue(String key) {
@@ -613 +613 @@
     /**
      * Returns true if the {@code key} corresponds to an OSM false value.
-     * @see {@link OsmUtils#isFalse(String) }
+     * @see OsmUtils#isFalse(String)
      */
     public final boolean isKeyFalse(String key) {

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -289 +289 @@
          *
          * @return a description (possibly with alternative suggestions)
-         * @see {@link #getDescriptionForMatchingSelector(Selector)}
+         * @see #getDescriptionForMatchingSelector(Selector)
          */
         String getDescription() {

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

@@ -139 +139 @@
         /**
          * Creates a list of values, e.g., for the {@code dashes} property.
-         * @see {@link Arrays#asList(Object[])}
+         * @see Arrays#asList(Object[])
          */
         public static List list(Object... args) {
@@ -159 +159 @@
         /**
          * Splits string {@code toSplit} at occurrences of the separator string {@code sep} and returns a list of matches.
-         * @see {@link String#split(String)}
+         * @see String#split(String)
          * @since 5699
          */
@@ -168 +168 @@
         /**
          * Creates a color value with the specified amounts of {@code r}ed, {@code g}reen, {@code b}lue (arguments from 0.0 to 1.0)
-         * @see {@link Color#Color(float, float, float)}
+         * @see Color#Color(float, float, float)
          */
         public static Color rgb(float r, float g, float b) {
@@ -196 +196 @@
         /**
          * Get the value of the red color channel in the rgb color model
-         * @see {@link java.awt.Color#getRed()}
+         * @see java.awt.Color#getRed()
          */
         public static float red(Color c) {
@@ -204 +204 @@
         /**
          * Get the value of the green color channel in the rgb color model
-         * @see {@link java.awt.Color#getGreen()}
+         * @see java.awt.Color#getGreen()
          */
         public static float green(Color c) {
@@ -212 +212 @@
         /**
          * Get the value of the blue color channel in the rgb color model
-         * @see {@link java.awt.Color#getBlue()}
+         * @see java.awt.Color#getBlue()
          */
         public static float blue(Color c) {
@@ -341 +341 @@
         /**
          * Determines if the objects {@code a} and {@code b} are equal.
-         * @see {@link Object#equals(Object)}
+         * @see Object#equals(Object)
          */
         public static boolean equal(Object a, Object b) {
@@ -372 +372 @@
          * Obtains the JOSM'key {@link org.openstreetmap.josm.data.Preferences} string for key {@code key},
          * and defaults to {@code def} if that is null.
-         * @see {@link org.openstreetmap.josm.data.Preferences#get(String, String)}
+         * @see org.openstreetmap.josm.data.Preferences#get(String, String)
          */
         public static String JOSM_pref(String key, String def) {
@@ -382 +382 @@
          * Obtains the JOSM'key {@link org.openstreetmap.josm.data.Preferences} color for key {@code key},
          * and defaults to {@code def} if that is null.
-         * @see {@link org.openstreetmap.josm.data.Preferences#getColor(String, java.awt.Color)}
+         * @see org.openstreetmap.josm.data.Preferences#getColor(String, java.awt.Color)
          */
         public static Color JOSM_pref_color(String key, Color def) {
@@ -391 +391 @@
         /**
          * Tests if string {@code target} matches pattern {@code pattern}
-         * @see {@link Pattern#matches(String, CharSequence)}
+         * @see Pattern#matches(String, CharSequence)
          * @since 5699
          */
@@ -452 +452 @@
         /**
          * Returns the OSM id of the current object.
-         * @see {@link org.openstreetmap.josm.data.osm.AbstractPrimitive#generateUniqueId()}
+         * @see OsmPrimitive#getUniqueId()
          */
         public long osm_id() {
@@ -470 +470 @@
         /**
          * Returns the substring of {@code s} starting at index {@code begin} (inclusive, 0-indexed).
-         * * @see {@link String#substring(int)}
+         * @see String#substring(int)
          */
         public static String substring(String s, /* due to missing Cascade.convertTo for int*/ float begin) {
@@ -479 +479 @@
          * Returns the substring of {@code s} starting at index {@code begin} (inclusive)
          * and ending at index {@code end}, (exclusive, 0-indexed).
-         * @see {@link String#substring(int, int)}
+         * @see String#substring(int, int)
          */
         public static String substring(String s, float begin, float end) {
@@ -487 +487 @@
         /**
          * Replaces in {@code s} every {@code} target} substring by {@code replacement}.
-         * * @see {@link String#replace(CharSequence, CharSequence)}
+         * * @see String#replace(CharSequence, CharSequence)
          */
         public static String replace(String s, String target, String replacement) {

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -100 +100 @@
     }
 
+    /**
+     * Returns the first element from {@code items} which is non-null, or null if all elements are null.
+     */
     public static <T> T firstNonNull(T... items) {
         for (T i : items) {