X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Farchaeopteryx%2Ftools%2FInferenceManager.java;h=24ec184e5fa0c4db9676bcbc974f96721c38eba6;hb=ae9764d1d2d667c26a90543b553f2ada548f1bcf;hp=688624337705a8fc6304a178366f682cbcab65c4;hpb=e86d89ccaf293b3e50d16db81d8e151c37c5fdb1;p=jalview.git diff --git a/forester/java/src/org/forester/archaeopteryx/tools/InferenceManager.java b/forester/java/src/org/forester/archaeopteryx/tools/InferenceManager.java index 6886243..24ec184 100644 --- a/forester/java/src/org/forester/archaeopteryx/tools/InferenceManager.java +++ b/forester/java/src/org/forester/archaeopteryx/tools/InferenceManager.java @@ -10,32 +10,25 @@ public final class InferenceManager { private final static String DEFAULT_PATHS[] = { "C:\\Program Files\\", "C:\\Program Files (x86)\\", "/bin/", "/usr/local/bin/", "/usr/bin/" }; private final File _path_to_local_mafft; - private final File _path_to_local_kalign; private final File _path_to_local_fastme; private final File _path_to_local_raxml; private final File _path_to_local_clustalo; public static InferenceManager createInstance( final Configuration c ) { return new InferenceManager( c.getpathToLocalMafft(), - c.getPathToLocalKalign(), c.getPathToLocalFastme(), c.getPathToLocalRaxml(), c.getPathToLocalClustalOmega() ); } public boolean canDoMsa() { - return ( getPathToLocalMafft() != null ) || ( getPathToLocalKalign() != null ) - || ( getPathToLocalClustalo() != null ); + return ( getPathToLocalMafft() != null ) || ( getPathToLocalClustalo() != null ); } public File getPathToLocalMafft() { return _path_to_local_mafft; } - public File getPathToLocalKalign() { - return _path_to_local_kalign; - } - public File getPathToLocalFastme() { return _path_to_local_fastme; } @@ -52,7 +45,7 @@ public final class InferenceManager { if ( ( path != null ) && path.canExecute() && !path.isDirectory() ) { return path; } - File p1 = new File( name ); + final File p1 = new File( name ); if ( p1.canExecute() && !p1.isDirectory() ) { return p1; } @@ -78,12 +71,10 @@ public final class InferenceManager { } private InferenceManager( final File path_to_local_mafft, - final File path_to_local_kalign, final File path_to_local_fastme, final File path_to_local_raxml, final File path_to_local_clustalo ) { _path_to_local_mafft = createLocalPath( path_to_local_mafft, "mafft" ); - _path_to_local_kalign = createLocalPath( path_to_local_kalign, "kalign" ); _path_to_local_fastme = createLocalPath( path_to_local_fastme, "fastme" ); _path_to_local_raxml = createLocalPath( path_to_local_raxml, "raxml" ); _path_to_local_clustalo = createLocalPath( path_to_local_clustalo, "clustalo" );