Attachment 97259 Details for Bug 222750 – Slightly modified patch

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

Slightly modified patch

patch(222750).txt (text/plain), 2.30 KB, created by Eric Moffatt

on 2008-04-23 12:36:36 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Moffatt

Created: 2008-04-23 12:36:36 EDT

Size: 2.30 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/internal/PerspectiveHelper.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveHelper.java,v
>retrieving revision 1.46
>diff -u -r1.46 PerspectiveHelper.java
>--- Eclipse UI/org/eclipse/ui/internal/PerspectiveHelper.java	24 Mar 2008 19:21:57 -0000	1.46
>+++ Eclipse UI/org/eclipse/ui/internal/PerspectiveHelper.java	23 Apr 2008 16:34:22 -0000
>@@ -7,6 +7,7 @@
>  *
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>+ *     Marco Maccaferri, maccasoft.com - patch for defect 222750
>  *******************************************************************************/
> 
> package org.eclipse.ui.internal;
>@@ -751,13 +752,19 @@
>                     	inTrim = perspective.getFastViewManager().getFastViews(folder.getID()).size() > 0;
>                     	
>                     if (childVisible == 0 && !inTrim) {
>-                        ILayoutContainer parentContainer = folder
>-                                .getContainer();
>-                        for (int i = 0; i < children.length; i++) {
>-                            folder.remove(children[i]);
>-                            parentContainer.add(children[i]);
>+                        ILayoutContainer parentContainer = folder.getContainer();
>+                        hasChildren = folder.getChildren().length > 0;
>+                        
>+                        // We maintain the stack as a place-holder if it has children
>+                        // (which at this point would represent view place-holders)
>+                        if (hasChildren) {
>+                        	folder.dispose();
>+                        	
>+							// replace the real container with a ContainerPlaceholder
>+							ContainerPlaceholder placeholder = new ContainerPlaceholder(folder.getID());
>+							placeholder.setRealContainer(folder);
>+							parentContainer.replace(folder, placeholder);
>                         }
>-                        hasChildren = false;
>                     } else if (childVisible == 1) {
>                         LayoutTree layout = mainLayout.getLayoutTree();
>                         layout = layout.find(folder);

Actions: View

Attachments on bug 222750: 92570 | 96715 | 97259