fix for static functions

MVMCoreUI/BaseClasses/View.swift

@@ -40,10 +40,6 @@ import UIKit
         }
     }
     
-    public func nameForReuse(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?) -> String? {
-        return model?.moleculeName
-    }
-    
     open func setWithModel(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
          self.model = model
          if let backgroundColor = model?.backgroundColor {

MVMCoreUI/Molecules/Items/MoleculeCollectionViewCell.swift

@@ -114,11 +114,13 @@ open class MoleculeCollectionViewCell: UICollectionViewCell, MVMCoreUIMoleculeVi
         backgroundColor = .white
     }
     
-    public class func name(forReuse molecule: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?) -> String? {
+    public class func nameForReuse(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?) -> String? {
-        guard let molecule = molecule?.optionalDictionaryForKey(KeyMolecule) else {
+        guard let molecule = (model as? CarouselItemModel)?.molecule,
+            let moleculeClass = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(molecule) as? ModelMoleculeViewProtocol.Type,
+            let name = moleculeClass.nameForReuse(molecule, delegateObject) ?? molecule.moleculeName else {
             return nil
         }
-        return MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(withJSON: molecule)?.name?(forReuse: molecule, delegateObject: delegateObject) ?? molecule.optionalStringForKey(KeyMoleculeName)
+        return name
     }
     
     public func updateView(_ size: CGFloat) {

MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift

@@ -20,16 +20,16 @@ import UIKit
             addMolecule(moleculeView)
         }
     }
-
+    
-    public override class func name(forReuse molecule: MoleculeProtocol?, delegateObject: MVMCoreUIDelegateObject?) -> String? {
+    public class func nameForReuse(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?) -> String? {
-        guard let moleculeModel = (molecule as? ListItemModel)?.molecule else {
+        guard let moleculeModel = (model as? ListItemModel)?.molecule else {
             return "\(self)<>"
         }
-        let className = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(moleculeModel) as? ModelMoleculeViewProtocol
+        let className = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(moleculeModel) as? ModelMoleculeViewProtocol.Type
-        let moleculeName = className?.nameForReuse(molecule, delegateObject) ?? moleculeModel.moleculeName ?? ""
+        let moleculeName = className?.nameForReuse(moleculeModel, delegateObject) ?? moleculeModel.moleculeName ?? ""
         return "\(self)<\(moleculeName)>"
     }
-
+    
     public class func requiredModules(_ json: [AnyHashable : Any]?, delegateObject: MVMCoreUIDelegateObject?, error: AutoreleasingUnsafeMutablePointer<MVMCoreErrorObject?>?) -> [String]? {
         guard let moleculeJSON = json?.optionalDictionaryForKey(KeyMolecule),
             let theClass = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(withJSON: moleculeJSON) else {

MVMCoreUI/Molecules/Items/TableViewCell.swift

@@ -178,10 +178,6 @@ import UIKit
         styleStandard()
         backgroundColor = .white
     }
-
-    public class func name(forReuse molecule: MoleculeProtocol?, delegateObject: MVMCoreUIDelegateObject?) -> String? {
-        return molecule?.moleculeName ?? ""
-    }
     
     // MARK: - Arrow
     /// Adds the standard mvm style caret to the accessory view

MVMCoreUI/Molecules/ModelMoleculeViewProtocol.swift

@@ -10,14 +10,14 @@ import Foundation
 
 public protocol ModelMoleculeViewProtocol {
     func setWithModel(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?)
-    func nameForReuse(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?) -> String?
+    static func nameForReuse(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?) -> String?
     static func estimatedHeight(forRow molecule: MoleculeProtocol?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat?
     static func requiredModules(_ molecule: MoleculeProtocol?, delegateObject: MVMCoreUIDelegateObject?, error: AutoreleasingUnsafeMutablePointer<MVMCoreErrorObject?>?) -> [String]?
 }
 
 extension ModelMoleculeViewProtocol {
-    public func nameForReuse(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?) -> String? {
+    public static func nameForReuse(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?) -> String? {
-        return nil
+        return model?.moleculeName
     }
     public static func estimatedHeight(forRow molecule: MoleculeProtocol?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
         return nil

MVMCoreUI/Molecules/ModuleMolecule.swift

@@ -58,10 +58,10 @@ open class ModuleMolecule: Container {
         return height
     }
 
-    public override func nameForReuse(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?) -> String? {
+    public class func nameForReuse(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?) -> String? {
         guard let moduleMolecule = model as? ModuleMoleculeModel,
             let moduleModel = delegateObject?.moleculeDelegate?.getModuleWithName(moduleMolecule.moduleName),
-            let classType = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(moduleModel) as? ModelMoleculeViewProtocol,
+            let classType = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(moduleModel) as? ModelMoleculeViewProtocol.Type,
                let name = classType.nameForReuse(moduleModel, delegateObject) else {
                 // Critical error
             return "moduleMolecule<>"

MVMCoreUI/Organisms/Carousel.swift

@@ -169,7 +169,7 @@ open class Carousel: ViewConstrainingView, ModelMoleculeViewProtocol {
     /// Returns the (identifier, class) of the molecule for the given map.
     func getMoleculeInfo(with molecule: MoleculeProtocol, delegateObject: MVMCoreUIDelegateObject?) -> (identifier: String, class: AnyClass, molecule: MoleculeProtocol)? {
         guard let className = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(molecule) ,
-            let moleculeName = (className as? ModelMoleculeViewProtocol)?.nameForReuse(molecule, delegateObject) ?? molecule.moleculeName else {
+            let moleculeName = (className as? ModelMoleculeViewProtocol.Type)?.nameForReuse(molecule, delegateObject) ?? molecule.moleculeName else {
             return nil
         }
         return (moleculeName, className, molecule)

MVMCoreUI/Organisms/MoleculeStackView.swift

@@ -97,7 +97,7 @@ open class MoleculeStackView: Container {
         removeAllItemViews()
         
         // If the items in the stack are different, clear them, create new ones.
-        if (previousModel == nil) || nameForReuse(previousModel, delegateObject) != nameForReuse(model, delegateObject) {
+        if (previousModel == nil) || MoleculeStackView.nameForReuse(previousModel, delegateObject) != MoleculeStackView.nameForReuse(model, delegateObject) {
             stackItems = []
             createStackItemsFromModel(with: delegateObject)
         } else if let models = stackModel?.molecules {
@@ -111,7 +111,7 @@ open class MoleculeStackView: Container {
         stackModel?.useVerticalMargins = moleculesShouldSetVerticalMargins
     }
     
-    public override func nameForReuse(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?) -> String? {
+    public class func nameForReuse(_ model: MoleculeProtocol?, _ delegateObject: MVMCoreUIDelegateObject?) -> String? {
         // This will aggregate names of molecules to make an id.
         guard let model = model as? MoleculeStackModel else {
             return "stack<>"
@@ -119,7 +119,7 @@ open class MoleculeStackView: Container {
         var name = "stack<"
         for case let item in model.molecules {
             if let moleculeName = item.molecule.moleculeName {
-                if let moleculeClass = MVMCoreUIMoleculeMappingObject.shared()?.moleculeMapping[moleculeName] as? ModelMoleculeViewProtocol, let nameForReuse = moleculeClass.nameForReuse(item.molecule, delegateObject) {
+                if let moleculeClass = MVMCoreUIMoleculeMappingObject.shared()?.moleculeMapping[moleculeName] as? ModelMoleculeViewProtocol.Type, let nameForReuse = moleculeClass.nameForReuse(item.molecule, delegateObject) {
                     name.append(nameForReuse + ",")
                 } else {
                     name.append(moleculeName + ",")

MVMCoreUI/Templates/MoleculeListTemplate.swift

@@ -167,7 +167,7 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
     func getMoleculeInfo(with listItem: ListItemModelProtocol?) -> (identifier: String, class: AnyClass, molecule: ListItemModelProtocol)? {
         guard let listItem = listItem,
             let moleculeClass = MVMCoreUIMoleculeMappingObject.shared()?.getMoleculeClass(listItem),
-            let moleculeName = (moleculeClass as? ModelMoleculeViewProtocol)?.nameForReuse(listItem, delegateObject() as? MVMCoreUIDelegateObject) ?? listItem.moleculeName else {
+            let moleculeName = (moleculeClass as? ModelMoleculeViewProtocol.Type)?.nameForReuse(listItem, delegateObject() as? MVMCoreUIDelegateObject) ?? listItem.moleculeName else {
             return nil
         }
         return (moleculeName, moleculeClass, listItem)