conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
import org.apache.sis.geometry.AbstractEnvelope;
=======
import org.apache.sis.internal.util.CollectionsExt;
import org.apache.sis.internal.simple.SimpleDuration;
import org.apache.sis.geometry.AbstractEnvelope;
>>>>>>>
import org.apache.sis.internal.util.CollectionsExt;
import org.apache.sis.geometry.Abstra... |
<<<<<<<
import org.apache.http.client.HttpClient;
=======
import com.ning.http.client.FluentStringsMap;
import com.ning.http.client.filter.FilterContext;
import com.ning.http.client.filter.FilterException;
import com.ning.http.client.filter.RequestFilter;
>>>>>>>
import org.apache.http.client.HttpClient;
<<<<<<<
=... |
<<<<<<<
// 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; |
<<<<<<<
=======
// Branch-dependent imports
import org.opengis.feature.Attribute;
import org.opengis.feature.AttributeType;
import org.opengis.feature.Feature;
import org.opengis.feature.InvalidPropertyValueException;
>>>>>>> |
<<<<<<<
import static org.opengis.annotation.Obligation.OPTIONAL;
import static org.opengis.annotation.Obligation.MANDATORY;
import static org.opengis.annotation.Specification.ISO_19115;
=======
// Branch-dependent imports
import org.apache.sis.internal.jdk8.BiConsumer;
>>>>>>>
// Branch-dependent imports
import o... |
<<<<<<<
return getTaskRequest( "service/local/schedules?allTasks=true" );
}
private static List<ScheduledServiceListResource> getTaskRequest( String uri )
throws IOException
{
try
{
String entityText = RequestFacade.doGetForText( uri, isSuccessful() );
... |
<<<<<<<
// Branch-dependent imports
import org.apache.sis.internal.jdk8.Stream;
import org.opengis.feature.Feature;
=======
import org.opengis.metadata.Metadata;
import org.apache.sis.storage.DataStore;
import org.apache.sis.setup.GeometryLibrary;
import org.apache.sis.internal.feature.Geometries;
import org.apache.s... |
<<<<<<<
=======
import org.opengis.util.NameFactory;
import org.opengis.metadata.Identifier;
>>>>>>>
import org.opengis.util.NameFactory;
<<<<<<<
final NameSpace scope = SIS_NAMES.createNameSpace(SIS_NAMES.createLocalName(null, "OGP"), null);
final NamedIdentifier identifier = new NamedIdentifier(SI... |
<<<<<<<
import org.opengis.annotation.UML;
=======
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
>>>>>>>
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
<<<<<<<
/// @XmlElement(name = "description")
@UML(identifier="description", obligation=OPTIONAL, specification=ISO_19115)
=====... |
<<<<<<<
import org.apache.sis.feature.AbstractFeature;
=======
import org.apache.sis.storage.DataStoreClosedException;
import org.opengis.feature.Feature;
>>>>>>>
import org.apache.sis.storage.DataStoreClosedException;
import org.apache.sis.feature.AbstractFeature;
<<<<<<<
public AbstractFeature readFeature() t... |
<<<<<<<
=======
// Branch-dependent imports
import org.opengis.coverage.grid.GridEnvelope;
import org.opengis.coverage.grid.GridCoordinates;
import org.opengis.coverage.CannotEvaluateException;
import org.opengis.coverage.PointOutsideCoverageException;
>>>>>>> |
<<<<<<<
* <div class="warning"><b>Upcoming API change — multiplicity</b><br>
* As of ISO 19115:2014, this singleton has been replaced by a collection.
* This change will tentatively be applied in GeoAPI 4.0.
* </div>
*
* @return Time period when individuals can contact the organization or ... |
<<<<<<<
for (int i=0; i<table.length; i++) {
for (Entry el=table[i]; el!=null; el=(Entry) el.next) {
final Map.Entry<K,V> entry = new SimpleEntry<K,V>(el);
=======
for (Entry el : table) {
while (el != null) {
... |
<<<<<<<
final double[] transformedData = new double[expectedData.length];
=======
toleranceModifier = null;
final double[] transformedData = new double[StrictMath.max(sourceDim, targetDim) * numPts];
>>>>>>>
final double[] transformedData = new double[StrictMath.max(sourceDim, targetD... |
<<<<<<<
import org.sonatype.nexus.rest.model.NexusNGArtifact;
=======
import org.sonatype.nexus.proxy.ResourceStoreRequest;
import org.sonatype.nexus.proxy.repository.Repository;
>>>>>>>
import org.sonatype.nexus.rest.model.NexusNGArtifact;
import org.sonatype.nexus.proxy.ResourceStoreRequest;
import org.sonatype.ne... |
<<<<<<<
import org.apache.sis.internal.shapefile.InvalidShapefileFormatException;
import org.apache.sis.internal.shapefile.ShapefileNotFoundException;
import org.apache.sis.internal.shapefile.jdbc.DbaseFileNotFoundException;
import org.apache.sis.internal.shapefile.jdbc.InvalidDbaseFileFormatException;
import org.apach... |
<<<<<<<
=======
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
>>>>>>>
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
<<<<<<<
public class NexusStatusUtil
{
protected static Logger log = LoggerFactory.getLogger( NexusStatusUtil.class );
=======
public class NexusStatusUtil {
protected... |
<<<<<<<
// 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; |
<<<<<<<
import org.opengis.annotation.UML;
=======
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
>>>>>>>
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
<<<<<<<
import org.opengis.metadata.quality.Scope;
import org.apache.sis.metadata.iso.citation.DefaultResponsibility;
=======
impor... |
<<<<<<<
import org.apache.sis.internal.jdk7.Objects;
import org.apache.sis.io.wkt.Formatter;
=======
import java.util.Objects;
>>>>>>>
import org.apache.sis.internal.jdk7.Objects;
<<<<<<<
final boolean setAccuracy = (coordinateOperationAccuracy == null);
final List<CoordinateOperation> flattened = n... |
<<<<<<<
import javax.measure.Unit;
import javax.measure.quantity.Angle;
import javax.measure.quantity.Length;
import org.opengis.metadata.extent.Extent;
=======
import org.opengis.metadata.Identifier;
import org.opengis.util.FactoryException;
>>>>>>>
import org.opengis.util.FactoryException;
<<<<<<<
import org.open... |
<<<<<<<
static final DefaultAttributeType<Polyline> RESULT_TYPE = new DefaultAttributeType<>(
Collections.singletonMap(NAME_KEY, AttributeConvention.ENVELOPE_PROPERTY), Polyline.class, 1, 1, null);
=======
private final String association;
>>>>>>>
private final String association;
<<<<<<<
... |
<<<<<<<
* <div class="warning"><b>Upcoming API change — specialization</b><br>
* The return type will be changed to the {@code CouplingType} code list
* when GeoAPI will provide it (tentatively in GeoAPI 3.1).
* </div>
*
* @return Type of coupling between service and associated data, or {@... |
<<<<<<<
if (REGRESSION) {
((DefaultMetadata) metadata).setCharacterSet(CharacterSet.UTF_8);
}
assertEquals("fileIdentifier", "20090901", metadata.getFileIdentifier());
assertEquals("language", Locale.ENGLISH, metadata.getLanguage());
... |
<<<<<<<
" │ └─Authority\n" +
" │ └─Title………………………………………………… ISBN\n" +
=======
" │ ├─Authority\n" +
" │ │ ├─Title………………………………………………… International Standard Book Number\n" +
" │ │ └─Alternate title……………………… ISBN\n" +
" │ └... |
<<<<<<<
ScalarFactory<Dimensionless> dimensionlessFactory = new ScalarFactory<Dimensionless>() {@Override public Dimensionless create(double value, Unit<Dimensionless> unit) {return new Scalar.Dimensionless(value, unit);}};
final SystemUnit<Length> m = add(Length.class, new Sc... |
<<<<<<<
try (Stream<AbstractFeature> features = reader.features()) {
final Iterator<AbstractFeature> it = features.iterator();
=======
try (Stream<Feature> features = reader.features(false)) {
final Iterator<Feature> it = features.iterator();
>>>>>>>
... |
<<<<<<<
import org.opengis.annotation.UML;
=======
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
>>>>>>>
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
<<<<<<<
@UML(identifier="offLine", obligation=OPTIONAL, specification=ISO_19115)
=======
@Override
@XmlElement(name = "... |
<<<<<<<
import java.io.UncheckedIOException;
import java.util.function.Consumer;
import org.apache.sis.feature.AbstractFeature;
=======
import org.opengis.feature.Feature;
>>>>>>>
import org.apache.sis.feature.AbstractFeature; |
<<<<<<<
* @deprecated Use {@link #getDirectionReplacement(CoordinateSystemAxis, AxisDirection)} instead.
*
* @param direction The original axis direction.
* @return The new axis direction, or {@code direction} if there is no change.
*/
@Deprecated
AxisDirection getDirectionReplacement(... |
<<<<<<<
import org.apache.sis.internal.netcdf.IOTestCase;
=======
>>>>>>>
<<<<<<<
=======
import org.apache.sis.util.Version;
import org.opengis.test.dataset.TestData;
>>>>>>>
import org.apache.sis.util.Version;
import org.apache.sis.internal.netcdf.TestData;
<<<<<<<
private static NetcdfStore create(final ... |
<<<<<<<
=======
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.opengis.metadata.Identifier;
>>>>>>>
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
<<<<<<<
import org.opengis.referencing.ReferenceIdentifier;
=======
import org.apache.sis.internal.jaxb.metadata.MD_Identifier... |
<<<<<<<
* Creates a telephone number of the given type.
*
* @param type Either {@code "VOICE"}, {@code "FACSIMILE"} or {@code "SMS"}.
*/
private static DefaultTelephone telephone(final String number, final String type) {
final DefaultTelephone tel = new DefaultTelephone();
tel.se... |
<<<<<<<
private InternationalString getName(final Class<? extends AbstractParty> type, final boolean position) {
final Collection<AbstractParty> parties = getParties();
=======
private InternationalString getIndividual(final boolean position) {
final Collection<Party> parties = getParties();
... |
<<<<<<<
// Branch-dependent imports
import java.util.Objects;
import org.apache.sis.internal.jdk8.JDK8;
=======
>>>>>>>
import org.apache.sis.internal.jdk8.JDK8; |
<<<<<<<
public Collection<CharacterSet> getCharacterSets() {
return Collections.emptySet();
=======
public Collection<Charset> getCharacterSets() {
return Collections.emptySet(); // We use 'Set' because we handle 'Charset' like a CodeList.
>>>>>>>
public Collection<Charac... |
<<<<<<<
} catch (Exception e) { // (SecurityException | JMException) on the JDK7 branch.
Logging.unexpectedException(Logging.getLogger("org.apache.sis"), Supervisor.class, "register", e);
=======
} catch (SecurityException | JMException e) {
Logging.unexpectedEx... |
<<<<<<<
public Map<String,AbstractAttribute<?>> characteristics() {
=======
@Override
@SuppressWarnings("ReturnOfCollectionOrArrayField")
public Map<String,Attribute<?>> characteristics() {
>>>>>>>
@SuppressWarnings("ReturnOfCollectionOrArrayField")
public Map<String,AbstractAttribute<?>> cha... |
<<<<<<<
@XmlJavaTypeAdapter(CI_ResponsibleParty.class),
@XmlJavaTypeAdapter(DS_AssociationTypeCode.class),
@XmlJavaTypeAdapter(DS_InitiativeTypeCode.class),
=======
@XmlJavaTypeAdapter(CI_Responsibility.class),
@XmlJavaTypeAdapter(DCPList.class),
>>>>>>>
@XmlJavaTypeAdapter(CI_ResponsiblePart... |
<<<<<<<
=======
// Branch-dependent imports
import org.opengis.feature.Property;
import org.opengis.feature.Attribute;
import org.opengis.feature.FeatureAssociation;
import org.opengis.feature.PropertyNotFoundException;
>>>>>>>
<<<<<<<
public Object getProperty(final String name) throws IllegalArgumentExceptio... |
<<<<<<<
public final class MD_KeywordClass extends PropertyType<MD_KeywordClass, DefaultKeywordClass> {
=======
public class MD_KeywordClass extends PropertyType<MD_KeywordClass, KeywordClass> {
>>>>>>>
public class MD_KeywordClass extends PropertyType<MD_KeywordClass, DefaultKeywordClass> {
<<<<<<<
protected C... |
<<<<<<<
final Short CONFLICT = (short) 0; // Sentinal value for conflicts (paranoiac safety).
final Map<Short,Short> map = new TreeMap<Short,Short>();
=======
final Short CONFLICT = 0; // Sentinal value for conflicts (paranoiac safety).
final Map<Short,Short> map = new TreeMap<>();
>>... |
<<<<<<<
import static org.hamcrest.MatcherAssert.*;
import static org.hamcrest.Matchers.*;
import static org.sonatype.nexus.test.utils.ResponseMatchers.*;
import static org.sonatype.nexus.test.utils.StatusMatchers.*;
=======
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.not... |
<<<<<<<
return toString((GenericName) value);
} else if (value instanceof AbstractIdentifiedType) {
return toString(((AbstractIdentifiedType) value).getName());
=======
text = toString((GenericName) value);
} else if (value instanceof IdentifiedType) {
t... |
<<<<<<<
* <div class="warning"><b>Warning:</b> in a future SIS version, the parameter types may be changed to
* {@code org.opengis.referencing.datum.ParametricDatum} and {@code org.opengis.referencing.cs.ParametricCS},
* and the return type may be changed to {@code org.opengis.referencing.crs.ParametricC... |
<<<<<<<
@UML(identifier="rationale", obligation=OPTIONAL, specification=ISO_19115)
=======
@Override
@XmlElement(name = "rationale")
>>>>>>>
@XmlElement(name = "rationale")
@UML(identifier="rationale", obligation=OPTIONAL, specification=ISO_19115) |
<<<<<<<
/// @XmlElement(name = "name")
@UML(identifier="name", obligation=CONDITIONAL, specification=ISO_19115)
=======
@Override
@XmlElement(name = "name")
@XmlJavaTypeAdapter(CI_Citation.Since2014.class)
>>>>>>>
@XmlElement(name = "name")
@XmlJavaTypeAdapter(CI_Citation.Since2014.class)
... |
<<<<<<<
if (((DefaultAttributeType<?>) attributeType).getMaximumOccurs() > 1) {
=======
if (maximumOccurs > 1) {
>>>>>>>
if (maximumOccurs > 1) {
<<<<<<<
converters[i] = ObjectConverters.find(String.class, ((DefaultAttributeType<?>) attributeType).getValueClass());
=... |
<<<<<<<
else if (name.equals(XML.STRING_SUBSTITUTES)) {
int mask = initialBitMasks();
=======
case XML.STRING_SUBSTITUTES: {
bitMasks &= ~(Context.SUBSTITUTE_LANGUAGE |
Context.SUBSTITUTE_COUNTRY |
... |
<<<<<<<
/// @XmlElement(name = "imageConstraints")
@UML(identifier="imageContraints", obligation=OPTIONAL, specification=ISO_19115)
=======
@Override
// @XmlElement at the end of this class.
>>>>>>>
// @XmlElement at the end of this class.
@UML(identifier="imageContraints", obligation=OPTIONAL, s... |
<<<<<<<
MatcherAssert.assertThat( content, StringContains.containsString( "test-capability" ) );
MatcherAssert.assertThat( content, StringContains.containsString( "repo_nexus-test-harness-repo" ) );
=======
assertThat( content, StringContains.containsString( "capabilities test!" ) );
a... |
<<<<<<<
* <div class="warning"><b>Warning:</b>
* This class is expected to implement a GeoAPI {@code AttributeType} interface in a future version.
* When such interface will be available, most references to {@code DefaultAttributeType} in current
* API will be replaced by references to the {@code AttributeType} int... |
<<<<<<<
import org.apache.sis.feature.AbstractFeature;
=======
import org.apache.sis.internal.jdk7.Objects;
import org.opengis.feature.Feature;
>>>>>>>
import org.apache.sis.internal.jdk7.Objects;
import org.apache.sis.feature.AbstractFeature;
<<<<<<<
public ArrayList<FieldDescriptor> FDArray = new ArrayList<Fi... |
<<<<<<<
import org.apache.sis.internal.jdk7.AutoCloseable;
=======
import org.apache.sis.internal.util.StandardDateFormat;
>>>>>>>
import org.apache.sis.internal.jdk7.AutoCloseable;
import org.apache.sis.internal.util.StandardDateFormat;
<<<<<<<
final Set<Integer> added = new HashSet<Integer>();
... |
<<<<<<<
import static org.opengis.referencing.IdentifiedObject.NAME_KEY;
import static org.apache.sis.parameter.TensorParameters.WKT1;
import static org.apache.sis.test.Assert.*;
=======
import static org.opengis.test.Validators.validate;
import static org.apache.sis.test.ReferencingAssert.*;
import static org.apache... |
<<<<<<<
import org.sonatype.nexus.web.MdcUserContextFilter;
=======
import org.sonatype.nexus.guice.FilterChainModule;
>>>>>>>
import org.sonatype.nexus.web.MdcUserContextFilter;
import org.sonatype.nexus.guice.FilterChainModule; |
<<<<<<<
" ParameterFile[“Geocentric translations file”, “\\E.*\\W\\Q" +
FranceGeocentricInterpolationTest.TEST_FILE + "”, Id[“EPSG”, 8727],\n" +
" Remark[“\\E.*\\Q”]]],\n" +
=======
" ParameterFile[“Geocentric translation fi... |
<<<<<<<
=======
* Constructs a new operation metadata initialized to the specified values.
*
* @param operationName an unique identifier for this interface.
* @param platform distributed computing platforms on which the operation has been implemented.
* @param connectPoint handle for... |
<<<<<<<
import org.apache.sis.internal.metadata.LegacyPropertyAdapter;
=======
import org.opengis.metadata.MetadataScope;
import org.apache.sis.internal.metadata.legacy.LegacyPropertyAdapter;
>>>>>>>
import org.apache.sis.internal.metadata.legacy.LegacyPropertyAdapter; |
<<<<<<<
* Tests the {@link Code#Code(ReferenceIdentifier)} constructor with {@code "EPSG:4326"} identifier.
=======
* Tests the {@link Code#Code(Identifier)} constructor with {@code "EPSG:4326"} identifier.
* This test intentionally uses an identifier with the {@code IOGP} authority instead than
*... |
<<<<<<<
=======
import java.util.Collections;
import java.io.Serializable;
import org.opengis.metadata.citation.OnlineResource;
import org.opengis.metadata.identification.CoupledResource;
import org.opengis.metadata.identification.DistributedComputingPlatform;
import org.opengis.metadata.identification.OperationMetad... |
<<<<<<<
import org.apache.sis.internal.jdk8.Temporal;
import org.apache.sis.util.iso.ResourceInternationalString;
=======
import java.time.temporal.Temporal;
>>>>>>>
import org.apache.sis.internal.jdk8.Temporal; |
<<<<<<<
=======
import org.opengis.feature.Property;
import org.opengis.feature.PropertyType;
import org.opengis.feature.PropertyNotFoundException;
import org.opengis.feature.InvalidPropertyValueException;
import org.opengis.feature.Attribute;
import org.opengis.feature.AttributeType;
import org.opengis.feature.Featu... |
<<<<<<<
* @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(Party)
>>>>>>>
* @param object the metadata to copy values from, or {@code null} if none.
<<<<<<<
=... |
<<<<<<<
final DefaultLegalConstraints constraints = (DefaultLegalConstraints) getSingleton(getSingleton(
builder.result().getIdentificationInfo()).getResourceConstraints());
=======
final LegalConstraints constraints = (LegalConstraints) getSingleton(getSingleton(
build... |
<<<<<<<
} catch (Exception e) { // (SecurityException | JMException) on the JDK7 branch.
Logging.unexpectedException(Logger.getLogger("org.apache.sis"), Supervisor.class, "register", e);
=======
} catch (InstanceAlreadyExistsException e) {
final LogRecord record... |
<<<<<<<
* <div class="warning"><b>Upcoming API change — generalization</b><br>
* The element type will be changed to the {@code AttributeGroup} interface
* when GeoAPI will provide it (tentatively in GeoAPI 3.1).
* </div>
*
* @return Information on attribute groups of the resource.
======... |
<<<<<<<
// Branch-dependent imports
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.charset.StandardCharsets;
import org.apache.sis.internal.jdk8.JDK8;
=======
>>>>>>>
import org.apache.sis.internal.jdk8.JDK8; |
<<<<<<<
String cs = null;
if (identifier instanceof ReferenceIdentifier) {
cs = ((ReferenceIdentifier) identifier).getCodeSpace();
}
if (cs == null) {
cs = org.apache.sis.internal.util.Citations.getIdentifier(identifier.getAuthority());
=======
String cs... |
<<<<<<<
// 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; |
<<<<<<<
import org.opengis.referencing.ReferenceIdentifier;
import org.apache.sis.util.Debug;
=======
>>>>>>>
import org.opengis.referencing.ReferenceIdentifier; |
<<<<<<<
* @since 0.3
* @version 0.8
=======
* @version 0.3
* @since 0.3
>>>>>>>
* @version 0.8
* @since 0.3 |
<<<<<<<
assertEquals("version", Store.V1_0, reader.getVersion());
try (final Stream<AbstractFeature> features = reader.getFeatures()) {
final Iterator<AbstractFeature> it = features.iterator();
=======
assertEquals("version", StoreProvider.V1_0, reader.getVersion())... |
<<<<<<<
* <li>{@code Set<AttributeType>} for the {@code attributes} property</li>
* <li>{@code Set<FeatureType>} for the {@code features} property</li>
* <li>{@code Set<FeatureType>} for the {@code featureInstances} property</li>
* <li>{@code Set<AttributeType>} for the {@code attributeI... |
<<<<<<<
String TYPE_PROCEDURE = "type " + PROCEDURE;
String AGGREGATED_PROCEDURE = "aggregated " + PROCEDURE;
String PROCEDURE_INSTANCE = PROCEDURE + " instance";
=======
String PUBLISHED_PROCEDURE = "published procedure";
String PUBLISHED_PROCEDURES = "published procedures";
>>>... |
<<<<<<<
2, 2, parameters.getDescriptor()), parameters, Collections.<ParameterRole, ParameterDescriptor<Double>>emptyMap(), (byte) 0));
=======
2, 2, parameters.getDescriptor()), parameters, Collections.emptyMap(), (byte) 0));
super.computeCoefficients();
>>>>>>>
... |
<<<<<<<
import org.apache.sis.util.iso.DefaultNameSpace;
import org.apache.sis.util.iso.DefaultNameFactory;
=======
>>>>>>>
import org.apache.sis.util.iso.DefaultNameFactory; |
<<<<<<<
public void setIssueIdentification(final String newValue) {
checkWritePermission();
=======
public void setIssueIdentification(final InternationalString newValue) {
checkWritePermission(issueIdentification);
>>>>>>>
public void setIssueIdentification(final String newValue) {
... |
<<<<<<<
public MemoryFeatureSet(final WarningListeners<DataStore> listeners,
final DefaultFeatureType type, final Collection<AbstractFeature> features)
{
super(listeners);
=======
public MemoryFeatureSet(final StoreListeners parent, final FeatureType type, final Collect... |
<<<<<<<
assertEquals(Locale.ENGLISH, metadata.getLanguage());
assertEquals(CharacterSet.UTF_8, metadata.getCharacterSet());
=======
assertInstanceOf("party", Organisation.class, party);
assertEquals(Locale.ENGLISH, getSingleton(metadata.getLanguages()... |
<<<<<<<
=======
// Branch-dependent imports
import org.apache.sis.internal.jdk7.Objects;
import org.opengis.feature.PropertyType;
import org.opengis.feature.AttributeType;
import org.opengis.feature.FeatureType;
import org.opengis.feature.FeatureAssociationRole;
>>>>>>>
<<<<<<<
final DefaultFeatureType... |
<<<<<<<
=======
// Branch-dependent imports
import org.opengis.feature.Feature;
import org.opengis.feature.FeatureType;
import org.opengis.feature.PropertyType;
import org.opengis.feature.InvalidPropertyValueException;
>>>>>>> |
<<<<<<<
import org.apache.sis.internal.jdk7.Objects;
=======
import java.util.Objects;
import org.opengis.feature.Attribute;
>>>>>>>
import org.apache.sis.internal.jdk7.Objects;
import org.opengis.feature.Attribute; |
<<<<<<<
} catch (IllegalArgumentException e) {
/*
* Parameter not found, or is not numeric, or unit of measurement is not linear.
* Those exceptions should never occur with map projections, but may happen for
* some other operations like Mol... |
<<<<<<<
// 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; |
<<<<<<<
import org.opengis.annotation.UML;
import org.opengis.util.CodeList;
=======
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
>>>>>>>
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
<<<<<<<
@UML(identifier="phone", obligation=OPTIONAL, specification=ISO_19115)
=======
@O... |
<<<<<<<
=======
import org.opengis.geometry.TransfiniteSet;
import org.opengis.geometry.complex.Complex;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.MathTransform;
>>>>>>> |
<<<<<<<
final SingleOperation operation,
final int firstAffectedOrdinate,
final int numTrailingOrdinates)
=======
final CoordinateOperation operat... |
<<<<<<<
=======
import org.apache.sis.internal.system.Modules;
import org.apache.sis.math.DecimalFunctions;
>>>>>>>
import org.apache.sis.math.DecimalFunctions; |
<<<<<<<
return (PropertyAccessor) JDK8.compute(accessors, key, new BiFunction<CacheKey, Object, Object>() {
@Override public Object apply(final CacheKey k, final Object v) {
if (v instanceof PropertyAccessor) {
return v;
}
final Pro... |
<<<<<<<
import org.apache.sis.internal.jaxb.code.SV_CouplingType;
=======
import org.opengis.metadata.identification.CoupledResource;
import org.opengis.metadata.identification.CouplingType;
import org.opengis.metadata.identification.OperationChainMetadata;
import org.opengis.metadata.identification.OperationMetadata... |
<<<<<<<
import java.time.Instant;
import org.apache.sis.feature.AbstractFeature;
import org.apache.sis.feature.AbstractIdentifiedType;
import org.apache.sis.feature.DefaultAttributeType;
import org.apache.sis.feature.DefaultFeatureType;
import org.apache.sis.metadata.iso.identification.AbstractIdentification;
=======
... |
<<<<<<<
new ImmutableIdentifier(HardCodedCitations.OGP, Constants.EPSG, Short.toString(code))));
return new DefaultParameterDescriptor<Double>(properties, 0, 1, Double.class, null, null, null);
=======
new ImmutableIdentifier(HardCodedCitations.IOGP, Constants.EPSG, Short.toStr... |
<<<<<<<
final DefaultLegalConstraints c = new DefaultLegalConstraints();
c.setUseConstraints(singleton(Restriction.LICENSE));
assertXmlEquals(xml, marshal(c), "xmlns:*");
/*
* Unmarshall and ensure that we got back the original LICENCE code, not a new "LICENSE" code.
*/... |
<<<<<<<
=======
// Branch-dependent imports
import org.opengis.feature.Property;
import org.opengis.feature.PropertyType;
import org.opengis.feature.PropertyNotFoundException;
import org.opengis.feature.InvalidPropertyValueException;
import org.opengis.feature.Attribute;
import org.opengis.feature.AttributeType;
impo... |
<<<<<<<
DefaultCitation.class, "getGraphics", "graphics", "graphic", "Graphics", BrowseGraphic[].class,
DefaultCitation.class, "getOnlineResources", "onlineResources", "onlineResource", "Online resources", OnlineRes... |
<<<<<<<
final AbstractFeature feature = types.wayPoint.newInstance();
feature.setPropertyValue("sis:identifier", index);
feature.setPropertyValue("sis:geometry", types.geometries.createPoint(parseDouble(lon), parseDouble(lat)));
=======
final Feature feature = types.wayPoint.newInstanc... |
<<<<<<<
* Executes the parameterless operation of the given name and returns the value of its result.
*/
final Object getOperationValue(final String name) {
final AbstractOperation operation = (AbstractOperation) type.getProperty(name);
if (operation instanceof LinkOperation) {
... |
<<<<<<<
JSONObject visibilityJson = GraphUtil.updateVisibilityJson(null, visibilitySource, workspaceId);
Visibility visibility = visibilityTranslator.toVisibility(visibilityJson);
=======
LumifyVisibility lumifyVisibility = visibilityTranslator.toVisibility(visibilitySource);
>>>>>>>
... |
<<<<<<<
import org.apache.sis.internal.jdk8.Temporal;
import org.apache.sis.storage.IllegalNameException;
=======
import java.time.temporal.Temporal;
>>>>>>>
import org.apache.sis.internal.jdk8.Temporal; |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.