Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java	(revision 10728)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java	(revision 10729)
@@ -261,5 +261,5 @@
         /** Tags (or arbitraty strings) of alternatives to be presented to the user */
         protected final List<String> alternatives = new ArrayList<>();
-        /** An {@link Instruction.AssignmentInstruction}-{@link Severity} pair.
+        /** An {@link org.openstreetmap.josm.gui.mappaint.mapcss.Instruction.AssignmentInstruction}-{@link Severity} pair.
          * Is evaluated on the matching primitive to give the error message. Map is checked to contain exactly one element. */
         protected final Map<Instruction.AssignmentInstruction, Severity> errors = new HashMap<>();
Index: /trunk/test/unit/org/openstreetmap/josm/tools/PredicatesTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/tools/PredicatesTest.java	(revision 10728)
+++ /trunk/test/unit/org/openstreetmap/josm/tools/PredicatesTest.java	(revision 10729)
@@ -24,9 +24,13 @@
  *
  * @author Michael Zangl
+ * @deprecated to remove when {@code Predicates} class is removed
  */
+@Deprecated
 public class PredicatesTest {
     /**
      * Some of this depends on preferences.
-     */
+     * @deprecated to remove when {@code Predicates} class is removed
+     */
+    @Deprecated
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
@@ -35,6 +39,8 @@
     /**
      * Test {@link Predicates#alwaysTrue()}
-     */
-    @Test
+     * @deprecated to remove when {@code Predicates} class is removed
+     */
+    @Test
+    @Deprecated
     public void testAlwaysTrue() {
         Predicate<Object> alwaysTrue = Predicates.alwaysTrue();
@@ -45,6 +51,8 @@
     /**
      * Test {@link Predicates#alwaysFalse()}
-     */
-    @Test
+     * @deprecated to remove when {@code Predicates} class is removed
+     */
+    @Test
+    @Deprecated
     public void testAlwaysFalse() {
         Predicate<Object> alwaysFalse = Predicates.alwaysFalse();
@@ -55,6 +63,8 @@
     /**
      * Test {@link Predicates#equalTo(Object)}
-     */
-    @Test
+     * @deprecated to remove when {@code Predicates} class is removed
+     */
+    @Test
+    @Deprecated
     public void testEqualTo() {
         Integer testObject = Integer.valueOf(1);
@@ -69,6 +79,8 @@
     /**
      * Test {@link Predicates#isOfClass(Class)}
-     */
-    @Test
+     * @deprecated to remove when {@code Predicates} class is removed
+     */
+    @Test
+    @Deprecated
     public void testIsOfClass() {
         Predicate<Object> isOfClass = Predicates.<Object>isOfClass(Hashtable.class);
@@ -81,6 +93,8 @@
     /**
      * Test {@link Predicates#isOfClass(Class)}
-     */
-    @Test
+     * @deprecated to remove when {@code Predicates} class is removed
+     */
+    @Test
+    @Deprecated
     public void testIsInstanceOf() {
         Predicate<Object> isInstanceOf = Predicates.<Object>isInstanceOf(Hashtable.class);
@@ -93,6 +107,8 @@
     /**
      * Test {@link Predicates#stringMatchesPattern(java.util.regex.Pattern)}
-     */
-    @Test
+     * @deprecated to remove when {@code Predicates} class is removed
+     */
+    @Test
+    @Deprecated
     public void testStringMatchesPattern() {
         Pattern p = Pattern.compile("ab?c");
@@ -107,6 +123,8 @@
     /**
      * Test {@link Predicates#stringContainsPattern(java.util.regex.Pattern)}
-     */
-    @Test
+     * @deprecated to remove when {@code Predicates} class is removed
+     */
+    @Test
+    @Deprecated
     public void testStringContainsPattern() {
         Pattern p = Pattern.compile("ab?c");
@@ -122,6 +140,8 @@
     /**
      * Test {@link Predicates#stringContains(String)}
-     */
-    @Test
+     * @deprecated to remove when {@code Predicates} class is removed
+     */
+    @Test
+    @Deprecated
     public void testStringContains() {
         Predicate<String> stringContains = Predicates.stringContains("abc");
@@ -135,6 +155,8 @@
     /**
      * Test {@link Predicates#hasTag(String, String...)}
-     */
-    @Test
+     * @deprecated to remove when {@code Predicates} class is removed
+     */
+    @Test
+    @Deprecated
     public void testHasTag() {
         Predicate<OsmPrimitive> hasTag = Predicates.hasTag("key", "value");
@@ -151,6 +173,8 @@
     /**
      * Test {@link Predicates#hasKey(String)}
-     */
-    @Test
+     * @deprecated to remove when {@code Predicates} class is removed
+     */
+    @Test
+    @Deprecated
     public void testHasKey() {
         Predicate<OsmPrimitive> hasKey = Predicates.hasKey("key");
@@ -165,6 +189,8 @@
     /**
      * Test {@link Predicates#inCollection(java.util.Collection)}
-     */
-    @Test
+     * @deprecated to remove when {@code Predicates} class is removed
+     */
+    @Test
+    @Deprecated
     public void testInCollection() {
         List<String> list = Arrays.asList("a", "b", "c");
@@ -185,6 +211,8 @@
     /**
      * Test {@link Predicates#isNull()}
-     */
-    @Test
+     * @deprecated to remove when {@code Predicates} class is removed
+     */
+    @Test
+    @Deprecated
     public void testIsNull() {
         Predicate<Object> isNull = Predicates.isNull();