Rename ResolverTask to DataSetResolverTask.

Author: mikekucera

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/commands/MastermapCommandTask.java

@@ -9,7 +9,7 @@
 import org.baderlab.csplugins.enrichmentmap.commands.tunables.FilterTunables;
 import org.baderlab.csplugins.enrichmentmap.model.DataSetParameters;
 import org.baderlab.csplugins.enrichmentmap.model.EMCreationParameters;
-import org.baderlab.csplugins.enrichmentmap.resolver.ResolverTask;
+import org.baderlab.csplugins.enrichmentmap.resolver.DataSetResolverTask;
 import org.baderlab.csplugins.enrichmentmap.task.CreateEMNetworkTask;
 import org.baderlab.csplugins.enrichmentmap.task.CreateEnrichmentMapTaskFactory;
 import org.baderlab.csplugins.enrichmentmap.util.NullTaskMonitor;
@@ -65,7 +65,7 @@ public void run(TaskMonitor tm) throws Exception {
 		}
 
 		// Scan root folder (note: throws exception if no data sets were found)
-		ResolverTask resolverTask = new ResolverTask(rootFolder);
+		DataSetResolverTask resolverTask = new DataSetResolverTask(rootFolder);
 
 		if(pattern != null) {
 			PathMatcher matcher = FileSystems.getDefault().getPathMatcher("glob:" + pattern);

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/commands/MastermapListCommandTask.java

@@ -8,7 +8,7 @@
 
 import org.baderlab.csplugins.enrichmentmap.model.DataSetFiles;
 import org.baderlab.csplugins.enrichmentmap.model.DataSetParameters;
-import org.baderlab.csplugins.enrichmentmap.resolver.ResolverTask;
+import org.baderlab.csplugins.enrichmentmap.resolver.DataSetResolverTask;
 import org.baderlab.csplugins.enrichmentmap.util.NullTaskMonitor;
 import org.cytoscape.work.AbstractTask;
 import org.cytoscape.work.ObservableTask;
@@ -45,7 +45,7 @@ public void run(TaskMonitor tm) throws Exception {
 			throw new IllegalArgumentException("rootFolder is invalid: " + rootFolder);
 		}
 
-		ResolverTask resolverTask = new ResolverTask(rootFolder);
+		DataSetResolverTask resolverTask = new DataSetResolverTask(rootFolder);
 
 		if(pattern != null) {
 			PathMatcher matcher = FileSystems.getDefault().getPathMatcher("glob:" + pattern);

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/resolver/ResolverTask.java renamed to EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/resolver/DataSetResolverTask.java

@@ -12,23 +12,23 @@
 import org.cytoscape.work.ObservableTask;
 import org.cytoscape.work.TaskMonitor;
 
-public class ResolverTask extends AbstractTask implements ObservableTask {
+public class DataSetResolverTask extends AbstractTask implements ObservableTask {
 
 	private final List<Path> paths = new ArrayList<>();
 	private final List<DataSetParameters> results = new ArrayList<>();
 
 	private PathMatcher matcher = null;
 
 
-	public ResolverTask(Path root) {
+	public DataSetResolverTask(Path root) {
 		paths.add(root);
 	}
 
-	public ResolverTask(File root) {
+	public DataSetResolverTask(File root) {
 		this(root.toPath());
 	}
 
-	public ResolverTask(List<File> files) {
+	public DataSetResolverTask(List<File> files) {
 		for(File file : files) 
 			paths.add(file.toPath());
 	}

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/MasterDetailDialogPage.java

@@ -60,7 +60,7 @@
 import org.baderlab.csplugins.enrichmentmap.model.EMCreationParameters;
 import org.baderlab.csplugins.enrichmentmap.model.EMCreationParameters.EdgeStrategy;
 import org.baderlab.csplugins.enrichmentmap.model.EMDataSet.Method;
-import org.baderlab.csplugins.enrichmentmap.resolver.ResolverTask;
+import org.baderlab.csplugins.enrichmentmap.resolver.DataSetResolverTask;
 import org.baderlab.csplugins.enrichmentmap.task.CreateEnrichmentMapTaskFactory;
 import org.baderlab.csplugins.enrichmentmap.task.InitializeGenesetsOfInterestTask.MissingGenesetStrategy;
 import org.baderlab.csplugins.enrichmentmap.task.MissingGenesetsException;
@@ -461,7 +461,7 @@ private void scanButtonClicked() {
 
 	private void runResolverTask(List<File> files) {
 		scanButton.setEnabled(false);
-		ResolverTask task = new ResolverTask(files);
+		DataSetResolverTask task = new DataSetResolverTask(files);
 
 		dialogTaskManager.execute(new TaskIterator(task), new TaskObserver() {