sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1480602 [15/15] - in /sis/branches/Android: ./ ide-project/ ide-project/NetBeans/ ide-project/NetBeans/nbproject/ ide-project/eclipse/ sis-app/src/main/java/org/apache/sis/cli/ sis-build-helper/ sis-build-helper/src/main/java/org/apache/si...
Date Thu, 09 May 2013 12:24:20 GMT
Modified: sis/branches/Android/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultInternationalStringTest.java
URL: http://svn.apache.org/viewvc/sis/branches/Android/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultInternationalStringTest.java?rev=1480602&r1=1480601&r2=1480602&view=diff
==============================================================================
--- sis/branches/Android/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultInternationalStringTest.java
[iso-8859-1] (original)
+++ sis/branches/Android/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultInternationalStringTest.java
[UTF-8] Thu May  9 12:24:13 2013
@@ -38,7 +38,7 @@ public final strictfp class DefaultInter
     /** {@value} */ static final String MESSAGE       = "This is an unlocalized message.";
     /** {@value} */ static final String MESSAGE_en    = "This is a localized message.";
     /** {@value} */ static final String MESSAGE_fr    = "Voici un message.";
-    /** {@value} */ static final String MESSAGE_fr_CA = "Swing la baguette dans le fond de
la boîte à bois!";
+    /** {@value} */ static final String MESSAGE_fr_CA = "Swing la baguette dans le fond de
la boîte à bois!";
 
     /**
      * Tests an instance having only the English locale.
@@ -49,6 +49,7 @@ public final strictfp class DefaultInter
         toTest.add(Locale.ENGLISH, MESSAGE);
         assertSame(MESSAGE, toTest.toString());
         assertSame(MESSAGE, toTest.toString(null));
+        assertSame(MESSAGE, toTest.toString(Locale.ROOT));
         validate(toTest);
     }
 
@@ -85,6 +86,7 @@ public final strictfp class DefaultInter
      */
     private static void assertLocalized(final InternationalString toTest, final String quebecker)
{
         assertEquals ("Unlocalized message:", MESSAGE,    toTest.toString(null));
+        assertEquals ("Unlocalized message:", MESSAGE,    toTest.toString(Locale.ROOT));
         assertEquals ("English message:",     MESSAGE_en, toTest.toString(Locale.ENGLISH));
         assertEquals ("French message:",      MESSAGE_fr, toTest.toString(Locale.FRENCH));
         assertEquals ("Quebecker message:",   quebecker,  toTest.toString(Locale.CANADA_FRENCH));
@@ -102,13 +104,15 @@ public final strictfp class DefaultInter
         toTest.add(Locale.FRENCH,        MESSAGE_fr);
         toTest.add(Locale.CANADA_FRENCH, MESSAGE_fr_CA);
 
-        assertEquals("Unlocalized message:", MESSAGE,    String.format((Locale) null,  "%s",
toTest));
+        assertEquals("Unlocalized message:", MESSAGE,    String.format(Locale.ROOT,    "%s",
toTest));
         assertEquals("English message:",     MESSAGE_en, String.format(Locale.ENGLISH, "%s",
toTest));
         assertEquals("French message:",      MESSAGE_fr, String.format(Locale.FRENCH,  "%s",
toTest));
 
-        assertEquals("  This", String.format(Locale.ENGLISH, "%6.4s",  toTest));
-        assertEquals(" Voici", String.format(Locale.FRENCH,  "%6.5s",  toTest));
-        assertEquals("THIS  ", String.format(Locale.ENGLISH, "%-6.5S", toTest));
-        assertEquals("VOICI ", String.format(Locale.FRENCH,  "%-6.5S", toTest));
+        assertEquals("  Thi…", String.format(Locale.ROOT,    "%6.4s",  toTest));
+        assertEquals("  Thi…", String.format(Locale.ENGLISH, "%6.4s",  toTest));
+        assertEquals(" Voic…", String.format(Locale.FRENCH,  "%6.5s",  toTest));
+        assertEquals("THIS… ", String.format(Locale.ROOT,    "%-6.5S", toTest));
+        assertEquals("THIS… ", String.format(Locale.ENGLISH, "%-6.5S", toTest));
+        assertEquals("VOIC… ", String.format(Locale.FRENCH,  "%-6.5S", toTest));
     }
 }

Propchange: sis/branches/Android/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultInternationalStringTest.java
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Thu May  9 12:24:13 2013
@@ -1 +1 @@
-text/plain
+text/plain;charset=UTF-8

Propchange: sis/branches/Android/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultNameFactoryTest.java
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Thu May  9 12:24:13 2013
@@ -1 +1 @@
-text/plain
+text/plain;charset=UTF-8

