[Bigdata-commit] SF.net SVN: bigdata:[3707] branches/QUADS_QUERY_BRANCH/ctc-striterators/src /java/cutthecrap/utils/striterators/Sorterator.java

[<tho...@us...>]

Revision: 3707
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3707&view=rev
Author:   thompsonbry
Date:     2010-09-30 23:38:12 +0000 (Thu, 30 Sep 2010)

Log Message:
-----------
Rolled back a Sorterator change which broke a bunch of tests.

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Sorterator.java

Modified: branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Sorterator.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Sorterator.java	2010-09-30 20:39:15 UTC (rev 3706)
+++ branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Sorterator.java	2010-09-30 23:38:12 UTC (rev 3707)
@@ -1,83 +1,77 @@
-/*
-Striterator - transformation and mapping patterns over java Iterators
-
-Copyright (C) SYSTAP, LLC 2010.  All rights reserved.
-
-Contact:
-     SYSTAP, LLC
-     4501 Tower Road
-     Greensboro, NC 27410
-     lic...@bi...
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-package cutthecrap.utils.striterators;
-
-import java.util.*;
-
-/**
- * Initialized with a Sorter object, wraps a standard iterator and resolves each
- * returned object
- */
-
-public class Sorterator implements Iterator {
-
-	private final Iterator m_src;
-	private Iterator m_iter;
-	private final Sorter m_sorter;
-	protected final Object m_context;
-	private boolean m_doneSort = false;
-
-	public Sorterator(Iterator iter, Object context, Sorter sorter) {
-
-		m_context = context;
-		m_src = iter;
-		m_sorter = sorter;
-
-	}
-
-	private void sort() {
-		if (!m_doneSort) {
-			// materialize the objects to be sorted.
-			LinkedList tmp = new LinkedList();
-
-			while (m_src.hasNext()) {
-				tmp.add(m_src.next());
-			}
-
-			Object[] a = tmp.toArray();
-
-			Arrays.sort(a, m_sorter/* .getComparator() */);
-
-			m_iter = Arrays.asList(a).iterator();
-			m_doneSort = true;
-		}
-	}
-
-	public boolean hasNext() {
-		return m_iter.hasNext();
-	}
-
-	public Object next() {
-		if (hasNext())
-			return m_iter.next();
-		else
-			throw new NoSuchElementException();
-	}
-
-	public void remove() {
-		m_iter.remove();
-	}
+/*
+Striterator - transformation and mapping patterns over java Iterators
+
+Copyright (C) SYSTAP, LLC 2010.  All rights reserved.
+
+Contact:
+     SYSTAP, LLC
+     4501 Tower Road
+     Greensboro, NC 27410
+     lic...@bi...
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+package cutthecrap.utils.striterators;
+
+import java.util.*;
+
+/**
+ * Initialized with a Sorter object, wraps a standard iterator and resolves each returned object
+ */
+
+public class Sorterator implements Iterator {
+
+    private final Iterator m_iter;
+    protected final Object m_context;
+    
+    public Sorterator(Iterator iter, Object context, Sorter sorter) {
+
+        this.m_context = context;
+
+        // materialize the objects to be sorted.
+        LinkedList tmp = new LinkedList();
+        
+        while(iter.hasNext()) {
+            tmp.add(iter.next());
+        }
+        
+        Object[] a = tmp.toArray();
+        
+        Arrays.sort(a, sorter/*.getComparator()*/);
+        
+        m_iter = Arrays.asList(a).iterator();
+        
+//        TreeSet set = new TreeSet(sorter);
+//
+//        while (iter.hasNext()) {
+//            set.add(iter.next());
+//        }
+//
+//        m_iter = set.iterator();
+
+    }
+
+  public boolean hasNext() {
+    return m_iter.hasNext();
+  }
+  
+  public Object next() {
+    return m_iter.next();
+  }
+  
+  public void remove() {
+    m_iter.remove();
+  }
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.