Attachment #49998 for bug #157070

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

View | Details | Raw Unified | Return to bug 157070
Collapse All | Expand All

Lines 24-32 Link Here

(-)src/org/eclipse/tptp/platform/log/views/internal/util/LogUtil.java (+113 lines)
24	import org.eclipse.emf.ecore.EClass;	24	import org.eclipse.emf.ecore.EClass;
25	import org.eclipse.emf.ecore.EClassifier;	25	import org.eclipse.emf.ecore.EClassifier;
26	import org.eclipse.emf.ecore.EObject;	26	import org.eclipse.emf.ecore.EObject;
		27	import org.eclipse.emf.ecore.EStructuralFeature;
		28	import org.eclipse.emf.ecore.util.EcoreUtil;
27	import org.eclipse.hyades.loaders.cbe.CBEUtils;	29	import org.eclipse.hyades.loaders.cbe.CBEUtils;
28	import org.eclipse.hyades.models.cbe.CBECommonBaseEvent;	30	import org.eclipse.hyades.models.cbe.CBECommonBaseEvent;
29	import org.eclipse.hyades.models.cbe.CBEPackage;	31	import org.eclipse.hyades.models.cbe.CBEPackage;
		32	import org.eclipse.hyades.models.hierarchy.extensions.BinaryExpression;
		33	import org.eclipse.hyades.models.hierarchy.extensions.LogicalExpression;
		34	import org.eclipse.hyades.models.hierarchy.extensions.Operand;
		35	import org.eclipse.hyades.models.hierarchy.extensions.SimpleOperand;
		36	import org.eclipse.hyades.models.hierarchy.extensions.SimpleSearchQuery;
		37	import org.eclipse.hyades.models.hierarchy.extensions.WhereExpression;
		38	import org.eclipse.hyades.models.hierarchy.util.internal.QueryUtils;
30	import org.eclipse.hyades.sd.logc.internal.loader.LogInteractions;	39	import org.eclipse.hyades.sd.logc.internal.loader.LogInteractions;
31	import org.eclipse.hyades.trace.ui.HyadesUtil;	40	import org.eclipse.hyades.trace.ui.HyadesUtil;
32	import org.eclipse.hyades.trace.ui.ViewSelectionChangedEvent;	41	import org.eclipse.hyades.trace.ui.ViewSelectionChangedEvent;
Lines 47-52 Link Here
47	import org.eclipse.tptp.platform.log.views.internal.LogViewsPlugin;	56	import org.eclipse.tptp.platform.log.views.internal.LogViewsPlugin;
48	import org.eclipse.tptp.platform.log.views.internal.actions.provider.ILogFindProvider;	57	import org.eclipse.tptp.platform.log.views.internal.actions.provider.ILogFindProvider;
49	import org.eclipse.tptp.platform.log.views.internal.navigator.LogNavigator;	58	import org.eclipse.tptp.platform.log.views.internal.navigator.LogNavigator;
		59	import org.eclipse.tptp.platform.log.views.internal.views.ComponentIdentificationFilterAttribute;
