Skip to content
This repository has been archived by the owner on Sep 27, 2020. It is now read-only.

Commit

Permalink
Merge pull request #17 from sc13-bioinf/master
Browse files Browse the repository at this point in the history
fix issue 3 multiple runs from one session
  • Loading branch information
apeltzer committed Jul 28, 2016
2 parents 67d69e3 + 9c032d6 commit 6ae6679
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion src/main/EAGER.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.stream.Collectors;

/**
* Created with IntelliJ IDEA.
Expand All @@ -38,7 +39,7 @@
* To change this template use File | Settings | File Templates.
*/
public class EAGER {
private final String EAGER_VERSION = "1.92.12";
private final String EAGER_VERSION = "1.92.13";

private String filepath;
private JCheckBox fastQCAnalysisCheckBox;
Expand Down Expand Up @@ -455,6 +456,8 @@ public void actionPerformed(ActionEvent actionEvent) {
try {
collectMainWindowInformation();
if (communicator.getConflict() == 0) {
ArrayList<String> original_gui_inputfiles = communicator.getGUI_inputfiles().stream().map( s -> s.toString() ).collect(Collectors.toCollection(ArrayList::new));

if (communicator.getGUI_inputfiles().size() == 1) { //Then this is a folder
File f = new File(communicator.getGUI_inputfiles().get(0));
if (f.isDirectory()) {
Expand Down Expand Up @@ -573,10 +576,14 @@ public void actionPerformed(ActionEvent actionEvent) {
// For each pair create a new communicator object and let ConfigGenerator store this object

}

ConfigurationCreated configurationCreated = new ConfigurationCreated(communicator);
setWindowPosition(configurationCreated);
configurationCreated.setSize(650, 400);
configurationCreated.setVisible(true);

communicator.setGUI_inputfiles(original_gui_inputfiles);

} else {
ConfigurationException cfge = new ConfigurationException(communicator);
cfge.setSize(650, 400);
Expand Down

0 comments on commit 6ae6679

Please sign in to comment.