util add/remove methods

Author: mpsonntag

+nix/Block.m

@@ -60,13 +60,8 @@
         end;
 
         function delCheck = delete_source(obj, del)
-            if(strcmp(class(del),'nix.Source'))
-                delID = del.id;
-            else
-                delID = del;
-            end;
-            delCheck = nix_mx('Block::deleteSource', obj.nix_handle, delID);
-            obj.sourcesCache.lastUpdate = 0;
+            [delCheck, obj.sourcesCache] = nix.Utils.delete_entity(obj, ...
+                del, 'nix.Source', 'Block::deleteSource', obj.sourcesCache);
         end;
 
         function retObj = open_source(obj, id_or_name)

+nix/File.m

@@ -51,13 +51,8 @@
         end;
 
         function delCheck = deleteBlock(obj, del)
-            if(strcmp(class(del),'nix.Block'))
-                delID = del.id;
-            else
-                delID = del;
-            end;
-            delCheck = nix_mx('File::deleteBlock', obj.nix_handle, delID);
-            obj.blocksCache.lastUpdate = 0;
+            [delCheck, obj.blocksCache] = nix.Utils.delete_entity(obj, ...
+                del, 'nix.Block', 'File::deleteBlock', obj.blocksCache);
         end;
 
         % ----------------
@@ -83,12 +78,7 @@
         end;
 
         function delCheck = deleteSection(obj, del)
-            if(strcmp(class(del),'nix.Section'))
-                delID = del.id;
-            else
-                delID = del;
-            end;
-            delCheck = nix_mx('File::deleteSection', obj.nix_handle, delID);
+            delCheck = nix.Utils.delete_entity(obj, del, 'nix.Section', 'File::deleteSection');
             obj.sectionsCache.lastUpdate = 0;
         end;
 

+nix/Source.m

@@ -58,13 +58,8 @@
         end;
 
         function delCheck = delete_source(obj, del)
-            if(strcmp(class(del),'nix.Source'))
-                delID = del.id;
-            else
-                delID = del;
-            end;
-            delCheck = nix_mx('Source::deleteSource', obj.nix_handle, delID);
-            obj.sourcesCache.lastUpdate = 0;
+            [delCheck, obj.sourcesCache] = nix.Utils.delete_entity(obj, ...
+                del, 'nix.Source', 'Source::deleteSource', obj.sourcesCache);
         end;
 
         function retObj = open_source(obj, id_or_name)

+nix/Tag.m

@@ -86,23 +86,13 @@
         % ------------------
 
         function [] = add_reference(obj, add_this)
-            if(strcmp(class(add_this),'nix.DataArray'))
-                addID = add_this.id;
-            else
-                addID = add_this;
-            end;
-            nix_mx('Tag::addReference', obj.nix_handle, addID);
-            obj.referencesCache.lastUpdate = 0;
+            obj.referencesCache = nix.Utils.add_entity(obj, ...
+                add_this, 'nix.DataArray', 'Tag::addReference', obj.referencesCache);
         end;
 
         function delCheck = remove_reference(obj, del)
-            if(strcmp(class(del),'nix.DataArray'))
-                delID = del.id;
-            else
-                delID = del;
-            end;
-            delCheck = nix_mx('Tag::removeReference', obj.nix_handle, delID);
-            obj.referencesCache.lastUpdate = 0;
+            [delCheck, obj.referencesCache] = nix.Utils.delete_entity(obj, ...
+                del, 'nix.DataArray', 'Tag::removeReference', obj.referencesCache);
         end;
 
         function retObj = open_reference(obj, id_or_name)
@@ -160,23 +150,13 @@
         % ------------------
 
         function [] = add_source(obj, add_this)
-            if(strcmp(class(add_this),'nix.Source'))
-                addID = add_this.id;
-            else
-                addID = add_this;
-            end;
-            nix_mx('Tag::addSource', obj.nix_handle, addID);
-            obj.sourcesCache.lastUpdate = 0;
+            obj.sourcesCache = nix.Utils.add_entity(obj, ...
+                add_this, 'nix.Source', 'Tag::addSource', obj.sourcesCache);
         end;
 
         function delCheck = remove_source(obj, del)
-            if(strcmp(class(del),'nix.Source'))
-                delID = del.id;
-            else
-                delID = del;
-            end;
-            delCheck = nix_mx('Tag::removeSource', obj.nix_handle, delID);
-            obj.sourcesCache.lastUpdate = 0;
+            [delCheck, obj.sourcesCache] = nix.Utils.delete_entity(obj, ...
+                del, 'nix.Source', 'Tag::removeSource', obj.sourcesCache);
         end;
 
         function retObj = open_source(obj, id_or_name)

+nix/Utils.m

@@ -33,6 +33,29 @@
             end;
             retCell = currCache.data;
         end;
+
+        function currCache = add_entity(obj, add_this, nixEntity, mxMethod, currCache)
+            if(strcmp(class(add_this), nixEntity))
+                addID = add_this.id;
+            else
+                addID = add_this;
+            end;
+            nix_mx(mxMethod, obj.nix_handle, addID);
+            currCache.lastUpdate = 0;
+        end;
+
+        % 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 [delCheck, currCache] = delete_entity(obj, del, nixEntity, mxMethod, currCache)
+            if(strcmp(class(del), nixEntity))
+                delID = del.id;
+            else
+                delID = del;
+            end;
+            delCheck = nix_mx(mxMethod, obj.nix_handle, delID);
+            currCache.lastUpdate = 0;
+        end;
     end;
 end