Merge branch 'copy-on-write'

Use CopyOnWriteArrayList to simplify mutable list fields.

Author: ctrueden

src/main/java/org/scijava/console/DefaultConsoleService.java

@@ -37,6 +37,7 @@
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.scijava.Context;
 import org.scijava.console.OutputEvent.Source;
@@ -69,9 +70,7 @@ public class DefaultConsoleService extends
 	private OutputStreamReporter out, err;
 
 	/** List of listeners for {@code stdout} and {@code stderr} output. */
-	private ArrayList<OutputListener> listeners;
-
-	private OutputListener[] cachedListeners;
+	private List<OutputListener> listeners;
 
 	// -- ConsoleService methods --
 
@@ -116,26 +115,19 @@ public void processArgs(final String... args) {
 	@Override
 	public void addOutputListener(final OutputListener l) {
 		if (listeners == null) initListeners();
-		synchronized (listeners) {
-			listeners.add(l);
-			cacheListeners();
-		}
+		listeners.add(l);
 	}
 
 	@Override
 	public void removeOutputListener(final OutputListener l) {
 		if (listeners == null) initListeners();
-		synchronized (listeners) {
-			listeners.remove(l);
-			cacheListeners();
-		}
+		listeners.remove(l);
 	}
 
 	@Override
 	public void notifyListeners(final OutputEvent event) {
 		if (listeners == null) initListeners();
-		final OutputListener[] toNotify = cachedListeners;
-		for (final OutputListener l : toNotify)
+		for (final OutputListener l : listeners)
 			l.outputOccurred(event);
 	}
 
@@ -163,16 +155,11 @@ private synchronized void initListeners() {
 		err = new OutputStreamReporter(Source.STDERR);
 		syserr.getParent().addOutputStream(err);
 
-		listeners = new ArrayList<>();
-		cachedListeners = listeners.toArray(new OutputListener[0]);
+		listeners = new CopyOnWriteArrayList<>();
 	}
 
 	// -- Helper methods --
 
-	private void cacheListeners() {
-		cachedListeners = listeners.toArray(new OutputListener[listeners.size()]);
-	}
-
 	private MultiPrintStream multiPrintStream(final PrintStream ps) {
 		if (ps instanceof MultiPrintStream) return (MultiPrintStream) ps;
 		return new MultiPrintStream(ps);

src/main/java/org/scijava/console/MultiOutputStream.java

@@ -35,6 +35,8 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * A {@code MultiOutputStream} is a collection of constituent
@@ -49,81 +51,59 @@
  */
 public class MultiOutputStream extends OutputStream {
 
-	private final ArrayList<OutputStream> streams;
-
-	private OutputStream[] cachedStreams;
+	private final List<OutputStream> streams;
 
 	/**
 	 * Forwards output to a list of output streams.
 	 *
 	 * @param os Output streams which will receive this stream's output.
 	 */
 	public MultiOutputStream(final OutputStream... os) {
-		streams = new ArrayList<>(os.length);
-		for (int i = 0; i < os.length; i++) {
-			streams.add(os[i]);
-		}
-		cacheStreams();
+		streams = new CopyOnWriteArrayList<>(os);
 	}
 
 	// -- MultiOutputStream methods --
 
 	/** Adds an output stream to those receiving this stream's output. */
 	public void addOutputStream(final OutputStream os) {
-		synchronized (streams) {
-			streams.add(os);
-			cacheStreams();
-		}
+		streams.add(os);
 	}
 
 	/** Removes an output stream from those receiving this stream's output. */
 	public void removeOutputStream(final OutputStream os) {
-		synchronized (streams) {
-			streams.remove(os);
-			cacheStreams();
-		}
+		streams.remove(os);
 	}
 
 	// -- OutputStream methods --
 
 	@Override
 	public void write(final int b) throws IOException {
-		final OutputStream[] toWrite = cachedStreams;
-		for (final OutputStream stream : toWrite)
+		for (final OutputStream stream : streams)
 			stream.write(b);
 	}
 
 	@Override
 	public void write(final byte[] buf, final int off, final int len)
 		throws IOException
 	{
-		final OutputStream[] toWrite = cachedStreams;
-		for (final OutputStream stream : toWrite)
+		for (final OutputStream stream : streams)
 			stream.write(buf, off, len);
 	}
 
 	// -- Closeable methods --
 
 	@Override
 	public void close() throws IOException {
-		final OutputStream[] toClose = cachedStreams;
-		for (final OutputStream stream : toClose)
+		for (final OutputStream stream : streams)
 			stream.close();
 	}
 
 	// -- Flushable methods --
 
 	@Override
 	public void flush() throws IOException {
-		final OutputStream[] toFlush = cachedStreams;
-		for (final OutputStream stream : toFlush)
+		for (final OutputStream stream : streams)
 			stream.flush();
 	}
 
-	// -- Helper methods --
-
-	private void cacheStreams() {
-		cachedStreams = streams.toArray(new OutputStream[streams.size()]);
-	}
-
 }