1.1 --- a/src/main/java/nl/grauw/gaia_tool/Library.java	Sun Oct 09 20:19:55 2011 +0200
     1.2 +++ b/src/main/java/nl/grauw/gaia_tool/Library.java	Sun Oct 09 20:35:10 2011 +0200
     1.3 @@ -18,15 +18,15 @@
     1.4  import java.io.File;
     1.5  import java.io.FileFilter;
     1.6  import java.io.IOException;
     1.7 +import java.util.ArrayList;
     1.8  import java.util.List;
     1.9 -import java.util.Vector;
    1.10  
    1.11  import nl.grauw.gaia_tool.mvc.Observable;
    1.12  
    1.13  public class Library extends Observable {
    1.14  	
    1.15 -	private List<FilePatch> patches = new Vector<FilePatch>();
    1.16 -	private List<Library> libraries = new Vector<Library>();
    1.17 +	private List<FilePatch> patches = new ArrayList<FilePatch>();
    1.18 +	private List<Library> libraries = new ArrayList<Library>();
    1.19  	private File source;
    1.20  	
    1.21  	public Library(File source) {

     2.1 --- a/src/main/java/nl/grauw/gaia_tool/mvc/Observable.java	Sun Oct 09 20:19:55 2011 +0200
     2.2 +++ b/src/main/java/nl/grauw/gaia_tool/mvc/Observable.java	Sun Oct 09 20:35:10 2011 +0200
     2.3 @@ -16,6 +16,8 @@
     2.4  package nl.grauw.gaia_tool.mvc;
     2.5  
     2.6  import java.lang.ref.WeakReference;
     2.7 +import java.util.ArrayList;
     2.8 +import java.util.List;
     2.9  import java.util.Vector;
    2.10  
    2.11  import javax.swing.JComponent;
    2.12 @@ -56,7 +58,7 @@
    2.13  	public void addObserver(AWTObserver observer) {
    2.14  		if (awtObservers.size() > lastGCLimit) {
    2.15  			System.gc();
    2.16 -			Vector<AWTObserver> observers = getAWTObservers();	// clean up the no longer available weak references
    2.17 +			List<AWTObserver> observers = getAWTObservers();	// clean up the no longer available weak references
    2.18  			lastGCLimit = observers.size() + 100;
    2.19  			System.out.println("Observer limit exceeded. Size after manual garbage collection: " + observers.size());
    2.20  		}
    2.21 @@ -126,7 +128,7 @@
    2.22  	 * @param detail Object providing details on the state change.
    2.23  	 */
    2.24  	protected void notifyObservers(Object detail) {
    2.25 -		Vector<Observer> observers = new Vector<Observer>(this.observers);
    2.26 +		Iterable<Observer> observers = new ArrayList<Observer>(this.observers);
    2.27  		for (Observer o : observers) {
    2.28  			o.update(this, detail);
    2.29  		}
    2.30 @@ -161,8 +163,8 @@
    2.31  	 * 
    2.32  	 * @return The observers registered on this object.
    2.33  	 */
    2.34 -	protected Vector<AWTObserver> getAWTObservers() {
    2.35 -		Vector<AWTObserver> observersCopy = new Vector<AWTObserver>(awtObservers.size());
    2.36 +	protected List<AWTObserver> getAWTObservers() {
    2.37 +		List<AWTObserver> observersCopy = new ArrayList<AWTObserver>(awtObservers.size());
    2.38  		for (int i = 0, len = awtObservers.size(); i < len; i++) {
    2.39  			WeakReference<AWTObserver> wro = awtObservers.get(i);
    2.40  			AWTObserver observer = wro.get();

     3.1 --- a/src/main/java/nl/grauw/gaia_tool/views/MIDIDeviceSelector.java	Sun Oct 09 20:19:55 2011 +0200
     3.2 +++ b/src/main/java/nl/grauw/gaia_tool/views/MIDIDeviceSelector.java	Sun Oct 09 20:35:10 2011 +0200
     3.3 @@ -16,7 +16,8 @@
     3.4  package nl.grauw.gaia_tool.views;
     3.5  
     3.6  import java.awt.Component;
     3.7 -import java.util.Vector;
     3.8 +import java.util.ArrayList;
     3.9 +import java.util.List;
    3.10  
    3.11  import javax.sound.midi.MidiDevice;
    3.12  import javax.sound.midi.MidiSystem;
    3.13 @@ -56,7 +57,7 @@
    3.14  	}
    3.15  	
    3.16  	private void selectMIDIInputDevice() {
    3.17 -		Vector<Object> inputDevices = new Vector<Object>();
    3.18 +		List<Object> inputDevices = new ArrayList<Object>();
    3.19  		inputDevices.add(AUTODETECT);
    3.20  		for (MidiDevice.Info mdi : MidiSystem.getMidiDeviceInfo()) {
    3.21  			try {
    3.22 @@ -81,7 +82,7 @@
    3.23  	}
    3.24  	
    3.25  	private void selectMIDIOutputDevice() {
    3.26 -		Vector<Object> outputDevices = new Vector<Object>();
    3.27 +		List<Object> outputDevices = new ArrayList<Object>();
    3.28  		outputDevices.add(AUTODETECT);
    3.29  		for (MidiDevice.Info mdi : MidiSystem.getMidiDeviceInfo()) {
    3.30  			try {

     4.1 --- a/src/test/java/nl/grauw/gaia_tool/mvc/ObservableTest.java	Sun Oct 09 20:19:55 2011 +0200
     4.2 +++ b/src/test/java/nl/grauw/gaia_tool/mvc/ObservableTest.java	Sun Oct 09 20:35:10 2011 +0200
     4.3 @@ -17,7 +17,7 @@
     4.4  
     4.5  import static org.junit.Assert.*;
     4.6  
     4.7 -import java.util.Vector;
     4.8 +import java.util.List;
     4.9  
    4.10  import javax.swing.JPanel;
    4.11  
    4.12 @@ -67,7 +67,7 @@
    4.13  	}
    4.14  	
    4.15  	public class TestObservable extends Observable {
    4.16 -		public Vector<AWTObserver> getAWTObservers() {
    4.17 +		public List<AWTObserver> getAWTObservers() {
    4.18  			return super.getAWTObservers();
    4.19  		}
    4.20  	}