diff -r bb339882c6e9 -r 0367d2db2c06 sysperfana/analyzetoolext/com.nokia.s60tools.analyzetool/src/com/nokia/s60tools/analyzetool/engine/DeferredCallstackManager.java
--- a/sysperfana/analyzetoolext/com.nokia.s60tools.analyzetool/src/com/nokia/s60tools/analyzetool/engine/DeferredCallstackManager.java	Tue Aug 24 12:10:03 2010 +0300
+++ b/sysperfana/analyzetoolext/com.nokia.s60tools.analyzetool/src/com/nokia/s60tools/analyzetool/engine/DeferredCallstackManager.java	Tue Aug 24 12:16:27 2010 +0300
@@ -30,105 +30,122 @@
 import com.nokia.s60tools.analyzetool.engine.statistic.ProcessInfo;
 
 /**
- * CallstackManager for reading of callstacks on demand by accessing the .dat file
- * after the initial parsing of the file has completed.
- *
+ * CallstackManager for reading of callstacks on demand by accessing the .dat
+ * file after the initial parsing of the file has completed.
+ * 
  */
-public class DeferredCallstackManager implements ICallstackManager{
-	/** max number of lines to parse before giving up and forcing the callstack as complete
-	 * This helps to deal with corrupt files */
+public class DeferredCallstackManager implements ICallstackManager {
+
+	/**
+	 * Max number of lines to parse before giving up and forcing the callstack
+	 * as complete. This helps to deal with corrupt files.
+	 */
 	private static final int BAIL_OUT_LIMIT = 100;
-	
+
 	/** Location of the .dat file */
 	String fileLocation;
-	/** list of processes for this file; this has to contain all DllLoads for each process */
+
+	/**
+	 * list of processes for this file; this has to contain all DllLoads for
+	 * each process
+	 */
 	private Map<Integer, ProcessInfo> processMap;
 
 	/**
-	 * Contructor
-	 * @param fileLocation full path of the file to read callstacks from
+	 * Constructor
+	 * 
+	 * @param fileLocation
+	 *            full path of the file to read callstacks from
 	 */
 	public DeferredCallstackManager(String fileLocation) {
 		this.fileLocation = fileLocation;
 	}
-	
+
 	/**
 	 * Setter for all processes valid for this data file. This has to contain
 	 * all DllInfo information for each of the processes
-	 * @param processes List of processes for the file
+	 * 
+	 * @param processes
+	 *            List of processes for the file
 	 */
-	public void setProcesses(AbstractList<ProcessInfo> processes){
-		//make a copy
+	public void setProcesses(AbstractList<ProcessInfo> processes) {
+		// make a copy
 		if (processMap == null) {
 			processMap = new HashMap<Integer, ProcessInfo>();
 			for (ProcessInfo processInfo : processes) {
 				processMap.put(processInfo.getProcessID(), processInfo);
 			}
 		}
-	}	
-	
-	/* (non-Javadoc)
-	 * @see com.nokia.s60tools.analyzetool.engine.statistic.ICallstackManager#readCallstack(com.nokia.s60tools.analyzetool.engine.statistic.BaseInfo)
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @seecom.nokia.s60tools.analyzetool.engine.statistic.ICallstackManager#
+	 * readCallstack(com.nokia.s60tools.analyzetool.engine.statistic.BaseInfo)
 	 */
-	public List<AllocCallstack> readCallstack(BaseInfo baseInfo) throws IOException{
-		//Returns a fully resolved callstack file in .dat format.
-		//The baseInfo's file position points to the beginning of a record where the callstack information starts
-		
-		if (!hasCallstack(baseInfo)){
+	public List<AllocCallstack> readCallstack(BaseInfo baseInfo)
+			throws IOException {
+		// Returns a fully resolved callstack file in .dat format.
+		// The baseInfo's file position points to the beginning of a record
+		// where the callstack information starts
+
+		if (!hasCallstack(baseInfo)) {
 			return null;
 		}
 
 		ProcessInfo p = processMap.get(baseInfo.getProcessID());
-		
-		if (p == null){
-			//no matching process found
+
+		if (p == null) {
+			// no matching process found
 			return new ArrayList<AllocCallstack>();
 		}
-		
-		
+
 		RandomAccessFile fileReader = null;
 		List<AllocCallstack> ret = null;
-		
-		
+
 		try {
 			// Open .dat file for reading
-			fileReader = new RandomAccessFile(new File(fileLocation), "r");  //$NON-NLS-1$
+			fileReader = new RandomAccessFile(new File(fileLocation), "r"); //$NON-NLS-1$
 
-			// Parsing the ELF header to read the Program Header Offset 'e_phoff' value
+			// Parsing the ELF header to read the Program Header Offset
+			// 'e_phoff' value
 			fileReader.seek(baseInfo.getFilePos());
-			
+
 			CallstackDataParser parser = new CallstackDataParser(baseInfo, p);
-			int lineCnt = 0; 
+			int lineCnt = 0;
 			String line;
-			while((line = fileReader.readLine()) != null){
-				if (parser.parseLine(line)){
+			while ((line = fileReader.readLine()) != null) {
+				if (parser.parseLine(line)) {
 					parser.finaliseCallstack();
 					ret = parser.getCallstack();
 					break;
 				}
-				
-				//let's count the lines we parse and bail out after <n> lines in case the file is corrupt
-				lineCnt ++;
-				if (lineCnt == BAIL_OUT_LIMIT){
+
+				// let's count the lines we parse and bail out after <n> lines
+				// in case the file is corrupt
+				lineCnt++;
+				if (lineCnt == BAIL_OUT_LIMIT) {
 					parser.forceComplete();
 					ret = parser.getCallstack();
 					break;
 				}
 			}
 		} finally {
-			if (fileReader != null){
+			if (fileReader != null) {
 				fileReader.close();
 			}
 		}
-		
 		return ret == null ? new ArrayList<AllocCallstack>() : ret;
 	}
 
-	/* (non-Javadoc)
-	 * @see com.nokia.s60tools.analyzetool.engine.statistic.ICallstackManager#hasCallstack(com.nokia.s60tools.analyzetool.engine.statistic.BaseInfo)
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @seecom.nokia.s60tools.analyzetool.engine.statistic.ICallstackManager#
+	 * hasCallstack(com.nokia.s60tools.analyzetool.engine.statistic.BaseInfo)
 	 */
 	public boolean hasCallstack(BaseInfo baseInfo) {
 		return baseInfo.getFilePos() > -1;
 	}
-	
 }