Fix: #74 - forgot removeConnectivityListener

Author: remikey

CHANGELOG.md

@@ -14,14 +14,18 @@ This file lists modifications introduced by each version.
 
 In order to better match the behavior introduced around `Topology.getOrientation()` in [[issue 49]][issue: #49], the
 following modifications have been applied:
-* `Topology.addConnectivityListener(ConnectivityListener, Orientation)` has been added 
-* `Topology.addConnectivityListener(ConnectivityListener, boolean)` has been marked **deprecated**
-
-  Please use `Topology.addConnectivityListener(ConnectivityListener, Orientation)` instead.
-* `Topology.addConnectivityListener(ConnectivityListener)`'s behavior is changed
-
-  It now takes `Topology.getOrientation()` into account when registering a new listener.
-  Previously, it always registered to undirected events.
+* `Topology.addConnectivityListener(ConnectivityListener, Orientation)` and 
+`Topology.removeConnectivityListener(ConnectivityListener, Orientation)` have been added 
+* `Topology.addConnectivityListener(ConnectivityListener, boolean)` and 
+`Topology.removeConnectivityListener(ConnectivityListener, boolean)` have been marked **deprecated**
+
+  Please use `Topology.addConnectivityListener(ConnectivityListener, Orientation)` and
+   `Topology.removeConnectivityListener(ConnectivityListener, Orientation)` instead.
+* `Topology.addConnectivityListener(ConnectivityListener)` and 
+`Topology.removeConnectivityListener(ConnectivityListener)`'s behaviors are changed
+
+  They now takes `Topology.getOrientation()` into account when registering/unregistering a listener.
+  Previously, it always worked on undirected events.
 
 [issue: #74]: https://github.com/jbotsim/JBotSim/issues/74
 

lib/jbotsim-core/src/main/java/io/jbotsim/core/Topology.java

@@ -859,11 +859,11 @@ public void addConnectivityListener(ConnectivityListener listener) {
      * @param listener The listener to register.
      * @param directed The orientation of links to be listened, as a boolean (<code>true</code> for
      *                 directed, <code>false</code> for undirected).
-     * @deprecated use {@link Topology#addConnectivityListener(ConnectivityListener, Orientation)} instead.
+     * @deprecated use {@link #addConnectivityListener(ConnectivityListener, Link.Orientation)} instead.
      */
     @Deprecated
     public void addConnectivityListener(ConnectivityListener listener, boolean directed) {
-        addConnectivityListener(listener, isDirected());
+        addConnectivityListener(listener, directed?Orientation.DIRECTED:Orientation.UNDIRECTED);
     }
 
     /**
@@ -882,25 +882,41 @@ public void addConnectivityListener(ConnectivityListener listener, Orientation o
     }
 
     /**
-     * Unregisters the specified connectivity listener from the 'undirected'
-     * listeners.
+     * <p>Unregisters the specified connectivity listener according to the orientation of the topology.</p>
+     *
+     * <p>The listener will be removed from the list of listeners, according to the current orientation of the topology.</p>
      *
      * @param listener The listener to unregister.
+     * @see #getOrientation()
      */
     public void removeConnectivityListener(ConnectivityListener listener) {
-        removeConnectivityListener(listener, false);
+        removeConnectivityListener(listener, getOrientation());
     }
 
     /**
-     * Unregisters the specified connectivity listener from the listeners
-     * of the specified type.
+     * <p>Unregisters the specified connectivity listener from the listeners
+     * of the specified orientation.</p>
      *
      * @param listener The listener to unregister.
-     * @param directed The type of links that this listener was listening
+     * @param directed The orientation of links that this listener was listening
      *                 (<code>true</code> for directed, <code>false</code> for undirected).
+     * @deprecated use {@link #removeConnectivityListener(ConnectivityListener, Link.Orientation)} instead.
      */
+    @Deprecated
     public void removeConnectivityListener(ConnectivityListener listener, boolean directed) {
-        if (directed)
+        removeConnectivityListener(listener,  directed?Orientation.DIRECTED:Orientation.UNDIRECTED);
+    }
+
+
+    /**
+     * <p>Unregisters the specified connectivity listener from the listeners
+     * of the specified orientation.</p>
+     *
+     * @param listener The listener to unregister.
+     * @param orientation The orientation of links that this listener was listening, as an {@link Orientation}.
+     */
+    public void removeConnectivityListener(ConnectivityListener listener, Orientation orientation) {
+        if (orientation == Orientation.DIRECTED)
             cxDirectedListeners.remove(listener);
         else
             cxUndirectedListeners.remove(listener);