Mercurial > fife-parpg

changeset 595:ea80b41c9bd7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- tested & applied patch by Helios - fixes API inconsistence and removed NotFound Exceptions for: - layer.getInstance() - model.getObjects() NOTE: - model.getObject() returned 0 if no objects were found, whereas model.getObjects() throws an exception (-> inconsistent)
author chewie@33b003aa-7bff-0310-803a-e67f0ece8222
date Sat, 21 Aug 2010 15:44:03 +0000
parents 5df831617b42
children 0bbe6e8ad9c8
files engine/core/model/model.cpp engine/core/model/structures/layer.cpp
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/engine/core/model/model.cpp	Thu Aug 19 14:15:02 2010 +0000
+++ b/engine/core/model/model.cpp	Sat Aug 21 15:44:03 2010 +0000
@@ -240,9 +240,9 @@
 			objectmap_t::const_iterator it = nspace->second.begin();
 			for(; it != nspace->second.end(); ++it )
 				object_list.push_back(it->second);
-			return object_list;
 		}
-		throw NotFound(name_space);
+
+		return object_list;
 	}
 
 	const Model::namespace_t* Model::selectNamespace(const std::string& name_space) const {
--- a/engine/core/model/structures/layer.cpp	Thu Aug 19 14:15:02 2010 +0000
+++ b/engine/core/model/structures/layer.cpp	Sat Aug 21 15:44:03 2010 +0000
@@ -148,7 +148,7 @@
 				return *it;
 		}
 
-		throw NotFound(id);
+		return 0;
 	}
 
 	std::vector<Instance*> Layer::getInstances(const std::string& id) {