From: kjvdheide <kjvanderheide@dundee.ac.uk>
Date: Mon, 13 Nov 2017 19:56:05 +0000 (+0000)
Subject: JAL-2805 more interface name changing
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=624b2dcf1e4830af721cc410c9974aff9795dcc5;p=jalview.git

JAL-2805 more interface name changing
---

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<F extends JInternalFrame>
+public interface ExternalTreeParserI<F extends JInternalFrame>
 {
   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<MainFrame>
+public class ForesterTreeParser implements ExternalTreeParserI<MainFrame>
 {
   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<MainFrame>
 
   }
 
-  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();