50	import org.eclipse.ui.IViewPart;	60	import org.eclipse.ui.IViewPart;
51	import org.eclipse.ui.IWorkbench;	61	import org.eclipse.ui.IWorkbench;
52	import org.eclipse.ui.IWorkbenchPage;	62	import org.eclipse.ui.IWorkbenchPage;
Lines 319-322 Link Here
319	public static boolean isSymptomEditorAvailable() {	329	public static boolean isSymptomEditorAvailable() {
320	return (Platform.getBundle("org.eclipse.tptp.monitoring.symptom.editor")!=null);	330	return (Platform.getBundle("org.eclipse.tptp.monitoring.symptom.editor")!=null);
321	}	331	}
		332
		333	public static SimpleSearchQuery addFilterReference(SimpleSearchQuery filter) {
		334	if (filter==null)
		335	return QueryUtils.getEmptyQuery();
		336
		337	SimpleSearchQuery filterCopy = (SimpleSearchQuery)EcoreUtil.copy(filter);
		338	LogicalExpression expression = (LogicalExpression)(filterCopy.getWhereExpression());
		339	checkFeatures(filterCopy,expression, null);
		340
		341	return filterCopy;
		342	}
		343
		344	private static void checkFeatures(SimpleSearchQuery filterCopy, WhereExpression expression, LogicalExpression parent) {
		345	if (expression == null) return;
		346
		347	if (expression instanceof LogicalExpression) {
		348	LogicalExpression lExpression = (LogicalExpression)expression;
		349	for (int i=lExpression.getArguments().size()-1; i>=0; i--) {
		350	WhereExpression exp= (WhereExpression)(lExpression.getArguments().get(i));
		351	if (exp!=null) checkFeatures(filterCopy, exp,lExpression);
		352	}
		353	}
		354	else if (expression instanceof BinaryExpression) {
		355	BinaryExpression bExpression = (BinaryExpression)expression;
		356	Operand leftOperand = bExpression.getLeftOperand();
		357	if (leftOperand==null) return;
		358	if (leftOperand instanceof SimpleOperand && ((SimpleOperand)leftOperand).getFeature() instanceof EStructuralFeature) {
		359	EStructuralFeature feature = (EStructuralFeature)(((SimpleOperand)leftOperand).getFeature());
		360	if (feature == CBEPackage.eINSTANCE.getCBEDefaultElement_Name() \|\|
		361	feature == CBEPackage.eINSTANCE.getCBEDefaultElement_Values() \|\|
		362	feature == CBEPackage.eINSTANCE.getCBEDefaultElement_Children() \|\|
		363	feature == CBEPackage.eINSTANCE.getCBEExtendedDataElement_HexValue() \|\|
		364	feature == CBEPackage.eINSTANCE.getCBEExtendedDataElement_Type()) {
		365
		366	if (!filterCopy.getRequiredPaths().contains(CBEPackage.Literals.CBE_DEFAULT_EVENT__EXTENDED_PROPERTIES))
		367	filterCopy.getRequiredPaths().add(CBEPackage.Literals.CBE_DEFAULT_EVENT__EXTENDED_PROPERTIES);
		368	}
		369	else if (feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_Component() \|\|
		370	feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_ComponentIdType() \|\|
		371	feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_ComponentType() \|\|
		372	feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_ExecutionEnvironment() \|\|
		373	feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_InstanceId() \|\|
		374	feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_Location() \|\|
		375	feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_LocationType() \|\|
		376	feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_ProcessId() \|\|
		377	feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_SubComponent() \|\|
		378	feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_ThreadId()) {
		379
		380	if (((SimpleOperand)leftOperand).getValue().equals(ComponentIdentificationFilterAttribute.SOURCE_COMPONENT_ID)) {
		381	if (!filterCopy.getRequiredPaths().contains(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__SOURCE_COMPONENT_ID))
		382	filterCopy.getRequiredPaths().add(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__SOURCE_COMPONENT_ID);
		383	}
		384	else {
		385	if (!filterCopy.getRequiredPaths().contains(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__REPORTER_COMPONENT_ID))
		386	filterCopy.getRequiredPaths().add(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__REPORTER_COMPONENT_ID);
		387	}
		388	}
		389	else if (feature == CBEPackage.eINSTANCE.getCBEContextDataElement_ContextId() \|\|
		390	feature == CBEPackage.eINSTANCE.getCBEContextDataElement_ContextValue() \|\|
		391	feature == CBEPackage.eINSTANCE.getCBEContextDataElement_Name() \|\|
		392	feature == CBEPackage.eINSTANCE.getCBEContextDataElement_Type()) {
		393
		394	if (!filterCopy.getRequiredPaths().contains(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__CONTEXT_DATA_ELEMENTS))
		395	filterCopy.getRequiredPaths().add(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__CONTEXT_DATA_ELEMENTS);
396	}
397	else if (feature == CBEPackage.eINSTANCE.getCBEMsgDataElement_MsgCatalog() \|\|
398	feature == CBEPackage.eINSTANCE.getCBEMsgDataElement_MsgCatalogId() \|\|
399	feature == CBEPackage.eINSTANCE.getCBEMsgDataElement_MsgCatalogTokens() \|\|
400	feature == CBEPackage.eINSTANCE.getCBEMsgDataElement_MsgCatalogType() \|\|
401	feature == CBEPackage.eINSTANCE.getCBEMsgDataElement_MsgId() \|\|
402	feature == CBEPackage.eINSTANCE.getCBEMsgDataElement_MsgIdType() \|\|
403	feature == CBEPackage.eINSTANCE.getCBEMsgDataElement_MsgLocale()) {
404	if (!filterCopy.getRequiredPaths().contains(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__MSG_DATA_ELEMENT))
405	filterCopy.getRequiredPaths().add(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__MSG_DATA_ELEMENT);
406	}
407	else if (feature == CBEPackage.eINSTANCE.getCBEAvailableSituation_AvailabilityDisposition() \|\|
408	feature == CBEPackage.eINSTANCE.getCBEAvailableSituation_OperationDisposition() \|\|
409	feature == CBEPackage.eINSTANCE.getCBEAvailableSituation_ProcessingDisposition() \|\|
410	feature == CBEPackage.eINSTANCE.getCBEConfigureSituation_SuccessDisposition() \|\|
411	feature == CBEPackage.eINSTANCE.getCBEConnectSituation_SituationDisposition() \|\|
412	feature == CBEPackage.eINSTANCE.getCBEConnectSituation_SuccessDisposition() \|\|
413	feature == CBEPackage.eINSTANCE.getCBECreateSituation_SuccessDisposition() \|\|
414	feature == CBEPackage.eINSTANCE.getCBEDependencySituation_DependencyDisposition() \|\|
415	feature == CBEPackage.eINSTANCE.getCBEDestroySituation_SuccessDisposition() \|\|
416	feature == CBEPackage.eINSTANCE.getCBEFeatureSituation_FeatureDisposition() \|\|
417	feature == CBEPackage.eINSTANCE.getCBEOtherSituation_AnyData() \|\|
418	feature == CBEPackage.eINSTANCE.getCBEReportSituation_ReportCategory() \|\|
419	feature == CBEPackage.eINSTANCE.getCBERequestSituation_SituationQualifier() \|\|
420	feature == CBEPackage.eINSTANCE.getCBERequestSituation_SuccessDisposition() \|\|
421	feature == CBEPackage.eINSTANCE.getCBESituation_CategoryName() \|\|
422	feature == CBEPackage.eINSTANCE.getCBESituation_ReasoningScope() \|\|
423	feature == CBEPackage.eINSTANCE.getCBEStartSituation_SituationQualifier() \|\|
424	feature == CBEPackage.eINSTANCE.getCBEStartSituation_SuccessDisposition() \|\|
425	feature == CBEPackage.eINSTANCE.getCBEStopSituation_SituationQualifier() \|\|
426	feature == CBEPackage.eINSTANCE.getCBEStopSituation_SuccessDisposition()) {
427
428	if (!filterCopy.getRequiredPaths().contains(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__SITUATION))
429	filterCopy.getRequiredPaths().add(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__SITUATION);
430	}
431	}
432	}
433	return;
434	}
322	}	435	}

