From 56f83c8078d00691564b844fd70855ad296a5511 Mon Sep 17 00:00:00 2001
From: Zlatin Balevsky <zlatinb@gmail.com>
Date: Tue, 7 Jun 2022 06:09:20 +0100
Subject: [PATCH] move contact selector to its own package

---
 gui/griffon-app/conf/Config.groovy                          | 6 +++---
 .../gui/{ => contacts}/ContactSelectorController.groovy     | 2 +-
 .../muwire/gui/{ => contacts}/ContactSelectorModel.groovy   | 2 +-
 .../muwire/gui/{ => contacts}/ContactSelectorView.groovy    | 5 ++++-
 4 files changed, 9 insertions(+), 6 deletions(-)
 rename gui/griffon-app/controllers/com/muwire/gui/{ => contacts}/ContactSelectorController.groovy (84%)
 rename gui/griffon-app/models/com/muwire/gui/{ => contacts}/ContactSelectorModel.groovy (89%)
 rename gui/griffon-app/views/com/muwire/gui/{ => contacts}/ContactSelectorView.groovy (96%)

diff --git a/gui/griffon-app/conf/Config.groovy b/gui/griffon-app/conf/Config.groovy
index 30c84f14..4563bfcf 100644
--- a/gui/griffon-app/conf/Config.groovy
+++ b/gui/griffon-app/conf/Config.groovy
@@ -234,9 +234,9 @@ mvcGroups {
         controller = 'com.muwire.gui.chat.ChatFavoritesController'
     }
     'contact-selector' {
-        model = 'com.muwire.gui.ContactSelectorModel'
-        view = 'com.muwire.gui.ContactSelectorView'
-        controller = 'com.muwire.gui.ContactSelectorController'
+        model = 'com.muwire.gui.contacts.ContactSelectorModel'
+        view = 'com.muwire.gui.contacts.ContactSelectorView'
+        controller = 'com.muwire.gui.contacts.ContactSelectorController'
     }
     'edit-profile' {
         model = 'com.muwire.gui.profile.EditProfileModel'
diff --git a/gui/griffon-app/controllers/com/muwire/gui/ContactSelectorController.groovy b/gui/griffon-app/controllers/com/muwire/gui/contacts/ContactSelectorController.groovy
similarity index 84%
rename from gui/griffon-app/controllers/com/muwire/gui/ContactSelectorController.groovy
rename to gui/griffon-app/controllers/com/muwire/gui/contacts/ContactSelectorController.groovy
index 0468e690..9367b395 100644
--- a/gui/griffon-app/controllers/com/muwire/gui/ContactSelectorController.groovy
+++ b/gui/griffon-app/controllers/com/muwire/gui/contacts/ContactSelectorController.groovy
@@ -1,4 +1,4 @@
-package com.muwire.gui
+package com.muwire.gui.contacts
 
 import griffon.core.artifact.GriffonController
 import griffon.metadata.ArtifactProviderFor
diff --git a/gui/griffon-app/models/com/muwire/gui/ContactSelectorModel.groovy b/gui/griffon-app/models/com/muwire/gui/contacts/ContactSelectorModel.groovy
similarity index 89%
rename from gui/griffon-app/models/com/muwire/gui/ContactSelectorModel.groovy
rename to gui/griffon-app/models/com/muwire/gui/contacts/ContactSelectorModel.groovy
index 5d011092..84c48316 100644
--- a/gui/griffon-app/models/com/muwire/gui/ContactSelectorModel.groovy
+++ b/gui/griffon-app/models/com/muwire/gui/contacts/ContactSelectorModel.groovy
@@ -1,4 +1,4 @@
-package com.muwire.gui
+package com.muwire.gui.contacts
 
 import com.muwire.core.Persona
 import griffon.core.artifact.GriffonModel
diff --git a/gui/griffon-app/views/com/muwire/gui/ContactSelectorView.groovy b/gui/griffon-app/views/com/muwire/gui/contacts/ContactSelectorView.groovy
similarity index 96%
rename from gui/griffon-app/views/com/muwire/gui/ContactSelectorView.groovy
rename to gui/griffon-app/views/com/muwire/gui/contacts/ContactSelectorView.groovy
index 3b3ca1a9..121bd2a9 100644
--- a/gui/griffon-app/views/com/muwire/gui/ContactSelectorView.groovy
+++ b/gui/griffon-app/views/com/muwire/gui/contacts/ContactSelectorView.groovy
@@ -1,6 +1,9 @@
-package com.muwire.gui
+package com.muwire.gui.contacts
 
 import com.muwire.core.Persona
+import com.muwire.gui.CopyPasteSupport
+import com.muwire.gui.PersonaCellRenderer
+import com.muwire.gui.UISettings
 import griffon.core.GriffonApplication
 import griffon.core.artifact.GriffonView
 import griffon.inject.MVCMember