Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
r10728 r10729 261 261 /** Tags (or arbitraty strings) of alternatives to be presented to the user */ 262 262 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. 264 264 * Is evaluated on the matching primitive to give the error message. Map is checked to contain exactly one element. */ 265 265 protected final Map<Instruction.AssignmentInstruction, Severity> errors = new HashMap<>(); -
trunk/test/unit/org/openstreetmap/josm/tools/PredicatesTest.java
r10691 r10729 24 24 * 25 25 * @author Michael Zangl 26 * @deprecated to remove when {@code Predicates} class is removed 26 27 */ 28 @Deprecated 27 29 public class PredicatesTest { 28 30 /** 29 31 * Some of this depends on preferences. 30 */ 32 * @deprecated to remove when {@code Predicates} class is removed 33 */ 34 @Deprecated 31 35 @Rule 32 36 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") … … 35 39 /** 36 40 * Test {@link Predicates#alwaysTrue()} 37 */ 38 @Test 41 * @deprecated to remove when {@code Predicates} class is removed 42 */ 43 @Test 44 @Deprecated 39 45 public void testAlwaysTrue() { 40 46 Predicate<Object> alwaysTrue = Predicates.alwaysTrue(); … … 45 51 /** 46 52 * Test {@link Predicates#alwaysFalse()} 47 */ 48 @Test 53 * @deprecated to remove when {@code Predicates} class is removed 54 */ 55 @Test 56 @Deprecated 49 57 public void testAlwaysFalse() { 50 58 Predicate<Object> alwaysFalse = Predicates.alwaysFalse(); … … 55 63 /** 56 64 * Test {@link Predicates#equalTo(Object)} 57 */ 58 @Test 65 * @deprecated to remove when {@code Predicates} class is removed 66 */ 67 @Test 68 @Deprecated 59 69 public void testEqualTo() { 60 70 Integer testObject = Integer.valueOf(1); … … 69 79 /** 70 80 * Test {@link Predicates#isOfClass(Class)} 71 */ 72 @Test 81 * @deprecated to remove when {@code Predicates} class is removed 82 */ 83 @Test 84 @Deprecated 73 85 public void testIsOfClass() { 74 86 Predicate<Object> isOfClass = Predicates.<Object>isOfClass(Hashtable.class); … … 81 93 /** 82 94 * Test {@link Predicates#isOfClass(Class)} 83 */ 84 @Test 95 * @deprecated to remove when {@code Predicates} class is removed 96 */ 97 @Test 98 @Deprecated 85 99 public void testIsInstanceOf() { 86 100 Predicate<Object> isInstanceOf = Predicates.<Object>isInstanceOf(Hashtable.class); … … 93 107 /** 94 108 * 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 97 113 public void testStringMatchesPattern() { 98 114 Pattern p = Pattern.compile("ab?c"); … … 107 123 /** 108 124 * 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 111 129 public void testStringContainsPattern() { 112 130 Pattern p = Pattern.compile("ab?c"); … … 122 140 /** 123 141 * Test {@link Predicates#stringContains(String)} 124 */ 125 @Test 142 * @deprecated to remove when {@code Predicates} class is removed 143 */ 144 @Test 145 @Deprecated 126 146 public void testStringContains() { 127 147 Predicate<String> stringContains = Predicates.stringContains("abc"); … … 135 155 /** 136 156 * Test {@link Predicates#hasTag(String, String...)} 137 */ 138 @Test 157 * @deprecated to remove when {@code Predicates} class is removed 158 */ 159 @Test 160 @Deprecated 139 161 public void testHasTag() { 140 162 Predicate<OsmPrimitive> hasTag = Predicates.hasTag("key", "value"); … … 151 173 /** 152 174 * Test {@link Predicates#hasKey(String)} 153 */ 154 @Test 175 * @deprecated to remove when {@code Predicates} class is removed 176 */ 177 @Test 178 @Deprecated 155 179 public void testHasKey() { 156 180 Predicate<OsmPrimitive> hasKey = Predicates.hasKey("key"); … … 165 189 /** 166 190 * 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 169 195 public void testInCollection() { 170 196 List<String> list = Arrays.asList("a", "b", "c"); … … 185 211 /** 186 212 * Test {@link Predicates#isNull()} 187 */ 188 @Test 213 * @deprecated to remove when {@code Predicates} class is removed 214 */ 215 @Test 216 @Deprecated 189 217 public void testIsNull() { 190 218 Predicate<Object> isNull = Predicates.isNull();
Note:
See TracChangeset
for help on using the changeset viewer.