X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJalview2XML_V1.java;h=74728777344e97fdc6e18f2ab87dcc2306cd7943;hb=400b50efffaa43ae2c3b4d3f653bf8215c5d1edc;hp=5cd3bb238291972be79f494866bee3569e595840;hpb=7d67fb613ec026dc9a265e351e7fab542e3f1d61;p=jalview.git

diff --git a/src/jalview/gui/Jalview2XML_V1.java b/src/jalview/gui/Jalview2XML_V1.java
index 5cd3bb2..7472877 100755
--- a/src/jalview/gui/Jalview2XML_V1.java
+++ b/src/jalview/gui/Jalview2XML_V1.java
@@ -52,8 +52,6 @@ import java.util.Vector;
 import java.util.jar.JarEntry;
 import java.util.jar.JarInputStream;
 
-import javax.swing.JOptionPane;
-
 /**
  * DOCUMENT ME!
  * 
@@ -156,11 +154,11 @@ public class Jalview2XML_V1
 
             System.err.println("Couldn't locate Jalview XML file : " + ex
                     + "\n");
-            JOptionPane.showInternalMessageDialog(Desktop.desktop,
+            JvOptionPane.showInternalMessageDialog(Desktop.desktop,
                     MessageManager.formatMessage("label.couldnt_locate",
                             new String[] { file }), MessageManager
                             .getString("label.url_not_found"),
-                    JOptionPane.WARNING_MESSAGE);
+                    JvOptionPane.WARNING_MESSAGE);
           }
         });
       }
@@ -177,12 +175,12 @@ public class Jalview2XML_V1
           public void run()
           {
 
-            JOptionPane.showInternalMessageDialog(Desktop.desktop,
+            JvOptionPane.showInternalMessageDialog(Desktop.desktop,
                     MessageManager.formatMessage(
                             "label.error_loading_file_params", new String[]
                             { file }), MessageManager
                             .getString("label.error_loading_jalview_file"),
-                    JOptionPane.WARNING_MESSAGE);
+                    JvOptionPane.WARNING_MESSAGE);
           }
         });
       }
@@ -333,15 +331,10 @@ public class Jalview2XML_V1
           }
           else
           {
-            cs = ColourSchemeProperty.getColour(al, groups[i].getColour());
-          }
-
-          if (cs != null)
-          {
-            cs.setThreshold(groups[i].getPidThreshold(), true);
+            cs = ColourSchemeProperty.getColourScheme(al, groups[i].getColour());
           }
-
         }
+        int pidThreshold = groups[i].getPidThreshold();
 
         Vector seqs = new Vector();
         int[] ids = groups[i].getSeq();
@@ -355,6 +348,7 @@ public class Jalview2XML_V1
                 seqs, groups[i].getName(), cs, groups[i].getDisplayBoxes(),
                 groups[i].getDisplayText(), groups[i].getColourText(),
                 groups[i].getStart(), groups[i].getEnd());
+        sg.getGroupColourScheme().setThreshold(pidThreshold, true);
 
         sg.setOutlineColour(new java.awt.Color(groups[i].getOutlineColour()));
 
@@ -401,23 +395,27 @@ public class Jalview2XML_V1
       }
       else
       {
-        cs = ColourSchemeProperty.getColour(al, view.getBgColour());
+        cs = ColourSchemeProperty.getColourScheme(al, view.getBgColour());
       }
 
-      if (cs != null)
-      {
-        cs.setThreshold(view.getPidThreshold(), true);
-        cs.setConsensus(af.viewport.getSequenceConsensusHash());
-      }
+      // if (cs != null)
+      // {
+      // cs.setThreshold(view.getPidThreshold(), true);
+      // cs.setConsensus(af.viewport.getSequenceConsensusHash());
+      // }
     }
 
-    af.viewport.setGlobalColourScheme(cs);
+    af.viewport.getViewportColourScheme().setThreshold(
+            view.getPidThreshold(), true);
+    af.viewport.getViewportColourScheme().setConsensus(
+            af.viewport.getSequenceConsensusHash());
     af.viewport.setColourAppliesToAllGroups(false);
     af.alignPanel.updateLayout();
     af.changeColour(cs);
     if (view.getConservationSelected() && cs != null)
     {
-      cs.setConservationInc(view.getConsThreshold());
+      af.viewport.getViewportColourScheme().setConservationInc(
+              view.getConsThreshold());
     }
 
     af.viewport.setColourAppliesToAllGroups(true);