X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDesktop.java;h=95c08a148a6f746c599a3dad56a20f1b7764a753;hb=58ba1562a8a739699ce47a338803b2641f6d7913;hp=fd8a8beae8d2cee64c4d716cecf7fc959a558068;hpb=9bea55eea55110a19b17d0127903802013fa60ea;p=jalview.git diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java index fd8a8be..95c08a1 100755 --- a/src/jalview/gui/Desktop.java +++ b/src/jalview/gui/Desktop.java @@ -12,14 +12,12 @@ package jalview.gui; import jalview.gui.*; import jalview.io.*; import jalview.datamodel.*; -import jalview.schemes.*; import javax.swing.*; import java.awt.*; import java.awt.event.*; import java.awt.dnd.*; import javax.swing.*; import java.awt.datatransfer.*; -import java.io.*; import jalview.bin.Cache; @@ -210,8 +208,8 @@ this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this)); { SequenceI [] sequences = null; - if (FormatProperties.contains(format)) - sequences = FormatAdapter.read(file, protocol, format); + if (FormatAdapter.formats.contains(format)) + sequences = FormatAdapter.readFile(file, protocol, format); if (sequences != null && sequences.length>0) { @@ -274,8 +272,8 @@ this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this)); String format = IdentifyFile.Identify(cap.getText(), "Paste"); SequenceI [] sequences = null; - if (FormatProperties.contains( format )) - sequences = FormatAdapter.read(cap.getText(), "Paste", format); + if (FormatAdapter.formats.contains( format )) + sequences = FormatAdapter.readFile(cap.getText(), "Paste", format); if(sequences!=null)