X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fdbsources%2Fdas%2Fdatamodel%2FJalviewSource.java;h=64a1095d379b078ef34a067b250371372c13421e;hb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;hp=073345221b27cace11d90a0f48b5726d26e92a36;hpb=a8f483d04205bb8273ee311c12968b7e86d205fa;p=jalview.git diff --git a/src/jalview/ws/dbsources/das/datamodel/JalviewSource.java b/src/jalview/ws/dbsources/das/datamodel/JalviewSource.java index 0733452..64a1095 100644 --- a/src/jalview/ws/dbsources/das/datamodel/JalviewSource.java +++ b/src/jalview/ws/dbsources/das/datamodel/JalviewSource.java @@ -1,23 +1,29 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * 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. + * 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; +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; @@ -35,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; @@ -344,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) == '/') { @@ -371,7 +376,8 @@ public class JalviewSource implements jalviewSourceI @Override public boolean isReferenceSource() { - // TODO check source object for indication that we are the primary for a DAS coordinate system + // TODO check source object for indication that we are the primary for a DAS + // coordinate system return false; } }