X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fdbsources%2Fdas%2Fdatamodel%2FJalviewSource.java;h=f8efb49f623d5f5a1ace0ad5bc3828a110877dea;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=93d83a67d8c6972112566c317dcc6334d8ac2799;hpb=59d682209891099d46b960509907c79e3fb276fe;p=jalview.git diff --git a/src/jalview/ws/dbsources/das/datamodel/JalviewSource.java b/src/jalview/ws/dbsources/das/datamodel/JalviewSource.java index 93d83a6..f8efb49 100644 --- a/src/jalview/ws/dbsources/das/datamodel/JalviewSource.java +++ b/src/jalview/ws/dbsources/das/datamodel/JalviewSource.java @@ -1,19 +1,22 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8) - * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1) + * Copyright (C) 2014 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. + * 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 . + * 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; @@ -27,7 +30,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; @@ -35,6 +37,7 @@ import org.biodas.jdas.schema.sources.PROP; import org.biodas.jdas.schema.sources.SOURCE; import org.biodas.jdas.schema.sources.VERSION; +import jalview.util.MessageManager; import jalview.ws.dbsources.das.api.jalviewSourceI; import jalview.ws.seqfetcher.DbSourceProxy; @@ -344,7 +347,7 @@ 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) == '/') { @@ -367,4 +370,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; + } }