Revert "Element type (#25) (#2468)" (#2473)

This reverts commit 391e46f.

Author: AndyDu1985

src/DynamoRevit/Resources/LayoutSpecs.json

@@ -118,9 +118,6 @@
                 {
                   "path": "RevitNodes.Revit.Elements.Element"
                 },
-                {
-                  "path": "RevitNodes.Revit.Elements.ElementType"
-                },
                 {
                   "path": "RevitNodes.Revit.Elements.FailureMessage"
                 },

src/DynamoRevitIcons/RevitNodesImages.resx

@@ -8,14 +8,26 @@ namespace Revit.Elements
     /// <summary>
     /// A Revit CurtainSystemType
     /// </summary>
-    public class CurtainSystemType : ElementType
+    public class CurtainSystemType : Element
     {
         #region Internal properties
 
         /// <summary>
         /// An internal reference to the CurtainSystemType
         /// </summary>
-        internal Autodesk.Revit.DB.CurtainSystemType InternalCurtainSystemType => InternalElementType as Autodesk.Revit.DB.CurtainSystemType;
+        internal Autodesk.Revit.DB.CurtainSystemType InternalCurtainSystemType
+        {
+            get; private set;
+        }
+
+        /// <summary>
+        /// Reference to the Element
+        /// </summary>
+        [SupressImportIntoVM]
+        public override Autodesk.Revit.DB.Element InternalElement
+        {
+            get { return InternalCurtainSystemType; }
+        }
 
         #endregion
 
@@ -24,9 +36,38 @@ public class CurtainSystemType : ElementType
         /// <summary>
         /// Private constructor for the Element
         /// </summary>
+        /// <param name="CurtainSystemType"></param>
+        private CurtainSystemType(Autodesk.Revit.DB.CurtainSystemType curtainSystemType)
+        {
+            SafeInit(() => InitCurtainSystemType(curtainSystemType));
+        }
+
+        #endregion
+
+        #region Private constructors
+
+        /// <summary>
+        /// Initialize a CurtainSystemType element
+        /// </summary>
+        /// <param name="CurtainSystemType"></param>
+        private void InitCurtainSystemType(Autodesk.Revit.DB.CurtainSystemType curtainSystemType)
+        {
+            InternalSetCurtainSystemType(curtainSystemType);
+        }
+
+        #endregion
+
+        #region Private mutators
+
+        /// <summary>
+        /// Set the CurtainSystemType property, element id, and unique id
+        /// </summary>
         /// <param name="curtainSystemType"></param>
-        private CurtainSystemType(Autodesk.Revit.DB.CurtainSystemType curtainSystemType):base(curtainSystemType)
+        private void InternalSetCurtainSystemType( Autodesk.Revit.DB.CurtainSystemType curtainSystemType )
         {
+            this.InternalCurtainSystemType = curtainSystemType;
+            this.InternalElementId = curtainSystemType.Id;
+            this.InternalUniqueId = curtainSystemType.UniqueId;
         }
 
         #endregion
@@ -50,7 +91,7 @@ private CurtainSystemType(Autodesk.Revit.DB.CurtainSystemType curtainSystemType)
         /// </summary>
         /// <param name="name"></param>
         /// <returns></returns>
-        public static new CurtainSystemType ByName(string name)
+        public static CurtainSystemType ByName(string name)
         {
             if (name == null)
             {
@@ -82,7 +123,7 @@ private CurtainSystemType(Autodesk.Revit.DB.CurtainSystemType curtainSystemType)
         /// <summary>
         /// Create a CurtainSystemType from a user selected Element.
         /// </summary>
-        /// <param name="curtainSystemType"></param>
+        /// <param name="CurtainSystemType"></param>
         /// <param name="isRevitOwned"></param>
         /// <returns></returns>
         internal static CurtainSystemType FromExisting(Autodesk.Revit.DB.CurtainSystemType curtainSystemType, bool isRevitOwned)

src/Libraries/RevitNodes/Elements/CurtainSystemType.cs

@@ -197,19 +197,23 @@ public Category GetCategory
         }
 
         /// <summary>
-        /// Returns the ElementType for this Element. Returns null if the Element cannot have an ElementType assigned.
+        /// Returns the FamilyType for this Element. Returns null if the Element cannot have a FamilyType assigned.
         /// </summary>
         /// <returns name="ElementType">Element Type or Null.</returns>
-        public ElementType ElementType
+        public Element ElementType
         {
             get
             {
                 var typeId = this.InternalElement.GetTypeId();
                 if (typeId == ElementId.InvalidElementId)
+                {
                     return null;
-                
-                var doc = DocumentManager.Instance.CurrentDBDocument;
-                return doc.GetElement(typeId).ToDSType(true) as ElementType;
+                }
+                else
+                {
+                    var doc = DocumentManager.Instance.CurrentDBDocument;
+                    return doc.GetElement(typeId).ToDSType(true);
+                }
             }
         }
 

src/Libraries/RevitNodes/Elements/Element.cs

@@ -11,15 +11,27 @@ namespace Revit.Elements
     /// A Revit FamilyType, the Revit API refers to this as a FamilySymbol
     /// </summary>
     [RegisterForTrace]
-    public class FamilyType: ElementType
+    public class FamilyType: Element
     {
 
         #region Internal Properties
 
         /// <summary>
         /// Internal wrapper property
         /// </summary>
-        internal Autodesk.Revit.DB.FamilySymbol InternalFamilySymbol => InternalElementType as Autodesk.Revit.DB.FamilySymbol;
+        internal Autodesk.Revit.DB.FamilySymbol InternalFamilySymbol
+        {
+            get;
+            private set;
+        }
+
+        /// <summary>
+        /// Reference to the Element
+        /// </summary>
+        public override Autodesk.Revit.DB.Element InternalElement
+        {
+            get { return InternalFamilySymbol; }
+        }
 
         #endregion
 
@@ -29,8 +41,37 @@ public class FamilyType: ElementType
         /// Private constructor for building a DSFamilySymbol
         /// </summary>
         /// <param name="symbol"></param>
-        private FamilyType(Autodesk.Revit.DB.FamilySymbol symbol):base(symbol)
+        private FamilyType(Autodesk.Revit.DB.FamilySymbol symbol)
+        {
+            SafeInit(() => InitFamilySymbol(symbol));
+        }
+
+        #endregion
+
+        #region Helper for private constructors
+
+        /// <summary>
+        /// Initialize a FamilySymbol element
+        /// </summary>
+        /// <param name="symbol"></param>
+        private void InitFamilySymbol(Autodesk.Revit.DB.FamilySymbol symbol)
+        {
+            InternalSetFamilySymbol(symbol);
+        }
+
+        #endregion
+
+        #region Private mutators
+
+        /// <summary>
+        /// Set the internal model of the family symbol along with its ElementId and UniqueId
+        /// </summary>
+        /// <param name="symbol"></param>
+        private void InternalSetFamilySymbol(Autodesk.Revit.DB.FamilySymbol symbol)
         {
+            this.InternalFamilySymbol = symbol;
+            this.InternalElementId = symbol.Id;
+            this.InternalUniqueId = symbol.UniqueId;
         }
 
         #endregion
@@ -156,7 +197,7 @@ public static FamilyType ByFamilyNameAndTypeName(string familyName, string typeN
         /// <search>
         /// symbol
         /// </search>
-        public static new FamilyType ByName(string name)
+        public static FamilyType ByName(string name)
         {
             if (name == null)
             {