You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2023/01/17 18:07:52 UTC
[sis] branch master updated (668c1d28b5 -> 7598ed90ea)
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git
from 668c1d28b5 Disable the use of FMA on the master branch for `MathTransform.transform(…)` methods. FMA stay enabled on the geoapi-4.0 development branch.
add 186c01efb9 Handle characters for the "File reference" column of EPSG database that are illegal according URI syntax.
add 0a621ef6cf Merge branch 'geoapi-4.0' into geoapi-3.1. It fixes a bug introduced by the replacement of `Path` by `URI` in coordinate operation parameters.
new 7598ed90ea Merge branch 'geoapi-3.1'.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../sis/referencing/factory/sql/EPSGDataAccess.java | 13 +++++++++----
.../apache/sis/util/resources/IndexedResourceBundle.java | 15 +++++++++------
2 files changed, 18 insertions(+), 10 deletions(-)
[sis] 01/01: Merge branch 'geoapi-3.1'.
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 7598ed90ea75f420a113eaf91339e8dfd8c12e8c
Merge: 668c1d28b5 0a621ef6cf
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Tue Jan 17 19:02:48 2023 +0100
Merge branch 'geoapi-3.1'.
.../sis/referencing/factory/sql/EPSGDataAccess.java | 13 +++++++++----
.../apache/sis/util/resources/IndexedResourceBundle.java | 15 +++++++++------
2 files changed, 18 insertions(+), 10 deletions(-)
diff --cc core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
index 90d48cc466,03c87279d1..75aa31a119
--- a/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
@@@ -423,16 -425,12 +424,12 @@@ public class IndexedResourceBundle exte
text = ((InternationalString) element).toString(getLocale());
}
replacement = CharSequences.shortSentence(text, MAX_STRING_LENGTH);
- } else if (element instanceof Throwable) {
- String message = Exceptions.getLocalizedMessage((Throwable) element, getLocale());
- if (message == null) {
- message = Classes.getShortClassName(element);
- }
- replacement = message;
+ } else if (element instanceof URI) {
+ replacement = ((URI) element).getPath(); // For decoding encoded characters.
} else if (element instanceof Class<?>) {
replacement = Classes.getShortName(getPublicType((Class<?>) element));
- } else if (element instanceof ControlledVocabulary) {
- replacement = MetadataServices.getInstance().getCodeTitle((ControlledVocabulary) element, getLocale());
+ } else if (element instanceof CodeList<?>) {
+ replacement = MetadataServices.getInstance().getCodeTitle((CodeList<?>) element, getLocale());
} else if (element instanceof Range<?>) {
final Range<?> range = (Range<?>) element;
replacement = new RangeFormat(getLocale(), range.getElementType()).format(range);