Bugfix on MSFragger version comparsion

Nesvilab · Sep 6, 2019 · 7396056 · 7396056
1 parent 0807d86
commit 7396056
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/MSFragger-GUI/src/umich/msfragger/gui/MsfraggerGuiFrame.java b/MSFragger-GUI/src/umich/msfragger/gui/MsfraggerGuiFrame.java
@@ -2920,6 +2920,7 @@ private boolean validateAndSaveMsfraggerPath(final String path) {
   private boolean validateMsfraggerJavaVersion() {
     final boolean javaAtLeast18 = SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_8);
     final VersionComparator vc = new VersionComparator();
+    final MsfraggerVersionComparator mvc = new MsfraggerVersionComparator();
     SwingUtilities.invokeLater(() -> {
       BalloonTip tip = tipMap.remove(TIP_NAME_FRAGGER_JAVA_VER);
       if (tip != null) {
@@ -2936,7 +2937,7 @@ private boolean validateMsfraggerJavaVersion() {
         final String fver = fraggerVer != null ? fraggerVer
             : MsfraggerProps.testJar(textBinMsfragger.getText()).version;
         if (jver != null && fver != null) {
-          if (vc.compare(fver, "20180316") < 0 && vc.compare(jver, "1.9") >= 0) {
+          if (mvc.compare(fver, "20180316") < 0 && vc.compare(jver, "1.9") >= 0) {
             tip = new BalloonTip(lblFraggerJavaVer, "<html>Looks like you're "
                 + "running Java 9 or higher with MSFragger v20180316 or lower.<br/>"
                 + "That version of MSFragger only supports Java 8.\n");

diff --git a/MSFragger-GUI/src/umich/msfragger/params/fragger/MsfraggerVersionComparator.java b/MSFragger-GUI/src/umich/msfragger/params/fragger/MsfraggerVersionComparator.java
@@ -26,12 +26,12 @@ public static boolean isNewScheme(String ver) {
   public int compare(String v1, String v2) {
     boolean isV1old = isOldScheme(v1);
     boolean isV1new = isNewScheme(v1);
-    if (isV1new == isV1old) {
+    if (isV1new && isV1old) {
       log.error("v1 was determined to be both old and new scheme, something is wrong");
     }
     boolean isV2old = isOldScheme(v2);
     boolean isV2new = isNewScheme(v2);
-    if (isV2new == isV2old) {
+    if (isV2new && isV2old) {
       log.error("v2 was determined to be both old and new scheme, something is wrong");
     }
     if (isV1old && isV2new) {