[Matlab] Refactor Enitity function names

mpsonntag · mpsonntag · commit 20d4a0e5e432 · 2017-09-07T14:35:46.000+02:00
- Refactors all Entity function names to CamelCase.
- Refactors all code occurrences.
diff --git a/+nix/Block.m b/+nix/Block.m
@@ -37,7 +37,7 @@
 
         function r = createGroup(obj, name, nixtype)
             fname = strcat(obj.alias, '::createGroup');
-            h = nix_mx(fname, obj.nix_handle, name, nixtype);
+            h = nix_mx(fname, obj.nixhandle, name, nixtype);
             r = nix.Utils.createEntity(h, @nix.Group);
         end
 
@@ -97,7 +97,7 @@
                 error(err);
             else
                 fname = strcat(obj.alias, '::createDataArray');
-                h = nix_mx(fname, obj.nix_handle, name, nixtype, lower(datatype.char), shape);
+                h = nix_mx(fname, obj.nixhandle, name, nixtype, lower(datatype.char), shape);
                 r = nix.Utils.createEntity(h, @nix.DataArray);
             end
         end
@@ -151,7 +151,7 @@
 
         function r = createSource(obj, name, type)
             fname = strcat(obj.alias, '::createSource');
-            h = nix_mx(fname, obj.nix_handle, name, type);
+            h = nix_mx(fname, obj.nixhandle, name, type);
             r = nix.Utils.createEntity(h, @nix.Source);
         end
 
@@ -209,7 +209,7 @@
 
         function r = createTag(obj, name, type, position)
             fname = strcat(obj.alias, '::createTag');
-            h = nix_mx(fname, obj.nix_handle, name, type, position);
+            h = nix_mx(fname, obj.nixhandle, name, type, position);
             r = nix.Utils.createEntity(h, @nix.Tag);
         end
 
@@ -246,7 +246,7 @@
         function r = createMultiTag(obj, name, type, refDataArray)
             fname = strcat(obj.alias, '::createMultiTag');
             id = nix.Utils.parseEntityId(refDataArray, 'nix.DataArray');
-            h = nix_mx(fname, obj.nix_handle, name, type, id);
+            h = nix_mx(fname, obj.nixhandle, name, type, id);
             r = nix.Utils.createEntity(h, @nix.MultiTag);
         end
 
diff --git a/+nix/DataArray.m b/+nix/DataArray.m
@@ -39,7 +39,7 @@
         function dimensions = get.dimensions(obj)
             dimensions = {};
             fname = strcat(obj.alias, '::dimensions');
-            currList = nix_mx(fname, obj.nix_handle);
+            currList = nix_mx(fname, obj.nixhandle);
             for i = 1:length(currList)
                 switch currList(i).dtype
                     case 'set'
@@ -59,33 +59,33 @@
 
         function r = appendSetDimension(obj)
             fname = strcat(obj.alias, '::appendSetDimension');
-            h = nix_mx(fname, obj.nix_handle);
+            h = nix_mx(fname, obj.nixhandle);
             r = nix.Utils.createEntity(h, @nix.SetDimension);
         end
 
         function r = appendSampledDimension(obj, interval)
             fname = strcat(obj.alias, '::appendSampledDimension');
-            h = nix_mx(fname, obj.nix_handle, interval);
+            h = nix_mx(fname, obj.nixhandle, interval);
             r = nix.Utils.createEntity(h, @nix.SampledDimension);
         end
 
         function r = appendRangeDimension(obj, ticks)
             fname = strcat(obj.alias, '::appendRangeDimension');
-            h = nix_mx(fname, obj.nix_handle, ticks);
+            h = nix_mx(fname, obj.nixhandle, ticks);
             r = nix.Utils.createEntity(h, @nix.RangeDimension);
         end
 
         function r = appendAliasRangeDimension(obj)
             fname = strcat(obj.alias, '::appendAliasRangeDimension');
-            h = nix_mx(fname, obj.nix_handle);
+            h = nix_mx(fname, obj.nixhandle);
             r = nix.Utils.createEntity(h, @nix.RangeDimension);
         end
 
         function r = openDimensionIdx(obj, idx)
         % Getting the dimension by index starts with 1
         % instead of 0 compared to all other index functions.
             fname = strcat(obj.alias, '::openDimensionIdx');
