X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fensembl%2FEnsemblInfo.java;h=69205499287965d5f5c176591a30be58b8b6e73b;hb=c7827c8c0d28158fcea4ebc132c7b457d60f557d;hp=de55a536430b7a62e8b809b1c37e24999a0c0fca;hpb=353109c11d706b29ae5bc9606f0e12223aa45a98;p=jalview.git diff --git a/src/jalview/ext/ensembl/EnsemblInfo.java b/src/jalview/ext/ensembl/EnsemblInfo.java index de55a53..6920549 100644 --- a/src/jalview/ext/ensembl/EnsemblInfo.java +++ b/src/jalview/ext/ensembl/EnsemblInfo.java @@ -1,3 +1,23 @@ +/* + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ 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.ext.ensembl; import jalview.datamodel.AlignmentI; @@ -61,18 +81,6 @@ public class EnsemblInfo extends EnsemblRestClient return true; } - @Override - protected String getRequestMimeType(boolean multipleIds) - { - return "application/json"; - } - - @Override - protected String getResponseMimeType() - { - return "application/json"; - } - /** * Answers the domain (http://rest.ensembl.org or * http://rest.ensemblgenomes.org) for the given division, or null if not @@ -101,17 +109,17 @@ public class EnsemblInfo extends EnsemblRestClient /* * for convenience, pre-fill ensembl.org as the domain for "ENSEMBL" */ - divisions.put(DBRefSource.ENSEMBL.toUpperCase(), ENSEMBL_REST); + divisions.put(DBRefSource.ENSEMBL.toUpperCase(), ensemblDomain); BufferedReader br = null; try { - URL url = getDivisionsUrl(ENSEMBL_GENOMES_REST); + URL url = getDivisionsUrl(ensemblGenomesDomain); if (url != null) { br = getHttpResponse(url, null); } - parseResponse(br, ENSEMBL_GENOMES_REST); + parseResponse(br, ensemblGenomesDomain); } catch (IOException e) { // ignore