Changeset 10600 in josm for trunk/src

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

Files:

• actions/ExpertToggleAction.java (modified) (1 diff)
• actions/search/SearchAction.java (modified) (1 diff)
• actions/search/SearchCompiler.java (modified) (1 diff)
• actions/upload/FixDataHook.java (modified) (1 diff)
• actions/upload/UploadHook.java (modified) (1 diff)
• data/Preferences.java (modified) (1 diff)
• data/SelectionChangedListener.java (modified) (1 diff)
• data/SystemOfMeasurement.java (modified) (1 diff)
• data/cache/ICachedLoaderListener.java (modified) (1 diff)
• data/osm/AbstractPrimitive.java (modified) (1 diff)
• data/osm/ChangesetCacheListener.java (modified) (1 diff)
• data/osm/PrimitiveDeepCopy.java (modified) (1 diff)
• data/osm/event/DataSetListenerAdapter.java (modified) (1 diff)
• data/osm/history/History.java (modified) (1 diff)
• data/osm/visitor/paint/Rendering.java (modified) (1 diff)
• data/projection/ProjectionChangeListener.java (modified) (1 diff)
• data/projection/proj/ICentralMeridianProvider.java (modified) (1 diff)
• data/projection/proj/IScaleFactorProvider.java (modified) (1 diff)
• data/projection/proj/ProjFactory.java (modified) (1 diff)
• data/validation/tests/SimilarNamedWays.java (modified) (1 diff)
• gui/FileDrop.java (modified) (2 diffs)
• gui/MapFrame.java (modified) (1 diff)
• gui/MapFrameListener.java (modified) (1 diff)
• gui/MapView.java (modified) (3 diffs)
• gui/NavigatableComponent.java (modified) (1 diff)
• gui/bbox/SlippyMapBBoxChooser.java (modified) (1 diff)
• gui/dialogs/CommandStackDialog.java (modified) (1 diff)
• gui/dialogs/IEnabledStateUpdating.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/dialogs/layer/IEnabledStateUpdating.java ) (1 diff)
• gui/dialogs/LayerListDialog.java (modified) (1 diff)
• gui/dialogs/changeset/ChangesetAware.java (modified) (1 diff)
• gui/dialogs/layer/ActivateLayerAction.java (modified) (1 diff)
• gui/dialogs/layer/DeleteLayerAction.java (modified) (1 diff)
• gui/dialogs/layer/DuplicateAction.java (modified) (1 diff)
• gui/dialogs/layer/LayerVisibilityAction.java (modified) (1 diff)
• gui/dialogs/layer/MergeAction.java (modified) (1 diff)
• gui/dialogs/layer/MoveDownAction.java (modified) (1 diff)
• gui/dialogs/layer/MoveUpAction.java (modified) (1 diff)
• gui/dialogs/layer/ShowHideLayerAction.java (modified) (1 diff)
• gui/dialogs/relation/IMemberModelListener.java (modified) (1 diff)
• gui/help/Helpful.java (modified) (1 diff)
• gui/layer/AbstractMapViewPaintable.java (modified) (1 diff)
• gui/layer/ImageProcessor.java (modified) (1 diff)
• gui/layer/Layer.java (modified) (1 diff)
• gui/layer/MainLayerManager.java (modified) (1 diff)
• gui/layer/MapViewPaintable.java (modified) (2 diffs)
• gui/layer/NativeScaleLayer.java (modified) (1 diff)
• gui/layer/OsmDataLayer.java (modified) (2 diffs)
• gui/layer/imagery/ImageryFilterSettings.java (modified) (1 diff)
• gui/layer/imagery/TileSourceDisplaySettings.java (modified) (1 diff)
• gui/layer/markerlayer/MarkerProducers.java (modified) (1 diff)
• gui/mappaint/mapcss/Expression.java (modified) (1 diff)
• gui/mappaint/mapcss/Instruction.java (modified) (1 diff)
• gui/mappaint/mapcss/Subpart.java (modified) (1 diff)
• gui/mappaint/styleelement/BoxTextElement.java (modified) (1 diff)
• gui/preferences/PreferenceSettingFactory.java (modified) (1 diff)
• gui/preferences/PreferenceTabbedPane.java (modified) (2 diffs)
• gui/preferences/SourceProvider.java (modified) (1 diff)
• gui/preferences/imagery/AddImageryPanel.java (modified) (1 diff)
• gui/preferences/server/ProxyPreferenceListener.java (modified) (1 diff)
• gui/progress/ProgressMonitor.java (modified) (1 diff)
• gui/util/ModifierListener.java (modified) (1 diff)
• gui/widgets/HistoryChangedListener.java (modified) (1 diff)
• gui/widgets/MultiSplitPane.java (modified) (1 diff)
• io/OsmServerReadPostprocessor.java (modified) (1 diff)
• io/OsmServerWritePostprocessor.java (modified) (1 diff)
• io/auth/CredentialsManager.java (modified) (1 diff)
• io/session/SessionLayerImporter.java (modified) (1 diff)
• tools/Destroyable.java (modified) (1 diff)
• tools/Diff.java (modified) (5 diffs)
• tools/ImageProvider.java (modified) (2 diffs)
• tools/Utils.java (modified) (1 diff)

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

