X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=runner%2Fcompbio%2Frunner%2Fdisorder%2FDisembl.java;fp=runner%2Fcompbio%2Frunner%2Fdisorder%2FDisembl.java;h=6b014ba7dbb93e6ca995ccae6b745a1718024014;hb=9ba9d7fd62b1f98b09ed4097c4b38ae94e25a72a;hp=616b5521033e1c7d4ffe177e5012eaf29d8d7ff5;hpb=9d860c3793c6812f643caa01fc80a0036fa3fe2b;p=jabaws.git

diff --git a/runner/compbio/runner/disorder/Disembl.java b/runner/compbio/runner/disorder/Disembl.java
index 616b552..6b014ba 100644
--- a/runner/compbio/runner/disorder/Disembl.java
+++ b/runner/compbio/runner/disorder/Disembl.java
@@ -19,12 +19,10 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.HashMap;
-import java.util.HashSet;
 
 import org.apache.log4j.Logger;
 
-import compbio.data.sequence.Score;
+import compbio.data.sequence.ScoreManager;
 import compbio.data.sequence.SequenceUtil;
 import compbio.data.sequence.UnknownFileFormatException;
 import compbio.engine.client.Executable;
@@ -85,15 +83,15 @@ public class Disembl extends SkeletalExecutable<Disembl>
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public HashMap<String, HashSet<Score>> getResults(String workDirectory)
+	public ScoreManager getResults(String workDirectory)
 			throws ResultNotAvailableException {
 
 		InputStream inStream = null;
-		HashMap<String, HashSet<Score>> results = null;
+		ScoreManager results = null;
 
 		try {
 			inStream = new FileInputStream(new File(workDirectory, getOutput()));
-			results = SequenceUtil.removeSequences(SequenceUtil
+			results = ScoreManager.newInstance(SequenceUtil
 					.readDisembl(inStream));
 			inStream.close();
 		} catch (FileNotFoundException e) {
@@ -112,7 +110,6 @@ public class Disembl extends SkeletalExecutable<Disembl>
 		log.trace("DRESULTS: " + results);
 		return results;
 	}
-
 	@Override
 	public Disembl setInput(String inFile) {
 		super.setInput(inFile);