X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2Fvamsas%2FDatastoreItem.java;h=0fae890d0d66a3b85fa8191eda4fb3652a3d01fa;hb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;hp=d7db6a6fcc6b0197433d22064e52e0639d094391;hpb=d423f22792e47dbc800ae220a58677f988971d06;p=jalview.git diff --git a/src/jalview/io/vamsas/DatastoreItem.java b/src/jalview/io/vamsas/DatastoreItem.java index d7db6a6..0fae890 100644 --- a/src/jalview/io/vamsas/DatastoreItem.java +++ b/src/jalview/io/vamsas/DatastoreItem.java @@ -1,25 +1,24 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5) - * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1) + * 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. - * + * * 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.io.vamsas; import jalview.bin.Cache; -import jalview.datamodel.DBRefEntry; -import jalview.gui.TreePanel; import jalview.io.VamsasAppDatastore; import java.util.Enumeration; @@ -27,12 +26,9 @@ import java.util.Hashtable; import java.util.IdentityHashMap; import java.util.Vector; -import org.apache.commons.logging.Log; - import uk.ac.vamsas.client.IClientDocument; import uk.ac.vamsas.client.Vobject; import uk.ac.vamsas.client.VorbaId; -import uk.ac.vamsas.objects.core.DbRef; import uk.ac.vamsas.objects.core.Entry; import uk.ac.vamsas.objects.core.Provenance; import uk.ac.vamsas.objects.core.Seg; @@ -200,7 +196,7 @@ public abstract class DatastoreItem { jv2vobj.put(newjvobject, vobject); vobj2jv.put(vobject, newjvobject); - updateRegistryEntry(newjvobject, (Vobject) vobject); + updateRegistryEntry(newjvobject, vobj); } } @@ -381,8 +377,8 @@ public abstract class DatastoreItem { datastore = ds; dsReg = ds.getDatastoreRegisty(); - initDatastoreItem(ds.getProvEntry(), ds.getClientDocument(), ds - .getVamsasObjectBinding(), ds.getJvObjectBinding()); + initDatastoreItem(ds.getProvEntry(), ds.getClientDocument(), + ds.getVamsasObjectBinding(), ds.getJvObjectBinding()); } private void initDatastoreItem(Entry provEntry, IClientDocument cdoc,