Changeset 304

Timestamp:

03/31/05 12:00:54 (4 years ago)

Author:

athomas

Message:

Finished migrating to new Property Map? hierarchy. Much, much cleaner. It
should also let me extend it seamlessly.

Files:

• todo2/trunk/src/Category.cc (modified) (1 diff)
• todo2/trunk/src/Category.h (modified) (1 diff)
• todo2/trunk/src/filter/Expression.cc (modified) (3 diffs)
• todo2/trunk/src/Item.cc (modified) (2 diffs)
• todo2/trunk/src/Item.h (modified) (5 diffs)
• todo2/trunk/src/Manager.cc (modified) (9 diffs)
• todo2/trunk/src/Manager.h (modified) (2 diffs)
• todo2/trunk/src/PropertyMap.cc (modified) (3 diffs)
• todo2/trunk/src/PropertyMap.h (modified) (1 diff)
• todo2/trunk/src/User.cc (modified) (1 diff)
• todo2/trunk/src/User.h (modified) (1 diff)

todo2/trunk/src/Category.cc

@@ -1 +1 @@
-#include "Category.h"
-
-
+Abstract
-}

todo2/trunk/src/Category.h

@@ -21 +21 @@
-
-                Category() {}
-
+Abstract
-
-                std::string id() const { return mid; }

todo2/trunk/src/filter/Expression.cc

