Attachment #12019 for bug #62218

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

Lines 11-21 Link Here

(-)src/org/eclipse/ui/internal/presentations/R21BasicStackPresentation.java (+62 lines)
11	package org.eclipse.ui.internal.presentations;	11	package org.eclipse.ui.internal.presentations;
12		12
13	import java.util.ArrayList;	13	import java.util.ArrayList;
		14	import java.util.Iterator;
		15	import java.util.List;
14		16
15	import org.eclipse.jface.action.GroupMarker;	17	import org.eclipse.jface.action.GroupMarker;
16	import org.eclipse.jface.action.IMenuManager;	18	import org.eclipse.jface.action.IMenuManager;
17	import org.eclipse.jface.action.MenuManager;	19	import org.eclipse.jface.action.MenuManager;
18	import org.eclipse.jface.action.Separator;	20	import org.eclipse.jface.action.Separator;
		21	import org.eclipse.jface.util.Assert;
19	import org.eclipse.jface.util.Geometry;	22	import org.eclipse.jface.util.Geometry;
20	import org.eclipse.jface.window.Window;	23	import org.eclipse.jface.window.Window;
21	import org.eclipse.swt.SWT;	24	import org.eclipse.swt.SWT;
Lines 40-46 Link Here
40	import org.eclipse.swt.widgets.Shell;	43	import org.eclipse.swt.widgets.Shell;
41	import org.eclipse.swt.widgets.ToolBar;	44	import org.eclipse.swt.widgets.ToolBar;
42	import org.eclipse.swt.widgets.ToolItem;	45	import org.eclipse.swt.widgets.ToolItem;
		46	import org.eclipse.ui.IMemento;
43	import org.eclipse.ui.IPropertyListener;	47	import org.eclipse.ui.IPropertyListener;
		48	import org.eclipse.ui.internal.IWorkbenchConstants;
44	import org.eclipse.ui.internal.IWorkbenchGraphicConstants;	49	import org.eclipse.ui.internal.IWorkbenchGraphicConstants;
45	import org.eclipse.ui.internal.WorkbenchImages;	50	import org.eclipse.ui.internal.WorkbenchImages;
46	import org.eclipse.ui.internal.WorkbenchWindow;	51	import org.eclipse.ui.internal.WorkbenchWindow;
Lines 52-57 Link Here
52	import org.eclipse.ui.internal.util.Util;	57	import org.eclipse.ui.internal.util.Util;
53	import org.eclipse.ui.presentations.IPartMenu;	58	import org.eclipse.ui.presentations.IPartMenu;
54	import org.eclipse.ui.presentations.IPresentablePart;	59	import org.eclipse.ui.presentations.IPresentablePart;
		60	import org.eclipse.ui.presentations.IPresentationSerializer;
55	import org.eclipse.ui.presentations.IStackPresentationSite;	61	import org.eclipse.ui.presentations.IStackPresentationSite;
56	import org.eclipse.ui.presentations.PresentationUtil;	62	import org.eclipse.ui.presentations.PresentationUtil;
57	import org.eclipse.ui.presentations.StackDropResult;	63	import org.eclipse.ui.presentations.StackDropResult;
Lines 986-989 Link Here
986	setActive(newState == AS_ACTIVE_FOCUS);	992	setActive(newState == AS_ACTIVE_FOCUS);
987	}	993	}
988		994
		995	/**
		996	* Restores a presentation from a previously stored state
		997	*
		998	* @param serializer (not null)
		999	* @param savedState (not null)
		1000	*/
		1001	public void restoreState(IPresentationSerializer serializer, IMemento savedState) {
		1002	IMemento[] parts = savedState.getChildren(IWorkbenchConstants.TAG_PART);
		1003
		1004	for (int idx = 0; idx < parts.length; idx++) {
		1005	String id = parts[idx].getString(IWorkbenchConstants.TAG_ID);
		1006
		1007	if (id != null) {
		1008	IPresentablePart part = serializer.getPart(id);
		1009
		1010	if (part != null) {
		1011	addPart(part, getPaneFolder().getItemCount());
		1012	}
		1013	}
		1014	}
		1015	}
		1016
		1017
		1018	/* (non-Javadoc)
		1019	* @see org.eclipse.ui.presentations.StackPresentation#saveState(org.eclipse.ui.presentations.IPresentationSerializer, org.eclipse.ui.IMemento)
		1020	*/
		1021	public void saveState(IPresentationSerializer context, IMemento memento) {
		1022	super.saveState(context, memento);
		1023
		1024	List parts = getPresentableParts();
		1025
		1026	Iterator iter = parts.iterator();
		1027	while (iter.hasNext()) {
		1028	IPresentablePart next = (IPresentablePart)iter.next();
		1029
		1030	IMemento childMem = memento.createChild(IWorkbenchConstants.TAG_PART);
		1031	childMem.putString(IWorkbenchConstants.TAG_ID, context.getId(next));
		1032	}
		1033	}
		1034
		1035	/**
		1036	* Returns the List of IPresentablePart currently in this presentation
		1037	*/
		1038	List getPresentableParts() {
		1039	Assert.isTrue(!isDisposed());
		1040
		1041	CTabItem[] items = getPaneFolder().getItems();
		1042	List result = new ArrayList(items.length);
		1043
		1044	for (int idx = 0; idx < getPaneFolder().getItemCount(); idx++) {
		1045	result.add(getPartForTab(items[idx]));
		1046	}
		1047
		1048	return result;
		1049	}
		1050
