Merge pull request #2996 from Mailaender/magic-chrom-converter

Check for magic byte and file content when converting chromatograms

Author: eselmeister

chemclipse/plugins/org.eclipse.chemclipse.converter/src/org/eclipse/chemclipse/converter/chromatogram/AbstractChromatogramConverter.java

@@ -31,6 +31,7 @@
 import org.eclipse.chemclipse.model.core.IPeak;
 import org.eclipse.chemclipse.model.support.ChromatogramColumnSupport;
 import org.eclipse.chemclipse.processing.DataCategory;
+import org.eclipse.chemclipse.processing.converter.ISupplier;
 import org.eclipse.chemclipse.processing.core.IProcessingInfo;
 import org.eclipse.chemclipse.processing.core.IProcessingMessage;
 import org.eclipse.chemclipse.processing.core.ProcessingInfo;
@@ -172,6 +173,14 @@ public IProcessingInfo getChromatogram(File file, boolean overview, IProgressMon
 			List<String> availableConverterIds = converterSupport.getAvailableConverterIds(file);
 			exitloop:
 			for(String converterId : availableConverterIds) {
+				try {
+					ISupplier supplier = converterSupport.getSupplier(converterId);
+					if(!supplier.isMatchMagicNumber(file) || !supplier.isMatchContent(file)) {
+						continue;
+					}
+				} catch(NoConverterAvailableException e) {
+					continue;
+				}
 				/*
 				 * Do not use a safe runnable here, because a IChromatogram
 				 * object must be returned or null.