Implement timePointListeners() for AbstractViewerPanel harmonization

  Replace CopyOnWriteArrayList<TimePointListener> with
  Listeners.SynchronizedList to match BDV's pattern. Deprecate
  addTimePointListener()/removeTimePointListener() in favor of the
  new timePointListeners() method.

  Companion to bigdataviewer/bigdataviewer-core#216

Author: NicoKiaru

pom.xml

@@ -154,6 +154,7 @@
 		<dependency>
 			<groupId>sc.fiji</groupId>
 			<artifactId>bigdataviewer-core</artifactId>
+			<version>10.6.8</version>
 		</dependency>
 		<dependency>
 			<groupId>sc.fiji</groupId>
@@ -182,4 +183,19 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<!-- Use source/target instead of release to allow sun.misc.Unsafe access on JDK 16+ -->
+					<release combine.self="override"/>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>

src/main/java/bvv/core/VolumeViewerPanel.java

@@ -78,7 +78,6 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
-import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.stream.Collectors;
 import javax.swing.DefaultBoundedRangeModel;
 import javax.swing.JSlider;
@@ -241,7 +240,7 @@ protected synchronized RepaintType getAndClear()
 	 * calling {@link #requestRepaint()} so listeners have the chance to
 	 * interfere.
 	 */
-	protected final CopyOnWriteArrayList< TimePointListener > timePointListeners;
+	private final Listeners.List< TimePointListener > timePointListeners;
 
 	/**
 	 * Current animator for viewer transform, or null. This is for example used
@@ -360,7 +359,7 @@ public VolumeViewerPanel(
 			if ( renderData != null )
 				l.transformChanged( renderData.getRenderTransformWorldToScreen() );
 		} );
-		timePointListeners = new CopyOnWriteArrayList<>();
+		timePointListeners = new Listeners.SynchronizedList<>( l -> l.timePointChanged( state.getCurrentTimepoint() ) );
 
 		msgOverlay = options.getMsgOverlay();
 
@@ -656,8 +655,7 @@ else if ( numTimepoints == 1 && sliderVisible )
 					sliderTime.setValue( timepoint );
 				blockSliderTimeEvents = false;
 			} );
-			for ( final TimePointListener l : timePointListeners )
-				l.timePointChanged( timepoint );
+			timePointListeners.list.forEach( l -> l.timePointChanged( timepoint ) );
 			requestRepaint();
 			break;
 		}
@@ -791,6 +789,7 @@ public TransformEventHandler getTransformEventHandler()
 		return transformEventHandler;
 	}
 
+	@Override
 	public ConverterSetups getConverterSetups()
 	{
 		return setups;
@@ -847,50 +846,41 @@ public Listeners< TransformListener< AffineTransform3D > > renderTransformListen
 	}
 
 	/**
-	 * Add a {@link TimePointListener} to notify about time-point
+	 * Add/remove {@link TimePointListener} to notify about time-point
 	 * changes. Listeners will be notified <em>before</em> calling
-	 * {@link #requestRepaint()} so they have the chance to interfere.
-	 *
-	 * @param listener
-	 *            the listener to add.
+	 * {@link #requestRepaint()} so listeners have the chance to interfere.
 	 */
+	@Override
+	public Listeners< TimePointListener > timePointListeners()
+	{
+		return timePointListeners;
+	}
+
+	/**
+	 * @deprecated Use {@code timePointListeners().add( listener )}.
+	 */
+	@Deprecated
 	public void addTimePointListener( final TimePointListener listener )
 	{
-		addTimePointListener( listener, Integer.MAX_VALUE );
+		timePointListeners().add( listener );
 	}
 
 	/**
-	 * Add a {@link TimePointListener} to notify about time-point
-	 * changes. Listeners will be notified <em>before</em> calling
-	 * {@link #requestRepaint()} so they have the chance to interfere.
-	 *
-	 * @param listener
-	 *            the listener to add.
-	 * @param index
-	 *            position in the list of listeners at which to insert this one.
+	 * @deprecated Use {@code timePointListeners().add( index, listener )}.
 	 */
+	@Deprecated
 	public void addTimePointListener( final TimePointListener listener, final int index )
 	{
-		synchronized ( timePointListeners )
-		{
-			final int s = timePointListeners.size();
-			timePointListeners.add( index < 0 ? 0 : index > s ? s : index, listener );
-			listener.timePointChanged( state.getCurrentTimepoint() );
-		}
+		timePointListeners().add( index, listener );
 	}
 
 	/**
-	 * Remove a {@link TimePointListener}.
-	 *
-	 * @param listener
-	 *            the listener to remove.
+	 * @deprecated Use {@code timePointListeners().remove( listener )}.
 	 */
+	@Deprecated
 	public void removeTimePointListener( final TimePointListener listener )
 	{
-		synchronized ( timePointListeners )
-		{
-			timePointListeners.remove( listener );
-		}
+		timePointListeners().remove( listener );
 	}
 
 	private static int getDitherStep( final int ditherWidth )

src/main/java/bvv/vistools/BvvHandle.java

@@ -244,7 +244,7 @@ void remove(
 
 		if ( timepointListeners != null )
 			for ( final TimePointListener l : timepointListeners )
-				viewer.removeTimePointListener( l );
+				viewer.timePointListeners().remove( l );
 
 		if ( viewerStateChangeListeners != null )
 			viewer.state().changeListeners().removeAll( viewerStateChangeListeners );