#5537: A public Populate() method is now mandatory for DeclarationSel…

…ector implementations
codereader · Sep 18, 2022 · 43f426f · 43f426f
1 parent bfcafd5
commit 43f426f
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 11 deletions.
diff --git a/libs/wxutil/EntityClassChooser.cpp b/libs/wxutil/EntityClassChooser.cpp
@@ -226,7 +226,7 @@ class EntityClassSelector :
         AddPreviewToBottom(new EntityClassDescription(this));
     }
 
-    void LoadEntityClasses()
+    void Populate() override
     {
         PopulateTreeView(std::make_shared<ThreadedEntityClassLoader>(GetColumns()));
     }
@@ -293,7 +293,7 @@ std::string EntityClassChooser::ChooseEntityClass(Purpose purpose, const std::st
 
 void EntityClassChooser::loadEntityClasses()
 {
-    _selector->LoadEntityClasses();
+    _selector->Populate();
 }
 
 void EntityClassChooser::SetSelectedDeclName(const std::string& declName)

diff --git a/libs/wxutil/decl/DeclarationSelector.h b/libs/wxutil/decl/DeclarationSelector.h
@@ -71,6 +71,9 @@ class DeclarationSelector :
     void loadFromPath(const std::string& registryKey) override;
     void saveToPath(const std::string& registryKey) override;
 
+    // (Re-)populate the tree view, must be implemented by subclasses
+    virtual void Populate() = 0;
+
 protected:
     DeclarationTreeView* GetTreeView() const;
 

diff --git a/radiant/ui/common/SkinChooser.cpp b/radiant/ui/common/SkinChooser.cpp
@@ -165,7 +165,7 @@ class SkinSelector :
         );
     }
 
-    void Populate()
+    void Populate() override
     {
         PopulateTreeView(std::make_shared<ThreadedSkinLoader>(GetColumns(), _model, _allSkinsItem, _matchingSkinsItem));
     }

diff --git a/radiant/ui/common/SoundChooser.cpp b/radiant/ui/common/SoundChooser.cpp
@@ -56,7 +56,7 @@ SoundChooser::SoundChooser(wxWindow* parent) :
 
 void SoundChooser::loadSoundShaders()
 {
-    _selector->LoadSoundShaders();
+    _selector->Populate();
 }
 
 std::string SoundChooser::getSelectedShader() const

diff --git a/radiant/ui/common/SoundShaderSelector.h b/radiant/ui/common/SoundShaderSelector.h
@@ -76,12 +76,12 @@ class SoundShaderSelector :
     {
         GetTreeView()->SetExpandTopLevelItemsAfterPopulation(true);
 
-        LoadSoundShaders();
+        Populate();
 
         AddPreviewToBottom(_preview);
     }
 
-    void LoadSoundShaders()
+    void Populate() override
     {
         PopulateTreeView(std::make_shared<ThreadedSoundShaderLoader>(GetColumns()));
     }

diff --git a/radiant/ui/materials/MaterialSelector.cpp b/radiant/ui/materials/MaterialSelector.cpp
@@ -82,6 +82,11 @@ MaterialSelector::MaterialSelector(wxWindow* parent, const std::function<void()>
 {
     AddPreviewToBottom(new TexturePreviewCombo(this));
 
+    Populate();
+}
+
+void MaterialSelector::Populate()
+{
     PopulateTreeView(std::make_shared<ThreadedMaterialLoader>(GetColumns(), _textureFilter));
 }
 

diff --git a/radiant/ui/materials/MaterialSelector.h b/radiant/ui/materials/MaterialSelector.h
@@ -50,6 +50,8 @@ class MaterialSelector :
 	// Get the selected Material
 	MaterialPtr getSelectedShader();
 
+    void Populate() override;
+
 protected:
     void onTreeViewSelectionChanged() override;
 };

diff --git a/radiant/ui/particles/ParticleSelector.cpp b/radiant/ui/particles/ParticleSelector.cpp
@@ -16,17 +16,17 @@ ParticleSelector::ParticleSelector(wxWindow* parent) :
         sigc::mem_fun(this, &ParticleSelector::reloadParticles)
     );
 
-    populateParticleList();
+    Populate();
 }
 
-void ParticleSelector::populateParticleList()
+void ParticleSelector::Populate()
 {
     PopulateTreeView(std::make_shared<ThreadedParticlesLoader>(GetColumns()));
 }
 
 void ParticleSelector::reloadParticles()
 {
-    populateParticleList();
+    Populate();
 }
 
 std::string ParticleSelector::GetSelectedParticle()

diff --git a/radiant/ui/particles/ParticleSelector.h b/radiant/ui/particles/ParticleSelector.h
@@ -28,9 +28,10 @@ class ParticleSelector :
     std::string GetSelectedParticle();
     void SetSelectedParticle(const std::string& particleName);
 
-private:
     // Populate the list of particles
-    void populateParticleList();
+    void Populate() override;
+
+private:
     void reloadParticles();
 };