fix: Ensure that every NdapiObject has its internal type set

felipebz · Dec 27, 2023 · a055c81 · a055c81
1 parent 3004c04
commit a055c81
Show file tree

Hide file tree

Showing 42 changed files with 44 additions and 43 deletions.
diff --git a/Ndapi/Alert.cs b/Ndapi/Alert.cs
@@ -27,7 +27,7 @@ public Alert(ObjectGroup group, string name) : base(name, ObjectType.Alert, grou
     {
     }
 
-    internal Alert(ObjectSafeHandle handle) : base(handle)
+    internal Alert(ObjectSafeHandle handle) : base(handle, ObjectType.Alert)
     {
     }
 

diff --git a/Ndapi/AttachedLibrary.cs b/Ndapi/AttachedLibrary.cs
@@ -39,7 +39,7 @@ public AttachedLibrary(MenuModule module, string location)
         Ensure.Success(status);
     }
 
-    internal AttachedLibrary(ObjectSafeHandle handle) : base(handle)
+    internal AttachedLibrary(ObjectSafeHandle handle) : base(handle, ObjectType.AttachedLibrary)
     {
     }
 

diff --git a/Ndapi/Block.cs b/Ndapi/Block.cs
@@ -27,7 +27,7 @@ public Block(ObjectGroup group, string name) : base(name, ObjectType.Block, grou
     {
     }
 
-    internal Block(ObjectSafeHandle handle) : base(handle)
+    internal Block(ObjectSafeHandle handle) : base(handle, ObjectType.Block)
     {
     }
 

diff --git a/Ndapi/BlockRelation.cs b/Ndapi/BlockRelation.cs
@@ -18,7 +18,7 @@ public BlockRelation(Block module, string name) : base(name, ObjectType.BlockRel
     {
     }
 
-    internal BlockRelation(ObjectSafeHandle handle) : base(handle)
+    internal BlockRelation(ObjectSafeHandle handle) : base(handle, ObjectType.BlockRelation)
     {
     }
 

diff --git a/Ndapi/Canvas.cs b/Ndapi/Canvas.cs
@@ -27,7 +27,7 @@ public Canvas(ObjectGroup group, string name) : base(name, ObjectType.Canvas, gr
     {
     }
 
-    internal Canvas(ObjectSafeHandle handle) : base(handle)
+    internal Canvas(ObjectSafeHandle handle) : base(handle, ObjectType.Canvas)
     {
     }
 

diff --git a/Ndapi/ColumnMapping.cs b/Ndapi/ColumnMapping.cs
@@ -18,7 +18,7 @@ public ColumnMapping(LOV lov, string name) : base(name, ObjectType.ColumnMapping
     {
     }
 
-    internal ColumnMapping(ObjectSafeHandle handle) : base(handle)
+    internal ColumnMapping(ObjectSafeHandle handle) : base(handle, ObjectType.ColumnMapping)
     {
     }
 

diff --git a/Ndapi/CompoundText.cs b/Ndapi/CompoundText.cs
@@ -18,7 +18,7 @@ public CompoundText(Graphics graphics, string name) : base(name, ObjectType.Comp
     {
     }
 
-    internal CompoundText(ObjectSafeHandle handle) : base(handle)
+    internal CompoundText(ObjectSafeHandle handle) : base(handle, ObjectType.CompoundText)
     {
     }
 

diff --git a/Ndapi/Coordinate.cs b/Ndapi/Coordinate.cs
@@ -28,7 +28,7 @@ public Coordinate(FormModule module) : this()
         Extract(module);
     }
 
-    internal Coordinate(ObjectSafeHandle handle) : base(handle)
+    internal Coordinate(ObjectSafeHandle handle) : base(handle, ObjectType.Coordinate)
     {
     }
 

diff --git a/Ndapi/DataSourceArgument.cs b/Ndapi/DataSourceArgument.cs
@@ -18,7 +18,7 @@ public DataSourceArgument(Block block, string name) : base(name, ObjectType.Data
     {
     }
 
-    internal DataSourceArgument(ObjectSafeHandle handle) : base(handle)
+    internal DataSourceArgument(ObjectSafeHandle handle) : base(handle, ObjectType.DataSourceArgument)
     {
     }
 

diff --git a/Ndapi/DataSourceColumn.cs b/Ndapi/DataSourceColumn.cs
@@ -18,7 +18,7 @@ public DataSourceColumn(Block block, string name) : base(name, ObjectType.DataSo
     {
     }
 
-    internal DataSourceColumn(ObjectSafeHandle handle) : base(handle)
+    internal DataSourceColumn(ObjectSafeHandle handle, ObjectType type) : base(handle, type)
     {
     }
 

diff --git a/Ndapi/Editor.cs b/Ndapi/Editor.cs
@@ -27,7 +27,7 @@ public Editor(ObjectGroup group, string name) : base(name, ObjectType.Editor, gr
     {
     }
 
-    internal Editor(ObjectSafeHandle handle) : base(handle)
+    internal Editor(ObjectSafeHandle handle) : base(handle, ObjectType.Editor)
     {
     }
 

diff --git a/Ndapi/Event.cs b/Ndapi/Event.cs
@@ -28,7 +28,7 @@ public Event(ObjectGroup group, string name) : base(name, ObjectType.Event, grou
     {
     }
 
-    internal Event(ObjectSafeHandle handle) : base(handle)
+    internal Event(ObjectSafeHandle handle) : base(handle, ObjectType.Event)
     {
     }
 

diff --git a/Ndapi/Font.cs b/Ndapi/Font.cs
@@ -29,7 +29,7 @@ public Font(NdapiObject obj, VisualAttributeType type) : this()
         Extract(obj, type);
     }
 
-    internal Font(ObjectSafeHandle handle) : base(handle)
+    internal Font(ObjectSafeHandle handle) : base(handle, ObjectType.Font)
     {
     }
 

diff --git a/Ndapi/FormModule.cs b/Ndapi/FormModule.cs
@@ -17,7 +17,7 @@ public FormModule(string name) : base(name, ObjectType.FormModule)
     {
     }
 
-    internal FormModule(ObjectSafeHandle handle) : base(handle)
+    internal FormModule(ObjectSafeHandle handle) : base(handle, ObjectType.FormModule)
     {
     }
 

diff --git a/Ndapi/FormParameter.cs b/Ndapi/FormParameter.cs
@@ -18,7 +18,7 @@ public FormParameter(FormModule module, string name) : base(name, ObjectType.For
     {
     }
 
-    internal FormParameter(ObjectSafeHandle handle) : base(handle)
+    internal FormParameter(ObjectSafeHandle handle) : base(handle, ObjectType.FormParameter)
     {
     }
 

diff --git a/Ndapi/Graphics.cs b/Ndapi/Graphics.cs
@@ -45,7 +45,7 @@ public Graphics(TabPage tab, string name) : base(name, ObjectType.Graphics, tab)
     {
     }
 
-    internal Graphics(ObjectSafeHandle handle) : base(handle)
+    internal Graphics(ObjectSafeHandle handle) : base(handle, ObjectType.Graphics)
     {
     }
 

diff --git a/Ndapi/Item.cs b/Ndapi/Item.cs
@@ -29,7 +29,7 @@ public Item(ObjectGroup group, string name) : base(name, ObjectType.Item, group)
     {
     }
 
-    internal Item(ObjectSafeHandle handle) : base(handle)
+    internal Item(ObjectSafeHandle handle) : base(handle, ObjectType.Item)
     {
     }
 

diff --git a/Ndapi/LOV.cs b/Ndapi/LOV.cs
@@ -27,7 +27,7 @@ public LOV(ObjectGroup group, string name) : base(name, ObjectType.LOV, group)
     {
     }
 
-    internal LOV(ObjectSafeHandle handle) : base(handle)
+    internal LOV(ObjectSafeHandle handle) : base(handle, ObjectType.LOV)
     {
     }
 

diff --git a/Ndapi/LibraryModule.cs b/Ndapi/LibraryModule.cs
@@ -11,7 +11,7 @@ namespace Ndapi;
 /// </summary>
 public class LibraryModule : NdapiModule
 {
-    internal LibraryModule(ObjectSafeHandle handle) : base(handle)
+    internal LibraryModule(ObjectSafeHandle handle) : base(handle, ObjectType.LibraryModule)
     {
     }
 

diff --git a/Ndapi/LibraryProgramUnit.cs b/Ndapi/LibraryProgramUnit.cs
@@ -9,7 +9,7 @@ namespace Ndapi;
 /// </summary>
 public class LibraryProgramUnit : NdapiObject<LibraryProgramUnit>
 {
-    internal LibraryProgramUnit(ObjectSafeHandle handle) : base(handle)
+    internal LibraryProgramUnit(ObjectSafeHandle handle) : base(handle, ObjectType.LibraryProgramUnit)
     {
     }
 

diff --git a/Ndapi/Menu.cs b/Ndapi/Menu.cs
@@ -27,7 +27,7 @@ public Menu(MenuModule module, string name) : base(name, ObjectType.Menu, module
     {
     }
 
-    internal Menu(ObjectSafeHandle handle) : base(handle)
+    internal Menu(ObjectSafeHandle handle) : base(handle, ObjectType.Menu)
     {
     }
 

diff --git a/Ndapi/MenuItem.cs b/Ndapi/MenuItem.cs
@@ -29,7 +29,7 @@ public MenuItem(ObjectGroup group, string name) : base(name, ObjectType.MenuItem
     {
     }
 
-    internal MenuItem(ObjectSafeHandle handle) : base(handle)
+    internal MenuItem(ObjectSafeHandle handle) : base(handle, ObjectType.MenuItem)
     {
     }
 

diff --git a/Ndapi/MenuModule.cs b/Ndapi/MenuModule.cs
@@ -19,7 +19,7 @@ public MenuModule(string name) : base(name, ObjectType.MenuModule)
     {
     }
 
-    internal MenuModule(ObjectSafeHandle handle) : base(handle)
+    internal MenuModule(ObjectSafeHandle handle) : base(handle, ObjectType.MenuModule)
     {
     }
 

diff --git a/Ndapi/MenuParameter.cs b/Ndapi/MenuParameter.cs
@@ -20,7 +20,7 @@ public MenuParameter(MenuModule module, string name) : base(name, ObjectType.Men
         {
         }
 
-        internal MenuParameter(ObjectSafeHandle handle) : base(handle)
+        internal MenuParameter(ObjectSafeHandle handle) : base(handle, ObjectType.MenuParameter)
         {
         }
 

diff --git a/Ndapi/NdapiModule.cs b/Ndapi/NdapiModule.cs
@@ -17,7 +17,7 @@ internal NdapiModule(string name, ObjectType type, NdapiObject parent = null) :
         NdapiContext.AddModule(this);
     }
 
-    internal NdapiModule(ObjectSafeHandle handle) : base(handle)
+    internal NdapiModule(ObjectSafeHandle handle, ObjectType type) : base(handle, type)
     {
         NdapiContext.AddModule(this);
     }

diff --git a/Ndapi/NdapiObject.cs b/Ndapi/NdapiObject.cs
@@ -37,9 +37,10 @@ internal NdapiObject(string name, ObjectType type, NdapiObject parent = null)
         _type = type;
     }
 
-    internal NdapiObject(ObjectSafeHandle handle) : this()
+    internal NdapiObject(ObjectSafeHandle handle, ObjectType type) : this()
     {
         _handle = handle;
+        _type = type;
     }
 
     /// <summary>
@@ -517,7 +518,7 @@ public abstract class NdapiObject<[DynamicallyAccessedMembers(DynamicallyAccesse
     internal NdapiObject() { }
     internal NdapiObject(ObjectType type) : base(type) { }
     internal NdapiObject(string name, ObjectType type, NdapiObject parent = null) : base(name, type, parent) { }
-    internal NdapiObject(ObjectSafeHandle handle) : base(handle) { }
+    internal NdapiObject(ObjectSafeHandle handle, ObjectType type) : base(handle, type) { }
 
     /// <summary>
     /// Get the previous object.

diff --git a/Ndapi/ObjectGroup.cs b/Ndapi/ObjectGroup.cs
@@ -27,7 +27,7 @@ public ObjectGroup(MenuModule module, string name) : base(name, ObjectType.Objec
     {
     }
 
-    internal ObjectGroup(ObjectSafeHandle handle) : base(handle)
+    internal ObjectGroup(ObjectSafeHandle handle) : base(handle, ObjectType.ObjectGroup)
     {
     }
 

diff --git a/Ndapi/ObjectGroupChild.cs b/Ndapi/ObjectGroupChild.cs
@@ -19,7 +19,7 @@ public ObjectGroupChild(ObjectGroup group, string name) : base(name, ObjectType.
     {
     }
 
-    internal ObjectGroupChild(ObjectSafeHandle handle) : base(handle)
+    internal ObjectGroupChild(ObjectSafeHandle handle) : base(handle, ObjectType.ObjectGroupChild)
     {
     }
 

diff --git a/Ndapi/ObjectLibrary.cs b/Ndapi/ObjectLibrary.cs
@@ -19,7 +19,7 @@ public ObjectLibrary(string name) : base(name, ObjectType.ObjectLibrary)
     {
     }
 
-    internal ObjectLibrary(ObjectSafeHandle handle) : base(handle)
+    internal ObjectLibrary(ObjectSafeHandle handle) : base(handle, ObjectType.ObjectLibrary)
     {
     }
 

diff --git a/Ndapi/ObjectLibraryTab.cs b/Ndapi/ObjectLibraryTab.cs
@@ -21,7 +21,7 @@ public ObjectLibraryTab(ObjectLibrary library, string name) : base(name, ObjectT
         ObjectLibrary = library;
     }
 
-    internal ObjectLibraryTab(ObjectSafeHandle handle) : base(handle)
+    internal ObjectLibraryTab(ObjectSafeHandle handle) : base(handle, ObjectType.ObjectLibraryTab)
     {
     }
 

diff --git a/Ndapi/Point.cs b/Ndapi/Point.cs
@@ -18,7 +18,7 @@ public Point(Graphics graphics, string name) : base(name, ObjectType.Point, grap
     {
     }
 
-    internal Point(ObjectSafeHandle handle) : base(handle)
+    internal Point(ObjectSafeHandle handle) : base(handle, ObjectType.Point)
     {
     }
 

diff --git a/Ndapi/ProgramUnit.cs b/Ndapi/ProgramUnit.cs
@@ -36,7 +36,7 @@ public ProgramUnit(ObjectGroup module, string name) : base(name, ObjectType.Prog
     {
     }
 
-    internal ProgramUnit(ObjectSafeHandle handle) : base(handle)
+    internal ProgramUnit(ObjectSafeHandle handle) : base(handle, ObjectType.ProgramUnit)
     {
     }
 

diff --git a/Ndapi/PropertyClass.cs b/Ndapi/PropertyClass.cs
@@ -45,7 +45,7 @@ public PropertyClass(LibraryModule library, string name) : base(name, ObjectType
     {
     }
 
-    internal PropertyClass(ObjectSafeHandle handle) : base(handle)
+    internal PropertyClass(ObjectSafeHandle handle) : base(handle, ObjectType.PropertyClass)
     {
     }
 

diff --git a/Ndapi/RadioButton.cs b/Ndapi/RadioButton.cs
@@ -18,7 +18,7 @@ public RadioButton(Item item, string name) : base(name, ObjectType.RadioButton,
     {
     }
 
-    internal RadioButton(ObjectSafeHandle handle) : base(handle)
+    internal RadioButton(ObjectSafeHandle handle) : base(handle, ObjectType.RadioButton)
     {
     }
 

diff --git a/Ndapi/RecordGroup.cs b/Ndapi/RecordGroup.cs
@@ -27,7 +27,7 @@ public RecordGroup(ObjectGroup group, string name) : base(name, ObjectType.Recor
     {
     }
 
-    internal RecordGroup(ObjectSafeHandle handle) : base(handle)
+    internal RecordGroup(ObjectSafeHandle handle) : base(handle, ObjectType.RecordGroup)
     {
     }
 

diff --git a/Ndapi/RecordGroupColumn.cs b/Ndapi/RecordGroupColumn.cs
@@ -20,7 +20,7 @@ public RecordGroupColumn(RecordGroup module, string name) : base(name, ObjectTyp
     {
     }
 
-    internal RecordGroupColumn(ObjectSafeHandle handle) : base(handle)
+    internal RecordGroupColumn(ObjectSafeHandle handle) : base(handle, ObjectType.ColumnSpecification)
     {
     }
 

diff --git a/Ndapi/Report.cs b/Ndapi/Report.cs
@@ -18,7 +18,7 @@ public Report(FormModule module, string name) : base(name, ObjectType.Report, mo
     {
     }
 
-    internal Report(ObjectSafeHandle handle) : base(handle)
+    internal Report(ObjectSafeHandle handle) : base(handle, ObjectType.Report)
     {
     }
 

diff --git a/Ndapi/TabPage.cs b/Ndapi/TabPage.cs
@@ -18,7 +18,7 @@ public TabPage(Canvas canvas, string name) : base(name, ObjectType.TabPage, canv
     {
     }
 
-    internal TabPage(ObjectSafeHandle handle) : base(handle)
+    internal TabPage(ObjectSafeHandle handle) : base(handle, ObjectType.TabPage)
     {
     }
 

diff --git a/Ndapi/TextSegment.cs b/Ndapi/TextSegment.cs
@@ -18,7 +18,7 @@ public TextSegment(CompoundText compoundText, string name) : base(name, ObjectTy
     {
     }
 
-    internal TextSegment(ObjectSafeHandle handle) : base(handle)
+    internal TextSegment(ObjectSafeHandle handle) : base(handle, ObjectType.TextSegment)
     {
     }
 

diff --git a/Ndapi/Trigger.cs b/Ndapi/Trigger.cs
@@ -54,7 +54,7 @@ public Trigger(PropertyClass propertyClass, string name) : base(name, ObjectType
     {
     }
 
-    internal Trigger(ObjectSafeHandle handle) : base(handle)
+    internal Trigger(ObjectSafeHandle handle) : base(handle, ObjectType.Trigger)
     {
     }
 

diff --git a/Ndapi/VisualAttribute.cs b/Ndapi/VisualAttribute.cs
@@ -35,7 +35,7 @@ public VisualAttribute(ObjectGroup group, string name) : base(name, ObjectType.V
     {
     }
 
-    internal VisualAttribute(ObjectSafeHandle handle) : base(handle)
+    internal VisualAttribute(ObjectSafeHandle handle) : base(handle, ObjectType.VisualAttribute)
     {
     }
 

diff --git a/Ndapi/Window.cs b/Ndapi/Window.cs
@@ -27,7 +27,7 @@ public Window(ObjectGroup group, string name) : base(name, ObjectType.Window, gr
     {
     }
 
-    internal Window(ObjectSafeHandle handle) : base(handle)
+    internal Window(ObjectSafeHandle handle) : base(handle, ObjectType.Window)
     {
     }