Changeset 10599 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2016-07-23T02:08:50+02:00 (7 years ago)

Author:

Don-vip

Message:

see #11390 - sonar - squid:S1610 - Java 8: Abstract classes without fields should be converted to interfaces

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• Command.java (modified) (1 diff)
• PseudoCommand.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/command/Command.java

@@ -37 +37 @@
  *
  * @author imi
+ * @since 21 (creation)
+ * @since 10599 (signature)
  */
-public abstract class Command extends PseudoCommand {
+public abstract class Command implements PseudoCommand {
 
     private static final class CloneVisitor extends AbstractVisitor {

trunk/src/org/openstreetmap/josm/command/PseudoCommand.java

@@ -12 +12 @@
  * as subcommand of real commands but it is just an empty shell and can not be
  * executed or undone.
+ * @since  3262 (creation)
+ * @since 10599 (functional interface)
  */
-public abstract class PseudoCommand {
+public interface PseudoCommand {
 
     /**
@@ -19 +21 @@
      * @return description text representing this command
      */
-    public abstract String getDescriptionText();
+    String getDescriptionText();
 
     /**
@@ -25 +27 @@
      * @return descriptive icon of this command
      */
-    public Icon getDescriptionIcon() {
+    default Icon getDescriptionIcon() {
         return null;
     }
@@ -33 +35 @@
      * @return primitives that take part in this command
      */
-    public abstract Collection<? extends OsmPrimitive> getParticipatingPrimitives();
+    Collection<? extends OsmPrimitive> getParticipatingPrimitives();
 
     /**
@@ -40 +42 @@
      * @return the subcommands, null if there are no child commands
      */
-    public Collection<PseudoCommand> getChildren() {
+    default Collection<PseudoCommand> getChildren() {
         return null;
     }