Attachment 87496 Details for Bug 194954 – new patch for 194954

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] new patch for 194954

194954-patch.txt (text/plain), 22.92 KB, created by Richard Y.S. HUANG

on 2008-01-22 05:02:42 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Richard Y.S. HUANG

Created: 2008-01-22 05:02:42 EST

Size: 22.92 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.monitoring.instrumentation.ui
>Index: src/org/eclipse/tptp/monitoring/instrumentation/ui/provisional/handler/CBEInstrumentHandler.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.monitoring.instrumentation.ui/src/org/eclipse/tptp/monitoring/instrumentation/ui/provisional/handler/CBEInstrumentHandler.java,v
>retrieving revision 1.3
>diff -u -r1.3 CBEInstrumentHandler.java
>--- src/org/eclipse/tptp/monitoring/instrumentation/ui/provisional/handler/CBEInstrumentHandler.java	16 Mar 2007 18:32:27 -0000	1.3
>+++ src/org/eclipse/tptp/monitoring/instrumentation/ui/provisional/handler/CBEInstrumentHandler.java	22 Jan 2008 09:55:08 -0000
>@@ -232,29 +232,33 @@
> 	
> 	/**
> 	 * return specific filter set element for CBE analysis type
>-	 * @param filterElement default filter set element from data collection
>+	 * @param filterSetElement default filter set from data collection
> 	 * @param launchconfiguration launch configuration
> 	 * @param isProbekit flag whether is probekit type
> 	 * @return specific filter set element for CBE
> 	 */
>-	private FilterSetElement getFilterSetElement(FilterSetElement filterElement,ILaunchConfiguration launchconfiguration, boolean isProbekit) {
>+	private FilterSetElement getFilterSetElement(FilterSetElement filterSetElement,ILaunchConfiguration launchconfiguration, boolean isProbekit) {
> 		FilterSetElement result = null;
> 
> 		try {
>-			if (!launchconfiguration.getAttribute(InstrumentLaunchConfiguration.ENABLE_CBE_INSTRUMENT_FILTER_SET, false))
>-				return filterElement;
>-
>-			String filterSetId = launchconfiguration.getAttribute(InstrumentLaunchConfiguration.CBE_ACTIVE_INSTRUMENT_FILTER_SET, "");
>-			String filterSetKey = InstrumentLaunchConfiguration.CBE_INSTRUMENT_FILTER_SET_KEY + "_" + launchconfiguration.getName();
>-			result = InstrumentSelectManager.getInstance().getFilterSetElement(filterSetKey, filterSetId);
>-
>-			if (result == null)
>-				result = filterElement;
>-			else if (isProbekit) {
>-				result.getChildren().addAll(InstrumentUtil.getFilterElementListByProbe(points));
>+			if (launchconfiguration.getAttribute(InstrumentLaunchConfiguration.ENABLE_CBE_INSTRUMENT_FILTER_SET, false)){
>+				String filterSetId = launchconfiguration.getAttribute(InstrumentLaunchConfiguration.CBE_ACTIVE_INSTRUMENT_FILTER_SET, "");
>+				String filterSetKey = InstrumentLaunchConfiguration.CBE_INSTRUMENT_FILTER_SET_KEY + "_" + launchconfiguration.getName();
>+				result = InstrumentSelectManager.getInstance().getFilterSetElement(filterSetKey, filterSetId);
>+	
>+				if (result == null)
>+					result = filterSetElement;
>+				else if (isProbekit) 
>+					result.getChildren().addAll(InstrumentUtil.getFilterElementListByProbe(points));
>+				
>+			}else{
>+				result= filterSetElement;
> 			}
>+			//append filter set element from BtM annotation to result filter set
>+			InstrumentUtil.appendAnnotationToFilterSet(launchconfiguration, result);
>+			
> 		} catch (CoreException e) {
>-			LogHelper.error(e);
>+				LogHelper.error(e);
> 		}
> 
> 		return result;
>Index: src/org/eclipse/tptp/monitoring/instrumentation/ui/provisional/handler/JmxInstrumentHandler.java
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.monitoring.instrumentation.ui/src/org/eclipse/tptp/monitoring/instrumentation/ui/provisional/handler/JmxInstrumentHandler.java,v
>retrieving revision 1.2
>diff -u -r1.2 JmxInstrumentHandler.java
>--- src/org/eclipse/tptp/monitoring/instrumentation/ui/provisional/handler/JmxInstrumentHandler.java	16 Mar 2007 18:32:27 -0000	1.2
>+++ src/org/eclipse/tptp/monitoring/instrumentation/ui/provisional/handler/JmxInstrumentHandler.java	22 Jan 2008 09:55:08 -0000
>@@ -116,18 +116,23 @@
> 		FilterSetElement result = null;
> 
> 		try {
>-			if (!launchconfiguration.getAttribute(InstrumentLaunchConfiguration.ENABLE_JMX_INSTRUMENT_FILTER_SET, false))
>-				return filterElement;
>-			
>-			String filterSetId = launchconfiguration.getAttribute(InstrumentLaunchConfiguration.JMX_ACTIVE_INSTRUMENT_FILTER_SET, "");
>-			String filterSetKey = InstrumentLaunchConfiguration.JMX_INSTRUMENT_FILTER_SET_KEY + "_" + launchconfiguration.getName();
>-			result = InstrumentSelectManager.getInstance().getFilterSetElement(filterSetKey, filterSetId);
>-
>-			if (result == null)
>+			if (!launchconfiguration.getAttribute(InstrumentLaunchConfiguration.ENABLE_JMX_INSTRUMENT_FILTER_SET, false)){
> 				result = filterElement;
>-			else if (isProbekit) {
>-				result.getChildren().addAll(InstrumentUtil.getFilterElementListByProbe(points));
>+			}else{			
>+				String filterSetId = launchconfiguration.getAttribute(InstrumentLaunchConfiguration.JMX_ACTIVE_INSTRUMENT_FILTER_SET, "");
>+				String filterSetKey = InstrumentLaunchConfiguration.JMX_INSTRUMENT_FILTER_SET_KEY + "_" + launchconfiguration.getName();
>+				result = InstrumentSelectManager.getInstance().getFilterSetElement(filterSetKey, filterSetId);
>+
>+				if (result == null)
>+					result = filterElement;
>+				else if (isProbekit) {
>+					result.getChildren().addAll(InstrumentUtil.getFilterElementListByProbe(points));
>+				}
> 			}
>+			
>+			//append filter set element from BtM annotation to result filter set
>+			InstrumentUtil.appendAnnotationToFilterSet(launchconfiguration, result);
>+			
> 		} catch (CoreException e) {
> 			LogHelper.error(e);
> 		}
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.monitoring.instrumentation.ui/META-INF/MANIFEST.MF,v
>retrieving revision 1.18
>diff -u -r1.18 MANIFEST.MF
>--- META-INF/MANIFEST.MF	6 Nov 2007 16:34:28 -0000	1.18
>+++ META-INF/MANIFEST.MF	22 Jan 2008 09:55:08 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %pluginName
> Bundle-SymbolicName: org.eclipse.tptp.monitoring.instrumentation.ui;singleton:=true
>-Bundle-Version: 4.4.1.qualifier
>+Bundle-Version: 4.5.0.qualifier
> Bundle-Activator: org.eclipse.tptp.monitoring.instrumentation.ui.internal.UIPlugin
> Bundle-Localization: plugin
> Require-Bundle: org.eclipse.tptp.platform.instrumentation.ui;bundle-version="[4.2.0,5.0.0)",
>#P org.eclipse.tptp.platform.instrumentation.ui
>Index: src/org/eclipse/tptp/platform/instrumentation/ui/internal/util/InstrumentFilterTableElement.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.instrumentation.ui/src/org/eclipse/tptp/platform/instrumentation/ui/internal/util/InstrumentFilterTableElement.java,v
>retrieving revision 1.5
>diff -u -r1.5 InstrumentFilterTableElement.java
>--- src/org/eclipse/tptp/platform/instrumentation/ui/internal/util/InstrumentFilterTableElement.java	22 Aug 2007 20:58:00 -0000	1.5
>+++ src/org/eclipse/tptp/platform/instrumentation/ui/internal/util/InstrumentFilterTableElement.java	22 Jan 2008 09:55:23 -0000
>@@ -11,40 +11,14 @@
>  ***********************************************************************/
> package org.eclipse.tptp.platform.instrumentation.ui.internal.util;
> 
>-import org.eclipse.hyades.trace.ui.internal.util.TraceMessages;
>-import org.eclipse.osgi.util.TextProcessor;
>-
> /**
>  * This class represents a single cell in a table.  The cell can be 
>  * method name, class name, visibility, or package name.
>  */
>-public class InstrumentFilterTableElement {
>-
>-	/* The visibility value */
>-	public static final String P_VISIBILITY= "combo";
>-	
>-	/* The class value */
>-	public static final String P_TEXT= "string";
>-	
>-	/* The method vale */
>-	public static final String P_METHOD= "method";
>-	
>-	/* The package value */
>-	public static final String P_PACKAGE = "package";
>+public class InstrumentFilterTableElement extends org.eclipse.tptp.platform.instrumentation.annotation.internal.util.BaseFilterTableElement {
> 
>-	private String packageName;
>-	private String fText;
>-	private String fMethod="*";	
>-	private String fVisibility;
> 	private InstrumentFilterList fParent;
> 	
>-	/* The list of visible states */
>-	protected static final String[] fVisibilityState = new String[] {
>-		TraceMessages.EXCLUDE, 
>-		TraceMessages.INCLUDE
>-	};
>-
>-	
> 	/**
> 	 * Default constructor.
> 	 * 
>@@ -55,70 +29,7 @@
> 	 */
> 	public InstrumentFilterTableElement(String text, String method,
> 			String visibility, String packageName) {
>-		fMethod = method;		
>-		fText = text;
>-		fVisibility = visibility;	
>-		this.packageName = packageName;
>-	}
>-
>-	/**
>-	 * Returns the package name for the current filter
>-	 * 
>-	 * @return the package name
>-	 */
>-	public String getPackageName() {
>-		return TextProcessor.process(packageName);
>-	}
>-
>-	/**
>-	 * Returns the method name for the current filter
>-	 * 
>-	 * @return the method
>-	 */
>-	public String getMethod() {
>-		return TextProcessor.process(fMethod);
>-	}
>-
>-	/**
>-	 * Returns the class name of the current filter
>-	 * 
>-	 * @return the class
>-	 */
>-	public String getText() {
>-		return TextProcessor.process(fText);
>-	}
>-	
>-	/**
>-	 * Returns the index of the visibility state of the current filter 
>-	 * 
>-	 * @return the index
>-	 */
>-	public int getVisibilityState() {
>-		for(int idx=0; idx<fVisibilityState.length; idx++) {
>-			if(fVisibilityState[idx].equals(fVisibility)) {
>-				return idx;
>-			}
>-		}
>-
>-		return -1;
>-	}
>-	
>-	/**
>-	 * Returns an array of visibility states
>-	 * 
>-	 * @return an array of visibility states
>-	 */
>-	public static String[] getVisibilityStates() {
>-		return fVisibilityState;
>-	}
>-	
>-	/**
>-	 * Returns the visibility state of the current filter.
>-	 * 
>-	 * @return the visibility state
>-	 */
>-	public String getVisibility() {
>-		return fVisibility;
>+		super(text, method, visibility, packageName);
> 	}
> 
> 	/**
>@@ -129,7 +40,7 @@
> 	 * @param packageName the package name
> 	 */
> 	public void setPackageName(String packageName) {
>-		this.packageName = packageName;
>+		super.setPackageName(packageName);
> 		fParent.fireElementChanged(this, P_PACKAGE);
> 	}
> 
>@@ -150,7 +61,7 @@
> 	 * @param value the class to filter 
> 	 */
> 	public void setText(String value) {
>-		fText= value;
>+		super.setText(value);
> 		if(fParent != null) {
> 			fParent.fireElementChanged(this, P_TEXT);
> 		}
>@@ -164,7 +75,7 @@
> 	 * @param value the visibility index
> 	 */
> 	public void setVisibility(int value) {
>-		fVisibility= fVisibilityState[value];
>+		super.setVisibility(value);
> 		if(fParent != null) {
> 			fParent.fireElementChanged(this, P_VISIBILITY);
> 		}
>@@ -178,7 +89,7 @@
> 	 * @param value the visibility 
> 	 */
> 	public void setVisibility(String value) {
>-		fVisibility= value;
>+		super.setVisibility(value);
> 		if(fParent != null) {
> 			fParent.fireElementChanged(this, P_VISIBILITY);
> 		}
>@@ -192,7 +103,7 @@
> 	 * @param value the method 
> 	 */
> 	public void setMethod(String value) {
>-		fMethod= value;
>+		super.setMethod(value);
> 		if(fParent != null) {
> 			fParent.fireElementChanged(this, P_METHOD);
> 		}
>Index: src/org/eclipse/tptp/platform/instrumentation/ui/internal/util/InstrumentUtil.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.instrumentation.ui/src/org/eclipse/tptp/platform/instrumentation/ui/internal/util/InstrumentUtil.java,v
>retrieving revision 1.21
>diff -u -r1.21 InstrumentUtil.java
>--- src/org/eclipse/tptp/platform/instrumentation/ui/internal/util/InstrumentUtil.java	31 May 2007 20:38:14 -0000	1.21
>+++ src/org/eclipse/tptp/platform/instrumentation/ui/internal/util/InstrumentUtil.java	22 Jan 2008 09:55:34 -0000
>@@ -34,8 +34,6 @@
> import org.eclipse.core.resources.IContainer;
> import org.eclipse.core.resources.IFile;
> import org.eclipse.core.resources.IFolder;
>-import org.eclipse.core.resources.IProject;
>-import org.eclipse.core.resources.IProjectDescription;
> import org.eclipse.core.resources.IResource;
> import org.eclipse.core.resources.IWorkspaceRoot;
> import org.eclipse.core.resources.ResourcesPlugin;
>@@ -46,7 +44,6 @@
> import org.eclipse.core.runtime.Platform;
> import org.eclipse.debug.core.ILaunchConfiguration;
> import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
>-import org.eclipse.hyades.trace.internal.ui.TraceConstants;
> import org.eclipse.hyades.trace.ui.UIPlugin;
> import org.eclipse.hyades.trace.ui.internal.launcher.IProfileLaunchConfigurationConstants;
> import org.eclipse.hyades.trace.ui.internal.util.FilterSetElement;
>@@ -63,14 +60,17 @@
> import org.eclipse.jdt.core.JavaModelException;
> import org.eclipse.jdt.core.dom.Statement;
> import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
>+import org.eclipse.jdt.launching.IVMInstall2;
>+import org.eclipse.jdt.launching.JavaRuntime;
> import org.eclipse.jdt.ui.jarpackager.JarPackageData;
> import org.eclipse.jface.preference.IPreferenceStore;
> import org.eclipse.jface.text.IRegion;
> import org.eclipse.jface.text.Region;
> import org.eclipse.tptp.platform.common.ui.trace.internal.CommonUITraceConstants;
>+import org.eclipse.tptp.platform.instrumentation.annotation.internal.util.AnnotationUtil;
>+import org.eclipse.tptp.platform.instrumentation.annotation.internal.util.BaseFilterTableElement;
> import org.eclipse.tptp.platform.instrumentation.ui.internal.InstrumentConstants;
> import org.eclipse.tptp.platform.instrumentation.ui.internal.InstrumentUIPlugin;
>-import org.eclipse.tptp.platform.instrumentation.ui.internal.LogHelper;
> import org.eclipse.tptp.platform.instrumentation.ui.internal.core.InstrumentPoint;
> import org.eclipse.tptp.platform.instrumentation.ui.internal.core.InstrumentSelectManager;
> import org.eclipse.tptp.platform.instrumentation.ui.internal.launcher.deleg.application.InstrumentLaunchConfiguration;
>@@ -206,7 +206,7 @@
> 		if (!doesRuleExist(parent.toString())) {
> 			parent.append("PROBE" + lineSeparator); //$NON-NLS-1$
> 			for (Iterator targetIter = filterElement.getChildren().iterator(); targetIter.hasNext();) {
>-				InstrumentFilterTableElement t = (InstrumentFilterTableElement) targetIter.next();
>+				BaseFilterTableElement t = (BaseFilterTableElement) targetIter.next();
> 				String pkg = t.getPackageName();
> 				if (emptyNullOrStar(pkg))
> 					pkg = "*"; //$NON-NLS-1$
>@@ -871,4 +871,41 @@
> 		}
> 		return result;
> 	}
>+	
>+	/**
>+	 * @see AnnotationUtil#appendAnnotationToFilterSet(ILaunchConfiguration, FilterSetElement)
>+	 */
>+	public static void appendAnnotationToFilterSet(ILaunchConfiguration configuration,FilterSetElement filterSetElement) throws CoreException {
>+		if (!isAnnotationSupported(configuration))
>+			return;
>+		//delegate action to AnnotationUtil class
>+		AnnotationUtil.appendAnnotationToFilterSet(configuration, filterSetElement);
>+	}
>+	
>+	/**
>+	 * 
>+	 * @see AnnotationUtil#handleAnnotation(ILaunchConfigurationWorkingCopy)
>+	 */
>+	public static void handleAnnotation(
>+			ILaunchConfigurationWorkingCopy configuration) throws CoreException {
>+		if (!isAnnotationSupported(configuration))
>+			return;
>+		
>+		//delegate action to AnnotationUtil class
>+		AnnotationUtil.handleAnnotation(configuration);
>+	}
>+	
>+	/**
>+	 * determined whether or not need to handle BtM annotation. If JRE version bundled with user project 
>+	 * above Java5, it indicated that BtM runtime don't need to handle BtM annotation information.
>+	 * 
>+	 * @param configuration launch configuration
>+	 * @return true if JRE version is newer or above Java5,otherwise false.
>+	 * @throws CoreException
>+	 */
>+	private static boolean isAnnotationSupported(ILaunchConfiguration configuration)throws CoreException{
>+		IVMInstall2 vmInstall =(IVMInstall2)JavaRuntime.computeVMInstall(configuration);
>+		String version = vmInstall.getJavaVersion();
>+		return version != null  && version.indexOf("1.3") == -1 && version.indexOf("1.4") == -1;
>+	}
> }
>Index: src/org/eclipse/tptp/platform/instrumentation/ui/internal/launcher/deleg/application/InstrumentDelegateHelper.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.instrumentation.ui/src/org/eclipse/tptp/platform/instrumentation/ui/internal/launcher/deleg/application/InstrumentDelegateHelper.java,v
>retrieving revision 1.30
>diff -u -r1.30 InstrumentDelegateHelper.java
>--- src/org/eclipse/tptp/platform/instrumentation/ui/internal/launcher/deleg/application/InstrumentDelegateHelper.java	22 May 2007 18:57:27 -0000	1.30
>+++ src/org/eclipse/tptp/platform/instrumentation/ui/internal/launcher/deleg/application/InstrumentDelegateHelper.java	22 Jan 2008 09:55:23 -0000
>@@ -102,6 +102,9 @@
> 		FilterSetElement filterSetElement = InstrumentUtil.getActiveFilterSetElement(configuration);
> 		ILaunchConfigurationWorkingCopy workingCopy = configuration.getWorkingCopy();
> 		
>+		//process BtM annotation from user java file 
>+		InstrumentUtil.handleAnnotation(workingCopy);		
>+		
> 		/* Create Project and Model */
> 		createModelEntities(configuration);
> 		
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.instrumentation.ui/META-INF/MANIFEST.MF,v
>retrieving revision 1.17
>diff -u -r1.17 MANIFEST.MF
>--- META-INF/MANIFEST.MF	22 Aug 2007 20:58:00 -0000	1.17
>+++ META-INF/MANIFEST.MF	22 Jan 2008 09:55:23 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %pluginName
> Bundle-SymbolicName: org.eclipse.tptp.platform.instrumentation.ui;singleton:=true
>-Bundle-Version: 4.3.1.qualifier
>+Bundle-Version: 4.5.0.qualifier
> Bundle-Activator: org.eclipse.tptp.platform.instrumentation.ui.internal.InstrumentUIPlugin
> Bundle-Vendor: %providerName
> Bundle-Localization: plugin
>@@ -20,7 +20,8 @@
>  org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,4.0.0)",
>  org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)",
>  org.eclipse.tptp.platform.integration.pde;bundle-version="[4.4.0,5.0.0)";resolution:=optional,
>- org.eclipse.tptp.platform.execution
>+ org.eclipse.tptp.platform.execution,
>+ org.eclipse.tptp.platform.instrumentation.annotation
> Eclipse-LazyStart: true
> Export-Package: org.eclipse.tptp.platform.instrumentation.ui.internal,
>  org.eclipse.tptp.platform.instrumentation.ui.internal.configuration,
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.instrumentation.ui/plugin.properties,v
>retrieving revision 1.10
>diff -u -r1.10 plugin.properties
>--- plugin.properties	31 May 2007 20:38:15 -0000	1.10
>+++ plugin.properties	22 Jan 2008 09:55:23 -0000
>@@ -15,7 +15,7 @@
> # NLS_MESSAGEFORMAT_VAR
> 
> #Plugin.xml entries
>-pluginName   = Instrument Core UI
>+pluginName   = TPTP Instrumentation UI Core
> providerName = Eclipse.org
> 
> INSTRUMENT = Instrument Filter
>#P org.eclipse.tptp.trace.arm.ui
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/tptp/trace/org.eclipse.tptp.trace.arm.ui/META-INF/MANIFEST.MF,v
>retrieving revision 1.12
>diff -u -r1.12 MANIFEST.MF
>--- META-INF/MANIFEST.MF	6 Sep 2007 19:58:18 -0000	1.12
>+++ META-INF/MANIFEST.MF	22 Jan 2008 09:55:47 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %pluginName
> Bundle-SymbolicName: org.eclipse.tptp.trace.arm.ui;singleton:=true
>-Bundle-Version: 4.3.100.qualifier
>+Bundle-Version: 4.5.0.qualifier
> Bundle-Activator: org.eclipse.tptp.trace.arm.ui.internal.ArmUIPlugin
> Bundle-Vendor: %providerName
> Bundle-Localization: plugin
>Index: src/org/eclipse/tptp/trace/arm/ui/provisional/handler/ARMInstrumentHandler.java
>===================================================================
>RCS file: /cvsroot/tptp/trace/org.eclipse.tptp.trace.arm.ui/src/org/eclipse/tptp/trace/arm/ui/provisional/handler/ARMInstrumentHandler.java,v
>retrieving revision 1.3
>diff -u -r1.3 ARMInstrumentHandler.java
>--- src/org/eclipse/tptp/trace/arm/ui/provisional/handler/ARMInstrumentHandler.java	16 Apr 2007 21:45:51 -0000	1.3
>+++ src/org/eclipse/tptp/trace/arm/ui/provisional/handler/ARMInstrumentHandler.java	22 Jan 2008 09:55:47 -0000
>@@ -137,32 +137,35 @@
> 			//return current instrument point
> 			String instrumentPointId = launchconfiguration.getAttribute(InstrumentLaunchConfiguration.CURRENT_INSTRUMENT_POINT, (String)null);
> 			if( instrumentPointId == null)
>-				return filterElement;
>-			
>-			//construct related key of instrument point filters 
>-			String activeFilterKey = ArmConstants.ACTIVE_FILTER_PREFIX + instrumentPointId;
>-			String filterSetKey = ArmConstants.FILTER_SET_PREFIX + instrumentPointId + "_" + launchconfiguration.getName();
>-			
>-			//retrieve filter set of current instrument point from internal cache
>-			Map filterSetMap = InstrumentSelectManager.getInstance().getFilterSet(filterSetKey);
>-			if (filterSetMap == null) {
>-				//save default filter set of current instrument point into internal cache
>-				String filterSetValue = ArmUtil.getInstrumentPointFilterSet(instrumentPointId);
>-				InstrumentSelectManager.getInstance().storeSelectionListInCache(filterSetKey, filterSetValue);
>-			}
>-			
>-			String activefilterSetId = launchconfiguration.getAttribute(activeFilterKey, (String)null);
>-			if( activefilterSetId == null)
>-				result = (FilterSetElement)InstrumentSelectManager.getInstance().getFilterSetCopy(filterSetKey).iterator().next();
>-			else
>-				result = InstrumentSelectManager.getInstance().getFilterSetElement(filterSetKey, activefilterSetId);
>-			
>-			if (result == null) {
> 				result = filterElement;
>+			else{			
>+				//construct related key of instrument point filters 
>+				String activeFilterKey = ArmConstants.ACTIVE_FILTER_PREFIX + instrumentPointId;
>+				String filterSetKey = ArmConstants.FILTER_SET_PREFIX + instrumentPointId + "_" + launchconfiguration.getName();
>+				
>+				//retrieve filter set of current instrument point from internal cache
>+				Map filterSetMap = InstrumentSelectManager.getInstance().getFilterSet(filterSetKey);
>+				if (filterSetMap == null) {
>+					//save default filter set of current instrument point into internal cache
>+					String filterSetValue = ArmUtil.getInstrumentPointFilterSet(instrumentPointId);
>+					InstrumentSelectManager.getInstance().storeSelectionListInCache(filterSetKey, filterSetValue);
>+				}
>+				
>+				String activefilterSetId = launchconfiguration.getAttribute(activeFilterKey, (String)null);
>+				if( activefilterSetId == null)
>+					result = (FilterSetElement)InstrumentSelectManager.getInstance().getFilterSetCopy(filterSetKey).iterator().next();
>+				else
>+					result = InstrumentSelectManager.getInstance().getFilterSetElement(filterSetKey, activefilterSetId);
>+				
>+				if (result == null) {
>+					result = filterElement;
>+				}
>+				
>+				/* Combine the two list */
>+				result.getChildren().addAll(filterElement.getChildren());
> 			}
>-			
>-			/* Combine the two list */
>-			result.getChildren().addAll(filterElement.getChildren());
>+			//append filter set element from BtM annotation to result filter set
>+			InstrumentUtil.appendAnnotationToFilterSet(launchconfiguration, result);
> 			
> 		} catch (CoreException e) {
> 			LogHelper.error(e);

Actions: View | Diff

Attachments on bug 194954: 75938 | 87495 | 87496