Author: desruisseaux
Date: Fri Jun 14 17:11:48 2013
New Revision: 1493163
URL: http://svn.apache.org/r1493163
Log:
Added a few missing @Debug annotations for documentation purpose.
Modified:
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueMap.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SurjectiveConverter.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocalisedCharacterString.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/TextGroup.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleCitation.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleReferenceIdentifier.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java
sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java
sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/DecoderWrapper.java
sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/StorageConnector.java
Modified:
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java?rev=1493163&r1=1493162&r2=1493163&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
[UTF-8] Fri Jun 14 17:11:48 2013
@@ -29,6 +29,7 @@ import java.lang.reflect.Field;
import org.opengis.metadata.citation.Citation;
import org.opengis.metadata.ExtendedElementInformation;
import org.opengis.referencing.ReferenceIdentifier;
+import org.apache.sis.util.Debug;
import org.apache.sis.util.Classes;
import org.apache.sis.util.ThreadSafe;
import org.apache.sis.util.ComparisonMode;
@@ -768,6 +769,7 @@ public class MetadataStandard implements
* Returns a string representation of this metadata standard.
* This is for debugging purpose only and may change in any future version.
*/
+ @Debug
@Override
public String toString() {
return Classes.getShortClassName(this) + '[' + citation.getTitle() +
']';
Modified:
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueMap.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueMap.java?rev=1493163&r1=1493162&r2=1493163&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueMap.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueMap.java
[UTF-8] Fri Jun 14 17:11:48 2013
@@ -21,6 +21,7 @@ import java.util.Set;
import java.util.Iterator;
import java.util.NoSuchElementException;
import org.apache.sis.util.CharSequences;
+import org.apache.sis.util.Debug;
import static org.apache.sis.metadata.PropertyAccessor.RETURN_NULL;
import static org.apache.sis.metadata.PropertyAccessor.RETURN_PREVIOUS;
@@ -256,6 +257,7 @@ final class ValueMap extends PropertyMap
* Returns a string representation of this entry.
* This method is mostly for debugging purpose.
*/
+ @Debug
@Override
public String toString() {
String value = String.valueOf(getValue());
Modified:
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SurjectiveConverter.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SurjectiveConverter.java?rev=1493163&r1=1493162&r2=1493163&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SurjectiveConverter.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SurjectiveConverter.java
[UTF-8] Fri Jun 14 17:11:48 2013
@@ -20,6 +20,7 @@ import java.util.Set;
import java.util.EnumSet;
import org.apache.sis.util.ObjectConverter;
import org.apache.sis.math.FunctionProperty;
+import org.apache.sis.util.Debug;
import org.apache.sis.util.Classes;
import org.apache.sis.util.resources.Errors;
@@ -73,6 +74,7 @@ public abstract class SurjectiveConverte
/**
* Returns a string representation of this converter for debugging purpose.
*/
+ @Debug
@Override
public String toString() {
return Classes.getShortClassName(this) + '[' +
Modified:
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java?rev=1493163&r1=1493162&r2=1493163&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java
[UTF-8] Fri Jun 14 17:11:48 2013
@@ -27,6 +27,7 @@ import java.util.NoSuchElementException;
import java.io.Serializable;
import org.opengis.metadata.Identifier;
import org.opengis.metadata.citation.Citation;
+import org.apache.sis.util.Debug;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.xml.IdentifierMap;
import org.apache.sis.xml.IdentifierSpace;
@@ -541,6 +542,7 @@ public class IdentifierMapAdapter extend
*
* @see SpecializedIdentifier#toString()
*/
+ @Debug
@Override
public String toString() {
final StringBuilder buffer = new StringBuilder(50).append('{');
Modified:
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java?rev=1493163&r1=1493162&r2=1493163&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
[UTF-8] Fri Jun 14 17:11:48 2013
@@ -28,6 +28,7 @@ import org.opengis.metadata.Identifier;
import org.opengis.metadata.citation.Citation;
import org.apache.sis.internal.simple.SimpleCitation;
import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.Debug;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.xml.IdentifierSpace;
@@ -123,6 +124,7 @@ public final class NonMarshalledAuthorit
/**
* Returns a string representation of this identifier space.
*/
+ @Debug
@Override
public String toString() {
return "IdentifierSpace[" + title + ']';
Modified:
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java?rev=1493163&r1=1493162&r2=1493163&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/SpecializedIdentifier.java
[UTF-8] Fri Jun 14 17:11:48 2013
@@ -25,6 +25,7 @@ import org.opengis.metadata.citation.Cit
import org.apache.sis.xml.XLink;
import org.apache.sis.xml.IdentifierMap;
import org.apache.sis.xml.IdentifierSpace;
+import org.apache.sis.util.Debug;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.internal.util.Citations;
@@ -201,6 +202,7 @@ public final class SpecializedIdentifier
*
* @see IdentifierMapAdapter#toString()
*/
+ @Debug
@Override
public String toString() {
final StringBuilder buffer = new
StringBuilder(60).append("Identifier[");
Modified:
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocalisedCharacterString.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocalisedCharacterString.java?rev=1493163&r1=1493162&r2=1493163&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocalisedCharacterString.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocalisedCharacterString.java
[UTF-8] Fri Jun 14 17:11:48 2013
@@ -20,6 +20,7 @@ import java.util.Locale;
import javax.xml.bind.annotation.XmlValue;
import javax.xml.bind.annotation.XmlAttribute;
import org.apache.sis.internal.jaxb.Context;
+import org.apache.sis.util.Debug;
// Related to JDK7
import java.util.Objects;
@@ -133,6 +134,7 @@ final class LocalisedCharacterString {
*
* @see TextGroup#toString()
*/
+ @Debug
@Override
public String toString() {
final StringBuilder buffer = new StringBuilder(80)
Modified:
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/TextGroup.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/TextGroup.java?rev=1493163&r1=1493162&r2=1493163&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/TextGroup.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/TextGroup.java
[UTF-8] Fri Jun 14 17:11:48 2013
@@ -18,6 +18,7 @@ package org.apache.sis.internal.jaxb.gmd
import java.util.Locale;
import javax.xml.bind.annotation.XmlElement;
+import org.apache.sis.util.Debug;
/**
@@ -120,6 +121,7 @@ final class TextGroup {
*
* @see LocalisedCharacterString#toString()
*/
+ @Debug
@Override
public String toString() {
final String lineSeparator = System.lineSeparator();
Modified:
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleCitation.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleCitation.java?rev=1493163&r1=1493162&r2=1493163&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleCitation.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleCitation.java
[UTF-8] Fri Jun 14 17:11:48 2013
@@ -29,6 +29,7 @@ import org.opengis.metadata.citation.Res
import org.opengis.metadata.citation.Series;
import org.opengis.util.InternationalString;
import org.apache.sis.util.iso.SimpleInternationalString;
+import org.apache.sis.util.Debug;
// Related to JDK7
import java.util.Objects;
@@ -111,8 +112,9 @@ public class SimpleCitation implements C
}
/**
- * Returns a string representation of this citation.
+ * Returns a string representation of this citation for debugging purpose.
*/
+ @Debug
@Override
public String toString() {
return "Citation[\"" + title + "\"]";
Modified:
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleReferenceIdentifier.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleReferenceIdentifier.java?rev=1493163&r1=1493162&r2=1493163&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleReferenceIdentifier.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleReferenceIdentifier.java
[UTF-8] Fri Jun 14 17:11:48 2013
@@ -23,6 +23,7 @@ import org.opengis.metadata.citation.Cit
import org.apache.sis.internal.util.Citations;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.Classes;
+import org.apache.sis.util.Debug;
import static org.apache.sis.util.iso.DefaultNameSpace.DEFAULT_SEPARATOR;
@@ -157,6 +158,7 @@ public class SimpleReferenceIdentifier i
/**
* Returns a string representation of this identifier.
*/
+ @Debug
@Override
public String toString() {
final String classname = Classes.getShortClassName(this);
Modified:
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java?rev=1493163&r1=1493162&r2=1493163&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultNameSpace.java
[UTF-8] Fri Jun 14 17:11:48 2013
@@ -27,6 +27,7 @@ import org.opengis.util.LocalName;
import org.opengis.util.ScopedName;
import org.opengis.util.GenericName;
import org.opengis.util.InternationalString;
+import org.apache.sis.util.Debug;
import org.apache.sis.util.Immutable;
import org.apache.sis.util.collection.WeakValueHashMap;
import org.apache.sis.internal.util.UnmodifiableArrayList;
@@ -441,6 +442,7 @@ public class DefaultNameSpace implements
*
* @return A string representation of this namespace.
*/
+ @Debug
@Override
public String toString() {
return "NameSpace[\"" + name() + "\"]";
Modified:
sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java?rev=1493163&r1=1493162&r2=1493163&view=diff
==============================================================================
---
sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java
[UTF-8] (original)
+++
sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java
[UTF-8] Fri Jun 14 17:11:48 2013
@@ -46,6 +46,7 @@ import org.apache.sis.util.resources.Err
import org.apache.sis.util.resources.Vocabulary;
import org.apache.sis.util.logging.WarningListeners;
import org.apache.sis.util.ArraysExt;
+import org.apache.sis.util.Debug;
import org.apache.sis.measure.Units;
@@ -734,6 +735,7 @@ nextVar: for (final VariableInfo vari
* Returns a string representation to be inserted in {@link
org.apache.sis.storage.netcdf.NetcdfStore#toString()}
* result. This is for debugging purpose only any may change in any future
SIS version.
*/
+ @Debug
@Override
public String toString() {
final StringBuilder buffer = new StringBuilder();
Modified:
sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/DecoderWrapper.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/DecoderWrapper.java?rev=1493163&r1=1493162&r2=1493163&view=diff
==============================================================================
---
sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/DecoderWrapper.java
[UTF-8] (original)
+++
sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/DecoderWrapper.java
[UTF-8] Fri Jun 14 17:11:48 2013
@@ -32,6 +32,7 @@ import ucar.nc2.units.DateUnit;
import ucar.nc2.time.Calendar;
import ucar.nc2.time.CalendarDate;
import ucar.nc2.time.CalendarDateFormatter;
+import org.apache.sis.util.Debug;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.logging.WarningListeners;
import org.apache.sis.internal.netcdf.Decoder;
@@ -358,6 +359,7 @@ public final class DecoderWrapper extend
* Returns a string representation to be inserted in {@link
org.apache.sis.storage.netcdf.NetcdfStore#toString()}
* result. This is for debugging purpose only any may change in any future
SIS version.
*/
+ @Debug
@Override
public String toString() {
return "UCAR driver: “" + file.getLocation() + '”';
Modified:
sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java?rev=1493163&r1=1493162&r2=1493163&view=diff
==============================================================================
---
sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
[UTF-8] (original)
+++
sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
[UTF-8] Fri Jun 14 17:11:48 2013
@@ -18,6 +18,7 @@ package org.apache.sis.storage.netcdf;
import java.io.IOException;
import org.opengis.metadata.Metadata;
+import org.apache.sis.util.Debug;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.storage.DataStore;
import org.apache.sis.storage.DataStoreException;
@@ -103,6 +104,7 @@ public class NetcdfStore extends DataSto
* Returns a string representation of this NetCDF store for debugging
purpose.
* The content of the string returned by this method may change in any
future SIS version.
*/
+ @Debug
@Override
public String toString() {
return getClass().getSimpleName() + '[' + decoder + ']';
Modified:
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/StorageConnector.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/StorageConnector.java?rev=1493163&r1=1493162&r2=1493163&view=diff
==============================================================================
---
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/StorageConnector.java
[UTF-8] (original)
+++
sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/StorageConnector.java
[UTF-8] Fri Jun 14 17:11:48 2013
@@ -29,6 +29,7 @@ import javax.imageio.ImageIO;
import javax.imageio.stream.ImageInputStream;
import java.sql.Connection;
import javax.sql.DataSource;
+import org.apache.sis.util.Debug;
import org.apache.sis.util.Classes;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.ArgumentChecks;
@@ -563,6 +564,7 @@ public class StorageConnector implements
/**
* Returns a string representation of this {@code StorageConnector} for
debugging purpose.
*/
+ @Debug
@Override
public String toString() {
final StringBuilder buffer = new StringBuilder(40);
