Issue #3108 - update bignsharp for Windows 64-bit compatibility. Upgrade JNA.

Amend: updated and/or added change revision history comments
Amend: fixed Java requirement in JNA classpath
Amend: fixed Java requirement in JNA MANIFEST

Change-Id: I5033f05c48a271fe08d3ec2ac01fe79481564371

Former-commit-id: 79244f5032 [formerly 1e1f46e68b] [formerly 9c29e6739c [formerly fb12234836a3562156a30531e6961c0a064588bd]]
Former-commit-id: 9c29e6739c
Former-commit-id: c1e9154e89

cots/com.sun.jna/.classpath

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="jna.jar"/>
+	<classpathentry exported="true" kind="lib" path="jna-4.1.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

cots/com.sun.jna/.settings/org.eclipse.jdt.core.prefs

@@ -1,4 +1,3 @@
-#Fri Mar 25 11:20:40 CDT 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6

cots/com.sun.jna/META-INF/MANIFEST.MF

@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Jna
+Bundle-Name: JNA FOSS
 Bundle-SymbolicName: com.sun.jna
-Bundle-Version: 3.3.0
-Bundle-ClassPath: jna.jar
-Bundle-Vendor: Raytheon-bundled OSS
+Bundle-Version: 4.1.0
+Bundle-ClassPath: jna-4.1.0.jar
 Export-Package: com.sun.jna,
- com.sun.jna.ptr
+ com.sun.jna.ptr,
+ com.sun.jna.win32
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

cots/com.sun.jna/build.properties

@@ -1,2 +1,2 @@
 bin.includes = META-INF/,\
-               jna.jar
+               jna-4.1.0.jar

ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/Activator.java

@@ -11,6 +11,9 @@
  * Date         Ticket#    	Engineer    Description
  * -------		------- 	-------- 	-----------
  * 03/23/2010	229			Chin Chen	Initial coding
+ * 05/08/2014   3108        bkowal      Disabled loading of native libraries that
+ *                                      are not available to Windows when the Windows
+ *                                      OS is detected.
  *
  * </pre>
  * 

ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpDataPaneResource.java

