Changeset 10729 in josm for trunk


Ignore:
Timestamp:
2016-08-04T01:53:02+02:00 (8 years ago)
Author:
Don-vip
Message:

fix compiler/javadoc warnings

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

    r10728 r10729  
    261261        /** Tags (or arbitraty strings) of alternatives to be presented to the user */
    262262        protected final List<String> alternatives = new ArrayList<>();
    263         /** An {@link Instruction.AssignmentInstruction}-{@link Severity} pair.
     263        /** An {@link org.openstreetmap.josm.gui.mappaint.mapcss.Instruction.AssignmentInstruction}-{@link Severity} pair.
    264264         * Is evaluated on the matching primitive to give the error message. Map is checked to contain exactly one element. */
    265265        protected final Map<Instruction.AssignmentInstruction, Severity> errors = new HashMap<>();
  • trunk/test/unit/org/openstreetmap/josm/tools/PredicatesTest.java

    r10691 r10729  
    2424 *
    2525 * @author Michael Zangl
     26 * @deprecated to remove when {@code Predicates} class is removed
    2627 */
     28@Deprecated
    2729public class PredicatesTest {
    2830    /**
    2931     * Some of this depends on preferences.
    30      */
     32     * @deprecated to remove when {@code Predicates} class is removed
     33     */
     34    @Deprecated
    3135    @Rule
    3236    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     
    3539    /**
    3640     * Test {@link Predicates#alwaysTrue()}
    37      */
    38     @Test
     41     * @deprecated to remove when {@code Predicates} class is removed
     42     */
     43    @Test
     44    @Deprecated
    3945    public void testAlwaysTrue() {
    4046        Predicate<Object> alwaysTrue = Predicates.alwaysTrue();
     
    4551    /**
    4652     * Test {@link Predicates#alwaysFalse()}
    47      */
    48     @Test
     53     * @deprecated to remove when {@code Predicates} class is removed
     54     */
     55    @Test
     56    @Deprecated
    4957    public void testAlwaysFalse() {
    5058        Predicate<Object> alwaysFalse = Predicates.alwaysFalse();
     
    5563    /**
    5664     * Test {@link Predicates#equalTo(Object)}
    57      */
    58     @Test
     65     * @deprecated to remove when {@code Predicates} class is removed
     66     */
     67    @Test
     68    @Deprecated
    5969    public void testEqualTo() {
    6070        Integer testObject = Integer.valueOf(1);
     
    6979    /**
    7080     * Test {@link Predicates#isOfClass(Class)}
    71      */
    72     @Test
     81     * @deprecated to remove when {@code Predicates} class is removed
     82     */
     83    @Test
     84    @Deprecated
    7385    public void testIsOfClass() {
    7486        Predicate<Object> isOfClass = Predicates.<Object>isOfClass(Hashtable.class);
     
    8193    /**
    8294     * Test {@link Predicates#isOfClass(Class)}
    83      */
    84     @Test
     95     * @deprecated to remove when {@code Predicates} class is removed
     96     */
     97    @Test
     98    @Deprecated
    8599    public void testIsInstanceOf() {
    86100        Predicate<Object> isInstanceOf = Predicates.<Object>isInstanceOf(Hashtable.class);
     
    93107    /**
    94108     * Test {@link Predicates#stringMatchesPattern(java.util.regex.Pattern)}
    95      */
    96     @Test
     109     * @deprecated to remove when {@code Predicates} class is removed
     110     */
     111    @Test
     112    @Deprecated
    97113    public void testStringMatchesPattern() {
    98114        Pattern p = Pattern.compile("ab?c");
     
    107123    /**
    108124     * Test {@link Predicates#stringContainsPattern(java.util.regex.Pattern)}
    109      */
    110     @Test
     125     * @deprecated to remove when {@code Predicates} class is removed
     126     */
     127    @Test
     128    @Deprecated
    111129    public void testStringContainsPattern() {
    112130        Pattern p = Pattern.compile("ab?c");
     
    122140    /**
    123141     * Test {@link Predicates#stringContains(String)}
    124      */
    125     @Test
     142     * @deprecated to remove when {@code Predicates} class is removed
     143     */
     144    @Test
     145    @Deprecated
    126146    public void testStringContains() {
    127147        Predicate<String> stringContains = Predicates.stringContains("abc");
     
    135155    /**
    136156     * Test {@link Predicates#hasTag(String, String...)}
    137      */
    138     @Test
     157     * @deprecated to remove when {@code Predicates} class is removed
     158     */
     159    @Test
     160    @Deprecated
    139161    public void testHasTag() {
    140162        Predicate<OsmPrimitive> hasTag = Predicates.hasTag("key", "value");
     
    151173    /**
    152174     * Test {@link Predicates#hasKey(String)}
    153      */
    154     @Test
     175     * @deprecated to remove when {@code Predicates} class is removed
     176     */
     177    @Test
     178    @Deprecated
    155179    public void testHasKey() {
    156180        Predicate<OsmPrimitive> hasKey = Predicates.hasKey("key");
     
    165189    /**
    166190     * Test {@link Predicates#inCollection(java.util.Collection)}
    167      */
    168     @Test
     191     * @deprecated to remove when {@code Predicates} class is removed
     192     */
     193    @Test
     194    @Deprecated
    169195    public void testInCollection() {
    170196        List<String> list = Arrays.asList("a", "b", "c");
     
    185211    /**
    186212     * Test {@link Predicates#isNull()}
    187      */
    188     @Test
     213     * @deprecated to remove when {@code Predicates} class is removed
     214     */
     215    @Test
     216    @Deprecated
    189217    public void testIsNull() {
    190218        Predicate<Object> isNull = Predicates.isNull();
Note: See TracChangeset for help on using the changeset viewer.