refactored Dynamic into independent static class

Author: asobolev

+nix/Block.m

@@ -1,12 +1,9 @@
 classdef Block < nix.NamedEntity
     %Block nix Block object
-    
-    properties (Access = protected)
+
+    properties (Hidden)
         % namespace reference for nix-mx functions
         alias = 'Block'
-    end
-    
-    properties(Hidden)
         metadataCache
     end
 
@@ -15,10 +12,10 @@
             [email protected](h);
 
             % assign relations
-            obj.add_dyn_relation('dataArrays', @nix.DataArray);
-            obj.add_dyn_relation('sources', @nix.Source);
-            obj.add_dyn_relation('tags', @nix.Tag);
-            obj.add_dyn_relation('multiTags', @nix.MultiTag);
+            nix.Dynamic.add_dyn_relation(obj, 'dataArrays', @nix.DataArray);
+            nix.Dynamic.add_dyn_relation(obj, 'sources', @nix.Source);
+            nix.Dynamic.add_dyn_relation(obj, 'tags', @nix.Tag);
+            nix.Dynamic.add_dyn_relation(obj, 'multiTags', @nix.MultiTag);
 
             obj.metadataCache = nix.CacheStruct();
         end;

+nix/Dynamic.m

@@ -1,27 +1,13 @@
-classdef Dynamic < dynamicprops
-    %Dynamic class that dynamically assigns properties 
+classdef Dynamic
+    %Dynamic class (all methods are static hehe)
+    % implements methods to dynamically assigns properties 
 
-    properties (Abstract, Access = protected)
-        alias
-    end
-    
-    properties (Access = protected)
-        info
-    end
-    
-    methods
-        function obj = Dynamic()
-            % fetch all object attrs
-            obj.info = nix_mx(strcat(obj.alias, '::describe'), obj.nix_handle);
-        end
-    end
-
-    methods (Hidden = true)
+    methods (Static)
         function add_dyn_attr(obj, prop, mode)
             if nargin < 3
                 mode = 'r'; 
             end
-
+            
             % create dynamic property
             p = addprop(obj, prop);
 
@@ -60,6 +46,7 @@ function add_dyn_relation(obj, name, constructor)
             % same property but returns Map 
             rel_map = addprop(obj, strcat(name, 'Map'));
             rel_map.GetMethod = @get_as_map;
+            rel_map.Hidden = true;
 
             function val = get_method(obj)
                 [obj.(cacheAttr), val] = nix.Utils.fetchObjList(obj.updatedAt, ...

+nix/Entity.m

@@ -1,14 +1,22 @@
-classdef Entity < handle
+classdef Entity < dynamicprops
     %Entity base class for nix entities
     %   handles object lifetime
 
-    properties(Hidden)
+    properties (Hidden)
         nix_handle
+        info
+    end
+    
+    properties (Abstract, Hidden)
+        alias
     end
 
     methods
         function obj = Entity(h)
             obj.nix_handle = h;
+            
+            % fetch all object attrs
+            obj.info = nix_mx(strcat(obj.alias, '::describe'), obj.nix_handle);
         end
 
         function delete(obj)

+nix/File.m

@@ -2,7 +2,9 @@
     %File nix File object
 
     properties(Hidden)
-        info
+        % namespace reference for nix-mx functions
+        alias = 'File'
+
         blocksCache;
         sectionsCache;
     end;

+nix/NamedEntity.m

@@ -1,17 +1,16 @@
-classdef NamedEntity < nix.Entity & nix.Dynamic
+classdef NamedEntity < nix.Entity
     %NamedEntity
     % base class for nix entities with name/type/definition
 
     methods
         function obj = NamedEntity(h)
             obj = [email protected](h);
-            obj = [email protected]();
 
             % assign dynamic properties
-            obj.add_dyn_attr('id', 'r');
-            obj.add_dyn_attr('name', 'r');
-            obj.add_dyn_attr('type', 'rw');
-            obj.add_dyn_attr('definition', 'rw');
+            nix.Dynamic.add_dyn_attr(obj, 'id', 'r');
+            nix.Dynamic.add_dyn_attr(obj, 'name', 'r');
+            nix.Dynamic.add_dyn_attr(obj, 'type', 'rw');
+            nix.Dynamic.add_dyn_attr(obj, 'definition', 'rw');
         end
     end
 

+nix/Section.m

@@ -2,12 +2,9 @@
     %SECTION Metadata Section class
     %   NIX metadata section
 
-    properties (Access = protected)
+    properties(Hidden)
         % namespace reference for nix-mx functions
         alias = 'Section'
-    end
-    
-    properties(Hidden)
         propsCache
     end;
 
@@ -21,11 +18,11 @@
             [email protected](h);
 
             % assign dynamic properties
-            obj.add_dyn_attr('repository', 'rw');
-            obj.add_dyn_attr('mapping', 'rw');
+            nix.Dynamic.add_dyn_attr(obj, 'repository', 'rw');
+            nix.Dynamic.add_dyn_attr(obj, 'mapping', 'rw');
 
             % assign relations
-            obj.add_dyn_relation('sections', @nix.Section);
+            nix.Dynamic.add_dyn_relation(obj, 'sections', @nix.Section);
 
             obj.propsCache = nix.CacheStruct();
         end;

+nix/SourcesMixIn.m

@@ -1,17 +1,14 @@
 classdef SourcesMixIn < handle
     %SourcesMixIn
     % mixin class for nix entities that can be related with sources
-    % depends on 
-    % - nix.Entity
-    % - nix.Dynamic
-    
-    properties (Abstract, Access = protected)
+
+    properties (Abstract, Hidden)
         alias
     end
 
     methods
         function obj = SourcesMixIn()
-            obj.add_dyn_relation('sources', @nix.Source);
+            nix.Dynamic.add_dyn_relation(obj, 'sources', @nix.Source);
         end
 
         function [] = add_source(obj, add_this)

+nix/Tag.m

@@ -1,7 +1,7 @@
 classdef Tag < nix.NamedEntity & nix.MetadataMixIn & nix.SourcesMixIn
     %Tag nix Tag object
 
-    properties (Access = protected)
+    properties (Hidden)
         % namespace reference for nix-mx functions
         alias = 'Tag'
     end
@@ -13,13 +13,13 @@
             [email protected]();
 
             % assign dynamic properties
-            obj.add_dyn_attr('position', 'rw');
-            obj.add_dyn_attr('extent', 'rw');
-            obj.add_dyn_attr('units', 'rw');
+            nix.Dynamic.add_dyn_attr(obj, 'position', 'rw');
+            nix.Dynamic.add_dyn_attr(obj, 'extent', 'rw');
+            nix.Dynamic.add_dyn_attr(obj, 'units', 'rw');
 
             % assign relations
-            obj.add_dyn_relation('references', @nix.DataArray);
-            obj.add_dyn_relation('features', @nix.Feature);
+            nix.Dynamic.add_dyn_relation(obj, 'references', @nix.DataArray);
+            nix.Dynamic.add_dyn_relation(obj, 'features', @nix.Feature);
         end;
 
         % ------------------