# HG changeset patch # User Chris Cannam # Date 1357922336 0 # Node ID 6ce0ffdc7b0003dde3caa6b5ee8a9b772fa37cfe # Parent f6c70e462cc322c30c891878da44ae916d9a79e8 jVamp now uses interfaces diff -r f6c70e462cc3 -r 6ce0ffdc7b00 vamp.yeti --- a/vamp.yeti Wed Jan 09 21:36:17 2013 +0000 +++ b/vamp.yeti Fri Jan 11 16:38:56 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;