Attachment #80706 for bug #206800

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 206800
Collapse All | Expand All




/*******************************************************************************
 * Copyright (c) 2000, 2007 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

import org.eclipse.gef.palette.PaletteEntry;
import org.eclipse.gef.palette.ToolEntry;
import org.eclipse.gef.ui.palette.PaletteViewerPreferences;
import org.eclipse.gef.ui.palette.editparts.PaletteEditPart;

public class ToolEntryEditPart
	extends PaletteEditPart

}

/**
 * @see org.eclipse.gef.ui.palette.editparts.PaletteEditPart#deactivate()
 */
public void deactivate() {
	customLabel.dispose();

}

/**
 * @see org.eclipse.gef.ui.palette.editparts.PaletteEditPart#getToolTipText()
 */
protected String getToolTipText() {
	String result = null;

Lines 1-5 Link Here

(-)src/org/eclipse/gef/internal/ui/palette/editparts/GroupEditPart.java (-1 / +5 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2005 IBM Corporation and others.	2	* Copyright (c) 2000, 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 17-22 Link Here
17		17
18	import org.eclipse.gef.palette.PaletteContainer;	18	import org.eclipse.gef.palette.PaletteContainer;
19	import org.eclipse.gef.ui.palette.PaletteViewerPreferences;	19	import org.eclipse.gef.ui.palette.PaletteViewerPreferences;
		20	import org.eclipse.gef.ui.palette.editparts.PaletteEditPart;
20		21
21	public class GroupEditPart	22	public class GroupEditPart
22	extends PaletteEditPart	23	extends PaletteEditPart
Lines 28-33 Link Here
28	super(group);	29	super(group);
29	}	30	}
30		31
		32	/**
		33	* @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#createFigure()
		34	*/
31	public IFigure createFigure() {	35	public IFigure createFigure() {
32	return new GroupFigure();	36	return new GroupFigure();
33	}	37	}

Lines 1-5 Link Here

