From 3512bd142dcc40d3003666bc50c0968478c6ed51 Mon Sep 17 00:00:00 2001 From: Damien Goutte-Gattat Date: Wed, 15 Feb 2023 12:16:05 +0000 Subject: [PATCH 1/4] Bump version number to 5.6.1. --- pom.xml | 2 +- protege-common/pom.xml | 2 +- protege-desktop/pom.xml | 2 +- protege-editor-core/pom.xml | 2 +- protege-editor-owl/pom.xml | 2 +- protege-launcher/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index eb183bd7d..3d01bf8af 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ edu.stanford.protege protege-parent - 5.6.0 + 5.6.1 pom protege-parent diff --git a/protege-common/pom.xml b/protege-common/pom.xml index 3c38d2d52..7a65ce848 100644 --- a/protege-common/pom.xml +++ b/protege-common/pom.xml @@ -5,7 +5,7 @@ edu.stanford.protege protege-parent - 5.6.0 + 5.6.1 ../ diff --git a/protege-desktop/pom.xml b/protege-desktop/pom.xml index 39e3bb05e..d2bd5afd6 100644 --- a/protege-desktop/pom.xml +++ b/protege-desktop/pom.xml @@ -4,7 +4,7 @@ edu.stanford.protege protege-parent - 5.6.0 + 5.6.1 ../ diff --git a/protege-editor-core/pom.xml b/protege-editor-core/pom.xml index b3346aa45..a31a4bb9d 100644 --- a/protege-editor-core/pom.xml +++ b/protege-editor-core/pom.xml @@ -5,7 +5,7 @@ edu.stanford.protege protege-parent - 5.6.0 + 5.6.1 ../ diff --git a/protege-editor-owl/pom.xml b/protege-editor-owl/pom.xml index 41b7222ab..f3ba042f5 100644 --- a/protege-editor-owl/pom.xml +++ b/protege-editor-owl/pom.xml @@ -5,7 +5,7 @@ edu.stanford.protege protege-parent - 5.6.0 + 5.6.1 ../ diff --git a/protege-launcher/pom.xml b/protege-launcher/pom.xml index 38a9a8df5..a50c797bb 100644 --- a/protege-launcher/pom.xml +++ b/protege-launcher/pom.xml @@ -5,7 +5,7 @@ edu.stanford.protege protege-parent - 5.6.0 + 5.6.1 ../ From f76bdabc09cebc3cff1e2f9b30d0ee5a4b8689c9 Mon Sep 17 00:00:00 2001 From: Damien Goutte-Gattat Date: Wed, 15 Feb 2023 12:10:19 +0000 Subject: [PATCH 2/4] Update the macOS launcher. Use a rebuilt macOS launcher with a lowered minimal macOS version requirement. The new launcher can work on macOS down to version 10.12 (for x86_64 only; the arm64 version still requires 11.0 at a minimum). closes #1101 --- .../src/main/env/os-x/MacOS/protege | Bin 86392 -> 88840 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/protege-desktop/src/main/env/os-x/MacOS/protege b/protege-desktop/src/main/env/os-x/MacOS/protege index f23569225edf1781a98e8b7eb3d17db469bd3103..cfcba92d1bae5532a244922700dc6249b638023a 100755 GIT binary patch delta 8014 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 J!g)U*{BIHGS)Bj? delta 2464 zcmeH}e^8Tk9LK-UGlm>0Y`|nNkYxgcA#O4@K%fnOFpU5MbWYS=qV3cSZ7HR-#ef6B z626^cd5Qh-$~&*anbg@2^7^4!VszfAStr(Y^Xj^;PLH!6>;3ssUDqF7dHvb<_I`a| zpYQX0pXb@0?fb0rxN`hip*JyyxQkR4QcxDpyFO^2_|m zRt|VX^x$~Jx5?RE)=e9B751PDk6;>x`o+ExUyO5C z!?^jz*D8!P8M!-4C$Bd0ZCTBU=X2?35uY;rkea5KeVEH{W)(;yJU=^G&d%kP**hg8 zAI&b6qqSURcv|jC=0^-0b#=HxXZvZN)!7x}>{eEZav0|?F@!8RW?45WYhnlY#12f9 zw8OWVp@7jLNptzhybaPwD1X)`vixH_SD23J?uy5xZZ+OoRo9KM4j*5527nV7L!+jE zLheiF^_I1=F`b{VER#pmcv9hGa!nfFTNsc(((x2)x8&k4SZ$J?e`YP0#(0{oUh3hS zZE5ndRQ`mm*l)poi)2~_iv&vqO9jgX?Sd78^92_QIt3RCRtZ)M)(YM&STDF#&?V>= zY!qDO7oA7&9>FHTb%I{O^@1A(HwiWiZV~heZWU}1d{}UY;G=>8!B)XG!4APrt)H=~ zUFp539CeY*Vtlx}y$*b%uYDDXM7%4>E|YB}8zpNaJ4Mz<_9oduvSVZ~lN}~|i)?`G zEZH8i%Va%dVY1dp#2@iqCvBlY8NZ`zo5<8;O=Q!_++=xVwPYn^3&|?UO39Xz%^_P$ zW+3yEO(%PfEQ#!GvRJYUWEG4wOnT!N*iU5Nkg4(ezIK&NPj-Q9HrZLSakW2k$Ov2p<#zTuGe0>$1cT6^M)qdrJy2a=A!DF`3tO;y^qh6 zUgN9lPfB0#84U&MD0V6+Va*7GqVZJ?+YGT2YZncDi8IEbZgxzpSl6kZ%-As1{JzG1 zCDvjrYOyQtBnvx2?v+-BKNVATNE(ukOh+;hJ#rf|1GycUiDV-9UH-A!V7Xv<$Sfou znT?nbGcpG$KrBchVnu975mJoIMM@d-voc6IatC5ZaJj4knTO0r79b0eN(8G9D?yyd ze{FA*=2ZlUV zl0NGHyM3$Q(|>oje^%fdee?4v!+7*#=@frK(6J uX~?@=@<{rEcWd^I9ZZ~hF=M}Ff7~lQmojP=?aV#%Udq5}`wxxo&A$Rdw>yjg From 91b9cdf8153dccc71a50bff91399533ddc3406c8 Mon Sep 17 00:00:00 2001 From: Damien Goutte-Gattat Date: Wed, 15 Feb 2023 12:07:33 +0000 Subject: [PATCH 3/4] Update OWL API to version 4.5.25. This new version of OWL API fixes some issues with the OBO serialisation. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3d01bf8af..9c6d02bee 100644 --- a/pom.xml +++ b/pom.xml @@ -138,7 +138,7 @@ net.sourceforge.owlapi owlapi-osgidistribution - 4.5.24 + 4.5.25 From 2b05ef27b2fc566fab320822198be26b8067f376 Mon Sep 17 00:00:00 2001 From: Damien Goutte-Gattat Date: Wed, 15 Feb 2023 15:25:38 +0000 Subject: [PATCH 4/4] Do not override user-provided extension. When saving a file under a user-provided name, we check the name for any extension. If there is no extension or if the extension is not one of the allowed extensions for the chosen file format, we forcibly append an allowed extension to the filename. This commit updates this behaviour to append an extension only in the case where there is no extension. If the user-provided filename already has an extension, we keep it as it is even if we don't recognize the extension. closes #1087. --- .../src/main/java/org/protege/editor/owl/OWLEditorKit.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/protege-editor-owl/src/main/java/org/protege/editor/owl/OWLEditorKit.java b/protege-editor-owl/src/main/java/org/protege/editor/owl/OWLEditorKit.java index 2f0c7980f..b71497cdb 100644 --- a/protege-editor-owl/src/main/java/org/protege/editor/owl/OWLEditorKit.java +++ b/protege-editor-owl/src/main/java/org/protege/editor/owl/OWLEditorKit.java @@ -389,9 +389,6 @@ private File getSaveAsOWLFile(@Nonnull OWLOntology ont, @Nonnull OWLDocumentForm if (extensionIndex == -1) { file = new File(file.toString() + extensions.get(0)); } - else if (! extensions.contains(file.toString().substring(extensionIndex))) { - file = new File(file.toString() + extensions.get(0)); - } } return file; }