diff --git a/src/main/java/uk/ac/ebi/pride/gui/task/FileScanAndValidationTask.java b/src/main/java/uk/ac/ebi/pride/gui/task/FileScanAndValidationTask.java index 2e0cfd7a..46eca419 100755 --- a/src/main/java/uk/ac/ebi/pride/gui/task/FileScanAndValidationTask.java +++ b/src/main/java/uk/ac/ebi/pride/gui/task/FileScanAndValidationTask.java @@ -46,7 +46,8 @@ public class FileScanAndValidationTask extends TaskAdapter]*location=\"([^\"]+)\"[^>]*>.*$"); public static final String MZIDENTML_PEAK_LIST_FILE_END = ""; public static final String PRIDEXML_SAMPLE_DESCRIPTION_BEGIN = " runMzIdentMLVersionValidation(List dataFiles) t boolean correctVersion = false; for (int i = 0; i < 5; i++) { String line = fileReader.readLine(); - if (line.contains("version=\"" + MZIDENTML_ACCEPTED_VERSION + "\"")) { + if (line.contains("version=\"" + MZIDENTML_ACCEPTED_VERSION_1_1_0 + "\"") || line.contains("version=\"" + MZIDENTML_ACCEPTED_VERSION_1_2_0 + "\"")) { correctVersion = true; break; } diff --git a/src/main/java/uk/ac/ebi/pride/gui/util/WarningMessageGenerator.java b/src/main/java/uk/ac/ebi/pride/gui/util/WarningMessageGenerator.java index bcb5cffb..46479dcc 100644 --- a/src/main/java/uk/ac/ebi/pride/gui/util/WarningMessageGenerator.java +++ b/src/main/java/uk/ac/ebi/pride/gui/util/WarningMessageGenerator.java @@ -46,7 +46,7 @@ public static String getMultipleResultFileFormatWarning(String formatA, String f public static String getInvalidMzIdentMLVersionWarning(List mzIdentMLFiles) { StringBuilder errMsg = new StringBuilder(); errMsg.append(""); - errMsg.append("The following mzIdentML are not version 1.1.0
"); + errMsg.append("The following mzIdentML are not version 1.1.0 or 1.2.0
"); for (DataFile mzIdentMLFile : mzIdentMLFiles) { errMsg.append("
  • "); errMsg.append(mzIdentMLFile.getFile().getName());