Changeset 62e23d

Timestamp:

Dec 16, 2009, 12:30:16 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

212c827

Parents:

f00f02

git-author:

Tillmann Crueger <crueger@…> (12/16/09 10:08:33)

git-committer:

Frederik Heber <heber@…> (12/16/09 12:30:16)

Message:

Rebuilt SubMenuItem to use inclusion (Strategy pattern) instead of inheritance. Signed-off-by: Tillmann Crueger <crueger@…>

Location:

molecuilder/src/Menu

Files:

• SubMenuItem.cpp (modified) (2 diffs)
• SubMenuItem.hpp (modified) (1 diff)

molecuilder/src/Menu/SubMenuItem.cpp

@@ -8 +8 @@
 #include "SubMenuItem.hpp"
 
-SubMenuItem::SubMenuItem(char _trigger,const char* _description,Menu* _menu,
-                         ostream& _outputter,string _title,char _spacer, int _length) :
-MenuItem(_trigger,_description,_menu),
-TextMenu(_outputter,_title,_spacer,_length)
-{
-}
-
-SubMenuItem::SubMenuItem(char _trigger,const char* _description,Menu* _menu,
-                         ostream& _outputter,string _title) :
-MenuItem(_trigger,_description,_menu),
-TextMenu(_outputter,_title)
+SubMenuItem::SubMenuItem(char _trigger,const char* _description,Menu* _parent, Menu* _theMenu) :
+MenuItem(_trigger,_description,_parent),
+theMenu(_theMenu)
 {
 }
@@ -24 +16 @@
 SubMenuItem::~SubMenuItem()
 {
+  delete theMenu;
 }
+
+void SubMenuItem::doTrigger() {
+  theMenu->display();
+}

molecuilder/src/Menu/SubMenuItem.hpp

@@ -7 +7 @@
 class Menu;
 
-class SubMenuItem : public MenuItem, public TextMenu
+class SubMenuItem : public MenuItem
 {
 public:
-  SubMenuItem(char,const char*,Menu *,ostream&,string,char,int);
-  SubMenuItem(char,const char*,Menu *,ostream&,string);
+  SubMenuItem(char,const char*,Menu*,Menu*);
   virtual ~SubMenuItem();
 
-  virtual void trigger();
+  virtual void doTrigger();
+private:
+  Menu* theMenu;
 };