[Matlab] Add nix.Utils.fetchHasEntity function

Author: mpsonntag

+nix/Block.m

@@ -42,8 +42,7 @@
         end
 
         function r = has_group(obj, id_or_name)
-            fname = strcat(obj.alias, '::hasGroup');
-            r = nix_mx(fname, obj.nix_handle, id_or_name);
+            r = nix.Utils.fetchHasEntity(obj, 'hasGroup', id_or_name);
         end
 
         function r = get_group(obj, id_or_name)
@@ -129,8 +128,7 @@
         end
 
         function r = has_data_array(obj, id_or_name)
-            fname = strcat(obj.alias, '::hasDataArray');
-            r = nix_mx(fname, obj.nix_handle, id_or_name);
+            r = nix.Utils.fetchHasEntity(obj, 'hasDataArray', id_or_name);
         end
 
         function r = delete_data_array(obj, del)
@@ -156,8 +154,7 @@
         end
 
         function r = has_source(obj, id_or_name)
-            fname = strcat(obj.alias, '::hasSource');
-            r = nix_mx(fname, obj.nix_handle, id_or_name);
+            r = nix.Utils.fetchHasEntity(obj, 'hasSource', id_or_name);
         end
 
         function r = delete_source(obj, del)
@@ -195,8 +192,7 @@
         end
 
         function r = has_tag(obj, id_or_name)
-            fname = strcat(obj.alias, '::hasTag');
-            r = nix_mx(fname, obj.nix_handle, id_or_name);
+            r = nix.Utils.fetchHasEntity(obj, 'hasTag', id_or_name);
         end
 
         function r = open_tag(obj, id_or_name)
@@ -230,8 +226,7 @@
         end
 
         function r = has_multi_tag(obj, id_or_name)
-            fname = strcat(obj.alias, '::hasMultiTag');
-            r = nix_mx(fname, obj.nix_handle, id_or_name);
+            r = nix.Utils.fetchHasEntity(obj, 'hasMultiTag', id_or_name);
         end
 
         function r = open_multi_tag(obj, id_or_name)

+nix/File.m

@@ -58,8 +58,7 @@
         end
 
         function r = has_block(obj, id_or_name)
-            fname = strcat(obj.alias, '::hasBlock');
-            r = nix_mx(fname, obj.nix_handle, id_or_name);
+            r = nix.Utils.fetchHasEntity(obj, 'hasBlock', id_or_name);
         end
 
         function r = open_block(obj, id_or_name)
@@ -93,8 +92,7 @@
         end
 
         function r = has_section(obj, id_or_name)
-            fname = strcat(obj.alias, '::hasSection');
-            r = nix_mx(fname, obj.nix_handle, id_or_name);
+            r = nix.Utils.fetchHasEntity(obj, 'hasSection', id_or_name);
         end
 
         function r = open_section(obj, id_or_name)

+nix/Group.m

@@ -35,8 +35,7 @@
         end
 
         function r = has_data_array(obj, id_or_name)
-            fname = strcat(obj.alias, '::hasDataArray');
-            r = nix_mx(fname, obj.nix_handle, id_or_name);
+            r = nix.Utils.fetchHasEntity(obj, 'hasDataArray', id_or_name);
         end
 
         function r = get_data_array(obj, id_or_name)
@@ -76,8 +75,7 @@
         end
 
         function r = has_tag(obj, id_or_name)
-            fname = strcat(obj.alias, '::hasTag');
-            r = nix_mx(fname, obj.nix_handle, id_or_name);
+            r = nix.Utils.fetchHasEntity(obj, 'hasTag', id_or_name);
         end
 
         function r = get_tag(obj, id_or_name)
@@ -113,8 +111,7 @@
         end
 
         function r = has_multi_tag(obj, id_or_name)
-            fname = strcat(obj.alias, '::hasMultiTag');
-            r = nix_mx(fname, obj.nix_handle, id_or_name);
+            r = nix.Utils.fetchHasEntity(obj, 'hasMultiTag', id_or_name);
         end
 
         function r = get_multi_tag(obj, id_or_name)

+nix/MultiTag.m

@@ -41,8 +41,7 @@
         end
 
         function r = has_reference(obj, id_or_name)
-            fname = strcat(obj.alias, '::hasReference');
-            r = nix_mx(fname, obj.nix_handle, id_or_name);
+            r = nix.Utils.fetchHasEntity(obj, 'hasReference', id_or_name);
         end
 
         function r = remove_reference(obj, del)
@@ -89,8 +88,7 @@
         end
 
         function r = has_feature(obj, id_or_name)
-            fname = strcat(obj.alias, '::hasFeature');
-            r = nix_mx(fname, obj.nix_handle, id_or_name);
+            r = nix.Utils.fetchHasEntity(obj, 'hasFeature', id_or_name);
         end
 
         function r = remove_feature(obj, del)

+nix/Section.m

@@ -76,8 +76,7 @@
         end
 
         function r = has_section(obj, id_or_name)
-            fname = strcat(obj.alias, '::hasSection');
-            r = nix_mx(fname, obj.nix_handle, id_or_name);
+            r = nix.Utils.fetchHasEntity(obj, 'hasSection', id_or_name);
         end
 
         function r = section_count(obj)

+nix/Source.m

@@ -38,8 +38,7 @@
         end
 
         function r = has_source(obj, id_or_name)
-            fname = strcat(obj.alias, '::hasSource');
-            r = nix_mx(fname, obj.nix_handle, id_or_name);
+            r = nix.Utils.fetchHasEntity(obj, 'hasSource', id_or_name);
         end
 
         function r = delete_source(obj, del)

+nix/SourcesMixIn.m

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

+nix/Tag.m

@@ -43,8 +43,7 @@
         end
 
         function r = has_reference(obj, id_or_name)
-            fname = strcat(obj.alias, '::hasReference');
-            r = nix_mx(fname, obj.nix_handle, id_or_name);
+            r = nix.Utils.fetchHasEntity(obj, 'hasReference', id_or_name);
         end
 
         function r = remove_reference(obj, del)
@@ -91,8 +90,7 @@
         end
 
         function r = has_feature(obj, id_or_name)
-            fname = strcat(obj.alias, '::hasFeature');
-            r = nix_mx(fname, obj.nix_handle, id_or_name);
+            r = nix.Utils.fetchHasEntity(obj, 'hasFeature', id_or_name);
         end
 
         function r = remove_feature(obj, del)

+nix/Utils.m

@@ -41,6 +41,11 @@
             r = nix_mx(mxMethod, obj.nix_handle);
         end
 
+        function r = fetchHasEntity(obj, mxMethodName, identifier)
+            mxMethod = strcat(obj.alias, '::', mxMethodName);
+            r = nix_mx(mxMethod, obj.nix_handle, identifier);
+        end
+
         function r = fetchObjList(obj, mxMethodName, objConstructor)
             mxMethod = strcat(obj.alias, '::', mxMethodName);
             list = nix_mx(mxMethod, obj.nix_handle);