# HG changeset patch
# User Chris Cannam
# Date 1357922899 0
# Node ID 11933d198ad0902d3298d4e587393188dd521810
# Parent  6ce0ffdc7b0003dde3caa6b5ee8a9b772fa37cfe# Parent  bf25c6d663d2e6a35dabd95197943d63a7de3e86
Merge

diff -r bf25c6d663d2 -r 11933d198ad0 vamp.yeti
--- a/vamp.yeti	Thu Jan 10 17:55:48 2013 +0000
+++ b/vamp.yeti	Fri Jan 11 16:48:19 2013 +0000
@@ -8,7 +8,7 @@
 
 import java.lang: UnsatisfiedLinkError;
 
-import java.util: TreeMap, AbstractList;
+import java.util: Map, List;
 
 block = load block;
 fr = load framer;
@@ -26,7 +26,7 @@
 featureList fl is ~Object -> 'a =
     if nullptr? fl then []
     else
-        a = fl unsafely_as ~AbstractList;
+        a = fl unsafely_as ~List;
         result = array [];
         itr = a#iterator();
         itr#hasNext() loop (push result (feature (itr#next() unsafely_as ~Feature)));
@@ -36,7 +36,7 @@
 numberOf n is ~Object -> number =
    (n unsafely_as ~Integer)#intValue();
 
-featureSet fs is ~TreeMap -> 'a =
+featureSet fs is ~Map -> 'a =
    (s = [:];
     kk = list fs#keySet()#toArray(); //!!! ugh
     for kk do k: s[numberOf k] := featureList fs#get(k) done;