// HashMap<String, Object> parsedDataMap = (HashMap<String, Object>)markerFieldData.clone();
// Or even safer, use HashMap constructor to do so :
HashMap<String, Object> parsedDataMap = new HashMap<String, Object>(markerFieldData);
-
- String newKey = null;
+
JniMarkerField newMarkerField = null;
Iterator<String> 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
* @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));
}
/*
* @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));
}
/*
* @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));
}
/*
endTime = oldTrace.endTime;
tracefilesMap = new HashMap<String, JniTracefile>(oldTrace.tracefilesMap.size());
- tracefilesMap = oldTrace.tracefilesMap;
+ ltt_feedAllTracefiles(thisTracePtr.getLibraryId(), thisTracePtr.getPointer());
eventsHeap = new PriorityQueue<JniEvent>( oldTrace.eventsHeap.size());
- eventsHeap = oldTrace.eventsHeap;
+ populateEventHeap();
printLttDebug = oldTrace.printLttDebug;
}
// 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();
}
}
}
}
+ /**
+ * 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.
* <u>Intended to debug</u><p>
projects / deliverable / tracecompass.git / commitdiff
