Author: desruisseaux
Date: Thu Jun 26 19:26:24 2014
New Revision: 1605887
URL: http://svn.apache.org/r1605887
Log:
Renamed LegacyProperties as LegacyPropertyAdapter.
Added:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyPropertyAdapter.java
- copied, changed from r1605796,
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyProperties.java
Removed:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyProperties.java
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
Copied:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyPropertyAdapter.java
(from r1605796,
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyProperties.java)
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyPropertyAdapter.java?p2=sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyPropertyAdapter.java&p1=sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyProperties.java&r1=1605796&r2=1605887&rev=1605887&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyProperties.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyPropertyAdapter.java
[UTF-8] Thu Jun 26 19:26:24 2014
@@ -39,7 +39,7 @@ import org.apache.sis.util.ArgumentCheck
* @version 0.5
* @module
*/
-public abstract class LegacyProperties<L,N> extends AbstractCollection<L> {
+public abstract class LegacyPropertyAdapter<L,N> extends AbstractCollection<L>
{
/**
* The collection where to store the elements.
*/
@@ -55,7 +55,7 @@ public abstract class LegacyProperties<L
*
* @param elements The collection where to store the elements (may be
{@code null}).
*/
- protected LegacyProperties(final Collection<N> elements) {
+ protected LegacyPropertyAdapter(final Collection<N> elements) {
this.elements = elements;
}
@@ -98,7 +98,7 @@ public abstract class LegacyProperties<L
*
* @return {@code this} or {@code null}.
*/
- public final LegacyProperties<L,N> validOrNull() {
+ public final LegacyPropertyAdapter<L,N> validOrNull() {
return (elements != null) ? this : null;
}
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java?rev=1605887&r1=1605886&r2=1605887&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java
[UTF-8] Thu Jun 26 19:26:24 2014
@@ -31,7 +31,7 @@ import org.opengis.metadata.content.Rang
import org.opengis.util.RecordType;
import org.apache.sis.xml.Namespaces;
import org.apache.sis.util.resources.Messages;
-import org.apache.sis.internal.metadata.LegacyProperties;
+import org.apache.sis.internal.metadata.LegacyPropertyAdapter;
import org.apache.sis.internal.metadata.MetadataUtilities;
@@ -249,7 +249,7 @@ public class DefaultCoverageDescription
@Deprecated
public void setContentType(final CoverageContentType newValue) {
checkWritePermission();
- final Collection<CoverageContentType> newValues =
LegacyProperties.asCollection(newValue);
+ final Collection<CoverageContentType> newValues =
LegacyPropertyAdapter.asCollection(newValue);
final Collection<AttributeGroup> groups = getAttributeGroups();
for (final AttributeGroup group : groups) {
if (group instanceof DefaultAttributeGroup) {
@@ -273,7 +273,7 @@ public class DefaultCoverageDescription
@Deprecated
@XmlElement(name = "dimension")
public final Collection<RangeDimension> getDimensions() {
- return new
LegacyProperties<RangeDimension,AttributeGroup>(getAttributeGroups()) {
+ return new
LegacyPropertyAdapter<RangeDimension,AttributeGroup>(getAttributeGroups()) {
/** Stores a legacy value into the new kind of value. */
@Override protected AttributeGroup wrap(final RangeDimension
value) {
final DefaultAttributeGroup container = new
DefaultAttributeGroup();
@@ -308,7 +308,7 @@ public class DefaultCoverageDescription
@Deprecated
public void setDimensions(final Collection<? extends RangeDimension>
newValues) {
checkWritePermission();
- ((LegacyProperties<RangeDimension,?>)
getDimensions()).setValues(newValues);
+ ((LegacyPropertyAdapter<RangeDimension,?>)
getDimensions()).setValues(newValues);
}
/**
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java?rev=1605887&r1=1605886&r2=1605887&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
[UTF-8] Thu Jun 26 19:26:24 2014
@@ -34,7 +34,7 @@ import org.opengis.util.InternationalStr
import org.apache.sis.metadata.iso.ISOMetadata;
import org.apache.sis.metadata.iso.quality.DefaultScope;
import org.apache.sis.metadata.iso.citation.DefaultCitationDate;
-import org.apache.sis.internal.metadata.LegacyProperties;
+import org.apache.sis.internal.metadata.LegacyPropertyAdapter;
/**
@@ -313,7 +313,7 @@ public class DefaultMaintenanceInformati
@Deprecated
@XmlElement(name = "updateScope")
public final Collection<ScopeCode> getUpdateScopes() {
- return new LegacyProperties<ScopeCode,Scope>(getMaintenanceScopes()) {
+ return new
LegacyPropertyAdapter<ScopeCode,Scope>(getMaintenanceScopes()) {
/** Stores a legacy value into the new kind of value. */
@Override protected Scope wrap(final ScopeCode value) {
return new DefaultScope(value);
@@ -345,7 +345,7 @@ public class DefaultMaintenanceInformati
@Deprecated
public void setUpdateScopes(final Collection<? extends ScopeCode>
newValues) {
checkWritePermission();
- ((LegacyProperties<ScopeCode,?>)
getUpdateScopes()).setValues(newValues);
+ ((LegacyPropertyAdapter<ScopeCode,?>)
getUpdateScopes()).setValues(newValues);
}
/**
@@ -361,7 +361,7 @@ public class DefaultMaintenanceInformati
@Deprecated
@XmlElement(name = "updateScopeDescription")
public final Collection<ScopeDescription> getUpdateScopeDescriptions() {
- return new
LegacyProperties<ScopeDescription,Scope>(getMaintenanceScopes()) {
+ return new
LegacyPropertyAdapter<ScopeDescription,Scope>(getMaintenanceScopes()) {
/** Stores a legacy value into the new kind of value. */
@Override protected Scope wrap(final ScopeDescription value) {
final DefaultScope container = new DefaultScope();
@@ -396,7 +396,7 @@ public class DefaultMaintenanceInformati
@Deprecated
public void setUpdateScopeDescriptions(final Collection<? extends
ScopeDescription> newValues) {
checkWritePermission();
- ((LegacyProperties<ScopeDescription,?>)
getUpdateScopeDescriptions()).setValues(newValues);
+ ((LegacyPropertyAdapter<ScopeDescription,?>)
getUpdateScopeDescriptions()).setValues(newValues);
}
/**