(-)src/org/eclipse/gef/internal/ui/palette/editparts/SliderPaletteEditPart.java (-1 / +4 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2005 IBM Corporation and others.	2	* Copyright (c) 2000, 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 17-22 Link Here
17		17
18	import org.eclipse.gef.palette.PaletteRoot;	18	import org.eclipse.gef.palette.PaletteRoot;
19	import org.eclipse.gef.ui.palette.PaletteViewer;	19	import org.eclipse.gef.ui.palette.PaletteViewer;
		20	import org.eclipse.gef.ui.palette.editparts.PaletteAnimator;
		21	import org.eclipse.gef.ui.palette.editparts.PaletteEditPart;
		22	import org.eclipse.gef.ui.palette.editparts.PaletteToolbarLayout;
20		23
21	public class SliderPaletteEditPart	24	public class SliderPaletteEditPart
22	extends PaletteEditPart	25	extends PaletteEditPart

Lines 1-5 Link Here

(-)src/org/eclipse/gef/internal/ui/palette/editparts/PaletteStackEditPart.java (-1 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2005 IBM Corporation and others.	2	* Copyright (c) 2000, 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 48-53 Link Here
48	import org.eclipse.gef.ui.actions.SetActivePaletteToolAction;	48	import org.eclipse.gef.ui.actions.SetActivePaletteToolAction;
49	import org.eclipse.gef.ui.palette.PaletteViewer;	49	import org.eclipse.gef.ui.palette.PaletteViewer;
50	import org.eclipse.gef.ui.palette.PaletteViewerPreferences;	50	import org.eclipse.gef.ui.palette.PaletteViewerPreferences;
		51	import org.eclipse.gef.ui.palette.editparts.PaletteEditPart;
51		52
52	/**	53	/**
53	* The EditPart for a PaletteStack.	54	* The EditPart for a PaletteStack.




/*******************************************************************************
 * Copyright (c) 2000, 2005 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.gef.internal.ui.palette.editparts;

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

import org.eclipse.draw2d.LayoutAnimator;
import org.eclipse.draw2d.IFigure;

import org.eclipse.gef.ui.palette.PaletteViewerPreferences;

/**
 * @author Randy Hudson, Pratik Shah
 */
public class PaletteAnimator extends LayoutAnimator {

private List drawers = new ArrayList();
private PaletteViewerPreferences prefs;

/**
 * Constructor
 */
public PaletteAnimator(PaletteViewerPreferences prefs) {
	this.prefs = prefs;
}

public void addDrawer(DrawerEditPart drawer) {
	drawers.add(drawer.getFigure());
}

protected void autoCollapse(DrawerFigure openDrawer) {
	int autoCollapseMode = prefs.getAutoCollapseSetting();
	
	// Collapse never
	if (autoCollapseMode == PaletteViewerPreferences.COLLAPSE_NEVER)
		return;
	
	DrawerFigure drawer;

	// Collapse always
	if (autoCollapseMode == PaletteViewerPreferences.COLLAPSE_ALWAYS) {
		for (Iterator iter = drawers.iterator(); iter.hasNext();) {
			drawer = (DrawerFigure) iter.next();
			if (drawer != openDrawer)
				drawer.setExpanded(false);
		}
		return;
	}
	
	// Collapse as needed
	int wHint = openDrawer.getParent().getClientArea().width;
	int availableHeight = openDrawer.getParent().getSize().height;
	int requiredHeight = 0;
	List closable = new ArrayList();
	for (Iterator iter = openDrawer.getParent().getChildren().iterator(); iter.hasNext();) {
		IFigure sibling = (IFigure) iter.next();
		int height = sibling.getPreferredSize(wHint, -1).height;
		requiredHeight += height;
		if (!(sibling instanceof DrawerFigure) || sibling == openDrawer)
			continue;
		drawer = (DrawerFigure)sibling;
		if (drawer.isExpanded() && !drawer.isPinnedOpen())
			closable.add(drawer);
	}
	
	//Start closing until requiredHeight <= available
	for (int i = closable.size() - 1; i >= 0 && requiredHeight > availableHeight; i--) {
		drawer = (DrawerFigure)closable.get(i);
		int expandedHeight = drawer.getPreferredSize(wHint, -1).height;
		drawer.setExpanded(false);
		int collapsedHeight = drawer.getPreferredSize(wHint, -1).height;
		requiredHeight -= (expandedHeight - collapsedHeight);
	}
}

public void playbackStarting(IFigure figure) {
	if (figure instanceof DrawerFigure)
		((DrawerFigure)figure).setAnimating(true);
}

public void removeDrawer(DrawerEditPart drawer) {
	drawers.remove(drawer.getFigure());
}

public void init(IFigure figure) {
	if (figure instanceof DrawerFigure) {
		DrawerFigure drawer = (DrawerFigure) figure;
		if (drawer.isExpanded())
			autoCollapse(drawer);
		return;
	}
	super.init(figure);
}

public void tearDown(IFigure figure) {
	if (figure instanceof DrawerFigure)
		((DrawerFigure) figure).setAnimating(false);
}

}

Lines 1-5 Link Here

(-)src/org/eclipse/gef/internal/ui/palette/editparts/DrawerFigure.java (-1 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2005 IBM Corporation and others.	2	* Copyright (c) 2000, 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 52-57 Link Here
52	import org.eclipse.gef.internal.Internal;	52	import org.eclipse.gef.internal.Internal;
53	import org.eclipse.gef.ui.palette.PaletteMessages;	53	import org.eclipse.gef.ui.palette.PaletteMessages;
54	import org.eclipse.gef.ui.palette.PaletteViewerPreferences;	54	import org.eclipse.gef.ui.palette.PaletteViewerPreferences;
		55	import org.eclipse.gef.ui.palette.editparts.PaletteToolbarLayout;
55		56
56	/**	57	/**
57	* @author Pratik Shah	58	* @author Pratik Shah




/*******************************************************************************
 * Copyright (c) 2000, 2005 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.gef.internal.ui.palette.editparts;

import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;

import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.IMemento;

import org.eclipse.draw2d.Border;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.MarginBorder;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.text.FlowPage;
import org.eclipse.draw2d.text.TextFlow;

import org.eclipse.gef.AccessibleEditPart;
import org.eclipse.gef.DragTracker;
import org.eclipse.gef.Request;
import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
import org.eclipse.gef.palette.PaletteContainer;
import org.eclipse.gef.palette.PaletteEntry;
import org.eclipse.gef.palette.PaletteSeparator;
import org.eclipse.gef.tools.SelectEditPartTracker;
import org.eclipse.gef.ui.palette.PaletteMessages;
import org.eclipse.gef.ui.palette.PaletteViewer;
import org.eclipse.gef.ui.palette.PaletteViewerPreferences;

public abstract class PaletteEditPart
	extends AbstractGraphicalEditPart
	implements PropertyChangeListener
{
	
public static final String XML_NAME = "entry"; //$NON-NLS-1$
private static final Border TOOLTIP_BORDER = new MarginBorder(0, 2, 1, 0);
private static ImageCache globalImageCache;
private AccessibleEditPart acc;
private PropertyChangeListener childListener = new PropertyChangeListener() {
	public void propertyChange(PropertyChangeEvent evt) {
		if (evt.getPropertyName().equals(PaletteEntry.PROPERTY_VISIBLE)) {
			refreshChildren();
		}
	}
};
private Image image;
private ImageDescriptor imgDescriptor;

public PaletteEditPart(PaletteEntry model) {
	setModel(model);
}

/**
 * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#activate()
 */
public void activate() {
	super.activate();
	PaletteEntry model = (PaletteEntry)getModel();
	model.addPropertyChangeListener(this);
	traverseChildren(model, true);
}

/**
 * returns the AccessibleEditPart for this EditPart.   This method is called lazily from
 * {@link #getAccessibleEditPart()}.
 */
protected AccessibleEditPart createAccessible() {
	return null;
}

public void createEditPolicies() { }

protected IFigure createToolTip() {
	String message = getToolTipText();
	if (message == null || message.length() == 0)
		return null;

	FlowPage fp = new FlowPage() {
		public Dimension getPreferredSize(int w, int h) {
			Dimension d = super.getPreferredSize(-1, -1);
			if (d.width > 150)
				d = super.getPreferredSize(150, -1);
			return d;
		}
	};
	fp.setOpaque(true);
	fp.setBorder(TOOLTIP_BORDER);
	TextFlow tf = new TextFlow();
	tf.setText(message);
	fp.add(tf);
	return fp;
}

/**
 * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#deactivate()
 */
public void deactivate() {
	PaletteEntry model = (PaletteEntry)getModel();
	model.removePropertyChangeListener(this);
	traverseChildren(model, false);
	if (image != null) {
		image.dispose();
		image = null;
	}
	super.deactivate();
}


protected AccessibleEditPart getAccessibleEditPart() {
	if (acc == null)
		acc = createAccessible();
	return acc;
}

class SingleSelectionTracker extends SelectEditPartTracker {
	SingleSelectionTracker() {
		super(PaletteEditPart.this);
	}
	protected void performSelection() {
		if (hasSelectionOccurred())
			return;
		setFlag(FLAG_SELECTION_PERFORMED, true);
		getCurrentViewer().select(getSourceEditPart());
	}
}

/**
 * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#getDragTracker(Request)
 */
public DragTracker getDragTracker(Request request) {
	return new SingleSelectionTracker();
}

/**
 * Returns the image cache.
 * The cache is global, and is shared by all palette edit parts. This has the disadvantage
 * that once an image is allocated, it is never freed until the display is disposed. 
 * However, it has the advantage that the same image in different palettes is
 * only ever created once.
 */
protected static ImageCache getImageCache() {
	ImageCache cache = globalImageCache;
	if (cache == null) {
		globalImageCache = cache = new ImageCache();
		Display display = Display.getDefault();
		if (display != null) {
			display.disposeExec(new Runnable() {
				public void run() {
					if (globalImageCache != null) {
						globalImageCache.dispose();
						globalImageCache = null;
					}
				}	
			});
		}
	}
	return cache;
}

/**
 * @see org.eclipse.gef.editparts.AbstractEditPart#getModelChildren()
 */
public List getModelChildren() {
	List modelChildren;
	if (getModel() instanceof PaletteContainer)
		modelChildren = new ArrayList(((PaletteContainer)getModel()).getChildren());
	else
		return Collections.EMPTY_LIST;
	
	PaletteEntry prevVisibleEntry = null;
	for (Iterator iter = modelChildren.iterator(); iter.hasNext();) {
		PaletteEntry entry = (PaletteEntry) iter.next();
		if (!entry.isVisible())
			// not visible
			iter.remove();
		else if (entry instanceof PaletteSeparator && prevVisibleEntry == null) 
			// first visible item in a group is a separator, don't need it
			iter.remove();
		else if (entry instanceof PaletteSeparator && prevVisibleEntry instanceof PaletteSeparator)
			// previous visible entry was a separator, don't need it
			iter.remove();
		else
			prevVisibleEntry = entry;
	}
	// check to see if last visible entry was a separator, and thus should be hidden
	if (prevVisibleEntry instanceof PaletteSeparator) 
		modelChildren.remove(prevVisibleEntry);
	
	return modelChildren;
}

protected PaletteEntry getPaletteEntry() {
	return (PaletteEntry)getModel();
}

PaletteViewer getPaletteViewer() {
	return (PaletteViewer)getViewer();
}

protected PaletteViewerPreferences getPreferenceSource() {
	return ((PaletteViewer)getViewer()).getPaletteViewerPreferences();
}

protected IFigure getToolTipFigure() {
	return getFigure();
}

protected String getToolTipText() {
	String text = null;
	PaletteEntry entry = (PaletteEntry)getModel();
	String desc = entry.getDescription();
	boolean needName = nameNeededInToolTip();
	if (desc == null
	  || desc.trim().equals(entry.getLabel())
	  || desc.trim().equals("")) { //$NON-NLS-1$
		if (needName)
			text = entry.getLabel();
	} else {
		if (needName)
			text = entry.getLabel() + " " //$NON-NLS-1$
					+ PaletteMessages.NAME_DESCRIPTION_SEPARATOR + " " + desc; //$NON-NLS-1$
		else
			text = desc;
	}
	if (text != null && text.trim().equals(""))//$NON-NLS-1$
		return null;
	return text;
}

protected boolean nameNeededInToolTip() {
	return getPreferenceSource().getLayoutSetting() 
			== PaletteViewerPreferences.LAYOUT_ICONS;
}

/**
 * @see java.beans.PropertyChangeListener#propertyChange(PropertyChangeEvent)
 */
public void propertyChange(PropertyChangeEvent evt) {
	String property = evt.getPropertyName();
	if (property.equals(PaletteContainer.PROPERTY_CHILDREN)) {
		traverseChildren((List)evt.getOldValue(), false);
		refreshChildren();
		traverseChildren((List)evt.getNewValue(), true);
	} else if (property.equals(PaletteEntry.PROPERTY_LABEL)
			|| property.equals(PaletteEntry.PROPERTY_SMALL_ICON)
			|| property.equals(PaletteEntry.PROPERTY_LARGE_ICON)
			|| property.equals(PaletteEntry.PROPERTY_DESCRIPTION))
		refreshVisuals();
}

public void restoreState(IMemento memento) {
	Iterator iter = getChildren().iterator();
	IMemento[] childMementos = memento.getChildren(XML_NAME);
	int index = 0;
	while (iter.hasNext())
		((PaletteEditPart)iter.next()).restoreState(childMementos[index++]);
}

public void saveState(IMemento memento) {
	Iterator iter = getChildren().iterator();
	while (iter.hasNext())
		((PaletteEditPart)iter.next()).saveState(memento.createChild(XML_NAME));
}

protected void setImageDescriptor(ImageDescriptor desc) {
	if (desc == imgDescriptor)
		return;
	imgDescriptor = desc;
	setImageInFigure(getImageCache().getImage(imgDescriptor));
}

protected void setImageInFigure(Image image) { }

private void traverseChildren(PaletteEntry parent, boolean add) {
	if (!(parent instanceof PaletteContainer))
		return;
	PaletteContainer container = (PaletteContainer)parent;
	traverseChildren(container.getChildren(), add);
}

private void traverseChildren(List children, boolean add) {	
	for (Iterator iter = children.iterator(); iter.hasNext();) {
		PaletteEntry entry = (PaletteEntry) iter.next();
		if (add) {
			entry.addPropertyChangeListener(childListener);
		} else {
			entry.removePropertyChangeListener(childListener);
		}		
	}
}

protected static class ImageCache {
	/** Map from ImageDescriptor to Image */
	private Map images = new HashMap(11);
	
	Image getImage(ImageDescriptor desc) {
		if (desc == null) {
			return null;
		}
		Image img = null;
		Object obj = images.get(desc);
		if (obj != null) {
			img = (Image)obj;
		} else {
			img = desc.createImage();
			images.put(desc, img);
		}
		return img;
	}

	Image getMissingImage() {
		return getImage(ImageDescriptor.getMissingImageDescriptor());
	}
	
	void dispose() {
		for (Iterator i = images.values().iterator(); i.hasNext();) {
			Image img = (Image) i.next();
			img.dispose();
		}
		images.clear();
	}
}

}




/*******************************************************************************
 * Copyright (c) 2000, 2007 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

import org.eclipse.gef.palette.PaletteEntry;
import org.eclipse.gef.palette.PaletteTemplateEntry;
import org.eclipse.gef.ui.palette.PaletteViewerPreferences;
import org.eclipse.gef.ui.palette.editparts.PaletteEditPart;

/**
 * @author Eric Bordeau, Pratik Shah

}

/**
 * @see org.eclipse.gef.ui.palette.editparts.PaletteEditPart#createAccessible()
 */
protected AccessibleEditPart createAccessible() {
	return new AccessibleGraphicalEditPart () {

}

/**
 * @see org.eclipse.gef.ui.palette.editparts.PaletteEditPart#deactivate()
 */
public void deactivate() {
	((DetailedLabelFigure)getFigure()).dispose();

}

/**
 * @see org.eclipse.gef.ui.palette.editparts.PaletteEditPart#getDragTracker(Request)
 */
public DragTracker getDragTracker(Request request) {
	return new SingleSelectionTracker() {

}

/**
 * @see org.eclipse.gef.ui.palette.editparts.PaletteEditPart#getToolTipText()
 */
protected String getToolTipText() {
	String result = null;

}

/**
 * @see org.eclipse.gef.ui.palette.editparts.PaletteEditPart#setImageInFigure(Image)
 */
protected void setImageInFigure(Image image) {
	DetailedLabelFigure fig = (DetailedLabelFigure)getFigure();




/*******************************************************************************
 * Copyright (c) 2000, 2005 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.gef.internal.ui.palette.editparts;

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

import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.ToolbarLayout;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Rectangle;

/**
 * A ToolbarLayout-like layout for the palette.  This layout is palette-specific and 
 * should not be used externally.  This layout only works when vertically oriented.
 * 
 * @author Pratik Shah
 */
public class PaletteToolbarLayout 
	extends ToolbarLayout 
{

/**
 * A figure is growing if it's an expanded drawer.
 * 
 * @param 	child	The figure that is to be marked as growing or non-growing
 * @return	<code>true</code> if the given child is considered growing
 */
protected boolean isChildGrowing(IFigure child) {
	return child instanceof DrawerFigure && ((DrawerFigure)child).isExpanded();
}

public void layout(IFigure parent) {
	List children = parent.getChildren();
	List childrenGrabbingVertical = new ArrayList();
	int numChildren = children.size();
	Rectangle clientArea = parent.getClientArea();
	int x = clientArea.x;
	int y = clientArea.y;
	int availableHeight = clientArea.height;
	boolean stretching;
	Dimension prefSizes [] = new Dimension[numChildren];
	Dimension minSizes [] = new Dimension[numChildren];
	int totalHeight = 0, totalMinHeight = 0, heightOfNonGrowingChildren = 0, 
		heightPerChild = 0, excessHeight = 0;
	
	/*
	 * Determine hints.
	 */
	int wHint = clientArea.width;
	int hHint = -1;

	/*
	 * Store the preferred and minimum sizes of all figures.  Determine which figures can
	 * be stretched/shrunk.
	 */
	for (int i = 0; i < numChildren; i++) {
		IFigure child = (IFigure)children.get(i);
		
		prefSizes[i] = child.getPreferredSize(wHint, hHint);
		minSizes[i] = child.getMinimumSize(wHint, hHint);
		
		totalHeight += prefSizes[i].height;
		totalMinHeight += minSizes[i].height;
						
		if (isChildGrowing(child)) {
			childrenGrabbingVertical.add(child);
		} else {
			heightOfNonGrowingChildren += prefSizes[i].height;
		}
	}
	totalHeight += (numChildren - 1) * getSpacing();
	totalMinHeight += (numChildren - 1) * getSpacing();

	/*
	 * This is the algorithm that determines which figures need to be compressed/stretched
	 * and by how much.
	 */
	stretching = totalHeight - Math.max(availableHeight, totalMinHeight) < 0;
	if (stretching) {
		/*
		 * We only want the last child to stretch.  So, we mark all but the last
		 * growing child as non-growing.
		 */
		for (int i = 0; i < childrenGrabbingVertical.size() - 1; i++) {
			int index = children.indexOf(childrenGrabbingVertical.get(i));
			heightOfNonGrowingChildren += prefSizes[index].height;
		}
		if (!childrenGrabbingVertical.isEmpty()) {
			Object last = childrenGrabbingVertical
					.get(childrenGrabbingVertical.size() - 1);
			childrenGrabbingVertical.clear();
			childrenGrabbingVertical.add(last);
			heightPerChild = availableHeight - heightOfNonGrowingChildren;
		}
	} else if (!childrenGrabbingVertical.isEmpty()) {
		/*
		 * So long as there is at least one child that can be grown, figure out how much
		 * height should be given to each growing child.
		 */
		boolean childrenDiscarded;
		// spaceToConsume is the space height available on the palette that is to be
		// shared by the growing children.
		int spaceToConsume = availableHeight - heightOfNonGrowingChildren;
		// heightPerChild is the height that each growing child is to be grown up to
		heightPerChild = spaceToConsume / childrenGrabbingVertical.size();
		// excessHeight is the space leftover at the bottom of the palette after each
		// growing child has been grown by heightPerChild.
		excessHeight = spaceToConsume - (heightPerChild * childrenGrabbingVertical.size());
		do {
			childrenDiscarded = false;
			for (Iterator iter = childrenGrabbingVertical.iterator(); iter.hasNext();) {
				IFigure childFig = (IFigure)iter.next();
				int i = childFig.getParent().getChildren().indexOf(childFig);
				// In the case of shrinking, if the child's height is less than
				// heightPerChild, mark that child as non-growing
				if (prefSizes[i].height < heightPerChild) {
					spaceToConsume -= prefSizes[i].height;
					heightOfNonGrowingChildren += prefSizes[i].height;
					iter.remove();
					if (!childrenGrabbingVertical.isEmpty()) {
						childrenDiscarded = true;
						heightPerChild = spaceToConsume / childrenGrabbingVertical.size();
						excessHeight = spaceToConsume 
								- (heightPerChild * childrenGrabbingVertical.size());
					}
					break;
				}
			}
		} while (childrenDiscarded);
	}	

	/*
	 * Do the actual layout, i.e. set the bounds of all the figures.
	 */
	for (int i = 0; i < numChildren; i++) {
		IFigure child = (IFigure)children.get(i);
		Rectangle newBounds = new Rectangle(x, y, prefSizes[i].width, prefSizes[i].height);

		if (childrenGrabbingVertical.contains(child)) {
			// Set the height of growing children.  If this is the last one, give it
			// the excess height.
			childrenGrabbingVertical.remove(child);
			if (childrenGrabbingVertical.isEmpty())
				newBounds.height = heightPerChild + excessHeight;
			else
				newBounds.height = heightPerChild;
		}

		if (getStretchMinorAxis())
			newBounds.width = clientArea.width;
		else
			newBounds.width = Math.min(prefSizes[i].width, clientArea.width);

		int adjust = clientArea.width - newBounds.width;
		switch (getMinorAlignment()) {
			case ALIGN_TOPLEFT: 
				adjust = 0;
				break;
			case ALIGN_CENTER:
				adjust /= 2;
				break;
			case ALIGN_BOTTOMRIGHT:
				break;
		}
		newBounds.x += adjust;
		child.setBounds(newBounds);
		y += newBounds.height + getSpacing();
	}
}

}

Lines 1-5 Link Here

(-)src/org/eclipse/gef/ui/palette/editparts/PaletteEditPart.java (-6 / +81 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2005 IBM Corporation and others.	2	* Copyright (c) 2000, 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 8-14 Link Here
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.gef.internal.ui.palette.editparts;	11	package org.eclipse.gef.ui.palette.editparts;
12		12
13	import java.beans.PropertyChangeEvent;	13	import java.beans.PropertyChangeEvent;
14	import java.beans.PropertyChangeListener;	14	import java.beans.PropertyChangeListener;
Lines 44-54 Link Here
44	import org.eclipse.gef.ui.palette.PaletteViewer;	44	import org.eclipse.gef.ui.palette.PaletteViewer;
45	import org.eclipse.gef.ui.palette.PaletteViewerPreferences;	45	import org.eclipse.gef.ui.palette.PaletteViewerPreferences;
46		46
		47	/**
		48	* The abstract implementation of palette edit parts. All edit parts used in
		49	* the palette must extend this class.
		50	*/
47	public abstract class PaletteEditPart	51	public abstract class PaletteEditPart
48	extends AbstractGraphicalEditPart	52	extends AbstractGraphicalEditPart
49	implements PropertyChangeListener	53	implements PropertyChangeListener
50	{	54	{
51		55
		56	/**
		57	* The name of each entry in the palette, used to restore the state.
		58	*/
52	public static final String XML_NAME = "entry"; //$NON-NLS-1$	59	public static final String XML_NAME = "entry"; //$NON-NLS-1$
53	private static final Border TOOLTIP_BORDER = new MarginBorder(0, 2, 1, 0);	60	private static final Border TOOLTIP_BORDER = new MarginBorder(0, 2, 1, 0);
54	private static ImageCache globalImageCache;	61	private static ImageCache globalImageCache;
Lines 63-68 Link Here
63	private Image image;	70	private Image image;
64	private ImageDescriptor imgDescriptor;	71	private ImageDescriptor imgDescriptor;
65		72
		73	/**
		74	* Constructor for the PaletteEditPart.
		75	* @param model The model element for this edit part.
		76	*/
66	public PaletteEditPart(PaletteEntry model) {	77	public PaletteEditPart(PaletteEntry model) {
67	setModel(model);	78	setModel(model);
68	}	79	}
Lines 80-92 Link Here
80	/**	91	/**
81	* returns the AccessibleEditPart for this EditPart. This method is called lazily from	92	* returns the AccessibleEditPart for this EditPart. This method is called lazily from
82	* {@link #getAccessibleEditPart()}.	93	* {@link #getAccessibleEditPart()}.
		94	* @return the AccessibleEditPart.
83	*/	95	*/
84	protected AccessibleEditPart createAccessible() {	96	protected AccessibleEditPart createAccessible() {
85	return null;	97	return null;
86	}	98	}
87		99
		100	/**
		101	* @see org.eclipse.gef.editparts.AbstractEditPart#createEditPolicies()
		102	*/
88	public void createEditPolicies() { }	103	public void createEditPolicies() { }
89		104
		105	/**
		106	* Create the tool tip for this palette edit part.
		107	* @return the tool tip figure.
		108	*/
90	protected IFigure createToolTip() {	109	protected IFigure createToolTip() {
91	String message = getToolTipText();	110	String message = getToolTipText();
92	if (message == null \|\| message.length() == 0)	111	if (message == null \|\| message.length() == 0)
Lines 122-138 Link Here
122	super.deactivate();	141	super.deactivate();
123	}	142	}
124		143
125		144	/**
		145	* @see org.eclipse.gef.editparts.AbstractEditPart#getAccessibleEditPart()
		146	*/
126	protected AccessibleEditPart getAccessibleEditPart() {	147	protected AccessibleEditPart getAccessibleEditPart() {
127	if (acc == null)	148	if (acc == null)
128	acc = createAccessible();	149	acc = createAccessible();
129	return acc;	150	return acc;
130	}	151	}
131		152
132	class SingleSelectionTracker extends SelectEditPartTracker {	153	/**
133	SingleSelectionTracker() {	154	* A selection tracker for the edit part.
		155	*/
		156	public class SingleSelectionTracker extends SelectEditPartTracker {
		157	/**
		158	* Constructor for a SingleSelectionTracker.
		159	*/
		160	public SingleSelectionTracker() {
134	super(PaletteEditPart.this);	161	super(PaletteEditPart.this);
135	}	162	}
		163	/**
		164	* @see org.eclipse.gef.tools.SelectEditPartTracker#performSelection()
		165	*/
136	protected void performSelection() {	166	protected void performSelection() {
137	if (hasSelectionOccurred())	167	if (hasSelectionOccurred())
138	return;	168	return;
Lines 154-159 Link Here
154	* that once an image is allocated, it is never freed until the display is disposed.	184	* that once an image is allocated, it is never freed until the display is disposed.
155	* However, it has the advantage that the same image in different palettes is	185	* However, it has the advantage that the same image in different palettes is
156	* only ever created once.	186	* only ever created once.
		187	* @return the image cache.
157	*/	188	*/
158	protected static ImageCache getImageCache() {	189	protected static ImageCache getImageCache() {
159	ImageCache cache = globalImageCache;	190	ImageCache cache = globalImageCache;
Lines 206-227 Link Here
206	return modelChildren;	237	return modelChildren;
207	}	238	}
208		239
		240	/**
		241	* Get the model element for this palette edit part.
		242	* @return the model element.
		243	*/
209	protected PaletteEntry getPaletteEntry() {	244	protected PaletteEntry getPaletteEntry() {
210	return (PaletteEntry)getModel();	245	return (PaletteEntry)getModel();
211	}	246	}
212		247
213	PaletteViewer getPaletteViewer() {	248	/**
		249	* Get the palette viewer for this palette edit part.
		250	* @return the palette viewer.
		251	*/
		252	protected PaletteViewer getPaletteViewer() {
214	return (PaletteViewer)getViewer();	253	return (PaletteViewer)getViewer();
215	}	254	}
216		255
		256	/**
		257	* Get the palette viewer preferences for this palette edit part.
		258	* @return the palette viewer preferences.
		259	*/
217	protected PaletteViewerPreferences getPreferenceSource() {	260	protected PaletteViewerPreferences getPreferenceSource() {
218	return ((PaletteViewer)getViewer()).getPaletteViewerPreferences();	261	return ((PaletteViewer)getViewer()).getPaletteViewerPreferences();
219	}	262	}
220		263
		264	/**
		265	* Get the tool tip figure for this palette edit part.
		266	* @return the tool tip figure.
		267	*/
221	protected IFigure getToolTipFigure() {	268	protected IFigure getToolTipFigure() {
222	return getFigure();	269	return getFigure();
223	}	270	}
224		271
		272	/**
		273	* Get the tool tip text for this palette edit part.
		274	* @return the tool tip text.
		275	*/
225	protected String getToolTipText() {	276	protected String getToolTipText() {
226	String text = null;	277	String text = null;
227	PaletteEntry entry = (PaletteEntry)getModel();	278	PaletteEntry entry = (PaletteEntry)getModel();
Lines 244-249 Link Here
244	return text;	295	return text;
245	}	296	}
246		297
		298	/**
		299	* Determine if the name is needed in the tool tip.
		300	* @return <code>true</code> if the name is needed in the tool tip.
		301	* @since 3.2
		302	*/
247	protected boolean nameNeededInToolTip() {	303	protected boolean nameNeededInToolTip() {
248	return getPreferenceSource().getLayoutSetting()	304	return getPreferenceSource().getLayoutSetting()
249	== PaletteViewerPreferences.LAYOUT_ICONS;	305	== PaletteViewerPreferences.LAYOUT_ICONS;
Lines 265-270 Link Here
265	refreshVisuals();	321	refreshVisuals();
266	}	322	}
267		323
		324	/**
		325	* Restore the state of the palette entry.
		326	* @param memento the saved state of the palette entry.
		327	*/
268	public void restoreState(IMemento memento) {	328	public void restoreState(IMemento memento) {
269	Iterator iter = getChildren().iterator();	329	Iterator iter = getChildren().iterator();
270	IMemento[] childMementos = memento.getChildren(XML_NAME);	330	IMemento[] childMementos = memento.getChildren(XML_NAME);
Lines 273-284 Link Here
273	((PaletteEditPart)iter.next()).restoreState(childMementos[index++]);	333	((PaletteEditPart)iter.next()).restoreState(childMementos[index++]);
274	}	334	}
275		335
		336	/**
		337	* Save the state of the palette entry.
		338	* @param memento the saved state of the palette entry.
		339	*/
276	public void saveState(IMemento memento) {	340	public void saveState(IMemento memento) {
277	Iterator iter = getChildren().iterator();	341	Iterator iter = getChildren().iterator();
278	while (iter.hasNext())	342	while (iter.hasNext())
279	((PaletteEditPart)iter.next()).saveState(memento.createChild(XML_NAME));	343	((PaletteEditPart)iter.next()).saveState(memento.createChild(XML_NAME));
280	}	344	}
281		345
		346	/**
		347	* Set the image for this palette edit part.
		348	* @param desc the image descriptor.
		349	*/
282	protected void setImageDescriptor(ImageDescriptor desc) {	350	protected void setImageDescriptor(ImageDescriptor desc) {
283	if (desc == imgDescriptor)	351	if (desc == imgDescriptor)
284	return;	352	return;
Lines 286-291 Link Here
286	setImageInFigure(getImageCache().getImage(imgDescriptor));	354	setImageInFigure(getImageCache().getImage(imgDescriptor));
287	}	355	}
288		356
		357	/**
		358	* Set the image to be used in the figure for this edit edit.
		359	* @param image the image
		360	*/
289	protected void setImageInFigure(Image image) { }	361	protected void setImageInFigure(Image image) { }
290		362
291	private void traverseChildren(PaletteEntry parent, boolean add) {	363	private void traverseChildren(PaletteEntry parent, boolean add) {
Lines 306-311 Link Here
306	}	378	}
307	}	379	}
308		380
		381	/**
		382	* The image cache for this edit part.
		383	*/
309	protected static class ImageCache {	384	protected static class ImageCache {
310	/** Map from ImageDescriptor to Image */	385	/** Map from ImageDescriptor to Image */
311	private Map images = new HashMap(11);	386	private Map images = new HashMap(11);

Lines 1-5 Link Here

(-)src/org/eclipse/gef/ui/palette/editparts/PaletteAnimator.java (-4 / +31 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2005 IBM Corporation and others.	2	* Copyright (c) 2000, 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 8-25 Link Here
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.gef.internal.ui.palette.editparts;	11	package org.eclipse.gef.ui.palette.editparts;
12		12
13	import java.util.ArrayList;	13	import java.util.ArrayList;
14	import java.util.Iterator;	14	import java.util.Iterator;
15	import java.util.List;	15	import java.util.List;
16		16
17	import org.eclipse.draw2d.LayoutAnimator;
18	import org.eclipse.draw2d.IFigure;	17	import org.eclipse.draw2d.IFigure;
		18	import org.eclipse.draw2d.LayoutAnimator;
19		19
		20	import org.eclipse.gef.internal.ui.palette.editparts.DrawerEditPart;
		21	import org.eclipse.gef.internal.ui.palette.editparts.DrawerFigure;
20	import org.eclipse.gef.ui.palette.PaletteViewerPreferences;	22	import org.eclipse.gef.ui.palette.PaletteViewerPreferences;
21		23
22	/**	24	/**
		25	* An animator for the layout of the palette.
		26	*
23	* @author Randy Hudson, Pratik Shah	27	* @author Randy Hudson, Pratik Shah
24	*/	28	*/
25	public class PaletteAnimator extends LayoutAnimator {	29	public class PaletteAnimator extends LayoutAnimator {
Lines 28-43 Link Here
28	private PaletteViewerPreferences prefs;	32	private PaletteViewerPreferences prefs;
29		33
30	/**	34	/**
31	* Constructor	35	* Constructor for a PaletteAnimator
		36	* @param prefs The palette PaletteViewerPreferencesPreferences
32	*/	37	*/
33	public PaletteAnimator(PaletteViewerPreferences prefs) {	38	public PaletteAnimator(PaletteViewerPreferences prefs) {
34	this.prefs = prefs;	39	this.prefs = prefs;
35	}	40	}
36		41
		42	/**
		43	* Add a drawer to the palette.
		44	* @param drawer the drawer.
		45	*/
37	public void addDrawer(DrawerEditPart drawer) {	46	public void addDrawer(DrawerEditPart drawer) {
38	drawers.add(drawer.getFigure());	47	drawers.add(drawer.getFigure());
39	}	48	}
40		49
		50	/**
		51	* Collapse the provided drawer if the automatoc collapse setting is enabled.
		52	* @param openDrawer The drawer to collapse.
		53	* @since 3.2
		54	*/
41	protected void autoCollapse(DrawerFigure openDrawer) {	55	protected void autoCollapse(DrawerFigure openDrawer) {
42	int autoCollapseMode = prefs.getAutoCollapseSetting();	56	int autoCollapseMode = prefs.getAutoCollapseSetting();
43		57
Lines 83-97 Link Here
83	}	97	}
84	}	98	}
85		99
		100	/**
		101	* @see org.eclipse.draw2d.Animator#playbackStarting(org.eclipse.draw2d.IFigure)
		102	*/
86	public void playbackStarting(IFigure figure) {	103	public void playbackStarting(IFigure figure) {
87	if (figure instanceof DrawerFigure)	104	if (figure instanceof DrawerFigure)
88	((DrawerFigure)figure).setAnimating(true);	105	((DrawerFigure)figure).setAnimating(true);
89	}	106	}
90		107
		108	/**
		109	* Remove the drawer.
		110	* @param drawer the drawer.
		111	*/
91	public void removeDrawer(DrawerEditPart drawer) {	112	public void removeDrawer(DrawerEditPart drawer) {
92	drawers.remove(drawer.getFigure());	113	drawers.remove(drawer.getFigure());
93	}	114	}
94		115
		116	/**
		117	* @see org.eclipse.draw2d.Animator#init(org.eclipse.draw2d.IFigure)
		118	*/
95	public void init(IFigure figure) {	119	public void init(IFigure figure) {
96	if (figure instanceof DrawerFigure) {	120	if (figure instanceof DrawerFigure) {
97	DrawerFigure drawer = (DrawerFigure) figure;	121	DrawerFigure drawer = (DrawerFigure) figure;
Lines 102-107 Link Here
102	super.init(figure);	126	super.init(figure);
103	}	127	}
104		128
		129	/**
		130	* @see org.eclipse.draw2d.Animator#tearDown(org.eclipse.draw2d.IFigure)
		131	*/
105	public void tearDown(IFigure figure) {	132	public void tearDown(IFigure figure) {
106	if (figure instanceof DrawerFigure)	133	if (figure instanceof DrawerFigure)
107	((DrawerFigure) figure).setAnimating(false);	134	((DrawerFigure) figure).setAnimating(false);

Lines 1-5 Link Here

(-)src/org/eclipse/gef/ui/palette/editparts/PaletteToolbarLayout.java (-4 / +9 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2005 IBM Corporation and others.	2	* Copyright (c) 2000, 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 8-14 Link Here
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.gef.internal.ui.palette.editparts;	11	package org.eclipse.gef.ui.palette.editparts;
12		12
13	import java.util.ArrayList;	13	import java.util.ArrayList;
14	import java.util.Iterator;	14	import java.util.Iterator;
Lines 19-27 Link Here
19	import org.eclipse.draw2d.geometry.Dimension;	19	import org.eclipse.draw2d.geometry.Dimension;
20	import org.eclipse.draw2d.geometry.Rectangle;	20	import org.eclipse.draw2d.geometry.Rectangle;
21		21
		22	import org.eclipse.gef.internal.ui.palette.editparts.DrawerFigure;
		23
22	/**	24	/**
23	* A ToolbarLayout-like layout for the palette. This layout is palette-specific and	25	* A ToolbarLayout-like layout for the palette. This layout only works when
24	* should not be used externally. This layout only works when vertically oriented.	26	* vertically oriented.
25	*	27	*
26	* @author Pratik Shah	28	* @author Pratik Shah
27	*/	29	*/
Lines 39-44 Link Here
39	return child instanceof DrawerFigure && ((DrawerFigure)child).isExpanded();	41	return child instanceof DrawerFigure && ((DrawerFigure)child).isExpanded();
40	}	42	}
41		43
		44	/**
		45	* @see org.eclipse.draw2d.ToolbarLayout#layout(org.eclipse.draw2d.IFigure)
		46	*/
42	public void layout(IFigure parent) {	47	public void layout(IFigure parent) {
43	List children = parent.getChildren();	48	List children = parent.getChildren();
44	List childrenGrabbingVertical = new ArrayList();	49	List childrenGrabbingVertical = new ArrayList();

Lines 28-33 Link Here

(-)META-INF/MANIFEST.MF (+1 lines)
28	org.eclipse.gef.ui.console.icons,	28	org.eclipse.gef.ui.console.icons,
29	org.eclipse.gef.ui.palette,	29	org.eclipse.gef.ui.palette,
30	org.eclipse.gef.ui.palette.customize,	30	org.eclipse.gef.ui.palette.customize,
		31	org.eclipse.gef.ui.palette.editparts,
31	org.eclipse.gef.ui.parts,	32	org.eclipse.gef.ui.parts,
32	org.eclipse.gef.ui.properties,	33	org.eclipse.gef.ui.properties,
33	org.eclipse.gef.ui.rulers,	34	org.eclipse.gef.ui.rulers,

Return to bug 206800

Lines 1-5 Link Here

(-)src/org/eclipse/gef/ui/palette/PaletteViewer.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2005 IBM Corporation and others.	2	* Copyright (c) 2000, 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 32-38 Link Here
32	import org.eclipse.gef.editparts.SimpleRootEditPart;	32	import org.eclipse.gef.editparts.SimpleRootEditPart;
33	import org.eclipse.gef.internal.ui.palette.PaletteSelectionTool;	33	import org.eclipse.gef.internal.ui.palette.PaletteSelectionTool;
34	import org.eclipse.gef.internal.ui.palette.editparts.DrawerEditPart;	34	import org.eclipse.gef.internal.ui.palette.editparts.DrawerEditPart;
35	import org.eclipse.gef.internal.ui.palette.editparts.PaletteEditPart;
36	import org.eclipse.gef.internal.ui.palette.editparts.PaletteStackEditPart;	35	import org.eclipse.gef.internal.ui.palette.editparts.PaletteStackEditPart;
37	import org.eclipse.gef.internal.ui.palette.editparts.ToolEntryEditPart;	36	import org.eclipse.gef.internal.ui.palette.editparts.ToolEntryEditPart;
38	import org.eclipse.gef.palette.PaletteDrawer;	37	import org.eclipse.gef.palette.PaletteDrawer;
Lines 42-47 Link Here
42	import org.eclipse.gef.palette.PaletteStack;	41	import org.eclipse.gef.palette.PaletteStack;
43	import org.eclipse.gef.palette.ToolEntry;	42	import org.eclipse.gef.palette.ToolEntry;
44	import org.eclipse.gef.ui.palette.customize.PaletteCustomizerDialog;	43	import org.eclipse.gef.ui.palette.customize.PaletteCustomizerDialog;
		44	import org.eclipse.gef.ui.palette.editparts.PaletteEditPart;
45	import org.eclipse.gef.ui.parts.PaletteViewerKeyHandler;	45	import org.eclipse.gef.ui.parts.PaletteViewerKeyHandler;
46	import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer;	46	import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer;
47		47