X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDesktop.java;h=95c08a148a6f746c599a3dad56a20f1b7764a753;hb=58ba1562a8a739699ce47a338803b2641f6d7913;hp=ac992f6dce96f410256c305c6e188dda3261aac8;hpb=bafd98ddd0fc546bdb4ca82f8ed99568db2e8e10;p=jalview.git

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index ac992f6..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,18 +208,16 @@ 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)
      {
        AlignFrame af = new AlignFrame(new Alignment(sequences));
        addInternalFrame(af, file, AlignFrame.NEW_WINDOW_WIDTH, AlignFrame.NEW_WINDOW_HEIGHT);
        af.statusBar.setText("Successfully loaded file " + file);
-       String string = Cache.getProperty("SHOW_FULLSCREEN");
        try{
-         if (string != null)
-           af.setMaximum(Boolean.valueOf(string).booleanValue());
+           af.setMaximum(Preferences.showFullscreen);
        }catch(Exception ex){}
 
      }
@@ -276,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)
@@ -342,6 +338,12 @@ this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this));
      ex.printStackTrace();
    }
  }
+
+ protected void preferences_actionPerformed(ActionEvent e)
+ {
+   Preferences pref = new Preferences();
+ }
+
 }