[Matlab] Add nix.Utils.parseEntityId function

Author: mpsonntag

+nix/Block.m

@@ -267,15 +267,10 @@
 
         %-- Creating a multitag requires an already existing data array
         function r = create_multi_tag(obj, name, type, add_data_array)
-            if (isa(add_data_array, 'nix.DataArray'))
-                addID = add_data_array.id;
-            else
-                addID = add_data_array;
-            end
-
             fname = strcat(obj.alias, '::createMultiTag');
-            h = nix_mx(fname, obj.nix_handle, name, type, addID);
-            r = nix.MultiTag(h);
+            id = nix.Utils.parseEntityId(add_data_array, 'nix.DataArray');
+            h = nix_mx(fname, obj.nix_handle, name, type, id);
+            r = nix.Utils.createEntity(h, @nix.MultiTag);
         end
 
         function r = delete_multi_tag(obj, del)

+nix/Feature.m

@@ -45,11 +45,9 @@
         end
 
         function [] = set_data(obj, setData)
-            if (isa(setData, 'nix.DataArray'))
-                setData = setData.id;
-            end
+            id = nix.Utils.parseEntityId(setData, 'nix.DataArray');
             fname = strcat(obj.alias, '::setData');
-            nix_mx(fname, obj.nix_handle, setData);
+            nix_mx(fname, obj.nix_handle, id);
         end
     end
 

+nix/MultiTag.m

@@ -89,14 +89,9 @@
         % ------------------
 
         function r = add_feature(obj, add_this, link_type)
-            if (isa(add_this, 'nix.DataArray'))
-                addID = add_this.id;
-            else
-                addID = add_this;
-            end
-
+            addId = nix.Utils.parseEntityId(add_this, 'nix.DataArray');
             fname = strcat(obj.alias, '::createFeature');
-            h = nix_mx(fname, obj.nix_handle, addID, link_type);
+            h = nix_mx(fname, obj.nix_handle, addId, link_type);
             r = nix.Utils.createEntity(h, @nix.Feature);
         end
 

+nix/Section.m

@@ -142,15 +142,13 @@
 
         function r = delete_property(obj, del)
             if (isstruct(del) && isfield(del, 'id'))
-                delID = del.id;
-            elseif (isa(del, 'nix.Property'))
-                delID = del.id;
+                id = del.id;
             else
-                delID = del;
+                id = nix.Utils.parseEntityId(del, 'nix.Property');
             end
 
             fname = strcat(obj.alias, '::deleteProperty');
-            r = nix_mx(fname, obj.nix_handle, delID);
+            r = nix_mx(fname, obj.nix_handle, id);
         end
 
         function r = open_property(obj, id_or_name)

+nix/SourcesMixIn.m

@@ -26,11 +26,7 @@
 
         % has_source supports only check by id, not by name
         function r = has_source(obj, id_or_entity)
-            has = id_or_entity;
-            if (isa(has, 'nix.Source'))
-            	has = id_or_entity.id;
-            end
-
+            has = nix.Utils.parseEntityId(id_or_entity, 'nix.Source');
             fname = strcat(obj.alias, '::hasSource');
             r = nix_mx(fname, obj.nix_handle, has);
         end

+nix/Tag.m

@@ -91,14 +91,9 @@
         % ------------------
 
         function r = add_feature(obj, add_this, link_type)
-            if (isa(add_this, 'nix.DataArray'))
-                addID = add_this.id;
-            else
-                addID = add_this;
-            end
-
+            id = nix.Utils.parseEntityId(add_this, 'nix.DataArray');
             fname = strcat(obj.alias, '::createFeature');
-            h = nix_mx(fname, obj.nix_handle, addID, link_type);
+            h = nix_mx(fname, obj.nix_handle, id, link_type);
             r = nix.Utils.createEntity(h, @nix.Feature);
         end
 

+nix/Utils.m

@@ -10,6 +10,18 @@
 
     methods(Static)
 
+        function r = parseEntityId(id_or_entity, nixEntity)
+            if (isa(id_or_entity, nixEntity))
+                r = id_or_entity.id;
+            elseif (isa(id_or_entity, 'char'))
+                r = id_or_entity;
+            else
+                err.identifier = 'NIXMX:InvalidArgument';
+                err.message = sprintf('Expected an id, name or %s entity', nixEntity);
+                error(err);
+            end
+        end
+
         function r = createEntity(handle, objConstructor)
             r = {};
             if (handle ~= 0)
@@ -44,13 +56,9 @@
             r = nix.Utils.createEntity(h, objConstructor);
         end
 
-        function [] = add_entity(obj, add_this, nixEntity, mxMethod)
-            if (isa(add_this, nixEntity))
-                addID = add_this.id;
-            else
-                addID = add_this;
-            end
-            nix_mx(mxMethod, obj.nix_handle, addID);
+        function [] = add_entity(obj, idNameEntity, nixEntity, mxMethod)
+            id = nix.Utils.parseEntityId(idNameEntity, nixEntity);
+            nix_mx(mxMethod, obj.nix_handle, id);
         end
 
         function [] = add_entity_array(obj, add_cell_array, nixEntity, mxMethod)
@@ -70,13 +78,9 @@
         % Function can be used for both nix delete and remove methods.
         % The first actually removes the entity, the latter
         % removes only the reference to the entity.
-        function r = delete_entity(obj, del, nixEntity, mxMethod)
-            if (isa(del, nixEntity))
-                delID = del.id;
-            else
-                delID = del;
-            end
-            r = nix_mx(mxMethod, obj.nix_handle, delID);
+        function r = delete_entity(obj, idNameEntity, nixEntity, mxMethod)
+            id = nix.Utils.parseEntityId(idNameEntity, nixEntity);
+            r = nix_mx(mxMethod, obj.nix_handle, id);
         end
 
         function r = open_entity(obj, mxMethod, id_or_name, objConstructor)