Modified: sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/math/DecimalFunctionsTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/math/DecimalFunctionsTest.java?rev=1555455&r1=1555454&r2=1555455&view=diff ============================================================================== --- sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/math/DecimalFunctionsTest.java [UTF-8] (original) +++ sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/math/DecimalFunctionsTest.java [UTF-8] Sun Jan 5 04:26:40 2014 @@ -66,7 +66,7 @@ public final strictfp class DecimalFunct for (int i=EXPONENT_FOR_ZERO; i<=EXPONENT_FOR_MAX; i++) { // Range of allowed exponents in base 10. assertEquals(parseDouble("1E"+i), pow10(i), STRICT); } - assertEquals(1000000000000000000L, Math.round(pow10(18))); // Highest value having an exact representation. + assertEquals(1000000000000000000L, StrictMath.round(pow10(18))); // Highest value having an exact representation. } /**
Modified: sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java?rev=1555455&r1=1555454&r2=1555455&view=diff ============================================================================== --- sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java [UTF-8] (original) +++ sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/measure/UnitsTest.java [UTF-8] Sun Jan 5 04:26:40 2014 @@ -255,7 +255,8 @@ public final strictfp class UnitsTest ex @Test public void testValueOfEPSG() { assertSame(METRE, valueOfEPSG(9001)); - assertSame(DEGREE_ANGLE, valueOfEPSG(9102)); + assertSame(DEGREE_ANGLE, valueOfEPSG(9102)); // Used in prime meridian and operation parameters. + assertSame(DEGREE_ANGLE, valueOfEPSG(9122)); // Used in coordinate system axes. assertSame(METRE, valueOf("EPSG:9001")); assertSame(DEGREE_ANGLE, valueOf(" epsg : 9102")); assertSame(DEGREE_ANGLE, valueOf("urn:ogc:def:uom:EPSG::9102")); @@ -264,12 +265,14 @@ public final strictfp class UnitsTest ex } /** - * Tests {@link Units#getEpsgCode(Unit)}. + * Tests {@link Units#getEpsgCode(Unit, boolean)}. */ @Test public void testGetEpsgCode() { - assertEquals(Integer.valueOf(9001), getEpsgCode(METRE)); - assertEquals(Integer.valueOf(9102), getEpsgCode(DEGREE_ANGLE)); - assertEquals(Integer.valueOf(9110), getEpsgCode(DMS)); + assertEquals(Integer.valueOf(9001), getEpsgCode(METRE, false)); + assertEquals(Integer.valueOf(9102), getEpsgCode(DEGREE_ANGLE, false)); + assertEquals(Integer.valueOf(9122), getEpsgCode(DEGREE_ANGLE, true)); + assertEquals(Integer.valueOf(9110), getEpsgCode(DMS, false)); + assertEquals(Integer.valueOf(9110), getEpsgCode(DMS, true)); } } Modified: sis/branches/JDK6/src/site/site.xml URL: http://svn.apache.org/viewvc/sis/branches/JDK6/src/site/site.xml?rev=1555455&r1=1555454&r2=1555455&view=diff ============================================================================== --- sis/branches/JDK6/src/site/site.xml (original) +++ sis/branches/JDK6/src/site/site.xml Sun Jan 5 04:26:40 2014 @@ -72,7 +72,7 @@ <item name="Utilities" href="sis-utility/index.html"/> <item name="Metadata" href="sis-metadata/index.html"/> <item name="Referencing" href="sis-referencing/index.html"/> - <item name="Features" href="sis-features/index.html"/> + <item name="Features" href="sis-feature/index.html"/> <item name="Storage" href="sis-storage/index.html"/> <item name="Shapefile" href="sis-shapefile/index.html"/> <item name="NetCDF" href="sis-netcdf/index.html"/> Modified: sis/branches/JDK6/storage/sis-netcdf/src/site/resources/css/site.css URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-netcdf/src/site/resources/css/site.css?rev=1555455&r1=1555454&r2=1555455&view=diff ============================================================================== --- sis/branches/JDK6/storage/sis-netcdf/src/site/resources/css/site.css (original) +++ sis/branches/JDK6/storage/sis-netcdf/src/site/resources/css/site.css Sun Jan 5 04:26:40 2014 @@ -1 +1 @@ -link ../../../../../../core/sis-build-helper/src/site/resources/css/site.css \ No newline at end of file +link ../../../../../../src/main/link-target/site-module.css \ No newline at end of file Modified: sis/branches/JDK6/storage/src/site/resources/css/site.css URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/src/site/resources/css/site.css?rev=1555455&r1=1555454&r2=1555455&view=diff ============================================================================== --- sis/branches/JDK6/storage/src/site/resources/css/site.css (original) +++ sis/branches/JDK6/storage/src/site/resources/css/site.css Sun Jan 5 04:26:40 2014 @@ -1 +1 @@ -link ../../../../../core/src/site/resources/css/site.css \ No newline at end of file +link ../../../../../src/main/link-target/site-module-group.css \ No newline at end of file
