2009-07-05 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Call RequestGroup::createNextCommandWithAdj() from
	BtFileAllocationEntry if at least one FileEntry has URI.  The
	static function hasAssociatedUri in RequestGroup.cc is renamed as
	isUriSuppliedForRequsetFileEntry() and placed in FileEntry.h.
	* src/BtFileAllocationEntry.cc
	* src/FileEntry.h
	* src/RequestGroup.cc

1 files changed, 12 insertions, 0 deletions

diff --git a/src/FileEntry.h b/src/FileEntry.h
index a52b2f02..74716141 100644
--- a/src/FileEntry.h
+++ b/src/FileEntry.h
@@ -265,6 +265,18 @@ size_t countRequestedFileEntry(InputIterator first, InputIterator last)
   return count;
 }
 
+// Returns true if at least one requested FileEntry has URIs.
+template<typename InputIterator>
+bool isUriSuppliedForRequsetFileEntry(InputIterator first, InputIterator last)
+{
+  for(; first != last; ++first) {
+    if((*first)->isRequested() && !(*first)->getRemainingUris().empty()) {
+      return true;
+    }
+  }
+  return false;
+}
+
 // Writes first filename to given o.  If memory is true, the output is
 // "[MEMORY]" plus the basename of the first filename.  If there is no
 // FileEntry, writes "n/a" to o.  If more than 1 FileEntry are in the