This commit has been forced by a change in GeoAPI.
Reverting this commit (replacement of getName(null)
by getName().getCode()
)
causes a compilation error, which is fixed by redoing the same replacement or by using toString()
.
Command line:
svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r7847:8660 https://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/operation/DefaultCoordinateOperationFactory.java
Revision 7847 | Revision 8660 |
---|---|
private static String getTemporaryName(final CoordinateSystem source) {
final StringBuffer buffer = new StringBuffer("Temporary-");
buffer.append(++temporaryID);
String name = source.getName(null);
if (name != null) {
final String suffix = " derived from ";
name = name.trim(); |
private static String getTemporaryName(final CoordinateSystem source) {
final StringBuffer buffer = new StringBuffer("Temporary-");
buffer.append(++temporaryID);
String name = source.getName().getCode();
if (name != null) {
final String suffix = " derived from ";
name = name.trim(); |
private static String getTemporaryName(final CoordinateSystem source,
final CoordinateSystem existing)
{
return (source!=existing) ? existing.getName(null) : getTemporaryName(source);
}
/** |
private static String getTemporaryName(final CoordinateSystem source,
final CoordinateSystem existing)
{
return (source!=existing) ? existing.getName().toString() : getTemporaryName(source);
}
/** |