Fix remaining exception class names

[r2c2.git] / source / libr2c2 / layout.cpp

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index df8ce74e62b01ba1d52a178469903992afb78a83..dfa56df02a93ae4ce6b0dffaec99b003a0f2b05b 100644 (file)
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -1,4 +1,5 @@
 #include <algorithm>
+#include <msp/core/maputils.h>
 #include <msp/core/refptr.h>
 #include <msp/datafile/parser.h>
 #include <msp/datafile/writer.h>
@@ -56,7 +57,7 @@ Layout::~Layout()
 Driver &Layout::get_driver() const
 {
        if(!driver)
-               throw InvalidState("No driver");
+               throw logic_error("!driver");
        return *driver;
 }
 
@@ -119,7 +120,7 @@ Block &Layout::get_block(unsigned id) const
                if((*i)->get_id()==id)
                        return **i;
 
-       throw KeyError("Unknown block", lexical_cast(id));
+       throw key_error(id);
 }
 
 void Layout::create_blocks()
@@ -179,7 +180,7 @@ Route &Layout::get_route(const string &name) const
        for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
                if((*i)->get_name()==name)
                        return **i;
-       throw KeyError("Unknown route", name);
+       throw key_error(name);
 }
 
 void Layout::update_routes()
@@ -218,7 +219,7 @@ Zone &Layout::get_zone(const string &group, unsigned num) const
                if((*i)->get_group()==group && (*i)->get_number()==num)
                        return **i;
 
-       throw KeyError("Unknown zone", format("%s %d", group, num));
+       throw key_error(format("%s %d", group, num));
 }
 
 void Layout::remove_zone(Zone &z)
@@ -229,19 +230,13 @@ void Layout::remove_zone(Zone &z)
 
 void Layout::add_train(Train &t)
 {
-       if(trains.count(t.get_address()))
-               throw KeyError("Duplicate train address", lexical_cast(t.get_address()));
-
-       trains[t.get_address()] = &t;
+       insert_unique(trains, t.get_address(), &t);
        signal_train_added.emit(t);
 }
 
 Train &Layout::get_train(unsigned addr) const
 {
-       map<unsigned, Train *>::const_iterator i = trains.find(addr);
-       if(i==trains.end())
-               throw KeyError("Unknown train", lexical_cast(addr));
-       return *i->second;
+       return *get_item(trains, addr);
 }
 
 void Layout::remove_train(Train &t)