Merge branch 'master' of github.com:slburson/fset-java

com/ergy/fset/FLinkedHashMap.java

@@ -24,7 +24,8 @@
  *
  * <p>WARNING: <code>less</code> takes O(n) time in this implementation.  Avoid it.
  *
- * <p>Still unimplemented: <code>restrictedTo</code>, <code>restrictedFrom</code>.
+ * <p>Still unimplemented: user-supplied comparators; <code>restrictedTo</code>,
+ * <code>restrictedFrom</code>.
  */
 
 public class FLinkedHashMap<Key, Val>
@@ -74,6 +75,13 @@ public int size() {
 	return FHashMap.treeSize(map_tree);
     }
 
+    /**
+     * Returns the keys in the map, in order, as an FList.
+     */
+    public FList<Key> keyList() {
+	return new FTreeList<Key>(list_tree, null);
+    }
+
     public Map.Entry<Key, Val> arb() {
 	return (Map.Entry<Key, Val>)FHashMap.arb(map_tree);
     }

com/ergy/fset/FLinkedHashSet.java

@@ -18,13 +18,14 @@
 
 
 /**
- * Just like <code>FHashSet</code> except that the iterator returns entries
- * in the same order in which the keys were first added.
+ * Just like <code>FHashSet</code> except that the iterator returns elements
+ * in the same order in which they were first added.
  *
  * <p>WARNING: <code>less</code> takes O(n) time, in general, in this implementation.
  * Avoid it, except in the special case of the element just returned by <code>arb</code>.
  *
- * Still unimplemented: <code>intersection</code>, <code>difference</code>.
+ * Still unimplemented: user-supplied comparators; <code>intersection</code>,
+ * <code>difference</code>.
  */
 
 public class FLinkedHashSet<Elt>
@@ -64,6 +65,13 @@ public int size() {
 	return FHashSet.treeSize(set_tree);
     }
 
+    /**
+     * Returns the contents of the set, in order, as an FList.
+     */
+    public FList<Elt> toList() {
+	return new FTreeList<Elt>(list_tree, null);
+    }
+
     /**
      * On an <code>FLinkedHashSet</code>, always returns the element that was added first.
      * (A subsequent call to <code>less</code> passing this element will be efficient.)