Changed config property names to camel case.

psidnell · Dec 11, 2014 · f5e4a9b · f5e4a9b
1 parent 2a5e04b
commit f5e4a9b
Show file tree

Hide file tree

Showing 15 changed files with 776 additions and 776 deletions.
diff --git a/config/config.properties b/config/config.properties
@@ -11,8 +11,8 @@ flattenedRootName:Tasks
 # FreeMarker templates using ${config.propName}
 
 # Java SimpleDateFormat string formatting
-template_date_format:yyyy-MM-dd
+templateDateFormat:yyyy-MM-dd
 
 # Values used in report.ftk
-report_date_format:yyyy-MM-dd-EEE
-report_ftl_title:Progress Report
+reportDateFormat:yyyy-MM-dd-EEE
+reportTitle:Progress Report
diff --git a/config/templates/csv.ftl b/config/templates/csv.ftl
@@ -68,6 +68,6 @@ $ MACRO: doRow
 $$$$$$$$$$$$$$$$$$
 -->
 <#macro doRow node>
-"${node.name?replace("\"","'")}"<#if (node.flagged)?? && node.flagged>,"FLAGGED"<#else>,</#if><#if (node.defer.getDate())??>,"${node.defer.getDate()?string[config.template_date_format]}"<#else>,</#if><#if (node.due.getDate())??>,"${node.due.getDate()?string[config.template_date_format]}"<#else>,</#if><#if (node.completion.getDate())??>,"${node.completion.getDate()?string[config.template_date_format]}"<#else>,</#if><#if (node.note)??>,"${node.note?replace("\"","'")?replace("\n"," ")}"</#if>
+"${node.name?replace("\"","'")}"<#if (node.flagged)?? && node.flagged>,"FLAGGED"<#else>,</#if><#if (node.defer.getDate())??>,"${node.defer.getDate()?string[config.templateDateFormat]}"<#else>,</#if><#if (node.due.getDate())??>,"${node.due.getDate()?string[config.templateDateFormat]}"<#else>,</#if><#if (node.completion.getDate())??>,"${node.completion.getDate()?string[config.templateDateFormat]}"<#else>,</#if><#if (node.note)??>,"${node.note?replace("\"","'")?replace("\n"," ")}"</#if>
 </#macro>
 
diff --git a/config/templates/debug.ftl b/config/templates/debug.ftl
@@ -40,11 +40,11 @@ $$$$$$$$$$$$$$$$$$
 <@doIndent indent=depth/>. -name:${project.name}
 <@doIndent indent=depth/>. -active:${project.active?c}
 <@doIndent indent=depth/>. -completed:${project.completed?c}
-<@doIndent indent=depth/>. -completionDate:<#if (project.completion.getDate())??>${project.completion.getDate()?string[config.template_date_format]}<#else>null</#if>
+<@doIndent indent=depth/>. -completionDate:<#if (project.completion.getDate())??>${project.completion.getDate()?string[config.templateDateFormat]}<#else>null</#if>
 <@doIndent indent=depth/>. -contextName:<#if (project.contextName)??>${project.contextName}<#else>null></#if>
-<@doIndent indent=depth/>. -deferDate:<#if (project.defer.getDate())??>${project.defer.getDate()?string[config.template_date_format]}<#else>null</#if>
+<@doIndent indent=depth/>. -deferDate:<#if (project.defer.getDate())??>${project.defer.getDate()?string[config.templateDateFormat]}<#else>null</#if>
 <@doIndent indent=depth/>. -dropped:${project.dropped?c}
-<@doIndent indent=depth/>. -dueDate:<#if (project.due.getDate())??>${project.due.getDate()?string[config.template_date_format]}<#else>null</#if>
+<@doIndent indent=depth/>. -dueDate:<#if (project.due.getDate())??>${project.due.getDate()?string[config.templateDateFormat]}<#else>null</#if>
 <@doIndent indent=depth/>. -estimatedMinutes:${project.estimatedMinutes}
 <@doIndent indent=depth/>. -flagged:${project.flagged?c}
 <@doIndent indent=depth/>. -onHold:${project.onHold?c}
@@ -71,10 +71,10 @@ $$$$$$$$$$$$$$$
 <@doIndent indent=depth/>. -available:${task.available?c}
 <@doIndent indent=depth/>. -blocked:${task.blocked?c}
 <@doIndent indent=depth/>. -completed:${task.completed?c}
-<@doIndent indent=depth/>. -completionDate:<#if (task.completion.getDate())??>${task.completion.getDate()?string[config.template_date_format]}<#else>null</#if>
+<@doIndent indent=depth/>. -completionDate:<#if (task.completion.getDate())??>${task.completion.getDate()?string[config.templateDateFormat]}<#else>null</#if>
 <@doIndent indent=depth/>. -contextName:<#if (task.contextName)??>${task.contextName}<#else>null></#if>
-<@doIndent indent=depth/>. -deferDate:<#if (task.defer.getDate())??>${task.defer.getDate()?string[config.template_date_format]}<#else>null</#if>
-<@doIndent indent=depth/>. -dueDate:<#if (task.due.getDate())??>${task.due.getDate()?string[config.template_date_format]}<#else>null</#if>
+<@doIndent indent=depth/>. -deferDate:<#if (task.defer.getDate())??>${task.defer.getDate()?string[config.templateDateFormat]}<#else>null</#if>
+<@doIndent indent=depth/>. -dueDate:<#if (task.due.getDate())??>${task.due.getDate()?string[config.templateDateFormat]}<#else>null</#if>
 <@doIndent indent=depth/>. -estimatedMinutes:${task.estimatedMinutes}
 <@doIndent indent=depth/>. -flagged:${task.flagged?c}
 <@doIndent indent=depth/>. -available:${task.available?c}

