From 54b24d3cc9640f605c1c0c6cb35d78c55b4a6db3 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Mon, 12 Jul 2010 11:09:33 +0000
Subject: [PATCH] [LMS-1634] extracted code to commons
SVN: 16976
---
.../bsse/cisd/dsu/dss/FlowLaneFeeder.java | 25 ++++---------------
1 file changed, 5 insertions(+), 20 deletions(-)
diff --git a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeeder.java b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeeder.java
index 10a33354e4e..2c9be622708 100644
--- a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeeder.java
+++ b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeeder.java
@@ -27,9 +27,9 @@ import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
+import java.util.Map.Entry;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
@@ -92,8 +92,8 @@ class FlowLaneFeeder extends AbstractPostRegistrationDataSetHandlerForFileBasedU
static final String FILE_TYPE = ".srf";
- private final static Logger operationLog = LogFactory.getLogger(LogCategory.OPERATION,
- FlowLaneFeeder.class);
+ private final static Logger operationLog =
+ LogFactory.getLogger(LogCategory.OPERATION, FlowLaneFeeder.class);
private final IEncapsulatedOpenBISService service;
@@ -152,7 +152,7 @@ class FlowLaneFeeder extends AbstractPostRegistrationDataSetHandlerForFileBasedU
Map<String, Sample> flowLaneSampleMap = createFlowLaneSampleMap(dataSetInformation);
String flowcellID = originalData.getName();
List<File> files = new ArrayList<File>();
- findFiles(originalData, files, createFileFilter());
+ FileUtilities.findFiles(originalData, files, createSrfFileFilter());
if (files.size() < flowLaneSampleMap.size())
{
throw new EnvironmentFailureException("Only " + files.size()
@@ -372,22 +372,7 @@ class FlowLaneFeeder extends AbstractPostRegistrationDataSetHandlerForFileBasedU
return flowLane;
}
- private void findFiles(File file, List<File> files, FileFilter filter)
- {
- if (filter.accept(file))
- {
- files.add(file);
- }
- if (file.isDirectory())
- {
- for (File child : file.listFiles())
- {
- findFiles(child, files, filter);
- }
- }
- }
-
- private FileFilter createFileFilter()
+ private FileFilter createSrfFileFilter()
{
return new FileFilter()
{
--
GitLab