X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2Fvamsas%2FDatastoreRegistry.java;h=b53de080bd13a9e29c7398d848a159b3b4966ceb;hb=4f1c8f3fdd352d5e6c3e6cfe1b729f9ef7d6e47f;hp=0d7628596700abf96cdbf4e0d1f28e120f479256;hpb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;p=jalview.git diff --git a/src/jalview/io/vamsas/DatastoreRegistry.java b/src/jalview/io/vamsas/DatastoreRegistry.java index 0d76285..b53de08 100644 --- a/src/jalview/io/vamsas/DatastoreRegistry.java +++ b/src/jalview/io/vamsas/DatastoreRegistry.java @@ -1,19 +1,21 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1) - * Copyright (C) 2014 The Jalview Authors + * 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; @@ -22,7 +24,7 @@ import java.util.IdentityHashMap; import java.util.Iterator; import java.util.Map; -public class DatastoreRegistry +public class DatastoreRegistry implements AutoCloseable { protected static org.apache.log4j.Logger log = org.apache.log4j.Logger .getLogger(DatastoreRegistry.class); @@ -81,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); @@ -151,7 +152,8 @@ public class DatastoreRegistry return dsregitem; } - protected void finalize() + @Override + public void close() { if (dsObjReg != null) { @@ -170,5 +172,6 @@ public class DatastoreRegistry { dsItemReg.clear(); } + // super.finalize(); } }