Update a whole bunch of things

Yeah... not a great commit message. t.b.h, I could maybe've split the
commit into more parts; but that would be quite a lot off effort and
would have a pretty decent chance of at least one of the commits leaving
the repository in a non-working state.

For the future, will want to try and commit more often so there aren't
these mega-commits where it's just "a whole bunch of stuff changed"

85 files changed, 3586 insertions, 640 deletions

diff --git a/projects/net.wotonomy.all/pom.xml b/projects/net.wotonomy.all/pom.xml
index f16e5ff..002ea02 100644
--- a/projects/net.wotonomy.all/pom.xml
+++ b/projects/net.wotonomy.all/pom.xml
@@ -18,6 +18,10 @@
 		<module>../net.wotonomy.web</module>
 		<module>../net.wotonomy.test</module>
 	</modules>
+	
+	<properties>
+		<maven.compiler.release>11</maven.compiler.release>
+	</properties>
 	<ciManagement>
 		<system>continuum</system>
 	</ciManagement>
diff --git a/projects/net.wotonomy.datastore/pom.xml b/projects/net.wotonomy.datastore/pom.xml
index 1955d17..7dfad9e 100644
--- a/projects/net.wotonomy.datastore/pom.xml
+++ b/projects/net.wotonomy.datastore/pom.xml
@@ -22,6 +22,19 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+	
+		<properties>
+		<maven.compiler.release>11</maven.compiler.release>
+	</properties>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.13.0</version>
+			</plugin>
+		</plugins>
+	</build>
 	<reporting>
 		<plugins>
 			<plugin>
diff --git a/projects/net.wotonomy.datastore/src/main/java/net/wotonomy/datastore/DataSoup.java b/projects/net.wotonomy.datastore/src/main/java/net/wotonomy/datastore/DataSoup.java
index c7523b3..d599e9d 100644
--- a/projects/net.wotonomy.datastore/src/main/java/net/wotonomy/datastore/DataSoup.java
+++ b/projects/net.wotonomy.datastore/src/main/java/net/wotonomy/datastore/DataSoup.java
@@ -93,7 +93,7 @@ public interface DataSoup {
 	 * 
 	 * @return A collection of all indices in this soup.
 	 */
-	public Collection getAllIndices();
+	public Collection<String> getAllIndices();
 
 	// relationship management
 
@@ -181,7 +181,7 @@ public interface DataSoup {
 	 * @return A DataView containing the objects for the corresponding keys, in the
 	 *         order in which the keys are returned from the collection.
 	 */
-	public DataView queryByKeys(Collection aKeyList);
+	public DataView queryByKeys(Collection<String> aKeyList);
 
 	/**
 	 * As queryByIndex, but with objects returned in reverse order.
diff --git a/projects/net.wotonomy.datastore/src/main/java/net/wotonomy/datastore/XMLFileSoup.java b/projects/net.wotonomy.datastore/src/main/java/net/wotonomy/datastore/XMLFileSoup.java
index cb22f7a..a6564f6 100644
--- a/projects/net.wotonomy.datastore/src/main/java/net/wotonomy/datastore/XMLFileSoup.java
+++ b/projects/net.wotonomy.datastore/src/main/java/net/wotonomy/datastore/XMLFileSoup.java
@@ -27,6 +27,11 @@ import java.net.MalformedURLException;
 import net.wotonomy.web.xml.XMLRPCDecoder;
 import net.wotonomy.web.xml.XMLRPCEncoder;
 
+/**
+ * An implementation of FileSoup for an XML file
+ * @author bjculkin
+ *
+ */
 public class XMLFileSoup extends FileSoup {
 	public XMLFileSoup(String aPath) {
 		super(aPath);
@@ -34,8 +39,8 @@ public class XMLFileSoup extends FileSoup {
 
 	// file access methods
 
+	@Override
 	protected boolean writeFile(String name, Object anObject) {
-//System.out.print( "writeFile: " + name + "..." );        
 		try {
 			File f = new File(getHomeDirectory(), name);
 			FileOutputStream fos = new FileOutputStream(f);
@@ -47,29 +52,28 @@ public class XMLFileSoup extends FileSoup {
 			System.err.println("XMLFileSoup.writeFile: " + exc);
 			return false;
 		}
-//System.out.println( "done." );        
 		return true;
 	}
 
+	@Override
 	protected Object readFile(String name) {
-//System.out.print( "readFile: " + name + "..." );        
 		Object result = null;
 
 		try {
 			File f = new File(getHomeDirectory(), name);
 			FileInputStream fis = new FileInputStream(f);
 			XMLRPCDecoder decoder = new XMLRPCDecoder();
-			result = decoder.decode(fis, f.getAbsolutePath(), f.toURL());
+			result = decoder.decode(fis, f.getAbsolutePath(), f.toURI().toURL());
 			fis.close();
 		} catch (MalformedURLException exc) {
 			result = null;
 		} catch (IOException exc) {
 			result = null;
 		}
-//System.out.println( "done." );        
 		return result;
 	}
 
+	@Override
 	protected boolean deleteFile(String name) {
 		try {
 			File f = new File(getHomeDirectory(), name);
diff --git a/projects/net.wotonomy.foundation/pom.xml b/projects/net.wotonomy.foundation/pom.xml
index a4ca4f9..edb26be 100644
--- a/projects/net.wotonomy.foundation/pom.xml
+++ b/projects/net.wotonomy.foundation/pom.xml
@@ -27,6 +27,18 @@
 			<version>2.6.7</version>
 		</dependency>
 	</dependencies>
+	<properties>
+		<maven.compiler.release>11</maven.compiler.release>
+	</properties>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.13.0</version>
+			</plugin>
+		</plugins>
+	</build>
 	<reporting>
 		<plugins>
 			<plugin>
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSArray.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSArray.java
index 175c3a1..3b75868 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSArray.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSArray.java
@@ -41,13 +41,13 @@ import java.util.ListIterator;
  * @author $Author: cgruber $
  * @version $Revision: 929 $
  */
-public class NSArray implements List<Object>, Serializable {
+public class NSArray<T> implements List<T>, Serializable {
 	private static final long serialVersionUID = 3640615326084287961L;
 
 	/**
 	 * Actual list that backs this instance.
 	 */
-	List<Object> list;
+	List<T> list;
 
 	/**
 	 * Return value when array index is not found.
@@ -57,15 +57,15 @@ public class NSArray implements List<Object>, Serializable {
 	/**
 	 * A constant representing an empty array.
 	 */
-	public static final NSArray EmptyArray = new NSArray();
+	public static final NSArray<?> EmptyArray = new NSArray<>();
 
 	/**
 	 * Returns an NSArray backed by the specified List. This is useful to "protect"
 	 * an internal representation that is returned by a method of return type
 	 * NSArray.
 	 */
-	public static NSArray arrayBackedByList(List<Object> aList) {
-		return new NSArray(aList, null);
+	public static <T> NSArray<T> arrayBackedByList(List<T> aList) {
+		return new NSArray<>(aList, null);
 	}
 
 	/**
@@ -82,7 +82,7 @@ public class NSArray implements List<Object>, Serializable {
 	 * @param ignored This parameter is entirely ignored, and is only there to
 	 *                distinguish the API.
 	 */
-	NSArray(List<Object> aList, Object ignored) // differentiates
+	NSArray(List<T> aList, Object ignored) // differentiates
 	{
 		list = aList;
 	}
@@ -104,7 +104,7 @@ public class NSArray implements List<Object>, Serializable {
 	/**
 	 * Produces an array containing only the specified object.
 	 */
-	public NSArray(Object anObject) {
+	public NSArray(T anObject) {
 		this();
 		list.add(anObject);
 	}
@@ -112,7 +112,7 @@ public class NSArray implements List<Object>, Serializable {
 	/**
 	 * Produces an array containing the specified objects.
 	 */
-	public NSArray(Object[] anArray) {
+	public NSArray(T[] anArray) {
 		this();
 		for (int i = 0; i < anArray.length; i++) {
 			list.add(anArray[i]);
@@ -122,9 +122,9 @@ public class NSArray implements List<Object>, Serializable {
 	/**
 	 * Produces an array containing the objects in the specified collection.
 	 */
-	public NSArray(Collection<Object> aCollection) {
+	public NSArray(Collection<T> aCollection) {
 		this();
-		Iterator i = aCollection.iterator();
+		Iterator<T> i = aCollection.iterator();
 		while (i.hasNext())
 			list.add(i.next());
 	}
@@ -140,8 +140,8 @@ public class NSArray implements List<Object>, Serializable {
 	 * Returns an array containing all objects in this array plus the specified
 	 * object.
 	 */
-	public NSArray arrayByAddingObject(Object anObject) {
-		NSArray result = new NSArray(this);
+	public NSArray<T> arrayByAddingObject(T anObject) {
+		NSArray<T> result = new NSArray<>(this);
 		result.protectedAdd(anObject);
 		return result;
 	}
@@ -150,8 +150,8 @@ public class NSArray implements List<Object>, Serializable {
 	 * Returns an array containing all objects in this array plus all objects in the
 	 * specified list.
 	 */
-	public NSArray arrayByAddingObjectsFromArray(Collection aCollection) {
-		NSArray result = new NSArray(this);
+	public NSArray<T> arrayByAddingObjectsFromArray(Collection<T> aCollection) {
+		NSArray<T> result = new NSArray<>(this);
 		result.protectedAddAll(aCollection);
 		return result;
 	}
@@ -163,7 +163,7 @@ public class NSArray implements List<Object>, Serializable {
 	 */
 	public String componentsJoinedByString(String separator) {
 		StringBuffer buf = new StringBuffer();
-		Iterator it = list.iterator();
+		Iterator<T> it = list.iterator();
 		if (it.hasNext()) {
 			buf.append(it.next().toString());
 		}
@@ -177,7 +177,7 @@ public class NSArray implements List<Object>, Serializable {
 	/**
 	 * Returns whether an equivalent object is contained in this array.
 	 */
-	public boolean containsObject(Object anObject) {
+	public boolean containsObject(T anObject) {
 		return list.contains(anObject);
 	}
 
@@ -185,12 +185,12 @@ public class NSArray implements List<Object>, Serializable {
 	 * Returns the first object in this array that is equivalent to an object in the
 	 * specified list, or null if no objects are in common.
 	 */
-	public Object firstObjectCommonWithArray(Collection aCollection) {
+	public T firstObjectCommonWithArray(Collection<T> aCollection) {
 		if (aCollection == null)
 			return null;
 
-		Object o;
-		Iterator it = list.iterator();
+		T o;
+		Iterator<T> it = list.iterator();
 		while (it.hasNext()) {
 			o = it.next();
 			if (aCollection.contains(o))
@@ -203,14 +203,14 @@ public class NSArray implements List<Object>, Serializable {
 	 * Returns whether the specified list contains elements equivalent to those in
 	 * this array in the same order.
 	 */
-	public boolean isEqualToArray(List aList) {
+	public boolean isEqualToArray(List<T> aList) {
 		return list.equals(aList);
 	}
 
 	/**
 	 * Returns the last object in this array, or null if the array is empty.
 	 */
-	public Object lastObject() {
+	public T lastObject() {
 		int i;
 		if ((i = list.size()) == 0)
 			return null;
@@ -228,9 +228,9 @@ public class NSArray implements List<Object>, Serializable {
 	 * Returns an array comprised of only those elements whose indices fall within
 	 * the specified range.
 	 */
-	public NSArray subarrayWithRange(NSRange aRange) {
+	public NSArray<T> subarrayWithRange(NSRange aRange) {
 		// TODO: Test this logic.
-		NSArray result = new NSArray();
+		NSArray<T> result = new NSArray<>();
 		if (aRange == null)
 			return result;
 
@@ -246,16 +246,18 @@ public class NSArray implements List<Object>, Serializable {
 	/**
 	 * Returns an enumeration over the the elements of the array.
 	 */
-	public Enumeration objectEnumerator() {
+	public Enumeration<T> objectEnumerator() {
 		// TODO: Test this logic.
-		return new Enumeration() {
-			Iterator it = NSArray.this.iterator();
+		return new Enumeration<>() {
+			Iterator<T> it = NSArray.this.iterator();
 
+			@Override
 			public boolean hasMoreElements() {
 				return it.hasNext();
 			}
 
-			public Object nextElement() {
+			@Override
+			public T nextElement() {
 				return it.next();
 			}
 		};
@@ -264,11 +266,11 @@ public class NSArray implements List<Object>, Serializable {
 	/**
 	 * Returns an enumeration over the elements of the array in reverse order.
 	 */
-	public java.util.Enumeration reverseObjectEnumerator() {
-		return new java.util.Enumeration() {
-			ListIterator it = null;
+	public java.util.Enumeration<T> reverseObjectEnumerator() {
+		class ReverseArrayEnumerator implements Enumeration<T> {
+			ListIterator<T> it = null;
 
-			public ListIterator getIterator() {
+			ListIterator<T> getIterator() {
 				if (it == null) {
 					it = NSArray.this.listIterator();
 					// zoom to end
@@ -278,21 +280,24 @@ public class NSArray implements List<Object>, Serializable {
 				return it;
 			}
 
+			@Override
 			public boolean hasMoreElements() {
 				return getIterator().hasPrevious();
 			}
 
-			public Object nextElement() {
+			@Override
+			public T nextElement() {
 				return getIterator().previous();
 			}
-		};
+		}
+		return new ReverseArrayEnumerator();
 	}
 
 	/**
 	 * Copies the elements of this array into the specified object array as the
 	 * array's capacity permits.
 	 */
-	public void getObjects(Object[] anArray) {
+	public void getObjects(T[] anArray) {
 		getObjects(anArray, null);
 	}
 
@@ -310,7 +315,7 @@ public class NSArray implements List<Object>, Serializable {
 	 * @param range   An NSRange object representing the range of data in the
 	 *                NSArray to be copied.
 	 */
-	public void getObjects(Object[] array, NSRange range) {
+	public void getObjects(T[] array, NSRange range) {
 		if (array == null)
 			return;
 		if (range == null)
@@ -326,7 +331,7 @@ public class NSArray implements List<Object>, Serializable {
 	 * Returns the index of the first object in the array equivalent to the
 	 * specified object. Returns NotFound if the item is not found.
 	 */
-	public int indexOfObject(Object anObject) {
+	public int indexOfObject(T anObject) {
 		int result = list.indexOf(anObject);
 		if (result == -1)
 			return NotFound; // in case this changes
@@ -338,7 +343,7 @@ public class NSArray implements List<Object>, Serializable {
 	 * equivalent to the specified object. Returns NotFound if the item is not
 	 * found.
 	 */
-	public int indexOfObject(Object anObject, NSRange aRange) {
+	public int indexOfObject(T anObject, NSRange aRange) {
 		if ((anObject == null) || (aRange == null))
 			return NotFound;
 
@@ -356,7 +361,7 @@ public class NSArray implements List<Object>, Serializable {
 	 * Returns the index of the specified object if it exists in the array,
 	 * comparing by reference. Returns NotFound if the item is not found.
 	 */
-	public int indexOfIdenticalObject(Object anObject) {
+	public int indexOfIdenticalObject(T anObject) {
 		int size = list.size();
 		for (int i = 0; i < size; i++) {
 			if (anObject == list.get(i)) {
@@ -370,7 +375,7 @@ public class NSArray implements List<Object>, Serializable {
 	 * Returns the index of the first object in the array within the specified range
 	 * equivalent to the specified object.
 	 */
-	public int indexOfIdenticalObject(Object anObject, NSRange aRange) {
+	public int indexOfIdenticalObject(T anObject, NSRange aRange) {
 		if (aRange == null)
 			return NotFound;
 
@@ -388,7 +393,7 @@ public class NSArray implements List<Object>, Serializable {
 	 * Returns the object at the specified index. Throws an IndexOutOfRange
 	 * exception if the index is out of range.
 	 */
-	public Object objectAtIndex(int anIndex) {
+	public T objectAtIndex(int anIndex) {
 		return list.get(anIndex);
 	}
 
@@ -396,12 +401,12 @@ public class NSArray implements List<Object>, Serializable {
 	 * Returns an array consisting of strings within the specified string as
 	 * delimited by the specified separator characters.
 	 */
-	public static NSArray componentsSeparatedByString(String aString, String aSeparator) {
-		NSArray result = new NSArray();
+	public static NSArray<String> componentsSeparatedByString(String aString, String aSeparator) {
+		NSArray<String> result = new NSArray<>();
 		if (aString == null)
 			return result;
 		if (aSeparator == null)
-			return new NSArray(aString);
+			return new NSArray<>(aString);
 
 		// FIXME: The spec probably considers the whole
 		// string as a separator, unlike string tokenizer.
@@ -413,18 +418,20 @@ public class NSArray implements List<Object>, Serializable {
 		return result;
 	}
 
+	@Override
 	public Object clone() {
-		return new NSArray(list);
+		return new NSArray<>(list);
 	}
 
-	public NSArray immutableClone() {
+	public NSArray<T> immutableClone() {
 		return this;
 	}
 
-	public NSMutableArray mutableClone() {
-		return new NSMutableArray(this);
+	public NSMutableArray<T> mutableClone() {
+		return new NSMutableArray<>(this);
 	}
 
+	@Override
 	public String toString() {
 		StringBuffer buf = new StringBuffer();
 		buf.append(NSPropertyListSerialization.TOKEN_BEGIN[NSPropertyListSerialization.PLIST_ARRAY]);
@@ -440,22 +447,27 @@ public class NSArray implements List<Object>, Serializable {
 
 	// interface List: accessors
 
+	@Override
 	public boolean contains(Object o) {
 		return list.contains(o);
 	}
 
-	public boolean containsAll(Collection c) {
+	@Override
+	public boolean containsAll(Collection<?> c) {
 		return list.containsAll(c);
 	}
 
+	@Override
 	public boolean equals(Object o) {
 		return list.equals(o);
 	}
 
-	public Object get(int index) {
+	@Override
+	public T get(int index) {
 		return list.get(index);
 	}
 
+	@Override
 	public int hashCode() {
 		int code = 19;
 		code *= getClass().hashCode();
@@ -463,151 +475,184 @@ public class NSArray implements List<Object>, Serializable {
 		return code;
 	}
 
+	@Override
 	public int indexOf(Object o) {
 		return list.indexOf(o);
 	}
 
+	@Override
 	public boolean isEmpty() {
 		return list.isEmpty();
 	}
 
+	@Override
 	public int lastIndexOf(Object o) {
 		return list.lastIndexOf(o);
 	}
 
+	@Override
 	public int size() {
 		return list.size();
 	}
 
+	@Override
 	public Object[] toArray() {
 		return list.toArray();
 	}
 
-	public Object[] toArray(Object[] a) {
-		return list.toArray(a);
+	@SuppressWarnings("unchecked")
+	@Override
+	public T[] toArray(Object[] a) {
+		return (T[]) list.toArray(a);
 	}
 
 	// interface List: mutators
 
-	public void add(int index, Object element) {
+	@Override
+	public void add(int index, T element) {
 		this.list.add(index, element);
 	}
 
-	public boolean add(Object o) {
+	@Override
+	public boolean add(T o) {
 		return this.list.add(o);
 	}
 
-	public boolean addAll(Collection coll) {
+	@Override
+	public boolean addAll(Collection<? extends T> coll) {
 		return this.list.addAll(coll);
 	}
 
-	public boolean addAll(int index, Collection c) {
+	@Override
+	public boolean addAll(int index, Collection<? extends T> c) {
 		return this.list.addAll(index, c);
 	}
 
+	@Override
 	public void clear() {
 		this.list.clear();
 	}
 
-	public Iterator iterator() {
+	@Override
+	public Iterator<T> iterator() {
 		// make a copy to avoid ConcurrentModificationExceptions
-		final Iterator i = new LinkedList(list).iterator();
-		return new Iterator() {
+		final Iterator<T> i = new LinkedList<>(list).iterator();
+		return new Iterator<>() {
+			@Override
 			public boolean hasNext() {
 				return i.hasNext();
 			}
 
-			public Object next() {
+			@Override
+			public T next() {
 				return i.next();
 			}
 
+			@Override
 			public void remove() {
 				throw new UnsupportedOperationException();
 			}
 		};
 	}
 
-	public ListIterator listIterator() {
+	@Override
+	public ListIterator<T> listIterator() {
 		return listIterator(0);
 	}
 
-	public ListIterator listIterator(final int index) {
+	@Override
+	public ListIterator<T> listIterator(final int index) {
 		// make a copy to avoid ConcurrentModificationExceptions
-		final ListIterator i = new LinkedList(list).listIterator(index);
-		return new ListIterator() {
+		final ListIterator<T> i = new LinkedList<>(list).listIterator(index);
+		return new ListIterator<>() {
+			@Override
 			public boolean hasNext() {
 				return i.hasNext();
 			}
 
-			public Object next() {
+			@Override
+			public T next() {
 				return i.next();
 			}
 
+			@Override
 			public boolean hasPrevious() {
 				return i.hasPrevious();
 			}
 
-			public Object previous() {
+			@Override
+			public T previous() {
 				return i.previous();
 			}
 
+			@Override
 			public int nextIndex() {
 				return i.nextIndex();
 			}
 
+			@Override
 			public int previousIndex() {
 				return i.previousIndex();
 			}
 
+			@Override
 			public void remove() {
 				throw new UnsupportedOperationException();
 			}
 
-			public void set(Object o) {
+			@Override
+			public void set(T o) {
 				throw new UnsupportedOperationException();
 			}
 
-			public void add(Object o) {
+			@Override
+			public void add(T o) {
 				throw new UnsupportedOperationException();
 			}
 		};
 	}
 
-	public Object remove(int index) {
+	@Override
+	public T remove(int index) {
 		return this.list.remove(index);
 	}
 
+	@Override
 	public boolean remove(Object o) {
 		return this.list.remove(o);
 	}
 
-	public boolean removeAll(Collection coll) {
+	@Override
+	public boolean removeAll(Collection<?> coll) {
 		return this.list.removeAll(coll);
 	}
 
-	public boolean retainAll(Collection coll) {
+	@Override
+	public boolean retainAll(Collection<?> coll) {
 		return this.list.retainAll(coll);
 	}
 
-	public Object set(int index, Object element) {
+	@Override
+	public T set(int index, T element) {
 		return this.list.set(index, element);
 	}
 
-	public List subList(int fromIndex, int toIndex) {
+	@Override
+	public List<T> subList(int fromIndex, int toIndex) {
 		return Collections.unmodifiableList(list.subList(fromIndex, toIndex));
 	}
 
 	/**
 	 * Provided for the use of subclasses like ArrayFault.
 	 */
-	protected boolean protectedAdd(Object o) {
+	protected boolean protectedAdd(T o) {
 		return list.add(o);
 	}
 
 	/**
 	 * Provided for the use of subclasses like ArrayFault.
 	 */
-	protected boolean protectedAddAll(Collection coll) {
+	protected boolean protectedAddAll(Collection<T> coll) {
 		return list.addAll(coll);
 	}
 }
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSBundle.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSBundle.java
index 49dda88..97fd9b9 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSBundle.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSBundle.java
@@ -64,7 +64,7 @@ public class NSBundle {
 
 	private static final NSMutableArray _allFrameworks = new NSMutableArray();
 
-	private static NSMutableDictionary _languageCodes = new NSMutableDictionary();
+	private static NSMutableDictionary<String, String> _languageCodes = new NSMutableDictionary<>();
 
 	private static NSBundle _mainBundle = null;
 
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSCoder.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSCoder.java
index 8a1721a..b925bbf 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSCoder.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSCoder.java
@@ -58,7 +58,7 @@ public abstract class NSCoder {
 
 	public abstract void encodeObject(Object obj);
 
-	public abstract void encodeClass(Class class1);
+	public abstract void encodeClass(Class<?> class1);
 
 	public abstract void encodeObjects(Object aobj[]);
 
@@ -82,7 +82,7 @@ public abstract class NSCoder {
 
 	public abstract Object decodeObject();
 
-	public abstract Class decodeClass();
+	public abstract Class<?> decodeClass();
 
 	public abstract Object[] decodeObjects();
 
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSComparator.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSComparator.java
index 6c88d19..2ce3646 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSComparator.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSComparator.java
@@ -32,10 +32,11 @@ import java.util.Comparator;
  * @version $Revision: 913 $
  */
 
-public abstract class NSComparator implements Comparator {
-	protected static class _NSSelectorComparator extends NSComparator {
+public abstract class NSComparator<T> implements Comparator<T> {
+	protected static class _NSSelectorComparator extends NSComparator<NSSelector> {
 
-		public int compare(Object obj, Object obj1) throws ComparisonException {
+		@Override
+		public int compare(NSSelector obj, NSSelector obj1) throws ComparisonException {
 			throw new UnsupportedOperationException("Not Yet Implemented");
 		}
 
@@ -44,33 +45,36 @@ public abstract class NSComparator implements Comparator {
 		}
 	}
 
-	private static class StandInComparator extends NSComparator {
+	private static class StandInComparator<T> extends NSComparator<T> {
 
 		public StandInComparator() {
 			throw new UnsupportedOperationException("Not Yet Implemented");
 		}
 
-		public int compare(Object obj, Object obj1) throws ComparisonException {
+		@Override
+		public int compare(T obj, T obj1) throws ComparisonException {
 			throw new UnsupportedOperationException("Not Yet Implemented");
 		}
 
 	}
 
 	public static class ComparisonException extends ClassCastException {
+		private static final long serialVersionUID = 8417668044508338674L;
 
 		public ComparisonException(String s) {
 			super(s);
 		}
 	}
 
-	public static final NSComparator AscendingStringComparator = new StandInComparator();
-	public static final NSComparator DescendingStringComparator = new StandInComparator();
-	public static final NSComparator AscendingCaseInsensitiveStringComparator = new StandInComparator();
-	public static final NSComparator DescendingCaseInsensitiveStringComparator = new StandInComparator();
-	public static final NSComparator AscendingNumberComparator = new StandInComparator();
-	public static final NSComparator DescendingNumberComparator = new StandInComparator();
-	public static final NSComparator AscendingTimestampComparator = new StandInComparator();
-	public static final NSComparator DescendingTimestampComparator = new StandInComparator();
+	public static final NSComparator<String> AscendingStringComparator = new StandInComparator<>();
+	public static final NSComparator<String> DescendingStringComparator = new StandInComparator<>();
+	public static final NSComparator<String> AscendingCaseInsensitiveStringComparator = new StandInComparator<>();
+	public static final NSComparator<String> DescendingCaseInsensitiveStringComparator = new StandInComparator<>();
+	public static final NSComparator<String> AscendingNumberComparator = new StandInComparator<>();
+	public static final NSComparator<String> DescendingNumberComparator = new StandInComparator<>();
+	public static final NSComparator<String> AscendingTimestampComparator = new StandInComparator<>();
+	public static final NSComparator<String> DescendingTimestampComparator = new StandInComparator<>();
+	
 	public static final int OrderedAscending = -1;
 	public static final int OrderedSame = 0;
 	public static final int OrderedDescending = 1;
@@ -78,9 +82,10 @@ public abstract class NSComparator implements Comparator {
 	public NSComparator() {
 	}
 
-	public abstract int compare(Object obj, Object obj1) throws ClassCastException;
+	@Override
+	public abstract int compare(T obj, T obj1) throws ClassCastException;
 
-	public static int _compareObjects(Comparable comparable, Comparable comparable1) {
+	public static <T> int _compareObjects(Comparable<T> comparable, Comparable<T> comparable1) {
 		throw new UnsupportedOperationException("Not Yet Implemented");
 	}
 
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSData.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSData.java
index 67f1d59..3120ad3 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSData.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSData.java
@@ -20,6 +20,7 @@ package net.wotonomy.foundation;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -75,8 +76,8 @@ public class NSData {
 	public NSData(File aFile) {
 		int len = (int) aFile.length();
 		byte[] data = new byte[len];
-		try {
-			new java.io.FileInputStream(aFile).read(data);
+		try (FileInputStream fis = new java.io.FileInputStream(aFile)) {
+			fis.read(data);
 		} catch (Exception exc) {
 			// produce an empty or partially blank array
 		}
@@ -189,6 +190,7 @@ public class NSData {
 		return bytes(0, length());
 	}
 
+	@Override
 	public String toString() {
 		String hex = "0123456789ABCDEF";
 		StringBuffer buf = new StringBuffer();
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSDate.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSDate.java
index a2121fd..e3ea753 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSDate.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSDate.java
@@ -31,8 +31,9 @@ import java.util.TimeZone;
  * @version $Revision: 892 $
  */
 public class NSDate extends Date {
+	private static final long serialVersionUID = -8755214209734414214L;
+	
 	// NSComparisonResult compatibility
-
 	public static final int NSOrderedAscending = -1;
 	public static final int NSOrderedSame = 0;
 	public static final int NSOrderedDescending = 1;
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSDictionary.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSDictionary.java
index a4e9cd5..f72d717 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSDictionary.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSDictionary.java
@@ -32,8 +32,10 @@ import java.util.Map;
  * @author $Author: cgruber $
  * @version $Revision: 893 $
  */
-public class NSDictionary extends HashMap implements NSKeyValueCoding {
-	public static final NSDictionary EmptyDictionary = new NSDictionary();
+public class NSDictionary<K, V> extends HashMap<K, V> implements NSKeyValueCoding {
+	private static final long serialVersionUID = -5043903788052328633L;
+	
+	public static final NSDictionary<?, ?> EmptyDictionary = new NSDictionary<>();
 
 	/**
 	 * Default constructor produces an empty dictionary.
@@ -52,7 +54,7 @@ public class NSDictionary extends HashMap implements NSKeyValueCoding {
 	/**
 	 * Produces a dictionary that contains one key referencing one value.
 	 */
-	public NSDictionary(Object key, Object value) {
+	public NSDictionary(K key, V value) {
 		super();
 		put(key, value);
 	}
@@ -61,7 +63,7 @@ public class NSDictionary extends HashMap implements NSKeyValueCoding {
 	 * Produces a dictionary containing the specified keys and values. An
 	 * IllegalArgumentException is thrown if the arrays are not of the same length.
 	 */
-	public NSDictionary(Object[] objects, Object[] keys) {
+	public NSDictionary(V[] objects, K[] keys) {
 		super();
 		if (keys.length != objects.length) {
 			throw new IllegalArgumentException("Array lengths do not match.");
@@ -75,7 +77,7 @@ public class NSDictionary extends HashMap implements NSKeyValueCoding {
 	/**
 	 * Produces a dictionary that is a copy of the specified map (or dictionary).
 	 */
-	public NSDictionary(Map aMap) {
+	public NSDictionary(Map<K, V> aMap) {
 		super(aMap);
 	}
 
@@ -89,21 +91,21 @@ public class NSDictionary extends HashMap implements NSKeyValueCoding {
 	/**
 	 * Returns an NSArray containing all keys in this dictionary.
 	 */
-	public NSArray allKeys() {
-		return new NSArray(keySet());
+	public NSArray<K> allKeys() {
+		return new NSArray<>(keySet());
 
 	}
 
 	/**
 	 * Returns an NSArray containing all keys that reference the specified value.
 	 */
-	public NSArray allKeysForObject(Object value) {
-		NSMutableArray result = new NSMutableArray();
-		Map.Entry entry;
-		Iterator it = entrySet().iterator();
+	public NSArray<K> allKeysForObject(V value) {
+		NSMutableArray<K> result = new NSMutableArray<>();
+		Map.Entry<K, V> entry;
+		Iterator<Map.Entry<K, V>> it = entrySet().iterator();
 
 		while (it.hasNext()) {
-			entry = (Map.Entry) it.next();
+			entry = (Map.Entry<K, V>) it.next();
 
 			// handle null values
 			if ((value == null) && (entry.getValue() == null) || (value.equals(entry.getValue()))) {
@@ -118,15 +120,15 @@ public class NSDictionary extends HashMap implements NSKeyValueCoding {
 	/**
 	 * Returns an NSArray containing all values in this dictionary.
 	 */
-	public NSArray allValues() {
-		return new NSArray(values());
+	public NSArray<V> allValues() {
+		return new NSArray<>(values());
 	}
 
 	/**
 	 * Returns whether the specified dictionary has the same or equivalent key-value
 	 * pairs as this dictionary.
 	 */
-	public boolean isEqualToDictionary(NSDictionary aDictionary) {
+	public boolean isEqualToDictionary(NSDictionary<K, V> aDictionary) {
 		return equals(aDictionary);
 	}
 
@@ -135,13 +137,13 @@ public class NSDictionary extends HashMap implements NSKeyValueCoding {
 	 * found, the marker parameter will be placed in the corresponding index(es) in
 	 * the returned array.
 	 */
-	public NSArray objectsForKeys(NSArray anArray, Object aMarker) {
-		NSMutableArray result = new NSMutableArray();
+	public NSArray<V> objectsForKeys(NSArray<K> anArray, V aMarker) {
+		NSMutableArray<V> result = new NSMutableArray<>();
 		if (anArray == null)
 			return result;
 
-		Object value;
-		Enumeration enumeration = anArray.objectEnumerator();
+		V value;
+		Enumeration<K> enumeration = anArray.objectEnumerator();
 		while (enumeration.hasMoreElements()) {
 			value = objectForKey(enumeration.nextElement());
 			if (value == null) {
@@ -155,15 +157,15 @@ public class NSDictionary extends HashMap implements NSKeyValueCoding {
 	/**
 	 * Returns an enumeration over the keys in this dictionary.
 	 */
-	public java.util.Enumeration keyEnumerator() {
-		return new java.util.Enumeration() {
-			Iterator it = NSDictionary.this.keySet().iterator();
+	public java.util.Enumeration<K> keyEnumerator() {
+		return new java.util.Enumeration<>() {
+			Iterator<K> it = NSDictionary.this.keySet().iterator();
 
 			public boolean hasMoreElements() {
 				return it.hasNext();
 			}
 
-			public Object nextElement() {
+			public K nextElement() {
 				return it.next();
 			}
 		};
@@ -172,15 +174,15 @@ public class NSDictionary extends HashMap implements NSKeyValueCoding {
 	/**
 	 * Returns an enumeration over the values in this dictionary.
 	 */
-	public java.util.Enumeration objectEnumerator() {
-		return new java.util.Enumeration() {
-			Iterator it = NSDictionary.this.values().iterator();
+	public java.util.Enumeration<V> objectEnumerator() {
+		return new java.util.Enumeration<>() {
+			Iterator<V> it = NSDictionary.this.values().iterator();
 
 			public boolean hasMoreElements() {
 				return it.hasNext();
 			}
 
-			public Object nextElement() {
+			public V nextElement() {
 				return it.next();
 			}
 		};
@@ -189,43 +191,53 @@ public class NSDictionary extends HashMap implements NSKeyValueCoding {
 	/**
 	 * Returns the value for the specified key, or null if the key is not found.
 	 */
-	public Object objectForKey(Object aKey) {
+	public V objectForKey(K aKey) {
 		return get(aKey);
 	}
 
 	// interface NSKeyValueCoding
-
+	@SuppressWarnings("unchecked")
+	@Override
 	public Object valueForKey(String aKey) { // System.out.println( "valueForKey: " + aKey + "->" + this );
-		Object result = objectForKey(aKey);
+		Object result = objectForKey((K) aKey);
 		if (result == null)
 			result = NSKeyValueCodingSupport.valueForKey(this, aKey);
 		return result;
 	}
 
+	@SuppressWarnings("unchecked")
+	@Override
 	public void takeValueForKey(Object aValue, String aKey) { // System.out.println( "takeValueForKey: " + aKey + " : "
 																// + aValue + "->" + this );
-		put(aKey, aValue); // FIXME: technically cheating since this is a read-only class
+		put((K)aKey, (V)aValue); // FIXME: technically cheating since this is a read-only class
 	}
 
+	@SuppressWarnings("unchecked")
+	@Override
 	public Object storedValueForKey(String aKey) {
-		Object result = objectForKey(aKey);
+		Object result = objectForKey((K) aKey);
 		if (result == null)
 			result = NSKeyValueCodingSupport.storedValueForKey(this, aKey);
 		return result;
 	}
 
+	@SuppressWarnings("unchecked")
+	@Override
 	public void takeStoredValueForKey(Object aValue, String aKey) {
-		put(aKey, aValue); // FIXME: technically cheating since this is a read-only class
+		put((K)aKey, (V)aValue); // FIXME: technically cheating since this is a read-only class
 	}
 
+	@Override
 	public Object handleQueryWithUnboundKey(String aKey) {
 		return NSKeyValueCodingSupport.handleQueryWithUnboundKey(this, aKey);
 	}
 
+	@Override
 	public void handleTakeValueForUnboundKey(Object aValue, String aKey) {
 		NSKeyValueCodingSupport.handleTakeValueForUnboundKey(this, aValue, aKey);
 	}
 
+	@Override
 	public void unableToSetNullForKey(String aKey) {
 		NSKeyValueCodingSupport.unableToSetNullForKey(this, aKey);
 	}
@@ -234,10 +246,11 @@ public class NSDictionary extends HashMap implements NSKeyValueCoding {
 		throw new RuntimeException("Not implemented yet.");
 	}
 
+	@SuppressWarnings("unchecked")
+	@Override
 	public String toString() {
 		StringBuffer buf = new StringBuffer();
-		Enumeration enumeration = keyEnumerator();
-		boolean quote = false;
+		Enumeration<K> enumeration = keyEnumerator();
 		buf.append(NSPropertyListSerialization.TOKEN_BEGIN[NSPropertyListSerialization.PLIST_DICTIONARY]);
 		while (enumeration.hasMoreElements()) {
 			if (buf.length() == 1)
@@ -245,7 +258,7 @@ public class NSDictionary extends HashMap implements NSKeyValueCoding {
 			Object k = enumeration.nextElement();
 			buf.append(NSPropertyListSerialization.stringForPropertyList(k));
 			buf.append(" = ");
-			k = objectForKey(k);
+			k = objectForKey((K) k);
 			buf.append(NSPropertyListSerialization.stringForPropertyList(k));
 			buf.append("; ");
 		}
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSForwardException.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSForwardException.java
index 10f54af..2fd8501 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSForwardException.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSForwardException.java
@@ -32,6 +32,7 @@ import java.io.StringWriter;
  */
 
 public class NSForwardException extends RuntimeException {
+	private static final long serialVersionUID = -6960129453213771785L;
 	protected String message;
 	protected Throwable wrappedThrowable;
 
@@ -78,6 +79,7 @@ public class NSForwardException extends RuntimeException {
 		return wrappedThrowable;
 	}
 
+	@Override
 	public void printStackTrace(PrintWriter s) {
 		if (message != null) {
 			s.println(toString());
@@ -89,6 +91,7 @@ public class NSForwardException extends RuntimeException {
 		super.printStackTrace(s);
 	}
 
+	@Override
 	public void printStackTrace(PrintStream s) {
 		if (message != null) {
 			s.println(toString());
@@ -100,6 +103,7 @@ public class NSForwardException extends RuntimeException {
 		super.printStackTrace(s);
 	}
 
+	@Override
 	public void printStackTrace() {
 		if (message != null) {
 			System.err.println(toString());
@@ -124,6 +128,7 @@ public class NSForwardException extends RuntimeException {
 		return writer.toString();
 	}
 
+	@Override
 	public String toString() {
 		String result = message;
 		if (result == null)
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSKeyValueCoding.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSKeyValueCoding.java
index 9eece7e..6f7da5f 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSKeyValueCoding.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSKeyValueCoding.java
@@ -36,7 +36,7 @@ import net.wotonomy.foundation.internal.WotonomyException;
  *
  * NSKeyValueCodingSupport implements the default behaviors for each of these
  * methods, so classes implementing this interface can call those methods to
- * acheive the same behavior. <br>
+ * achieve the same behavior. <br>
  * <br>
  *
  * valueForKey and takeValueForKey are called in response to user actions, like
@@ -318,6 +318,7 @@ public interface NSKeyValueCoding {
 			super();
 		}
 
+		@Override
 		public String toString() {
 			return "<null>";
 		}
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSKeyValueCodingAdditions.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSKeyValueCodingAdditions.java
index 39428ad..72c9fc8 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSKeyValueCodingAdditions.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSKeyValueCodingAdditions.java
@@ -49,13 +49,13 @@ public interface NSKeyValueCodingAdditions extends NSKeyValueCoding {
 	 * Returns a Map of the specified keys to their values, each of which might be
 	 * obtained by calling valueForKey.
 	 */
-	NSDictionary valuesForKeys(List aKeyList);
+	NSDictionary<String, Object> valuesForKeys(List<String> aKeyList);
 
 	/**
 	 * Takes the keys from the specified map as properties and applies the
 	 * corresponding values, each of which might be set by calling takeValueForKey.
 	 */
-	void takeValuesFromDictionary(Map aMap);
+	void takeValuesFromDictionary(Map<String, Object> aMap);
 
 	/**
 	 * Static utility methods that call the appropriate method if the object
@@ -68,7 +68,7 @@ public interface NSKeyValueCodingAdditions extends NSKeyValueCoding {
 		 * NSKeyValueCodingAdditions, otherwise calls the method on
 		 * DefaultImplementation.
 		 */
-		public static void takeValuesFromDictionary(Object object, Map dictionary) {
+		public static void takeValuesFromDictionary(Object object, Map<String, Object> dictionary) {
 			if (object instanceof NSKeyValueCodingAdditions) {
 				((NSKeyValueCodingAdditions) object).takeValuesFromDictionary(dictionary);
 			} else {
@@ -94,7 +94,7 @@ public interface NSKeyValueCodingAdditions extends NSKeyValueCoding {
 		 * NSKeyValueCodingAdditions, otherwise calls the method on
 		 * DefaultImplementation.
 		 */
-		public static NSDictionary valuesForKeys(Object object, List keys) {
+		public static NSDictionary<String, Object> valuesForKeys(Object object, List<String> keys) {
 			if (object instanceof NSKeyValueCodingAdditions) {
 				return ((NSKeyValueCodingAdditions) object).valuesForKeys(keys);
 			} else {
@@ -125,7 +125,7 @@ public interface NSKeyValueCodingAdditions extends NSKeyValueCoding {
 		 * Provides a reflection-based implementation for classes that don't implement
 		 * NSKeyValueCodingAdditions.
 		 */
-		public static void takeValuesFromDictionary(Object object, Map dictionary) {
+		public static void takeValuesFromDictionary(Object object, Map<String, Object> dictionary) {
 			throw new RuntimeException("Not implemented yet.");
 		}
 
@@ -142,7 +142,7 @@ public interface NSKeyValueCodingAdditions extends NSKeyValueCoding {
 		 * Provides a reflection-based implementation for classes that don't implement
 		 * NSKeyValueCodingAdditions.
 		 */
-		public static NSDictionary valuesForKeys(Object object, List keys) {
+		public static NSDictionary<String, Object> valuesForKeys(Object object, List<String> keys) {
 			throw new RuntimeException("Not implemented yet.");
 		}
 
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSLock.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSLock.java
index 45afdde..c9287eb 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSLock.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSLock.java
@@ -41,6 +41,7 @@ public class NSLock extends Mutex implements NSLocking {
 	public NSLock() {
 	}
 
+	@Override
 	public synchronized void lock() {
 		try {
 			acquire();
@@ -49,6 +50,7 @@ public class NSLock extends Mutex implements NSLocking {
 		}
 	}
 
+	@Override
 	public synchronized void unlock() {
 		release();
 	}
@@ -70,6 +72,7 @@ public class NSLock extends Mutex implements NSLocking {
 		return tryLock(nstimestamp.getTime() - System.currentTimeMillis());
 	}
 
+	@Override
 	public String toString() {
 		return getClass().getName() + " <" + (inuse_ ? "Locked" : "Unlocked") + ">";
 	}
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSLog.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSLog.java
index b447bd3..eba1383 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSLog.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSLog.java
@@ -222,14 +222,14 @@ public class NSLog {
 		 * Convenience to append a Boolean.
 		 */
 		public void appendln(boolean aValue) {
-			appendln(new Boolean(aValue));
+			appendln(Boolean.valueOf(aValue));
 		}
 
 		/**
 		 * Convenience to append a Byte.
 		 */
 		public void appendln(byte aValue) {
-			appendln(new Byte(aValue));
+			appendln(Byte.valueOf(aValue));
 		}
 
 		/**
@@ -244,7 +244,7 @@ public class NSLog {
 		 * Convenience to append a Character.
 		 */
 		public void appendln(char aValue) {
-			appendln(new Character(aValue));
+			appendln(Character.valueOf(aValue));
 		}
 
 		/**
@@ -258,35 +258,35 @@ public class NSLog {
 		 * Convenience to append a Double.
 		 */
 		public void appendln(double aValue) {
-			appendln(new Double(aValue));
+			appendln(Double.valueOf(aValue));
 		}
 
 		/**
 		 * Convenience to append a Float.
 		 */
 		public void appendln(float aValue) {
-			appendln(new Float(aValue));
+			appendln(Float.valueOf(aValue));
 		}
 
 		/**
 		 * Convenience to append a Integer.
 		 */
 		public void appendln(int aValue) {
-			appendln(new Integer(aValue));
+			appendln(Integer.valueOf(aValue));
 		}
 
 		/**
 		 * Convenience to append a Long.
 		 */
 		public void appendln(long aValue) {
-			appendln(new Long(aValue));
+			appendln(Long.valueOf(aValue));
 		}
 
 		/**
 		 * Convenience to append a Short
 		 */
 		public void appendln(short aValue) {
-			appendln(new Short(aValue));
+			appendln(Short.valueOf(aValue));
 		}
 
 		/**
@@ -362,6 +362,7 @@ public class NSLog {
 		/**
 		 * Sends a newline to the print stream.
 		 */
+		@Override
 		public void appendln() {
 			if (isEnabled()) {
 				thePrintStream.println();
@@ -371,6 +372,7 @@ public class NSLog {
 		/**
 		 * Writes the throwable to the print stream.
 		 */
+		@Override
 		public void appendln(Throwable aValue) {
 			appendln(NSLog.throwableAsString(aValue));
 		}
@@ -378,6 +380,7 @@ public class NSLog {
 		/**
 		 * Writes aValue.toString to the print stream.
 		 */
+		@Override
 		public void appendln(Object aValue) {
 			if (isEnabled()) {
 				if (isVerbose()) {
@@ -392,6 +395,7 @@ public class NSLog {
 		/**
 		 * Flushes the print stream.
 		 */
+		@Override
 		public void flush() {
 			thePrintStream.flush();
 		}
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSMultiReaderLock.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSMultiReaderLock.java
index 3492141..fe296db 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSMultiReaderLock.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSMultiReaderLock.java
@@ -39,7 +39,7 @@ import EDU.oswego.cs.dl.util.concurrent.ReentrantWriterPreferenceReadWriteLock;
  */
 public class NSMultiReaderLock extends ReentrantWriterPreferenceReadWriteLock implements NSLocking {
 
-	NSMutableDictionary _readerSuspended = new NSMutableDictionary();
+	NSMutableDictionary<Thread, Integer> _readerSuspended = new NSMutableDictionary<>();
 
 	public NSMultiReaderLock() {
 	}
@@ -58,6 +58,7 @@ public class NSMultiReaderLock extends ReentrantWriterPreferenceReadWriteLock im
 		readerLock_.release();
 	}
 
+	@Override
 	public void lock() {
 		lockForWriting();
 	}
@@ -72,6 +73,7 @@ public class NSMultiReaderLock extends ReentrantWriterPreferenceReadWriteLock im
 		}
 	}
 
+	@Override
 	public void unlock() {
 		unlockForWriting();
 	}
@@ -122,6 +124,7 @@ public class NSMultiReaderLock extends ReentrantWriterPreferenceReadWriteLock im
 		}
 	}
 
+	@Override
 	public String toString() {
 		throw new UnsupportedOperationException("Not Yet Implemented");
 	}
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSMutableArray.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSMutableArray.java
index c75de01..39f9fb1 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSMutableArray.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSMutableArray.java
@@ -30,17 +30,19 @@ import java.util.ListIterator;
  * @author $Author: cgruber $
  * @version $Revision: 893 $
  */
-public class NSMutableArray extends NSArray {
+public class NSMutableArray<T> extends NSArray<T> {
+	private static final long serialVersionUID = 2414783500843649556L;
+
 	/**
 	 * Returns an NSArray backed by the specified List. This is useful to "protect"
 	 * an internal representation that is returned by a method of return type
 	 * NSArray.
 	 */
-	public static NSMutableArray mutableArrayBackedByList(List aList) {
-		return new NSMutableArray(aList, null);
+	public static <T> NSMutableArray<T> mutableArrayBackedByList(List<T> aList) {
+		return new NSMutableArray<>(aList, null);
 	}
 
-	NSMutableArray(List aList, Object ignored) // differentiates
+	NSMutableArray(List<T> aList, Object ignored) // differentiates
 	{
 		super(aList, ignored);
 	}
@@ -64,7 +66,7 @@ public class NSMutableArray extends NSArray {
 	/**
 	 * Produces an array containing only the specified object.
 	 */
-	public NSMutableArray(Object anObject) {
+	public NSMutableArray(T anObject) {
 		super(anObject);
 //System.out.println( "NSMutableArray: " + net.wotonomy.ui.swing.util.StackTraceInspector.getMyCaller() );
 	}
@@ -72,7 +74,7 @@ public class NSMutableArray extends NSArray {
 	/**
 	 * Produces an array containing the specified objects.
 	 */
-	public NSMutableArray(Object[] anArray) {
+	public NSMutableArray(T[] anArray) {
 		super(anArray);
 //System.out.println( "NSMutableArray: " + net.wotonomy.ui.swing.util.StackTraceInspector.getMyCaller() );
 	}
@@ -80,7 +82,7 @@ public class NSMutableArray extends NSArray {
 	/**
 	 * Produces an array containing the objects in the specified collection.
 	 */
-	public NSMutableArray(Collection aCollection) {
+	public NSMutableArray(Collection<T> aCollection) {
 		super(aCollection);
 //System.out.println( "NSMutableArray: " + net.wotonomy.ui.swing.util.StackTraceInspector.getMyCaller() );
 	}
@@ -102,7 +104,7 @@ public class NSMutableArray extends NSArray {
 	/**
 	 * Adds all objects in the specified collection.
 	 */
-	public void addObjectsFromArray(Collection aCollection) {
+	public void addObjectsFromArray(Collection<T> aCollection) {
 		list.addAll(aCollection);
 	}
 
@@ -117,7 +119,7 @@ public class NSMutableArray extends NSArray {
 	 * Removes all objects equivalent to the specified object within the range of
 	 * specified indices.
 	 */
-	public void removeObject(Object anObject, NSRange aRange) {
+	public void removeObject(T anObject, NSRange aRange) {
 		if ((anObject == null) || (aRange == null))
 			return;
 
@@ -136,7 +138,7 @@ public class NSMutableArray extends NSArray {
 	 * Removes all instances of the specified object within the range of specified
 	 * indices, comparing by reference.
 	 */
-	public void removeIdenticalObject(Object anObject, NSRange aRange) {
+	public void removeIdenticalObject(T anObject, NSRange aRange) {
 		if ((anObject == null) || (aRange == null))
 			return;
 
@@ -154,7 +156,7 @@ public class NSMutableArray extends NSArray {
 	/**
 	 * Removes all objects in the specified collection from the array.
 	 */
-	public void removeObjectsInArray(Collection aCollection) {
+	public void removeObjectsInArray(Collection<T> aCollection) {
 		list.removeAll(aCollection);
 	}
 
@@ -176,7 +178,7 @@ public class NSMutableArray extends NSArray {
 	 * objects are removed. If otherRange is larger than currentRange, the extra
 	 * objects are added.
 	 */
-	public void replaceObjectsInRange(NSRange currentRange, List otherArray, NSRange otherRange) {
+	public void replaceObjectsInRange(NSRange currentRange, List<T> otherArray, NSRange otherRange) {
 		if ((currentRange == null) || (otherArray == null) || (otherRange == null))
 			return;
 
@@ -187,8 +189,7 @@ public class NSMutableArray extends NSArray {
 			otherRange = new NSRange(loc, otherArray.size() - loc);
 		}
 
-		Object o;
-		List subList = list.subList(currentRange.location(), currentRange.maxRange());
+		List<T> subList = list.subList(currentRange.location(), currentRange.maxRange());
 		int otherIndex = otherRange.location();
 		// TODO: Test this logic.
 		for (int i = 0; i < subList.size(); i++) {
@@ -210,7 +211,7 @@ public class NSMutableArray extends NSArray {
 	 * Clears the current array and then populates it with the contents of the
 	 * specified collection.
 	 */
-	public void setArray(Collection aCollection) {
+	public void setArray(Collection<T> aCollection) {
 		list.clear();
 		list.addAll(aCollection);
 	}
@@ -233,8 +234,8 @@ public class NSMutableArray extends NSArray {
 	/**
 	 * Removes all occurences of the specified object, comparing by reference.
 	 */
-	public void removeIdenticalObject(Object anObject) {
-		Iterator it = list.iterator();
+	public void removeIdenticalObject(T anObject) {
+		Iterator<T> it = list.iterator();
 		while (it.hasNext()) {
 			if (it.next() == anObject) {
 				it.remove();
@@ -245,91 +246,108 @@ public class NSMutableArray extends NSArray {
 	/**
 	 * Inserts the specified object into this array at the specified index.
 	 */
-	public void insertObjectAtIndex(Object anObject, int anIndex) {
+	public void insertObjectAtIndex(T anObject, int anIndex) {
 		list.add(anIndex, anObject);
 	}
 
 	/**
 	 * Replaces the object at the specified index with the specified object.
 	 */
-	public void replaceObjectAtIndex(int anIndex, Object anObject) {
+	public void replaceObjectAtIndex(int anIndex, T anObject) {
 		list.set(anIndex, anObject);
 	}
 
 	/**
 	 * Adds the specified object to the end of this array.
 	 */
-	public void addObject(Object anObject) {
+	public void addObject(T anObject) {
 		list.add(anObject);
 	}
 
+	@Override
 	public Object clone() {
-		return new NSMutableArray(list);
+		return new NSMutableArray<>(list);
 	}
 
-	public NSArray immutableClone() {
-		return new NSArray(this);
+	@Override
+	public NSArray<T> immutableClone() {
+		return new NSArray<>(this);
 	}
 
-	public NSMutableArray mutableClone() {
-		return new NSMutableArray(this);
+	@Override
+	public NSMutableArray<T> mutableClone() {
+		return new NSMutableArray<>(this);
 	}
 
 	// interface List: mutators
 
-	public void add(int index, Object element) {
+	@Override
+	public void add(int index, T element) {
 		list.add(index, element);
 	}
 
-	public boolean add(Object o) {
+	@Override
+	public boolean add(T o) {
 		return list.add(o);
 	}
 
-	public boolean addAll(Collection coll) {
+	@Override
+	public boolean addAll(Collection<? extends T> coll) {
 		return list.addAll(coll);
 	}
 
-	public boolean addAll(int index, Collection c) {
+	@Override
+	public boolean addAll(int index, Collection<? extends T> c) {
 		return list.addAll(index, c);
 	}
 
+	@Override
 	public void clear() {
 		list.clear();
 	}
 
-	public Iterator iterator() {
+	@Override
+	public Iterator<T> iterator() {
 		return list.iterator();
 	}
 
-	public ListIterator listIterator() {
+	@Override
+	public ListIterator<T> listIterator() {
 		return list.listIterator();
 	}
 
-	public ListIterator listIterator(int index) {
-		return list.listIterator();
+	@Override
+	public ListIterator<T> listIterator(int index) {
+		return list.listIterator(index);
 	}
 
-	public Object remove(int index) {
+	@Override
+	public T remove(int index) {
 		return list.remove(index);
 	}
 
+	@Override
 	public boolean remove(Object o) {
 		return list.remove(o);
 	}
 
-	public boolean removeAll(Collection coll) {
+	@Override
+	public boolean removeAll(Collection<?> coll) {
 		return list.removeAll(coll);
 	}
 
-	public boolean retainAll(Collection coll) {
+	@Override
+	public boolean retainAll(Collection<?> coll) {
 		return list.retainAll(coll);
 	}
 
-	public Object set(int index, Object element) {
+	@Override
+	public T set(int index, T element) {
 		return list.set(index, element);
 	}
 
-	public List subList(int fromIndex, int toIndex) {
+	@Override
+	public List<T> subList(int fromIndex, int toIndex) {
 		return list.subList(fromIndex, toIndex);
 	}
 
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSMutableDictionary.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSMutableDictionary.java
index ba58189..99c5230 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSMutableDictionary.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSMutableDictionary.java
@@ -29,7 +29,9 @@ import java.util.Map;
  * @author $Author: cgruber $
  * @version $Revision: 893 $
  */
-public class NSMutableDictionary extends NSDictionary {
+public class NSMutableDictionary<K, V> extends NSDictionary<K, V> {
+	private static final long serialVersionUID = -150787274911739812L;
+
 	/**
 	 * Default constructor produces an empty dictionary.
 	 */
@@ -47,7 +49,7 @@ public class NSMutableDictionary extends NSDictionary {
 	/**
 	 * Produces a dictionary that contains one key referencing one value.
 	 */
-	public NSMutableDictionary(Object key, Object value) {
+	public NSMutableDictionary(K key, V value) {
 		super(key, value);
 	}
 
@@ -55,21 +57,21 @@ public class NSMutableDictionary extends NSDictionary {
 	 * Produces a dictionary containing the specified keys and values. An
 	 * IllegalArgumentException is thrown if the arrays are not of the same length.
 	 */
-	public NSMutableDictionary(Object[] keys, Object[] values) {
-		super(keys, values);
+	public NSMutableDictionary(K[] keys, V[] values) {
+		super(values, keys);
 	}
 
 	/**
 	 * Produces a dictionary that is a copy of the specified map (or dictionary).
 	 */
-	public NSMutableDictionary(Map aMap) {
+	public NSMutableDictionary(Map<K, V> aMap) {
 		super(aMap);
 	}
 
 	/**
 	 * Removes the key-value pair for the specified key.
 	 */
-	public void removeObjectForKey(Object aKey) {
+	public void removeObjectForKey(K aKey) {
 		remove(aKey);
 	}
 
@@ -77,7 +79,7 @@ public class NSMutableDictionary extends NSDictionary {
 	 * Copies all mappings from the specified dictionary to this dictionary,
 	 * replacing any mappings this map had for any keys in the specified map.
 	 */
-	public void addEntriesFromDictionary(Map aMap) {
+	public void addEntriesFromDictionary(Map<K, V> aMap) {
 		putAll(aMap);
 	}
 
@@ -91,8 +93,8 @@ public class NSMutableDictionary extends NSDictionary {
 	/**
 	 * Removes all keys in the specified array from this dictionary.
 	 */
-	public void removeObjectsForKeys(NSArray anArray) {
-		Enumeration enumeration = anArray.objectEnumerator();
+	public void removeObjectsForKeys(NSArray<K> anArray) {
+		Enumeration<K> enumeration = anArray.objectEnumerator();
 		while (enumeration.hasMoreElements()) {
 			removeObjectForKey(enumeration.nextElement());
 		}
@@ -102,7 +104,7 @@ public class NSMutableDictionary extends NSDictionary {
 	 * Clears all mappings in this dictionary and then adds all entries in the
 	 * specified dictionary.
 	 */
-	public void setDictionary(Map aMap) {
+	public void setDictionary(Map<K, V> aMap) {
 		removeAllObjects();
 		addEntriesFromDictionary(aMap);
 	}
@@ -112,7 +114,7 @@ public class NSMutableDictionary extends NSDictionary {
 	 * dictionary, the old value is replaced with the specified value. An
 	 * IllegalArgumentException is thrown if either the key or value is null.
 	 */
-	public void setObjectForKey(Object aValue, Object aKey) {
+	public void setObjectForKey(V aValue, K aKey) {
 		if ((aKey == null) || (aValue == null)) {
 			throw new IllegalArgumentException("Cannot use null objects with an NSMutableDictionary.");
 		}
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSNotification.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSNotification.java
index 6b091e2..4fbd8af 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSNotification.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSNotification.java
@@ -87,7 +87,7 @@ public class NSNotification {
 	public NSDictionary userInfo() {
 		if (userInfo == null)
 			return null;
-		return new NSDictionary(userInfo);
+		return new NSDictionary<>(userInfo);
 	}
 
 	/**
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSNotificationCenter.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSNotificationCenter.java
index cf0af53..862d454 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSNotificationCenter.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSNotificationCenter.java
@@ -60,13 +60,13 @@ public class NSNotificationCenter {
 	/**
 	 * A Map of (name,object) pairs to a List of (observer,selector) pairs.
 	 */
-	private Hashtable observers; // thread-safe
+	private Hashtable<CompoundKey, List<CompoundValue>> observers; // thread-safe
 
 	/**
 	 * Default constructor creates a new notification center.
 	 */
 	public NSNotificationCenter() {
-		observers = new Hashtable();
+		observers = new Hashtable<>();
 	}
 
 	/**
@@ -81,7 +81,7 @@ public class NSNotificationCenter {
 	}
 
 	/**
-	 * Addes the specified observer to the notification queue for notifications with
+	 * Adds the specified observer to the notification queue for notifications with
 	 * the specified name or the specified object or both.
 	 * 
 	 * @param anObserver       The observer that wishes to be notified.
@@ -105,12 +105,12 @@ public class NSNotificationCenter {
 		if (anObject == null) {
 			anObject = NullMarker;
 		}
-		Object key = new CompoundKey(name, anObject);
-		Object value = new CompoundValue(anObserver, aSelector);
-		List list = (List) observers.get(key);
+		CompoundKey key = new CompoundKey(name, anObject);
+		CompoundValue value = new CompoundValue(anObserver, aSelector);
+		List<CompoundValue> list = observers.get(key);
 		if (list == null) {
 			// create new list with value and put it in map
-			list = new Vector(); // thread-safe
+			list = new Vector<>(); // thread-safe
 			list.add(value);
 			observers.put(new CompoundKey(name, anObject, keyQueue), list);
 		} else {
@@ -129,8 +129,9 @@ public class NSNotificationCenter {
 	 *                      selector.
 	 */
 	public void postNotification(NSNotification aNotification) {
-		List mergedList = new LinkedList();
-		Object key, observerList;
+		List<CompoundValue> mergedList = new LinkedList<>();
+		CompoundKey key;
+		List<CompoundValue> observerList;
 
 		Object name = aNotification.name();
 		Object object = aNotification.object();
@@ -139,39 +140,39 @@ public class NSNotificationCenter {
 			if (object != null) { // both are specified
 				observerList = observers.get(new CompoundKey(name, object));
 				if (observerList != null) {
-					mergedList.addAll((List) observerList);
+					mergedList.addAll(observerList);
 				}
 				observerList = observers.get(new CompoundKey(name, NullMarker));
 				if (observerList != null) {
-					mergedList.addAll((List) observerList);
+					mergedList.addAll(observerList);
 				}
 				observerList = observers.get(new CompoundKey(NullMarker, object));
 				if (observerList != null) {
-					mergedList.addAll((List) observerList);
+					mergedList.addAll(observerList);
 				}
 			} else { // object is null
 				observerList = observers.get(new CompoundKey(name, NullMarker));
 				if (observerList != null) {
-					mergedList.addAll((List) observerList);
+					mergedList.addAll(observerList);
 				}
 			}
 		} else if (object != null) { // name is null
 			observerList = observers.get(new CompoundKey(NullMarker, object));
 			if (observerList != null) {
-				mergedList.addAll((List) observerList);
+				mergedList.addAll(observerList);
 			}
 		}
 
 		key = new CompoundKey(NullMarker, NullMarker);
 		observerList = observers.get(key);
 		if (observerList != null) {
-			mergedList.addAll((List) observerList);
+			mergedList.addAll(observerList);
 		}
 
 		CompoundValue value;
-		Iterator it = mergedList.iterator();
+		Iterator<CompoundValue> it = mergedList.iterator();
 		while (it.hasNext()) {
-			value = (CompoundValue) it.next();
+			value = it.next();
 			if (value.get() == null) {
 				it.remove();
 			} else {
@@ -182,7 +183,7 @@ public class NSNotificationCenter {
 							"Error notifying object: " + value.get() + " : " + aNotification, exc);
 //                    throw w;
 					w.printStackTrace();
-					postNotification("Error notifying object", this, new NSDictionary("exception", w));
+					postNotification("Error notifying object", this, new NSDictionary<>("exception", w));
 				}
 			}
 		}
@@ -212,7 +213,7 @@ public class NSNotificationCenter {
 	 *                         originator of the notification and that may be of
 	 *                         interest to a knowledgable observer.
 	 */
-	public void postNotification(String notificationName, Object anObject, Map userInfo) {
+	public void postNotification(String notificationName, Object anObject, Map<String, Object> userInfo) {
 		postNotification(new NSNotification(notificationName, anObject, userInfo));
 	}
 
@@ -226,7 +227,7 @@ public class NSNotificationCenter {
 		// remove freed objects
 		processKeyQueue();
 
-		Iterator it = new LinkedList(observers.keySet()).iterator();
+		Iterator<CompoundKey> it = new LinkedList<>(observers.keySet()).iterator();
 		while (it.hasNext()) {
 			removeObserver(anObserver, it.next());
 		}
@@ -253,10 +254,10 @@ public class NSNotificationCenter {
 		processKeyQueue();
 
 		// get key matches
-		List keys = matchingKeys(notificationName, anObject);
+		List<CompoundKey> keys = matchingKeys(notificationName, anObject);
 
 		// remove specified observer from each matching key
-		Iterator it = keys.iterator();
+		Iterator<CompoundKey> it = keys.iterator();
 		while (it.hasNext()) {
 			removeObserver(anObserver, it.next());
 		}
@@ -267,12 +268,12 @@ public class NSNotificationCenter {
 	 * null parameters are considered wildcards. Pass NullMarkers if you want to
 	 * explicitly match nulls.
 	 */
-	private List matchingKeys(String name, Object object) {
-		List result = new LinkedList();
+	private List<CompoundKey> matchingKeys(String name, Object object) {
+		List<CompoundKey> result = new LinkedList<>();
 
 		boolean willAdd;
 		CompoundKey key;
-		Iterator it = observers.keySet().iterator();
+		Iterator<CompoundKey> it = observers.keySet().iterator();
 		while (it.hasNext()) {
 			key = (CompoundKey) it.next();
 			willAdd = false;
@@ -299,15 +300,15 @@ public class NSNotificationCenter {
 			return;
 		}
 
-		List list = (List) observers.get(key);
+		List<CompoundValue> list = observers.get(key);
 		if (list == null)
 			return;
 
 		// remove specified observer from list
 		Object observer;
-		Iterator it = list.iterator();
+		Iterator<CompoundValue> it = list.iterator();
 		while (it.hasNext()) {
-			observer = ((CompoundValue) it.next()).get();
+			observer = it.next().get();
 			if ((observer == null) || (anObserver == observer)) {
 				// remove if match or freed object
 				it.remove();
@@ -321,7 +322,7 @@ public class NSNotificationCenter {
 	}
 
 	/* Reference queues for cleared WeakKeys */
-	private ReferenceQueue keyQueue = new ReferenceQueue();
+	private ReferenceQueue keyQueue = new ReferenceQueue<>();
 
 	/**
 	 * Removes any keys whose object has been garbage collected. (Garbage collected
@@ -339,7 +340,7 @@ public class NSNotificationCenter {
 	 * Key combining a name with an object. The object is weakly referenced, and
 	 * keys are deallocated by reference queue. equals() compares by reference.
 	 */
-	private static class CompoundKey extends WeakReference {
+	private static class CompoundKey extends WeakReference<Object> {
 		private Object name;
 		private int hashCode;
 
@@ -357,6 +358,7 @@ public class NSNotificationCenter {
 		 * Creates compound key with queue. Neither name nor object may be null. Use
 		 * NullMarker to represent null in either name or object.
 		 */
+		@SuppressWarnings({ "rawtypes", "unchecked" })
 		public CompoundKey(Object aName, Object anObject, ReferenceQueue aQueue) {
 			super(anObject, aQueue);
 			name = aName;
@@ -367,10 +369,12 @@ public class NSNotificationCenter {
 			return name;
 		}
 
+		@Override
 		public int hashCode() {
 			return hashCode;
 		}
 
+		@Override
 		public boolean equals(Object anObject) {
 			if (this == anObject)
 				return true;
@@ -388,6 +392,7 @@ public class NSNotificationCenter {
 			return false;
 		}
 
+		@Override
 		public String toString() {
 			return "[CompoundKey:" + name() + ":" + get() + "]";
 		}
@@ -397,7 +402,7 @@ public class NSNotificationCenter {
 	 * Value combining an object with a selector. The object is weakly referenced,
 	 * and null values are not allowed.
 	 */
-	private static class CompoundValue extends WeakReference {
+	private static class CompoundValue extends WeakReference<Object> {
 		private NSSelector selector;
 		private int hashCode;
 
@@ -411,10 +416,12 @@ public class NSNotificationCenter {
 			return selector;
 		}
 
+		@Override
 		public int hashCode() {
 			return hashCode;
 		}
 
+		@Override
 		public boolean equals(Object anObject) {
 			if (this == anObject)
 				return true;
@@ -431,6 +438,7 @@ public class NSNotificationCenter {
 			return false;
 		}
 
+		@Override
 		public String toString() {
 			return "[CompoundValue:" + get() + ":" + selector().name() + "]";
 		}
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSNull.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSNull.java
index 861f576..5d08fb2 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSNull.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSNull.java
@@ -36,6 +36,7 @@ import java.io.Serializable;
  * @version $Revision: 892 $
  */
 public class NSNull implements Serializable {
+	private static final long serialVersionUID = 6516669267906970248L;
 	private static final NSNull instance = new NSNull();
 
 	/**
@@ -56,13 +57,15 @@ public class NSNull implements Serializable {
 	/**
 	 * Returns a human-readable string representation.
 	 */
+	@Override
 	public String toString() {
 		return "[null]";
 	}
 
 	/**
-	 * Hashcode of all instances is zero.
+	 * Hash code of all instances is zero.
 	 */
+	@Override
 	public int hashCode() {
 		return 0;
 	}
@@ -70,6 +73,7 @@ public class NSNull implements Serializable {
 	/**
 	 * Implemented to return true for any instance of NSNull.
 	 */
+	@Override
 	public boolean equals(Object anObject) {
 		return (anObject instanceof NSNull);
 	}
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSRange.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSRange.java
index 13dca2f..5c54a08 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSRange.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSRange.java
@@ -110,6 +110,7 @@ public class NSRange implements Cloneable {
 	/**
 	 * Returns whether the specified object is equal to this range.
 	 */
+	@Override
 	public boolean equals(Object anObject) {
 		if (anObject instanceof NSRange)
 			return isEqualToRange((NSRange) anObject);
@@ -119,6 +120,7 @@ public class NSRange implements Cloneable {
 	/**
 	 * Returns a hashCode.
 	 */
+	@Override
 	public int hashCode() {
 		// TODO: Test this logic.
 		return (location() << 2) & length(); // bitwise ops never my forte
@@ -127,6 +129,7 @@ public class NSRange implements Cloneable {
 	/**
 	 * Returns a string representation of this range.
 	 */
+	@Override
 	public String toString() {
 		return "[NSRange: location = " + location() + "; length = " + length() + "]";
 	}
@@ -264,6 +267,7 @@ public class NSRange implements Cloneable {
 	/**
 	 * Returns a copy of this range.
 	 */
+	@Override
 	public Object clone() {
 		return new NSRange(location(), length());
 	}
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSRunLoop.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSRunLoop.java
index c72cd23..2889aef 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSRunLoop.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSRunLoop.java
@@ -40,7 +40,7 @@ import java.util.ListIterator;
  * not get their own run loop as in OpenStep.<br>
  * <br>
  *
- * That said, this event queue is servicable as a replacement for the default
+ * That said, this event queue is serviceable as a replacement for the default
  * event queue and will provide prioritized execution of selectors before and
  * after normal AWT events. <br>
  * <br>
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSSet.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSSet.java
index 38a7ec6..ece9e1b 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSSet.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/NSSet.java
@@ -33,7 +33,9 @@ import java.util.Vector;
  * @author $Author: cgruber $
  * @version $Revision: 893 $
  */
-public class NSSet extends HashSet {
+public class NSSet<T> extends HashSet<T> {
+	private static final long serialVersionUID = 4211571026717957124L;
+
 	/**
 	 * Default constructor.
 	 */
@@ -44,14 +46,14 @@ public class NSSet extends HashSet {
 	/**
 	 * Constructs a NSSet containing the objects in the specified collection.
 	 */
-	public NSSet(Collection aCollection) {
+	public NSSet(Collection<T> aCollection) {
 		super(aCollection);
 	}
 
 	/**
 	 * Constructs a NSSet containing only the specified object.
 	 */
-	public NSSet(Object anObject) {
+	public NSSet(T anObject) {
 		super();
 		add(anObject);
 	}
@@ -59,7 +61,7 @@ public class NSSet extends HashSet {
 	/**
 	 * Constructs a NSSet containing the objects in the specified array.
 	 */
-	public NSSet(Object[] anObjectArray) {
+	public NSSet(T[] anObjectArray) {
 		super();
 		for (int i = 0; i < anObjectArray.length; i++) {
 			add(anObjectArray[i]);
@@ -69,14 +71,16 @@ public class NSSet extends HashSet {
 	/**
 	 * Returns an NSArray containing all objects in the set.
 	 */
-	public NSArray allObjects() {
-		return new NSArray(this);
+	public NSArray<T> allObjects() {
+		return new NSArray<>(this);
 	}
 
 	/**
+	* Retrieve an arbitrary object from the set.
 	* 
+	* @return An arbitrary object from the set
 	*/
-	public Object anyObject() {
+	public T anyObject() {
 		throw new RuntimeException("Not implemented yet.");
 	}
 
@@ -98,8 +102,8 @@ public class NSSet extends HashSet {
 	 * Returns whether this set has one or more elements in common with the
 	 * specified set.
 	 */
-	public boolean intersectsSet(Set aSet) {
-		Iterator it = aSet.iterator();
+	public boolean intersectsSet(Set<T> aSet) {
+		Iterator<T> it = aSet.iterator();
 		while (it.hasNext()) {
 			if (this.containsObject(it.next())) {
 				return true;
@@ -112,14 +116,14 @@ public class NSSet extends HashSet {
 	/**
 	 * Returns whether this set contains the same object as the specified set.
 	 */
-	public boolean isEqualToSet(Set aSet) {
+	public boolean isEqualToSet(Set<T> aSet) {
 		return equals(aSet);
 	}
 
 	/**
 	 * Returns whether this set is a subset of the specified set.
 	 */
-	public boolean isSubsetOfSet(Set aSet) {
+	public boolean isSubsetOfSet(Set<T> aSet) {
 		return aSet.containsAll(this);
 	}
 
@@ -133,15 +137,15 @@ public class NSSet extends HashSet {
 	/**
 	 * Returns an enumerator over the objects in this set.
 	 */
-	public Enumeration objectEnumerator() {
-		return new Vector(this).elements();
+	public Enumeration<T> objectEnumerator() {
+		return new Vector<>(this).elements();
 	}
 
 	/**
 	 * Returns a set that is the intersection of this set and the specified set.
 	 */
-	public NSSet setByIntersectingSet(Set aSet) {
-		NSSet result = new NSSet(this);
+	public NSSet<T> setByIntersectingSet(Set<T> aSet) {
+		NSSet<T> result = new NSSet<>(this);
 		result.retainAll(aSet);
 		return result;
 	}
@@ -150,8 +154,8 @@ public class NSSet extends HashSet {
 	 * Returns a set that contains all elements in this set that are not in the
 	 * specified set.
 	 */
-	public NSSet setBySubtractingSet(Set aSet) {
-		NSSet result = new NSSet(this);
+	public NSSet<T> setBySubtractingSet(Set<T> aSet) {
+		NSSet<T> result = new NSSet<>(this);
 		result.removeAll(aSet);
 		return result;
 	}
@@ -159,8 +163,8 @@ public class NSSet extends HashSet {
 	/**
 	 * Returns a set that is the union of this set and the specified set.
 	 */
-	public NSSet setByUnioningSet(Set aSet) {
-		NSSet result = new NSSet(this);
+	public NSSet<T> setByUnioningSet(Set<T> aSet) {
+		NSSet<T> result = new NSSet<>(this);
 		result.addAll(aSet);
 		return result;
 	}
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/Duplicator.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/Duplicator.java
index 16ef393..8ecb7a3 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/Duplicator.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/Duplicator.java
@@ -19,8 +19,6 @@ License along with this library; if not, see http://www.gnu.org
 package net.wotonomy.foundation.internal;
 
 import net.wotonomy.foundation.*;
-import net.wotonomy.foundation.internal.Introspector;
-import net.wotonomy.foundation.internal.WotonomyException;
 
 import java.io.*;
 import java.util.*; //collections
@@ -49,14 +47,14 @@ public class Duplicator {
 	 * Returns a list of properties for the specified class that are both readable
 	 * and writable.
 	 */
-	static public List editablePropertiesForObject(Object anObject) {
-		List readProperties = new ArrayList();
+	static public List<String> editablePropertiesForObject(Object anObject) {
+		List<String> readProperties = new ArrayList<>();
 		String[] read = Introspector.getReadPropertiesForObject(anObject);
 		for (int i = 0; i < read.length; i++) {
 			readProperties.add(read[i]);
 		}
 
-		List properties = new ArrayList();
+		List<String> properties = new ArrayList<>();
 		String[] write = Introspector.getWritePropertiesForObject(anObject);
 		for (int i = 0; i < write.length; i++) {
 			properties.add(write[i]);
@@ -73,12 +71,12 @@ public class Duplicator {
 	 * and their values. Any null values for properties will be represented with the
 	 * NULL object.
 	 */
-	static public Map readPropertiesForObject(Object anObject) {
-		NSMutableDictionary result = new NSMutableDictionary();
+	static public Map<String, Object> readPropertiesForObject(Object anObject) {
+		NSMutableDictionary<String, Object> result = new NSMutableDictionary<>();
 
 		String key;
 		Object value;
-		Iterator it = editablePropertiesForObject(anObject).iterator();
+		Iterator<String> it = editablePropertiesForObject(anObject).iterator();
 		while (it.hasNext()) {
 			key = it.next().toString();
 			value = Introspector.get(anObject, key);
@@ -93,10 +91,12 @@ public class Duplicator {
 	 * Returns a Map containing only the mutable properties for the specified object
 	 * and deep clones of their values. Nulls are represented by the NULL object.
 	 */
-	static public Map clonePropertiesForObject(Object anObject) {
-		Object key, value;
-		Map result = readPropertiesForObject(anObject);
-		Iterator it = result.keySet().iterator();
+	static public Map<String, Object> clonePropertiesForObject(Object anObject) {
+		String key;
+		Object value;
+		
+		Map<String, Object> result = readPropertiesForObject(anObject);
+		Iterator<String> it = result.keySet().iterator();
 		while (it.hasNext()) {
 			key = it.next();
 			value = result.get(key);
@@ -110,10 +110,10 @@ public class Duplicator {
 	 * Applies the map of properties and values to the specified object. Null values
 	 * for properties must be represented by the NULL object.
 	 */
-	static public void writePropertiesForObject(Map aMap, Object anObject) {
+	static public void writePropertiesForObject(Map<String, Object> aMap, Object anObject) {
 		String key;
 		Object value;
-		Iterator it = aMap.keySet().iterator();
+		Iterator<String> it = aMap.keySet().iterator();
 		while (it.hasNext()) {
 			key = it.next().toString();
 			value = aMap.get(key);
@@ -141,9 +141,9 @@ public class Duplicator {
 			}
 		}
 
-		Class c = aSource.getClass();
+		Class<?> c = aSource.getClass();
 		try {
-			result = c.newInstance();
+			result = c.getDeclaredConstructor().newInstance();
 		} catch (Exception exc) {
 			throw new WotonomyException(exc);
 		}
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/IntrospectorException.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/IntrospectorException.java
index 45080a2..a5887ab 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/IntrospectorException.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/IntrospectorException.java
@@ -28,4 +28,5 @@ package net.wotonomy.foundation.internal;
  */
 
 public class IntrospectorException extends WotonomyException {
+	private static final long serialVersionUID = -997809394704941577L;
 }
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/MissingPropertyException.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/MissingPropertyException.java
index c89742f..c53595c 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/MissingPropertyException.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/MissingPropertyException.java
@@ -28,4 +28,5 @@ package net.wotonomy.foundation.internal;
  */
 
 public class MissingPropertyException extends IntrospectorException {
+	private static final long serialVersionUID = -6130027204690491083L;
 }
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/NullPrimitiveException.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/NullPrimitiveException.java
index bf1dffd..aa52e69 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/NullPrimitiveException.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/NullPrimitiveException.java
@@ -28,4 +28,5 @@ package net.wotonomy.foundation.internal;
  */
 
 public class NullPrimitiveException extends IntrospectorException {
+	private static final long serialVersionUID = -572058252131498585L;
 }
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/PropertyComparator.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/PropertyComparator.java
index c804893..f8b1cca 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/PropertyComparator.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/PropertyComparator.java
@@ -29,7 +29,8 @@ import java.util.Comparator;
  * @author $Author: cgruber $
  * @version $Revision: 893 $
  */
-public class PropertyComparator implements Comparator, Serializable {
+public class PropertyComparator<T> implements Comparator<T>, Serializable {
+	private static final long serialVersionUID = -3028294144521868334L;
 	private String property;
 
 	/**
@@ -43,13 +44,15 @@ public class PropertyComparator implements Comparator, Serializable {
 
 	// interface Comparator
 
+	@SuppressWarnings("unchecked")
+	@Override
 	public int compare(Object o1, Object o2) {
 		Object v1 = Introspector.get(o1, property);
 		Object v2 = Introspector.get(o2, property);
-		if (v1 instanceof Comparable) {
-			return ((Comparable) v1).compareTo(v2);
+		if (v1 instanceof Comparable<?>) {
+			return ((Comparable<Object>) v1).compareTo(v2);
 		} else if (v2 instanceof Comparable) {
-			return ((Comparable) v2).compareTo(v1);
+			return ((Comparable<Object>) v2).compareTo(v1);
 		} else {
 			if (v1 == null) {
 				if (v2 == null) {
@@ -64,6 +67,7 @@ public class PropertyComparator implements Comparator, Serializable {
 		return v1.toString().compareTo(v2.toString());
 	}
 
+	@Override
 	public boolean equals(Object obj) {
 		return (obj instanceof PropertyComparator);
 	}
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/QueueMap.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/QueueMap.java
index 59104e5..2f6accf 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/QueueMap.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/QueueMap.java
@@ -22,9 +22,9 @@ import java.util.*; //collections
 
 /**
  * A queue based implementation of the Map interface. This class provides for
- * all the opertions of a map, but keeps the entries in the same sequence as
+ * all the operations of a map, but keeps the entries in the same sequence as
  * originally added. The first entry placed in the map will be the first entry
- * retreived during iteration: first-in, first-out (FIFO). <BR>
+ * retrieved during iteration: first-in, first-out (FIFO). <BR>
  * <BR>
  *
  * Keys cannot be duplicated. If an entry is made using a key that already
@@ -33,9 +33,9 @@ import java.util.*; //collections
  * <BR>
  *
  * Some convenience methods are provided for the queue type operations. The
- * first key can be retreived as well as the last key. A key can be used to
- * retreive its corresponding value from the map. A value can also be used to
- * retreive its key from the map, however, since there may be multiple values of
+ * first key can be retrieved as well as the last key. A key can be used to
+ * retrieve its corresponding value from the map. A value can also be used to
+ * retrieve its key from the map, however, since there may be multiple values of
  * the same equality, the first key found will be returned. <BR>
  * <BR>
  *
@@ -44,31 +44,31 @@ import java.util.*; //collections
  * @date $Date: 2006-02-18 17:41:36 -0500 (Sat, 18 Feb 2006) $
  * @revision $Revision: 899 $
  */
-public class QueueMap implements Map {
-	List values;
-	List keys;
-	Map keyToValue;
+public class QueueMap<K, V> implements Map<K, V> {
+	List<V> values;
+	List<K> keys;
+	Map<K, V> keyToValue;
 
 	/**
 	 * Creates an empty QueueMap.
 	 */
 	public QueueMap() {
-		values = new LinkedList();
-		keys = new LinkedList();
-		keyToValue = new HashMap();
+		values = new LinkedList<>();
+		keys = new LinkedList<>();
+		keyToValue = new HashMap<>();
 	}
 
 	/**
 	 * Creates a QueueMap and places the entries from the passed in map into this
-	 * map. The order of the entries is based on however the iterator iteratated
+	 * map. The order of the entries is based on however the iterator iterated
 	 * through the map entries.
 	 * 
 	 * @param t A map object.
 	 */
-	public QueueMap(Map t) {
-		values = new ArrayList();
-		keys = new ArrayList();
-		keyToValue = new HashMap();
+	public QueueMap(Map<K, V> t) {
+		values = new ArrayList<>();
+		keys = new ArrayList<>();
+		keyToValue = new HashMap<>();
 
 		putAll(t);
 	}
@@ -76,6 +76,7 @@ public class QueueMap implements Map {
 	/**
 	 * Removes all the entries from this map.
 	 */
+	@Override
 	public void clear() {
 		values.clear();
 		keys.clear();
@@ -89,6 +90,7 @@ public class QueueMap implements Map {
 	 * 
 	 * @return True if the map contains the given key, false otherwise.
 	 */
+	@Override
 	public boolean containsKey(Object key) {
 		return keyToValue.containsKey(key);
 	}
@@ -102,6 +104,7 @@ public class QueueMap implements Map {
 	 * 
 	 * @return True if the map contains the given value, false otherwise.
 	 */
+	@Override
 	public boolean containsValue(Object value) {
 		return keyToValue.containsValue(value);
 	}
@@ -114,11 +117,12 @@ public class QueueMap implements Map {
 	 *
 	 * @return a set view of the mappings contained in this map.
 	 */
-	public Set entrySet() {
-		Set result = new HashSet(keys.size(), 1F);
+	@Override
+	public Set<Map.Entry<K, V>> entrySet() {
+		Set<Map.Entry<K, V>> result = new HashSet<>(keys.size(), 1F);
 
 		for (int i = 0; i < keys.size(); i++) {
-			result.add(new KeyValuePair(keys.get(i), values.get(i)));
+			result.add(new KeyValuePair<>(keys.get(i), values.get(i)));
 		}
 
 		return result;
@@ -135,6 +139,7 @@ public class QueueMap implements Map {
 	 * @param o object to be compared for equality with this map.
 	 * @return <tt>true</tt> if the specified object is equal to this map.
 	 */
+	@Override
 	public boolean equals(Object o) {
 		return keyToValue.equals(o);
 	}
@@ -149,7 +154,8 @@ public class QueueMap implements Map {
 	 * @return The value corresponding to the key (can be null), or null if the key
 	 *         is not contained in the map.
 	 */
-	public Object get(Object key) {
+	@Override
+	public V get(Object key) {
 		return keyToValue.get(key);
 	}
 
@@ -162,6 +168,7 @@ public class QueueMap implements Map {
 	 *
 	 * @return the hash code value for this map.
 	 */
+	@Override
 	public int hashCode() {
 		return keyToValue.hashCode();
 	}
@@ -171,6 +178,7 @@ public class QueueMap implements Map {
 	 * 
 	 * @return True is this map contains no entries, false otherwise.
 	 */
+	@Override
 	public boolean isEmpty() {
 		return keyToValue.isEmpty();
 	}
@@ -181,8 +189,9 @@ public class QueueMap implements Map {
 	 * 
 	 * @return A Set containing all the keys used in the map.
 	 */
-	public Set keySet() {
-		Set result = new HashSet(keys.size(), 1F);
+	@Override
+	public Set<K> keySet() {
+		Set<K> result = new HashSet<>(keys.size(), 1F);
 
 		for (int i = 0; i < keys.size(); i++) {
 			result.add(keys.get(i));
@@ -202,7 +211,8 @@ public class QueueMap implements Map {
 	 * @return Null if the key is new, the replaced value if the key already
 	 *         existed. (Note: If the key was null, then null is returned.)
 	 */
-	public Object put(Object key, Object value) {
+	@Override
+	public V put(K key, V value) {
 		if (key == null)
 			return null;
 
@@ -223,15 +233,16 @@ public class QueueMap implements Map {
 	 * 
 	 * @param t A map of key/value entries.
 	 */
-	public void putAll(Map t) {
+	@Override
+	public void putAll(Map<? extends K, ? extends V> t) {
 		if (t == null) {
 			// Nothing to do!
 			return;
 		}
 
 		// Place the entries from the passed in map into this map.
-		for (Iterator it = t.keySet().iterator(); it.hasNext();) {
-			Object aKey = it.next();
+		for (Iterator<? extends K> it = t.keySet().iterator(); it.hasNext();) {
+			K aKey = it.next();
 			put(aKey, t.get(aKey));
 		}
 	}
@@ -245,11 +256,12 @@ public class QueueMap implements Map {
 	 *         Null could also be returned if the associated value of the key was
 	 *         null.
 	 */
-	public Object remove(Object key) {
+	@Override
+	public V remove(Object key) {
 		if (key == null)
 			return null;
 
-		Object value = null;
+		V value = null;
 
 		if (containsKey(key)) {
 			value = keyToValue.remove(key);
@@ -268,6 +280,7 @@ public class QueueMap implements Map {
 	 * 
 	 * @return The number of pairs.
 	 */
+	@Override
 	public int size() {
 		return values.size();
 	}
@@ -280,7 +293,7 @@ public class QueueMap implements Map {
 	 * 
 	 * @return An ordered list of keys.
 	 */
-	public List keys() {
+	public List<K> keys() {
 		return keys;
 	}
 
@@ -292,7 +305,8 @@ public class QueueMap implements Map {
 	 * 
 	 * @return An ordered list of values.
 	 */
-	public Collection values() {
+	@Override
+	public Collection<V> values() {
 		return values;
 	}
 
@@ -306,7 +320,7 @@ public class QueueMap implements Map {
 	 * @return The value corresponding to the key (can be null), or null if the key
 	 *         is not contained in the map.
 	 */
-	public Object getValueForKey(Object key) {
+	public V getValueForKey(K key) {
 		return keyToValue.get(key);
 	}
 
@@ -318,7 +332,7 @@ public class QueueMap implements Map {
 	 * @param value A value that is contained in this map.
 	 * @return A first key that corresponds to this value.
 	 */
-	public Object getKeyForValue(Object value) {
+	public K getKeyForValue(V value) {
 		int i = values.indexOf(value);
 		if (i != -1) {
 			return keys.get(i);
@@ -331,7 +345,7 @@ public class QueueMap implements Map {
 	 * 
 	 * @return The first key in the map, null if there are no mappings.
 	 */
-	public Object getFirstKey() {
+	public K getFirstKey() {
 		if (keys.size() < 1) {
 			return null;
 		}
@@ -343,7 +357,7 @@ public class QueueMap implements Map {
 	 * 
 	 * @return The last key in the map, null if there are no mappings.
 	 */
-	public Object getLastKey() {
+	public K getLastKey() {
 		if (keys.size() < 1) {
 			return null;
 		}
@@ -354,9 +368,9 @@ public class QueueMap implements Map {
 	 * This class contains a key/value pair. The key must be a valid object, it
 	 * cannot be null. The value can be a valid object or null.
 	 */
-	static public class KeyValuePair implements Map.Entry {
-		Object key;
-		Object value;
+	static public class KeyValuePair<K, V> implements Map.Entry<K, V> {
+		K key;
+		V value;
 
 		/**
 		 * Default constructor. The constructor takes the key and value as parameters.
@@ -366,7 +380,7 @@ public class QueueMap implements Map {
 		 * @param key   The key object of this pair. The key cannot be null.
 		 * @param value The value object of this pair. The value can be null.
 		 */
-		public KeyValuePair(Object aKey, Object aValue) {
+		public KeyValuePair(K aKey, V aValue) {
 			key = aKey;
 			value = aValue;
 		}
@@ -376,7 +390,8 @@ public class QueueMap implements Map {
 		 * 
 		 * @return The key object.
 		 */
-		public Object getKey() {
+		@Override
+		public K getKey() {
 			return key;
 		}
 
@@ -385,7 +400,8 @@ public class QueueMap implements Map {
 		 * 
 		 * @return The value object.
 		 */
-		public Object getValue() {
+		@Override
+		public V getValue() {
 			return value;
 		}
 
@@ -394,15 +410,18 @@ public class QueueMap implements Map {
 		 * 
 		 * @param aValue The value object to place into this pair.
 		 */
-		public Object setValue(Object aValue) {
-			Object result = value;
+		@Override
+		public V setValue(V aValue) {
+			V result = value;
 			value = aValue;
 			return result;
 		}
 
+		@Override
 		public boolean equals(Object o) {
 			if (o instanceof KeyValuePair) {
-				KeyValuePair p = (KeyValuePair) o;
+				@SuppressWarnings("unchecked")
+				KeyValuePair<K, V> p = (KeyValuePair<K, V>) o;
 				if ((key.equals(p.getKey())) && (value.equals(p.getValue()))) {
 					return true;
 				}
@@ -412,9 +431,10 @@ public class QueueMap implements Map {
 	}
 
 	/**
-	 * Returns a string reprsentation of this class. The contents of the map are
+	 * Returns a string representation of this class. The contents of the map are
 	 * placed in the string in its proper order.
 	 */
+	@Override
 	public String toString() {
 		int max = size() - 1;
 		StringBuffer buf = new StringBuffer();
@@ -432,10 +452,11 @@ public class QueueMap implements Map {
 	}
 
 	// unit test
+	// TODO convert to JUnit test
 	public static void main(String[] argv) {
-		QueueMap qMap;
+		QueueMap<String, String> qMap;
 
-		qMap = new QueueMap();
+		qMap = new QueueMap<>();
 		for (int i = 0; i < 5; i++) {
 			qMap.put(Integer.toString(i), Integer.toString(i));
 		}
@@ -443,7 +464,7 @@ public class QueueMap implements Map {
 		System.out.println("Keys = " + qMap.keys());
 		System.out.println("Values = " + qMap.values());
 
-		qMap = new QueueMap();
+		qMap = new QueueMap<>();
 		for (int i = 0; i < 5; i++) {
 			qMap.put(Integer.toString(i), "A");
 		}
@@ -451,7 +472,7 @@ public class QueueMap implements Map {
 		System.out.println("Keys = " + qMap.keys());
 		System.out.println("Values = " + qMap.values());
 
-		qMap = new QueueMap();
+		qMap = new QueueMap<>();
 		for (int i = 0; i < 5; i++) {
 			qMap.put(Integer.toString(i), null);
 		}
@@ -459,17 +480,17 @@ public class QueueMap implements Map {
 		System.out.println("Keys = " + qMap.keys());
 		System.out.println("Values = " + qMap.values());
 
-		Map aMap = new HashMap();
+		Map<String, String> aMap = new HashMap<>();
 		for (int i = 0; i < 5; i++) {
 			aMap.put(Integer.toString(i), Integer.toString(i));
 		}
-		qMap = new QueueMap(aMap);
+		qMap = new QueueMap<>(aMap);
 		System.out.println("\nHashMap = " + aMap);
 		System.out.println("Map = " + qMap);
 		System.out.println("Keys = " + qMap.keys());
 		System.out.println("Values = " + qMap.values());
 
-		qMap = new QueueMap();
+		qMap = new QueueMap<>();
 		qMap.put("Test1", "String1");
 		qMap.put("Test2", "String2");
 		qMap.put("Test3", "String3");
@@ -498,7 +519,7 @@ public class QueueMap implements Map {
 		qMap.put("Test12", "String12");
 		System.out.println("Clear Test, Map = " + qMap);
 
-		aMap = new HashMap();
+		aMap = new HashMap<>();
 		aMap.put("Test10", "String10");
 		aMap.put("Test11", "String11");
 		aMap.put("Test12", "String12");
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/ValueConverter.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/ValueConverter.java
index 7f28e06..3d995e5 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/ValueConverter.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/ValueConverter.java
@@ -37,69 +37,70 @@ public class ValueConverter {
 	 * Returns the specified object as converted to an instance of the specified
 	 * class, or null if the conversion could not be performed.
 	 */
-	static public Object convertObjectToClass(Object anObject, Class aClass) {
+	@SuppressWarnings("unchecked")
+	static public <C> C convertObjectToClass(Object anObject, Class<C> aClass) {
 		if (aClass == String.class) {
-			return getString(anObject);
+			return (C) getString(anObject);
 		}
 		if (aClass == Short.class) {
-			return getShort(anObject);
+			return (C) getShort(anObject);
 		}
 		if (aClass == short.class) {
-			return getShort(anObject);
+			return (C) getShort(anObject);
 		}
 		if (aClass == Integer.class) {
-			return getInteger(anObject);
+			return (C) getInteger(anObject);
 		}
 		if (aClass == int.class) {
-			return getInteger(anObject);
+			return (C) getInteger(anObject);
 		}
 		if (aClass == Long.class) {
-			return getLong(anObject);
+			return (C) getLong(anObject);
 		}
 		if (aClass == long.class) {
-			return getLong(anObject);
+			return (C) getLong(anObject);
 		}
 		if (aClass == Float.class) {
-			return getFloat(anObject);
+			return (C) getFloat(anObject);
 		}
 		if (aClass == float.class) {
-			return getFloat(anObject);
+			return (C) getFloat(anObject);
 		}
 		if (aClass == Double.class) {
-			return getDouble(anObject);
+			return (C) getDouble(anObject);
 		}
 		if (aClass == double.class) {
-			return getDouble(anObject);
+			return (C) getDouble(anObject);
 		}
 		if (aClass == java.util.Date.class) {
-			return getDate(anObject);
+			return (C) getDate(anObject);
 		}
 		if (aClass == Boolean.class) {
-			return getBoolean(anObject);
+			return (C) getBoolean(anObject);
 		}
 		if (aClass == boolean.class) {
-			return getBoolean(anObject);
+			return (C) getBoolean(anObject);
 		}
 		if (aClass == Character.class) {
-			return getCharacter(anObject);
+			return (C) getCharacter(anObject);
 		}
 		if (aClass == char.class) {
-			return getCharacter(anObject);
+			return (C) getCharacter(anObject);
 		}
 		if (aClass == Byte.class) {
-			return getByte(anObject);
+			return (C) getByte(anObject);
 		}
 		if (aClass == byte.class) {
-			return getByte(anObject);
+			return (C) getByte(anObject);
 		}
 		if (Collection.class.isAssignableFrom(aClass)) {
-			return getCollection(anObject, aClass);
+			return (C) getCollection(anObject, aClass);
 		}
 		if (aClass.isArray()) {
-			return getArray(anObject, aClass);
+			return (C) getArray(anObject, aClass);
 		}
 
-		return convert(anObject, aClass);
+		return (C) convert(anObject, aClass);
 	}
 
 	/**
@@ -108,10 +109,10 @@ public class ValueConverter {
 	 * the best fit to the object. and returns a new instance with that constructor.
 	 * Subclasses can override to directly support specific types.
 	 */
-	static protected Object convert(Object anObject, Class aClass) {
-		Constructor[] ctors = aClass.getConstructors();
+	static protected Object convert(Object anObject, Class<?> aClass) {
+		Constructor<?>[] ctors = aClass.getConstructors();
 
-		Class[] types;
+		Class<?>[] types;
 		for (int i = 0; i < ctors.length; i++) {
 			types = ctors[i].getParameterTypes();
 			if (types.length == 1) {
@@ -148,9 +149,9 @@ public class ValueConverter {
 	static protected Object preprocess(Object anObject) {
 		if (anObject instanceof Boolean) {
 			if (((Boolean) anObject).booleanValue()) {
-				return new Double(1.0);
+				return Double.valueOf(1.0);
 			}
-			return new Double(0.0);
+			return Double.valueOf(0.0);
 		}
 
 		if (anObject instanceof Character) {
@@ -167,9 +168,9 @@ public class ValueConverter {
 
 	static public Short getShort(Object anObject) {
 		if (anObject == null)
-			return new Short((short) 0);
+			return Short.valueOf((short) 0);
 		if ("".equals(anObject))
-			return new Short((short) 0);
+			return Short.valueOf((short) 0);
 		if (anObject instanceof Short)
 			return (Short) anObject;
 
diff --git a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/WotonomyException.java b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/WotonomyException.java
index 21b47b3..041a216 100644
--- a/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/WotonomyException.java
+++ b/projects/net.wotonomy.foundation/src/main/java/net/wotonomy/foundation/internal/WotonomyException.java
@@ -26,7 +26,7 @@ import java.io.PrintWriter;
  * Behaves as a normal RuntimeException except that it prints a stack trace of
  * the wrapped throwable if one is specified.
  *
- * Intended to be used anytime you'd report an exception with
+ * Intended to be used any time you'd report an exception with
  * System.out.println: that is, for debugging and non-user-visible exceptions.
  *
  * @author michael@mpowers.net
@@ -35,6 +35,8 @@ import java.io.PrintWriter;
  */
 
 public class WotonomyException extends RuntimeException {
+	private static final long serialVersionUID = -7267633105344041941L;
+	
 	protected String message;
 	protected Throwable wrappedThrowable;
 
@@ -81,6 +83,7 @@ public class WotonomyException extends RuntimeException {
 		return wrappedThrowable;
 	}
 
+	@Override
 	public void printStackTrace(PrintWriter s) {
 		if (message != null) {
 			s.println("Exception: " + message);
@@ -92,6 +95,7 @@ public class WotonomyException extends RuntimeException {
 		super.printStackTrace(s);
 	}
 
+	@Override
 	public void printStackTrace(PrintStream s) {
 		if (message != null) {
 			s.println("Exception: " + message);
@@ -103,6 +107,7 @@ public class WotonomyException extends RuntimeException {
 		super.printStackTrace(s);
 	}
 
+	@Override
 	public void printStackTrace() {
 		if (message != null) {
 			System.err.println("Exception: " + message);
diff --git a/projects/net.wotonomy.foundation/src/test/java/net/wotonomy/foundation/NSArrayTest.java b/projects/net.wotonomy.foundation/src/test/java/net/wotonomy/foundation/NSArrayTest.java
index e8bdbbc..98689dc 100644
--- a/projects/net.wotonomy.foundation/src/test/java/net/wotonomy/foundation/NSArrayTest.java
+++ b/projects/net.wotonomy.foundation/src/test/java/net/wotonomy/foundation/NSArrayTest.java
@@ -45,7 +45,7 @@ public class NSArrayTest extends TestCase {
 	 * Test method for 'net.wotonomy.foundation.NSArray.arrayBackedByList(List)'
 	 */
 	public void testArrayBackedByList() {
-		List list = new ArrayList();
+		List<Object> list = new ArrayList<>();
 		NSArray array = NSArray.arrayBackedByList(list);
 		assertNotNull(array);
 		assertSame(list, array.list);
@@ -63,7 +63,7 @@ public class NSArrayTest extends TestCase {
 	 * Test method for 'net.wotonomy.foundation.NSArray.NSArray(List, Object)'
 	 */
 	public void testNSArrayListObject() {
-		List list = new ArrayList();
+		List<Object> list = new ArrayList<>();
 		NSArray array = new NSArray(list, null);
 		assertNotNull(array);
 		assertSame(list, array.list);
@@ -131,7 +131,7 @@ public class NSArrayTest extends TestCase {
 	 * Test method for 'net.wotonomy.foundation.NSArray.NSArray(Collection)'
 	 */
 	public void testNSArrayCollection() {
-		ArrayList list = new ArrayList();
+		ArrayList<Object> list = new ArrayList<>();
 		list.add(o1);
 		list.add(o2);
 		list.add(o3);
@@ -164,7 +164,7 @@ public class NSArrayTest extends TestCase {
 	 */
 	public void testArrayByAddingObjectsFromArray() {
 		NSArray array = new NSArray(o1);
-		List list = new ArrayList();
+		List<Object> list = new ArrayList<>();
 		list.add(o2);
 		list.add(o3);
 		NSArray array2 = array.arrayByAddingObjectsFromArray(list);
@@ -198,7 +198,7 @@ public class NSArrayTest extends TestCase {
 	 * 'net.wotonomy.foundation.NSArray.firstObjectCommonWithArray(Collection)'
 	 */
 	public void testFirstObjectCommonWithArray() {
-		ArrayList list = new ArrayList();
+		ArrayList<Object> list = new ArrayList<>();
 		list.add(o2);
 		list.add(o3);
 		list.add(o4);
diff --git a/projects/net.wotonomy.persistence.adapter.jdbc/pom.xml b/projects/net.wotonomy.persistence.adapter.jdbc/pom.xml
index 19d0eeb..4832e5e 100644
--- a/projects/net.wotonomy.persistence.adapter.jdbc/pom.xml
+++ b/projects/net.wotonomy.persistence.adapter.jdbc/pom.xml
@@ -1,4 +1,5 @@
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>net.wotonomy</groupId>
@@ -21,7 +22,32 @@
 			<version>3.8.1</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+		    <groupId>com.h2database</groupId>
+   			 <artifactId>h2</artifactId>
+   			 <version>2.2.224</version>
+			<scope>test</scope>
+		</dependency>
+   		<dependency>
+    			<groupId>org.postgresql</groupId>
+    			<artifactId>postgresql</artifactId>
+   				<version>42.7.3</version>
+				<scope>test</scope>
+		</dependency>
 	</dependencies>
+	
+		<properties>
+		<maven.compiler.release>11</maven.compiler.release>
+	</properties>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.13.0</version>
+			</plugin>
+		</plugins>
+	</build>
 	<reporting>
 		<plugins>
 			<plugin>
diff --git a/projects/net.wotonomy.persistence.adapter.jdbc/src/main/java/net/wotonomy/jdbcadaptor/EOMapObjectStore.java b/projects/net.wotonomy.persistence.adapter.jdbc/src/main/java/net/wotonomy/jdbcadaptor/EOMapObjectStore.java
new file mode 100644
index 0000000..06dc280
--- /dev/null
+++ b/projects/net.wotonomy.persistence.adapter.jdbc/src/main/java/net/wotonomy/jdbcadaptor/EOMapObjectStore.java
@@ -0,0 +1,116 @@
+package net.wotonomy.jdbcadaptor;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import net.wotonomy.control.ArrayFault;
+import net.wotonomy.control.EOEditingContext;
+import net.wotonomy.control.EOFetchSpecification;
+import net.wotonomy.control.EOGlobalID;
+import net.wotonomy.control.EOObjectStore;
+import net.wotonomy.foundation.NSArray;
+import net.wotonomy.foundation.internal.WotonomyException;
+
+/**
+ * Implementation of EOObjectStore backed by a single map
+ * @author bjculkin
+ *
+ */
+public class EOMapObjectStore extends EOObjectStore {
+	private Map<EOGlobalID, Object> data;
+
+	public EOMapObjectStore() {
+		super();
+		
+		data = new HashMap<>();
+	}
+	
+	public EOMapObjectStore(Map<EOGlobalID, Object> data) {
+		this.data = data;
+	}
+	
+	public Map<EOGlobalID, Object> getData() {
+		return data;
+	}
+	
+	public void setData(Map<EOGlobalID, Object> data) {
+		this.data = data;
+	}
+	
+	@Override
+	public NSArray<?> arrayFaultWithSourceGlobalID(EOGlobalID aGlobalID, String aRelationship,
+			EOEditingContext aContext) {
+		return new ArrayFault(aGlobalID, aRelationship, aContext);
+	}
+
+	@Override
+	public Object faultForGlobalID(EOGlobalID aGlobalID, EOEditingContext aContext) {
+		return data.get(aGlobalID);
+	}
+
+	@Override
+	public Object faultForRawRow(Map aDictionary, String anEntityName, EOEditingContext aContext) {
+		// TODO: faults are not yet supported
+		throw new WotonomyException("Faults are not yet supported.");
+	}
+
+	@Override
+	public void initializeObject(Object eo, EOGlobalID aGlobalID, EOEditingContext aContext) {
+		// TODO is this right?
+		data.put(aGlobalID, eo);
+		aContext.recordObject(eo, aGlobalID);
+	}
+
+	@Override
+	public void invalidateAllObjects() {
+		// Does nothing
+	}
+
+	@Override
+	public void invalidateObjectsWithGlobalIDs(List aList) {
+		// Does nothing
+	}
+
+	@Override
+	public boolean isObjectLockedWithGlobalID(EOGlobalID aGlobalID, EOEditingContext aContext) {
+		// No locking
+		return false;
+	}
+
+	@Override
+	public void lockObjectWithGlobalID(EOGlobalID aGlobalID, EOEditingContext aContext) {
+		// No locking
+	}
+
+	@Override
+	public NSArray objectsForSourceGlobalID(EOGlobalID aGlobalID, String aRelationship, EOEditingContext aContext) {
+		// TODO: relationships are not yet supported
+		throw new WotonomyException("Relationships are not yet supported.");
+	}
+
+	@Override
+	public NSArray objectsWithFetchSpecification(EOFetchSpecification aFetchSpec, EOEditingContext aContext) {
+		throw new WotonomyException("Fetchspecs are not yet supported.");
+	}
+
+	@Override
+	public void refaultObject(Object anObject, EOGlobalID aGlobalID, EOEditingContext aContext) {
+		// TODO faults are not supported
+		initializeObject(anObject, aGlobalID, aContext);
+	}
+
+	@Override
+	public void saveChangesInEditingContext(EOEditingContext aContext) {
+		for (Object obj : aContext.insertedObjects()) {
+			EOGlobalID key = aContext.globalIDForObject(obj);
+			data.put(key, obj);
+		}
+		for (Object obj : aContext.deletedObjects()) {
+			EOGlobalID key = aContext.globalIDForObject(obj);
+			data.remove(key);
+		}
+		// No need to handle updates
+	}
+
+}
diff --git a/projects/net.wotonomy.persistence.adapter.jdbc/src/main/java/net/wotonomy/jdbcadaptor/JDBCAdaptor.java b/projects/net.wotonomy.persistence.adapter.jdbc/src/main/java/net/wotonomy/jdbcadaptor/JDBCAdaptor.java
index f3d848c..1a67d6d 100644
--- a/projects/net.wotonomy.persistence.adapter.jdbc/src/main/java/net/wotonomy/jdbcadaptor/JDBCAdaptor.java
+++ b/projects/net.wotonomy.persistence.adapter.jdbc/src/main/java/net/wotonomy/jdbcadaptor/JDBCAdaptor.java
@@ -34,7 +34,7 @@ public class JDBCAdaptor extends EOAdaptor {
 
 	protected EOSQLExpressionFactory _expressionFactory;
 	protected String _driverName;
-	protected NSDictionary _jdbcInfo;
+	protected NSDictionary<String, String> _jdbcInfo;
 
 	/**
 	 * Creates a new instance.
@@ -45,14 +45,15 @@ public class JDBCAdaptor extends EOAdaptor {
 		super(name);
 	}
 
-	public void setConnectionDictionary(NSDictionary dict) {
+	@SuppressWarnings("unchecked")
+	public void setConnectionDictionary(NSDictionary<String, Object> dict) {
 		super.setConnectionDictionary(dict);
 		if (dict.objectForKey("driver") != null)
 			_driverName = (String) dict.objectForKey("driver");
 		else
 			throw new JDBCAdaptorException("Connection dictionary must have a 'driver' key.", null);
 		if (dict.objectForKey("jdbc2Info") != null)
-			_jdbcInfo = (NSDictionary) dict.objectForKey("jdbc2Info");
+			_jdbcInfo = (NSDictionary<String, String>) dict.objectForKey("jdbc2Info");
 		else
 			throw new JDBCAdaptorException("Connection dictionary must have a 'jdbc2Info' key.", null);
 	}
@@ -85,7 +86,7 @@ public class JDBCAdaptor extends EOAdaptor {
 	 * 
 	 * @see net.wotonomy.access.EOAdaptor#defaultExpressionClass()
 	 */
-	public Class defaultExpressionClass() {
+	public Class<JDBCExpression> defaultExpressionClass() {
 		return JDBCExpression.class;
 	}
 
@@ -115,7 +116,7 @@ public class JDBCAdaptor extends EOAdaptor {
 		return _driverName;
 	}
 
-	public NSDictionary jdbcInfo() {
+	public NSDictionary<String, String> jdbcInfo() {
 		return _jdbcInfo;
 	}
 
diff --git a/projects/net.wotonomy.persistence.adapter.jdbc/src/main/java/net/wotonomy/jdbcadaptor/JDBCAdaptorException.java b/projects/net.wotonomy.persistence.adapter.jdbc/src/main/java/net/wotonomy/jdbcadaptor/JDBCAdaptorException.java
index 412c0a1..ea9df38 100644
--- a/projects/net.wotonomy.persistence.adapter.jdbc/src/main/java/net/wotonomy/jdbcadaptor/JDBCAdaptorException.java
+++ b/projects/net.wotonomy.persistence.adapter.jdbc/src/main/java/net/wotonomy/jdbcadaptor/JDBCAdaptorException.java
@@ -29,7 +29,7 @@ import net.wotonomy.access.EOGeneralAdaptorException;
  * @version $Revision: 903 $
  */
 public class JDBCAdaptorException extends EOGeneralAdaptorException {
-
+	private static final long serialVersionUID = -2677311934036267760L;
 	protected SQLException _sqlException;
 
 	/**
@@ -38,6 +38,7 @@ public class JDBCAdaptorException extends EOGeneralAdaptorException {
 	 */
 	public JDBCAdaptorException(String msg, SQLException sqlex) {
 		super(msg);
+		initCause(sqlex);
 		_sqlException = sqlex;
 	}
 
@@ -47,6 +48,7 @@ public class JDBCAdaptorException extends EOGeneralAdaptorException {
 	 */
 	public JDBCAdaptorException(SQLException sqlex) {
 		super(sqlex.getMessage());
+		initCause(sqlex);
 		_sqlException = sqlex;
 	}
 
diff --git a/projects/net.wotonomy.persistence.adapter.jdbc/src/main/java/net/wotonomy/jdbcadaptor/JDBCContext.java b/projects/net.wotonomy.persistence.adapter.jdbc/src/main/java/net/wotonomy/jdbcadaptor/JDBCContext.java
index 9e6df6c..87c33fe 100644
--- a/projects/net.wotonomy.persistence.adapter.jdbc/src/main/java/net/wotonomy/jdbcadaptor/JDBCContext.java
+++ b/projects/net.wotonomy.persistence.adapter.jdbc/src/main/java/net/wotonomy/jdbcadaptor/JDBCContext.java
@@ -25,6 +25,7 @@ import java.sql.SQLException;
 import net.wotonomy.access.EOAdaptor;
 import net.wotonomy.access.EOAdaptorChannel;
 import net.wotonomy.access.EOAdaptorContext;
+import net.wotonomy.foundation.NSDictionary;
 
 /**
  * Concrete implementation of EOAdaptorContext for use with JDBC.
@@ -51,11 +52,14 @@ public class JDBCContext extends EOAdaptorContext {
 			if (_jdbcConnection != null && !_jdbcConnection.isClosed())
 				throw new JDBCAdaptorException("Attempt to connect when already connected.", null);
 			Class.forName(((JDBCAdaptor) adaptor()).driverName());
-			String url = (String) adaptor().connectionDictionary().objectForKey("URL");
+			NSDictionary<String, Object> connectionDictionary = adaptor().connectionDictionary();
+			String url = (String) connectionDictionary.objectForKey("URL");
 			Driver driver = DriverManager.getDriver(url);
 			java.util.Properties props = new java.util.Properties();
-			props.setProperty("user", (String) adaptor().connectionDictionary().objectForKey("username"));
-			props.setProperty("password", (String) adaptor().connectionDictionary().objectForKey("password"));
+			if (connectionDictionary.containsKey("username"))
+				props.setProperty("user", (String) connectionDictionary.objectForKey("username"));
+			if (connectionDictionary.containsKey("password"))
+				props.setProperty("password", (String) connectionDictionary.objectForKey("password"));
 			_jdbcConnection = driver.connect(url, props);
 			_jdbcConnection.setAutoCommit(false);
 		} catch (SQLException ex) {
diff --git a/projects/net.wotonomy.persistence.adapter.jdbc/src/main/java/net/wotonomy/jdbcadaptor/SimpleJDBCObjectStore.java b/projects/net.wotonomy.persistence.adapter.jdbc/src/main/java/net/wotonomy/jdbcadaptor/SimpleJDBCObjectStore.java
new file mode 100644
index 0000000..67bbc0c
--- /dev/null
+++ b/projects/net.wotonomy.persistence.adapter.jdbc/src/main/java/net/wotonomy/jdbcadaptor/SimpleJDBCObjectStore.java
@@ -0,0 +1,69 @@
+package net.wotonomy.jdbcadaptor;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import net.wotonomy.control.AbstractObjectStore;
+import net.wotonomy.control.EOEditingContext;
+import net.wotonomy.control.EOFetchSpecification;
+import net.wotonomy.control.EOGlobalID;
+import net.wotonomy.control.EOObjectStore;
+import net.wotonomy.foundation.NSArray;
+import net.wotonomy.foundation.internal.WotonomyException;
+
+/**
+ * A simple EOObjectStore that uses JDBC
+ * @author bjculkin
+ *
+ */
+public class SimpleJDBCObjectStore extends AbstractObjectStore {
+
+	@Override
+	protected Comparable timestampForData(Map aDataMap) {
+		return null;
+	}
+
+	@Override
+	protected EOGlobalID globalIDForData(Map aDataMap) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	protected String entityForGlobalIDOrObject(EOGlobalID aGlobalID, Object anObject) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	protected Collection changedKeysForObject(Object anObject) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	protected Map readObject(EOGlobalID aGlobalID, Collection keys) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	protected Map insertObject(EOGlobalID aGlobalID, Map aDataMap) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	protected Object updateObject(EOGlobalID aGlobalID, Map aDataMap) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	protected Object deleteObject(EOGlobalID aGlobalID) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
diff --git a/projects/net.wotonomy.persistence.adapter.jdbc/src/test/java/net/wotonomy/jdbcadaptor/JDBCDBTest.java b/projects/net.wotonomy.persistence.adapter.jdbc/src/test/java/net/wotonomy/jdbcadaptor/JDBCDBTest.java
new file mode 100644
index 0000000..5af3bff
--- /dev/null
+++ b/projects/net.wotonomy.persistence.adapter.jdbc/src/test/java/net/wotonomy/jdbcadaptor/JDBCDBTest.java
@@ -0,0 +1,89 @@
+package net.wotonomy.jdbcadaptor;
+
+import java.sql.SQLException;
+
+import junit.framework.TestCase;
+import net.wotonomy.access.EODatabase;
+import net.wotonomy.access.EODatabaseContext;
+import net.wotonomy.control.EOClassDescription;
+import net.wotonomy.control.EOEditingContext;
+import net.wotonomy.control.EOTemporaryGlobalID;
+import net.wotonomy.foundation.NSDictionary;
+
+public class JDBCDBTest extends TestCase {
+	public void testJDBCContextH2() throws SQLException, ClassNotFoundException {
+		String jdbcURL = "jdbc:h2:mem:test";
+		
+		// Feels a bit weird not to put anything here, but I don't think we need to
+		NSDictionary<String, String> jdbcInfo = new NSDictionary<>();
+		
+		NSDictionary<String, Object> connDict = new NSDictionary<>();
+		connDict.put("driver", "org.h2.Driver");
+		connDict.put("jdbc2Info", jdbcInfo);
+		connDict.put("URL", jdbcURL);
+		JDBCAdaptor adaptor = new JDBCAdaptor("JDBC");
+		adaptor.setConnectionDictionary(connDict);
+		adaptor.assertConnectionDictionaryIsValid();
+		
+		EODatabase db = new EODatabase(adaptor);
+		EODatabaseContext dbCtx = new EODatabaseContext(db);
+		((JDBCContext)dbCtx.adaptorContext()).connect();
+		
+		EOEditingContext editCtx = new EOEditingContext(dbCtx);
+		
+		EOClassDescription<Person> personDesc = EOClassDescription.classDescriptionForClass(Person.class);
+		EOTemporaryGlobalID tempGID = new EOTemporaryGlobalID();
+		Person person = personDesc.createInstanceWithEditingContext(editCtx, tempGID);
+		
+		person.setFirstName("John");
+		person.setLastName("Doe");
+		person.setAge(25);
+		
+		editCtx.saveChanges();
+		
+		Person newPerson = (Person) editCtx.objectForGlobalID(tempGID);
+		assertEquals(person, newPerson);
+	}
+	
+	public void testJDBCContextPostgres() throws SQLException, ClassNotFoundException {
+		String jdbcURL = "jdbc:postgresql:wotonomy";
+		
+		// Feels a bit weird not to put anything here, but I don't think we need to
+		NSDictionary<String, String> jdbcInfo = new NSDictionary<>();
+		
+		NSDictionary<String, Object> connDict = new NSDictionary<>();
+		connDict.put("driver", "org.postgresql.Driver");
+		connDict.put("jdbc2Info", jdbcInfo);
+		connDict.put("URL", jdbcURL);
+		connDict.put("username", "wotonomy");
+		connDict.put("password", "wotonomy");
+		
+		JDBCAdaptor adaptor = new JDBCAdaptor("JDBC");
+		adaptor.setConnectionDictionary(connDict);
+		adaptor.assertConnectionDictionaryIsValid();
+		
+		EODatabase db = new EODatabase(adaptor);
+		EODatabaseContext dbCtx = new EODatabaseContext(db);
+		((JDBCContext)dbCtx.adaptorContext()).connect();
+		
+		EOEditingContext editCtx = new EOEditingContext(dbCtx);
+		
+		EOClassDescription<Person> personDesc = EOClassDescription.classDescriptionForClass(Person.class);
+		
+		EOTemporaryGlobalID tempGID = new EOTemporaryGlobalID();
+		Person person = personDesc.createInstanceWithEditingContext(editCtx, tempGID);
+		
+		person.setFirstName("John");
+		person.setLastName("Doe");
+		person.setAge(25);
+		
+		editCtx.saveChanges();
+		editCtx.invalidateAllObjects();
+
+		((JDBCContext)dbCtx.adaptorContext()).commitTransaction();
+		//editCtx.reset();
+		
+		Person newPerson = (Person) editCtx.objectForGlobalID(tempGID);
+		assertEquals(person, newPerson);
+	}
+}
\ No newline at end of file
diff --git a/projects/net.wotonomy.persistence.adapter.jdbc/src/test/java/net/wotonomy/jdbcadaptor/Person.java b/projects/net.wotonomy.persistence.adapter.jdbc/src/test/java/net/wotonomy/jdbcadaptor/Person.java
new file mode 100644
index 0000000..d42c77c
--- /dev/null
+++ b/projects/net.wotonomy.persistence.adapter.jdbc/src/test/java/net/wotonomy/jdbcadaptor/Person.java
@@ -0,0 +1,59 @@
+package net.wotonomy.jdbcadaptor;
+
+import java.util.Objects;
+
+public class Person {
+	private String firstName;
+	private String lastName;
+	
+	private int age;
+
+	public String getFirstName() {
+		return firstName;
+	}
+
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+
+	public String getLastName() {
+		return lastName;
+	}
+
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+
+	public int getAge() {
+		return age;
+	}
+
+	public void setAge(int age) {
+		this.age = age;
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(age, firstName, lastName);
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		Person other = (Person) obj;
+		return age == other.age && Objects.equals(firstName, other.firstName)
+				&& Objects.equals(lastName, other.lastName);
+	}
+
+	@Override
+	public String toString() {
+		return "Person [firstName=" + firstName + ", lastName=" + lastName + ", age=" + age + "]";
+	}
+	
+	
+}
\ No newline at end of file
diff --git a/projects/net.wotonomy.persistence/pom.xml b/projects/net.wotonomy.persistence/pom.xml
index 983e859..13bb0c3 100644
--- a/projects/net.wotonomy.persistence/pom.xml
+++ b/projects/net.wotonomy.persistence/pom.xml
@@ -9,6 +9,9 @@
 	<artifactId>wotonomy-persistence</artifactId>
 	<name>Wotonomy - Persistence</name>
 	<packaging>jar</packaging>
+	<properties>
+		<maven.compiler.release>11</maven.compiler.release>
+	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
@@ -22,6 +25,15 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.13.0</version>
+			</plugin>
+		</plugins>
+	</build>
 	<reporting>
 		<plugins>
 			<plugin>
diff --git a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/access/EOAdaptor.java b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/access/EOAdaptor.java
index 17d6454..8624458 100644
--- a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/access/EOAdaptor.java
+++ b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/access/EOAdaptor.java
@@ -35,10 +35,11 @@ import net.wotonomy.foundation.NSTimestamp;
 public abstract class EOAdaptor {
 
 	protected String _name;
-	protected NSDictionary _connectionDictionary = NSDictionary.EmptyDictionary;
-	protected NSMutableArray _contexts = new NSMutableArray();
-	protected Class _expressionClass;
-	private static NSMutableDictionary _expressionClassesByName = new NSMutableDictionary();
+	@SuppressWarnings("unchecked")
+	protected NSDictionary<String, Object> _connectionDictionary = (NSDictionary<String, Object>) NSDictionary.EmptyDictionary;
+	protected NSMutableArray<Object> _contexts = new NSMutableArray<>();
+	protected Class<? extends EOSQLExpression> _expressionClass;
+	private static NSMutableDictionary<String, String> _expressionClassesByName = new NSMutableDictionary<>();
 
 	public EOAdaptor(String name) {
 		super();
@@ -75,8 +76,9 @@ public abstract class EOAdaptor {
 	 * @param name The name of the adaptor, or a fully qualified class name.
 	 * @return
 	 */
+	@SuppressWarnings("unchecked")
 	public static EOAdaptor adaptorWithName(String name) {
-		Class adaptorClass = null;
+		Class<? extends EOAdaptor> adaptorClass = null;
 		String cname = null;
 		if (name.endsWith("Adaptor") && name.indexOf('.') > 0) {
 			cname = name;
@@ -88,15 +90,15 @@ public abstract class EOAdaptor {
 			cname = "net.wotonomy." + name.toLowerCase() + "adaptor." + name + "Adaptor";
 		}
 		try {
-			adaptorClass = Class.forName(cname);
+			adaptorClass = (Class<? extends EOAdaptor>) Class.forName(cname);
 		} catch (ClassNotFoundException ex) {
 			throw new IllegalArgumentException("Cannot find class named " + name);
 		}
 		EOAdaptor adaptor = null;
-		java.lang.reflect.Constructor callme = null;
+		java.lang.reflect.Constructor<? extends EOAdaptor> callme = null;
 		try {
 			callme = adaptorClass.getConstructor(new Class[] { String.class });
-			adaptor = (EOAdaptor) callme.newInstance((Object[]) new String[] { name });
+			adaptor = callme.newInstance((Object[]) new String[] { name });
 		} catch (ClassCastException ex) {
 			throw new IllegalArgumentException(
 					"Class " + adaptorClass.getName() + " must inherit from net.wotonomy.access.EOAdaptor");
@@ -130,13 +132,13 @@ public abstract class EOAdaptor {
 	}
 
 	public void assignExternalInfoForEntireModel(EOModel model) {
-		NSArray ents = model.entities();
+		NSArray<EOEntity> ents = model.entities();
 		for (int i = 0; i < ents.count(); i++) {
-			EOEntity e = (EOEntity) ents.objectAtIndex(i);
+			EOEntity e = ents.objectAtIndex(i);
 			// TODO: check that entity is not a prototypes entity
-			NSArray atts = e.attributes();
+			NSArray<EOAttribute> atts = e.attributes();
 			for (int j = 0; j < atts.count(); j++) {
-				EOAttribute a = (EOAttribute) atts.objectAtIndex(i);
+				EOAttribute a = atts.objectAtIndex(i);
 				assignExternalInfoForAttribute(a);
 			}
 			assignExternalInfoForEntity(e);
@@ -144,7 +146,7 @@ public abstract class EOAdaptor {
 	}
 
 	public boolean canServiceModel(EOModel model) {
-		NSDictionary mcd = model.connectionDictionary();
+		NSDictionary<String, Object> mcd = model.connectionDictionary();
 		if (mcd == null && _connectionDictionary == null)
 			return true;
 		if (mcd == null || _connectionDictionary == null)
@@ -152,35 +154,36 @@ public abstract class EOAdaptor {
 		return mcd.equals(_connectionDictionary);
 	}
 
-	public void setConnectionDictionary(NSDictionary connection) {
+	public void setConnectionDictionary(NSDictionary<String, Object> connection) {
 		_connectionDictionary = connection;
 	}
 
-	public NSDictionary connectionDictionary() {
+	public NSDictionary<String, Object> connectionDictionary() {
 		return _connectionDictionary;
 	}
 
-	public NSArray contexts() {
-		return new NSArray(_contexts);
+	public NSArray<Object> contexts() {
+		return new NSArray<>(_contexts);
 	}
 
 	public abstract void assertConnectionDictionaryIsValid();
 
 	public abstract EOAdaptorContext createAdaptorContext();
 
-	public abstract Class defaultExpressionClass();
+	public abstract Class<? extends EOSQLExpression> defaultExpressionClass();
 
 	public abstract EOSQLExpressionFactory expressionFactory();
 
 	public abstract boolean isValidQualifierType(String typeName, EOModel model);
 
-	public Class expressionClass() {
+	@SuppressWarnings("unchecked")
+	public Class<? extends EOSQLExpression> expressionClass() {
 		if (_expressionClass != null)
 			return _expressionClass;
 		String cname = expressionClassName(name());
 		if (cname != null) {
 			try {
-				_expressionClass = Class.forName(cname);
+				_expressionClass = (Class<? extends EOSQLExpression>) Class.forName(cname);
 			} catch (ClassNotFoundException ex) {
 				throw new IllegalStateException("Cannot find expression class named " + cname);
 			}
@@ -188,7 +191,7 @@ public abstract class EOAdaptor {
 		return defaultExpressionClass();
 	}
 
-	public NSArray externalTypesWithModel(EOModel model) {
+	public NSArray<?> externalTypesWithModel(EOModel model) {
 		return NSArray.EmptyArray;
 	}
 
@@ -252,7 +255,7 @@ public abstract class EOAdaptor {
 		return _name;
 	}
 
-	public NSArray prototypeAttributes() {
+	public NSArray<?> prototypeAttributes() {
 		return NSArray.EmptyArray;
 	}
 
diff --git a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/access/EOAdaptorChannel.java b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/access/EOAdaptorChannel.java
index 44b3401..13c914c 100644
--- a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/access/EOAdaptorChannel.java
+++ b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/access/EOAdaptorChannel.java
@@ -42,7 +42,7 @@ public abstract class EOAdaptorChannel {
 		return _context;
 	}
 
-	public void addStoredProceduresNamed(NSArray names, EOModel model) {
+	public void addStoredProceduresNamed(NSArray<String> names, EOModel model) {
 	}
 
 	public abstract NSArray attributesToFetch();
diff --git a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/access/EODatabase.java b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/access/EODatabase.java
index a995290..b98b148 100644
--- a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/access/EODatabase.java
+++ b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/access/EODatabase.java
@@ -28,7 +28,7 @@ import net.wotonomy.foundation.NSMutableDictionary;
 import net.wotonomy.foundation.NSTimestamp;
 
 /**
- *
+ * 
  * @author ezamudio@nasoft.com
  * @author $Author: cgruber $
  * @version $Revision: 894 $
diff --git a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/access/EODatabaseContext.java b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/access/EODatabaseContext.java
index 6ee58a5..9cf6721 100644
--- a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/access/EODatabaseContext.java
+++ b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/access/EODatabaseContext.java
@@ -42,40 +42,57 @@ import net.wotonomy.foundation.NSMutableArray;
 import net.wotonomy.foundation.NSMutableDictionary;
 
 /**
- *
+ * Represents an EOObjectStore that connects to an EODatabase
  * @author ezamudio@nasoft.com
  * @author $Author: cgruber $
  * @version $Revision: 894 $
  */
 public class EODatabaseContext extends EOCooperatingObjectStore implements NSLocking {
 
-	private static Class _contextClass;
+	private static Class<? extends EODatabaseContext> _contextClass;
 	protected EODatabase _database;
 	protected EOAdaptorContext _context;
 	protected NSMutableArray _channels = new NSMutableArray();
 	protected NSMutableArray _lockedObjects = new NSMutableArray();
 
-	protected NSMutableDictionary _simpleSnaps;
+	protected NSMutableDictionary<EOGlobalID, NSDictionary> _simpleSnaps;
 	protected NSMutableDictionary _manySnaps;
 
 	protected EOObjectStoreCoordinator _coordinator;
 	protected EOEditingContext _currEC;
 	protected int _updateStrategy;
 
+	/**
+	 * Create an EODatabaseContext backed by the given EODatabase
+	 * 
+	 * @param database The database
+	 */
 	public EODatabaseContext(EODatabase database) {
 		super();
 		_database = database;
 		_context = _database.adaptor().createAdaptorContext();
 	}
 
+	/**
+	 * Retrieve the EOAdaptorContext for this context
+	 * @return The EOAdaptorContext
+	 */
 	public EOAdaptorContext adaptorContext() {
 		return _context;
 	}
 
+	/**
+	 * Retrieve the EODatabase for this context
+	 * @return The EODatabase for this context
+	 */
 	public EODatabase database() {
 		return _database;
 	}
 
+	/**
+	 * Retrieve an available EODatabaseChannel for this context
+	 * @return An available EODatabaseChannel
+	 */
 	public EODatabaseChannel availableChannel() {
 		for (int i = 0; i < _channels.count(); i++) {
 			EODatabaseChannel c = (EODatabaseChannel) _channels.objectAtIndex(i);
@@ -88,13 +105,22 @@ public class EODatabaseContext extends EOCooperatingObjectStore implements NSLoc
 	}
 
 	public void batchFetchRelationship(EORelationship rel, NSArray arr, EOEditingContext ec) {
+		// TODO should this do something?
 	}
 
-	public static void setContextClassToRegister(Class contextClass) {
+	/**
+	 * Set the context class
+	 * @param contextClass The context class
+	 */
+	public static void setContextClassToRegister(Class<? extends EODatabaseContext> contextClass) {
 		_contextClass = contextClass;
 	}
 
-	public static Class contextClassToRegister() {
+	/**
+	 * Retrieve the context class
+	 * @return
+	 */
+	public static Class<? extends EODatabaseContext> contextClassToRegister() {
 		if (_contextClass == null)
 			_contextClass = EODatabaseContext.class;
 		return _contextClass;
@@ -104,12 +130,14 @@ public class EODatabaseContext extends EOCooperatingObjectStore implements NSLoc
 		return _coordinator;
 	}
 
+	@Override
 	public void editingContextDidForgetObjectWithGlobalID(EOEditingContext ec, EOGlobalID gid) {
 		database().decrementSnapshotCountForGlobalID(gid);
 	}
 
 	public void handleDroppedConnection() {
 		// TODO: unregister channels
+		
 		adaptorContext().handleDroppedConnection();
 	}
 
@@ -119,6 +147,7 @@ public class EODatabaseContext extends EOCooperatingObjectStore implements NSLoc
 	 * @see net.wotonomy.control.EOCooperatingObjectStore#ownsGlobalID(net.wotonomy.
 	 * control.EOGlobalID)
 	 */
+	@Override
 	public boolean ownsGlobalID(EOGlobalID gid) {
 		if (!(gid instanceof EOKeyGlobalID))
 			return false;
@@ -132,6 +161,7 @@ public class EODatabaseContext extends EOCooperatingObjectStore implements NSLoc
 	 * net.wotonomy.control.EOCooperatingObjectStore#ownsObject(net.wotonomy.control
 	 * .EOEnterpriseObject)
 	 */
+	@Override
 	public boolean ownsObject(EOEnterpriseObject eo) {
 		if (eo.entityName() == null)
 			return false;
@@ -145,6 +175,7 @@ public class EODatabaseContext extends EOCooperatingObjectStore implements NSLoc
 	 * net.wotonomy.control.EOCooperatingObjectStore#handlesFetchSpecification(net.
 	 * wotonomy.control.EOFetchSpecification)
 	 */
+	@Override
 	public boolean handlesFetchSpecification(EOFetchSpecification fspec) {
 		String ename = fspec.entityName();
 		return (database().entityNamed(ename) != null);
@@ -162,6 +193,7 @@ public class EODatabaseContext extends EOCooperatingObjectStore implements NSLoc
 	 * net.wotonomy.control.EOObjectStoreCoordinator,
 	 * net.wotonomy.control.EOEditingContext)
 	 */
+	@Override
 	public void prepareForSaveWithCoordinator(EOObjectStoreCoordinator coord, EOEditingContext ec) {
 		// TODO Auto-generated method stub
 		_coordinator = coord;
@@ -174,6 +206,7 @@ public class EODatabaseContext extends EOCooperatingObjectStore implements NSLoc
 	 * @see
 	 * net.wotonomy.control.EOCooperatingObjectStore#recordChangesInEditingContext()
 	 */
+	@Override
 	public void recordChangesInEditingContext() {
 		// TODO insert, delete, update
 	}
@@ -184,6 +217,7 @@ public class EODatabaseContext extends EOCooperatingObjectStore implements NSLoc
 	 * @see net.wotonomy.control.EOCooperatingObjectStore#recordUpdateForObject(net.
 	 * wotonomy.control.EOEnterpriseObject, net.wotonomy.foundation.NSDictionary)
 	 */
+	@Override
 	public void recordUpdateForObject(EOEnterpriseObject eo, NSDictionary changes) {
 		// TODO Auto-generated method stub
 	}
@@ -205,7 +239,7 @@ public class EODatabaseContext extends EOCooperatingObjectStore implements NSLoc
 		d.setObjectForKey(gids, relationName);
 	}
 
-	public void recordSnapshots(NSDictionary snaps) {
+	public void recordSnapshots(NSDictionary<EOGlobalID, NSDictionary> snaps) {
 		if (_simpleSnaps == null)
 			throw new IllegalArgumentException("Attempt to record snapshots without a transaction in progress.");
 		_simpleSnaps.addEntriesFromDictionary(snaps);
@@ -220,7 +254,7 @@ public class EODatabaseContext extends EOCooperatingObjectStore implements NSLoc
 	public void recordToManySnapshots(NSDictionary snaps) {
 		if (_manySnaps == null)
 			throw new IllegalArgumentException("Attempt to record snapshots without a transaction in progress.");
-		Enumeration enumeration = snaps.keyEnumerator();
+		Enumeration<Object> enumeration = snaps.keyEnumerator();
 		while (enumeration.hasMoreElements()) {
 			Object key = enumeration.nextElement();
 			NSDictionary d = (NSDictionary) snaps.objectForKey(key);
@@ -239,9 +273,9 @@ public class EODatabaseContext extends EOCooperatingObjectStore implements NSLoc
 	 * 
 	 * @see net.wotonomy.control.EOCooperatingObjectStore#performChanges()
 	 */
+	@Override
 	public void performChanges() {
 		// TODO Auto-generated method stub
-
 	}
 
 	/*
@@ -249,6 +283,7 @@ public class EODatabaseContext extends EOCooperatingObjectStore implements NSLoc
 	 * 
 	 * @see net.wotonomy.control.EOCooperatingObjectStore#commitChanges()
 	 */
+	@Override
 	public void commitChanges() {
 		adaptorContext().commitTransaction();
 	}
@@ -258,6 +293,7 @@ public class EODatabaseContext extends EOCooperatingObjectStore implements NSLoc
 	 * 
 	 * @see net.wotonomy.control.EOCooperatingObjectStore#rollbackChanges()
 	 */
+	@Override
 	public void rollbackChanges() {
 		adaptorContext().rollbackTransaction();
 	}
@@ -269,6 +305,7 @@ public class EODatabaseContext extends EOCooperatingObjectStore implements NSLoc
 	 * net.wotonomy.control.EOCooperatingObjectStore#valuesForKeys(net.wotonomy.
 	 * foundation.NSArray, net.wotonomy.control.EOEnterpriseObject)
 	 */
+	@Override
 	public NSDictionary valuesForKeys(NSArray keys, EOEnterpriseObject eo) {
 		// TODO check snapshots; eo could be a fault
 		return eo.valuesForKeys(keys);
@@ -279,6 +316,7 @@ public class EODatabaseContext extends EOCooperatingObjectStore implements NSLoc
 	 * 
 	 * @see net.wotonomy.foundation.NSLocking#lock()
 	 */
+	@Override
 	public void lock() {
 		EOAccessLock.lock();
 	}
@@ -288,6 +326,7 @@ public class EODatabaseContext extends EOCooperatingObjectStore implements NSLoc
 	 * 
 	 * @see net.wotonomy.foundation.NSLocking#unlock()
 	 */
+	@Override
 	public void unlock() {
 		EOAccessLock.unlock();
 	}
@@ -299,6 +338,7 @@ public class EODatabaseContext extends EOCooperatingObjectStore implements NSLoc
 	 * net.wotonomy.control.EOObjectStore#arrayFaultWithSourceGlobalID(net.wotonomy.
 	 * control.EOGlobalID, java.lang.String, net.wotonomy.control.EOEditingContext)
 	 */
+	@Override
 	public NSArray arrayFaultWithSourceGlobalID(EOGlobalID gid, String relName, EOEditingContext ec) {
 		if (!(gid instanceof EOKeyGlobalID))
 			throw new IllegalArgumentException("an EOKeyGlobalID is needed.");
@@ -313,6 +353,7 @@ public class EODatabaseContext extends EOCooperatingObjectStore implements NSLoc
 	 * net.wotonomy.control.EOObjectStore#faultForGlobalID(net.wotonomy.control.
 	 * EOGlobalID, net.wotonomy.control.EOEditingContext)
 	 */
+	@Override
 	public /* EOEnterpriseObject */Object faultForGlobalID(EOGlobalID gid, EOEditingContext ec) {
 		if (!(gid instanceof EOKeyGlobalID))
 			throw new IllegalArgumentException("Cannot fault an object that doesn't have a key global ID.");
@@ -329,6 +370,7 @@ public class EODatabaseContext extends EOCooperatingObjectStore implements NSLoc
 	 * @see net.wotonomy.control.EOObjectStore#faultForRawRow(java.util.Map,
 	 * java.lang.String, net.wotonomy.control.EOEditingContext)
 	 */
+	@Override
 	public /* EOEnterpriseObject */ Object faultForRawRow(Map row, String entityName, EOEditingContext ec) {
 		EOEntity e = database().entityNamed(entityName);
 		EOGlobalID gid = e.globalIDForRow(row);
@@ -342,9 +384,9 @@ public class EODatabaseContext extends EOCooperatingObjectStore implements NSLoc
 		_manySnaps.removeObjectForKey(gid);
 	}
 
-	public void forgetSnapshotsForGlobalIDs(List gids) {
+	public void forgetSnapshotsForGlobalIDs(List<EOGlobalID> gids) {
 		for (int i = 0; i < gids.size(); i++) {
-			EOGlobalID g = (EOGlobalID) gids.get(i);
+			EOGlobalID g = gids.get(i);
 			forgetSnapshotForGlobalID(g);
 			database().forgetSnapshotForGlobalID(g);
 		}
@@ -356,6 +398,7 @@ public class EODatabaseContext extends EOCooperatingObjectStore implements NSLoc
 	 * @see net.wotonomy.control.EOObjectStore#initializeObject(java.lang.Object,
 	 * net.wotonomy.control.EOGlobalID, net.wotonomy.control.EOEditingContext)
 	 */
+	@Override
 	public void initializeObject(/* EOEnterpriseObject */Object eo, EOGlobalID gid, EOEditingContext ec) {
 		if (gid.isTemporary())
 			return;
@@ -398,6 +441,7 @@ public class EODatabaseContext extends EOCooperatingObjectStore implements NSLoc
 	 * 
 	 * @see net.wotonomy.control.EOObjectStore#invalidateAllObjects()
 	 */
+	@Override
 	public void invalidateAllObjects() {
 		invalidateObjectsWithGlobalIDs(database().snapshots().allKeys());
 	}
@@ -409,6 +453,7 @@ public class EODatabaseContext extends EOCooperatingObjectStore implements NSLoc
 	 * net.wotonomy.control.EOObjectStore#invalidateObjectsWithGlobalIDs(java.util.
 	 * List)
 	 */
+	@Override
 	public void invalidateObjectsWithGlobalIDs(List aList) {
 		forgetSnapshotsForGlobalIDs(aList);
 	}
@@ -420,6 +465,7 @@ public class EODatabaseContext extends EOCooperatingObjectStore implements NSLoc
 	 * net.wotonomy.control.EOObjectStore#isObjectLockedWithGlobalID(net.wotonomy.
 	 * control.EOGlobalID, net.wotonomy.control.EOEditingContext)
 	 */
+	@Override
 	public boolean isObjectLockedWithGlobalID(EOGlobalID gid, EOEditingContext ec) {
 		return isObjectLockedWithGlobalID(gid);
 	}
@@ -434,6 +480,7 @@ public class EODatabaseContext extends EOCooperatingObjectStore implements NSLoc
 	 * @see net.wotonomy.control.EOObjectStore#lockObjectWithGlobalID(net.wotonomy.
 	 * control.EOGlobalID, net.wotonomy.control.EOEditingContext)
 	 */
+	@Override
 	public void lockObjectWithGlobalID(EOGlobalID gid, EOEditingContext ec) {
 		NSDictionary snap = snapshotForGlobalID(gid);
 		if (snap == null)
@@ -456,6 +503,7 @@ public class EODatabaseContext extends EOCooperatingObjectStore implements NSLoc
 	 * net.wotonomy.control.EOObjectStore#objectsForSourceGlobalID(net.wotonomy.
 	 * control.EOGlobalID, java.lang.String, net.wotonomy.control.EOEditingContext)
 	 */
+	@Override
 	public NSArray objectsForSourceGlobalID(EOGlobalID gid, String relationName, EOEditingContext ec) {
 		EOEnterpriseObject eo = (EOEnterpriseObject) ec.objectForGlobalID(gid);
 		if (eo == null)
@@ -515,6 +563,7 @@ public class EODatabaseContext extends EOCooperatingObjectStore implements NSLoc
 	 * net.wotonomy.control.EOObjectStore#objectsWithFetchSpecification(net.wotonomy
 	 * .control.EOFetchSpecification, net.wotonomy.control.EOEditingContext)
 	 */
+	@Override
 	public NSArray objectsWithFetchSpecification(EOFetchSpecification fspec, EOEditingContext ec) {
 		EODatabaseChannel channel = availableChannel();
 		channel.selectObjectsWithFetchSpecification(fspec, ec);
@@ -534,6 +583,7 @@ public class EODatabaseContext extends EOCooperatingObjectStore implements NSLoc
 	 * @see net.wotonomy.control.EOObjectStore#refaultObject(java.lang.Object,
 	 * net.wotonomy.control.EOGlobalID, net.wotonomy.control.EOEditingContext)
 	 */
+	@Override
 	public void refaultObject(Object obj, EOGlobalID gid, EOEditingContext ec) {
 		if (!(gid instanceof EOKeyGlobalID))
 			throw new IllegalArgumentException("GlobalID must be an EOKeyGlobalID");
@@ -551,6 +601,7 @@ public class EODatabaseContext extends EOCooperatingObjectStore implements NSLoc
 	 * net.wotonomy.control.EOObjectStore#saveChangesInEditingContext(net.wotonomy.
 	 * control.EOEditingContext)
 	 */
+	@Override
 	public void saveChangesInEditingContext(EOEditingContext ec) {
 		prepareForSaveWithCoordinator(null, ec);
 		recordChangesInEditingContext();
diff --git a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/AbstractObjectStore.java b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/AbstractObjectStore.java
index 1989582..d47d86b 100644
--- a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/AbstractObjectStore.java
+++ b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/AbstractObjectStore.java
@@ -70,18 +70,19 @@ public abstract class AbstractObjectStore extends EOObjectStore {
 	/**
 	 * This implementation returns an appropriately configured array fault.
 	 */
-	public NSArray arrayFaultWithSourceGlobalID(EOGlobalID aGlobalID, String aRelationship, EOEditingContext aContext) { // System.out.println(
-																															// "arrayFaultWithSourceGlobalID:
-																															// "
-																															// +
-																															// aGlobalID
-																															// +
-																															// "
-																															// :
-																															// "
-																															// +
-																															// aRelationship
-																															// );
+	public NSArray arrayFaultWithSourceGlobalID(EOGlobalID aGlobalID, String aRelationship, EOEditingContext aContext) {
+		// System.out.println(
+		// "arrayFaultWithSourceGlobalID:
+		// "
+		// +
+		// aGlobalID
+		// +
+		// "
+		// :
+		// "
+		// +
+		// aRelationship
+		// );
 		return new ArrayFault(aGlobalID, aRelationship, aContext);
 	}
 
diff --git a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOClassDescription.java b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOClassDescription.java
index 79019de..c4425cb 100644
--- a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOClassDescription.java
+++ b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOClassDescription.java
@@ -36,7 +36,7 @@ import net.wotonomy.foundation.internal.WotonomyException;
  * The default implementation works for most well-formed java beans, but you
  * will want to create your own subclass most typically to customize the toOne
  * and toMany relationships for your class to ensure that an entire graph of
- * objects is not persisted in order to perist a single object. <br>
+ * objects is not persisted in order to persist a single object. <br>
  * <br>
  *
  * The easiest way to register your subclass is to create it in the same package
@@ -53,7 +53,7 @@ import net.wotonomy.foundation.internal.WotonomyException;
  * @author $Author: cgruber $
  * @version $Revision: 900 $
  */
-public class EOClassDescription {
+public class EOClassDescription<C> {
 	/**
 	 * A delete rule specifying that object(s) that reference this object should
 	 * have those references set to null when this object is deleted.
@@ -67,7 +67,7 @@ public class EOClassDescription {
 	public static final int DeleteRuleCascade = 1;
 
 	/**
-	 * A delete rule specicying that this object should not be allowed to be deleted
+	 * A delete rule specifying that this object should not be allowed to be deleted
 	 * if it references any object(s).
 	 */
 	public static final int DeleteRuleDeny = 2;
@@ -110,24 +110,25 @@ public class EOClassDescription {
 	 * still not found, a class description is returned that uses java bean
 	 * introspection to provide reasonable values.
 	 */
-	public static EOClassDescription classDescriptionForClass(Class aClass) {
+	@SuppressWarnings("unchecked")
+	public static <C> EOClassDescription<C> classDescriptionForClass(Class<C> aClass) {
 		if (classMap == null)
-			classMap = new HashMap();
-		EOClassDescription result = (EOClassDescription) classMap.get(aClass);
+			classMap = new HashMap<>();
+		EOClassDescription<C> result = (EOClassDescription<C>) classMap.get(aClass);
 		if (result == null) {
 			// if not found, post notification
 			NSNotificationCenter.defaultCenter().postNotification(ClassDescriptionNeededForClassNotification, aClass,
 					null);
-			result = (EOClassDescription) classMap.get(aClass);
+			result = (EOClassDescription<C>) classMap.get(aClass);
 		}
 		if (result == null) {
 			// if not found, look for similarly named class
 			String className = aClass.getName() + ClassNameSuffix;
-			Class classDesc;
+			Class<EOClassDescription<C>> classDesc;
 			try {
-				classDesc = aClass.getClassLoader().loadClass(className);
+				classDesc = (Class<EOClassDescription<C>>) aClass.getClassLoader().loadClass(className);
 				if (classDesc != null) {
-					result = (EOClassDescription) classDesc.newInstance();
+					result = classDesc.getDeclaredConstructor().newInstance();
 					registerClassDescription(result, aClass);
 				}
 			} catch (Exception exc) {
@@ -136,7 +137,7 @@ public class EOClassDescription {
 		}
 		if (result == null) {
 			// if not found, default to this class
-			result = new EOClassDescription(aClass);
+			result = new EOClassDescription<>(aClass);
 			registerClassDescription(result, aClass);
 		}
 		return result;
@@ -148,15 +149,16 @@ public class EOClassDescription {
 	 * ClassDescriptionNeededForEntityNameNotification is posted. Returns null if no
 	 * class description can be found for the entity name.
 	 */
-	public static EOClassDescription classDescriptionForEntityName(String aName) {
+	@SuppressWarnings("unchecked")
+	public static <C> EOClassDescription<C> classDescriptionForEntityName(String aName) {
 		if (entityMap == null)
-			entityMap = new HashMap();
-		EOClassDescription result = (EOClassDescription) entityMap.get(aName);
+			entityMap = new HashMap<>();
+		EOClassDescription<C> result = (EOClassDescription<C>) entityMap.get(aName);
 		if (result == null) {
 			// if not found, post notification
 			NSNotificationCenter.defaultCenter().postNotification(ClassDescriptionNeededForEntityNameNotification,
 					aName, null);
-			result = (EOClassDescription) entityMap.get(aName);
+			result = (EOClassDescription<C>) entityMap.get(aName);
 		}
 		return result;
 	}
@@ -171,14 +173,14 @@ public class EOClassDescription {
 	}
 
 	/**
-	 * Registers the specified class descriptiong for the specified class. Nulls are
+	 * Registers the specified class description for the specified class. Nulls are
 	 * not allowed - to clear the cache call invalidateClassDescriptionCache().
 	 */
-	public static void registerClassDescription(EOClassDescription description, Class aClass) {
+	public static <C> void registerClassDescription(EOClassDescription<C> description, Class<C> aClass) {
 		if (classMap == null)
-			classMap = new HashMap();
+			classMap = new HashMap<>();
 		if (entityMap == null)
-			entityMap = new HashMap();
+			entityMap = new HashMap<>();
 		description.theClass = aClass;
 		classMap.put(aClass, description);
 		entityMap.put(description.entityName(), description);
@@ -198,16 +200,16 @@ public class EOClassDescription {
 	 */
 	private final static String ClassNameSuffix = "ClassDesc";
 
-	private static Map classMap;
-	private static Map entityMap;
+	private static Map<Class<?>, EOClassDescription<?>> classMap;
+	private static Map<String, EOClassDescription<?>> entityMap;
 
-	protected Class theClass;
+	protected Class<?> theClass;
 	private NSMutableArray attributes;
 
 	/**
 	 * Constructor may only be called by subclasses.
 	 */
-	protected EOClassDescription(Class aClass) {
+	protected EOClassDescription(Class<?> aClass) {
 		theClass = aClass;
 	}
 
@@ -265,7 +267,7 @@ public class EOClassDescription {
 	 * relationship key, or null if the class description cannot be determined for
 	 * that key. This implementation returns null.
 	 */
-	public EOClassDescription classDescriptionForDestinationKey(String detailKey) {
+	public EOClassDescription<?> classDescriptionForDestinationKey(String detailKey) {
 		return null;
 	}
 
@@ -280,11 +282,12 @@ public class EOClassDescription {
 	 * editing context is specified, the global id is ignored and the new instance
 	 * of the class is returned.
 	 */
-	public Object createInstanceWithEditingContext(EOEditingContext anEditingContext, EOGlobalID globalID) {
+	@SuppressWarnings("unchecked")
+	public C createInstanceWithEditingContext(EOEditingContext anEditingContext, EOGlobalID globalID) {
 //System.out.println( "createInstanceWithEditingContext: " + this + " : " + theClass );
 		Object result = null;
 		try {
-			result = theClass.newInstance();
+			result = theClass.getDeclaredConstructor().newInstance();
 			if (anEditingContext != null) {
 				if (globalID != null) {
 					if (result instanceof EOEnterpriseObject) {
@@ -305,7 +308,7 @@ public class EOClassDescription {
 			// error instantiating
 			throw new WotonomyException(exc);
 		}
-		return result;
+		return (C) result;
 	}
 
 	/*
diff --git a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOCooperatingObjectStore.java b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOCooperatingObjectStore.java
index 98a8a60..552e6b8 100644
--- a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOCooperatingObjectStore.java
+++ b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOCooperatingObjectStore.java
@@ -59,8 +59,10 @@ public abstract class EOCooperatingObjectStore extends EOObjectStore implements
 
 	public abstract NSDictionary valuesForKeys(NSArray nsarray, EOEnterpriseObject eoenterpriseobject);
 
+	@Override
 	public abstract void lock();
 
+	@Override
 	public abstract void unlock();
 
 }
diff --git a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOEditingContext.java b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOEditingContext.java
index 3a39035..8342722 100644
--- a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOEditingContext.java
+++ b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOEditingContext.java
@@ -89,23 +89,24 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 	private EOObjectStore parentStore;
 	private WeakReference delegate;
 	private WeakReference messageHandler;
-	private List editorSet;
+	private List<WeakReference<EOEditingContext.Editor>> editorSet;
 	private double fetchTimestamp;
 	private boolean lockBeforeModify;
 	private boolean propagateDeletesAfterEvent;
 	private boolean stopValidationAfterError;
-	private NSMutableArray insertedObjects;
-	private NSMutableArray insertedObjectsBuffer;
-	private NSArray insertedObjectsProxy;
-	private NSMutableArray updatedObjects;
-	private NSMutableArray updatedObjectsBuffer;
-	private NSArray updatedObjectsProxy;
-	private NSMutableArray deletedObjects;
-	private NSMutableArray deletedObjectsBuffer;
-	private NSArray deletedObjectsProxy;
-	private NSMutableArray deletedIDsBuffer;
-	private NSMutableArray invalidatedObjectsBuffer;
-	private NSMutableArray invalidatedIDsBuffer;
+	private NSMutableArray<Object> insertedObjects;
+	private NSMutableArray<Object> insertedObjectsBuffer;
+	private NSArray<Object> insertedObjectsProxy;
+	private NSMutableArray<Object> updatedObjects;
+	private NSMutableArray<Object> updatedObjectsBuffer;
+	private NSArray<Object> updatedObjectsProxy;
+	private NSMutableArray<Object> deletedObjects;
+	private NSMutableArray<Object> deletedObjectsBuffer;
+	private NSArray<Object> deletedObjectsProxy;
+	// TODO I think this is EOGlobalID but not certain
+	private NSMutableArray<Object> deletedIDsBuffer;
+	private NSMutableArray<Object> invalidatedObjectsBuffer;
+	private NSMutableArray<EOGlobalID> invalidatedIDsBuffer;
 	private Registrar registrar;
 //    private UndoManager undoManager;
 
@@ -143,7 +144,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 		parentStore = anObjectStore;
 		delegate = null;
 		messageHandler = null;
-		editorSet = new LinkedList();
+		editorSet = new LinkedList<>();
 		fetchTimestamp = 0;
 		lockBeforeModify = false;
 		propagateDeletesAfterEvent = true;
@@ -189,10 +190,10 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 	 * Registers the specified object as an editor for this context. The object is
 	 * expected to implement EOEditingContext.Editor.
 	 */
-	public void addEditor(Object anEditor) {
+	public void addEditor(EOEditingContext.Editor anEditor) {
 		if (anEditor == null)
 			return;
-		editorSet.add(new WeakReference(anEditor));
+		editorSet.add(new WeakReference<>(anEditor));
 	}
 
 	/**
@@ -205,6 +206,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 	 * specified relationship key must produce a result of type Collection for the
 	 * source object or an exception is thrown.
 	 */
+	@Override
 	public NSArray arrayFaultWithSourceGlobalID(EOGlobalID aGlobalID, String aRelationshipKey,
 			EOEditingContext aContext) {
 		NSArray result = null;
@@ -337,6 +339,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 	 * Called by child editing contexts when they no longer need to track the
 	 * specified id. This implementation forwards the call to the parent store.
 	 */
+	@Override
 	public void editingContextDidForgetObjectWithGlobalID(EOEditingContext aContext, EOGlobalID aGlobalID) {
 		parentStore.editingContextDidForgetObjectWithGlobalID(aContext, aGlobalID);
 	}
@@ -347,9 +350,9 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 	public NSArray editors() {
 		NSMutableArray result = new NSMutableArray();
 		Object o;
-		Iterator i = editorSet.iterator();
+		Iterator<WeakReference<Editor>> i = editorSet.iterator();
 		while (i.hasNext()) {
-			o = ((WeakReference) i.next()).get();
+			o = i.next().get();
 			if (o != null) {
 				result.addObject(o);
 			} else {
@@ -370,6 +373,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 	 * create a copy of the object and register it in the specified context.
 	 * Otherwise it will forward the call to the parent object store.
 	 */
+	@Override
 	public /* EOEnterpriseObject */ Object faultForGlobalID(EOGlobalID aGlobalID, EOEditingContext aContext) {
 		Object result = registrar.objectForGlobalID(aGlobalID);
 
@@ -402,6 +406,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 	 * specified editing context. This implementation forwards the call to the
 	 * parent store.
 	 */
+	@Override
 	public /* EOEnterpriseObject */ Object faultForRawRow(Map aDictionary, String anEntityName,
 			EOEditingContext aContext) {
 		return parentStore.faultForRawRow(aDictionary, anEntityName, aContext);
@@ -461,11 +466,10 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 	/**
 	 * Returns an array of ids for an array of objects.
 	 */
-	private NSArray globalIDsForObjects(List anObjectList) {
+	private NSArray globalIDsForObjects(List<Object> anObjectList) {
 		NSMutableArray result = new NSMutableArray();
-		Iterator it = anObjectList.iterator();
-		while (it.hasNext()) {
-			result.add(globalIDForObject(it.next()));
+		for (Object obj : anObjectList) {
+			result.add(globalIDForObject(obj));
 		}
 		return result;
 	}
@@ -492,6 +496,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 	 * in this editing context if possible, calling to the parent object store only
 	 * if such an object is not found.
 	 */
+	@Override
 	public void initializeObject(/* EOEnterpriseObject */ Object anObject, EOGlobalID aGlobalID,
 			EOEditingContext aContext) {
 		Object existingObject = registrar.objectForGlobalID(aGlobalID);
@@ -539,6 +544,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 			deletedObjects.removeObjectAtIndex(index);
 
 			// if in the deleted ids buffer
+			// TODO is this 
 			index = deletedIDsBuffer.indexOfIdenticalObject(anObject);
 			if (index != NSArray.NotFound) {
 				// remove from deleted ids buffer
@@ -587,6 +593,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 	 * fetched the next time they are accessed, and calls
 	 * invalidateObjectsWithGlobalIDs on the parent object store.
 	 */
+	@Override
 	public void invalidateAllObjects() {
 		// register change so processRecentChanges is called
 		willChange();
@@ -613,9 +620,9 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 		// refault all objects
 		EOGlobalID id;
 		Object o;
-		Enumeration e = ids.objectEnumerator();
+		Enumeration<EOGlobalID> e = ids.objectEnumerator();
 		while (e.hasMoreElements()) {
-			id = (EOGlobalID) e.nextElement();
+			id = e.nextElement();
 			o = objectForGlobalID(id);
 
 			// some objects may have been manually discarded
@@ -645,6 +652,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 	 * fetched the next time they are accessed, and forwards the call to the parent
 	 * object store.
 	 */
+	@Override
 	public void invalidateObjectsWithGlobalIDs(List anArray) {
 		// register change so processRecentChanges is called
 		willChange();
@@ -654,9 +662,9 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 
 		Object o;
 		EOGlobalID id;
-		Iterator it = anArray.iterator();
+		Iterator<EOGlobalID> it = anArray.iterator();
 		while (it.hasNext()) {
-			id = (EOGlobalID) it.next();
+			id = it.next();
 			if (id != null) {
 				o = objectForGlobalID(id);
 				if (o != null) {
@@ -688,6 +696,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 	 * Returns whether the object referenced by the specified id is locked. This
 	 * implementation simply forwards the call to the parent object store.
 	 */
+	@Override
 	public boolean isObjectLockedWithGlobalID(EOGlobalID aGlobalID, EOEditingContext aContext) {
 		return parentStore.isObjectLockedWithGlobalID(aGlobalID, aContext);
 	}
@@ -709,6 +718,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 	 * context. This implementation simply forwards the call to the parent object
 	 * store.
 	 */
+	@Override
 	public void lockObjectWithGlobalID(EOGlobalID aGlobalID, EOEditingContext aContext) {
 		parentStore.lockObjectWithGlobalID(aGlobalID, aContext);
 	}
@@ -747,6 +757,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 	 * specified relationship key must produce a result of type Collection for the
 	 * source object or an exception is thrown.
 	 */
+	@Override
 	public NSArray objectsForSourceGlobalID(EOGlobalID aGlobalID, String aRelationshipKey, EOEditingContext aContext) {
 //System.out.println( "EOEditingContext.objectsForSourceGlobalID: " 
 //+ aGlobalID + " : " + aRelationshipKey );        
@@ -793,7 +804,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 			} else // not NSArray
 			if (value instanceof Collection) {
 				// convert to NSArray
-				result = new NSArray((Collection) value);
+				result = new NSArray((Collection<?>) value);
 			} else {
 				throw new WotonomyException(
 						"Relationship key did not return a collection: " + aGlobalID + " : " + aRelationshipKey);
@@ -825,6 +836,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 	 * parent object store, which will register each object in the specified editing
 	 * context only if it does not already exist.
 	 */
+	@Override
 	public NSArray objectsWithFetchSpecification(EOFetchSpecification aFetchSpec, EOEditingContext aContext) {
 		if (aContext == this) {
 			Object result = notifyDelegate("editingContextShouldFetchObjects",
@@ -869,7 +881,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 		boolean postStoreInfo = (insertedObjectsBuffer.size() + updatedObjectsBuffer.size() + deletedIDsBuffer.size()
 				+ invalidatedIDsBuffer.size() > 0);
 
-		NSMutableDictionary storeInfo = new NSMutableDictionary();
+		NSMutableDictionary<String, NSArray> storeInfo = new NSMutableDictionary<>();
 		if (postStoreInfo) {
 			storeInfo.setObjectForKey(globalIDsForObjects(insertedObjectsBuffer),
 					// globalIDsForObjects( insertedObjects ),
@@ -877,10 +889,10 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 			storeInfo.setObjectForKey(globalIDsForObjects(updatedObjectsBuffer),
 					// globalIDsForObjects( updatedObjects ),
 					EOObjectStore.UpdatedKey);
-			storeInfo.setObjectForKey(new NSArray((Collection) deletedIDsBuffer),
+			storeInfo.setObjectForKey(new NSArray((Collection<?>) deletedIDsBuffer),
 					// globalIDsForObjects( deletedObjects ),
 					EOObjectStore.DeletedKey);
-			storeInfo.setObjectForKey(new NSArray((Collection) invalidatedIDsBuffer), EOObjectStore.InvalidatedKey);
+			storeInfo.setObjectForKey(new NSArray((Collection<?>) invalidatedIDsBuffer), EOObjectStore.InvalidatedKey);
 		}
 
 		// broadcast ObjectsChangedInEditingContextNotification
@@ -889,27 +901,27 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 		boolean postContextInfo = (insertedObjectsBuffer.size() + updatedObjectsBuffer.size()
 				+ deletedObjectsBuffer.size() + invalidatedObjectsBuffer.size() > 0);
 
-		NSMutableDictionary contextInfo = new NSMutableDictionary();
+		NSMutableDictionary<String, NSArray> contextInfo = new NSMutableDictionary<>();
 
 		if (postContextInfo) {
 
-			contextInfo.setObjectForKey(new NSArray((Collection) insertedObjectsBuffer),
+			contextInfo.setObjectForKey(new NSArray((Collection<?>) insertedObjectsBuffer),
 					// new NSArray( (Collection) insertedObjects ),
 					EOObjectStore.InsertedKey);
-			contextInfo.setObjectForKey(new NSArray((Collection) updatedObjectsBuffer),
+			contextInfo.setObjectForKey(new NSArray((Collection<?>) updatedObjectsBuffer),
 					// new NSArray( (Collection) updatedObjects ),
 					EOObjectStore.UpdatedKey);
-			contextInfo.setObjectForKey(new NSArray((Collection) deletedObjectsBuffer),
+			contextInfo.setObjectForKey(new NSArray((Collection<?>) deletedObjectsBuffer),
 					// new NSArray( (Collection) deletedObjects ),
 					EOObjectStore.DeletedKey);
-			contextInfo.setObjectForKey(new NSArray((Collection) invalidatedObjectsBuffer),
+			contextInfo.setObjectForKey(new NSArray((Collection<?>) invalidatedObjectsBuffer),
 					EOObjectStore.InvalidatedKey);
 		}
 
 		// update the current snapshots
 
 		Object o;
-		Iterator it;
+		Iterator<Object> it;
 		it = insertedObjectsBuffer.iterator();
 		while (it.hasNext()) {
 			o = it.next();
@@ -1024,6 +1036,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 	 * Refaults the specified object, turning it into a fault for the specified
 	 * global id in the specified context.
 	 */
+	@Override
 	public void refaultObject(Object anObject, EOGlobalID aGlobalID, EOEditingContext aContext) {
 		aContext.registrar.setCurrentSnapshot(anObject, null);
 
@@ -1052,7 +1065,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 
 		Object o;
 		EOGlobalID id;
-		Iterator it = registeredObjects().iterator();
+		Iterator<Object> it = registeredObjects().iterator();
 		while (it.hasNext()) {
 			o = it.next();
 			if ((updatedObjects.indexOfIdenticalObject(o) == NSArray.NotFound)
@@ -1088,9 +1101,9 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 			return;
 
 		Object o;
-		Iterator i = editorSet.iterator();
+		Iterator<WeakReference<Editor>> i = editorSet.iterator();
 		while (i.hasNext()) {
-			o = ((WeakReference) i.next()).get();
+			o = i.next().get();
 			if ((o == null) || (o == anObject)) {
 				i.remove();
 			}
@@ -1102,7 +1115,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 	 * timestamp.
 	 */
 	public void reset() {
-		Iterator it = registeredObjects().iterator();
+		Iterator<Object> it = registeredObjects().iterator();
 		while (it.hasNext()) {
 			forgetObject(it.next());
 		}
@@ -1119,7 +1132,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 		willChange();
 		fireWillSaveChanges();
 
-		Iterator it;
+		Iterator<Object> it;
 
 		// forget inserted objects
 		it = new NSArray(insertedObjects).iterator();
@@ -1127,7 +1140,6 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 			forgetObject(it.next());
 		}
 
-		EOGlobalID id;
 		Object o;
 		byte[] snapshot;
 
@@ -1190,10 +1202,10 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 		processRecentChanges();
 
 		// set up user info for notification to be posted.
-		NSMutableDictionary userInfo = new NSMutableDictionary();
-		userInfo.setObjectForKey(new NSArray((Collection) insertedObjects), EOObjectStore.InsertedKey);
-		userInfo.setObjectForKey(new NSArray((Collection) updatedObjects), EOObjectStore.UpdatedKey);
-		userInfo.setObjectForKey(new NSArray((Collection) deletedObjects), EOObjectStore.DeletedKey);
+		NSMutableDictionary<String, NSArray> userInfo = new NSMutableDictionary<>();
+		userInfo.setObjectForKey(new NSArray((Collection<?>) insertedObjects), EOObjectStore.InsertedKey);
+		userInfo.setObjectForKey(new NSArray((Collection<?>) updatedObjects), EOObjectStore.UpdatedKey);
+		userInfo.setObjectForKey(new NSArray((Collection<?>) deletedObjects), EOObjectStore.DeletedKey);
 
 		// notify the editors
 		fireWillSaveChanges();
@@ -1215,8 +1227,8 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 
 		// no exceptions: proceed!
 
-		Object o, key;
-		Iterator it;
+		Object o;
+		Iterator<Object> it;
 
 		// update the committed snapshots
 		it = insertedObjects.iterator();
@@ -1249,12 +1261,13 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 	 * Commits all changes in the specified editing context to this one. Called by
 	 * child editing contexts in their saveChanges() method.
 	 */
+	@Override
 	public void saveChangesInEditingContext(EOEditingContext aContext) {
 		Object o;
-		Iterator it;
+		Iterator<Object> it;
 
 		// process deletes
-		List deletes = new NSArray(aContext.deletedObjects());
+		List<Object> deletes = new NSArray(aContext.deletedObjects());
 		it = deletes.iterator();
 		while (it.hasNext()) {
 			o = it.next();
@@ -1276,7 +1289,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 		}
 
 		// process inserts - all inserts are new objects
-		List inserts = new NSArray(aContext.insertedObjects());
+		List<Object> inserts = new NSArray(aContext.insertedObjects());
 		it = inserts.iterator();
 		while (it.hasNext()) {
 			o = it.next();
@@ -1293,7 +1306,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 		}
 
 		// process updates
-		List updates = new NSArray(aContext.updatedObjects());
+		List<Object> updates = new NSArray(aContext.updatedObjects());
 		it = updates.iterator();
 		while (it.hasNext()) {
 			willChange(); // need to mark editing context as changed
@@ -1335,7 +1348,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 	public void setDelegate(Object anObject) {
 		if (anObject == null)
 			delegate = null;
-		delegate = new WeakReference(anObject);
+		delegate = new WeakReference<>(anObject);
 	}
 
 	/**
@@ -1442,7 +1455,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 	 */
 	private void fireWillSaveChanges() {
 		Object o = null;
-		Iterator i = editors().iterator();
+		Iterator<WeakReference<EOEditingContext.Editor>> i = editors().iterator();
 		while (i.hasNext()) {
 			try {
 				o = i.next();
@@ -1477,16 +1490,16 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 			NSNotificationCenter.defaultCenter()
 					.postNotification(new NSNotification(InvalidatedAllObjectsInStoreNotification, this));
 		} else if (EOGlobalID.GlobalIDChangedNotification.equals(aNotification.name())) {
-			NSDictionary userInfo = aNotification.userInfo();
+			NSDictionary<EOGlobalID, ?> userInfo = aNotification.userInfo();
 
 			// if any keys in userInfo are registered ids,
 			// re-register with new permanent values.
 
 			Object o;
 			EOGlobalID id;
-			Enumeration e = userInfo.keyEnumerator();
+			Enumeration<EOGlobalID> e = userInfo.keyEnumerator();
 			while (e.hasMoreElements()) {
-				id = (EOGlobalID) e.nextElement();
+				id = e.nextElement();
 				o = objectForGlobalID(id);
 				if (o != null) {
 					// record object is assumed to handle key updates
@@ -1501,16 +1514,16 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 
 			Object o;
 			EOGlobalID id;
-			Enumeration e;
-			NSDictionary userInfo = aNotification.userInfo();
+			Enumeration<EOGlobalID> e;
+			NSDictionary<String, NSArray<EOGlobalID>> userInfo = (NSDictionary<String, NSArray<EOGlobalID>>) aNotification.userInfo();
 
 			// inserted objects are ignored
 
 			// existing deleted objects are removed
-			NSArray deletes = (NSArray) userInfo.objectForKey(EOObjectStore.DeletedKey);
+			NSArray<EOGlobalID> deletes = userInfo.objectForKey(EOObjectStore.DeletedKey);
 			e = deletes.objectEnumerator();
 			while (e.hasMoreElements()) {
-				id = (EOGlobalID) e.nextElement();
+				id = e.nextElement();
 				o = objectForGlobalID(id);
 				if (o != null) {
 					// System.out.println( "EOEditingContext: deleted: " + id );
@@ -1521,10 +1534,10 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 			}
 
 			// existing updated objects are merged
-			NSArray updates = (NSArray) userInfo.objectForKey(EOObjectStore.UpdatedKey);
+			NSArray<EOGlobalID> updates = userInfo.objectForKey(EOObjectStore.UpdatedKey);
 			e = updates.objectEnumerator();
 			while (e.hasMoreElements()) {
-				id = (EOGlobalID) e.nextElement();
+				id = e.nextElement();
 				o = objectForGlobalID(id);
 				if (o != null) {
 					// System.out.println( "EOEditingContext: updated: " + id );
@@ -1540,10 +1553,10 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 			}
 
 			// existing invalidated objects are refaulted
-			NSArray invalidates = (NSArray) userInfo.objectForKey(EOObjectStore.InvalidatedKey);
+			NSArray<EOGlobalID> invalidates = userInfo.objectForKey(EOObjectStore.InvalidatedKey);
 			e = invalidates.objectEnumerator();
 			while (e.hasMoreElements()) {
-				id = (EOGlobalID) e.nextElement();
+				id = e.nextElement();
 				o = objectForGlobalID(id);
 				if (o != null) {
 					if (updatedObjects // only invalidate if unchanged
@@ -1719,6 +1732,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 	 * Implementation of the EOObserving interface. Called before objects are
 	 * modified.
 	 */
+	@Override
 	public void objectWillChange(Object anObject) {
 		if (ignoreChanges)
 			return;
@@ -1812,6 +1826,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 	 * net.wotonomy.util.WotonomyException("Not implemented yet."); }
 	 */
 
+	@Override
 	public String toString() {
 		return "[EOEditingContext@" + Integer.toHexString(System.identityHashCode(this)) + ":" + " inserted="
 				+ idsForObjects(insertedObjects) + " updated=" + idsForObjects(updatedObjects) + " deleted="
@@ -2054,6 +2069,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 			weakComparisonKey = new WeakReferenceKey();
 		}
 
+		@Override
 		public NSArray registeredObjects() {
 			Object object;
 			WeakReferenceKey weakKey;
@@ -2072,6 +2088,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 			return result;
 		}
 
+		@Override
 		public Object objectForGlobalID(EOGlobalID aGlobalID) {
 			WeakReference ref = (WeakReference) super.objectForGlobalID(aGlobalID);
 			if (ref == null)
@@ -2089,11 +2106,13 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 			return result;
 		}
 
+		@Override
 		public byte[] getCommitSnapshot(Object anObject) {
 			weakComparisonKey.set(anObject);
 			return (byte[]) objectsToCommitSnapshots.objectForKey(weakComparisonKey);
 		}
 
+		@Override
 		public void setCommitSnapshot(Object anObject, byte[] aSnapshot) {
 			if (aSnapshot == null) {
 				weakComparisonKey.set(anObject);
@@ -2103,11 +2122,13 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 			}
 		}
 
+		@Override
 		public byte[] getCurrentSnapshot(Object anObject) {
 			weakComparisonKey.set(anObject);
 			return (byte[]) objectsToCurrentSnapshots.objectForKey(weakComparisonKey);
 		}
 
+		@Override
 		public void setCurrentSnapshot(Object anObject, byte[] aSnapshot) {
 			if (aSnapshot == null) {
 				weakComparisonKey.set(anObject);
@@ -2117,6 +2138,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 			}
 		}
 
+		@Override
 		public void registerObject(Object anObject, EOGlobalID aGlobalID) { // new
 																			// net.wotonomy.ui.swing.ReferenceInspector(
 																			// anObject );
@@ -2125,6 +2147,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 			EOObserverCenter.addObserver(context, anObject);
 		}
 
+		@Override
 		public void forgetObject(Object anObject) {
 			disposeObject(anObject, null);
 		}
@@ -2173,6 +2196,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 		/**
 		 * Returns the actual key's hash code.
 		 */
+		@Override
 		public int hashCode() {
 			return hashCode;
 		}
@@ -2180,6 +2204,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 		/**
 		 * Compares by reference.
 		 */
+		@Override
 		public boolean equals(Object anObject) {
 			if (anObject == this)
 				return true;
@@ -2203,10 +2228,12 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 			super(anObject);
 		}
 
+		@Override
 		public Object get() {
 			return ((WeakReference) referent).get();
 		}
 
+		@Override
 		public void set(Object anObject) {
 			referent = new WeakReference(anObject);
 			hashCode = anObject.hashCode();
@@ -2215,6 +2242,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 		/**
 		 * Compares by reference.
 		 */
+		@Override
 		public boolean equals(Object anObject) {
 			if (anObject == this)
 				return true;
@@ -2242,10 +2270,12 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 			hashCode = object.hashCode() + string.hashCode();
 		}
 
+		@Override
 		public int hashCode() {
 			return hashCode;
 		}
 
+		@Override
 		public boolean equals(Object anObject) {
 			if (anObject instanceof CompoundKey) {
 				CompoundKey key = (CompoundKey) anObject;
@@ -2254,6 +2284,7 @@ public class EOEditingContext extends EOObjectStore implements EOObserving {
 			return false;
 		}
 
+		@Override
 		public String toString() {
 			return "[CompoundKey:" + object + ":" + string + "]";
 		}
diff --git a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOFaultHandler.java b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOFaultHandler.java
index e407492..c9c9de4 100644
--- a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOFaultHandler.java
+++ b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOFaultHandler.java
@@ -28,7 +28,7 @@ package net.wotonomy.control;
  */
 public abstract class EOFaultHandler {
 
-	protected Class _targetClass;
+	protected Class<?> _targetClass;
 
 	public EOFaultHandler() {
 		super();
@@ -61,7 +61,7 @@ public abstract class EOFaultHandler {
 		((EOFaulting) obj).clearFault();
 	}
 
-	public Class targetClass() {
+	public Class<?> targetClass() {
 		return _targetClass;
 	}
 
diff --git a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOKeyValueCodingAdditions.java b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOKeyValueCodingAdditions.java
index d1bb2c0..f0fdba1 100644
--- a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOKeyValueCodingAdditions.java
+++ b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOKeyValueCodingAdditions.java
@@ -47,7 +47,7 @@ public interface EOKeyValueCodingAdditions extends EOKeyValueCoding, NSKeyValueC
 		 * NSKeyValueCodingAdditions, otherwise calls the method on
 		 * DefaultImplementation.
 		 */
-		public static void takeValuesFromDictionary(Object object, Map dictionary) {
+		public static void takeValuesFromDictionary(Object object, Map<String, Object> dictionary) {
 			if (object instanceof NSKeyValueCodingAdditions) {
 				((NSKeyValueCodingAdditions) object).takeValuesFromDictionary(dictionary);
 			} else {
@@ -75,7 +75,7 @@ public interface EOKeyValueCodingAdditions extends EOKeyValueCoding, NSKeyValueC
 		 * NSKeyValueCodingAdditions, otherwise calls the method on
 		 * DefaultImplementation.
 		 */
-		public static NSDictionary valuesForKeys(Object object, List keys) {
+		public static NSDictionary<String, Object> valuesForKeys(Object object, List<String> keys) {
 			if (object instanceof NSKeyValueCodingAdditions) {
 				return ((NSKeyValueCodingAdditions) object).valuesForKeys(keys);
 			} else {
@@ -102,20 +102,20 @@ public interface EOKeyValueCodingAdditions extends EOKeyValueCoding, NSKeyValueC
 	 * NSKeyValueCodingAdditions.
 	 */
 	public class DefaultImplementation extends NSKeyValueCodingAdditions.DefaultImplementation {
-		public static void takeValuesFromDictionary(Object object, NSDictionary dictionary) {
+		public static void takeValuesFromDictionary(Object object, NSDictionary<String, Object> dictionary) {
 			throw new RuntimeException("Not implemented yet.");
 		}
 
-		public static void takeValuesFromDictionaryWithMapping(Object object, NSDictionary dictionary,
-				NSDictionary mapping) {
+		public static void takeValuesFromDictionaryWithMapping(Object object, NSDictionary<String, Object> dictionary,
+				NSDictionary<?, ?> mapping) {
 			throw new RuntimeException("Not implemented yet.");
 		}
 
-		public static NSDictionary valuesForKeys(Object object, List keys) {
+		public static NSDictionary<String, Object> valuesForKeys(Object object, List<String> keys) {
 			throw new RuntimeException("Not implemented yet.");
 		}
 
-		public static NSDictionary valuesForKeysWithMapping(Object object, Map mapping) {
+		public static NSDictionary<String, Object> valuesForKeysWithMapping(Object object, Map<String, Object> mapping) {
 			throw new RuntimeException("Not implemented yet.");
 		}
 	}
diff --git a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOObjectStore.java b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOObjectStore.java
index 4f60045..8998bab 100644
--- a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOObjectStore.java
+++ b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOObjectStore.java
@@ -103,7 +103,7 @@ public abstract class EOObjectStore {
 	 * must produce a result of type Collection for the source object or an
 	 * exception is thrown.
 	 */
-	public abstract NSArray arrayFaultWithSourceGlobalID(EOGlobalID aGlobalID, String aRelationship,
+	public abstract NSArray<?> arrayFaultWithSourceGlobalID(EOGlobalID aGlobalID, String aRelationship,
 			EOEditingContext aContext);
 
 	/**
@@ -187,7 +187,7 @@ public abstract class EOObjectStore {
 	public abstract void refaultObject(Object anObject, EOGlobalID aGlobalID, EOEditingContext aContext);
 
 	/**
-	 * Writes all changes in the specified editing context to the respository. The
+	 * Writes all changes in the specified editing context to the repository. The
 	 * object store is expected to post a notification that should be named with the
 	 * string constant ObjectsChangedInStoreNotification with this object store as
 	 * the object and user info containing keys named UpdatedKey, InsertedKey, and
diff --git a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java
index c2ad03d..6fa0486 100644
--- a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java
+++ b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java
@@ -20,7 +20,7 @@ $Id: EOObjectStoreCoordinator.java 894 2006-02-16 16:47:14Z cgruber $
 */
 
 package net.wotonomy.control;
-
+	
 import java.util.List;
 import java.util.Map;
 
diff --git a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOTemporaryGlobalID.java b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOTemporaryGlobalID.java
index 31351a9..b5c60b7 100644
--- a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOTemporaryGlobalID.java
+++ b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOTemporaryGlobalID.java
@@ -37,6 +37,8 @@ import java.net.InetAddress;
  * @version $Revision: 893 $
  */
 public class EOTemporaryGlobalID extends EOGlobalID {
+	private static final long serialVersionUID = 7652533198394290800L;
+
 	/**
 	 * Holds the length in bytes of the key that is generated.
 	 */
diff --git a/projects/net.wotonomy.persistence/tags b/projects/net.wotonomy.persistence/tags
new file mode 100644
index 0000000..dee7d47
--- /dev/null
+++ b/projects/net.wotonomy.persistence/tags
@@ -0,0 +1,1919 @@
+!_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;" to lines/
+!_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/
+!_TAG_OUTPUT_EXCMD	mixed	/number, pattern, mixed, or combineV2/
+!_TAG_OUTPUT_FILESEP	slash	/slash or backslash/
+!_TAG_OUTPUT_MODE	u-ctags	/u-ctags or e-ctags/
+!_TAG_PATTERN_LENGTH_LIMIT	96	/0 for no limit/
+!_TAG_PROC_CWD	/home/bjculkin/Projects/wotonomy/projects/net.wotonomy.persistence/	//
+!_TAG_PROGRAM_AUTHOR	Universal Ctags Team	//
+!_TAG_PROGRAM_NAME	Universal Ctags	/Derived from Exuberant Ctags/
+!_TAG_PROGRAM_URL	https://ctags.io/	/official site/
+!_TAG_PROGRAM_VERSION	5.9.0	//
+AbstractObjectStore	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	public AbstractObjectStore() {$/;"	m	class:AbstractObjectStore
+AbstractObjectStore	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^public abstract class AbstractObjectStore extends EOObjectStore {$/;"	c
+AdaptorContextBeginTransactionNotification	src/main/java/net/wotonomy/access/EOAdaptorContext.java	/^	public static final String AdaptorContextBeginTransactionNotification = "AdaptorContextBeginTra/;"	f	class:EOAdaptorContext
+AdaptorContextCommitTransactionNotification	src/main/java/net/wotonomy/access/EOAdaptorContext.java	/^	public static final String AdaptorContextCommitTransactionNotification = "AdaptorContextCommitT/;"	f	class:EOAdaptorContext
+AdaptorContextRollbackTransactionNotification	src/main/java/net/wotonomy/access/EOAdaptorContext.java	/^	public static final String AdaptorContextRollbackTransactionNotification = "AdaptorContextRollb/;"	f	class:EOAdaptorContext
+AdaptorDeleteOperator	src/main/java/net/wotonomy/access/EODatabaseOperation.java	/^	public static final int AdaptorDeleteOperator = 3;$/;"	f	class:EODatabaseOperation
+AdaptorInsertOperator	src/main/java/net/wotonomy/access/EODatabaseOperation.java	/^	public static final int AdaptorInsertOperator = 1;$/;"	f	class:EODatabaseOperation
+AdaptorLockOperator	src/main/java/net/wotonomy/access/EODatabaseOperation.java	/^	public static final int AdaptorLockOperator = 0;$/;"	f	class:EODatabaseOperation
+AdaptorStoredProcedureOperator	src/main/java/net/wotonomy/access/EODatabaseOperation.java	/^	public static final int AdaptorStoredProcedureOperator = 4;$/;"	f	class:EODatabaseOperation
+AdaptorUpdateOperator	src/main/java/net/wotonomy/access/EODatabaseOperation.java	/^	public static final int AdaptorUpdateOperator = 2;$/;"	f	class:EODatabaseOperation
+AndQualifierSupport	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^		public AndQualifierSupport() {$/;"	m	class:EOQualifierSQLGeneration.AndQualifierSupport
+AndQualifierSupport	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^	public class AndQualifierSupport extends Support {$/;"	c	interface:EOQualifierSQLGeneration
+ArrayFault	src/main/java/net/wotonomy/control/ArrayFault.java	/^	public ArrayFault(EOGlobalID aSourceID, String aRelationshipKey, EOEditingContext aContext) {$/;"	m	class:ArrayFault
+ArrayFault	src/main/java/net/wotonomy/control/ArrayFault.java	/^public class ArrayFault extends NSArray {$/;"	c
+BaseSelector	src/main/java/net/wotonomy/control/EOQualifier.java	/^	static private abstract class BaseSelector extends NSSelector {$/;"	c	class:EOQualifier
+BindVariableAttributeKey	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public static final String BindVariableAttributeKey = "BindVariableAttribute";$/;"	f	class:EOSQLExpression
+BindVariableColumnKey	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public static final String BindVariableColumnKey = "BindVariableColumn";$/;"	f	class:EOSQLExpression
+BindVariableNameKey	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public static final String BindVariableNameKey = "BindVariableName";$/;"	f	class:EOSQLExpression
+BindVariablePlaceHolderKey	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public static final String BindVariablePlaceHolderKey = "BindVariablePlaceholder";$/;"	f	class:EOSQLExpression
+BindVariableValueKey	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public static final String BindVariableValueKey = "BindVariableValue";$/;"	f	class:EOSQLExpression
+ChildDataSource	src/main/java/net/wotonomy/control/ChildDataSource.java	/^	public ChildDataSource(EODataSource aParentSource, Collection anObjectList) {$/;"	m	class:ChildDataSource
+ChildDataSource	src/main/java/net/wotonomy/control/ChildDataSource.java	/^	public ChildDataSource(EODataSource aParentSource, Object anObject) {$/;"	m	class:ChildDataSource
+ChildDataSource	src/main/java/net/wotonomy/control/ChildDataSource.java	/^public class ChildDataSource extends EODataSource {$/;"	c
+ClassDescriptionNeededForClassNotification	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public static final String ClassDescriptionNeededForClassNotification = "ClassDescriptionNeeded/;"	f	class:EOClassDescription
+ClassDescriptionNeededForEntityNameNotification	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public static final String ClassDescriptionNeededForEntityNameNotification = "ClassDescriptionN/;"	f	class:EOClassDescription
+ClassNameSuffix	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	private final static String ClassNameSuffix = "ClassDesc";$/;"	f	class:EOClassDescription	file:
+CompareAscending	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^	public static final NSSelector CompareAscending = new CompareAscendingComparator();$/;"	f	class:EOSortOrdering
+CompareAscendingComparator	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^	private static class CompareAscendingComparator extends NSSelector {$/;"	c	class:EOSortOrdering
+CompareCaseInsensitiveAscending	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^	public static final NSSelector CompareCaseInsensitiveAscending = new CompareCaseInsensitiveAsce/;"	f	class:EOSortOrdering
+CompareCaseInsensitiveAscendingComparator	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^	private static class CompareCaseInsensitiveAscendingComparator extends NSSelector {$/;"	c	class:EOSortOrdering
+CompareCaseInsensitiveDescending	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^	public static final NSSelector CompareCaseInsensitiveDescending = new CompareCaseInsensitiveDes/;"	f	class:EOSortOrdering
+CompareCaseInsensitiveDescendingComparator	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^	private static class CompareCaseInsensitiveDescendingComparator extends CompareCaseInsensitiveA/;"	c	class:EOSortOrdering
+CompareDescending	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^	public static final NSSelector CompareDescending = new CompareDescendingComparator();$/;"	f	class:EOSortOrdering
+CompareDescendingComparator	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^	private static class CompareDescendingComparator extends CompareAscendingComparator {$/;"	c	class:EOSortOrdering
+CompoundKey	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public CompoundKey(Object anObject, String aString) {$/;"	m	class:EOEditingContext.CompoundKey
+CompoundKey	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	static private class CompoundKey {$/;"	c	class:EOEditingContext
+ContextObjectInputStream	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^		public ContextObjectInputStream(InputStream anInputStream, EOEditingContext aContext, ClassLoa/;"	m	class:KeyValueCodingUtilities.ContextObjectInputStream
+ContextObjectInputStream	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^	static private class ContextObjectInputStream extends ObjectInputStream {$/;"	c	class:KeyValueCodingUtilities
+ContextObjectOutputStream	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^		public ContextObjectOutputStream(OutputStream anOutputStream, EOEditingContext aContext) throw/;"	m	class:KeyValueCodingUtilities.ContextObjectOutputStream
+ContextObjectOutputStream	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^	static private class ContextObjectOutputStream extends ObjectOutputStream {$/;"	c	class:KeyValueCodingUtilities
+CooperatingObjectStoreNeededNotification	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public static final String CooperatingObjectStoreNeededNotification = "EOCooperatingObjectStore/;"	f	class:EOObjectStoreCoordinator
+CooperatingObjectStoreWasAddedNotification	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public static final String CooperatingObjectStoreWasAddedNotification = "EOCooperatingObjectSto/;"	f	class:EOObjectStoreCoordinator
+CooperatingObjectStoreWasRemovedNotification	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public static final String CooperatingObjectStoreWasRemovedNotification = "EOCooperatingObjectS/;"	f	class:EOObjectStoreCoordinator
+DatabaseDeleteOperator	src/main/java/net/wotonomy/access/EODatabaseOperation.java	/^	public static final int DatabaseDeleteOperator = 3;$/;"	f	class:EODatabaseOperation
+DatabaseInsertOperator	src/main/java/net/wotonomy/access/EODatabaseOperation.java	/^	public static final int DatabaseInsertOperator = 1;$/;"	f	class:EODatabaseOperation
+DatabaseNothingOperator	src/main/java/net/wotonomy/access/EODatabaseOperation.java	/^	public static final int DatabaseNothingOperator = 0;$/;"	f	class:EODatabaseOperation
+DatabaseUpdateOperator	src/main/java/net/wotonomy/access/EODatabaseOperation.java	/^	public static final int DatabaseUpdateOperator = 2;$/;"	f	class:EODatabaseOperation
+DefaultImplementation	src/main/java/net/wotonomy/control/EOKeyValueCodingAdditions.java	/^	public class DefaultImplementation extends NSKeyValueCodingAdditions.DefaultImplementation {$/;"	c	interface:EOKeyValueCodingAdditions
+Delegate	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public interface Delegate {$/;"	i	class:EOEditingContext
+DelegatingComparator	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^		public DelegatingComparator(String aKey, Comparator aComparator) {$/;"	m	class:EOSortOrdering.DelegatingComparator
+DelegatingComparator	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^	private static class DelegatingComparator implements Comparator {$/;"	c	class:EOSortOrdering
+DeleteRuleCascade	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public static final int DeleteRuleCascade = 1;$/;"	f	class:EOClassDescription
+DeleteRuleDeny	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public static final int DeleteRuleDeny = 2;$/;"	f	class:EOClassDescription
+DeleteRuleNoAction	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public static final int DeleteRuleNoAction = 3;$/;"	f	class:EOClassDescription
+DeleteRuleNullify	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public static final int DeleteRuleNullify = 0;$/;"	f	class:EOClassDescription
+DeletedKey	src/main/java/net/wotonomy/control/EOObjectStore.java	/^	public static final String DeletedKey = "deleted";$/;"	f	class:EOObjectStore
+EOAccessArrayFaultHandler	src/main/java/net/wotonomy/access/EOAccessArrayFaultHandler.java	/^	public EOAccessArrayFaultHandler(EOKeyGlobalID sourceID, String relationName, EODatabaseContext/;"	m	class:EOAccessArrayFaultHandler
+EOAccessArrayFaultHandler	src/main/java/net/wotonomy/access/EOAccessArrayFaultHandler.java	/^public class EOAccessArrayFaultHandler extends EOAccessGenericFaultHandler {$/;"	c
+EOAccessFaultHandler	src/main/java/net/wotonomy/access/EOAccessFaultHandler.java	/^	public EOAccessFaultHandler(EOKeyGlobalID gid, EODatabaseContext dbc, EOEditingContext ec) {$/;"	m	class:EOAccessFaultHandler
+EOAccessFaultHandler	src/main/java/net/wotonomy/access/EOAccessFaultHandler.java	/^public class EOAccessFaultHandler extends EOAccessGenericFaultHandler {$/;"	c
+EOAccessGenericFaultHandler	src/main/java/net/wotonomy/access/EOAccessGenericFaultHandler.java	/^	public EOAccessGenericFaultHandler() {$/;"	m	class:EOAccessGenericFaultHandler
+EOAccessGenericFaultHandler	src/main/java/net/wotonomy/access/EOAccessGenericFaultHandler.java	/^public abstract class EOAccessGenericFaultHandler extends EOFaultHandler {$/;"	c
+EOAccessLock	src/main/java/net/wotonomy/access/EOAccessLock.java	/^	private EOAccessLock() {$/;"	m	class:EOAccessLock	file:
+EOAccessLock	src/main/java/net/wotonomy/access/EOAccessLock.java	/^public class EOAccessLock {$/;"	c
+EOAdaptor	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public EOAdaptor(String name) {$/;"	m	class:EOAdaptor
+EOAdaptor	src/main/java/net/wotonomy/access/EOAdaptor.java	/^public abstract class EOAdaptor {$/;"	c
+EOAdaptorChannel	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	public EOAdaptorChannel(EOAdaptorContext context) {$/;"	m	class:EOAdaptorChannel
+EOAdaptorChannel	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^public abstract class EOAdaptorChannel {$/;"	c
+EOAdaptorContext	src/main/java/net/wotonomy/access/EOAdaptorContext.java	/^	public EOAdaptorContext(EOAdaptor adaptor) {$/;"	m	class:EOAdaptorContext
+EOAdaptorContext	src/main/java/net/wotonomy/access/EOAdaptorContext.java	/^public abstract class EOAdaptorContext {$/;"	c
+EOAdaptorOperation	src/main/java/net/wotonomy/access/EOAdaptorOperation.java	/^	public EOAdaptorOperation(EOEntity entity) {$/;"	m	class:EOAdaptorOperation
+EOAdaptorOperation	src/main/java/net/wotonomy/access/EOAdaptorOperation.java	/^public class EOAdaptorOperation {$/;"	c
+EOAndQualifier	src/main/java/net/wotonomy/control/EOAndQualifier.java	/^	public EOAndQualifier(List aQualifierList) {$/;"	m	class:EOAndQualifier
+EOAndQualifier	src/main/java/net/wotonomy/control/EOAndQualifier.java	/^public class EOAndQualifier extends EOQualifier implements EOKeyValueArchiving, EOQualifierEvalu/;"	c
+EOAttribute	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public EOAttribute() {$/;"	m	class:EOAttribute
+EOAttribute	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public EOAttribute(NSDictionary dict, Object obj) {$/;"	m	class:EOAttribute
+EOAttribute	src/main/java/net/wotonomy/access/EOAttribute.java	/^public class EOAttribute extends EOProperty implements EOPropertyListEncoding {$/;"	c
+EOClassDescription	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	protected EOClassDescription(Class<?> aClass) {$/;"	m	class:EOClassDescription
+EOClassDescription	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public EOClassDescription() {$/;"	m	class:EOClassDescription
+EOClassDescription	src/main/java/net/wotonomy/control/EOClassDescription.java	/^public class EOClassDescription<C> {$/;"	c
+EOCooperatingObjectStore	src/main/java/net/wotonomy/control/EOCooperatingObjectStore.java	/^	public EOCooperatingObjectStore() {$/;"	m	class:EOCooperatingObjectStore
+EOCooperatingObjectStore	src/main/java/net/wotonomy/control/EOCooperatingObjectStore.java	/^public abstract class EOCooperatingObjectStore extends EOObjectStore implements NSLocking {$/;"	c
+EOCustomObject	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public EOCustomObject() {$/;"	m	class:EOCustomObject
+EOCustomObject	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public EOCustomObject(EOEditingContext aContext, EOClassDescription aClassDescription, EOGlobal/;"	m	class:EOCustomObject
+EOCustomObject	src/main/java/net/wotonomy/control/EOCustomObject.java	/^public class EOCustomObject implements EOEnterpriseObject, EOKeyValueCodingAdditions, EODeferred/;"	c
+EODataSource	src/main/java/net/wotonomy/control/EODataSource.java	/^public abstract class EODataSource {$/;"	c
+EODatabase	src/main/java/net/wotonomy/access/EODatabase.java	/^	public EODatabase(EOAdaptor adaptor) {$/;"	m	class:EODatabase
+EODatabase	src/main/java/net/wotonomy/access/EODatabase.java	/^	public EODatabase(EOModel model) {$/;"	m	class:EODatabase
+EODatabase	src/main/java/net/wotonomy/access/EODatabase.java	/^public class EODatabase {$/;"	c
+EODatabaseChannel	src/main/java/net/wotonomy/access/EODatabaseChannel.java	/^	public EODatabaseChannel(EODatabaseContext context) {$/;"	m	class:EODatabaseChannel
+EODatabaseChannel	src/main/java/net/wotonomy/access/EODatabaseChannel.java	/^public class EODatabaseChannel {$/;"	c
+EODatabaseContext	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public EODatabaseContext(EODatabase database) {$/;"	m	class:EODatabaseContext
+EODatabaseContext	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^public class EODatabaseContext extends EOCooperatingObjectStore implements NSLocking {$/;"	c
+EODatabaseDataSource	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	public EODatabaseDataSource(EOEditingContext aContext, String anEntityName) {$/;"	m	class:EODatabaseDataSource
+EODatabaseDataSource	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	public EODatabaseDataSource(EOEditingContext aContext, String anEntityName, String aFetchSpecNa/;"	m	class:EODatabaseDataSource
+EODatabaseDataSource	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^public abstract class EODatabaseDataSource {$/;"	c
+EODatabaseOperation	src/main/java/net/wotonomy/access/EODatabaseOperation.java	/^public class EODatabaseOperation {$/;"	c
+EODeferredFaulting	src/main/java/net/wotonomy/control/EODeferredFaulting.java	/^public interface EODeferredFaulting extends EOFaulting {$/;"	i
+EODelayedObserver	src/main/java/net/wotonomy/control/EODelayedObserver.java	/^	public EODelayedObserver() {$/;"	m	class:EODelayedObserver
+EODelayedObserver	src/main/java/net/wotonomy/control/EODelayedObserver.java	/^public abstract class EODelayedObserver implements EOObserving, Observer {$/;"	c
+EODelayedObserverQueue	src/main/java/net/wotonomy/control/EODelayedObserverQueue.java	/^	public EODelayedObserverQueue() {$/;"	m	class:EODelayedObserverQueue
+EODelayedObserverQueue	src/main/java/net/wotonomy/control/EODelayedObserverQueue.java	/^public class EODelayedObserverQueue {$/;"	c
+EOEditingContext	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public EOEditingContext() {$/;"	m	class:EOEditingContext
+EOEditingContext	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public EOEditingContext(EOObjectStore anObjectStore) {$/;"	m	class:EOEditingContext
+EOEditingContext	src/main/java/net/wotonomy/control/EOEditingContext.java	/^public class EOEditingContext extends EOObjectStore implements EOObserving {$/;"	c
+EOEnterpriseObject	src/main/java/net/wotonomy/control/EOEnterpriseObject.java	/^public interface EOEnterpriseObject$/;"	i
+EOEntity	src/main/java/net/wotonomy/access/EOEntity.java	/^	public EOEntity() {$/;"	m	class:EOEntity
+EOEntity	src/main/java/net/wotonomy/access/EOEntity.java	/^	public EOEntity(NSDictionary dict, Object obj) {$/;"	m	class:EOEntity
+EOEntity	src/main/java/net/wotonomy/access/EOEntity.java	/^public class EOEntity implements EOPropertyListEncoding {$/;"	c
+EOEntityClassDescription	src/main/java/net/wotonomy/access/EOEntityClassDescription.java	/^	public EOEntityClassDescription() {$/;"	m	class:EOEntityClassDescription
+EOEntityClassDescription	src/main/java/net/wotonomy/access/EOEntityClassDescription.java	/^	public EOEntityClassDescription(EOEntity entity) {$/;"	m	class:EOEntityClassDescription
+EOEntityClassDescription	src/main/java/net/wotonomy/access/EOEntityClassDescription.java	/^public class EOEntityClassDescription extends EOClassDescription {$/;"	c
+EOEntityTest	src/test/java/net/wotonomy/access/EOEntityTest.java	/^public class EOEntityTest extends TestCase {$/;"	c
+EOFaultHandler	src/main/java/net/wotonomy/control/EOFaultHandler.java	/^	public EOFaultHandler() {$/;"	m	class:EOFaultHandler
+EOFaultHandler	src/main/java/net/wotonomy/control/EOFaultHandler.java	/^public abstract class EOFaultHandler {$/;"	c
+EOFaulting	src/main/java/net/wotonomy/control/EOFaulting.java	/^public interface EOFaulting {$/;"	i
+EOFetchSpecification	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public EOFetchSpecification() {$/;"	m	class:EOFetchSpecification
+EOFetchSpecification	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public EOFetchSpecification(String anEntityName, EOQualifier aQualifier, List aSortOrderingList/;"	m	class:EOFetchSpecification
+EOFetchSpecification	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public EOFetchSpecification(String anEntityName, EOQualifier aQualifier, NSArray aSortOrderingL/;"	m	class:EOFetchSpecification
+EOFetchSpecification	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^public class EOFetchSpecification implements EOKeyValueArchiving {$/;"	c
+EOGeneralAdaptorException	src/main/java/net/wotonomy/access/EOGeneralAdaptorException.java	/^	public EOGeneralAdaptorException(String msg) {$/;"	m	class:EOGeneralAdaptorException
+EOGeneralAdaptorException	src/main/java/net/wotonomy/access/EOGeneralAdaptorException.java	/^	public EOGeneralAdaptorException(String name, NSDictionary userInfo) {$/;"	m	class:EOGeneralAdaptorException
+EOGeneralAdaptorException	src/main/java/net/wotonomy/access/EOGeneralAdaptorException.java	/^	public EOGeneralAdaptorException(String selectorName, String className, String msg) {$/;"	m	class:EOGeneralAdaptorException
+EOGeneralAdaptorException	src/main/java/net/wotonomy/access/EOGeneralAdaptorException.java	/^public class EOGeneralAdaptorException extends RuntimeException implements java.io.Serializable /;"	c
+EOGenericRecord	src/main/java/net/wotonomy/control/EOGenericRecord.java	/^	protected EOGenericRecord() {$/;"	m	class:EOGenericRecord
+EOGenericRecord	src/main/java/net/wotonomy/control/EOGenericRecord.java	/^	public EOGenericRecord(EOClassDescription aDescription) {$/;"	m	class:EOGenericRecord
+EOGenericRecord	src/main/java/net/wotonomy/control/EOGenericRecord.java	/^	public EOGenericRecord(EOEditingContext aContext, EOClassDescription aDescription, EOGlobalID a/;"	m	class:EOGenericRecord
+EOGenericRecord	src/main/java/net/wotonomy/control/EOGenericRecord.java	/^public class EOGenericRecord extends EOCustomObject {$/;"	c
+EOGlobalID	src/main/java/net/wotonomy/control/EOGlobalID.java	/^public abstract class EOGlobalID implements Cloneable, Serializable {$/;"	c
+EOIntegralKeyGlobalID	src/main/java/net/wotonomy/control/EOIntegralKeyGlobalID.java	/^	public EOIntegralKeyGlobalID(String entityName, Number value) {$/;"	m	class:EOIntegralKeyGlobalID
+EOIntegralKeyGlobalID	src/main/java/net/wotonomy/control/EOIntegralKeyGlobalID.java	/^public class EOIntegralKeyGlobalID extends EOKeyGlobalID {$/;"	c
+EOJoin	src/main/java/net/wotonomy/access/EOJoin.java	/^	public EOJoin(EOAttribute src, EOAttribute dst) {$/;"	m	class:EOJoin
+EOJoin	src/main/java/net/wotonomy/access/EOJoin.java	/^public class EOJoin {$/;"	c
+EOKeyComparisonQualifier	src/main/java/net/wotonomy/control/EOKeyComparisonQualifier.java	/^	public EOKeyComparisonQualifier(String leftKey, NSSelector selector, String rightKey) {$/;"	m	class:EOKeyComparisonQualifier
+EOKeyComparisonQualifier	src/main/java/net/wotonomy/control/EOKeyComparisonQualifier.java	/^public class EOKeyComparisonQualifier extends EOQualifier implements EOKeyValueArchiving, EOQual/;"	c
+EOKeyGlobalID	src/main/java/net/wotonomy/control/EOKeyGlobalID.java	/^	protected EOKeyGlobalID(String entityName, int hashCode) {$/;"	m	class:EOKeyGlobalID
+EOKeyGlobalID	src/main/java/net/wotonomy/control/EOKeyGlobalID.java	/^public abstract class EOKeyGlobalID extends EOGlobalID implements NSCoding {$/;"	c
+EOKeyValueArchiver	src/main/java/net/wotonomy/control/EOKeyValueArchiver.java	/^	public EOKeyValueArchiver() {$/;"	m	class:EOKeyValueArchiver
+EOKeyValueArchiver	src/main/java/net/wotonomy/control/EOKeyValueArchiver.java	/^public class EOKeyValueArchiver {$/;"	c
+EOKeyValueArchiving	src/main/java/net/wotonomy/control/EOKeyValueArchiving.java	/^public interface EOKeyValueArchiving {$/;"	i
+EOKeyValueCoding	src/main/java/net/wotonomy/control/EOKeyValueCoding.java	/^public interface EOKeyValueCoding extends NSKeyValueCoding {$/;"	i
+EOKeyValueCodingAdditions	src/main/java/net/wotonomy/control/EOKeyValueCodingAdditions.java	/^public interface EOKeyValueCodingAdditions extends EOKeyValueCoding, NSKeyValueCodingAdditions {$/;"	i
+EOKeyValueCodingSupport	src/main/java/net/wotonomy/control/EOKeyValueCodingSupport.java	/^public class EOKeyValueCodingSupport {$/;"	c
+EOKeyValueQualifier	src/main/java/net/wotonomy/control/EOKeyValueQualifier.java	/^	public EOKeyValueQualifier(String aKey, NSSelector aSelector, Object aValue) {$/;"	m	class:EOKeyValueQualifier
+EOKeyValueQualifier	src/main/java/net/wotonomy/control/EOKeyValueQualifier.java	/^public class EOKeyValueQualifier extends EOQualifier implements EOKeyValueArchiving, EOQualifier/;"	c
+EOKeyValueUnarchiver	src/main/java/net/wotonomy/control/EOKeyValueUnarchiver.java	/^	public EOKeyValueUnarchiver(NSDictionary archive) {$/;"	m	class:EOKeyValueUnarchiver
+EOKeyValueUnarchiver	src/main/java/net/wotonomy/control/EOKeyValueUnarchiver.java	/^public class EOKeyValueUnarchiver {$/;"	c
+EOModel	src/main/java/net/wotonomy/access/EOModel.java	/^	public EOModel() {$/;"	m	class:EOModel
+EOModel	src/main/java/net/wotonomy/access/EOModel.java	/^	public EOModel(NSDictionary dict, Object o) {$/;"	m	class:EOModel
+EOModel	src/main/java/net/wotonomy/access/EOModel.java	/^	public EOModel(String path) {$/;"	m	class:EOModel
+EOModel	src/main/java/net/wotonomy/access/EOModel.java	/^public class EOModel {$/;"	c
+EOModelGroup	src/main/java/net/wotonomy/access/EOModelGroup.java	/^	public EOModelGroup() {$/;"	m	class:EOModelGroup
+EOModelGroup	src/main/java/net/wotonomy/access/EOModelGroup.java	/^public class EOModelGroup {$/;"	c
+EONotQualifier	src/main/java/net/wotonomy/control/EONotQualifier.java	/^	public EONotQualifier(EOQualifier aQualifier) {$/;"	m	class:EONotQualifier
+EONotQualifier	src/main/java/net/wotonomy/control/EONotQualifier.java	/^public class EONotQualifier extends EOQualifier implements EOKeyValueArchiving, EOQualifierEvalu/;"	c
+EONullValue	src/main/java/net/wotonomy/control/EONullValue.java	/^	private EONullValue() {$/;"	m	class:EONullValue	file:
+EONullValue	src/main/java/net/wotonomy/control/EONullValue.java	/^public class EONullValue implements Serializable {$/;"	c
+EOObjectStore	src/main/java/net/wotonomy/control/EOObjectStore.java	/^	public EOObjectStore() {$/;"	m	class:EOObjectStore
+EOObjectStore	src/main/java/net/wotonomy/control/EOObjectStore.java	/^public abstract class EOObjectStore {$/;"	c
+EOObjectStoreCoordinator	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public EOObjectStoreCoordinator() {$/;"	m	class:EOObjectStoreCoordinator
+EOObjectStoreCoordinator	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^public class EOObjectStoreCoordinator extends EOObjectStore {$/;"	c
+EOObserverCenter	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^public class EOObserverCenter implements Observer {$/;"	c
+EOObserverProxy	src/main/java/net/wotonomy/control/EOObserverProxy.java	/^	public EOObserverProxy(Object anObject, NSSelector aSelector) {$/;"	m	class:EOObserverProxy
+EOObserverProxy	src/main/java/net/wotonomy/control/EOObserverProxy.java	/^	public EOObserverProxy(Object anObject, NSSelector aSelector, int aPriority) {$/;"	m	class:EOObserverProxy
+EOObserverProxy	src/main/java/net/wotonomy/control/EOObserverProxy.java	/^public class EOObserverProxy extends EODelayedObserver {$/;"	c
+EOObserving	src/main/java/net/wotonomy/control/EOObserving.java	/^public interface EOObserving {$/;"	i
+EOOrQualifier	src/main/java/net/wotonomy/control/EOOrQualifier.java	/^	public EOOrQualifier(List aQualifierList) {$/;"	m	class:EOOrQualifier
+EOOrQualifier	src/main/java/net/wotonomy/control/EOOrQualifier.java	/^public class EOOrQualifier extends EOQualifier implements EOKeyValueArchiving, EOQualifierEvalua/;"	c
+EOProperty	src/main/java/net/wotonomy/access/EOProperty.java	/^	public EOProperty() {$/;"	m	class:EOProperty
+EOProperty	src/main/java/net/wotonomy/access/EOProperty.java	/^public abstract class EOProperty {$/;"	c
+EOPropertyListEncoding	src/main/java/net/wotonomy/access/EOPropertyListEncoding.java	/^public interface EOPropertyListEncoding {$/;"	i
+EOQualifier	src/main/java/net/wotonomy/control/EOQualifier.java	/^	public EOQualifier() {$/;"	m	class:EOQualifier
+EOQualifier	src/main/java/net/wotonomy/control/EOQualifier.java	/^public abstract class EOQualifier {$/;"	c
+EOQualifierEvaluation	src/main/java/net/wotonomy/control/EOQualifierEvaluation.java	/^public interface EOQualifierEvaluation {$/;"	i
+EOQualifierSQLGeneration	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^public interface EOQualifierSQLGeneration {$/;"	i
+EORelationship	src/main/java/net/wotonomy/access/EORelationship.java	/^	public EORelationship() {$/;"	m	class:EORelationship
+EORelationship	src/main/java/net/wotonomy/access/EORelationship.java	/^	public EORelationship(NSDictionary dict, Object obj) {$/;"	m	class:EORelationship
+EORelationship	src/main/java/net/wotonomy/access/EORelationship.java	/^public class EORelationship extends EOProperty implements EOPropertyListEncoding {$/;"	c
+EORelationshipManipulation	src/main/java/net/wotonomy/control/EORelationshipManipulation.java	/^public interface EORelationshipManipulation {$/;"	i
+EOSQLExpression	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	private EOSQLExpression() {$/;"	m	class:EOSQLExpression	file:
+EOSQLExpression	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public EOSQLExpression(EOEntity entity) {$/;"	m	class:EOSQLExpression
+EOSQLExpression	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^public abstract class EOSQLExpression {$/;"	c
+EOSQLExpressionFactory	src/main/java/net/wotonomy/access/EOSQLExpressionFactory.java	/^	public EOSQLExpressionFactory(EOAdaptor adaptor) {$/;"	m	class:EOSQLExpressionFactory
+EOSQLExpressionFactory	src/main/java/net/wotonomy/access/EOSQLExpressionFactory.java	/^public class EOSQLExpressionFactory {$/;"	c
+EOSortOrdering	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^	public EOSortOrdering(String aKey, Comparator aComparator) {$/;"	m	class:EOSortOrdering
+EOSortOrdering	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^	public EOSortOrdering(String aKey, NSSelector aSelector) {$/;"	m	class:EOSortOrdering
+EOSortOrdering	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^public class EOSortOrdering implements Serializable, EOKeyValueArchiving {$/;"	c
+EOStoredProcedure	src/main/java/net/wotonomy/access/EOStoredProcedure.java	/^	public EOStoredProcedure(NSDictionary dict, Object obj) {$/;"	m	class:EOStoredProcedure
+EOStoredProcedure	src/main/java/net/wotonomy/access/EOStoredProcedure.java	/^	public EOStoredProcedure(String withName) {$/;"	m	class:EOStoredProcedure
+EOStoredProcedure	src/main/java/net/wotonomy/access/EOStoredProcedure.java	/^public class EOStoredProcedure implements EOPropertyListEncoding {$/;"	c
+EOTemporaryGlobalID	src/main/java/net/wotonomy/control/EOTemporaryGlobalID.java	/^	private EOTemporaryGlobalID(byte[] aKey) {$/;"	m	class:EOTemporaryGlobalID	file:
+EOTemporaryGlobalID	src/main/java/net/wotonomy/control/EOTemporaryGlobalID.java	/^	public EOTemporaryGlobalID() {$/;"	m	class:EOTemporaryGlobalID
+EOTemporaryGlobalID	src/main/java/net/wotonomy/control/EOTemporaryGlobalID.java	/^public class EOTemporaryGlobalID extends EOGlobalID {$/;"	c
+EOValidation	src/main/java/net/wotonomy/control/EOValidation.java	/^public interface EOValidation {$/;"	i
+EOVectorKeyGlobalID	src/main/java/net/wotonomy/control/EOVectorKeyGlobalID.java	/^	public EOVectorKeyGlobalID(String entityName, Object[] values) {$/;"	m	class:EOVectorKeyGlobalID
+EOVectorKeyGlobalID	src/main/java/net/wotonomy/control/EOVectorKeyGlobalID.java	/^public class EOVectorKeyGlobalID extends EOKeyGlobalID {$/;"	c
+EditingContext	src/main/java/net/wotonomy/control/EditingContext.java	/^	public EditingContext() {$/;"	m	class:EditingContext
+EditingContext	src/main/java/net/wotonomy/control/EditingContext.java	/^	public EditingContext(EOObjectStore anObjectStore) {$/;"	m	class:EditingContext
+EditingContext	src/main/java/net/wotonomy/control/EditingContext.java	/^public class EditingContext extends EOEditingContext {$/;"	c
+EditingContextDidSaveChangesNotification	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public static final String EditingContextDidSaveChangesNotification = "EOEditingContextDidSaveC/;"	f	class:EOEditingContext
+EditingContextFlushChangesRunLoopOrdering	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public static int EditingContextFlushChangesRunLoopOrdering = 300000;$/;"	f	class:EOEditingContext
+EditingContextMarker	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^	static private class EditingContextMarker implements Serializable {$/;"	c	class:KeyValueCodingUtilities
+Editor	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public interface Editor {$/;"	i	class:EOEditingContext
+FetchSpecificationKey	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public static final String FetchSpecificationKey = "fetchSpecification";$/;"	f	class:EOObjectStoreCoordinator
+FlushDelayedObserversRunLoopOrdering	src/main/java/net/wotonomy/control/EODelayedObserverQueue.java	/^	public static int FlushDelayedObserversRunLoopOrdering = 400000;$/;"	f	class:EODelayedObserverQueue
+FullOuterJoin	src/main/java/net/wotonomy/access/EORelationship.java	/^	public static final int FullOuterJoin = 1;$/;"	f	class:EORelationship
+GlobalIDChangedNotification	src/main/java/net/wotonomy/control/EOGlobalID.java	/^	public static final String GlobalIDChangedNotification = "GlobalIDChangedNotification";$/;"	f	class:EOGlobalID
+GlobalIDKey	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public static final String GlobalIDKey = "globalID";$/;"	f	class:EOObjectStoreCoordinator
+GlobalIDMarker	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^		public GlobalIDMarker(EOGlobalID anID) {$/;"	m	class:KeyValueCodingUtilities.GlobalIDMarker
+GlobalIDMarker	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^	static private class GlobalIDMarker implements Serializable {$/;"	c	class:KeyValueCodingUtilities
+IDX_NAME	src/main/java/net/wotonomy/access/EOModel.java	/^	protected static final String IDX_NAME = "index.eomodeld";$/;"	f	class:EOModel
+IDsToObjects	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		NSMutableDictionary IDsToObjects;$/;"	f	class:EOEditingContext.Registrar
+InOutParameter	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public static final int InOutParameter = 3;$/;"	f	class:EOAttribute
+InParameter	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public static final int InParameter = 1;$/;"	f	class:EOAttribute
+InnerJoin	src/main/java/net/wotonomy/access/EORelationship.java	/^	public static final int InnerJoin = 0;$/;"	f	class:EORelationship
+InsertedKey	src/main/java/net/wotonomy/control/EOObjectStore.java	/^	public static final String InsertedKey = "inserted";$/;"	f	class:EOObjectStore
+InvalidatedAllObjectsInStoreNotification	src/main/java/net/wotonomy/control/EOObjectStore.java	/^	public static final String InvalidatedAllObjectsInStoreNotification = "EOInvalidatedAllObjectsI/;"	f	class:EOObjectStore
+InvalidatedKey	src/main/java/net/wotonomy/control/EOObjectStore.java	/^	public static final String InvalidatedKey = "invalidated";$/;"	f	class:EOObjectStore
+KeyComparisonQualifierSupport	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^		public KeyComparisonQualifierSupport() {$/;"	m	class:EOQualifierSQLGeneration.KeyComparisonQualifierSupport
+KeyComparisonQualifierSupport	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^	public class KeyComparisonQualifierSupport extends Support {$/;"	c	interface:EOQualifierSQLGeneration
+KeyValueCodingUtilities	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^public class KeyValueCodingUtilities {$/;"	c
+KeyValueQualifierSupport	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^		public KeyValueQualifierSupport() {$/;"	m	class:EOQualifierSQLGeneration.KeyValueQualifierSupport
+KeyValueQualifierSupport	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^	public class KeyValueQualifierSupport extends Support {$/;"	c	interface:EOQualifierSQLGeneration
+LeftOuterJoin	src/main/java/net/wotonomy/access/EORelationship.java	/^	public static final int LeftOuterJoin = 2;$/;"	f	class:EORelationship
+METHOD_ARGS	src/main/java/net/wotonomy/control/EOKeyValueUnarchiver.java	/^	protected static final Class[] METHOD_ARGS = new Class[] { EOKeyValueUnarchiver.class };$/;"	f	class:EOKeyValueUnarchiver
+MessageChangeConflict	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	static protected String MessageChangeConflict = "Another user changed an object you are editing/;"	f	class:EOEditingContext
+MessageHandler	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public interface MessageHandler {$/;"	i	class:EOEditingContext
+NotQualifierSupport	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^		public NotQualifierSupport() {$/;"	m	class:EOQualifierSQLGeneration.NotQualifierSupport
+NotQualifierSupport	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^	public class NotQualifierSupport extends Support {$/;"	c	interface:EOQualifierSQLGeneration
+ObjectKey	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public static final String ObjectKey = "object";$/;"	f	class:EOObjectStoreCoordinator
+ObjectsChangedInEditingContextNotification	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public static final String ObjectsChangedInEditingContextNotification = "EOObjectsChangedInEdit/;"	f	class:EOEditingContext
+ObjectsChangedInStoreNotification	src/main/java/net/wotonomy/control/EOObjectStore.java	/^	public static final String ObjectsChangedInStoreNotification = "EOObjectsChangedInStoreNotifica/;"	f	class:EOObjectStore
+ObservableArray	src/main/java/net/wotonomy/control/ObservableArray.java	/^	ObservableArray(EOObserving anObserver) {$/;"	m	class:ObservableArray
+ObservableArray	src/main/java/net/wotonomy/control/ObservableArray.java	/^class ObservableArray extends NSMutableArray {$/;"	c
+ObserverNumberOfPriorities	src/main/java/net/wotonomy/control/EODelayedObserver.java	/^	public static final int ObserverNumberOfPriorities = 8;$/;"	f	class:EODelayedObserver
+ObserverPriorityFifth	src/main/java/net/wotonomy/control/EODelayedObserver.java	/^	public static final int ObserverPriorityFifth = 5;$/;"	f	class:EODelayedObserver
+ObserverPriorityFirst	src/main/java/net/wotonomy/control/EODelayedObserver.java	/^	public static final int ObserverPriorityFirst = 1;$/;"	f	class:EODelayedObserver
+ObserverPriorityFourth	src/main/java/net/wotonomy/control/EODelayedObserver.java	/^	public static final int ObserverPriorityFourth = 4;$/;"	f	class:EODelayedObserver
+ObserverPriorityImmediate	src/main/java/net/wotonomy/control/EODelayedObserver.java	/^	public static final int ObserverPriorityImmediate = 0;$/;"	f	class:EODelayedObserver
+ObserverPriorityLater	src/main/java/net/wotonomy/control/EODelayedObserver.java	/^	public static final int ObserverPriorityLater = 7;$/;"	f	class:EODelayedObserver
+ObserverPrioritySecond	src/main/java/net/wotonomy/control/EODelayedObserver.java	/^	public static final int ObserverPrioritySecond = 2;$/;"	f	class:EODelayedObserver
+ObserverPrioritySixth	src/main/java/net/wotonomy/control/EODelayedObserver.java	/^	public static final int ObserverPrioritySixth = 6;$/;"	f	class:EODelayedObserver
+ObserverPriorityThird	src/main/java/net/wotonomy/control/EODelayedObserver.java	/^	public static final int ObserverPriorityThird = 3;$/;"	f	class:EODelayedObserver
+OperatorCaseInsensitiveLike	src/main/java/net/wotonomy/control/EOQualifier.java	/^	static class OperatorCaseInsensitiveLike extends BaseSelector {$/;"	c	class:EOQualifier
+OperatorContains	src/main/java/net/wotonomy/control/EOQualifier.java	/^	static class OperatorContains extends BaseSelector {$/;"	c	class:EOQualifier
+OperatorEqual	src/main/java/net/wotonomy/control/EOQualifier.java	/^	static class OperatorEqual extends BaseSelector {$/;"	c	class:EOQualifier
+OperatorGreaterThan	src/main/java/net/wotonomy/control/EOQualifier.java	/^	static class OperatorGreaterThan extends BaseSelector {$/;"	c	class:EOQualifier
+OperatorGreaterThanOrEqualTo	src/main/java/net/wotonomy/control/EOQualifier.java	/^	static class OperatorGreaterThanOrEqualTo extends BaseSelector {$/;"	c	class:EOQualifier
+OperatorLessThan	src/main/java/net/wotonomy/control/EOQualifier.java	/^	static class OperatorLessThan extends BaseSelector {$/;"	c	class:EOQualifier
+OperatorLessThanOrEqualTo	src/main/java/net/wotonomy/control/EOQualifier.java	/^	static class OperatorLessThanOrEqualTo extends BaseSelector {$/;"	c	class:EOQualifier
+OperatorLike	src/main/java/net/wotonomy/control/EOQualifier.java	/^	static class OperatorLike extends BaseSelector {$/;"	c	class:EOQualifier
+OperatorNotEqual	src/main/java/net/wotonomy/control/EOQualifier.java	/^	static class OperatorNotEqual extends BaseSelector {$/;"	c	class:EOQualifier
+OrQualifierSupport	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^		public OrQualifierSupport() {$/;"	m	class:EOQualifierSQLGeneration.OrQualifierSupport
+OrQualifierSupport	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^	public class OrQualifierSupport extends Support {$/;"	c	interface:EOQualifierSQLGeneration
+OrderedDataSource	src/main/java/net/wotonomy/control/OrderedDataSource.java	/^public abstract class OrderedDataSource extends EODataSource {$/;"	c
+OutParameter	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public static final int OutParameter = 2;$/;"	f	class:EOAttribute
+PriorityLaterRunnable	src/main/java/net/wotonomy/control/EODelayedObserverQueue.java	/^		public PriorityLaterRunnable(List anObserverList) {$/;"	m	class:EODelayedObserverQueue.PriorityLaterRunnable
+PriorityLaterRunnable	src/main/java/net/wotonomy/control/EODelayedObserverQueue.java	/^	class PriorityLaterRunnable implements Runnable {$/;"	c	class:EODelayedObserverQueue
+PropertyDataSource	src/main/java/net/wotonomy/control/PropertyDataSource.java	/^	public PropertyDataSource() {$/;"	m	class:PropertyDataSource
+PropertyDataSource	src/main/java/net/wotonomy/control/PropertyDataSource.java	/^	public PropertyDataSource(EOEditingContext aContext) {$/;"	m	class:PropertyDataSource
+PropertyDataSource	src/main/java/net/wotonomy/control/PropertyDataSource.java	/^	public PropertyDataSource(EOEditingContext aContext, Class aClass) {$/;"	m	class:PropertyDataSource
+PropertyDataSource	src/main/java/net/wotonomy/control/PropertyDataSource.java	/^	public PropertyDataSource(EOEditingContext aContext, EOClassDescription aClassDesc) {$/;"	m	class:PropertyDataSource
+PropertyDataSource	src/main/java/net/wotonomy/control/PropertyDataSource.java	/^public class PropertyDataSource extends OrderedDataSource {$/;"	c
+QualifierOperatorCaseInsensitiveLike	src/main/java/net/wotonomy/control/EOQualifier.java	/^	public static final NSSelector QualifierOperatorCaseInsensitiveLike = new OperatorCaseInsensiti/;"	f	class:EOQualifier
+QualifierOperatorContains	src/main/java/net/wotonomy/control/EOQualifier.java	/^	public static final NSSelector QualifierOperatorContains = new OperatorContains();$/;"	f	class:EOQualifier
+QualifierOperatorEqual	src/main/java/net/wotonomy/control/EOQualifier.java	/^	public static final NSSelector QualifierOperatorEqual = new OperatorEqual();$/;"	f	class:EOQualifier
+QualifierOperatorGreaterThan	src/main/java/net/wotonomy/control/EOQualifier.java	/^	public static final NSSelector QualifierOperatorGreaterThan = new OperatorGreaterThan();$/;"	f	class:EOQualifier
+QualifierOperatorGreaterThanOrEqualTo	src/main/java/net/wotonomy/control/EOQualifier.java	/^	public static final NSSelector QualifierOperatorGreaterThanOrEqualTo = new OperatorGreaterThanO/;"	f	class:EOQualifier
+QualifierOperatorLessThan	src/main/java/net/wotonomy/control/EOQualifier.java	/^	public static final NSSelector QualifierOperatorLessThan = new OperatorLessThan();$/;"	f	class:EOQualifier
+QualifierOperatorLessThanOrEqualTo	src/main/java/net/wotonomy/control/EOQualifier.java	/^	public static final NSSelector QualifierOperatorLessThanOrEqualTo = new OperatorLessThanOrEqual/;"	f	class:EOQualifier
+QualifierOperatorLike	src/main/java/net/wotonomy/control/EOQualifier.java	/^	public static final NSSelector QualifierOperatorLike = new OperatorLike();$/;"	f	class:EOQualifier
+QualifierOperatorNotEqual	src/main/java/net/wotonomy/control/EOQualifier.java	/^	public static final NSSelector QualifierOperatorNotEqual = new OperatorNotEqual();$/;"	f	class:EOQualifier
+ReferenceKey	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public ReferenceKey() {$/;"	m	class:EOEditingContext.ReferenceKey
+ReferenceKey	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public ReferenceKey(Object anObject) {$/;"	m	class:EOEditingContext.ReferenceKey
+ReferenceKey	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	static private class ReferenceKey {$/;"	c	class:EOEditingContext
+ReferenceKey	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^		public ReferenceKey(Object anObject) {$/;"	m	class:EOObserverCenter.ReferenceKey
+ReferenceKey	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^		public ReferenceKey(Object anObject, ReferenceQueue aQueue) {$/;"	m	class:EOObserverCenter.ReferenceKey
+ReferenceKey	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^	static private class ReferenceKey extends WeakReference {$/;"	c	class:EOObserverCenter
+Registrar	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public Registrar(EOEditingContext aContext) {$/;"	m	class:EOEditingContext.Registrar
+Registrar	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	static private class Registrar {$/;"	c	class:EOEditingContext
+RightOuterJoin	src/main/java/net/wotonomy/access/EORelationship.java	/^	public static final int RightOuterJoin = 3;$/;"	f	class:EORelationship
+Support	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^		public Support() {$/;"	m	class:EOQualifierSQLGeneration.Support
+Support	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^	public abstract class Support {$/;"	c	interface:EOQualifierSQLGeneration
+Surrogate	src/main/java/net/wotonomy/control/internal/Surrogate.java	/^	public Surrogate() {$/;"	m	class:Surrogate
+Surrogate	src/main/java/net/wotonomy/control/internal/Surrogate.java	/^	public Surrogate(Object aDefault) {$/;"	m	class:Surrogate
+Surrogate	src/main/java/net/wotonomy/control/internal/Surrogate.java	/^	public Surrogate(Object[] aDelegateArray) {$/;"	m	class:Surrogate
+Surrogate	src/main/java/net/wotonomy/control/internal/Surrogate.java	/^	public Surrogate(Object[] aDelegateArray, Object aDefault) {$/;"	m	class:Surrogate
+Surrogate	src/main/java/net/wotonomy/control/internal/Surrogate.java	/^public class Surrogate extends NSMutableDictionary {$/;"	c
+TransposingContextObjectInputStream	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^		public TransposingContextObjectInputStream(InputStream anInputStream, EOEditingContext aContex/;"	m	class:KeyValueCodingUtilities.TransposingContextObjectInputStream
+TransposingContextObjectInputStream	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^	static private class TransposingContextObjectInputStream extends ContextObjectInputStream {$/;"	c	class:KeyValueCodingUtilities
+TransposingContextObjectOutputStream	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^		public TransposingContextObjectOutputStream(OutputStream anOutputStream, EOEditingContext aCon/;"	m	class:KeyValueCodingUtilities.TransposingContextObjectOutputStream
+TransposingContextObjectOutputStream	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^	static private class TransposingContextObjectOutputStream extends ContextObjectOutputStream {$/;"	c	class:KeyValueCodingUtilities
+UniqueBinaryKeyLength	src/main/java/net/wotonomy/control/EOTemporaryGlobalID.java	/^	public static final int UniqueBinaryKeyLength = 12;$/;"	f	class:EOTemporaryGlobalID
+UpdatedKey	src/main/java/net/wotonomy/control/EOObjectStore.java	/^	public static final String UpdatedKey = "updated";$/;"	f	class:EOObjectStore
+UseBindings	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	private static int UseBindings;$/;"	f	class:EOSQLExpression	file:
+Utility	src/main/java/net/wotonomy/control/EOKeyValueCodingAdditions.java	/^	public class Utility extends NSKeyValueCodingAdditions.Utility {$/;"	c	interface:EOKeyValueCodingAdditions
+Void	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public static final int Void = 0;$/;"	f	class:EOAttribute
+WeakReferenceKey	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public WeakReferenceKey() {$/;"	m	class:EOEditingContext.WeakReferenceKey
+WeakReferenceKey	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public WeakReferenceKey(Object anObject) {$/;"	m	class:EOEditingContext.WeakReferenceKey
+WeakReferenceKey	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	static private class WeakReferenceKey extends ReferenceKey {$/;"	c	class:EOEditingContext
+WeakRegistrar	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public WeakRegistrar(EOEditingContext aContext) {$/;"	m	class:EOEditingContext.WeakRegistrar
+WeakRegistrar	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	static private class WeakRegistrar extends Registrar {$/;"	c	class:EOEditingContext
+_DefaultFormatSQLStringLength	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	private static final int _DefaultFormatSQLStringLength = 64;$/;"	f	class:EOSQLExpression	file:
+_DefaultListStringLength	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	private static final int _DefaultListStringLength = 256;$/;"	f	class:EOSQLExpression	file:
+_DefaultOrderByStringLength	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	private static final int _DefaultOrderByStringLength = 128;$/;"	f	class:EOSQLExpression	file:
+_DefaultPathLength	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	private static final int _DefaultPathLength = 128;$/;"	f	class:EOSQLExpression	file:
+_DefaultTableListLength	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	private static final int _DefaultTableListLength = 128;$/;"	f	class:EOSQLExpression	file:
+_ValueLengthLimit	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	private static final int _ValueLengthLimit = 40;$/;"	f	class:EOSQLExpression	file:
+_adaptor	src/main/java/net/wotonomy/access/EOAdaptorContext.java	/^	protected EOAdaptor _adaptor;$/;"	f	class:EOAdaptorContext
+_adaptor	src/main/java/net/wotonomy/access/EODatabase.java	/^	protected EOAdaptor _adaptor;$/;"	f	class:EODatabase
+_adaptor	src/main/java/net/wotonomy/access/EOSQLExpressionFactory.java	/^	protected EOAdaptor _adaptor;$/;"	f	class:EOSQLExpressionFactory
+_adaptorName	src/main/java/net/wotonomy/access/EOModel.java	/^	protected String _adaptorName = "JDBC";$/;"	f	class:EOModel
+_adaptorOp	src/main/java/net/wotonomy/access/EOAdaptorOperation.java	/^	protected int _adaptorOp;$/;"	f	class:EOAdaptorOperation
+_adjustForInheritance	src/main/java/net/wotonomy/control/EOKeyGlobalID.java	/^	public static EOKeyGlobalID _adjustForInheritance(EOKeyGlobalID eokeyglobalid, String s, String/;"	m	class:EOKeyGlobalID
+_aliasForRelatedAttributeRelationshipPath	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String _aliasForRelatedAttributeRelationshipPath(EOAttribute a, String path) {$/;"	m	class:EOSQLExpression
+_aliasForRelationshipPath	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String _aliasForRelationshipPath(String path) {$/;"	m	class:EOSQLExpression
+_aliasesByEntityName	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	protected NSMutableDictionary _aliasesByEntityName;$/;"	f	class:EOSQLExpression
+_aliasesByRelationshipPath	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	protected NSMutableDictionary _aliasesByRelationshipPath;$/;"	f	class:EOSQLExpression
+_allowsNull	src/main/java/net/wotonomy/access/EOAttribute.java	/^	protected boolean _allowsNull;$/;"	f	class:EOAttribute
+_arguments	src/main/java/net/wotonomy/access/EOStoredProcedure.java	/^	protected NSArray _arguments = NSArray.EmptyArray;$/;"	f	class:EOStoredProcedure
+_attributeForPath	src/main/java/net/wotonomy/access/EOEntity.java	/^	public EOAttribute _attributeForPath(String path) {$/;"	m	class:EOEntity
+_attributes	src/main/java/net/wotonomy/access/EOAdaptorOperation.java	/^	protected NSArray _attributes;$/;"	f	class:EOAdaptorOperation
+_attributes	src/main/java/net/wotonomy/access/EODatabaseChannel.java	/^	protected NSArray _attributes;$/;"	f	class:EODatabaseChannel
+_attributes	src/main/java/net/wotonomy/access/EOEntity.java	/^	protected NSMutableDictionary _attributes = new NSMutableDictionary();$/;"	f	class:EOEntity
+_batchCount	src/main/java/net/wotonomy/access/EORelationship.java	/^	protected int _batchCount;$/;"	f	class:EORelationship
+_bindings	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	protected NSMutableArray _bindings;$/;"	f	class:EOSQLExpression
+_changedValues	src/main/java/net/wotonomy/access/EOAdaptorOperation.java	/^	protected NSDictionary _changedValues;$/;"	f	class:EOAdaptorOperation
+_channel	src/main/java/net/wotonomy/access/EODatabaseChannel.java	/^	protected EOAdaptorChannel _channel;$/;"	f	class:EODatabaseChannel
+_channels	src/main/java/net/wotonomy/access/EOAdaptorContext.java	/^	protected NSMutableArray _channels = new NSMutableArray();$/;"	f	class:EOAdaptorContext
+_channels	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	protected NSMutableArray _channels = new NSMutableArray();$/;"	f	class:EODatabaseContext
+_className	src/main/java/net/wotonomy/access/EOAttribute.java	/^	protected String _className;$/;"	f	class:EOAttribute
+_className	src/main/java/net/wotonomy/access/EOEntity.java	/^	protected String _className;$/;"	f	class:EOEntity
+_classProperties	src/main/java/net/wotonomy/access/EOEntity.java	/^	private NSMutableArray _classProperties = new NSMutableArray();$/;"	f	class:EOEntity	file:
+_classPropertyAttributes	src/main/java/net/wotonomy/access/EOEntity.java	/^	private NSMutableArray _classPropertyAttributes = new NSMutableArray();$/;"	f	class:EOEntity	file:
+_classPropertyManyRelationships	src/main/java/net/wotonomy/access/EOEntity.java	/^	private NSMutableArray _classPropertyManyRelationships = new NSMutableArray();$/;"	f	class:EOEntity	file:
+_classPropertyNames	src/main/java/net/wotonomy/access/EOEntity.java	/^	private NSMutableArray _classPropertyNames = new NSMutableArray();$/;"	f	class:EOEntity	file:
+_classPropertyOneRelationships	src/main/java/net/wotonomy/access/EOEntity.java	/^	private NSMutableArray _classPropertyOneRelationships = new NSMutableArray();$/;"	f	class:EOEntity	file:
+_classes	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^		private static NSMutableDictionary _classes = new NSMutableDictionary();$/;"	f	class:EOQualifierSQLGeneration.Support	file:
+_columnName	src/main/java/net/wotonomy/access/EOAttribute.java	/^	protected String _columnName;$/;"	f	class:EOAttribute
+_connectionDictionary	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	protected NSDictionary<String, Object> _connectionDictionary = (NSDictionary<String, Object>) N/;"	f	class:EOAdaptor
+_connectionDictionary	src/main/java/net/wotonomy/access/EOModel.java	/^	protected NSDictionary _connectionDictionary = NSDictionary.EmptyDictionary;$/;"	f	class:EOModel
+_context	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	protected EOAdaptorContext _context;$/;"	f	class:EOAdaptorChannel
+_context	src/main/java/net/wotonomy/access/EODatabaseChannel.java	/^	protected EODatabaseContext _context;$/;"	f	class:EODatabaseChannel
+_context	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	protected EOAdaptorContext _context;$/;"	f	class:EODatabaseContext
+_contextClass	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	private static Class<? extends EODatabaseContext> _contextClass;$/;"	f	class:EODatabaseContext	file:
+_contextStack	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	protected NSMutableArray _contextStack;$/;"	f	class:EOSQLExpression
+_contexts	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	protected NSMutableArray<Object> _contexts = new NSMutableArray<>();$/;"	f	class:EOAdaptor
+_contexts	src/main/java/net/wotonomy/access/EODatabase.java	/^	protected NSMutableArray _contexts = new NSMutableArray();$/;"	f	class:EODatabase
+_coordinator	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	protected EOObjectStoreCoordinator _coordinator;$/;"	f	class:EODatabaseContext
+_currEC	src/main/java/net/wotonomy/access/EODatabaseChannel.java	/^	protected EOEditingContext _currEC;$/;"	f	class:EODatabaseChannel
+_currEC	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	protected EOEditingContext _currEC;$/;"	f	class:EODatabaseContext
+_currEntity	src/main/java/net/wotonomy/access/EODatabaseChannel.java	/^	protected EOEntity _currEntity;$/;"	f	class:EODatabaseChannel
+_database	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	protected EODatabase _database;$/;"	f	class:EODatabaseContext
+_dbContext	src/main/java/net/wotonomy/access/EOAccessGenericFaultHandler.java	/^	protected EODatabaseContext _dbContext;$/;"	f	class:EOAccessGenericFaultHandler
+_defaultDateFormatter	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	protected NSTimestampFormatter _defaultDateFormatter() {$/;"	m	class:EOSQLExpression
+_defaultDateFormatter	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	protected static NSTimestampFormatter _defaultDateFormatter;$/;"	f	class:EOSQLExpression
+_defaultGlobalIDWithEntityName	src/main/java/net/wotonomy/control/EOKeyGlobalID.java	/^	public static EOKeyGlobalID _defaultGlobalIDWithEntityName(String s, Object aobj[]) {$/;"	m	class:EOKeyGlobalID
+_defaultGroup	src/main/java/net/wotonomy/access/EOModelGroup.java	/^	private static EOModelGroup _defaultGroup;$/;"	f	class:EOModelGroup	file:
+_definition	src/main/java/net/wotonomy/access/EOAttribute.java	/^	protected String _definition;$/;"	f	class:EOAttribute
+_definition	src/main/java/net/wotonomy/access/EORelationship.java	/^	protected String _definition;$/;"	f	class:EORelationship
+_delegate	src/main/java/net/wotonomy/control/EOKeyValueArchiver.java	/^	private Object _delegate;$/;"	f	class:EOKeyValueArchiver	file:
+_delegate	src/main/java/net/wotonomy/control/EOKeyValueUnarchiver.java	/^	Object _delegate;$/;"	f	class:EOKeyValueUnarchiver
+_deleteRule	src/main/java/net/wotonomy/access/EORelationship.java	/^	protected int _deleteRule;$/;"	f	class:EORelationship
+_destination	src/main/java/net/wotonomy/access/EOJoin.java	/^	protected EOAttribute _destination;$/;"	f	class:EOJoin
+_destination	src/main/java/net/wotonomy/access/EORelationship.java	/^	protected EOEntity _destination;$/;"	f	class:EORelationship
+_ec	src/main/java/net/wotonomy/access/EOAccessGenericFaultHandler.java	/^	protected EOEditingContext _ec;$/;"	f	class:EOAccessGenericFaultHandler
+_entities	src/main/java/net/wotonomy/access/EOModel.java	/^	protected NSMutableArray _entities = new NSMutableArray();$/;"	f	class:EOModel
+_entitiesByClass	src/main/java/net/wotonomy/access/EOModel.java	/^	protected NSMutableDictionary _entitiesByClass = new NSMutableDictionary();$/;"	f	class:EOModel
+_entitiesByName	src/main/java/net/wotonomy/access/EOModel.java	/^	protected NSMutableDictionary _entitiesByName = new NSMutableDictionary();$/;"	f	class:EOModel
+_entity	src/main/java/net/wotonomy/access/EOAdaptorOperation.java	/^	protected EOEntity _entity;$/;"	f	class:EOAdaptorOperation
+_entity	src/main/java/net/wotonomy/access/EOAttribute.java	/^	protected EOEntity _entity;$/;"	f	class:EOAttribute
+_entity	src/main/java/net/wotonomy/access/EOEntityClassDescription.java	/^	protected EOEntity _entity;$/;"	f	class:EOEntityClassDescription
+_entity	src/main/java/net/wotonomy/access/EORelationship.java	/^	protected EOEntity _entity;$/;"	f	class:EORelationship
+_entity	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	protected EOEntity _entity;$/;"	f	class:EOSQLExpression
+_entityName	src/main/java/net/wotonomy/control/EOKeyGlobalID.java	/^	protected String _entityName;$/;"	f	class:EOKeyGlobalID
+_exception	src/main/java/net/wotonomy/access/EOAdaptorOperation.java	/^	protected Throwable _exception;$/;"	f	class:EOAdaptorOperation
+_expressionClass	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	protected Class<? extends EOSQLExpression> _expressionClass;$/;"	f	class:EOAdaptor
+_expressionClass	src/main/java/net/wotonomy/access/EOSQLExpressionFactory.java	/^	protected Class _expressionClass;$/;"	f	class:EOSQLExpressionFactory
+_expressionClassesByName	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	private static NSMutableDictionary<String, String> _expressionClassesByName = new NSMutableDict/;"	f	class:EOAdaptor	file:
+_externalName	src/main/java/net/wotonomy/access/EOEntity.java	/^	protected String _externalName;$/;"	f	class:EOEntity
+_externalName	src/main/java/net/wotonomy/access/EOStoredProcedure.java	/^	protected String _externalName;$/;"	f	class:EOStoredProcedure
+_externalType	src/main/java/net/wotonomy/access/EOAttribute.java	/^	protected String _externalType;$/;"	f	class:EOAttribute
+_fetchSpecs	src/main/java/net/wotonomy/access/EOEntity.java	/^	protected NSMutableDictionary _fetchSpecs = new NSMutableDictionary();$/;"	f	class:EOEntity
+_gid	src/main/java/net/wotonomy/access/EOAccessFaultHandler.java	/^	protected EOKeyGlobalID _gid;$/;"	f	class:EOAccessFaultHandler
+_globalGroup	src/main/java/net/wotonomy/access/EOModelGroup.java	/^	private static EOModelGroup _globalGroup;$/;"	f	class:EOModelGroup	file:
+_group	src/main/java/net/wotonomy/access/EOModel.java	/^	protected EOModelGroup _group;$/;"	f	class:EOModel
+_guessedEntityName	src/main/java/net/wotonomy/control/EOKeyGlobalID.java	/^	public String _guessedEntityName() {$/;"	m	class:EOKeyGlobalID
+_hasOpenTransaction	src/main/java/net/wotonomy/access/EOAdaptorContext.java	/^	protected boolean _hasOpenTransaction;$/;"	f	class:EOAdaptorContext
+_has_allowsNull	src/main/java/net/wotonomy/access/EOAttribute.java	/^	protected boolean _has_allowsNull;$/;"	f	class:EOAttribute
+_hash	src/main/java/net/wotonomy/control/EOKeyGlobalID.java	/^	protected int _hash;$/;"	f	class:EOKeyGlobalID
+_hexChars	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	protected static final char[] _hexChars = new char[] { '0', '1', '2', '3', '4', '5', '6', '7', /;"	f	class:EOSQLExpression
+_instantiator	src/main/java/net/wotonomy/access/EOSQLExpressionFactory.java	/^	private Constructor _instantiator;$/;"	f	class:EOSQLExpressionFactory	file:
+_internalInfo	src/main/java/net/wotonomy/access/EOAttribute.java	/^	protected NSDictionary _internalInfo;$/;"	f	class:EOAttribute
+_internalInfo	src/main/java/net/wotonomy/access/EOEntity.java	/^	protected NSDictionary _internalInfo;$/;"	f	class:EOEntity
+_internalInfo	src/main/java/net/wotonomy/access/EOModel.java	/^	protected NSDictionary _internalInfo = NSDictionary.EmptyDictionary;$/;"	f	class:EOModel
+_internalInfo	src/main/java/net/wotonomy/access/EORelationship.java	/^	protected NSDictionary _internalInfo = NSDictionary.EmptyDictionary;$/;"	f	class:EORelationship
+_internalInfo	src/main/java/net/wotonomy/access/EOStoredProcedure.java	/^	protected NSDictionary _internalInfo = NSDictionary.EmptyDictionary;$/;"	f	class:EOStoredProcedure
+_invalidatedAllObjectsInSubStore	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public void _invalidatedAllObjectsInSubStore(NSNotification nsnotification) {$/;"	m	class:EOObjectStoreCoordinator
+_isAbstract	src/main/java/net/wotonomy/access/EOEntity.java	/^	protected boolean _isAbstract;$/;"	f	class:EOEntity
+_isFinal	src/main/java/net/wotonomy/control/EOKeyGlobalID.java	/^	public boolean _isFinal() {$/;"	m	class:EOKeyGlobalID
+_isFlattened	src/main/java/net/wotonomy/access/EOAttribute.java	/^	protected boolean _isFlattened;$/;"	f	class:EOAttribute
+_isFlattened	src/main/java/net/wotonomy/access/EORelationship.java	/^	protected boolean _isFlattened;$/;"	f	class:EORelationship
+_isMandatory	src/main/java/net/wotonomy/access/EORelationship.java	/^	protected boolean _isMandatory;$/;"	f	class:EORelationship
+_isReadOnly	src/main/java/net/wotonomy/access/EOEntity.java	/^	protected boolean _isReadOnly;$/;"	f	class:EOEntity
+_isToMany	src/main/java/net/wotonomy/access/EORelationship.java	/^	protected boolean _isToMany;$/;"	f	class:EORelationship
+_joinClauseString	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	protected StringBuffer _joinClauseString;$/;"	f	class:EOSQLExpression
+_joinSemantic	src/main/java/net/wotonomy/access/EORelationship.java	/^	protected int _joinSemantic;$/;"	f	class:EORelationship
+_joins	src/main/java/net/wotonomy/access/EORelationship.java	/^	protected NSMutableArray _joins = new NSMutableArray();$/;"	f	class:EORelationship
+_keyValues	src/main/java/net/wotonomy/control/EOVectorKeyGlobalID.java	/^	protected Object[] _keyValues;$/;"	f	class:EOVectorKeyGlobalID
+_keyValuesNoCopy	src/main/java/net/wotonomy/control/EOIntegralKeyGlobalID.java	/^	public Object[] _keyValuesNoCopy() {$/;"	m	class:EOIntegralKeyGlobalID
+_keyValuesNoCopy	src/main/java/net/wotonomy/control/EOKeyGlobalID.java	/^	public abstract Object[] _keyValuesNoCopy();$/;"	m	class:EOKeyGlobalID
+_keyValuesNoCopy	src/main/java/net/wotonomy/control/EOVectorKeyGlobalID.java	/^	public Object[] _keyValuesNoCopy() {$/;"	m	class:EOVectorKeyGlobalID
+_knowsIfFlattened	src/main/java/net/wotonomy/access/EOAttribute.java	/^	protected boolean _knowsIfFlattened;$/;"	f	class:EOAttribute
+_knowsIfFlattened	src/main/java/net/wotonomy/access/EORelationship.java	/^	protected boolean _knowsIfFlattened;$/;"	f	class:EORelationship
+_leftKey	src/main/java/net/wotonomy/control/EOKeyComparisonQualifier.java	/^	private String _leftKey;$/;"	f	class:EOKeyComparisonQualifier	file:
+_listString	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	protected StringBuffer _listString() {$/;"	m	class:EOSQLExpression
+_listString	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	protected StringBuffer _listString;$/;"	f	class:EOSQLExpression
+_literalEntityName	src/main/java/net/wotonomy/control/EOKeyGlobalID.java	/^	public String _literalEntityName() {$/;"	m	class:EOKeyGlobalID
+_loadedFetchSpecs	src/main/java/net/wotonomy/access/EOEntity.java	/^	private boolean _loadedFetchSpecs;$/;"	f	class:EOEntity	file:
+_lock	src/main/java/net/wotonomy/access/EOAccessLock.java	/^	private static NSRecursiveLock _lock = new NSRecursiveLock();$/;"	f	class:EOAccessLock	file:
+_lockedObjects	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	protected NSMutableArray _lockedObjects = new NSMutableArray();$/;"	f	class:EODatabaseContext
+_locking	src/main/java/net/wotonomy/access/EODatabaseChannel.java	/^	protected boolean _locking;$/;"	f	class:EODatabaseChannel
+_lockingAttributes	src/main/java/net/wotonomy/access/EOEntity.java	/^	protected NSMutableArray _lockingAttributes = new NSMutableArray();$/;"	f	class:EOEntity
+_manySnaps	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	protected NSMutableDictionary _manySnaps;$/;"	f	class:EODatabaseContext
+_model	src/main/java/net/wotonomy/access/EOEntity.java	/^	protected EOModel _model;$/;"	f	class:EOEntity
+_model	src/main/java/net/wotonomy/access/EOStoredProcedure.java	/^	protected EOModel _model;$/;"	f	class:EOStoredProcedure
+_models	src/main/java/net/wotonomy/access/EODatabase.java	/^	protected NSMutableArray _models = new NSMutableArray();$/;"	f	class:EODatabase
+_models	src/main/java/net/wotonomy/access/EOModelGroup.java	/^	protected NSMutableDictionary _models;$/;"	f	class:EOModelGroup
+_name	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	protected String _name;$/;"	f	class:EOAdaptor
+_name	src/main/java/net/wotonomy/access/EOAttribute.java	/^	protected String _name;$/;"	f	class:EOAttribute
+_name	src/main/java/net/wotonomy/access/EOEntity.java	/^	protected String _name;$/;"	f	class:EOEntity
+_name	src/main/java/net/wotonomy/access/EOModel.java	/^	protected String _name;$/;"	f	class:EOModel
+_name	src/main/java/net/wotonomy/access/EORelationship.java	/^	protected String _name;$/;"	f	class:EORelationship
+_name	src/main/java/net/wotonomy/access/EOStoredProcedure.java	/^	protected String _name;$/;"	f	class:EOStoredProcedure
+_objectsChangedInSubStore	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public void _objectsChangedInSubStore(NSNotification nsnotification) {$/;"	m	class:EOObjectStoreCoordinator
+_orderByString	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	protected StringBuffer _orderByString() {$/;"	m	class:EOSQLExpression
+_orderByString	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	protected StringBuffer _orderByString;$/;"	f	class:EOSQLExpression
+_ownsDestination	src/main/java/net/wotonomy/access/EORelationship.java	/^	protected boolean _ownsDestination;$/;"	f	class:EORelationship
+_parameterDirection	src/main/java/net/wotonomy/access/EOAttribute.java	/^	protected int _parameterDirection;$/;"	f	class:EOAttribute
+_path	src/main/java/net/wotonomy/access/EOModel.java	/^	protected String _path;$/;"	f	class:EOModel
+_pkAttributeNames	src/main/java/net/wotonomy/access/EOEntity.java	/^	protected NSArray _pkAttributeNames = NSArray.EmptyArray;$/;"	f	class:EOEntity
+_pkAttributes	src/main/java/net/wotonomy/access/EOEntity.java	/^	protected NSArray _pkAttributes = NSArray.EmptyArray;$/;"	f	class:EOEntity
+_precision	src/main/java/net/wotonomy/access/EOAttribute.java	/^	protected int _precision;$/;"	f	class:EOAttribute
+_prepClone	src/main/java/net/wotonomy/control/EOKeyGlobalID.java	/^	protected void _prepClone(EOKeyGlobalID gid) {$/;"	m	class:EOKeyGlobalID
+_proc	src/main/java/net/wotonomy/access/EOAdaptorOperation.java	/^	protected EOStoredProcedure _proc;$/;"	f	class:EOAdaptorOperation
+_propagatesPrimaryKey	src/main/java/net/wotonomy/access/EORelationship.java	/^	protected boolean _propagatesPrimaryKey;$/;"	f	class:EORelationship
+_prototype	src/main/java/net/wotonomy/access/EOAttribute.java	/^	protected EOAttribute _prototype;$/;"	f	class:EOAttribute
+_prototypeName	src/main/java/net/wotonomy/access/EOAttribute.java	/^	protected String _prototypeName;$/;"	f	class:EOAttribute
+_prototypesByName	src/main/java/net/wotonomy/access/EOModel.java	/^	protected NSMutableDictionary _prototypesByName = new NSMutableDictionary();$/;"	f	class:EOModel
+_qualifier	src/main/java/net/wotonomy/access/EOAdaptorOperation.java	/^	protected EOQualifier _qualifier;$/;"	f	class:EOAdaptorOperation
+_quoteExternalNames	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	protected static boolean _quoteExternalNames;$/;"	f	class:EOSQLExpression
+_readFormat	src/main/java/net/wotonomy/access/EOAttribute.java	/^	protected String _readFormat;$/;"	f	class:EOAttribute
+_readOnly	src/main/java/net/wotonomy/access/EOAttribute.java	/^	protected boolean _readOnly;$/;"	f	class:EOAttribute
+_refreshing	src/main/java/net/wotonomy/access/EODatabaseChannel.java	/^	protected boolean _refreshing;$/;"	f	class:EODatabaseChannel
+_relation	src/main/java/net/wotonomy/access/EOAccessArrayFaultHandler.java	/^	protected String _relation;$/;"	f	class:EOAccessArrayFaultHandler
+_relations	src/main/java/net/wotonomy/access/EOEntity.java	/^	protected NSMutableDictionary _relations = new NSMutableDictionary();$/;"	f	class:EOEntity
+_releaseUnrefSnapshots	src/main/java/net/wotonomy/access/EODatabase.java	/^	protected static boolean _releaseUnrefSnapshots = true;$/;"	f	class:EODatabase
+_resultCache	src/main/java/net/wotonomy/access/EODatabase.java	/^	protected NSMutableDictionary _resultCache = new NSMutableDictionary();$/;"	f	class:EODatabase
+_rightKey	src/main/java/net/wotonomy/control/EOKeyComparisonQualifier.java	/^	private String _rightKey;$/;"	f	class:EOKeyComparisonQualifier	file:
+_rootEntityForExpression	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public EOEntity _rootEntityForExpression() {$/;"	m	class:EOSQLExpression
+_scale	src/main/java/net/wotonomy/access/EOAttribute.java	/^	protected int _scale;$/;"	f	class:EOAttribute
+_selector	src/main/java/net/wotonomy/control/EOKeyComparisonQualifier.java	/^	private NSSelector _selector;$/;"	f	class:EOKeyComparisonQualifier	file:
+_setEntity	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public void _setEntity(EOEntity value) {$/;"	m	class:EOSQLExpression
+_setGuessedEntityName	src/main/java/net/wotonomy/control/EOKeyGlobalID.java	/^	public void _setGuessedEntityName(String s) {$/;"	m	class:EOKeyGlobalID
+_setSubEntityName	src/main/java/net/wotonomy/control/EOKeyGlobalID.java	/^	public void _setSubEntityName(String s) {$/;"	m	class:EOKeyGlobalID
+_simpleSnaps	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	protected NSMutableDictionary<EOGlobalID, NSDictionary> _simpleSnaps;$/;"	f	class:EODatabaseContext
+_snapshots	src/main/java/net/wotonomy/access/EODatabase.java	/^	protected NSMutableDictionary _snapshots = new NSMutableDictionary();$/;"	f	class:EODatabase
+_source	src/main/java/net/wotonomy/access/EOJoin.java	/^	protected EOAttribute _source;$/;"	f	class:EOJoin
+_sourceID	src/main/java/net/wotonomy/access/EOAccessArrayFaultHandler.java	/^	protected EOKeyGlobalID _sourceID;$/;"	f	class:EOAccessArrayFaultHandler
+_sources	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	private NSArray _sources() {$/;"	m	class:EOObjectStoreCoordinator	file:
+_sqlStringForJoinSemanticMatchSemantic	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String _sqlStringForJoinSemanticMatchSemantic(int semantic, int match) {$/;"	m	class:EOSQLExpression
+_statement	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	protected String _statement;$/;"	f	class:EOSQLExpression
+_storedProcedureNames	src/main/java/net/wotonomy/access/EOModel.java	/^	protected NSMutableArray _storedProcedureNames = new NSMutableArray();$/;"	f	class:EOModel
+_storedProcedures	src/main/java/net/wotonomy/access/EOModel.java	/^	protected NSMutableDictionary _storedProcedures = new NSMutableDictionary();$/;"	f	class:EOModel
+_stringForDate	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	protected String _stringForDate(NSTimestamp timestamp) {$/;"	m	class:EOSQLExpression
+_subEntityName	src/main/java/net/wotonomy/control/EOKeyGlobalID.java	/^	public String _subEntityName() {$/;"	m	class:EOKeyGlobalID
+_targetClass	src/main/java/net/wotonomy/control/EOFaultHandler.java	/^	protected Class _targetClass;$/;"	f	class:EOFaultHandler
+_timestamp	src/main/java/net/wotonomy/access/EODatabase.java	/^	protected NSTimestamp _timestamp;$/;"	f	class:EODatabase
+_updateStrategy	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	protected int _updateStrategy;$/;"	f	class:EODatabaseContext
+_upperFunctionName	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	protected String _upperFunctionName;$/;"	f	class:EOSQLExpression
+_useAliases	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	protected boolean _useAliases = true;$/;"	f	class:EOSQLExpression
+_useBatchFaulting	src/main/java/net/wotonomy/access/EORelationship.java	/^	protected boolean _useBatchFaulting;$/;"	f	class:EORelationship
+_userInfo	src/main/java/net/wotonomy/access/EOAttribute.java	/^	protected NSDictionary _userInfo;$/;"	f	class:EOAttribute
+_userInfo	src/main/java/net/wotonomy/access/EOEntity.java	/^	protected NSDictionary _userInfo;$/;"	f	class:EOEntity
+_userInfo	src/main/java/net/wotonomy/access/EOGeneralAdaptorException.java	/^	private NSDictionary _userInfo;$/;"	f	class:EOGeneralAdaptorException	file:
+_userInfo	src/main/java/net/wotonomy/access/EOModel.java	/^	protected NSDictionary _userInfo = NSDictionary.EmptyDictionary;$/;"	f	class:EOModel
+_userInfo	src/main/java/net/wotonomy/access/EORelationship.java	/^	protected NSDictionary _userInfo = NSDictionary.EmptyDictionary;$/;"	f	class:EORelationship
+_userInfo	src/main/java/net/wotonomy/access/EOStoredProcedure.java	/^	protected NSDictionary _userInfo = NSDictionary.EmptyDictionary;$/;"	f	class:EOStoredProcedure
+_valueClass	src/main/java/net/wotonomy/access/EOAttribute.java	/^	protected Class _valueClass;$/;"	f	class:EOAttribute
+_valueClassName	src/main/java/net/wotonomy/access/EOAttribute.java	/^	protected String _valueClassName;$/;"	f	class:EOAttribute
+_valueFactoryMethod	src/main/java/net/wotonomy/access/EOAttribute.java	/^	protected NSSelector _valueFactoryMethod;$/;"	f	class:EOAttribute
+_valueFactoryMethodName	src/main/java/net/wotonomy/access/EOAttribute.java	/^	protected String _valueFactoryMethodName;$/;"	f	class:EOAttribute
+_valueList	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	protected StringBuffer _valueList() {$/;"	m	class:EOSQLExpression
+_valueListString	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	protected StringBuffer _valueListString;$/;"	f	class:EOSQLExpression
+_valueType	src/main/java/net/wotonomy/access/EOAttribute.java	/^	protected String _valueType;$/;"	f	class:EOAttribute
+_whereClauseString	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	protected String _whereClauseString;$/;"	f	class:EOSQLExpression
+_width	src/main/java/net/wotonomy/access/EOAttribute.java	/^	protected int _width;$/;"	f	class:EOAttribute
+_writeFormat	src/main/java/net/wotonomy/access/EOAttribute.java	/^	protected String _writeFormat;$/;"	f	class:EOAttribute
+adaptor	src/main/java/net/wotonomy/access/EOAdaptorContext.java	/^	public EOAdaptor adaptor() {$/;"	m	class:EOAdaptorContext
+adaptor	src/main/java/net/wotonomy/access/EODatabase.java	/^	public EOAdaptor adaptor() {$/;"	m	class:EODatabase
+adaptor	src/main/java/net/wotonomy/access/EOSQLExpressionFactory.java	/^	public EOAdaptor adaptor() {$/;"	m	class:EOSQLExpressionFactory
+adaptorChannel	src/main/java/net/wotonomy/access/EODatabaseChannel.java	/^	public EOAdaptorChannel adaptorChannel() {$/;"	m	class:EODatabaseChannel
+adaptorContext	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	public EOAdaptorContext adaptorContext() {$/;"	m	class:EOAdaptorChannel
+adaptorContext	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public EOAdaptorContext adaptorContext() {$/;"	m	class:EODatabaseContext
+adaptorName	src/main/java/net/wotonomy/access/EOModel.java	/^	public String adaptorName() {$/;"	m	class:EOModel
+adaptorOperator	src/main/java/net/wotonomy/access/EOAdaptorOperation.java	/^	public int adaptorOperator() {$/;"	m	class:EOAdaptorOperation
+adaptorWithModel	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public static EOAdaptor adaptorWithModel(EOModel model) {$/;"	m	class:EOAdaptor
+adaptorWithName	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public static EOAdaptor adaptorWithName(String name) {$/;"	m	class:EOAdaptor
+add	src/main/java/net/wotonomy/control/ObservableArray.java	/^	public boolean add(Object o) {$/;"	m	class:ObservableArray
+add	src/main/java/net/wotonomy/control/ObservableArray.java	/^	public void add(int index, Object element) {$/;"	m	class:ObservableArray
+addAll	src/main/java/net/wotonomy/control/ObservableArray.java	/^	public boolean addAll(Collection coll) {$/;"	m	class:ObservableArray
+addAll	src/main/java/net/wotonomy/control/ObservableArray.java	/^	public boolean addAll(int index, Collection c) {$/;"	m	class:ObservableArray
+addAttribute	src/main/java/net/wotonomy/access/EOEntity.java	/^	public void addAttribute(EOAttribute atr) {$/;"	m	class:EOEntity
+addBindVariableDictionary	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public void addBindVariableDictionary(NSDictionary dict) {$/;"	m	class:EOSQLExpression
+addCooperatingObjectStore	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public void addCooperatingObjectStore(EOCooperatingObjectStore eocooperatingobjectstore) {$/;"	m	class:EOObjectStoreCoordinator
+addCreateClauseForAttribute	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public void addCreateClauseForAttribute(EOAttribute attr) {$/;"	m	class:EOSQLExpression
+addEditor	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void addEditor(EOEditingContext.Editor anEditor) {$/;"	m	class:EOEditingContext
+addEntity	src/main/java/net/wotonomy/access/EOModel.java	/^	public void addEntity(EOEntity ent) {$/;"	m	class:EOModel
+addFetchSpecification	src/main/java/net/wotonomy/access/EOEntity.java	/^	public void addFetchSpecification(EOFetchSpecification fspec, String name) {$/;"	m	class:EOEntity
+addInsertListAttribute	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public void addInsertListAttribute(EOAttribute attr, Object o) {$/;"	m	class:EOSQLExpression
+addJoin	src/main/java/net/wotonomy/access/EORelationship.java	/^	public void addJoin(EOJoin join) {$/;"	m	class:EORelationship
+addJoinClause	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public void addJoinClause(String left, String right, int semantic) {$/;"	m	class:EOSQLExpression
+addModel	src/main/java/net/wotonomy/access/EODatabase.java	/^	public void addModel(EOModel model) {$/;"	m	class:EODatabase
+addModel	src/main/java/net/wotonomy/access/EOModelGroup.java	/^	public void addModel(EOModel model) {$/;"	m	class:EOModelGroup
+addModelIfCompatible	src/main/java/net/wotonomy/access/EODatabase.java	/^	public boolean addModelIfCompatible(EOModel model) {$/;"	m	class:EODatabase
+addModelWithPath	src/main/java/net/wotonomy/access/EOModelGroup.java	/^	public void addModelWithPath(String path) {$/;"	m	class:EOModelGroup
+addModelsFromDirectory	src/main/java/net/wotonomy/access/EOModelGroup.java	/^	public void addModelsFromDirectory(String dir) {$/;"	m	class:EOModelGroup
+addObject	src/main/java/net/wotonomy/control/ObservableArray.java	/^	public void addObject(Object anObject) {$/;"	m	class:ObservableArray
+addObjectToBothSidesOfRelationshipWithKey	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public void addObjectToBothSidesOfRelationshipWithKey(EORelationshipManipulation anObject, Stri/;"	m	class:EOCustomObject
+addObjectToBothSidesOfRelationshipWithKey	src/main/java/net/wotonomy/control/EORelationshipManipulation.java	/^	void addObjectToBothSidesOfRelationshipWithKey(EORelationshipManipulation anObject, String aKey/;"	m	interface:EORelationshipManipulation
+addObjectToPropertyWithKey	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public void addObjectToPropertyWithKey(Object anObject, String aKey) {$/;"	m	class:EOCustomObject
+addObjectToPropertyWithKey	src/main/java/net/wotonomy/control/EORelationshipManipulation.java	/^	void addObjectToPropertyWithKey(Object anObject, String aKey);$/;"	m	interface:EORelationshipManipulation
+addObjectsFromArray	src/main/java/net/wotonomy/control/ObservableArray.java	/^	public void addObjectsFromArray(Collection aCollection) {$/;"	m	class:ObservableArray
+addObserver	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^	public static void addObserver(EOObserving anObserver, Object anObject) {$/;"	m	class:EOObserverCenter
+addOmniscientObserver	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^	public static void addOmniscientObserver(EOObserving anObserver) {$/;"	m	class:EOObserverCenter
+addOrderByAttributeOrdering	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public void addOrderByAttributeOrdering(EOSortOrdering order) {$/;"	m	class:EOSQLExpression
+addQualifier	src/main/java/net/wotonomy/control/EOAndQualifier.java	/^	public void addQualifier(EOQualifier qualifier) {$/;"	m	class:EOAndQualifier
+addQualifier	src/main/java/net/wotonomy/control/EOOrQualifier.java	/^	public void addQualifier(EOQualifier qualifier) {$/;"	m	class:EOOrQualifier
+addQualifierKeysToSet	src/main/java/net/wotonomy/control/EOQualifier.java	/^	public void addQualifierKeysToSet(Set aSet) {$/;"	m	class:EOQualifier
+addRelationship	src/main/java/net/wotonomy/access/EOEntity.java	/^	public void addRelationship(EORelationship rel) {$/;"	m	class:EOEntity
+addSelectListAttribute	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public void addSelectListAttribute(EOAttribute attr) {$/;"	m	class:EOSQLExpression
+addStoredProcedure	src/main/java/net/wotonomy/access/EOModel.java	/^	public void addStoredProcedure(EOStoredProcedure proc) {$/;"	m	class:EOModel
+addStoredProceduresNamed	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	public void addStoredProceduresNamed(NSArray<String> names, EOModel model) {$/;"	m	class:EOAdaptorChannel
+addUpdateListAttribute	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public void addUpdateListAttribute(EOAttribute attr, Object o) {$/;"	m	class:EOSQLExpression
+aliasesByRelationshipPath	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public NSMutableDictionary aliasesByRelationshipPath() {$/;"	m	class:EOSQLExpression
+allAttributeKeys	src/main/java/net/wotonomy/access/EOEntityClassDescription.java	/^	public NSArray allAttributeKeys() {$/;"	m	class:EOEntityClassDescription
+allPropertyKeys	src/main/java/net/wotonomy/access/EOEntityClassDescription.java	/^	public NSArray allPropertyKeys() {$/;"	m	class:EOEntityClassDescription
+allPropertyKeys	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public NSArray allPropertyKeys() {$/;"	m	class:EOCustomObject
+allPropertyKeys	src/main/java/net/wotonomy/control/EOEnterpriseObject.java	/^	NSArray allPropertyKeys();$/;"	m	interface:EOEnterpriseObject
+allQualifierKeys	src/main/java/net/wotonomy/control/EOQualifier.java	/^	public NSSet allQualifierKeys() {$/;"	m	class:EOQualifier
+allQualifierOperators	src/main/java/net/wotonomy/control/EOQualifier.java	/^	public static NSArray allQualifierOperators() {$/;"	m	class:EOQualifier
+allToManyRelationshipKeys	src/main/java/net/wotonomy/access/EOEntityClassDescription.java	/^	public NSArray allToManyRelationshipKeys() {$/;"	m	class:EOEntityClassDescription
+allToOneRelationshipKeys	src/main/java/net/wotonomy/access/EOEntityClassDescription.java	/^	public NSArray allToOneRelationshipKeys() {$/;"	m	class:EOEntityClassDescription
+allowsNull	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public boolean allowsNull() {$/;"	m	class:EOAttribute
+allowsNullClauseForConstraint	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String allowsNullClauseForConstraint(boolean flag) {$/;"	m	class:EOSQLExpression
+appendItemToListString	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public void appendItemToListString(String item, StringBuffer list) {$/;"	m	class:EOSQLExpression
+applySnapshot	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private void applySnapshot(byte[] aSnapshot, Object anObject) {$/;"	m	class:EOEditingContext	file:
+arguments	src/main/java/net/wotonomy/access/EOStoredProcedure.java	/^	public NSArray arguments() {$/;"	m	class:EOStoredProcedure
+arrayFaultWithSourceGlobalID	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public NSArray arrayFaultWithSourceGlobalID(EOGlobalID gid, String relName, EOEditingContext ec/;"	m	class:EODatabaseContext
+arrayFaultWithSourceGlobalID	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	public NSArray arrayFaultWithSourceGlobalID(EOGlobalID aGlobalID, String aRelationship, EOEditi/;"	m	class:AbstractObjectStore
+arrayFaultWithSourceGlobalID	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public NSArray arrayFaultWithSourceGlobalID(EOGlobalID aGlobalID, String aRelationshipKey,$/;"	m	class:EOEditingContext
+arrayFaultWithSourceGlobalID	src/main/java/net/wotonomy/control/EOObjectStore.java	/^	public abstract NSArray arrayFaultWithSourceGlobalID(EOGlobalID aGlobalID, String aRelationship/;"	m	class:EOObjectStore
+arrayFaultWithSourceGlobalID	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public NSArray arrayFaultWithSourceGlobalID(EOGlobalID eoglobalid, String s, EOEditingContext e/;"	m	class:EOObjectStoreCoordinator
+assembleDeleteStatementWithQualifier	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String assembleDeleteStatementWithQualifier(EOQualifier q, String tableList, String wher/;"	m	class:EOSQLExpression
+assembleInsertStatementWithRow	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String assembleInsertStatementWithRow(NSDictionary row, String tableList, String columnL/;"	m	class:EOSQLExpression
+assembleJoinClause	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String assembleJoinClause(String leftName, String rightName, int semantic) {$/;"	m	class:EOSQLExpression
+assembleSelectStatementWithAttributes	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String assembleSelectStatementWithAttributes(NSArray attributes, boolean lock, EOQualifi/;"	m	class:EOSQLExpression
+assembleUpdateStatementWithRow	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String assembleUpdateStatementWithRow(NSDictionary row, EOQualifier q, String tableList,/;"	m	class:EOSQLExpression
+assertConnectionDictionaryIsValid	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public abstract void assertConnectionDictionaryIsValid();$/;"	m	class:EOAdaptor
+assignExternalInfoForAttribute	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public void assignExternalInfoForAttribute(EOAttribute attribute) {$/;"	m	class:EOAdaptor
+assignExternalInfoForEntireModel	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public void assignExternalInfoForEntireModel(EOModel model) {$/;"	m	class:EOAdaptor
+assignExternalInfoForEntity	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public void assignExternalInfoForEntity(EOEntity entity) {$/;"	m	class:EOAdaptor
+assignExternalTypeForAttribute	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public void assignExternalTypeForAttribute(EOAttribute attribute) {$/;"	m	class:EOAdaptor
+attributeKeys	src/main/java/net/wotonomy/access/EOEntityClassDescription.java	/^	public NSArray attributeKeys() {$/;"	m	class:EOEntityClassDescription
+attributeKeys	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public NSArray attributeKeys() {$/;"	m	class:EOClassDescription
+attributeKeys	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public NSArray attributeKeys() {$/;"	m	class:EOCustomObject
+attributeKeys	src/main/java/net/wotonomy/control/EOEnterpriseObject.java	/^	NSArray attributeKeys();$/;"	m	interface:EOEnterpriseObject
+attributeNamed	src/main/java/net/wotonomy/access/EOEntity.java	/^	public EOAttribute attributeNamed(String name) {$/;"	m	class:EOEntity
+attributes	src/main/java/net/wotonomy/access/EOAdaptorOperation.java	/^	public NSArray attributes() {$/;"	m	class:EOAdaptorOperation
+attributes	src/main/java/net/wotonomy/access/EOEntity.java	/^	public NSArray attributes() {$/;"	m	class:EOEntity
+attributes	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	private NSMutableArray attributes;$/;"	f	class:EOClassDescription	file:
+attributesToFetch	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	public abstract NSArray attributesToFetch();$/;"	m	class:EOAdaptorChannel
+attributesToFetch	src/main/java/net/wotonomy/access/EOEntity.java	/^	public NSArray attributesToFetch() {$/;"	m	class:EOEntity
+attributesUsedForLocking	src/main/java/net/wotonomy/access/EOEntity.java	/^	public NSArray attributesUsedForLocking() {$/;"	m	class:EOEntity
+auxiliaryQualifier	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	EOQualifier auxiliaryQualifier;$/;"	f	class:EODatabaseDataSource
+auxiliaryQualifier	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	public EOQualifier auxiliaryQualifier() {$/;"	m	class:EODatabaseDataSource
+availableChannel	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public EODatabaseChannel availableChannel() {$/;"	m	class:EODatabaseContext
+awakeFromFetch	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public void awakeFromFetch(EOEditingContext anEditingContext) {$/;"	m	class:EOCustomObject
+awakeFromFetch	src/main/java/net/wotonomy/control/EOEnterpriseObject.java	/^	void awakeFromFetch(EOEditingContext anEditingContext);$/;"	m	interface:EOEnterpriseObject
+awakeFromInsertion	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public void awakeFromInsertion(EOEditingContext anEditingContext) {$/;"	m	class:EOCustomObject
+awakeFromInsertion	src/main/java/net/wotonomy/control/EOEnterpriseObject.java	/^	void awakeFromInsertion(EOEditingContext anEditingContext);$/;"	m	interface:EOEnterpriseObject
+awakeObjectFromFetch	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public void awakeObjectFromFetch(Object object, EOEditingContext anEditingContext) {$/;"	m	class:EOClassDescription
+awakeObjectFromInsertion	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public void awakeObjectFromInsertion(Object object, EOEditingContext anEditingContext) {$/;"	m	class:EOClassDescription
+awakeObjects	src/main/java/net/wotonomy/control/EOKeyValueUnarchiver.java	/^	public void awakeObjects() {$/;"	m	class:EOKeyValueUnarchiver
+awakeWithPropertyList	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public void awakeWithPropertyList(NSDictionary plist) {$/;"	m	class:EOAttribute
+awakeWithPropertyList	src/main/java/net/wotonomy/access/EOEntity.java	/^	public void awakeWithPropertyList(NSDictionary plist) {$/;"	m	class:EOEntity
+awakeWithPropertyList	src/main/java/net/wotonomy/access/EOPropertyListEncoding.java	/^	public abstract void awakeWithPropertyList(NSDictionary plist);$/;"	m	interface:EOPropertyListEncoding
+awakeWithPropertyList	src/main/java/net/wotonomy/access/EORelationship.java	/^	public void awakeWithPropertyList(NSDictionary plist) {$/;"	m	class:EORelationship
+awakeWithPropertyList	src/main/java/net/wotonomy/access/EOStoredProcedure.java	/^	public void awakeWithPropertyList(NSDictionary plist) {$/;"	m	class:EOStoredProcedure
+batchFetchRelationship	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public void batchFetchRelationship(EORelationship rel, NSArray arr, EOEditingContext ec) {$/;"	m	class:EODatabaseContext
+beginTransaction	src/main/java/net/wotonomy/access/EOAdaptorContext.java	/^	public abstract void beginTransaction();$/;"	m	class:EOAdaptorContext
+bindVariableDictionaries	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public NSArray bindVariableDictionaries() {$/;"	m	class:EOSQLExpression
+bindVariableDictionaryForAttribute	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public abstract NSMutableDictionary bindVariableDictionaryForAttribute(EOAttribute attr, Object/;"	m	class:EOSQLExpression
+bindingKeys	src/main/java/net/wotonomy/control/EOQualifier.java	/^	public NSArray bindingKeys() {$/;"	m	class:EOQualifier
+canAccessFieldsDirectly	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public static boolean canAccessFieldsDirectly() {$/;"	m	class:EOCustomObject
+canServiceModel	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public boolean canServiceModel(EOModel model) {$/;"	m	class:EOAdaptor
+cancelFetch	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	public abstract void cancelFetch();$/;"	m	class:EOAdaptorChannel
+cancelFetch	src/main/java/net/wotonomy/access/EODatabaseChannel.java	/^	public void cancelFetch() {$/;"	m	class:EODatabaseChannel
+changedKeysForObject	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	abstract protected Collection changedKeysForObject(Object anObject);$/;"	m	class:AbstractObjectStore
+changedValues	src/main/java/net/wotonomy/access/EOAdaptorOperation.java	/^	public NSDictionary changedValues() {$/;"	m	class:EOAdaptorOperation
+changesFromSnapshot	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public NSDictionary changesFromSnapshot(NSDictionary snapshot) {$/;"	m	class:EOCustomObject
+changesFromSnapshot	src/main/java/net/wotonomy/control/EOEnterpriseObject.java	/^	NSDictionary changesFromSnapshot(NSDictionary snapshot);$/;"	m	interface:EOEnterpriseObject
+channels	src/main/java/net/wotonomy/access/EOAdaptorContext.java	/^	public NSArray channels() {$/;"	m	class:EOAdaptorContext
+classDesc	src/main/java/net/wotonomy/control/PropertyDataSource.java	/^	protected EOClassDescription classDesc;$/;"	f	class:PropertyDataSource
+classDescription	src/main/java/net/wotonomy/control/ChildDataSource.java	/^	private EOClassDescription classDescription;$/;"	f	class:ChildDataSource	file:
+classDescription	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	private transient static EOClassDescription classDescription;$/;"	f	class:EOCustomObject	file:
+classDescription	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public EOClassDescription classDescription() {$/;"	m	class:EOCustomObject
+classDescription	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	EOClassDescription classDescription;$/;"	f	class:EODatabaseDataSource
+classDescription	src/main/java/net/wotonomy/control/EOEnterpriseObject.java	/^	EOClassDescription classDescription();$/;"	m	interface:EOEnterpriseObject
+classDescription	src/main/java/net/wotonomy/control/EOGenericRecord.java	/^	private EOClassDescription classDescription;$/;"	f	class:EOGenericRecord	file:
+classDescription	src/main/java/net/wotonomy/control/EOGenericRecord.java	/^	public EOClassDescription classDescription() {$/;"	m	class:EOGenericRecord
+classDescriptionForClass	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public static <C> EOClassDescription<C> classDescriptionForClass(Class<C> aClass) {$/;"	m	class:EOClassDescription
+classDescriptionForDestinationKey	src/main/java/net/wotonomy/access/EOEntityClassDescription.java	/^	public EOClassDescription classDescriptionForDestinationKey(String key) {$/;"	m	class:EOEntityClassDescription
+classDescriptionForDestinationKey	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public EOClassDescription<?> classDescriptionForDestinationKey(String detailKey) {$/;"	m	class:EOClassDescription
+classDescriptionForDestinationKey	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public EOClassDescription classDescriptionForDestinationKey(String aKey) {$/;"	m	class:EOCustomObject
+classDescriptionForDestinationKey	src/main/java/net/wotonomy/control/EOEnterpriseObject.java	/^	EOClassDescription classDescriptionForDestinationKey(String aKey);$/;"	m	interface:EOEnterpriseObject
+classDescriptionForEntityName	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public static <C> EOClassDescription<C> classDescriptionForEntityName(String aName) {$/;"	m	class:EOClassDescription
+classDescriptionForInstances	src/main/java/net/wotonomy/access/EOEntity.java	/^	public EOClassDescription classDescriptionForInstances() {$/;"	m	class:EOEntity
+classDescriptionForObjects	src/main/java/net/wotonomy/control/ChildDataSource.java	/^	public EOClassDescription classDescriptionForObjects() {$/;"	m	class:ChildDataSource
+classDescriptionForObjects	src/main/java/net/wotonomy/control/EODataSource.java	/^	public EOClassDescription classDescriptionForObjects() {$/;"	m	class:EODataSource
+classDescriptionForObjects	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	public EOClassDescription classDescriptionForObjects() {$/;"	m	class:EODatabaseDataSource
+classDescriptionForObjects	src/main/java/net/wotonomy/control/PropertyDataSource.java	/^	public EOClassDescription classDescriptionForObjects() {$/;"	m	class:PropertyDataSource
+classForCoder	src/main/java/net/wotonomy/control/EOKeyGlobalID.java	/^	public Class classForCoder() {$/;"	m	class:EOKeyGlobalID
+classLoader	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^		protected ClassLoader classLoader;$/;"	f	class:KeyValueCodingUtilities.ContextObjectInputStream
+classMap	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	private static Map<Class<?>, EOClassDescription<?>> classMap;$/;"	f	class:EOClassDescription	file:
+className	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public String className() {$/;"	m	class:EOAttribute
+className	src/main/java/net/wotonomy/access/EOEntity.java	/^	public String className() {$/;"	m	class:EOEntity
+classProperties	src/main/java/net/wotonomy/access/EOEntity.java	/^	public NSArray classProperties() {$/;"	m	class:EOEntity
+classPropertyAttributeNames	src/main/java/net/wotonomy/access/EOEntity.java	/^	public NSArray classPropertyAttributeNames() {$/;"	m	class:EOEntity
+classPropertyNames	src/main/java/net/wotonomy/access/EOEntity.java	/^	public NSArray classPropertyNames() {$/;"	m	class:EOEntity
+classPropertyToManyRelationshipNames	src/main/java/net/wotonomy/access/EOEntity.java	/^	public NSArray classPropertyToManyRelationshipNames() {$/;"	m	class:EOEntity
+classPropertyToOneRelationshipNames	src/main/java/net/wotonomy/access/EOEntity.java	/^	public NSArray classPropertyToOneRelationshipNames() {$/;"	m	class:EOEntity
+clear	src/main/java/net/wotonomy/control/ObservableArray.java	/^	public void clear() {$/;"	m	class:ObservableArray
+clearFault	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public void clearFault() {$/;"	m	class:EOCustomObject
+clearFault	src/main/java/net/wotonomy/control/EOFaultHandler.java	/^	public static void clearFault(Object obj) {$/;"	m	class:EOFaultHandler
+clearFault	src/main/java/net/wotonomy/control/EOFaulting.java	/^	void clearFault();$/;"	m	interface:EOFaulting
+clearProperties	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public void clearProperties() {$/;"	m	class:EOCustomObject
+clearProperties	src/main/java/net/wotonomy/control/EOEnterpriseObject.java	/^	void clearProperties();$/;"	m	interface:EOEnterpriseObject
+clientAttributeKeys	src/main/java/net/wotonomy/access/EOEntityClassDescription.java	/^	public NSArray clientAttributeKeys() {$/;"	m	class:EOEntityClassDescription
+clientToManyRelationshipKeys	src/main/java/net/wotonomy/access/EOEntityClassDescription.java	/^	public NSArray clientToManyRelationshipKeys() {$/;"	m	class:EOEntityClassDescription
+clientToOneRelationshipKeys	src/main/java/net/wotonomy/access/EOEntityClassDescription.java	/^	public NSArray clientToOneRelationshipKeys() {$/;"	m	class:EOEntityClassDescription
+clone	src/main/java/net/wotonomy/control/ArrayFault.java	/^	public Object clone() {$/;"	m	class:ArrayFault
+clone	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	static private Object clone(EOEditingContext aSourceContext, Object aSource, EOEditingContext a/;"	m	class:EOEditingContext	file:
+clone	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public Object clone() {$/;"	m	class:EOFetchSpecification
+clone	src/main/java/net/wotonomy/control/EOGlobalID.java	/^	public Object clone() throws CloneNotSupportedException {$/;"	m	class:EOGlobalID
+clone	src/main/java/net/wotonomy/control/EOTemporaryGlobalID.java	/^	public Object clone() {$/;"	m	class:EOTemporaryGlobalID
+clone	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^	static private Object clone(EOEditingContext aSourceContext, Object aSource, EOEditingContext a/;"	m	class:KeyValueCodingUtilities	file:
+clone	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^	static public Object clone(EOEditingContext aSourceContext, Object aSource, EOEditingContext aD/;"	m	class:KeyValueCodingUtilities
+clone	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^	static public Object clone(Object aSource) {$/;"	m	class:KeyValueCodingUtilities
+closeChannel	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	public abstract void closeChannel();$/;"	m	class:EOAdaptorChannel
+columnName	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public String columnName() {$/;"	m	class:EOAttribute
+columnTypeStringForAttribute	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String columnTypeStringForAttribute(EOAttribute attr) {$/;"	m	class:EOSQLExpression
+commitChanges	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public void commitChanges() {$/;"	m	class:EODatabaseContext
+commitChanges	src/main/java/net/wotonomy/control/EOCooperatingObjectStore.java	/^	public abstract void commitChanges();$/;"	m	class:EOCooperatingObjectStore
+commitTransaction	src/main/java/net/wotonomy/access/EOAdaptorContext.java	/^	public abstract void commitTransaction();$/;"	m	class:EOAdaptorContext
+committedSnapshotForObject	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public NSDictionary committedSnapshotForObject(Object anObject) {$/;"	m	class:EOEditingContext
+comparator	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^		private Comparator comparator;$/;"	f	class:EOSortOrdering.DelegatingComparator	file:
+compare	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^		public int compare(Object o1, Object o2) {$/;"	m	class:EOSortOrdering.CompareAscendingComparator
+compare	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^		public int compare(Object o1, Object o2) {$/;"	m	class:EOSortOrdering.CompareCaseInsensitiveAscendingComparator
+compare	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^		public int compare(Object o1, Object o2) {$/;"	m	class:EOSortOrdering.CompareCaseInsensitiveDescendingComparator
+compare	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^		public int compare(Object o1, Object o2) {$/;"	m	class:EOSortOrdering.CompareDescendingComparator
+compare	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^		public int compare(Object o1, Object o2) {$/;"	m	class:EOSortOrdering.DelegatingComparator
+compareAdaptorOperation	src/main/java/net/wotonomy/access/EOAdaptorOperation.java	/^	public int compareAdaptorOperation(EOAdaptorOperation op) {$/;"	m	class:EOAdaptorOperation
+comparisonKey	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		ReferenceKey comparisonKey; \/\/ FIXME not thread safe!$/;"	f	class:EOEditingContext.Registrar
+completeInitializationOfObject	src/main/java/net/wotonomy/access/EOAccessArrayFaultHandler.java	/^	public void completeInitializationOfObject(Object obj) {$/;"	m	class:EOAccessArrayFaultHandler
+completeInitializationOfObject	src/main/java/net/wotonomy/access/EOAccessFaultHandler.java	/^	public void completeInitializationOfObject(Object obj) {$/;"	m	class:EOAccessFaultHandler
+completeInitializationOfObject	src/main/java/net/wotonomy/control/EOFaultHandler.java	/^	public abstract void completeInitializationOfObject(Object obj);$/;"	m	class:EOFaultHandler
+connectionDictionary	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public NSDictionary<String, Object> connectionDictionary() {$/;"	m	class:EOAdaptor
+connectionDictionary	src/main/java/net/wotonomy/access/EOModel.java	/^	public NSDictionary connectionDictionary() {$/;"	m	class:EOModel
+contains	src/main/java/net/wotonomy/control/ArrayFault.java	/^	public boolean contains(Object elem) {$/;"	m	class:ArrayFault
+context	src/main/java/net/wotonomy/control/ChildDataSource.java	/^	private EOEditingContext context;$/;"	f	class:ChildDataSource	file:
+context	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		EOEditingContext context;$/;"	f	class:EOEditingContext.Registrar
+context	src/main/java/net/wotonomy/control/PropertyDataSource.java	/^	protected EOEditingContext context;$/;"	f	class:PropertyDataSource
+contextClassToRegister	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public static Class<? extends EODatabaseContext> contextClassToRegister() {$/;"	m	class:EODatabaseContext
+contexts	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public NSArray<Object> contexts() {$/;"	m	class:EOAdaptor
+convertSnapshotToDictionary	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private NSDictionary convertSnapshotToDictionary(byte[] aSnapshot) {$/;"	m	class:EOEditingContext	file:
+cooperatingObjectStores	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public NSArray cooperatingObjectStores() {$/;"	m	class:EOObjectStoreCoordinator
+coordinator	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public EOObjectStoreCoordinator coordinator() {$/;"	m	class:EODatabaseContext
+copy	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	static private Object copy(EOEditingContext aSourceContext, Object aSource, EOEditingContext aD/;"	m	class:EOEditingContext	file:
+copy	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^	static public Object copy(EOEditingContext aSourceContext, Object aSource, EOEditingContext aDe/;"	m	class:KeyValueCodingUtilities
+copy	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^	static public Object copy(Object aSource, Object aDestination) {$/;"	m	class:KeyValueCodingUtilities
+createAdaptorChannel	src/main/java/net/wotonomy/access/EOAdaptorContext.java	/^	public abstract EOAdaptorChannel createAdaptorChannel();$/;"	m	class:EOAdaptorContext
+createAdaptorContext	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public abstract EOAdaptorContext createAdaptorContext();$/;"	m	class:EOAdaptor
+createExpression	src/main/java/net/wotonomy/access/EOSQLExpressionFactory.java	/^	public EOSQLExpression createExpression(EOEntity entity) {$/;"	m	class:EOSQLExpressionFactory
+createFaultForDeferredFault	src/main/java/net/wotonomy/control/EOFaultHandler.java	/^	public Object createFaultForDeferredFault(Object fault, EOEnterpriseObject source) {$/;"	m	class:EOFaultHandler
+createInstanceWithEditingContext	src/main/java/net/wotonomy/access/EOEntityClassDescription.java	/^	public Object createInstanceWithEditingContext(EOEditingContext ec, EOGlobalID gid) {$/;"	m	class:EOEntityClassDescription
+createInstanceWithEditingContext	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	protected Object createInstanceWithEditingContext(EOGlobalID aGlobalID, EOEditingContext aConte/;"	m	class:AbstractObjectStore
+createInstanceWithEditingContext	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public C createInstanceWithEditingContext(EOEditingContext anEditingContext, EOGlobalID globalI/;"	m	class:EOClassDescription
+createObject	src/main/java/net/wotonomy/control/EODataSource.java	/^	public Object createObject() {$/;"	m	class:EODataSource
+currentEventSnapshotForObject	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public NSDictionary currentEventSnapshotForObject(Object anObject) {$/;"	m	class:EOEditingContext
+dataDictionary	src/main/java/net/wotonomy/control/EOGenericRecord.java	/^	private NSMutableDictionary dataDictionary;$/;"	f	class:EOGenericRecord	file:
+dataSourceQualifiedByKey	src/main/java/net/wotonomy/control/ChildDataSource.java	/^	public EODataSource dataSourceQualifiedByKey(String aKey) {$/;"	m	class:ChildDataSource
+dataSourceQualifiedByKey	src/main/java/net/wotonomy/control/EODataSource.java	/^	public abstract EODataSource dataSourceQualifiedByKey(String aKey);$/;"	m	class:EODataSource
+dataSourceQualifiedByKey	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	public EODataSource dataSourceQualifiedByKey(String aKey) {$/;"	m	class:EODatabaseDataSource
+dataSourceQualifiedByKey	src/main/java/net/wotonomy/control/PropertyDataSource.java	/^	public EODataSource dataSourceQualifiedByKey(String aKey) {$/;"	m	class:PropertyDataSource
+database	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public EODatabase database() {$/;"	m	class:EODatabaseContext
+databaseContext	src/main/java/net/wotonomy/access/EOAccessGenericFaultHandler.java	/^	public EODatabaseContext databaseContext() {$/;"	m	class:EOAccessGenericFaultHandler
+databaseContext	src/main/java/net/wotonomy/access/EODatabaseChannel.java	/^	public EODatabaseContext databaseContext() {$/;"	m	class:EODatabaseChannel
+databaseContext	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	public EOObjectStore databaseContext() {$/;"	m	class:EODatabaseDataSource
+debugString	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^	private static String debugString() {$/;"	m	class:EOObserverCenter	file:
+decodeBoolForKey	src/main/java/net/wotonomy/control/EOKeyValueUnarchiver.java	/^	public boolean decodeBoolForKey(String key) {$/;"	m	class:EOKeyValueUnarchiver
+decodeIntForKey	src/main/java/net/wotonomy/control/EOKeyValueUnarchiver.java	/^	public int decodeIntForKey(String key) {$/;"	m	class:EOKeyValueUnarchiver
+decodeObject	src/main/java/net/wotonomy/control/EOKeyGlobalID.java	/^	public static Object decodeObject(NSCoder nscoder) {$/;"	m	class:EOKeyGlobalID
+decodeObjectForKey	src/main/java/net/wotonomy/control/EOKeyValueUnarchiver.java	/^	public Object decodeObjectForKey(String key) {$/;"	m	class:EOKeyValueUnarchiver
+decodeObjectReferenceForKey	src/main/java/net/wotonomy/control/EOKeyValueUnarchiver.java	/^	public Object decodeObjectReferenceForKey(String key) {$/;"	m	class:EOKeyValueUnarchiver
+decodeWithKeyValueArchiver	src/main/java/net/wotonomy/control/EOKeyComparisonQualifier.java	/^	public static Object decodeWithKeyValueArchiver(EOKeyValueUnarchiver arch) {$/;"	m	class:EOKeyComparisonQualifier
+decodeWithKeyValueUnarchiver	src/main/java/net/wotonomy/control/EOAndQualifier.java	/^	public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver arch) {$/;"	m	class:EOAndQualifier
+decodeWithKeyValueUnarchiver	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver unarch) {$/;"	m	class:EOFetchSpecification
+decodeWithKeyValueUnarchiver	src/main/java/net/wotonomy/control/EOKeyValueQualifier.java	/^	public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver arch) {$/;"	m	class:EOKeyValueQualifier
+decodeWithKeyValueUnarchiver	src/main/java/net/wotonomy/control/EONotQualifier.java	/^	public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver arch) {$/;"	m	class:EONotQualifier
+decodeWithKeyValueUnarchiver	src/main/java/net/wotonomy/control/EOOrQualifier.java	/^	public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver arch) {$/;"	m	class:EOOrQualifier
+decodeWithKeyValueUnarchiver	src/main/java/net/wotonomy/control/EOQualifier.java	/^	public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver ua) {$/;"	m	class:EOQualifier
+decodeWithKeyValueUnarchiver	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^	public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver arch) {$/;"	m	class:EOSortOrdering
+decrementSnapshotCountForGlobalID	src/main/java/net/wotonomy/access/EODatabase.java	/^	public void decrementSnapshotCountForGlobalID(EOGlobalID gid) {$/;"	m	class:EODatabase
+deep	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	private boolean deep;$/;"	f	class:EOFetchSpecification	file:
+defaultCoordinator	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public static synchronized EOObjectStoreCoordinator defaultCoordinator() {$/;"	m	class:EOObjectStoreCoordinator
+defaultExpressionClass	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public abstract Class<? extends EOSQLExpression> defaultExpressionClass();$/;"	m	class:EOAdaptor
+defaultFetchTimestampLag	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private static double defaultFetchTimestampLag = 0;$/;"	f	class:EOEditingContext	file:
+defaultFetchTimestampLag	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public static double defaultFetchTimestampLag() {$/;"	m	class:EOEditingContext
+defaultGroup	src/main/java/net/wotonomy/access/EOModelGroup.java	/^	public static EOModelGroup defaultGroup() {$/;"	m	class:EOModelGroup
+defaultObserverQueue	src/main/java/net/wotonomy/control/EODelayedObserverQueue.java	/^	private static EODelayedObserverQueue defaultObserverQueue = null;$/;"	f	class:EODelayedObserverQueue	file:
+defaultObserverQueue	src/main/java/net/wotonomy/control/EODelayedObserverQueue.java	/^	public static EODelayedObserverQueue defaultObserverQueue() {$/;"	m	class:EODelayedObserverQueue
+defaultParentObjectStore	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private static EOObjectStore defaultParentObjectStore = null;$/;"	f	class:EOEditingContext	file:
+defaultParentObjectStore	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public static EOObjectStore defaultParentObjectStore() {$/;"	m	class:EOEditingContext
+defaultValue	src/main/java/net/wotonomy/control/internal/Surrogate.java	/^	protected Object defaultValue;$/;"	f	class:Surrogate
+definition	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public String definition() {$/;"	m	class:EOAttribute
+definition	src/main/java/net/wotonomy/access/EORelationship.java	/^	public String definition() {$/;"	m	class:EORelationship
+delegate	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private WeakReference delegate;$/;"	f	class:EOEditingContext	file:
+delegate	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public Object delegate() {$/;"	m	class:EOEditingContext
+delegate	src/main/java/net/wotonomy/control/EOKeyValueArchiver.java	/^	public Object delegate() {$/;"	m	class:EOKeyValueArchiver
+delegate	src/main/java/net/wotonomy/control/EOKeyValueUnarchiver.java	/^	public Object delegate() {$/;"	m	class:EOKeyValueUnarchiver
+delegates	src/main/java/net/wotonomy/control/internal/Surrogate.java	/^	protected Object[] delegates;$/;"	f	class:Surrogate
+deleteObject	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	abstract protected Object deleteObject(EOGlobalID aGlobalID);$/;"	m	class:AbstractObjectStore
+deleteObject	src/main/java/net/wotonomy/control/ChildDataSource.java	/^	public void deleteObject(Object anObject) {$/;"	m	class:ChildDataSource
+deleteObject	src/main/java/net/wotonomy/control/EODataSource.java	/^	public abstract void deleteObject(Object anObject);$/;"	m	class:EODataSource
+deleteObject	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	public void deleteObject(Object anObject) {$/;"	m	class:EODatabaseDataSource
+deleteObject	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void deleteObject(Object anObject) {$/;"	m	class:EOEditingContext
+deleteObject	src/main/java/net/wotonomy/control/PropertyDataSource.java	/^	public void deleteObject(Object anObject) {$/;"	m	class:PropertyDataSource
+deleteRowDescribedByQualifier	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	public void deleteRowDescribedByQualifier(EOQualifier q, EOEntity entity) {$/;"	m	class:EOAdaptorChannel
+deleteRowsDescribedByQualifier	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	public abstract int deleteRowsDescribedByQualifier(EOQualifier q, EOEntity entity);$/;"	m	class:EOAdaptorChannel
+deleteRule	src/main/java/net/wotonomy/access/EORelationship.java	/^	public int deleteRule() {$/;"	m	class:EORelationship
+deleteRuleForRelationshipKey	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public int deleteRuleForRelationshipKey(String relationshipKey) {$/;"	m	class:EOClassDescription
+deleteRuleForRelationshipKey	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public int deleteRuleForRelationshipKey(String aRelationshipKey) {$/;"	m	class:EOCustomObject
+deleteRuleForRelationshipKey	src/main/java/net/wotonomy/control/EOEnterpriseObject.java	/^	int deleteRuleForRelationshipKey(String aRelationshipKey);$/;"	m	interface:EOEnterpriseObject
+deleteStatementWithQualifier	src/main/java/net/wotonomy/access/EOSQLExpressionFactory.java	/^	public EOSQLExpression deleteStatementWithQualifier(EOQualifier qualifier, EOEntity entity) {$/;"	m	class:EOSQLExpressionFactory
+deletedIDsBuffer	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	private NSMutableArray deletedIDsBuffer;$/;"	f	class:AbstractObjectStore	file:
+deletedIDsBuffer	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private NSMutableArray<Object> deletedIDsBuffer;$/;"	f	class:EOEditingContext	file:
+deletedObjects	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private NSMutableArray<Object> deletedObjects;$/;"	f	class:EOEditingContext	file:
+deletedObjects	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public NSArray deletedObjects() {$/;"	m	class:EOEditingContext
+deletedObjectsBuffer	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private NSMutableArray<Object> deletedObjectsBuffer;$/;"	f	class:EOEditingContext	file:
+deletedObjectsProxy	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private NSArray<Object> deletedObjectsProxy;$/;"	f	class:EOEditingContext	file:
+dequeueObserver	src/main/java/net/wotonomy/control/EODelayedObserverQueue.java	/^	public void dequeueObserver(EODelayedObserver anObserver) {$/;"	m	class:EODelayedObserverQueue
+describeModelWithTableNames	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	public EOModel describeModelWithTableNames(NSArray names) {$/;"	m	class:EOAdaptorChannel
+describeResults	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	public abstract NSArray describeResults();$/;"	m	class:EOAdaptorChannel
+describeStoredProcedureNames	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	public NSArray describeStoredProcedureNames() {$/;"	m	class:EOAdaptorChannel
+describeTableNames	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	public NSArray describeTableNames() {$/;"	m	class:EOAdaptorChannel
+descriptionForObject	src/main/java/net/wotonomy/control/EOFaultHandler.java	/^	public String descriptionForObject(Object obj) {$/;"	m	class:EOFaultHandler
+destinationAttribute	src/main/java/net/wotonomy/access/EOJoin.java	/^	public EOAttribute destinationAttribute() {$/;"	m	class:EOJoin
+destinationEntity	src/main/java/net/wotonomy/access/EORelationship.java	/^	public EOEntity destinationEntity() {$/;"	m	class:EORelationship
+dict	src/main/java/net/wotonomy/control/EOKeyValueArchiver.java	/^	NSMutableDictionary dict = new NSMutableDictionary();$/;"	f	class:EOKeyValueArchiver
+dict	src/main/java/net/wotonomy/control/EOKeyValueUnarchiver.java	/^	NSDictionary dict;$/;"	f	class:EOKeyValueUnarchiver
+dictionary	src/main/java/net/wotonomy/control/EOKeyValueArchiver.java	/^	public NSDictionary dictionary() {$/;"	m	class:EOKeyValueArchiver
+dictionaryWithObjectsForAttributes	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	public NSMutableDictionary dictionaryWithObjectsForAttributes(Object[] values, NSArray attribut/;"	m	class:EOAdaptorChannel
+directGet	src/main/java/net/wotonomy/control/internal/Surrogate.java	/^	public Object directGet(Object aKey) {$/;"	m	class:Surrogate
+directPut	src/main/java/net/wotonomy/control/internal/Surrogate.java	/^	public Object directPut(Object aKey, Object aValue) {$/;"	m	class:Surrogate
+disableSnapshotRefCounting	src/main/java/net/wotonomy/access/EODatabase.java	/^	public static void disableSnapshotRefCounting() {$/;"	m	class:EODatabase
+discardPendingNotification	src/main/java/net/wotonomy/control/EODelayedObserver.java	/^	public void discardPendingNotification() {$/;"	m	class:EODelayedObserver
+displayNameForKey	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public String displayNameForKey(String key) {$/;"	m	class:EOClassDescription
+dispose	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public void dispose() {$/;"	m	class:EOObjectStoreCoordinator
+disposeObject	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		private void disposeObject(Object anObject, WeakReferenceKey key) {$/;"	m	class:EOEditingContext.WeakRegistrar	file:
+disposeSnapshots	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public void disposeSnapshots(Object anObject) {$/;"	m	class:EOEditingContext.Registrar
+distinct	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	private boolean distinct;$/;"	f	class:EOFetchSpecification	file:
+doCompare	src/main/java/net/wotonomy/control/EOQualifier.java	/^		protected int doCompare(Object o1, Object o2) {$/;"	m	class:EOQualifier.BaseSelector
+editingContext	src/main/java/net/wotonomy/access/EOAccessGenericFaultHandler.java	/^	public EOEditingContext editingContext() {$/;"	m	class:EOAccessGenericFaultHandler
+editingContext	src/main/java/net/wotonomy/control/ArrayFault.java	/^	private EOEditingContext editingContext;$/;"	f	class:ArrayFault	file:
+editingContext	src/main/java/net/wotonomy/control/ChildDataSource.java	/^	public EOEditingContext editingContext() {$/;"	m	class:ChildDataSource
+editingContext	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	private transient EOEditingContext editingContext;$/;"	f	class:EOCustomObject	file:
+editingContext	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public EOEditingContext editingContext() {$/;"	m	class:EOCustomObject
+editingContext	src/main/java/net/wotonomy/control/EODataSource.java	/^	public EOEditingContext editingContext() {$/;"	m	class:EODataSource
+editingContext	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	EOEditingContext editingContext;$/;"	f	class:EODatabaseDataSource
+editingContext	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	public EOEditingContext editingContext() {$/;"	m	class:EODatabaseDataSource
+editingContext	src/main/java/net/wotonomy/control/EOEnterpriseObject.java	/^	EOEditingContext editingContext();$/;"	m	interface:EOEnterpriseObject
+editingContext	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^		protected EOEditingContext editingContext;$/;"	f	class:KeyValueCodingUtilities.ContextObjectInputStream
+editingContext	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^		protected EOEditingContext editingContext;$/;"	f	class:KeyValueCodingUtilities.ContextObjectOutputStream
+editingContext	src/main/java/net/wotonomy/control/PropertyDataSource.java	/^	public EOEditingContext editingContext() {$/;"	m	class:PropertyDataSource
+editingContextDidForgetObjectWithGlobalID	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public void editingContextDidForgetObjectWithGlobalID(EOEditingContext ec, EOGlobalID gid) {$/;"	m	class:EODatabaseContext
+editingContextDidForgetObjectWithGlobalID	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void editingContextDidForgetObjectWithGlobalID(EOEditingContext aContext, EOGlobalID aGl/;"	m	class:EOEditingContext
+editingContextDidForgetObjectWithGlobalID	src/main/java/net/wotonomy/control/EOObjectStore.java	/^	public void editingContextDidForgetObjectWithGlobalID(EOEditingContext aContext, EOGlobalID aGl/;"	m	class:EOObjectStore
+editingContextDidForgetObjectWithGlobalID	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public void editingContextDidForgetObjectWithGlobalID(EOEditingContext eoeditingcontext, EOGlob/;"	m	class:EOObjectStoreCoordinator
+editingContextDidMergeChanges	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		void editingContextDidMergeChanges(EOEditingContext anEditingContext);$/;"	m	interface:EOEditingContext.Delegate
+editingContextPresentErrorMessage	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		void editingContextPresentErrorMessage(EOEditingContext anEditingContext, String aMessage);$/;"	m	interface:EOEditingContext.MessageHandler
+editingContextShouldContinueFetching	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		boolean editingContextShouldContinueFetching(EOEditingContext anEditingContext, int count, int/;"	m	interface:EOEditingContext.MessageHandler
+editingContextShouldFetchObjects	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		NSArray editingContextShouldFetchObjects(EOEditingContext anEditingContext,$/;"	m	interface:EOEditingContext.Delegate
+editingContextShouldInvalidateObject	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		boolean editingContextShouldInvalidateObject(EOEditingContext anEditingContext, Object anObjec/;"	m	interface:EOEditingContext.Delegate
+editingContextShouldMergeChangesForObject	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		boolean editingContextShouldMergeChangesForObject(EOEditingContext anEditingContext, Object an/;"	m	interface:EOEditingContext.Delegate
+editingContextShouldPresentException	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		boolean editingContextShouldPresentException(EOEditingContext anEditingContext, Throwable exce/;"	m	interface:EOEditingContext.Delegate
+editingContextShouldUndoUserActionsAfterFailure	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		boolean editingContextShouldUndoUserActionsAfterFailure(EOEditingContext anEditingContext);$/;"	m	interface:EOEditingContext.Delegate
+editingContextShouldValidateChanges	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		boolean editingContextShouldValidateChanges(EOEditingContext anEditingContext);$/;"	m	interface:EOEditingContext.Delegate
+editingContextWillSaveChanges	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		void editingContextWillSaveChanges(EOEditingContext anEditingContext);$/;"	m	interface:EOEditingContext.Delegate
+editingContextWillSaveChanges	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		void editingContextWillSaveChanges(EOEditingContext anEditingContext);$/;"	m	interface:EOEditingContext.Editor
+editorHasChangesForEditingContext	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		boolean editorHasChangesForEditingContext(EOEditingContext anEditingContext);$/;"	m	interface:EOEditingContext.Editor
+editorSet	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private List<WeakReference<EOEditingContext.Editor>> editorSet;$/;"	f	class:EOEditingContext	file:
+editors	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public NSArray editors() {$/;"	m	class:EOEditingContext
+enableObserverNotification	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^	public static void enableObserverNotification() {$/;"	m	class:EOObserverCenter
+encodeBool	src/main/java/net/wotonomy/control/EOKeyValueArchiver.java	/^	public void encodeBool(boolean flag, String key) {$/;"	m	class:EOKeyValueArchiver
+encodeInt	src/main/java/net/wotonomy/control/EOKeyValueArchiver.java	/^	public void encodeInt(int value, String key) {$/;"	m	class:EOKeyValueArchiver
+encodeIntoPropertyList	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public void encodeIntoPropertyList(NSMutableDictionary dict) {$/;"	m	class:EOAttribute
+encodeIntoPropertyList	src/main/java/net/wotonomy/access/EOEntity.java	/^	public void encodeIntoPropertyList(NSMutableDictionary dict) {$/;"	m	class:EOEntity
+encodeIntoPropertyList	src/main/java/net/wotonomy/access/EOPropertyListEncoding.java	/^	public abstract void encodeIntoPropertyList(NSMutableDictionary plist);$/;"	m	interface:EOPropertyListEncoding
+encodeIntoPropertyList	src/main/java/net/wotonomy/access/EORelationship.java	/^	public void encodeIntoPropertyList(NSMutableDictionary dict) {$/;"	m	class:EORelationship
+encodeIntoPropertyList	src/main/java/net/wotonomy/access/EOStoredProcedure.java	/^	public void encodeIntoPropertyList(NSMutableDictionary plist) {$/;"	m	class:EOStoredProcedure
+encodeObject	src/main/java/net/wotonomy/control/EOKeyValueArchiver.java	/^	public void encodeObject(Object obj, String key) {$/;"	m	class:EOKeyValueArchiver
+encodeReferenceToObject	src/main/java/net/wotonomy/control/EOKeyValueArchiver.java	/^	public void encodeReferenceToObject(Object obj, String key) {$/;"	m	class:EOKeyValueArchiver
+encodeWithCoder	src/main/java/net/wotonomy/control/EOKeyGlobalID.java	/^	public void encodeWithCoder(NSCoder nscoder) {$/;"	m	class:EOKeyGlobalID
+encodeWithKeyValueArchiver	src/main/java/net/wotonomy/control/EOAndQualifier.java	/^	public void encodeWithKeyValueArchiver(EOKeyValueArchiver arch) {$/;"	m	class:EOAndQualifier
+encodeWithKeyValueArchiver	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public void encodeWithKeyValueArchiver(EOKeyValueArchiver arch) {$/;"	m	class:EOFetchSpecification
+encodeWithKeyValueArchiver	src/main/java/net/wotonomy/control/EOKeyComparisonQualifier.java	/^	public void encodeWithKeyValueArchiver(EOKeyValueArchiver arch) {$/;"	m	class:EOKeyComparisonQualifier
+encodeWithKeyValueArchiver	src/main/java/net/wotonomy/control/EOKeyValueArchiving.java	/^	public abstract void encodeWithKeyValueArchiver(EOKeyValueArchiver archiver);$/;"	m	interface:EOKeyValueArchiving
+encodeWithKeyValueArchiver	src/main/java/net/wotonomy/control/EOKeyValueQualifier.java	/^	public void encodeWithKeyValueArchiver(EOKeyValueArchiver arch) {$/;"	m	class:EOKeyValueQualifier
+encodeWithKeyValueArchiver	src/main/java/net/wotonomy/control/EONotQualifier.java	/^	public void encodeWithKeyValueArchiver(EOKeyValueArchiver arch) {$/;"	m	class:EONotQualifier
+encodeWithKeyValueArchiver	src/main/java/net/wotonomy/control/EOOrQualifier.java	/^	public void encodeWithKeyValueArchiver(EOKeyValueArchiver arch) {$/;"	m	class:EOOrQualifier
+encodeWithKeyValueArchiver	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^	public void encodeWithKeyValueArchiver(EOKeyValueArchiver arch) {$/;"	m	class:EOSortOrdering
+enqueueObserver	src/main/java/net/wotonomy/control/EODelayedObserverQueue.java	/^	public void enqueueObserver(EODelayedObserver anObserver) {$/;"	m	class:EODelayedObserverQueue
+ensureObjectAwake	src/main/java/net/wotonomy/control/EOKeyValueUnarchiver.java	/^	public void ensureObjectAwake(Object obj) {$/;"	m	class:EOKeyValueUnarchiver
+entities	src/main/java/net/wotonomy/access/EOModel.java	/^	public NSArray entities() {$/;"	m	class:EOModel
+entity	src/main/java/net/wotonomy/access/EOAdaptorOperation.java	/^	public EOEntity entity() {$/;"	m	class:EOAdaptorOperation
+entity	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public EOEntity entity() {$/;"	m	class:EOAttribute
+entity	src/main/java/net/wotonomy/access/EOEntityClassDescription.java	/^	public EOEntity entity() {$/;"	m	class:EOEntityClassDescription
+entity	src/main/java/net/wotonomy/access/EORelationship.java	/^	public EOEntity entity() {$/;"	m	class:EORelationship
+entity	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public EOEntity entity() {$/;"	m	class:EOSQLExpression
+entityForGlobalIDOrObject	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	abstract protected String entityForGlobalIDOrObject(EOGlobalID aGlobalID, Object anObject);$/;"	m	class:AbstractObjectStore
+entityForObject	src/main/java/net/wotonomy/access/EODatabase.java	/^	public EOEntity entityForObject(EOEnterpriseObject eo) {$/;"	m	class:EODatabase
+entityForObject	src/main/java/net/wotonomy/access/EOModelGroup.java	/^	public EOEntity entityForObject(net.wotonomy.control.EOEnterpriseObject eo) {$/;"	m	class:EOModelGroup
+entityMap	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	private static Map<String, EOClassDescription<?>> entityMap;$/;"	f	class:EOClassDescription	file:
+entityName	src/main/java/net/wotonomy/access/EOEntityClassDescription.java	/^	public String entityName() {$/;"	m	class:EOEntityClassDescription
+entityName	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public String entityName() {$/;"	m	class:EOClassDescription
+entityName	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public String entityName() {$/;"	m	class:EOCustomObject
+entityName	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	String entityName;$/;"	f	class:EODatabaseDataSource
+entityName	src/main/java/net/wotonomy/control/EOEnterpriseObject.java	/^	String entityName();$/;"	m	interface:EOEnterpriseObject
+entityName	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	private String entityName;$/;"	f	class:EOFetchSpecification	file:
+entityName	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public String entityName() {$/;"	m	class:EOFetchSpecification
+entityName	src/main/java/net/wotonomy/control/EOKeyGlobalID.java	/^	public String entityName() {$/;"	m	class:EOKeyGlobalID
+entityNamed	src/main/java/net/wotonomy/access/EODatabase.java	/^	public EOEntity entityNamed(String name) {$/;"	m	class:EODatabase
+entityNamed	src/main/java/net/wotonomy/access/EOModel.java	/^	public EOEntity entityNamed(String name) {$/;"	m	class:EOModel
+entityNamed	src/main/java/net/wotonomy/access/EOModelGroup.java	/^	public EOEntity entityNamed(String name) {$/;"	m	class:EOModelGroup
+entityNames	src/main/java/net/wotonomy/access/EOModel.java	/^	public NSArray entityNames() {$/;"	m	class:EOModel
+eoDescription	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public String eoDescription() {$/;"	m	class:EOCustomObject
+eoDescription	src/main/java/net/wotonomy/control/EOEnterpriseObject.java	/^	String eoDescription();$/;"	m	interface:EOEnterpriseObject
+eoShallowDescription	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public String eoShallowDescription() {$/;"	m	class:EOCustomObject
+eoShallowDescription	src/main/java/net/wotonomy/control/EOEnterpriseObject.java	/^	String eoShallowDescription();$/;"	m	interface:EOEnterpriseObject
+eoShallowDescription	src/main/java/net/wotonomy/control/EOFaultHandler.java	/^	public String eoShallowDescription(Object obj) {$/;"	m	class:EOFaultHandler
+equals	src/main/java/net/wotonomy/control/ArrayFault.java	/^	public boolean equals(Object o) {$/;"	m	class:ArrayFault
+equals	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public boolean equals(Object anObject) {$/;"	m	class:EOEditingContext.CompoundKey
+equals	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public boolean equals(Object anObject) {$/;"	m	class:EOEditingContext.ReferenceKey
+equals	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public boolean equals(Object anObject) {$/;"	m	class:EOEditingContext.WeakReferenceKey
+equals	src/main/java/net/wotonomy/control/EONullValue.java	/^	public boolean equals(Object anObject) {$/;"	m	class:EONullValue
+equals	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^		public boolean equals(Object anObject) {$/;"	m	class:EOObserverCenter.ReferenceKey
+equals	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^		public boolean equals(Object obj) {$/;"	m	class:EOSortOrdering.CompareAscendingComparator
+equals	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^		public boolean equals(Object obj) {$/;"	m	class:EOSortOrdering.CompareCaseInsensitiveAscendingComparator
+equals	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^		public boolean equals(Object obj) {$/;"	m	class:EOSortOrdering.DelegatingComparator
+equals	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^	public boolean equals(Object anObject) {$/;"	m	class:EOSortOrdering
+equals	src/main/java/net/wotonomy/control/EOTemporaryGlobalID.java	/^	public boolean equals(Object anObject) {$/;"	m	class:EOTemporaryGlobalID
+equals	src/main/java/net/wotonomy/control/internal/Surrogate.java	/^	public boolean equals(Object anObject) {$/;"	m	class:Surrogate
+evaluateExpression	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	public abstract void evaluateExpression(EOSQLExpression sql);$/;"	m	class:EOAdaptorChannel
+evaluateWithObject	src/main/java/net/wotonomy/control/EOAndQualifier.java	/^	public boolean evaluateWithObject(Object anObject) {$/;"	m	class:EOAndQualifier
+evaluateWithObject	src/main/java/net/wotonomy/control/EOKeyComparisonQualifier.java	/^	public boolean evaluateWithObject(Object eo) {$/;"	m	class:EOKeyComparisonQualifier
+evaluateWithObject	src/main/java/net/wotonomy/control/EOKeyValueQualifier.java	/^	public boolean evaluateWithObject(Object anObject) {$/;"	m	class:EOKeyValueQualifier
+evaluateWithObject	src/main/java/net/wotonomy/control/EONotQualifier.java	/^	public boolean evaluateWithObject(Object anObject) {$/;"	m	class:EONotQualifier
+evaluateWithObject	src/main/java/net/wotonomy/control/EOOrQualifier.java	/^	public boolean evaluateWithObject(Object anObject) {$/;"	m	class:EOOrQualifier
+evaluateWithObject	src/main/java/net/wotonomy/control/EOQualifier.java	/^	public boolean evaluateWithObject(Object anObject) {$/;"	m	class:EOQualifier
+evaluateWithObject	src/main/java/net/wotonomy/control/EOQualifierEvaluation.java	/^	public boolean evaluateWithObject(Object eo);$/;"	m	interface:EOQualifierEvaluation
+exception	src/main/java/net/wotonomy/access/EOAdaptorOperation.java	/^	public Throwable exception() {$/;"	m	class:EOAdaptorOperation
+exceptionList	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	private List exceptionList;$/;"	f	class:AbstractObjectStore	file:
+executeStoredProcedure	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	public abstract void executeStoredProcedure(EOStoredProcedure proc, NSDictionary values);$/;"	m	class:EOAdaptorChannel
+expressionClass	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public Class<? extends EOSQLExpression> expressionClass() {$/;"	m	class:EOAdaptor
+expressionClass	src/main/java/net/wotonomy/access/EOSQLExpressionFactory.java	/^	public Class expressionClass() {$/;"	m	class:EOSQLExpressionFactory
+expressionClassName	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public static String expressionClassName(String adaptorClassName) {$/;"	m	class:EOAdaptor
+expressionFactory	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public abstract EOSQLExpressionFactory expressionFactory();$/;"	m	class:EOAdaptor
+expressionForEntity	src/main/java/net/wotonomy/access/EOSQLExpressionFactory.java	/^	public EOSQLExpression expressionForEntity(EOEntity entity) {$/;"	m	class:EOSQLExpressionFactory
+expressionForString	src/main/java/net/wotonomy/access/EOSQLExpressionFactory.java	/^	public EOSQLExpression expressionForString(String sql) {$/;"	m	class:EOSQLExpressionFactory
+externalModelsReferenced	src/main/java/net/wotonomy/access/EOEntity.java	/^	public NSArray externalModelsReferenced() {$/;"	m	class:EOEntity
+externalName	src/main/java/net/wotonomy/access/EOEntity.java	/^	public String externalName() {$/;"	m	class:EOEntity
+externalName	src/main/java/net/wotonomy/access/EOStoredProcedure.java	/^	public String externalName() {$/;"	m	class:EOStoredProcedure
+externalNameQuoteCharacter	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String externalNameQuoteCharacter() {$/;"	m	class:EOSQLExpression
+externalType	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public String externalType() {$/;"	m	class:EOAttribute
+externalTypesWithModel	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public NSArray<?> externalTypesWithModel(EOModel model) {$/;"	m	class:EOAdaptor
+faultForGlobalID	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public \/* EOEnterpriseObject *\/Object faultForGlobalID(EOGlobalID gid, EOEditingContext ec) {$/;"	m	class:EODatabaseContext
+faultForGlobalID	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	public \/* EOEnterpriseObject *\/Object faultForGlobalID(EOGlobalID aGlobalID, EOEditingContext/;"	m	class:AbstractObjectStore
+faultForGlobalID	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public \/* EOEnterpriseObject *\/ Object faultForGlobalID(EOGlobalID aGlobalID, EOEditingContex/;"	m	class:EOEditingContext
+faultForGlobalID	src/main/java/net/wotonomy/control/EOObjectStore.java	/^	public abstract \/* EOEnterpriseObject *\/ Object faultForGlobalID(EOGlobalID aGlobalID, EOEdit/;"	m	class:EOObjectStore
+faultForGlobalID	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public \/* EOEnterpriseObject *\/ Object faultForGlobalID(EOGlobalID eoglobalid, EOEditingConte/;"	m	class:EOObjectStoreCoordinator
+faultForRawRow	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public \/* EOEnterpriseObject *\/ Object faultForRawRow(Map row, String entityName, EOEditingCo/;"	m	class:EODatabaseContext
+faultForRawRow	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	public \/* EOEnterpriseObject *\/Object faultForRawRow(Map aDictionary, String anEntityName,$/;"	m	class:AbstractObjectStore
+faultForRawRow	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public Object faultForRawRow(Map aDictionary, String anEntityName) {$/;"	m	class:EOEditingContext
+faultForRawRow	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public \/* EOEnterpriseObject *\/ Object faultForRawRow(Map aDictionary, String anEntityName,$/;"	m	class:EOEditingContext
+faultForRawRow	src/main/java/net/wotonomy/control/EOObjectStore.java	/^	public abstract \/* EOEnterpriseObject *\/ Object faultForRawRow(Map aDictionary, String anEnti/;"	m	class:EOObjectStore
+faultForRawRow	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public \/* EOEnterpriseObject *\/ Object faultForRawRow(Map aDictionary, String anEntityName,$/;"	m	class:EOObjectStoreCoordinator
+faultForRawRow	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public \/* EOEnterpriseObject *\/ Object faultForRawRow(NSDictionary nsdictionary, String s,$/;"	m	class:EOObjectStoreCoordinator
+faultHandler	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public EOFaultHandler faultHandler() {$/;"	m	class:EOCustomObject
+faultHandler	src/main/java/net/wotonomy/control/EOFaulting.java	/^	EOFaultHandler faultHandler();$/;"	m	interface:EOFaulting
+faultWillFire	src/main/java/net/wotonomy/access/EOAccessGenericFaultHandler.java	/^	public void faultWillFire(Object obj) {$/;"	m	class:EOAccessGenericFaultHandler
+faultWillFire	src/main/java/net/wotonomy/control/EOFaultHandler.java	/^	public abstract void faultWillFire(Object obj);$/;"	m	class:EOFaultHandler
+fetchEnabled	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	boolean fetchEnabled;$/;"	f	class:EODatabaseDataSource
+fetchLimit	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	private int fetchLimit;$/;"	f	class:EOFetchSpecification	file:
+fetchLimit	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public int fetchLimit() {$/;"	m	class:EOFetchSpecification
+fetchObject	src/main/java/net/wotonomy/access/EODatabaseChannel.java	/^	public Object fetchObject() {$/;"	m	class:EODatabaseChannel
+fetchObjects	src/main/java/net/wotonomy/control/ChildDataSource.java	/^	public NSArray fetchObjects() {$/;"	m	class:ChildDataSource
+fetchObjects	src/main/java/net/wotonomy/control/EODataSource.java	/^	public NSArray fetchObjects() {$/;"	m	class:EODataSource
+fetchObjects	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	public NSArray fetchObjects() {$/;"	m	class:EODatabaseDataSource
+fetchObjects	src/main/java/net/wotonomy/control/PropertyDataSource.java	/^	public NSArray fetchObjects() {$/;"	m	class:PropertyDataSource
+fetchRow	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	public abstract NSMutableDictionary fetchRow();$/;"	m	class:EOAdaptorChannel
+fetchSpecification	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	EOFetchSpecification fetchSpecification;$/;"	f	class:EODatabaseDataSource
+fetchSpecification	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	public EOFetchSpecification fetchSpecification() {$/;"	m	class:EODatabaseDataSource
+fetchSpecificationForFetch	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	public EOFetchSpecification fetchSpecificationForFetch() {$/;"	m	class:EODatabaseDataSource
+fetchSpecificationName	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	String fetchSpecificationName;$/;"	f	class:EODatabaseDataSource
+fetchSpecificationName	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	public String fetchSpecificationName() {$/;"	m	class:EODatabaseDataSource
+fetchSpecificationNamed	src/main/java/net/wotonomy/access/EOEntity.java	/^	public EOFetchSpecification fetchSpecificationNamed(String name) {$/;"	m	class:EOEntity
+fetchSpecificationNamed	src/main/java/net/wotonomy/access/EOEntityClassDescription.java	/^	public EOFetchSpecification fetchSpecificationNamed(String name) {$/;"	m	class:EOEntityClassDescription
+fetchSpecificationNamed	src/main/java/net/wotonomy/access/EOModelGroup.java	/^	public EOFetchSpecification fetchSpecificationNamed(String fetchSpecName, String entityName) {$/;"	m	class:EOModelGroup
+fetchSpecificationNamed	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public EOFetchSpecification fetchSpecificationNamed(String aString) {$/;"	m	class:EOClassDescription
+fetchSpecificationNamed	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public static EOFetchSpecification fetchSpecificationNamed(String name, String entityName) {$/;"	m	class:EOFetchSpecification
+fetchSpecificationNames	src/main/java/net/wotonomy/access/EOEntity.java	/^	public NSArray fetchSpecificationNames() {$/;"	m	class:EOEntity
+fetchSpecificationWithQualifierBindings	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public EOFetchSpecification fetchSpecificationWithQualifierBindings(Map aBindingMap) {$/;"	m	class:EOFetchSpecification
+fetchTimestamp	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private double fetchTimestamp;$/;"	f	class:EOEditingContext	file:
+fetchTimestamp	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public double fetchTimestamp() {$/;"	m	class:EOEditingContext
+fetched	src/main/java/net/wotonomy/control/ArrayFault.java	/^	private boolean fetched;$/;"	f	class:ArrayFault	file:
+fetchedValueForDataValue	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public NSData fetchedValueForDataValue(NSData value, EOAttribute attr) {$/;"	m	class:EOAdaptor
+fetchedValueForDateValue	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public NSTimestamp fetchedValueForDateValue(NSTimestamp value, EOAttribute attr) {$/;"	m	class:EOAdaptor
+fetchedValueForNumberValue	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public Number fetchedValueForNumberValue(Number value, EOAttribute attr) {$/;"	m	class:EOAdaptor
+fetchedValueForStringValue	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public String fetchedValueForStringValue(String value, EOAttribute attr) {$/;"	m	class:EOAdaptor
+fetchedValueForValue	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public Object fetchedValueForValue(Object value, EOAttribute attr) {$/;"	m	class:EOAdaptor
+fetchesRawRows	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	private boolean fetchesRawRows;$/;"	f	class:EOFetchSpecification	file:
+fetchesRawRows	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public boolean fetchesRawRows() {$/;"	m	class:EOFetchSpecification
+filterArrayWithQualifier	src/main/java/net/wotonomy/control/EOQualifier.java	/^	public static void filterArrayWithQualifier(List anObjectList, EOQualifier aQualifier) {$/;"	m	class:EOQualifier
+filteredArrayWithQualifier	src/main/java/net/wotonomy/control/EOQualifier.java	/^	public static NSArray filteredArrayWithQualifier(List anObjectList, EOQualifier aQualifier) {$/;"	m	class:EOQualifier
+finishInitializationOfObjects	src/main/java/net/wotonomy/control/EOKeyValueUnarchiver.java	/^	public void finishInitializationOfObjects() {$/;"	m	class:EOKeyValueUnarchiver
+fireFault	src/main/java/net/wotonomy/control/ArrayFault.java	/^	protected void fireFault() {$/;"	m	class:ArrayFault
+fireObjectsChangedInStore	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	private void fireObjectsChangedInStore() {$/;"	m	class:AbstractObjectStore	file:
+fireWillSaveChanges	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private void fireWillSaveChanges() {$/;"	m	class:EOEditingContext	file:
+flattenedAttributes	src/main/java/net/wotonomy/access/EOEntity.java	/^	public NSArray flattenedAttributes() {$/;"	m	class:EOEntity
+flushObserverQueue	src/main/java/net/wotonomy/control/EODelayedObserverQueue.java	/^	public void flushObserverQueue(Object anObject) {$/;"	m	class:EODelayedObserverQueue
+flushRecentChanges	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void flushRecentChanges(Object anObject) {$/;"	m	class:EOEditingContext
+forgetAllSnapshots	src/main/java/net/wotonomy/access/EODatabase.java	/^	public void forgetAllSnapshots() {$/;"	m	class:EODatabase
+forgetObject	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public void forgetObject(Object anObject) {$/;"	m	class:EOEditingContext.Registrar
+forgetObject	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public void forgetObject(Object anObject) {$/;"	m	class:EOEditingContext.WeakRegistrar
+forgetObject	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void forgetObject(Object anObject) {$/;"	m	class:EOEditingContext
+forgetSnapshotForGlobalID	src/main/java/net/wotonomy/access/EODatabase.java	/^	public void forgetSnapshotForGlobalID(EOGlobalID gid) {$/;"	m	class:EODatabase
+forgetSnapshotForGlobalID	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public void forgetSnapshotForGlobalID(EOGlobalID gid) {$/;"	m	class:EODatabaseContext
+forgetSnapshotsForGlobalIDs	src/main/java/net/wotonomy/access/EODatabase.java	/^	public void forgetSnapshotsForGlobalIDs(NSArray gids) {$/;"	m	class:EODatabase
+forgetSnapshotsForGlobalIDs	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public void forgetSnapshotsForGlobalIDs(List<EOGlobalID> gids) {$/;"	m	class:EODatabaseContext
+formatSQLString	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String formatSQLString(String value, String format) {$/;"	m	class:EOSQLExpression
+formatStringValue	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String formatStringValue(String s) {$/;"	m	class:EOSQLExpression
+formatValueForAttribute	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String formatValueForAttribute(Object value, EOAttribute attr) {$/;"	m	class:EOSQLExpression
+forwardUpdateForObject	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public void forwardUpdateForObject(EOEnterpriseObject eoenterpriseobject, NSDictionary nsdictio/;"	m	class:EOObjectStoreCoordinator
+freeze	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^	static public byte[] freeze(Object anObject, EOEditingContext aContext, Object aRootObject, boo/;"	m	class:KeyValueCodingUtilities
+geRegisteredObjects	src/main/java/net/wotonomy/control/EditingContext.java	/^	public List geRegisteredObjects() {$/;"	m	class:EditingContext
+get	src/main/java/net/wotonomy/control/ArrayFault.java	/^	public Object get(int index) {$/;"	m	class:ArrayFault
+get	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public Object get() {$/;"	m	class:EOEditingContext.ReferenceKey
+get	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public Object get() {$/;"	m	class:EOEditingContext.WeakReferenceKey
+get	src/main/java/net/wotonomy/control/internal/Surrogate.java	/^	public Object get(Object aKey) {$/;"	m	class:Surrogate
+getArrayFaultWithSourceGlobalID	src/main/java/net/wotonomy/control/EditingContext.java	/^	public List getArrayFaultWithSourceGlobalID(EOGlobalID aGlobalID, String aRelationshipKey,$/;"	m	class:EditingContext
+getCommitSnapshot	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public byte[] getCommitSnapshot(Object anObject) {$/;"	m	class:EOEditingContext.Registrar
+getCommitSnapshot	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public byte[] getCommitSnapshot(Object anObject) {$/;"	m	class:EOEditingContext.WeakRegistrar
+getCommittedSnapshotForObject	src/main/java/net/wotonomy/control/EditingContext.java	/^	public Map getCommittedSnapshotForObject(Object anObject) {$/;"	m	class:EditingContext
+getCurrentEventSnapshotForObject	src/main/java/net/wotonomy/control/EditingContext.java	/^	public Map getCurrentEventSnapshotForObject(Object anObject) {$/;"	m	class:EditingContext
+getCurrentSnapshot	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public byte[] getCurrentSnapshot(Object anObject) {$/;"	m	class:EOEditingContext.Registrar
+getCurrentSnapshot	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public byte[] getCurrentSnapshot(Object anObject) {$/;"	m	class:EOEditingContext.WeakRegistrar
+getDefaultFetchTimestampLag	src/main/java/net/wotonomy/control/EditingContext.java	/^	public static double getDefaultFetchTimestampLag() {$/;"	m	class:EditingContext
+getDefaultParentObjectStore	src/main/java/net/wotonomy/control/EditingContext.java	/^	public static EOObjectStore getDefaultParentObjectStore() {$/;"	m	class:EditingContext
+getDefaultValue	src/main/java/net/wotonomy/control/internal/Surrogate.java	/^	public Object getDefaultValue() {$/;"	m	class:Surrogate
+getDelegate	src/main/java/net/wotonomy/control/EditingContext.java	/^	public Object getDelegate() {$/;"	m	class:EditingContext
+getDelegate	src/main/java/net/wotonomy/control/internal/Surrogate.java	/^	public Object getDelegate() {$/;"	m	class:Surrogate
+getDelegates	src/main/java/net/wotonomy/control/internal/Surrogate.java	/^	public Object[] getDelegates() {$/;"	m	class:Surrogate
+getDeletedObjects	src/main/java/net/wotonomy/control/EditingContext.java	/^	public List getDeletedObjects() {$/;"	m	class:EditingContext
+getDescribedClass	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public Class getDescribedClass() {$/;"	m	class:EOClassDescription
+getEditors	src/main/java/net/wotonomy/control/EditingContext.java	/^	public List getEditors() {$/;"	m	class:EditingContext
+getFaultForGlobalID	src/main/java/net/wotonomy/control/EditingContext.java	/^	public Object getFaultForGlobalID(EOGlobalID aGlobalID) {$/;"	m	class:EditingContext
+getFaultForRawRow	src/main/java/net/wotonomy/control/EditingContext.java	/^	public Object getFaultForRawRow(Map aDictionary, String anEntityName) {$/;"	m	class:EditingContext
+getFetchTimestamp	src/main/java/net/wotonomy/control/EditingContext.java	/^	public double getFetchTimestamp() {$/;"	m	class:EditingContext
+getGlobalIDForObject	src/main/java/net/wotonomy/control/EditingContext.java	/^	public EOGlobalID getGlobalIDForObject(Object anObject) {$/;"	m	class:EditingContext
+getID	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^		public EOGlobalID getID() {$/;"	m	class:KeyValueCodingUtilities.GlobalIDMarker
+getInsertedObjects	src/main/java/net/wotonomy/control/EditingContext.java	/^	public List getInsertedObjects() {$/;"	m	class:EditingContext
+getMessageHandler	src/main/java/net/wotonomy/control/EditingContext.java	/^	public Object getMessageHandler() {$/;"	m	class:EditingContext
+getObjectForGlobalID	src/main/java/net/wotonomy/control/EditingContext.java	/^	public Object getObjectForGlobalID(EOGlobalID aGlobalID) {$/;"	m	class:EditingContext
+getObjectsWithFetchSpecification	src/main/java/net/wotonomy/control/EditingContext.java	/^	public List getObjectsWithFetchSpecification(EOFetchSpecification aFetchSpec) {$/;"	m	class:EditingContext
+getParentObjectStore	src/main/java/net/wotonomy/control/EditingContext.java	/^	public EOObjectStore getParentObjectStore() {$/;"	m	class:EditingContext
+getRootObjectStore	src/main/java/net/wotonomy/control/EditingContext.java	/^	public EOObjectStore getRootObjectStore() {$/;"	m	class:EditingContext
+getUpdateMap	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	protected Map getUpdateMap(EOEditingContext aContext, Object anObject) {$/;"	m	class:AbstractObjectStore
+getUpdatedObjects	src/main/java/net/wotonomy/control/EditingContext.java	/^	public List getUpdatedObjects() {$/;"	m	class:EditingContext
+getValue	src/main/java/net/wotonomy/control/PropertyDataSource.java	/^	protected Object getValue() {$/;"	m	class:PropertyDataSource
+globalID	src/main/java/net/wotonomy/access/EOAccessFaultHandler.java	/^	public EOKeyGlobalID globalID() {$/;"	m	class:EOAccessFaultHandler
+globalIDForData	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	abstract protected EOGlobalID globalIDForData(Map aDataMap);$/;"	m	class:AbstractObjectStore
+globalIDForObject	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public EOGlobalID globalIDForObject(Object anObject) {$/;"	m	class:EOEditingContext.Registrar
+globalIDForObject	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public EOGlobalID globalIDForObject(Object anObject) {$/;"	m	class:EOEditingContext
+globalIDForRow	src/main/java/net/wotonomy/access/EOEntity.java	/^	public EOGlobalID globalIDForRow(Map row) {$/;"	m	class:EOEntity
+globalIDWithEntityName	src/main/java/net/wotonomy/control/EOKeyGlobalID.java	/^	public static EOKeyGlobalID globalIDWithEntityName(String s, Object aobj[]) {$/;"	m	class:EOKeyGlobalID
+globalIDsForObjects	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private NSArray globalIDsForObjects(List<Object> anObjectList) {$/;"	m	class:EOEditingContext	file:
+globalModelGroup	src/main/java/net/wotonomy/access/EOModelGroup.java	/^	public static EOModelGroup globalModelGroup() {$/;"	m	class:EOModelGroup
+handleDroppedConnection	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public void handleDroppedConnection() {$/;"	m	class:EOAdaptor
+handleDroppedConnection	src/main/java/net/wotonomy/access/EOAdaptorContext.java	/^	public abstract void handleDroppedConnection();$/;"	m	class:EOAdaptorContext
+handleDroppedConnection	src/main/java/net/wotonomy/access/EODatabase.java	/^	public void handleDroppedConnection() {$/;"	m	class:EODatabase
+handleDroppedConnection	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public void handleDroppedConnection() {$/;"	m	class:EODatabaseContext
+handleNotification	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void handleNotification(NSNotification aNotification) { \/\/ System.out.println( "EOEdit/;"	m	class:EOEditingContext
+handleQueryWithUnboundKey	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public Object handleQueryWithUnboundKey(String aKey) {$/;"	m	class:EOCustomObject
+handleQueryWithUnboundKey	src/main/java/net/wotonomy/control/EOKeyValueCoding.java	/^	Object handleQueryWithUnboundKey(String aKey);$/;"	m	interface:EOKeyValueCoding
+handleQueryWithUnboundKey	src/main/java/net/wotonomy/control/EOKeyValueCodingSupport.java	/^	static public Object handleQueryWithUnboundKey(Object anObject, String aKey) {$/;"	m	class:EOKeyValueCodingSupport
+handleTakeValueForUnboundKey	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public void handleTakeValueForUnboundKey(Object aValue, String aKey) {$/;"	m	class:EOCustomObject
+handleTakeValueForUnboundKey	src/main/java/net/wotonomy/control/EOKeyValueCoding.java	/^	void handleTakeValueForUnboundKey(Object aValue, String aKey);$/;"	m	interface:EOKeyValueCoding
+handleTakeValueForUnboundKey	src/main/java/net/wotonomy/control/EOKeyValueCodingSupport.java	/^	static public void handleTakeValueForUnboundKey(Object anObject, Object aValue, String aKey) {$/;"	m	class:EOKeyValueCodingSupport
+handleUpdateConflict	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private void handleUpdateConflict(EOGlobalID anID, Object anObject) {$/;"	m	class:EOEditingContext	file:
+handlerForFault	src/main/java/net/wotonomy/control/EOFaultHandler.java	/^	public static EOFaultHandler handlerForFault(Object obj) {$/;"	m	class:EOFaultHandler
+handlesFetchSpecification	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public boolean handlesFetchSpecification(EOFetchSpecification fspec) {$/;"	m	class:EODatabaseContext
+handlesFetchSpecification	src/main/java/net/wotonomy/control/EOCooperatingObjectStore.java	/^	public abstract boolean handlesFetchSpecification(EOFetchSpecification eofetchspecification);$/;"	m	class:EOCooperatingObjectStore
+hasBusyChannels	src/main/java/net/wotonomy/access/EOAdaptorContext.java	/^	public boolean hasBusyChannels() {$/;"	m	class:EOAdaptorContext
+hasBusyChannels	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public boolean hasBusyChannels() {$/;"	m	class:EODatabaseContext
+hasChanges	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public boolean hasChanges() {$/;"	m	class:EOEditingContext
+hasOpenChannels	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public boolean hasOpenChannels() {$/;"	m	class:EOAdaptor
+hasOpenChannels	src/main/java/net/wotonomy/access/EOAdaptorContext.java	/^	public boolean hasOpenChannels() {$/;"	m	class:EOAdaptorContext
+hasOpenTransaction	src/main/java/net/wotonomy/access/EOAdaptorContext.java	/^	public boolean hasOpenTransaction() {$/;"	m	class:EOAdaptorContext
+hasSimplePrimaryKey	src/main/java/net/wotonomy/access/EOEntity.java	/^	public boolean hasSimplePrimaryKey() {$/;"	m	class:EOEntity
+hashCode	src/main/java/net/wotonomy/control/ArrayFault.java	/^	public int hashCode() {$/;"	m	class:ArrayFault
+hashCode	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		int hashCode;$/;"	f	class:EOEditingContext.ReferenceKey
+hashCode	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		private int hashCode;$/;"	f	class:EOEditingContext.CompoundKey	file:
+hashCode	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public int hashCode() {$/;"	m	class:EOEditingContext.CompoundKey
+hashCode	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public int hashCode() {$/;"	m	class:EOEditingContext.ReferenceKey
+hashCode	src/main/java/net/wotonomy/control/EOKeyGlobalID.java	/^	public int hashCode() {$/;"	m	class:EOKeyGlobalID
+hashCode	src/main/java/net/wotonomy/control/EONullValue.java	/^	public int hashCode() {$/;"	m	class:EONullValue
+hashCode	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^		private int hashCode;$/;"	f	class:EOObserverCenter.ReferenceKey	file:
+hashCode	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^		public int hashCode() {$/;"	m	class:EOObserverCenter.ReferenceKey
+hashCode	src/main/java/net/wotonomy/control/EOTemporaryGlobalID.java	/^	private int hashCode;$/;"	f	class:EOTemporaryGlobalID	file:
+hashCode	src/main/java/net/wotonomy/control/EOTemporaryGlobalID.java	/^	public int hashCode() {$/;"	m	class:EOTemporaryGlobalID
+hints	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	private NSDictionary hints;$/;"	f	class:EOFetchSpecification	file:
+hints	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public NSDictionary hints() {$/;"	m	class:EOFetchSpecification
+id	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^		private EOGlobalID id;$/;"	f	class:KeyValueCodingUtilities.GlobalIDMarker	file:
+idsForObjects	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private List idsForObjects(List objects) {$/;"	m	class:EOEditingContext	file:
+ignoreChanges	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private boolean ignoreChanges;$/;"	f	class:EOEditingContext	file:
+implementedByClass	src/main/java/net/wotonomy/control/EOQualifier.java	/^		public boolean implementedByClass(Class aClass) {$/;"	m	class:EOQualifier.BaseSelector
+implementedByObject	src/main/java/net/wotonomy/control/EOQualifier.java	/^		public boolean implementedByObject(Object anObject) {$/;"	m	class:EOQualifier.BaseSelector
+incrementSnapshotCountForGlobalID	src/main/java/net/wotonomy/access/EODatabase.java	/^	public void incrementSnapshotCountForGlobalID(EOGlobalID gid) {$/;"	m	class:EODatabase
+indexOf	src/main/java/net/wotonomy/control/ArrayFault.java	/^	public int indexOf(Object o) {$/;"	m	class:ArrayFault
+indexOf	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^	private static int indexOf(List aList, Object anObject) {$/;"	m	class:EOObserverCenter	file:
+initializeObject	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public void initializeObject(\/* EOEnterpriseObject *\/Object eo, EOGlobalID gid, EOEditingCont/;"	m	class:EODatabaseContext
+initializeObject	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	public void initializeObject(Object anObject, EOGlobalID aGlobalID, EOEditingContext aContext) /;"	m	class:AbstractObjectStore
+initializeObject	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void initializeObject(\/* EOEnterpriseObject *\/ Object anObject, EOGlobalID aGlobalID,$/;"	m	class:EOEditingContext
+initializeObject	src/main/java/net/wotonomy/control/EOObjectStore.java	/^	public abstract void initializeObject(\/* EOEnterpriseObject *\/ Object eo, EOGlobalID aGlobalI/;"	m	class:EOObjectStore
+initializeObject	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public void initializeObject(Object anObject, EOGlobalID aGlobalID, EOEditingContext aContext) /;"	m	class:EOObjectStoreCoordinator
+insertObject	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	abstract protected Map insertObject(EOGlobalID aGlobalID, Map aDataMap);$/;"	m	class:AbstractObjectStore
+insertObject	src/main/java/net/wotonomy/control/ChildDataSource.java	/^	public void insertObject(Object anObject) {$/;"	m	class:ChildDataSource
+insertObject	src/main/java/net/wotonomy/control/EODataSource.java	/^	public abstract void insertObject(Object anObject);$/;"	m	class:EODataSource
+insertObject	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	public void insertObject(Object anObject) {$/;"	m	class:EODatabaseDataSource
+insertObject	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void insertObject(Object anObject) {$/;"	m	class:EOEditingContext
+insertObject	src/main/java/net/wotonomy/control/PropertyDataSource.java	/^	public void insertObject(Object anObject) {$/;"	m	class:PropertyDataSource
+insertObjectAtIndex	src/main/java/net/wotonomy/control/ObservableArray.java	/^	public void insertObjectAtIndex(Object anObject, int anIndex) {$/;"	m	class:ObservableArray
+insertObjectAtIndex	src/main/java/net/wotonomy/control/OrderedDataSource.java	/^	public abstract void insertObjectAtIndex(Object anObject, int anIndex);$/;"	m	class:OrderedDataSource
+insertObjectAtIndex	src/main/java/net/wotonomy/control/PropertyDataSource.java	/^	public void insertObjectAtIndex(Object anObject, int anIndex) {$/;"	m	class:PropertyDataSource
+insertObjectWithGlobalID	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void insertObjectWithGlobalID(Object anObject, EOGlobalID aGlobalID) {$/;"	m	class:EOEditingContext
+insertRow	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	public abstract void insertRow(NSDictionary row, EOEntity entity);$/;"	m	class:EOAdaptorChannel
+insertStatementForRow	src/main/java/net/wotonomy/access/EOSQLExpressionFactory.java	/^	public EOSQLExpression insertStatementForRow(NSDictionary row, EOEntity entity) {$/;"	m	class:EOSQLExpressionFactory
+insertedIDsBuffer	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	private NSMutableArray insertedIDsBuffer;$/;"	f	class:AbstractObjectStore	file:
+insertedObjects	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private NSMutableArray<Object> insertedObjects;$/;"	f	class:EOEditingContext	file:
+insertedObjects	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public NSArray insertedObjects() {$/;"	m	class:EOEditingContext
+insertedObjectsBuffer	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private NSMutableArray<Object> insertedObjectsBuffer;$/;"	f	class:EOEditingContext	file:
+insertedObjectsProxy	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private NSArray<Object> insertedObjectsProxy;$/;"	f	class:EOEditingContext	file:
+instance	src/main/java/net/wotonomy/control/EONullValue.java	/^	private static final EONullValue instance = new EONullValue();$/;"	f	class:EONullValue	file:
+instance	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^	private static EOObserverCenter instance = null;$/;"	f	class:EOObserverCenter	file:
+instance	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^	private static EOObserverCenter instance() {$/;"	m	class:EOObserverCenter	file:
+instancesRetainRegisteredObjects	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public static boolean instancesRetainRegisteredObjects() {$/;"	m	class:EOEditingContext
+internalTypeForExternalType	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public String internalTypeForExternalType(String extType, EOModel model) {$/;"	m	class:EOAdaptor
+invalidateAllCache	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	protected void invalidateAllCache() {$/;"	m	class:AbstractObjectStore
+invalidateAllObjects	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public void invalidateAllObjects() {$/;"	m	class:EODatabaseContext
+invalidateAllObjects	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	public void invalidateAllObjects() {$/;"	m	class:AbstractObjectStore
+invalidateAllObjects	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void invalidateAllObjects() {$/;"	m	class:EOEditingContext
+invalidateAllObjects	src/main/java/net/wotonomy/control/EOObjectStore.java	/^	public abstract void invalidateAllObjects();$/;"	m	class:EOObjectStore
+invalidateAllObjects	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public void invalidateAllObjects() {$/;"	m	class:EOObjectStoreCoordinator
+invalidateAllObjectsQuietly	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private void invalidateAllObjectsQuietly() {$/;"	m	class:EOEditingContext	file:
+invalidateClassDescriptionCache	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public static void invalidateClassDescriptionCache() {$/;"	m	class:EOClassDescription
+invalidateObject	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	protected void invalidateObject(EOGlobalID aGlobalID) {$/;"	m	class:AbstractObjectStore
+invalidateObjectsWithGlobalIDs	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public void invalidateObjectsWithGlobalIDs(List aList) {$/;"	m	class:EODatabaseContext
+invalidateObjectsWithGlobalIDs	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	public void invalidateObjectsWithGlobalIDs(List aList) {$/;"	m	class:AbstractObjectStore
+invalidateObjectsWithGlobalIDs	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void invalidateObjectsWithGlobalIDs(List anArray) {$/;"	m	class:EOEditingContext
+invalidateObjectsWithGlobalIDs	src/main/java/net/wotonomy/control/EOObjectStore.java	/^	public abstract void invalidateObjectsWithGlobalIDs(List aList);$/;"	m	class:EOObjectStore
+invalidateObjectsWithGlobalIDs	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public void invalidateObjectsWithGlobalIDs(List aList) {$/;"	m	class:EOObjectStoreCoordinator
+invalidateObjectsWithGlobalIDs	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public void invalidateObjectsWithGlobalIDs(NSArray nsarray) {$/;"	m	class:EOObjectStoreCoordinator
+invalidateResultCache	src/main/java/net/wotonomy/access/EODatabase.java	/^	public void invalidateResultCache() {$/;"	m	class:EODatabase
+invalidateResultCacheForEntityNamed	src/main/java/net/wotonomy/access/EODatabase.java	/^	public void invalidateResultCacheForEntityNamed(String name) {$/;"	m	class:EODatabase
+invalidatedIDsBuffer	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	private NSMutableArray invalidatedIDsBuffer;$/;"	f	class:AbstractObjectStore	file:
+invalidatedIDsBuffer	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private NSMutableArray<EOGlobalID> invalidatedIDsBuffer;$/;"	f	class:EOEditingContext	file:
+invalidatedObjectsBuffer	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private NSMutableArray<Object> invalidatedObjectsBuffer;$/;"	f	class:EOEditingContext	file:
+inverseForRelationshipKey	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public String inverseForRelationshipKey(String relationshipKey) {$/;"	m	class:EOClassDescription
+inverseForRelationshipKey	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public String inverseForRelationshipKey(String aRelationshipKey) {$/;"	m	class:EOCustomObject
+inverseForRelationshipKey	src/main/java/net/wotonomy/control/EOEnterpriseObject.java	/^	String inverseForRelationshipKey(String aRelationshipKey);$/;"	m	interface:EOEnterpriseObject
+invoke	src/main/java/net/wotonomy/control/EOQualifier.java	/^		public Object invoke(Object anObject, Object[] parameters) throws IllegalAccessException,$/;"	m	class:EOQualifier.BaseSelector
+ipaddr	src/main/java/net/wotonomy/control/EOTemporaryGlobalID.java	/^	private static byte[] ipaddr; \/\/ 4 bytes$/;"	f	class:EOTemporaryGlobalID	file:
+isAbstractEntity	src/main/java/net/wotonomy/access/EOEntity.java	/^	public boolean isAbstractEntity() {$/;"	m	class:EOEntity
+isDeep	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public boolean isDeep() {$/;"	m	class:EOFetchSpecification
+isDerived	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public boolean isDerived() {$/;"	m	class:EOAttribute
+isDroppedConnectionException	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public boolean isDroppedConnectionException(Exception ex) {$/;"	m	class:EOAdaptor
+isEmpty	src/main/java/net/wotonomy/control/ArrayFault.java	/^	public boolean isEmpty() {$/;"	m	class:ArrayFault
+isFault	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public boolean isFault() {$/;"	m	class:EOCustomObject
+isFault	src/main/java/net/wotonomy/control/EOFaultHandler.java	/^	public static boolean isFault(Object obj) {$/;"	m	class:EOFaultHandler
+isFault	src/main/java/net/wotonomy/control/EOFaulting.java	/^	boolean isFault();$/;"	m	interface:EOFaulting
+isFetchEnabled	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	public boolean isFetchEnabled() {$/;"	m	class:EODatabaseDataSource
+isFetchInProgress	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	public abstract boolean isFetchInProgress();$/;"	m	class:EOAdaptorChannel
+isFetchInProgress	src/main/java/net/wotonomy/access/EODatabaseChannel.java	/^	public boolean isFetchInProgress() {$/;"	m	class:EODatabaseChannel
+isFetched	src/main/java/net/wotonomy/control/ArrayFault.java	/^	public boolean isFetched() {$/;"	m	class:ArrayFault
+isFlattened	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public boolean isFlattened() {$/;"	m	class:EOAttribute
+isFlattened	src/main/java/net/wotonomy/access/EORelationship.java	/^	public boolean isFlattened() {$/;"	m	class:EORelationship
+isInvalidating	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private boolean isInvalidating;$/;"	f	class:EOEditingContext	file:
+isLocking	src/main/java/net/wotonomy/access/EODatabaseChannel.java	/^	public boolean isLocking() {$/;"	m	class:EODatabaseChannel
+isMandatory	src/main/java/net/wotonomy/access/EORelationship.java	/^	public boolean isMandatory() {$/;"	m	class:EORelationship
+isMultiHop	src/main/java/net/wotonomy/access/EORelationship.java	/^	public boolean isMultiHop() {$/;"	m	class:EORelationship
+isObjectLockedWithGlobalID	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public boolean isObjectLockedWithGlobalID(EOGlobalID gid) {$/;"	m	class:EODatabaseContext
+isObjectLockedWithGlobalID	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public boolean isObjectLockedWithGlobalID(EOGlobalID gid, EOEditingContext ec) {$/;"	m	class:EODatabaseContext
+isObjectLockedWithGlobalID	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	public boolean isObjectLockedWithGlobalID(EOGlobalID aGlobalID, EOEditingContext aContext) {$/;"	m	class:AbstractObjectStore
+isObjectLockedWithGlobalID	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public boolean isObjectLockedWithGlobalID(EOGlobalID aGlobalID, EOEditingContext aContext) {$/;"	m	class:EOEditingContext
+isObjectLockedWithGlobalID	src/main/java/net/wotonomy/control/EOObjectStore.java	/^	public abstract boolean isObjectLockedWithGlobalID(EOGlobalID aGlobalID, EOEditingContext aCont/;"	m	class:EOObjectStore
+isObjectLockedWithGlobalID	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public boolean isObjectLockedWithGlobalID(EOGlobalID eoglobalid, EOEditingContext eoeditingcont/;"	m	class:EOObjectStoreCoordinator
+isOpen	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	public abstract boolean isOpen();$/;"	m	class:EOAdaptorChannel
+isReadOnly	src/main/java/net/wotonomy/access/EOEntity.java	/^	public boolean isReadOnly() {$/;"	m	class:EOEntity
+isRefreshingObjects	src/main/java/net/wotonomy/access/EODatabaseChannel.java	/^	public boolean isRefreshingObjects() {$/;"	m	class:EODatabaseChannel
+isRelationalOperator	src/main/java/net/wotonomy/control/EOQualifier.java	/^		public boolean isRelationalOperator() {$/;"	m	class:EOQualifier.BaseSelector
+isRelationalOperator	src/main/java/net/wotonomy/control/EOQualifier.java	/^		public boolean isRelationalOperator() {$/;"	m	class:EOQualifier.OperatorCaseInsensitiveLike
+isRelationalOperator	src/main/java/net/wotonomy/control/EOQualifier.java	/^		public boolean isRelationalOperator() {$/;"	m	class:EOQualifier.OperatorContains
+isRelationalOperator	src/main/java/net/wotonomy/control/EOQualifier.java	/^		public boolean isRelationalOperator() {$/;"	m	class:EOQualifier.OperatorLike
+isTemporary	src/main/java/net/wotonomy/control/EOGlobalID.java	/^	public abstract boolean isTemporary();$/;"	m	class:EOGlobalID
+isTemporary	src/main/java/net/wotonomy/control/EOIntegralKeyGlobalID.java	/^	public boolean isTemporary() {$/;"	m	class:EOIntegralKeyGlobalID
+isTemporary	src/main/java/net/wotonomy/control/EOTemporaryGlobalID.java	/^	public boolean isTemporary() {$/;"	m	class:EOTemporaryGlobalID
+isTemporary	src/main/java/net/wotonomy/control/EOVectorKeyGlobalID.java	/^	public boolean isTemporary() {$/;"	m	class:EOVectorKeyGlobalID
+isToMany	src/main/java/net/wotonomy/access/EORelationship.java	/^	public boolean isToMany() {$/;"	m	class:EORelationship
+isToManyKey	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public boolean isToManyKey(String aKey) {$/;"	m	class:EOCustomObject
+isToManyKey	src/main/java/net/wotonomy/control/EOEnterpriseObject.java	/^	boolean isToManyKey(String aKey);$/;"	m	interface:EOEnterpriseObject
+isValidPrimaryKeyAttribute	src/main/java/net/wotonomy/access/EOEntity.java	/^	public boolean isValidPrimaryKeyAttribute(EOAttribute attr) {$/;"	m	class:EOEntity
+isValidQualifierType	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public abstract boolean isValidQualifierType(String typeName, EOModel model);$/;"	m	class:EOAdaptor
+iterator	src/main/java/net/wotonomy/control/ArrayFault.java	/^	public Iterator iterator() {$/;"	m	class:ArrayFault
+joinClauseString	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String joinClauseString() {$/;"	m	class:EOSQLExpression
+joinExpression	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public void joinExpression() {$/;"	m	class:EOSQLExpression
+joinSemantic	src/main/java/net/wotonomy/access/EORelationship.java	/^	public int joinSemantic() {$/;"	m	class:EORelationship
+joins	src/main/java/net/wotonomy/access/EORelationship.java	/^	public NSArray joins() {$/;"	m	class:EORelationship
+key	src/main/java/net/wotonomy/control/EOKeyValueQualifier.java	/^	private String key;$/;"	f	class:EOKeyValueQualifier	file:
+key	src/main/java/net/wotonomy/control/EOKeyValueQualifier.java	/^	public String key() {$/;"	m	class:EOKeyValueQualifier
+key	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^		private String key;$/;"	f	class:EOSortOrdering.DelegatingComparator	file:
+key	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^	protected String key;$/;"	f	class:EOSortOrdering
+key	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^	public String key() {$/;"	m	class:EOSortOrdering
+key	src/main/java/net/wotonomy/control/EOTemporaryGlobalID.java	/^	private byte[] key;$/;"	f	class:EOTemporaryGlobalID	file:
+key	src/main/java/net/wotonomy/control/PropertyDataSource.java	/^	protected String key;$/;"	f	class:PropertyDataSource
+key	src/main/java/net/wotonomy/control/PropertyDataSource.java	/^	public String key() {$/;"	m	class:PropertyDataSource
+keyCount	src/main/java/net/wotonomy/control/EOIntegralKeyGlobalID.java	/^	public int keyCount() {$/;"	m	class:EOIntegralKeyGlobalID
+keyCount	src/main/java/net/wotonomy/control/EOKeyGlobalID.java	/^	public abstract int keyCount();$/;"	m	class:EOKeyGlobalID
+keyCount	src/main/java/net/wotonomy/control/EOVectorKeyGlobalID.java	/^	public int keyCount() {$/;"	m	class:EOVectorKeyGlobalID
+keyPathForBindingKey	src/main/java/net/wotonomy/control/EOQualifier.java	/^	public String keyPathForBindingKey(String aVariable) {$/;"	m	class:EOQualifier
+keyValue	src/main/java/net/wotonomy/control/EOIntegralKeyGlobalID.java	/^	protected Number keyValue;$/;"	f	class:EOIntegralKeyGlobalID
+keyValues	src/main/java/net/wotonomy/control/EOIntegralKeyGlobalID.java	/^	public Object[] keyValues() {$/;"	m	class:EOIntegralKeyGlobalID
+keyValues	src/main/java/net/wotonomy/control/EOKeyGlobalID.java	/^	public abstract Object[] keyValues();$/;"	m	class:EOKeyGlobalID
+keyValues	src/main/java/net/wotonomy/control/EOVectorKeyGlobalID.java	/^	public Object[] keyValues() {$/;"	m	class:EOVectorKeyGlobalID
+keyValuesArray	src/main/java/net/wotonomy/control/EOKeyGlobalID.java	/^	public NSArray keyValuesArray() {$/;"	m	class:EOKeyGlobalID
+lastIndexOf	src/main/java/net/wotonomy/control/ArrayFault.java	/^	public int lastIndexOf(Object o) {$/;"	m	class:ArrayFault
+lastKnownType	src/main/java/net/wotonomy/control/PropertyDataSource.java	/^	protected Class lastKnownType; \/\/ for best-guessing$/;"	f	class:PropertyDataSource
+lastRequest	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^	private static Object lastRequest;$/;"	f	class:EOObserverCenter	file:
+lastResult	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^	private static NSArray lastResult;$/;"	f	class:EOObserverCenter	file:
+leftKey	src/main/java/net/wotonomy/control/EOKeyComparisonQualifier.java	/^	public String leftKey() {$/;"	m	class:EOKeyComparisonQualifier
+listIterator	src/main/java/net/wotonomy/control/ArrayFault.java	/^	public ListIterator listIterator() {$/;"	m	class:ArrayFault
+listIterator	src/main/java/net/wotonomy/control/ArrayFault.java	/^	public ListIterator listIterator(int index) {$/;"	m	class:ArrayFault
+listString	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String listString() {$/;"	m	class:EOSQLExpression
+loadAllModelObjects	src/main/java/net/wotonomy/access/EOModelGroup.java	/^	public void loadAllModelObjects() {$/;"	m	class:EOModelGroup
+loadFetchSpecifications	src/main/java/net/wotonomy/access/EOEntity.java	/^	private void loadFetchSpecifications() {$/;"	m	class:EOEntity	file:
+lock	src/main/java/net/wotonomy/access/EOAccessLock.java	/^	public static void lock() {$/;"	m	class:EOAccessLock
+lock	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public void lock() {$/;"	m	class:EODatabaseContext
+lock	src/main/java/net/wotonomy/control/EOCooperatingObjectStore.java	/^	public abstract void lock();$/;"	m	class:EOCooperatingObjectStore
+lockBeforeModify	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private boolean lockBeforeModify;$/;"	f	class:EOEditingContext	file:
+lockClause	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String lockClause() {$/;"	m	class:EOSQLExpression
+lockObject	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void lockObject(Object anObject) {$/;"	m	class:EOEditingContext
+lockObjectWithGlobalID	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public void lockObjectWithGlobalID(EOGlobalID gid, EOEditingContext ec) {$/;"	m	class:EODatabaseContext
+lockObjectWithGlobalID	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	public void lockObjectWithGlobalID(EOGlobalID aGlobalID, EOEditingContext aContext) {$/;"	m	class:AbstractObjectStore
+lockObjectWithGlobalID	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void lockObjectWithGlobalID(EOGlobalID aGlobalID, EOEditingContext aContext) {$/;"	m	class:EOEditingContext
+lockObjectWithGlobalID	src/main/java/net/wotonomy/control/EOObjectStore.java	/^	public abstract void lockObjectWithGlobalID(EOGlobalID aGlobalID, EOEditingContext aContext);$/;"	m	class:EOObjectStore
+lockObjectWithGlobalID	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public void lockObjectWithGlobalID(EOGlobalID eoglobalid, EOEditingContext eoeditingcontext) {$/;"	m	class:EOObjectStoreCoordinator
+lockRowComparingAttributes	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	public void lockRowComparingAttributes(NSArray atts, EOEntity entity, EOQualifier q, NSDictiona/;"	m	class:EOAdaptorChannel
+locksObjects	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	private boolean locksObjects;$/;"	f	class:EOFetchSpecification	file:
+locksObjects	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public boolean locksObjects() {$/;"	m	class:EOFetchSpecification
+locksObjectsBeforeFirstModification	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public boolean locksObjectsBeforeFirstModification() {$/;"	m	class:EOEditingContext
+makeObjectIntoFault	src/main/java/net/wotonomy/control/EOFaultHandler.java	/^	public static void makeObjectIntoFault(Object obj, EOFaultHandler handler) {$/;"	m	class:EOFaultHandler
+marker	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^		private EditingContextMarker marker = new EditingContextMarker();$/;"	f	class:KeyValueCodingUtilities.ContextObjectOutputStream	file:
+mergeExternalChanges	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private boolean mergeExternalChanges(EOGlobalID anID, Object anObject) {$/;"	m	class:EOEditingContext	file:
+messageHandler	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private WeakReference messageHandler;$/;"	f	class:EOEditingContext	file:
+messageHandler	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public Object messageHandler() {$/;"	m	class:EOEditingContext
+methodOnClass	src/main/java/net/wotonomy/control/EOQualifier.java	/^		public Method methodOnClass(Class aClass) throws NoSuchMethodException {$/;"	m	class:EOQualifier.BaseSelector
+methodOnObject	src/main/java/net/wotonomy/control/EOQualifier.java	/^		public Method methodOnObject(Object anObject) throws NoSuchMethodException {$/;"	m	class:EOQualifier.BaseSelector
+model	src/main/java/net/wotonomy/access/EOEntity.java	/^	public EOModel model() {$/;"	m	class:EOEntity
+model	src/main/java/net/wotonomy/access/EOStoredProcedure.java	/^	public EOModel model() {$/;"	m	class:EOStoredProcedure
+modelGroup	src/main/java/net/wotonomy/access/EOModel.java	/^	public EOModelGroup modelGroup() {$/;"	m	class:EOModel
+modelGroupForObjectStoreCoordinator	src/main/java/net/wotonomy/access/EOModelGroup.java	/^	public static EOModelGroup modelGroupForObjectStoreCoordinator(EOObjectStoreCoordinator coord) /;"	m	class:EOModelGroup
+modelNamed	src/main/java/net/wotonomy/access/EOModelGroup.java	/^	public EOModel modelNamed(String name) {$/;"	m	class:EOModelGroup
+modelNames	src/main/java/net/wotonomy/access/EOModelGroup.java	/^	public NSArray modelNames() {$/;"	m	class:EOModelGroup
+modelWithPath	src/main/java/net/wotonomy/access/EOModelGroup.java	/^	public EOModel modelWithPath(String path) {$/;"	m	class:EOModelGroup
+models	src/main/java/net/wotonomy/access/EODatabase.java	/^	public NSArray models() {$/;"	m	class:EODatabase
+models	src/main/java/net/wotonomy/access/EOModelGroup.java	/^	public NSArray models() {$/;"	m	class:EOModelGroup
+mustUseBindVariableForAttribute	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public boolean mustUseBindVariableForAttribute(EOAttribute attr) {$/;"	m	class:EOSQLExpression
+name	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public String name() {$/;"	m	class:EOAdaptor
+name	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public String name() {$/;"	m	class:EOAttribute
+name	src/main/java/net/wotonomy/access/EOEntity.java	/^	public String name() {$/;"	m	class:EOEntity
+name	src/main/java/net/wotonomy/access/EOModel.java	/^	public String name() {$/;"	m	class:EOModel
+name	src/main/java/net/wotonomy/access/EOProperty.java	/^	public abstract String name();$/;"	m	class:EOProperty
+name	src/main/java/net/wotonomy/access/EORelationship.java	/^	public String name() {$/;"	m	class:EORelationship
+name	src/main/java/net/wotonomy/access/EOStoredProcedure.java	/^	public String name() {$/;"	m	class:EOStoredProcedure
+name	src/main/java/net/wotonomy/control/EOQualifier.java	/^		public String name() {$/;"	m	class:EOQualifier.BaseSelector
+net.wotonomy.access	src/main/java/net/wotonomy/access/EOAccessArrayFaultHandler.java	/^package net.wotonomy.access;$/;"	p
+net.wotonomy.access	src/main/java/net/wotonomy/access/EOAccessFaultHandler.java	/^package net.wotonomy.access;$/;"	p
+net.wotonomy.access	src/main/java/net/wotonomy/access/EOAccessGenericFaultHandler.java	/^package net.wotonomy.access;$/;"	p
+net.wotonomy.access	src/main/java/net/wotonomy/access/EOAccessLock.java	/^package net.wotonomy.access;$/;"	p
+net.wotonomy.access	src/main/java/net/wotonomy/access/EOAdaptor.java	/^package net.wotonomy.access;$/;"	p
+net.wotonomy.access	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^package net.wotonomy.access;$/;"	p
+net.wotonomy.access	src/main/java/net/wotonomy/access/EOAdaptorContext.java	/^package net.wotonomy.access;$/;"	p
+net.wotonomy.access	src/main/java/net/wotonomy/access/EOAdaptorOperation.java	/^package net.wotonomy.access;$/;"	p
+net.wotonomy.access	src/main/java/net/wotonomy/access/EOAttribute.java	/^package net.wotonomy.access;$/;"	p
+net.wotonomy.access	src/main/java/net/wotonomy/access/EODatabase.java	/^package net.wotonomy.access;$/;"	p
+net.wotonomy.access	src/main/java/net/wotonomy/access/EODatabaseChannel.java	/^package net.wotonomy.access;$/;"	p
+net.wotonomy.access	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^package net.wotonomy.access;$/;"	p
+net.wotonomy.access	src/main/java/net/wotonomy/access/EODatabaseOperation.java	/^package net.wotonomy.access;$/;"	p
+net.wotonomy.access	src/main/java/net/wotonomy/access/EOEntity.java	/^package net.wotonomy.access;$/;"	p
+net.wotonomy.access	src/main/java/net/wotonomy/access/EOEntityClassDescription.java	/^package net.wotonomy.access;$/;"	p
+net.wotonomy.access	src/main/java/net/wotonomy/access/EOGeneralAdaptorException.java	/^package net.wotonomy.access;$/;"	p
+net.wotonomy.access	src/main/java/net/wotonomy/access/EOJoin.java	/^package net.wotonomy.access;$/;"	p
+net.wotonomy.access	src/main/java/net/wotonomy/access/EOModel.java	/^package net.wotonomy.access;$/;"	p
+net.wotonomy.access	src/main/java/net/wotonomy/access/EOModelGroup.java	/^package net.wotonomy.access;$/;"	p
+net.wotonomy.access	src/main/java/net/wotonomy/access/EOProperty.java	/^package net.wotonomy.access;$/;"	p
+net.wotonomy.access	src/main/java/net/wotonomy/access/EOPropertyListEncoding.java	/^package net.wotonomy.access;$/;"	p
+net.wotonomy.access	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^package net.wotonomy.access;$/;"	p
+net.wotonomy.access	src/main/java/net/wotonomy/access/EORelationship.java	/^package net.wotonomy.access;$/;"	p
+net.wotonomy.access	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^package net.wotonomy.access;$/;"	p
+net.wotonomy.access	src/main/java/net/wotonomy/access/EOSQLExpressionFactory.java	/^package net.wotonomy.access;$/;"	p
+net.wotonomy.access	src/main/java/net/wotonomy/access/EOStoredProcedure.java	/^package net.wotonomy.access;$/;"	p
+net.wotonomy.access	src/test/java/net/wotonomy/access/EOEntityTest.java	/^package net.wotonomy.access;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/ArrayFault.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/ChildDataSource.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOAndQualifier.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOClassDescription.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOCooperatingObjectStore.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOCustomObject.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EODataSource.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EODeferredFaulting.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EODelayedObserver.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EODelayedObserverQueue.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOEditingContext.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOEnterpriseObject.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOFaultHandler.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOFaulting.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOGenericRecord.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOGlobalID.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOIntegralKeyGlobalID.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOKeyComparisonQualifier.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOKeyGlobalID.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOKeyValueArchiver.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOKeyValueArchiving.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOKeyValueCoding.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOKeyValueCodingAdditions.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOKeyValueCodingSupport.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOKeyValueQualifier.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOKeyValueUnarchiver.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EONotQualifier.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EONullValue.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOObjectStore.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOObserverProxy.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOObserving.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOOrQualifier.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOQualifier.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOQualifierEvaluation.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EORelationshipManipulation.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOTemporaryGlobalID.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOValidation.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EOVectorKeyGlobalID.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/EditingContext.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/ObservableArray.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/OrderedDataSource.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control	src/main/java/net/wotonomy/control/PropertyDataSource.java	/^package net.wotonomy.control;$/;"	p
+net.wotonomy.control.internal	src/main/java/net/wotonomy/control/internal/Surrogate.java	/^package net.wotonomy.control.internal;$/;"	p
+notifyDelegate	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private Object notifyDelegate(String aMethodName, Class[] types, Object[] params) {$/;"	m	class:EOEditingContext	file:
+notifyMessageHandler	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private void notifyMessageHandler(String aMessage) {$/;"	m	class:EOEditingContext	file:
+notifyObserversObjectWillChange	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^	public static void notifyObserversObjectWillChange(Object anObject) {$/;"	m	class:EOObserverCenter
+notifyObserversUpToPriority	src/main/java/net/wotonomy/control/EODelayedObserverQueue.java	/^	public void notifyObserversUpToPriority(int priority) {$/;"	m	class:EODelayedObserverQueue
+nullValue	src/main/java/net/wotonomy/control/EONullValue.java	/^	public static EONullValue nullValue() {$/;"	m	class:EONullValue
+numberOfToManyFaultsToBatchFetch	src/main/java/net/wotonomy/access/EORelationship.java	/^	public int numberOfToManyFaultsToBatchFetch() {$/;"	m	class:EORelationship
+object	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		private Object object;$/;"	f	class:EOEditingContext.CompoundKey	file:
+objectForGlobalID	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public Object objectForGlobalID(EOGlobalID aGlobalID) {$/;"	m	class:EOEditingContext.Registrar
+objectForGlobalID	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public Object objectForGlobalID(EOGlobalID aGlobalID) {$/;"	m	class:EOEditingContext.WeakRegistrar
+objectForGlobalID	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public Object objectForGlobalID(EOGlobalID aGlobalID) {$/;"	m	class:EOEditingContext
+objectStoreForEntityNamed	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	EOCooperatingObjectStore objectStoreForEntityNamed(String s) {$/;"	m	class:EOObjectStoreCoordinator
+objectStoreForFetchSpecification	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public EOCooperatingObjectStore objectStoreForFetchSpecification(EOFetchSpecification eofetchsp/;"	m	class:EOObjectStoreCoordinator
+objectStoreForGlobalID	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public EOCooperatingObjectStore objectStoreForGlobalID(EOGlobalID eoglobalid) {$/;"	m	class:EOObjectStoreCoordinator
+objectStoreForObject	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public EOCooperatingObjectStore objectStoreForObject(EOEnterpriseObject eoenterpriseobject) {$/;"	m	class:EOObjectStoreCoordinator
+objectWillChange	src/main/java/net/wotonomy/control/EODelayedObserver.java	/^	public void objectWillChange(Object anObject) {$/;"	m	class:EODelayedObserver
+objectWillChange	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void objectWillChange(Object anObject) {$/;"	m	class:EOEditingContext
+objectWillChange	src/main/java/net/wotonomy/control/EOObserving.java	/^	void objectWillChange(Object anObject);$/;"	m	interface:EOObserving
+objects	src/main/java/net/wotonomy/control/ChildDataSource.java	/^	private NSMutableArray objects;$/;"	f	class:ChildDataSource	file:
+objectsForSourceGlobalID	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public NSArray objectsForSourceGlobalID(EOGlobalID gid, String relationName, EOEditingContext e/;"	m	class:EODatabaseContext
+objectsForSourceGlobalID	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	public NSArray objectsForSourceGlobalID(EOGlobalID aGlobalID, String aRelationship, EOEditingCo/;"	m	class:AbstractObjectStore
+objectsForSourceGlobalID	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public NSArray objectsForSourceGlobalID(EOGlobalID aGlobalID, String aRelationshipKey, EOEditin/;"	m	class:EOEditingContext
+objectsForSourceGlobalID	src/main/java/net/wotonomy/control/EOObjectStore.java	/^	public abstract NSArray objectsForSourceGlobalID(EOGlobalID aGlobalID, String aRelationship,$/;"	m	class:EOObjectStore
+objectsForSourceGlobalID	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public NSArray objectsForSourceGlobalID(EOGlobalID eoglobalid, String s, EOEditingContext eoedi/;"	m	class:EOObjectStoreCoordinator
+objectsToCommitSnapshots	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		NSMutableDictionary objectsToCommitSnapshots;$/;"	f	class:EOEditingContext.Registrar
+objectsToCurrentSnapshots	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		NSMutableDictionary objectsToCurrentSnapshots;$/;"	f	class:EOEditingContext.Registrar
+objectsToIDs	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		NSMutableDictionary objectsToIDs;$/;"	f	class:EOEditingContext.Registrar
+objectsWithFetchSpecification	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public NSArray objectsWithFetchSpecification(EOFetchSpecification fspec, EOEditingContext ec) {$/;"	m	class:EODatabaseContext
+objectsWithFetchSpecification	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	public NSArray objectsWithFetchSpecification(EOFetchSpecification aFetchSpec, EOEditingContext /;"	m	class:AbstractObjectStore
+objectsWithFetchSpecification	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public NSArray objectsWithFetchSpecification(EOFetchSpecification aFetchSpec) {$/;"	m	class:EOEditingContext
+objectsWithFetchSpecification	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public NSArray objectsWithFetchSpecification(EOFetchSpecification aFetchSpec, EOEditingContext /;"	m	class:EOEditingContext
+objectsWithFetchSpecification	src/main/java/net/wotonomy/control/EOObjectStore.java	/^	public abstract NSArray objectsWithFetchSpecification(EOFetchSpecification aFetchSpec, EOEditin/;"	m	class:EOObjectStore
+objectsWithFetchSpecification	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public NSArray objectsWithFetchSpecification(EOFetchSpecification eofetchspecification,$/;"	m	class:EOObjectStoreCoordinator
+observableToObservers	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^	private static Map observableToObservers = new Hashtable();$/;"	f	class:EOObserverCenter	file:
+observer	src/main/java/net/wotonomy/control/ObservableArray.java	/^	EOObserving observer;$/;"	f	class:ObservableArray
+observerForObject	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^	public static EOObserving observerForObject(Object anObject, Class aClass) {$/;"	m	class:EOObserverCenter
+observerListForObject	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^	private static List observerListForObject(Object anObject) {$/;"	m	class:EOObserverCenter	file:
+observerNotificationSuppressCount	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^	public static int observerNotificationSuppressCount() {$/;"	m	class:EOObserverCenter
+observerQueue	src/main/java/net/wotonomy/control/EODelayedObserver.java	/^	public EODelayedObserverQueue observerQueue() {$/;"	m	class:EODelayedObserver
+observers	src/main/java/net/wotonomy/control/EODelayedObserverQueue.java	/^		List observers;$/;"	f	class:EODelayedObserverQueue.PriorityLaterRunnable
+observersForObject	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^	public static NSArray observersForObject(Object anObject) {$/;"	m	class:EOObserverCenter
+omniscients	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^	private static List omniscients = new LinkedList();$/;"	f	class:EOObserverCenter	file:
+openChannel	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	public abstract void openChannel();$/;"	m	class:EOAdaptorChannel
+operatorSelectorForString	src/main/java/net/wotonomy/control/EOQualifier.java	/^	public static NSSelector operatorSelectorForString(String anOperatorString) {$/;"	m	class:EOQualifier
+operators	src/main/java/net/wotonomy/control/EOQualifier.java	/^	private static NSMutableDictionary operators;$/;"	f	class:EOQualifier	file:
+orderByString	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String orderByString() {$/;"	m	class:EOSQLExpression
+ownsDestination	src/main/java/net/wotonomy/access/EORelationship.java	/^	public boolean ownsDestination() {$/;"	m	class:EORelationship
+ownsDestinationObjectsForRelationshipKey	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public boolean ownsDestinationObjectsForRelationshipKey(String relationshipKey) {$/;"	m	class:EOClassDescription
+ownsDestinationObjectsForRelationshipKey	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public boolean ownsDestinationObjectsForRelationshipKey(String aKey) {$/;"	m	class:EOCustomObject
+ownsDestinationObjectsForRelationshipKey	src/main/java/net/wotonomy/control/EOEnterpriseObject.java	/^	boolean ownsDestinationObjectsForRelationshipKey(String aKey);$/;"	m	interface:EOEnterpriseObject
+ownsGlobalID	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public boolean ownsGlobalID(EOGlobalID gid) {$/;"	m	class:EODatabaseContext
+ownsGlobalID	src/main/java/net/wotonomy/control/EOCooperatingObjectStore.java	/^	public abstract boolean ownsGlobalID(EOGlobalID eoglobalid);$/;"	m	class:EOCooperatingObjectStore
+ownsObject	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public boolean ownsObject(EOEnterpriseObject eo) {$/;"	m	class:EODatabaseContext
+ownsObject	src/main/java/net/wotonomy/control/EOCooperatingObjectStore.java	/^	public abstract boolean ownsObject(EOEnterpriseObject eoenterpriseobject);$/;"	m	class:EOCooperatingObjectStore
+parameterDirection	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public int parameterDirection() {$/;"	m	class:EOAttribute
+parameterTypes	src/main/java/net/wotonomy/control/EOQualifier.java	/^		public Class[] parameterTypes() {$/;"	m	class:EOQualifier.BaseSelector
+parent	src/main/java/net/wotonomy/control/ChildDataSource.java	/^	private EODataSource parent;$/;"	f	class:ChildDataSource	file:
+parent	src/main/java/net/wotonomy/control/EOKeyValueUnarchiver.java	/^	public Object parent() {$/;"	m	class:EOKeyValueUnarchiver
+parentObjectStore	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public EOObjectStore parentObjectStore() {$/;"	m	class:EOEditingContext
+parentStore	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private EOObjectStore parentStore;$/;"	f	class:EOEditingContext	file:
+path	src/main/java/net/wotonomy/access/EOModel.java	/^	public String path() {$/;"	m	class:EOModel
+performAdaptorOperation	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	public void performAdaptorOperation(EOAdaptorOperation operation) {$/;"	m	class:EOAdaptorChannel
+performAdaptorOperations	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	public void performAdaptorOperations(NSArray ops) {$/;"	m	class:EOAdaptorChannel
+performChanges	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public void performChanges() {$/;"	m	class:EODatabaseContext
+performChanges	src/main/java/net/wotonomy/control/EOCooperatingObjectStore.java	/^	public abstract void performChanges();$/;"	m	class:EOCooperatingObjectStore
+plist	src/main/java/net/wotonomy/access/EORelationship.java	/^	protected NSDictionary plist;$/;"	f	class:EORelationship
+precision	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public int precision() {$/;"	m	class:EOAttribute
+prefetchingRelationshipKeyPaths	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	private NSArray prefetchingRelationshipKeyPaths;$/;"	f	class:EOFetchSpecification	file:
+prefetchingRelationshipKeyPaths	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public NSArray prefetchingRelationshipKeyPaths() {$/;"	m	class:EOFetchSpecification
+prepareConstraintStatementForRelationship	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public void prepareConstraintStatementForRelationship(EORelationship rel, NSArray arr1, NSArray/;"	m	class:EOSQLExpression
+prepareDeleteExpressionForQualifier	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public void prepareDeleteExpressionForQualifier(EOQualifier q) {$/;"	m	class:EOSQLExpression
+prepareForSaveWithCoordinator	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public void prepareForSaveWithCoordinator(EOObjectStoreCoordinator coord, EOEditingContext ec) /;"	m	class:EODatabaseContext
+prepareForSaveWithCoordinator	src/main/java/net/wotonomy/control/EOCooperatingObjectStore.java	/^	public abstract void prepareForSaveWithCoordinator(EOObjectStoreCoordinator eoobjectstorecoordi/;"	m	class:EOCooperatingObjectStore
+prepareInsertExpressionWithRow	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public void prepareInsertExpressionWithRow(NSDictionary row) {$/;"	m	class:EOSQLExpression
+prepareSelectExpressionWithAttributes	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public void prepareSelectExpressionWithAttributes(NSArray atts, boolean lock, EOFetchSpecificat/;"	m	class:EOSQLExpression
+prepareUpdateExpressionWithRow	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public void prepareUpdateExpressionWithRow(NSDictionary row, EOQualifier q) {$/;"	m	class:EOSQLExpression
+primaryKeyAttributeNames	src/main/java/net/wotonomy/access/EOEntity.java	/^	public NSArray primaryKeyAttributeNames() {$/;"	m	class:EOEntity
+primaryKeyAttributes	src/main/java/net/wotonomy/access/EOEntity.java	/^	public NSArray primaryKeyAttributes() {$/;"	m	class:EOEntity
+primaryKeyForGlobalID	src/main/java/net/wotonomy/access/EOEntity.java	/^	public NSDictionary primaryKeyForGlobalID(EOGlobalID gid) {$/;"	m	class:EOEntity
+primaryKeysForNewRowsWithEntity	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	public NSArray primaryKeysForNewRowsWithEntity(int count, EOEntity entity) {$/;"	m	class:EOAdaptorChannel
+priority	src/main/java/net/wotonomy/control/EODelayedObserver.java	/^	public int priority() {$/;"	m	class:EODelayedObserver
+priority	src/main/java/net/wotonomy/control/EOObserverProxy.java	/^	protected int priority;$/;"	f	class:EOObserverProxy
+priority	src/main/java/net/wotonomy/control/EOObserverProxy.java	/^	public int priority() {$/;"	m	class:EOObserverProxy
+priorityQueue	src/main/java/net/wotonomy/control/EODelayedObserverQueue.java	/^	private LinkedList priorityQueue;$/;"	f	class:EODelayedObserverQueue	file:
+processInsert	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	protected Object processInsert(EOEditingContext aContext, Object object) {$/;"	m	class:AbstractObjectStore
+processQueue	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^	private static void processQueue() {$/;"	m	class:EOObserverCenter	file:
+processRecentChanges	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void processRecentChanges() { \/\/ System.out.println( "EOEditingContext.processRecentCh/;"	m	class:EOEditingContext
+processid	src/main/java/net/wotonomy/control/EOTemporaryGlobalID.java	/^	private static byte[] processid; \/\/ 2 bytes$/;"	f	class:EOTemporaryGlobalID	file:
+promptsAfterFetchLimit	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	private boolean promptsAfterFetchLimit;$/;"	f	class:EOFetchSpecification	file:
+promptsAfterFetchLimit	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public boolean promptsAfterFetchLimit() {$/;"	m	class:EOFetchSpecification
+propagateDeleteForObject	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public void propagateDeleteForObject(Object object, EOEditingContext anEditingContext) {$/;"	m	class:EOClassDescription
+propagateDeleteWithEditingContext	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public void propagateDeleteWithEditingContext(EOEditingContext aContext) {$/;"	m	class:EOCustomObject
+propagateDeleteWithEditingContext	src/main/java/net/wotonomy/control/EOEnterpriseObject.java	/^	void propagateDeleteWithEditingContext(EOEditingContext aContext);$/;"	m	interface:EOEnterpriseObject
+propagateDeletesAfterEvent	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private boolean propagateDeletesAfterEvent;$/;"	f	class:EOEditingContext	file:
+propagatesDeletesAtEndOfEvent	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public boolean propagatesDeletesAtEndOfEvent() {$/;"	m	class:EOEditingContext
+propagatesPrimaryKey	src/main/java/net/wotonomy/access/EORelationship.java	/^	public boolean propagatesPrimaryKey() {$/;"	m	class:EORelationship
+prototype	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public EOAttribute prototype() {$/;"	m	class:EOAttribute
+prototypeAttributes	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public NSArray<?> prototypeAttributes() {$/;"	m	class:EOAdaptor
+put	src/main/java/net/wotonomy/control/internal/Surrogate.java	/^	public Object put(Object aKey, Object aValue) {$/;"	m	class:Surrogate
+qualifier	src/main/java/net/wotonomy/access/EOAdaptorOperation.java	/^	public EOQualifier qualifier() {$/;"	m	class:EOAdaptorOperation
+qualifier	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	private EOQualifier qualifier;$/;"	f	class:EOFetchSpecification	file:
+qualifier	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public EOQualifier qualifier() {$/;"	m	class:EOFetchSpecification
+qualifier	src/main/java/net/wotonomy/control/EONotQualifier.java	/^	private EOQualifier qualifier;$/;"	f	class:EONotQualifier	file:
+qualifier	src/main/java/net/wotonomy/control/EONotQualifier.java	/^	public EOQualifier qualifier() {$/;"	m	class:EONotQualifier
+qualifierBindingKeys	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	public NSArray qualifierBindingKeys() {$/;"	m	class:EODatabaseDataSource
+qualifierBindings	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	NSDictionary qualifierBindings;$/;"	f	class:EODatabaseDataSource
+qualifierBindings	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	public NSDictionary qualifierBindings() {$/;"	m	class:EODatabaseDataSource
+qualifierForPrimaryKey	src/main/java/net/wotonomy/access/EOEntity.java	/^	public EOQualifier qualifierForPrimaryKey(Map pkey) {$/;"	m	class:EOEntity
+qualifierMigratedFromEntityRelationshipPath	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^		public EOQualifier qualifierMigratedFromEntityRelationshipPath(EOQualifier q, EOEntity e, Stri/;"	m	class:EOQualifierSQLGeneration.AndQualifierSupport
+qualifierMigratedFromEntityRelationshipPath	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^		public EOQualifier qualifierMigratedFromEntityRelationshipPath(EOQualifier q, EOEntity e, Stri/;"	m	class:EOQualifierSQLGeneration.KeyComparisonQualifierSupport
+qualifierMigratedFromEntityRelationshipPath	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^		public EOQualifier qualifierMigratedFromEntityRelationshipPath(EOQualifier q, EOEntity e, Stri/;"	m	class:EOQualifierSQLGeneration.KeyValueQualifierSupport
+qualifierMigratedFromEntityRelationshipPath	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^		public EOQualifier qualifierMigratedFromEntityRelationshipPath(EOQualifier q, EOEntity e, Stri/;"	m	class:EOQualifierSQLGeneration.OrQualifierSupport
+qualifierMigratedFromEntityRelationshipPath	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^		public EOQualifier qualifierMigratedFromEntityRelationshipPath(EOQualifier qualifier, EOEntity/;"	m	class:EOQualifierSQLGeneration.NotQualifierSupport
+qualifierMigratedFromEntityRelationshipPath	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^		public abstract EOQualifier qualifierMigratedFromEntityRelationshipPath(EOQualifier q, EOEntit/;"	m	class:EOQualifierSQLGeneration.Support
+qualifierMigratedFromEntityRelationshipPath	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^	public EOQualifier qualifierMigratedFromEntityRelationshipPath(EOEntity entity, String path);$/;"	m	interface:EOQualifierSQLGeneration
+qualifierToMatchAllValues	src/main/java/net/wotonomy/control/EOQualifier.java	/^	public static EOQualifier qualifierToMatchAllValues(Map aMap) {$/;"	m	class:EOQualifier
+qualifierToMatchAnyValue	src/main/java/net/wotonomy/control/EOQualifier.java	/^	public static EOQualifier qualifierToMatchAnyValue(Map aMap) {$/;"	m	class:EOQualifier
+qualifierWithBindings	src/main/java/net/wotonomy/control/EOQualifier.java	/^	public EOQualifier qualifierWithBindings(Map aMap, boolean requireAll) {$/;"	m	class:EOQualifier
+qualifierWithQualifierFormat	src/main/java/net/wotonomy/control/EOQualifier.java	/^	public static EOQualifier qualifierWithQualifierFormat(String aString, List anArgumentList) {$/;"	m	class:EOQualifier
+qualifiers	src/main/java/net/wotonomy/control/EOAndQualifier.java	/^	private List qualifiers;$/;"	f	class:EOAndQualifier	file:
+qualifiers	src/main/java/net/wotonomy/control/EOAndQualifier.java	/^	public NSArray qualifiers() {$/;"	m	class:EOAndQualifier
+qualifiers	src/main/java/net/wotonomy/control/EOOrQualifier.java	/^	private List qualifiers;$/;"	f	class:EOOrQualifier	file:
+qualifiers	src/main/java/net/wotonomy/control/EOOrQualifier.java	/^	public NSArray qualifiers() {$/;"	m	class:EOOrQualifier
+qualify	src/main/java/net/wotonomy/control/EOQualifier.java	/^		abstract protected Boolean qualify(Object target, Object parameter);$/;"	m	class:EOQualifier.BaseSelector
+qualify	src/main/java/net/wotonomy/control/EOQualifier.java	/^		protected Boolean qualify(Object o1, Object o2) {$/;"	m	class:EOQualifier.OperatorCaseInsensitiveLike
+qualify	src/main/java/net/wotonomy/control/EOQualifier.java	/^		protected Boolean qualify(Object o1, Object o2) {$/;"	m	class:EOQualifier.OperatorContains
+qualify	src/main/java/net/wotonomy/control/EOQualifier.java	/^		protected Boolean qualify(Object o1, Object o2) {$/;"	m	class:EOQualifier.OperatorEqual
+qualify	src/main/java/net/wotonomy/control/EOQualifier.java	/^		protected Boolean qualify(Object o1, Object o2) {$/;"	m	class:EOQualifier.OperatorGreaterThan
+qualify	src/main/java/net/wotonomy/control/EOQualifier.java	/^		protected Boolean qualify(Object o1, Object o2) {$/;"	m	class:EOQualifier.OperatorGreaterThanOrEqualTo
+qualify	src/main/java/net/wotonomy/control/EOQualifier.java	/^		protected Boolean qualify(Object o1, Object o2) {$/;"	m	class:EOQualifier.OperatorLessThan
+qualify	src/main/java/net/wotonomy/control/EOQualifier.java	/^		protected Boolean qualify(Object o1, Object o2) {$/;"	m	class:EOQualifier.OperatorLessThanOrEqualTo
+qualify	src/main/java/net/wotonomy/control/EOQualifier.java	/^		protected Boolean qualify(Object o1, Object o2) {$/;"	m	class:EOQualifier.OperatorLike
+qualify	src/main/java/net/wotonomy/control/EOQualifier.java	/^		protected Boolean qualify(Object o1, Object o2) {$/;"	m	class:EOQualifier.OperatorNotEqual
+qualifyWithRelationshipKey	src/main/java/net/wotonomy/control/ChildDataSource.java	/^	public void qualifyWithRelationshipKey(String aKey, Object anObject) {$/;"	m	class:ChildDataSource
+qualifyWithRelationshipKey	src/main/java/net/wotonomy/control/EODataSource.java	/^	public abstract void qualifyWithRelationshipKey(String aKey, Object anObject);$/;"	m	class:EODataSource
+qualifyWithRelationshipKey	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	public void qualifyWithRelationshipKey(String aKey, Object anObject) {$/;"	m	class:EODatabaseDataSource
+qualifyWithRelationshipKey	src/main/java/net/wotonomy/control/PropertyDataSource.java	/^	public void qualifyWithRelationshipKey(String aKey, Object anObject) {$/;"	m	class:PropertyDataSource
+queue	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^	private static ReferenceQueue queue = new ReferenceQueue();$/;"	f	class:EOObserverCenter	file:
+rawRowKeyPaths	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	private NSArray rawRowKeyPaths;$/;"	f	class:EOFetchSpecification	file:
+rawRowKeyPaths	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public NSArray rawRowKeyPaths() {$/;"	m	class:EOFetchSpecification
+readAsList	src/main/java/net/wotonomy/control/PropertyDataSource.java	/^	protected NSMutableArray readAsList() {$/;"	m	class:PropertyDataSource
+readFormat	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public String readFormat() {$/;"	m	class:EOAttribute
+readFromCache	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	protected Map readFromCache(EOGlobalID aGlobalID, Collection keys) {$/;"	m	class:AbstractObjectStore
+readObject	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	abstract protected Map readObject(EOGlobalID aGlobalID, Collection keys);$/;"	m	class:AbstractObjectStore
+readOnly	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public boolean readOnly() {$/;"	m	class:EOAttribute
+readResolve	src/main/java/net/wotonomy/control/EOKeyGlobalID.java	/^	protected Object readResolve() throws ObjectStreamException {$/;"	m	class:EOKeyGlobalID
+reapplyChangesFromDictionary	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public void reapplyChangesFromDictionary(NSDictionary aDeltaSnapshot) {$/;"	m	class:EOCustomObject
+reapplyChangesFromDictionary	src/main/java/net/wotonomy/control/EOEnterpriseObject.java	/^	void reapplyChangesFromDictionary(NSDictionary aDeltaSnapshot);$/;"	m	interface:EOEnterpriseObject
+recordChangesInEditingContext	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public void recordChangesInEditingContext() {$/;"	m	class:EODatabaseContext
+recordChangesInEditingContext	src/main/java/net/wotonomy/control/EOCooperatingObjectStore.java	/^	public abstract void recordChangesInEditingContext();$/;"	m	class:EOCooperatingObjectStore
+recordObject	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void recordObject(Object anObject, EOGlobalID aGlobalID) {$/;"	m	class:EOEditingContext
+recordSnapshotForGlobalID	src/main/java/net/wotonomy/access/EODatabase.java	/^	public void recordSnapshotForGlobalID(NSDictionary snap, EOGlobalID gid) {$/;"	m	class:EODatabase
+recordSnapshotForGlobalID	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public void recordSnapshotForGlobalID(NSDictionary snap, EOGlobalID gid) {$/;"	m	class:EODatabaseContext
+recordSnapshotForSourceGlobalID	src/main/java/net/wotonomy/access/EODatabase.java	/^	public void recordSnapshotForSourceGlobalID(NSArray gids, EOGlobalID gid, String name) {$/;"	m	class:EODatabase
+recordSnapshotForSourceGlobalID	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public void recordSnapshotForSourceGlobalID(NSArray gids, EOGlobalID gid, String relationName) /;"	m	class:EODatabaseContext
+recordSnapshots	src/main/java/net/wotonomy/access/EODatabase.java	/^	public void recordSnapshots(NSDictionary snaps) {$/;"	m	class:EODatabase
+recordSnapshots	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public void recordSnapshots(NSDictionary<EOGlobalID, NSDictionary> snaps) {$/;"	m	class:EODatabaseContext
+recordToManySnapshots	src/main/java/net/wotonomy/access/EODatabase.java	/^	public void recordToManySnapshots(NSDictionary snaps) {$/;"	m	class:EODatabase
+recordToManySnapshots	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public void recordToManySnapshots(NSDictionary snaps) {$/;"	m	class:EODatabaseContext
+recordUpdateForObject	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public void recordUpdateForObject(EOEnterpriseObject eo, NSDictionary changes) {$/;"	m	class:EODatabaseContext
+recordUpdateForObject	src/main/java/net/wotonomy/control/EOCooperatingObjectStore.java	/^	public abstract void recordUpdateForObject(EOEnterpriseObject eoenterpriseobject, NSDictionary /;"	m	class:EOCooperatingObjectStore
+redo	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void redo() {$/;"	m	class:EOEditingContext
+refault	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void refault() {$/;"	m	class:EOEditingContext
+refaultObject	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public void refaultObject(Object obj, EOGlobalID gid, EOEditingContext ec) {$/;"	m	class:EODatabaseContext
+refaultObject	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	public void refaultObject(Object anObject, EOGlobalID aGlobalID, EOEditingContext aContext) {$/;"	m	class:AbstractObjectStore
+refaultObject	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void refaultObject(Object anObject, EOGlobalID aGlobalID, EOEditingContext aContext) {$/;"	m	class:EOEditingContext
+refaultObject	src/main/java/net/wotonomy/control/EOObjectStore.java	/^	public abstract void refaultObject(Object anObject, EOGlobalID aGlobalID, EOEditingContext aCon/;"	m	class:EOObjectStore
+refaultObject	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public void refaultObject(Object anObject, EOGlobalID aGlobalID, EOEditingContext aContext) {$/;"	m	class:EOObjectStoreCoordinator
+refaultObjects	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void refaultObjects() {$/;"	m	class:EOEditingContext
+referent	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		Object referent;$/;"	f	class:EOEditingContext.ReferenceKey
+refetch	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void refetch() {$/;"	m	class:EOEditingContext
+refreshesRefetchedObjects	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	private boolean refreshesRefetchedObjects;$/;"	f	class:EOFetchSpecification	file:
+refreshesRefetchedObjects	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public boolean refreshesRefetchedObjects() {$/;"	m	class:EOFetchSpecification
+registerChannel	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public void registerChannel(EODatabaseChannel channel) {$/;"	m	class:EODatabaseContext
+registerClassDescription	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public static <C> void registerClassDescription(EOClassDescription<C> description, Class<C> aCl/;"	m	class:EOClassDescription
+registerClone	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	static private Object registerClone(EOGlobalID aGlobalID, EOEditingContext aSourceContext, Obje/;"	m	class:EOEditingContext	file:
+registerContext	src/main/java/net/wotonomy/access/EODatabase.java	/^	public void registerContext(EODatabaseContext context) {$/;"	m	class:EODatabase
+registerObject	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public void registerObject(Object anObject, EOGlobalID aGlobalID) { \/\/ new$/;"	m	class:EOEditingContext.WeakRegistrar
+registerObject	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public void registerObject(Object anObject, EOGlobalID aGlobalID) {$/;"	m	class:EOEditingContext.Registrar
+registeredChannels	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public NSArray registeredChannels() {$/;"	m	class:EODatabaseContext
+registeredContexts	src/main/java/net/wotonomy/access/EODatabase.java	/^	public NSArray registeredContexts() {$/;"	m	class:EODatabase
+registeredGlobalIDs	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public NSArray registeredGlobalIDs() {$/;"	m	class:EOEditingContext.Registrar
+registeredObjects	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public NSArray registeredObjects() {$/;"	m	class:EOEditingContext.Registrar
+registeredObjects	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public NSArray registeredObjects() {$/;"	m	class:EOEditingContext.WeakRegistrar
+registeredObjects	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public NSArray registeredObjects() {$/;"	m	class:EOEditingContext
+registrar	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private Registrar registrar;$/;"	f	class:EOEditingContext	file:
+relationalQualifierOperators	src/main/java/net/wotonomy/control/EOQualifier.java	/^	public static NSArray relationalQualifierOperators() {$/;"	m	class:EOQualifier
+relationshipKey	src/main/java/net/wotonomy/control/ArrayFault.java	/^	private String relationshipKey;$/;"	f	class:ArrayFault	file:
+relationshipName	src/main/java/net/wotonomy/access/EOAccessArrayFaultHandler.java	/^	public String relationshipName() {$/;"	m	class:EOAccessArrayFaultHandler
+relationshipNamed	src/main/java/net/wotonomy/access/EOEntity.java	/^	public EORelationship relationshipNamed(String name) {$/;"	m	class:EOEntity
+relationshipPath	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public String relationshipPath() {$/;"	m	class:EOAttribute
+relationshipPath	src/main/java/net/wotonomy/access/EOProperty.java	/^	public abstract String relationshipPath();$/;"	m	class:EOProperty
+relationshipPath	src/main/java/net/wotonomy/access/EORelationship.java	/^	public String relationshipPath() {$/;"	m	class:EORelationship
+relationships	src/main/java/net/wotonomy/access/EOEntity.java	/^	public NSArray relationships() {$/;"	m	class:EOEntity
+remove	src/main/java/net/wotonomy/control/ObservableArray.java	/^	public Object remove(int index) {$/;"	m	class:ObservableArray
+remove	src/main/java/net/wotonomy/control/ObservableArray.java	/^	public boolean remove(Object o) {$/;"	m	class:ObservableArray
+removeAll	src/main/java/net/wotonomy/control/ObservableArray.java	/^	public boolean removeAll(Collection coll) {$/;"	m	class:ObservableArray
+removeAllObjects	src/main/java/net/wotonomy/control/ObservableArray.java	/^	public void removeAllObjects() {$/;"	m	class:ObservableArray
+removeAttribute	src/main/java/net/wotonomy/access/EOEntity.java	/^	public void removeAttribute(EOAttribute atr) {$/;"	m	class:EOEntity
+removeCooperatingObjectStore	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public void removeCooperatingObjectStore(EOCooperatingObjectStore eocooperatingobjectstore) {$/;"	m	class:EOObjectStoreCoordinator
+removeEditor	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void removeEditor(Object anObject) {$/;"	m	class:EOEditingContext
+removeEntity	src/main/java/net/wotonomy/access/EOModel.java	/^	public void removeEntity(EOEntity ent) {$/;"	m	class:EOModel
+removeFetchSpecificationNamed	src/main/java/net/wotonomy/access/EOEntity.java	/^	public void removeFetchSpecificationNamed(String name) {$/;"	m	class:EOEntity
+removeIdenticalObject	src/main/java/net/wotonomy/control/ObservableArray.java	/^	public void removeIdenticalObject(Object anObject) {$/;"	m	class:ObservableArray
+removeIdenticalObject	src/main/java/net/wotonomy/control/ObservableArray.java	/^	public void removeIdenticalObject(Object anObject, NSRange aRange) {$/;"	m	class:ObservableArray
+removeJoin	src/main/java/net/wotonomy/access/EORelationship.java	/^	public void removeJoin(EOJoin join) {$/;"	m	class:EORelationship
+removeLastObject	src/main/java/net/wotonomy/control/ObservableArray.java	/^	public void removeLastObject() {$/;"	m	class:ObservableArray
+removeMode	src/main/java/net/wotonomy/access/EODatabase.java	/^	public void removeMode(EOModel model) {$/;"	m	class:EODatabase
+removeModel	src/main/java/net/wotonomy/access/EOModelGroup.java	/^	public void removeModel(EOModel model) {$/;"	m	class:EOModelGroup
+removeObject	src/main/java/net/wotonomy/control/ObservableArray.java	/^	public void removeObject(Object anObject) {$/;"	m	class:ObservableArray
+removeObject	src/main/java/net/wotonomy/control/ObservableArray.java	/^	public void removeObject(Object anObject, NSRange aRange) {$/;"	m	class:ObservableArray
+removeObjectAtIndex	src/main/java/net/wotonomy/control/ObservableArray.java	/^	public void removeObjectAtIndex(int index) {$/;"	m	class:ObservableArray
+removeObjectFromBothSidesOfRelationshipWithKey	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public void removeObjectFromBothSidesOfRelationshipWithKey(EORelationshipManipulation anObject,/;"	m	class:EOCustomObject
+removeObjectFromBothSidesOfRelationshipWithKey	src/main/java/net/wotonomy/control/EORelationshipManipulation.java	/^	void removeObjectFromBothSidesOfRelationshipWithKey(EORelationshipManipulation anObject, String/;"	m	interface:EORelationshipManipulation
+removeObjectFromPropertyWithKey	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public void removeObjectFromPropertyWithKey(Object anObject, String aKey) {$/;"	m	class:EOCustomObject
+removeObjectFromPropertyWithKey	src/main/java/net/wotonomy/control/EORelationshipManipulation.java	/^	void removeObjectFromPropertyWithKey(Object anObject, String aKey);$/;"	m	interface:EORelationshipManipulation
+removeObjectsInArray	src/main/java/net/wotonomy/control/ObservableArray.java	/^	public void removeObjectsInArray(Collection aCollection) {$/;"	m	class:ObservableArray
+removeObjectsInRange	src/main/java/net/wotonomy/control/ObservableArray.java	/^	public void removeObjectsInRange(NSRange aRange) {$/;"	m	class:ObservableArray
+removeObserver	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^	public static void removeObserver(EOObserving anObserver, Object anObject) {$/;"	m	class:EOObserverCenter
+removeOmniscientObserver	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^	public static void removeOmniscientObserver(EOObserving anObserver) {$/;"	m	class:EOObserverCenter
+removeRelationship	src/main/java/net/wotonomy/access/EOEntity.java	/^	public void removeRelationship(EORelationship rel) {$/;"	m	class:EOEntity
+removeStoredProcedure	src/main/java/net/wotonomy/access/EOModel.java	/^	public void removeStoredProcedure(EOStoredProcedure proc) {$/;"	m	class:EOModel
+replaceObject	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^		protected Object replaceObject(Object anObject) throws IOException {$/;"	m	class:KeyValueCodingUtilities.ContextObjectOutputStream
+replaceObject	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^		protected Object replaceObject(Object anObject) throws IOException {$/;"	m	class:KeyValueCodingUtilities.TransposingContextObjectOutputStream
+replaceObjectAtIndex	src/main/java/net/wotonomy/control/ObservableArray.java	/^	public void replaceObjectAtIndex(int anIndex, Object anObject) {$/;"	m	class:ObservableArray
+replaceObjectsInRange	src/main/java/net/wotonomy/control/ObservableArray.java	/^	public void replaceObjectsInRange(NSRange currentRange, List otherArray, NSRange otherRange) {$/;"	m	class:ObservableArray
+requiresAllQualifierBindingVariables	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	private boolean requiresAllQualifierBindingVariables;$/;"	f	class:EOFetchSpecification	file:
+requiresAllQualifierBindingVariables	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public boolean requiresAllQualifierBindingVariables() {$/;"	m	class:EOFetchSpecification
+reset	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void reset() {$/;"	m	class:EOEditingContext
+resolveClass	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^		protected Class resolveClass(ObjectStreamClass v) throws IOException, ClassNotFoundException {$/;"	m	class:KeyValueCodingUtilities.ContextObjectInputStream
+resolveObject	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^		protected Object resolveObject(Object anObject) throws IOException {$/;"	m	class:KeyValueCodingUtilities.ContextObjectInputStream
+resolveObject	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^		protected Object resolveObject(Object anObject) throws IOException {$/;"	m	class:KeyValueCodingUtilities.TransposingContextObjectInputStream
+resultCacheForEntityNamed	src/main/java/net/wotonomy/access/EODatabase.java	/^	public NSArray resultCacheForEntityNamed(String name) {$/;"	m	class:EODatabase
+retainAll	src/main/java/net/wotonomy/control/ObservableArray.java	/^	public boolean retainAll(Collection coll) {$/;"	m	class:ObservableArray
+retainsRegisteredObjects	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private static boolean retainsRegisteredObjects = true;$/;"	f	class:EOEditingContext	file:
+returnValuesForLastStoredProcedureInvocation	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	public abstract NSDictionary returnValuesForLastStoredProcedureInvocation();$/;"	m	class:EOAdaptorChannel
+revert	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void revert() {$/;"	m	class:EOEditingContext
+rightKey	src/main/java/net/wotonomy/control/EOKeyComparisonQualifier.java	/^	public String rightKey() {$/;"	m	class:EOKeyComparisonQualifier
+rollbackChanges	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public void rollbackChanges() {$/;"	m	class:EODatabaseContext
+rollbackChanges	src/main/java/net/wotonomy/control/EOCooperatingObjectStore.java	/^	public abstract void rollbackChanges();$/;"	m	class:EOCooperatingObjectStore
+rollbackTransaction	src/main/java/net/wotonomy/access/EOAdaptorContext.java	/^	public abstract void rollbackTransaction();$/;"	m	class:EOAdaptorContext
+rootObject	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^		protected Object rootObject;$/;"	f	class:KeyValueCodingUtilities.TransposingContextObjectOutputStream
+rootObjectStore	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public EOObjectStore rootObjectStore() {$/;"	m	class:EOEditingContext
+run	src/main/java/net/wotonomy/control/EODelayedObserverQueue.java	/^		public void run() {$/;"	m	class:EODelayedObserverQueue.PriorityLaterRunnable
+runLater	src/main/java/net/wotonomy/control/EODelayedObserverQueue.java	/^	private void runLater() {$/;"	m	class:EODelayedObserverQueue	file:
+runLater	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private void runLater() {$/;"	m	class:EOEditingContext	file:
+runLaterSelector	src/main/java/net/wotonomy/control/EODelayedObserverQueue.java	/^	private static NSSelector runLaterSelector = new NSSelector("flushObserverQueue", new Class[] {/;"	f	class:EODelayedObserverQueue	file:
+runLaterSelector	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private static NSSelector runLaterSelector = new NSSelector("flushRecentChanges", new Class[] {/;"	f	class:EOEditingContext	file:
+saveChanges	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void saveChanges() {$/;"	m	class:EOEditingContext
+saveChangesInEditingContext	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public void saveChangesInEditingContext(EOEditingContext ec) {$/;"	m	class:EODatabaseContext
+saveChangesInEditingContext	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	public void saveChangesInEditingContext(EOEditingContext aContext) {$/;"	m	class:AbstractObjectStore
+saveChangesInEditingContext	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void saveChangesInEditingContext(EOEditingContext aContext) {$/;"	m	class:EOEditingContext
+saveChangesInEditingContext	src/main/java/net/wotonomy/control/EOObjectStore.java	/^	public abstract void saveChangesInEditingContext(EOEditingContext aContext);$/;"	m	class:EOObjectStore
+saveChangesInEditingContext	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public void saveChangesInEditingContext(EOEditingContext eoeditingcontext) {$/;"	m	class:EOObjectStoreCoordinator
+scale	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public int scale() {$/;"	m	class:EOAttribute
+schemaBasedQualifierWithRootEntity	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^		public EOQualifier schemaBasedQualifierWithRootEntity(EOQualifier q, EOEntity e) {$/;"	m	class:EOQualifierSQLGeneration.AndQualifierSupport
+schemaBasedQualifierWithRootEntity	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^		public EOQualifier schemaBasedQualifierWithRootEntity(EOQualifier q, EOEntity e) {$/;"	m	class:EOQualifierSQLGeneration.KeyComparisonQualifierSupport
+schemaBasedQualifierWithRootEntity	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^		public EOQualifier schemaBasedQualifierWithRootEntity(EOQualifier q, EOEntity e) {$/;"	m	class:EOQualifierSQLGeneration.KeyValueQualifierSupport
+schemaBasedQualifierWithRootEntity	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^		public EOQualifier schemaBasedQualifierWithRootEntity(EOQualifier q, EOEntity e) {$/;"	m	class:EOQualifierSQLGeneration.OrQualifierSupport
+schemaBasedQualifierWithRootEntity	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^		public EOQualifier schemaBasedQualifierWithRootEntity(EOQualifier qualifier, EOEntity e) {$/;"	m	class:EOQualifierSQLGeneration.NotQualifierSupport
+schemaBasedQualifierWithRootEntity	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^		public abstract EOQualifier schemaBasedQualifierWithRootEntity(EOQualifier q, EOEntity e);$/;"	m	class:EOQualifierSQLGeneration.Support
+schemaBasedQualifierWithRootEntity	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^	public EOQualifier schemaBasedQualifierWithRootEntity(EOEntity entity);$/;"	m	interface:EOQualifierSQLGeneration
+sel	src/main/java/net/wotonomy/control/EOKeyValueArchiver.java	/^	public static final NSSelector sel = new NSSelector("referenceToEncodeForObject", new Class[] {/;"	f	class:EOKeyValueArchiver
+selectAttributes	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	public abstract void selectAttributes(NSArray atts, EOFetchSpecification fspec, boolean lock, E/;"	m	class:EOAdaptorChannel
+selectObjectsWithFetchSpecification	src/main/java/net/wotonomy/access/EODatabaseChannel.java	/^	public void selectObjectsWithFetchSpecification(EOFetchSpecification fspec, EOEditingContext ec/;"	m	class:EODatabaseChannel
+selectStatementForAttributes	src/main/java/net/wotonomy/access/EOSQLExpressionFactory.java	/^	public EOSQLExpression selectStatementForAttributes(NSArray atts, boolean lock, EOFetchSpecific/;"	m	class:EOSQLExpressionFactory
+selector	src/main/java/net/wotonomy/control/EOKeyComparisonQualifier.java	/^	public NSSelector selector() {$/;"	m	class:EOKeyComparisonQualifier
+selector	src/main/java/net/wotonomy/control/EOKeyValueQualifier.java	/^	private NSSelector selector;$/;"	f	class:EOKeyValueQualifier	file:
+selector	src/main/java/net/wotonomy/control/EOKeyValueQualifier.java	/^	public NSSelector selector() {$/;"	m	class:EOKeyValueQualifier
+selector	src/main/java/net/wotonomy/control/EOObserverProxy.java	/^	protected NSSelector selector;$/;"	f	class:EOObserverProxy
+selector	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^	protected NSSelector selector;$/;"	f	class:EOSortOrdering
+selector	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^	public NSSelector selector() {$/;"	m	class:EOSortOrdering
+sequence	src/main/java/net/wotonomy/control/EOTemporaryGlobalID.java	/^	private static int sequence;$/;"	f	class:EOTemporaryGlobalID	file:
+serialVersionUID	src/main/java/net/wotonomy/control/EOTemporaryGlobalID.java	/^	private static final long serialVersionUID = 7652533198394290800L;$/;"	f	class:EOTemporaryGlobalID	file:
+set	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public void set(Object anObject) {$/;"	m	class:EOEditingContext.ReferenceKey
+set	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public void set(Object anObject) {$/;"	m	class:EOEditingContext.WeakReferenceKey
+set	src/main/java/net/wotonomy/control/ObservableArray.java	/^	public Object set(int index, Object element) {$/;"	m	class:ObservableArray
+setAdaptorName	src/main/java/net/wotonomy/access/EOModel.java	/^	public void setAdaptorName(String value) {$/;"	m	class:EOModel
+setAdaptorOperator	src/main/java/net/wotonomy/access/EOAdaptorOperation.java	/^	public void setAdaptorOperator(int adOp) {$/;"	m	class:EOAdaptorOperation
+setAllowsNull	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public void setAllowsNull(boolean flag) {$/;"	m	class:EOAttribute
+setArguments	src/main/java/net/wotonomy/access/EOStoredProcedure.java	/^	public void setArguments(NSArray value) {$/;"	m	class:EOStoredProcedure
+setArray	src/main/java/net/wotonomy/control/ObservableArray.java	/^	public void setArray(Collection aCollection) {$/;"	m	class:ObservableArray
+setAttributes	src/main/java/net/wotonomy/access/EOAdaptorOperation.java	/^	public void setAttributes(NSArray atts) {$/;"	m	class:EOAdaptorOperation
+setAttributesToFetch	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	public abstract void setAttributesToFetch(NSArray atts);$/;"	m	class:EOAdaptorChannel
+setAttributesUsedForLocking	src/main/java/net/wotonomy/access/EOEntity.java	/^	public void setAttributesUsedForLocking(NSArray value) {$/;"	m	class:EOEntity
+setAuxiliaryQualifier	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	public void setAuxiliaryQualifier(EOQualifier aQualifier) {$/;"	m	class:EODatabaseDataSource
+setChangedValues	src/main/java/net/wotonomy/access/EOAdaptorOperation.java	/^	public void setChangedValues(NSDictionary values) {$/;"	m	class:EOAdaptorOperation
+setClassName	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public void setClassName(String name) {$/;"	m	class:EOAttribute
+setClassName	src/main/java/net/wotonomy/access/EOEntity.java	/^	public void setClassName(String name) {$/;"	m	class:EOEntity
+setClassProperties	src/main/java/net/wotonomy/access/EOEntity.java	/^	public void setClassProperties(NSArray value) {$/;"	m	class:EOEntity
+setColumnName	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public void setColumnName(String name) {$/;"	m	class:EOAttribute
+setCommitSnapshot	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public void setCommitSnapshot(Object anObject, byte[] aSnapshot) {$/;"	m	class:EOEditingContext.Registrar
+setCommitSnapshot	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public void setCommitSnapshot(Object anObject, byte[] aSnapshot) {$/;"	m	class:EOEditingContext.WeakRegistrar
+setConnectionDictionary	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public void setConnectionDictionary(NSDictionary<String, Object> connection) {$/;"	m	class:EOAdaptor
+setConnectionDictionary	src/main/java/net/wotonomy/access/EOModel.java	/^	public void setConnectionDictionary(NSDictionary dict) {$/;"	m	class:EOModel
+setContext	src/main/java/net/wotonomy/access/EOAccessGenericFaultHandler.java	/^	protected void setContext(EODatabaseContext dbc, EOEditingContext ec) {$/;"	m	class:EOAccessGenericFaultHandler
+setContextClassToRegister	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public static void setContextClassToRegister(Class<? extends EODatabaseContext> contextClass) {$/;"	m	class:EODatabaseContext
+setCurrentEditingContext	src/main/java/net/wotonomy/access/EODatabaseChannel.java	/^	public void setCurrentEditingContext(EOEditingContext ec) {$/;"	m	class:EODatabaseChannel
+setCurrentEntity	src/main/java/net/wotonomy/access/EODatabaseChannel.java	/^	public void setCurrentEntity(EOEntity entity) {$/;"	m	class:EODatabaseChannel
+setCurrentSnapshot	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public void setCurrentSnapshot(Object anObject, byte[] aSnapshot) {$/;"	m	class:EOEditingContext.Registrar
+setCurrentSnapshot	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public void setCurrentSnapshot(Object anObject, byte[] aSnapshot) {$/;"	m	class:EOEditingContext.WeakRegistrar
+setDefaultCoordinator	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public static synchronized void setDefaultCoordinator(EOObjectStoreCoordinator eoobjectstorecoo/;"	m	class:EOObjectStoreCoordinator
+setDefaultFetchTimestampLag	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public static void setDefaultFetchTimestampLag(double aDouble) {$/;"	m	class:EOEditingContext
+setDefaultGroup	src/main/java/net/wotonomy/access/EOModelGroup.java	/^	public static void setDefaultGroup(EOModelGroup group) {$/;"	m	class:EOModelGroup
+setDefaultParentObjectStore	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public static void setDefaultParentObjectStore(EOObjectStore anObjectStore) {$/;"	m	class:EOEditingContext
+setDefaultValue	src/main/java/net/wotonomy/control/internal/Surrogate.java	/^	public void setDefaultValue(Object aDefault) {$/;"	m	class:Surrogate
+setDefinition	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public void setDefinition(String def) {$/;"	m	class:EOAttribute
+setDefinition	src/main/java/net/wotonomy/access/EORelationship.java	/^	public void setDefinition(String def) {$/;"	m	class:EORelationship
+setDelegate	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void setDelegate(Object anObject) {$/;"	m	class:EOEditingContext
+setDelegate	src/main/java/net/wotonomy/control/EOKeyValueArchiver.java	/^	public void setDelegate(Object delegate) {$/;"	m	class:EOKeyValueArchiver
+setDelegate	src/main/java/net/wotonomy/control/EOKeyValueUnarchiver.java	/^	public void setDelegate(Object del) {$/;"	m	class:EOKeyValueUnarchiver
+setDelegate	src/main/java/net/wotonomy/control/internal/Surrogate.java	/^	public void setDelegate(Object aDelegate) {$/;"	m	class:Surrogate
+setDelegates	src/main/java/net/wotonomy/control/internal/Surrogate.java	/^	public void setDelegates(Object[] aDelegateArray) {$/;"	m	class:Surrogate
+setDeleteRule	src/main/java/net/wotonomy/access/EORelationship.java	/^	public void setDeleteRule(int value) {$/;"	m	class:EORelationship
+setEntity	src/main/java/net/wotonomy/access/EOAttribute.java	/^	void setEntity(EOEntity value) {$/;"	m	class:EOAttribute
+setEntityName	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public void setEntityName(String aName) {$/;"	m	class:EOFetchSpecification
+setException	src/main/java/net/wotonomy/access/EOAdaptorOperation.java	/^	public void setException(Throwable t) {$/;"	m	class:EOAdaptorOperation
+setExpressionClassName	src/main/java/net/wotonomy/access/EOAdaptor.java	/^	public static void setExpressionClassName(String expClassName, String adaptorClassName) {$/;"	m	class:EOAdaptor
+setExternalName	src/main/java/net/wotonomy/access/EOEntity.java	/^	public void setExternalName(String name) {$/;"	m	class:EOEntity
+setExternalName	src/main/java/net/wotonomy/access/EOStoredProcedure.java	/^	public void setExternalName(String value) {$/;"	m	class:EOStoredProcedure
+setExternalType	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public void setExternalType(String type) {$/;"	m	class:EOAttribute
+setFetchEnabled	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	public void setFetchEnabled(boolean isFetchEnabled) {$/;"	m	class:EODatabaseDataSource
+setFetchLimit	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public void setFetchLimit(int aLimit) {$/;"	m	class:EOFetchSpecification
+setFetchSpecification	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	public void setFetchSpecification(EOFetchSpecification aFetchSpec) {$/;"	m	class:EODatabaseDataSource
+setFetchSpecificationByName	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	public void setFetchSpecificationByName(String aName) {$/;"	m	class:EODatabaseDataSource
+setFetchTimestamp	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void setFetchTimestamp(double aDouble) {$/;"	m	class:EOEditingContext
+setFetchesRawRows	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public void setFetchesRawRows(boolean shouldFetchRawRows) {$/;"	m	class:EOFetchSpecification
+setHints	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public void setHints(Map aHintMap) {$/;"	m	class:EOFetchSpecification
+setInstancesRetainRegisteredObjects	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public static void setInstancesRetainRegisteredObjects(boolean retainsObjects) {$/;"	m	class:EOEditingContext
+setIsAbstractEntity	src/main/java/net/wotonomy/access/EOEntity.java	/^	public void setIsAbstractEntity(boolean flag) {$/;"	m	class:EOEntity
+setIsDeep	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public void setIsDeep(boolean isDeep) {$/;"	m	class:EOFetchSpecification
+setIsLocking	src/main/java/net/wotonomy/access/EODatabaseChannel.java	/^	public void setIsLocking(boolean flag) {$/;"	m	class:EODatabaseChannel
+setIsMandatory	src/main/java/net/wotonomy/access/EORelationship.java	/^	public void setIsMandatory(boolean flag) {$/;"	m	class:EORelationship
+setIsRefreshingObjects	src/main/java/net/wotonomy/access/EODatabaseChannel.java	/^	public void setIsRefreshingObjects(boolean flag) {$/;"	m	class:EODatabaseChannel
+setJoinSemantic	src/main/java/net/wotonomy/access/EORelationship.java	/^	public void setJoinSemantic(int value) {$/;"	m	class:EORelationship
+setKey	src/main/java/net/wotonomy/control/PropertyDataSource.java	/^	public void setKey(String aKey) {$/;"	m	class:PropertyDataSource
+setLocksObjects	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public void setLocksObjects(boolean shouldLockObjects) {$/;"	m	class:EOFetchSpecification
+setLocksObjectsBeforeFirstModification	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void setLocksObjectsBeforeFirstModification(boolean locksObjects) {$/;"	m	class:EOEditingContext
+setMessageHandler	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void setMessageHandler(Object anObject) {$/;"	m	class:EOEditingContext
+setModelGroup	src/main/java/net/wotonomy/access/EOModel.java	/^	public void setModelGroup(EOModelGroup group) {$/;"	m	class:EOModel
+setModelGroupForObjectStoreCoordinator	src/main/java/net/wotonomy/access/EOModelGroup.java	/^	public static void setModelGroupForObjectStoreCoordinator(EOObjectStoreCoordinator coord, EOMod/;"	m	class:EOModelGroup
+setName	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public void setName(String name) {$/;"	m	class:EOAttribute
+setName	src/main/java/net/wotonomy/access/EOEntity.java	/^	public void setName(String name) {$/;"	m	class:EOEntity
+setName	src/main/java/net/wotonomy/access/EORelationship.java	/^	public void setName(String name) {$/;"	m	class:EORelationship
+setName	src/main/java/net/wotonomy/access/EOStoredProcedure.java	/^	public void setName(String value) {$/;"	m	class:EOStoredProcedure
+setNumberOfToManyFaultsToBatchFetch	src/main/java/net/wotonomy/access/EORelationship.java	/^	public void setNumberOfToManyFaultsToBatchFetch(int count) {$/;"	m	class:EORelationship
+setOwnsDestination	src/main/java/net/wotonomy/access/EORelationship.java	/^	public void setOwnsDestination(boolean flag) {$/;"	m	class:EORelationship
+setParameterDirection	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public void setParameterDirection(int dir) {$/;"	m	class:EOAttribute
+setPrecision	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public void setPrecision(int value) {$/;"	m	class:EOAttribute
+setPrefetchingRelationshipKeyPaths	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public void setPrefetchingRelationshipKeyPaths(List aKeyPathList) {$/;"	m	class:EOFetchSpecification
+setPrimaryKeyAtributes	src/main/java/net/wotonomy/access/EOEntity.java	/^	public void setPrimaryKeyAtributes(NSArray pk) {$/;"	m	class:EOEntity
+setPromptsAfterFetchLimit	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public void setPromptsAfterFetchLimit(boolean shouldPrompt) {$/;"	m	class:EOFetchSpecification
+setPropagatesDeletesAtEndOfEvent	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void setPropagatesDeletesAtEndOfEvent(boolean propagatesDeletes) {$/;"	m	class:EOEditingContext
+setPropagatesPrimaryKey	src/main/java/net/wotonomy/access/EORelationship.java	/^	public void setPropagatesPrimaryKey(boolean flag) {$/;"	m	class:EORelationship
+setPrototype	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public void setPrototype(EOAttribute proto) {$/;"	m	class:EOAttribute
+setQualifier	src/main/java/net/wotonomy/access/EOAdaptorOperation.java	/^	public void setQualifier(EOQualifier q) {$/;"	m	class:EOAdaptorOperation
+setQualifier	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public void setQualifier(EOQualifier aQualifier) {$/;"	m	class:EOFetchSpecification
+setQualifierBindings	src/main/java/net/wotonomy/control/EODatabaseDataSource.java	/^	public void setQualifierBindings(Map aBindingMap) {$/;"	m	class:EODatabaseDataSource
+setRawRowKeyPaths	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public void setRawRowKeyPaths(List aKeyPathList) {$/;"	m	class:EOFetchSpecification
+setReadFormat	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public void setReadFormat(String value) {$/;"	m	class:EOAttribute
+setReadOnly	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public void setReadOnly(boolean flag) {$/;"	m	class:EOAttribute
+setReadOnly	src/main/java/net/wotonomy/access/EOEntity.java	/^	public void setReadOnly(boolean flag) {$/;"	m	class:EOEntity
+setRefreshesRefetchedObjects	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public void setRefreshesRefetchedObjects(boolean shouldRefresh) {$/;"	m	class:EOFetchSpecification
+setRequiresAllQualifierBindingVariables	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public void setRequiresAllQualifierBindingVariables(boolean shouldRequireAll) {$/;"	m	class:EOFetchSpecification
+setResultCache	src/main/java/net/wotonomy/access/EODatabase.java	/^	public void setResultCache(NSArray cache, String entityName) {$/;"	m	class:EODatabase
+setScale	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public void setScale(int value) {$/;"	m	class:EOAttribute
+setSortOrderings	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public void setSortOrderings(List aSortList) {$/;"	m	class:EOFetchSpecification
+setSource	src/main/java/net/wotonomy/control/PropertyDataSource.java	/^	public void setSource(Object anObject) {$/;"	m	class:PropertyDataSource
+setStatement	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public void setStatement(String statement) {$/;"	m	class:EOSQLExpression
+setStopsValidationAfterFirstError	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void setStopsValidationAfterFirstError(boolean stopsValidation) {$/;"	m	class:EOEditingContext
+setStoredProcedure	src/main/java/net/wotonomy/access/EOAdaptorOperation.java	/^	public void setStoredProcedure(EOStoredProcedure sp) {$/;"	m	class:EOAdaptorOperation
+setStoredProcedure	src/main/java/net/wotonomy/access/EOEntity.java	/^	public void setStoredProcedure(EOStoredProcedure proc, String operation) {$/;"	m	class:EOEntity
+setSupportForClass	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^		public static void setSupportForClass(Support sup, Class aClass) {$/;"	m	class:EOQualifierSQLGeneration.Support
+setTimestampToNow	src/main/java/net/wotonomy/access/EODatabase.java	/^	public void setTimestampToNow() {$/;"	m	class:EODatabase
+setToMany	src/main/java/net/wotonomy/access/EORelationship.java	/^	public void setToMany(boolean flag) {$/;"	m	class:EORelationship
+setUpdateStrategy	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public void setUpdateStrategy(int strategy) {$/;"	m	class:EODatabaseContext
+setUseAliases	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public void setUseAliases(boolean flag) {$/;"	m	class:EOSQLExpression
+setUseBindVariables	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public void setUseBindVariables(boolean flag) {$/;"	m	class:EOSQLExpression
+setUseQuotedExternalNames	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public static void setUseQuotedExternalNames(boolean flag) {$/;"	m	class:EOSQLExpression
+setUserInfo	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public void setUserInfo(NSDictionary value) {$/;"	m	class:EOAttribute
+setUserInfo	src/main/java/net/wotonomy/access/EOEntity.java	/^	public void setUserInfo(NSDictionary value) {$/;"	m	class:EOEntity
+setUserInfo	src/main/java/net/wotonomy/access/EOModel.java	/^	public void setUserInfo(NSDictionary dict) {$/;"	m	class:EOModel
+setUserInfo	src/main/java/net/wotonomy/access/EORelationship.java	/^	public void setUserInfo(NSDictionary value) {$/;"	m	class:EORelationship
+setUserInfo	src/main/java/net/wotonomy/access/EOStoredProcedure.java	/^	public void setUserInfo(NSDictionary info) {$/;"	m	class:EOStoredProcedure
+setUserInfo	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public void setUserInfo(NSDictionary nsdictionary) {$/;"	m	class:EOObjectStoreCoordinator
+setUsesDistinct	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public void setUsesDistinct(boolean shouldUseDistinct) {$/;"	m	class:EOFetchSpecification
+setValue	src/main/java/net/wotonomy/control/PropertyDataSource.java	/^	protected void setValue(Object aValue) {$/;"	m	class:PropertyDataSource
+setValueClassName	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public void setValueClassName(String name) {$/;"	m	class:EOAttribute
+setValueType	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public void setValueType(String type) {$/;"	m	class:EOAttribute
+setWhereClauseString	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public void setWhereClauseString(String clause) {$/;"	m	class:EOSQLExpression
+setWidth	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public void setWidth(int value) {$/;"	m	class:EOAttribute
+setWriteFormat	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public void setWriteFormat(String value) {$/;"	m	class:EOAttribute
+shouldUseBindVariableForAttribute	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public boolean shouldUseBindVariableForAttribute(EOAttribute attr) {$/;"	m	class:EOSQLExpression
+shouldUseStoredAccessors	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public static boolean shouldUseStoredAccessors() {$/;"	m	class:EOCustomObject
+size	src/main/java/net/wotonomy/control/ArrayFault.java	/^	public int size() {$/;"	m	class:ArrayFault
+snapshot	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public NSDictionary snapshot() {$/;"	m	class:EOCustomObject
+snapshot	src/main/java/net/wotonomy/control/EOEnterpriseObject.java	/^	NSDictionary snapshot();$/;"	m	interface:EOEnterpriseObject
+snapshotForGlobalID	src/main/java/net/wotonomy/access/EODatabase.java	/^	public NSDictionary snapshotForGlobalID(EOGlobalID gid) {$/;"	m	class:EODatabase
+snapshotForGlobalID	src/main/java/net/wotonomy/access/EODatabase.java	/^	public NSDictionary snapshotForGlobalID(EOGlobalID gid, long l) {$/;"	m	class:EODatabase
+snapshotForGlobalID	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public NSDictionary snapshotForGlobalID(EOGlobalID gid) {$/;"	m	class:EODatabaseContext
+snapshotForSourceGlobalID	src/main/java/net/wotonomy/access/EODatabase.java	/^	public NSArray snapshotForSourceGlobalID(EOGlobalID gid, String name) {$/;"	m	class:EODatabase
+snapshotForSourceGlobalID	src/main/java/net/wotonomy/access/EODatabase.java	/^	public NSDictionary snapshotForSourceGlobalID(EOGlobalID gid, String s, long l) {$/;"	m	class:EODatabase
+snapshotForSourceGlobalID	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public NSArray snapshotForSourceGlobalID(EOGlobalID gid, String name) {$/;"	m	class:EODatabaseContext
+snapshots	src/main/java/net/wotonomy/access/EODatabase.java	/^	public NSDictionary snapshots() {$/;"	m	class:EODatabase
+snapshots	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	private Map snapshots;$/;"	f	class:AbstractObjectStore	file:
+sortArrayUsingKeyOrderArray	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^	public static void sortArrayUsingKeyOrderArray(List anObjectList, List aSortOrderingList) {$/;"	m	class:EOSortOrdering
+sortOrderingWithKey	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^	public static EOSortOrdering sortOrderingWithKey(String key, NSSelector selector) {$/;"	m	class:EOSortOrdering
+sortOrderings	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	private NSArray sortOrderings;$/;"	f	class:EOFetchSpecification	file:
+sortOrderings	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public NSArray sortOrderings() {$/;"	m	class:EOFetchSpecification
+sortedArrayUsingKeyOrderArray	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^	public static NSArray sortedArrayUsingKeyOrderArray(List anObjectList, List aSortOrderingList) /;"	m	class:EOSortOrdering
+source	src/main/java/net/wotonomy/control/PropertyDataSource.java	/^	protected Object source;$/;"	f	class:PropertyDataSource
+source	src/main/java/net/wotonomy/control/PropertyDataSource.java	/^	public Object source() {$/;"	m	class:PropertyDataSource
+sourceAttribute	src/main/java/net/wotonomy/access/EOJoin.java	/^	public EOAttribute sourceAttribute() {$/;"	m	class:EOJoin
+sourceGlobalID	src/main/java/net/wotonomy/access/EOAccessArrayFaultHandler.java	/^	public EOKeyGlobalID sourceGlobalID() {$/;"	m	class:EOAccessArrayFaultHandler
+sourceID	src/main/java/net/wotonomy/control/ArrayFault.java	/^	private EOGlobalID sourceID;$/;"	f	class:ArrayFault	file:
+sqlEscapeChar	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public char sqlEscapeChar() {$/;"	m	class:EOSQLExpression
+sqlPatternFromShellPattern	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String sqlPatternFromShellPattern(String pattern) {$/;"	m	class:EOSQLExpression
+sqlPatternFromShellPatternWithEscapeCharacter	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String sqlPatternFromShellPatternWithEscapeCharacter(String pattern, char escape) {$/;"	m	class:EOSQLExpression
+sqlStringForAttribute	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String sqlStringForAttribute(EOAttribute attr) {$/;"	m	class:EOSQLExpression
+sqlStringForAttributeNamed	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String sqlStringForAttributeNamed(String name) {$/;"	m	class:EOSQLExpression
+sqlStringForAttributePath	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String sqlStringForAttributePath(NSArray path) {$/;"	m	class:EOSQLExpression
+sqlStringForCaseInsensitiveLike	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String sqlStringForCaseInsensitiveLike(String key, String value) {$/;"	m	class:EOSQLExpression
+sqlStringForConjoinedQualifiers	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String sqlStringForConjoinedQualifiers(NSArray qualifiers) {$/;"	m	class:EOSQLExpression
+sqlStringForData	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String sqlStringForData(NSData data) {$/;"	m	class:EOSQLExpression
+sqlStringForDisjoinedQualifiers	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String sqlStringForDisjoinedQualifiers(NSArray qualifiers) {$/;"	m	class:EOSQLExpression
+sqlStringForKeyComparisonQualifier	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String sqlStringForKeyComparisonQualifier(EOKeyComparisonQualifier q) {$/;"	m	class:EOSQLExpression
+sqlStringForKeyValueQualifier	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String sqlStringForKeyValueQualifier(EOKeyValueQualifier q) {$/;"	m	class:EOSQLExpression
+sqlStringForNegatedQualifier	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String sqlStringForNegatedQualifier(EOQualifier q) {$/;"	m	class:EOSQLExpression
+sqlStringForNumber	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public static String sqlStringForNumber(Number number) {$/;"	m	class:EOSQLExpression
+sqlStringForQualifier	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String sqlStringForQualifier(EOQualifierSQLGeneration sql) {$/;"	m	class:EOSQLExpression
+sqlStringForSQLExpression	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^		public String sqlStringForSQLExpression(EOQualifier qualifier, EOSQLExpression exp) {$/;"	m	class:EOQualifierSQLGeneration.AndQualifierSupport
+sqlStringForSQLExpression	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^		public String sqlStringForSQLExpression(EOQualifier qualifier, EOSQLExpression exp) {$/;"	m	class:EOQualifierSQLGeneration.KeyComparisonQualifierSupport
+sqlStringForSQLExpression	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^		public String sqlStringForSQLExpression(EOQualifier qualifier, EOSQLExpression exp) {$/;"	m	class:EOQualifierSQLGeneration.KeyValueQualifierSupport
+sqlStringForSQLExpression	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^		public String sqlStringForSQLExpression(EOQualifier qualifier, EOSQLExpression exp) {$/;"	m	class:EOQualifierSQLGeneration.NotQualifierSupport
+sqlStringForSQLExpression	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^		public String sqlStringForSQLExpression(EOQualifier qualifier, EOSQLExpression exp) {$/;"	m	class:EOQualifierSQLGeneration.OrQualifierSupport
+sqlStringForSQLExpression	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^		public abstract String sqlStringForSQLExpression(EOQualifier q, EOSQLExpression exp);$/;"	m	class:EOQualifierSQLGeneration.Support
+sqlStringForSQLExpression	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^	public String sqlStringForSQLExpression(EOSQLExpression expression);$/;"	m	interface:EOQualifierSQLGeneration
+sqlStringForSchemaObjectName	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String sqlStringForSchemaObjectName(String name) {$/;"	m	class:EOSQLExpression
+sqlStringForSelector	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String sqlStringForSelector(NSSelector sel, Object value) {$/;"	m	class:EOSQLExpression
+sqlStringForString	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public static String sqlStringForString(String s) {$/;"	m	class:EOSQLExpression
+sqlStringForValue	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String sqlStringForValue(Object value, String keyPath) {$/;"	m	class:EOSQLExpression
+statement	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String statement() {$/;"	m	class:EOSQLExpression
+stopValidationAfterError	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private boolean stopValidationAfterError;$/;"	f	class:EOEditingContext	file:
+stopsValidationAfterFirstError	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public boolean stopsValidationAfterFirstError() {$/;"	m	class:EOEditingContext
+storedProcedure	src/main/java/net/wotonomy/access/EOAdaptorOperation.java	/^	public EOStoredProcedure storedProcedure() {$/;"	m	class:EOAdaptorOperation
+storedProcedureForOperation	src/main/java/net/wotonomy/access/EOEntity.java	/^	public EOStoredProcedure storedProcedureForOperation(String operation) {$/;"	m	class:EOEntity
+storedProcedureNamed	src/main/java/net/wotonomy/access/EOModel.java	/^	public EOStoredProcedure storedProcedureNamed(String name) {$/;"	m	class:EOModel
+storedProcedureNamed	src/main/java/net/wotonomy/access/EOModelGroup.java	/^	public EOStoredProcedure storedProcedureNamed(String name) {$/;"	m	class:EOModelGroup
+storedProcedureNames	src/main/java/net/wotonomy/access/EOModel.java	/^	public NSArray storedProcedureNames() {$/;"	m	class:EOModel
+storedProcedures	src/main/java/net/wotonomy/access/EOModel.java	/^	public NSArray storedProcedures() {$/;"	m	class:EOModel
+storedValueForKey	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public Object storedValueForKey(String aKey) {$/;"	m	class:EOCustomObject
+storedValueForKey	src/main/java/net/wotonomy/control/EOGenericRecord.java	/^	public Object storedValueForKey(String aKey) {$/;"	m	class:EOGenericRecord
+storedValueForKey	src/main/java/net/wotonomy/control/EOKeyValueCoding.java	/^	Object storedValueForKey(String aKey);$/;"	m	interface:EOKeyValueCoding
+storedValueForKey	src/main/java/net/wotonomy/control/EOKeyValueCodingSupport.java	/^	static public Object storedValueForKey(Object anObject, String aKey) {$/;"	m	class:EOKeyValueCodingSupport
+storedValuesForKeys	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^	static public NSDictionary storedValuesForKeys(Object anObject, List aKeyList) {$/;"	m	class:KeyValueCodingUtilities
+string	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		private String string;$/;"	f	class:EOEditingContext.CompoundKey	file:
+stringForOperatorSelector	src/main/java/net/wotonomy/control/EOQualifier.java	/^	public static String stringForOperatorSelector(NSSelector aSelector) {$/;"	m	class:EOQualifier
+subEntities	src/main/java/net/wotonomy/access/EOEntity.java	/^	public NSArray subEntities() {$/;"	m	class:EOEntity
+subList	src/main/java/net/wotonomy/control/ArrayFault.java	/^	public List subList(int fromIndex, int toIndex) {$/;"	m	class:ArrayFault
+subjectChanged	src/main/java/net/wotonomy/control/EODelayedObserver.java	/^	public abstract void subjectChanged();$/;"	m	class:EODelayedObserver
+subjectChanged	src/main/java/net/wotonomy/control/EOObserverProxy.java	/^	public void subjectChanged() {$/;"	m	class:EOObserverProxy
+supportForClass	src/main/java/net/wotonomy/access/EOQualifierSQLGeneration.java	/^		public static Support supportForClass(Class aClass) {$/;"	m	class:EOQualifierSQLGeneration.Support
+suppressObserverNotification	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^	public static void suppressObserverNotification() {$/;"	m	class:EOObserverCenter
+suppressions	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^	private static int suppressions = 0;$/;"	f	class:EOObserverCenter	file:
+tableListWithRootEntity	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String tableListWithRootEntity(EOEntity root) {$/;"	m	class:EOSQLExpression
+takeSnapshot	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private byte[] takeSnapshot(Object anObject) { \/\/ System.out.println( "takeSnapshot: " + anOb/;"	m	class:EOEditingContext	file:
+takeStoredValueForKey	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public void takeStoredValueForKey(Object aValue, String aKey) {$/;"	m	class:EOCustomObject
+takeStoredValueForKey	src/main/java/net/wotonomy/control/EOGenericRecord.java	/^	public void takeStoredValueForKey(Object aValue, String aKey) {$/;"	m	class:EOGenericRecord
+takeStoredValueForKey	src/main/java/net/wotonomy/control/EOKeyValueCoding.java	/^	void takeStoredValueForKey(Object aValue, String aKey);$/;"	m	interface:EOKeyValueCoding
+takeStoredValueForKey	src/main/java/net/wotonomy/control/EOKeyValueCodingSupport.java	/^	static public void takeStoredValueForKey(Object anObject, Object aValue, String aKey) {$/;"	m	class:EOKeyValueCodingSupport
+takeStoredValuesFromDictionary	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^	static private void takeStoredValuesFromDictionary(Object anObject, Map aMap, boolean isStored)/;"	m	class:KeyValueCodingUtilities	file:
+takeStoredValuesFromDictionary	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^	static public void takeStoredValuesFromDictionary(Object anObject, Map aMap) {$/;"	m	class:KeyValueCodingUtilities
+takeValueForKey	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public void takeValueForKey(Object aValue, String aKey) {$/;"	m	class:EOCustomObject
+takeValueForKey	src/main/java/net/wotonomy/control/EOGenericRecord.java	/^	public void takeValueForKey(Object aValue, String aKey) {$/;"	m	class:EOGenericRecord
+takeValueForKey	src/main/java/net/wotonomy/control/EOKeyValueCoding.java	/^	void takeValueForKey(Object aValue, String aKey);$/;"	m	interface:EOKeyValueCoding
+takeValueForKey	src/main/java/net/wotonomy/control/EOKeyValueCodingSupport.java	/^	static public void takeValueForKey(Object anObject, Object aValue, String aKey) {$/;"	m	class:EOKeyValueCodingSupport
+takeValueForKeyPath	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public void takeValueForKeyPath(Object aValue, String aKeyPath) {$/;"	m	class:EOCustomObject
+takeValuesFromDictionary	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public void takeValuesFromDictionary(Map aMap) {$/;"	m	class:EOCustomObject
+takeValuesFromDictionary	src/main/java/net/wotonomy/control/EOKeyValueCodingAdditions.java	/^		public static void takeValuesFromDictionary(Object object, Map<String, Object> dictionary) {$/;"	m	class:EOKeyValueCodingAdditions.Utility
+takeValuesFromDictionary	src/main/java/net/wotonomy/control/EOKeyValueCodingAdditions.java	/^		public static void takeValuesFromDictionary(Object object, NSDictionary<String, Object> dictio/;"	m	class:EOKeyValueCodingAdditions.DefaultImplementation
+takeValuesFromDictionary	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^	static public void takeValuesFromDictionary(Object anObject, Map aMap) {$/;"	m	class:KeyValueCodingUtilities
+takeValuesFromDictionaryWithMapping	src/main/java/net/wotonomy/control/EOKeyValueCodingAdditions.java	/^		public static void takeValuesFromDictionaryWithMapping(Object object, NSDictionary<String, Obj/;"	m	class:EOKeyValueCodingAdditions.DefaultImplementation
+target	src/main/java/net/wotonomy/control/EOObserverProxy.java	/^	protected Object target;$/;"	f	class:EOObserverProxy
+targetClass	src/main/java/net/wotonomy/control/EOFaultHandler.java	/^	public Class targetClass() {$/;"	m	class:EOFaultHandler
+testAddAttribute	src/test/java/net/wotonomy/access/EOEntityTest.java	/^	public void testAddAttribute() {$/;"	m	class:EOEntityTest
+thaw	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^	static public Object thaw(byte[] aByteArray, EOEditingContext aContext, ClassLoader aLoader, bo/;"	m	class:KeyValueCodingUtilities
+thaw	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^	static public Object thaw(byte[] aByteArray, EOEditingContext aContext, boolean transpose) {$/;"	m	class:KeyValueCodingUtilities
+theClass	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	protected Class<?> theClass;$/;"	f	class:EOClassDescription
+timestampForData	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	abstract protected Comparable timestampForData(Map aDataMap);$/;"	m	class:AbstractObjectStore
+timestampForGlobalID	src/main/java/net/wotonomy/access/EODatabase.java	/^	public long timestampForGlobalID(EOGlobalID gid) {$/;"	m	class:EODatabase
+timestampForSourceGlobalID	src/main/java/net/wotonomy/access/EODatabase.java	/^	public long timestampForSourceGlobalID(EOGlobalID gid, String s) {$/;"	m	class:EODatabase
+toArray	src/main/java/net/wotonomy/control/ArrayFault.java	/^	public Object[] toArray() {$/;"	m	class:ArrayFault
+toArray	src/main/java/net/wotonomy/control/ArrayFault.java	/^	public Object[] toArray(Object[] a) {$/;"	m	class:ArrayFault
+toManyRelationshipKeys	src/main/java/net/wotonomy/access/EOEntityClassDescription.java	/^	public NSArray toManyRelationshipKeys() {$/;"	m	class:EOEntityClassDescription
+toManyRelationshipKeys	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public NSArray toManyRelationshipKeys() {$/;"	m	class:EOClassDescription
+toManyRelationshipKeys	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public NSArray toManyRelationshipKeys() {$/;"	m	class:EOCustomObject
+toManyRelationshipKeys	src/main/java/net/wotonomy/control/EOEnterpriseObject.java	/^	NSArray toManyRelationshipKeys();$/;"	m	interface:EOEnterpriseObject
+toOneRelationshipKeys	src/main/java/net/wotonomy/access/EOEntityClassDescription.java	/^	public NSArray toOneRelationshipKeys() {$/;"	m	class:EOEntityClassDescription
+toOneRelationshipKeys	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public NSArray toOneRelationshipKeys() {$/;"	m	class:EOClassDescription
+toOneRelationshipKeys	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public NSArray toOneRelationshipKeys() {$/;"	m	class:EOCustomObject
+toOneRelationshipKeys	src/main/java/net/wotonomy/control/EOEnterpriseObject.java	/^	NSArray toOneRelationshipKeys();$/;"	m	interface:EOEnterpriseObject
+toString	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String toString() {$/;"	m	class:EOSQLExpression
+toString	src/main/java/net/wotonomy/control/ArrayFault.java	/^	public String toString() {$/;"	m	class:ArrayFault
+toString	src/main/java/net/wotonomy/control/EOAndQualifier.java	/^	public String toString() {$/;"	m	class:EOAndQualifier
+toString	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		public String toString() {$/;"	m	class:EOEditingContext.CompoundKey
+toString	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public String toString() {$/;"	m	class:EOEditingContext
+toString	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public String toString() {$/;"	m	class:EOFetchSpecification
+toString	src/main/java/net/wotonomy/control/EOKeyValueQualifier.java	/^	public String toString() {$/;"	m	class:EOKeyValueQualifier
+toString	src/main/java/net/wotonomy/control/EONotQualifier.java	/^	public String toString() {$/;"	m	class:EONotQualifier
+toString	src/main/java/net/wotonomy/control/EONullValue.java	/^	public String toString() {$/;"	m	class:EONullValue
+toString	src/main/java/net/wotonomy/control/EOOrQualifier.java	/^	public String toString() {$/;"	m	class:EOOrQualifier
+toString	src/main/java/net/wotonomy/control/EOQualifier.java	/^		public String toString() {$/;"	m	class:EOQualifier.OperatorCaseInsensitiveLike
+toString	src/main/java/net/wotonomy/control/EOQualifier.java	/^		public String toString() {$/;"	m	class:EOQualifier.OperatorContains
+toString	src/main/java/net/wotonomy/control/EOQualifier.java	/^		public String toString() {$/;"	m	class:EOQualifier.OperatorEqual
+toString	src/main/java/net/wotonomy/control/EOQualifier.java	/^		public String toString() {$/;"	m	class:EOQualifier.OperatorGreaterThan
+toString	src/main/java/net/wotonomy/control/EOQualifier.java	/^		public String toString() {$/;"	m	class:EOQualifier.OperatorGreaterThanOrEqualTo
+toString	src/main/java/net/wotonomy/control/EOQualifier.java	/^		public String toString() {$/;"	m	class:EOQualifier.OperatorLessThan
+toString	src/main/java/net/wotonomy/control/EOQualifier.java	/^		public String toString() {$/;"	m	class:EOQualifier.OperatorLessThanOrEqualTo
+toString	src/main/java/net/wotonomy/control/EOQualifier.java	/^		public String toString() {$/;"	m	class:EOQualifier.OperatorLike
+toString	src/main/java/net/wotonomy/control/EOQualifier.java	/^		public String toString() {$/;"	m	class:EOQualifier.OperatorNotEqual
+toString	src/main/java/net/wotonomy/control/EOQualifier.java	/^	public String toString() {$/;"	m	class:EOQualifier
+toString	src/main/java/net/wotonomy/control/EOSortOrdering.java	/^	public String toString() {$/;"	m	class:EOSortOrdering
+toString	src/main/java/net/wotonomy/control/EOTemporaryGlobalID.java	/^	public String toString() {$/;"	m	class:EOTemporaryGlobalID
+toString	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^		public String toString() {$/;"	m	class:KeyValueCodingUtilities.GlobalIDMarker
+transactionDidBegin	src/main/java/net/wotonomy/access/EOAdaptorContext.java	/^	public void transactionDidBegin() {$/;"	m	class:EOAdaptorContext
+transactionDidCommit	src/main/java/net/wotonomy/access/EOAdaptorContext.java	/^	public void transactionDidCommit() {$/;"	m	class:EOAdaptorContext
+transactionDidRollback	src/main/java/net/wotonomy/access/EOAdaptorContext.java	/^	public void transactionDidRollback() {$/;"	m	class:EOAdaptorContext
+turnIntoFault	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public void turnIntoFault(EOFaultHandler aFaultHandler) {$/;"	m	class:EOCustomObject
+turnIntoFault	src/main/java/net/wotonomy/control/EOFaulting.java	/^	void turnIntoFault(EOFaultHandler aFaultHandler);$/;"	m	interface:EOFaulting
+unableToSetNullForKey	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public void unableToSetNullForKey(String aKey) {$/;"	m	class:EOCustomObject
+unableToSetNullForKey	src/main/java/net/wotonomy/control/EOKeyValueCoding.java	/^	void unableToSetNullForKey(String aKey);$/;"	m	interface:EOKeyValueCoding
+unableToSetNullForKey	src/main/java/net/wotonomy/control/EOKeyValueCodingSupport.java	/^	static public void unableToSetNullForKey(Object anObject, String aKey) {$/;"	m	class:EOKeyValueCodingSupport
+undo	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public void undo() {$/;"	m	class:EOEditingContext
+unlock	src/main/java/net/wotonomy/access/EOAccessLock.java	/^	public static void unlock() {$/;"	m	class:EOAccessLock
+unlock	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public void unlock() {$/;"	m	class:EODatabaseContext
+unlock	src/main/java/net/wotonomy/control/EOCooperatingObjectStore.java	/^	public abstract void unlock();$/;"	m	class:EOCooperatingObjectStore
+unregisterChannel	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public void unregisterChannel(EODatabaseChannel channel) {$/;"	m	class:EODatabaseContext
+unregisterContext	src/main/java/net/wotonomy/access/EODatabase.java	/^	public void unregisterContext(EODatabaseContext context) {$/;"	m	class:EODatabase
+update	src/main/java/net/wotonomy/control/EODelayedObserver.java	/^	public void update(Observable anObject, Object aValue) {$/;"	m	class:EODelayedObserver
+update	src/main/java/net/wotonomy/control/EOObserverCenter.java	/^	public void update(Observable o, Object arg) {$/;"	m	class:EOObserverCenter
+updateFromSnapshot	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public void updateFromSnapshot(NSDictionary aSnapshot) {$/;"	m	class:EOCustomObject
+updateFromSnapshot	src/main/java/net/wotonomy/control/EOEnterpriseObject.java	/^	void updateFromSnapshot(NSDictionary aSnapshot);$/;"	m	interface:EOEnterpriseObject
+updateObject	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	abstract protected Object updateObject(EOGlobalID aGlobalID, Map aDataMap);$/;"	m	class:AbstractObjectStore
+updateStatementForRow	src/main/java/net/wotonomy/access/EOSQLExpressionFactory.java	/^	public EOSQLExpression updateStatementForRow(NSDictionary row, EOQualifier qualifier, EOEntity /;"	m	class:EOSQLExpressionFactory
+updateStrategy	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public int updateStrategy() {$/;"	m	class:EODatabaseContext
+updateValuesInRowDescribedByQualifier	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	public void updateValuesInRowDescribedByQualifier(NSDictionary row, EOQualifier q, EOEntity ent/;"	m	class:EOAdaptorChannel
+updateValuesInRowsDescribedByQualifier	src/main/java/net/wotonomy/access/EOAdaptorChannel.java	/^	public abstract int updateValuesInRowsDescribedByQualifier(NSDictionary row, EOQualifier q, EOE/;"	m	class:EOAdaptorChannel
+updatedIDsBuffer	src/main/java/net/wotonomy/control/AbstractObjectStore.java	/^	private NSMutableArray updatedIDsBuffer;$/;"	f	class:AbstractObjectStore	file:
+updatedObjects	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private NSMutableArray<Object> updatedObjects;$/;"	f	class:EOEditingContext	file:
+updatedObjects	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	public NSArray updatedObjects() {$/;"	m	class:EOEditingContext
+updatedObjectsBuffer	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private NSMutableArray<Object> updatedObjectsBuffer;$/;"	f	class:EOEditingContext	file:
+updatedObjectsProxy	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private NSArray<Object> updatedObjectsProxy;$/;"	f	class:EOEditingContext	file:
+useAliases	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public boolean useAliases() {$/;"	m	class:EOSQLExpression
+useBindVariables	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public boolean useBindVariables() {$/;"	m	class:EOSQLExpression
+useQuotedExternalNames	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public static boolean useQuotedExternalNames() {$/;"	m	class:EOSQLExpression
+userInfo	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public NSDictionary userInfo() {$/;"	m	class:EOAttribute
+userInfo	src/main/java/net/wotonomy/access/EOEntity.java	/^	public NSDictionary userInfo() {$/;"	m	class:EOEntity
+userInfo	src/main/java/net/wotonomy/access/EOGeneralAdaptorException.java	/^	public NSDictionary userInfo() {$/;"	m	class:EOGeneralAdaptorException
+userInfo	src/main/java/net/wotonomy/access/EOModel.java	/^	public NSDictionary userInfo() {$/;"	m	class:EOModel
+userInfo	src/main/java/net/wotonomy/access/EORelationship.java	/^	public NSDictionary userInfo() {$/;"	m	class:EORelationship
+userInfo	src/main/java/net/wotonomy/access/EOStoredProcedure.java	/^	public NSDictionary userInfo() {$/;"	m	class:EOStoredProcedure
+userInfo	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public NSDictionary userInfo() {$/;"	m	class:EOObjectStoreCoordinator
+userPresentableDescription	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public String userPresentableDescription() {$/;"	m	class:EOCustomObject
+userPresentableDescription	src/main/java/net/wotonomy/control/EOEnterpriseObject.java	/^	String userPresentableDescription();$/;"	m	interface:EOEnterpriseObject
+userPresentableDescriptionForObject	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public String userPresentableDescriptionForObject(Object anObject) {$/;"	m	class:EOClassDescription
+usesDeferredFaultCreation	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public static boolean usesDeferredFaultCreation() {$/;"	m	class:EOCustomObject
+usesDeferredFaultCreation	src/main/java/net/wotonomy/control/EOGenericRecord.java	/^	public static boolean usesDeferredFaultCreation() {$/;"	m	class:EOGenericRecord
+usesDistinct	src/main/java/net/wotonomy/control/EOFetchSpecification.java	/^	public boolean usesDistinct() {$/;"	m	class:EOFetchSpecification
+validateForDelete	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public void validateForDelete() {$/;"	m	class:EOCustomObject
+validateForDelete	src/main/java/net/wotonomy/control/EOValidation.java	/^	void validateForDelete();$/;"	m	interface:EOValidation
+validateForInsert	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public void validateForInsert() {$/;"	m	class:EOCustomObject
+validateForInsert	src/main/java/net/wotonomy/control/EOValidation.java	/^	void validateForInsert();$/;"	m	interface:EOValidation
+validateForSave	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public void validateForSave() {$/;"	m	class:EOCustomObject
+validateForSave	src/main/java/net/wotonomy/control/EOValidation.java	/^	void validateForSave();$/;"	m	interface:EOValidation
+validateForUpdate	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public void validateForUpdate() {$/;"	m	class:EOCustomObject
+validateForUpdate	src/main/java/net/wotonomy/control/EOValidation.java	/^	void validateForUpdate();$/;"	m	interface:EOValidation
+validateKeysWithRootClassDescription	src/main/java/net/wotonomy/control/EOQualifier.java	/^	public Throwable validateKeysWithRootClassDescription(Class aClass) {$/;"	m	class:EOQualifier
+validateObjectForDelete	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public void validateObjectForDelete(Object object) {$/;"	m	class:EOClassDescription
+validateObjectForSave	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public void validateObjectForSave(Object object) {$/;"	m	class:EOClassDescription
+validateValueForKey	src/main/java/net/wotonomy/control/EOClassDescription.java	/^	public Object validateValueForKey(Object value, String key) {$/;"	m	class:EOClassDescription
+value	src/main/java/net/wotonomy/control/EOKeyValueQualifier.java	/^	private Object value;$/;"	f	class:EOKeyValueQualifier	file:
+value	src/main/java/net/wotonomy/control/EOKeyValueQualifier.java	/^	public Object value() {$/;"	m	class:EOKeyValueQualifier
+valueClassName	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public String valueClassName() {$/;"	m	class:EOAttribute
+valueForKey	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public Object valueForKey(String aKey) {$/;"	m	class:EOCustomObject
+valueForKey	src/main/java/net/wotonomy/control/EOGenericRecord.java	/^	public Object valueForKey(String aKey) {$/;"	m	class:EOGenericRecord
+valueForKey	src/main/java/net/wotonomy/control/EOKeyValueCoding.java	/^	Object valueForKey(String aKey);$/;"	m	interface:EOKeyValueCoding
+valueForKey	src/main/java/net/wotonomy/control/EOKeyValueCodingSupport.java	/^	static public Object valueForKey(Object anObject, String aKey) {$/;"	m	class:EOKeyValueCodingSupport
+valueForKeyPath	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public Object valueForKeyPath(String aKeyPath) {$/;"	m	class:EOCustomObject
+valueList	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String valueList() {$/;"	m	class:EOSQLExpression
+valueType	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public String valueType() {$/;"	m	class:EOAttribute
+valuesForKeys	src/main/java/net/wotonomy/access/EODatabaseContext.java	/^	public NSDictionary valuesForKeys(NSArray keys, EOEnterpriseObject eo) {$/;"	m	class:EODatabaseContext
+valuesForKeys	src/main/java/net/wotonomy/control/EOCooperatingObjectStore.java	/^	public abstract NSDictionary valuesForKeys(NSArray nsarray, EOEnterpriseObject eoenterpriseobje/;"	m	class:EOCooperatingObjectStore
+valuesForKeys	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public NSDictionary valuesForKeys(List aKeyList) {$/;"	m	class:EOCustomObject
+valuesForKeys	src/main/java/net/wotonomy/control/EOKeyValueCodingAdditions.java	/^		public static NSDictionary<String, Object> valuesForKeys(Object object, List<String> keys) {$/;"	m	class:EOKeyValueCodingAdditions.DefaultImplementation
+valuesForKeys	src/main/java/net/wotonomy/control/EOKeyValueCodingAdditions.java	/^		public static NSDictionary<String, Object> valuesForKeys(Object object, List<String> keys) {$/;"	m	class:EOKeyValueCodingAdditions.Utility
+valuesForKeys	src/main/java/net/wotonomy/control/EOObjectStoreCoordinator.java	/^	public NSDictionary valuesForKeys(NSArray nsarray, EOEnterpriseObject eoenterpriseobject) {$/;"	m	class:EOObjectStoreCoordinator
+valuesForKeys	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^	static private NSDictionary valuesForKeys(Object anObject, List aKeyList, boolean isStored) {$/;"	m	class:KeyValueCodingUtilities	file:
+valuesForKeys	src/main/java/net/wotonomy/control/KeyValueCodingUtilities.java	/^	static public NSDictionary valuesForKeys(Object anObject, List aKeyList) {$/;"	m	class:KeyValueCodingUtilities
+valuesForKeysWithMapping	src/main/java/net/wotonomy/control/EOKeyValueCodingAdditions.java	/^		public static NSDictionary<String, Object> valuesForKeysWithMapping(Object object, Map<String,/;"	m	class:EOKeyValueCodingAdditions.DefaultImplementation
+weakComparisonKey	src/main/java/net/wotonomy/control/EOEditingContext.java	/^		private WeakReferenceKey weakComparisonKey; \/\/ FIXME not thread safe!$/;"	f	class:EOEditingContext.WeakRegistrar	file:
+whereClauseString	src/main/java/net/wotonomy/access/EOSQLExpression.java	/^	public String whereClauseString() {$/;"	m	class:EOSQLExpression
+width	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public int width() {$/;"	m	class:EOAttribute
+willChange	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public void willChange() {$/;"	m	class:EOCustomObject
+willChange	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private void willChange() {$/;"	m	class:EOEditingContext	file:
+willChange	src/main/java/net/wotonomy/control/EOEnterpriseObject.java	/^	void willChange();$/;"	m	interface:EOEnterpriseObject
+willRead	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public void willRead() {$/;"	m	class:EOCustomObject
+willRead	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public void willRead(String aKey) {$/;"	m	class:EOCustomObject
+willRead	src/main/java/net/wotonomy/control/EOFaulting.java	/^	void willRead();$/;"	m	interface:EOFaulting
+willRead	src/main/java/net/wotonomy/control/EOFaulting.java	/^	void willRead(String aKey);$/;"	m	interface:EOFaulting
+willReadRelationship	src/main/java/net/wotonomy/control/EOCustomObject.java	/^	public Object willReadRelationship(Object anObject) {$/;"	m	class:EOCustomObject
+willReadRelationship	src/main/java/net/wotonomy/control/EODeferredFaulting.java	/^	Object willReadRelationship(Object anObject);$/;"	m	interface:EODeferredFaulting
+willRunLater	src/main/java/net/wotonomy/control/EODelayedObserverQueue.java	/^	private boolean willRunLater;$/;"	f	class:EODelayedObserverQueue	file:
+willRunLater	src/main/java/net/wotonomy/control/EOEditingContext.java	/^	private boolean willRunLater;$/;"	f	class:EOEditingContext	file:
+write	src/main/java/net/wotonomy/access/EOModel.java	/^	public void write() {$/;"	m	class:EOModel
+writeAsList	src/main/java/net/wotonomy/control/PropertyDataSource.java	/^	protected void writeAsList(List anObjectList) {$/;"	m	class:PropertyDataSource
+writeFormat	src/main/java/net/wotonomy/access/EOAttribute.java	/^	public String writeFormat() {$/;"	m	class:EOAttribute
+writeToFile	src/main/java/net/wotonomy/access/EOModel.java	/^	public void writeToFile(String path) {$/;"	m	class:EOModel
diff --git a/projects/net.wotonomy.test/pom.xml b/projects/net.wotonomy.test/pom.xml
index 90ddbdf..93e9757 100644
--- a/projects/net.wotonomy.test/pom.xml
+++ b/projects/net.wotonomy.test/pom.xml
@@ -32,6 +32,19 @@
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
+	
+		<properties>
+		<maven.compiler.release>11</maven.compiler.release>
+	</properties>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.13.0</version>
+			</plugin>
+		</plugins>
+	</build>
 	<reporting>
 		<plugins>
 			<plugin>
diff --git a/projects/net.wotonomy.test/src/main/java/net/wotonomy/test/DataObjectStore.java b/projects/net.wotonomy.test/src/main/java/net/wotonomy/test/DataObjectStore.java
index ac5ee44..a65e2d5 100644
--- a/projects/net.wotonomy.test/src/main/java/net/wotonomy/test/DataObjectStore.java
+++ b/projects/net.wotonomy.test/src/main/java/net/wotonomy/test/DataObjectStore.java
@@ -39,6 +39,7 @@ public class DataObjectStore extends EOObjectStore {
 	/**
 	 * This implementation returns an appropriately configured array fault.
 	 */
+	@Override
 	public NSArray arrayFaultWithSourceGlobalID(EOGlobalID aGlobalID, String aRelationship, EOEditingContext aContext) {
 		return new ArrayFault(aGlobalID, aRelationship, aContext);
 	}
@@ -46,6 +47,7 @@ public class DataObjectStore extends EOObjectStore {
 	/**
 	 * This implementation returns the actual object for the specified id.
 	 */
+	@Override
 	public Object faultForGlobalID(EOGlobalID aGlobalID, EOEditingContext aContext) {
 		System.out.println("DataObjectStore.faultForGlobalID: * reading object * : " + aGlobalID);
 		Object result = soup.getObjectByKey(((DataKeyID) aGlobalID).getKey());
@@ -66,6 +68,7 @@ public class DataObjectStore extends EOObjectStore {
 	 * values from the specified dictionary. The fault should belong to the
 	 * specified editing context.
 	 */
+	@Override
 	public Object faultForRawRow(Map aDictionary, String anEntityName, EOEditingContext aContext) {
 		// TODO: faults are not yet supported
 		throw new WotonomyException("Faults are not yet supported.");
@@ -76,6 +79,7 @@ public class DataObjectStore extends EOObjectStore {
 	 * values appropriate for the specified id. The object should belong to the
 	 * specified editing context. This method is called to populate faults.
 	 */
+	@Override
 	public void initializeObject(Object anObject, EOGlobalID aGlobalID, EOEditingContext aContext) {
 		if (aGlobalID.isTemporary()) {
 			// TODO: this should never happen, but it does now until we get
@@ -100,6 +104,7 @@ public class DataObjectStore extends EOObjectStore {
 	 * Remove all values from all objects in memory, turning them into faults, and
 	 * posts a notification that all objects have been invalidated.
 	 */
+	@Override
 	public void invalidateAllObjects() {
 		// does nothing except post notification
 
@@ -111,6 +116,7 @@ public class DataObjectStore extends EOObjectStore {
 	 * Removes values with the specified ids from memory, turning them into faults,
 	 * and posts a notification that those objects have been invalidated.
 	 */
+	@Override
 	public void invalidateObjectsWithGlobalIDs(List aList) {
 		// does nothing
 	}
@@ -118,6 +124,7 @@ public class DataObjectStore extends EOObjectStore {
 	/**
 	 * Returns false because locking is not permitted.
 	 */
+	@Override
 	public boolean isObjectLockedWithGlobalID(EOGlobalID aGlobalID, EOEditingContext aContext) {
 		return false;
 	}
@@ -125,6 +132,7 @@ public class DataObjectStore extends EOObjectStore {
 	/**
 	 * Does nothing because locking is not permitted.
 	 */
+	@Override
 	public void lockObjectWithGlobalID(EOGlobalID aGlobalID, EOEditingContext aContext) {
 		// does nothing
 	}
@@ -137,6 +145,7 @@ public class DataObjectStore extends EOObjectStore {
 	 * key must produce a result of type Collection for the source object or an
 	 * exception is thrown.
 	 */
+	@Override
 	public NSArray objectsForSourceGlobalID(EOGlobalID aGlobalID, String aRelationship, EOEditingContext aContext) {
 		System.out.println("DataObjectStore.objectsForSourceGlobalID: * reading object * : " + aGlobalID);
 		Object object = soup.getObjectByKey(((DataKeyID) aGlobalID).getKey());
@@ -176,6 +185,7 @@ public class DataObjectStore extends EOObjectStore {
 	 * If any object is already registered in the specified context, it is not
 	 * refetched and that object should be used in the array.
 	 */
+	@Override
 	public NSArray objectsWithFetchSpecification(EOFetchSpecification aFetchSpec, EOEditingContext aContext) {
 		// TODO: fetch specs are not yet supported
 
@@ -202,6 +212,7 @@ public class DataObjectStore extends EOObjectStore {
 	 * Removes all values from the specified object, converting it into a fault for
 	 * the specified id. New or deleted objects should not be refaulted.
 	 */
+	@Override
 	public void refaultObject(Object anObject, EOGlobalID aGlobalID, EOEditingContext aContext) {
 		// TODO: faults are not yet supported
 		// just re-initialize the object
@@ -211,6 +222,7 @@ public class DataObjectStore extends EOObjectStore {
 	/**
 	 * Writes all changes in the specified editing context to the respository.
 	 */
+	@Override
 	public void saveChangesInEditingContext(EOEditingContext aContext) {
 		Object o;
 		DataKeyID id;
diff --git a/projects/net.wotonomy.test/src/main/java/net/wotonomy/test/Test.java b/projects/net.wotonomy.test/src/main/java/net/wotonomy/test/Test.java
index 5b4533d..d262aad 100644
--- a/projects/net.wotonomy.test/src/main/java/net/wotonomy/test/Test.java
+++ b/projects/net.wotonomy.test/src/main/java/net/wotonomy/test/Test.java
@@ -1,8 +1,6 @@
 package net.wotonomy.test;
 
 import java.awt.BorderLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
@@ -31,7 +29,7 @@ public class Test {
 		// system l&f
 		try {
 //           UIManager.setLookAndFeel("com.sun.java.swing.plaf.motif.MotifLookAndFeel");
-			UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
+//			UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
 //           UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 //            UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());
 		} catch (Exception e) {
@@ -66,11 +64,7 @@ public class Test {
 		menu.add("New");
 		menuItem = new JMenuItem("Save");
 		menuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, KeyEvent.CTRL_MASK));
-		menuItem.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent evt) {
-				controller.displayGroup.dataSource().editingContext().saveChanges();
-			}
-		});
+		menuItem.addActionListener(evt -> controller.displayGroup.dataSource().editingContext().saveChanges());
 
 		menu.add(menuItem);
 		menu.add("Close");
@@ -84,12 +78,16 @@ public class Test {
 
 		frame.getContentPane().add(testPanel, BorderLayout.CENTER);
 		frame.setTitle("Test Frame");
-		frame.setBounds(50, 50, 750, 500);
-		frame.show(); // comment out this to avoid memory leak from jdk1.2.2 bug
+		
+		frame.pack();
+		frame.setSize(640, 480);
+		
+		frame.setVisible(true); // comment out this to avoid memory leak from jdk1.2.2 bug
 
 		// add WindowListener for frame
 		frame.addWindowListener(new WindowAdapter() {
 			// exit on close
+			@Override
 			public void windowClosing(WindowEvent e) {
 				System.exit(0);
 			}
diff --git a/projects/net.wotonomy.test/src/main/java/net/wotonomy/test/TestController.java b/projects/net.wotonomy.test/src/main/java/net/wotonomy/test/TestController.java
index 83fe97c..c91739c 100644
--- a/projects/net.wotonomy.test/src/main/java/net/wotonomy/test/TestController.java
+++ b/projects/net.wotonomy.test/src/main/java/net/wotonomy/test/TestController.java
@@ -73,8 +73,10 @@ public class TestController implements ActionListener {
 		column = new TableColumn();
 		column.setHeaderValue("First");
 		IconCellRenderer iconRenderer = new IconCellRenderer() {
+			private static final long serialVersionUID = 6287856165157518684L;
 			private Icon icon = UIManager.getIcon("FileChooser.homeFolderIcon");
 
+			@Override
 			public Icon getIconForContext(JComponent container, Object value, int row, int col, boolean isSelected,
 					boolean hasFocus, boolean isExpanded, boolean isLeaf) {
 				return icon;
diff --git a/projects/net.wotonomy.test/src/main/java/net/wotonomy/test/TestObjectStore.java b/projects/net.wotonomy.test/src/main/java/net/wotonomy/test/TestObjectStore.java
index 316fcf7..cbd16fa 100644
--- a/projects/net.wotonomy.test/src/main/java/net/wotonomy/test/TestObjectStore.java
+++ b/projects/net.wotonomy.test/src/main/java/net/wotonomy/test/TestObjectStore.java
@@ -34,6 +34,7 @@ public class TestObjectStore extends EOObjectStore {
 	/**
 	 * This implementation simply returns objectsWithSourceGlobalID.
 	 */
+	@Override
 	public NSArray arrayFaultWithSourceGlobalID(EOGlobalID aGlobalID, String aRelationship, EOEditingContext aContext) {
 		return objectsForSourceGlobalID(aGlobalID, aRelationship, aContext);
 	}
@@ -41,6 +42,7 @@ public class TestObjectStore extends EOObjectStore {
 	/**
 	 * This implementation returns the actual object for the specified id.
 	 */
+	@Override
 	public Object faultForGlobalID(EOGlobalID aGlobalID, EOEditingContext aContext) {
 		System.out.println("TestObjectStore: * reading object * : " + aGlobalID);
 		return soup.getObjectByKey(((DataKeyID) aGlobalID).getKey());
@@ -51,6 +53,7 @@ public class TestObjectStore extends EOObjectStore {
 	 * values from the specified dictionary. The fault should belong to the
 	 * specified editing context.
 	 */
+	@Override
 	public Object faultForRawRow(Map aDictionary, String anEntityName, EOEditingContext aContext) {
 		// TODO: faults are not yet supported
 		throw new WotonomyException("Faults are not yet supported.");
@@ -61,6 +64,7 @@ public class TestObjectStore extends EOObjectStore {
 	 * values appropriate for the specified id. The object should belong to the
 	 * specified editing context. This method is called to populate faults.
 	 */
+	@Override
 	public void initializeObject(Object anObject, EOGlobalID aGlobalID, EOEditingContext aContext) {
 		System.out.println("TestObjectStore: * reading object * : " + aGlobalID);
 		Object original = soup.getObjectByKey(((DataKeyID) aGlobalID).getKey());
@@ -73,6 +77,7 @@ public class TestObjectStore extends EOObjectStore {
 	 * Remove all values from all objects in memory, turning them into faults, and
 	 * posts a notification that all objects have been invalidated.
 	 */
+	@Override
 	public void invalidateAllObjects() {
 		// does nothing
 	}
@@ -81,6 +86,7 @@ public class TestObjectStore extends EOObjectStore {
 	 * Removes values with the specified ids from memory, turning them into faults,
 	 * and posts a notification that those objects have been invalidated.
 	 */
+	@Override
 	public void invalidateObjectsWithGlobalIDs(List aList) {
 		// does nothing
 	}
@@ -88,6 +94,7 @@ public class TestObjectStore extends EOObjectStore {
 	/**
 	 * Returns false because locking is not permitted.
 	 */
+	@Override
 	public boolean isObjectLockedWithGlobalID(EOGlobalID aGlobalID, EOEditingContext aContext) {
 		return false;
 	}
@@ -95,6 +102,7 @@ public class TestObjectStore extends EOObjectStore {
 	/**
 	 * Does nothing because locking is not permitted.
 	 */
+	@Override
 	public void lockObjectWithGlobalID(EOGlobalID aGlobalID, EOEditingContext aContext) {
 		// does nothing
 	}
@@ -104,6 +112,7 @@ public class TestObjectStore extends EOObjectStore {
 	 * for the specified property relationship. Faults are not allowed in the array.
 	 * All objects should belong to the specified editing context.
 	 */
+	@Override
 	public NSArray objectsForSourceGlobalID(EOGlobalID aGlobalID, String aRelationship, EOEditingContext aContext) {
 		// TODO: relationships are not yet supported
 		throw new WotonomyException("Relationships are not yet supported.");
@@ -116,6 +125,7 @@ public class TestObjectStore extends EOObjectStore {
 	 * the specified context, it is not refetched and that object should be used in
 	 * the array.
 	 */
+	@Override
 	public NSArray objectsWithFetchSpecification(EOFetchSpecification aFetchSpec, EOEditingContext aContext) {
 		// TODO: fetch specs are not yet supported
 
@@ -144,6 +154,7 @@ public class TestObjectStore extends EOObjectStore {
 	 * Removes all values from the specified object, converting it into a fault for
 	 * the specified id. New or deleted objects should not be refaulted.
 	 */
+	@Override
 	public void refaultObject(Object anObject, EOGlobalID aGlobalID, EOEditingContext aContext) {
 		// TODO: faults are not yet supported
 		// just re-initialize the object
@@ -153,6 +164,7 @@ public class TestObjectStore extends EOObjectStore {
 	/**
 	 * Writes all changes in the specified editing context to the respository.
 	 */
+	@Override
 	public void saveChangesInEditingContext(EOEditingContext aContext) {
 		Object o;
 		DataKeyID id;
diff --git a/projects/net.wotonomy.test/src/main/java/net/wotonomy/test/TestPanel.java b/projects/net.wotonomy.test/src/main/java/net/wotonomy/test/TestPanel.java
index 78eedb6..a85593e 100644
--- a/projects/net.wotonomy.test/src/main/java/net/wotonomy/test/TestPanel.java
+++ b/projects/net.wotonomy.test/src/main/java/net/wotonomy/test/TestPanel.java
@@ -66,13 +66,13 @@ public class TestPanel extends JPanel {
 		infoPanel.addRow("Name", new Component[] { firstNameField, middleNameField, lastNameField, checkbox });
 
 		// date comboboxen
-		Vector datesList = new Vector();
+		Vector<Integer> datesList = new Vector<>();
 		for (int i = 1; i < 32; i++)
-			datesList.add(new Integer(i));
-		dateBox = new JComboBox(datesList);
+			datesList.add(Integer.valueOf(i));
+		dateBox = new JComboBox<>(datesList);
 		dateBox.setEditable(true);
-		monthBox = new JComboBox();
-		yearBox = new JComboBox();
+		monthBox = new JComboBox<>();
+		yearBox = new JComboBox<>();
 		infoPanel.addRow("Create Date", dateBox, monthBox, yearBox);
 
 		// year slider
diff --git a/projects/net.wotonomy.test/tags b/projects/net.wotonomy.test/tags
new file mode 100644
index 0000000..32ec8d9
--- /dev/null
+++ b/projects/net.wotonomy.test/tags
@@ -0,0 +1,239 @@
+!_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;" to lines/
+!_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/
+!_TAG_OUTPUT_EXCMD	mixed	/number, pattern, mixed, or combineV2/
+!_TAG_OUTPUT_FILESEP	slash	/slash or backslash/
+!_TAG_OUTPUT_MODE	u-ctags	/u-ctags or e-ctags/
+!_TAG_PATTERN_LENGTH_LIMIT	96	/0 for no limit/
+!_TAG_PROC_CWD	/home/bjculkin/Projects/wotonomy/projects/net.wotonomy.test/	//
+!_TAG_PROGRAM_AUTHOR	Universal Ctags Team	//
+!_TAG_PROGRAM_NAME	Universal Ctags	/Derived from Exuberant Ctags/
+!_TAG_PROGRAM_URL	https://ctags.io/	/official site/
+!_TAG_PROGRAM_VERSION	5.9.0	//
+ApproveSelectionAction	src/main/java/net/wotonomy/test/BindingPanel.java	/^	protected class ApproveSelectionAction extends AbstractAction {$/;"	c	class:BindingPanel
+BindingController	src/main/java/net/wotonomy/test/BindingController.java	/^	public BindingController(EODisplayGroup titlesGroup, EODisplayGroup childGroup) {$/;"	m	class:BindingController
+BindingController	src/main/java/net/wotonomy/test/BindingController.java	/^public class BindingController {$/;"	c
+BindingPanel	src/main/java/net/wotonomy/test/BindingPanel.java	/^	public BindingPanel() {$/;"	m	class:BindingPanel
+BindingPanel	src/main/java/net/wotonomy/test/BindingPanel.java	/^public class BindingPanel extends JPanel {$/;"	c
+CancelSelectionAction	src/main/java/net/wotonomy/test/BindingPanel.java	/^	protected class CancelSelectionAction extends AbstractAction {$/;"	c	class:BindingPanel
+ChangeToParentDirectoryAction	src/main/java/net/wotonomy/test/BindingPanel.java	/^		protected ChangeToParentDirectoryAction() {$/;"	m	class:BindingPanel.ChangeToParentDirectoryAction
+ChangeToParentDirectoryAction	src/main/java/net/wotonomy/test/BindingPanel.java	/^	protected class ChangeToParentDirectoryAction extends AbstractAction {$/;"	c	class:BindingPanel
+DataKeyID	src/main/java/net/wotonomy/test/DataKeyID.java	/^	public DataKeyID(DataKey aKey) {$/;"	m	class:DataKeyID
+DataKeyID	src/main/java/net/wotonomy/test/DataKeyID.java	/^public class DataKeyID extends EOGlobalID {$/;"	c
+DataObjectStore	src/main/java/net/wotonomy/test/DataObjectStore.java	/^	public DataObjectStore(String aPath) {$/;"	m	class:DataObjectStore
+DataObjectStore	src/main/java/net/wotonomy/test/DataObjectStore.java	/^public class DataObjectStore extends EOObjectStore {$/;"	c
+EditController	src/main/java/net/wotonomy/test/EditController.java	/^	public EditController(EODataSource aDataSource) {$/;"	m	class:EditController
+EditController	src/main/java/net/wotonomy/test/EditController.java	/^public class EditController {$/;"	c
+EditPanel	src/main/java/net/wotonomy/test/EditPanel.java	/^	public EditPanel() {$/;"	m	class:EditPanel
+EditPanel	src/main/java/net/wotonomy/test/EditPanel.java	/^public class EditPanel extends JPanel {$/;"	c
+GoHomeAction	src/main/java/net/wotonomy/test/BindingPanel.java	/^		protected GoHomeAction() {$/;"	m	class:BindingPanel.GoHomeAction
+GoHomeAction	src/main/java/net/wotonomy/test/BindingPanel.java	/^	protected class GoHomeAction extends AbstractAction {$/;"	c	class:BindingPanel
+InspectorController	src/main/java/net/wotonomy/test/InspectorController.java	/^	public InspectorController(Object o) {$/;"	m	class:InspectorController
+InspectorController	src/main/java/net/wotonomy/test/InspectorController.java	/^public class InspectorController {$/;"	c
+NewFolderAction	src/main/java/net/wotonomy/test/BindingPanel.java	/^		protected NewFolderAction() {$/;"	m	class:BindingPanel.NewFolderAction
+NewFolderAction	src/main/java/net/wotonomy/test/BindingPanel.java	/^	protected class NewFolderAction extends AbstractAction {$/;"	c	class:BindingPanel
+Test	src/main/java/net/wotonomy/test/Test.java	/^public class Test {$/;"	c
+TestController	src/main/java/net/wotonomy/test/TestController.java	/^	public TestController(TestPanel aPanel) {$/;"	m	class:TestController
+TestController	src/main/java/net/wotonomy/test/TestController.java	/^public class TestController implements ActionListener {$/;"	c
+TestDataSource	src/main/java/net/wotonomy/test/TestDataSource.java	/^	public TestDataSource() {$/;"	m	class:TestDataSource
+TestDataSource	src/main/java/net/wotonomy/test/TestDataSource.java	/^	public TestDataSource(EOEditingContext aContext) {$/;"	m	class:TestDataSource
+TestDataSource	src/main/java/net/wotonomy/test/TestDataSource.java	/^public class TestDataSource extends EODataSource {$/;"	c
+TestMap	src/main/java/net/wotonomy/test/TestMap.java	/^	public TestMap() {$/;"	m	class:TestMap
+TestMap	src/main/java/net/wotonomy/test/TestMap.java	/^public class TestMap extends HashMap {$/;"	c
+TestObject	src/main/java/net/wotonomy/test/TestObject.java	/^	public TestObject() {$/;"	m	class:TestObject
+TestObject	src/main/java/net/wotonomy/test/TestObject.java	/^public class TestObject implements Serializable \/\/ , EOKeyValueCoding$/;"	c
+TestObjectClassDesc	src/main/java/net/wotonomy/test/TestObjectClassDesc.java	/^	public TestObjectClassDesc() {$/;"	m	class:TestObjectClassDesc
+TestObjectClassDesc	src/main/java/net/wotonomy/test/TestObjectClassDesc.java	/^public class TestObjectClassDesc extends EOClassDescription {$/;"	c
+TestObjectStore	src/main/java/net/wotonomy/test/TestObjectStore.java	/^	public TestObjectStore(String aPath) {$/;"	m	class:TestObjectStore
+TestObjectStore	src/main/java/net/wotonomy/test/TestObjectStore.java	/^public class TestObjectStore extends EOObjectStore {$/;"	c
+TestPanel	src/main/java/net/wotonomy/test/TestPanel.java	/^	public TestPanel() {$/;"	m	class:TestPanel
+TestPanel	src/main/java/net/wotonomy/test/TestPanel.java	/^public class TestPanel extends JPanel {$/;"	c
+TreeController	src/main/java/net/wotonomy/test/TreeController.java	/^	public TreeController(EODataSource aDataSource) {$/;"	m	class:TreeController
+TreeController	src/main/java/net/wotonomy/test/TreeController.java	/^	public TreeController(EOEditingContext aContext, EODisplayGroup aTitlesGroup, EODisplayGroup aC/;"	m	class:TreeController
+TreeController	src/main/java/net/wotonomy/test/TreeController.java	/^public class TreeController implements ActionListener {$/;"	c
+TreeInspectorController	src/main/java/net/wotonomy/test/TreeInspectorController.java	/^	public TreeInspectorController(EODisplayGroup titlesGroup, EODisplayGroup childrenGroup) {$/;"	m	class:TreeInspectorController
+TreeInspectorController	src/main/java/net/wotonomy/test/TreeInspectorController.java	/^public class TreeInspectorController {$/;"	c
+TreePanel	src/main/java/net/wotonomy/test/TreePanel.java	/^	public TreePanel() {$/;"	m	class:TreePanel
+TreePanel	src/main/java/net/wotonomy/test/TreePanel.java	/^public class TreePanel extends JPanel {$/;"	c
+UpdateAction	src/main/java/net/wotonomy/test/BindingPanel.java	/^	protected class UpdateAction extends AbstractAction {$/;"	c	class:BindingPanel
+actionPerformed	src/main/java/net/wotonomy/test/BindingPanel.java	/^		public void actionPerformed(ActionEvent e) {$/;"	m	class:BindingPanel.ApproveSelectionAction
+actionPerformed	src/main/java/net/wotonomy/test/BindingPanel.java	/^		public void actionPerformed(ActionEvent e) {$/;"	m	class:BindingPanel.CancelSelectionAction
+actionPerformed	src/main/java/net/wotonomy/test/BindingPanel.java	/^		public void actionPerformed(ActionEvent e) {$/;"	m	class:BindingPanel.ChangeToParentDirectoryAction
+actionPerformed	src/main/java/net/wotonomy/test/BindingPanel.java	/^		public void actionPerformed(ActionEvent e) {$/;"	m	class:BindingPanel.GoHomeAction
+actionPerformed	src/main/java/net/wotonomy/test/BindingPanel.java	/^		public void actionPerformed(ActionEvent e) {$/;"	m	class:BindingPanel.NewFolderAction
+actionPerformed	src/main/java/net/wotonomy/test/BindingPanel.java	/^		public void actionPerformed(ActionEvent e) {$/;"	m	class:BindingPanel.UpdateAction
+actionPerformed	src/main/java/net/wotonomy/test/TestController.java	/^	public void actionPerformed(ActionEvent evt) {$/;"	m	class:TestController
+actionPerformed	src/main/java/net/wotonomy/test/TreeController.java	/^	public void actionPerformed(ActionEvent evt) {$/;"	m	class:TreeController
+addPanel	src/main/java/net/wotonomy/test/EditPanel.java	/^	public ButtonPanel addPanel;$/;"	f	class:EditPanel
+address	src/main/java/net/wotonomy/test/TestObject.java	/^	protected String address;$/;"	f	class:TestObject
+age	src/main/java/net/wotonomy/test/TestObject.java	/^	protected short age;$/;"	f	class:TestObject
+arrayFaultWithSourceGlobalID	src/main/java/net/wotonomy/test/DataObjectStore.java	/^	public NSArray arrayFaultWithSourceGlobalID(EOGlobalID aGlobalID, String aRelationship, EOEditi/;"	m	class:DataObjectStore
+arrayFaultWithSourceGlobalID	src/main/java/net/wotonomy/test/TestObjectStore.java	/^	public NSArray arrayFaultWithSourceGlobalID(EOGlobalID aGlobalID, String aRelationship, EOEditi/;"	m	class:TestObjectStore
+buttonPanel	src/main/java/net/wotonomy/test/TestPanel.java	/^	public ButtonPanel buttonPanel;$/;"	f	class:TestPanel
+checkbox	src/main/java/net/wotonomy/test/TestPanel.java	/^	public JCheckBox checkbox;$/;"	f	class:TestPanel
+childCount	src/main/java/net/wotonomy/test/TestMap.java	/^	protected int childCount;$/;"	f	class:TestMap
+childCount	src/main/java/net/wotonomy/test/TestObject.java	/^	protected int childCount;$/;"	f	class:TestObject
+childList	src/main/java/net/wotonomy/test/TestObject.java	/^	protected List childList;$/;"	f	class:TestObject
+children	src/main/java/net/wotonomy/test/TestMap.java	/^	protected TestMap[] children;$/;"	f	class:TestMap
+city	src/main/java/net/wotonomy/test/TestObject.java	/^	protected String city;$/;"	f	class:TestObject
+classDescriptionForDestinationKey	src/main/java/net/wotonomy/test/TestObjectClassDesc.java	/^	public EOClassDescription classDescriptionForDestinationKey(String detailKey) {$/;"	m	class:TestObjectClassDesc
+classDescriptionForObjects	src/main/java/net/wotonomy/test/TestDataSource.java	/^	public EOClassDescription classDescriptionForObjects() {$/;"	m	class:TestDataSource
+clone	src/main/java/net/wotonomy/test/DataKeyID.java	/^	public Object clone() {$/;"	m	class:DataKeyID
+context	src/main/java/net/wotonomy/test/TestDataSource.java	/^	private EOEditingContext context;$/;"	f	class:TestDataSource	file:
+convertRelationKeysToObjects	src/main/java/net/wotonomy/test/DataObjectStore.java	/^	private void convertRelationKeysToObjects(EOEditingContext aContext, Object anObject, EOGlobalI/;"	m	class:DataObjectStore	file:
+convertRelationObjectsToKeys	src/main/java/net/wotonomy/test/DataObjectStore.java	/^	private void convertRelationObjectsToKeys(EOEditingContext aContext, Object anObject) { \/\/ Sy/;"	m	class:DataObjectStore	file:
+dataSourceQualifiedByKey	src/main/java/net/wotonomy/test/TestDataSource.java	/^	public EODataSource dataSourceQualifiedByKey(String aKey) {$/;"	m	class:TestDataSource
+date	src/main/java/net/wotonomy/test/TestObject.java	/^	protected Date date;$/;"	f	class:TestObject
+dateBox	src/main/java/net/wotonomy/test/TestPanel.java	/^	public JComboBox dateBox, monthBox, yearBox;$/;"	f	class:TestPanel
+deleteObject	src/main/java/net/wotonomy/test/TestDataSource.java	/^	public void deleteObject(Object anObject) {$/;"	m	class:TestDataSource
+detailGroup	src/main/java/net/wotonomy/test/TreeController.java	/^	final EODisplayGroup detailGroup;$/;"	f	class:TreeController
+dialog	src/main/java/net/wotonomy/test/EditController.java	/^	JDialog dialog;$/;"	f	class:EditController
+displayGroup	src/main/java/net/wotonomy/test/TestController.java	/^	EODisplayGroup displayGroup;$/;"	f	class:TestController
+editPanel	src/main/java/net/wotonomy/test/TreePanel.java	/^	public EditPanel editPanel;$/;"	f	class:TreePanel
+editingContext	src/main/java/net/wotonomy/test/Test.java	/^	static EOEditingContext editingContext;$/;"	f	class:Test
+editingContext	src/main/java/net/wotonomy/test/TestDataSource.java	/^	public EOEditingContext editingContext() {$/;"	m	class:TestDataSource
+editingContext	src/main/java/net/wotonomy/test/TestObject.java	/^	public EOEditingContext editingContext;$/;"	f	class:TestObject
+editingContext	src/main/java/net/wotonomy/test/TreeController.java	/^	final EOEditingContext editingContext;$/;"	f	class:TreeController
+equals	src/main/java/net/wotonomy/test/DataKeyID.java	/^	public boolean equals(Object anObject) {$/;"	m	class:DataKeyID
+equals	src/main/java/net/wotonomy/test/TestMap.java	/^	public boolean equals(Object anObject) {$/;"	m	class:TestMap
+equals	src/main/java/net/wotonomy/test/TestObject.java	/^	public boolean equals(Object anObject) {$/;"	m	class:TestObject
+faultForGlobalID	src/main/java/net/wotonomy/test/DataObjectStore.java	/^	public Object faultForGlobalID(EOGlobalID aGlobalID, EOEditingContext aContext) {$/;"	m	class:DataObjectStore
+faultForGlobalID	src/main/java/net/wotonomy/test/TestObjectStore.java	/^	public Object faultForGlobalID(EOGlobalID aGlobalID, EOEditingContext aContext) {$/;"	m	class:TestObjectStore
+faultForRawRow	src/main/java/net/wotonomy/test/DataObjectStore.java	/^	public Object faultForRawRow(Map aDictionary, String anEntityName, EOEditingContext aContext) {$/;"	m	class:DataObjectStore
+faultForRawRow	src/main/java/net/wotonomy/test/TestObjectStore.java	/^	public Object faultForRawRow(Map aDictionary, String anEntityName, EOEditingContext aContext) {$/;"	m	class:TestObjectStore
+fetchObjects	src/main/java/net/wotonomy/test/TestDataSource.java	/^	public NSArray fetchObjects() {$/;"	m	class:TestDataSource
+filter	src/main/java/net/wotonomy/test/TestController.java	/^	private String filter;$/;"	f	class:TestController	file:
+firstName	src/main/java/net/wotonomy/test/TestObject.java	/^	protected String firstName;$/;"	f	class:TestObject
+firstNameField	src/main/java/net/wotonomy/test/EditPanel.java	/^	public JTextComponent firstNameField;$/;"	f	class:EditPanel
+firstNameField	src/main/java/net/wotonomy/test/TestPanel.java	/^	public JTextComponent firstNameField;$/;"	f	class:TestPanel
+getAddress	src/main/java/net/wotonomy/test/TestObject.java	/^	public String getAddress() {$/;"	m	class:TestObject
+getAge	src/main/java/net/wotonomy/test/TestObject.java	/^	public short getAge() {$/;"	m	class:TestObject
+getChildCount	src/main/java/net/wotonomy/test/TestMap.java	/^	public int getChildCount() {$/;"	m	class:TestMap
+getChildCount	src/main/java/net/wotonomy/test/TestObject.java	/^	public int getChildCount() {$/;"	m	class:TestObject
+getChildList	src/main/java/net/wotonomy/test/TestMap.java	/^	public List getChildList() {$/;"	m	class:TestMap
+getChildList	src/main/java/net/wotonomy/test/TestObject.java	/^	public List getChildList() {$/;"	m	class:TestObject
+getChildren	src/main/java/net/wotonomy/test/TestMap.java	/^	public TestMap[] getChildren() {$/;"	m	class:TestMap
+getCity	src/main/java/net/wotonomy/test/TestObject.java	/^	public String getCity() {$/;"	m	class:TestObject
+getCreateDate	src/main/java/net/wotonomy/test/TestObject.java	/^	public Date getCreateDate() {$/;"	m	class:TestObject
+getEditingContext	src/main/java/net/wotonomy/test/TestObject.java	/^	public EOEditingContext getEditingContext() {$/;"	m	class:TestObject
+getFilter	src/main/java/net/wotonomy/test/TestController.java	/^	public String getFilter() {$/;"	m	class:TestController
+getFirstName	src/main/java/net/wotonomy/test/TestObject.java	/^	public String getFirstName() {$/;"	m	class:TestObject
+getFullName	src/main/java/net/wotonomy/test/TestMap.java	/^	public String getFullName() {$/;"	m	class:TestMap
+getFullName	src/main/java/net/wotonomy/test/TestObject.java	/^	public String getFullName() {$/;"	m	class:TestObject
+getHash	src/main/java/net/wotonomy/test/TestObject.java	/^	public String getHash() {$/;"	m	class:TestObject
+getKey	src/main/java/net/wotonomy/test/DataKeyID.java	/^	public DataKey getKey() {$/;"	m	class:DataKeyID
+getLastName	src/main/java/net/wotonomy/test/TestObject.java	/^	public String getLastName() {$/;"	m	class:TestObject
+getMiddleName	src/main/java/net/wotonomy/test/TestObject.java	/^	public StringBuffer getMiddleName() {$/;"	m	class:TestObject
+getParent	src/main/java/net/wotonomy/test/TestObject.java	/^	public TestObject getParent() {$/;"	m	class:TestObject
+getState	src/main/java/net/wotonomy/test/TestObject.java	/^	public String getState() {$/;"	m	class:TestObject
+getZipCode	src/main/java/net/wotonomy/test/TestObject.java	/^	public int getZipCode() {$/;"	m	class:TestObject
+group	src/main/java/net/wotonomy/test/EditController.java	/^	EODisplayGroup group;$/;"	f	class:EditController
+group	src/main/java/net/wotonomy/test/TreeController.java	/^	final EODisplayGroup group;$/;"	f	class:TreeController
+handleQueryWithUnboundKey	src/main/java/net/wotonomy/test/TestObject.java	/^	public Object handleQueryWithUnboundKey(String aKey) {$/;"	m	class:TestObject
+handleTakeValueForUnboundKey	src/main/java/net/wotonomy/test/TestObject.java	/^	public void handleTakeValueForUnboundKey(Object aValue, String aKey) {$/;"	m	class:TestObject
+hashCode	src/main/java/net/wotonomy/test/DataKeyID.java	/^	public int hashCode() {$/;"	m	class:DataKeyID
+hitMe	src/main/java/net/wotonomy/test/TestController.java	/^	public void hitMe(NSNotification aNote) {$/;"	m	class:TestController
+infoPanel	src/main/java/net/wotonomy/test/EditPanel.java	/^	public InfoPanel infoPanel;$/;"	f	class:EditPanel
+infoPanel	src/main/java/net/wotonomy/test/TestPanel.java	/^	public InfoPanel infoPanel;$/;"	f	class:TestPanel
+init	src/main/java/net/wotonomy/test/BindingPanel.java	/^	protected void init() {$/;"	m	class:BindingPanel
+init	src/main/java/net/wotonomy/test/TreeController.java	/^	public void init() {$/;"	m	class:TreeController
+initializeObject	src/main/java/net/wotonomy/test/DataObjectStore.java	/^	public void initializeObject(Object anObject, EOGlobalID aGlobalID, EOEditingContext aContext) /;"	m	class:DataObjectStore
+initializeObject	src/main/java/net/wotonomy/test/TestObjectStore.java	/^	public void initializeObject(Object anObject, EOGlobalID aGlobalID, EOEditingContext aContext) /;"	m	class:TestObjectStore
+insertObject	src/main/java/net/wotonomy/test/TestDataSource.java	/^	public void insertObject(Object anObject) {$/;"	m	class:TestDataSource
+invalidateAllObjects	src/main/java/net/wotonomy/test/DataObjectStore.java	/^	public void invalidateAllObjects() {$/;"	m	class:DataObjectStore
+invalidateAllObjects	src/main/java/net/wotonomy/test/TestObjectStore.java	/^	public void invalidateAllObjects() {$/;"	m	class:TestObjectStore
+invalidateObjectsWithGlobalIDs	src/main/java/net/wotonomy/test/DataObjectStore.java	/^	public void invalidateObjectsWithGlobalIDs(List aList) {$/;"	m	class:DataObjectStore
+invalidateObjectsWithGlobalIDs	src/main/java/net/wotonomy/test/TestObjectStore.java	/^	public void invalidateObjectsWithGlobalIDs(List aList) {$/;"	m	class:TestObjectStore
+isObjectLockedWithGlobalID	src/main/java/net/wotonomy/test/DataObjectStore.java	/^	public boolean isObjectLockedWithGlobalID(EOGlobalID aGlobalID, EOEditingContext aContext) {$/;"	m	class:DataObjectStore
+isObjectLockedWithGlobalID	src/main/java/net/wotonomy/test/TestObjectStore.java	/^	public boolean isObjectLockedWithGlobalID(EOGlobalID aGlobalID, EOEditingContext aContext) {$/;"	m	class:TestObjectStore
+isSpecial	src/main/java/net/wotonomy/test/TestObject.java	/^	public Boolean isSpecial() {$/;"	m	class:TestObject
+isTemporary	src/main/java/net/wotonomy/test/DataKeyID.java	/^	public boolean isTemporary() {$/;"	m	class:DataKeyID
+key	src/main/java/net/wotonomy/test/DataKeyID.java	/^	private DataKey key;$/;"	f	class:DataKeyID	file:
+key	src/main/java/net/wotonomy/test/TestDataSource.java	/^	private String key;$/;"	f	class:TestDataSource	file:
+lastName	src/main/java/net/wotonomy/test/TestObject.java	/^	protected String lastName;$/;"	f	class:TestObject
+lastNameField	src/main/java/net/wotonomy/test/EditPanel.java	/^	public JTextField middleNameField, lastNameField;$/;"	f	class:EditPanel
+lastNameField	src/main/java/net/wotonomy/test/TestPanel.java	/^	public JTextComponent middleNameField, lastNameField;$/;"	f	class:TestPanel
+list	src/main/java/net/wotonomy/test/EditPanel.java	/^	public JList list;$/;"	f	class:EditPanel
+lockObjectWithGlobalID	src/main/java/net/wotonomy/test/DataObjectStore.java	/^	public void lockObjectWithGlobalID(EOGlobalID aGlobalID, EOEditingContext aContext) {$/;"	m	class:DataObjectStore
+lockObjectWithGlobalID	src/main/java/net/wotonomy/test/TestObjectStore.java	/^	public void lockObjectWithGlobalID(EOGlobalID aGlobalID, EOEditingContext aContext) {$/;"	m	class:TestObjectStore
+main	src/main/java/net/wotonomy/test/Test.java	/^	static public void main(String[] argv) {$/;"	m	class:Test
+main	src/main/java/net/wotonomy/test/TestMap.java	/^	public static void main(String[] argv) {$/;"	m	class:TestMap
+main	src/main/java/net/wotonomy/test/TestObject.java	/^	public static void main(String[] argv) {$/;"	m	class:TestObject
+middleName	src/main/java/net/wotonomy/test/TestObject.java	/^	protected StringBuffer middleName;$/;"	f	class:TestObject
+middleNameField	src/main/java/net/wotonomy/test/EditPanel.java	/^	public JTextField middleNameField, lastNameField;$/;"	f	class:EditPanel
+middleNameField	src/main/java/net/wotonomy/test/TestPanel.java	/^	public JTextComponent middleNameField, lastNameField;$/;"	f	class:TestPanel
+monthBox	src/main/java/net/wotonomy/test/TestPanel.java	/^	public JComboBox dateBox, monthBox, yearBox;$/;"	f	class:TestPanel
+net.wotonomy.test	src/main/java/net/wotonomy/test/BindingController.java	/^package net.wotonomy.test;$/;"	p
+net.wotonomy.test	src/main/java/net/wotonomy/test/BindingPanel.java	/^package net.wotonomy.test;$/;"	p
+net.wotonomy.test	src/main/java/net/wotonomy/test/DataKeyID.java	/^package net.wotonomy.test;$/;"	p
+net.wotonomy.test	src/main/java/net/wotonomy/test/DataObjectStore.java	/^package net.wotonomy.test;$/;"	p
+net.wotonomy.test	src/main/java/net/wotonomy/test/EditController.java	/^package net.wotonomy.test;$/;"	p
+net.wotonomy.test	src/main/java/net/wotonomy/test/EditPanel.java	/^package net.wotonomy.test;$/;"	p
+net.wotonomy.test	src/main/java/net/wotonomy/test/InspectorController.java	/^package net.wotonomy.test;$/;"	p
+net.wotonomy.test	src/main/java/net/wotonomy/test/Test.java	/^package net.wotonomy.test;$/;"	p
+net.wotonomy.test	src/main/java/net/wotonomy/test/TestController.java	/^package net.wotonomy.test;$/;"	p
+net.wotonomy.test	src/main/java/net/wotonomy/test/TestDataSource.java	/^package net.wotonomy.test;$/;"	p
+net.wotonomy.test	src/main/java/net/wotonomy/test/TestMap.java	/^package net.wotonomy.test;$/;"	p
+net.wotonomy.test	src/main/java/net/wotonomy/test/TestObject.java	/^package net.wotonomy.test;$/;"	p
+net.wotonomy.test	src/main/java/net/wotonomy/test/TestObjectClassDesc.java	/^package net.wotonomy.test;$/;"	p
+net.wotonomy.test	src/main/java/net/wotonomy/test/TestObjectStore.java	/^package net.wotonomy.test;$/;"	p
+net.wotonomy.test	src/main/java/net/wotonomy/test/TestPanel.java	/^package net.wotonomy.test;$/;"	p
+net.wotonomy.test	src/main/java/net/wotonomy/test/TreeController.java	/^package net.wotonomy.test;$/;"	p
+net.wotonomy.test	src/main/java/net/wotonomy/test/TreeInspectorController.java	/^package net.wotonomy.test;$/;"	p
+net.wotonomy.test	src/main/java/net/wotonomy/test/TreePanel.java	/^package net.wotonomy.test;$/;"	p
+objectStore	src/main/java/net/wotonomy/test/Test.java	/^	static EOObjectStore objectStore;$/;"	f	class:Test
+objectsForSourceGlobalID	src/main/java/net/wotonomy/test/DataObjectStore.java	/^	public NSArray objectsForSourceGlobalID(EOGlobalID aGlobalID, String aRelationship, EOEditingCo/;"	m	class:DataObjectStore
+objectsForSourceGlobalID	src/main/java/net/wotonomy/test/TestObjectStore.java	/^	public NSArray objectsForSourceGlobalID(EOGlobalID aGlobalID, String aRelationship, EOEditingCo/;"	m	class:TestObjectStore
+objectsWithFetchSpecification	src/main/java/net/wotonomy/test/DataObjectStore.java	/^	public NSArray objectsWithFetchSpecification(EOFetchSpecification aFetchSpec, EOEditingContext /;"	m	class:DataObjectStore
+objectsWithFetchSpecification	src/main/java/net/wotonomy/test/TestObjectStore.java	/^	public NSArray objectsWithFetchSpecification(EOFetchSpecification aFetchSpec, EOEditingContext /;"	m	class:TestObjectStore
+okPanel	src/main/java/net/wotonomy/test/BindingPanel.java	/^	protected ButtonPanel okPanel;$/;"	f	class:BindingPanel
+panel	src/main/java/net/wotonomy/test/TestController.java	/^	TestPanel panel;$/;"	f	class:TestController
+panel	src/main/java/net/wotonomy/test/TreePanel.java	/^	public JPanel panel;$/;"	f	class:TreePanel
+parent	src/main/java/net/wotonomy/test/TestObject.java	/^	protected TestObject parent;$/;"	f	class:TestObject
+qualifyWithRelationshipKey	src/main/java/net/wotonomy/test/TestDataSource.java	/^	public void qualifyWithRelationshipKey(String aKey, Object anObject) {$/;"	m	class:TestDataSource
+random	src/main/java/net/wotonomy/test/TestMap.java	/^	private static Random random = new Random();$/;"	f	class:TestMap	file:
+random	src/main/java/net/wotonomy/test/TestObject.java	/^	private static Random random = new Random();$/;"	f	class:TestObject	file:
+randomParse	src/main/java/net/wotonomy/test/TestMap.java	/^	private static String randomParse(String aString) {$/;"	m	class:TestMap	file:
+randomParse	src/main/java/net/wotonomy/test/TestObject.java	/^	private static String randomParse(String aString) {$/;"	m	class:TestObject	file:
+refaultObject	src/main/java/net/wotonomy/test/DataObjectStore.java	/^	public void refaultObject(Object anObject, EOGlobalID aGlobalID, EOEditingContext aContext) {$/;"	m	class:DataObjectStore
+refaultObject	src/main/java/net/wotonomy/test/TestObjectStore.java	/^	public void refaultObject(Object anObject, EOGlobalID aGlobalID, EOEditingContext aContext) {$/;"	m	class:TestObjectStore
+saveChangesInEditingContext	src/main/java/net/wotonomy/test/DataObjectStore.java	/^	public void saveChangesInEditingContext(EOEditingContext aContext) {$/;"	m	class:DataObjectStore
+saveChangesInEditingContext	src/main/java/net/wotonomy/test/TestObjectStore.java	/^	public void saveChangesInEditingContext(EOEditingContext aContext) {$/;"	m	class:TestObjectStore
+savePanel	src/main/java/net/wotonomy/test/TestPanel.java	/^	public ButtonPanel savePanel;$/;"	f	class:TestPanel
+serialVersionUID	src/main/java/net/wotonomy/test/TestObject.java	/^	static final long serialVersionUID = -5482454640042392838L;$/;"	f	class:TestObject
+setAddress	src/main/java/net/wotonomy/test/TestObject.java	/^	public void setAddress(String anAddress) {$/;"	m	class:TestObject
+setAge	src/main/java/net/wotonomy/test/TestObject.java	/^	public void setAge(short anAge) {$/;"	m	class:TestObject
+setChildList	src/main/java/net/wotonomy/test/TestMap.java	/^	public void setChildList(List aChildList) {$/;"	m	class:TestMap
+setChildList	src/main/java/net/wotonomy/test/TestObject.java	/^	public void setChildList(List aChildList) {$/;"	m	class:TestObject
+setChildren	src/main/java/net/wotonomy/test/TestMap.java	/^	public void setChildren(TestMap[] aChildArray) {$/;"	m	class:TestMap
+setCity	src/main/java/net/wotonomy/test/TestObject.java	/^	public void setCity(String aCity) {$/;"	m	class:TestObject
+setCreateDate	src/main/java/net/wotonomy/test/TestObject.java	/^	public void setCreateDate(Date aDate) {$/;"	m	class:TestObject
+setFilter	src/main/java/net/wotonomy/test/TestController.java	/^	public void setFilter(String aFilter) {$/;"	m	class:TestController
+setFirstName	src/main/java/net/wotonomy/test/TestObject.java	/^	public void setFirstName(String aName) {$/;"	m	class:TestObject
+setLastName	src/main/java/net/wotonomy/test/TestObject.java	/^	public void setLastName(String aName) {$/;"	m	class:TestObject
+setMiddleName	src/main/java/net/wotonomy/test/TestObject.java	/^	public void setMiddleName(StringBuffer aName) {$/;"	m	class:TestObject
+setParent	src/main/java/net/wotonomy/test/TestObject.java	/^	public void setParent(TestObject anObject) {$/;"	m	class:TestObject
+setSpecial	src/main/java/net/wotonomy/test/TestObject.java	/^	public void setSpecial(Boolean isSpecial) {$/;"	m	class:TestObject
+setState	src/main/java/net/wotonomy/test/TestObject.java	/^	public void setState(String aState) {$/;"	m	class:TestObject
+setZipCode	src/main/java/net/wotonomy/test/TestObject.java	/^	public void setZipCode(int aZipCode) {$/;"	m	class:TestObject
+slider	src/main/java/net/wotonomy/test/TestPanel.java	/^	public JSlider slider;$/;"	f	class:TestPanel
+soup	src/main/java/net/wotonomy/test/DataObjectStore.java	/^	DataSoup soup;$/;"	f	class:DataObjectStore
+soup	src/main/java/net/wotonomy/test/TestObjectStore.java	/^	DataSoup soup;$/;"	f	class:TestObjectStore
+source	src/main/java/net/wotonomy/test/TestDataSource.java	/^	private Object source;$/;"	f	class:TestDataSource	file:
+special	src/main/java/net/wotonomy/test/TestObject.java	/^	protected boolean special;$/;"	f	class:TestObject
+state	src/main/java/net/wotonomy/test/TestObject.java	/^	protected String state;$/;"	f	class:TestObject
+storedValueForKey	src/main/java/net/wotonomy/test/TestObject.java	/^	public Object storedValueForKey(String aKey) {$/;"	m	class:TestObject
+table	src/main/java/net/wotonomy/test/TestPanel.java	/^	public JTable table;$/;"	f	class:TestPanel
+takeStoredValueForKey	src/main/java/net/wotonomy/test/TestObject.java	/^	public void takeStoredValueForKey(Object aValue, String aKey) {$/;"	m	class:TestObject
+takeValueForKey	src/main/java/net/wotonomy/test/TestObject.java	/^	public void takeValueForKey(Object aValue, String aKey) {$/;"	m	class:TestObject
+titlesGroup	src/main/java/net/wotonomy/test/TreeController.java	/^	final EODisplayGroup titlesGroup;$/;"	f	class:TreeController
+toManyRelationshipKeys	src/main/java/net/wotonomy/test/TestObjectClassDesc.java	/^	public NSArray toManyRelationshipKeys() {$/;"	m	class:TestObjectClassDesc
+toString	src/main/java/net/wotonomy/test/DataKeyID.java	/^	public String toString() {$/;"	m	class:DataKeyID
+toString	src/main/java/net/wotonomy/test/TestMap.java	/^	public String toString() {$/;"	m	class:TestMap
+toString	src/main/java/net/wotonomy/test/TestObject.java	/^	public String toString() {$/;"	m	class:TestObject
+tree	src/main/java/net/wotonomy/test/TreePanel.java	/^	public JTree tree;$/;"	f	class:TreePanel
+treeChooser	src/main/java/net/wotonomy/test/BindingPanel.java	/^	protected TreeChooser treeChooser;$/;"	f	class:BindingPanel
+unableToSetNullForKey	src/main/java/net/wotonomy/test/TestObject.java	/^	public void unableToSetNullForKey(String aKey) {$/;"	m	class:TestObject
+valueForKey	src/main/java/net/wotonomy/test/TestObject.java	/^	public Object valueForKey(String aKey) {$/;"	m	class:TestObject
+yearBox	src/main/java/net/wotonomy/test/TestPanel.java	/^	public JComboBox dateBox, monthBox, yearBox;$/;"	f	class:TestPanel
+yearRadioPanel	src/main/java/net/wotonomy/test/EditPanel.java	/^	public RadioButtonPanel yearRadioPanel;$/;"	f	class:EditPanel
+zip	src/main/java/net/wotonomy/test/TestObject.java	/^	protected int zip;$/;"	f	class:TestObject
diff --git a/projects/net.wotonomy.ui.swing/pom.xml b/projects/net.wotonomy.ui.swing/pom.xml
index 28567d0..4dc3807 100644
--- a/projects/net.wotonomy.ui.swing/pom.xml
+++ b/projects/net.wotonomy.ui.swing/pom.xml
@@ -22,6 +22,19 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+	
+		<properties>
+		<maven.compiler.release>11</maven.compiler.release>
+	</properties>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.13.0</version>
+			</plugin>
+		</plugins>
+	</build>
 	<reporting>
 		<plugins>
 			<plugin>
diff --git a/projects/net.wotonomy.ui.swing/src/main/java/net/wotonomy/ui/swing/TreeColumnAssociation.java b/projects/net.wotonomy.ui.swing/src/main/java/net/wotonomy/ui/swing/TreeColumnAssociation.java
index 26f2eda..36eb40f 100644
--- a/projects/net.wotonomy.ui.swing/src/main/java/net/wotonomy/ui/swing/TreeColumnAssociation.java
+++ b/projects/net.wotonomy.ui.swing/src/main/java/net/wotonomy/ui/swing/TreeColumnAssociation.java
@@ -121,6 +121,7 @@ public class TreeColumnAssociation extends TableColumnAssociation {
 	 * Binds the specified aspect of this association to the specified key on the
 	 * specified display group.
 	 */
+	@Override
 	public void bindAspect(String anAspect, EODisplayGroup aDisplayGroup, String aKey) {
 		if (ChildrenAspect.equals(anAspect)) {
 			childrenDisplayGroup = aDisplayGroup;
@@ -137,6 +138,7 @@ public class TreeColumnAssociation extends TableColumnAssociation {
 	 * Overridden to call createTree if necessary, call configureColumn, call
 	 * createTreeAssociation if necessary, and then call to super.
 	 */
+	@Override
 	public void establishConnection() {
 		if (tree == null) {
 			tree = createTree();
@@ -161,7 +163,7 @@ public class TreeColumnAssociation extends TableColumnAssociation {
 
 		treeAssociation.establishConnection();
 
-		table.setRowHeight(tree.getRowHeight());
+		table.setRowHeight(Math.max(1, tree.getRowHeight()));
 
 		super.establishConnection();
 
@@ -175,6 +177,7 @@ public class TreeColumnAssociation extends TableColumnAssociation {
 	 * Breaks the connection between this association and its object. Override to
 	 * stop listening for events from the object.
 	 */
+	@Override
 	public void breakConnection() {
 		super.breakConnection();
 		treeAssociation.breakConnection();
diff --git a/projects/net.wotonomy.ui.swing/src/main/java/net/wotonomy/ui/swing/components/InfoPanel.java b/projects/net.wotonomy.ui.swing/src/main/java/net/wotonomy/ui/swing/components/InfoPanel.java
index a2c0182..06938e9 100644
--- a/projects/net.wotonomy.ui.swing/src/main/java/net/wotonomy/ui/swing/components/InfoPanel.java
+++ b/projects/net.wotonomy.ui.swing/src/main/java/net/wotonomy/ui/swing/components/InfoPanel.java
@@ -100,9 +100,9 @@ public class InfoPanel extends JPanel implements ActionListener {
 	protected int vgap; // set in constructor
 	protected int margin; // set in constructor
 	protected int columns; // set in constructor
-	protected List fields = null;
-	protected List labels = null;
-	protected List fieldSpacers = null;
+	protected List<Component> fields = null;
+	protected List<Component> labels = null;
+	protected List<Component> fieldSpacers = null;
 	protected ButtonPanel buttonPanel = null;
 	protected boolean isEditable = true;
 	protected String prefix;
@@ -124,8 +124,8 @@ public class InfoPanel extends JPanel implements ActionListener {
 		margin = 0; // default margin: none
 		prefix = ""; // default prefix: none
 		postfix = ":"; // per java l&f guidelines
-		fields = new ArrayList();
-		labels = new ArrayList();
+		fields = new ArrayList<>();
+		labels = new ArrayList<>();
 		labelAnchor = GridBagConstraints.NORTHWEST;
 		// per java l&f guidelines (CENTER is nicer)
 		labelAlign = SwingConstants.LEFT;
diff --git a/projects/net.wotonomy.ui/pom.xml b/projects/net.wotonomy.ui/pom.xml
index bd62e14..a02fd93 100644
--- a/projects/net.wotonomy.ui/pom.xml
+++ b/projects/net.wotonomy.ui/pom.xml
@@ -22,6 +22,19 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+	
+		<properties>
+		<maven.compiler.release>11</maven.compiler.release>
+	</properties>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.13.0</version>
+			</plugin>
+		</plugins>
+	</build>
 	<reporting>
 		<plugins>
 			<plugin>
diff --git a/projects/net.wotonomy.ui/src/main/java/net/wotonomy/ui/EODisplayGroup.java b/projects/net.wotonomy.ui/src/main/java/net/wotonomy/ui/EODisplayGroup.java
index fd80713..033f0a9 100644
--- a/projects/net.wotonomy.ui/src/main/java/net/wotonomy/ui/EODisplayGroup.java
+++ b/projects/net.wotonomy.ui/src/main/java/net/wotonomy/ui/EODisplayGroup.java
@@ -1724,10 +1724,10 @@ public class EODisplayGroup extends Observable implements EOObserving, EOEditing
  * selectionChanged flags after all Associations have been notified.
  */
 class LastGroupObserver extends EODelayedObserver {
-	Reference ref;
+	Reference<EODisplayGroup> ref;
 
 	public LastGroupObserver(EODisplayGroup aDisplayGroup) {
-		ref = new WeakReference(aDisplayGroup);
+		ref = new WeakReference<>(aDisplayGroup);
 	}
 
 	/**
diff --git a/projects/net.wotonomy.web/pom.xml b/projects/net.wotonomy.web/pom.xml
index 20c498b..1ac517e 100644
--- a/projects/net.wotonomy.web/pom.xml
+++ b/projects/net.wotonomy.web/pom.xml
@@ -43,6 +43,18 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+	<properties>
+		<maven.compiler.release>11</maven.compiler.release>
+	</properties>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.13.0</version>
+			</plugin>
+		</plugins>
+	</build>
 	<reporting>
 		<plugins>
 			<plugin>
diff --git a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/ObservableArray.java b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/ObservableArray.java
index 1c91115..90d234d 100644
--- a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/ObservableArray.java
+++ b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/ObservableArray.java
@@ -36,7 +36,8 @@ import net.wotonomy.foundation.NSRange;
  * probably call each other. However, EOObserverCenter will only register us
  * once per object.
  */
-class ObservableArray extends NSMutableArray {
+class ObservableArray<T> extends NSMutableArray<T> {
+	private static final long serialVersionUID = 1166339693880765234L;
 	EOObserving observer;
 
 	ObservableArray(EOObserving anObserver) {
@@ -46,6 +47,7 @@ class ObservableArray extends NSMutableArray {
 	/**
 	 * Removes the last object from the array.
 	 */
+	@Override
 	public void removeLastObject() {
 		remove(count() - 1);
 	}
@@ -53,6 +55,7 @@ class ObservableArray extends NSMutableArray {
 	/**
 	 * Removes the object at the specified index.
 	 */
+	@Override
 	public void removeObjectAtIndex(int index) {
 		remove(index);
 	}
@@ -60,13 +63,15 @@ class ObservableArray extends NSMutableArray {
 	/**
 	 * Adds all objects in the specified collection.
 	 */
-	public void addObjectsFromArray(Collection aCollection) {
+	@Override
+	public void addObjectsFromArray(Collection<T> aCollection) {
 		addAll(aCollection);
 	}
 
 	/**
 	 * Removes all objects from the array.
 	 */
+	@Override
 	public void removeAllObjects() {
 		clear();
 	}
@@ -75,7 +80,8 @@ class ObservableArray extends NSMutableArray {
 	 * Removes all objects equivalent to the specified object within the range of
 	 * specified indices.
 	 */
-	public void removeObject(Object anObject, NSRange aRange) {
+	@Override
+	public void removeObject(T anObject, NSRange aRange) {
 		if ((anObject == null) || (aRange == null))
 			return;
 
@@ -94,7 +100,8 @@ class ObservableArray extends NSMutableArray {
 	 * Removes all instances of the specified object within the range of specified
 	 * indices, comparing by reference.
 	 */
-	public void removeIdenticalObject(Object anObject, NSRange aRange) {
+	@Override
+	public void removeIdenticalObject(T anObject, NSRange aRange) {
 		if ((anObject == null) || (aRange == null))
 			return;
 
@@ -112,13 +119,15 @@ class ObservableArray extends NSMutableArray {
 	/**
 	 * Removes all objects in the specified collection from the array.
 	 */
-	public void removeObjectsInArray(Collection aCollection) {
+	@Override
+	public void removeObjectsInArray(Collection<T> aCollection) {
 		removeAll(aCollection);
 	}
 
 	/**
 	 * Removes all objects in the indices within the specified range from the array.
 	 */
+	@Override
 	public void removeObjectsInRange(NSRange aRange) {
 		if (aRange == null)
 			return;
@@ -134,7 +143,8 @@ class ObservableArray extends NSMutableArray {
 	 * objects are removed. If otherRange is larger than currentRange, the extra
 	 * objects are added.
 	 */
-	public void replaceObjectsInRange(NSRange currentRange, List otherArray, NSRange otherRange) {
+	@Override
+	public void replaceObjectsInRange(NSRange currentRange, List<T> otherArray, NSRange otherRange) {
 		if ((currentRange == null) || (otherArray == null) || (otherRange == null))
 			return;
 
@@ -145,8 +155,7 @@ class ObservableArray extends NSMutableArray {
 			otherRange = new NSRange(loc, otherArray.size() - loc);
 		}
 
-		Object o;
-		List subList = subList(currentRange.location(), currentRange.maxRange());
+		List<T> subList = subList(currentRange.location(), currentRange.maxRange());
 		int otherIndex = otherRange.location();
 		// TODO: Test this logic.
 		for (int i = 0; i < subList.size(); i++) {
@@ -168,7 +177,8 @@ class ObservableArray extends NSMutableArray {
 	 * Clears the current array and then populates it with the contents of the
 	 * specified collection.
 	 */
-	public void setArray(Collection aCollection) {
+	@Override
+	public void setArray(Collection<T> aCollection) {
 		clear();
 		addAll(aCollection);
 	}
@@ -176,6 +186,7 @@ class ObservableArray extends NSMutableArray {
 	/**
 	 * Removes all objects equivalent to the specified object.
 	 */
+	@Override
 	public void removeObject(Object anObject) {
 		remove(anObject);
 	}
@@ -183,7 +194,8 @@ class ObservableArray extends NSMutableArray {
 	/**
 	 * Removes all occurences of the specified object, comparing by reference.
 	 */
-	public void removeIdenticalObject(Object anObject) {
+	@Override
+	public void removeIdenticalObject(T anObject) {
 		EOObserverCenter.removeObserver(observer, anObject);
 		super.removeIdenticalObject(anObject);
 	}
@@ -191,83 +203,96 @@ class ObservableArray extends NSMutableArray {
 	/**
 	 * Inserts the specified object into this array at the specified index.
 	 */
-	public void insertObjectAtIndex(Object anObject, int anIndex) {
+	@Override
+	public void insertObjectAtIndex(T anObject, int anIndex) {
 		add(anIndex, anObject);
 	}
 
 	/**
 	 * Replaces the object at the specified index with the specified object.
 	 */
-	public void replaceObjectAtIndex(int anIndex, Object anObject) {
+	@Override
+	public void replaceObjectAtIndex(int anIndex, T anObject) {
 		set(anIndex, anObject);
 	}
 
 	/**
 	 * Adds the specified object to the end of this array.
 	 */
-	public void addObject(Object anObject) {
+	@Override
+	public void addObject(T anObject) {
 		add(anObject);
 	}
 
 	// interface List: mutators
 
-	public void add(int index, Object element) {
+	@Override
+	public void add(int index, T element) {
 		EOObserverCenter.addObserver(observer, element);
 		super.add(index, element);
 	}
 
-	public boolean add(Object o) {
+	@Override
+	public boolean add(T o) {
 		EOObserverCenter.addObserver(observer, o);
 		return super.add(o);
 	}
 
-	public boolean addAll(Collection coll) {
-		Iterator it = coll.iterator();
+	@Override
+	public boolean addAll(Collection<? extends T> coll) {
+		Iterator<? extends T> it = coll.iterator();
 		while (it.hasNext()) {
 			EOObserverCenter.addObserver(observer, it.next());
 		}
 		return super.addAll(coll);
 	}
 
-	public boolean addAll(int index, Collection c) {
-		Iterator it = c.iterator();
+	@Override
+	public boolean addAll(int index, Collection<? extends T> c) {
+		Iterator<? extends T> it = c.iterator();
 		while (it.hasNext()) {
 			EOObserverCenter.addObserver(observer, it.next());
 		}
 		return super.addAll(index, c);
 	}
 
+	@Override
 	public void clear() {
-		Iterator it = iterator();
+		Iterator<T> it = iterator();
 		while (it.hasNext()) {
 			EOObserverCenter.removeObserver(observer, it.next());
 		}
 		super.clear();
 	}
 
-	public Object remove(int index) {
+	@Override
+	public T remove(int index) {
 		EOObserverCenter.removeObserver(observer, get(index));
 		return super.remove(index);
 	}
 
+	@Override
 	public boolean remove(Object o) {
 		EOObserverCenter.removeObserver(observer, o);
 		return super.remove(o);
 	}
 
-	public boolean removeAll(Collection coll) {
-		Iterator it = coll.iterator();
+	@Override
+	public boolean removeAll(Collection<?> coll) {
+		Iterator<?> it = coll.iterator();
 		while (it.hasNext()) {
 			EOObserverCenter.removeObserver(observer, it.next());
 		}
 		return super.removeAll(coll);
 	}
 
-	public boolean retainAll(Collection coll) {
+	@Override
+	public boolean retainAll(Collection<?> coll) {
 		throw new UnsupportedOperationException();
 	}
 
-	public Object set(int index, Object element) {
+	@Override
+	public T set(int index, T element) {
 		EOObserverCenter.removeObserver(observer, get(index));
 		EOObserverCenter.addObserver(observer, element);
 		return super.set(index, element);
diff --git a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/URI.java b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/URI.java
index ba608a4..99716bf 100644
--- a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/URI.java
+++ b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/URI.java
@@ -70,16 +70,13 @@ import java.io.IOException;
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.net.URL;
-import java.security.AccessController;
 import java.util.BitSet;
 import java.util.Hashtable;
 import java.util.Locale;
 
-import sun.security.action.GetPropertyAction;
-
 /**
  * The interface for the URI(Uniform Resource Identifiers) version of RFC 2396.
- * This class has the purpose of supportting of parsing a URI reference to
+ * This class has the purpose of supporting of parsing a URI reference to
  * extend any specific protocols, the character encoding of the protocol to be
  * transported and the charset of the document.
  * <p>
@@ -166,7 +163,7 @@ import sun.security.action.GetPropertyAction;
  * @author <a href="mailto:jericho@apache.org">Sung-Gu</a>
  * @version $Revision: 905 $ $Date: 2002/03/14 15:14:01
  */
-class URI implements Cloneable, Comparable, Serializable {
+class URI implements Cloneable, Comparable<URI>, Serializable {
 
 	// ----------------------------------------------------------- Constructors
 
@@ -571,7 +568,7 @@ class URI implements Cloneable, Comparable, Serializable {
 			// in order to support backward compatiblity
 			_documentCharset = LocaleToCharsetMap.getCharset(locale);
 		} else {
-			_documentCharset = (String) AccessController.doPrivileged(new GetPropertyAction("file.encoding"));
+			_documentCharset = "UTF-8"; //(String) AccessController.doPrivileged(new GetPropertyAction("file.encoding"));
 		}
 	}
 
@@ -3459,9 +3456,7 @@ class URI implements Cloneable, Comparable, Serializable {
 	 * @exception ClassCastException not URI argument
 	 * @throws NullPointerException null object
 	 */
-	public int compareTo(Object obj) {
-
-		URI another = (URI) obj;
+	public int compareTo(URI another) {
 		if (!equals(_authority, another.getRawAuthority()))
 			return -1;
 		return toString().compareTo(another.toString());
@@ -3582,9 +3577,9 @@ class URI implements Cloneable, Comparable, Serializable {
 	 */
 	public static class LocaleToCharsetMap {
 
-		private static Hashtable map;
+		private static Hashtable<String, String> map;
 		static {
-			map = new Hashtable();
+			map = new Hashtable<>();
 			map.put("ar", "ISO-8859-6");
 			map.put("be", "ISO-8859-5");
 			map.put("bg", "ISO-8859-5");
diff --git a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOApplication.java b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOApplication.java
index 692e6b5..6d0dfc1 100644
--- a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOApplication.java
+++ b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOApplication.java
@@ -28,7 +28,6 @@ import jakarta.servlet.http.HttpServletResponse;
 import net.wotonomy.foundation.NSArray;
 import net.wotonomy.foundation.NSDictionary;
 import net.wotonomy.foundation.NSMutableDictionary;
-import net.wotonomy.web.util.BrowserLauncher;
 
 /**
  * A pure java implementation of WOApplication. <br>
@@ -46,10 +45,12 @@ import net.wotonomy.web.util.BrowserLauncher;
  * @version $Revision: 905 $
  */
 public class WOApplication extends HttpServlet {
+	private static final long serialVersionUID = 2417528899972745905L;
+
 	/**
 	 * A tricky way to allow multiple WOApplications in the same servlet container.
 	 */
-	static private ThreadLocal threadLocal;
+	static private ThreadLocal<WOApplication> threadLocal;
 	// static private WOApplication application;
 
 	/**
@@ -61,7 +62,7 @@ public class WOApplication extends HttpServlet {
 
 	private String name;
 	private WORequestHandler defaultRequestHandler;
-	private NSMutableDictionary requestHandlers;
+	private NSMutableDictionary<String, WORequestHandler> requestHandlers;
 	private WOSessionStore sessionStore;
 	private WOResourceManager resourceManager;
 	private boolean pageRefreshOnBacktrack;
@@ -81,13 +82,13 @@ public class WOApplication extends HttpServlet {
 
 	public WOApplication() {
 		if (threadLocal == null) {
-			threadLocal = new ThreadLocal();
+			threadLocal = new ThreadLocal<>();
 		}
 		threadLocal.set(this);
 
 		// application = this;
 		resourceManager = createResourceManager();
-		requestHandlers = new NSMutableDictionary();
+		requestHandlers = new NSMutableDictionary<>();
 		defaultRequestHandler = new WODirectActionRequestHandler();
 		registerRequestHandler(defaultRequestHandler, directActionRequestHandlerKey());
 		registerRequestHandler(new WOComponentRequestHandler(), componentRequestHandlerKey());
@@ -107,6 +108,7 @@ public class WOApplication extends HttpServlet {
 	 * sends the response to the appropriate WORequestHandler, and then updates the
 	 * servlet response from the resulting WOResponse.
 	 */
+	@Override
 	protected void doGet(HttpServletRequest req, HttpServletResponse resp)
 			throws ServletException, java.io.IOException {
 		threadLocal.set(this);
@@ -121,6 +123,7 @@ public class WOApplication extends HttpServlet {
 	 * gets and posts similarly. Override to handle post requests in a different
 	 * manner.
 	 */
+	@Override
 	protected void doPost(HttpServletRequest req, HttpServletResponse resp)
 			throws ServletException, java.io.IOException {
 		doGet(req, resp);
@@ -298,7 +301,7 @@ public class WOApplication extends HttpServlet {
 	/**
 	 * Returns the keys under which request handlers are registered.
 	 */
-	public NSArray registeredRequestHandlerKeys() {
+	public NSArray<String> registeredRequestHandlerKeys() {
 		return requestHandlers.allKeys();
 	}
 
@@ -314,9 +317,11 @@ public class WOApplication extends HttpServlet {
 	 * Returns the request handler that would best service the specified request.
 	 */
 	public WORequestHandler handlerForRequest(WORequest aRequest) {
-		WORequestHandler result = requestHandlerForKey(aRequest.requestHandlerKey());
+		WORequestHandler result;
 		if (aRequest == null)
 			result = defaultRequestHandler();
+		// TODO verify it was correct to move this down one
+		result = requestHandlerForKey(aRequest.requestHandlerKey());
 		return result;
 	}
 
@@ -470,7 +475,7 @@ public class WOApplication extends HttpServlet {
 		WOSession result = null;
 		try {
 			// using our class loader, which is hopefully dynamic.
-			result = (WOSession) getLocalClass("Session").newInstance();
+			result = (WOSession) getLocalClass("Session").getDeclaredConstructor().newInstance();
 		} catch (Throwable t) {
 			// ignore: fall back to WOSession
 			// t.printStackTrace();
@@ -503,11 +508,11 @@ public class WOApplication extends HttpServlet {
 		WOComponent result = null;
 		try {
 			// using our class loader, which is hopefully dynamic.
-			Class c = getLocalClass(aName);
+			Class<? extends WOComponent> c = getLocalClass(aName);
 
 			if (c != null) {
 				// get constructor
-				Constructor ctor;
+				Constructor<? extends WOComponent> ctor;
 				try {
 					ctor = c.getConstructor(new Class[] { WOContext.class });
 				} catch (NoSuchMethodException nsme) {
@@ -519,7 +524,7 @@ public class WOApplication extends HttpServlet {
 					result = (WOComponent) ctor.newInstance(new Object[] { aContext });
 				} else // call back on default constructor (deprecated)
 				{
-					result = (WOComponent) c.newInstance();
+					result = (WOComponent) c.getDeclaredConstructor().newInstance();
 				}
 			}
 		} catch (Throwable t) {
@@ -544,13 +549,14 @@ public class WOApplication extends HttpServlet {
 	 * that, from the WOApplication package, or finally from the root of the class
 	 * path. Returns null if not found.
 	 */
-	Class getLocalClass(String aName) {
-		Class result = null;
+	@SuppressWarnings("unchecked")
+	<C> Class<C> getLocalClass(String aName) {
+		Class<C> result = null;
 		if (getClass() != WOApplication.class) {
-			result = loadLocalClass(getClass(), aName);
+			result = (Class<C>) loadLocalClass(getClass(), aName);
 		}
 		if (result == null) {
-			result = loadLocalClass(WOApplication.class, aName);
+			result = (Class<C>) loadLocalClass(WOApplication.class, aName);
 		}
 		if (result == null) {
 			result = loadLocalClass(null, aName);
@@ -558,7 +564,8 @@ public class WOApplication extends HttpServlet {
 		return result;
 	}
 
-	private static final Class loadLocalClass(Class aClass, String aName) {
+	@SuppressWarnings("unchecked")
+	private static final <C> Class<C> loadLocalClass(Class<C> aClass, String aName) {
 		ClassLoader loader;
 		String packageName = "";
 		if (aClass != null) {
@@ -575,7 +582,7 @@ public class WOApplication extends HttpServlet {
 		}
 
 		try {
-			return loader.loadClass(packageName + aName);
+			return (Class<C>) loader.loadClass(packageName + aName);
 		} catch (ClassNotFoundException e) {
 			return null;
 		}
@@ -589,7 +596,7 @@ public class WOApplication extends HttpServlet {
 	public WOElement dynamicElementWithName(String anElementName, NSDictionary anAssociationMap, WOElement aBodyElement,
 			List aLanguageList) {
 		WOElement element = null;
-		Class c = null;
+		Class<? extends WODynamicElement> c = null;
 		try {
 			c = getLocalClass(anElementName);
 			if (c == null) {
@@ -599,8 +606,8 @@ public class WOApplication extends HttpServlet {
 			}
 
 			// get constructor
-			Class[] params = new Class[] { String.class, NSDictionary.class, WOElement.class };
-			Constructor ctor = c.getConstructor(params);
+			Class<?>[] params = new Class[] { String.class, NSDictionary.class, WOElement.class };
+			Constructor<? extends WODynamicElement> ctor = c.getConstructor(params);
 
 			// create instance of class
 			if (ctor != null) {
@@ -886,7 +893,7 @@ public class WOApplication extends HttpServlet {
 	 * Subclasses may call this method to start a self-hosted web server to serve
 	 * themselves directly (for testing).
 	 */
-	public static void main(String[] argv, Class subclass) {
+	public static void main(String[] argv, Class<?> subclass) {
 		// TODO fix this later
 		/*try {
 			int port = 0;
diff --git a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WODirectAction.java b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WODirectAction.java
index 0ad4181..002e2a3 100644
--- a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WODirectAction.java
+++ b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WODirectAction.java
@@ -90,6 +90,7 @@ public class WODirectAction {
 	 */
 	public WOSession existingSession() {
 		// FIXME: this is incorrect
+		// To do this correctly, probably want to use WOSessionStore
 		HttpSession session = request.servletRequest().getSession();
 		if (session == null)
 			return null;
@@ -156,7 +157,7 @@ public class WODirectAction {
 		Method m;
 		Object key;
 		Object value;
-		java.util.Enumeration e = anArray.objectEnumerator();
+		java.util.Enumeration<Object> e = anArray.objectEnumerator();
 		while (e.hasMoreElements()) {
 			key = e.nextElement();
 			value = request.formValuesForKey(key.toString());
@@ -167,7 +168,7 @@ public class WODirectAction {
 				if (m != null) {
 					// if value isn't null, try to convert it to type
 					if (value != null) {
-						Class[] paramTypes = m.getParameterTypes();
+						Class<?>[] paramTypes = m.getParameterTypes();
 						if (!paramTypes[0].isAssignableFrom(value.getClass())) {
 							// TODO: find a constructor whose parameter
 							// is assignable from value.getClass()
@@ -196,7 +197,7 @@ public class WODirectAction {
 		Method m;
 		Object key;
 		Object value;
-		java.util.Enumeration e = anArray.objectEnumerator();
+		java.util.Enumeration<Object> e = anArray.objectEnumerator();
 		while (e.hasMoreElements()) {
 			key = e.nextElement();
 			value = request.formValueForKey(key.toString());
@@ -207,7 +208,7 @@ public class WODirectAction {
 				if (m != null) {
 					// if value isn't null, try to convert it to type
 					if (value != null) {
-						Class[] paramTypes = m.getParameterTypes();
+						Class<?>[] paramTypes = m.getParameterTypes();
 						Object convertedValue = ValueConverter.convertObjectToClass(value, paramTypes[0]);
 						if (convertedValue != null) {
 							value = convertedValue;
diff --git a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WODirectActionRequestHandler.java b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WODirectActionRequestHandler.java
index 228f387..77a5428 100644
--- a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WODirectActionRequestHandler.java
+++ b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WODirectActionRequestHandler.java
@@ -33,6 +33,7 @@ import net.wotonomy.foundation.NSArray;
  * @version $Revision: 905 $
  */
 public class WODirectActionRequestHandler extends WORequestHandler {
+	@Override
 	public WOResponse handleRequest(WORequest aRequest) {
 		WOResponse response = null;
 
diff --git a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WODynamicElement.java b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WODynamicElement.java
index 6abb7d6..6cf7acd 100644
--- a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WODynamicElement.java
+++ b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WODynamicElement.java
@@ -36,6 +36,7 @@ import net.wotonomy.foundation.NSMutableDictionary;
  * @version $Revision: 905 $
  */
 public abstract class WODynamicElement extends WOElement {
+	private static final long serialVersionUID = -5383805382837136590L;
 	protected String name;
 	protected WOElement rootElement;
 	protected NSDictionary associations;
@@ -68,6 +69,7 @@ public abstract class WODynamicElement extends WOElement {
 	 * context before the start of the request-response cycle. If the context has a
 	 * current component, that component becomes this component's parent.
 	 */
+	@Override
 	void ensureAwakeInContext(WOContext aContext) {
 		if (rootElement != null) {
 			rootElement.ensureAwakeInContext(aContext);
@@ -168,6 +170,7 @@ public abstract class WODynamicElement extends WOElement {
 	 * are associated with the element in the binding. This implementation does
 	 * nothing.
 	 */
+	@Override
 	public void takeValuesFromRequest(WORequest aRequest, WOContext aContext) {
 
 	}
@@ -181,6 +184,7 @@ public abstract class WODynamicElement extends WOElement {
 	 * the action specified in the binding, and return the result of that action.
 	 * This implementation returns null.
 	 */
+	@Override
 	public WOActionResults invokeAction(WORequest aRequest, WOContext aContext) {
 		return null;
 	}
@@ -190,10 +194,12 @@ public abstract class WODynamicElement extends WOElement {
 	 * to a user request. The message should be forwarded to any child elements so
 	 * that the entire tree is traversed. This implementation does nothing.
 	 */
+	@Override
 	public void appendToResponse(WOResponse aResponse, WOContext aContext) {
 		// does nothing
 	}
 
+	@Override
 	public WOResponse generateResponse() {
 		return null;
 	}
diff --git a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOElement.java b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOElement.java
index 184eeea..b1c4282 100644
--- a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOElement.java
+++ b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOElement.java
@@ -31,6 +31,7 @@ import net.wotonomy.foundation.NSDictionary;
  * @version $Revision: 905 $
  */
 public abstract class WOElement implements WOActionResults, Serializable {
+	private static final long serialVersionUID = 3854088436393061500L;
 	NSDictionary associations;
 
 	/**
diff --git a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOMessage.java b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOMessage.java
index f2310c2..d051a53 100644
--- a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOMessage.java
+++ b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOMessage.java
@@ -33,9 +33,9 @@ import net.wotonomy.foundation.NSMutableDictionary;
 public class WOMessage {
 
 	protected String _contentEncoding = "ISO8859_1";
-	protected NSMutableDictionary _headers = new NSMutableDictionary();
-	protected NSMutableDictionary _cookies = new NSMutableDictionary();
-	private NSMutableDictionary _userInfo = new NSMutableDictionary();
+	protected NSMutableDictionary<String, NSArray<String>> _headers = new NSMutableDictionary<>();
+	protected NSMutableDictionary<String, WOCookie> _cookies = new NSMutableDictionary<>();
+	private NSMutableDictionary<Object, Object> _userInfo = new NSMutableDictionary<>();
 	protected NSMutableData _contentData = new NSMutableData();
 
 	public WOMessage() {
@@ -59,7 +59,7 @@ public class WOMessage {
 	/**
 	 * Sets the specified array of values as headers under the specified key.
 	 */
-	public void setHeaders(NSArray headerArray, String aKey) {
+	public void setHeaders(NSArray<String> headerArray, String aKey) {
 		_headers.setObjectForKey(headerArray, aKey);
 	}
 
@@ -67,13 +67,13 @@ public class WOMessage {
 	 * Sets the specified header value for the specified key.
 	 */
 	public void setHeader(String aValue, String aKey) {
-		_headers.setObjectForKey(new NSArray(aValue), aKey);
+		_headers.setObjectForKey(new NSArray<>(aValue), aKey);
 	}
 
 	/**
 	 * Returns an array of all the header keys that have been set in the response.
 	 */
-	public NSArray headerKeys() {
+	public NSArray<String> headerKeys() {
 		return _headers.allKeys();
 	}
 
@@ -81,8 +81,8 @@ public class WOMessage {
 	 * Returns an array of all the header values for the specified key, or null if
 	 * the key does not exist.
 	 */
-	public NSArray headersForKey(String aKey) {
-		return (NSArray) _headers.objectForKey(aKey);
+	public NSArray<String> headersForKey(String aKey) {
+		return _headers.objectForKey(aKey);
 	}
 
 	/**
@@ -90,7 +90,7 @@ public class WOMessage {
 	 * since most header keys will have a single value.
 	 */
 	public String headerForKey(String aKey) {
-		NSArray values = (NSArray) _headers.objectForKey(aKey);
+		NSArray<String> values = _headers.objectForKey(aKey);
 		if (values != null && values.count() > 0) {
 			return values.objectAtIndex(0).toString();
 		}
@@ -118,8 +118,8 @@ public class WOMessage {
 	 * application-specific uses and are available to other actions and components
 	 * in the request-response cycle.
 	 */
-	public void setUserInfo(NSDictionary aDict) {
-		_userInfo = new NSMutableDictionary(aDict);
+	public void setUserInfo(NSDictionary<Object, Object> aDict) {
+		_userInfo = new NSMutableDictionary<>(aDict);
 	}
 
 	/**
@@ -127,8 +127,8 @@ public class WOMessage {
 	 * application-specific uses are are available to other actions and components
 	 * in the request-response cycle.
 	 */
-	public NSDictionary userInfo() {
-		return new NSDictionary(_userInfo);
+	public NSDictionary<Object, Object> userInfo() {
+		return new NSDictionary<>(_userInfo);
 	}
 
 	/**
@@ -195,7 +195,7 @@ public class WOMessage {
 	 * Returns an array of cookies currently being sent with the response. Contains
 	 * whatever cookies have previously been set in this response.
 	 */
-	public NSArray cookies() {
+	public NSArray<WOCookie> cookies() {
 		return _cookies.allValues();
 	}
 
diff --git a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WORepetition.java b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WORepetition.java
index 53615a4..607ab97 100644
--- a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WORepetition.java
+++ b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WORepetition.java
@@ -24,6 +24,7 @@ import java.util.Iterator;
 import net.wotonomy.foundation.NSDictionary;
 
 public class WORepetition extends WODynamicElement {
+	private static final long serialVersionUID = -8039846464450349317L;
 
 	protected int count;
 	protected int index;
@@ -71,6 +72,7 @@ public class WORepetition extends WODynamicElement {
 		return list;
 	}
 
+	@Override
 	public void takeValuesFromRequest(WORequest r, WOContext c) {
 		c.appendZeroElementIDComponent();
 		pullValuesFromParent(c.component());
@@ -91,6 +93,7 @@ public class WORepetition extends WODynamicElement {
 		c.deleteLastElementIDComponent();
 	}
 
+	@Override
 	public WOActionResults invokeAction(WORequest r, WOContext c) {
 		c.appendZeroElementIDComponent();
 		pullValuesFromParent(c.component());
@@ -116,6 +119,7 @@ public class WORepetition extends WODynamicElement {
 		return null;
 	}
 
+	@Override
 	public void appendToResponse(WOResponse r, WOContext c) {
 		c.appendZeroElementIDComponent();
 		pullValuesFromParent(c.component());
diff --git a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WORequest.java b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WORequest.java
index 5664e59..3991b34 100644
--- a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WORequest.java
+++ b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WORequest.java
@@ -20,6 +20,7 @@ package net.wotonomy.web;
 
 import java.io.InputStream;
 import java.util.Enumeration;
+import java.util.Locale;
 
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
@@ -43,7 +44,7 @@ import net.wotonomy.foundation.NSMutableDictionary;
 public class WORequest extends WOResponse {
 	HttpServletRequest request;
 	private WOApplication application;
-	private NSArray languages;
+	private NSArray<Locale> languages;
 	private String requestHandlerKey;
 	private String requestHandlerPath;
 	private String pageName;
@@ -61,11 +62,11 @@ public class WORequest extends WOResponse {
 	/**
 	 * Standard constructor. Method and URL are required. HeaderMap is a map of
 	 * header names to arrays containing one or more values. Data is the content of
-	 * the request. UserInfo contains application-defined paramters that get passed
+	 * the request. UserInfo contains application-defined parameters that get passed
 	 * to all objects involved in dispatching the request.
 	 */
-	public WORequest(String aMethod, String aURL, String aProtocolName, NSDictionary headerMap, NSData aData,
-			NSDictionary userInfo) {
+	public WORequest(String aMethod, String aURL, String aProtocolName, NSDictionary<String, NSArray<Object>> headerMap, NSData aData,
+			NSDictionary<Object, Object> userInfo) {
 		throw new RuntimeException("This constructor is not yet supported.");
 	}
 
@@ -97,7 +98,7 @@ public class WORequest extends WOResponse {
 				requestHandlerPath = requestHandlerPath.substring(i);
 			}
 
-			Enumeration e = requestHandlerPathArray().objectEnumerator();
+			Enumeration<String> e = requestHandlerPathArray().objectEnumerator();
 			// skipping session ID for now
 			if (e.hasMoreElements()) {
 				pageName = e.nextElement().toString();
@@ -131,6 +132,7 @@ public class WORequest extends WOResponse {
 	 * Returns the name of the protocol (presumably HTTP) and the version used by
 	 * the client as sent in the request headers.
 	 */
+	@Override
 	public String httpVersion() {
 		return request.getProtocol();
 	}
@@ -138,7 +140,8 @@ public class WORequest extends WOResponse {
 	/**
 	 * Returns an array of the header names in this request in no particular order.
 	 */
-	public NSArray headerKeys() {
+	@Override
+	public NSArray<String> headerKeys() {
 		return arrayFromEnumeration(request.getHeaderNames());
 	}
 
@@ -146,7 +149,8 @@ public class WORequest extends WOResponse {
 	 * Returns an array of the header values for the specified key in no particular
 	 * order.
 	 */
-	public NSArray headersForKey(String aString) {
+	@Override
+	public NSArray<String> headersForKey(String aString) {
 		return arrayFromEnumeration(request.getHeaders(aString));
 	}
 
@@ -154,6 +158,7 @@ public class WORequest extends WOResponse {
 	 * Returns one value for the specified header key. Provided as a convenience
 	 * since most headers have only one value. Returns null if not found.
 	 */
+	@Override
 	public String headerForKey(String aKey) {
 		return request.getHeader(aKey);
 	}
@@ -163,6 +168,7 @@ public class WORequest extends WOResponse {
 	 * content is determined by the "content-type" header. On error, null is
 	 * returned.
 	 */
+	@Override
 	public NSData content() {
 		// TODO: This is broken!
 		NSMutableData data = new NSMutableData();
@@ -186,11 +192,12 @@ public class WORequest extends WOResponse {
 	 * Returns the application-specific userInfo dictionary. This implementation
 	 * returns the servlet attribute map.
 	 */
+	@Override
 	public NSDictionary userInfo() {
 		// TODO: Test this logic.
 		Object key, value;
-		NSMutableDictionary info = new NSMutableDictionary();
-		java.util.Enumeration e = request.getAttributeNames();
+		NSMutableDictionary<Object, Object> info = new NSMutableDictionary<>();
+		java.util.Enumeration<String> e = request.getAttributeNames();
 		while (e.hasMoreElements()) {
 			key = e.nextElement();
 			value = request.getAttribute(e.nextElement().toString());
@@ -205,7 +212,7 @@ public class WORequest extends WOResponse {
 	 * Returns the items in the request handler path parsed by the "/" delimiter and
 	 * put into an array.
 	 */
-	public NSArray requestHandlerPathArray() {
+	public NSArray<String> requestHandlerPathArray() {
 		return NSArray.componentsSeparatedByString(requestHandlerPath(), "/");
 	}
 
@@ -214,7 +221,7 @@ public class WORequest extends WOResponse {
 	 * The strings are returned in java Locale format, meaning dashes (-) are
 	 * converted to underbars (_): see java.util.Locale.toString().
 	 */
-	public NSArray browserLanguages() {
+	public NSArray<Locale> browserLanguages() {
 		if (languages == null) {
 			languages = arrayFromEnumeration(request.getLocales());
 		}
@@ -284,15 +291,15 @@ public class WORequest extends WOResponse {
 	/**
 	 * Returns an array containing all the form keys in the request.
 	 */
-	public NSArray formValueKeys() {
+	public NSArray<String> formValueKeys() {
 		return arrayFromEnumeration(request.getParameterNames());
 	}
 
 	/**
 	 * Returns an array of the values for the specified key in no particular order.
 	 */
-	public NSArray formValuesForKey(String aKey) {
-		NSMutableArray result = new NSMutableArray();
+	public NSArray<String> formValuesForKey(String aKey) {
+		NSMutableArray<String> result = new NSMutableArray<>();
 		String[] values = request.getParameterValues(aKey);
 		if (values != null) {
 			for (int i = 0; i < values.length; i++) {
@@ -500,8 +507,8 @@ public class WORequest extends WOResponse {
 	/**
 	 * Convenience method to populate an NSArray from an Enumeration.
 	 */
-	private static NSArray arrayFromEnumeration(java.util.Enumeration e) {
-		NSMutableArray result = new NSMutableArray();
+	private static <C> NSArray<C> arrayFromEnumeration(java.util.Enumeration<C> e) {
+		NSMutableArray<C> result = new NSMutableArray<>();
 		while (e.hasMoreElements()) {
 			result.addObject(e.nextElement());
 		}
diff --git a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WORequestHandler.java b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WORequestHandler.java
index 7e3c624..3adf51e 100644
--- a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WORequestHandler.java
+++ b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WORequestHandler.java
@@ -48,7 +48,7 @@ public abstract class WORequestHandler {
 	 * it has been modified. Returns null if not found. Because this method is not
 	 * in the specification, it has only package access.
 	 */
-	Class loadClass(String aName) {
+	Class<?> loadClass(String aName) {
 		try {
 			return loader.loadClass(aName, true);
 		} catch (ClassNotFoundException cnfe) {
diff --git a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOServletSessionStore.java b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOServletSessionStore.java
index fde7f18..3de29b7 100644
--- a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOServletSessionStore.java
+++ b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOServletSessionStore.java
@@ -126,7 +126,7 @@ public class WOServletSessionStore extends WOSessionStore {
 			loader = aClassLoader;
 		}
 
-		protected Class resolveClass(ObjectStreamClass v) throws IOException, ClassNotFoundException {
+		protected Class<?> resolveClass(ObjectStreamClass v) throws IOException, ClassNotFoundException {
 			return loader.loadClass(v.getName());
 		}
 	}
diff --git a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOSession.java b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOSession.java
index 58a45f0..c8c1f4d 100644
--- a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOSession.java
+++ b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOSession.java
@@ -42,6 +42,8 @@ import net.wotonomy.foundation.NSMutableDictionary;
  * @version $Revision: 905 $
  */
 public class WOSession implements Serializable, NSKeyValueCodingAdditions {
+	private static final long serialVersionUID = -5060204676319332437L;
+
 	// NOTE: need to set this when deserialized and on creation
 	transient private HttpSession session;
 
diff --git a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/xml/XMLRPCDecoder.java b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/xml/XMLRPCDecoder.java
index 54658c0..ed27d7c 100644
--- a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/xml/XMLRPCDecoder.java
+++ b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/xml/XMLRPCDecoder.java
@@ -51,6 +51,7 @@ public class XMLRPCDecoder implements XMLDecoder {
 	 * @return The object that was constructed from the XML content, or null if no
 	 *         object could be constructed.
 	 */
+	@Override
 	public Object decode(InputStream anInputStream, String aDescription, URL aURL) {
 		Object result = null;