Lines 69-74 Link Here

(-)src/org/eclipse/hyades/sd/logc/internal/loader/LogThreadInteractions.java (+1 lines)
69		69
70	if(!isDisplayingOnlyCorrelations()){	70	if(!isDisplayingOnlyCorrelations()){
71	loadThreadIdsFromAgentList(true);	71	loadThreadIdsFromAgentList(true);
		72	eventsList = getFilteredLogRecords(agents);
72	}else{	73	}else{
73	loadThreadIdsFromAgentList(false);	74	loadThreadIdsFromAgentList(false);
74	loadEventsFromCorrelationsXMI(agents);	75	loadEventsFromCorrelationsXMI(agents);




		if (query == null)
			return new ArrayList();
		
		SimpleSearchQuery filterWithReferences = LogUtil.addFilterReference(query);
		if (filterWithReferences == null)
		{
			filterWithReferences = QueryUtils.getEmptyQuery();

	
	protected List getFilteredLogRecords (List source) {
		SimpleSearchQuery filter = getCurrentFilter();
		SimpleSearchQuery filterWithReferences = LogUtil.addFilterReference(filter);
		if (filterWithReferences == null)
		{
			filterWithReferences = QueryUtils.getEmptyQuery();

		
		return getFilteredElements(filterWithReferences, source, CBEPackage.Literals.CBE_DEFAULT_EVENT); 
	}
	
	private SimpleSearchQuery addFilterReference(SimpleSearchQuery filter) {
		if (filter==null) 
			return null;
		
		SimpleSearchQuery filterCopy = (SimpleSearchQuery)EcoreUtil.copy(filter);
		LogicalExpression expression = (LogicalExpression)(filterCopy.getWhereExpression());
		checkFeatures(filterCopy,expression, null);
		
		return filterCopy;
	}
	
	private void checkFeatures(SimpleSearchQuery filterCopy, WhereExpression expression, LogicalExpression parent) {
		if (expression == null) return;
		
		if (expression instanceof LogicalExpression) {
			LogicalExpression lExpression = (LogicalExpression)expression;
			 for (int i=lExpression.getArguments().size()-1; i>=0; i--) {
		            WhereExpression exp= (WhereExpression)(lExpression.getArguments().get(i));
		            if (exp!=null) checkFeatures(filterCopy, exp,lExpression);
		     }
		}
		else if (expression instanceof BinaryExpression) {
			BinaryExpression bExpression = (BinaryExpression)expression;
			Operand leftOperand = bExpression.getLeftOperand();
			if (leftOperand==null) return;
			if (leftOperand instanceof SimpleOperand && ((SimpleOperand)leftOperand).getFeature() instanceof EStructuralFeature) {
					EStructuralFeature feature = (EStructuralFeature)(((SimpleOperand)leftOperand).getFeature());
					if (feature == CBEPackage.eINSTANCE.getCBEDefaultElement_Name() ||
							feature == CBEPackage.eINSTANCE.getCBEDefaultElement_Values() ||
							feature == CBEPackage.eINSTANCE.getCBEDefaultElement_Children() ||
							feature == CBEPackage.eINSTANCE.getCBEExtendedDataElement_HexValue() ||
							feature == CBEPackage.eINSTANCE.getCBEExtendedDataElement_Type()) {
						
						if (!filterCopy.getRequiredPaths().contains(CBEPackage.Literals.CBE_DEFAULT_EVENT__EXTENDED_PROPERTIES)) 
							filterCopy.getRequiredPaths().add(CBEPackage.Literals.CBE_DEFAULT_EVENT__EXTENDED_PROPERTIES);
					}
					else if (feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_Component() ||
							feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_ComponentIdType() ||
							feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_ComponentType() ||
							feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_ExecutionEnvironment() ||
							feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_InstanceId() ||
							feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_Location() ||
							feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_LocationType() ||
							feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_ProcessId() ||
							feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_SubComponent() ||
							feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_ThreadId()) {
						
						if (((SimpleOperand)leftOperand).getValue().equals(ComponentIdentificationFilterAttribute.SOURCE_COMPONENT_ID)) {
							if (!filterCopy.getRequiredPaths().contains(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__SOURCE_COMPONENT_ID)) 
								filterCopy.getRequiredPaths().add(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__SOURCE_COMPONENT_ID);						
						}
						else {
							if (!filterCopy.getRequiredPaths().contains(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__REPORTER_COMPONENT_ID)) 
								filterCopy.getRequiredPaths().add(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__REPORTER_COMPONENT_ID);
						}
					}
					else if (feature == CBEPackage.eINSTANCE.getCBEContextDataElement_ContextId() ||
							feature == CBEPackage.eINSTANCE.getCBEContextDataElement_ContextValue() ||
							feature == CBEPackage.eINSTANCE.getCBEContextDataElement_Name() ||
							feature == CBEPackage.eINSTANCE.getCBEContextDataElement_Type()) {
						
						if (!filterCopy.getRequiredPaths().contains(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__CONTEXT_DATA_ELEMENTS)) 
							filterCopy.getRequiredPaths().add(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__CONTEXT_DATA_ELEMENTS);
					}
					else if (feature == CBEPackage.eINSTANCE.getCBEMsgDataElement_MsgCatalog() ||
							feature == CBEPackage.eINSTANCE.getCBEMsgDataElement_MsgCatalogId() ||
							feature == CBEPackage.eINSTANCE.getCBEMsgDataElement_MsgCatalogTokens() ||
							feature == CBEPackage.eINSTANCE.getCBEMsgDataElement_MsgCatalogType() ||
							feature == CBEPackage.eINSTANCE.getCBEMsgDataElement_MsgId() ||
							feature == CBEPackage.eINSTANCE.getCBEMsgDataElement_MsgIdType() ||
							feature == CBEPackage.eINSTANCE.getCBEMsgDataElement_MsgLocale()) {
						if (!filterCopy.getRequiredPaths().contains(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__MSG_DATA_ELEMENT)) 
							filterCopy.getRequiredPaths().add(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__MSG_DATA_ELEMENT);
					}
					else if (feature == CBEPackage.eINSTANCE.getCBEAvailableSituation_AvailabilityDisposition() ||
							feature == CBEPackage.eINSTANCE.getCBEAvailableSituation_OperationDisposition() ||
							feature == CBEPackage.eINSTANCE.getCBEAvailableSituation_ProcessingDisposition() ||
							feature == CBEPackage.eINSTANCE.getCBEConfigureSituation_SuccessDisposition() ||
							feature == CBEPackage.eINSTANCE.getCBEConnectSituation_SituationDisposition() ||
							feature == CBEPackage.eINSTANCE.getCBEConnectSituation_SuccessDisposition() ||
							feature == CBEPackage.eINSTANCE.getCBECreateSituation_SuccessDisposition() ||
							feature == CBEPackage.eINSTANCE.getCBEDependencySituation_DependencyDisposition() ||
							feature == CBEPackage.eINSTANCE.getCBEDestroySituation_SuccessDisposition() ||
							feature == CBEPackage.eINSTANCE.getCBEFeatureSituation_FeatureDisposition() ||
							feature == CBEPackage.eINSTANCE.getCBEOtherSituation_AnyData() ||
							feature == CBEPackage.eINSTANCE.getCBEReportSituation_ReportCategory() ||
							feature == CBEPackage.eINSTANCE.getCBERequestSituation_SituationQualifier() ||
							feature == CBEPackage.eINSTANCE.getCBERequestSituation_SuccessDisposition() ||
							feature == CBEPackage.eINSTANCE.getCBESituation_CategoryName() ||
							feature == CBEPackage.eINSTANCE.getCBESituation_ReasoningScope() ||
							feature == CBEPackage.eINSTANCE.getCBEStartSituation_SituationQualifier() ||
							feature == CBEPackage.eINSTANCE.getCBEStartSituation_SuccessDisposition() ||
							feature == CBEPackage.eINSTANCE.getCBEStopSituation_SituationQualifier() ||
							feature == CBEPackage.eINSTANCE.getCBEStopSituation_SuccessDisposition()) {

						if (!filterCopy.getRequiredPaths().contains(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__SITUATION)) 
						filterCopy.getRequiredPaths().add(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__SITUATION);
					}
			}
		}
		return;
	}
			
	public void partActivated(IWorkbenchPart part) {
		searchDialog = LogUtil.getSearchDialog();

Return to bug 157070

Lines 938-944 Link Here

(-)src/org/eclipse/tptp/platform/log/views/internal/views/LogViewer.java (-105 / +2 lines)
938	if (query == null)	938	if (query == null)
939	return new ArrayList();	939	return new ArrayList();
940		940
941	SimpleSearchQuery filterWithReferences = addFilterReference(query);	941	SimpleSearchQuery filterWithReferences = LogUtil.addFilterReference(query);
942	if (filterWithReferences == null)	942	if (filterWithReferences == null)
943	{	943	{
944	filterWithReferences = QueryUtils.getEmptyQuery();	944	filterWithReferences = QueryUtils.getEmptyQuery();
Lines 1004-1010 Link Here
1004		1004
1005	protected List getFilteredLogRecords (List source) {	1005	protected List getFilteredLogRecords (List source) {
1006	SimpleSearchQuery filter = getCurrentFilter();	1006	SimpleSearchQuery filter = getCurrentFilter();
1007	SimpleSearchQuery filterWithReferences = addFilterReference(filter);	1007	SimpleSearchQuery filterWithReferences = LogUtil.addFilterReference(filter);
1008	if (filterWithReferences == null)	1008	if (filterWithReferences == null)
1009	{	1009	{
1010	filterWithReferences = QueryUtils.getEmptyQuery();	1010	filterWithReferences = QueryUtils.getEmptyQuery();
Lines 1012-1120 Link Here
1012		1012
1013	return getFilteredElements(filterWithReferences, source, CBEPackage.Literals.CBE_DEFAULT_EVENT);	1013	return getFilteredElements(filterWithReferences, source, CBEPackage.Literals.CBE_DEFAULT_EVENT);
1014	}	1014	}
1015
1016	private SimpleSearchQuery addFilterReference(SimpleSearchQuery filter) {
1017	if (filter==null)
1018	return null;
1019
1020	SimpleSearchQuery filterCopy = (SimpleSearchQuery)EcoreUtil.copy(filter);
1021	LogicalExpression expression = (LogicalExpression)(filterCopy.getWhereExpression());
1022	checkFeatures(filterCopy,expression, null);
1023
1024	return filterCopy;
1025	}
1026
1027	private void checkFeatures(SimpleSearchQuery filterCopy, WhereExpression expression, LogicalExpression parent) {
1028	if (expression == null) return;
1029
1030	if (expression instanceof LogicalExpression) {
1031	LogicalExpression lExpression = (LogicalExpression)expression;
1032	for (int i=lExpression.getArguments().size()-1; i>=0; i--) {
1033	WhereExpression exp= (WhereExpression)(lExpression.getArguments().get(i));
1034	if (exp!=null) checkFeatures(filterCopy, exp,lExpression);
1035	}
1036	}
1037	else if (expression instanceof BinaryExpression) {
1038	BinaryExpression bExpression = (BinaryExpression)expression;
1039	Operand leftOperand = bExpression.getLeftOperand();
1040	if (leftOperand==null) return;
1041	if (leftOperand instanceof SimpleOperand && ((SimpleOperand)leftOperand).getFeature() instanceof EStructuralFeature) {
1042	EStructuralFeature feature = (EStructuralFeature)(((SimpleOperand)leftOperand).getFeature());
1043	if (feature == CBEPackage.eINSTANCE.getCBEDefaultElement_Name() \|\|
1044	feature == CBEPackage.eINSTANCE.getCBEDefaultElement_Values() \|\|
1045	feature == CBEPackage.eINSTANCE.getCBEDefaultElement_Children() \|\|
1046	feature == CBEPackage.eINSTANCE.getCBEExtendedDataElement_HexValue() \|\|
1047	feature == CBEPackage.eINSTANCE.getCBEExtendedDataElement_Type()) {
1048
1049	if (!filterCopy.getRequiredPaths().contains(CBEPackage.Literals.CBE_DEFAULT_EVENT__EXTENDED_PROPERTIES))
1050	filterCopy.getRequiredPaths().add(CBEPackage.Literals.CBE_DEFAULT_EVENT__EXTENDED_PROPERTIES);
1051	}
1052	else if (feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_Component() \|\|
1053	feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_ComponentIdType() \|\|
1054	feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_ComponentType() \|\|
1055	feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_ExecutionEnvironment() \|\|
1056	feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_InstanceId() \|\|
1057	feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_Location() \|\|
1058	feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_LocationType() \|\|
1059	feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_ProcessId() \|\|
1060	feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_SubComponent() \|\|
1061	feature == CBEPackage.eINSTANCE.getCBEComponentIdentification_ThreadId()) {
1062
1063	if (((SimpleOperand)leftOperand).getValue().equals(ComponentIdentificationFilterAttribute.SOURCE_COMPONENT_ID)) {
1064	if (!filterCopy.getRequiredPaths().contains(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__SOURCE_COMPONENT_ID))
1065	filterCopy.getRequiredPaths().add(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__SOURCE_COMPONENT_ID);
1066	}
1067	else {
1068	if (!filterCopy.getRequiredPaths().contains(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__REPORTER_COMPONENT_ID))
1069	filterCopy.getRequiredPaths().add(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__REPORTER_COMPONENT_ID);
1070	}
1071	}
1072	else if (feature == CBEPackage.eINSTANCE.getCBEContextDataElement_ContextId() \|\|
1073	feature == CBEPackage.eINSTANCE.getCBEContextDataElement_ContextValue() \|\|
1074	feature == CBEPackage.eINSTANCE.getCBEContextDataElement_Name() \|\|
1075	feature == CBEPackage.eINSTANCE.getCBEContextDataElement_Type()) {
1076
1077	if (!filterCopy.getRequiredPaths().contains(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__CONTEXT_DATA_ELEMENTS))
1078	filterCopy.getRequiredPaths().add(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__CONTEXT_DATA_ELEMENTS);
1079	}
1080	else if (feature == CBEPackage.eINSTANCE.getCBEMsgDataElement_MsgCatalog() \|\|
1081	feature == CBEPackage.eINSTANCE.getCBEMsgDataElement_MsgCatalogId() \|\|
1082	feature == CBEPackage.eINSTANCE.getCBEMsgDataElement_MsgCatalogTokens() \|\|
1083	feature == CBEPackage.eINSTANCE.getCBEMsgDataElement_MsgCatalogType() \|\|
1084	feature == CBEPackage.eINSTANCE.getCBEMsgDataElement_MsgId() \|\|
1085	feature == CBEPackage.eINSTANCE.getCBEMsgDataElement_MsgIdType() \|\|
1086	feature == CBEPackage.eINSTANCE.getCBEMsgDataElement_MsgLocale()) {
1087	if (!filterCopy.getRequiredPaths().contains(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__MSG_DATA_ELEMENT))
1088	filterCopy.getRequiredPaths().add(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__MSG_DATA_ELEMENT);
1089	}
1090	else if (feature == CBEPackage.eINSTANCE.getCBEAvailableSituation_AvailabilityDisposition() \|\|
1091	feature == CBEPackage.eINSTANCE.getCBEAvailableSituation_OperationDisposition() \|\|
1092	feature == CBEPackage.eINSTANCE.getCBEAvailableSituation_ProcessingDisposition() \|\|
1093	feature == CBEPackage.eINSTANCE.getCBEConfigureSituation_SuccessDisposition() \|\|
1094	feature == CBEPackage.eINSTANCE.getCBEConnectSituation_SituationDisposition() \|\|
1095	feature == CBEPackage.eINSTANCE.getCBEConnectSituation_SuccessDisposition() \|\|
1096	feature == CBEPackage.eINSTANCE.getCBECreateSituation_SuccessDisposition() \|\|
1097	feature == CBEPackage.eINSTANCE.getCBEDependencySituation_DependencyDisposition() \|\|
1098	feature == CBEPackage.eINSTANCE.getCBEDestroySituation_SuccessDisposition() \|\|
1099	feature == CBEPackage.eINSTANCE.getCBEFeatureSituation_FeatureDisposition() \|\|
1100	feature == CBEPackage.eINSTANCE.getCBEOtherSituation_AnyData() \|\|
1101	feature == CBEPackage.eINSTANCE.getCBEReportSituation_ReportCategory() \|\|
1102	feature == CBEPackage.eINSTANCE.getCBERequestSituation_SituationQualifier() \|\|
1103	feature == CBEPackage.eINSTANCE.getCBERequestSituation_SuccessDisposition() \|\|
1104	feature == CBEPackage.eINSTANCE.getCBESituation_CategoryName() \|\|
1105	feature == CBEPackage.eINSTANCE.getCBESituation_ReasoningScope() \|\|
1106	feature == CBEPackage.eINSTANCE.getCBEStartSituation_SituationQualifier() \|\|
1107	feature == CBEPackage.eINSTANCE.getCBEStartSituation_SuccessDisposition() \|\|
1108	feature == CBEPackage.eINSTANCE.getCBEStopSituation_SituationQualifier() \|\|
1109	feature == CBEPackage.eINSTANCE.getCBEStopSituation_SuccessDisposition()) {
1110
1111	if (!filterCopy.getRequiredPaths().contains(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__SITUATION))
1112	filterCopy.getRequiredPaths().add(CBEPackage.Literals.CBE_COMMON_BASE_EVENT__SITUATION);
1113	}
1114	}
1115	}
1116	return;
1117	}
1118		1015
1119	public void partActivated(IWorkbenchPart part) {	1016	public void partActivated(IWorkbenchPart part) {
1120	searchDialog = LogUtil.getSearchDialog();	1017	searchDialog = LogUtil.getSearchDialog();

Lines 36-41 Link Here

(-)src/org/eclipse/hyades/sd/logc/internal/loader/LogInteractions.java (-1 / +7 lines)
36	import org.eclipse.emf.common.util.URI;	36	import org.eclipse.emf.common.util.URI;
37	import org.eclipse.emf.ecore.EClass;	37	import org.eclipse.emf.ecore.EClass;
38	import org.eclipse.emf.ecore.EObject;	38	import org.eclipse.emf.ecore.EObject;
		39	import org.eclipse.emf.ecore.EStructuralFeature;
39	import org.eclipse.emf.ecore.InternalEObject;	40	import org.eclipse.emf.ecore.InternalEObject;
40	import org.eclipse.emf.ecore.resource.Resource;	41	import org.eclipse.emf.ecore.resource.Resource;
41	import org.eclipse.emf.ecore.util.EcoreUtil;	42	import org.eclipse.emf.ecore.util.EcoreUtil;
Lines 51-57 Link Here
51	import org.eclipse.hyades.models.hierarchy.HierarchyPackage;	52	import org.eclipse.hyades.models.hierarchy.HierarchyPackage;
52	import org.eclipse.hyades.models.hierarchy.TRCAgent;	53	import org.eclipse.hyades.models.hierarchy.TRCAgent;
53	import org.eclipse.hyades.models.hierarchy.TRCAgentProxy;	54	import org.eclipse.hyades.models.hierarchy.TRCAgentProxy;
		55	import org.eclipse.hyades.models.hierarchy.extensions.BinaryExpression;
54	import org.eclipse.hyades.models.hierarchy.extensions.ExtensionsFactory;	56	import org.eclipse.hyades.models.hierarchy.extensions.ExtensionsFactory;
		57	import org.eclipse.hyades.models.hierarchy.extensions.LogicalExpression;
		58	import org.eclipse.hyades.models.hierarchy.extensions.Operand;
55	import org.eclipse.hyades.models.hierarchy.extensions.OrderByElement;	59	import org.eclipse.hyades.models.hierarchy.extensions.OrderByElement;
56	import org.eclipse.hyades.models.hierarchy.extensions.OrderByOperators;	60	import org.eclipse.hyades.models.hierarchy.extensions.OrderByOperators;
57	import org.eclipse.hyades.models.hierarchy.extensions.Query;	61	import org.eclipse.hyades.models.hierarchy.extensions.Query;
Lines 60-65 Link Here
60	import org.eclipse.hyades.models.hierarchy.extensions.SimpleOperand;	64	import org.eclipse.hyades.models.hierarchy.extensions.SimpleOperand;
61	import org.eclipse.hyades.models.hierarchy.extensions.SimpleSearchQuery;	65	import org.eclipse.hyades.models.hierarchy.extensions.SimpleSearchQuery;
62	import org.eclipse.hyades.models.hierarchy.extensions.TimeBasedCorrelationQuery;	66	import org.eclipse.hyades.models.hierarchy.extensions.TimeBasedCorrelationQuery;
		67	import org.eclipse.hyades.models.hierarchy.extensions.WhereExpression;
63	import org.eclipse.hyades.models.hierarchy.util.HierarchyResourceSetImpl;	68	import org.eclipse.hyades.models.hierarchy.util.HierarchyResourceSetImpl;
64	import org.eclipse.hyades.models.hierarchy.util.IFilterElement;	69	import org.eclipse.hyades.models.hierarchy.util.IFilterElement;
65	import org.eclipse.hyades.models.hierarchy.util.ILogFilterCriteria;	70	import org.eclipse.hyades.models.hierarchy.util.ILogFilterCriteria;
Lines 131-136 Link Here
131	import org.eclipse.tptp.platform.log.views.internal.util.RecordFilterSearchUtil;	136	import org.eclipse.tptp.platform.log.views.internal.util.RecordFilterSearchUtil;
132	import org.eclipse.tptp.platform.log.views.internal.util.SearchRecordDialog;	137	import org.eclipse.tptp.platform.log.views.internal.util.SearchRecordDialog;
133	import org.eclipse.tptp.platform.log.views.internal.util.SortElement;	138	import org.eclipse.tptp.platform.log.views.internal.util.SortElement;
		139	import org.eclipse.tptp.platform.log.views.internal.views.ComponentIdentificationFilterAttribute;
134	import org.eclipse.ui.IPartListener2;	140	import org.eclipse.ui.IPartListener2;
135	import org.eclipse.ui.ISelectionListener;	141	import org.eclipse.ui.ISelectionListener;
136	import org.eclipse.ui.IWorkbenchPart;	142	import org.eclipse.ui.IWorkbenchPart;
Lines 3220-3226 Link Here
3220	filter.getOutputElements().add(outputElement);	3226	filter.getOutputElements().add(outputElement);
3221		3227
3222	HierarchyXMIQueryEngine engine = new HierarchyXMIQueryEngine();	3228	HierarchyXMIQueryEngine engine = new HierarchyXMIQueryEngine();
3223	QueryResult result = engine.executeQuery(filter, resource	3229	QueryResult result = engine.executeQuery(LogUtil.addFilterReference(filter), resource
3224	.getResourceSet(), Collections.EMPTY_LIST);	3230	.getResourceSet(), Collections.EMPTY_LIST);
3225	if (result == null)	3231	if (result == null)
3226	return new ArrayList();	3232	return new ArrayList();