Modified: sis/branches/Android/sis-utility/src/test/java/org/apache/sis/util/iso/SimpleInternationalStringTest.java
URL: http://svn.apache.org/viewvc/sis/branches/Android/sis-utility/src/test/java/org/apache/sis/util/iso/SimpleInternationalStringTest.java?rev=1480602&r1=1480601&r2=1480602&view=diff
==============================================================================
--- sis/branches/Android/sis-utility/src/test/java/org/apache/sis/util/iso/SimpleInternationalStringTest.java
[iso-8859-1] (original)
+++ sis/branches/Android/sis-utility/src/test/java/org/apache/sis/util/iso/SimpleInternationalStringTest.java
[UTF-8] Thu May  9 12:24:13 2013
@@ -16,6 +16,7 @@
  */
 package org.apache.sis.util.iso;
 
+import java.util.Locale;
 import org.apache.sis.test.TestCase;
 import org.junit.Test;
 
@@ -41,6 +42,8 @@ public final strictfp class SimpleIntern
         final SimpleInternationalString toTest = new SimpleInternationalString(MESSAGE);
         assertSame(MESSAGE, toTest.toString());
         assertSame(MESSAGE, toTest.toString(null));
+        assertSame(MESSAGE, toTest.toString(Locale.ROOT));
+        assertSame(MESSAGE, toTest.toString(Locale.JAPANESE));
         validate(toTest);
     }
 
@@ -53,6 +56,21 @@ public final strictfp class SimpleIntern
         final SimpleInternationalString after  = assertSerializedEquals(before);
         assertEquals(MESSAGE, after.toString());
         assertEquals(MESSAGE, after.toString(null));
+        assertEquals(MESSAGE, after.toString(Locale.ROOT));
+        assertEquals(MESSAGE, after.toString(Locale.JAPANESE));
         validate(after);
     }
+
+    /**
+     * Tests the formatting in a {@code printf} statement.
+     */
+    @Test
+    public void testPrintf() {
+        final SimpleInternationalString toTest = new SimpleInternationalString(MESSAGE);
+        assertEquals(MESSAGE,                               String.format("%s", toTest));
+        assertEquals("    This is an unlocalized message.", String.format("%35s", toTest));
+        assertEquals("This is an unlocalized message.    ", String.format("%-35s", toTest));
+        assertEquals("This is a…",                          String.format("%1.10s", toTest));
+        assertEquals("This is a…  ",                        String.format("%-12.10s", toTest));
+    }
 }

Propchange: sis/branches/Android/sis-utility/src/test/java/org/apache/sis/util/iso/SimpleInternationalStringTest.java
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Thu May  9 12:24:13 2013
@@ -1 +1 @@
-text/plain
+text/plain;charset=UTF-8

Modified: sis/branches/Android/sis-utility/src/test/java/org/apache/sis/util/iso/TypesTest.java
URL: http://svn.apache.org/viewvc/sis/branches/Android/sis-utility/src/test/java/org/apache/sis/util/iso/TypesTest.java?rev=1480602&r1=1480601&r2=1480602&view=diff
==============================================================================
--- sis/branches/Android/sis-utility/src/test/java/org/apache/sis/util/iso/TypesTest.java
[iso-8859-1] (original)
+++ sis/branches/Android/sis-utility/src/test/java/org/apache/sis/util/iso/TypesTest.java
[UTF-8] Thu May  9 12:24:13 2013
@@ -20,6 +20,8 @@ import java.util.Set;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Locale;
+import org.opengis.util.InternationalString;
+import org.opengis.metadata.citation.Address;
 import org.opengis.metadata.citation.Citation;
 import org.opengis.metadata.citation.OnLineFunction;
 import org.opengis.metadata.content.ImagingCondition;