diff --git a/config/templates/html.ftl b/config/templates/html.ftl
@@ -171,7 +171,7 @@ $$$$$$$$$$$$$$$
 Using Java SimpleDateFormat conversion
 -->
 <#macro doAttribs node>
-<span class="Attrib"><#if (node.flagged)??> <span class="AFlagged">FLAGGED</span></#if><#if (node.defer.getDate())??> <span class="AStart">${node.defer.getDate()?string[config.template_date_format]}</span></#if><#if (node.due.getDate())??> <span class="ADue">${node.due.getDate()?string[config.template_date_format]}</span></#if><#if (node.completion.getDate())??> <span class="AComplete">${node.completion.getDate()?string[config.template_date_format]}</span></#if></span></#macro>
+<span class="Attrib"><#if (node.flagged)??> <span class="AFlagged">FLAGGED</span></#if><#if (node.defer.getDate())??> <span class="AStart">${node.defer.getDate()?string[config.templateDateFormat]}</span></#if><#if (node.due.getDate())??> <span class="ADue">${node.due.getDate()?string[config.templateDateFormat]}</span></#if><#if (node.completion.getDate())??> <span class="AComplete">${node.completion.getDate()?string[config.templateDateFormat]}</span></#if></span></#macro>
 <#--
 $$$$$$$$$$$$$$$
 $ MACRO: doNote

diff --git a/config/templates/opml.ftl b/config/templates/opml.ftl
@@ -86,7 +86,7 @@ $$$$$$$$$$$$$$$
 Using Java SimpleDateFormat conversion
 -->
 <#macro doAttribs node>
-<#if (node.completion.getDate())??> completed="${node.completion.getDate()?string[config.template_date_format]}"</#if><#if node.flagged> flagged="flagged"</#if><#if (node.contextName)??> context="${node.contextName?xml}"</#if><#if (node.note)??> _note="${escape(node.note)}"</#if></#macro>
+<#if (node.completion.getDate())??> completed="${node.completion.getDate()?string[config.templateDateFormat]}"</#if><#if node.flagged> flagged="flagged"</#if><#if (node.contextName)??> context="${node.contextName?xml}"</#if><#if (node.note)??> _note="${escape(node.note)}"</#if></#macro>
 <#--
 $$$$$$$$$$$$$$
 $ FUNCTION: escape

diff --git a/config/templates/report.ftl b/config/templates/report.ftl
@@ -5,7 +5,7 @@ $$$$$$$$$$$$$$$$$$
 -->
 <#global INDENT="\t">
 <#global TODAY=root.date("today")>
-${config.report_ftl_title} ${TODAY?string[config.report_date_format]}:
+${config.reportTitle} ${TODAY?string[config.reportDateFormat]}:
 <#--
 $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
 $ Walk over items in root node
@@ -76,6 +76,6 @@ $ MACRO: doDateTag
 $$$$$$$$$$$$$$$$$$
 Using Java SimpleDateFormat conversion
 -->
-<#macro doDateTag date> @${date?string[config.report_date_format]}</#macro>
+<#macro doDateTag date> @${date?string[config.reportDateFormat]}</#macro>
 
 
diff --git a/config/templates/taskpaper.ftl b/config/templates/taskpaper.ftl
@@ -78,7 +78,7 @@ $$$$$$$$$$$$$$$
 Using Java SimpleDateFormat conversion
 -->
 <#macro doTags node>
-<#if (node.completion.getDate())??> @done(${node.completion.getDate()?string[config.template_date_format]})</#if><#if node.flagged> @flagged</#if><#if (node.due.getDate())??> @due(${node.due.getDate()?string["yyyy-MM-dd"]})</#if><#if (node.contextName)??> @${node.contextName?replace(" ","")?replace(",","")?replace("@","")?replace(".","")}</#if></#macro> 
+<#if (node.completion.getDate())??> @done(${node.completion.getDate()?string[config.templateDateFormat]})</#if><#if node.flagged> @flagged</#if><#if (node.due.getDate())??> @due(${node.due.getDate()?string["yyyy-MM-dd"]})</#if><#if (node.contextName)??> @${node.contextName?replace(" ","")?replace(",","")?replace("@","")?replace(".","")}</#if></#macro> 
 <#--
 $$$$$$$$$$$$$$$
 $ MACRO: doNote

diff --git a/config/templates/txt.ftl b/config/templates/txt.ftl
@@ -70,7 +70,7 @@ $$$$$$$$$$$$$$$
 Using Java SimpleDateFormat conversion
 -->
 <#macro doAttribs node>
-<#if (node.completion.getDate())??> done:${node.completion.getDate()?string[config.template_date_format]}</#if><#if (node.due.getDate())??> due:${node.due.getDate()?string[config.template_date_format]}</#if><#if node.flagged> FLAGGED</#if></#macro> 
+<#if (node.completion.getDate())??> done:${node.completion.getDate()?string[config.templateDateFormat]}</#if><#if (node.due.getDate())??> due:${node.due.getDate()?string[config.templateDateFormat]}</#if><#if node.flagged> FLAGGED</#if></#macro> 
 <#--
 $$$$$$$$$$$$$$$$$$
 $ MACRO: doIndent