From 8a14c386555b5b9ccd8d850713bd7732cdeb3fa3 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Wed, 11 Mar 2015 20:06:26 +0400 Subject: Rename for better understanding --- ParserClass/AbstractIDManager.hpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 ParserClass/AbstractIDManager.hpp (limited to 'ParserClass/AbstractIDManager.hpp') diff --git a/ParserClass/AbstractIDManager.hpp b/ParserClass/AbstractIDManager.hpp new file mode 100644 index 0000000..e69de29 -- cgit v1.2.3 From 6fcf2131d319d8c9a7bff67defb83098e4fe5cab Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Wed, 11 Mar 2015 21:32:36 +0400 Subject: Update ParserClass --- ParserClass/AbstractIDManager.cpp | 47 +++++++++++++------------------- ParserClass/AbstractIDManager.hpp | 36 ++++++++++++++++++++++++ ParserClass/FileManContainer/Website.cpp | 13 ++------- ParserClass/FileManContainer/Website.hpp | 12 ++------ 4 files changed, 60 insertions(+), 48 deletions(-) (limited to 'ParserClass/AbstractIDManager.hpp') diff --git a/ParserClass/AbstractIDManager.cpp b/ParserClass/AbstractIDManager.cpp index 370fc06..852c201 100644 --- a/ParserClass/AbstractIDManager.cpp +++ b/ParserClass/AbstractIDManager.cpp @@ -1,39 +1,30 @@ /** - * @file AbstractFileContainer.hpp - * @brief FileManContainer class definitions + * @file AbstractIDManager.cpp + * @brief AbstractIDManager class definitions * @author manzerbredes * @date 11 Mars 2015 * - * Contain all definitions of FileManContainer class. + * Contain all implémentations of AbstractIDManager class. * */ -#ifndef __FileManContainer__ -#define __FileManContainer__ +#include "AbstractIDManager.hpp" +AbstractIDManager::AbstractIDManager(){ + this->id=this->generateId(); +} +void AbstractIDManager::setId(std::string id){ + this->id = id; +} -/** - * @class Website Website.hpp "/ParserClass/FileManContainer/Website.hpp" - * @brief Class for manager all FileMan container (websites etc...) - * @author manzerbredes - * - * - * - */ - -class FileManContainer{ - - public: - FileManContainer(); - - void addWebsite(Website website); - std::vector getWebsites(); - - private: - - std::vector websites; -}; - +std::string AbstractIDManager::generateId(){ + boost::uuids::uuid uuid = boost::uuids::random_generator()(); + std::stringstream ss; + ss << uuid; + return ss.str(); +} -#endif +std::string AbstractIDManager::getId(){ + return this->id; +} diff --git a/ParserClass/AbstractIDManager.hpp b/ParserClass/AbstractIDManager.hpp index e69de29..9281915 100644 --- a/ParserClass/AbstractIDManager.hpp +++ b/ParserClass/AbstractIDManager.hpp @@ -0,0 +1,36 @@ +/** + * @file AbstractIDManager.cpp + * @brief AbstractIDManager class definitions + * @author manzerbredes + * @date 11 Mars 2015 + * + * Contain all definitions of AbstractIDManager class. + * + */ + +#include +#include +#include // uuid class +#include // generators +#include // streaming operators etc. + + + + + + class AbstractIDManager{ + + + public: + AbstractIDManager(); + + std::string getId(); + void setId(std::string id); + + std::string generateId(); + + private: + + std::string id; + + }; diff --git a/ParserClass/FileManContainer/Website.cpp b/ParserClass/FileManContainer/Website.cpp index 0e1a670..d54e28a 100644 --- a/ParserClass/FileManContainer/Website.cpp +++ b/ParserClass/FileManContainer/Website.cpp @@ -13,18 +13,13 @@ Website::Website(){ - boost::uuids::uuid uuid = boost::uuids::random_generator()(); - std::stringstream ss; - ss << uuid; - this->id=ss.str(); + } -std::string Website::getId(){ - return this->id; -} + std::string Website::getTitle(){ return this->title; } @@ -43,9 +38,7 @@ std::string Website::getDescription(){ -void Website::setId(std::string id){ - this->id = id; -} + void Website::setTitle(std::string title){ this->title = title; } diff --git a/ParserClass/FileManContainer/Website.hpp b/ParserClass/FileManContainer/Website.hpp index ceb21ad..c370f3b 100644 --- a/ParserClass/FileManContainer/Website.hpp +++ b/ParserClass/FileManContainer/Website.hpp @@ -27,12 +27,7 @@ */ #include -#include -#include // uuid class -#include // generators -#include // streaming operators etc. - - +#include "AbstractIDManager.hpp" /** * @class Website Website.hpp "/ParserClass/FileManContainer/Website.hpp" @@ -42,7 +37,7 @@ * Container for website data. * */ -class Website{ +class Website : public AbstractIDManager { public: @@ -53,7 +48,6 @@ class Website{ * @brief Containner getters. */ - std::string getId(); std::string getTitle(); std::string getUrl(); std::string getUsername(); @@ -64,7 +58,6 @@ class Website{ /** * @brief Containner setters. */ - void setId(std::string title); void setTitle(std::string title); void setUrl(std::string url); void setUsername(std::string username); @@ -74,7 +67,6 @@ class Website{ private: - std::string id; ///< id of the website std::string title; ///< Title of the website std::string url; ///< Url of the website std::string username; ///< username of the account -- cgit v1.2.3 From 40c659f6810b712c366e50139046995af46f42cc Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Fri, 13 Mar 2015 10:52:34 +0400 Subject: Update class --- CryptClass/AESCrypt.cpp | 1 + CryptClass/AbstractSKA.hpp | 7 ------- ParserClass/AbstractIDManager.cpp | 9 +++++++++ ParserClass/AbstractIDManager.hpp | 31 +++++++++++++++++++++++++++---- 4 files changed, 37 insertions(+), 11 deletions(-) (limited to 'ParserClass/AbstractIDManager.hpp') diff --git a/CryptClass/AESCrypt.cpp b/CryptClass/AESCrypt.cpp index 0222e9a..30e501a 100644 --- a/CryptClass/AESCrypt.cpp +++ b/CryptClass/AESCrypt.cpp @@ -21,6 +21,7 @@ AESCrypt::AESCrypt(){ //Destructor AESCrypt::~AESCrypt(){ + } diff --git a/CryptClass/AbstractSKA.hpp b/CryptClass/AbstractSKA.hpp index 5a23c36..7622ab4 100644 --- a/CryptClass/AbstractSKA.hpp +++ b/CryptClass/AbstractSKA.hpp @@ -28,13 +28,6 @@ class AbstractSKA { public: - //Constructor - AbstractSKA(); - - //Destructor - ~AbstractSKA(); - - /** * @brief Encrypt data. * diff --git a/ParserClass/AbstractIDManager.cpp b/ParserClass/AbstractIDManager.cpp index 852c201..01e3c3d 100644 --- a/ParserClass/AbstractIDManager.cpp +++ b/ParserClass/AbstractIDManager.cpp @@ -14,6 +14,15 @@ AbstractIDManager::AbstractIDManager(){ this->id=this->generateId(); } +AbstractIDManager::AbstractIDManager(std::string id){ + this->id=id; +} +AbstractIDManager::~AbstractIDManager(){ + this->id=id; +} + + + void AbstractIDManager::setId(std::string id){ this->id = id; } diff --git a/ParserClass/AbstractIDManager.hpp b/ParserClass/AbstractIDManager.hpp index 9281915..a18d1b2 100644 --- a/ParserClass/AbstractIDManager.hpp +++ b/ParserClass/AbstractIDManager.hpp @@ -1,15 +1,21 @@ /** - * @file AbstractIDManager.cpp + * @file AbstractIDManager.hpp * @brief AbstractIDManager class definitions * @author manzerbredes * @date 11 Mars 2015 * * Contain all definitions of AbstractIDManager class. + * If you want to manage id in class (like container), use + * this class as superclass. * */ +//----- std ----- #include #include + + +//----- boost ----- #include // uuid class #include // generators #include // streaming operators etc. @@ -17,20 +23,37 @@ - +/** + * @class AbstractIDManager AbstractIDManager.hpp "/CryptClass/AbstractIDManager.hpp" + * @brief Managing ID + * @author manzerbredes + * + * This class should not be instantiate directly. + * + */ class AbstractIDManager{ public: + //Constructor AbstractIDManager(); + //Constructor, init with id + AbstractIDManager(std::string); + + //Destructor + ~AbstractIDManager(); + + + //Getters and setters std::string getId(); void setId(std::string id); - std::string generateId(); private: + //Generate and random id + std::string generateId(); - std::string id; + std::string id; ///< String id attribute }; -- cgit v1.2.3