From 24f44e58292df1efef48ff2654468380cc24a0b6 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Wed, 12 Feb 2020 22:03:46 -0500
Subject: [PATCH] Small cleaning

---
 .../ListItemModelProtocol.swift               | 12 ------------
 .../MoleculeModelProtocol.swift               |  3 ---
 .../ModelProtocols/PageModelProtocol.swift    | 19 +------------------
 .../TemplateModelProtocol.swift               | 10 +++++++++-
 4 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/MVMCoreUI/Models/ModelProtocols/ListItemModelProtocol.swift b/MVMCoreUI/Models/ModelProtocols/ListItemModelProtocol.swift
index cd19a23c..020c3cbe 100644
--- a/MVMCoreUI/Models/ModelProtocols/ListItemModelProtocol.swift
+++ b/MVMCoreUI/Models/ModelProtocols/ListItemModelProtocol.swift
@@ -28,16 +28,4 @@ public extension ListItemModelProtocol {
         get { return nil }
         set { }
     }
-    
-    var moleculeName: String? {
-        get { return Self.identifier }
-    }
-    
-    var categoryName: String {
-        return "\(ListItemModelProtocol.self)"
-    }
-    
-//    var categoryCodingKey: String {
-//        return "style"
-//    }
 }
diff --git a/MVMCoreUI/Models/ModelProtocols/MoleculeModelProtocol.swift b/MVMCoreUI/Models/ModelProtocols/MoleculeModelProtocol.swift
index 9f099331..1ec0d13c 100644
--- a/MVMCoreUI/Models/ModelProtocols/MoleculeModelProtocol.swift
+++ b/MVMCoreUI/Models/ModelProtocols/MoleculeModelProtocol.swift
@@ -4,9 +4,6 @@ import Foundation
 public protocol MoleculeModelProtocol: Model {
     var moleculeName: String? { get }
     var backgroundColor: Color? { get set}
-    
-    static var categoryName: String { get }
-    static var categoryCodingKey: String { get }
 }
 
 public extension MoleculeModelProtocol {
diff --git a/MVMCoreUI/Models/ModelProtocols/PageModelProtocol.swift b/MVMCoreUI/Models/ModelProtocols/PageModelProtocol.swift
index 2ad9b8a2..34b58818 100644
--- a/MVMCoreUI/Models/ModelProtocols/PageModelProtocol.swift
+++ b/MVMCoreUI/Models/ModelProtocols/PageModelProtocol.swift
@@ -9,25 +9,8 @@
 import Foundation
 
 
-public protocol PageModelProtocol: Model  {
+public protocol PageModelProtocol {
     var pageType: String { get set }
     var screenHeading: String? { get set }
     var isAtomicTabs: Bool? { get set }
-    
-    static var categoryName: String { get }
-    static var categoryCodingKey: String { get }
-}
-
-extension PageModelProtocol {
-    //TODO: Scott implement
-    
-    public static var categoryCodingKey: String {
-        return "moleculeName"
-    }
-    
-    public static var categoryName: String {
-        return "\(PageModelProtocol.self)"
-    }
-//    public static var categoryName: String { return "template" }
-//    public static var categoryCodingKey: String { return "\(PageModelProtocol.self)" }
 }
diff --git a/MVMCoreUI/Models/ModelProtocols/TemplateModelProtocol.swift b/MVMCoreUI/Models/ModelProtocols/TemplateModelProtocol.swift
index 90a8ec2a..793baa0a 100644
--- a/MVMCoreUI/Models/ModelProtocols/TemplateModelProtocol.swift
+++ b/MVMCoreUI/Models/ModelProtocols/TemplateModelProtocol.swift
@@ -9,7 +9,7 @@
 import Foundation
 
 
-public protocol TemplateModelProtocol: PageModelProtocol {
+public protocol TemplateModelProtocol: PageModelProtocol, Model {
     var template: String { get }
 }
 
@@ -18,4 +18,12 @@ public extension TemplateModelProtocol {
     var template: String {
         get { return Self.identifier }
     }
+    
+    static var categoryCodingKey: String {
+        return "template"
+    }
+        
+    static var categoryName: String {
+        return "\(TemplateModelProtocol.self)"
+    }
 }