@@ -76,25 +78,51 @@ public final strictfp class TypesTest ex
     }
 
     /**
-     * Tests the {@link Types#getDescription(Class, Locale)} method.
+     * Tests the {@link Types#getResources(String)} method.
+     */
+    @Test
+    public void testGetResources() {
+        assertEquals("org.opengis.metadata.Descriptions", Types.getResources("org.opengis.metadata.Identifier"));
+        assertNull(Types.getResources("org.opengis.metadata2.Identifier"));
+    }
+
+    /**
+     * Tests the {@link Types#getDescription(Class)} method.
      */
     @Test
     public void testGetDescription() {
+        final InternationalString description = Types.getDescription(CharacterSet.class);
+        assertEquals("Name of the character coding standard used in the resource.",
+                description.toString(Locale.ROOT));
         assertEquals("Name of the character coding standard used in the resource.",
-                Types.getDescription(CharacterSet.class, Locale.ENGLISH));
-        assertEquals("Jeu de caractères.",
-                Types.getDescription(CharacterSet.class, Locale.FRENCH));
+                description.toString(Locale.ENGLISH));
+        assertEquals("Jeu de caractères.",
+                description.toString(Locale.FRENCH));
+    }
+
+    /**
+     * Tests the {@link Types#getDescription(Class, String)} method.
+     */
+    @Test
+    public void testGetPropertyDescription() {
+        assertEquals("The city of the location.",
+                Types.getDescription(Address.class, "city").toString(Locale.ROOT));
+        assertEquals("Country of the physical address.",
+                Types.getDescription(Address.class, "country").toString(Locale.ENGLISH));
     }
 
     /**
-     * Tests the {@link Types#getDescription(CodeList, Locale)} method.
+     * Tests the {@link Types#getDescription(CodeList)} method.
      */
     @Test
     public void testGetCodeDescription() {
+        final InternationalString description = Types.getDescription(CharacterSet.ISO_8859_1);
         assertEquals("ISO/IEC 8859-1, Information technology - 8-bit single byte coded graphic
character sets - Part 1 : Latin alphabet No.1.",
-                Types.getDescription(CharacterSet.ISO_8859_1, Locale.ENGLISH));
+                description.toString(Locale.ROOT));
+        assertEquals("ISO/IEC 8859-1, Information technology - 8-bit single byte coded graphic
character sets - Part 1 : Latin alphabet No.1.",
+                description.toString(Locale.ENGLISH));
         assertEquals("ISO/IEC 8859-1, alphabet latin 1.",
-                Types.getDescription(CharacterSet.ISO_8859_1, Locale.FRENCH));
+                description.toString(Locale.FRENCH));
     }
 
     /**
@@ -118,22 +146,23 @@ public final strictfp class TypesTest ex
     }
 
     /**
-     * Tests the examples given in {@link Types#getCodeTitle(CodeList)} javadoc.
+     * Tests the examples given in {@link Types#getCodeLabel(CodeList)} javadoc.
      */
     @Test
