Attachment 184729 Details for Bug 332041 – Fix

[patch] Fix

patch.txt (text/plain), 6.17 KB, created by Dani Megert

on 2010-12-07 11:32:08 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Dani Megert

Created: 2010-12-07 11:32:08 EST

Size: 6.17 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.tests.views.properties.tabbed
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.tests.views.properties.tabbed/META-INF/MANIFEST.MF,v
>retrieving revision 1.9
>diff -u -r1.9 MANIFEST.MF
>--- META-INF/MANIFEST.MF	7 Oct 2008 04:22:50 -0000	1.9
>+++ META-INF/MANIFEST.MF	7 Dec 2010 16:31:43 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %Plugin.name
> Bundle-SymbolicName: org.eclipse.ui.tests.views.properties.tabbed;singleton:=true
>-Bundle-Version: 3.5.0.qualifier
>+Bundle-Version: 3.5.100.qualifier
> Bundle-Activator: org.eclipse.ui.tests.views.properties.tabbed.Activator
> Bundle-Localization: plugin
> Require-Bundle: org.eclipse.ui,
>Index: src/org/eclipse/ui/tests/views/properties/tabbed/TabbedPropertySheetPageTextTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/TabbedPropertySheetPageTextTest.java,v
>retrieving revision 1.4
>diff -u -r1.4 TabbedPropertySheetPageTextTest.java
>--- src/org/eclipse/ui/tests/views/properties/tabbed/TabbedPropertySheetPageTextTest.java	26 Nov 2008 16:05:09 -0000	1.4
>+++ src/org/eclipse/ui/tests/views/properties/tabbed/TabbedPropertySheetPageTextTest.java	7 Dec 2010 16:31:43 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2007, 2008 IBM Corporation and others.
>+ * Copyright (c) 2007, 2010 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
>@@ -12,8 +12,10 @@
> 
> import junit.framework.TestCase;
> 
>-import org.eclipse.jface.text.IDocument;
> import org.eclipse.swt.widgets.Display;
>+
>+import org.eclipse.jface.text.IDocument;
>+
> import org.eclipse.ui.IViewPart;
> import org.eclipse.ui.IWorkbenchPage;
> import org.eclipse.ui.IWorkbenchWindow;
>@@ -84,7 +86,11 @@
>         document.set("This is a test");
>         textTestsView.getViewer().setSelectedRange(0, 14);
>         
>-        ITabDescriptor[] tabDescriptors = textTestsView.getTabbedPropertySheetPage().getActiveTabs();
>+		ITabDescriptor[] tabDescriptors;
>+		do {
>+			textTestsView.getSite().getShell().getDisplay().readAndDispatch();
>+			tabDescriptors= textTestsView.getTabbedPropertySheetPage().getActiveTabs();
>+		} while (tabDescriptors.length == 0);
>         /**
>          * First tab is "This"
>          */
>@@ -115,7 +121,12 @@
> 	    document.set("The fifth tab is selected");
> 	    textTestsView.getViewer().setSelectedRange(0, 26);
> 	    
>-	    ITabDescriptor[] tabDescriptors = textTestsView.getTabbedPropertySheetPage().getActiveTabs();
>+		ITabDescriptor[] tabDescriptors;
>+		do {
>+			textTestsView.getSite().getShell().getDisplay().readAndDispatch();
>+			tabDescriptors= textTestsView.getTabbedPropertySheetPage().getActiveTabs();
>+		} while (tabDescriptors.length == 0);
>+
> 	    /**
> 	     * First tab is "the" and is selected.
> 	     */
>@@ -155,10 +166,16 @@
>         document.set("This is a test");
>         textTestsView.getViewer().setSelectedRange(0, 14);
> 
>-        /**
>-         * each tab has one section.
>-         */
>-        TabContents tabContents = textTestsView.getTabbedPropertySheetPage().getCurrentTab();
>+		ITabDescriptor[] tabDescriptors;
>+		do {
>+			textTestsView.getSite().getShell().getDisplay().readAndDispatch();
>+			tabDescriptors= textTestsView.getTabbedPropertySheetPage().getActiveTabs();
>+		} while (tabDescriptors.length == 0);
>+
>+		/**
>+		 * each tab has one section.
>+		 */
>+		TabContents tabContents= textTestsView.getTabbedPropertySheetPage().getCurrentTab();
>         ISection[] sections = tabContents.getSections();
>         assertEquals(1, sections.length);
>         assertEquals(TextTestsLabelSection.class, sections[0].getClass());
>#P org.eclipse.ui.views
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.views/META-INF/MANIFEST.MF,v
>retrieving revision 1.17
>diff -u -r1.17 MANIFEST.MF
>--- META-INF/MANIFEST.MF	3 Sep 2009 07:40:18 -0000	1.17
>+++ META-INF/MANIFEST.MF	7 Dec 2010 16:31:44 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %pluginName
> Bundle-SymbolicName: org.eclipse.ui.views; singleton:=true
>-Bundle-Version: 3.5.0.qualifier
>+Bundle-Version: 3.5.100.qualifier
> Bundle-ClassPath: .
> Bundle-Activator: org.eclipse.ui.internal.views.ViewsPlugin
> Bundle-ActivationPolicy: lazy
>Index: src/org/eclipse/ui/views/properties/PropertySheet.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.views/src/org/eclipse/ui/views/properties/PropertySheet.java,v
>retrieving revision 1.25
>diff -u -r1.25 PropertySheet.java
>--- src/org/eclipse/ui/views/properties/PropertySheet.java	3 Sep 2009 07:40:18 -0000	1.25
>+++ src/org/eclipse/ui/views/properties/PropertySheet.java	7 Dec 2010 16:31:44 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2010 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
>@@ -185,7 +185,7 @@
>         super.dispose();
> 
>         // remove ourselves as a selection and registry listener
>-        getSite().getPage().removeSelectionListener(this);
>+        getSite().getPage().removePostSelectionListener(this);
>         RegistryFactory.getRegistry().removeListener(this);
>         
>         currentPart = null;
>@@ -244,7 +244,7 @@
>      * Method declared on IViewPart.
>      */
>     public void init(IViewSite site) throws PartInitException {
>-   		site.getPage().addSelectionListener(this);
>+   		site.getPage().addPostSelectionListener(this);
>    		super.init(site);
>     }
>

Actions: View | Diff

Attachments on bug 332041: 184729 | 184778