The commit contains the following changes:
IdentifiedObject.getName(Locale) by calls to IdentifiedObject.getName().toString(Locale).
This change was forced by a change in GeoAPI interfaces. Reverting this change cause compilation errors, which can be fixed only by
redoing the exact same change.Parameters.array: this change has been removed. It has been replaced by an iteration
directly on the returned collection.OperationParameter by ParameterDescriptor: this cast does not exist anymore in Geotk/SIS
since the migration to JDK 5 allowed us to use covariant return type. Indeed, the comment in the code below
already anticipated that day.Command line:
svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r7843:7863 https://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/wkt/Formatter.java| Revision 7843 | Revision 7863 |
|---|---|
import org.opengis.util.CodeList;
import org.opengis.util.InternationalString;
import org.opengis.referencing.IdentifiedObject;
import org.opengis.parameter.ParameterValue;
import org.opengis.parameter.OperationParameter;
import org.opengis.parameter.ParameterValueGroup;
import org.opengis.parameter.GeneralParameterValue;
import org.opengis.metadata.Identifier; |
import org.opengis.util.CodeList; import org.opengis.util.InternationalString; import org.opengis.referencing.IdentifiedObject; import org.opengis.parameter.ParameterDescriptor; import org.opengis.parameter.ParameterValue; import org.opengis.parameter.GeneralParameterDescriptor; import org.opengis.parameter.ParameterValueGroup; import org.opengis.parameter.GeneralParameterValue; import org.opengis.metadata.Identifier; |
import org.opengis.referencing.operation.MathTransform; // Geotools dependencies import org.geotools.resources.Utilities; import org.geotools.resources.cts.Resources; import org.geotools.resources.cts.ResourceKeys; |
import org.opengis.referencing.operation.MathTransform;
// Geotools dependencies
import org.geotools.parameter.Parameters;
import org.geotools.resources.Utilities;
import org.geotools.resources.cts.Resources;
import org.geotools.resources.cts.ResourceKeys; |
? (IdentifiedObject) formattable : null;
if (info != null) {
buffer.append(QUOTE);
buffer.append(info.getName(locale));
buffer.append(QUOTE);
}
String keyword = formattable.formatWKT(this); |
? (IdentifiedObject) formattable : null;
if (info != null) {
buffer.append(QUOTE);
buffer.append(info.getName().toString(locale));
buffer.append(QUOTE);
}
String keyword = formattable.formatWKT(this); |
*/
public void append(final GeneralParameterValue parameter) {
if (parameter instanceof ParameterValueGroup) {
final GeneralParameterValue[] parameters = ((ParameterValueGroup)parameter).getValues();
for (int i=0; i<parameters.length; i++) {
append(parameters[i]);
} |
*/
public void append(final GeneralParameterValue parameter) {
if (parameter instanceof ParameterValueGroup) {
final GeneralParameterValue[] parameters = Parameters.array( (ParameterValueGroup)parameter);
for (int i=0; i<parameters.length; i++) {
append(parameters[i]);
} |
if (parameter instanceof ParameterValue) {
final ParameterValue param = (ParameterValue) parameter;
// Covariance: Remove cast if covariance is allowed.
final OperationParameter descriptor = (OperationParameter) param.getDescriptor();
Unit unit = descriptor.getUnit();
if (unit!=null && contextualUnit!=null && unit.isCompatible(contextualUnit)) {
unit = contextualUnit; |
if (parameter instanceof ParameterValue) {
final ParameterValue param = (ParameterValue) parameter;
// Covariance: Remove cast if covariance is allowed.
final ParameterDescriptor descriptor = (ParameterDescriptor) param.getDescriptor();
Unit unit = descriptor.getUnit();
if (unit!=null && contextualUnit!=null && unit.isCompatible(contextualUnit)) {
unit = contextualUnit; |
*/
public String getName(final IdentifiedObject info) {
final Identifier identifier = getIdentifier(info);
return (identifier!=null) ? identifier.getCode() : info.getName(locale);
}
/** |
*/
public String getName(final IdentifiedObject info) {
final Identifier identifier = getIdentifier(info);
return (identifier!=null) ? identifier.getCode() : info.getName().toString( null );
}
/** |