Remove EventListener plugin

This plugin uses the deprecated Observer/Observable, so remove it.
contiki-ng · Sep 16, 2023 · 07c82a4 · 07c82a4
1 parent b5d0563
commit 07c82a4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 360 deletions.
diff --git a/doc/ChangeLog.md b/doc/ChangeLog.md
@@ -2,6 +2,10 @@
 
 ## Cooja User Interface Changes
 
+### Removed the EventListener plugin
+
+This plugin used the deprecated observable pattern.
+
 ## Cooja Simulation File Changes
 
 ### Expand $(MAKE) in csc files

diff --git a/java/org/contikios/cooja/ExtensionManager.java b/java/org/contikios/cooja/ExtensionManager.java
@@ -44,7 +44,6 @@
 import org.contikios.cooja.plugins.BaseRSSIconf;
 import org.contikios.cooja.plugins.BufferListener;
 import org.contikios.cooja.plugins.DGRMConfigurator;
-import org.contikios.cooja.plugins.EventListener;
 import org.contikios.cooja.plugins.LogListener;
 import org.contikios.cooja.plugins.Mobility;
 import org.contikios.cooja.plugins.MoteInformation;
@@ -79,7 +78,6 @@ public class ExtensionManager {
     registerBuiltinPlugin(MoteInformation.class);
     registerBuiltinPlugin(MoteInterfaceViewer.class);
     registerBuiltinPlugin(VariableWatcher.class);
-    registerBuiltinPlugin(EventListener.class);
     registerBuiltinPlugin(RadioLogger.class);
     registerBuiltinPlugin(ScriptRunner.class);
     registerBuiltinPlugin(Notes.class);

diff --git a/java/org/contikios/cooja/Simulation.java b/java/org/contikios/cooja/Simulation.java
@@ -352,7 +352,8 @@ public Simulation(SimConfig cfg, Cooja cooja, String title, boolean generateSeed
         // Skip plugins that have been removed or merged into other classes.
         if ("org.contikios.cooja.plugins.SimControl".equals(pluginClassName) ||
                 "org.contikios.cooja.plugins.SimInformation".equals(pluginClassName) ||
-                "org.contikios.cooja.plugins.MoteTypeInformation".equals(pluginClassName)) {
+                "org.contikios.cooja.plugins.MoteTypeInformation".equals(pluginClassName) ||
+                "org.contikios.cooja.plugins.EventListener".equals(pluginClassName)) {
           continue;
         }
         // Backwards compatibility: old visualizers were replaced.

diff --git a/java/org/contikios/cooja/plugins/EventListener.java b/java/org/contikios/cooja/plugins/EventListener.java