Changes in src/Atom/atom.cpp [d05088:c32d21]

File:

• src/Atom/atom.cpp (modified) (5 diffs)

src/Atom/atom.cpp ¶

@@ -58 +58 @@
   mol(0)
 {
-  // note AtomObserver about inserted atom
+  // sign on to global atom change tracker
   AtomObserver::getInstance().AtomInserted(this);
 }
@@ -69 +69 @@
     mol(0)
 {
-  // sign on to father atom to be notified when it is removed
-  father->signOn(this);
-
-  // note AtomObserver about inserted atom
+  // sign on to global atom change tracker
   AtomObserver::getInstance().AtomInserted(this);
 };
@@ -87 +84 @@
 atom::~atom()
 {
-  // sign off from possible father
-  if ((father != this) && (father != NULL))
-    father->signOff(this);
-
   removeFromMolecule();
-  // note AtomObserver about removed atom
+  // sign off from global atom change tracker
   AtomObserver::getInstance().AtomRemoved(this);
 }
@@ -132 +125 @@
     return father->GetTrueFather();
   }
-}
-
-void atom::setFather(atom * const _father)
-{
-  // sign off from old father
-  if ((father != this) && (father != NULL))
-    father->signOff(this);
-
-  father = _father;
-  father->signOn(this);
-}
+};
 
 /** Sets father to itself or its father in case of copying a molecule.
@@ -342 +325 @@
   return atom1->getType()->getAtomicNumber() < atom2->getType()->getAtomicNumber();
 }
-/*
-void atom::update(Observable *publisher)
-{}
-
-void atom::recieveNotification(Observable *publisher, Notification_ptr notification)
-{
-  ASSERT(0, "atom::recieveNotification() - we are not signed on to any notifications.");
-}
-*/
-void atom::subjectKilled(Observable *publisher)
-{
-  // as publisher has been half-deallocated (Observable is one of the base classes, hence
-  // becomes destroyed latest), we cannot senibly cast it anymore.
-  // Hence, we simply have to check here whether it is NOT one of the other instances
-  // we are signed on to.
-  father = this;
-  // no need to sign off
-}