@@ -16 +16 @@
-
-        // Load aliases
-Manager::PropertyMap aliases = MANAGER.prefixToPropertyMap(
-Manager
+OverlayPropertyMap aliases(&MANAGER, 
+PropertyMap
-crash::Expression expr;
-
@@ -82 +82 @@
-        "  children  the number of children of the current node (integer)\n"
-        "  index     the numeric index of the current node (integer)\n"
-index  
+bsindex
-        "            <n>.<m>.<o> ...)\n"
-        "  depth     the numeric depth of the current node (integer)\n"
@@ -258 +258 @@
-                        if (ev == "children") return (double)item->children();
-                        if (ev == "index") return (double)item->index();
-index") return (string)item->ai
+bsindex") return (string)item->absI
-                        if (ev == "depth") return (double)item->depth();
-                        if (ev == "true") return 1.0;

todo2/trunk/src/Item.cc

@@ -132 +132 @@
-}
-
-i
+bsI
-Index index;
-
@@ -141 +141 @@
-}
-
-/*void Item::vacuum(bool clean) {
-        for (KeyValues::iterator i = mkv.begin(); i != mkv.end(); ++i)
-                i->second.dirty(clean);
-}
-
-void Item::vacuum(std::string key, bool clean) {
-        if (mkv.find(key) == mkv.end()) throw Exception(_("can't clean non-existent key '") + key + "'");
-        mkv[key].dirty(clean);
-}
-
-bool Item::dirty(std::string key) const {
-KeyValues::const_iterator i = mkv.find(key);
-        if (i == mkv.end())
-                throw Exception(_("non-existent key '") + key + "'");
-        return i->second.dirty();
-}*/
-
-bool Item::dirty() const {
-for (KeyValues::const_iterator i = mkv.begin(); i != mkv.end(); ++i
-if (i->second.dirty()) 
+if (COWPropertyMap::dirty()
+
-        if (child()) return child()->dirty();
-        if (next()) return next()->dirty();

todo2/trunk/src/Item.h

@@ -2 +2 @@
-#define ITEM_H__
-
-#include <time.h>
-#include <stdexcept>
-#include <string>
-#include <vector>
-#include <map>
+#include <ctime>
-#include <crash/Tree.h>
-#include <crash/Exception.h>
@@ -16 +16 @@
-/**     An Item represents a single entry in the devtodo database. */
-
-
+COW
-        public :
-                SUBCLASS_DEFAULT_EXCEPTION
@@ -52 +52 @@
-
-                /**     Find root of tree */
-parent() ? 
+crash::Tree<Item>::parent() ? crash::Tree<Item>::
-                /**     Find root of tree */
-parent() ? 
+crash::Tree<Item>::parent() ? crash::Tree<Item>::
-
-                /* Hierarchy traversal */
-/*              Item *parent() { return crash::Tree<Item>::parent(); }
-                const Item *parent() const { return crash::Tree<Item>::parent(); }
-                Item *child() { return crash::Tree<Item>::child(); }
-                const Item *child() const { return crash::Tree<Item>::child(); }
-                Item *next() { return crash::Tree<Item>::next(); }
-                Item *prev() { return crash::Tree<Item>::prev(); }
-                const Item *next() const { return crash::Tree<Item>::next(); }
-                const Item *prev() const { return crash::Tree<Item>::prev(); }
-                unsigned children() const { return crash::Tree<Item>::children(); }
-                unsigned depth() const { return crash::Tree<Item>::depth(); }*/
-
-                /*      Hierarchy modification */
-/*              Item *peer(Item *peer) { return crash::Tree<Item>::peer(peer); }
-                Item *next(Item *next) { return crash::Tree<Item>::next(next); }
-                Item *prev(Item *prev) { return crash::Tree<Item>::prev(prev); }*/
-                Item *adopt(Item *child) {
-propertyParent
+child->backing
-                        return crash::Tree<Item>::adopt(child);
-                }
-propertyParent
+backing
-
-                // Attribute queries
-                ///     Get body of Item
-const std::string &
+std::string 
-                ///     Get title of Item
-const std::string &
+std::string 
-                // Scheduling times
-                ///     Get beginning of scheduled time
@@ -125 +109 @@
-                Priority priority() const { return static_cast<Priority>(get<int>("priority")); }
-                ///     Return the absolute index to this item.
-i
+bsI
-                /** Note that active() is not equivalent to !completed(), because an
-                        item can be inactive until a dependency is satisfied, or it's 
@@ -147 +131 @@
-                bool dirty() const;
-        private :
+                //      Demoted methods we don't want to be used in Item context.
+                void flatten(const std::string &) {}
+                void flatten() {}
+
-                std::vector<Item*> mdeps;
-                bool mfiltered;

todo2/trunk/src/Manager.cc

@@ -91 +91 @@
-}
-
-
+
+
+
+
-        // Find this time zones offset from UTC
-time_t now = ::time(0);
@@ -118 +121 @@
-        /*      Add ourselves to the AddressBook. Hopefully, though, the user will
-                override this with a valid E-Mail address. */
-defined
+exists
-                set("addressbook." + string(pw->pw_name) + ".name", pw->pw_gecos);
-                set("addressbook." + string(pw->pw_name) + ".contact", "mail:" + string(pw->pw_name) + "@" + hostname());
@@ -281 +284 @@
-                /*      All configuration changes from here on will be written to the 
-                        currently open database. */
-vacuum
+commit
-
-                // Final pass before handing off to modules.
@@ -345 +348 @@
-                                break;
-                                case DUMPCONFIG : {
-PropertyMap::
+this->
-
-                                        for (Manager::Keys::iterator i = keys.begin(); i != keys.end(); ++i)
@@ -486 +489 @@
-                props.set("id", (*i).substr(9));
-                props.set("description", get(*i));
+
+                mcategories[props.get("id")] = new Category(props);
-        }
-}
@@ -494 +499 @@
-        for (Keys::iterator i = ab.begin(); i != ab.end(); ++i) {
-        vector<string> c = split(".", *i);
-PropertyMap props = prefixToPropertyMap(
+OverlayPropertyMap props(this, 
-
-                props.set("id", c[1]);
@@ -502 +507 @@
-
-void Manager::populatePriorities() {
-PropertyMap props = prefixToPropertyMap(
-PropertyMap::
-
-PropertyMap::
+OverlayPropertyMap props(this, 
+
+
+
-                try {
-                int p = from_string<int>(*i);
@@ -553 +558 @@
-}
-
-
+Abstract
-        DEBUG(9, "adding user " << prop.get("id") << " to global address book");
-        musers[prop.get("id")] = new User(prop);
@@ -572 +577 @@
-}
-
-
+Abstract
-        mcategories[prop.get("id")] = new Category(prop);
-}

todo2/trunk/src/Manager.h

@@ -17 +17 @@
-
-/**
-
+
+
+
+
+
-*/
-
-
+
-        public :
-                SUBCLASS_DEFAULT_EXCEPTION
@@ -43 +46 @@
-                /**     Return the User entry for the current user. */
-                const User *self() { return mself; }
-
+Abstract
-                const User *getUser(std::string id);
-                User::List allUsers() const;
-
-                ///     Add a new category
-
+Abstract
-                const Category *getCategory(std::string name) const;
-                const Category *defaultCategory() const;

todo2/trunk/src/PropertyMap.cc

@@ -1 +1 @@
-#include <fstream>
-#include <iostream>
+#include <algorithm>
+#include <set>
-#include "PropertyMap.h"
-#include "main.h"
@@ -7 +9 @@
-using namespace crash;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-ifstream in(file.c_str());
-string line, section;
@@ -62 +37 @@
-}
-
-
-
+
+
+
+
+
+
+
+
+
+
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        return out;
-}

todo2/trunk/src/PropertyMap.h

@@ -1 @@
-BASICCONFIG
-BASICCONFIG
+PROPERTYMAP
+PROPERTYMAP
-
-#include <crash/Exception.h>
-#include <crash/StringManip.h>
-#include <crash/TypeResolver.h>
-#include <crash/smart_ptr.h>
-#include <map>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        public :
-                SUBCLASS_DEFAULT_EXCEPTION
-                SUBCLASS_NAMED_EXCEPTION(InvalidValue, Exception)
-
-                class Property {
-                        public :
-                                Property() : mdirty(true) {}
-                                explicit Property(const std::string &value) : mvalue(value), mdirty(true) {}
-
-                                void dirty(bool state) { mdirty = state; }
-                                bool dirty() const { return mdirty; }
-
-                                const std::string &get() const { return mvalue; }
-                                void set(const std::string &value) { mvalue = value; mdirty = true; }
-                        private :
-                                std::string mvalue;
-                                bool mdirty;
-                };
-
-                typedef std::map<std::string, Property> KeyValues;
-                typedef KeyValues::const_iterator const_iterator;
-                typedef KeyValues::iterator iterator;
-
-                typedef std::vector<std::string> Keys;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                template <typename T>
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        try {
-
+v
-                        } catch (crash::BadCast) {
-
+v
-                        }
-                }
-
-                /**     Return the value of a key as a specific type. If the key does not
-                        exist return a default value. */
-                template <typename T>
-
-
+
-                        try {
-
+
+
+
-                        } catch (crash::BadCast) {
-
+v
-                        }
-                }
-
-                ///     Set the value of a key to a specific type.
-                template <typename T>
-                void set(const std::string &key, const T &value) {
-                        set(key, crash::to_string(value));
-                }
-
-                ///     Set the value of a key.
-                void setUnlessDefined(const std::string &key, const std::string &value) {
-                        if (!exists(key)) set(key, value);
-                }
-
-                ///     Set the value of a key to a specific type.
-                template <typename T>
-                void setUnlessDefined(const std::string &key, const T &value) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        protected :
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+