From: jprocter Date: Fri, 11 May 2012 13:17:09 +0000 (+0100) Subject: formatting X-Git-Tag: Jalview_2_9~532^2~6 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=70d3ef530c56776e3169d597e4389ad090013c87;p=jalview.git formatting --- diff --git a/src/jalview/ws/dbsources/das/datamodel/DasSourceRegistry.java b/src/jalview/ws/dbsources/das/datamodel/DasSourceRegistry.java index 777c4a4..3d477a4 100644 --- a/src/jalview/ws/dbsources/das/datamodel/DasSourceRegistry.java +++ b/src/jalview/ws/dbsources/das/datamodel/DasSourceRegistry.java @@ -98,7 +98,8 @@ public class DasSourceRegistry implements DasSourceRegistryI, * @param registryURL * return sources from registryURL */ - private static List getDASSources(String registryURL, MultipleConnectionPropertyProviderI registry) + private static List getDASSources(String registryURL, + MultipleConnectionPropertyProviderI registry) { try { @@ -110,21 +111,26 @@ public class DasSourceRegistry implements DasSourceRegistryI, List dassources = sources.getSOURCE(); ArrayList dsrc = new ArrayList(); - HashMap latests=new HashMap(); + HashMap latests = new HashMap(); Integer latest; for (SOURCE src : dassources) { - JalviewSource jsrc=new JalviewSource(src, registry, false); - latest=latests.get(jsrc.getSourceURL()); - if (latest!=null) + JalviewSource jsrc = new JalviewSource(src, registry, false); + latest = latests.get(jsrc.getSourceURL()); + if (latest != null) { if (jsrc.isNewerThan(dsrc.get(latest.intValue()))) { dsrc.set(latest.intValue(), jsrc); - } else { - System.out.println("Debug: Ingored older source "+jsrc.getTitle()); } - } else { + else + { + System.out.println("Debug: Ignored older source " + + jsrc.getTitle()); + } + } + else + { latests.put(jsrc.getSourceURL(), Integer.valueOf(dsrc.size())); dsrc.add(jsrc); } @@ -153,7 +159,7 @@ public class DasSourceRegistry implements DasSourceRegistryI, } return appendLocalSources(); } - + /** * generate Sources from the local das source list *