POI path related refactoring

Author: Eric Fields

Ftest2xls.m

@@ -14,7 +14,7 @@
 % format_output  - A boolean specifying whether to apply formatting to the 
 %                  spreadsheet output. {default: true}
 %
-%VERSION DATE: 19 November 2017
+%VERSION DATE: 20 November 2017
 %AUTHOR: Eric Fields
 %
 %NOTE: This function is provided "as is" and any express or implied warranties 
@@ -61,9 +61,8 @@ function Ftest2xls(GND, test_id, output_fname, format_output)
                                  'This can delete global variables and create other problems.\n', ...
                                  'You can avoid this by running add_poi_path.']));
             end
-            for i = 1:length(missing_poi_files)
-                javaaddpath(missing_poi_files{i});
-            end
+            %Add each .jar file to the dynamic path
+            add_poi_path('-dynamic');
         end
         writexls = @xlwrite;
     end

add_poi_path.m

@@ -3,7 +3,11 @@
 %EXAMPLE USAGE
 % >> add_poi_path
 %
-%VERSION DATE: 19 November 2017
+%INPUT
+% segment - if '-static', add POI library .jar files to the static path; if
+%           '-dynamic', add to the dynamic path.
+%
+%VERSION DATE: 20 November 2017
 %AUTHOR: Eric Fields
 %
 %NOTE: This function is provided "as is" and any express or implied warranties 
@@ -13,14 +17,23 @@
 %All rights reserved.
 %This code is free and open source software made available under the 3-clause BSD license.
 
-function add_poi_path()
+function add_poi_path(segment)
+    
+    %Default to updating static path
+    if ~nargin
+        segment = '-static';
+    end
 
     %Get full path for POI .jar files not on static Java class path
     [~, missing_poi_files] = get_poi_paths();
+    
+    %Nothing to do if all files are on static path
+    if isempty(missing_poi_files)
+        return;
+    end
+    
+    if strcmpi(segment, '-static')
 
-    %Append POI locations that are not already on the static Java class
-    %path
-    if ~isempty(missing_poi_files)
         %Full path for javaclasspath file
         static_file = [prefdir filesep 'javaclasspath.txt'];
         %Append missing POI files to javaclasspath.txt file
@@ -29,6 +42,21 @@ function add_poi_path()
             fprintf(f_out, '%s\n', missing_poi_files{i});
         end
         fclose(f_out);
+    
+        %POI files will not actually be added to the Java class path until
+        %MATLAB is restarted
+        msgbox('Close and restart MATLAB to finish adding the Apache POI library to the Java class path.')
+        
+    elseif strcmpi(segment, '-dynamic')
+        
+        %Add any file no on the static or dynamic path to the dynamic path
+        for i = 1:length(missing_poi_files)
+            jar_file = missing_poi_files{i};
+            if ~ismember(jar_file, javaclasspath('-dynamic'))
+                javaaddpath(jar_file);
+            end
+        end
+        
     end
 
 end

get_poi_paths.m

@@ -9,7 +9,7 @@
 % missing_poi_files  - Full paths for .jar files in the Apache POI library
 %                      that are not on the static Java class path
 %
-%VERSION DATE: 19 November 2017
+%VERSION DATE: 20 November 2017
 %AUTHOR: Eric Fields
 %
 %NOTE: This function is provided "as is" and any express or implied warranties 
@@ -20,14 +20,17 @@
 %This code is free and open source software made available under the 3-clause BSD license.
 
 function [poi_files, missing_poi_files] = get_poi_paths()
-
-    poi_files = {fullfile(fileparts(which('get_poi_paths')), 'poi_library/poi-3.8-20120326.jar')
-                 fullfile(fileparts(which('get_poi_paths')), 'poi_library/poi-ooxml-3.8-20120326.jar')
-                 fullfile(fileparts(which('get_poi_paths')), 'poi_library/poi-ooxml-schemas-3.8-20120326.jar')
-                 fullfile(fileparts(which('get_poi_paths')), 'poi_library/xmlbeans-2.3.0.jar')
-                 fullfile(fileparts(which('get_poi_paths')), 'poi_library/dom4j-1.6.1.jar')
-                 fullfile(fileparts(which('get_poi_paths')), 'poi_library/stax-api-1.0.1.jar')};
-             
-     missing_poi_files = poi_files(~ismember(poi_files, javaclasspath('-static')));
+    
+    %Find directory with POI library
+	poi_dir = fullfile(fileparts(which('get_poi_paths')), 'poi_library');
+    
+    %Find all .jar files within directory
+    poi_files = dir(poi_dir);
+    poi_files = {poi_files.name};
+    poi_files = poi_files(cell2mat(cellfun(@(x) ~isempty(strfind(x, '.jar')), poi_files, 'UniformOutput', false))); %#ok<STREMP>
+    poi_files = cellfun(@(x) [poi_dir filesep x], poi_files, 'UniformOutput', false);
+    
+    %Find which .jar files (if any) are not on the static Java class path
+    missing_poi_files = poi_files(~ismember(poi_files, javaclasspath('-static')));
 
 end

ttest2xls.m

@@ -14,7 +14,7 @@
 % format_output  - A boolean specifying whether to apply formatting to the 
 %                  spreadsheet output. {default: true}
 %
-%VERSION DATE: 19 November 2017
+%VERSION DATE: 20 November 2017
 %AUTHOR: Eric Fields
 %
 %NOTE: This function is provided "as is" and any express or implied warranties 
@@ -60,9 +60,8 @@ function ttest2xls(GND, test_id, output_fname, format_output)
                                  'This can delete global variables and create other problems.\n', ...
                                  'You can avoid this by running add_poi_path.']));
             end
-            for i = 1:length(missing_poi_files)
-                javaaddpath(missing_poi_files{i});
-            end
+            %Add each .jar file to the dynamic path
+            add_poi_path('-dynamic');
         end
         writexls = @xlwrite;
     end