-    public void testGetCodeTitle() {
-        assertEquals("North",         Types.getCodeTitle(AxisDirection   .NORTH));
-        assertEquals("UTF-8",         Types.getCodeTitle(CharacterSet    .UTF_8));
-        assertEquals("Blurred image", Types.getCodeTitle(ImagingCondition.BLURRED_IMAGE));
+    public void testGetCodeLabel() {
+        assertEquals("North",         Types.getCodeLabel(AxisDirection   .NORTH));
+        assertEquals("UTF-8",         Types.getCodeLabel(CharacterSet    .UTF_8));
+        assertEquals("Blurred image", Types.getCodeLabel(ImagingCondition.BLURRED_IMAGE));
     }
 
     /**
-     * Tests {@link Types#getCodeTitle(CodeList, Locale)}.
+     * Tests {@link Types#getCodeTitle(CodeList)}.
      */
     @Test
-    public void testGetLocalizedCodeTitle() {
-        assertEquals("Download",       Types.getCodeTitle(OnLineFunction.DOWNLOAD, Locale.ENGLISH));
-        assertEquals("Téléchargement", Types.getCodeTitle(OnLineFunction.DOWNLOAD,
Locale.FRENCH));
+    public void testGetCodeTitle() {
+        assertEquals("Download",       Types.getCodeTitle(OnLineFunction.DOWNLOAD).toString(Locale.ROOT));
+        assertEquals("Download",       Types.getCodeTitle(OnLineFunction.DOWNLOAD).toString(Locale.ENGLISH));
+        assertEquals("Téléchargement", Types.getCodeTitle(OnLineFunction.DOWNLOAD).toString(Locale.FRENCH));
     }
 
     /**

Propchange: sis/branches/Android/sis-utility/src/test/java/org/apache/sis/util/iso/TypesTest.java
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Thu May  9 12:24:13 2013
@@ -1 +1 @@
-text/plain
+text/plain;charset=UTF-8

Propchange: sis/branches/Android/sis-utility/src/test/java/org/apache/sis/util/logging/PerformanceLevelTest.java
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Thu May  9 12:24:13 2013
@@ -1 +1 @@
-text/plain
+text/plain;charset=UTF-8

Modified: sis/branches/Android/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java
URL: http://svn.apache.org/viewvc/sis/branches/Android/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java?rev=1480602&r1=1480601&r2=1480602&view=diff
==============================================================================
--- sis/branches/Android/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java
[iso-8859-1] (original)
+++ sis/branches/Android/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java
[UTF-8] Thu May  9 12:24:13 2013
@@ -40,7 +40,7 @@ import static org.apache.sis.test.Assert
  * @since   0.3 (derived from geotk-2.2)
  * @version 0.3
  */
-@DependsOn(org.apache.sis.util.ArraysTest.class)
+@DependsOn(LoaderTest.class)
 public final strictfp class IndexedResourceBundleTest extends TestCase {
     /**
      * The resource bundle in process of being tested. Shall be reset to {@code null} after
every
@@ -56,14 +56,18 @@ public final strictfp class IndexedResou
     public void testGetResources() {
         final Errors english = Errors.getResources(Locale.ENGLISH);
         final Errors french  = Errors.getResources(Locale.FRENCH);
+        final Errors canada  = Errors.getResources(Locale.CANADA);
+        final Errors quebec  = Errors.getResources(Locale.CANADA_FRENCH);
+        assertNotSame(english, Errors.getResources(Locale.US));
+        assertNotSame(english, Errors.getResources(Locale.UK));
         assertNotSame(english, french);
+        assertNotSame(english, canada);
+        assertNotSame(french,  quebec);
 
         assertSame(english, Errors.getResources(Locale.ENGLISH));
-        assertSame(english, Errors.getResources(Locale.US));
-        assertSame(english, Errors.getResources(Locale.UK));
-        assertSame(english, Errors.getResources(Locale.CANADA));
+        assertSame(canada,  Errors.getResources(Locale.CANADA));
         assertSame(french,  Errors.getResources(Locale.FRENCH));
-        assertSame(french,  Errors.getResources(Locale.CANADA_FRENCH));
+        assertSame(quebec,  Errors.getResources(Locale.CANADA_FRENCH));
     }
 
     /**
@@ -78,7 +82,7 @@ public final strictfp class IndexedResou
         Errors.getResources(Locale.ENGLISH).list(buffer);
         final String text = buffer.toString();
         final int key     = text.indexOf("NullArgument_1");
-        final int value   = text.indexOf("Argument ‘{0}’ shall not be null.");
+        final int value   = text.indexOf("Argument ‘{0}’ shall not be null.");
         assertTrue(key   > 0);
         assertTrue(value > key);
     }
@@ -114,8 +118,8 @@ public final strictfp class IndexedResou
         final Errors english = Errors.getResources(Locale.ENGLISH);
         final Errors french  = Errors.getResources(Locale.FRENCH);
 
-        assertEquals("Argument ‘{0}’ shall not be null.",      (testing = english).getString(Errors.Keys.NullArgument_1));
-        assertEquals("L’argument ‘{0}’ ne doit pas être nul.", (testing
= french) .getString(Errors.Keys.NullArgument_1));
+        assertEquals("Argument ‘{0}’ shall not be null.",      (testing = english).getString(Errors.Keys.NullArgument_1));
+        assertEquals("L’argument ‘{0}’ ne doit pas être nul.", (testing = french)
.getString(Errors.Keys.NullArgument_1));
         testing = null;
     }
 
@@ -128,8 +132,8 @@ public final strictfp class IndexedResou
         final Errors english = Errors.getResources(Locale.ENGLISH);
         final Errors french  = Errors.getResources(Locale.FRENCH);
 
-        assertEquals("Argument ‘{0}’ shall not be null.",      (testing = english).getString("NullArgument_1"));
-        assertEquals("L’argument ‘{0}’ ne doit pas être nul.", (testing
= french) .getString("NullArgument_1"));
+        assertEquals("Argument ‘{0}’ shall not be null.",      (testing = english).getString("NullArgument_1"));
+        assertEquals("L’argument ‘{0}’ ne doit pas être nul.", (testing = french)
.getString("NullArgument_1"));
         testing = null;
     }
 
@@ -140,9 +144,9 @@ public final strictfp class IndexedResou
     @DependsOnMethod("testGetString")
     public void testGetStringWithParameter() {
         testing = Errors.getResources(Locale.ENGLISH);
-        assertEquals("Argument ‘CRS’ shall not be null.", testing.getString(Errors.Keys.NullArgument_1,
"CRS"));
+        assertEquals("Argument ‘CRS’ shall not be null.", testing.getString(Errors.Keys.NullArgument_1,
"CRS"));
         testing = Errors.getResources(Locale.FRENCH);
-        assertEquals("L’argument ‘CRS’ ne doit pas être nul.", testing.getString(Errors.Keys.NullArgument_1,
"CRS"));
+        assertEquals("L’argument ‘CRS’ ne doit pas être nul.", testing.getString(Errors.Keys.NullArgument_1,
"CRS"));
         testing = null;
     }
 
@@ -153,13 +157,15 @@ public final strictfp class IndexedResou
     @DependsOnMethod("testGetResources")
     public void testFormatInternational() {
         InternationalString i18n = Errors.formatInternational(Errors.Keys.NullArgument_1);
-        assertEquals("Argument ‘{0}’ shall not be null.",      i18n.toString(Locale.ENGLISH));
-        assertEquals("L’argument ‘{0}’ ne doit pas être nul.", i18n.toString(Locale.FRENCH));
+        assertEquals("Argument ‘{0}’ shall not be null.",      i18n.toString(Locale.ROOT));
+        assertEquals("Argument ‘{0}’ shall not be null.",      i18n.toString(Locale.ENGLISH));
+        assertEquals("L’argument ‘{0}’ ne doit pas être nul.", i18n.toString(Locale.FRENCH));
         assertNotSame(i18n, assertSerializedEquals(i18n));
 
         i18n = Errors.formatInternational(Errors.Keys.NullArgument_1, "CRS");
-        assertEquals("Argument ‘CRS’ shall not be null.",      i18n.toString(Locale.ENGLISH));
-        assertEquals("L’argument ‘CRS’ ne doit pas être nul.", i18n.toString(Locale.FRENCH));
+        assertEquals("Argument ‘CRS’ shall not be null.",      i18n.toString(Locale.ROOT));
+        assertEquals("Argument ‘CRS’ shall not be null.",      i18n.toString(Locale.ENGLISH));
+        assertEquals("L’argument ‘CRS’ ne doit pas être nul.", i18n.toString(Locale.FRENCH));
         assertNotSame(i18n, assertSerializedEquals(i18n));
     }
 
@@ -175,7 +181,7 @@ public final strictfp class IndexedResou
 
         final SimpleFormatter formatter = new SimpleFormatter();
         final String message = formatter.format(record);
-        assertTrue(message.contains("Argument ‘CRS’ shall not be null."));
+        assertTrue(message.contains("Argument ‘CRS’ shall not be null."));
         testing = null;
     }
 

Propchange: sis/branches/Android/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Thu May  9 12:24:13 2013
@@ -1 +1 @@
-text/plain
+text/plain;charset=UTF-8

Modified: sis/branches/Android/sis-utility/src/test/java/org/apache/sis/xml/NilReasonTest.java
URL: http://svn.apache.org/viewvc/sis/branches/Android/sis-utility/src/test/java/org/apache/sis/xml/NilReasonTest.java?rev=1480602&r1=1480601&r2=1480602&view=diff
==============================================================================
--- sis/branches/Android/sis-utility/src/test/java/org/apache/sis/xml/NilReasonTest.java [iso-8859-1]
(original)
+++ sis/branches/Android/sis-utility/src/test/java/org/apache/sis/xml/NilReasonTest.java [UTF-8]
Thu May  9 12:24:13 2013
@@ -21,7 +21,7 @@ import org.opengis.metadata.citation.Cit
 import org.opengis.metadata.citation.ResponsibleParty;
 import org.apache.sis.util.LenientComparable;
 import org.apache.sis.util.ComparisonMode;
-import org.apache.sis.util.Arrays;
+import org.apache.sis.util.ArraysExt;
 import org.apache.sis.test.TestCase;
 import org.junit.*;
 
@@ -50,8 +50,8 @@ public final strictfp class NilReasonTes
         assertSame(NilReason.MISSING,  NilReason.valueOf("  missing "));
 
         final NilReason[] reasons = NilReason.values();
-        assertTrue(Arrays.contains(reasons, NilReason.TEMPLATE));
-        assertTrue(Arrays.contains(reasons, NilReason.MISSING));
+        assertTrue(ArraysExt.contains(reasons, NilReason.TEMPLATE));
+        assertTrue(ArraysExt.contains(reasons, NilReason.MISSING));
     }
 
     /**
@@ -70,9 +70,9 @@ public final strictfp class NilReasonTes
         assertNull   ("NilReason.getURI()", other.getURI());
 
         final NilReason[] reasons = NilReason.values();
-        assertTrue(Arrays.contains(reasons, NilReason.TEMPLATE));
-        assertTrue(Arrays.contains(reasons, NilReason.MISSING));
-        assertTrue(Arrays.contains(reasons, other));
+        assertTrue(ArraysExt.contains(reasons, NilReason.TEMPLATE));
+        assertTrue(ArraysExt.contains(reasons, NilReason.MISSING));
+        assertTrue(ArraysExt.contains(reasons, other));
     }
 
     /**
@@ -88,9 +88,9 @@ public final strictfp class NilReasonTes
         assertEquals("NilReason.getURI()", "http://www.nilreasons.org", String.valueOf(other.getURI()));
 
         final NilReason[] reasons = NilReason.values();
-        assertTrue(Arrays.contains(reasons, NilReason.TEMPLATE));
-        assertTrue(Arrays.contains(reasons, NilReason.MISSING));
-        assertTrue(Arrays.contains(reasons, other));
+        assertTrue(ArraysExt.contains(reasons, NilReason.TEMPLATE));
+        assertTrue(ArraysExt.contains(reasons, NilReason.MISSING));
+        assertTrue(ArraysExt.contains(reasons, other));
     }
 
     /**

Propchange: sis/branches/Android/sis-utility/src/test/java/org/apache/sis/xml/NilReasonTest.java
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Thu May  9 12:24:13 2013
@@ -1 +1 @@
-text/plain
+text/plain;charset=UTF-8

Propchange: sis/branches/Android/sis-utility/src/test/java/org/apache/sis/xml/XLinkTest.java
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Thu May  9 12:24:13 2013
@@ -1 +1 @@
-text/plain
+text/plain;charset=UTF-8

Propchange: sis/branches/Android/sis-utility/src/test/java/org/apache/sis/xml/readme.txt
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Thu May  9 12:24:13 2013
@@ -1 +1 @@
-text/plain
+text/plain;charset=UTF-8

Modified: sis/branches/Android/sis-webapp/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/sis-webapp/pom.xml?rev=1480602&r1=1480601&r2=1480602&view=diff
==============================================================================
--- sis/branches/Android/sis-webapp/pom.xml (original)
+++ sis/branches/Android/sis-webapp/pom.xml Thu May  9 12:24:13 2013
@@ -38,8 +38,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <groupId>javax</groupId>
+      <artifactId>javaee-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.geonames</groupId>
@@ -54,11 +54,10 @@
 
   <build>
     <plugins>
-    <plugin>
-    <groupId>org.codehaus.mojo</groupId>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
         <executions>
-
           <execution>
             <id>reserve-ports</id>
             <phase>initialize</phase>

Propchange: sis/branches/Android/sis-webapp/src/main/java/org/apache/sis/services/LocationServlet.java
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Thu May  9 12:24:13 2013
@@ -1 +1 @@
-text/plain
+text/plain;charset=UTF-8

Propchange: sis/branches/Android/src/main/docbook/README.txt
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Thu May  9 12:24:13 2013
@@ -1 +1 @@
-text/plain
+text/plain;charset=UTF-8

Modified: sis/branches/Android/src/main/docbook/fr.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/src/main/docbook/fr.xml?rev=1480602&r1=1480601&r2=1480602&view=diff
==============================================================================
--- sis/branches/Android/src/main/docbook/fr.xml (original)
+++ sis/branches/Android/src/main/docbook/fr.xml Thu May  9 12:24:13 2013
@@ -33,5 +33,6 @@
   <xi:include href="fr/XML.xml"/>
   <xi:include href="fr/utility.xml"/>
   <xi:include href="fr/geometry.xml"/>
+  <xi:include href="fr/coverage.xml"/>
 
 </book>

Modified: sis/branches/Android/src/main/docbook/fr/XML.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/src/main/docbook/fr/XML.xml?rev=1480602&r1=1480601&r2=1480602&view=diff
==============================================================================
--- sis/branches/Android/src/main/docbook/fr/XML.xml (original)
+++ sis/branches/Android/src/main/docbook/fr/XML.xml Thu May  9 12:24:13 2013
@@ -28,7 +28,7 @@
     qui ne font pas partie des spécifications abstraites d’origines.
     Ces attributs supplémentaires sont habituellement propres au <acronym>XML</acronym>
     et peuvent ne pas apparaître directement dans l’<acronym>API</acronym>
de Apache <acronym>SIS</acronym>.
-    Certains de ces attributs, notamment <literal role="OGC">gmd:id</literal>,
<literal role="OGC">gco:uuid</literal>
+    Certains de ces attributs, notamment <literal role="OGC">id</literal>, <literal
role="OGC">uuid</literal>
     et <literal>xlink:href</literal>, restent toutefois accessibles sous forme
de paires clé-valeurs.
   </para>
   <para>
@@ -181,7 +181,7 @@
       Le type de la valeur est un élément <acronym>XML</acronym> dont le
nom commence toujours par une lettre majuscule, en ignorant les préfixes.
       Dans l’exemple ci-haut nous avions <classname role="OGC">MD_DataIdentification</classname>,
qui correspond à l’interface Java <classname role="GeoAPI">DataIdentification</classname>.
       C’est cet élément <acronym>XML</acronym> qui contient les propriétés
filles. Cet élément accepte aussi un groupe d’attributs
-      (notamment <literal role="OGC">gmd:id</literal> et <literal role="OGC">gco:uuid</literal>)
+      (notamment <literal role="OGC">id</literal> et <literal role="OGC">uuid</literal>)
       que les schémas <acronym>XSD</acronym> de l’<acronym>OGC</acronym>
nomment collectivement <classname role="OGC">gco:ObjectIdentification</classname>.
       Ces attributs n’ont pas de méthodes Java dédiées, mais sont accessibles
indirectement via l’interface <classname role="SIS">IdentifiedObject</classname>
       décrite dans la sous-section suivante.
@@ -219,8 +219,8 @@
     <section>
       <title>Identification d’instances déjà définies</title>
       <para>
-        L’élément englobant peut contenir un attribut <literal role="OGC">gmd:id</literal>,
-        <literal role="OGC">gco:uuid</literal> ou <literal>xlink:href</literal>.
+        L’élément englobant peut contenir un attribut <literal role="OGC">id</literal>,
+        <literal role="OGC">uuid</literal> ou <literal>xlink:href</literal>.
         Si un de ces attributs est présent, l’élément englobé peut être
complètement omis;
         il sera remplacé au moment de la lecture par l’élément référencé
par l’attribut.
         Dans l’exemple suivant, la partie gauche définie un élément associé
à l’identifiant “<literal>mon_id</literal>”,
@@ -258,11 +258,11 @@
       </para>
       <itemizedlist>
         <listitem>
-          <literal role="OGC">gmd:id</literal> n’est valide qu’à
l’intérieur du document <acronym>XML</acronym>
+          <literal role="OGC">id</literal> n’est valide qu’à l’intérieur
du document <acronym>XML</acronym>
           qui définit l’objet ainsi référencé.
         </listitem>
         <listitem>
-          <literal role="OGC">gco:uuid</literal> peut être valide à l’extérieur
du document <acronym>XML</acronym>,
+          <literal role="OGC">uuid</literal> peut être valide à l’extérieur
du document <acronym>XML</acronym>,
           mais quelqu’un doit maintenir une base de données fournissant les objets
pour chaque <acronym>UUID</acronym> donnés.
         </listitem>
         <listitem>
@@ -278,10 +278,10 @@
         notamment <constant role="SIS">ID</constant>, <constant role="SIS">UUID</constant>
et <constant role="SIS">HREF</constant>.
         Chacune de ces clés peut être associée à une valeur d’un type différent
(habituellement <classname>String</classname>,
         <classname>UUID</classname> ou <classname>URI</classname>)
selon la clé.
-        Par exemple le code suivant définit une valeur pour l’attribut <literal
role="OGC">gco:uuid</literal>:
+        Par exemple le code suivant définit une valeur pour l’attribut <literal
role="OGC">uuid</literal>:
       </para>
       <example>
-        <title>Associer un identifiant <literal role="OGC">gco:uuid</literal>
à une méta-donnée</title>
+        <title>Associer un identifiant <literal role="OGC">uuid</literal>
à une méta-donnée</title>
         <programlisting language="java">import org.apache.sis.metadata.iso.DefaultMetadata;
 import org.apache.sis.xml.IdentifierSpace;
 import java.util.UUID;

Modified: sis/branches/Android/src/main/docbook/fr/geoapi.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/src/main/docbook/fr/geoapi.xml?rev=1480602&r1=1480601&r2=1480602&view=diff
==============================================================================
--- sis/branches/Android/src/main/docbook/fr/geoapi.xml (original)
+++ sis/branches/Android/src/main/docbook/fr/geoapi.xml Thu May  9 12:24:13 2013
@@ -108,7 +108,7 @@
           Une conversion à partir des schémas <acronym>XSD</acronym> introduit,
au moins dans le cas des méta-données, près du
           double du nombre d’interfaces réellement définies par le standard, sans
que cela n’apporte de nouvelles fonctionnalités.
           Les schémas <acronym>XSD</acronym> définissent aussi des attributs
propres aux documents <acronym>XML</acronym>
-          (<literal role="OGC">gmd:id</literal>, <literal role="OGC">gco:uuid</literal>,
<literal>xlink:href</literal>, <foreignphrase>etc.</foreignphrase>),
+          (<literal role="OGC">id</literal>, <literal role="OGC">uuid</literal>,
<literal>xlink:href</literal>, <foreignphrase>etc.</foreignphrase>),
           qui n’existent pas dans les diagrammes <acronym>UML</acronym>
originaux et que l’on ne souhaite pas forcément exposer dans un API Java.
           Une conversion à partir des schémas <acronym>UML</acronym> évite
ce problème, mais les outils capable d’effectuer cette
           opération sont plus rares.

Modified: sis/branches/Android/src/main/docbook/fr/utility.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/src/main/docbook/fr/utility.xml?rev=1480602&r1=1480601&r2=1480602&view=diff
==============================================================================
--- sis/branches/Android/src/main/docbook/fr/utility.xml (original)
+++ sis/branches/Android/src/main/docbook/fr/utility.xml Thu May  9 12:24:13 2013
@@ -173,10 +173,10 @@
     </section>
 
     <section>
-      <title>Convention locale nulle</title>
+      <title>Convention <constant>Locale.ROOT</constant></title>
       <para>
-        La plupart des méthodes <acronym>SIS</acronym> recevant ou retournant
une valeur de type <classname>Locale</classname>
-        acceptent la valeur <constant>null</constant>. Cette valeur est interprétée
comme signifiant de ne pas localiser le texte.
+        Toutes les méthodes <acronym>SIS</acronym> recevant ou retournant
une valeur de type <classname>Locale</classname>
+        acceptent la valeur <constant>Locale.ROOT</constant>. Cette valeur est
interprétée comme signifiant de ne pas localiser le texte.
         La notion de <quote>texte non-localisé</quote> est un peu fausse,
puisqu’il faut bien choisir une convention de format.
         Mais cette convention, bien que très proche de l’anglais, sera généralement
légèrement différente.
         Par exemple:

Propchange: sis/branches/Android/src/site/apt/branches.apt
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Thu May  9 12:24:13 2013
@@ -1 +1 @@
-text/plain
+text/plain;charset=UTF-8

Propchange: sis/branches/Android/src/site/apt/code-format.apt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/Android/src/site/apt/code-format.apt
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Propchange: sis/branches/Android/src/site/apt/develop.apt
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Thu May  9 12:24:13 2013
@@ -1 +1 @@
-text/plain
+text/plain;charset=UTF-8

Propchange: sis/branches/Android/src/site/apt/download.apt
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Thu May  9 12:24:13 2013
@@ -1 +1 @@
-text/plain
+text/plain;charset=UTF-8

Modified: sis/branches/Android/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/sis/branches/Android/src/site/apt/index.apt?rev=1480602&r1=1480601&r2=1480602&view=diff
==============================================================================
--- sis/branches/Android/src/site/apt/index.apt [iso-8859-1] (original)
+++ sis/branches/Android/src/site/apt/index.apt [UTF-8] Thu May  9 12:24:13 2013
@@ -3,7 +3,7 @@
                              ------------------------------
 
 
-The Apache SIS™ library
+The Apache SIS™ library
 
   Apache SIS is a toolkit for describing location information, including points, bounding
boxes,
   polygons, and for computing distances on that information.
@@ -26,7 +26,9 @@ The Apache SIS™ library
 
     * {{{./apidocs/index.html}Aggregated Javadoc}}
 
-    * Developer Guide (English - translation to be provided later) ({{{./book/fr.xhtml}Français}})
+    * Developer Guide (English - translation to be provided later) ({{{./book/fr.xhtml}Français}})
+
+    * {{{http://cwiki.apache.org/confluence/display/SIS}SIS Wiki}}
 
 
 ** SIS developer documentation

Propchange: sis/branches/Android/src/site/apt/index.apt
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Thu May  9 12:24:13 2013
@@ -1 +1 @@
-text/plain
+text/plain;charset=UTF-8

Propchange: sis/branches/Android/storage/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu May  9 12:24:13 2013
@@ -0,0 +1,10 @@
+.project
+.settings
+.classpath
+.jetproperties
+.wtpmodules
+target
+bin
+cobertura.ser
+nbproject
+nbactions.xml

Modified: sis/branches/Android/storage/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/storage/pom.xml?rev=1480602&r1=1480595&r2=1480602&view=diff
==============================================================================
--- sis/branches/Android/storage/pom.xml (original)
+++ sis/branches/Android/storage/pom.xml Thu May  9 12:24:13 2013
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>sis-parent</artifactId>
-    <version>0.3-geoapi3.0-SNAPSHOT</version>
+    <version>0.3-android-SNAPSHOT</version>
   </parent>
 
 

Modified: sis/branches/Android/storage/sis-netcdf/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/storage/sis-netcdf/pom.xml?rev=1480602&r1=1480595&r2=1480602&view=diff
==============================================================================
--- sis/branches/Android/storage/sis-netcdf/pom.xml (original)
+++ sis/branches/Android/storage/sis-netcdf/pom.xml Thu May  9 12:24:13 2013
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>storage</artifactId>
-    <version>0.3-geoapi3.0-SNAPSHOT</version>
+    <version>0.3-android-SNAPSHOT</version>
   </parent>
 
 
@@ -37,7 +37,7 @@
        =========================================================== -->
   <groupId>org.apache.sis.storage</groupId>
   <artifactId>sis-netcdf</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>apklib</packaging>
   <name>Apache SIS NetCDF storage</name>
   <description>
   <!-- Left alignment because this description will be copied in META-INF/MANIFEST.MF



Mime
View raw message