conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
// Related to JDK7
import org.apache.sis.internal.jdk7.Objects;
=======
// Branch-dependent imports
import java.util.Objects;
>>>>>>>
// Branch-dependent imports
import org.apache.sis.internal.jdk7.Objects; |
<<<<<<<
String workspaceId = getWorkspaceId(request);
ModelUserContext modelUserContext = userRepository.getModelUserContext(authorizations, workspaceId);
=======
String workspaceId = getActiveWorkspaceId(request);
ModelUserContext modelUserContext = this.userProvider.getModelUserConte... |
<<<<<<<
if (name.equals(XML.GML_VERSION)) {
gmlVersion = (value instanceof CharSequence) ? new Version(value.toString()) : (Version) value;
=======
case XML.GML_VERSION: {
versionGML = (value instanceof CharSequence) ? new Version(value.toString(... |
<<<<<<<
@SuppressWarnings("null")
Collection<ReferenceIdentifier> identifiers = object.getIdentifiers();
=======
Collection<? extends Identifier> identifiers = object.getIdentifiers();
>>>>>>>
Collection<ReferenceIdentifier> identifiers = object.getIdentifiers(); |
<<<<<<<
=======
import java.util.LinkedHashMap;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import org.opengis.parameter.ParameterDirection;
>>>>>>>
import java.util.LinkedHashMap;
import javax.xml.bind.annotation.XmlType;
im... |
<<<<<<<
import java.util.Objects;
import org.apache.sis.internal.jdk8.LongConsumer;
import org.apache.sis.internal.jdk8.DoubleConsumer;
=======
import java.util.function.LongConsumer;
import java.util.function.DoubleConsumer;
>>>>>>>
import org.apache.sis.internal.jdk8.LongConsumer;
import org.apache.sis.internal.jd... |
<<<<<<<
* @param object The metadata to copy values from, or {@code null} if none.
=======
* @param object the metadata to copy values from, or {@code null} if none.
*
* @see #castOrCopy(Organisation)
>>>>>>>
* @param object the metadata to copy values from, or {@code null} if none.
<<<... |
<<<<<<<
import org.apache.sis.internal.jdk7.Objects;
import org.apache.sis.util.iso.DefaultNameFactory;
=======
import java.util.Objects;
>>>>>>>
import org.apache.sis.internal.jdk7.Objects; |
<<<<<<<
=======
* Returns a SIS datum implementation with the same values than the given arbitrary implementation.
* If the given object is {@code null}, then this method returns {@code null}.
* Otherwise if the given object is already a SIS implementation, then the given object is returned unchanged.
... |
<<<<<<<
* @version 1.0
=======
* @version 1.1
*
* @see org.opengis.metadata.content.SampleDimension
*
>>>>>>>
* @version 1.1 |
<<<<<<<
final GenericName name = type.getName();
if (name.equals(creating.getName())) {
type = creating; // This is the most common case.
} else {
/*
* The feature that we need to resolve is not the one we just created. Maybe we can fi... |
<<<<<<<
* Methods inherited from the {@link Citation} interface which are not of interest to this
* {@code SimpleCitation} implementation.
*
* @return an empty list.
*/
@Override public Collection<? extends InternationalString> getAlternateTitles() {return Collections.emptyList();}... |
<<<<<<<
final Map<String,Object> properties = new HashMap<String,Object>(6);
properties.put(ParameterDescriptor.NAME_KEY, first(wkt.getAlias()));
properties.put(ParameterDescriptor.ALIAS_KEY, wkt.getName());
=======
final Map<String,Object> properties = new HashMap<>(6);
>>>>>>>
... |
<<<<<<<
// Branch-dependent imports
import org.apache.sis.internal.util.StandardDateFormat;
import org.apache.sis.referencing.cs.DefaultParametricCS;
import org.apache.sis.referencing.datum.DefaultParametricDatum;
=======
import static org.apache.sis.internal.metadata.NameToIdentifier.Simplifier.ESRI_DATUM_PREFIX;
... |
<<<<<<<
=======
import org.opengis.metadata.distribution.Medium;
import org.apache.sis.internal.util.Strings;
>>>>>>>
import org.apache.sis.internal.util.Strings; |
<<<<<<<
* <div class="warning"><b>Upcoming API change</b><br>
* {@code URI} may be replaced by {@link CharSequence} in GeoAPI 4.0.
* </div>
*
* @return Application schema as an ASCII file, or {@code null}.
=======
* @return application schema as an ASCII file, or {@code null}.
>>>>>>>
... |
<<<<<<<
* @return The attribute value (may be {@code null}).
* @throws IllegalStateException if this attribute contains more than one value.
=======
* @return the attribute value (may be {@code null}).
* @throws MultiValuedPropertyException if this attribute contains more than one value.
>>>>>>>
... |
<<<<<<<
import org.opengis.annotation.UML;
=======
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
>>>>>>>
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
<<<<<<<
/// @XmlElement(name = "boundMin")
@UML(identifier="boundMin", obligation=OPTIONAL, specification=ISO_19115)
=======
... |
<<<<<<<
public class ImmutableIdentifier extends FormattableObject implements ReferenceIdentifier, Deprecable, Serializable {
=======
public class ImmutableIdentifier extends FormattableObject implements Identifier, Serializable {
>>>>>>>
public class ImmutableIdentifier extends FormattableObject implements Referenc... |
<<<<<<<
=======
// Branch-dependent imports
import org.opengis.feature.Feature;
import org.opengis.feature.FeatureAssociationRole;
import org.opengis.feature.InvalidPropertyValueException;
>>>>>>>
<<<<<<<
* @param value The new value, or {@code null}.
* @throws IllegalArgumentException If the given feat... |
<<<<<<<
final AbstractIdentifiedType resultType; // Result of operation if applicable.
if (propertyType instanceof AbstractOperation) {
resultType = ((AbstractOperation) propertyType).getResult();
=======
final IdentifiedType resultType; // Res... |
<<<<<<<
=======
// Branch-dependent imports
import org.apache.sis.internal.jdk8.UncheckedIOException;
import org.opengis.feature.IdentifiedType;
import org.opengis.feature.Property;
import org.opengis.feature.PropertyType;
import org.opengis.feature.Attribute;
import org.opengis.feature.AttributeType;
import org.open... |
<<<<<<<
// Branch-specific imports
import org.opengis.annotation.UML;
import static org.opengis.annotation.Obligation.OPTIONAL;
import static org.opengis.annotation.Obligation.CONDITIONAL;
import static org.opengis.annotation.Specification.ISO_19115;
=======
import static org.apache.sis.internal.metadata.MetadataUti... |
<<<<<<<
Double value = getNumeric(columnLabel, new Function<String,Double>() {
@Override public Double apply(final String value) {
return Double.parseDouble(value);
}
});
wasNull = (value == null);
=======
Double value = getNumeric(columnLabel, D... |
<<<<<<<
} else if (r0 != null) {
if (r1 == null || !isAssignableIgnoreName(r0, r1)) {
return false;
}
}
=======
}
if (r0 instanceof PropertyType) {
... |
<<<<<<<
=======
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.opengis.metadata.content.Band;
import org.opengis.metadata.content.SampleDimension;
>>>>>>>
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.opengis.metadata.content.Band;
<<<<<<<
/// @XmlElement(name = ... |
<<<<<<<
=======
import com.altamiracorp.lumify.core.model.ontology.LabelName;
import com.altamiracorp.lumify.core.model.ontology.OntologyRepository;
import com.altamiracorp.lumify.core.model.textHighlighting.TermMentionOffsetItem;
>>>>>>>
import com.altamiracorp.lumify.core.model.ontology.LabelName;
import com.altam... |
<<<<<<<
return new NetcdfStore(new StorageConnector(IOTestCase.getResource(dataset)));
=======
return new NetcdfStore(null, new StorageConnector(IOTestCase.class.getResource(dataset)));
>>>>>>>
return new NetcdfStore(null, new StorageConnector(IOTestCase.getResource(dataset))); |
<<<<<<<
import org.apache.sis.feature.AbstractIdentifiedType;
import org.apache.sis.feature.DefaultFeatureType;
=======
import org.opengis.feature.FeatureType;
import org.opengis.feature.FeatureAssociationRole;
>>>>>>>
import org.apache.sis.feature.DefaultFeatureType;
<<<<<<<
final AbstractIdentifiedType create... |
<<<<<<<
CharacteristicTypeBuilder(final AttributeTypeBuilder<?> owner, final DefaultAttributeType<V> template) {
super(template, owner.getLocale());
=======
CharacteristicTypeBuilder(final AttributeTypeBuilder<?> owner, final AttributeType<V> template) {
super(owner.getLocale());
>>>>>>>
... |
<<<<<<<
@UML(identifier="levelOfDetail", obligation=CONDITIONAL, specification=ISO_19115)
=======
@Override
@XmlElement(name = "levelOfDetail")
@XmlJavaTypeAdapter(InternationalStringAdapter.Since2014.class)
>>>>>>>
@XmlElement(name = "levelOfDetail")
@XmlJavaTypeAdapter(InternationalStringAd... |
<<<<<<<
import org.apache.sis.internal.geoapi.evolution.UnsupportedCodeList;
// Branch-specific imports
import org.opengis.util.CodeList;
import org.opengis.annotation.UML;
import static org.opengis.annotation.Obligation.OPTIONAL;
import static org.opengis.annotation.Specification.ISO_19115;
=======
import org.apach... |
<<<<<<<
// Related to JDK7
import java.nio.channels.FileChannel;
=======
// Branch-dependent imports
import java.nio.channels.SeekableByteChannel;
>>>>>>>
// Branch-dependent imports
import java.nio.channels.FileChannel; |
<<<<<<<
final List<SingleCRS> expanded = new ArrayList<SingleCRS>(crs.size());
final boolean identical = ReferencingUtilities.getSingleComponents(crs, expanded);
singles = UnmodifiableArrayList.wrap(expanded.toArray(new SingleCRS[expanded.size()]));
=======
final List<SingleCRS> flatte... |
<<<<<<<
return new NumberRange<Byte>(Byte.class,
=======
return unique(new NumberRange<>(Byte.class,
>>>>>>>
return unique(new NumberRange<Byte>(Byte.class,
<<<<<<<
return new NumberRange<Short>(Short.class,
=======
return unique(new NumberRange<>(Short.class,
>>>>>>>
... |
<<<<<<<
final synchronized Stream<AbstractFeature> features() throws DataStoreException {
=======
@Override
public final synchronized Stream<Feature> features(boolean parallel) throws DataStoreException {
>>>>>>>
@Override
public final synchronized Stream<AbstractFeature> features(boolean paralle... |
<<<<<<<
import org.opengis.referencing.ReferenceIdentifier;
=======
import org.opengis.metadata.Identifier;
import org.apache.sis.internal.util.Constants;
>>>>>>>
import org.opengis.referencing.ReferenceIdentifier;
import org.apache.sis.internal.util.Constants;
<<<<<<<
final ReferenceIdentifier id = new Imm... |
<<<<<<<
for (final AbstractIdentifiedType property : feature.getProperties(includeSuperTypes)) {
=======
for (final PropertyType property : feature.getPropertyTypes(includeSuperTypes)) {
>>>>>>>
for (final AbstractIdentifiedType property : feature.getPropertyTypes(includeSuperTypes)) {
<<<<<... |
<<<<<<<
=======
// Branch-dependent imports
import org.opengis.feature.IdentifiedType;
import org.opengis.feature.PropertyType;
import org.opengis.feature.AttributeType;
>>>>>>>
<<<<<<<
for (final AbstractIdentifiedType propertyType : featureType.getProperties(true)) {
=======
for (final Property... |
<<<<<<<
private static <E> Set<E> cast(final Object value, final Class<E> type) {
assert ((CheckedContainer<?>) value).getElementType() == type;
return (Set<E>) value;
=======
private static Set<CharSequence> cast(final Object value) {
assert !(value instanceof CheckedContainer<?>) ||
... |
<<<<<<<
* @return The feature or attribute value (may be {@code null}).
* @throws IllegalStateException if this field contains more than one value.
=======
* @return the feature or attribute value (may be {@code null}).
* @throws MultiValuedPropertyException if this field contains more than one va... |
<<<<<<<
import org.opengis.metadata.citation.ResponsibleParty;
import org.apache.sis.internal.simple.SimpleCitation;
=======
import org.opengis.metadata.citation.Responsibility;
import org.apache.sis.internal.simple.CitationConstant;
>>>>>>>
import org.opengis.metadata.citation.ResponsibleParty;
import org.apache.si... |
<<<<<<<
* <div class="warning"><b>Warning:</b> In a future SIS version, the return type may be changed
* to {@code org.opengis.feature.AttributeType}. This change is pending GeoAPI revision.</div>
*
* @return Information about the attribute.
=======
* @return information about the attribute.
... |
<<<<<<<
final NamedIdentifier identifier = new NamedIdentifier(OGP, "EPSG", "4326", "8.3", null);
Validators.validate((ReferenceIdentifier) identifier);
=======
final NamedIdentifier identifier = new NamedIdentifier(IOGP, "EPSG", "4326", "8.3", null);
Validators.validate((Identifier) ... |
<<<<<<<
Citation copyFrom = null; // Copy citedResponsibleParty from that citation.
{ // This is a switch(String) on the JDK7 branch
if (key.equals("ISO 19115-1")) {
=======
Citation[] copyFrom = null; // Copy citedResponsibleParty from... |
<<<<<<<
import java.time.Instant;
import java.util.stream.Stream;
import org.apache.sis.feature.AbstractFeature;
import org.opengis.util.GenericName;
=======
import org.opengis.feature.Feature;
import org.opengis.metadata.content.FeatureTypeInfo;
>>>>>>>
import org.apache.sis.feature.AbstractFeature;
import org.open... |
<<<<<<<
numRow = new DefaultParameterDescriptor<Integer>(properties, Integer.class, valueDomain, null, defaultSize, true);
=======
numRow = new DefaultParameterDescriptor<>(properties, 1, 1, Integer.class, valueDomain, null, defaultSize);
>>>>>>>
numRow = new DefaultParameterDescriptor<Intege... |
<<<<<<<
* JAXB adapter for {@code DistributedComputingPlatform}, in order to integrate the value in an element
* respecting the ISO-19139 standard. See package documentation for more information about the handling
* of {@code CodeList} in ISO-19139.
=======
* JAXB adapter for {@link DistributedComputingPlatform}
... |
<<<<<<<
* <div class="warning"><b>Upcoming API change — generalization</b><br>
* As of ISO 19115:2014, {@code ResponsibleParty} is replaced by the {@link Responsibility} parent interface.
* This change may be applied in GeoAPI 4.0.
* </div>
*
* @return Means of communication with person(s)... |
<<<<<<<
private static final int[] SIZES = new int[] {
Byte .SIZE / Byte.SIZE,
Byte .SIZE / Byte.SIZE, // NOT Java char
Short .SIZE / Byte.SIZE,
Integer.SIZE / Byte.SIZE,
Float .SIZE / Byte.SIZE,
Double .SIZE / Byte.SIZE,
=======
private static final byte[... |
<<<<<<<
import javax.xml.bind.annotation.XmlType;
import org.opengis.annotation.UML;
=======
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
>>>>>>>
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
<<<<<<<
/// @XmlElement(name = "scope")
@UML(identifier="scope", obligation=OPTIONAL, s... |
<<<<<<<
// Following tests use indirectly EPSG factory.
=======
// Geodetic object creations from authority codes.
org.apache.sis.referencing.factory.GIGS2001.class,
org.apache.sis.referencing.factory.GIGS2002.class,
org.apache.sis.referencing.factory.GIGS2003.class,
org.apache.sis.referencing... |
<<<<<<<
import org.opengis.annotation.UML;
=======
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
>>>>>>>
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
<<<<<<<
=======
import org.opengis.metadata.content.FeatureTypeInfo;
import org.apache.sis.internal.jaxb.FilterByVersion;
import or... |
<<<<<<<
DefaultResponsibleParty responsibility = new DefaultResponsibleParty(Role.DISTRIBUTOR);
responsibility.setParties(singleton(party));
citation.getCitedResponsibleParties().add(responsibility);
=======
DefaultResponsibility responsibility = new DefaultResponsibility(Role.DISTRIBU... |
<<<<<<<
return new MeasurementRange<Float>(Float.class,
=======
return unique(new MeasurementRange<>(Float.class,
>>>>>>>
return unique(new MeasurementRange<Float>(Float.class,
<<<<<<<
return new MeasurementRange<Double>(Double.class,
=======
return unique(new MeasurementRa... |
<<<<<<<
// Related to JDK8
import org.apache.sis.internal.jdk8.JDK8;
import org.apache.sis.internal.jdk8.Function;
=======
// Branch-dependent imports
import java.util.function.Function;
>>>>>>>
// Branch-dependent imports
import org.apache.sis.internal.jdk8.JDK8;
import org.apache.sis.internal.jdk8.Function; |
<<<<<<<
// Related to JDK7
import org.apache.sis.internal.jdk7.Objects;
=======
// Branch-dependent imports
import java.util.Objects;
>>>>>>>
// Branch-dependent imports
import org.apache.sis.internal.jdk7.Objects; |
<<<<<<<
=======
+ " ├─Language…………………………………………………………………………………………… en\n"
+ " ├─Spatial representation info (1 of 3)\n"
+ " │ ├─Number of dimensions………………………………………………… 2\n"
+ " │ ├─Axis dimension properties (1 of 2)\n"
+ " │ │ ... |
<<<<<<<
} catch (Exception e) {
Logging.recoverableException(getClass(), "handleGetObject", e);
=======
} catch (ReflectiveOperationException e) {
e.addSuppressed(exception);
Logging.recoverableException(Logging.getLogger(Loggers.LOCALIZATION), g... |
<<<<<<<
private boolean setName(final Class<? extends AbstractParty> type, final boolean position, final InternationalString name) {
checkWritePermission();
final Iterator<AbstractParty> it = getParties().iterator();
=======
private boolean setName(final Class<? extends Party> type, final bool... |
<<<<<<<
* <div class="warning"><b>Upcoming API change — internationalization</b><br>
* The return type may be changed from {@code Collection<String>} to
* {@code Collection<? extends InternationalString>} in GeoAPI 4.0.
* </div>
*
* @return Address line for the location.
=======
* @... |
<<<<<<<
final void addName(final ReferenceIdentifier id) {
if (name == null) {
=======
final void addName(final Identifier id) {
if (name == NilReferencingObject.UNNAMED) {
>>>>>>>
final void addName(final ReferenceIdentifier id) {
if (name == NilReferencingObject.UNNAMED) { |
<<<<<<<
// Branch-dependent imports
import java.nio.file.Path;
import java.nio.file.Paths;
import org.apache.sis.internal.jdk8.JDK8;
=======
>>>>>>>
// Branch-dependent imports
import org.apache.sis.internal.jdk8.JDK8; |
<<<<<<<
* @since 0.4 (derived from geotk-3.00)
* @version 0.4
=======
* @since 0.4
* @version 0.5
>>>>>>>
* @since 0.4
* @version 0.4 |
<<<<<<<
valueType = toString(pt.getValueType().getName());
valueClass = AbstractFeature.class;
} else if (propertyType instanceof DefaultOperation) {
final AbstractIdentifiedType resultType = ((DefaultOperation) propertyType).getResult();
=======
... |
<<<<<<<
result = new SystemUnit(null, dim, null, (byte) 0, (short) 0);
=======
result = new SystemUnit<>(null, dim, null, (byte) 0, (short) 0, null);
>>>>>>>
result = new SystemUnit(null, dim, null, (byte) 0, (short) 0, null); |
<<<<<<<
private final VisibilityTranslator visibilityTranslator;
=======
private final UserRepository userRepository;
private final VisibilityTranslator visibilityTranslator;
>>>>>>>
private final VisibilityTranslator visibilityTranslator;
<<<<<<<
public RelationshipCreate(
final Gra... |
<<<<<<<
final List<CoordinateOperation> flattened = new ArrayList<CoordinateOperation>(operations.length);
initialize(properties, operations, flattened, mtFactory, (coordinateOperationAccuracy == null));
=======
final List<CoordinateOperation> flattened = new ArrayList<>(operations.length);
... |
<<<<<<<
import org.opengis.util.CodeList;
=======
import org.opengis.util.ControlledVocabulary;
import org.opengis.metadata.citation.Citation;
>>>>>>>
import org.opengis.util.CodeList;
import org.opengis.metadata.citation.Citation; |
<<<<<<<
import org.apache.sis.internal.geoapi.evolution.UnsupportedCodeList;
=======
import org.opengis.metadata.identification.CouplingType;
import org.opengis.metadata.identification.CoupledResource;
import org.opengis.metadata.identification.OperationMetadata;
import org.opengis.metadata.identification.ServiceIden... |
<<<<<<<
import org.opengis.util.CodeList;
import org.opengis.annotation.UML;
=======
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
>>>>>>>
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
<<<<<<<
import org.apache.sis.internal.util.CollectionsExt;
=======
import org.opengis.metadata.c... |
<<<<<<<
/// @XmlElement(name = "dimensionTitle")
@UML(identifier="dimensionTitle", obligation=OPTIONAL, specification=ISO_19115)
=======
@Override
@XmlElement(name = "dimensionTitle")
@XmlJavaTypeAdapter(InternationalStringAdapter.Since2014.class)
>>>>>>>
@XmlElement(name = "dimensionTitle")
... |
<<<<<<<
import org.opengis.parameter.ParameterDescriptor;
=======
import org.opengis.metadata.identification.DistributedComputingPlatform;
import org.opengis.metadata.identification.OperationMetadata;
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.metadata.TitleProperty;
>>>>>>>
import org.apa... |
<<<<<<<
try (final BufferedWriter out = JDK8.newBufferedWriter(file)) {
=======
try (BufferedWriter out = Files.newBufferedWriter(file)) {
>>>>>>>
try (BufferedWriter out = JDK8.newBufferedWriter(file)) { |
<<<<<<<
* <div class="warning"><b>Upcoming API change — generalization</b><br>
* As of ISO 19115:2014, {@code ResponsibleParty} is replaced by the {@link Responsibility} parent interface.
* This change will be tentatively applied in GeoAPI 4.0.
* </div>
*
* @return Organization responsible... |
<<<<<<<
@UML(identifier="metadataIdentifier", obligation=OPTIONAL, specification=ISO_19115)
=======
@Override
@XmlElement(name = "metadataIdentifier")
@XmlJavaTypeAdapter(MD_Identifier.Since2014.class)
>>>>>>>
@XmlElement(name = "metadataIdentifier")
@XmlJavaTypeAdapter(MD_Identifier.Since201... |
<<<<<<<
=======
import org.opengis.feature.IdentifiedType;
import org.opengis.feature.Operation;
>>>>>>>
<<<<<<<
public class DefaultOperation extends PropertyType {
=======
public class DefaultOperation extends AbstractIdentifiedType implements Operation {
>>>>>>>
public class DefaultOperation extends AbstractI... |
<<<<<<<
=======
// Branch-dependent imports
import org.opengis.geometry.Geometry;
import org.apache.sis.internal.jdk8.JDK8;
>>>>>>>
import org.apache.sis.internal.jdk8.JDK8; |
<<<<<<<
dates = new ArrayList<CitationDate>(1);
=======
newValues = new ArrayList<>(1);
>>>>>>>
newValues = new ArrayList<CitationDate>(1); |
<<<<<<<
private static Map<ParameterRole, ParameterDescriptor<Double>> roles(final byte type) {
final EnumMap<ParameterRole, ParameterDescriptor<Double>> roles =
new EnumMap<ParameterRole, ParameterDescriptor<Double>>(ParameterRole.class);
=======
private static Map<ParameterRole, Para... |
<<<<<<<
import org.apache.sis.metadata.iso.DefaultIdentifier;
=======
import org.apache.sis.internal.jaxb.metadata.replace.ReferenceSystemMetadata;
>>>>>>>
import org.apache.sis.metadata.iso.DefaultIdentifier;
import org.apache.sis.internal.jaxb.metadata.replace.ReferenceSystemMetadata;
<<<<<<<
"<gm... |
<<<<<<<
import java.io.IOException;
import java.nio.ByteOrder;
import java.nio.MappedByteBuffer;
import java.nio.channels.FileChannel;
import java.io.FileInputStream;
import java.util.HashMap;
import java.util.Map;
import java.text.MessageFormat;
import com.esri.core.geometry.Point;
import com.esri.core.geometry.Polygo... |
<<<<<<<
public static void createMarshallers() throws JAXBException {
final Map<String,Object> properties = new HashMap<String,Object>(4);
=======
public static void createMarshallerPool() throws JAXBException {
final Map<String,Object> properties = new HashMap<>(4);
>>>>>>>
public static... |
<<<<<<<
=======
import org.opengis.util.ControlledVocabulary;
import org.opengis.util.FactoryException;
>>>>>>>
import org.opengis.util.FactoryException;
<<<<<<<
final Class<?> type = subType(info.getMetadataType(), toSearch.identifier);
final Class<?> returnType = Interim.getReturnTyp... |
<<<<<<<
* <li>{@link #getStandardName(Class)}, {@link #getListName(CodeList)} and {@link #getCodeName(CodeList)}
* for fetching ISO names if possible.</li>
* <li>{@link #getCodeTitle(CodeList)}, {@link #getDescription(CodeList)} and
* {@link #getDescription(Class)} for fetching human-readable descri... |
<<<<<<<
"Role",
"Party",
"Name",
=======
"Organisation", // A Party subtype
"Name", // In COMPACT mode, this value is associated to "Organisation" node.
"Role",
>>... |
<<<<<<<
@ValueRange(minimum=0, isMinIncluded=false)
=======
@Override
>>>>>>>
<<<<<<<
@UML(identifier="vertical", obligation=CONDITIONAL, specification=ISO_19115)
=======
@ValueRange(minimum=0, isMinIncluded=false)
>>>>>>>
@UML(identifier="vertical", obligation=CONDITIONAL, specification=ISO_... |
<<<<<<<
// Related to JDK8
import org.apache.sis.internal.jdk8.Function;
=======
// Branch-dependent imports
import java.util.function.Function;
>>>>>>>
// Branch-dependent imports
import org.apache.sis.internal.jdk8.Function; |
<<<<<<<
* @since 0.5
* @version 0.8
=======
* @version 0.7
* @since 0.5
>>>>>>>
* @version 0.8
* @since 0.5
<<<<<<<
* The directory where HTML pages will be written.
*/
private String outputDirectory;
/**
* Invoked by the Javadoc tools for instantiating the custom doclet.
*/... |
<<<<<<<
@XmlElement(name = "userContactInfo", required = true)
public Collection<ResponsibleParty> getUserContactInfo() {
return userContactInfo = nonNullCollection(userContactInfo, ResponsibleParty.class);
=======
@XmlElement(name = "userContactInfo")
public Collection<Responsibility> getUser... |
<<<<<<<
* @param value The obligation name.
* @return The obligation enumeration for the given name.
=======
* @param wrapper the wrapper.
* @return the wrapped value.
>>>>>>>
* @param value the obligation name.
* @return the obligation enumeration for the given name.
<<<<<<<
*... |
<<<<<<<
=======
import org.opengis.util.NameFactory;
import org.opengis.metadata.Identifier;
>>>>>>>
import org.opengis.util.NameFactory; |
<<<<<<<
import java.util.Iterator;
=======
>>>>>>>
<<<<<<<
public void addPack(final String parent, final String pack, final String[] jars) throws IOException {
PackOutput p = null;
if (parent != null) {
p = outputs.get(parent);
if (p == null) {
throw new ... |
<<<<<<<
private static Map<String,Object> properties(final short code, final String name, final String alias) {
final Map<String,Object> map = new HashMap<String,Object>(8);
=======
private static Map<String,Object> properties(final short code, final String name, final String alias, final boolean worl... |
<<<<<<<
@Override
public Stream<AbstractFeature> features(boolean parallel) {
=======
public Stream<Feature> features(boolean parallel) {
>>>>>>>
public Stream<AbstractFeature> features(boolean parallel) { |
<<<<<<<
private static DefaultOperationMethod create(final String method, final String identifier, final String formula) {
final Map<String,Object> properties = new HashMap<String,Object>(8);
=======
private static DefaultOperationMethod create(final String method, final String identifier, final Strin... |
<<<<<<<
import org.opengis.parameter.ParameterValue;
=======
import java.lang.reflect.Modifier;
import org.opengis.metadata.Identifier;
>>>>>>>
import java.lang.reflect.Modifier; |
<<<<<<<
import org.apache.sis.internal.metadata.LegacyPropertyAdapter;
import org.apache.sis.internal.geoapi.evolution.UnsupportedCodeList;
=======
import org.apache.sis.internal.metadata.legacy.LegacyPropertyAdapter;
>>>>>>>
import org.apache.sis.internal.geoapi.evolution.UnsupportedCodeList;
import org.apache.sis.... |
<<<<<<<
=======
import org.opengis.metadata.citation.Responsibility;
import org.opengis.metadata.citation.ResponsibleParty;
>>>>>>>
import org.opengis.metadata.citation.ResponsibleParty;
<<<<<<<
if (LEGACY_XML && !(metadata instanceof DefaultResponsibleParty)) {
return new DefaultResponsiblePart... |
<<<<<<<
if (openedStatements.size() > 0) {
format(Level.WARNING, "log.statements_left_opened", openedStatements.size(), openedStatements.toString());
=======
if (this.openedStatements.size() > 0) {
log(Level.WARNING, "log.statements_left_opened", this.openedStat... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.