code cleanups

This commit is contained in:
Guenter Obiltschnig
2012-10-15 12:27:56 +00:00
parent ac8c9ad1ca
commit eb8c662c4c
19 changed files with 151 additions and 175 deletions

View File

@@ -32,11 +32,13 @@
// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
//
#include "Poco/File.h"
#include "Poco/FileStream.h"
#include "Poco/JSON/Template.h"
#include "Poco/JSON/TemplateCache.h"
#include "Poco/JSON/Query.h"
#include "Poco/File.h"
#include "Poco/FileStream.h"
using Poco::Dynamic::Var;
@@ -52,12 +54,10 @@ POCO_IMPLEMENT_EXCEPTION(JSONTemplateException, Exception, "Template Exception")
class Part
{
public:
Part()
{
}
virtual ~Part()
{
}
@@ -68,10 +68,9 @@ public:
};
class StringPart : public Part
class StringPart: public Part
{
public:
StringPart() : Part()
{
}
@@ -80,57 +79,46 @@ public:
{
}
virtual ~StringPart()
{
}
void render(const Var& data, std::ostream& out) const
{
out << _content;
}
void setContent(const std::string& content)
{
_content = content;
}
inline std::string getContent() const
{
return _content;
}
private:
std::string _content;
};
class MultiPart : public Part
class MultiPart: public Part
{
public:
MultiPart()
{
}
virtual ~MultiPart()
{
}
virtual void addPart(Part* part)
{
_parts.push_back(part);
}
void render(const Var& data, std::ostream& out) const
{
for(VectorParts::const_iterator it = _parts.begin(); it != _parts.end(); ++it)
@@ -140,15 +128,13 @@ public:
}
protected:
VectorParts _parts;
};
class EchoPart : public Part
class EchoPart: public Part
{
public:
EchoPart(const std::string& query) : Part(), _query(query)
{
}
@@ -157,7 +143,6 @@ public:
{
}
void render(const Var& data, std::ostream& out) const
{
Query query(data);
@@ -170,7 +155,6 @@ public:
}
private:
std::string _query;
};
@@ -261,7 +245,6 @@ public:
class LogicPart : public MultiPart
{
public:
LogicPart() : MultiPart()
{
}
@@ -296,22 +279,19 @@ public:
}
private:
std::vector<SharedPtr<LogicQuery> > _queries;
};
class LoopPart : public MultiPart
class LoopPart: public MultiPart
{
public:
LoopPart(const std::string& name, const std::string& query) : MultiPart(), _name(name), _query(query)
{
}
virtual ~LoopPart()
{
}
void render(const Var& data, std::ostream& out) const
@@ -336,14 +316,12 @@ public:
}
private:
std::string _name;
std::string _query;
};
class IncludePart : public Part
class IncludePart: public Part
{
public:
@@ -370,7 +348,6 @@ public:
{
}
void render(const Var& data, std::ostream& out) const
{
TemplateCache* cache = TemplateCache::instance();
@@ -388,9 +365,7 @@ public:
}
private:
Path _path;
};
@@ -748,4 +723,4 @@ void Template::render(const Var& data, std::ostream& out) const
}
}} // Namespace Poco::JSON
} } // Namespace Poco::JSON