sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1.
Date Thu, 09 May 2019 10:36:38 GMT
This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 3ae456abe8e39d64a30d15c5fd4b925c97f704fc
Merge: 6944f6c bcc2b5a
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Thu May 9 12:27:03 2019 +0200

    Merge branch 'geoapi-4.0' into geoapi-3.1.

 .../sis/internal/jaxb/lan/LocaleAdapter.java       |   2 +-
 .../sis/internal/jaxb/lan/LocaleAndCharset.java    |  12 ++-
 .../apache/sis/internal/jaxb/lan/OtherLocales.java |   3 +
 .../apache/sis/internal/jaxb/lan/PT_Locale.java    |  23 +++--
 .../{ => legacy}/LegacyPropertyAdapter.java        |   2 +-
 .../sis/internal/metadata/legacy/package-info.java |   9 +-
 .../iso/DefaultExtendedElementInformation.java     |   2 +-
 .../apache/sis/metadata/iso/DefaultMetadata.java   |   2 +-
 .../sis/metadata/iso/MetadataScopeAdapter.java     |   2 +-
 .../sis/metadata/iso/citation/DefaultContact.java  |   2 +-
 .../iso/citation/DefaultResponsibleParty.java      |   2 +-
 .../metadata/iso/citation/LegacyTelephones.java    |   2 +-
 .../iso/content/DefaultCoverageDescription.java    |   2 +-
 .../DefaultFeatureCatalogueDescription.java        |   2 +-
 .../DefaultDigitalTransferOptions.java             |   2 +-
 .../metadata/iso/distribution/DefaultFormat.java   |   2 +-
 .../metadata/iso/distribution/DefaultMedium.java   |   2 +-
 .../iso/identification/AbstractIdentification.java |   2 +-
 .../identification/DefaultDataIdentification.java  |   2 +-
 .../maintenance/DefaultMaintenanceInformation.java |   2 +-
 .../sis/metadata/iso/quality/DefaultScope.java     |   2 +-
 .../java/org/apache/sis/image/DefaultIterator.java |  95 ++++++++++++-------
 .../java/org/apache/sis/image/LinearIterator.java  |  89 ++++++++++++------
 .../java/org/apache/sis/image/PixelIterator.java   |  10 ++
 .../org/apache/sis/image/DefaultIteratorTest.java  |  89 +++++++++++++-----
 .../org/apache/sis/image/LinearIteratorTest.java   |  25 +++--
 .../org/apache/sis/internal/util/AbstractMap.java  |   3 +-
 .../java/org/apache/sis/internal/util/Bag.java     | 104 +++++++++++++++++++++
 .../main/java/org/apache/sis/util/ArraysExt.java   |   8 +-
 .../java/org/apache/sis/internal/util/BagTest.java |  80 ++++++++++++++++
 .../apache/sis/test/suite/UtilityTestSuite.java    |   1 +
 31 files changed, 458 insertions(+), 127 deletions(-)

diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
index 8d8166c,f3de62b..a3b3317
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
@@@ -37,11 -35,11 +37,11 @@@ import org.apache.sis.internal.jaxb.gco
  import org.apache.sis.internal.jaxb.FilterByVersion;
  import org.apache.sis.internal.jaxb.metadata.CI_Citation;
  import org.apache.sis.internal.jaxb.metadata.MD_Identifier;
 -import org.apache.sis.internal.metadata.legacy.MediumName;
  import org.apache.sis.internal.metadata.Dependencies;
- import org.apache.sis.internal.metadata.LegacyPropertyAdapter;
+ import org.apache.sis.internal.metadata.legacy.LegacyPropertyAdapter;
  import org.apache.sis.internal.xml.LegacyNamespaces;
  import org.apache.sis.internal.util.CollectionsExt;
 +import org.apache.sis.internal.util.CodeLists;
  
  import static org.apache.sis.internal.metadata.MetadataUtilities.ensurePositive;
  


Mime
View raw message