--- trunk/src/selection/TokenMap.hpp	2005/02/02 23:13:11	281
+++ trunk/src/selection/TokenMap.hpp	2005/12/02 15:38:03	770
@@ -1,4 +1,4 @@
- /*
+/*
  * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
  *
  * The University of Notre Dame grants you ("Licensee") a
@@ -42,32 +42,33 @@
 #ifndef SELECTION_TOKENMAP_HPP
 #define SELECTION_TOKENMAP_HPP
 
-#include "selection/Token.hpp"
+#include "selection/SelectionToken.hpp"
 
 namespace oopse {
 
 
-class TokenMap{
-    public:
-        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();
         
-        static TokenMap* instance_;
+    static TokenMap* instance_;
 
-        std::map<std::string, Token> tokenMap_;        
+    TokenMapType tokenMap_;        
         
-};
+  };
 
 }
 #endif