989	}	1051	}




package org.eclipse.ui.internal.presentations;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

import org.eclipse.jface.action.GroupMarker;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.util.Assert;
import org.eclipse.jface.util.Geometry;
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;

import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.ui.IMemento;
import org.eclipse.ui.IPropertyListener;
import org.eclipse.ui.internal.IPreferenceConstants;
import org.eclipse.ui.internal.IWorkbenchConstants;
import org.eclipse.ui.internal.WorkbenchPlugin;
import org.eclipse.ui.internal.WorkbenchWindow;
import org.eclipse.ui.internal.dnd.DragUtil;

import org.eclipse.ui.internal.presentations.r21.widgets.CTabItem;
import org.eclipse.ui.presentations.IPartMenu;
import org.eclipse.ui.presentations.IPresentablePart;
import org.eclipse.ui.presentations.IPresentationSerializer;
import org.eclipse.ui.presentations.IStackPresentationSite;
import org.eclipse.ui.presentations.PresentationUtil;
import org.eclipse.ui.presentations.StackDropResult;

			// Select a location for newly inserted parts
			idx = tabFolder.getItemCount();
		}

		if (getTab(newPart) != null) {
			return;
		}
		
        addPart(newPart, idx);
	}
	    
    /**
     * Adds the given presentable part to this presentation at the given index.
     * Does nothing if a tab already exists for the given part. 
     *
     * @param newPart
     * @param index
     */
    public void addPart(IPresentablePart newPart, int index) {
        // If we already have a tab for this part, do nothing
        if (getTab(newPart) != null) {
            return;
        }
        createPartTab(newPart, index);
        
        //setControlSize();
    }

    /*
     * (non-Javadoc)
     * 

        activeState = newState;
        updateGradient();
	}

    /**
     * Restores a presentation from a previously stored state
     * 
     * @param serializer (not null)
     * @param savedState (not null)
     */
    public void restoreState(IPresentationSerializer serializer, IMemento savedState) {
        IMemento[] parts = savedState.getChildren(IWorkbenchConstants.TAG_PART);
        
        for (int idx = 0; idx < parts.length; idx++) {
            String id = parts[idx].getString(IWorkbenchConstants.TAG_ID);
            
            if (id != null) {
                IPresentablePart part = serializer.getPart(id);
                
                if (part != null) {
                    addPart(part, tabFolder.getItemCount());
                }
            } 
        }
    }
    
    
    /* (non-Javadoc)
     * @see org.eclipse.ui.presentations.StackPresentation#saveState(org.eclipse.ui.presentations.IPresentationSerializer, org.eclipse.ui.IMemento)
     */
    public void saveState(IPresentationSerializer context, IMemento memento) {
        super.saveState(context, memento);
        
        List parts = getPresentableParts();
        
        Iterator iter = parts.iterator();
        while (iter.hasNext()) {
            IPresentablePart next = (IPresentablePart)iter.next();
            
            IMemento childMem = memento.createChild(IWorkbenchConstants.TAG_PART);
            childMem.putString(IWorkbenchConstants.TAG_ID, context.getId(next));
        }
    }
    
    /**
     * Returns the List of IPresentablePart currently in this presentation
     */
    List getPresentableParts() {
        Assert.isTrue(!isDisposed());
        
        CTabItem[] items = tabFolder.getItems();
        List result = new ArrayList(items.length);
        
        for (int idx = 0; idx < tabFolder.getItemCount(); idx++) {
            result.add(getPartForTab(items[idx]));
        }
        
        return result;
    }
    
}

Return to bug 62218