From: kiramt <k.mourao@dundee.ac.uk>
Date: Wed, 8 Feb 2017 11:59:19 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/develop' into features/JAL-2316
X-Git-Tag: Release_2_10_3b1~346^2~3
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=77bebd0b42826a8ba2f54293b05ccc1dbfbd6ae7;p=jalview.git

Merge remote-tracking branch 'origin/develop' into features/JAL-2316
---

77bebd0b42826a8ba2f54293b05ccc1dbfbd6ae7
diff --cc src/jalview/bin/Cache.java
index 9edd712,9363c23..48c1ee9
--- a/src/jalview/bin/Cache.java
+++ b/src/jalview/bin/Cache.java
@@@ -21,8 -21,11 +21,12 @@@
  package jalview.bin;
  
  import jalview.datamodel.PDBEntry;
+ import jalview.gui.UserDefinedColours;
+ import jalview.schemes.ColourSchemes;
+ import jalview.schemes.UserColourScheme;
  import jalview.structure.StructureImportSettings;
 +import jalview.urls.IdOrgSettings;
+ import jalview.util.ColorUtils;
  import jalview.ws.dbsources.das.api.DasSourceRegistryI;
  import jalview.ws.dbsources.das.datamodel.DasSourceRegistry;
  import jalview.ws.sifts.SiftsSettings;
diff --cc src/jalview/gui/Preferences.java
index 0903942,d32ff46..cf80a6d
--- a/src/jalview/gui/Preferences.java
+++ b/src/jalview/gui/Preferences.java
@@@ -29,14 -34,11 +29,16 @@@ import jalview.io.JalviewFileChooser
  import jalview.io.JalviewFileView;
  import jalview.jbgui.GPreferences;
  import jalview.jbgui.GSequenceLink;
- import jalview.schemes.ColourSchemeProperty;
+ import jalview.schemes.ColourSchemeI;
+ import jalview.schemes.ColourSchemes;
+ import jalview.schemes.ResidueColourScheme;
 +import jalview.urls.UrlLinkTableModel;
 +import jalview.urls.api.UrlProviderFactoryI;
 +import jalview.urls.api.UrlProviderI;
 +import jalview.urls.desktop.DesktopUrlProviderFactory;
  import jalview.util.MessageManager;
  import jalview.util.Platform;
 +import jalview.util.UrlConstants;
  import jalview.ws.sifts.SiftsSettings;
  
  import java.awt.BorderLayout;