[matlab] Add and use generic findXXX function

Author: mpsonntag

+nix/Block.m

@@ -191,21 +191,8 @@
 
         % maxdepth is an index
         function sec = find_filtered_sources(obj, max_depth, filter, val)
-            if (~isnumeric(max_depth))
-                error('Provide a valid search depth');
-            end
-
-            valid = nix.Utils.valid_filter(filter, val);
-            if(~isempty(valid))
-                error(valid);
-            end
-
-            ret = nix_mx('Block::findSources', obj.nix_handle, ...
-                                            max_depth, uint8(filter), val);
-            sec = cell(length(ret), 1);
-            for i = 1:length(ret)
-                sec{i} = nix.Source(ret{i});
-            end;
+            sec = nix.Utils.find(obj, ...
+                max_depth, filter, val, 'Block::findSources', @nix.Source);
         end
 
         % -----------------
@@ -289,6 +276,6 @@
             filtered = nix.Utils.filter(obj, filter, val, ...
                 'Block::multiTagsFiltered', @nix.MultiTag);
         end
+    end
 
-    end;
 end

+nix/File.m

@@ -120,21 +120,8 @@
 
         % maxdepth is an index
         function sec = find_filtered_sections(obj, max_depth, filter, val)
-            if (~isnumeric(max_depth))
-                error('Provide a valid search depth');
-            end
-
-            valid = nix.Utils.valid_filter(filter, val);
-            if(~isempty(valid))
-                error(valid);
-            end
-
-            ret = nix_mx('File::findSections', obj.nix_handle, ...
-                                            max_depth, uint8(filter), val);
-            sec = cell(length(ret), 1);
-            for i = 1:length(ret)
-                sec{i} = nix.Section(ret{i});
-            end;
+            sec = nix.Utils.find(obj, ...
+                max_depth, filter, val, 'File::findSections', @nix.Section);
         end
     end
 

+nix/Section.m

@@ -123,21 +123,8 @@
 
         % maxdepth is an index
         function sec = find_filtered_sections(obj, max_depth, filter, val)
-            if (~isnumeric(max_depth))
-                error('Provide a valid search depth');
-            end
-
-            valid = nix.Utils.valid_filter(filter, val);
-            if(~isempty(valid))
-                error(valid);
-            end
-
-            ret = nix_mx('Section::findSections', obj.nix_handle, ...
-                                            max_depth, uint8(filter), val);
-            sec = cell(length(ret), 1);
-            for i = 1:length(ret)
-                sec{i} = nix.Section(ret{i});
-            end;
+            sec = nix.Utils.find(obj, ...
+                max_depth, filter, val, 'Section::findSections', @nix.Section);
         end
 
         % ----------------

+nix/Source.m

@@ -88,21 +88,8 @@
         % maxdepth is an index where idx = 0 corresponds to the calling
         % source
         function sec = find_filtered_sources(obj, max_depth, filter, val)
-            if (~isnumeric(max_depth))
-                error('Provide a valid search depth');
-            end
-
-            valid = nix.Utils.valid_filter(filter, val);
-            if(~isempty(valid))
-                error(valid);
-            end
-
-            ret = nix_mx('Source::findSources', obj.nix_handle, ...
-                                            max_depth, uint8(filter), val);
-            sec = cell(length(ret), 1);
-            for i = 1:length(ret)
-                sec{i} = nix.Source(ret{i});
-            end;
+            sec = nix.Utils.find(obj, ...
+                max_depth, filter, val, 'Source::findSources', @nix.Source);
         end
     end;
 end

+nix/Utils.m

@@ -114,5 +114,29 @@
             end;
         end
 
+        % -----------------------------------------------------------
+        % findXXX helper functions
+        % -----------------------------------------------------------
+
+        function currData = find(obj, max_depth, filter, val, ...
+                                                mxMethod, objConstructor)
+            if (~isnumeric(max_depth))
+                error('Provide a valid search depth');
+            end
+
+            valid = nix.Utils.valid_filter(filter, val);
+            if(~isempty(valid))
+                error(valid);
+            end
+
+            currList = nix_mx(mxMethod, ...
+                            obj.nix_handle, max_depth, uint8(filter), val);
+
+            currData = cell(length(currList), 1);
+            for i = 1:length(currList)
+                currData{i} = objConstructor(currList{i});
+            end;
+        end
+
     end;
 end