sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1418218 - in /sis/branches/JDK7: ide-project/NetBeans/nbproject/ sis-utility/src/main/java/org/apache/sis/internal/jaxb/code/ sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/ sis-utility/src/main/java/org/apache/sis/internal/jax...
Date Fri, 07 Dec 2012 08:36:04 GMT
Author: desruisseaux
Date: Fri Dec  7 08:36:02 2012
New Revision: 1418218

URL: http://svn.apache.org/viewvc?rev=1418218&view=rev
Log:
Minor javadoc fixes.

Modified:
    sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties
    sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml
    sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/code/package-info.java
    sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
    sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java
    sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java
    sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/PT_FreeText.java
    sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/TextGroup.java
    sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/Static.java
    sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/XML.java

Modified: sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties?rev=1418218&r1=1418217&r2=1418218&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties Fri Dec  7 08:36:02
2012
@@ -3,6 +3,6 @@
 build.xml.data.CRC32=58e6b21c
 build.xml.script.CRC32=462eaba0
 build.xml.stylesheet.CRC32=28e38971@1.53.1.46
-nbproject/build-impl.xml.data.CRC32=37bc3318
+nbproject/build-impl.xml.data.CRC32=e8191a2a
 nbproject/build-impl.xml.script.CRC32=aa05f102
 nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.53.1.46

Modified: sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml?rev=1418218&r1=1418217&r2=1418218&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml Fri Dec  7 08:36:02 2012
@@ -35,6 +35,7 @@
             <word>namespaces</word>
             <word>timezone</word>
             <word>Unicode</word>
+            <word>unmarshal</word>
             <word>unmarshalling</word>
             <word>whitespaces</word>
         </spellchecker-wordlist>

Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/code/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/code/package-info.java?rev=1418218&r1=1418217&r2=1418218&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/code/package-info.java
(original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/code/package-info.java
Fri Dec  7 08:36:02 2012
@@ -17,7 +17,7 @@
 
 /**
  * JAXB adapters for code {@linkplain org.opengis.util.CodeList code lists}.
- * Every time JAXB will try to marshall or unmarshall a code list, an adapter will replace
the
+ * Every time JAXB will try to marshal or unmarshal a code list, an adapter will replace
the
  * code list value (which would otherwise be written directly by JAXB) by an element like
below:
  *
  * <ul>

Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java?rev=1418218&r1=1418217&r2=1418218&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
(original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
Fri Dec  7 08:36:02 2012
@@ -57,7 +57,7 @@ public class GO_CharacterString {
     /**
      * Builds an wrapper for the given text.
      *
-     * @param text The string to marshall, 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;

Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java?rev=1418218&r1=1418217&r2=1418218&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java
(original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java
Fri Dec  7 08:36:02 2012
@@ -88,8 +88,8 @@ 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 marshall, or {@code null}.
-     * @paral anchors If non-null, marshall the locale as a {@code <gco:CharacterString>}
instead
+     * @param locale  The value to marshal, or {@code null}.
+     * @paral anchors If non-null, marshal the locale as a {@code <gco:CharacterString>}
instead
      *                than {@code <Country>}, using the given anchors if any.
      * @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.

Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java?rev=1418218&r1=1418217&r2=1418218&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java
(original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java
Fri Dec  7 08:36:02 2012
@@ -86,8 +86,8 @@ 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 marshall, or {@code null}.
-     * @paral anchors If non-null, marshall the locale as a {@code <gco:CharacterString>}
instead
+     * @param locale  The value to marshal, or {@code null}.
+     * @paral anchors If non-null, marshal the locale as a {@code <gco:CharacterString>}
instead
      *                than {@code <LanguageCode>}, using the given anchors if any.
      * @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.

Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/PT_FreeText.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/PT_FreeText.java?rev=1418218&r1=1418217&r2=1418218&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/PT_FreeText.java
(original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/PT_FreeText.java
Fri Dec  7 08:36:02 2012
@@ -31,7 +31,7 @@ import org.apache.sis.util.type.SimpleIn
 
 /**
  * JAXB wrapper for ISO-19139 {@code <PT_FreeText>} element mapped to {@link InternationalString}.
- * It will be used in order to marshall and unmarshall international strings localized in
several
+ * It will be used in order to marshal and unmarshal international strings localized in several
  * language, using the {@link DefaultInternationalString} implementation class. Example:
  *
  * {@preformat xml

Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/TextGroup.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/TextGroup.java?rev=1418218&r1=1418217&r2=1418218&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/TextGroup.java
(original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/TextGroup.java
Fri Dec  7 08:36:02 2012
@@ -38,7 +38,7 @@ import javax.xml.bind.annotation.XmlElem
  * unmarshalling. More specifically, the name suggests that the format should be:</p>
  *
  * {@preformat xml
- *   <gco:CharacterString>Geotoolkit.org, projet OpenSource</gco:CharacterString>
+ *   <gco:CharacterString>Apache SIS, projet OpenSource</gco:CharacterString>
  *   <gmd:PT_FreeText>
  *     <gmd:textGroup>
  *       <gmd:LocalisedCharacterString locale="#locale-eng">Apache SIS, OpenSource
Project</gmd:LocalisedCharacterString>
@@ -51,7 +51,7 @@ import javax.xml.bind.annotation.XmlElem
  * But the actual official format is:
  *
  * {@preformat xml
- *   <gco:CharacterString>Geotoolkit.org, projet OpenSource</gco:CharacterString>
+ *   <gco:CharacterString>Apache SIS, projet OpenSource</gco:CharacterString>
  *   <gmd:PT_FreeText>
  *     <gmd:textGroup>
  *       <gmd:LocalisedCharacterString locale="#locale-eng">Apache SIS, OpenSource
Project</gmd:LocalisedCharacterString>

Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/Static.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/Static.java?rev=1418218&r1=1418217&r2=1418218&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/Static.java (original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/Static.java Fri Dec  7
08:36:02 2012
@@ -51,7 +51,7 @@ package org.apache.sis.util;
  * <tr><td>{@link org.apache.sis.io.IO}</td>
  *     <td>Methods working on {@link Appendable} instances.</td></tr>
  * <tr><td>{@link org.apache.sis.xml.XML}</td>
- *     <td>Marshall or unmarshall ISO 19115 objects.</td></tr>
+ *     <td>Marshal or unmarshal ISO 19115 objects.</td></tr>
  *
  * <tr><th colspan="2" class="hsep">Loggings and exceptions</th></tr>
  * <tr><td>{@link ArgumentChecks}</td>

Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/XML.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/XML.java?rev=1418218&r1=1418217&r2=1418218&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/XML.java (original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/xml/XML.java Fri Dec  7 08:36:02
2012
@@ -60,7 +60,7 @@ public final class XML extends Static {
      * UML identifiers}. While such identifiers often look like English words, they are not
      * considered as the {@linkplain Locale#ENGLISH English} localization.
      * The algorithm attempting to find a "unlocalized" string is defined in the
-     * {@link org.apache.sis.util.DefaultInternationalString#toString(Locale)} javadoc.
+     * {@link org.apache.sis.util.type.DefaultInternationalString#toString(Locale)} javadoc.
      *
      * {@section Special case}
      * If the object to be marshalled is an instance of
@@ -179,7 +179,7 @@ public final class XML extends Static {
      *         }
      *     }
      *
-     *     // Unmarshall a XML string, trapping some kind of errors.
+     *     // Unmarshal a XML string, trapping some kind of errors.
      *     // Not all errors are trapped - see the ValueConverter
      *     // javadoc for more details.
      *     WarningCollector myWarningList = new WarningCollector();



Mime
View raw message