Changeset 14784 in josm for trunk/src/org/openstreetmap

Timestamp:

2019-02-12T01:02:57+01:00 (6 years ago)

Author:

Don-vip

Message:

see #17516 - upgrade to error_prone 2.3.3-SNAPSHOT + patch for Java 13 compatibility

See ​https://github.com/google/error-prone/issues/1106#issuecomment-460800327

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ToggleAction.java (modified) (1 diff)
• data/osm/visitor/paint/PaintColors.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/ToggleAction.java

@@ -121 +121 @@
      * This method needs to be called especially if the action is associated with a keyboard shortcut to ensure correct selected state.
      * @param e ActionEvent that trigerred the action
-     * @see <a href="https://weblogs.java.net/blog/zixle/archive/2005/11/changes_to_acti.html">Changes to Actions in 1.6</a>
-     * @see <a href="https://docs.oracle.com/javase/6/docs/api/javax/swing/Action.html">Interface Action</a>
+     * @see <a href="https://docs.oracle.com/javase/8/docs/api/javax/swing/Action.html">Interface Action</a>
      */
     protected final void toggleSelectedState(ActionEvent e) {

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java

@@ -79 +79 @@
     AREA_TEXT(marktr("areatext"), Color.LIGHT_GRAY);
 
-    /**
-     * The name of the color
-     */
-    private final String name;
-    private final Color defaultColor;
     private final NamedColorProperty baseProperty;
     private final CachingProperty<Color> property;
@@ -90 +85 @@
         baseProperty = new NamedColorProperty(name, defaultColor);
         property = baseProperty.cached();
-        this.name = name;
-        this.defaultColor = defaultColor;
     }