@@ -19 +19 @@
 public class ExpertToggleAction extends ToggleAction {
 
+    @FunctionalInterface
     public interface ExpertModeChangeListener {
         void expertChanged(boolean isExpert);

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -555 +555 @@
      * @author Michael Zangl
      * @since 10457
-     */
+     * @since 10600 (functional interface)
+     */
+    @FunctionalInterface
     interface SearchReceiver {
         /**

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -230 +230 @@
     /**
      * Classes implementing this interface can provide Match operators.
-     */
+     * @since 10600 (functional interface)
+     */
+    @FunctionalInterface
     private interface MatchFactory {
         Collection<String> getKeywords();

trunk/src/org/openstreetmap/josm/actions/upload/FixDataHook.java

@@ -60 +60 @@
     /**
      * Common set of commands for data fixing
-     */
+     * @since 10600 (functional interface)
+     */
+    @FunctionalInterface
     public interface FixData {
         /**

trunk/src/org/openstreetmap/josm/actions/upload/UploadHook.java

@@ -4 +4 @@
 import org.openstreetmap.josm.data.APIDataSet;
 
+@FunctionalInterface
 public interface UploadHook {
 

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -181 +181 @@
     /**
      * Listener to preference change events.
-     */
+     * @since 10600 (functional interface)
+     */
+    @FunctionalInterface
     public interface PreferenceChangedListener {
         /**

trunk/src/org/openstreetmap/josm/data/SelectionChangedListener.java

@@ -16 +16 @@
  *
  * @author imi
+ * @since     8 (creation)
+ * @since 10600 (functional interface)
  */
+@FunctionalInterface
 public interface SelectionChangedListener {
 

trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java

@@ -26 +26 @@
      * Interface to notify listeners of the change of the system of measurement.
      * @since 8554
-     */
+     * @since 10600 (functional interface)
+     */
+    @FunctionalInterface
     public interface SoMChangeListener {
         /**

trunk/src/org/openstreetmap/josm/data/cache/ICachedLoaderListener.java

@@ -5 +5 @@
  * Cache loader listener.
  * @since 8168
+ * @since 10600 (functional interface)
  */
+@FunctionalInterface
 public interface ICachedLoaderListener {
 

trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java

@@ -31 +31 @@
      * @author Michael Zangl
      * @since 8742
-     */
+     * @since 10600 (functional interface)
+     */
+    @FunctionalInterface
     public interface KeyValueVisitor {
 

trunk/src/org/openstreetmap/josm/data/osm/ChangesetCacheListener.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
+@FunctionalInterface
 public interface ChangesetCacheListener {
 

trunk/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java

@@ -18 +18 @@
 public class PrimitiveDeepCopy {
 
+    @FunctionalInterface
     public interface PasteBufferChangedListener {
         void pasteBufferChanged(PrimitiveDeepCopy pasteBuffer);

trunk/src/org/openstreetmap/josm/data/osm/event/DataSetListenerAdapter.java

@@ -10 +10 @@
 public class DataSetListenerAdapter implements DataSetListener {
 
+    @FunctionalInterface
     public interface Listener {
         void processDatasetEvent(AbstractDatasetChangedEvent event);

trunk/src/org/openstreetmap/josm/data/osm/history/History.java

@@ -21 +21 @@
 public class History {
 
+    @FunctionalInterface
     private interface FilterPredicate {
         boolean matches(HistoryOsmPrimitive primitive);

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

@@ -7 +7 @@
 /**
  * <p>An object which can render data provided by a {@link DataSet}.</p>
+ * @since  4087 (creation)
+ * @since 10600 (functional interface)
  */
+@FunctionalInterface
 public interface Rendering {
     /**

trunk/src/org/openstreetmap/josm/data/projection/ProjectionChangeListener.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.projection;
 
+@FunctionalInterface
 public interface ProjectionChangeListener {
     void projectionChanged(Projection oldValue, Projection newValue);

trunk/src/org/openstreetmap/josm/data/projection/proj/ICentralMeridianProvider.java

@@ -10 +10 @@
  *
  * @see Proj
+ * @since  9532 (creation)
+ * @since 10600 (functional interface)
  */
+@FunctionalInterface
 public interface ICentralMeridianProvider {
     /**

trunk/src/org/openstreetmap/josm/data/projection/proj/IScaleFactorProvider.java

@@ -10 +10 @@
  *
  * @see Proj
+ * @since  9565 (creation)
+ * @since 10600 (functional interface)
  */
+@FunctionalInterface
 public interface IScaleFactorProvider {
     /**

trunk/src/org/openstreetmap/josm/data/projection/proj/ProjFactory.java

@@ -4 +4 @@
 /**
  * Factory class that provides a Proj instance.
+ * @since  5227 (creation)
+ * @since 10600 (functional interface)
  */
+@FunctionalInterface
 public interface ProjFactory {
+    /**
+     * Creates a Proj instance.
+     * @return a Proj instance
+     */
     Proj createInstance();
 }

trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java

@@ -214 +214 @@
     }
 
+    @FunctionalInterface
     public interface NormalizeRule {
 

trunk/src/org/openstreetmap/josm/gui/FileDrop.java

@@ -437 +437 @@
      * </code>
      */
+    @FunctionalInterface
     public interface Listener {
 
@@ -651 +652 @@
          * @author Robert Harder
          */
+        @FunctionalInterface
         public interface Fetcher {
             /**

trunk/src/org/openstreetmap/josm/gui/MapFrame.java

@@ -719 +719 @@
     /**
      * Interface to notify listeners of the change of the mapMode.
-     */
+     * @since 10600 (functional interface)
+     */
+    @FunctionalInterface
     public interface MapModeChangeListener {
         /**

trunk/src/org/openstreetmap/josm/gui/MapFrameListener.java

@@ -5 +5 @@
  * Listener notified of MapFrame changes.
  * @since 5957
+ * @since 10600 (functional interface)
  */
+@FunctionalInterface
 public interface MapFrameListener {
 

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -131 +131 @@
      */
     @Deprecated
+    @FunctionalInterface
     public interface EditLayerChangeListener {
 
@@ -149 +150 @@
         private boolean ignoreRepaint;
         @Override
-        public void paintablInvalidated(PaintableInvalidationEvent event) {
+        public void paintableInvalidated(PaintableInvalidationEvent event) {
             ignoreRepaint = true;
             repaint();
@@ -1318 +1319 @@
      * This is the only safe method to find changes to the map view, since many components call MapView.repaint() directly.
      * @author Michael Zangl
-     */
+     * @since 10600 (functional interface)
+     */
+    @FunctionalInterface
     public interface RepaintListener {
         /**

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -74 +74 @@
     /**
      * Interface to notify listeners of the change of the zoom area.
-     */
+     * @since 10600 (functional interface)
+     */
+    @FunctionalInterface
     public interface ZoomChangeListener {
         /**

trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java

@@ -45 +45 @@
 public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser {
 
+    @FunctionalInterface
     public interface TileSourceProvider {
         List<TileSource> getTileSources();

trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java

@@ -190 +190 @@
 
     /**
-     * Interface to provide a callback for enabled state update.
-     */
-    protected interface IEnabledStateUpdating {
-        void updateEnabledState();
-    }
-
-    /**
      * Wires updater for enabled state to the events. Also updates dialog title if needed.
      * @param updater updater

trunk/src/org/openstreetmap/josm/gui/dialogs/IEnabledStateUpdating.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.dialogs.layer;
+package org.openstreetmap.josm.gui.dialogs;
 
 /**
  * To be implemented by actions for which their enabled state depends on another model.
+ * @since 10600 (refactoring to new package, functional interface)
  */
+@FunctionalInterface
 public interface IEnabledStateUpdating {
 

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -52 +52 @@
 import org.openstreetmap.josm.gui.dialogs.layer.DeleteLayerAction;
 import org.openstreetmap.josm.gui.dialogs.layer.DuplicateAction;
-import org.openstreetmap.josm.gui.dialogs.layer.IEnabledStateUpdating;
 import org.openstreetmap.josm.gui.dialogs.layer.LayerVisibilityAction;
 import org.openstreetmap.josm.gui.dialogs.layer.MergeAction;

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetAware.java

@@ -7 +7 @@
  * Super interface of changeset-aware components.
  * @since 9493
+ * @since 10600 (functional interface)
  */
+@FunctionalInterface
 public interface ChangesetAware {
 

trunk/src/org/openstreetmap/josm/gui/dialogs/layer/ActivateLayerAction.java

@@ -10 +10 @@
 import javax.swing.AbstractAction;
 
+import org.openstreetmap.josm.gui.dialogs.IEnabledStateUpdating;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel;

trunk/src/org/openstreetmap/josm/gui/dialogs/layer/DeleteLayerAction.java

@@ -12 +12 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.dialogs.IEnabledStateUpdating;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel;
 import org.openstreetmap.josm.gui.help.HelpUtil;

trunk/src/org/openstreetmap/josm/gui/dialogs/layer/DuplicateAction.java

@@ -12 +12 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.dialogs.IEnabledStateUpdating;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel;
 import org.openstreetmap.josm.gui.help.HelpUtil;

trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java

@@ -25 +25 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.SideButton;
+import org.openstreetmap.josm.gui.dialogs.IEnabledStateUpdating;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;

trunk/src/org/openstreetmap/josm/gui/dialogs/layer/MergeAction.java

@@ -12 +12 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.dialogs.IEnabledStateUpdating;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel;
 import org.openstreetmap.josm.gui.help.HelpUtil;

trunk/src/org/openstreetmap/josm/gui/dialogs/layer/MoveDownAction.java

@@ -8 +8 @@
 import javax.swing.AbstractAction;
 
+import org.openstreetmap.josm.gui.dialogs.IEnabledStateUpdating;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel;
 import org.openstreetmap.josm.tools.ImageProvider;

trunk/src/org/openstreetmap/josm/gui/dialogs/layer/MoveUpAction.java

@@ -8 +8 @@
 import javax.swing.AbstractAction;
 
+import org.openstreetmap.josm.gui.dialogs.IEnabledStateUpdating;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel;
 import org.openstreetmap.josm.tools.ImageProvider;

trunk/src/org/openstreetmap/josm/gui/dialogs/layer/ShowHideLayerAction.java

@@ -13 +13 @@
 import javax.swing.JMenuItem;
 
+import org.openstreetmap.josm.gui.dialogs.IEnabledStateUpdating;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel;

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/IMemberModelListener.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.dialogs.relation;
 
+@FunctionalInterface
 public interface IMemberModelListener {
     void makeMemberVisible(int index);

trunk/src/org/openstreetmap/josm/gui/help/Helpful.java

@@ -5 +5 @@
  * Anything on which we can provide help.
  * @since 2252
+ * @since 10600 (functional interface)
  */
+@FunctionalInterface
 public interface Helpful {
 

trunk/src/org/openstreetmap/josm/gui/layer/AbstractMapViewPaintable.java

@@ -91 +91 @@
     public void invalidate() {
         for (PaintableInvalidationListener l : invalidationListeners) {
-            l.paintablInvalidated(new PaintableInvalidationEvent(this));
+            l.paintableInvalidated(new PaintableInvalidationEvent(this));
         }
     }

trunk/src/org/openstreetmap/josm/gui/layer/ImageProcessor.java

@@ -10 +10 @@
  *
  * @author Nipel-Crumple
+ * @since  8625 (creation)
+ * @since 10600 (functional interface)
  */
+@FunctionalInterface
 public interface ImageProcessor {
 

trunk/src/org/openstreetmap/josm/gui/layer/Layer.java

@@ -70 +70 @@
     /**
      * Action related to several layers.
-     */
+     * @since 10600 (functional interface)
+     */
+    @FunctionalInterface
     public interface MultiLayerAction {
 

trunk/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java

@@ -24 +24 @@
      * This listener listens to changes of the active or the edit layer.
      * @author Michael Zangl
-     *
-     */
+     * @since 10600 (functional interface)
+     */
+    @FunctionalInterface
     public interface ActiveLayerChangeListener {
         /**

trunk/src/org/openstreetmap/josm/gui/layer/MapViewPaintable.java

@@ -13 +13 @@
  * <p>
  * That class allows you to listen to paintable change events. Those methods may be moved here some time in the future.
+ * @since   608 (creation)
+ * @since 10600 (functional interface)
  */
+@FunctionalInterface
 public interface MapViewPaintable {
 
@@ -51 +54 @@
      * This is a listener that listens to {@link PaintableInvalidationEvent}s
      * @author Michael Zangl
+     * @since 10600 (functional interface)
      */
+    @FunctionalInterface
     interface PaintableInvalidationListener {
         /**
          * Called whenever a {@link PaintableInvalidationEvent} is fired. This might be called from any thread.
          * @param event The event
+         * @ince 10600 (renamed)
          */
-        void paintablInvalidated(PaintableInvalidationEvent event);
+        void paintableInvalidated(PaintableInvalidationEvent event);
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/NativeScaleLayer.java

@@ -11 +11 @@
  * Represents a layer that has native scales.
  * @author András Kolesár
+ * @since  9818 (creation)
+ * @since 10600 (functional interface)
  */
+@FunctionalInterface
 public interface NativeScaleLayer {
 

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -239 +239 @@
     }
 
+    @FunctionalInterface
     public interface CommandQueueListener {
         void commandChanged(int queueSize, int redoSize);
@@ -245 +246 @@
     /**
      * Listener called when a state of this layer has changed.
-     */
+     * @since 10600 (functional interface)
+     */
+    @FunctionalInterface
     public interface LayerStateChangeListener {
         /**

trunk/src/org/openstreetmap/josm/gui/layer/imagery/ImageryFilterSettings.java

@@ -110 +110 @@
      * A listener that listens to filter changes
      * @author Michael Zangl
+     * @since 10600 (functional interface)
      */
+    @FunctionalInterface
     public interface FilterChangeListener {
         /**

trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileSourceDisplaySettings.java

@@ -317 +317 @@
      * A listener that listens to changes to the {@link TileSourceDisplaySettings} object.
      * @author Michael Zangl
-     */
+     * @since 10600 (functional interface)
+     */
+    @FunctionalInterface
     public interface DisplaySettingsChangeListener {
         /**

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerProducers.java

@@ -14 +14 @@
  *
  * @author Frederik Ramm
+ * @since   200 (creation)
+ * @since 10600 (functional interface)
  */
+@FunctionalInterface
 public interface MarkerProducers {
     /**

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Expression.java

@@ -9 +9 @@
  * Can be evaluated in a certain {@link Environment}. Usually takes
  * parameters, that are also Expressions and have to be evaluated first.
+ * @since  3848 (creation)
+ * @since 10600 (functional interface)
  */
+@FunctionalInterface
 public interface Expression {
     /**

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java

@@ -11 +11 @@
 import org.openstreetmap.josm.gui.mappaint.StyleKeys;
 
+@FunctionalInterface
 public interface Instruction extends StyleKeys {
 

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Subpart.java

@@ -7 +7 @@
 /**
  * A subpart identifies different rendering layers (<code>::subpart</code> syntax).
+ * @since  8086 (creation)
+ * @since 10600 (functional interface)
  */
+@FunctionalInterface
 public interface Subpart {
     String getId(Environment env);

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/BoxTextElement.java

@@ -34 +34 @@
     /**
      * Something that provides us with a {@link BoxProviderResult}
-     */
+     * @since 10600 (functional interface)
+     */
+    @FunctionalInterface
     public interface BoxProvider {
         /**

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceSettingFactory.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.preferences;
 
+@FunctionalInterface
 public interface PreferenceSettingFactory {
 
     PreferenceSetting createPreferenceSetting();
-
 }

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

@@ -182 +182 @@
      * Allows PreferenceSettings to do validation of entered values when ok was pressed.
      * If data is invalid then event can return false to cancel closing of preferences dialog.
-     *
-     */
+     * @since 10600 (functional interface)
+     */
+    @FunctionalInterface
     public interface ValidationListener {
         /**
@@ -302 +303 @@
     }
 
+    @FunctionalInterface
     private interface TabIdentifier {
         boolean identify(TabPreferenceSetting tps, Object param);

trunk/src/org/openstreetmap/josm/gui/preferences/SourceProvider.java

@@ -4 +4 @@
 import java.util.Collection;
 
+@FunctionalInterface
 public interface SourceProvider {
 

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java

@@ -35 +35 @@
     /**
      * A listener notified when the validation status of this panel change.
+     * @since 10600 (functional interface)
      */
+    @FunctionalInterface
     public interface ContentValidationListener {
         /**

trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferenceListener.java

@@ -5 +5 @@
  * Listener called when proxy settings are updated.
  * @since 6525
+ * @since 10600 (functional interface)
  */
+@FunctionalInterface
 public interface ProxyPreferenceListener {
 

trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java

@@ -32 +32 @@
 public interface ProgressMonitor {
 
+    @FunctionalInterface
     public interface CancelListener {
         void operationCanceled();

trunk/src/org/openstreetmap/josm/gui/util/ModifierListener.java

@@ -5 +5 @@
  * Listener called when pressed modifier keys change is detected
  * @since 7217
+ * @since 10600 (functional interface)
  */
+@FunctionalInterface
 public interface ModifierListener {
     void modifiersChanged(int modifiers);

trunk/src/org/openstreetmap/josm/gui/widgets/HistoryChangedListener.java

@@ -4 +4 @@
 import java.util.List;
 
+@FunctionalInterface
 public interface HistoryChangedListener {
     void historyChanged(List<String> history);

trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java

@@ -144 +144 @@
      * @see #setDividerPainter
      */
+    @FunctionalInterface
     public interface DividerPainter {
         /**

trunk/src/org/openstreetmap/josm/io/OsmServerReadPostprocessor.java

@@ -5 +5 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 
+@FunctionalInterface
 public interface OsmServerReadPostprocessor {
 

trunk/src/org/openstreetmap/josm/io/OsmServerWritePostprocessor.java

@@ -7 +7 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 
+@FunctionalInterface
 public interface OsmServerWritePostprocessor {
 

trunk/src/org/openstreetmap/josm/io/auth/CredentialsManager.java

@@ -42 +42 @@
     private static CredentialsAgentFactory agentFactory;
 
+    @FunctionalInterface
     public interface CredentialsAgentFactory {
         CredentialsAgent getCredentialsAgent();

trunk/src/org/openstreetmap/josm/io/session/SessionLayerImporter.java

@@ -13 +13 @@
  * Session layer importer.
  * @since 4668
+ * @since 10600 (functional interface)
  */
+@FunctionalInterface
 public interface SessionLayerImporter {
 

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> {