Changeset 7648 for code/trunk/src/libraries/core/Loader.cc
- Timestamp:
- Nov 13, 2010, 11:55:23 PM (13 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/releasetodo (added) merged: 7614,7625-7629,7638-7639,7645-7647
- Property svn:mergeinfo changed
-
code/trunk/src/libraries/core/Loader.cc
r6422 r7648 88 88 } 89 89 90 bool Loader::load(const ClassTreeMask& mask) 90 /** 91 @brief 92 Loads all opened files, while conforming to the restrictions given by the input ClassTreeMask. 93 @param mask 94 A ClassTreeMask, which defines which types of classes are loaded and which aren't. 95 @param verbose 96 Whether the loader is verbose (prints its progress in a low output level) or not. 97 @return 98 Returns true if successful. 99 */ 100 bool Loader::load(const ClassTreeMask& mask, bool verbose) 91 101 { 92 102 bool success = true; 93 103 for (std::vector<std::pair<const XMLFile*, ClassTreeMask> >::iterator it = Loader::files_s.begin(); it != Loader::files_s.end(); ++it) 94 if (!Loader::load(it->first, it->second * mask ))104 if (!Loader::load(it->first, it->second * mask, verbose)) 95 105 success = false; 96 106 … … 109 119 } 110 120 111 bool Loader::reload(const ClassTreeMask& mask) 121 /** 122 @brief 123 Reloads all opened files, while conforming to the restrictions given by the input ClassTreeMask. 124 @param mask 125 A ClassTreeMask, which defines which types of classes are reloaded and which aren't. 126 @param verbose 127 Whether the loader is verbose (prints its progress in a low output level) or not. 128 @return 129 Returns true if successful. 130 */ 131 bool Loader::reload(const ClassTreeMask& mask, bool verbose) 112 132 { 113 133 Loader::unload(mask); 114 return Loader::load(mask); 115 } 116 117 bool Loader::load(const XMLFile* file, const ClassTreeMask& mask) 134 return Loader::load(mask, verbose); 135 } 136 137 /** 138 @brief 139 Loads the input file, while conforming to the restrictions given by the input ClassTreeMask. 140 @param file 141 The file to be loaded. 142 @param mask 143 A ClassTreeMask, which defines which types of classes are loaded and which aren't. 144 @param verbose 145 Whether the loader is verbose (prints its progress in a low output level) or not. 146 @return 147 Returns true if successful. 148 */ 149 bool Loader::load(const XMLFile* file, const ClassTreeMask& mask, bool verbose) 118 150 { 119 151 if (!file) … … 144 176 try 145 177 { 146 COUT(0) << "Start loading " << file->getFilename() << "..." << std::endl; 147 COUT(3) << "Mask: " << Loader::currentMask_s << std::endl; 178 if(verbose) 179 { 180 COUT(0) << "Start loading " << file->getFilename() << "..." << std::endl; 181 COUT(3) << "Mask: " << Loader::currentMask_s << std::endl; 182 } 183 else 184 { 185 COUT(4) << "Start loading " << file->getFilename() << "..." << std::endl; 186 COUT(4) << "Mask: " << Loader::currentMask_s << std::endl; 187 } 148 188 149 189 ticpp::Document xmlfile(file->getFilename()); … … 165 205 rootNamespace->XMLPort(rootElement, XMLPort::LoadObject); 166 206 167 COUT(0) << "Finished loading " << file->getFilename() << '.' << std::endl; 207 if(verbose) 208 COUT(0) << "Finished loading " << file->getFilename() << '.' << std::endl; 209 else 210 COUT(4) << "Finished loading " << file->getFilename() << '.' << std::endl; 168 211 169 212 COUT(4) << "Namespace-tree:" << std::endl << rootNamespace->toString(" ") << std::endl; … … 210 253 } 211 254 212 bool Loader::reload(const XMLFile* file, const ClassTreeMask& mask) 255 /** 256 @brief 257 Reloads the input file, while conforming to the restrictions given by the input ClassTreeMask. 258 @param file 259 The file to be reloaded. 260 @param mask 261 A ClassTreeMask, which defines which types of classes are reloaded and which aren't. 262 @param verbose 263 Whether the loader is verbose (prints its progress in a low output level) or not. 264 @return 265 Returns true if successful. 266 */ 267 bool Loader::reload(const XMLFile* file, const ClassTreeMask& mask, bool verbose) 213 268 { 214 269 Loader::unload(file, mask); 215 return Loader::load(file, mask );270 return Loader::load(file, mask, verbose); 216 271 } 217 272
Note: See TracChangeset
for help on using the changeset viewer.