removeCache: cleanup helper functions

mpsonntag · mpsonntag · commit eb803621b5ea · 2015-12-14T19:37:17.000+01:00
diff --git a/+nix/Block.m b/+nix/Block.m
@@ -39,7 +39,7 @@
         end;
 
         function delCheck = delete_group(obj, del)
-            delCheck = nix.Utils.delete_entity_(obj, ...
+            delCheck = nix.Utils.delete_entity(obj, ...
                 del, 'nix.Group', 'Block::deleteGroup');
         end;
         
@@ -73,7 +73,7 @@
         end;
         
         function delCheck = delete_data_array(obj, del)
-            delCheck = nix.Utils.delete_entity_(obj, ...
+            delCheck = nix.Utils.delete_entity(obj, ...
                 del, 'nix.DataArray', 'Block::deleteDataArray');
         end;
 
@@ -91,7 +91,7 @@
         end;
         
         function delCheck = delete_source(obj, del)
-            delCheck = nix.Utils.delete_entity_(obj, ...
+            delCheck = nix.Utils.delete_entity(obj, ...
                 del, 'nix.Source', 'Block::deleteSource');
         end;
         
@@ -120,7 +120,7 @@
         end;
 
         function delCheck = delete_tag(obj, del)
-            delCheck = nix.Utils.delete_entity_(obj, ...
+            delCheck = nix.Utils.delete_entity(obj, ...
                 del, 'nix.Tag', 'Block::deleteTag');
         end;
 
@@ -150,9 +150,9 @@
         end;
         
         function delCheck = delete_multi_tag(obj, del)
-            delCheck = nix.Utils.delete_entity_(obj, ...
+            delCheck = nix.Utils.delete_entity(obj, ...
                 del, 'nix.MultiTag', 'Block::deleteMultiTag');
         end;
-
     end;
+
 end
diff --git a/+nix/CacheStruct.m b/+nix/CacheStruct.m
diff --git a/+nix/Dynamic.m b/+nix/Dynamic.m
@@ -43,12 +43,6 @@ function set_method(obj, val)
         end
         
         function add_dyn_relation(obj, name, constructor)
-            cacheAttr = strcat(name, 'Cache');
-            cache = addprop(obj, cacheAttr);
-            cache.Hidden = true;
-            obj.(cacheAttr) = nix.CacheStruct();
-
-            %-- refactor Cache, remove code above once it works everywhere.
             dataAttr = strcat(name, 'Data');
             data = addprop(obj, dataAttr);
             data.Hidden = true;
@@ -80,4 +74,5 @@ function add_dyn_relation(obj, name, constructor)
             end
         end
     end
-end
+
+end
diff --git a/+nix/File.m b/+nix/File.m
@@ -39,7 +39,7 @@
         end
 
         function delCheck = deleteBlock(obj, del)
-            delCheck = nix.Utils.delete_entity_(obj, ...
+            delCheck = nix.Utils.delete_entity(obj, ...
                 del, 'nix.Block', 'File::deleteBlock');
         end;
 
@@ -61,8 +61,8 @@
         end
 
         function delCheck = deleteSection(obj, del)
-            delCheck = nix.Utils.delete_entity_(obj, del, 'nix.Section', 'File::deleteSection');
+            delCheck = nix.Utils.delete_entity(obj, del, 'nix.Section', 'File::deleteSection');
         end;
-
     end
+
 end
diff --git a/+nix/Group.m b/+nix/Group.m
@@ -31,12 +31,12 @@
         end;
 
         function [] = add_data_array(obj, add_this)
-            nix.Utils.add_entity_(obj, add_this, ...
+            nix.Utils.add_entity(obj, add_this, ...
                 'nix.DataArray', 'Group::addDataArray');
         end;
 
         function delCheck = remove_data_array(obj, del)
-            delCheck = nix.Utils.delete_entity_(obj, del, ...
+            delCheck = nix.Utils.delete_entity(obj, del, ...
                 'nix.DataArray', 'Group::removeDataArray');
         end;
 
@@ -45,7 +45,7 @@
         % -----------------
 
         function [] = add_tag(obj, add_this)
-            nix.Utils.add_entity_(obj, add_this, ...
+            nix.Utils.add_entity(obj, add_this, ...
                 'nix.Tag', 'Group::addTag');
         end;
 
@@ -59,7 +59,7 @@
         end;
 
         function delCheck = remove_tag(obj, del)
-            delCheck = nix.Utils.delete_entity_(obj, del, ...
+            delCheck = nix.Utils.delete_entity(obj, del, ...
                 'nix.Tag', 'Group::removeTag');
         end;
 
@@ -68,7 +68,7 @@
         % -----------------
         
         function [] = add_multi_tag(obj, add_this)
-            nix.Utils.add_entity_(obj, add_this, ...
+            nix.Utils.add_entity(obj, add_this, ...
                 'nix.MultiTag', 'Group::addMultiTag');
         end;
 
@@ -83,9 +83,9 @@
         end;
 
         function delCheck = remove_multi_tag(obj, del)
-            delCheck = nix.Utils.delete_entity_(obj, del, ...
+            delCheck = nix.Utils.delete_entity(obj, del, ...
                 'nix.MultiTag', 'Group::removeMultiTag');
         end;
-
     end;
+
 end
diff --git a/+nix/MetadataMixIn.m b/+nix/MetadataMixIn.m
@@ -10,7 +10,7 @@
     
     methods
         function metadata = open_metadata(obj)
-            metadata = nix.Utils.fetchObj_(...
+            metadata = nix.Utils.fetchObj(...
                 strcat(obj.alias, '::openMetadataSection'), ...
                 obj.nix_handle, @nix.Section);
         end;
@@ -20,7 +20,7 @@ function set_metadata(obj, val)
                 nix_mx(strcat(obj.alias, '::set_none_metadata'), ...
                     obj.nix_handle, val);
             else
-                nix.Utils.add_entity_(obj, val, 'nix.Section', ...
+                nix.Utils.add_entity(obj, val, 'nix.Section', ...
                     strcat(obj.alias, '::set_metadata'));
             end;
         end;
diff --git a/+nix/MultiTag.m b/+nix/MultiTag.m
@@ -25,7 +25,7 @@
         % ------------------
 
         function [] = add_reference(obj, add_this)
-            nix.Utils.add_entity_(obj, add_this, ...
+            nix.Utils.add_entity(obj, add_this, ...
                 'nix.DataArray', 'MultiTag::addReference');
         end;
 
@@ -35,7 +35,7 @@
         end;
         
         function delCheck = remove_reference(obj, del)
-            delCheck = nix.Utils.delete_entity_(obj, del, ...
+            delCheck = nix.Utils.delete_entity(obj, del, ...
                 'nix.DataArray', 'MultiTag::removeReference');
         end;
 
@@ -75,7 +75,7 @@
         end;
         
         function delCheck = remove_feature(obj, del)
-            delCheck = nix.Utils.delete_entity_(obj, del, ...
+            delCheck = nix.Utils.delete_entity(obj, del, ...
                 'nix.Feature', 'MultiTag::deleteFeature');
         end;
 
diff --git a/+nix/Section.m b/+nix/Section.m
@@ -67,7 +67,7 @@
         end;
 
         function delCheck = deleteSection(obj, del)
-            delCheck = nix.Utils.delete_entity_(obj, del, ...
+            delCheck = nix.Utils.delete_entity(obj, del, ...
                 'nix.Section', 'Section::deleteSection');
         end;
 
diff --git a/+nix/Source.m b/+nix/Source.m
@@ -28,7 +28,7 @@
         end;
         
         function delCheck = delete_source(obj, del)
-            delCheck = nix.Utils.delete_entity_(obj, del, ...
+            delCheck = nix.Utils.delete_entity(obj, del, ...
                 'nix.Source', 'Source::deleteSource');
         end;
 
diff --git a/+nix/SourcesMixIn.m b/+nix/SourcesMixIn.m
@@ -12,12 +12,12 @@
         end
         
         function [] = add_source(obj, add_this)
-            nix.Utils.add_entity_(obj, add_this, ...
+            nix.Utils.add_entity(obj, add_this, ...
                 'nix.Source', strcat(obj.alias, '::addSource'));
         end;
 
         function delCheck = remove_source(obj, del)
-            delCheck = nix.Utils.delete_entity_(obj, del, ...
+            delCheck = nix.Utils.delete_entity(obj, del, ...
                 'nix.Source', strcat(obj.alias, '::removeSource'));
         end;
 
diff --git a/+nix/Tag.m b/+nix/Tag.m
@@ -36,7 +36,7 @@
         end;
         
         function delCheck = remove_reference(obj, del)
-            delCheck = nix.Utils.delete_entity_(obj, del, ...
+            delCheck = nix.Utils.delete_entity(obj, del, ...
                 'nix.DataArray', 'Tag::removeReference');
         end;
 
@@ -74,7 +74,7 @@
         end;
         
         function delCheck = remove_feature(obj, del)
-            delCheck = nix.Utils.delete_entity_(obj, del, ...
+            delCheck = nix.Utils.delete_entity(obj, del, ...
                 'nix.Feature', 'Tag::deleteFeature');
         end;
 
diff --git a/+nix/Utils.m b/+nix/Utils.m
@@ -1,54 +1,15 @@
 classdef Utils
     methods(Static)
 
-        function [currData] = fetchObjList(nixMxFunc, handle, objConstructor)
+        function currData = fetchObjList(nixMxFunc, handle, objConstructor)
             currList = nix_mx(nixMxFunc, handle);
             currData = cell(length(currList), 1);
             for i = 1:length(currList)
                 currData{i} = objConstructor(currList{i});
             end;
         end;
-        
-        function [currCache, retCell] = fetchObj(currUpdatedAt, nixMxFunc, handle, currCache, objConstructor)
-            if currCache.lastUpdate ~= currUpdatedAt
-                sh = nix_mx(nixMxFunc, handle);
-                if sh ~= 0
-                    currCache.data = objConstructor(sh);
-                else
-                    currCache.data = {};
-                end;
-                currCache.lastUpdate = currUpdatedAt;
-            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;
 
-        %-- functions for the transition between cache and no-cache;
-        %-- remove above at the end of the refactoring step and rename
-        %-- to appropriate functions.
-        function retCell = fetchObj_(nixMxFunc, handle, objConstructor)
+        function retCell = fetchObj(nixMxFunc, handle, objConstructor)
             sh = nix_mx(nixMxFunc, handle);
             if sh ~= 0
                 retCell = objConstructor(sh);
@@ -57,7 +18,7 @@
             end;
         end;
 
-        function [] = add_entity_(obj, add_this, nixEntity, mxMethod)
+        function [] = add_entity(obj, add_this, nixEntity, mxMethod)
             if(strcmp(class(add_this), nixEntity))
                 addID = add_this.id;
             else
@@ -66,10 +27,10 @@
             nix_mx(mxMethod, obj.nix_handle, addID);
         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 = delete_entity_(obj, del, nixEntity, mxMethod)
+        % 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 = delete_entity(obj, del, nixEntity, mxMethod)
             if(strcmp(class(del), nixEntity))
                 delID = del.id;
             else
@@ -88,4 +49,3 @@
         
     end;
 end
-
