From 11cba2331a5432de08131cf8fe5c2e3173bf8dfc Mon Sep 17 00:00:00 2001 From: Rene Meier Date: Tue, 4 Jun 2024 14:24:42 +0200 Subject: [PATCH 1/3] Bumped version number to 2.2.8-SNAPSHOT --- MassBank-Project/MassBank-lib/pom.xml | 2 +- MassBank-Project/MassBank-web/pom.xml | 2 +- MassBank-Project/pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MassBank-Project/MassBank-lib/pom.xml b/MassBank-Project/MassBank-lib/pom.xml index a06914f3..d88ccbdb 100644 --- a/MassBank-Project/MassBank-lib/pom.xml +++ b/MassBank-Project/MassBank-lib/pom.xml @@ -5,7 +5,7 @@ MassBank-Project de.ipb-halle.msbi - 2.2.7 + 2.2.8-SNAPSHOT MassBank-lib diff --git a/MassBank-Project/MassBank-web/pom.xml b/MassBank-Project/MassBank-web/pom.xml index 7d8750d1..190c86ba 100644 --- a/MassBank-Project/MassBank-web/pom.xml +++ b/MassBank-Project/MassBank-web/pom.xml @@ -3,7 +3,7 @@ MassBank-Project de.ipb-halle.msbi - 2.2.7 + 2.2.8-SNAPSHOT MassBank-web diff --git a/MassBank-Project/pom.xml b/MassBank-Project/pom.xml index 5a8c529d..2d1ff498 100644 --- a/MassBank-Project/pom.xml +++ b/MassBank-Project/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.ipb-halle.msbi MassBank-Project - 2.2.7 + 2.2.8-SNAPSHOT MassBank-Project https://github.com/MassBank/MassBank-web pom @@ -29,7 +29,7 @@ UTF-8 ${project.version} - 2024-06-04T14:10:11+02:00 + 2024-06-04T14:24:26+02:00 From 02c3807aafc8c391f875c51702fee2b1e6e9a3e4 Mon Sep 17 00:00:00 2001 From: Rene Meier Date: Tue, 11 Jun 2024 12:20:40 +0200 Subject: [PATCH 2/3] Fix bug in ListComparator --- .../MassBank-lib/src/main/java/massbank/ResultList.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MassBank-Project/MassBank-lib/src/main/java/massbank/ResultList.java b/MassBank-Project/MassBank-lib/src/main/java/massbank/ResultList.java index 0a82d99d..7ed0877a 100644 --- a/MassBank-Project/MassBank-lib/src/main/java/massbank/ResultList.java +++ b/MassBank-Project/MassBank-lib/src/main/java/massbank/ResultList.java @@ -312,7 +312,7 @@ public int compare(Object o1, Object o2){ // ソート処理 switch (sortKey) { case SORT_KEY_NAME: { // Nameソート - if (!e1.getSortName().equals(e2.getSortName())) { + if (!e1.getSortName().equalsIgnoreCase(e2.getSortName())) { switch (sortAction) { case SORT_ACTION_ASC: ret = (e1.getSortName()).compareToIgnoreCase(e2.getSortName()); From 88f58e0cefb104de6e593e5e12ad16fde0d583b0 Mon Sep 17 00:00:00 2001 From: Rene Meier Date: Thu, 20 Jun 2024 10:49:38 +0200 Subject: [PATCH 3/3] Bumped version number to 2.2.7-hotfix1 --- MassBank-Project/MassBank-lib/pom.xml | 2 +- MassBank-Project/MassBank-web/pom.xml | 2 +- MassBank-Project/pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MassBank-Project/MassBank-lib/pom.xml b/MassBank-Project/MassBank-lib/pom.xml index d88ccbdb..cec8e5cb 100644 --- a/MassBank-Project/MassBank-lib/pom.xml +++ b/MassBank-Project/MassBank-lib/pom.xml @@ -5,7 +5,7 @@ MassBank-Project de.ipb-halle.msbi - 2.2.8-SNAPSHOT + 2.2.7-hotfix1 MassBank-lib diff --git a/MassBank-Project/MassBank-web/pom.xml b/MassBank-Project/MassBank-web/pom.xml index 190c86ba..0a0f291f 100644 --- a/MassBank-Project/MassBank-web/pom.xml +++ b/MassBank-Project/MassBank-web/pom.xml @@ -3,7 +3,7 @@ MassBank-Project de.ipb-halle.msbi - 2.2.8-SNAPSHOT + 2.2.7-hotfix1 MassBank-web diff --git a/MassBank-Project/pom.xml b/MassBank-Project/pom.xml index 2d1ff498..4af0201d 100644 --- a/MassBank-Project/pom.xml +++ b/MassBank-Project/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.ipb-halle.msbi MassBank-Project - 2.2.8-SNAPSHOT + 2.2.7-hotfix1 MassBank-Project https://github.com/MassBank/MassBank-web pom @@ -29,7 +29,7 @@ UTF-8 ${project.version} - 2024-06-04T14:24:26+02:00 + 2024-06-20T10:49:13+02:00