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.getModelUserContext(authorizations, workspaceId);
>>>>>>>
String workspaceId = getActiveWorkspaceId(request);
ModelUserContext modelUserContext = userRepository.getModelUserContext(authorizations, workspaceId); |
<<<<<<<
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()) : (Version) value;
>>>>>>>
if (name.equals(XML.GML_VERSION)) {
versionGML = (value instanceof CharSequence) ? new Version(value.toString()) : (Version) value;
<<<<<<<
/*switch (name)*/ {
if (name.equals(XML.LOCALE)) return locale;
if (name.equals(XML.TIMEZONE)) return timezone;
if (name.equals(XML.SCHEMAS)) return schemas;
if (name.equals(XML.GML_VERSION)) return gmlVersion;
if (name.equals(XML.RESOLVER)) return resolver;
if (name.equals(XML.CONVERTER)) return converter;
if (name.equals(XML.WARNING_LISTENER)) return warningListener;
if (name.equals(XML.STRING_SUBSTITUTES)) {
=======
switch (name) {
case XML.LOCALE: return locale;
case XML.TIMEZONE: return timezone;
case XML.SCHEMAS: return schemas;
case XML.GML_VERSION: return versionGML;
case XML.RESOLVER: return resolver;
case XML.CONVERTER: return converter;
case XML.WARNING_LISTENER: return warningListener;
case XML.STRING_SUBSTITUTES: {
>>>>>>>
/*switch (name)*/ {
if (name.equals(XML.LOCALE)) return locale;
if (name.equals(XML.TIMEZONE)) return timezone;
if (name.equals(XML.SCHEMAS)) return schemas;
if (name.equals(XML.GML_VERSION)) return versionGML;
if (name.equals(XML.RESOLVER)) return resolver;
if (name.equals(XML.CONVERTER)) return converter;
if (name.equals(XML.WARNING_LISTENER)) return warningListener;
if (name.equals(XML.STRING_SUBSTITUTES)) { |
<<<<<<<
@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;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement; |
<<<<<<<
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.jdk8.DoubleConsumer; |
<<<<<<<
* @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.
<<<<<<<
individual = copyCollection(object.getIndividual(), DefaultIndividual.class);
=======
individual = copyCollection(object.getIndividual(), Individual.class);
}
}
/**
* Returns a SIS metadata implementation with the values of the given arbitrary implementation.
* This method performs the first applicable action in the following choices:
*
* <ul>
* <li>If the given object is {@code null}, then this method returns {@code null}.</li>
* <li>Otherwise if the given object is already an instance of
* {@code DefaultOrganisation}, then it is returned unchanged.</li>
* <li>Otherwise a new {@code DefaultOrganisation} instance is created using the
* {@linkplain #DefaultOrganisation(Organisation) copy constructor}
* and returned. Note that this is a <cite>shallow</cite> copy operation, since the other
* metadata contained in the given object are not recursively copied.</li>
* </ul>
*
* @param object the object to get as a SIS implementation, or {@code null} if none.
* @return a SIS implementation containing the values of the given object (may be the
* given object itself), or {@code null} if the argument was null.
*/
public static DefaultOrganisation castOrCopy(final Organisation object) {
if (object == null || object instanceof DefaultOrganisation) {
return (DefaultOrganisation) object;
>>>>>>>
individual = copyCollection(object.getIndividual(), DefaultIndividual.class);
<<<<<<<
* <div class="warning"><b>Upcoming API change — generalization</b><br>
* The element type will be changed to the {@code Individual} interface
* when GeoAPI will provide it (tentatively in GeoAPI 3.1).
* </div>
*
* @return Individuals in the named organization, or an empty collection.
=======
* @return individuals in the named organization, or an empty collection.
>>>>>>>
* <div class="warning"><b>Upcoming API change — generalization</b><br>
* The element type will be changed to the {@code Individual} interface
* when GeoAPI will provide it (tentatively in GeoAPI 3.1).
* </div>
*
* @return individuals in the named organization, or an empty collection.
<<<<<<<
* <div class="warning"><b>Upcoming API change — generalization</b><br>
* The element type will be changed to the {@code Individual} interface
* when GeoAPI will provide it (tentatively in GeoAPI 3.1).
* </div>
*
* @param newValues The new individuals in the named organization.
=======
* @param newValues the new individuals in the named organization.
>>>>>>>
* <div class="warning"><b>Upcoming API change — generalization</b><br>
* The element type will be changed to the {@code Individual} interface
* when GeoAPI will provide it (tentatively in GeoAPI 3.1).
* </div>
*
* @param newValues the new individuals in the named organization. |
<<<<<<<
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.
* Otherwise a new SIS implementation is created and initialized to the attribute values of the given object.
*
* @param object the object to get as a SIS implementation, or {@code null} if none.
* @return a SIS implementation containing the values of the given object (may be the
* given object itself), or {@code null} if the argument was null.
*/
public static DefaultParametricDatum castOrCopy(final ParametricDatum object) {
return (object == null) || (object instanceof DefaultParametricDatum) ?
(DefaultParametricDatum) object : new DefaultParametricDatum(object);
}
/**
* Returns the GeoAPI interface implemented by this class.
* The SIS implementation returns {@code ParametricDatum.class}.
*
* <div class="note"><b>Note for implementors:</b>
* Subclasses usually do not need to override this method since GeoAPI does not define {@code TemporalDatum}
* sub-interface. Overriding possibility is left mostly for implementors who wish to extend GeoAPI with their
* own set of interfaces.</div>
*
* @return {@code ParametricDatum.class} or a user-defined sub-interface.
*/
@Override
public Class<? extends ParametricDatum> getInterface() {
return ParametricDatum.class;
}
/**
>>>>>>> |
<<<<<<<
* @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 find
* this desired feature in an association of the 'creating' feature, instead than beeing
* the 'creating' feature itself. This is a little bit unusual, but not illegal.
*/
final List<DefaultFeatureType> deferred = new ArrayList<DefaultFeatureType>();
type = search(creating, name, deferred);
if (type == null) {
=======
FeatureType resolved = ((NamedFeatureType) type).resolved;
if (resolved == null) {
final GenericName name = type.getName();
if (name.equals(creating.getName())) {
resolved = creating; // This is the most common case.
} else {
>>>>>>>
FeatureType resolved = ((NamedFeatureType) type).resolved;
if (resolved == null) {
final GenericName name = type.getName();
if (name.equals(creating.getName())) {
resolved = creating; // This is the most common case.
} else {
<<<<<<<
valueType = ((DefaultAssociationRole) property).valueType;
if (valueType instanceof NamedFeatureType) {
continue; // Skip unresolved feature types.
=======
if (property instanceof DefaultAssociationRole) {
valueType = ((DefaultAssociationRole) property).valueType;
if (valueType instanceof NamedFeatureType) {
continue; // Skip unresolved feature types.
}
} else {
valueType = ((FeatureAssociationRole) property).getValueType();
>>>>>>>
valueType = ((DefaultAssociationRole) property).valueType;
if (valueType instanceof NamedFeatureType) {
continue; // Skip unresolved feature types.
<<<<<<<
* <div class="warning"><b>Warning:</b> In a future SIS version, the return type may be changed
* to {@code org.opengis.feature.FeatureType}. This change is pending GeoAPI revision.</div>
*
* @return The type of feature values.
=======
* <p>This method can not be invoked if {@link #isResolved()} returns {@code false}.
* However it is still possible to {@linkplain Features#getValueTypeName(PropertyType)
* get the associated feature type name}.</p>
*
* @return the type of feature values.
>>>>>>>
* <p>This method can not be invoked if {@link #isResolved()} returns {@code false}.
* However it is still possible to {@linkplain Features#getValueTypeName(PropertyType)
* get the associated feature type name}.</p>
*
* <div class="warning"><b>Warning:</b> In a future SIS version, the return type may be changed
* to {@code org.opengis.feature.FeatureType}. This change is pending GeoAPI revision.</div>
*
* @return the type of feature values. |
<<<<<<<
* 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();}
@Override public Collection<? extends CitationDate> getDates() {return Collections.emptyList();}
@Override public InternationalString getEdition() {return null;}
@Override public Date getEditionDate() {return null;}
@Override public Collection<? extends Identifier> getIdentifiers() {return Collections.emptyList();}
@Override public Collection<? extends ResponsibleParty> getCitedResponsibleParties() {return Collections.emptyList();}
@Override public Collection<PresentationForm> getPresentationForms() {return Collections.emptyList();}
@Override public Series getSeries() {return null;}
@Override public InternationalString getOtherCitationDetails() {return null;}
@Override public String getISBN() {return null;}
@Override public String getISSN() {return null;}
@Deprecated
@Override public InternationalString getCollectiveTitle() {return null;}
/**
=======
>>>>>>>
* 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();}
@Override public Collection<? extends CitationDate> getDates() {return Collections.emptyList();}
@Override public InternationalString getEdition() {return null;}
@Override public Date getEditionDate() {return null;}
@Override public Collection<? extends Identifier> getIdentifiers() {return Collections.emptyList();}
@Override public Collection<? extends ResponsibleParty> getCitedResponsibleParties() {return Collections.emptyList();}
@Override public Collection<PresentationForm> getPresentationForms() {return Collections.emptyList();}
@Override public Series getSeries() {return null;}
@Override public InternationalString getOtherCitationDetails() {return null;}
@Override public String getISBN() {return null;}
@Override public String getISSN() {return null;}
@Deprecated
@Override public InternationalString getCollectiveTitle() {return null;}
/** |
<<<<<<<
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);
>>>>>>>
final Map<String,Object> properties = new HashMap<String,Object>(6);
<<<<<<<
return new DefaultParameterDescriptor<Double>(properties, 0, 1, Double.class, null, null, wkt.getDefaultValue());
=======
properties.put(ParameterDescriptor.NAME_KEY, name);
properties.put(ParameterDescriptor.ALIAS_KEY, wkt.getName());
return new DefaultParameterDescriptor<>(properties, 0, 1, Double.class, null, null, wkt.getDefaultValue());
>>>>>>>
properties.put(ParameterDescriptor.NAME_KEY, name);
properties.put(ParameterDescriptor.ALIAS_KEY, wkt.getName());
return new DefaultParameterDescriptor<Double>(properties, 0, 1, Double.class, null, null, wkt.getDefaultValue()); |
<<<<<<<
// 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 static org.apache.sis.internal.metadata.NameToIdentifier.Simplifier.ESRI_DATUM_PREFIX;
// 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 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}.
>>>>>>>
* <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}.
<<<<<<<
* <div class="warning"><b>Upcoming API change</b><br>
* {@code URI} may be replaced by {@link CharSequence} in GeoAPI 4.0.
* </div>
*
* @param newValue The new ASCII file.
=======
* @param newValue the new ASCII file.
>>>>>>>
* <div class="warning"><b>Upcoming API change</b><br>
* {@code URI} may be replaced by {@link CharSequence} in GeoAPI 4.0.
* </div>
*
* @param newValue the new ASCII file.
<<<<<<<
* <div class="warning"><b>Upcoming API change</b><br>
* As of ISO 19115:2014, {@code URI} is replaced by {@link OnlineResource}.
* This change may be applied in GeoAPI 4.0.
* </div>
*
* @return Application schema as a graphics file, or {@code null}.
=======
* @return application schema as a graphics file, or {@code null}.
>>>>>>>
* <div class="warning"><b>Upcoming API change</b><br>
* As of ISO 19115:2014, {@code URI} is replaced by {@link OnlineResource}.
* This change may be applied in GeoAPI 4.0.
* </div>
*
* @return application schema as a graphics file, or {@code null}.
<<<<<<<
* <div class="warning"><b>Upcoming API change</b><br>
* As of ISO 19115:2014, {@code URI} is replaced by {@link OnlineResource}.
* This change may be applied in GeoAPI 4.0.
* </div>
*
* @param newValue The new graphics file.
=======
* @param newValue the new graphics file.
>>>>>>>
* <div class="warning"><b>Upcoming API change</b><br>
* As of ISO 19115:2014, {@code URI} is replaced by {@link OnlineResource}.
* This change may be applied in GeoAPI 4.0.
* </div>
*
* @param newValue the new graphics file.
<<<<<<<
* <div class="warning"><b>Upcoming API change</b><br>
* As of ISO 19115:2014, {@code URI} is replaced by {@link OnlineResource}.
* This change may be applied in GeoAPI 4.0.
* </div>
*
* @return Application schema as a software development file, or {@code null}.
=======
* @return application schema as a software development file, or {@code null}.
>>>>>>>
* <div class="warning"><b>Upcoming API change</b><br>
* As of ISO 19115:2014, {@code URI} is replaced by {@link OnlineResource}.
* This change may be applied in GeoAPI 4.0.
* </div>
*
* @return application schema as a software development file, or {@code null}.
<<<<<<<
* <div class="warning"><b>Upcoming API change</b><br>
* As of ISO 19115:2014, {@code URI} is replaced by {@link OnlineResource}.
* This change may be applied in GeoAPI 4.0.
* </div>
*
* @param newValue The new software development file.
=======
* @param newValue the new software development file.
>>>>>>>
* <div class="warning"><b>Upcoming API change</b><br>
* As of ISO 19115:2014, {@code URI} is replaced by {@link OnlineResource}.
* This change may be applied in GeoAPI 4.0.
* </div>
*
* @param newValue the new software development file. |
<<<<<<<
* @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.
>>>>>>>
* @return the attribute value (may be {@code null}).
* @throws IllegalStateException if this attribute contains more than one value.
<<<<<<<
default: throw new IllegalStateException(Errors.format(Errors.Keys.NotASingleton_1, getName()));
=======
default: throw new MultiValuedPropertyException(Resources.format(Resources.Keys.NotASingleton_1, getName()));
>>>>>>>
default: throw new IllegalStateException(Resources.format(Resources.Keys.NotASingleton_1, getName())); |
<<<<<<<
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)
=======
@XmlElement(name = "boundMin")
@XmlJavaTypeAdapter(GO_Real.Since2014.class)
>>>>>>>
@XmlElement(name = "boundMin")
@XmlJavaTypeAdapter(GO_Real.Since2014.class)
@UML(identifier="boundMin", obligation=OPTIONAL, specification=ISO_19115)
<<<<<<<
/// @XmlElement(name = "boundMax")
@UML(identifier="boundMax", obligation=OPTIONAL, specification=ISO_19115)
=======
@XmlElement(name = "boundMax")
@XmlJavaTypeAdapter(GO_Real.Since2014.class)
>>>>>>>
@XmlElement(name = "boundMax")
@XmlJavaTypeAdapter(GO_Real.Since2014.class)
@UML(identifier="boundMax", obligation=OPTIONAL, specification=ISO_19115)
<<<<<<<
/// @XmlElement(name = "boundUnits")
@UML(identifier="boundUnits", obligation=OPTIONAL, specification=ISO_19115)
=======
@Override
@XmlElement(name = "boundUnits")
@XmlJavaTypeAdapter(UnitAdapter.Since2014.class)
>>>>>>>
@XmlElement(name = "boundUnits")
@XmlJavaTypeAdapter(UnitAdapter.Since2014.class)
@UML(identifier="boundUnits", 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 ReferenceIdentifier, Serializable {
<<<<<<<
code = identifier.getCode();
codeSpace = identifier.getCodeSpace();
authority = identifier.getAuthority();
version = identifier.getVersion();
if (identifier instanceof DefaultIdentifier) {
description = ((DefaultIdentifier) identifier).getDescription();
} else {
description = null;
}
if (identifier instanceof Deprecable) {
remarks = ((Deprecable) identifier).getRemarks();
} else {
remarks = null;
}
=======
code = identifier.getCode();
codeSpace = identifier.getCodeSpace();
authority = identifier.getAuthority();
version = identifier.getVersion();
description = identifier.getDescription();
>>>>>>>
code = identifier.getCode();
codeSpace = identifier.getCodeSpace();
authority = identifier.getAuthority();
version = identifier.getVersion();
if (identifier instanceof DefaultIdentifier) {
description = ((DefaultIdentifier) identifier).getDescription();
} else {
description = null;
} |
<<<<<<<
=======
// 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 feature is not valid for this association.
=======
* @param value the new value, or {@code null}.
* @throws InvalidPropertyValueException if the given feature is not valid for this association.
>>>>>>>
* @param value the new value, or {@code null}.
* @throws InvalidPropertyValueException if the given feature is not valid for this association. |
<<<<<<<
final AbstractIdentifiedType resultType; // Result of operation if applicable.
if (propertyType instanceof AbstractOperation) {
resultType = ((AbstractOperation) propertyType).getResult();
=======
final IdentifiedType resultType; // Result of operation if applicable.
if (propertyType instanceof Operation) {
resultType = ((Operation) propertyType).getResult(); // May be null
>>>>>>>
final AbstractIdentifiedType resultType; // Result of operation if applicable.
if (propertyType instanceof AbstractOperation) {
resultType = ((AbstractOperation) propertyType).getResult(); // May be null |
<<<<<<<
=======
// 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.opengis.feature.Feature;
import org.opengis.feature.FeatureType;
import org.opengis.feature.FeatureAssociationRole;
import org.opengis.feature.Operation;
>>>>>>>
// Branch-dependent imports
import org.apache.sis.internal.jdk8.UncheckedIOException;
<<<<<<<
} else if (propertyType instanceof DefaultAttributeType<?>) {
value = ((DefaultAttributeType<?>) propertyType).getDefaultValue();
} else if (propertyType instanceof AbstractOperation) {
if (((AbstractOperation) propertyType).formatResultFormula(buffer)) {
value = CharSequences.trimWhitespaces(buffer).toString();
buffer.setLength(0);
=======
} else if (propertyType instanceof AttributeType<?>) {
value = ((AttributeType<?>) propertyType).getDefaultValue();
} else if (propertyType instanceof Operation) {
buffer.append(" = ");
try {
if (propertyType instanceof AbstractOperation) {
((AbstractOperation) propertyType).formatResultFormula(buffer);
} else {
AbstractOperation.defaultFormula(((Operation) propertyType).getParameters(), buffer);
}
} catch (IOException e) {
throw new UncheckedIOException(e); // Should never happen since we write in a StringBuffer.
>>>>>>>
} else if (propertyType instanceof DefaultAttributeType<?>) {
value = ((DefaultAttributeType<?>) propertyType).getDefaultValue();
} else if (propertyType instanceof AbstractOperation) {
buffer.append(" = ");
try {
((AbstractOperation) propertyType).formatResultFormula(buffer);
} catch (IOException e) {
throw new UncheckedIOException(e); // Should never happen since we write in a StringBuffer. |
<<<<<<<
// 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.MetadataUtilities.warnNonPositiveArgument;
>>>>>>>
import static org.apache.sis.internal.metadata.MetadataUtilities.warnNonPositiveArgument;
// 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;
<<<<<<<
=======
@Override
@ValueRange(minimum = 0)
>>>>>>>
@ValueRange(minimum = 0) |
<<<<<<<
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, Double::parseDouble);
this.wasNull = (value == null);
>>>>>>>
Double value = getNumeric(columnLabel, new Function<String,Double>() {
@Override public Double apply(final String value) {
return Double.parseDouble(value);
}
});
this.wasNull = (value == null);
<<<<<<<
Float value = getNumeric(columnLabel, new Function<String,Float>() {
@Override public Float apply(final String value) {
return Float.parseFloat(value);
}
});
wasNull = (value == null);
=======
Float value = getNumeric(columnLabel, Float::parseFloat);
this.wasNull = (value == null);
>>>>>>>
Float value = getNumeric(columnLabel, new Function<String,Float>() {
@Override public Float apply(final String value) {
return Float.parseFloat(value);
}
});
this.wasNull = (value == null);
<<<<<<<
Integer value = getNumeric(columnLabel, new Function<String,Integer>() {
@Override public Integer apply(final String value) {
return Integer.parseInt(value);
}
});
wasNull = (value == null);
=======
Integer value = getNumeric(columnLabel, Integer::parseInt);
this.wasNull = (value == null);
>>>>>>>
Integer value = getNumeric(columnLabel, new Function<String,Integer>() {
@Override public Integer apply(final String value) {
return Integer.parseInt(value);
}
});
this.wasNull = (value == null);
<<<<<<<
Long value = getNumeric(columnLabel, new Function<String,Long>() {
@Override public Long apply(final String value) {
return Long.parseLong(value);
}
});
wasNull = (value == null);
=======
Long value = getNumeric(columnLabel, Long::parseLong);
this.wasNull = (value == null);
>>>>>>>
Long value = getNumeric(columnLabel, new Function<String,Long>() {
@Override public Long apply(final String value) {
return Long.parseLong(value);
}
});
this.wasNull = (value == null);
<<<<<<<
Short value = getNumeric(columnLabel, new Function<String,Short>() {
@Override public Short apply(final String value) {
return Short.parseShort(value);
}
});
wasNull = (value == null);
=======
Short value = getNumeric(columnLabel, Short::parseShort);
this.wasNull = (value == null);
>>>>>>>
Short value = getNumeric(columnLabel, new Function<String,Short>() {
@Override public Short apply(final String value) {
return Short.parseShort(value);
}
});
this.wasNull = (value == null); |
<<<<<<<
} else if (r0 != null) {
if (r1 == null || !isAssignableIgnoreName(r0, r1)) {
return false;
}
}
=======
}
if (r0 instanceof PropertyType) {
if (!(r1 instanceof PropertyType) || !isAssignableIgnoreName((PropertyType) r0, (PropertyType) r1)) {
return false;
}
}
// No need for explicit AttributeType or Operation checks because they are PropertyType.
>>>>>>>
} else if (r0 != null) {
if (r1 == null || !isAssignableIgnoreName(r0, r1)) {
return false;
}
}
// No need for explicit AttributeType or Operation checks because they are 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 = "numberOfValues")
@UML(identifier="numberOfValues", obligation=OPTIONAL, specification=ISO_19115)
=======
@XmlElement(name = "numberOfValues")
@XmlJavaTypeAdapter(GO_Integer.Since2014.class)
>>>>>>>
@XmlElement(name = "numberOfValues")
@XmlJavaTypeAdapter(GO_Integer.Since2014.class)
@UML(identifier="numberOfValues", obligation=OPTIONAL, specification=ISO_19115)
<<<<<<<
/// @XmlElement(name = "meanValue")
@UML(identifier="meanValue", obligation=OPTIONAL, specification=ISO_19115)
=======
@Override
@XmlElement(name = "meanValue")
@XmlJavaTypeAdapter(GO_Real.Since2014.class)
>>>>>>>
@XmlElement(name = "meanValue")
@XmlJavaTypeAdapter(GO_Real.Since2014.class)
@UML(identifier="meanValue", obligation=OPTIONAL, specification=ISO_19115)
<<<<<<<
/// @XmlElement(name = "standardDeviation")
@UML(identifier="standardDeviation", obligation=OPTIONAL, specification=ISO_19115)
=======
@Override
@XmlElement(name = "standardDeviation")
@XmlJavaTypeAdapter(GO_Real.Since2014.class)
>>>>>>>
@XmlElement(name = "standardDeviation")
@XmlJavaTypeAdapter(GO_Real.Since2014.class)
@UML(identifier="standardDeviation", obligation=OPTIONAL, specification=ISO_19115)
<<<<<<<
/// @XmlElement(name = "scaleFactor")
@UML(identifier="scaleFactor", obligation=OPTIONAL, specification=ISO_19115)
=======
@Override
@XmlElement(name = "scaleFactor")
>>>>>>>
@XmlElement(name = "scaleFactor")
@UML(identifier="scaleFactor", obligation=OPTIONAL, specification=ISO_19115)
<<<<<<<
/// @XmlElement(name = "offset")
@UML(identifier="offset", obligation=OPTIONAL, specification=ISO_19115)
=======
@Override
@XmlElement(name = "offset")
>>>>>>>
@XmlElement(name = "offset")
@UML(identifier="offset", obligation=OPTIONAL, specification=ISO_19115)
<<<<<<<
/// @XmlElement(name = "bitsPerValues")
@UML(identifier="bitsPerValue", obligation=OPTIONAL, specification=ISO_19115)
=======
@XmlElement(name = "bitsPerValue")
>>>>>>>
@XmlElement(name = "bitsPerValue")
@UML(identifier="bitsPerValue", obligation=OPTIONAL, specification=ISO_19115)
<<<<<<<
/// @XmlElement(name = "otherPropertyType")
@UML(identifier="otherPropertyType", obligation=OPTIONAL, specification=ISO_19115)
=======
@Override
@XmlElement(name = "otherPropertyType")
@XmlJavaTypeAdapter(GO_RecordType.Since2014.class)
>>>>>>>
@XmlElement(name = "otherPropertyType")
@XmlJavaTypeAdapter(GO_RecordType.Since2014.class)
@UML(identifier="otherPropertyType", obligation=OPTIONAL, specification=ISO_19115)
<<<<<<<
/// @XmlElement(name = "otherProperty")
@UML(identifier="otherProperty", obligation=OPTIONAL, specification=ISO_19115)
=======
@Override
@XmlElement(name = "otherProperty")
@XmlJavaTypeAdapter(GO_Record.Since2014.class)
>>>>>>>
@XmlElement(name = "otherProperty")
@XmlJavaTypeAdapter(GO_Record.Since2014.class)
@UML(identifier="otherProperty", obligation=OPTIONAL, specification=ISO_19115) |
<<<<<<<
=======
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.altamiracorp.lumify.core.model.ontology.OntologyRepository;
import com.altamiracorp.lumify.core.model.textHighlighting.TermMentionOffsetItem;
<<<<<<<
private final UserProvider userProvider;
=======
private final OntologyRepository ontologyRepository;
>>>>>>>
private final UserProvider userProvider;
private final OntologyRepository ontologyRepository;
<<<<<<<
final VisibilityTranslator visibilityTranslator,
final Configuration configuration,
final UserProvider userProvider) {
super(userRepository, configuration);
=======
final VisibilityTranslator visibilityTranslator,
final OntologyRepository ontologyRepository) {
>>>>>>>
final VisibilityTranslator visibilityTranslator,
final Configuration configuration,
final UserProvider userProvider,
final OntologyRepository ontologyRepository) {
super(userRepository, configuration);
<<<<<<<
this.userProvider = userProvider;
=======
this.ontologyRepository = ontologyRepository;
>>>>>>>
this.userProvider = userProvider;
this.ontologyRepository = ontologyRepository;
<<<<<<<
if (classiferConcept == null) {
modelSession.deleteRow(detectedObjectModel.getTableName(), detectedObjectRowKey, modelUserContext);
=======
if (detectedObjectModel.getMetadata().getProcess() == null) {
modelSession.deleteRow(detectedObjectModel.getTableName(), detectedObjectRowKey, user.getModelUserContext());
result.put("deleteTag", true);
>>>>>>>
if (detectedObjectModel.getMetadata().getProcess() == null) {
modelSession.deleteRow(detectedObjectModel.getTableName(), detectedObjectRowKey, user.getModelUserContext());
result.put("deleteTag", true);
<<<<<<<
modelSession.deleteColumn(detectedObjectModel, detectedObjectModel.getTableName(), columnFamilyName, columnName, modelUserContext);
=======
modelSession.deleteColumn(detectedObjectModel, detectedObjectModel.getTableName(), columnFamilyName, columnName, user.getModelUserContext());
>>>>>>>
modelSession.deleteColumn(detectedObjectModel, detectedObjectModel.getTableName(), columnFamilyName, columnName, user.getModelUserContext()); |
<<<<<<<
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() {
if (type != null) {
return new DefaultAssociationRole(identification(), type, minimumOccurs, maximumOccurs);
} else {
return new DefaultAssociationRole(identification(), typeName, minimumOccurs, maximumOccurs);
=======
public FeatureAssociationRole build() {
if (property == null) {
if (type != null) {
property = new DefaultAssociationRole(identification(), type, minimumOccurs, maximumOccurs);
} else {
property = new DefaultAssociationRole(identification(), typeName, minimumOccurs, maximumOccurs);
}
>>>>>>>
public DefaultAssociationRole build() {
if (property == null) {
if (type != null) {
property = new DefaultAssociationRole(identification(), type, minimumOccurs, maximumOccurs);
} else {
property = new DefaultAssociationRole(identification(), typeName, minimumOccurs, maximumOccurs);
} |
<<<<<<<
CharacteristicTypeBuilder(final AttributeTypeBuilder<?> owner, final DefaultAttributeType<V> template) {
super(template, owner.getLocale());
=======
CharacteristicTypeBuilder(final AttributeTypeBuilder<?> owner, final AttributeType<V> template) {
super(owner.getLocale());
>>>>>>>
CharacteristicTypeBuilder(final AttributeTypeBuilder<?> owner, final DefaultAttributeType<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(InternationalStringAdapter.Since2014.class)
@UML(identifier="levelOfDetail", obligation=CONDITIONAL, specification=ISO_19115) |
<<<<<<<
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.apache.sis.internal.xml.LegacyNamespaces;
import org.apache.sis.internal.util.CollectionsExt;
>>>>>>>
import org.apache.sis.internal.geoapi.evolution.UnsupportedCodeList;
import org.apache.sis.internal.xml.LegacyNamespaces;
import org.apache.sis.internal.util.CollectionsExt;
// 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; |
<<<<<<<
// 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> flattened = new ArrayList<>(crs.size());
final boolean identical = ReferencingUtilities.getSingleComponents(crs, flattened);
singles = UnmodifiableArrayList.wrap(flattened.toArray(new SingleCRS[flattened.size()]));
>>>>>>>
final List<SingleCRS> flattened = new ArrayList<SingleCRS>(crs.size());
final boolean identical = ReferencingUtilities.getSingleComponents(crs, flattened);
singles = UnmodifiableArrayList.wrap(flattened.toArray(new SingleCRS[flattened.size()])); |
<<<<<<<
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,
>>>>>>>
return unique(new NumberRange<Short>(Short.class,
<<<<<<<
return new NumberRange<Integer>(Integer.class,
=======
return unique(new NumberRange<>(Integer.class,
>>>>>>>
return unique(new NumberRange<Integer>(Integer.class,
<<<<<<<
return new NumberRange<Long>(Long.class,
=======
return unique(new NumberRange<>(Long.class,
>>>>>>>
return unique(new NumberRange<Long>(Long.class,
<<<<<<<
return new NumberRange<Float>(Float.class,
=======
return unique(new NumberRange<>(Float.class,
>>>>>>>
return unique(new NumberRange<Float>(Float.class,
<<<<<<<
return new NumberRange<Double>(Double.class,
=======
return unique(new NumberRange<>(Double.class,
>>>>>>>
return unique(new NumberRange<Double>(Double.class,
<<<<<<<
return new NumberRange<N>(range);
=======
// Do not invoke unique(NumberRange) because the returned range is often temporary.
return new NumberRange<>(range);
>>>>>>>
// Do not invoke unique(NumberRange) because the returned range is often temporary.
return new NumberRange<N>(range); |
<<<<<<<
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 parallel) throws DataStoreException { |
<<<<<<<
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 ImmutableIdentifier(HardCodedCitations.OGP, "EPSG", "4326");
=======
final Identifier id = new ImmutableIdentifier(HardCodedCitations.IOGP, "EPSG", "4326");
>>>>>>>
final ReferenceIdentifier id = new ImmutableIdentifier(HardCodedCitations.IOGP, "EPSG", "4326");
<<<<<<<
final ReferenceIdentifier id = new ImmutableIdentifier(HardCodedCitations.OGP, "EPSG", "4326", "8.2", null);
=======
final Identifier id = new ImmutableIdentifier(HardCodedCitations.IOGP, "EPSG", "4326", "8.2", null);
>>>>>>>
final ReferenceIdentifier id = new ImmutableIdentifier(HardCodedCitations.IOGP, "EPSG", "4326", "8.2", null);
<<<<<<<
final ReferenceIdentifier id = new ImmutableIdentifier(HardCodedCitations.OGP, "EPSG", "4326", "8.2", null);
=======
final Identifier id = new ImmutableIdentifier(HardCodedCitations.IOGP, "EPSG", "4326", "8.2", null);
>>>>>>>
final ReferenceIdentifier id = new ImmutableIdentifier(HardCodedCitations.IOGP, "EPSG", "4326", "8.2", null); |
<<<<<<<
for (final AbstractIdentifiedType property : feature.getProperties(includeSuperTypes)) {
=======
for (final PropertyType property : feature.getPropertyTypes(includeSuperTypes)) {
>>>>>>>
for (final AbstractIdentifiedType property : feature.getPropertyTypes(includeSuperTypes)) {
<<<<<<<
final Collection<AbstractIdentifiedType> properties = complex.getProperties(false);
final Iterator<AbstractIdentifiedType> it = properties.iterator();
=======
final Collection<PropertyType> properties = complex.getPropertyTypes(false);
final Iterator<PropertyType> it = properties.iterator();
>>>>>>>
final Collection<AbstractIdentifiedType> properties = complex.getPropertyTypes(false);
final Iterator<AbstractIdentifiedType> it = properties.iterator(); |
<<<<<<<
=======
// 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 PropertyType propertyType : featureType.getPropertyTypes(true)) {
>>>>>>>
for (final AbstractIdentifiedType propertyType : featureType.getPropertyTypes(true)) {
<<<<<<<
final DefaultAttributeType<?> resultType = ((DefaultOperation) propertyType).getResult();
=======
final IdentifiedType resultType = ((DefaultOperation) propertyType).getResult();
>>>>>>>
final AbstractIdentifiedType resultType = ((DefaultOperation) propertyType).getResult(); |
<<<<<<<
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<?>) ||
((CheckedContainer<?>) value).getElementType() == CharSequence.class;
return (Set<CharSequence>) value;
>>>>>>>
private static <E> Set<E> cast(final Object value, final Class<E> type) {
assert !(value instanceof CheckedContainer<?>) ||
((CheckedContainer<?>) value).getElementType() == type;
return (Set<E>) value; |
<<<<<<<
* @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 value.
>>>>>>>
* @return the feature or attribute value (may be {@code null}).
* @throws IllegalStateException if this field contains more than one value.
<<<<<<<
* @param values The new values.
* @throws IllegalArgumentException if the given collection contains too many elements.
=======
* @param values the new values.
* @throws InvalidPropertyValueException if the given collection contains too many elements.
>>>>>>>
* @param values the new values.
* @throws IllegalArgumentException if the given collection contains too many elements. |
<<<<<<<
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.sis.internal.simple.CitationConstant;
<<<<<<<
final DefaultOrganisation organisation = new DefaultOrganisation();
organisation.setName(Types.toInternationalString(citedResponsibleParty));
final DefaultResponsibleParty r = new DefaultResponsibleParty(Role.PRINCIPAL_INVESTIGATOR);
r.setParties(singleton(organisation));
final Collection<ResponsibleParty> parties = c.getCitedResponsibleParties();
if (parties != null) {
parties.add(r);
} else {
c.setCitedResponsibleParties(singleton(r));
=======
c.setCitedResponsibleParties(singleton(new DefaultResponsibility(Role.PRINCIPAL_INVESTIGATOR, null,
new DefaultOrganisation(citedResponsibleParty, null, null, null))));
}
if (copyFrom != null) {
for (final Citation other : copyFrom) {
final Collection<? extends Responsibility> parties = other.getCitedResponsibleParties();
final Collection<Responsibility> current = c.getCitedResponsibleParties();
if (current != null) {
current.addAll(parties);
} else {
c.setCitedResponsibleParties(parties);
}
>>>>>>>
final DefaultResponsibleParty r = new DefaultResponsibleParty(Role.PRINCIPAL_INVESTIGATOR);
r.setParties(singleton(new DefaultOrganisation(citedResponsibleParty, null, null, null)));
c.setCitedResponsibleParties(singleton(r));
}
if (copyFrom != null) {
for (final Citation other : copyFrom) {
final Collection<? extends ResponsibleParty> parties = other.getCitedResponsibleParties();
final Collection<ResponsibleParty> current = c.getCitedResponsibleParties();
if (current != null) {
current.addAll(parties);
} else {
c.setCitedResponsibleParties(parties);
} |
<<<<<<<
* <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.
>>>>>>>
* <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 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.
>>>>>>>
* @return the attribute value (may be {@code null}).
* @throws IllegalStateException if this attribute contains more than one value.
<<<<<<<
* @param values The new values.
* @throws IllegalArgumentException if the given collection contains too many elements.
=======
* @param values the new values.
* @throws InvalidPropertyValueException if the given collection contains too many elements.
>>>>>>>
* @param values the new values.
* @throws IllegalArgumentException if the given collection contains too many elements. |
<<<<<<<
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) identifier);
>>>>>>>
final NamedIdentifier identifier = new NamedIdentifier(IOGP, "EPSG", "4326", "8.3", null);
Validators.validate((ReferenceIdentifier) 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 those citations.
switch (key) {
case "ISO 19115-1": {
>>>>>>>
Citation[] copyFrom = null; // Copy citedResponsibleParty from those citations.
{ // This is a switch(String) on the JDK7 branch
if (key.equals("ISO 19115-1")) {
<<<<<<<
} else if (key.equals(Constants.OGC)) {
title = "Identifier in OGC namespace";
code = "OGC";
=======
break;
}
case Constants.OGC: {
title = "Identifiers in OGC namespace";
code = Constants.OGC;
>>>>>>>
} else if (key.equals(Constants.OGC)) {
title = "Identifiers in OGC namespace";
code = Constants.OGC;
<<<<<<<
} else if (key.equals(Constants.EPSG)) {
=======
break;
}
case Constants.IOGP: { // Not in public API (see Citations.IOGP javadoc)
title = "Using the EPSG Geodetic Parameter Dataset"; // Geomatics Guidance Note number 7, part 1
code = Constants.IOGP;
copyFrom = new Citation[] {Citations.EPSG};
presentationForm = PresentationForm.DOCUMENT_DIGITAL;
break;
}
case Constants.EPSG: {
>>>>>>>
} else if (key.equals(Constants.IOGP)) { // Not in public API (see Citations.IOGP javadoc)
title = "Using the EPSG Geodetic Parameter Dataset"; // Geomatics Guidance Note number 7, part 1
code = Constants.IOGP;
copyFrom = new Citation[] {Citations.EPSG};
presentationForm = PresentationForm.DOCUMENT_DIGITAL;
} else if (key.equals(Constants.EPSG)) { |
<<<<<<<
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.opengis.util.GenericName; |
<<<<<<<
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<Integer>(properties, 1, 1, Integer.class, valueDomain, null, defaultSize);
<<<<<<<
numCol = new DefaultParameterDescriptor<Integer>(properties, Integer.class, valueDomain, null, defaultSize, true);
WKT1 = new TensorParameters<Double>(Double.class, "elt_", "_", numRow, numCol);
=======
numCol = new DefaultParameterDescriptor<>(properties, 1, 1, Integer.class, valueDomain, null, defaultSize);
WKT1 = new TensorParameters<>(Double.class, "elt_", "_", numRow, numCol);
>>>>>>>
numCol = new DefaultParameterDescriptor<Integer>(properties, 1, 1, Integer.class, valueDomain, null, defaultSize);
WKT1 = new TensorParameters<Double>(Double.class, "elt_", "_", numRow, numCol);
<<<<<<<
return new DefaultParameterDescriptor<E>(properties, elementType, null, null, isDiagonal ? one : zero, false);
=======
return new DefaultParameterDescriptor<>(properties, 0, 1, elementType, null, null, isDiagonal ? one : zero);
>>>>>>>
return new DefaultParameterDescriptor<E>(properties, 0, 1, elementType, null, null, isDiagonal ? one : zero); |
<<<<<<<
* 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}
* in order to wrap the value in an XML element as specified by ISO 19115-3 standard.
* See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3.
>>>>>>>
* JAXB adapter for {@code DistributedComputingPlatform}
* in order to wrap the value in an XML element as specified by ISO 19115-3 standard.
* See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. |
<<<<<<<
* <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) and organization(s) associated with the process step.
=======
* @return means of communication with person(s) and organization(s) associated with the process step.
>>>>>>>
* <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) and organization(s) associated with the process step.
<<<<<<<
* <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>
*
* @param newValues The new processors.
=======
* @param newValues the new processors.
>>>>>>>
* <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>
*
* @param newValues the new processors. |
<<<<<<<
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[] SIZES = new byte[] {
Byte .BYTES,
Byte .BYTES, // NOT Character.BYTES
Short .BYTES,
Integer.BYTES,
Float .BYTES,
Double .BYTES,
>>>>>>>
private static final byte[] SIZES = new byte[] {
Byte .SIZE / Byte.SIZE,
Byte .SIZE / Byte.SIZE, // NOT Character.BYTES
Short .SIZE / Byte.SIZE,
Integer.SIZE / Byte.SIZE,
Float .SIZE / Byte.SIZE,
Double .SIZE / Byte.SIZE, |
<<<<<<<
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, specification=ISO_19115)
=======
@Override
@XmlElement(name = "scope")
@XmlJavaTypeAdapter(MD_Scope.Since2014.class)
>>>>>>>
@XmlElement(name = "scope")
@XmlJavaTypeAdapter(MD_Scope.Since2014.class)
@UML(identifier="scope", obligation=OPTIONAL, specification=ISO_19115)
<<<<<<<
/// @XmlElement(name = "additionalDocumentation")
@UML(identifier="additionalDocumentation", obligation=OPTIONAL, specification=ISO_19115)
=======
@Override
// @XmlElement at the end of this class.
>>>>>>>
// @XmlElement at the end of this class.
@UML(identifier="additionalDocumentation", obligation=OPTIONAL, specification=ISO_19115) |
<<<<<<<
// 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.factory.GIGS2004.class,
org.apache.sis.referencing.factory.GIGS2005.class,
org.apache.sis.referencing.factory.GIGS2006.class,
org.apache.sis.referencing.factory.GIGS2007.class,
org.apache.sis.referencing.factory.GIGS2008.class,
org.apache.sis.referencing.factory.GIGS2009.class,
// Following tests may use indirectly EPSG factory.
>>>>>>>
// Following tests may use indirectly EPSG factory. |
<<<<<<<
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 org.apache.sis.internal.jaxb.LegacyNamespaces;
import org.apache.sis.internal.jaxb.gmd.LocaleAdapter;
>>>>>>>
import org.apache.sis.internal.jaxb.FilterByVersion;
import org.apache.sis.internal.jaxb.LegacyNamespaces;
import org.apache.sis.internal.jaxb.gmd.LocaleAdapter;
<<<<<<<
@UML(identifier="featureTypes", obligation=OPTIONAL, specification=ISO_19115)
public Collection<DefaultFeatureTypeInfo> getFeatureTypeInfo() {
return featureTypes = nonNullCollection(featureTypes, DefaultFeatureTypeInfo.class);
=======
@Override
// @XmlElement at the end of this class.
public Collection<FeatureTypeInfo> getFeatureTypeInfo() {
return featureTypes = nonNullCollection(featureTypes, FeatureTypeInfo.class);
>>>>>>>
// @XmlElement at the end of this class.
@UML(identifier="featureTypes", obligation=OPTIONAL, specification=ISO_19115)
public Collection<DefaultFeatureTypeInfo> getFeatureTypeInfo() {
return featureTypes = nonNullCollection(featureTypes, DefaultFeatureTypeInfo.class);
<<<<<<<
return new LegacyPropertyAdapter<GenericName,DefaultFeatureTypeInfo>(getFeatureTypeInfo()) {
=======
if (!FilterByVersion.LEGACY_METADATA.accept()) return null;
return new LegacyPropertyAdapter<GenericName,FeatureTypeInfo>(getFeatureTypeInfo()) {
>>>>>>>
if (!FilterByVersion.LEGACY_METADATA.accept()) return null;
return new LegacyPropertyAdapter<GenericName,DefaultFeatureTypeInfo>(getFeatureTypeInfo()) { |
<<<<<<<
DefaultResponsibleParty responsibility = new DefaultResponsibleParty(Role.DISTRIBUTOR);
responsibility.setParties(singleton(party));
citation.getCitedResponsibleParties().add(responsibility);
=======
DefaultResponsibility responsibility = new DefaultResponsibility(Role.DISTRIBUTOR, null, party);
assertTrue(citation.getCitedResponsibleParties().add(responsibility));
>>>>>>>
DefaultResponsibleParty responsibility = new DefaultResponsibleParty(Role.DISTRIBUTOR);
responsibility.setParties(singleton(party));
assertTrue(citation.getCitedResponsibleParties().add(responsibility));
<<<<<<<
responsibility = new DefaultResponsibleParty(Role.POINT_OF_CONTACT);
responsibility.setParties(singleton(party));
citation.getCitedResponsibleParties().add(responsibility);
=======
responsibility = new DefaultResponsibility(Role.POINT_OF_CONTACT, null, party);
assertTrue(citation.getCitedResponsibleParties().add(responsibility));
>>>>>>>
responsibility = new DefaultResponsibleParty(Role.POINT_OF_CONTACT);
responsibility.setParties(singleton(party));
assertTrue(citation.getCitedResponsibleParties().add(responsibility)); |
<<<<<<<
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 MeasurementRange<>(Double.class,
>>>>>>>
return unique(new MeasurementRange<Double>(Double.class, |
<<<<<<<
// 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"
+ " │ │ ├─Dimension name……………………………………………………… Sample\n"
+ " │ │ └─Dimension size……………………………………………………… 15000\n"
+ " │ ├─Axis dimension properties (2 of 2)\n"
+ " │ │ ├─Dimension name……………………………………………………… Line\n"
+ " │ │ └─Dimension size……………………………………………………… 15500\n"
+ " │ └─Transformation parameter availability…… false\n"
+ " ├─Spatial representation info (2 of 3)\n"
+ " │ ├─Number of dimensions………………………………………………… 2\n"
+ " │ ├─Axis dimension properties (1 of 2)\n"
+ " │ │ ├─Dimension name……………………………………………………… Sample\n"
+ " │ │ └─Dimension size……………………………………………………… 7600\n"
+ " │ ├─Axis dimension properties (2 of 2)\n"
+ " │ │ ├─Dimension name……………………………………………………… Line\n"
+ " │ │ └─Dimension size……………………………………………………… 7800\n"
+ " │ └─Transformation parameter availability…… false\n"
+ " ├─Spatial representation info (3 of 3)\n"
+ " │ ├─Number of dimensions………………………………………………… 2\n"
+ " │ ├─Axis dimension properties (1 of 2)\n"
+ " │ │ ├─Dimension name……………………………………………………… Sample\n"
+ " │ │ └─Dimension size……………………………………………………… 7600\n"
+ " │ ├─Axis dimension properties (2 of 2)\n"
+ " │ │ ├─Dimension name……………………………………………………… Line\n"
+ " │ │ └─Dimension size……………………………………………………… 7800\n"
+ " │ └─Transformation parameter availability…… false\n"
+ " ├─Reference system info………………………………………………………… EPSG:WGS 84 / UTM zone 49N\n"
>>>>>>>
+ " ├─Spatial representation info (1 of 3)\n"
+ " │ ├─Number of dimensions………………………………………………… 2\n"
+ " │ ├─Axis dimension properties (1 of 2)\n"
+ " │ │ ├─Dimension name……………………………………………………… Sample\n"
+ " │ │ └─Dimension size……………………………………………………… 15000\n"
+ " │ ├─Axis dimension properties (2 of 2)\n"
+ " │ │ ├─Dimension name……………………………………………………… Line\n"
+ " │ │ └─Dimension size……………………………………………………… 15500\n"
+ " │ └─Transformation parameter availability…… false\n"
+ " ├─Spatial representation info (2 of 3)\n"
+ " │ ├─Number of dimensions………………………………………………… 2\n"
+ " │ ├─Axis dimension properties (1 of 2)\n"
+ " │ │ ├─Dimension name……………………………………………………… Sample\n"
+ " │ │ └─Dimension size……………………………………………………… 7600\n"
+ " │ ├─Axis dimension properties (2 of 2)\n"
+ " │ │ ├─Dimension name……………………………………………………… Line\n"
+ " │ │ └─Dimension size……………………………………………………… 7800\n"
+ " │ └─Transformation parameter availability…… false\n"
+ " ├─Spatial representation info (3 of 3)\n"
+ " │ ├─Number of dimensions………………………………………………… 2\n"
+ " │ ├─Axis dimension properties (1 of 2)\n"
+ " │ │ ├─Dimension name……………………………………………………… Sample\n"
+ " │ │ └─Dimension size……………………………………………………… 7600\n"
+ " │ ├─Axis dimension properties (2 of 2)\n"
+ " │ │ ├─Dimension name……………………………………………………… Line\n"
+ " │ │ └─Dimension size……………………………………………………… 7800\n"
+ " │ └─Transformation parameter availability…… false\n"
+ " ├─Reference system info………………………………………………………… EPSG:WGS 84 / UTM zone 49N\n"
<<<<<<<
+ " │ ├─Date…………………………………………………………………………… 2016-06-27 16:48:12\n"
+ " │ └─Date type……………………………………………………………… Creation\n"
+ " ├─Default locale+other locale………………………… en\n"
=======
+ " │ ├─Date…………………………………………………………………………………………… 2016-06-27 16:48:12\n"
+ " │ └─Date type……………………………………………………………………………… Creation\n"
>>>>>>>
+ " │ ├─Date…………………………………………………………………………………………… 2016-06-27 16:48:12\n"
+ " │ └─Date type……………………………………………………………………………… Creation\n"
+ " ├─Default locale+other locale………………………………………… en\n"
<<<<<<<
+ " │ │ ├─Role………………………………………………………………… Principal investigator\n"
+ " │ │ └─Party\n"
+ " │ │ └─Name……………………………………………………… International Organization for Standardization\n"
+ " │ ├─Edition…………………………………………………………………… ISO 19115-1:2014(E)\n"
=======
+ " │ │ ├─Party\n"
+ " │ │ │ └─Name……………………………………………………………………… International Organization for Standardization\n"
+ " │ │ └─Role………………………………………………………………………………… Principal investigator\n"
+ " │ ├─Edition…………………………………………………………………………………… ISO 19115-1:2014(E)\n"
>>>>>>>
+ " │ │ ├─Role………………………………………………………………………………… Principal investigator\n"
+ " │ │ └─Party\n"
+ " │ │ └─Name……………………………………………………………………… International Organization for Standardization\n"
+ " │ ├─Edition…………………………………………………………………………………… ISO 19115-1:2014(E)\n"
<<<<<<<
+ " │ │ └─Code………………………………………………………………… 19115-1\n"
+ " │ └─Presentation form………………………………………… Document digital\n"
=======
+ " │ │ ├─Code………………………………………………………………………………… 19115-1\n"
+ " │ │ ├─Code space………………………………………………………………… ISO\n"
+ " │ │ └─Version………………………………………………………………………… 2014(E)\n"
+ " │ └─Presentation form………………………………………………………… Document digital\n"
>>>>>>>
+ " │ │ └─Code………………………………………………………………………………… 19115-1\n"
+ " │ └─Presentation form………………………………………………………… Document digital\n"
<<<<<<<
+ " │ ├─Role………………………………………………………………… Principal investigator\n"
+ " │ └─Party\n"
+ " │ └─Name……………………………………………………… International Organization for Standardization\n"
+ " ├─Edition…………………………………………………………………… ISO 19115-2:2009(E)\n"
=======
+ " │ ├─Party\n"
+ " │ │ └─Name……………………………………………………………………… International Organization for Standardization\n"
+ " │ └─Role………………………………………………………………………………… Principal investigator\n"
+ " ├─Edition…………………………………………………………………………………… ISO 19115-2:2009(E)\n"
>>>>>>>
+ " │ ├─Role………………………………………………………………………………… Principal investigator\n"
+ " │ └─Party\n"
+ " │ └─Name……………………………………………………………………… International Organization for Standardization\n"
+ " ├─Edition…………………………………………………………………………………… ISO 19115-2:2009(E)\n"
<<<<<<<
+ " │ └─Code………………………………………………………………… 19115-2\n"
+ " └─Presentation form………………………………………… Document digital\n", text);
=======
+ " │ ├─Code………………………………………………………………………………… 19115-2\n"
+ " │ ├─Code space………………………………………………………………… ISO\n"
+ " │ └─Version………………………………………………………………………… 2009(E)\n"
+ " └─Presentation form………………………………………………………… Document digital\n", text);
>>>>>>>
+ " │ └─Code………………………………………………………………………………… 19115-2\n"
+ " └─Presentation form………………………………………………………… Document digital\n", text); |
<<<<<<<
} catch (Exception e) {
Logging.recoverableException(getClass(), "handleGetObject", e);
=======
} catch (ReflectiveOperationException e) {
e.addSuppressed(exception);
Logging.recoverableException(Logging.getLogger(Loggers.LOCALIZATION), getClass(), "handleGetObject", e);
>>>>>>>
} catch (Exception e) {
Logging.recoverableException(Logging.getLogger(Loggers.LOCALIZATION), getClass(), "handleGetObject", e); |
<<<<<<<
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 boolean position, final InternationalString name) {
checkWritePermission(valueIfDefined(super.getParties()));
final Iterator<Party> it = getParties().iterator();
>>>>>>>
private boolean setName(final Class<? extends AbstractParty> type, final boolean position, final InternationalString name) {
checkWritePermission(valueIfDefined(super.getParties()));
final Iterator<AbstractParty> it = getParties().iterator();
<<<<<<<
checkWritePermission();
final Iterator<AbstractParty> it = getParties().iterator();
=======
checkWritePermission(valueIfDefined(super.getParties()));
final Iterator<Party> it = getParties().iterator();
>>>>>>>
checkWritePermission(valueIfDefined(super.getParties()));
final Iterator<AbstractParty> it = getParties().iterator(); |
<<<<<<<
* <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.
=======
* @return address line for the location.
>>>>>>>
* <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.
<<<<<<<
* <div class="warning"><b>Upcoming API change — internationalization</b><br>
* The argument type may be changed from {@code Collection<String>} to
* {@code Collection<? extends InternationalString>} in GeoAPI 4.0.
* </div>
*
* @param newValues The new delivery points, or {@code null} if none.
=======
* @param newValues the new delivery points, or {@code null} if none.
>>>>>>>
* <div class="warning"><b>Upcoming API change — internationalization</b><br>
* The argument type may be changed from {@code Collection<String>} to
* {@code Collection<? extends InternationalString>} in GeoAPI 4.0.
* </div>
*
* @param newValues the new delivery points, or {@code null} if none. |
<<<<<<<
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();
=======
valueType = toString(DefaultAssociationRole.getValueTypeName(pt));
valueClass = Feature.class;
} else if (propertyType instanceof Operation) {
final IdentifiedType resultType = ((Operation) propertyType).getResult();
>>>>>>>
valueType = toString(DefaultAssociationRole.getValueTypeName(pt));
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 Graph graph,
final AuditRepository auditRepository,
final OntologyRepository ontologyRepository,
final UserRepository userRepository,
final VisibilityTranslator visibilityTranslator,
final Configuration configuration) {
super(userRepository, configuration);
=======
public RelationshipCreate(final Graph graph,
final AuditRepository auditRepository,
final OntologyRepository ontologyRepository,
final UserRepository userRepository,
final VisibilityTranslator visibilityTranslator) {
>>>>>>>
public RelationshipCreate(
final Graph graph,
final AuditRepository auditRepository,
final OntologyRepository ontologyRepository,
final VisibilityTranslator visibilityTranslator,
final UserRepository userRepository,
final Configuration configuration) {
super(userRepository, configuration);
<<<<<<<
this.visibilityTranslator = visibilityTranslator;
=======
this.userRepository = userRepository;
this.visibilityTranslator = visibilityTranslator;
>>>>>>>
this.visibilityTranslator = visibilityTranslator;
<<<<<<<
final String visibilitySource = getOptionalParameter(request, "visibilitySource"); // TODO change this to required when the front end is complete
String workspaceId = getWorkspaceId(request);
=======
final String visibilitySource = getOptionalParameter(request, "visibilitySource");
>>>>>>>
final String visibilitySource = getOptionalParameter(request, "visibilitySource");
String workspaceId = getWorkspaceId(request);
<<<<<<<
Edge edge = GraphUtil.addEdge(graph, sourceVertex, destVertex, predicateLabel, visibilitySource, workspaceId, visibilityTranslator, authorizations);
=======
Visibility visibility;
if (visibilitySource != null) {
visibility = visibilityTranslator.toVisibility(visibilitySource);
} else {
visibility = new Visibility("");
}
Edge edge = graph.addEdge(sourceVertex, destVertex, predicateLabel, visibility, authorizations);
>>>>>>>
Visibility visibility;
if (visibilitySource != null) {
visibility = visibilityTranslator.toVisibility(visibilitySource);
} else {
visibility = new Visibility("");
}
Edge edge = graph.addEdge(sourceVertex, destVertex, predicateLabel, visibility, authorizations); |
<<<<<<<
final List<CoordinateOperation> flattened = new ArrayList<CoordinateOperation>(operations.length);
initialize(properties, operations, flattened, mtFactory, (coordinateOperationAccuracy == null));
=======
final List<CoordinateOperation> flattened = new ArrayList<>(operations.length);
initialize(properties, operations, flattened, mtFactory,
(coordinateOperationAccuracy == null), (domainOfValidity == null));
>>>>>>>
final List<CoordinateOperation> flattened = new ArrayList<CoordinateOperation>(operations.length);
initialize(properties, operations, flattened, mtFactory,
(coordinateOperationAccuracy == null), (domainOfValidity == null));
<<<<<<<
final List<CoordinateOperation> flattened = new ArrayList<CoordinateOperation>(steps.length);
initialize(null, steps, flattened, DefaultFactories.forBuildin(MathTransformFactory.class), coordinateOperationAccuracy == null);
=======
final List<CoordinateOperation> flattened = new ArrayList<>(steps.length);
initialize(null, steps, flattened, DefaultFactories.forBuildin(MathTransformFactory.class),
(coordinateOperationAccuracy == null), (domainOfValidity == null));
>>>>>>>
final List<CoordinateOperation> flattened = new ArrayList<CoordinateOperation>(steps.length);
initialize(null, steps, flattened, DefaultFactories.forBuildin(MathTransformFactory.class),
(coordinateOperationAccuracy == null), (domainOfValidity == null)); |
<<<<<<<
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.ServiceIdentification;
import org.opengis.metadata.identification.DistributedComputingPlatform;
import org.apache.sis.metadata.iso.citation.DefaultCitation;
>>>>>>>
import org.apache.sis.internal.geoapi.evolution.UnsupportedCodeList;
import org.apache.sis.metadata.iso.citation.DefaultCitation; |
<<<<<<<
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.citation.TelephoneType;
>>>>>>>
<<<<<<<
/// @XmlElement(name = "number", required = true)
@UML(identifier="number", obligation=MANDATORY, specification=ISO_19115)
=======
@Override
@XmlElement(name = "number", required = true)
@XmlJavaTypeAdapter(StringAdapter.Since2014.class)
>>>>>>>
@XmlElement(name = "number", required = true)
@XmlJavaTypeAdapter(StringAdapter.Since2014.class)
@UML(identifier="number", obligation=MANDATORY, specification=ISO_19115)
<<<<<<<
/// @XmlElement(name = "numberType")
@UML(identifier="numberType", obligation=OPTIONAL, specification=ISO_19115)
@InterimType(UnsupportedCodeList.class)
public CodeList<?> getNumberType() {
=======
@Override
@XmlElement(name = "numberType")
@XmlJavaTypeAdapter(CI_TelephoneTypeCode.Since2014.class)
public TelephoneType getNumberType() {
>>>>>>>
@InterimType(UnsupportedCodeList.class)
@XmlElement(name = "numberType")
@XmlJavaTypeAdapter(CI_TelephoneTypeCode.Since2014.class)
@UML(identifier="numberType", obligation=OPTIONAL, specification=ISO_19115)
public CodeList<?> getNumberType() {
<<<<<<<
return new LegacyTelephones(getOwner(), UnsupportedCodeList.VOICE);
=======
if (FilterByVersion.LEGACY_METADATA.accept()) {
return new LegacyTelephones(getOwner(), TelephoneType.VOICE);
}
return null; // Marshalling newer ISO 19115-3 document.
>>>>>>>
if (FilterByVersion.LEGACY_METADATA.accept()) {
return new LegacyTelephones(getOwner(), UnsupportedCodeList.VOICE);
}
return null;
<<<<<<<
return new LegacyTelephones(getOwner(), UnsupportedCodeList.FACSIMILE);
=======
if (FilterByVersion.LEGACY_METADATA.accept()) {
return new LegacyTelephones(getOwner(), TelephoneType.FACSIMILE);
}
return null; // Marshalling newer ISO 19115-3 document.
>>>>>>>
if (FilterByVersion.LEGACY_METADATA.accept()) {
return new LegacyTelephones(getOwner(), UnsupportedCodeList.FACSIMILE);
}
return null; // Marshalling newer ISO 19115-3 document. |
<<<<<<<
/// @XmlElement(name = "dimensionTitle")
@UML(identifier="dimensionTitle", obligation=OPTIONAL, specification=ISO_19115)
=======
@Override
@XmlElement(name = "dimensionTitle")
@XmlJavaTypeAdapter(InternationalStringAdapter.Since2014.class)
>>>>>>>
@XmlElement(name = "dimensionTitle")
@XmlJavaTypeAdapter(InternationalStringAdapter.Since2014.class)
@UML(identifier="dimensionTitle", obligation=OPTIONAL, specification=ISO_19115)
<<<<<<<
/// @XmlElement(name = "dimensionDescription")
@UML(identifier="dimensionDescription", obligation=OPTIONAL, specification=ISO_19115)
=======
@Override
@XmlElement(name = "dimensionDescription")
@XmlJavaTypeAdapter(InternationalStringAdapter.Since2014.class)
>>>>>>>
@XmlElement(name = "dimensionDescription")
@XmlJavaTypeAdapter(InternationalStringAdapter.Since2014.class)
@UML(identifier="dimensionDescription", obligation=OPTIONAL, specification=ISO_19115) |
<<<<<<<
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.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.metadata.TitleProperty;
<<<<<<<
@SuppressWarnings("unchecked")
public DefaultOperationMetadata(final DefaultOperationMetadata object) {
=======
@SuppressWarnings({"unchecked", "rawtypes"})
public DefaultOperationMetadata(final OperationMetadata object) {
>>>>>>>
@SuppressWarnings({"unchecked", "rawtypes"})
public DefaultOperationMetadata(final DefaultOperationMetadata object) {
<<<<<<<
@XmlElement(name = "operationName", namespace = Namespaces.SRV, required = true)
@UML(identifier="operationName", obligation=MANDATORY, specification=ISO_19115)
=======
@Override
@XmlElement(name = "operationName", required = true)
>>>>>>>
@XmlElement(name = "operationName", required = true)
@UML(identifier="operationName", obligation=MANDATORY, specification=ISO_19115)
<<<<<<<
@XmlJavaTypeAdapter(DCPList.class)
@XmlElement(name = "DCP", namespace = Namespaces.SRV, required = true)
@UML(identifier="distributedComputingPlatform", obligation=MANDATORY, specification=ISO_19115)
public Collection<CodeList<?>> getDistributedComputingPlatforms() {
return distributedComputingPlatforms = nonNullCollection(distributedComputingPlatforms, (Class) CodeList.class);
=======
@Override
@XmlElement(name = "distributedComputingPlatform", required = true)
public Collection<DistributedComputingPlatform> getDistributedComputingPlatforms() {
return distributedComputingPlatforms = nonNullCollection(distributedComputingPlatforms, DistributedComputingPlatform.class);
>>>>>>>
@XmlJavaTypeAdapter(DCPList.class)
@XmlElement(name = "distributedComputingPlatform", required = true)
@UML(identifier="distributedComputingPlatform", obligation=MANDATORY, specification=ISO_19115)
public Collection<CodeList<?>> getDistributedComputingPlatforms() {
return distributedComputingPlatforms = nonNullCollection(distributedComputingPlatforms, (Class) CodeList.class);
<<<<<<<
@XmlElement(name = "operationDescription", namespace = Namespaces.SRV)
@UML(identifier="operationDescription", obligation=OPTIONAL, specification=ISO_19115)
=======
@Override
@XmlElement(name = "operationDescription")
>>>>>>>
@XmlElement(name = "operationDescription")
@UML(identifier="operationDescription", obligation=OPTIONAL, specification=ISO_19115)
<<<<<<<
@XmlElement(name = "invocationName", namespace = Namespaces.SRV)
@UML(identifier="invocationName", obligation=OPTIONAL, specification=ISO_19115)
=======
@Override
@XmlElement(name = "invocationName")
>>>>>>>
@XmlElement(name = "invocationName")
@UML(identifier="invocationName", obligation=OPTIONAL, specification=ISO_19115)
<<<<<<<
@XmlElement(name = "connectPoint", namespace = Namespaces.SRV, required = true)
@UML(identifier="connectPoint", obligation=MANDATORY, specification=ISO_19115)
=======
@Override
@XmlElement(name = "connectPoint", required = true)
>>>>>>>
@XmlElement(name = "connectPoint", required = true)
@UML(identifier="connectPoint", obligation=MANDATORY, specification=ISO_19115)
<<<<<<<
@SuppressWarnings("unchecked")
@XmlElement(name = "parameters", namespace = Namespaces.SRV)
@UML(identifier="parameters", obligation=OPTIONAL, specification=ISO_19115)
=======
@Override
@XmlElement(name = "parameter")
@SuppressWarnings({"unchecked", "rawtypes"})
>>>>>>>
@XmlElement(name = "parameter")
@SuppressWarnings({"unchecked", "rawtypes"})
@UML(identifier="parameters", obligation=OPTIONAL, specification=ISO_19115)
<<<<<<<
@XmlElement(name = "dependsOn", namespace = Namespaces.SRV)
@UML(identifier="dependsOn", obligation=OPTIONAL, specification=ISO_19115)
public List<DefaultOperationMetadata> getDependsOn() {
return dependsOn = nonNullList(dependsOn, DefaultOperationMetadata.class);
=======
@Override
@XmlElement(name = "dependsOn")
public List<OperationMetadata> getDependsOn() {
return dependsOn = nonNullList(dependsOn, OperationMetadata.class);
>>>>>>>
@XmlElement(name = "dependsOn")
@UML(identifier="dependsOn", obligation=OPTIONAL, specification=ISO_19115)
public List<DefaultOperationMetadata> getDependsOn() {
return dependsOn = nonNullList(dependsOn, DefaultOperationMetadata.class); |
<<<<<<<
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 for building, launch, or operation of the platform.
=======
* @return organization responsible for building, launch, or operation of the platform.
>>>>>>>
* <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 for building, launch, or operation of the platform.
<<<<<<<
* <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>
*
* @param newValues The new sponsors values;
=======
* @param newValues the new sponsors values;
>>>>>>>
* <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>
*
* @param newValues the new sponsors values; |
<<<<<<<
@UML(identifier="metadataIdentifier", obligation=OPTIONAL, specification=ISO_19115)
=======
@Override
@XmlElement(name = "metadataIdentifier")
@XmlJavaTypeAdapter(MD_Identifier.Since2014.class)
>>>>>>>
@XmlElement(name = "metadataIdentifier")
@XmlJavaTypeAdapter(MD_Identifier.Since2014.class)
@UML(identifier="metadataIdentifier", obligation=OPTIONAL, specification=ISO_19115)
<<<<<<<
@UML(identifier="defaultLocale+otherLocale", obligation=CONDITIONAL, specification=ISO_19115)
=======
@Override
// @XmlElement at the end of this class.
>>>>>>>
// @XmlElement at the end of this class.
@UML(identifier="defaultLocale+otherLocale", obligation=CONDITIONAL, specification=ISO_19115)
<<<<<<<
@UML(identifier="parentMetadata", obligation=CONDITIONAL, specification=ISO_19115)
=======
@Override
@XmlElement(name = "parentMetadata")
@XmlJavaTypeAdapter(CI_Citation.Since2014.class)
>>>>>>>
@XmlElement(name = "parentMetadata")
@XmlJavaTypeAdapter(CI_Citation.Since2014.class)
@UML(identifier="parentMetadata", obligation=CONDITIONAL, specification=ISO_19115)
<<<<<<<
@UML(identifier="metadataScope", obligation=CONDITIONAL, specification=ISO_19115)
public Collection<DefaultMetadataScope> getMetadataScopes() {
return metadataScopes = nonNullCollection(metadataScopes, DefaultMetadataScope.class);
=======
@Override
// @XmlElement at the end of this class.
public Collection<MetadataScope> getMetadataScopes() {
return metadataScopes = nonNullCollection(metadataScopes, MetadataScope.class);
>>>>>>>
// @XmlElement at the end of this class.
@UML(identifier="metadataScope", obligation=CONDITIONAL, specification=ISO_19115)
public Collection<DefaultMetadataScope> getMetadataScopes() {
return metadataScopes = nonNullCollection(metadataScopes, DefaultMetadataScope.class);
<<<<<<<
@UML(identifier="dateInfo", obligation=MANDATORY, specification=ISO_19115)
=======
@Override
// @XmlElement at the end of this class.
>>>>>>>
// @XmlElement at the end of this class.
@UML(identifier="dateInfo", obligation=MANDATORY, specification=ISO_19115)
<<<<<<<
@UML(identifier="metadataStandard", obligation=OPTIONAL, specification=ISO_19115)
=======
@Override
// @XmlElement at the end of this class.
>>>>>>>
// @XmlElement at the end of this class.
@UML(identifier="metadataStandard", obligation=OPTIONAL, specification=ISO_19115)
<<<<<<<
@UML(identifier="metadataProfile", obligation=OPTIONAL, specification=ISO_19115)
=======
@Override
// @XmlElement at the end of this class.
>>>>>>>
// @XmlElement at the end of this class.
@UML(identifier="metadataProfile", obligation=OPTIONAL, specification=ISO_19115)
<<<<<<<
@UML(identifier="alternativeMetadataReference", obligation=OPTIONAL, specification=ISO_19115)
=======
@Override
// @XmlElement at the end of this class.
>>>>>>>
// @XmlElement at the end of this class.
@UML(identifier="alternativeMetadataReference", obligation=OPTIONAL, specification=ISO_19115)
<<<<<<<
@UML(identifier="metadataLinkage", obligation=OPTIONAL, specification=ISO_19115)
=======
@Override
// @XmlElement at the end of this class.
>>>>>>>
// @XmlElement at the end of this class.
@UML(identifier="metadataLinkage", obligation=OPTIONAL, specification=ISO_19115)
<<<<<<<
@UML(identifier="resourceLineage", obligation=OPTIONAL, specification=ISO_19115)
=======
@Override
// @XmlElement at the end of this class.
>>>>>>>
// @XmlElement at the end of this class.
@UML(identifier="resourceLineage", obligation=OPTIONAL, specification=ISO_19115) |
<<<<<<<
=======
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 AbstractIdentifiedType {
<<<<<<<
public AbstractIdentifiedType getResult() {
=======
@Override
public IdentifiedType getResult() {
>>>>>>>
public AbstractIdentifiedType getResult() { |
<<<<<<<
=======
// 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, ParameterDescriptor<Double>> roles(final byte variant) {
final EnumMap<ParameterRole, ParameterDescriptor<Double>> roles = new EnumMap<>(ParameterRole.class);
>>>>>>>
private static Map<ParameterRole, ParameterDescriptor<Double>> roles(final byte variant) {
final EnumMap<ParameterRole, ParameterDescriptor<Double>> roles =
new EnumMap<ParameterRole, ParameterDescriptor<Double>>(ParameterRole.class); |
<<<<<<<
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;
<<<<<<<
"<gmd:RS_Identifier xmlns:gmd=\"" + LegacyNamespaces.GMD + '"' +
" xmlns:gmx=\"" + LegacyNamespaces.GMX + '"' +
" xmlns:gco=\"" + LegacyNamespaces.GCO + '"' +
" xmlns:xlink=\"" + Namespaces.XLINK + "\">\n" +
" <gmd:code>\n" +
" <gmx:Anchor xlink:href=\"SDN:L101:2:4326\">EPSG:4326</gmx:Anchor>\n" +
" </gmd:code>\n" +
" <gmd:codeSpace>\n" +
" <gco:CharacterString>L101</gco:CharacterString>\n" +
" </gmd:codeSpace>\n" +
"</gmd:RS_Identifier>";
final ReferenceIdentifier id = unmarshal(ReferenceIdentifier.class, expected);
=======
"<gmd:MD_ReferenceSystem xmlns:gmd=\"" + LegacyNamespaces.GMD + '"' +
" xmlns:gmx=\"" + LegacyNamespaces.GMX + '"' +
" xmlns:gco=\"" + LegacyNamespaces.GCO + '"' +
" xmlns:xlink=\"" + Namespaces.XLINK + "\">\n" +
" <gmd:referenceSystemIdentifier>" +
" <gmd:RS_Identifier>" +
" <gmd:code>\n" +
" <gmx:Anchor xlink:href=\"SDN:L101:2:4326\">EPSG:4326</gmx:Anchor>\n" +
" </gmd:code>\n" +
" <gmd:codeSpace>\n" +
" <gco:CharacterString>L101</gco:CharacterString>\n" +
" </gmd:codeSpace>\n" +
" </gmd:RS_Identifier>" +
" </gmd:referenceSystemIdentifier>" +
"</gmd:MD_ReferenceSystem>";
final ReferenceSystemMetadata md = unmarshal(ReferenceSystemMetadata.class, expected);
final Identifier id = md.getName();
>>>>>>>
"<gmd:MD_ReferenceSystem xmlns:gmd=\"" + LegacyNamespaces.GMD + '"' +
" xmlns:gmx=\"" + LegacyNamespaces.GMX + '"' +
" xmlns:gco=\"" + LegacyNamespaces.GCO + '"' +
" xmlns:xlink=\"" + Namespaces.XLINK + "\">\n" +
" <gmd:referenceSystemIdentifier>" +
" <gmd:RS_Identifier>" +
" <gmd:code>\n" +
" <gmx:Anchor xlink:href=\"SDN:L101:2:4326\">EPSG:4326</gmx:Anchor>\n" +
" </gmd:code>\n" +
" <gmd:codeSpace>\n" +
" <gco:CharacterString>L101</gco:CharacterString>\n" +
" </gmd:codeSpace>\n" +
" </gmd:RS_Identifier>" +
" </gmd:referenceSystemIdentifier>" +
"</gmd:MD_ReferenceSystem>";
final ReferenceSystemMetadata md = unmarshal(ReferenceSystemMetadata.class, expected);
final ReferenceIdentifier id = md.getName(); |
<<<<<<<
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.Polygon;
import com.esri.core.geometry.Polyline;
import com.esri.core.geometry.Geometry;
import org.apache.sis.feature.DefaultFeatureType;
import org.apache.sis.feature.DefaultAttributeType;
import org.apache.sis.storage.DataStoreException;
=======
import java.io.File;
import java.util.Objects;
>>>>>>>
import java.io.File;
<<<<<<<
import org.apache.sis.internal.jdk7.Objects;
import org.opengis.feature.Feature;
=======
>>>>>>>
import org.apache.sis.internal.jdk7.Objects;
<<<<<<<
/** Z Max. */
public double zmax; // little
/** M Min. */
public double mmin; // little
/** M Max. */
public double mmax; // little
/** Underlying databasefile content. */
private Database dbf;
/** Features existing in the shapefile. */
public Map<Integer, Feature> FeatureMap = new HashMap<Integer, Feature>();
=======
/** Database file. */
private File databaseFile;
>>>>>>>
/** Database file. */
private File databaseFile; |
<<<<<<<
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 void createMarshallerPool() throws JAXBException {
final Map<String,Object> properties = new HashMap<String,Object>(4); |
<<<<<<<
=======
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.getReturnType(method);
=======
final Class<?> type = TableHierarchy.subType(info.getMetadataType(), toSearch.identifier);
final Class<?> returnType = method.getReturnType();
>>>>>>>
final Class<?> type = TableHierarchy.subType(info.getMetadataType(), toSearch.identifier);
final Class<?> returnType = Interim.getReturnType(method); |
<<<<<<<
* <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 descriptions.</li>
* <li>{@link #forStandardName(String)} and {@link #forCodeName(Class, String, boolean)} for
* fetching an instance from a name (converse of above {@code get} methods).</li>
=======
* <li>Methods for fetching the ISO name or description of a code list:<ul>
* <li>{@link #getStandardName(Class)} for ISO name</li>
* <li>{@link #getListName(ControlledVocabulary)} for ISO name</li>
* <li>{@link #getDescription(Class)} for a description</li>
* </ul></li>
* <li>Methods for fetching the ISO name or description of a code value:<ul>
* <li>{@link #getCodeName(ControlledVocabulary)} for ISO name,</li>
* <li>{@link #getCodeTitle(ControlledVocabulary)} for a label or title</li>
* <li>{@link #getDescription(ControlledVocabulary)} for a more verbose description</li>
* </ul></li>
* <li>Methods for fetching an instance from a name (converse of above {@code get} methods):<ul>
* <li>{@link #forCodeName(Class, String, boolean)}</li>
* <li>{@link #forEnumName(Class, String)}</li>
* </ul></li>
* </ul>
*
* <div class="section">Substituting a free text by a code list</div>
* The ISO standard allows to substitute some character strings in the <cite>"free text"</cite> domain
* by a {@link CodeList} value.
*
* <div class="note"><b>Example:</b>
* in the following XML fragment, the {@code <gmi:type>} value is normally a {@code <gco:CharacterString>}
* but has been replaced by a {@code SensorType} code below:
*
* {@preformat xml
* <gmi:MI_Instrument>
* <gmi:type>
* <gmi:MI_SensorTypeCode
* codeList="http://navigator.eumetsat.int/metadata_schema/eum/resources/Codelist/eum_gmxCodelists.xml#CI_SensorTypeCode"
* codeListValue="RADIOMETER">Radiometer</gmi:MI_SensorTypeCode>
* </gmi:type>
* </gmi:MI_Instrument>
* }
* </div>
*
* Such substitution can be done with:
*
* <ul>
* <li>{@link #getCodeTitle(ControlledVocabulary)} for getting the {@link InternationalString} instance
* to store in a metadata property.</li>
* <li>{@link #forCodeTitle(CharSequence)} for retrieving the {@link CodeList} previously stored as an
* {@code InternationalString}.</li>
>>>>>>>
* <li>Methods for fetching the ISO name or description of a code list:<ul>
* <li>{@link #getStandardName(Class)} for ISO name</li>
* <li>{@link #getListName(CodeList)} for ISO name</li>
* <li>{@link #getDescription(Class)} for a description</li>
* </ul></li>
* <li>Methods for fetching the ISO name or description of a code value:<ul>
* <li>{@link #getCodeName(CodeList)} for ISO name,</li>
* <li>{@link #getCodeTitle(CodeList)} for a label or title</li>
* <li>{@link #getDescription(CodeList)} for a more verbose description</li>
* </ul></li>
* <li>Methods for fetching an instance from a name (converse of above {@code get} methods):<ul>
* <li>{@link #forCodeName(Class, String, boolean)}</li>
* <li>{@link #forEnumName(Class, String)}</li>
* </ul></li>
* </ul>
*
* <div class="section">Substituting a free text by a code list</div>
* The ISO standard allows to substitute some character strings in the <cite>"free text"</cite> domain
* by a {@link CodeList} value.
*
* <div class="note"><b>Example:</b>
* in the following XML fragment, the {@code <gmi:type>} value is normally a {@code <gco:CharacterString>}
* but has been replaced by a {@code SensorType} code below:
*
* {@preformat xml
* <gmi:MI_Instrument>
* <gmi:type>
* <gmi:MI_SensorTypeCode
* codeList="http://navigator.eumetsat.int/metadata_schema/eum/resources/Codelist/eum_gmxCodelists.xml#CI_SensorTypeCode"
* codeListValue="RADIOMETER">Radiometer</gmi:MI_SensorTypeCode>
* </gmi:type>
* </gmi:MI_Instrument>
* }
* </div>
*
* Such substitution can be done with:
*
* <ul>
* <li>{@link #getCodeTitle(CodeList)} for getting the {@link InternationalString} instance
* to store in a metadata property.</li>
* <li>{@link #forCodeTitle(CharSequence)} for retrieving the {@link CodeList} previously stored as an
* {@code InternationalString}.</li>
<<<<<<<
* @see #getDescription(CodeList)
=======
* @see #getDescription(ControlledVocabulary)
* @see #forCodeTitle(CharSequence)
>>>>>>>
* @see #getDescription(CodeList)
* @see #forCodeTitle(CharSequence)
<<<<<<<
private final CodeList<?> code;
=======
final ControlledVocabulary code;
>>>>>>>
final CodeList<?> code;
<<<<<<<
* Returns the resource key for the given code list.
*/
static String resourceKey(final CodeList<?> code) {
String key = getCodeName(code);
if (key.indexOf(SEPARATOR) < 0) {
key = getListName(code) + SEPARATOR + key;
}
return key;
}
/**
* Returns all known values for the given type of code list.
=======
* Returns all known values for the given type of code list or enumeration.
>>>>>>>
* Returns all known values for the given type of code list. |
<<<<<<<
"Role",
"Party",
"Name",
=======
"Organisation", // A Party subtype
"Name", // In COMPACT mode, this value is associated to "Organisation" node.
"Role",
>>>>>>>
"Role",
"Party",
"Name", // In COMPACT mode, this value is associated to "Organisation" node.
<<<<<<<
"Role",
"Party",
"Name",
=======
"Individual", // A Party subtype
"Name", // In COMPACT mode, this value is associated to "Individual" node.
>>>>>>>
"Role",
"Party",
"Name", // In COMPACT mode, this value is associated to "Individual" node.
<<<<<<<
"name",
=======
"name", // In COMPACT mode, this value is associated to "party" node.
"role",
>>>>>>>
"name", // In COMPACT mode, this value is associated to "party" node.
<<<<<<<
null, // name
=======
null, // name — in COMPACT mode, this value is associated to "party" node.
null, // role
>>>>>>>
null, // name — in COMPACT mode, this value is associated to "party" node.
<<<<<<<
null, // ResponsibleParty
Role.DISTRIBUTOR,
null, // Party (organisation)
=======
null, // ResponsibleParty
null, // Party (organisation)
>>>>>>>
null, // ResponsibleParty
Role.DISTRIBUTOR,
null, // Party (organisation)
<<<<<<<
null, // ResponsibleParty
Role.POINT_OF_CONTACT,
null, // Party (individual)
=======
Role.DISTRIBUTOR,
null, // ResponsibleParty
null, // Party (individual)
>>>>>>>
null, // ResponsibleParty
Role.POINT_OF_CONTACT,
null, // Party (individual) |
<<<<<<<
@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_19115)
@ValueRange(minimum=0, isMinIncluded=false)
<<<<<<<
@ValueRange(minimum=0, isMinIncluded=false)
=======
@Override
>>>>>>>
<<<<<<<
@UML(identifier="angularDistance", obligation=CONDITIONAL, specification=ISO_19115)
=======
@ValueRange(minimum=0, isMinIncluded=false)
>>>>>>>
@UML(identifier="angularDistance", obligation=CONDITIONAL, specification=ISO_19115)
@ValueRange(minimum=0, isMinIncluded=false) |
<<<<<<<
// 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.
*/
public Doclet() {
}
/**
* Invoked by the Javadoc tools for initializing the doclet.
=======
* Invoked by reflection for creating the doclet.
*/
public Doclet() {
}
/**
* Invoked by Javadoc for starting the doclet.
>>>>>>>
* The directory where HTML pages will be written.
*/
private String outputDirectory;
/**
* Invoked by the Javadoc tools for instantiating the custom doclet.
*/
public Doclet() {
}
/**
* Invoked by the Javadoc tools for initializing the doclet. |
<<<<<<<
@XmlElement(name = "userContactInfo", required = true)
public Collection<ResponsibleParty> getUserContactInfo() {
return userContactInfo = nonNullCollection(userContactInfo, ResponsibleParty.class);
=======
@XmlElement(name = "userContactInfo")
public Collection<Responsibility> getUserContactInfo() {
return userContactInfo = nonNullCollection(userContactInfo, Responsibility.class);
>>>>>>>
@XmlElement(name = "userContactInfo")
public Collection<ResponsibleParty> getUserContactInfo() {
return userContactInfo = nonNullCollection(userContactInfo, ResponsibleParty.class);
<<<<<<<
/// @XmlElement(name = "response")
@UML(identifier="response", obligation=OPTIONAL, specification=ISO_19115)
public Collection<? extends InternationalString> getResponses() {
=======
@Override
// @XmlElement at the end of this class.
public Collection<InternationalString> getResponses() {
>>>>>>>
// @XmlElement at the end of this class.
@UML(identifier="response", obligation=OPTIONAL, specification=ISO_19115)
public Collection<InternationalString> getResponses() {
<<<<<<<
/// @XmlElement(name = "additionalDocumentation")
@UML(identifier="additionalDocumentation", obligation=OPTIONAL, specification=ISO_19115)
=======
@Override
// @XmlElement at the end of this class.
>>>>>>>
// @XmlElement at the end of this class.
@UML(identifier="additionalDocumentation", obligation=OPTIONAL, specification=ISO_19115)
<<<<<<<
/// @XmlElement(name = "identifiedIssues")
@UML(identifier="identifiedIssues", obligation=OPTIONAL, specification=ISO_19115)
public Collection<? extends Citation> getIdentifiedIssues() {
=======
@Override
// @XmlElement at the end of this class.
public Collection<Citation> getIdentifiedIssues() {
>>>>>>>
// @XmlElement at the end of this class.
@UML(identifier="identifiedIssues", obligation=OPTIONAL, specification=ISO_19115)
public Collection<Citation> getIdentifiedIssues() { |
<<<<<<<
* @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.
<<<<<<<
* @param value The obligation enumeration.
* @return The name of the given obligation.
=======
* @param e the value to wrap.
* @return the wrapped value.
>>>>>>>
* @param value the obligation enumeration.
* @return the name of the given obligation. |
<<<<<<<
=======
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 IllegalArgumentException("Non-existant pack: " + parent);
=======
private Map<File,PackInput> getInputJARs() throws IOException {
final Set<String> filenames = JarCollector.loadDependencyList(new File(binariesDirectory, CONTENT_FILE));
filenames.addAll(Arrays.asList(binariesDirectory.list(this)));
final Map<File,PackInput> inputJARs = new LinkedHashMap<>(filenames.size() * 4/3);
for (final String filename : filenames) {
File file = new File(filename);
if (!file.isAbsolute()) {
file = new File(binariesDirectory, filename);
>>>>>>>
private Map<File,PackInput> getInputJARs() throws IOException {
final Set<String> filenames = JarCollector.loadDependencyList(new File(binariesDirectory, CONTENT_FILE));
filenames.addAll(Arrays.asList(binariesDirectory.list(this)));
final Map<File,PackInput> inputJARs = new LinkedHashMap<File,PackInput>(filenames.size() * 4/3);
for (final String filename : filenames) {
File file = new File(filename);
if (!file.isAbsolute()) {
file = new File(binariesDirectory, filename);
<<<<<<<
final File outDirectory = new File(targetDirectory, PACK_DIRECTORY);
if (!outDirectory.isDirectory()) {
if (!outDirectory.mkdir()) {
throw new IOException("Can't create the \"" + PACK_DIRECTORY + "\" directory.");
}
}
/*
* Opens all input JAR files in read-only mode, and create the initially empty output JAR
* file. We need to open all input files in order to check for duplicate entries before we
* start the writing process. Files in the META-INF/services directory need to be merged.
*/
for (final Map.Entry<String,PackOutput> entry : outputs.entrySet()) {
final String name = entry.getKey();
final PackOutput pack = entry.getValue();
pack.createPackInputs(inputs);
pack.open(new File(outDirectory, name));
}
/*
* Iterates through the individual jars and merge them in single, bigger JAR file.
* During each iteration we get the array of output streams where a particular file
* need to be copied - all those "active" output streams will be filled in parallel.
*/
final byte[] buffer = new byte[64*1024];
final Map<File,PackInput> activeInputs = new LinkedHashMap<File,PackInput>(inputs.size() * 4/3);
final PackOutput[] activesForFile = new PackOutput[outputs.size()];
final PackOutput[] activesForEntry = new PackOutput[activesForFile.length];
final PackOutput[] activesForFollow = new PackOutput[activesForFile.length];
for (final Iterator<Map.Entry<File,PackInput>> it = inputs.entrySet().iterator(); it.hasNext();) {
final Map.Entry<File,PackInput> fileInputPair = it.next();
final File inputFile = fileInputPair.getKey();
final PackInput input = fileInputPair.getValue();
try {
it.remove(); // Needs to be before next usage of "inputs" below.
int countForFile = 0;
for (final PackOutput candidate : outputs.values()) {
if (candidate.contains(inputFile)) {
activesForFile[countForFile++] = candidate;
candidate.copyInputs(inputs, activeInputs);
}
}
/*
* "activesForFile" now contains the list of PackOutput we need to care about
* for the current PackInput (i.e. a whole input JAR). Copies every entries
* found in that JAR.
*/
for (JarEntry entry; (entry = input.nextEntry()) != null;) {
int countForEntry = 0;
for (int i=0; i<countForFile; i++) {
final PackOutput candidate = activesForFile[i];
if (candidate.putNextEntry(entry)) {
activesForEntry[countForEntry++] = candidate;
}
}
copy(input.getInputStream(), activesForEntry, countForEntry, buffer);
/*
* From that points, the entry has been copied to all target JARs. Now looks in
* following input JARs to see if there is some META-INF/services files to merge.
*/
final String name = entry.getName();
if (PackOutput.mergeAllowed(name)) {
for (final Map.Entry<File,PackInput> continuing : activeInputs.entrySet()) {
final InputStream in = continuing.getValue().getInputStream(name);
if (in != null) {
final File file = continuing.getKey();
int countForFollow = 0;
for (int i=0; i<countForEntry; i++) {
final PackOutput candidate = activesForEntry[i];
if (candidate.contains(file)) {
activesForFollow[countForFollow++] = candidate;
}
}
copy(in, activesForFollow, countForFollow, buffer);
Arrays.fill(activesForFollow, null);
}
}
}
for (int i=0; i<countForEntry; i++) {
activesForEntry[i].closeEntry();
}
Arrays.fill(activesForEntry, null);
}
Arrays.fill(activesForFile, null);
activeInputs.clear();
} finally {
input.close();
}
}
close();
}
/**
* Copies fully the given input stream to the given destination.
* The given input stream is closed after the copy.
*
* @param in The input stream from which to get the the content to copy.
* @param out Where to copy the input stream content.
* @param count Number of valid entries in the {@code out} array.
* @param buffer Temporary buffer to reuse at each method call.
* @throws IOException If an error occurred during the copy.
*/
private static void copy(final InputStream in, final PackOutput[] out, final int count,
final byte[] buffer) throws IOException
{
int n;
while ((n = in.read(buffer)) >= 0) {
for (int i=0; i<count; i++) {
out[i].write(buffer, n);
}
}
in.close();
}
/**
* Closes all streams.
*
* @throws IOException If an error occurred while closing the stream.
*/
public void close() throws IOException {
for (final PackOutput jar : outputs.values()) {
jar.close();
}
for (final PackInput jar : inputs.values()) {
jar.close();
=======
final File outDirectory = distributionDirectory(targetDirectory);
final PackOutput output = new PackOutput(getInputJARs(), new File(outDirectory, outputJAR));
try {
output.open(projectName, projectURL, version);
output.writeContent();
} finally {
output.close();
>>>>>>>
final File outDirectory = distributionDirectory(targetDirectory);
final PackOutput output = new PackOutput(getInputJARs(), new File(outDirectory, outputJAR));
try {
output.open(projectName, projectURL, version);
output.writeContent();
} finally {
output.close(); |
<<<<<<<
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 world) {
final Map<String,Object> map = new HashMap<>(8);
>>>>>>>
private static Map<String,Object> properties(final short code, final String name, final String alias, final boolean world) {
final Map<String,Object> map = new HashMap<String,Object>(8); |
<<<<<<<
@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 String formula,
final Integer dimension)
{
final Map<String,Object> properties = new HashMap<>(8);
>>>>>>>
private static DefaultOperationMethod create(final String method, final String identifier, final String formula,
final Integer dimension)
{
final Map<String,Object> properties = new HashMap<String,Object>(8); |
<<<<<<<
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.internal.metadata.legacy.LegacyPropertyAdapter; |
<<<<<<<
=======
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 DefaultResponsibleParty(metadata);
} else {
return metadata;
=======
if (FilterByVersion.CURRENT_METADATA.accept()) {
if (metadata instanceof ResponsibleParty) {
// Need to build new DefaultResponsibility object here — simply casting doesn't work.
return new DefaultResponsibility(metadata);
}
return DefaultResponsibility.castOrCopy(metadata);
} else {
return DefaultResponsibleParty.castOrCopy(metadata);
>>>>>>>
if (FilterByVersion.CURRENT_METADATA.accept()) {
if (metadata instanceof ResponsibleParty) {
// Need to build new DefaultResponsibility object here — simply casting doesn't work.
return new DefaultResponsibility(metadata);
}
return metadata;
} else if (FilterByVersion.LEGACY_METADATA.accept()) {
if (metadata instanceof DefaultResponsibleParty) {
return metadata;
} else {
return new DefaultResponsibleParty(metadata);
}
} else {
return null; |
<<<<<<<
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.openedStatements.size(), this.openedStatements.stream().map(DBFStatement::toString).collect(Collectors.joining(", ")));
>>>>>>>
if (this.openedStatements.size() > 0) {
log(Level.WARNING, "log.statements_left_opened", this.openedStatements.size(), openedStatements.toString()); |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.