From 14f2e8811f86486321afa861a8111349147d8276 Mon Sep 17 00:00:00 2001
From: Doug MacEachern <dougm@hyperic.com>
Date: Sun, 21 Nov 2004 19:11:55 +0000
Subject: [PATCH] making the native method public and renaming to gather

---
 bindings/java/src/jni/generate.pl                  |  8 ++++----
 bindings/java/src/jni/javasigar.c                  |  4 ++--
 bindings/java/src/net/hyperic/sigar/FileInfo.java  | 14 +++++++-------
 bindings/java/src/net/hyperic/sigar/ProcCpu.java   |  2 +-
 .../java/src/net/hyperic/sigar/ThreadCpuTime.java  |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/bindings/java/src/jni/generate.pl b/bindings/java/src/jni/generate.pl
index 59dfbbc3..689a0ff2 100644
--- a/bindings/java/src/jni/generate.pl
+++ b/bindings/java/src/jni/generate.pl
@@ -1062,7 +1062,7 @@ while (my($name, $fields) = each %classes) {
     $sigar_function = $func_alias{$sigar_function} || $sigar_function;
     my $sigar_type = join '_', $sigar_prefix, 't';
 
-    my $nativefunc = join '_', $jni_prefix, 'nativeGet';
+    my $nativefunc = join '_', $jni_prefix, 'gather';
 
     my $proto = join "\n",
       "JNIEXPORT void JNICALL $nativefunc",
@@ -1121,9 +1121,9 @@ package net.hyperic.sigar;
  */
 public class $name {
 
-    $name() { }
+    public $name() { }
 
-    native void nativeGet($jargs_proto) throws SigarException;
+    public native void gather($jargs_proto) throws SigarException;
 
     /**
      * This method is not intended to be called directly.
@@ -1133,7 +1133,7 @@ public class $name {
      */
     static $name fetch($jargs_proto) throws SigarException {
         $name $jname = new $name();
-        $jname.nativeGet($jargs);
+        $jname.gather($jargs);
         return $jname;
     }
 
diff --git a/bindings/java/src/jni/javasigar.c b/bindings/java/src/jni/javasigar.c
index 0f66544c..f0669f55 100644
--- a/bindings/java/src/jni/javasigar.c
+++ b/bindings/java/src/jni/javasigar.c
@@ -746,10 +746,10 @@ JNIEXPORT jint SIGAR_JNI(FileInfo_getMode)
 
 
 /*
- * copy of the generated FileAttrs_nativeGet function
+ * copy of the generated FileAttrs_gather function
  * but we call the lstat wrapper instead.
  */
-JNIEXPORT void SIGAR_JNI(FileInfo_nativeGetLink)
+JNIEXPORT void SIGAR_JNI(FileInfo_gatherLink)
 (JNIEnv *env, jobject obj, jobject sigar_obj, jstring name)
 {
     sigar_file_attrs_t s;
diff --git a/bindings/java/src/net/hyperic/sigar/FileInfo.java b/bindings/java/src/net/hyperic/sigar/FileInfo.java
index 28a83aa6..ce2af4ae 100644
--- a/bindings/java/src/net/hyperic/sigar/FileInfo.java
+++ b/bindings/java/src/net/hyperic/sigar/FileInfo.java
@@ -91,7 +91,7 @@ public class FileInfo extends FileAttrs {
 
     private static native String getTypeString(int type);
 
-    native void nativeGetLink(Sigar sigar, String name)
+    native void gatherLink(Sigar sigar, String name)
         throws SigarException;
 
     public String getTypeString() {
@@ -160,7 +160,7 @@ public class FileInfo extends FileAttrs {
                     this.stat = this.sigar.getDirStat(this.name);
                 }
                 else {
-                    this.stat.nativeGet(this.sigar, this.name);
+                    this.stat.gather(this.sigar, this.name);
                 }
             } catch (SigarException e) {
                 //ok for now
@@ -381,16 +381,16 @@ public class FileInfo extends FileAttrs {
         long mtime = this.mtime;
 
         if (this.lstat) {
-            this.nativeGetLink(this.sigar, this.name);
+            this.gatherLink(this.sigar, this.name);
         }
         else {
-            this.nativeGet(this.sigar, this.name);
+            this.gather(this.sigar, this.name);
         }
 
         if (this.dirStatEnabled &&
             (mtime != this.mtime)) //no need to fetch stat if unmodified.
         {
-            this.stat.nativeGet(this.sigar, this.name);
+            this.stat.gather(this.sigar, this.name);
         }
     }
 
@@ -401,11 +401,11 @@ public class FileInfo extends FileAttrs {
         FileInfo info = new FileInfo();
 
         if (followSymlinks) {
-            info.nativeGet(sigar, name);
+            info.gather(sigar, name);
             info.lstat = false;
         }
         else {
-            info.nativeGetLink(sigar, name);
+            info.gatherLink(sigar, name);
             info.lstat = true;
         }
 
diff --git a/bindings/java/src/net/hyperic/sigar/ProcCpu.java b/bindings/java/src/net/hyperic/sigar/ProcCpu.java
index c0fac0ae..60f96f2d 100644
--- a/bindings/java/src/net/hyperic/sigar/ProcCpu.java
+++ b/bindings/java/src/net/hyperic/sigar/ProcCpu.java
@@ -17,7 +17,7 @@ public class ProcCpu extends ProcTime {
 
     private void getValues(Sigar sigar, long pid)
         throws SigarException {
-        this.nativeGet(sigar, pid);
+        this.gather(sigar, pid);
     }
 
     static synchronized ProcCpu get(Sigar sigar, long pid)
diff --git a/bindings/java/src/net/hyperic/sigar/ThreadCpuTime.java b/bindings/java/src/net/hyperic/sigar/ThreadCpuTime.java
index 8e388d40..299619d4 100644
--- a/bindings/java/src/net/hyperic/sigar/ThreadCpuTime.java
+++ b/bindings/java/src/net/hyperic/sigar/ThreadCpuTime.java
@@ -10,7 +10,7 @@ public class ThreadCpuTime extends ThreadCpu {
     }
 
     public void getCurrent() throws SigarException {
-        this.nativeGet(this.sigar, 0);
+        this.gather(this.sigar, 0);
     }
 
     public ThreadCpu getDiff() throws SigarException {