Those two commits contain two kinds of changes:
org.opengis
were forced by a GeoAPI change.
Reverting this commit results in compiler errors, which are fixed by reapplying
the same changes for the new GeoAPI interface names.ParameterReal
) do not apply to Apache SIS,
since no class of that name exists in SIS.Command line:
svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r7706:7843 https://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/operation/transform/ExponentialTransform1D.java
Revision 7706 | Revision 7843 |
---|---|
// OpenGIS dependencies import org.opengis.parameter.ParameterValue; import org.opengis.parameter.OperationParameter; import org.opengis.parameter.ParameterValueGroup; import org.opengis.parameter.OperationParameterGroup; import org.opengis.parameter.ParameterNotFoundException; import org.opengis.referencing.operation.MathTransform; import org.opengis.referencing.operation.MathTransform1D; |
// OpenGIS dependencies import org.opengis.parameter.ParameterValue; import org.opengis.parameter.ParameterDescriptor; import org.opengis.parameter.ParameterValueGroup; import org.opengis.parameter.ParameterDescriptorGroup; import org.opengis.parameter.ParameterNotFoundException; import org.opengis.referencing.operation.MathTransform; import org.opengis.referencing.operation.MathTransform1D; |
import org.geotools.referencing.Identifier;
import org.geotools.referencing.operation.LinearTransform;
import org.geotools.referencing.operation.MathTransformProvider;
import org.geotools.parameter.ParameterRealValue;
import org.geotools.resources.cts.ResourceKeys; |
import org.geotools.referencing.Identifier;
import org.geotools.referencing.operation.LinearTransform;
import org.geotools.referencing.operation.MathTransformProvider;
import org.geotools.parameter.ParameterReal;
import org.geotools.resources.cts.ResourceKeys; |
public ParameterValueGroup getParameterValues() { final ParameterValue[] parameters = new ParameterValue[scale!=1 ? 2 : 1]; switch (parameters.length) { case 2: parameters[1] = new ParameterRealValue(Provider.SCALE, scale); // fall through case 1: parameters[0] = new ParameterRealValue(Provider.BASE, base); // fall through } return new org.geotools.parameter.ParameterValueGroup(Provider.PARAMETERS, parameters); } /** |
public ParameterValueGroup getParameterValues() { final ParameterValue[] parameters = new ParameterValue[scale!=1 ? 2 : 1]; switch (parameters.length) { case 2: parameters[1] = new ParameterReal(Provider.SCALE, scale); // fall through case 1: parameters[0] = new ParameterReal(Provider.BASE, base); // fall through } return new org.geotools.parameter.ParameterGroup(Provider.PARAMETERS, parameters); } /** |
* The operation parameter descriptor for the {@link #base base} parameter value. * Valid values range from 0 to infinity. The default value is 10. */ public static final OperationParameter BASE = LogarithmicTransform1D.Provider.BASE; /** * The operation parameter descriptor for the {@link #scale scale} parameter value. * Valid values range is unrestricted. The default value is 1. */ public static final OperationParameter SCALE = new org.geotools.parameter.OperationParameter( "scale", 1, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY, Unit.ONE); /** * The parameters group. */ static final OperationParameterGroup PARAMETERS = group( new Identifier[] { new Identifier(Citation.GEOTOOLS, null, "Exponential") }, new OperationParameter[] { BASE, SCALE }); |
* The operation parameter descriptor for the {@link #base base} parameter value. * Valid values range from 0 to infinity. The default value is 10. */ public static final ParameterDescriptor BASE = LogarithmicTransform1D.Provider.BASE; /** * The operation parameter descriptor for the {@link #scale scale} parameter value. * Valid values range is unrestricted. The default value is 1. */ public static final ParameterDescriptor SCALE = new org.geotools.parameter.ParameterDescriptor( "scale", 1, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY, Unit.ONE); /** * The parameters group. */ static final ParameterDescriptorGroup PARAMETERS = group( new Identifier[] { new Identifier(Citation.GEOTOOLS, null, "Exponential") }, new ParameterDescriptor[] { BASE, SCALE }); |