This commit propagates an interface name change which was done in GeoAPI. There is no way such change could be done differently, since not renaming the uses of that interface cause a compilation error.
Action: all contributions forced by changes in GeoAPI interfaces
(mostly import
statements and method signatures) have been rewritten from scratch
by creating an empty Java class implementing the interface,
clicking on the "Implement all abstract methods" contextual menu in NetBeans,
removing the <? extends>
part in parameterized type of collections,
adding the synchronized
keyword (for now)
and finally adding the corresponding private fields.
This action has been committed in the Apache SIS JDK7 branch at revision 1458238.
Command line:
svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r24924:24925 https://svn.osgeo.org/geotools/trunk/modules/library/metadata/src/main/java/org/geotools/metadata/iso/MetaDataImpl.java
Revision 24924 | Revision 24925 |
---|---|
import org.opengis.metadata.citation.ResponsibleParty; import org.opengis.metadata.constraint.Constraints; import org.opengis.metadata.distribution.Distribution; import org.opengis.metadata.identification.Identification; import org.opengis.metadata.maintenance.MaintenanceInformation; import org.opengis.metadata.maintenance.ScopeCode; |
import org.opengis.metadata.citation.ResponsibleParty;
import org.opengis.metadata.constraint.Constraints;
import org.opengis.metadata.distribution.Distribution;
import org.opengis.metadata.identification.CharacterSet;
import org.opengis.metadata.identification.Identification;
import org.opengis.metadata.maintenance.MaintenanceInformation;
import org.opengis.metadata.maintenance.ScopeCode; |
/**
* Full name of the character coding standard used for the metadata set.
*/
private Charset characterSet;
/**
* File identifier of the metadata to which this metadata is a subset (child). |
/**
* Full name of the character coding standard used for the metadata set.
*/
private CharacterSet characterSet;
/**
* File identifier of the metadata to which this metadata is a subset (child). |
/**
* Returns the full name of the character coding standard used for the metadata set.
*/
public Charset getCharacterSet() {
return characterSet;
} |
/**
* Returns the full name of the character coding standard used for the metadata set.
*/
public CharacterSet getCharacterSet() {
return characterSet;
} |
super.freeze();
language = (Locale) unmodifiable(language);
locales = (Collection) unmodifiable(locales);
characterSet = (Charset) unmodifiable(characterSet);
hierarchyLevels = (Collection) unmodifiable(hierarchyLevels);
hierarchyLevelNames = (Collection) unmodifiable(hierarchyLevelNames);
contacts = (Collection) unmodifiable(contacts); |
super.freeze();
language = (Locale) unmodifiable(language);
locales = (Collection) unmodifiable(locales);
characterSet = (CharacterSet) unmodifiable(characterSet);
hierarchyLevels = (Collection) unmodifiable(hierarchyLevels);
hierarchyLevelNames = (Collection) unmodifiable(hierarchyLevelNames);
contacts = (Collection) unmodifiable(contacts); |