Skip to content

Commit

Permalink
upgrade to error_prone 2.3.3-SNAPSHOT + patch for Java 13 compatibility
Browse files Browse the repository at this point in the history
See google/error-prone#1106 (comment)

git-svn-id: https://josm.openstreetmap.de/svn/trunk@14784 0c6e7542-c601-0410-84e7-c038aed88b3b
  • Loading branch information
don-vip committed Feb 12, 2019
1 parent cbe6868 commit 1b5a7ad
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 10 deletions.
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ Build-Date: ${build.tstamp}
<compilerarg value="-Xlint:unchecked"/>
<!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
<compilerarg value="-XDignore.symbol.file"/>
<compilerarg value="-Xplugin:ErrorProne -Xep:ReferenceEquality:OFF -Xep:ImmutableEnumChecker:OFF -Xep:FutureReturnValueIgnored:OFF -Xep:FloatingPointLiteralPrecision:OFF -Xep:ShortCircuitBoolean:OFF -Xep:StringSplitter:OFF -Xep:JdkObsolete:OFF -Xep:UnnecessaryParentheses:OFF -Xep:EqualsGetClass:OFF -Xep:ThreadPriorityCheck:OFF -Xep:UndefinedEquals:OFF"/>
<compilerarg value="-Xplugin:ErrorProne -Xep:ReferenceEquality:OFF -Xep:ImmutableEnumChecker:OFF -Xep:FutureReturnValueIgnored:OFF -Xep:FloatingPointLiteralPrecision:OFF -Xep:ShortCircuitBoolean:OFF -Xep:StringSplitter:OFF -Xep:JdkObsolete:OFF -Xep:UnnecessaryParentheses:OFF -Xep:EqualsGetClass:OFF -Xep:ThreadPriorityCheck:OFF -Xep:UndefinedEquals:OFF -Xep:MixedMutabilityReturnType:OFF -Xep:OverrideThrowableToString:OFF -Xep:JavaTimeDefaultTimeZone:OFF -Xep:UnusedVariable:OFF -Xep:EqualsUsingHashCode:OFF"/>
<compilerarg line="-Xmaxwarns 1000"/>
<exclude name="org/openstreetmap/josm/io/audio/fx/*.java" if:set="noJavaFX"/>
</javac>
Expand Down
3 changes: 1 addition & 2 deletions src/org/openstreetmap/josm/actions/ToggleAction.java
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,7 @@ protected void notifySelectedState() {
* the component already set the selected state.
* 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) {
if (e == null || !(e.getSource() instanceof JToggleButton ||
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,19 +78,12 @@ public enum PaintColors {
*/
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;

PaintColors(String name, Color defaultColor) {
baseProperty = new NamedColorProperty(name, defaultColor);
property = baseProperty.cached();
this.name = name;
this.defaultColor = defaultColor;
}

/**
Expand Down
Binary file modified tools/error_prone_core.jar
Binary file not shown.
Binary file added tools/spotbugs/jFormatString-3.0.0.jar
Binary file not shown.

0 comments on commit 1b5a7ad

Please sign in to comment.