X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FDesktop.java;h=27f60ea0296d7c4e8fe17268f84a509c4bb0348c;hb=007af0c9001900071f6d8e9214143f79e10f4938;hp=8ba21e5a08bab761334ccb73b059b9a8f3e802c1;hpb=e1767448d422ab26a6920bae2173804eda662e31;p=jalview.git diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java index 8ba21e5..27f60ea 100644 --- a/src/jalview/gui/Desktop.java +++ b/src/jalview/gui/Desktop.java @@ -653,7 +653,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements String file = (String) contents .getTransferData(DataFlavor.stringFlavor); - String format = new IdentifyFile().Identify(file, + String format = new IdentifyFile().identify(file, FormatAdapter.PASTE); new FileLoader().LoadFile(file, FormatAdapter.PASTE, format); @@ -1007,7 +1007,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements } else { - format = new IdentifyFile().Identify(file, protocol); + format = new IdentifyFile().identify(file, protocol); } new FileLoader().LoadFile(file, protocol, format); @@ -1058,20 +1058,13 @@ public class Desktop extends jalview.jbgui.GDesktop implements } else { - format = new IdentifyFile().Identify(choice, FormatAdapter.FILE); + format = new IdentifyFile().identify(choice, FormatAdapter.FILE); } if (viewport != null) { new FileLoader().LoadFile(viewport, choice, FormatAdapter.FILE, format); - // viewport.setShowSequenceFeatures(JSONFile.isSeqFeaturesEnabled()); - // AlignFrame af = viewport.getAlignPanel().alignFrame; - // if (af != null) - // { - // af.changeColour(JSONFile.getColourScheme()); - // af.setMenusForViewport(); - // } } else { @@ -1141,7 +1134,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements } else { - String format = new IdentifyFile().Identify(url, FormatAdapter.URL); + String format = new IdentifyFile().identify(url, FormatAdapter.URL); if (format.equals("URL NOT FOUND")) {