github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

Renamed NameMatchOptionHandler as AbstractOptionHandler.

pull/2/head
Tatsuhiro Tsujikawa 2011-10-22 22:57:44 +09:00
parent 3d767543e6
commit 23a83deb4f
5 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/NameMatchOptionHandler.cc → src/AbstractOptionHandler.cc
View File

@ -32,7 +32,7 @@
* files in the program, then also delete it here.
*/
/* copyright --> */
#include "NameMatchOptionHandler.h"
#include "AbstractOptionHandler.h"
#include <algorithm>
@ -43,7 +43,7 @@
namespace aria2 {
NameMatchOptionHandler::NameMatchOptionHandler
AbstractOptionHandler::AbstractOptionHandler
(const Pref* pref,
const std::string& description,
const std::string& defaultValue,
@ -62,9 +62,9 @@ NameMatchOptionHandler::NameMatchOptionHandler
cumulative_(false)
{}
NameMatchOptionHandler::~NameMatchOptionHandler() {}
AbstractOptionHandler::~AbstractOptionHandler() {}
void NameMatchOptionHandler::parse(Option& option, const std::string& arg)
void AbstractOptionHandler::parse(Option& option, const std::string& arg)
{
try {
parseArg(option, arg);
@ -73,22 +73,22 @@ void NameMatchOptionHandler::parse(Option& option, const std::string& arg)
}
}
bool NameMatchOptionHandler::hasTag(const std::string& tag) const
bool AbstractOptionHandler::hasTag(const std::string& tag) const
{
return std::find(tags_.begin(), tags_.end(), tag) != tags_.end();
}
void NameMatchOptionHandler::addTag(const std::string& tag)
void AbstractOptionHandler::addTag(const std::string& tag)
{
tags_.push_back(tag);
}
std::string NameMatchOptionHandler::toTagString() const
std::string AbstractOptionHandler::toTagString() const
{
return strjoin(tags_.begin(), tags_.end(), ", ");
}
const std::string& NameMatchOptionHandler::getName() const
const std::string& AbstractOptionHandler::getName() const
{
return pref_->k;
}

12
src/NameMatchOptionHandler.h → src/AbstractOptionHandler.h
View File

@ -32,8 +32,8 @@
* files in the program, then also delete it here.
*/
/* copyright --> */
#ifndef D_NAME_MATCH_OPTION_HANDLER_H
#define D_NAME_MATCH_OPTION_HANDLER_H
#ifndef D_ABSTRACT_OPTION_HANDLER_H
#define D_ABSTRACT_OPTION_HANDLER_H
#include "OptionHandler.h"
@ -46,7 +46,7 @@ namespace aria2 {
class Option;
class Pref;
class NameMatchOptionHandler : public OptionHandler {
class AbstractOptionHandler : public OptionHandler {
protected:
const Pref* pref_;
@ -71,13 +71,13 @@ protected:
virtual void parseArg(Option& option, const std::string& arg) = 0;
public:
NameMatchOptionHandler(const Pref* pref,
AbstractOptionHandler(const Pref* pref,
const std::string& description = NO_DESCRIPTION,
const std::string& defaultValue = NO_DEFAULT_VALUE,
ARG_TYPE argType = REQ_ARG,
char shortName = 0);
virtual ~NameMatchOptionHandler();
virtual ~AbstractOptionHandler();
virtual void parse(Option& option, const std::string& arg);
@ -177,4 +177,4 @@ public:
} // namespace aria2
#endif // D_NAME_MATCH_OPTION_HANDLER_H
#endif // D_ABSTRACT_OPTION_HANDLER_H

2
src/Makefile.am
View File

@ -77,7 +77,7 @@ SRCS = Socket.h\
OptionHandlerFactory.cc OptionHandlerFactory.h\
OptionHandler.cc OptionHandler.h\
OptionHandlerImpl.cc OptionHandlerImpl.h\
NameMatchOptionHandler.cc NameMatchOptionHandler.h\
AbstractOptionHandler.cc AbstractOptionHandler.h\
NameResolver.cc NameResolver.h\
RequestGroup.cc RequestGroup.h\
RequestGroupMan.cc RequestGroupMan.h\

72
src/OptionHandlerImpl.cc
View File

@ -69,8 +69,8 @@ BooleanOptionHandler::BooleanOptionHandler
const std::string& defaultValue,
OptionHandler::ARG_TYPE argType,
char shortName)
: NameMatchOptionHandler(pref, description, defaultValue,
argType, shortName)
: AbstractOptionHandler(pref, description, defaultValue,
argType, shortName)
{}
BooleanOptionHandler::~BooleanOptionHandler() {}
@ -102,8 +102,8 @@ IntegerRangeOptionHandler::IntegerRangeOptionHandler
const std::string& defaultValue,
int32_t min, int32_t max,
char shortName)
: NameMatchOptionHandler(pref, description, defaultValue,
OptionHandler::REQ_ARG, shortName),
: AbstractOptionHandler(pref, description, defaultValue,
OptionHandler::REQ_ARG, shortName),
min_(min),
max_(max)
{}
@ -139,8 +139,8 @@ NumberOptionHandler::NumberOptionHandler
int64_t min,
int64_t max,
char shortName)
: NameMatchOptionHandler(pref, description, defaultValue,
OptionHandler::REQ_ARG, shortName),
: AbstractOptionHandler(pref, description, defaultValue,
OptionHandler::REQ_ARG, shortName),
min_(min),
max_(max)
{}
@ -221,8 +221,8 @@ FloatNumberOptionHandler::FloatNumberOptionHandler
double min,
double max,
char shortName)
: NameMatchOptionHandler(pref, description, defaultValue,
OptionHandler::REQ_ARG, shortName),
: AbstractOptionHandler(pref, description, defaultValue,
OptionHandler::REQ_ARG, shortName),
min_(min),
max_(max)
{}
@ -279,8 +279,8 @@ DefaultOptionHandler::DefaultOptionHandler
const std::string& possibleValuesString,
OptionHandler::ARG_TYPE argType,
char shortName)
: NameMatchOptionHandler(pref, description, defaultValue, argType,
shortName),
: AbstractOptionHandler(pref, description, defaultValue, argType,
shortName),
possibleValuesString_(possibleValuesString)
{}
@ -304,8 +304,8 @@ CumulativeOptionHandler::CumulativeOptionHandler
const std::string& possibleValuesString,
OptionHandler::ARG_TYPE argType,
char shortName)
: NameMatchOptionHandler(pref, description, defaultValue, argType,
shortName),
: AbstractOptionHandler(pref, description, defaultValue, argType,
shortName),
delim_(delim),
possibleValuesString_(possibleValuesString)
{}
@ -329,8 +329,8 @@ IndexOutOptionHandler::IndexOutOptionHandler
(const Pref* pref,
const std::string& description,
char shortName)
: NameMatchOptionHandler(pref, description, NO_DEFAULT_VALUE,
OptionHandler::REQ_ARG, shortName)
: AbstractOptionHandler(pref, description, NO_DEFAULT_VALUE,
OptionHandler::REQ_ARG, shortName)
{}
IndexOutOptionHandler::~IndexOutOptionHandler() {}
@ -353,8 +353,8 @@ ChecksumOptionHandler::ChecksumOptionHandler
(const Pref* pref,
const std::string& description,
char shortName)
: NameMatchOptionHandler(pref, description, NO_DEFAULT_VALUE,
OptionHandler::REQ_ARG, shortName)
: AbstractOptionHandler(pref, description, NO_DEFAULT_VALUE,
OptionHandler::REQ_ARG, shortName)
{}
ChecksumOptionHandler::~ChecksumOptionHandler() {}
@ -382,8 +382,8 @@ ParameterOptionHandler::ParameterOptionHandler
const std::string& defaultValue,
const std::vector<std::string>& validParamValues,
char shortName)
: NameMatchOptionHandler(pref, description, defaultValue,
OptionHandler::REQ_ARG, shortName),
: AbstractOptionHandler(pref, description, defaultValue,
OptionHandler::REQ_ARG, shortName),
validParamValues_(validParamValues)
{}
@ -393,8 +393,8 @@ ParameterOptionHandler::ParameterOptionHandler
const std::string& defaultValue,
const std::string& validParamValue,
char shortName)
: NameMatchOptionHandler(pref, description, defaultValue,
OptionHandler::REQ_ARG, shortName)
: AbstractOptionHandler(pref, description, defaultValue,
OptionHandler::REQ_ARG, shortName)
{
validParamValues_.push_back(validParamValue);
}
@ -406,8 +406,8 @@ ParameterOptionHandler::ParameterOptionHandler
const std::string& validParamValue1,
const std::string& validParamValue2,
char shortName)
: NameMatchOptionHandler(pref, description, defaultValue,
OptionHandler::REQ_ARG, shortName)
: AbstractOptionHandler(pref, description, defaultValue,
OptionHandler::REQ_ARG, shortName)
{
validParamValues_.push_back(validParamValue1);
validParamValues_.push_back(validParamValue2);
@ -421,8 +421,8 @@ ParameterOptionHandler::ParameterOptionHandler
const std::string& validParamValue2,
const std::string& validParamValue3,
char shortName)
: NameMatchOptionHandler(pref, description, defaultValue,
OptionHandler::REQ_ARG, shortName)
: AbstractOptionHandler(pref, description, defaultValue,
OptionHandler::REQ_ARG, shortName)
{
validParamValues_.push_back(validParamValue1);
validParamValues_.push_back(validParamValue2);
@ -468,8 +468,8 @@ HostPortOptionHandler::HostPortOptionHandler
const Pref* hostOptionName,
const Pref* portOptionName,
char shortName)
: NameMatchOptionHandler(pref, description, defaultValue,
OptionHandler::REQ_ARG, shortName),
: AbstractOptionHandler(pref, description, defaultValue,
OptionHandler::REQ_ARG, shortName),
hostOptionName_(hostOptionName),
portOptionName_(portOptionName)
{}
@ -505,8 +505,8 @@ HttpProxyUserOptionHandler::HttpProxyUserOptionHandler
const std::string& description,
const std::string& defaultValue,
char shortName)
: NameMatchOptionHandler(pref, description, defaultValue,
OptionHandler::REQ_ARG, shortName)
: AbstractOptionHandler(pref, description, defaultValue,
OptionHandler::REQ_ARG, shortName)
{}
void HttpProxyUserOptionHandler::parseArg
@ -547,8 +547,8 @@ HttpProxyPasswdOptionHandler::HttpProxyPasswdOptionHandler
const std::string& description,
const std::string& defaultValue,
char shortName)
: NameMatchOptionHandler(pref, description, defaultValue,
OptionHandler::REQ_ARG, shortName)
: AbstractOptionHandler(pref, description, defaultValue,
OptionHandler::REQ_ARG, shortName)
{}
void HttpProxyPasswdOptionHandler::parseArg
@ -589,8 +589,8 @@ HttpProxyOptionHandler::HttpProxyOptionHandler
const std::string& description,
const std::string& defaultValue,
char shortName)
: NameMatchOptionHandler(pref, description, defaultValue,
OptionHandler::REQ_ARG, shortName),
: AbstractOptionHandler(pref, description, defaultValue,
OptionHandler::REQ_ARG, shortName),
proxyUserPref_(option::k2p(pref->k+"-user")),
proxyPasswdPref_(option::k2p(pref->k+"-passwd"))
{}
@ -643,8 +643,8 @@ LocalFilePathOptionHandler::LocalFilePathOptionHandler
const std::string& defaultValue,
bool acceptStdin,
char shortName)
: NameMatchOptionHandler(pref, description, defaultValue,
OptionHandler::REQ_ARG, shortName),
: AbstractOptionHandler(pref, description, defaultValue,
OptionHandler::REQ_ARG, shortName),
acceptStdin_(acceptStdin)
{}
@ -676,8 +676,8 @@ PrioritizePieceOptionHandler::PrioritizePieceOptionHandler
const std::string& description,
const std::string& defaultValue,
char shortName)
: NameMatchOptionHandler(pref, description, defaultValue,
OptionHandler::REQ_ARG, shortName)
: AbstractOptionHandler(pref, description, defaultValue,
OptionHandler::REQ_ARG, shortName)
{}
void PrioritizePieceOptionHandler::parseArg

