From 336efe17d8f24a8445e93645f2cf18b68e18de2e Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 30 Apr 2013 17:18:29 -0700
Subject: ACME-275 : WIP : Write all LLPersonViewerFilter methods and clean up
 interface

---
 indra/newview/llpersonmodelcommon.cpp | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

(limited to 'indra/newview/llpersonmodelcommon.cpp')

diff --git a/indra/newview/llpersonmodelcommon.cpp b/indra/newview/llpersonmodelcommon.cpp
index 4e54562f18..32ceef096d 100644
--- a/indra/newview/llpersonmodelcommon.cpp
+++ b/indra/newview/llpersonmodelcommon.cpp
@@ -163,8 +163,9 @@ LLPersonModelCommon(root_view_model)
 //
 
 LLPersonViewFilter::LLPersonViewFilter() :
-    mEmpty(""),
+    mEmptyLookupMessage(""),
     mFilterSubString(""),
+    mName(""),
     mFilterModified(FILTER_NONE)
 {
 }
@@ -177,31 +178,32 @@ void LLPersonViewFilter::setFilterSubString(const std::string& string)
     
 	if (mFilterSubString != filter_sub_string_new)
 	{
+        // *TODO : Add logic to support more and less restrictive filtering
+        mFilterModified = FILTER_RESTART;
 		mFilterSubString = filter_sub_string_new;
 	}
 }
 
-std::string::size_type LLPersonViewFilter::getFilterStringSize() const
+bool LLPersonViewFilter::showAllResults() const
 {
-	return mFilterSubString.size();
+	return mFilterSubString.size() > 0;
 }
 
 bool LLPersonViewFilter::check(const LLFolderViewModelItem* item)
 {
-	//const LLPersonModelCommon* person = dynamic_cast<const LLPersonModelCommon*>(item);
 	std::string::size_type string_offset = mFilterSubString.size() ? item->getSearchableName().find(mFilterSubString) : std::string::npos;
     
 	return (mFilterSubString.size() == 0 || string_offset != std::string::npos);
 }
 
-bool LLPersonViewFilter::showAllResults() const
+std::string::size_type LLPersonViewFilter::getStringMatchOffset(LLFolderViewModelItem* item) const
 {
-	return mFilterSubString.size() > 0;
+	return mFilterSubString.size() ? item->getSearchableName().find(mFilterSubString) : std::string::npos;
 }
 
-std::string::size_type LLPersonViewFilter::getStringMatchOffset(LLFolderViewModelItem* item) const
+std::string::size_type LLPersonViewFilter::getFilterStringSize() const
 {
-	return mFilterSubString.size() ? item->getSearchableName().find(mFilterSubString) : std::string::npos;
+	return mFilterSubString.size();
 }
 
 bool LLPersonViewFilter::isActive() const
@@ -211,11 +213,21 @@ bool LLPersonViewFilter::isActive() const
 
 bool LLPersonViewFilter::isModified() const
 {
-    return isActive();
+	return mFilterModified != FILTER_NONE;
 }
 
 void LLPersonViewFilter::clearModified()
 {
     mFilterModified = FILTER_NONE;
-	setFilterSubString("");
 }
+
+void LLPersonViewFilter::setEmptyLookupMessage(const std::string& message)
+{
+	mEmptyLookupMessage = message;
+}
+
+std::string LLPersonViewFilter::getEmptyLookupMessage() const
+{
+	return mEmptyLookupMessage;
+}
+
-- 
cgit v1.2.3