Rename "Proj" as "PROJ" for the library name.

6 files changed, 33 insertions, 33 deletions

diff --git a/jniwrap/README.md b/jniwrap/README.md
index 20c2c86c..3cce43c0 100644
--- a/jniwrap/README.md
+++ b/jniwrap/README.md
@@ -1,21 +1,21 @@
-# Proj bridge to Java
+# PROJ bridge to Java
 
-This is the third release of JNI wrappers for the main Proj functions.
+This is the third release of JNI wrappers for the main PROJ functions.
 The first release of JNI wrappers were created by http://www.hydrologis.com.
 The second release of JNI wrappers were created by http://www.geoapi.org.
 
 
 
-## What is "Proj bridge to Java"
+## What is "PROJ bridge to Java"
 
-_Proj bridge to Java_ is a small library of Java classes that wrap a few Proj functions
+_Proj bridge to Java_ is a small library of Java classes that wrap a few PROJ functions
 by using the Java Native Interface (JNI). The main Java class is `org.proj4.PJ`.
 
 
 
 ### Compilation
 
-To compile the native part, `configure` has to be run in the Proj directory like this:
+To compile the native part, `configure` has to be run in the PROJ directory like this:
 
     CFLAGS=-Iinclude2 ./configure --with-jni=include1
 
