From 67f3334250bfaefdbec6ceddbaf56fd57b5449f5 Mon Sep 17 00:00:00 2001 From: Doug MacEachern Date: Sat, 24 Sep 2005 00:24:49 +0000 Subject: [PATCH] rename EventLogRecord.getStringData() to getMessage() --- bindings/java/src/jni/win32/eventlog.c | 4 ++-- .../net/hyperic/sigar/win32/EventLogRecord.java | 15 +++++++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/bindings/java/src/jni/win32/eventlog.c b/bindings/java/src/jni/win32/eventlog.c index c0f4da8b..a9f4c3eb 100644 --- a/bindings/java/src/jni/win32/eventlog.c +++ b/bindings/java/src/jni/win32/eventlog.c @@ -237,13 +237,13 @@ JNIEXPORT jobject SIGAR_JNI(win32_EventLog_readlog) if ((get_messagefile_dll(name, source, dllfile) == ERROR_SUCCESS) && (get_formatted_message(pevlr, dllfile, msg) == ERROR_SUCCESS)) { - id = JENV->GetFieldID(env, cls, "stringData", + id = JENV->GetFieldID(env, cls, "message", "Ljava/lang/String;"); SetStringField(env, eventObj, id, msg); } else if (pevlr->StringOffset > 0) { /* Work around some applications not using a message file */ char *tmp = (LPSTR)((LPBYTE)pevlr + pevlr->StringOffset); - id = JENV->GetFieldID(env, cls, "stringData", "Ljava/lang/String;"); + id = JENV->GetFieldID(env, cls, "message", "Ljava/lang/String;"); SetStringField(env, eventObj, id, tmp); } JENV->ReleaseStringUTFChars(env, jname, name); diff --git a/bindings/java/src/net/hyperic/sigar/win32/EventLogRecord.java b/bindings/java/src/net/hyperic/sigar/win32/EventLogRecord.java index aed0254c..28e23d00 100644 --- a/bindings/java/src/net/hyperic/sigar/win32/EventLogRecord.java +++ b/bindings/java/src/net/hyperic/sigar/win32/EventLogRecord.java @@ -15,7 +15,7 @@ public class EventLogRecord { String source; String computerName; String user; - String stringData; + String message; /* Get the record number for this event entry */ public long getRecordNumber() { @@ -84,10 +84,17 @@ public class EventLogRecord { } /** - * Get the string data for the event. (The message) + * Get the message for the event. + */ + public String getMessage() { + return this.message; + } + + /** + * @deprecated */ public String getStringData() { - return this.stringData; + return getMessage(); } /** @@ -100,7 +107,7 @@ public class EventLogRecord { "source=" + source + " " + "computerName=" + computerName + " " + "user=" + user + " " + - "stringData=" + stringData; + "message=" + message; } }