Documentation updates and first configuration changes:

  - Added @deprecated tags to the old bindings, with test pointing to their replacement.
  - Added a note in the header of the new bindings suggesting to keep the classes synchronized with GeoAPI (if possible).
  - Edited the README file for the new bindings, but did not yet edited the example.
  - Added the new files to the list of files declared in Makefile.in, and ran automake to regenerate Makefile.am.
  - Edited build.xml to generate the header file of PJ.h instead than Projections.h.


git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2092 4e78687f-474d-0410-85f9-8d5e500ac6b2

1 files changed, 36 insertions, 34 deletions

diff --git a/jniwrap/org/proj4/Proj4.java b/jniwrap/org/proj4/Proj4.java
index 5873c661..d2fe8b72 100644
--- a/jniwrap/org/proj4/Proj4.java
+++ b/jniwrap/org/proj4/Proj4.java
@@ -2,7 +2,7 @@
 
  FILE:  Proj4.java
 
- DESCRIPTION:  
+ DESCRIPTION:
 
  NOTES:  ---
  AUTHOR:          Antonello Andrea
@@ -14,34 +14,34 @@
  REVISION:  ---
  =====================================================================================*/
 
-/* 
- This library is free software; you can redistribute it and/or 
- modify it under the terms of the GNU Library General Public 
- License as published by the Free Software Foundation; either 
- version 2 of the License, or (at your option) any later version. 
-
- This library is distributed in the hope that it will be useful, 
- but WITHOUT ANY WARRANTY; without even the implied warranty of 
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
- Library General Public License for more details. 
-
- You should have received a copy of the GNU Library General Public 
- License along with this library; if not, write to the Free 
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 
- USA 
-
- 1. Redistributions of source code must retain the above copyright   
- notice, this list of conditions and the following disclaimer.   
- 2. Redistributions in binary form must reproduce the above copyright   
- notice, this list of conditions and the following disclaimer in the   
- documentation and/or other materials provided with the distribution.   
+/*
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ USA
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
  */
 package org.proj4;
 
 import java.util.LinkedHashMap;
 
 /**
- * This is the public 
+ * This is the public
  * test class to try the jproj api. Reads data from file.
  * The input file has three lines of header:<BR>
  * 1) source projection code or option <BR>
@@ -58,18 +58,20 @@ import java.util.LinkedHashMap;
  * destProj: +init=epsg:32632
  * rows: 2
  * ...datatriplets
- * 
+ *
+ * @deprecated Replaced by {@link PJ}. See package description for usage example.
  */
+@Deprecated
 public class Proj4 implements Proj4Factory
 {
   Projections srcProjection = null;
   Projections destProjection = null;
   Projections projection = null;
-  
+
   /**
    * constructor used to instatiate a single projection. This is used
    * if the goal is to simply get information about a projection definition
-   * 
+   *
    * @param proj the projection definition
    */
   public Proj4(String proj)
@@ -83,12 +85,12 @@ public class Proj4 implements Proj4Factory
       projection = new Others(proj);
     }
   }
-  
+
   /**
    * constructor used to instantiate the object for a further reproiection.
-   * From the definitions the source and destination projection are 
+   * From the definitions the source and destination projection are
    * created.
-   * 
+   *
    * @param srcProj
    * @param destProj
    */
@@ -115,7 +117,7 @@ public class Proj4 implements Proj4Factory
   /**
    * method to reproject a dataset from the source projection to the destination
    * projection as defined in the constructor
-   * 
+   *
    * @param dataTP the data set to reproject
    * @param point_count
    * @param point_offset
@@ -134,7 +136,7 @@ public class Proj4 implements Proj4Factory
           + dataTP.z[i]);
     }
   }
-  
+
   /**
    * @return the projection info as a hashmap
    */
@@ -150,7 +152,7 @@ public class Proj4 implements Proj4Factory
   {
     return srcProjection.mapProjInfo();
   }
-  
+
   /**
    * @return the destination projection info as a hashmap
    */
@@ -158,7 +160,7 @@ public class Proj4 implements Proj4Factory
   {
     return destProjection.mapProjInfo();
   }
-  
+
 
   /**
    * print the projection info to standard output
@@ -167,7 +169,7 @@ public class Proj4 implements Proj4Factory
   {
     projection.printProjInfo();
   }
-  
+
   /**
    * print the source projection info to standard output
    */