From e0ea56dd32e75f2f4eb8fd998836a6d1e24e9406 Mon Sep 17 00:00:00 2001 From: William Bourque Date: Thu, 6 May 2010 17:34:27 +0000 Subject: [PATCH] Small changes to comply with findBugs plugin suggestions --- .../linuxtools/lttng/jni/JniMarker.java | 4 +-- .../linuxtools/lttng/jni/JniParser.java | 12 ++++---- .../linuxtools/lttng/jni/JniTrace.java | 8 ++--- .../linuxtools/lttng/jni/common/JniTime.java | 30 +++++++++++++++++++ .../lttng/jni/factory/JniTraceVersion.java | 4 ++- 5 files changed, 42 insertions(+), 16 deletions(-) diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniMarker.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniMarker.java index 00029641b8..d98fd1989c 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniMarker.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniMarker.java @@ -215,8 +215,8 @@ public abstract class JniMarker extends Jni_C_Common returnData += "name : " + name + "\n"; returnData += "formatOverview : " + formatOverview + "\n"; - returnData += "markerFieldArrayList : " + markerFieldsArrayList.toArray() + "\n"; - + returnData += "markerFieldArrayList : " + markerFieldsArrayList.hashCode() + " (size : " + markerFieldsArrayList.size() + " )" + "\n"; + return returnData; } diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniParser.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniParser.java index 90902c2c8a..adeafd9ff5 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniParser.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniParser.java @@ -130,14 +130,12 @@ public abstract class JniParser extends Jni_C_Common // HashMap parsedDataMap = (HashMap)markerFieldData.clone(); // Or even safer, use HashMap constructor to do so : HashMap parsedDataMap = new HashMap(markerFieldData); - - String newKey = null; + JniMarkerField newMarkerField = null; Iterator iterator = markerFieldData.keySet().iterator(); while ( iterator.hasNext() ) { - newKey = iterator.next(); - newMarkerField = markerFieldData.get(newKey); + newMarkerField = markerFieldData.get(iterator.next()); // Call the C to parse the data ltt_getParsedData(eventToParse.getEventPtr().getLibraryId(), parsedData, eventToParse.getEventPtr().getPointer(), newMarkerField.getMarkerFieldPtr().getPointer()); // Save the result into the HashMap @@ -209,7 +207,7 @@ public abstract class JniParser extends Jni_C_Common * @param formatToAdd The format of the raw data */ static private void addShortToParsingFromC(Object contentHolder, short shortToAdd) { - ((ParsedObjectContent)contentHolder).setData( new Short(shortToAdd)); + ((ParsedObjectContent)contentHolder).setData( Short.valueOf(shortToAdd)); } /* @@ -225,7 +223,7 @@ public abstract class JniParser extends Jni_C_Common * @param formatToAdd The format of the raw data */ static private void addIntegerToParsingFromC(Object contentHolder, int intToAdd) { - ((ParsedObjectContent)contentHolder).setData( new Integer(intToAdd)); + ((ParsedObjectContent)contentHolder).setData( Integer.valueOf(intToAdd)); } /* @@ -241,7 +239,7 @@ public abstract class JniParser extends Jni_C_Common * @param formatToAdd The format of the raw data */ static private void addLongToParsingFromC(Object contentHolder, long longToAdd) { - ((ParsedObjectContent)contentHolder).setData( new Long(longToAdd)); + ((ParsedObjectContent)contentHolder).setData( Long.valueOf(longToAdd)); } /* diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTrace.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTrace.java index 7ed77f365a..7b3820e140 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTrace.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/JniTrace.java @@ -179,10 +179,10 @@ public abstract class JniTrace extends Jni_C_Common { endTime = oldTrace.endTime; tracefilesMap = new HashMap(oldTrace.tracefilesMap.size()); - tracefilesMap = oldTrace.tracefilesMap; + ltt_feedAllTracefiles(thisTracePtr.getLibraryId(), thisTracePtr.getPointer()); eventsHeap = new PriorityQueue( oldTrace.eventsHeap.size()); - eventsHeap = oldTrace.eventsHeap; + populateEventHeap(); printLttDebug = oldTrace.printLttDebug; } @@ -303,10 +303,6 @@ public abstract class JniTrace extends Jni_C_Common { // Nullify the pointer thisTracePtr = new Jni_C_Pointer_And_Library_Id(); - - // Ask the garbage collector to make a little pass here, as we could - // be left with 100's of unreferenced objects - System.gc(); } } diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/JniTime.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/JniTime.java index dc6d2827eb..5f9303da5c 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/JniTime.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/common/JniTime.java @@ -157,6 +157,36 @@ public class JniTime extends Jni_C_Constant implements Comparable } } + /** + * Overrided equals for JniTime type + * + * @param The object we want to compare too + * + * @return true if the time is the same, false otherwise. + */ + @Override + public boolean equals(Object obj) { + boolean returnedValue = false; + + if ( obj instanceof JniTime ) { + if ( ((JniTime)obj).time == this.time ) { + returnedValue = true; + } + } + + return returnedValue; + } + + /** + * Overridden hash code for JniTime type + * + */ + @Override + public int hashCode() { + return this.toString().hashCode(); + } + + /** * toString() method. * Intended to debug

diff --git a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceVersion.java b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceVersion.java index 38ad73a365..b3727d7c84 100644 --- a/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceVersion.java +++ b/org.eclipse.linuxtools.lttng.jni/src/org/eclipse/linuxtools/lttng/jni/factory/JniTraceVersion.java @@ -83,7 +83,9 @@ public class JniTraceVersion { try { readVersionFromTrace(tracepath); } - catch(JniTraceVersionException e) { } + catch(JniTraceVersionException e) { + // Yes, we do ignore exception. + } } /** -- 2.34.1