From 8acb34db91455c64bd569ca9a37a2d3f60de2663 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Thu, 30 May 2013 14:50:14 -0700 Subject: [PATCH] Feature friendly names. --- src/cpp/ripple/FeatureTable.cpp | 4 ++++ src/cpp/ripple/FeatureTable.h | 28 ++++++++++++++++------------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/cpp/ripple/FeatureTable.cpp b/src/cpp/ripple/FeatureTable.cpp index 1581d0d6ca..0fa2e2755a 100644 --- a/src/cpp/ripple/FeatureTable.cpp +++ b/src/cpp/ripple/FeatureTable.cpp @@ -9,6 +9,7 @@ void FeatureTable::addInitialFeatures() // getCreateFeature. Set any vetoes or defaults. A pointer to the FeatureState can be stashed testFeature = getCreateFeature(uint256("1234"), true); + testFeature->setFriendlyName("testFeature"); } FeatureState* FeatureTable::getCreateFeature(const uint256& featureHash, bool create) @@ -299,6 +300,9 @@ Json::Value FeatureTable::getJson(int) { Json::Value& v(ret[it.first.GetHex()] = Json::objectValue); + if (!it.second.mFriendlyName.empty()) + v["name"] = it.second.mFriendlyName; + v["supported"] = it.second.mSupported; if (it.second.mEnabled) diff --git a/src/cpp/ripple/FeatureTable.h b/src/cpp/ripple/FeatureTable.h index 222603d64e..0202386784 100644 --- a/src/cpp/ripple/FeatureTable.h +++ b/src/cpp/ripple/FeatureTable.h @@ -21,24 +21,28 @@ public: class FeatureState { public: - bool mVetoed; // We don't want this feature enabled - bool mEnabled; - bool mSupported; - bool mDefault; // Include in genesis ledger + bool mVetoed; // We don't want this feature enabled + bool mEnabled; + bool mSupported; + bool mDefault; // Include in genesis ledger - uint32 mFirstMajority; // First time we saw a majority (close time) - uint32 mLastMajority; // Most recent time we saw a majority (close time) + uint32 mFirstMajority; // First time we saw a majority (close time) + uint32 mLastMajority; // Most recent time we saw a majority (close time) + + std::string mFriendlyName; FeatureState() : mVetoed(false), mEnabled(false), mSupported(false), mDefault(false), mFirstMajority(0), mLastMajority(0) { ; } - void setVeto() { mVetoed = true; } - void setDefault() { mDefault = true; } - bool isDefault() { return mDefault; } - bool isSupported() { return mSupported; } - bool isVetoed() { return mVetoed; } - bool isEnabled() { return mEnabled; } + void setVeto() { mVetoed = true; } + void setDefault() { mDefault = true; } + bool isDefault() { return mDefault; } + bool isSupported() { return mSupported; } + bool isVetoed() { return mVetoed; } + bool isEnabled() { return mEnabled; } + const std::string& getFiendlyName() { return mFriendlyName; } + void setFriendlyName(const std::string& n) { mFriendlyName = n; } };