FCL/sftools/ana/dynaanaapps: comparison sysperfana/perfinvestigator/com.nokia.carbide.cpp.pi.function/src/com/nokia/carbide/cpp/pi/function/NewFunctionAnalyse.java

equal deleted inserted replaced

-:615035072f7e
+:844b047e260d
 import com.nokia.carbide.cpp.internal.pi.analyser.NpiInstanceRepository;
 import com.nokia.carbide.cpp.internal.pi.model.Function;
 import com.nokia.carbide.cpp.internal.pi.model.GUITooltips;
 import com.nokia.carbide.cpp.internal.pi.model.GenericSampledTrace;
 import com.nokia.carbide.cpp.internal.pi.model.GenericTrace;
+import com.nokia.carbide.cpp.internal.pi.model.IFunction;
 import com.nokia.carbide.cpp.internal.pi.model.ParsedTraceData;
 import com.nokia.carbide.cpp.internal.pi.model.TraceDataRepository;
 import com.nokia.carbide.cpp.internal.pi.test.PIAnalyser;
 import com.nokia.carbide.cpp.internal.pi.utils.QuickSortImpl;
 import com.nokia.carbide.cpp.internal.pi.utils.Sortable;
 			if (!threads.containsKey(sample.thread.process.name+"::"+sample.thread.threadName+"_"+sample.thread.threadId)) //$NON-NLS-1$ //$NON-NLS-2$
 			{
 				threads.put(s,sample.thread);
 				//listData.add(sample.thread.process.name+"::"+sample.thread.threadName);
-				threadSampleAmount.put(s,new Integer(1));
+				threadSampleAmount.put(s,Integer.valueOf(1));
 			}
 			else
 			{
 				int value = ((Integer)threadSampleAmount.get(s)).intValue();
 				threadSampleAmount.remove(s);
-				threadSampleAmount.put(s,new Integer(value+1));
+				threadSampleAmount.put(s,Integer.valueOf(value+1));
 			}
 		}
 		while(threadSampleAmount.size() > 0)
 		{
 						if (test != null && this.originallySelectedThreads[i] != null)
 						{
 							if (this.originallySelectedThreads[i].equals(test))
 							{
 								//System.out.println("Match:"+this.originallySelectedThreads[i]+" index "+k);
-								selectedIndx.add(new Integer(k));
+								selectedIndx.add(Integer.valueOf(k));
 							}
 						}
 					}
 				}
 			    }
 			}
 			if (!containsKey)
 		    {
 		        binaries.put(bi, sample);
-		        binarySampleAmount.put(bi, new Integer(1));
+		        binarySampleAmount.put(bi, Integer.valueOf(1));
 		    }
 		    else
 		    {
 		        for (Enumeration<BinaryNameItem> e = binarySampleAmount.keys(); e.hasMoreElements();)
 		        {
 		            BinaryNameItem biTemp = e.nextElement();
 		            if (biTemp.toString().equalsIgnoreCase(bi.toString()))
 		            {
 		                int value = ((Integer)binarySampleAmount.get(biTemp)).intValue();
 		                binarySampleAmount.remove(biTemp);
-						binarySampleAmount.put(biTemp, new Integer(value+1));
+						binarySampleAmount.put(biTemp, Integer.valueOf(value+1));
 		            }
 		        }
 		    }
 		}
 						if (test != null && this.originallySelectedBinaries[i] != null)
 						{
 							if (this.originallySelectedBinaries[i].equalsIgnoreCase(test))
 							{
 								//System.out.println("Match:"+this.originallySelectedThreads[i]+" index "+k);
-								selectedIndx.add(new Integer(k));
+								selectedIndx.add(Integer.valueOf(k));
 							}
 						}
 					}
 				}
 				String threadName = sample.thread.process.name+"::"+sample.thread.threadName+"_"+sample.thread.threadId; //$NON-NLS-1$ //$NON-NLS-2$
 				if (!threadVector.contains(threadName))
 				{
 					threadVector.add(threadName);
-					threadSampleAmount.add(new Integer(1));
+					threadSampleAmount.add(Integer.valueOf(1));
 				}
 				else
 				{
 					//int value = ((Integer)binarySampleAmount.get(binaryName)).intValue();
 					int index = threadVector.indexOf(threadName);
 					int value = ((Integer)threadSampleAmount.get(index)).intValue();
 					threadSampleAmount.remove(index);
-					threadSampleAmount.add(index,new Integer(value+1));
+					threadSampleAmount.add(index,Integer.valueOf(value+1));
 				}
 			}
 		}
 		int totalSamples = 0;
 			    }
 //			    int index = listData.indexOf(valueStore[i]);
 			    int index = (found) ? counter : -1;
 				if (index != -1)
 				{
-					indexStore.add(new Integer(index));
+					indexStore.add(Integer.valueOf(index));
 				}
 				else
 				{
 					notVisibleStore.add(valueStore[i]);
 				}
 			    }
 			    int index = (found) ? counter : -1;
 //				int index = listData.indexOf(value);
 				if (index != -1)
 				{
-					indexStore.add(new Integer(index));
+					indexStore.add(Integer.valueOf(index));
 				}
 				else
 				{
 					notVisibleStore.add(value);
 				}
 				BinaryNameItem binaryName = getBinaryNameForGppSample(sample);
 				if (!binaryVector.contains(binaryName))
 				{
 					binaryVector.add(binaryName);
-					binarySampleAmount.add(new Integer(1));
+					binarySampleAmount.add(Integer.valueOf(1));
 				}
 				else
 				{
 					//int value = ((Integer)binarySampleAmount.get(binaryName)).intValue();
 					int index = binaryVector.indexOf(binaryName);
 					int value = ((Integer)binarySampleAmount.get(index)).intValue();
 					binarySampleAmount.remove(index);
-					binarySampleAmount.add(index,new Integer(value+1));
+					binarySampleAmount.add(index,Integer.valueOf(value+1));
 				}
 			}
 		}
 		int totalSamples = 0;
 			for (int i=0;i<valueStore.length;i++)
 			{
 				int index = listData.indexOf(valueStore[i]);
 				if (index != -1)
 				{
-					indexStore.add(new Integer(index));
+					indexStore.add(Integer.valueOf(index));
 				}
 				else
 				{
 					notVisibleStore.add(valueStore[i]);
 				}
 			{
 				Object value = e.nextElement();
 				int index = listData.indexOf(value);
 				if (index != -1)
 				{
-					indexStore.add(new Integer(index));
+					indexStore.add(Integer.valueOf(index));
 				}
 				else
 				{
 					notVisibleStore.add(value);
 				}
 				{
 					// add the function name to percentData
 					percentData.add(getFunctionNameForGppSample(s));
 					// this is the first sample for this function, thus add number 1
 					// to the percent value list
-					percentValueList.add(new Integer(1));
+					percentValueList.add(Integer.valueOf(1));
 					// add a vector for the function offset values
 					if (this.functionPercents.isSelected() == true)
 					{
 						Vector functionIndexVector = new Vector();
 							((Integer)percentValueList.elementAt(index)).intValue());
 					*/
 					Integer value = (Integer)percentValueList.elementAt(index);
 					percentValueList.remove(index);
-					percentValueList.add(index,new Integer(value.intValue()+1));
+					percentValueList.add(index,Integer.valueOf(value.intValue()+1));
 					if (this.functionPercents.isSelected() == true)
 					{
 						Vector functionIndexVector = (Vector)functionIndexList.elementAt(index);
 						Long offset = getFunctionOffsetForGppSample(s);
 	private BinaryNameItem getBinaryNameForGppSample(GppSample s)
 	{
 		String binaryName;
 		if (this.symbolPrimary || this.ittTrace == null)
 		{
-			binaryName = s.currentFunctionSym.functionBinary.binaryName;
+			binaryName = s.getCurrentFunctionSym().getFunctionBinary().getBinaryName();
 			if (!binaryName.endsWith(Messages.getString("NewFunctionAnalyse.notFound"))) //$NON-NLS-1$
 				return new BinaryNameItem(binaryName,false);
 		}
-		if (s.currentFunctionItt != null)
+		if (s.getCurrentFunctionItt() != null)
 		{
-			binaryName = s.currentFunctionItt.functionBinary.binaryName;
+			binaryName = s.getCurrentFunctionItt().getFunctionBinary().getBinaryName();
 			if (!binaryName.endsWith(Messages.getString("NewFunctionAnalyse.notFound"))) //$NON-NLS-1$
 			{
 				return new BinaryNameItem(binaryName,true);
 			}
 			else
 			{
-				binaryName = s.currentFunctionSym.functionBinary.binaryName;
+				binaryName = s.getCurrentFunctionSym().getFunctionBinary().getBinaryName();
 				if (binaryName.endsWith(Messages.getString("NewFunctionAnalyse.notFound"))) //$NON-NLS-1$
 					return new BinaryNameItem(Messages.getString("NewFunctionAnalyse.binaryNotFound"),true); //$NON-NLS-1$
 				else
 					return new BinaryNameItem(binaryName,false);
 			}
 		}
-		else if (!s.currentFunctionSym.functionBinary.binaryName.endsWith(Messages.getString("NewFunctionAnalyse.notFound"))) //$NON-NLS-1$
+		else if (!s.getCurrentFunctionSym().getFunctionBinary().getBinaryName().endsWith(Messages.getString("NewFunctionAnalyse.notFound"))) //$NON-NLS-1$
 		{
-			binaryName = s.currentFunctionSym.functionBinary.binaryName;
+			binaryName = s.getCurrentFunctionSym().getFunctionBinary().getBinaryName();
 			return new BinaryNameItem(binaryName,false);
 		}
 		else
 		{
 			return new BinaryNameItem(Messages.getString("NewFunctionAnalyse.binaryNotFound"),false); //$NON-NLS-1$
 	private Long getFunctionOffsetForGppSample(GppSample s)
 	{
 		//String functionName;
 		if ((this.symbolPrimary || this.ittTrace == null) &&
-				!s.currentFunctionSym.functionBinary.binaryName.endsWith(Messages.getString("NewFunctionAnalyse.notFound")) ) //$NON-NLS-1$
+				!s.getCurrentFunctionSym().getFunctionBinary().getBinaryName().endsWith(Messages.getString("NewFunctionAnalyse.notFound")) ) //$NON-NLS-1$
 		{
-			return new Long(s.programCounter-s.currentFunctionSym.startAddress.longValue());
+			return new Long(s.programCounter-s.getCurrentFunctionSym().getStartAddress().longValue());
 		}
-		if (s.currentFunctionItt != null && !s.currentFunctionItt.functionName.endsWith(Messages.getString("NewFunctionAnalyse.notFound"))) //$NON-NLS-1$
+		if (s.getCurrentFunctionItt() != null && !s.getCurrentFunctionItt().getFunctionName().endsWith(Messages.getString("NewFunctionAnalyse.notFound"))) //$NON-NLS-1$
 		{
 			//System.out.println("OFF:"+(s.programCounter-s.currentFunctionItt.startAddress.longValue())+" PC: "+Long.toHexString(s.programCounter)+" start"+Long.toHexString(s.currentFunctionItt.startAddress.longValue()));
-			return new Long(s.programCounter-s.currentFunctionItt.startAddress.longValue());
+			return new Long(s.programCounter-s.getCurrentFunctionItt().getStartAddress().longValue());
 		}
-		else if (s.currentFunctionSym != null)
+		else if (s.getCurrentFunctionSym() != null)
 		{
-			return new Long(s.programCounter-s.currentFunctionSym.startAddress.longValue());
+			return new Long(s.programCounter-s.getCurrentFunctionSym().getStartAddress().longValue());
 		}
 		else
 		{
 			return new Long(666666);
 		}
 			{
 				return item;
 			}
 			else
 			{
-				functionName = s.currentFunctionSym.functionName;
+				functionName = s.getCurrentFunctionSym().getFunctionName();
 				if (!functionName.endsWith(Messages.getString("NewFunctionAnalyse.notFound"))) //$NON-NLS-1$
 				{
-					item = new FunctionNameItem(functionName,s.currentFunctionSym,false);
+					item = new FunctionNameItem(functionName,s.getCurrentFunctionSym(),false);
 					this.functionNameCacheSym.put(s,item);
 					return item;
 				}
 			}
 		}
-		if (s.currentFunctionItt != null)
+		if (s.getCurrentFunctionItt() != null)
 		{
 			FunctionNameItem item = (FunctionNameItem)this.functionNameCacheItt.get(s);
 			if (item != null) return item;
-			functionName = s.currentFunctionItt.functionName;
+			functionName = s.getCurrentFunctionItt().getFunctionName();
 			if (!functionName.endsWith(Messages.getString("NewFunctionAnalyse.notFound"))) //$NON-NLS-1$
 			{
-				item = new FunctionNameItem(functionName,s.currentFunctionItt,true);
+				item = new FunctionNameItem(functionName,s.getCurrentFunctionItt(),true);
 				this.functionNameCacheItt.put(s,item);
 				return item;
 //				return new FunctionNameItem(functionName,s.currentFunctionItt,true);
 			}
 			else
 			{
 				item = (FunctionNameItem)this.functionNameCacheSym.get(s);
 				if (item != null) return item;
-				functionName = s.currentFunctionSym.functionName;
+				functionName = s.getCurrentFunctionSym().getFunctionName();
-				item = new FunctionNameItem(functionName,s.currentFunctionSym,false);
+				item = new FunctionNameItem(functionName,s.getCurrentFunctionSym(),false);
 				this.functionNameCacheSym.put(s,item);
 				return item;
 //				return new FunctionNameItem(functionName,s.currentFunctionSym,false);
 			}
 		}
-		else if (s.currentFunctionSym != null)
+		else if (s.getCurrentFunctionSym() != null)
 		{
 			FunctionNameItem item = (FunctionNameItem)this.functionNameCacheSym.get(s);
 			if (item != null) return item;
-			functionName = s.currentFunctionSym.functionName;
+			functionName = s.getCurrentFunctionSym().getFunctionName();
-			item = new FunctionNameItem(functionName,s.currentFunctionSym,false);
+			item = new FunctionNameItem(functionName,s.getCurrentFunctionSym(),false);
 			this.functionNameCacheSym.put(s,item);
 			return item;
 //			return new FunctionNameItem(functionName,s.currentFunctionSym,false);
 		}
 		else
 	{
 		public String name;
 		public boolean itt;
 		public int sampleAmount;
 		public int totalSamples;
-		public Function function;
+		public IFunction function;
 		public Vector offsetVector;
 		public double currentPercent;
-		public FunctionNameItem(String name, Function function, boolean itt)
+		public FunctionNameItem(String name, IFunction function, boolean itt)
 		{
 			this.offsetVector = new Vector();
 			this.sampleAmount = 0;
 			this.totalSamples = 0;
 			this.function = function;
 			super.paint(g);
 			if (this.functionNameItem != null && this.functionNameItem.offsetVector != null)
 			{
-				long length = this.functionNameItem.function.length;
+				long length = this.functionNameItem.function.getLength();
 				g.setColor(
 						// AWT
 					    AWTColorPalette.getColor(new RGB(255, 255, 255))
 					    // SWT
 					    //ColorPalette.getColor(new RGB(255, 255, 255))
 					setBorder(null);
 				}
 				if (item.function != null)
 				{
-					if (item.function.functionBinary != null && item.function.functionBinary.binaryName != null)
+					if (item.function.getFunctionBinary() != null && item.function.getFunctionBinary().getBinaryName() != null)
 					{
-						this.setToolTipText(Messages.getString("NewFunctionAnalyse.function1")+item.function.functionName+Messages.getString("NewFunctionAnalyse.function2")+ //$NON-NLS-1$ //$NON-NLS-2$
+						this.setToolTipText(Messages.getString("NewFunctionAnalyse.function1")+item.function.getFunctionName()+Messages.getString("NewFunctionAnalyse.function2")+ //$NON-NLS-1$ //$NON-NLS-2$
-								Long.toHexString(item.function.startAddress.longValue())+
+								Long.toHexString(item.function.getStartAddress().longValue())+
-								Messages.getString("NewFunctionAnalyse.function3")+item.function.functionBinary.binaryName); //$NON-NLS-1$
+								Messages.getString("NewFunctionAnalyse.function3")+item.function.getFunctionBinary().getBinaryName()); //$NON-NLS-1$
 					}
 					else
 					{
-						this.setToolTipText(Messages.getString("NewFunctionAnalyse.function1")+item.function.functionName+Messages.getString("NewFunctionAnalyse.function2")+ //$NON-NLS-1$ //$NON-NLS-2$
+						this.setToolTipText(Messages.getString("NewFunctionAnalyse.function1")+item.function.getFunctionName()+Messages.getString("NewFunctionAnalyse.function2")+ //$NON-NLS-1$ //$NON-NLS-2$
-								Long.toHexString(item.function.startAddress.longValue())+
+								Long.toHexString(item.function.getStartAddress().longValue())+
 								Messages.getString("NewFunctionAnalyse.function3") + Messages.getString("NewFunctionAnalyse.binaryNotFound")); //$NON-NLS-1$ //$NON-NLS-2$
 					}
 				}
 				else
 				{

changeset 5	844b047e260d
parent 2	b9ab3b238396
child 12	ae255c9aa552