-            dim = nix_mx(fname, obj.nix_handle, idx);
+            dim = nix_mx(fname, obj.nixhandle, idx);
             switch (dim.dimension_type)
                 case 'set'
                     r = nix.Utils.createEntity(dim.handle, @nix.SetDimension);
@@ -98,7 +98,7 @@
 
         function r = deleteDimensions(obj)
             fname = strcat(obj.alias, '::deleteDimensions');
-            r = nix_mx(fname, obj.nix_handle);
+            r = nix_mx(fname, obj.nixhandle);
         end
 
         function r = dimensionCount(obj)
@@ -111,7 +111,7 @@
 
         function r = readAllData(obj)
             fname = strcat(obj.alias, '::readAll');
-            data = nix_mx(fname, obj.nix_handle);
+            data = nix_mx(fname, obj.nixhandle);
             r = nix.Utils.transposeArray(data);
         end
 
@@ -143,12 +143,12 @@
             end
 
             fname = strcat(obj.alias, '::writeAll');
-            nix_mx(fname, obj.nix_handle, nix.Utils.transposeArray(data));
+            nix_mx(fname, obj.nixhandle, nix.Utils.transposeArray(data));
         end
 
         function r = datatype(obj)
             fname = strcat(obj.alias, '::dataType');
-            r = nix_mx(fname, obj.nix_handle);
+            r = nix_mx(fname, obj.nixhandle);
         end
 
         % Set data extent enables to increase the original size 
@@ -162,7 +162,7 @@
         % will be lost!
         function [] = setDataExtent(obj, extent)
             fname = strcat(obj.alias, '::setDataExtent');
-            nix_mx(fname, obj.nix_handle, extent);
+            nix_mx(fname, obj.nixhandle, extent);
         end
     end
 
diff --git a/+nix/Dynamic.m b/+nix/Dynamic.m
@@ -32,7 +32,7 @@ function setMethod(obj, val)
 
                 if (isempty(val))
                     fname = strcat(obj.alias, '::setNone', upper(prop(1)), prop(2:end));
-                    nix_mx(fname, obj.nix_handle, 0);
+                    nix_mx(fname, obj.nixhandle, 0);
                 elseif ((strcmp(prop, 'units') || strcmp(prop, 'labels')) && (~iscell(val)))
                 %-- BUGFIX: Matlab crashes, if units in Tags and MultiTags
                 %-- or labels of SetDimension are set using anything else than a cell.
@@ -41,7 +41,7 @@ function setMethod(obj, val)
                     throwAsCaller(ME);
                 else
                     fname = strcat(obj.alias, '::set', upper(prop(1)), prop(2:end));
-                    nix_mx(fname, obj.nix_handle, val);
+                    nix_mx(fname, obj.nixhandle, val);
                 end
             end
 
diff --git a/+nix/Entity.m b/+nix/Entity.m
@@ -11,7 +11,7 @@
     %   handles object lifetime
 
     properties (Hidden)
-        nix_handle
+        nixhandle
     end
 
     properties (SetAccess=private, GetAccess=public, Hidden)
@@ -24,20 +24,20 @@
 
     methods
         function obj = Entity(h)
-            obj.nix_handle = h;
+            obj.nixhandle = h;
         end
 
         function [] = delete(obj)
-            nix_mx('Entity::destroy', obj.nix_handle);
+            nix_mx('Entity::destroy', obj.nixhandle);
         end
 
         function r = updatedAt(obj)
-            r = nix_mx('Entity::updatedAt', obj.nix_handle);
+            r = nix_mx('Entity::updatedAt', obj.nixhandle);
         end
 
         function r = get.info(obj)
             fname = strcat(obj.alias, '::describe');
-            r = nix_mx(fname, obj.nix_handle);
+            r = nix_mx(fname, obj.nixhandle);
         end
     end
 
diff --git a/+nix/Feature.m b/+nix/Feature.m
@@ -30,24 +30,24 @@
 
         function r = get.linkType(obj)
             fname = strcat(obj.alias, '::getLinkType');
-            r = nix_mx(fname, obj.nix_handle);
+            r = nix_mx(fname, obj.nixhandle);
         end
 
         function [] = set.linkType(obj, linkType)
             fname = strcat(obj.alias, '::setLinkType');
