X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2Fvamsas%2FDatastoreItem.java;h=0da8ea9b65da06c0904a47e100747cc02af36a2a;hb=ef0377ec8e57164363e74c33d6ede31f85e8ccf7;hp=d37e8454f942f987cf793a2d77a4f3ec00bd5473;hpb=153dd62dc91da13ae732600e6ea55ddbe15eab39;p=jalview.git diff --git a/src/jalview/io/vamsas/DatastoreItem.java b/src/jalview/io/vamsas/DatastoreItem.java index d37e845..0da8ea9 100644 --- a/src/jalview/io/vamsas/DatastoreItem.java +++ b/src/jalview/io/vamsas/DatastoreItem.java @@ -1,13 +1,13 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6) - * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle + * 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 * * 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 @@ -18,8 +18,6 @@ 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 +25,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 +195,7 @@ public abstract class DatastoreItem { jv2vobj.put(newjvobject, vobject); vobj2jv.put(vobject, newjvobject); - updateRegistryEntry(newjvobject, (Vobject) vobject); + updateRegistryEntry(newjvobject, vobj); } } @@ -381,8 +376,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,