no need to send pid, seqnum

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

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index ac992f6..95c08a1 100755 (executable)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -12,14 +12,12 @@ package jalview.gui;
 import jalview.gui.*;\r
 import jalview.io.*;\r
 import jalview.datamodel.*;\r
-import jalview.schemes.*;\r
 import javax.swing.*;\r
 import java.awt.*;\r
 import java.awt.event.*;\r
 import java.awt.dnd.*;\r
 import javax.swing.*;\r
 import java.awt.datatransfer.*;\r
-import java.io.*;\r
 import jalview.bin.Cache;\r
 \r
 \r
@@ -210,18 +208,16 @@ this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this));
    {\r
      SequenceI [] sequences = null;\r
 \r
-     if (FormatProperties.contains(format))\r
-         sequences = FormatAdapter.read(file, protocol, format);\r
+     if (FormatAdapter.formats.contains(format))\r
+         sequences = FormatAdapter.readFile(file, protocol, format);\r
 \r
      if (sequences != null && sequences.length>0)\r
      {\r
        AlignFrame af = new AlignFrame(new Alignment(sequences));\r
        addInternalFrame(af, file, AlignFrame.NEW_WINDOW_WIDTH, AlignFrame.NEW_WINDOW_HEIGHT);\r
        af.statusBar.setText("Successfully loaded file " + file);\r
-       String string = Cache.getProperty("SHOW_FULLSCREEN");\r
        try{\r
-         if (string != null)\r
-           af.setMaximum(Boolean.valueOf(string).booleanValue());\r
+           af.setMaximum(Preferences.showFullscreen);\r
        }catch(Exception ex){}\r
 \r
      }\r
@@ -276,8 +272,8 @@ this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this));
     String format = IdentifyFile.Identify(cap.getText(), "Paste");\r
     SequenceI [] sequences = null;\r
 \r
-    if (FormatProperties.contains( format ))\r
-      sequences = FormatAdapter.read(cap.getText(), "Paste", format);\r
+    if (FormatAdapter.formats.contains( format ))\r
+      sequences = FormatAdapter.readFile(cap.getText(), "Paste", format);\r
 \r
 \r
       if(sequences!=null)\r
@@ -342,6 +338,12 @@ this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this));
      ex.printStackTrace();\r
    }\r
  }\r
+\r
+ protected void preferences_actionPerformed(ActionEvent e)\r
+ {\r
+   Preferences pref = new Preferences();\r
+ }\r
+\r
 }\r
 \r
 \r