--- a/src/DAF/DA/DA.cc
+++ b/src/DAF/DA/DA.cc
@@ -1,25 +1,32 @@
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program 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 Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this program. If not, see http://www.gnu.org/licenses/.
-//
+// The MIT License (MIT)
+//
+// Copyright (c) 2014-2016 Brno University of Technology, PRISTINE project
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
#include "DA.h"
//Constants
-const char* MOD_DIRECTORY = "directory";
-const char* MOD_NAMINFO = "namingInformation";
-const char* MOD_NEIGHBORTAB = "neighborTable";
-const char* MOD_SEARCHTAB = "searchTable";
+const char* MOD_DIRECTORY = "^.directory";
+const char* MOD_NAMINFO = "^.namingInformation";
+const char* MOD_NEIGHBORTAB = "^.neighborTable";
+const char* MOD_SEARCHTAB = "^.searchTable";
Define_Module(DA);
@@ -71,10 +78,14 @@
void DA::initPointers() {
//Retrieve pointers to submodules
- Dir = ModuleAccess<Directory>(MOD_DIRECTORY).get();
- NamInfo = ModuleAccess<NamingInformation>(MOD_NAMINFO).get();
- NeighborTab = ModuleAccess<NeighborTable>(MOD_NEIGHBORTAB).get();
- SearchTab = ModuleAccess<SearchTable>(MOD_SEARCHTAB).get();
+ Dir = check_and_cast<Directory*>
+ (getModuleByPath(MOD_DIRECTORY));
+ NamInfo = check_and_cast<NamingInformation*>
+ (getModuleByPath(MOD_NAMINFO));
+ NeighborTab = check_and_cast<NeighborTable*>
+ (getModuleByPath(MOD_NEIGHBORTAB));
+ SearchTab = check_and_cast<SearchTable*>
+ (getModuleByPath(MOD_SEARCHTAB));
}
void DA::initialize()