-            nix_mx(fname, obj.nix_handle, linkType);
+            nix_mx(fname, obj.nixhandle, linkType);
         end
 
         function r = openData(obj)
             fname = strcat(obj.alias, '::openData');
-            h = nix_mx(fname, obj.nix_handle);
+            h = nix_mx(fname, obj.nixhandle);
             r = nix.Utils.createEntity(h, @nix.DataArray);
         end
 
         function [] = setData(obj, data)
             id = nix.Utils.parseEntityId(data, 'nix.DataArray');
             fname = strcat(obj.alias, '::setData');
-            nix_mx(fname, obj.nix_handle, id);
+            nix_mx(fname, obj.nixhandle, id);
         end
     end
 
diff --git a/+nix/File.m b/+nix/File.m
@@ -30,17 +30,17 @@
         % braindead...
         function r = isOpen(obj)
             fname = strcat(obj.alias, '::isOpen');
-            r = nix_mx(fname, obj.nix_handle);
+            r = nix_mx(fname, obj.nixhandle);
         end
 
         function r = fileMode(obj)
             fname = strcat(obj.alias, '::fileMode');
-            r = nix_mx(fname, obj.nix_handle);
+            r = nix_mx(fname, obj.nixhandle);
         end
 
         function r = validate(obj)
             fname = strcat(obj.alias, '::validate');
-            r = nix_mx(fname, obj.nix_handle);
+            r = nix_mx(fname, obj.nixhandle);
         end
 
         % ----------------
@@ -49,7 +49,7 @@
 
         function r = createBlock(obj, name, type)
             fname = strcat(obj.alias, '::createBlock');
-            h = nix_mx(fname, obj.nix_handle, name, type);
+            h = nix_mx(fname, obj.nixhandle, name, type);
             r = nix.Utils.createEntity(h, @nix.Block);
         end
 
@@ -84,7 +84,7 @@
 
         function r = createSection(obj, name, type)
             fname = strcat(obj.alias, '::createSection');
-            h = nix_mx(fname, obj.nix_handle, name, type);
+            h = nix_mx(fname, obj.nixhandle, name, type);
             r = nix.Utils.createEntity(h, @nix.Section);
         end
 
diff --git a/+nix/MetadataMixIn.m b/+nix/MetadataMixIn.m
@@ -24,7 +24,7 @@
         function [] = setMetadata(obj, val)
             if (isempty(val))
                 fname = strcat(obj.alias, '::setNoneMetadata');
-                nix_mx(fname, obj.nix_handle, val);
+                nix_mx(fname, obj.nixhandle, val);
             else
                 nix.Utils.addEntity(obj, 'setMetadata', val, 'nix.Section');
             end
diff --git a/+nix/MultiTag.m b/+nix/MultiTag.m
@@ -60,15 +60,15 @@
         function r = retrieveData(obj, positionIdx, idName)
             posIdx = nix.Utils.handleIndex(positionIdx);
             fname = strcat(obj.alias, '::retrieveData');
-            data = nix_mx(fname, obj.nix_handle, posIdx, idName);
+            data = nix_mx(fname, obj.nixhandle, posIdx, idName);
             r = nix.Utils.transposeArray(data);
         end
 
         function r = retrieveDataIdx(obj, positionIdx, referenceIdx)
             posIdx = nix.Utils.handleIndex(positionIdx);
             refIdx = nix.Utils.handleIndex(referenceIdx);
             fname = strcat(obj.alias, '::retrieveDataIdx');
-            data = nix_mx(fname, obj.nix_handle, posIdx, refIdx);
+            data = nix_mx(fname, obj.nixhandle, posIdx, refIdx);
             r = nix.Utils.transposeArray(data);
         end
 
@@ -87,7 +87,7 @@
         function r = addFeature(obj, entity, linkType)
             addId = nix.Utils.parseEntityId(entity, 'nix.DataArray');
             fname = strcat(obj.alias, '::createFeature');
-            h = nix_mx(fname, obj.nix_handle, addId, linkType);
+            h = nix_mx(fname, obj.nixhandle, addId, linkType);
             r = nix.Utils.createEntity(h, @nix.Feature);
         end
 
