X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fstructure%2FStructureSelectionManager.java;h=73a5905bc3467b915259fe65bc99fd5a2a522408;hb=bdba25716eaa9492681532cb443c18ed34237488;hp=8d684c1d598b8f0590541c987a94dd43797d78b0;hpb=6b1d4e765d7a6beafcc1eb1fec38e041f3fb780f;p=jalview.git diff --git a/src/jalview/structure/StructureSelectionManager.java b/src/jalview/structure/StructureSelectionManager.java index 8d684c1..73a5905 100644 --- a/src/jalview/structure/StructureSelectionManager.java +++ b/src/jalview/structure/StructureSelectionManager.java @@ -1,19 +1,22 @@ /* - * 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 + * 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.structure; @@ -25,6 +28,7 @@ import jalview.analysis.*; import jalview.api.AlignmentViewPanel; import jalview.api.StructureSelectionManagerProvider; import jalview.datamodel.*; +import jalview.util.MessageManager; public class StructureSelectionManager { @@ -53,18 +57,20 @@ public class StructureSelectionManager } Hashtable mappingData = new Hashtable(); + private static StructureSelectionManager nullProvider = null; + public static StructureSelectionManager getStructureSelectionManager( StructureSelectionManagerProvider context) { - if (context==null) { + if (context == null) + { if (nullProvider == null) { if (instances != null) { - throw new Error( - "Implementation error. Structure selection manager's context is 'null'", - new NullPointerException("SSM context is null")); + throw new Error(MessageManager.getString("error.implementation_error_structure_selection_manager_null"), + new NullPointerException(MessageManager.getString("exception.ssm_context_is_null"))); } else { @@ -80,10 +86,12 @@ public class StructureSelectionManager StructureSelectionManager instance = instances.get(context); if (instance == null) { - if (nullProvider!=null) + if (nullProvider != null) { instance = nullProvider; - } else { + } + else + { instance = new StructureSelectionManager(); } instances.put(context, instance);