32
src/OptionHandlerImpl.h
View File

@ -39,14 +39,14 @@
#include <vector>
#include "NameMatchOptionHandler.h"
#include "AbstractOptionHandler.h"
namespace aria2 {
class Option;
class Pref;
class BooleanOptionHandler : public NameMatchOptionHandler {
class BooleanOptionHandler : public AbstractOptionHandler {
public:
BooleanOptionHandler(const Pref* pref,
const std::string& description = NO_DESCRIPTION,
@ -58,7 +58,7 @@ public:
virtual std::string createPossibleValuesString() const;
};
class IntegerRangeOptionHandler : public NameMatchOptionHandler {
class IntegerRangeOptionHandler : public AbstractOptionHandler {
private:
int32_t min_;
int32_t max_;
@ -73,7 +73,7 @@ public:
virtual std::string createPossibleValuesString() const;
};
class NumberOptionHandler : public NameMatchOptionHandler {
class NumberOptionHandler : public AbstractOptionHandler {
private:
int64_t min_;
int64_t max_;
@ -103,7 +103,7 @@ public:
virtual void parseArg(Option& option, const std::string& optarg);
};
class FloatNumberOptionHandler : public NameMatchOptionHandler {
class FloatNumberOptionHandler : public AbstractOptionHandler {
private:
double min_;
double max_;
@ -118,7 +118,7 @@ public:
virtual std::string createPossibleValuesString() const;
};
class DefaultOptionHandler : public NameMatchOptionHandler {
class DefaultOptionHandler : public AbstractOptionHandler {
private:
std::string possibleValuesString_;
public:
@ -133,7 +133,7 @@ public:
virtual std::string createPossibleValuesString() const;
};
class CumulativeOptionHandler : public NameMatchOptionHandler {
class CumulativeOptionHandler : public AbstractOptionHandler {
private:
std::string delim_;
std::string possibleValuesString_;
@ -151,7 +151,7 @@ public:
virtual std::string createPossibleValuesString() const;
};
class IndexOutOptionHandler : public NameMatchOptionHandler {
class IndexOutOptionHandler : public AbstractOptionHandler {
public:
IndexOutOptionHandler(const Pref* pref,
const std::string& description,
@ -161,7 +161,7 @@ public:
virtual std::string createPossibleValuesString() const;
};
class ChecksumOptionHandler : public NameMatchOptionHandler {
class ChecksumOptionHandler : public AbstractOptionHandler {
public:
ChecksumOptionHandler(const Pref* pref,
const std::string& description,
@ -171,7 +171,7 @@ public:
virtual std::string createPossibleValuesString() const;
};
class ParameterOptionHandler : public NameMatchOptionHandler {
class ParameterOptionHandler : public AbstractOptionHandler {
private:
std::vector<std::string> validParamValues_;
public:
@ -203,7 +203,7 @@ public:
virtual std::string createPossibleValuesString() const;
};
class HostPortOptionHandler : public NameMatchOptionHandler {
class HostPortOptionHandler : public AbstractOptionHandler {
private:
const Pref* hostOptionName_;
const Pref* portOptionName_;
@ -221,7 +221,7 @@ public:
virtual std::string createPossibleValuesString() const;
};
class HttpProxyUserOptionHandler:public NameMatchOptionHandler {
class HttpProxyUserOptionHandler:public AbstractOptionHandler {
public:
HttpProxyUserOptionHandler(const Pref* pref,
const std::string& description,
@ -231,7 +231,7 @@ public:
virtual std::string createPossibleValuesString() const;
};
class HttpProxyPasswdOptionHandler:public NameMatchOptionHandler {
class HttpProxyPasswdOptionHandler:public AbstractOptionHandler {
public:
HttpProxyPasswdOptionHandler(const Pref* pref,
const std::string& description,
@ -241,7 +241,7 @@ public:
virtual std::string createPossibleValuesString() const;
};
class HttpProxyOptionHandler : public NameMatchOptionHandler {
class HttpProxyOptionHandler : public AbstractOptionHandler {
private:
const Pref* proxyUserPref_;
const Pref* proxyPasswdPref_;
@ -255,7 +255,7 @@ public:
virtual std::string createPossibleValuesString() const;
};
class LocalFilePathOptionHandler : public NameMatchOptionHandler {
class LocalFilePathOptionHandler : public AbstractOptionHandler {
private:
bool acceptStdin_;
public:
@ -269,7 +269,7 @@ public:
virtual std::string createPossibleValuesString() const;
};
class PrioritizePieceOptionHandler:public NameMatchOptionHandler {
class PrioritizePieceOptionHandler:public AbstractOptionHandler {
public:
PrioritizePieceOptionHandler
(const Pref* pref,