You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2017/01/18 06:31:09 UTC
svn commit: r1779293 [1/8] - in /sis/branches/JDK7: ./
core/sis-utility/src/main/java/org/apache/sis/internal/converter/
core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/
core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/ c...
Author: desruisseaux
Date: Wed Jan 18 06:31:07 2017
New Revision: 1779293
URL: http://svn.apache.org/viewvc?rev=1779293&view=rev
Log:
Merge from JDK8 branch javadoc formatting in minor compiler warning fixes in sis-utility module.
Modified:
sis/branches/JDK7/ (props changed)
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/StringConverter.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/CharSequenceAdapter.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Boolean.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal32.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Distance.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_GenericName.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer64.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_LocalName.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Measure.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Real.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_RecordType.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/InternationalStringAdapter.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/InternationalStringConverter.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/NameAdapter.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/StringAdapter.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/URIAdapter.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/UnitAdapter.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListUID.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/EnumAdapter.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/GO_URL.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocaleAdapter.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/PT_FreeText.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/jaxb/gml/CodeListAdapter.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/CodeListUID.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/Measure.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/MeasureList.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/SC_VerticalCRS.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/TimeInstant.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriod.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriodBound.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/Anchor.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/FileName.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/MimeFileType.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/MimeFileTypeAdapter.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleAttributeType.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/DaemonThread.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/DataDirectory.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedExecutor.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/LocalizedStaticObject.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/Loggers.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/OS.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/OSGiActivator.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/OptionalDependency.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/ReferenceQueueConsumer.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/Semaphores.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/ServletListener.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/Shutdown.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/SupervisorMBean.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/SystemListener.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/AbstractMapEntry.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/CheckedArrayList.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/CheckedHashSet.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/DefinitionURI.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/DoubleDouble.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/LazySet.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/LazySynchronizedIterator.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/MetadataServices.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/SetOfUnknownSize.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/X364.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/AppendableWriter.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/Appender.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/ClassFormat.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/DefaultFormat.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/IO.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/IdentifiedObjectFormat.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/LineAppender.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/ArrayVector.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/CompoundDirectPositions.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/ConcatenatedVector.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/DecimalFunctions.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/FunctionProperty.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/Line.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/Plane.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/Statistics.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/math/StatisticsFormat.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/AngleFormat.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/ElevationAngle.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/FormatField.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/FormattedCharacterIterator.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/Latitude.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/Longitude.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/NumberRange.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/Range.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/ValueRange.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/setup/InstallationResources.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ArgumentChecks.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ArraysExt.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Classes.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/CorruptedObjectException.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Locales.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/NullArgumentException.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Numbers.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverter.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/StringBuilders.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/UnconvertibleObjectException.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/UnknownNameException.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/UnsupportedImplementationException.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Workaround.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/Cache.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/CacheEntries.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/CodeListSet.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/Containers.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedIterator.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedMap.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTables.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakEntry.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakHashSet.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakValueHashMap.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractFactory.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultInternationalString.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultMemberName.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecord.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordSchema.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordType.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultScopedName.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/RecordDefinition.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/ResourceInternationalString.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/TypeNames.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/LoggerAdapter.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/LoggerFactory.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/Logging.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/PerformanceLevel.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/WarningListener.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Loader.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/NilObject.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/Pooled.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/PooledMarshaller.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/PooledTemplate.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/PooledUnmarshaller.java
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/XLink.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/AngleConverterTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/FallbackConverterTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/NumberConverterTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/PathConverterTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/StringConverterTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/XmlUtilitiesTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeMock.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gmd/LanguageCodeTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/system/ReferenceQueueConsumerTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/test/XMLComparatorTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/CitationsTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/DoubleDoubleTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/io/AppenderTestCase.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/io/EchoAppendable.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/io/LeftMarginTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/io/LineAppenderTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/io/SingleCharAppendable.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/io/TableAppenderTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/io/TabulationExpansionTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/io/WordWrapTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/math/DecimalFunctionsTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/math/PlaneTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/math/StatisticsTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/measure/AngleFormatTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/measure/AngleTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/measure/FormattedCharacterIteratorTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/measure/RangeTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/Assume.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/DependsOn.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/DependsOnMethod.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/LoggingWatcher.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/XMLComparator.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/XMLTestCase.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/foreigner/SerializableTableColumn.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/mock/CoordinateSystemAxisMock.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/mock/VerticalCRSMock.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/ClassesTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/collection/CacheTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/collection/CodeListSetTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedMapTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedSetTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/collection/IntegerListTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakHashSetTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakValueHashMapTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/iso/AbstractNameTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultInternationalStringTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultNameFactoryTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/iso/LargeCodeList.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/iso/NamesTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/logging/EmptyWarningListeners.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/logging/LoggerAdapterTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/xml/MarshallerPoolTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/xml/NilReasonTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/xml/ReferenceResolverMock.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/xml/ValueConverterTest.java
sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/xml/XLinkTest.java
Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 18 06:31:07 2017
@@ -1,5 +1,5 @@
/sis/branches/Android:1430670-1480699
/sis/branches/JDK6:1394913-1508480
-/sis/branches/JDK8:1584960-1779142
+/sis/branches/JDK8:1584960-1779291
/sis/branches/JDK9:1773327-1773512
/sis/trunk:1394364-1508466,1519089-1519674
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/StringConverter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/StringConverter.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/StringConverter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/StringConverter.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -123,7 +123,7 @@ abstract class StringConverter<T> extend
* then delegates to {@link #doConvert(String)}.
*
* @param source the string to convert, or {@code null}.
- * @return The converted value, or {@code null} if the given string was null or empty.
+ * @return the converted value, or {@code null} if the given string was null or empty.
* @throws UnconvertibleObjectException if an error occurred during the conversion.
*/
@Override
@@ -146,7 +146,7 @@ abstract class StringConverter<T> extend
* type of this converter.
*
* @param source the string to convert, guaranteed to be non-null and non-empty.
- * @return The converted value.
+ * @return the converted value.
* @throws Exception if an error occurred during the conversion.
*/
abstract T doConvert(String source) throws Exception;
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/CharSequenceAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/CharSequenceAdapter.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/CharSequenceAdapter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/CharSequenceAdapter.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -58,8 +58,8 @@ public final class CharSequenceAdapter e
* Converts a string read from a XML stream to the object containing the value.
* JAXB calls automatically this method at unmarshalling time.
*
- * @param value The adapter for this metadata value.
- * @return A {@link CharSequence} which represents the metadata value.
+ * @param value the adapter for this metadata value.
+ * @return a {@link CharSequence} which represents the metadata value.
*/
@Override
public CharSequence unmarshal(final GO_CharacterString value) {
@@ -70,8 +70,8 @@ public final class CharSequenceAdapter e
* Converts a {@linkplain CharSequence character sequence} to the object to be marshalled
* in a XML file or stream. JAXB calls automatically this method at marshalling time.
*
- * @param value The string value.
- * @return The wrapper for the given character sequence, or {@code null}.
+ * @param value the string value.
+ * @return the wrapper for the given character sequence, or {@code null}.
*/
@Override
public GO_CharacterString marshal(final CharSequence value) {
@@ -82,8 +82,8 @@ public final class CharSequenceAdapter e
* Converts a {@linkplain CharSequence character sequence} to the object to be marshalled
* in a XML file or stream.
*
- * @param value The character representation of the object being marshalled.
- * @return The wrapper for the given character sequence, or {@code null}.
+ * @param value the character representation of the object being marshalled.
+ * @return the wrapper for the given character sequence, or {@code null}.
*/
static GO_CharacterString wrap(CharSequence value) {
if (value instanceof String) {
@@ -147,10 +147,10 @@ public final class CharSequenceAdapter e
* This method is a copy of {@link #wrap(CharSequence)} simplified for the case when we know
* that the character sequence being marshalled is a string.
*
- * @param context The current (un)marshalling context, or {@code null} if none.
- * @param object The object being marshalled (e.g. {@code URI} or {@code Locale}).
- * @param string The string representation of the object being marshalled.
- * @return The wrapper for the given character sequence, or {@code null}.
+ * @param context the current (un)marshalling context, or {@code null} if none.
+ * @param object the object being marshalled (e.g. {@code URI} or {@code Locale}).
+ * @param string the string representation of the object being marshalled.
+ * @return the wrapper for the given character sequence, or {@code null}.
*/
public static GO_CharacterString wrap(final Context context, final Object object, final String string) {
final CharSequence text = value(context, object, string);
@@ -161,10 +161,10 @@ public final class CharSequenceAdapter e
* Same as {@link #wrap(Context, Object, String)}, but returns directly the {@link GO_CharacterString#text}
* value without wrapping in a {@code GO_CharacterString} instance.
*
- * @param context The current (un)marshalling context, or {@code null} if none.
- * @param object The object being marshalled (e.g. {@code URI} or {@code Locale}).
- * @param string The string representation of the object being marshalled.
- * @return The text value for the given character sequence, or {@code null}.
+ * @param context the current (un)marshalling context, or {@code null} if none.
+ * @param object the object being marshalled (e.g. {@code URI} or {@code Locale}).
+ * @param string the string representation of the object being marshalled.
+ * @return the text value for the given character sequence, or {@code null}.
*/
public static CharSequence value(final Context context, final Object object, String string) {
string = CharSequences.trimWhitespaces(string);
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Boolean.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Boolean.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Boolean.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Boolean.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -44,7 +44,7 @@ public final class GO_Boolean extends Pr
/**
* Constructs a wrapper for the given value.
*
- * @param value The value.
+ * @param value the value.
*/
@SuppressWarnings("NumberEquality")
private GO_Boolean(final Boolean value) {
@@ -65,8 +65,8 @@ public final class GO_Boolean extends Pr
* Allows JAXB to change the result of the marshalling process, according to the
* ISO-19139 standard and its requirements about primitive types.
*
- * @param value The boolean value we want to surround by an element representing its type.
- * @return An adaptation of the boolean value, that is to say a boolean value surrounded
+ * @param value the boolean value we want to surround by an element representing its type.
+ * @return an adaptation of the boolean value, that is to say a boolean value surrounded
* by {@code <gco:Boolean>} element.
*/
@Override
@@ -77,7 +77,7 @@ public final class GO_Boolean extends Pr
/**
* Invoked by JAXB at marshalling time for getting the actual value to write.
*
- * @return The value to be marshalled.
+ * @return the value to be marshalled.
*/
@XmlElement(name = "Boolean")
@XmlSchemaType(name = "boolean")
@@ -88,7 +88,7 @@ public final class GO_Boolean extends Pr
/**
* Invoked by JAXB at unmarshalling time for storing the result temporarily.
*
- * @param metadata The unmarshalled value.
+ * @param metadata the unmarshalled value.
*/
public void setElement(final Boolean metadata) {
this.metadata = metadata;
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -140,7 +140,7 @@ public class GO_CharacterString {
/**
* Builds a wrapper for the given text.
*
- * @param text The string to marshal, or {@code null} if none.
+ * @param text the string to marshal, or {@code null} if none.
*/
protected GO_CharacterString(final CharSequence text) {
this.text = text;
@@ -155,8 +155,8 @@ public class GO_CharacterString {
* Sets the {@link #text} field to the given value.
* If the given value overwrites a previous one, a warning is emitted.
*
- * @param value The value to set.
- * @param property 0 or one of the {@link #MIME_TYPE}, {@link #FILENAME} or {@link #ANCHOR} constants.
+ * @param value the value to set.
+ * @param property 0 or one of the {@link #MIME_TYPE}, {@link #FILENAME} or {@link #ANCHOR} constants.
*/
private void setText(CharSequence value, byte property) {
value = CharSequences.trimWhitespaces(value);
@@ -202,8 +202,8 @@ public class GO_CharacterString {
case 0: return StringAdapter.toString(text);
case FILENAME: return new FileName(text.toString());
case MIME_TYPE: return new MimeFileType(text.toString());
- case ANCHOR: return text; // Shall be an instance of Anchor.
- default: return null; // CodeList or Enum.
+ case ANCHOR: return text; // Shall be an instance of Anchor.
+ default: return null; // CodeList or Enum.
}
}
@@ -294,7 +294,7 @@ public class GO_CharacterString {
* an {@code InternationalString} or an {@code Anchor}. This method is overridden
* by {@code PT_FreeText} in order to handle the international string case.
*
- * @return The character sequence for this {@code <gco:CharacterString>}.
+ * @return the character sequence for this {@code <gco:CharacterString>}.
*/
protected CharSequence toCharSequence() {
final CharSequence text = CharSequences.trimWhitespaces(this.text);
@@ -313,7 +313,7 @@ public class GO_CharacterString {
* But precedents exist (for example {@link javax.swing.tree.DefaultMutableTreeNode})
* and this class is not for public usage.</div>
*
- * @return The text as a string (may be null).
+ * @return the text as a string (may be null).
*/
@Override
public final String toString() {
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -53,7 +53,7 @@ public final class GO_Decimal extends Pr
/**
* Constructs a wrapper for the given value.
*
- * @param value The value.
+ * @param value the value.
*/
private GO_Decimal(final Double value) {
super(value, value.isNaN());
@@ -73,8 +73,8 @@ public final class GO_Decimal extends Pr
* Allows JAXB to change the result of the marshalling process, according to the
* ISO-19139 standard and its requirements about primitive types.
*
- * @param value The double value we want to surround by an element representing its type.
- * @return An adaptation of the double value, that is to say a double value surrounded
+ * @param value the double value we want to surround by an element representing its type.
+ * @return an adaptation of the double value, that is to say a double value surrounded
* by {@code <gco:Decimal>} element.
*/
@Override
@@ -85,7 +85,7 @@ public final class GO_Decimal extends Pr
/**
* Invoked by JAXB at marshalling time for getting the actual value to write.
*
- * @return The value to be marshalled.
+ * @return the value to be marshalled.
*/
@XmlElement(name = "Decimal")
@XmlSchemaType(name = "decimal")
@@ -96,7 +96,7 @@ public final class GO_Decimal extends Pr
/**
* Invoked by JAXB at unmarshalling time for storing the result temporarily.
*
- * @param metadata The unmarshalled value.
+ * @param metadata the unmarshalled value.
*/
public void setElement(final Double metadata) {
this.metadata = metadata;
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal32.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal32.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal32.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal32.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -41,7 +41,7 @@ public final class GO_Decimal32 extends
/**
* Constructs a wrapper for the given value.
*
- * @param value The value.
+ * @param value the value.
*/
private GO_Decimal32(final Float value) {
super(value, value.isNaN());
@@ -61,8 +61,8 @@ public final class GO_Decimal32 extends
* Allows JAXB to change the result of the marshalling process, according to the
* ISO-19139 standard and its requirements about primitive types.
*
- * @param value The float value we want to surround by an element representing its type.
- * @return An adaptation of the float value, that is to say a float value surrounded
+ * @param value the float value we want to surround by an element representing its type.
+ * @return an adaptation of the float value, that is to say a float value surrounded
* by {@code <gco:Decimal>} element.
*/
@Override
@@ -73,7 +73,7 @@ public final class GO_Decimal32 extends
/**
* Invoked by JAXB at marshalling time for getting the actual value to write.
*
- * @return The value to be marshalled.
+ * @return the value to be marshalled.
*/
@XmlElement(name = "Decimal")
@XmlSchemaType(name = "decimal")
@@ -84,7 +84,7 @@ public final class GO_Decimal32 extends
/**
* Invoked by JAXB at unmarshalling time for storing the result temporarily.
*
- * @param metadata The unmarshalled value.
+ * @param metadata the unmarshalled value.
*/
public void setElement(final Float metadata) {
this.metadata = metadata;
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Distance.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Distance.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Distance.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Distance.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -53,7 +53,7 @@ public final class GO_Distance extends X
/**
* Constructs an adapter for the given value before marshalling.
*
- * @param value The value.
+ * @param value the value.
*
* @todo The unit of measurement is fixed to metres for now because we do not have this information
* in current metadata interface. This will need to be revisited in a future SIS version if we
@@ -67,8 +67,8 @@ public final class GO_Distance extends X
/**
* Allows JAXB to generate a Double object using the value found in the adapter.
*
- * @param value The value wrapped in an adapter.
- * @return The double value extracted from the adapter.
+ * @param value the value wrapped in an adapter.
+ * @return the double value extracted from the adapter.
*/
@Override
public Double unmarshal(final GO_Distance value) {
@@ -85,8 +85,8 @@ public final class GO_Distance extends X
* Allows JAXB to change the result of the marshalling process, according to the
* ISO-19139 standard and its requirements about {@code measures}.
*
- * @param value The double value we want to integrate into a {@code <gco:Distance>} element.
- * @return An adaptation of the double value, that is to say a double value surrounded
+ * @param value the double value we want to integrate into a {@code <gco:Distance>} element.
+ * @return an adaptation of the double value, that is to say a double value surrounded
* by {@code <gco:Distance>} element, with an {@code uom} attribute.
*/
@Override
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_GenericName.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_GenericName.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_GenericName.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_GenericName.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -56,8 +56,8 @@ public final class GO_GenericName extend
* Does the link between an {@link GenericName} and the adapter associated.
* JAXB calls automatically this method at marshalling-time.
*
- * @param value The implementing class for this metadata value.
- * @return An wrapper which contains the metadata value.
+ * @param value the implementing class for this metadata value.
+ * @return an wrapper which contains the metadata value.
*/
@Override
public GO_GenericName marshal(final GenericName value) {
@@ -68,8 +68,8 @@ public final class GO_GenericName extend
* Does the link between adapters and the way they will be unmarshalled.
* JAXB calls automatically this method at unmarshalling-time.
*
- * @param value The wrapper, or {@code null} if none.
- * @return The implementing class.
+ * @param value the wrapper, or {@code null} if none.
+ * @return the implementing class.
*/
@Override
public GenericName unmarshal(final GO_GenericName value) {
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -46,7 +46,7 @@ public final class GO_Integer extends Pr
/**
* Constructs a wrapper for the given value.
*
- * @param value The value.
+ * @param value the value.
*/
private GO_Integer(final Integer value) {
super(value, value == 0);
@@ -66,8 +66,8 @@ public final class GO_Integer extends Pr
* Allows JAXB to change the result of the marshalling process, according to the
* ISO-19139 standard and its requirements about primitive types.
*
- * @param value The integer value we want to surround by an element representing its type.
- * @return An adaptation of the integer value, that is to say an integer value surrounded
+ * @param value the integer value we want to surround by an element representing its type.
+ * @return an adaptation of the integer value, that is to say an integer value surrounded
* by {@code <gco:Integer>} element.
*/
@Override
@@ -78,7 +78,7 @@ public final class GO_Integer extends Pr
/**
* Invoked by JAXB at marshalling time for getting the actual value to write.
*
- * @return The value to be marshalled.
+ * @return the value to be marshalled.
*/
@XmlElement(name = "Integer")
@XmlSchemaType(name = "integer")
@@ -89,7 +89,7 @@ public final class GO_Integer extends Pr
/**
* Invoked by JAXB at unmarshalling time for storing the result temporarily.
*
- * @param metadata The unmarshalled value.
+ * @param metadata the unmarshalled value.
*/
public void setElement(final Integer metadata) {
this.metadata = metadata;
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer64.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer64.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer64.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer64.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -41,7 +41,7 @@ public final class GO_Integer64 extends
/**
* Constructs a wrapper for the given value.
*
- * @param value The value.
+ * @param value the value.
*/
private GO_Integer64(final Long value) {
super(value, value == 0L);
@@ -61,8 +61,8 @@ public final class GO_Integer64 extends
* Allows JAXB to change the result of the marshalling process, according to the
* ISO-19139 standard and its requirements about primitive types.
*
- * @param value The integer value we want to surround by an element representing its type.
- * @return An adaptation of the integer value, that is to say a integer value surrounded
+ * @param value the integer value we want to surround by an element representing its type.
+ * @return an adaptation of the integer value, that is to say a integer value surrounded
* by {@code <gco:Integer>} element.
*/
@Override
@@ -73,7 +73,7 @@ public final class GO_Integer64 extends
/**
* Invoked by JAXB at marshalling time for getting the actual value to write.
*
- * @return The value to be marshalled.
+ * @return the value to be marshalled.
*/
@XmlElement(name = "Integer")
@XmlSchemaType(name = "integer")
@@ -84,7 +84,7 @@ public final class GO_Integer64 extends
/**
* Invoked by JAXB at unmarshalling time for storing the result temporarily.
*
- * @param metadata The unmarshalled value.
+ * @param metadata the unmarshalled value.
*/
public void setElement(final Long metadata) {
this.metadata = metadata;
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_LocalName.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_LocalName.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_LocalName.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_LocalName.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -55,8 +55,8 @@ public final class GO_LocalName extends
* Does the link between an {@link AbstractName} and the adapter associated.
* JAXB calls automatically this method at marshalling-time.
*
- * @param value The implementing class for this metadata value.
- * @return An wrapper which contains the metadata value.
+ * @param value the implementing class for this metadata value.
+ * @return an wrapper which contains the metadata value.
*/
@Override
public GO_LocalName marshal(final LocalName value) {
@@ -67,8 +67,8 @@ public final class GO_LocalName extends
* Does the link between adapters and the way they will be unmarshalled.
* JAXB calls automatically this method at unmarshalling-time.
*
- * @param value The wrapper, or {@code null} if none.
- * @return The implementing class.
+ * @param value the wrapper, or {@code null} if none.
+ * @return the implementing class.
*/
@Override
public LocalName unmarshal(final GO_LocalName value) {
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Measure.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Measure.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Measure.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Measure.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -53,7 +53,7 @@ public final class GO_Measure extends Xm
/**
* Constructs an adapter for the given value before marshalling.
*
- * @param value The value.
+ * @param value the value.
*
* @todo The unit of measurement is fixed to metres for now because we do not have this information
* in current metadata interface. This will need to be revisited in a future SIS version if we
@@ -67,8 +67,8 @@ public final class GO_Measure extends Xm
/**
* Allows JAXB to generate a Double object using the value found in the adapter.
*
- * @param value The value wrapped in an adapter.
- * @return The double value extracted from the adapter.
+ * @param value the value wrapped in an adapter.
+ * @return the double value extracted from the adapter.
*/
@Override
public Double unmarshal(final GO_Measure value) {
@@ -85,8 +85,8 @@ public final class GO_Measure extends Xm
* Allows JAXB to change the result of the marshalling process, according to the
* ISO-19139 standard and its requirements about {@code measures}.
*
- * @param value The double value we want to integrate into a {@code <gco:Measure>} element.
- * @return An adaptation of the double value, that is to say a double value surrounded
+ * @param value the double value we want to integrate into a {@code <gco:Measure>} element.
+ * @return an adaptation of the double value, that is to say a double value surrounded
* by {@code <gco:Measure>} element, with an {@code uom} attribute.
*/
@Override
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Real.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Real.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Real.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Real.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -48,7 +48,7 @@ public final class GO_Real extends Prope
/**
* Constructs a wrapper for the given value.
*
- * @param value The value.
+ * @param value the value.
*/
private GO_Real(final Double value) {
super(value, value.isNaN());
@@ -68,8 +68,8 @@ public final class GO_Real extends Prope
* Allows JAXB to change the result of the marshalling process, according to the
* ISO-19139 standard and its requirements about primitive types.
*
- * @param value The double value we want to surround by an element representing its type.
- * @return An adaptation of the double value, that is to say a double value surrounded
+ * @param value the double value we want to surround by an element representing its type.
+ * @return an adaptation of the double value, that is to say a double value surrounded
* by {@code <gco:Real>} element.
*/
@Override
@@ -80,7 +80,7 @@ public final class GO_Real extends Prope
/**
* Invoked by JAXB at marshalling time for getting the actual value to write.
*
- * @return The value to be marshalled.
+ * @return the value to be marshalled.
*/
@XmlElement(name = "Real")
@XmlSchemaType(name = "double")
@@ -91,7 +91,7 @@ public final class GO_Real extends Prope
/**
* Invoked by JAXB at unmarshalling time for storing the result temporarily.
*
- * @param metadata The unmarshalled value.
+ * @param metadata the unmarshalled value.
*/
public void setElement(final Double metadata) {
this.metadata = metadata;
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_RecordType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_RecordType.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_RecordType.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_RecordType.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -40,7 +40,7 @@ public final class GO_RecordType extends
/**
* Wraps a {@code RecordType} value with a {@code gco:RecordType} tags at marshalling-time.
*
- * @param metadata The metadata value to marshal.
+ * @param metadata the metadata value to marshal.
*/
private GO_RecordType(final RecordType metadata) {
super(metadata);
@@ -49,8 +49,8 @@ public final class GO_RecordType extends
/**
* Returns a wrapper for the given {@code RecordType} element.
*
- * @param value The value to marshal.
- * @return The wrapper around the given metadata value.
+ * @param value the value to marshal.
+ * @return the wrapper around the given metadata value.
*/
@Override
protected GO_RecordType wrap(final RecordType value) {
@@ -71,7 +71,7 @@ public final class GO_RecordType extends
* Returns the {@link DefaultRecordType} generated from the metadata value.
* This method is systematically called at marshalling-time by JAXB.
*
- * @return The metadata to be marshalled.
+ * @return the metadata to be marshalled.
*/
@XmlElement(name = "RecordType")
public DefaultRecordType getElement() {
@@ -82,7 +82,7 @@ public final class GO_RecordType extends
* Sets the value for the {@link DefaultRecordType}.
* This method is systematically called at unmarshalling-time by JAXB.
*
- * @param metadata The unmarshalled metadata.
+ * @param metadata the unmarshalled metadata.
*/
public void setElement(final DefaultRecordType metadata) {
this.metadata = metadata;
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/InternationalStringAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/InternationalStringAdapter.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/InternationalStringAdapter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/InternationalStringAdapter.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -45,8 +45,8 @@ public final class InternationalStringAd
* Converts an object read from a XML stream to an {@link InternationalString} implementation.
* JAXB invokes automatically this method at unmarshalling time.
*
- * @param value The wrapper for the value, or {@code null}.
- * @return The unwrapped {@link String} value, or {@code null}.
+ * @param value the wrapper for the value, or {@code null}.
+ * @return the unwrapped {@link String} value, or {@code null}.
*/
@Override
public InternationalString unmarshal(final GO_CharacterString value) {
@@ -66,8 +66,8 @@ public final class InternationalStringAd
* Converts an {@link InternationalString} to an object to format into a XML stream.
* JAXB invokes automatically this method at marshalling time.
*
- * @param value The string value, or {@code null}.
- * @return The wrapper for the given string, or {@code null}.
+ * @param value the string value, or {@code null}.
+ * @return the wrapper for the given string, or {@code null}.
*/
@Override
public GO_CharacterString marshal(final InternationalString value) {
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/InternationalStringConverter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/InternationalStringConverter.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/InternationalStringConverter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/InternationalStringConverter.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -41,8 +41,8 @@ public final class InternationalStringCo
* Converts an object read from a XML stream to an {@link InternationalString}
* implementation. JAXB invokes automatically this method at unmarshalling time.
*
- * @param adapter The adapter for the string value.
- * @return An {@link InternationalString} for the string value.
+ * @param adapter the adapter for the string value.
+ * @return an {@link InternationalString} for the string value.
*/
@Override
public InternationalString unmarshal(final String adapter) {
@@ -53,8 +53,8 @@ public final class InternationalStringCo
* Converts an {@link InternationalString} to an object to formatted into a
* XML stream. JAXB invokes automatically this method at marshalling time.
*
- * @param value The string value.
- * @return The adapter for the string.
+ * @param value the string value.
+ * @return the adapter for the string.
*/
@Override
public String marshal(final InternationalString value) {
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/NameAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/NameAdapter.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/NameAdapter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/NameAdapter.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -66,7 +66,7 @@ abstract class NameAdapter<ValueType ext
/**
* Ensures that the {@linkplain #name} is not already defined.
*
- * @throws IllegalStateException If a name is already defined.
+ * @throws IllegalStateException if a name is already defined.
*/
private void ensureUndefined() throws IllegalStateException {
if (name != null) {
@@ -78,7 +78,7 @@ abstract class NameAdapter<ValueType ext
* Returns the {@code LocalName} or {@code ScopedName} to marshall. Returns {@code null}�if the name
* is a {@link TypeName} or a {@link MemberName}, in order to use {@link #getNameType()} instead.
*
- * @return The code for the current name, or {@code null} if none.
+ * @return the code for the current name, or {@code null} if none.
*/
@XmlElementRef
public final CodeType getCodeType() {
@@ -103,8 +103,8 @@ abstract class NameAdapter<ValueType ext
* Sets the value for the {@code LocalName} or {@code ScopedName}.
* This method is called at unmarshalling-time by JAXB.
*
- * @param code The new name.
- * @throws IllegalStateException If a name is already defined.
+ * @param code the new name.
+ * @throws IllegalStateException if a name is already defined.
*/
public final void setCodeType(final CodeType code) throws IllegalStateException {
ensureUndefined();
@@ -117,7 +117,7 @@ abstract class NameAdapter<ValueType ext
* Returns the {@code TypeName} or {@code MemberName} to marshall. Returns {@code null} if the name
* is a {@link LocalName} or {@link ScopedName}, in order to use {@link #getCodeType()} instead.
*
- * @return The current name, or {@code null} if none.
+ * @return the current name, or {@code null} if none.
*/
@XmlElementRef
public final DefaultLocalName getNameType() {
@@ -135,8 +135,8 @@ abstract class NameAdapter<ValueType ext
* Sets the value from the {@code TypeName} or {@code MemberName}.
* This method is called at unmarshalling-time by JAXB.
*
- * @param value The new name.
- * @throws IllegalStateException If a name is already defined.
+ * @param value the new name.
+ * @throws IllegalStateException if a name is already defined.
*/
public final void setNameType(final DefaultLocalName value) throws IllegalStateException {
ensureUndefined();
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -102,8 +102,8 @@ import org.apache.sis.util.resources.Err
* abstract {@code getElement()} from this class.</li>
* </ul></div>
*
- * @param <ValueType> The adapter subclass.
- * @param <BoundType> The interface being adapted.
+ * @param <ValueType> the adapter subclass.
+ * @param <BoundType> the interface being adapted.
*
* @author C�dric Brian�on (Geomatys)
* @author Martin Desruisseaux (Geomatys)
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/StringAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/StringAdapter.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/StringAdapter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/StringAdapter.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -48,8 +48,8 @@ public class StringAdapter extends XmlAd
* If the context is {@code null} or does not specify any locale, then the choice
* of locale is left to the {@link InternationalString#toString()} implementation.
*
- * @param text The {@code CharSequence} to convert to a {@code String}, or {@code null}.
- * @return The localized representation of the given text, or {@code null} if the text was null.
+ * @param text the {@code CharSequence} to convert to a {@code String}, or {@code null}.
+ * @return the localized representation of the given text, or {@code null} if the text was null.
*
* @see org.apache.sis.xml.XML#LOCALE
*/
@@ -62,8 +62,10 @@ public class StringAdapter extends XmlAd
if (context != null) {
final Locale locale = context.getLocale();
if (locale != null) {
- // While Apache SIS accepts null locale, foreigner
- // implementations are not guaranteed to support null.
+ /*
+ * While Apache SIS accepts null locale, foreigner
+ * implementations are not guaranteed to support null.
+ */
return ((InternationalString) text).toString(locale);
}
}
@@ -75,8 +77,8 @@ public class StringAdapter extends XmlAd
* Returns the string representation of the given {@code GO_CharacterString} for the current locale.
* The locale is determined by the {@link org.apache.sis.xml.XML#LOCALE} property given to the marshaller.
*
- * @param value The wrapper for the value, or {@code null}.
- * @return The string representation of the given text, or {@code null}.
+ * @param value the wrapper for the value, or {@code null}.
+ * @return the string representation of the given text, or {@code null}.
*/
static String toString(final GO_CharacterString value) {
return (value != null) ? toString(value.toCharSequence()) : null;
@@ -88,8 +90,8 @@ public class StringAdapter extends XmlAd
* sequence is an instance of {@link InternationalString}, then the locale from
* the current unmashalling context is used in order to get a string.
*
- * @param value The wrapper for the value, or {@code null}.
- * @return The unwrapped {@link String} value, or {@code null}.
+ * @param value the wrapper for the value, or {@code null}.
+ * @return the unwrapped {@link String} value, or {@code null}.
*/
@Override
public String unmarshal(final GO_CharacterString value) {
@@ -100,8 +102,8 @@ public class StringAdapter extends XmlAd
* Converts a {@linkplain String string} to the object to be marshalled in a XML file or stream.
* JAXB calls automatically this method at marshalling time.
*
- * @param value The string value, or {@code null}.
- * @return The wrapper for the given string, or {@code null}.
+ * @param value the string value, or {@code null}.
+ * @return the wrapper for the given string, or {@code null}.
*/
@Override
public GO_CharacterString marshal(final String value) {
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/URIAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/URIAdapter.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/URIAdapter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/URIAdapter.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -42,9 +42,9 @@ public final class URIAdapter extends Xm
* Converts a URI read from a XML stream to the object containing the value.
* JAXB calls automatically this method at unmarshalling time.
*
- * @param value The wrapper for the URI value, or {@code null}.
- * @return A {@link URI} which represents the URI value, or {@code null}.
- * @throws URISyntaxException If the string is not a valid URI.
+ * @param value the wrapper for the URI value, or {@code null}.
+ * @return a {@link URI} which represents the URI value, or {@code null}.
+ * @throws URISyntaxException if the string is not a valid URI.
*/
@Override
public URI unmarshal(final GO_CharacterString value) throws URISyntaxException {
@@ -60,8 +60,8 @@ public final class URIAdapter extends Xm
* Converts a {@link URI} to the object to be marshalled in a XML file or stream.
* JAXB calls automatically this method at marshalling time.
*
- * @param value The URI value, or {@code null}.
- * @return The wrapper for the given URI, or {@code null}.
+ * @param value the URI value, or {@code null}.
+ * @return the wrapper for the given URI, or {@code null}.
*/
@Override
public GO_CharacterString marshal(final URI value) {
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/UnitAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/UnitAdapter.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/UnitAdapter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/UnitAdapter.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -37,8 +37,8 @@ public class UnitAdapter extends XmlAdap
/**
* Returns a unit for the given string.
*
- * @param value The unit symbol.
- * @return The unit for the given symbol.
+ * @param value the unit symbol.
+ * @return the unit for the given symbol.
* @throws IllegalArgumentException if the given symbol is unknown.
*/
@Override
@@ -50,8 +50,8 @@ public class UnitAdapter extends XmlAdap
/**
* Returns the symbol of the given unit.
*
- * @param value The unit.
- * @return The unit symbol.
+ * @param value the unit.
+ * @return the unit symbol.
*/
@Override
public String marshal(final Unit<?> value) {
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -64,7 +64,7 @@ public abstract class CodeListAdapter<Va
/**
* Creates a wrapper for a {@link CodeList}, in order to handle the format specified in ISO-19139.
*
- * @param value The value of {@link CodeList} to be marshalled.
+ * @param value the value of {@link CodeList} to be marshalled.
*/
protected CodeListAdapter(final CodeListUID value) {
identifier = value;
@@ -82,15 +82,15 @@ public abstract class CodeListAdapter<Va
* For example {@link org.apache.sis.internal.jaxb.code.MD_RestrictionCode}
* replaces {@code "licence"} by {@code "license"} for ISO 19115:2003 compatibility.
*
- * @param value The value of {@link CodeList}, to be marshalled.
- * @return The wrapper for the code list value.
+ * @param value the value of {@link CodeList}, to be marshalled.
+ * @return the wrapper for the code list value.
*/
protected abstract ValueType wrap(CodeListUID value);
/**
* Returns the class of code list wrapped by this adapter.
*
- * @return The code list class.
+ * @return the code list class.
*/
protected abstract Class<BoundType> getCodeListClass();
@@ -98,8 +98,8 @@ public abstract class CodeListAdapter<Va
* Substitutes the adapter value read from an XML stream by the object which will
* contain the value. JAXB calls automatically this method at unmarshalling time.
*
- * @param adapter The adapter for this metadata value.
- * @return A code list which represents the metadata value.
+ * @param adapter the adapter for this metadata value.
+ * @return a code list which represents the metadata value.
*/
@Override
public final BoundType unmarshal(final ValueType adapter) {
@@ -110,8 +110,8 @@ public abstract class CodeListAdapter<Va
* Substitutes the code list by the adapter to be marshalled into an XML file
* or stream. JAXB calls automatically this method at marshalling time.
*
- * @param code The code list value.
- * @return The adapter for the given code list.
+ * @param code the code list value.
+ * @return the adapter for the given code list.
*/
@Override
public final ValueType marshal(final BoundType code) {
@@ -122,7 +122,7 @@ public abstract class CodeListAdapter<Va
* Invoked by JAXB on marshalling. Subclasses must override this
* method with the appropriate {@code @XmlElement} annotation.
*
- * @return The {@code CodeList} value to be marshalled.
+ * @return the {@code CodeList} value to be marshalled.
*/
public abstract CodeListUID getElement();
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListUID.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListUID.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListUID.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListUID.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -60,13 +60,13 @@ public final class CodeListUID {
* <li>{@code "http://schemas.opengis.net/iso/19139/20070417/resources/Codelist/gmxCodelists.xml#CI_OnLineFunctionCode"}</li>
* </ul>
*
- * @param context The current (un)marshalling context, or {@code null} if none.
- * @param identifier The UML identifier of the code list.
- * @return The URL to the given code list in the given schema.
+ * @param context the current (un)marshalling context, or {@code null} if none.
+ * @param identifier the UML identifier of the code list.
+ * @return the URL to the given code list in the given schema.
*/
private static String schema(final Context context, final String identifier) {
return Context.schema(context, "gmd", Schemas.METADATA_ROOT)
- .append(Schemas.CODELISTS_PATH) // Future SIS version may switch between localized/unlocalized file.
+ .append(Schemas.CODELISTS_PATH) // Future SIS version may switch between localized/unlocalized file.
.append('#').append(identifier).toString();
}
@@ -110,11 +110,11 @@ public final class CodeListUID {
/**
* Builds a code list with the given attributes.
*
- * @param context The current (un)marshalling context, or {@code null} if none.
- * @param codeList The {@code codeList} attribute, to be concatenated after the {@code "#"} symbol.
- * @param codeListValue The {@code codeListValue} attribute, to be declared in the XML element.
- * @param codeSpace The 3-letters language code of the {@code value} attribute, or {@code null} if none.
- * @param value The value in the language specified by the {@code codeSpace} attribute, or {@code null} if none.
+ * @param context the current (un)marshalling context, or {@code null} if none.
+ * @param codeList the {@code codeList} attribute, to be concatenated after the {@code "#"} symbol.
+ * @param codeListValue the {@code codeListValue} attribute, to be declared in the XML element.
+ * @param codeSpace the 3-letters language code of the {@code value} attribute, or {@code null} if none.
+ * @param value the value in the language specified by the {@code codeSpace} attribute, or {@code null} if none.
*/
public CodeListUID(final Context context, final String codeList, final String codeListValue,
final String codeSpace, final String value)
@@ -129,8 +129,8 @@ public final class CodeListUID {
* Builds a value for {@link CodeListAdapter} elements.
* This constructors stores the values that will be used for marshalling.
*
- * @param context The current (un)marshalling context, or {@code null} if none.
- * @param code The code list to wrap.
+ * @param context the current (un)marshalling context, or {@code null} if none.
+ * @param code the code list to wrap.
*/
public CodeListUID(final Context context, final ControlledVocabulary code) {
final String classID = Types.getListName(code);
@@ -156,9 +156,11 @@ public final class CodeListUID {
if (value != null) {
codeSpace = Context.converter(context).toLanguageCode(context, locale);
} else {
- // Fallback when no value is defined for the code list. Build a value from the
- // most descriptive name (excluding the field name), which is usually the UML
- // name except for CharacterSet in which case it is a string like "UTF-8".
+ /*
+ * Fallback when no value is defined for the code list. Build a value from the
+ * most descriptive name (excluding the field name), which is usually the UML
+ * name except for CharacterSet in which case it is a string like "UTF-8".
+ */
value = Types.getCodeLabel(code);
}
codeListValue = fieldID;
@@ -170,7 +172,7 @@ public final class CodeListUID {
* code list is actually used as an enumeration, then the above attribute
* is null and we have to use directly the {@linkplain #value} instead.
*
- * @return The identifier to be given to the {@code CodeList.valueOf(\u2026)} method.
+ * @return the identifier to be given to the {@code CodeList.valueOf(\u2026)} method.
*/
@Override
public String toString() {
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -73,10 +73,10 @@ public final class Country extends GO_Ch
* Builds a {@code <Country>} element.
* For private use by {@link #create(Context, Locale)} only.
*
- * @param context The current (un)marshalling context, or {@code null} if none.
- * @param codeListValue The {@code codeListValue} attribute in the XML element.
- * @param codeSpace The 3-letters language code of the {@code value} attribute, or {@code null} if none.
- * @param value The value in the language specified by the {@code codeSpace} attribute, or {@code null} if none.
+ * @param context the current (un)marshalling context, or {@code null} if none.
+ * @param codeListValue the {@code codeListValue} attribute in the XML element.
+ * @param codeSpace the 3-letters language code of the {@code value} attribute, or {@code null} if none.
+ * @param value the value in the language specified by the {@code codeSpace} attribute, or {@code null} if none.
*/
private Country(final Context context, final String codeListValue, final String codeSpace, final String value) {
identifier = new CodeListUID(context, "Country", codeListValue, codeSpace, value);
@@ -85,9 +85,9 @@ public final class Country extends GO_Ch
/**
* Creates a new wrapper for the given locale.
*
- * @param context The current (un)marshalling context, or {@code null} if none.
- * @param locale The value to marshal, or {@code null}.
- * @return The country to marshal, or {@code null} if the given locale was null
+ * @param context the current (un)marshalling context, or {@code null} if none.
+ * @param locale the value to marshal, or {@code null}.
+ * @return the country to marshal, or {@code null} if the given locale was null
* or if its {@link Locale#getCountry()} attribute is the empty string.
*/
public static Country create(final Context context, final Locale locale) {
@@ -120,11 +120,11 @@ public final class Country extends GO_Ch
/**
* Returns the locale for the given language and country (which may be null), or {@code null} if none.
*
- * @param context The current (un)marshalling context, or {@code null} if none.
- * @param language The wrapper for the language value.
- * @param country The wrapper for the country value.
- * @param caller The class which is invoking this method, used only in case of warning.
- * @return A locale which represents the language and country value.
+ * @param context the current (un)marshalling context, or {@code null} if none.
+ * @param language the wrapper for the language value.
+ * @param country the wrapper for the country value.
+ * @param caller the class which is invoking this method, used only in case of warning.
+ * @return a locale which represents the language and country value.
*/
public static Locale getLocale(final Context context, final LanguageCode language, final Country country,
final Class<?> caller)
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/EnumAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/EnumAdapter.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/EnumAdapter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/EnumAdapter.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -31,8 +31,8 @@ import org.apache.sis.util.iso.Types;
* </srv:direction>
* }
*
- * @param <ValueType> The subclass implementing this adapter.
- * @param <BoundType> The enum being adapted.
+ * @param <ValueType> the subclass implementing this adapter.
+ * @param <BoundType> the enum being adapted.
*
* @author Martin Desruisseaux (Geomatys)
* @since 0.5
@@ -51,8 +51,8 @@ public abstract class EnumAdapter<ValueT
/**
* Converts the given XML value to an enumeration constant name.
*
- * @param value The text in the XML element.
- * @return The presumed enumeration constant name.
+ * @param value the text in the XML element.
+ * @return the presumed enumeration constant name.
*/
protected static String name(final String value) {
/*
@@ -81,8 +81,8 @@ public abstract class EnumAdapter<ValueT
/**
* Returns the text to write in the XML element for the given enumeration constant.
*
- * @param e The enumeration constant.
- * @return The text to write in the XML element.
+ * @param e the enumeration constant.
+ * @return the text to write in the XML element.
*/
protected static String value(final ControlledVocabulary e) {
return Types.getCodeName(e);
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/GO_URL.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/GO_URL.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/GO_URL.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/GO_URL.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -50,7 +50,7 @@ public final class GO_URL extends XmlAda
/**
* Builds an adapter for the given URI.
*
- * @param value The URI to marshal.
+ * @param value the URI to marshal.
*/
private GO_URL(final URI value) {
uri = value.toString();
@@ -60,8 +60,8 @@ public final class GO_URL extends XmlAda
* Converts a URI read from a XML stream to the object which will contains
* the value. JAXB calls automatically this method at unmarshalling time.
*
- * @param value The adapter for this metadata value.
- * @return A {@link URI} which represents the metadata value.
+ * @param value the adapter for this metadata value.
+ * @return a {@link URI} which represents the metadata value.
* @throws URISyntaxException if the given value contains an invalid URI.
*/
@Override
@@ -77,8 +77,8 @@ public final class GO_URL extends XmlAda
* Converts a {@link URI} to the object to be marshalled in a XML file
* or stream. JAXB calls automatically this method at marshalling time.
*
- * @param value The URI value.
- * @return The adapter for this URI.
+ * @param value the URI value.
+ * @return the adapter for this URI.
*/
@Override
public GO_URL marshal(final URI value) {
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java?rev=1779293&r1=1779292&r2=1779293&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java [UTF-8] Wed Jan 18 06:31:07 2017
@@ -71,10 +71,10 @@ public final class LanguageCode extends
* Builds a {@code <LanguageCode>} element.
* For private use by {@link #create(Context, Locale)} only.
*
- * @param context The current (un)marshalling context, or {@code null} if none.
- * @param codeListValue The {@code codeListValue} attribute in the XML element.
- * @param codeSpace The 3-letters language code of the {@code value} attribute, or {@code null} if none.
- * @param value The value in the language specified by the {@code codeSpace} attribute, or {@code null} if none.
+ * @param context the current (un)marshalling context, or {@code null} if none.
+ * @param codeListValue the {@code codeListValue} attribute in the XML element.
+ * @param codeSpace the 3-letters language code of the {@code value} attribute, or {@code null} if none.
+ * @param value the value in the language specified by the {@code codeSpace} attribute, or {@code null} if none.
*/
private LanguageCode(final Context context, final String codeListValue, final String codeSpace, final String value) {
identifier = new CodeListUID(context, "LanguageCode", codeListValue, codeSpace, value);
@@ -83,9 +83,9 @@ public final class LanguageCode extends
/**
* Creates a new wrapper for the given locale.
*
- * @param context The current (un)marshalling context, or {@code null} if none.
- * @param locale The value to marshal, or {@code null}.
- * @return The language to marshal, or {@code null} if the given locale was null
+ * @param context the current (un)marshalling context, or {@code null} if none.
+ * @param locale the value to marshal, or {@code null}.
+ * @return the language to marshal, or {@code null} if the given locale was null
* or if its {@link Locale#getLanguage()} attribute is the empty string.
*/
public static LanguageCode create(final Context context, final Locale locale) {
@@ -132,7 +132,7 @@ public final class LanguageCode extends
* Returns the language, or {@code null} if none. The language is expected to
* be a 2- or 3-letters ISO 639 code, but this is not verified by this method.
*
- * @return The language code
+ * @return the language code
*/
public String getLanguage() {
String code;