From f54983a4b00eeeba75854bee6d4d2de6a24856e0 Mon Sep 17 00:00:00 2001 From: jprocter Date: Wed, 29 Feb 2012 16:03:02 +0000 Subject: [PATCH] JAL-972 - refactored local source builder to registry implementation and made Cache the holder of the registry singleton --- src/jalview/bin/Cache.java | 58 +++++++++++++------------------------------- 1 file changed, 17 insertions(+), 41 deletions(-) diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java index 15e368d..d810ee7 100755 --- a/src/jalview/bin/Cache.java +++ b/src/jalview/bin/Cache.java @@ -17,6 +17,9 @@ */ package jalview.bin; +import jalview.ws.dbsources.das.api.DasSourceRegistryI; +import jalview.ws.dbsources.das.datamodel.DasSourceRegistry; + import java.awt.Color; import java.io.*; import java.text.DateFormat; @@ -579,47 +582,6 @@ public class Cache } /** - * generate Das1Sources from the local das source list - * - * @return Vector of Das1Sources - */ - public static Vector getLocalDasSources() - { - Vector localSources = new Vector(); - String local = jalview.bin.Cache.getProperty("DAS_LOCAL_SOURCE"); - if (local != null) - { - StringTokenizer st = new StringTokenizer(local, "\t"); - while (st.hasMoreTokens()) - { - String token = st.nextToken(); - int bar = token.indexOf("|"); - // TODO: replace with JDAS source object. - Das1Source source = new Das1Source(); - source.setUrl(token.substring(bar + 1)); - if (source.getUrl().startsWith("sequence:")) - { - source.setUrl(source.getUrl().substring(9)); - // this source also serves sequences as well as features - source.setCapabilities(new String[] - { "sequence", "features" }); - } - else - { - // default is that all user added sources serve features - source.setCapabilities(new String[] - { "features" }); - } - - source.setNickname(token.substring(0, bar)); - - localSources.addElement(source); - } - } - return localSources; - } - - /** * GA tracker object - actually JGoogleAnalyticsTracker null if tracking not * enabled. */ @@ -824,4 +786,18 @@ public class Cache } return null; } + + private static DasSourceRegistryI sourceRegistry=null; + /** + * initialise and .. + * @return instance of the das source registry + */ + public static DasSourceRegistryI getDasSourceRegistry() + { + if (sourceRegistry==null) + { + sourceRegistry = new DasSourceRegistry(); + } + return sourceRegistry; + } } -- 1.7.10.2