From 624b2dcf1e4830af721cc410c9974aff9795dcc5 Mon Sep 17 00:00:00 2001 From: kjvdheide Date: Mon, 13 Nov 2017 19:56:05 +0000 Subject: [PATCH] JAL-2805 more interface name changing --- .../forester/io/{TreeParserI.java => ExternalTreeParserI.java} | 2 +- .../ext/forester/io/{TreeParser.java => ForesterTreeParser.java} | 6 +++--- src/jalview/gui/AlignFrame.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename src/jalview/ext/forester/io/{TreeParserI.java => ExternalTreeParserI.java} (60%) rename src/jalview/ext/forester/io/{TreeParser.java => ForesterTreeParser.java} (93%) diff --git a/src/jalview/ext/forester/io/TreeParserI.java b/src/jalview/ext/forester/io/ExternalTreeParserI.java similarity index 60% rename from src/jalview/ext/forester/io/TreeParserI.java rename to src/jalview/ext/forester/io/ExternalTreeParserI.java index 034cdca..9095a0f 100644 --- a/src/jalview/ext/forester/io/TreeParserI.java +++ b/src/jalview/ext/forester/io/ExternalTreeParserI.java @@ -2,7 +2,7 @@ package jalview.ext.forester.io; import javax.swing.JInternalFrame; -public interface TreeParserI +public interface ExternalTreeParserI { public F loadTree(); } diff --git a/src/jalview/ext/forester/io/TreeParser.java b/src/jalview/ext/forester/io/ForesterTreeParser.java similarity index 93% rename from src/jalview/ext/forester/io/TreeParser.java rename to src/jalview/ext/forester/io/ForesterTreeParser.java index 85f57b6..3096269 100644 --- a/src/jalview/ext/forester/io/TreeParser.java +++ b/src/jalview/ext/forester/io/ForesterTreeParser.java @@ -12,13 +12,13 @@ import org.forester.archaeopteryx.Archaeopteryx; import org.forester.archaeopteryx.MainFrame; import org.forester.util.ForesterUtil; -public class TreeParser implements TreeParserI +public class ForesterTreeParser implements ExternalTreeParserI { private final String filePath; private final File file; - public TreeParser(final String treeFilePath) + public ForesterTreeParser(final String treeFilePath) { final String possibleError = ForesterUtil.isReadableFile(treeFilePath); if (possibleError != null) @@ -34,7 +34,7 @@ public class TreeParser implements TreeParserI } - public TreeParser(final File treeFile) throws IOException + public ForesterTreeParser(final File treeFile) throws IOException { final String possibleError = ForesterUtil.isReadableFile(treeFile); if (possibleError != null) diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java index 4e3df8b..bde5eb6 100644 --- a/src/jalview/gui/AlignFrame.java +++ b/src/jalview/gui/AlignFrame.java @@ -61,7 +61,7 @@ import jalview.datamodel.Sequence; import jalview.datamodel.SequenceGroup; import jalview.datamodel.SequenceI; import jalview.ext.forester.io.SupportedTreeFileFilter; -import jalview.ext.forester.io.TreeParser; +import jalview.ext.forester.io.ForesterTreeParser; import jalview.gui.ColourMenuHelper.ColourChangeListener; import jalview.gui.ViewSelectionMenu.ViewSetProvider; import jalview.io.AlignmentProperties; @@ -3902,7 +3902,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, NewickFile fin = null; try { - TreeParser treeParser = new TreeParser(filePath); + ForesterTreeParser treeParser = new ForesterTreeParser(filePath); treeParser.loadTree(); -- 1.7.10.2