Skip to content

Commit 7f59bba

Browse files
committed
Merge pull request #8 from ngageoint/better_parameter_collection_exception
Using a more specific exception
2 parents 0efb18d + 05d0760 commit 7f59bba

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
#include "six/Parameter.h"
2-
#include "six/ParameterCollection.h"
1+
#include <except/Exception.h>
2+
#include <six/Parameter.h>
3+
#include <six/ParameterCollection.h>
34

4-
#include <import/except.h>
5-
6-
size_t six::ParameterCollection::findParameterIndex(const std::string& paramName) const
5+
namespace six
6+
{
7+
size_t
8+
ParameterCollection::findParameterIndex(const std::string& paramName) const
79
{
810
for(size_t ii = 0; ii < mParams.size(); ++ii)
911
{
@@ -13,11 +15,13 @@ size_t six::ParameterCollection::findParameterIndex(const std::string& paramName
1315
}
1416
}
1517

16-
throw except::Exception("No parameter with name \"" + paramName
17-
+ "\" found in this collection");
18+
throw except::NoSuchKeyException(Ctxt(
19+
"No parameter with name \"" + paramName
20+
+ "\" found in this collection"));
1821
}
1922

20-
bool six::ParameterCollection::containsParameter(const std::string& paramName) const
23+
bool
24+
ParameterCollection::containsParameter(const std::string& paramName) const
2125
{
2226
for(size_t ii = 0; ii < mParams.size(); ++ii)
2327
{
@@ -29,3 +33,4 @@ bool six::ParameterCollection::containsParameter(const std::string& paramName) c
2933

3034
return false;
3135
}
36+
}

0 commit comments

Comments
 (0)