commit 2b4c947fc029efc1fe34715c3bd0b8d44cdcc04e
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Aug 09 15:00:38 2012 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Aug 10 18:15:14 2012 -0700
tree 53b6e0b43ee5671e930bd7f836d2af6db69f0fdd
parent b8d14adbfd8bfdaf98982f06229c9534395cfc3a

Another set of refactoring

examples/trie.cc

diff --git a/examples/trie.cc b/examples/trie.cc
index 4766229..2523857 100644
--- a/examples/trie.cc
+++ b/examples/trie.cc
@@ -33,7 +33,7 @@
 using namespace ndnSIM;
 using namespace boost;
 
-NS_LOG_COMPONENT_DEFINE ("Trie");
+NS_LOG_COMPONENT_DEFINE ("ndn.Trie");
 
 // class Integer : public ns3::SimpleRefCount<Integer>
 // {
@@ -98,21 +98,21 @@
 
   Ptr<Node> node = CreateObject<Node> ();
   Names::Add ("TestNode", node);
-  Ptr<NdnApp> app = CreateObject<NdnApp> ();
+  Ptr<ndn::App> app = CreateObject<ndn::App> ();
   node->AddApplication (app);
   
-  ObjectFactory factory ("ns3::NdnFib");
+  ObjectFactory factory ("ns3::ndn::fib::Default");
   
-  Ptr<NdnFib> fib = factory.Create<NdnFib> ();
+  Ptr<ndn::Fib> fib = factory.Create<ndn::Fib> ();
   node->AggregateObject (fib);
-  Ptr<NdnFace> face = CreateObject<NdnAppFace> (app);
+  Ptr<ndn::Face> face = CreateObject<ndn::AppFace> (app);
 
-  fib->Add (lexical_cast<NdnNameComponents> ("/bla"), face, 1);
-  fib->Add (lexical_cast<NdnNameComponents> ("/bla/1"), face, 1);
-  fib->Add (lexical_cast<NdnNameComponents> ("/bla/2"), face, 1);
-  fib->Add (lexical_cast<NdnNameComponents> ("/bla/3"), face, 1);
-  fib->Add (lexical_cast<NdnNameComponents> ("/bla/1/1"), face, 1);
-  fib->Add (lexical_cast<NdnNameComponents> ("/bla/1/2"), face, 1);
+  fib->Add (lexical_cast<ndn::NameComponents> ("/bla"), face, 1);
+  fib->Add (lexical_cast<ndn::NameComponents> ("/bla/1"), face, 1);
+  fib->Add (lexical_cast<ndn::NameComponents> ("/bla/2"), face, 1);
+  fib->Add (lexical_cast<ndn::NameComponents> ("/bla/3"), face, 1);
+  fib->Add (lexical_cast<ndn::NameComponents> ("/bla/1/1"), face, 1);
+  fib->Add (lexical_cast<ndn::NameComponents> ("/bla/1/2"), face, 1);
   
   cout << *fib << endl;