--- trunk/src/selection/TokenMap.hpp	2005/02/15 17:35:30	349
+++ trunk/src/selection/TokenMap.hpp	2013/06/16 15:15:42	1879
@@ -1,4 +1,4 @@
- /*
+/*
  * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
  *
  * The University of Notre Dame grants you ("Licensee") a
@@ -6,19 +6,10 @@
  * redistribute this software in source and binary code form, provided
  * that the following conditions are met:
  *
- * 1. Acknowledgement of the program authors must be made in any
- *    publication of scientific results based in part on use of the
- *    program.  An acceptable form of acknowledgement is citation of
- *    the article in which the program was described (Matthew
- *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
- *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
- *    Parallel Simulation Engine for Molecular Dynamics,"
- *    J. Comput. Chem. 26, pp. 252-271 (2005))
- *
- * 2. Redistributions of source code must retain the above copyright
+ * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  *
- * 3. Redistributions in binary form must reproduce the above copyright
+ * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the
  *    distribution.
@@ -37,38 +28,49 @@
  * arising out of the use of or inability to use software, even if the
  * University of Notre Dame has been advised of the possibility of
  * such damages.
+ *
+ * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
+ * research, please cite the appropriate papers when you publish your
+ * work.  Good starting points are:
+ *                                                                      
+ * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).             
+ * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
+ * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          
+ * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
+ * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
  */
 
 #ifndef SELECTION_TOKENMAP_HPP
 #define SELECTION_TOKENMAP_HPP
 
-#include "selection/Token.hpp"
+#include "selection/SelectionToken.hpp"
 
-namespace oopse {
+namespace OpenMD {
 
 
-class TokenMap{
-    public:
-        typedef std::map<std::string, Token> TokenMapType;
-        static TokenMap* getInstance(){
-            if (instance_ == NULL) {
-                instance_ = new TokenMap();
-            }
+  class TokenMap{
+  public:
+    typedef std::map<std::string, Token> TokenMapType;
+    static TokenMap* getInstance(){
+      if (instance_ == NULL) {
+	instance_ = new TokenMap();
+      }
 
-            return instance_;
-        }
+      return instance_;
+    }
 
-        Token* getToken(const std::string& ident);
+    Token* getToken(const std::string& ident);
         
-    private:
+  private:
         
-        TokenMap();
+    TokenMap();
+    ~TokenMap();
         
-        static TokenMap* instance_;
+    static TokenMap* instance_;
 
-        TokenMapType tokenMap_;        
+    TokenMapType tokenMap_;        
         
-};
+  };
 
 }
 #endif