- Refactored column objects to contain a ::validate method, for the
  validation of incoming data.
- Context.columns is now a vector of one of each column object,
  indexed by attribute name, for validation purposes.
This commit is contained in:
Paul Beckingham
2011-06-24 00:39:28 -04:00
parent a7d6b91ad3
commit 3c1c900b5b
38 changed files with 252 additions and 76 deletions

View File

@@ -37,6 +37,7 @@ extern Context context;
////////////////////////////////////////////////////////////////////////////////
ColumnRecur::ColumnRecur ()
{
_name = "recur";
_type = "string";
_style = "default";
_label = STRING_COLUMN_LABEL_RECUR;
@@ -47,6 +48,12 @@ ColumnRecur::~ColumnRecur ()
{
}
////////////////////////////////////////////////////////////////////////////////
bool ColumnRecur::validate (std::string& value)
{
return true;
}
////////////////////////////////////////////////////////////////////////////////
// Overriden so that style <----> label are linked.
// Note that you can not determine which gets called first.
@@ -68,11 +75,11 @@ void ColumnRecur::measure (Task& task, int& minimum, int& maximum)
}
else if (_style == "indicator")
{
if (task.has ("recur"))
if (task.has (_name))
minimum = maximum = context.config.get ("recurrence.indicator").length ();
}
else
throw format (STRING_COLUMN_BAD_FORMAT, "recur.", _style);
throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
}
////////////////////////////////////////////////////////////////////////////////
@@ -88,7 +95,7 @@ void ColumnRecur::render (
}
else if (_style == "indicator")
{
if (task.has ("recur"))
if (task.has (_name))
lines.push_back (
color.colorize (
rightJustify (context.config.get ("recurrence.indicator"), width)));