X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fdesign_main.cpp;h=c65fc9cd0f103a34f6ad6bc923349c5a0e3cf1b1;hb=7969e482bd427717e116917116e52958432a9c16;hp=f5c2820eab550f0c34d0b0f430614ea4010f5a07;hpb=1500d350bb472bc50d36642060e559bb67c1d185;p=metaproxy-moved-to-github.git

diff --git a/src/design_main.cpp b/src/design_main.cpp
index f5c2820..c65fc9c 100644
--- a/src/design_main.cpp
+++ b/src/design_main.cpp
@@ -2,68 +2,70 @@
 #include <iostream>
 #include  "design.h"
 
-
-
 int main(int argc, char **argv) {
 
-   // test filter set/get/exception
-  try {
-    std::cout << "\nTRY" << "\n";
-    p3::Filter filter;
-    unsigned int tmp;
+    // test filter set/get/exception
+    try {
+        std::cout << "\nTRY" << "\n";
+        yp2::Filter filter;
     
-    filter.max_front_workers(1).max_front_workers(2);
-    tmp = filter.max_front_workers();
-    std::cout << "workers: " << tmp << "\n";
+        filter.name("filter1");
+        std::cout << "filter: " << filter.name() << "\n";
 
-    filter.max_front_workers() = 3;
-    tmp = filter.max_front_workers();
-    std::cout << "workers: " << tmp << "\n";
+        filter.name() = "filter1 rename";
+        std::cout << "filter: " << filter.name() << "\n";
 
-    throw p3::Filter_Exception("finished");
-  }
-  catch (std::exception &e) {
-    std::cout << e.what() << "\n";
-  }
+        throw yp2::FilterException("finished");
+    }
+    catch (std::exception &e) {
+        std::cout << e.what() << "\n";
+    }
 
   
-  try {
-    std::cout << "\nTRY" << "\n";
-
-    p3::Filter filter1;
-    p3::Filter filter2;
+    try {
+        std::cout << "\nTRY" << "\n";
 
-    std::cout << "filter1 filter2" << "\n";
+        yp2::Filter filter1;
+        filter1.name("filter1");
     
-    p3::Router router1;
-    router1.rule(filter1);
-    std::cout << "router1.rule(filter1)" << "\n";
+        yp2::Filter filter2;
+        filter2.name() = "filter2";
 
-    p3::Router router2;
-    router2.rule(filter2);
-    std::cout << "router2.rule(filter2)" << "\n";
-
-    p3::Package pack_in;
-    pack_in.data(7).router(router1);
-    std::cout << "pack_in.data(7).router(router1)" << "\n";
-
-    pack_in.move();
-    std::cout << "pack_in.move()" << "\n";
+        std::cout << "filter1 filter2" << "\n";
+    
+        yp2::Router router1;
+        router1.rule(filter1);
+        std::cout << "router1.rule(filter1)" << "\n";
 
-    pack_in.router(router2);
-    std::cout << "pack_in.router(router2)" << "\n";
+        yp2::Router router2;
+        router2.rule(filter2);
+        std::cout << "router2.rule(filter2)" << "\n";
 
-    pack_in.move();
-    std::cout << "pack_in.move()" << "\n";
+        yp2::Package pack_in;
+        pack_in.data(7).router(router1);
+        std::cout << "pack_in.data(7).router(router1)" << "\n";
 
-    throw  p3::Router_Exception("finished");
+        pack_in.move();
+        std::cout << "pack_in.move()" << "\n";
 
-  }
-  catch (std::exception &e) {
-    std::cout << e.what() << "\n";
-  }
+        pack_in.router(router2);
+        std::cout << "pack_in.router(router2)" << "\n";
 
+        pack_in.move();
+        std::cout << "pack_in.move()" << "\n";
 
+        throw  yp2::RouterException("finished");
 
+    }
+    catch (std::exception &e) {
+        std::cout << e.what() << "\n";
+    }
 }
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */