Changeset 10600 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2016-07-23T03:04:37+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11390 - sonar - squid:S1609 - Java 8: @FunctionalInterface annotation should be used to flag Single Abstract Method interfaces

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• Destroyable.java (modified) (1 diff)
• Diff.java (modified) (5 diffs)
• ImageProvider.java (modified) (2 diffs)
• Utils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/Destroyable.java

@@ -8 +8 @@
  *
  * @author immanuel.scholz
+ * @since   208 (creation)
+ * @since 10600 (functional interface)
  */
+@FunctionalInterface
 public interface Destroyable {
 

trunk/src/org/openstreetmap/josm/tools/Diff.java

@@ -306 +306 @@
     /**
      * Script builder.
-     */
+     * @since 10600 (functional interface)
+     */
+    @FunctionalInterface
     public interface ScriptBuilder {
         /**
@@ -315 +317 @@
          * @param len1 number of lines in 2nd file
          * @return a linked list of changes - or null
+         * @since 10600 (renamed)
          */
-        Change build_script(
+        Change buildScript(
                 boolean[] changed0, int len0,
                 boolean[] changed1, int len1
@@ -322 +325 @@
     }
 
-    /** Scan the tables of which lines are inserted and deleted,
-     producing an edit script in reverse order.  */
-
+    /**
+     * Scan the tables of which lines are inserted and deleted, producing an edit script in reverse order.
+     */
     static class ReverseScript implements ScriptBuilder {
         @Override
-        public Change build_script(
+        public Change buildScript(
                 final boolean[] changed0, int len0,
                 final boolean[] changed1, int len1) {
@@ -360 +363 @@
             producing an edit script in forward order.  */
         @Override
-        public Change build_script(
+        public Change buildScript(
                 final boolean[] changed0, int len0,
                 final boolean[] changed1, int len1) {
@@ -438 +441 @@
 
         // Get the results of comparison in the form of a chain of `struct change's -- an edit script.
-        return bld.build_script(
+        return bld.buildScript(
                 filevec[0].changedFlag,
                 filevec[0].bufferedLines,

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -311 +311 @@
     /**
      * Callback interface for asynchronous image loading.
-     */
+     * @since 10600 (functional interface)
+     */
+    @FunctionalInterface
     public interface ImageCallback {
         /**
@@ -323 +325 @@
      * Callback interface for asynchronous image loading (with delayed scaling possibility).
      * @since 7693
-     */
+     * @since 10600 (functional interface)
+     */
+    @FunctionalInterface
     public interface ImageResourceCallback {
         /**

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -809 +809 @@
      */
     @Deprecated
+    @FunctionalInterface
     public interface Function<A, B> {