diff --git a/lib/licence/SpectralAnalysisLicence.jar b/lib/licence/SpectralAnalysisLicence.jar deleted file mode 100644 index 77adbc1..0000000 Binary files a/lib/licence/SpectralAnalysisLicence.jar and /dev/null differ diff --git a/lib/licence/public.key b/lib/licence/public.key deleted file mode 100644 index fcbc51c..0000000 Binary files a/lib/licence/public.key and /dev/null differ diff --git a/src/util/canUseJSpectralAnalysis.m b/src/util/canUseJSpectralAnalysis.m index 679a27a..dd21937 100644 --- a/src/util/canUseJSpectralAnalysis.m +++ b/src/util/canUseJSpectralAnalysis.m @@ -2,8 +2,7 @@ % Check if old versions of Java are used, and if so then we can't use the % fast methods in JSpectralAnalysis (uses Java 7) if(~isempty(strfind(version('-java'), '1.6')) || ... - ~isempty(strfind(version('-java'), '1.5')) || ... - ~isValidLicence()) + ~isempty(strfind(version('-java'), '1.5'))) can = false; else can = true; diff --git a/src/util/isValidLicence.m b/src/util/isValidLicence.m deleted file mode 100644 index 321ed22..0000000 --- a/src/util/isValidLicence.m +++ /dev/null @@ -1,43 +0,0 @@ -function valid = isValidLicence() - -valid = false; - -licenceJar = 'SpectralAnalysisLicence.jar'; - -found = checkJAROnPath(licenceJar); - -pathstr = getLibraryPath(); - -if(~found) - javaaddpath([pathstr 'licence' filesep licenceJar]); - - % Check that it has been added to the path now, and if not throw an - % exception - found = checkJAROnPath(licenceJar); - - if(~found) - exception = MException('addJARsToClassPath:FailedToAddJAR', ... - ['Failed to add JAR file ''' 'licence/' licenceJar ''', please ensure that it exists.']); - throw(exception); - end -end - -if(isdeployed()) - licenceFile = [ctfroot() filesep '..' filesep 'SpectralAnalysis.lic']; -else - licenceFile = [pathstr 'licence' filesep 'SpectralAnalysis.lic']; -end - -if(exist(licenceFile, 'file')) - fid = fopen(licenceFile, 'r'); - signature = fread(fid, Inf, '*char'); - fclose(fid); - - licenceCheck = com.alanmrace.spectralanalysislicence.EncryptLibrary([pathstr 'licence' filesep 'public.key']); - - if(licenceCheck.checkLicence(signature)) - valid = true; - end -end - -valid = true; \ No newline at end of file