[INTERNAL] #399 Adds default methods to ActivityReceiver

Making AbstractActivityReceiver obsolete.

Author: srossbach

core/src/saros/activities/AbstractActivityReceiver.java

@@ -19,39 +19,75 @@ public interface IActivityReceiver {
    */
 
   /** */
-  void receive(ChangeColorActivity changeColorActivity);
+  default void receive(ChangeColorActivity changeColorActivity) {
+    /*NOP*/
+  }
 
-  void receive(ChecksumActivity checksumActivity);
+  default void receive(ChecksumActivity checksumActivity) {
+    /*NOP*/
+  }
 
-  void receive(ChecksumErrorActivity checksumErrorActivity);
+  default void receive(ChecksumErrorActivity checksumErrorActivity) {
+    /*NOP*/
+  }
 
-  void receive(EditorActivity editorActivity);
+  default void receive(EditorActivity editorActivity) {
+    /*NOP*/
+  }
 
-  void receive(FileActivity fileActivity);
+  default void receive(FileActivity fileActivity) {
+    /*NOP*/
+  }
 
-  void receive(FolderCreatedActivity folderCreatedActivity);
+  default void receive(FolderCreatedActivity folderCreatedActivity) {
+    /*NOP*/
+  }
 
-  void receive(FolderDeletedActivity folderDeletedActivity);
+  default void receive(FolderDeletedActivity folderDeletedActivity) {
+    /*NOP*/
+  }
 
-  void receive(FolderMovedActivity folderMovedActivity);
+  default void receive(FolderMovedActivity folderMovedActivity) {
+    /*NOP*/
+  }
 
-  void receive(JupiterActivity jupiterActivity);
+  default void receive(JupiterActivity jupiterActivity) {
+    /*NOP*/
+  }
 
-  void receive(NOPActivity nopActivity);
+  default void receive(NOPActivity nopActivity) {
+    /*NOP*/
+  }
 
-  void receive(PermissionActivity permissionActivity);
+  default void receive(PermissionActivity permissionActivity) {
+    /*NOP*/
+  }
 
-  void receive(ProgressActivity progressActivity);
+  default void receive(ProgressActivity progressActivity) {
+    /*NOP*/
+  }
 
-  void receive(StartFollowingActivity startFollowingActivity);
+  default void receive(StartFollowingActivity startFollowingActivity) {
+    /*NOP*/
+  }
 
-  void receive(StopActivity stopActivity);
+  default void receive(StopActivity stopActivity) {
+    /*NOP*/
+  }
 
-  void receive(StopFollowingActivity stopFollowingActivity);
+  default void receive(StopFollowingActivity stopFollowingActivity) {
+    /*NOP*/
+  }
 
-  void receive(TextEditActivity textEditActivity);
+  default void receive(TextEditActivity textEditActivity) {
+    /*NOP*/
+  }
 
-  void receive(TextSelectionActivity textSelectionActivity);
+  default void receive(TextSelectionActivity textSelectionActivity) {
+    /*NOP*/
+  }
 
-  void receive(ViewportActivity viewportActivity);
+  default void receive(ViewportActivity viewportActivity) {
+    /*NOP*/
+  }
 }

core/src/saros/activities/IActivityReceiver.java

@@ -103,7 +103,7 @@ public int getSequenceNumber() {
   }
 
   /**
-   * @JTourBusStop 5, Creating a new Activity type, XStream registration:
+   * @JTourBusStop 4, Creating a new Activity type, XStream registration:
    *
    * <p>We use the XStream library to convert handy Java objects to easy-to-send XML string and vice
    * versa. To beautify this XML output, we make use of annotations (such as XStreamAlias or

core/src/saros/communication/extensions/ActivitiesExtension.java

@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.log4j.Logger;
-import saros.activities.AbstractActivityReceiver;
 import saros.activities.ChecksumActivity;
 import saros.activities.FileActivity;
 import saros.activities.IActivity;
@@ -126,7 +125,7 @@ private IActivity receiveChecksum(ChecksumActivity activity) {
 
   /** Used to remove JupiterClientDocuments for deleted files */
   private final IActivityReceiver clientReceiver =
-      new AbstractActivityReceiver() {
+      new IActivityReceiver() {
         @Override
         public void receive(FileActivity fileActivity) {
           if (fileActivity.getType() == FileActivity.Type.REMOVED) {

core/src/saros/concurrent/management/ConcurrentDocumentClient.java

@@ -5,7 +5,6 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import org.apache.log4j.Logger;
-import saros.activities.AbstractActivityReceiver;
 import saros.activities.ChecksumActivity;
 import saros.activities.FileActivity;
 import saros.activities.IActivity;
@@ -77,7 +76,7 @@ public void checkFileDeleted(final IActivity activity) {
   }
 
   private final IActivityReceiver hostReceiver =
-      new AbstractActivityReceiver() {
+      new IActivityReceiver() {
         @Override
         public void receive(final FileActivity activity) {
           if (activity.getType() == FileActivity.Type.REMOVED) {

core/src/saros/concurrent/management/ConcurrentDocumentServer.java

@@ -1,6 +1,5 @@
 package saros.session;
 
-import saros.activities.AbstractActivityReceiver;
 import saros.activities.IActivity;
 import saros.activities.IActivityReceiver;
 import saros.activities.TextSelectionActivity;
@@ -54,8 +53,7 @@
  * };
  * </pre>
  */
-public abstract class AbstractActivityConsumer extends AbstractActivityReceiver
-    implements IActivityConsumer {
+public abstract class AbstractActivityConsumer implements IActivityReceiver, IActivityConsumer {
 
   /**
    * @JTourBusStop 11, Activity sending, The second dispatch:

core/src/saros/session/AbstractActivityConsumer.java

@@ -52,7 +52,7 @@ public class ChangeColorManager extends AbstractActivityProducer implements Star
   private final Map<Integer, Integer> usedColorIDs = new HashMap<Integer, Integer>();
 
   /**
-   * @JTourBusStop 7, Creating a new Activity type, Waiting for incoming activities:
+   * @JTourBusStop 6, Creating a new Activity type, Waiting for incoming activities:
    *
    * <p>All you have to do on the receiver's side, is to create a new IActivityReceiver (or amend an
    * existing one), provide it with an receive() method of your newly created flavor, and react on
@@ -144,7 +144,7 @@ public synchronized void start() {
       }
     }
     /**
-     * @JTourBusStop 8, Creating a new Activity type, Arming your consumer:
+     * @JTourBusStop 7, Creating a new Activity type, Arming your consumer:
      *
      * <p>To ensure your newly created consumer actually receives incoming activities, you need to
      * register it on the session. That's it :)
@@ -179,7 +179,7 @@ public synchronized Set<Integer> getUsedColorIDs() {
   public void changeColorID(int colorID) {
 
     /**
-     * @JTourBusStop 6, Creating a new Activity type, Create activity instances of your new type:
+     * @JTourBusStop 5, Creating a new Activity type, Create activity instances of your new type:
      *
      * <p>Now you are prepared to make use of your new activity type: Find a place in the business
      * logic where to react on the events you want to send as an Activity to the other session