@@ -263,7 +263,7 @@ public class NsharpDataPaneResource extends NsharpAbstractPaneResource{
    		 *
    		 *
    		 */
-   		//if we can not Interpolates a temp with 700 mb pressure, then we dont have enough raw data 	
+   		//if we can not Interpolates a temp with 700 mb pressure, then we dont have enough raw data
    		if ((nsharpNative.nsharpLib.qc(nsharpNative.nsharpLib.itemp(700.0F)) == 0))
    		{
    			target.drawString(myfont, "               " +NO_DATA, rect.x, rect.y, 0.0,

ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/META-INF/MANIFEST.MF

@@ -32,7 +32,8 @@ Require-Bundle: org.eclipse.ui,
  gov.noaa.nws.ncep.viz.gempak;bundle-version="1.0.0",
  gov.noaa.nws.ncep.viz.gempak.nativelib;bundle-version="1.0.0",
  com.raytheon.uf.common.style;bundle-version="1.0.0",
- com.raytheon.uf.common.numeric;bundle-version="1.14.0"
+ com.raytheon.uf.common.numeric;bundle-version="1.14.0",
+ org.apache.commons.lang;bundle-version="2.3.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: gov.noaa.nws.ncep.viz.rsc.ncgrid,

ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/Activator.java

@@ -6,6 +6,8 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
+import org.apache.commons.lang.SystemUtils;
+
 /**
  * The activator class controls the plug-in life cycle
  */
@@ -35,6 +37,9 @@ public class Activator extends AbstractUIPlugin {
     public void start(BundleContext context) throws Exception {
         super.start(context);
         plugin = this;
+        if (SystemUtils.IS_OS_WINDOWS) {
+            return;
+        }
         LibraryLoader.load("cnflib");
         // LibraryLoader.load("xml2");
         LibraryLoader.load("gempak");

ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/aodt/natives/datagrid.java

@@ -1,34 +1,85 @@
+/**
+ * 
+ * 
+ * This java class performs the NSHARP NsharpNative functions.
+ * This code has been developed by the NCEP-SIB for use in the AWIPS2 system.
+ * 
+ * <pre>
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#     Engineer    Description
+ * -------      -------     --------    -----------
+ * ??/??/???    ?                       Initial coding
+ * 05/08/2014   3108        bkowal      Updated structure classes for the JNA upgrade.
+ * 
+ *
+ * </pre>
+ * 
+ * @author ?
+ * @version 1.0
+ */
 package gov.noaa.nws.ncep.viz.tools.aodt.natives;
 
+import java.util.Arrays;
+import java.util.List;
+
 import com.sun.jna.Structure;
 
 public class datagrid extends Structure {
-	public float[][] temp = new float[500][500];
+    public float[][] temp = new float[500][500];
+
     public float[][] lat = new float[500][500];
+
     public float[][] lon = new float[500][500];
+
     public int numx;
+
     public int numy;
+
     public datagrid() {
-            super();
+        super();
     }
-    public datagrid(float temp[][], float lat[][], float lon[][], int numx, int numy) {
-            super();
-            if (temp.length != this.temp.length)
-                    throw new java.lang.IllegalArgumentException("Wrong array size !");
-            this.temp = temp;
-            if (lat.length != this.lat.length)
-                    throw new java.lang.IllegalArgumentException("Wrong array size !");
-            this.lat = lat;
-            if (lon.length != this.lon.length)
-                    throw new java.lang.IllegalArgumentException("Wrong array size !");
-            this.lon = lon;
-            this.numx = numx;
-            this.numy = numy;
+
+    public datagrid(float temp[][], float lat[][], float lon[][], int numx,
+            int numy) {
+        super();
+        if (temp.length != this.temp.length)
+            throw new java.lang.IllegalArgumentException("Wrong array size !");
+        this.temp = temp;
+        if (lat.length != this.lat.length)
+            throw new java.lang.IllegalArgumentException("Wrong array size !");
+        this.lat = lat;
+        if (lon.length != this.lon.length)
+            throw new java.lang.IllegalArgumentException("Wrong array size !");
+        this.lon = lon;
+        this.numx = numx;
+        this.numy = numy;
+    }
+
+    protected ByReference newByReference() {
+        return new ByReference();
+    }
+
+    protected ByValue newByValue() {
+        return new ByValue();
+    }
+
+    protected datagrid newInstance() {
+        return new datagrid();
+    }
+
+    public static class ByReference extends datagrid implements
+            com.sun.jna.Structure.ByReference {
+    }
+
+    public static class ByValue extends datagrid implements
+            com.sun.jna.Structure.ByValue {
+    }
+
+    @Override
+    protected List getFieldOrder() {
+        return Arrays.asList(new String[] { "temp", "lat", "lon", "numx",
+                "numy" });
     }
-    protected ByReference newByReference() { return new ByReference(); }
-    protected ByValue newByValue() { return new ByValue(); }
-    protected datagrid newInstance() { return new datagrid(); }
-    public static class ByReference extends datagrid implements com.sun.jna.Structure.ByReference {}
-    public static class ByValue extends datagrid implements com.sun.jna.Structure.ByValue {}
 
 }

ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/aodt/natives/dis_vars.java

@@ -1,27 +1,75 @@
+/**
+ * 
+ * 
+ * This java class performs the NSHARP NsharpNative functions.
+ * This code has been developed by the NCEP-SIB for use in the AWIPS2 system.
+ * 
+ * <pre>
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#     Engineer    Description
+ * -------      -------     --------    -----------
+ * ??/??/???    ?                       Initial coding
+ * 05/08/2014   3108        bkowal      Updated structure classes for the JNA upgrade.
+ * 
+ *
+ * </pre>
+ * 
+ * @author ?
+ * @version 1.0
+ */
 package gov.noaa.nws.ncep.viz.tools.aodt.natives;
 
+import java.util.Arrays;
+import java.util.List;
+
 import com.sun.jna.Structure;
 
-public class dis_vars extends Structure{
-	/// Output number of lines
+public class dis_vars extends Structure {
+    // / Output number of lines
     public double xrectl;
-    /// Output number of elems
+
+    // / Output number of elems
     public double xrecte;
+
     public dis_vars() {
-            super();
+        super();
     }
+
     /**
-     * @param xrectl Output number of lines<br>
-     * @param xrecte Output number of elems
+     * @param xrectl
+     *            Output number of lines<br>
+     * @param xrecte
+     *            Output number of elems
      */
     public dis_vars(double xrectl, double xrecte) {
-            super();
-            this.xrectl = xrectl;
-            this.xrecte = xrecte;
+        super();
+        this.xrectl = xrectl;
+        this.xrecte = xrecte;
+    }
+
+    protected ByReference newByReference() {
+        return new ByReference();
+    }
+
+    protected ByValue newByValue() {
+        return new ByValue();
+    }
+
+    protected dis_vars newInstance() {
+        return new dis_vars();
+    }
+
+    public static class ByReference extends dis_vars implements
+            com.sun.jna.Structure.ByReference {
+    }
+
+    public static class ByValue extends dis_vars implements
+            com.sun.jna.Structure.ByValue {
+    }
+
+    @Override
+    protected List getFieldOrder() {
+        return Arrays.asList(new String[] { "xrectl", "xrecte" });
     }
-    protected ByReference newByReference() { return new ByReference(); }
-    protected ByValue newByValue() { return new ByValue(); }
-    protected dis_vars newInstance() { return new dis_vars(); }
-    public static class ByReference extends dis_vars implements com.sun.jna.Structure.ByReference {}
-    public static class ByValue extends dis_vars implements com.sun.jna.Structure.ByValue {}
 }

ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/aodt/natives/irdata.java

@@ -1,65 +1,159 @@
+/**
+ * 
+ * 
+ * This java class performs the NSHARP NsharpNative functions.
+ * This code has been developed by the NCEP-SIB for use in the AWIPS2 system.
+ * 
+ * <pre>
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#     Engineer    Description
+ * -------      -------     --------    -----------
+ * ??/??/???    ?                       Initial coding
+ * 05/08/2014   3108        bkowal      Updated structure classes for the JNA upgrade.
+ * 
+ *
+ * </pre>
+ * 
+ * @author ?
+ * @version 1.0
+ */
 package gov.noaa.nws.ncep.viz.tools.aodt.natives;
 
+import java.util.Arrays;
+import java.util.List;
+
 import com.sun.jna.Pointer;
 import com.sun.jna.Structure;
 
 public class irdata extends Structure {
-	public static class ByReference extends irdata implements
-			Structure.ByReference {
-	}
-    public int date;
-    public int time;
-    public float TrawO;
-    public float Traw;
-    public float Tfinal;
-    public float Tfinal3;
-    public float CI;
-    public float eyet;
-    public float warmt;
-    public float cloudt;
-    public float cloudt2;
-    public float cwcloudt;
-    public float latitude;
-    public float longitude;
-    public float warmlatitude;
-    public float warmlongitude;
-    public float eyesize;
-    public float eyestdv;
-    public float cloudsymave;
-    public int sattype;
-    public int eyescene;
-    public int cloudscene;
-    public int eyesceneold;
-    public int cloudsceneold;
-    public int rule9;
-    public int rule8;
-    public int land;
-    public int eyefft;
-    public int cloudfft;
-    public int cwring;
-    public int ringcb;
-    public int ringcbval;
-    public int ringcbvalmax;
-    public float ringcblatmax;
-    public float ringcblonmax;
-    public float CIadjp;
-    public float sst;
-    public float TIEraw;
-    public float TIEavg;
-    public int TIEflag;
-    public int autopos;
-    public int LBflag;
-    public float rmw;
-    public byte[] comment = new byte[(50)];
-    public irdata() {
-            super();
+    public static class ByReference extends irdata implements
+            Structure.ByReference {
     }
+
+    public int date;
+
+    public int time;
+
+    public float TrawO;
+
+    public float Traw;
+
+    public float Tfinal;
+
+    public float Tfinal3;
+
+    public float CI;
+
+    public float eyet;
+
+    public float warmt;
+
+    public float cloudt;
+
+    public float cloudt2;
+
+    public float cwcloudt;
+
+    public float latitude;
+
+    public float longitude;
+
+    public float warmlatitude;
+
+    public float warmlongitude;
+
+    public float eyesize;
+
+    public float eyestdv;
+
+    public float cloudsymave;
+
+    public int sattype;
+
+    public int eyescene;
+
+    public int cloudscene;
+
+    public int eyesceneold;
+
+    public int cloudsceneold;
+
+    public int rule9;
+
+    public int rule8;
+
+    public int land;
+
+    public int eyefft;
+
+    public int cloudfft;
+
+    public int cwring;
+
+    public int ringcb;
+
+    public int ringcbval;
+
+    public int ringcbvalmax;
+
+    public float ringcblatmax;
+
+    public float ringcblonmax;
+
+    public float CIadjp;
+
+    public float sst;
+
+    public float TIEraw;
+
+    public float TIEavg;
+
+    public int TIEflag;
+
+    public int autopos;
+
+    public int LBflag;
+
+    public float rmw;
+
+    public byte[] comment = new byte[(50)];
+
+    public irdata() {
+        super();
+    }
+
     public irdata(Pointer p) {
         useMemory(p);
     }
-    protected ByReference newByReference() { return new ByReference(); }
-    protected ByValue newByValue() { return new ByValue(); }
-    protected irdata newInstance() { return new irdata(); }
-    //public static class ByReference extends irdata implements ByReference {}
-    public static class ByValue extends irdata implements com.sun.jna.Structure.ByValue {}
+
+    protected ByReference newByReference() {
+        return new ByReference();
+    }
+
+    protected ByValue newByValue() {
+        return new ByValue();
+    }
+
+    protected irdata newInstance() {
+        return new irdata();
+    }
+
+    // public static class ByReference extends irdata implements ByReference {}
+    public static class ByValue extends irdata implements
+            com.sun.jna.Structure.ByValue {
+    }
+
+    @Override
+    protected List getFieldOrder() {
+        return Arrays.asList(new String[] { "date", "time", "TrawO", "Traw",
+                "Tfinal", "Tfinal3", "CI", "eyet", "warmt", "cloudt",
+                "cloudt2", "cwcloudt", "latitude", "longitude", "warmlatitude",
+                "warmlongitude", "eyesize", "eyestdv", "cloudsymave",
+                "sattype", "eyescene", "cloudscene", "eyesceneold",
+                "cloudsceneold", "rule9", "rule8", "land", "eyefft",
+                "cloudfft", "cwring", "ringcb", "ringcbval", "ringcbvalmax",
+                "ringcblatmax", "ringcblonmax", "CIadjp", "sst", "TIEraw",
+                "TIEavg", "TIEflag", "autopos", "LBflag", "rmw", "comment" });
+    }
 }

ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/aodt/natives/odtdata.java

@@ -1,26 +1,73 @@
+/**
+ * 
+ * 
+ * This java class performs the NSHARP NsharpNative functions.
+ * This code has been developed by the NCEP-SIB for use in the AWIPS2 system.
+ * 
+ * <pre>
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#     Engineer    Description
+ * -------      -------     --------    -----------
+ * ??/??/???    ?                       Initial coding
+ * 05/08/2014   3108        bkowal      Updated structure classes for the JNA upgrade.
+ * 
+ *
+ * </pre>
+ * 
+ * @author ?
+ * @version 1.0
+ */
 package gov.noaa.nws.ncep.viz.tools.aodt.natives;
 
+import java.util.Arrays;
+import java.util.List;
+
 import com.sun.jna.Pointer;
 import com.sun.jna.Structure;
 
-public class odtdata extends Structure{
-	 public irdata IR;
-     public odtdata.ByReference nextrec;
-     public odtdata() {
-             super();
-     }
-     public odtdata(Pointer p) {
-         useMemory(p);
-     }
-     public odtdata(irdata IR, odtdata.ByReference nextrec) {
-             super();
-             this.IR = IR;
-             this.nextrec = nextrec;
-     }
-     public ByReference newByReference() { return new ByReference(); }
-     public ByValue newByValue() { return new ByValue(); }
-     public odtdata newInstance() { return new odtdata(); }
-     public static class ByReference extends odtdata implements com.sun.jna.Structure.ByReference {}
-     public static class ByValue extends odtdata implements com.sun.jna.Structure.ByValue {}
+public class odtdata extends Structure {
+    public irdata IR;
+
+    public odtdata.ByReference nextrec;
+
+    public odtdata() {
+        super();
+    }
+
+    public odtdata(Pointer p) {
+        useMemory(p);
+    }
+
+    public odtdata(irdata IR, odtdata.ByReference nextrec) {
+        super();
+        this.IR = IR;
+        this.nextrec = nextrec;
+    }
+
+    public ByReference newByReference() {
+        return new ByReference();
+    }
+
+    public ByValue newByValue() {
+        return new ByValue();
+    }
+
+    public odtdata newInstance() {
+        return new odtdata();
+    }
+
+    public static class ByReference extends odtdata implements
+            com.sun.jna.Structure.ByReference {
+    }
+
+    public static class ByValue extends odtdata implements
+            com.sun.jna.Structure.ByValue {
+    }
+
+    @Override
+    protected List getFieldOrder() {
+        return Arrays.asList(new String[] { "IR", "nextrec" });
+    }
 
 }

ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/aodt/natives/remap_vars.java

@@ -1,37 +1,91 @@
+/**
+ * 
+ * 
+ * This java class performs the NSHARP NsharpNative functions.
+ * This code has been developed by the NCEP-SIB for use in the AWIPS2 system.
+ * 
+ * <pre>
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#     Engineer    Description
+ * -------      -------     --------    -----------
+ * ??/??/???    ?                       Initial coding
+ * 05/08/2014   3108        bkowal      Updated structure classes for the JNA upgrade.
+ * 
+ *
+ * </pre>
+ * 
+ * @author ?
+ * @version 1.0
+ */
 package gov.noaa.nws.ncep.viz.tools.aodt.natives;
 
+import java.util.Arrays;
+import java.util.List;
+
 import gov.noaa.nws.ncep.viz.tools.aodt.natives.AODTv64Native.aodtv64.FILE;
 
 import com.sun.jna.Structure;
 
 public class remap_vars extends Structure {
-	 /// Block size (bytes) input file
+    // / Block size (bytes) input file
     public int in_bfw;
-    /// Block size (bytes) output file
+
+    // / Block size (bytes) output file
     public int out_bfw;
-    /// Number of splines/line
+
+    // / Number of splines/line
     public int nspl;
-    /// Number of splines/elem
+
+    // / Number of splines/elem
     public int nspe;
-    /// Source blocksize
+
+    // / Source blocksize
     public int slb;
-    /// Dest blocksize
+
+    // / Dest blocksize
     public int dlb;
-    /// Number of corners in line
+
+    // / Number of corners in line
     public int ncl;
-    /// Number of corners in elem
+
+    // / Number of corners in elem
     public int nce;
-    /// Input file descriptor
+
+    // / Input file descriptor
     public FILE in_fd;
-    /// Output file descriptor
+
+    // / Output file descriptor
     public FILE out_fd;
+
     public remap_vars() {
-            super();
+        super();
+    }
+
+    protected ByReference newByReference() {
+        return new ByReference();
+    }
+
+    protected ByValue newByValue() {
+        return new ByValue();
+    }
+
+    protected remap_vars newInstance() {
+        return new remap_vars();
+    }
+
+    public static class ByReference extends remap_vars implements
+            com.sun.jna.Structure.ByReference {
+    }
+
+    public static class ByValue extends remap_vars implements
+            com.sun.jna.Structure.ByValue {
+    }
+
+    @Override
+    protected List getFieldOrder() {
+        return Arrays.asList(new String[] { "in_bfw", "out_bfw", "nspl",
+                "nspe", "slb", "dlb", "ncl", "nce", "in_fd", "out_fd" });
     }
-    protected ByReference newByReference() { return new ByReference(); }
-    protected ByValue newByValue() { return new ByValue(); }
-    protected remap_vars newInstance() { return new remap_vars(); }
-    public static class ByReference extends remap_vars implements com.sun.jna.Structure.ByReference {}
-    public static class ByValue extends remap_vars implements com.sun.jna.Structure.ByValue {}
 
 }

ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/aodt/natives/ringdata.java

@@ -1,26 +1,76 @@
+/**
+ * 
+ * 
+ * This java class performs the NSHARP NsharpNative functions.
+ * This code has been developed by the NCEP-SIB for use in the AWIPS2 system.
+ * 
+ * <pre>
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#     Engineer    Description
+ * -------      -------     --------    -----------
+ * ??/??/???    ?                       Initial coding
+ * 05/08/2014   3108        bkowal      Updated structure classes for the JNA upgrade.
+ * 
+ *
+ * </pre>
+ * 
+ * @author ?
+ * @version 1.0
+ */
 package gov.noaa.nws.ncep.viz.tools.aodt.natives;
 
+import java.util.Arrays;
+import java.util.List;
+
 import com.sun.jna.Structure;
 
 public class ringdata extends Structure {
-	public float dist;
+    public float dist;
+
     public float angle;
+
     public float temp;
+
     public ringdata.ByReference nextrec;
+
     public ringdata() {
-            super();
+        super();
     }
-    public ringdata(float dist, float angle, float temp, ringdata.ByReference nextrec) {
-            super();
-            this.dist = dist;
-            this.angle = angle;
-            this.temp = temp;
-            this.nextrec = nextrec;
+
+    public ringdata(float dist, float angle, float temp,
+            ringdata.ByReference nextrec) {
+        super();
+        this.dist = dist;
+        this.angle = angle;
+        this.temp = temp;
+        this.nextrec = nextrec;
+    }
+
+    protected ByReference newByReference() {
+        return new ByReference();
+    }
+
+    protected ByValue newByValue() {
+        return new ByValue();
+    }
+
+    protected ringdata newInstance() {
+        return new ringdata();
+    }
+
+    public static class ByReference extends ringdata implements
+            com.sun.jna.Structure.ByReference {
+    }
+
+    public static class ByValue extends ringdata implements
+            com.sun.jna.Structure.ByValue {
+    }
+
+    @Override
+    protected List getFieldOrder() {
+        return Arrays
+                .asList(new String[] { "dist", "angle", "temp", "nextrec" });
     }
-    protected ByReference newByReference() { return new ByReference(); }
-    protected ByValue newByValue() { return new ByValue(); }
-    protected ringdata newInstance() { return new ringdata(); }
-    public static class ByReference extends ringdata implements com.sun.jna.Structure.ByReference {}
-    public static class ByValue extends ringdata implements com.sun.jna.Structure.ByValue {}
 
 }

ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/aodt/natives/tiff_header.java

@@ -1,32 +1,82 @@
+/**
+ * 
+ * 
+ * This java class performs the NSHARP NsharpNative functions.
+ * This code has been developed by the NCEP-SIB for use in the AWIPS2 system.
+ * 
+ * <pre>
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#     Engineer    Description
+ * -------      -------     --------    -----------
+ * ??/??/???    ?                       Initial coding
+ * 05/08/2014   3108        bkowal      Updated structure classes for the JNA upgrade.
+ * 
+ *
+ * </pre>
+ * 
+ * @author ?
+ * @version 1.0
+ */
 package gov.noaa.nws.ncep.viz.tools.aodt.natives;
 
+import java.util.Arrays;
+import java.util.List;
+
 import com.sun.jna.Structure;
 
-public class tiff_header extends Structure{
-	 /// Byte order
+public class tiff_header extends Structure {
+    // / Byte order
     public int order;
-    /// Version
+
+    // / Version
     public int version;
-    /// Pointer
+
+    // / Pointer
     public int point;
+
     public tiff_header() {
-            super();
+        super();
     }
+
     /**
-     * @param order Byte order<br>
-     * @param version Version<br>
-     * @param point Pointer
+     * @param order
+     *            Byte order<br>
+     * @param version
+     *            Version<br>
+     * @param point
+     *            Pointer
      */
     public tiff_header(int order, int version, int point) {
-            super();
-            this.order = order;
-            this.version = version;
-            this.point = point;
+        super();
+        this.order = order;
+        this.version = version;
+        this.point = point;
+    }
+
+    protected ByReference newByReference() {
+        return new ByReference();
+    }
+
+    protected ByValue newByValue() {
+        return new ByValue();
+    }
+
+    protected tiff_header newInstance() {
+        return new tiff_header();
+    }
+
+    public static class ByReference extends tiff_header implements
+            com.sun.jna.Structure.ByReference {
+    }
+
+    public static class ByValue extends tiff_header implements
+            com.sun.jna.Structure.ByValue {
+    }
+
+    @Override
+    protected List getFieldOrder() {
+        return Arrays.asList(new String[] { "order", "version", "point" });
     }
-    protected ByReference newByReference() { return new ByReference(); }
-    protected ByValue newByValue() { return new ByValue(); }
-    protected tiff_header newInstance() { return new tiff_header(); }
-    public static class ByReference extends tiff_header implements com.sun.jna.Structure.ByReference {}
-    public static class ByValue extends tiff_header implements com.sun.jna.Structure.ByValue {}
 
 }

ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/aodt/natives/tiff_record.java

@@ -1,36 +1,88 @@
+/**
+ * 
+ * 
+ * This java class performs the NSHARP NsharpNative functions.
+ * This code has been developed by the NCEP-SIB for use in the AWIPS2 system.
+ * 
+ * <pre>
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#     Engineer    Description
+ * -------      -------     --------    -----------
+ * ??/??/???    ?                       Initial coding
+ * 05/08/2014   3108        bkowal      Updated structure classes for the JNA upgrade.
+ * 
+ *
+ * </pre>
+ * 
+ * @author ?
+ * @version 1.0
+ */
 package gov.noaa.nws.ncep.viz.tools.aodt.natives;
 
+import java.util.Arrays;
+import java.util.List;
+
 import com.sun.jna.Structure;
 
-public class tiff_record extends Structure{
-	 /// TIFF tag
+public class tiff_record extends Structure {
+    // / TIFF tag
     public int tag;
-    /// Data type
+
+    // / Data type
     public int type;
-    /// Length
+
+    // / Length
     public int length;
-    /// Pointer or value
+
+    // / Pointer or value
     public int voff;
+
     public tiff_record() {
-            super();
+        super();
     }
+
     /**
-     * @param tag TIFF tag<br>
-     * @param type Data type<br>
-     * @param length Length<br>
-     * @param voff Pointer or value
+     * @param tag
+     *            TIFF tag<br>
+     * @param type
+     *            Data type<br>
+     * @param length
+     *            Length<br>
+     * @param voff
+     *            Pointer or value
      */
     public tiff_record(int tag, int type, int length, int voff) {
-            super();
-            this.tag = tag;
-            this.type = type;
-            this.length = length;
-            this.voff = voff;
+        super();
+        this.tag = tag;
+        this.type = type;
+        this.length = length;
+        this.voff = voff;
+    }
+
+    protected ByReference newByReference() {
+        return new ByReference();
+    }
+
+    protected ByValue newByValue() {
+        return new ByValue();
+    }
+
+    protected tiff_record newInstance() {
+        return new tiff_record();
+    }
+
+    public static class ByReference extends tiff_record implements
+            com.sun.jna.Structure.ByReference {
+    }
+
+    public static class ByValue extends tiff_record implements
+            com.sun.jna.Structure.ByValue {
+    }
+
+    @Override
+    protected List getFieldOrder() {
+        return Arrays.asList(new String[] { "tag", "type", "length", "voff" });
     }
-    protected ByReference newByReference() { return new ByReference(); }
-    protected ByValue newByValue() { return new ByValue(); }
-    protected tiff_record newInstance() { return new tiff_record(); }
-    public static class ByReference extends tiff_record implements com.sun.jna.Structure.ByReference {}
-    public static class ByValue extends tiff_record implements com.sun.jna.Structure.ByValue {}
 
 }

ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/aodt/natives/tiff_vars.java

@@ -1,40 +1,96 @@
+/**
+ * 
+ * 
+ * This java class performs the NSHARP NsharpNative functions.
+ * This code has been developed by the NCEP-SIB for use in the AWIPS2 system.
+ * 
+ * <pre>
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#     Engineer    Description
+ * -------      -------     --------    -----------
+ * ??/??/???    ?                       Initial coding
+ * 05/08/2014   3108        bkowal      Updated structure classes for the JNA upgrade.
+ * 
+ *
+ * </pre>
+ * 
+ * @author ?
+ * @version 1.0
+ */
 package gov.noaa.nws.ncep.viz.tools.aodt.natives;
 
+import java.util.Arrays;
+import java.util.List;
+
 import com.sun.jna.Structure;
 
-public class tiff_vars extends Structure{
-	 public int nbits;
-     public int photo;
-     public int unit;
-     public int in_lines;
-     public int in_elems;
-     public int out_lines;
-     public int out_elems;
-     public int[] ratx = new int[(2)];
-     public int[] raty = new int[(2)];
-     public tiff_vars() {
-             super();
-     }
-     public tiff_vars(int nbits, int photo, int unit, int in_lines, int in_elems, int out_lines, int out_elems, int ratx[], int raty[]) {
-             super();
-             this.nbits = nbits;
-             this.photo = photo;
-             this.unit = unit;
-             this.in_lines = in_lines;
-             this.in_elems = in_elems;
-             this.out_lines = out_lines;
-             this.out_elems = out_elems;
-             if (ratx.length != this.ratx.length)
-                     throw new java.lang.IllegalArgumentException("Wrong array size !");
-             this.ratx = ratx;
-             if (raty.length != this.raty.length)
-                     throw new java.lang.IllegalArgumentException("Wrong array size !");
-             this.raty = raty;
-     }
-     protected ByReference newByReference() { return new ByReference(); }
-     protected ByValue newByValue() { return new ByValue(); }
-     protected tiff_vars newInstance() { return new tiff_vars(); }
-     public static class ByReference extends tiff_vars implements com.sun.jna.Structure.ByReference {}
-     public static class ByValue extends tiff_vars implements com.sun.jna.Structure.ByValue {}
+public class tiff_vars extends Structure {
+    public int nbits;
+
+    public int photo;
+
+    public int unit;
+
+    public int in_lines;
+
+    public int in_elems;
+
+    public int out_lines;
+
+    public int out_elems;
+
+    public int[] ratx = new int[(2)];
+
+    public int[] raty = new int[(2)];
+
+    public tiff_vars() {
+        super();
+    }
+
+    public tiff_vars(int nbits, int photo, int unit, int in_lines,
+            int in_elems, int out_lines, int out_elems, int ratx[], int raty[]) {
+        super();
+        this.nbits = nbits;
+        this.photo = photo;
+        this.unit = unit;
+        this.in_lines = in_lines;
+        this.in_elems = in_elems;
+        this.out_lines = out_lines;
+        this.out_elems = out_elems;
+        if (ratx.length != this.ratx.length)
+            throw new java.lang.IllegalArgumentException("Wrong array size !");
+        this.ratx = ratx;
+        if (raty.length != this.raty.length)
+            throw new java.lang.IllegalArgumentException("Wrong array size !");
+        this.raty = raty;
+    }
+
+    protected ByReference newByReference() {
+        return new ByReference();
+    }
+
+    protected ByValue newByValue() {
+        return new ByValue();
+    }
+
+    protected tiff_vars newInstance() {
+        return new tiff_vars();
+    }
+
+    public static class ByReference extends tiff_vars implements
+            com.sun.jna.Structure.ByReference {
+    }
+
+    public static class ByValue extends tiff_vars implements
+            com.sun.jna.Structure.ByValue {
+    }
+
+    @Override
+    protected List getFieldOrder() {
+        return Arrays.asList(new String[] { "nbits", "photo", "unit",
+                "in_lines", "in_elems", "out_lines", "out_elems", "ratx",
+                "raty" });
+    }
 
 }