JAL-2344 use .equals() to compare FileFormatI objects

[jalview.git] / src / jalview / gui / AlignFrame.java

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 453fd3a..8cc1dd5 100644 (file)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -1011,7 +1011,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
       // originating file's format
       // TODO: work out how to recover feature settings for correct view(s) when
       // file is reloaded.
-      if (currentFileFormat == FileFormat.Jalview)
+      if (FileFormat.Jalview.equals(currentFileFormat))
       {
         JInternalFrame[] frames = Desktop.desktop.getAllFrames();
         for (int i = 0; i < frames.length; i++)
@@ -1155,7 +1155,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
   {
     boolean success = true;
 
-    if (format == FileFormat.Jalview)
+    if (FileFormat.Jalview.equals(format))
     {
       String shortName = title;
 
@@ -5099,7 +5099,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
               }
               if (type != null)
               {
-                if (type == FileFormat.PDB)
+                if (FileFormat.PDB.equals(type))
                 {
                   filesmatched.add(new Object[] { file, protocol, mtch });
                   continue;
@@ -5210,7 +5210,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
       // if the file isn't identified, or not positively identified as some
       // other filetype (PFAM is default unidentified alignment file type) then
       // try to parse as annotation.
-      boolean isAnnotation = (format == null || format == FileFormat.Pfam) ? new AnnotationFile()
+      boolean isAnnotation = (format == null || FileFormat.Pfam
+              .equals(format)) ? new AnnotationFile()
               .annotateAlignmentView(viewport, file, sourceType) : false;
 
       if (!isAnnotation)
@@ -5267,7 +5268,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
           {
             format = new IdentifyFile().identify(file, sourceType);
           }
-          if (format == FileFormat.Jnet)
+          if (FileFormat.Jnet.equals(format))
           {
             JPredFile predictions = new JPredFile(
                     file, sourceType);
@@ -5282,7 +5283,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
             isAnnotation = true;
           }
           // else if (IdentifyFile.FeaturesFile.equals(format))
-          else if (format == FileFormat.Features)
+          else if (FileFormat.Features.equals(format))
           {
             if (parseFeaturesFile(file, sourceType))
             {