X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fdbsources%2FUniprot.java;h=359f2b15c2cd3dbfc2db46c6d27ff7da6f7aec29;hb=5f090b7d1cb8836903474f8f4d5e475be142d30c;hp=167758f8815a60e57614971edbbd5964135fdc55;hpb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;p=jalview.git
diff --git a/src/jalview/ws/dbsources/Uniprot.java b/src/jalview/ws/dbsources/Uniprot.java
index 167758f..359f2b1 100644
--- a/src/jalview/ws/dbsources/Uniprot.java
+++ b/src/jalview/ws/dbsources/Uniprot.java
@@ -1,27 +1,28 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * 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;
import java.io.File;
import java.io.FileReader;
-import java.io.IOException;
import java.util.Enumeration;
-import java.util.Hashtable;
import java.util.Vector;
import org.exolab.castor.xml.Unmarshaller;
@@ -37,9 +38,6 @@ import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
import jalview.datamodel.UniprotEntry;
import jalview.datamodel.UniprotFile;
-import jalview.io.FormatAdapter;
-import jalview.io.IdentifyFile;
-import jalview.ws.DBRefFetcher;
import jalview.ws.ebi.EBIFetchClient;
import jalview.ws.seqfetcher.DbSourceProxy;
import jalview.ws.seqfetcher.DbSourceProxyImpl;
@@ -100,16 +98,21 @@ public class Uniprot extends DbSourceProxyImpl implements DbSourceProxy
private EBIFetchClient ebi = null;
+ private static org.exolab.castor.mapping.Mapping map;
+
public Vector getUniprotEntries(File file)
{
UniprotFile uni = new UniprotFile();
try
{
- // 1. Load the mapping information from the file
- org.exolab.castor.mapping.Mapping map = new org.exolab.castor.mapping.Mapping(
- uni.getClass().getClassLoader());
- java.net.URL url = getClass().getResource("/uniprot_mapping.xml");
- map.loadMapping(url);
+ if (map == null)
+ {
+ // 1. Load the mapping information from the file
+ map = new org.exolab.castor.mapping.Mapping(uni.getClass()
+ .getClassLoader());
+ java.net.URL url = getClass().getResource("/uniprot_mapping.xml");
+ map.loadMapping(url);
+ }
// 2. Unmarshal the data
Unmarshaller unmar = new Unmarshaller(uni);
@@ -294,4 +297,10 @@ public class Uniprot extends DbSourceProxyImpl implements DbSourceProxy
{
return "Uniprot"; // getDbSource();
}
+
+ @Override
+ public int getTier()
+ {
+ return 0;
+ }
}