1 files changed, 17 insertions, 9 deletions
diff --git a/Swift/Controllers/HighlightEditorController.cpp b/Swift/Controllers/HighlightEditorController.cpp
index 899e4bb..2b57dbf 100644
--- a/Swift/Controllers/HighlightEditorController.cpp
+++ b/Swift/Controllers/HighlightEditorController.cpp
@@ -7,34 +7,42 @@
 #include <boost/bind.hpp>
 
 #include <Swift/Controllers/HighlightEditorController.h>
-#include <Swift/Controllers/UIInterfaces/HighlightEditorWidget.h>
-#include <Swift/Controllers/UIInterfaces/HighlightEditorWidgetFactory.h>
 #include <Swift/Controllers/UIEvents/RequestHighlightEditorUIEvent.h>
 #include <Swift/Controllers/UIEvents/UIEventStream.h>
+#include <Swift/Controllers/UIInterfaces/HighlightEditorWindowFactory.h>
+#include <Swift/Controllers/UIInterfaces/HighlightEditorWindow.h>
+#include <Swift/Controllers/ContactSuggester.h>
 
 namespace Swift {
 
-HighlightEditorController::HighlightEditorController(UIEventStream* uiEventStream, HighlightEditorWidgetFactory* highlightEditorWidgetFactory, HighlightManager* highlightManager) : highlightEditorWidgetFactory_(highlightEditorWidgetFactory), highlightEditorWidget_(NULL), highlightManager_(highlightManager)
+HighlightEditorController::HighlightEditorController(UIEventStream* uiEventStream, ContactSuggester* contactSuggester, HighlightEditorWindowFactory* highlightEditorWindowFactory, HighlightManager* highlightManager)
+: highlightEditorWindowFactory_(highlightEditorWindowFactory), highlightEditorWindow_(NULL), highlightManager_(highlightManager), contactSuggester_(contactSuggester)
 {
 	uiEventStream->onUIEvent.connect(boost::bind(&HighlightEditorController::handleUIEvent, this, _1));
 }
 
 HighlightEditorController::~HighlightEditorController()
 {
-	delete highlightEditorWidget_;
-	highlightEditorWidget_ = NULL;
+	delete highlightEditorWindow_;
+	highlightEditorWindow_ = NULL;
 }
 
 void HighlightEditorController::handleUIEvent(boost::shared_ptr<UIEvent> rawEvent)
 {
 	boost::shared_ptr<RequestHighlightEditorUIEvent> event = boost::dynamic_pointer_cast<RequestHighlightEditorUIEvent>(rawEvent);
 	if (event) {
-		if (!highlightEditorWidget_) {
-			highlightEditorWidget_ = highlightEditorWidgetFactory_->createHighlightEditorWidget();
-			highlightEditorWidget_->setHighlightManager(highlightManager_);
+		if (!highlightEditorWindow_) {
+			highlightEditorWindow_ = highlightEditorWindowFactory_->createHighlightEditorWindow();
+			highlightEditorWindow_->setHighlightManager(highlightManager_);
+			highlightEditorWindow_->onContactSuggestionsRequested.connect(boost::bind(&HighlightEditorController::handleContactSuggestionsRequested, this, _1));
 		}
-		highlightEditorWidget_->show();
+		highlightEditorWindow_->show();
 	}
 }
 
+void HighlightEditorController::handleContactSuggestionsRequested(const std::string& text)
+{
+	highlightEditorWindow_->setContactSuggestions(contactSuggester_->getSuggestions(text));
+}
+
 }