@@ -111,15 +111,15 @@
         function r = retrieveFeatureData(obj, positionIdx, idName)
             posIdx = nix.Utils.handleIndex(positionIdx);
             fname = strcat(obj.alias, '::featureRetrieveData');
-            data = nix_mx(fname, obj.nix_handle, posIdx, idName);
+            data = nix_mx(fname, obj.nixhandle, posIdx, idName);
             r = nix.Utils.transposeArray(data);
         end
 
         function r = retrieveFeatureDataIdx(obj, positionIdx, featureIdx)
             posIdx = nix.Utils.handleIndex(positionIdx);
             featIdx = nix.Utils.handleIndex(featureIdx);
             fname = strcat(obj.alias, '::featureRetrieveDataIdx');
-            data = nix_mx(fname, obj.nix_handle, posIdx, featIdx);
+            data = nix_mx(fname, obj.nixhandle, posIdx, featIdx);
             r = nix.Utils.transposeArray(data);
         end
 
@@ -137,7 +137,7 @@
 
         function r = hasPositions(obj)
             fname = strcat(obj.alias, '::hasPositions');
-            r = nix_mx(fname, obj.nix_handle);
+            r = nix_mx(fname, obj.nixhandle);
         end
 
         function r = openPositions(obj)
@@ -159,7 +159,7 @@
         function [] = setExtents(obj, entity)
             if (isempty(entity))
                 fname = strcat(obj.alias, '::setNoneExtents');
-                nix_mx(fname, obj.nix_handle, 0);
+                nix_mx(fname, obj.nixhandle, 0);
             else
                 nix.Utils.addEntity(obj, 'setExtents', entity, 'nix.DataArray');
             end
diff --git a/+nix/NamedEntity.m b/+nix/NamedEntity.m
@@ -30,7 +30,7 @@
                 error(err);
             end
             fname = strcat(obj.alias, '::compare');
-            r = nix_mx(fname, obj.nix_handle, entity.nix_handle);
+            r = nix_mx(fname, obj.nixhandle, entity.nixhandle);
         end
     end
 
diff --git a/+nix/Property.m b/+nix/Property.m
@@ -30,7 +30,7 @@
 
         function r = get.values(obj)
             fname = strcat(obj.alias, '::values');
-            r = nix_mx(fname, obj.nix_handle);
+            r = nix_mx(fname, obj.nixhandle);
         end
 
         function [] = set.values(obj, val)
@@ -54,7 +54,7 @@
             end
 
             fname = strcat(obj.alias, '::updateValues');
-            nix_mx(fname, obj.nix_handle, values);
+            nix_mx(fname, obj.nixhandle, values);
         end
 
         function r = valueCount(obj)
@@ -63,7 +63,7 @@
 
         function [] = deleteValues(obj)
             fname = strcat(obj.alias, '::deleteValues');
-            nix_mx(fname, obj.nix_handle);
+            nix_mx(fname, obj.nixhandle);
         end
     end
 
diff --git a/+nix/RangeDimension.m b/+nix/RangeDimension.m
@@ -29,12 +29,12 @@
         function r = tickAt(obj, index)
             index = nix.Utils.handleIndex(index);
             fname = strcat(obj.alias, '::tickAt');
-            r = nix_mx(fname, obj.nix_handle, index);
+            r = nix_mx(fname, obj.nixhandle, index);
         end
 
         function r = indexOf(obj, position)
             fname = strcat(obj.alias, '::indexOf');
-            r = nix_mx(fname, obj.nix_handle, position);
+            r = nix_mx(fname, obj.nixhandle, position);
         end
 
         function r = axis(obj, count, startIndex)
@@ -45,7 +45,7 @@
             startIndex = nix.Utils.handleIndex(startIndex);
 
             fname = strcat(obj.alias, '::axis');
-            r = nix_mx(fname, obj.nix_handle, count, startIndex);
+            r = nix_mx(fname, obj.nixhandle, count, startIndex);
         end
     end
 
diff --git a/+nix/SampledDimension.m b/+nix/SampledDimension.m
diff --git a/+nix/Section.m b/+nix/Section.m
diff --git a/+nix/Source.m b/+nix/Source.m
diff --git a/+nix/Tag.m b/+nix/Tag.m
diff --git a/+nix/Utils.m b/+nix/Utils.m
