Attachment 87501 Details for Bug 194030 – Updated patch

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

[patch] Updated patch

tptp_patch_bugzilla194030_20080122.txt (text/plain), 4.88 KB, created by Yasuhisa Gotoh

on 2008-01-22 05:26:45 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhisa Gotoh

Created: 2008-01-22 05:26:45 EST

Size: 4.88 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.platform.log.views
>Index: src/org/eclipse/hyades/sd/logc/internal/loader/LogInteractions.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.log.views/src/org/eclipse/hyades/sd/logc/internal/loader/LogInteractions.java,v
>retrieving revision 1.55
>diff -u -r1.55 LogInteractions.java
>--- src/org/eclipse/hyades/sd/logc/internal/loader/LogInteractions.java	16 Jan 2008 06:37:10 -0000	1.55
>+++ src/org/eclipse/hyades/sd/logc/internal/loader/LogInteractions.java	22 Jan 2008 10:07:39 -0000
>@@ -1,5 +1,5 @@
> /**********************************************************************
>- * Copyright (c) 2005,2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2008 IBM Corporation and others.
>  * All rights reserved.   This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -608,11 +608,6 @@
> 
> 	protected boolean fForceRefresh = true;
> 
>-	/**
>-	 * The property page of the log interaction view
>-	 */
>-	protected LogInteractionPropertyPage propertyPage;
>-
> 	protected IPartListener2 fPartListener = new IPartListener2()
> 	{
> 		public void partActivated(IWorkbenchPartReference ref)
>@@ -739,7 +734,6 @@
> 		CorrelationHelper.getInstance().addJobChangeListener(this);
> 		LogViewsPlugin.getDefault().addRecordPaneViewerListener(this);
> 		recordFilterSearch = new RecordFilterSearchUtil();
>-		propertyPage = new LogInteractionPropertyPage(this);
> 		_findRecordSelection = false;
> 	}
> 
>@@ -3686,7 +3680,8 @@
> 	
> 	public IPropertySheetPage getPropertySheetEntry()
> 	{
>-		return propertyPage;
>+		// need to create a TabbedPropertySheetPage instance every time to avoid NPE
>+		return new LogInteractionPropertyPage(this);
> 	}
> 	
> 	public List getEventList()
>#P org.eclipse.tptp.lta.log.epi
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.lta.log.epi/plugin.properties,v
>retrieving revision 1.1
>diff -u -r1.1 plugin.properties
>--- plugin.properties	16 Jan 2008 06:31:56 -0000	1.1
>+++ plugin.properties	22 Jan 2008 10:07:41 -0000
>@@ -1,5 +1,5 @@
> ############################################################################### 
>-# Copyright (c) 2007 IBM Corporation and others. 
>+# Copyright (c) 2007, 2008 IBM Corporation and others. 
> # All rights reserved. This program and the accompanying materials 
> # are made available under the terms of the Eclipse Public License v1.0 
> # which accompanies this distribution, and is available at 
>@@ -70,6 +70,7 @@
> 38 = Choose Columns
> 39 = Analysis Result
> 40 = Refresh Views
>+41 = Correlations
> 
> #############################################################
> # Ali M.: Newly added messages as part of the RCP
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.lta.log.epi/plugin.xml,v
>retrieving revision 1.1
>diff -u -r1.1 plugin.xml
>--- plugin.xml	16 Jan 2008 06:31:56 -0000	1.1
>+++ plugin.xml	22 Jan 2008 10:07:41 -0000
>@@ -396,6 +396,12 @@
> 				category="tabs"
> 				id="org.eclipse.tptp.platform.log.views.AnalysisResultsTab"
> 				label="%39"/>
>+
>+			
>+			<propertyTab
>+				category="tabs"
>+				id="org.eclipse.tptp.platform.log.views.CorrelationTab"
>+				label="%41"/>
> 		</propertyTabs>        
> 	</extension>
>    
>@@ -494,6 +500,14 @@
> 				tab="org.eclipse.tptp.platform.log.views.AnalysisResultsTab">
> 				<input type="org.eclipse.hyades.models.cbe.CBECommonBaseEvent"/>
> 			</propertySection>
>+
>+			
>+			<propertySection
>+				class="org.eclipse.ui.views.properties.tabbed.AdvancedPropertySection"
>+				id="org.eclipse.tptp.platform.log.views.CorrelationSection"
>+				tab="org.eclipse.tptp.platform.log.views.CorrelationTab">
>+				<input type="org.eclipse.hyades.sd.logc.internal.uml2sd.LogAsyncMessage"/>
>+			</propertySection>
> 		</propertySections>
> 	</extension>
> 
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.lta.log.epi/META-INF/MANIFEST.MF,v
>retrieving revision 1.2
>diff -u -r1.2 MANIFEST.MF
>--- META-INF/MANIFEST.MF	16 Jan 2008 15:28:21 -0000	1.2
>+++ META-INF/MANIFEST.MF	22 Jan 2008 10:07:41 -0000
>@@ -12,7 +12,8 @@
>  org.eclipse.tptp.platform.common.ui,
>  org.eclipse.tptp.platform.common.ui.trace,
>  org.eclipse.tptp.monitoring.logui,
>- org.eclipse.tptp.platform.la.core
>+ org.eclipse.tptp.platform.la.core,
>+ org.eclipse.ui.views.properties.tabbed;bundle-version="[3.2.0,4.0.0)"
> Eclipse-LazyStart: true
> Export-Package: org.eclipse.tptp.platform.lta.extensions.instances
> Bundle-RequiredExecutionEnvironment: J2SE-1.4

Actions: View | Diff

Attachments on bug 194030: 72356 | 72357 | 72359 | 84947 | 87501