Commit bfd10f98 authored by Davide Lagoa's avatar Davide Lagoa
Browse files

refatoring + conflict solved

parent 459e7cf8
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>scraper</name> <name>transyt-scraper</name>
<comment></comment> <comment></comment>
<projects> <projects>
</projects> </projects>
......
...@@ -23,9 +23,9 @@ import connection.TcdbExplorer; ...@@ -23,9 +23,9 @@ import connection.TcdbExplorer;
import connection.TcdbRetriever; import connection.TcdbRetriever;
import enumerators.TypeOfTransporter; import enumerators.TypeOfTransporter;
import files.FilesUtils; import files.FilesUtils;
import javafx.util.Pair;
import tcdb.capsules.ReactionContainer; import tcdb.capsules.ReactionContainer;
import tcdb.capsules.TcNumberContainer; import tcdb.capsules.TcNumberContainer;
import pt.uminho.ceb.biosystems.merlin.utilities.Pair;
/** /**
* @author Davide * @author Davide
...@@ -521,10 +521,10 @@ public class FindTransporters { ...@@ -521,10 +521,10 @@ public class FindTransporters {
Pair<Set<String>, Set<String>> reactants = compartmentsParser(reactant); Pair<Set<String>, Set<String>> reactants = compartmentsParser(reactant);
Pair<Set<String>, Set<String>> products = compartmentsParser(product); Pair<Set<String>, Set<String>> products = compartmentsParser(product);
Set<String> reactantsMetab = reactants.getKey(); Set<String> reactantsMetab = reactants.getA();
Set<String> reactantsComp = reactants.getValue(); Set<String> reactantsComp = reactants.getB();
Set<String> productsMetab = products.getKey(); Set<String> productsMetab = products.getA();
Set<String> productsComp = products.getValue(); Set<String> productsComp = products.getB();
boolean one = false; boolean one = false;
boolean ol = false; boolean ol = false;
......
Manifest-Version: 1.0 Manifest-Version: 1.0
Built-By: Davide Built-By: davidelagoa
Build-Jdk: 10.0.1 Build-Jdk: 11.0.1
Created-By: Maven Integration for Eclipse Created-By: Maven Integration for Eclipse
#Generated by Maven Integration for Eclipse #Generated by Maven Integration for Eclipse
#Thu Nov 08 14:56:50 GMT 2018 #Thu Nov 08 17:49:52 WET 2018
m2e.projectLocation=C\:\\Users\\Davide\\Biosynth2\\scraper m2e.projectLocation=/Users/davidelagoa/TranSyT/transyt-scraper
m2e.projectName=scraper m2e.projectName=transyt-scraper
groupId=tcdb groupId=tcdb
artifactId=triage artifactId=triage
version=0.0.1-SNAPSHOT version=0.0.1-SNAPSHOT
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment