X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fdbsources%2Fdas%2Fdatamodel%2FJalviewSource.java;h=64a1095d379b078ef34a067b250371372c13421e;hb=d9c7868a610eff29a8eddb160b6dc78a94a72470;hp=f3729a849350f0f0276f3effdcce0dcaaf1514fe;hpb=b57a02c25e335d033c97f8a6bacd6b54f62bd2b6;p=jalview.git diff --git a/src/jalview/ws/dbsources/das/datamodel/JalviewSource.java b/src/jalview/ws/dbsources/das/datamodel/JalviewSource.java index f3729a8..64a1095 100644 --- a/src/jalview/ws/dbsources/das/datamodel/JalviewSource.java +++ b/src/jalview/ws/dbsources/das/datamodel/JalviewSource.java @@ -1,5 +1,29 @@ +/* + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) + * Copyright (C) 2015 The Jalview Authors + * + * This file is part of Jalview. + * + * Jalview is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. + * + * Jalview is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. + */ package jalview.ws.dbsources.das.datamodel; +import jalview.util.MessageManager; +import jalview.ws.dbsources.das.api.jalviewSourceI; +import jalview.ws.seqfetcher.DbSourceProxy; + import java.text.ParseException; import java.util.ArrayList; import java.util.Date; @@ -10,7 +34,6 @@ import java.util.Map; import org.biodas.jdas.client.threads.MultipleConnectionPropertyProviderI; import org.biodas.jdas.dassources.Capabilities; import org.biodas.jdas.dassources.utils.DasTimeFormat; -import org.biodas.jdas.dassources.utils.RegistrySourceAdapter; import org.biodas.jdas.schema.sources.CAPABILITY; import org.biodas.jdas.schema.sources.COORDINATES; import org.biodas.jdas.schema.sources.MAINTAINER; @@ -18,9 +41,6 @@ import org.biodas.jdas.schema.sources.PROP; import org.biodas.jdas.schema.sources.SOURCE; import org.biodas.jdas.schema.sources.VERSION; -import jalview.ws.dbsources.das.api.jalviewSourceI; -import jalview.ws.seqfetcher.DbSourceProxy; - public class JalviewSource implements jalviewSourceI { SOURCE source; @@ -327,7 +347,9 @@ public class JalviewSource implements jalviewSourceI int p = cap.getQueryUri().lastIndexOf(capname); if (p < -1) { - throw new Exception("Invalid das source: " + source.getUri()); + throw new Exception(MessageManager.formatMessage( + "exception.invalid_das_source", + new String[] { source.getUri() })); } if (cap.getQueryUri().charAt(p) == '/') { @@ -350,4 +372,12 @@ public class JalviewSource implements jalviewSourceI return isLaterThan(getVersion().getCreated(), other.getVersion() .getCreated()); } + + @Override + public boolean isReferenceSource() + { + // TODO check source object for indication that we are the primary for a DAS + // coordinate system + return false; + } }