Author: desruisseaux
Date: Thu Oct 13 16:57:30 2016
New Revision: 1764736

URL: http://svn.apache.org/viewvc?rev=1764736&view=rev
Log:
Merge addition of a few units from JDK8 branch.

Modified:
    sis/branches/JDK7/   (props changed)
    
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java

Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 13 16:57:30 2016
@@ -1,4 +1,4 @@
 /sis/branches/Android:1430670-1480699
 /sis/branches/JDK6:1394913-1508480
-/sis/branches/JDK8:1584960-1764673
+/sis/branches/JDK8:1584960-1764735
 /sis/trunk:1394364-1508466,1519089-1519674

Modified: 
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java
URL: 
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java?rev=1764736&r1=1764735&r2=1764736&view=diff
==============================================================================
--- 
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java
 [UTF-8] (original)
+++ 
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/Units.java
 [UTF-8] Thu Oct 13 16:57:30 2016
@@ -62,8 +62,11 @@ public final class Units extends Static
      * @see #CENTIMETRE
      * @see #KILOMETRE
      * @see #NAUTICAL_MILE
+     * @see #MILE
      * @see #FOOT
      * @see #FOOT_SURVEY_US
+     * @see #INCH
+     * @see #PIXEL
      *
      * @since 0.8
      */
@@ -121,12 +124,24 @@ public final class Units extends Static
      *
      * @see #METRE
      * @see #KILOMETRE
+     * @see #MILE
      *
      * @since 0.8
      */
     public static final Unit<Length> NAUTICAL_MILE = METRE.multiply(1852);
 
     /**
+     * Unit of measurement defined as 1609.344 metres.
+     *
+     * @see #METRE
+     * @see #KILOMETRE
+     * @see #NAUTICAL_MILE
+     *
+     * @since 0.8
+     */
+    public static final Unit<Length> MILE = METRE.multiply(1609.344);
+
+    /**
      * Unit of measurement defined as 0.3048 metres.
      *
      * @see #METRE
@@ -148,6 +163,21 @@ public final class Units extends Static
     public static final Unit<Length> FOOT_SURVEY_US = METRE.multiply(12 / 
39.37);
 
     /**
+     * Unit of measurement defined as 2.54 centimetres.
+     *
+     * @since 0.8
+     */
+    public static final Unit<Length> INCH = METRE.multiply(2.54 / 100);
+
+    /**
+     * Unit of measurement defined as 0.013837 inch.
+     * This is commonly used to measure the height of a font.
+     *
+     * @since 0.8
+     */
+    public static final Unit<Length> POINT = METRE.multiply(0.996264 / 72);
+
+    /**
      * The SI unit for plane angles.
      * There is 2π radians in a circle.
      *


Reply via email to