X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fio%2Fvamsas%2FDatastoreRegistry.java;h=ff7a764349faf810cb577ee2a49e150dac008317;hb=c39137ea1057fea32d65471a12855a68d00365d5;hp=8b23e4c54ec776bf076e4e5769d667428488aa34;hpb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;p=jalview.git
diff --git a/src/jalview/io/vamsas/DatastoreRegistry.java b/src/jalview/io/vamsas/DatastoreRegistry.java
index 8b23e4c..ff7a764 100644
--- a/src/jalview/io/vamsas/DatastoreRegistry.java
+++ b/src/jalview/io/vamsas/DatastoreRegistry.java
@@ -1,29 +1,29 @@
/*
- * 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-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.
- *
+ * 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.io.vamsas;
-import java.util.Enumeration;
import java.util.IdentityHashMap;
import java.util.Iterator;
import java.util.Map;
-import uk.ac.vamsas.client.Vobject;
-
public class DatastoreRegistry
{
protected static org.apache.log4j.Logger log = org.apache.log4j.Logger
@@ -83,8 +83,7 @@ public class DatastoreRegistry
if (dsregitem == null)
{
// create a new item entry
- dsregitem = new Object[]
- { dsitem.jvobj, dsitem.vobj };
+ dsregitem = new Object[] { dsitem.jvobj, dsitem.vobj };
dsItemReg.put(dsitem, dsregitem);
dsObjReg.put(dsitem.jvobj, dsitem);
dsObjReg.put(dsitem.vobj, dsitem);
@@ -153,7 +152,8 @@ public class DatastoreRegistry
return dsregitem;
}
- protected void finalize()
+ @Override
+ protected void finalize() throws Throwable
{
if (dsObjReg != null)
{
@@ -172,5 +172,6 @@ public class DatastoreRegistry
{
dsItemReg.clear();
}
+ super.finalize();
}
}