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

equal deleted inserted replaced

-:5b9d4d8641ce
+:ae255c9aa552
 	private static final String HELP_CONTEXT_ID = PIPageEditor.PI_ID + ".address";  //$NON-NLS-1$
 	public static final String ACTION_COMBINED_CPU_VIEW = "combined_cpu_view";//$NON-NLS-1$
 	public static final String ACTION_SEPARATE_CPU_VIEW = "separate_cpu_view";//$NON-NLS-1$
 	public static final int[] TRACE_IDS_SMP = new int[]{1, 21, 41, 62};
+	public static final String PLUGIN_ID = "com.nokia.carbide.cpp.pi.address";
 //	private static HashMap<Integer,Long> uidToAddrThreadPeriod = new HashMap<Integer,Long>();
 	// There will be three graphs - one each for editor pages 0, 1, 2
 	/* (non-Javadoc)
 	 * @see com.nokia.carbide.cpp.internal.pi.plugin.model.IClassReplacer#getReplacedClass(java.lang.String)
 	 */
 	public Class getReplacedClass(String className)
 	{
-		if (   className.indexOf("com.nokia.carbide.cpp.pi.address.GppTrace") != -1 //$NON-NLS-1$
+		if (   className.indexOf(PLUGIN_ID+".GppTrace") != -1 //$NON-NLS-1$
 			|| className.indexOf("fi.vtt.bappea.model.GppTrace") != -1 //$NON-NLS-1$
 			|| className.indexOf("com.nokia.carbide.pi.address.GppTrace") != -1 //$NON-NLS-1$
 			|| className.indexOf("fi.vtt.bappea.gppTracePlugin.GppTrace") != -1) //$NON-NLS-1$
 		{
 			return GppTrace.class;
 		}
-		else if (   className.indexOf("com.nokia.carbide.cpp.pi.address.GppSample") != -1 //$NON-NLS-1$
+		else if (   className.indexOf(PLUGIN_ID+".GppSample") != -1 //$NON-NLS-1$
 				 || className.indexOf("com.nokia.carbide.pi.address.GppSample") != -1 //$NON-NLS-1$
 				 || className.indexOf("fi.vtt.bappea.model.GppSample") != -1 //$NON-NLS-1$
 				 || className.indexOf("fi.vtt.bappea.gppTracePlugin.GppSample") != -1) //$NON-NLS-1$
 		{
 			return GppSample.class;
 		}
-		else if (   className.indexOf("com.nokia.carbide.cpp.pi.address.GppThread") != -1 //$NON-NLS-1$
+		else if (   className.indexOf(PLUGIN_ID+".GppThread") != -1 //$NON-NLS-1$
 				 || className.indexOf("com.nokia.carbide.pi.address.GppThread") != -1 //$NON-NLS-1$
 				 || className.indexOf("fi.vtt.bappea.model.GppThread") != -1 //$NON-NLS-1$
 				 || className.indexOf("fi.vtt.bappea.gppTracePlugin.GppThread") != -1) //$NON-NLS-1$
 		{
 			return GppThread.class;
 		}
-		else if (   className.indexOf("com.nokia.carbide.cpp.pi.address.GppProcess") != -1 //$NON-NLS-1$
+		else if (   className.indexOf(PLUGIN_ID+".GppProcess") != -1 //$NON-NLS-1$
 				 || className.indexOf("com.nokia.carbide.pi.address.GppProcess") != -1 //$NON-NLS-1$
 				 || className.indexOf("fi.vtt.bappea.model.GppProcess") != -1 //$NON-NLS-1$
 				 || className.indexOf("fi.vtt.bappea.gppTracePlugin.GppProcess") != -1) //$NON-NLS-1$
 		{
 			return GppProcess.class;
 		if (!(genericTrace instanceof GppTrace))
 			return;
 		GppTrace trace = (GppTrace)genericTrace;
-		NpiInstanceRepository.getInstance().activeUidAddTrace("com.nokia.carbide.cpp.pi.address", trace); //$NON-NLS-1$
+		NpiInstanceRepository.getInstance().activeUidAddTrace(PLUGIN_ID, trace); //$NON-NLS-1$
 		// initialize the address/thread base sampling rate
 		int samplingInterval = 1;
 		if (trace.samples.size() > 2) {
 			// because of a problem in older samplers, the first address/thread sample may have been thrown out
 			samplingInterval = (int) (((GppSample) trace.samples.get(1)).sampleSynchTime - ((GppSample) trace.samples.get(0)).sampleSynchTime);
 		}
-		NpiInstanceRepository.getInstance().activeUidSetPersistState("com.nokia.carbide.cpp.pi.address.samplingInterval", Integer.valueOf(samplingInterval)); //$NON-NLS-1$
+		NpiInstanceRepository.getInstance().activeUidSetPersistState(PLUGIN_ID+".samplingInterval", Integer.valueOf(samplingInterval)); //$NON-NLS-1$
 		// make sure that the sorted samples array exists
 		if (trace.getSortedGppSamples() == null)
 			trace.sortGppSamples();
 		PIPageEditor.currentPageEditor().setMaxEndTime(((double)lastSampleTime) / 1000.0f);
 	}
 	public GppTrace getTrace()
 	{
-		return (GppTrace)NpiInstanceRepository.getInstance().activeUidGetTrace("com.nokia.carbide.cpp.pi.address"); //$NON-NLS-1$
+		return (GppTrace)NpiInstanceRepository.getInstance().activeUidGetTrace(PLUGIN_ID); //$NON-NLS-1$
 	}
 	public IGppTraceGraph getTraceGraph(int graphIndex)
 	{
-		GppTrace trace = (GppTrace)NpiInstanceRepository.getInstance().activeUidGetTrace("com.nokia.carbide.cpp.pi.address"); //$NON-NLS-1$
+		GppTrace trace = (GppTrace)NpiInstanceRepository.getInstance().activeUidGetTrace(PLUGIN_ID); //$NON-NLS-1$
 		if (trace != null) {
 			int uid = NpiInstanceRepository.getInstance().activeUid();
 			return trace.getTraceGraph(graphIndex, uid);
 		} else
 			return null;
 	}
 	public GenericTrace getTrace(int graphIndex)
 	{
-		return (GenericTrace)NpiInstanceRepository.getInstance().activeUidGetTrace("com.nokia.carbide.cpp.pi.address"); //$NON-NLS-1$
+		return (GenericTrace)NpiInstanceRepository.getInstance().activeUidGetTrace(PLUGIN_ID); //$NON-NLS-1$
 	}
 	public Integer getLastSample(int graphIndex)
 	{
-		GppTrace trace = (GppTrace)NpiInstanceRepository.getInstance().activeUidGetTrace("com.nokia.carbide.cpp.pi.address"); //$NON-NLS-1$
+		GppTrace trace = (GppTrace)NpiInstanceRepository.getInstance().activeUidGetTrace(PLUGIN_ID); //$NON-NLS-1$
 		if (trace == null)
 			return null;
 	  	//this sets GPP thread list visible by default
 		if (   (currentPage != PIPageEditor.THREADS_PAGE)
 			&& (currentPage != PIPageEditor.BINARIES_PAGE)
 			&& (currentPage != PIPageEditor.FUNCTIONS_PAGE))
 			  return;
-		GppTrace trace = (GppTrace)NpiInstanceRepository.getInstance().activeUidGetTrace("com.nokia.carbide.cpp.pi.address"); //$NON-NLS-1$
+		GppTrace trace = (GppTrace)NpiInstanceRepository.getInstance().activeUidGetTrace(PLUGIN_ID); //$NON-NLS-1$
 		if (eventString.equals("fillSelected")) //$NON-NLS-1$
 	    {
 	    	PIEvent be = new PIEvent(null, PIEvent.SET_FILL_SELECTED_THREAD);
 	    	for (int i = 0; i < getGraphCount(); i++) {
 		    	trace.getTraceGraph(i).piEventReceived(be);
 			}
-	    	NpiInstanceRepository.getInstance().activeUidSetPersistState("com.nokia.carbide.cpp.pi.address.fillAll", Boolean.FALSE); //$NON-NLS-1$
+	    	NpiInstanceRepository.getInstance().activeUidSetPersistState(PLUGIN_ID+".fillAll", Boolean.FALSE); //$NON-NLS-1$
 	    }
 		else if (eventString.equals("fillAll")) //$NON-NLS-1$
 		{
 			PIEvent be = new PIEvent(null, PIEvent.SET_FILL_ALL_THREADS);
 	    	for (int i = 0; i < getGraphCount(); i++) {
 		    	trace.getTraceGraph(i).piEventReceived(be);
 			}
-	    	NpiInstanceRepository.getInstance().activeUidSetPersistState("com.nokia.carbide.cpp.pi.address.fillAll", Boolean.TRUE); //$NON-NLS-1$
+	    	NpiInstanceRepository.getInstance().activeUidSetPersistState(PLUGIN_ID+".fillAll", Boolean.TRUE); //$NON-NLS-1$
 		}
 		else if (eventString.equals("fillNone")) //$NON-NLS-1$
 		{
 			PIEvent be = new PIEvent(null, PIEvent.SET_FILL_OFF);
 	    	for (int i = 0; i < getGraphCount(); i++) {
 		    	trace.getTraceGraph(i).piEventReceived(be);
 			}
-	    	NpiInstanceRepository.getInstance().activeUidSetPersistState("com.nokia.carbide.cpp.pi.address.fillAll", Boolean.FALSE); //$NON-NLS-1$
+	    	NpiInstanceRepository.getInstance().activeUidSetPersistState(PLUGIN_ID+".fillAll", Boolean.FALSE); //$NON-NLS-1$
 		}
 		else if (eventString.equals("setBarOn")) //$NON-NLS-1$
 		{
 			PIEvent be = new PIEvent(null, PIEvent.GPP_SET_BAR_GRAPH_ON);
 	    	for (int i = 0; i < getGraphCount(); i++) {
 		    	trace.getTraceGraph(i).piEventReceived(be);
 			}
-	    	NpiInstanceRepository.getInstance().activeUidSetPersistState("com.nokia.carbide.cpp.pi.address.bar", Boolean.TRUE); //$NON-NLS-1$
+	    	NpiInstanceRepository.getInstance().activeUidSetPersistState(PLUGIN_ID+".bar", Boolean.TRUE); //$NON-NLS-1$
 		}
 		else if (eventString.equals("setBarOff")) //$NON-NLS-1$
 		{
 			PIEvent be = new PIEvent(null, PIEvent.GPP_SET_BAR_GRAPH_OFF);
 	    	for (int i = 0; i < getGraphCount(); i++) {
 		    	trace.getTraceGraph(i).piEventReceived(be);
 			}
-	    	NpiInstanceRepository.getInstance().activeUidSetPersistState("com.nokia.carbide.cpp.pi.address.bar", Boolean.FALSE); //$NON-NLS-1$
+	    	NpiInstanceRepository.getInstance().activeUidSetPersistState(PLUGIN_ID+".bar", Boolean.FALSE); //$NON-NLS-1$
 		}
 	  	else if (eventString.equals("resetToCurrentMode")) //$NON-NLS-1$
 	  	{
 	  		trace.getTraceGraph(currentPage).action(eventString);
 	  	} else if (eventString.equals(ACTION_COMBINED_CPU_VIEW) || eventString.equals(ACTION_SEPARATE_CPU_VIEW)){
 		if (   (currentPage != PIPageEditor.THREADS_PAGE)
 			&& (currentPage != PIPageEditor.BINARIES_PAGE)
 			&& (currentPage != PIPageEditor.FUNCTIONS_PAGE))
 			  return null;
-		GppTrace trace = (GppTrace)NpiInstanceRepository.getInstance().activeUidGetTrace("com.nokia.carbide.cpp.pi.address"); //$NON-NLS-1$
+		GppTrace trace = (GppTrace)NpiInstanceRepository.getInstance().activeUidGetTrace(PLUGIN_ID); //$NON-NLS-1$
 		Hashtable<Integer,Object> summary = new Hashtable<Integer,Object>();
 		Enumeration<ProfiledGeneric> e = trace.getSortedThreadsElements();
 		while (e.hasMoreElements())
 		{
 		if (tmpTable != null)
 		{
 			threadName = (String)((Vector<Object>)tmpTable.get(key)).elementAt(0);
 		}
-		GppTrace trace = (GppTrace)NpiInstanceRepository.getInstance().activeUidGetTrace("com.nokia.carbide.cpp.pi.address"); //$NON-NLS-1$
+		GppTrace trace = (GppTrace)NpiInstanceRepository.getInstance().activeUidGetTrace(PLUGIN_ID); //$NON-NLS-1$
 		Vector<GenericSample> samples = trace.getSamplesInsideTimePeriod((long)startTime, (long)endTime);
 		Hashtable<String,Integer> functionLoad = new Hashtable<String,Integer>();
 		int threadSampleAmount = 0;
 		};
 		Boolean bar = SessionPreferences.getInstance().getBarMode();		// default value to session preference
 		Object obj;
-		obj = NpiInstanceRepository.getInstance().activeUidGetPersistState("com.nokia.carbide.cpp.pi.address.bar"); //$NON-NLS-1$
+		obj = NpiInstanceRepository.getInstance().activeUidGetPersistState(PLUGIN_ID+".bar"); //$NON-NLS-1$
 		if ((obj != null) && (obj instanceof Boolean))
 			// retrieve the current value
 			bar = (Boolean)obj;
 		else
 			// set the initial value
-			NpiInstanceRepository.getInstance().activeUidSetPersistState("com.nokia.carbide.cpp.pi.address.bar", bar); //$NON-NLS-1$
+			NpiInstanceRepository.getInstance().activeUidSetPersistState(PLUGIN_ID+".bar", bar); //$NON-NLS-1$
 		action.setChecked(bar);
 		action.setToolTipText("Show graph as vertical bars"); //$NON-NLS-1$
 		manager.add(action);
 //		manager.add(new Separator());
 		Boolean fillAll = SessionPreferences.getInstance().getFillAllEnabled();		// default value to session preference
 		// if there is a value associated with the current Analyser tab, then use it
-		obj = NpiInstanceRepository.getInstance().activeUidGetPersistState("com.nokia.carbide.cpp.pi.address.fillAll"); //$NON-NLS-1$
+		obj = NpiInstanceRepository.getInstance().activeUidGetPersistState(PLUGIN_ID+".fillAll"); //$NON-NLS-1$
 		if ((obj != null) && (obj instanceof Boolean))
 			// retrieve the current value
 			fillAll = (Boolean)obj;
 		else
 			// set the initial value
-			NpiInstanceRepository.getInstance().activeUidSetPersistState("com.nokia.carbide.cpp.pi.address.fillAll", fillAll); //$NON-NLS-1$
+			NpiInstanceRepository.getInstance().activeUidSetPersistState(PLUGIN_ID+".fillAll", fillAll); //$NON-NLS-1$
 		action = new Action(Messages.getString("AddressPlugin.9"), IAction.AS_CHECK_BOX) {  //$NON-NLS-1$
 			@Override
 			public void run() {
 				if (this.isChecked()) {
 		manager.add(action);
 		manager.add(new Separator());
-		GppTrace trace = (GppTrace)NpiInstanceRepository.getInstance().activeUidGetTrace("com.nokia.carbide.cpp.pi.address"); //$NON-NLS-1$
+		GppTrace trace = (GppTrace)NpiInstanceRepository.getInstance().activeUidGetTrace(PLUGIN_ID); //$NON-NLS-1$
 		if (trace != null && trace.getCPUCount() > 1){
 			//the following are SMP-related view options
 			manager.add(new Separator());
 	public Serializable getAdditionalData()
 	{
 		if (plugin == null)
 			return null;
-		GppTrace trace = (GppTrace)NpiInstanceRepository.getInstance().activeUidGetTrace("com.nokia.carbide.cpp.pi.address"); //$NON-NLS-1$
+		GppTrace trace = (GppTrace)NpiInstanceRepository.getInstance().activeUidGetTrace(PLUGIN_ID); //$NON-NLS-1$
 		if (trace == null)
 			return null;
 		Vector<Object> wrapper = new Vector<Object>();
 	{
 		if (!(data instanceof Vector))
 			return;
 		try {
-			final GppTrace trace = (GppTrace)NpiInstanceRepository.getInstance().activeUidGetTrace("com.nokia.carbide.cpp.pi.address"); //$NON-NLS-1$
+			final GppTrace trace = (GppTrace)NpiInstanceRepository.getInstance().activeUidGetTrace(PLUGIN_ID); //$NON-NLS-1$
 			int uid = NpiInstanceRepository.getInstance().activeUid();
 			trace.setAdditionalData((Vector<Object>)data);
 		} catch (Exception e) {
 			System.out.println("Could not load additional address/thread data!"); //$NON-NLS-1$
 	 *
 	 * @param path the path
 	 * @return the image descriptor
 	 */
 	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractPiPlugin.imageDescriptorFromPlugin("com.nokia.carbide.cpp.pi.address", path); //$NON-NLS-1$
+		return AbstractPiPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path); //$NON-NLS-1$
 	}
 	/**
 	 *  number of graphs supplied by this plugin
 	 */
 	public int getGraphCount() {
-		final GppTrace trace = (GppTrace)NpiInstanceRepository.getInstance().activeUidGetTrace("com.nokia.carbide.cpp.pi.address"); //$NON-NLS-1$
+		final GppTrace trace = (GppTrace)NpiInstanceRepository.getInstance().activeUidGetTrace(PLUGIN_ID); //$NON-NLS-1$
 		int graphCount = trace.getCPUCount() > 1 ? PAGE_COUNT + trace.getCPUCount() : PAGE_COUNT;
 		return graphCount;
 	}
 	// page number of each graph supplied by this plugin
 	/* (non-Javadoc)
 	 * @see com.nokia.carbide.cpp.internal.pi.plugin.model.IFinalizeTrace#runOnPartOpened()
 	 */
 	public void runOnPartOpened() {
 		//execute the initial action; since it affects the GIU, execute in UI thread
-		GppTrace trace = (GppTrace)NpiInstanceRepository.getInstance().activeUidGetTrace("com.nokia.carbide.cpp.pi.address"); //$NON-NLS-1$
+		GppTrace trace = (GppTrace)NpiInstanceRepository.getInstance().activeUidGetTrace(PLUGIN_ID); //$NON-NLS-1$
 		if (trace != null && trace.getCPUCount() > 1){
 			boolean showCombinedCPUView  = true;
 			Object obj = NpiInstanceRepository.getInstance().activeUidGetPersistState(NpiInstanceRepository.PERSISTED_SHOW_COMBINED_CPU_VIEW);
 				}
 			});
 		}
 	}
+	/*
+	 * (non-Javadoc)
+	 * @see com.nokia.carbide.cpp.internal.pi.plugin.model.ITrace#isMandatory()
+	 */
+	public boolean isMandatory() {
+		return true;
+	}
+	/*
+	 * (non-Javadoc)
+	 * @see com.nokia.carbide.cpp.internal.pi.plugin.model.ITrace#getTraceDescription()
+	 */
+	public String getTraceDescription() {
+		return getTraceTitle();
+	}
 }

changeset 12	ae255c9aa552
parent 5	844b047e260d