@@ -35,7 +35,7 @@ It applies to Linux, MacOS and Windows (and virtually to every system supporting
 
 ### Requirements
 
-Beyond the ones already put by Proj, you need:
+Beyond the ones already put by PROJ, you need:
 
 * For compilation:
   * Java 9+, the Java standard development kit version 9 or above
@@ -70,8 +70,8 @@ Proj.4 license for the second release.
 
 ## Usage & a fast example:
 
-The `proj.jar` is all is needed to implement Proj support in java applications.
-The whole job is done by the Proj library, so there are just a couple of functions that be used.
+The `proj.jar` is all is needed to implement PROJ support in java applications.
+The whole job is done by the PROJ library, so there are just a couple of functions that be used.
 
 The best way is to see everything through an example.
 In the following example we create two Coordinate Reference System and transform 3 points.
@@ -103,7 +103,7 @@ Of course, real applications would read them from a file or other data source.
 
 ### compile the Main code
 
-we assume that Proj was compiled with the right flag to support the bridge to Java
+we assume that PROJ was compiled with the right flag to support the bridge to Java
 Therefore we have a library called `proj.jar`.
 Thus we compile the `Main.java` with the command:
 
diff --git a/jniwrap/build.xml b/jniwrap/build.xml
index bb9a6081..ddd424bd 100644
--- a/jniwrap/build.xml
+++ b/jniwrap/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<project name="Proj bridge to Java" default="compile" basedir=".">
+<project name="PROJ bridge to Java" default="compile" basedir=".">
 
     <!-- *******************************************
              Set directory paths and versions.
@@ -25,7 +25,7 @@
 
         <jar destfile="${out}/proj.jar" basedir="${classes}/${module}" level="9" strict="fail">
             <manifest>
-                <attribute name="Implementation-Title"   value="Proj bridge to Java"/>
+                <attribute name="Implementation-Title"   value="PROJ bridge to Java"/>
                 <attribute name="Implementation-Version" value="${version}"/>
                 <attribute name="Implementation-Vendor"  value="Proj.4 project"/>
                 <attribute name="Implementation-URL"     value="http://proj4.org/"/>
@@ -38,7 +38,7 @@
          ********************************************************** -->
     <target name="javadoc" depends="compile">
         <javadoc classpath="${classes}/${module}" destdir="${javadoc}"
-                 encoding="UTF-8" noqualifier="all" windowtitle="Proj bridge to Java" author="false" version="true"
+                 encoding="UTF-8" noqualifier="all" windowtitle="PROJ bridge to Java" author="false" version="true"
                  link="http://www.geoapi.org/3.0/javadoc/" additionalparam="-html5">
           <sourcefiles>
             <fileset dir="${src}/${module}">
diff --git a/jniwrap/org.osgeo.proj/module-info.java b/jniwrap/org.osgeo.proj/module-info.java
index 8c5739fb..ea8a623a 100644
--- a/jniwrap/org.osgeo.proj/module-info.java
+++ b/jniwrap/org.osgeo.proj/module-info.java
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Project:  PROJ.4
- * Purpose:  Java/JNI wrappers for PROJ.4 API.
+ * Purpose:  Java/JNI wrappers for PROJ API.
  * Author:   Martin Desruisseaux
  *
  ******************************************************************************
diff --git a/jniwrap/org.osgeo.proj/org/proj4/PJ.java b/jniwrap/org.osgeo.proj/org/proj4/PJ.java
index 27b0f25d..de09f86a 100644
--- a/jniwrap/org.osgeo.proj/org/proj4/PJ.java
+++ b/jniwrap/org.osgeo.proj/org/proj4/PJ.java
@@ -32,11 +32,11 @@ import java.lang.annotation.Native;
 
 
 /**
- * Wraps the <a href="http://proj4.org/">Proj</a> {@code PJ} native data structure.
- * Almost every methods defined in this class are native methods delegating the work to the Proj library.
+ * Wraps the <a href="http://proj4.org/">PROJ</a> {@code PJ} native data structure.
+ * Almost every methods defined in this class are native methods delegating the work to the PROJ library.
  * This class is the only place where such native methods are defined.
  *
- * <p>In the Proj library, the {@code PJ} structure aggregates in a single place information usually
+ * <p>In the PROJ library, the {@code PJ} structure aggregates in a single place information usually
  * splitted in many different ISO 19111 interfaces: {@link org.opengis.referencing.datum.Ellipsoid},
  * {@link org.opengis.referencing.datum.Datum}, {@link org.opengis.referencing.datum.PrimeMeridian},
  * {@link org.opengis.referencing.cs.CoordinateSystem}, {@link org.opengis.referencing.crs.CoordinateReferenceSystem}
@@ -56,7 +56,7 @@ public class PJ {
     public static final int DIMENSION_MAX = 100;
 
     /**
-     * Loads the Proj library.
+     * Loads the PROJ library.
      */
     static {
         System.loadLibrary("proj");
@@ -64,15 +64,15 @@ public class PJ {
 
     /**
      * The pointer to {@code PJ} structure allocated in the C/C++ heap. This value has no meaning in Java code.
-     * <strong>Do not modify</strong>, since this value is used by Proj. Do not rename neither, unless you update
+     * <strong>Do not modify</strong>, since this value is used by PROJ. Do not rename neither, unless you update
      * accordingly the C code in JNI wrappers.
      */
     private final long ptr;
 
     /**
-     * Creates a new {@code PJ} structure from the given Proj definition string.
+     * Creates a new {@code PJ} structure from the given PROJ definition string.
      *
-     * @param  definition  the Proj definition string.
+     * @param  definition  the PROJ definition string.
      * @throws IllegalArgumentException if the PJ structure can not be created from the given string.
      */
     public PJ(final String definition) throws IllegalArgumentException {
@@ -110,7 +110,7 @@ public class PJ {
      * to the {@link #ptr} field. The allocated structure is released by the {@link #finalize()}
      * method.
      *
-     * @param  definition  the Proj definition string.
+     * @param  definition  the PROJ definition string.
      * @return a pointer to the PJ native data structure, or 0 if the operation failed.
      */
     private static native long allocatePJ(String definition);
@@ -127,17 +127,17 @@ public class PJ {
     private static native long allocateGeoPJ(PJ projected);
 
     /**
-     * Returns the version number of the Proj library.
+     * Returns the version number of the PROJ library.
      *
-     * @return the Proj release string.
+     * @return the PROJ release string.
      */
     public static native String getVersion();
 
     /**
-     * Returns the Proj definition string. This is the string given to the constructor,
+     * Returns the PROJ definition string. This is the string given to the constructor,
      * expanded with as much information as possible.
      *
-     * @return the Proj definition string.
+     * @return the PROJ definition string.
      */
     public native String getDefinition();
 
@@ -150,7 +150,7 @@ public class PJ {
 
     /**
      * The coordinate reference system (CRS) type returned by {@link PJ#getType()}.
-     * In the Proj library, a CRS can only be geographic, geocentric or projected,
+     * In the PROJ library, a CRS can only be geographic, geocentric or projected,
      * without distinction between 2D and 3D CRS.
      *
      * @author  Martin Desruisseaux (Geomatys)
@@ -259,7 +259,7 @@ public class PJ {
      * @param  numPts       number of points to transform.
      * @throws NullPointerException if the {@code target} or {@code coordinates} argument is null.
      * @throws IndexOutOfBoundsException if the {@code offset} or {@code numPts} arguments are invalid.
-     * @throws PJException if the operation failed for another reason (provided by Proj).
+     * @throws PJException if the operation failed for another reason (provided by PROJ).
      *
      * @see org.opengis.referencing.operation.MathTransform#transform(double[], int, double[], int, int)
      */
diff --git a/jniwrap/org.osgeo.proj/org/proj4/package-info.java b/jniwrap/org.osgeo.proj/org/proj4/package-info.java
index d69fb807..814d2483 100644
--- a/jniwrap/org.osgeo.proj/org/proj4/package-info.java
+++ b/jniwrap/org.osgeo.proj/org/proj4/package-info.java
@@ -27,10 +27,10 @@
  */
 
 /**
- * Wrappers for the <a href="http://proj4.org/">Proj</a> library.
- * The {@link org.proj4.PJ} class contains only native methods delegating their work to the Proj library.
+ * Wrappers for the <a href="http://proj4.org/">PROJ</a> library.
+ * The {@link org.proj4.PJ} class contains only native methods delegating their work to the PROJ library.
  * For higher-level methods making use of those native methods, see for example the
- * <a href="http://www.geoapi.org/geoapi-proj4/index.html">GeoAPI bindings for Proj</a>.
+ * <a href="http://www.geoapi.org/geoapi-proj4/index.html">GeoAPI bindings for PROJ</a>.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 5.1
diff --git a/src/jniproj.c b/src/jniproj.c
index 573dd0e7..67aa2478 100644
--- a/src/jniproj.c
+++ b/src/jniproj.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Project:  PROJ.4
- * Purpose:  Java/JNI wrappers for PROJ.4 API.
+ * Purpose:  Java/JNI wrappers for PROJ API.
  * Author:   Antonello Andrea
  *           Martin Desruisseaux
  *
@@ -32,7 +32,7 @@
  * \file jniproj.c
  *
  * \brief
- * Functions used by the Java Native Interface (JNI) wrappers of Proj.4
+ * Functions used by the Java Native Interface (JNI) wrappers of PROJ.
  *
  *
  * \author Antonello Andrea
@@ -339,7 +339,7 @@ JNIEXPORT jdouble JNICALL Java_org_proj4_PJ_getLinearUnitToMetre
  * Converts input values from degrees to radians before coordinate operation, or the output
  * values from radians to degrees after the coordinate operation.
  *
- * \param pj        - The Proj.4 PJ structure.
+ * \param pj        - The PROJ.4 PJ structure.
  * \param data      - The coordinate array to transform.
  * \param numPts    - Number of points to transform.
  * \param dimension - Dimension of points in the coordinate array.