Index: plugin.xml
===================================================================
RCS file: /home/eclipse/org.eclipse.ui.tests/plugin.xml,v
retrieving revision 1.138
diff -u -r1.138 plugin.xml
--- plugin.xml	20 Jun 2005 13:33:18 -0000	1.138
+++ plugin.xml	30 Jun 2005 18:07:58 -0000
@@ -646,6 +646,21 @@
                id="org.eclipse.ui.tests.markers.delete">
          </action>
       </actionSet>
+      <actionSet
+            label="TestEditorMulti"
+            visible="false"
+            id="org.eclipse.ui.tests.multieditor.actionSet">
+         <action
+               class="org.eclipse.ui.tests.api.MockEditorActionDelegate"
+               disabledIcon="icons/binary_co.gif"
+               icon="icons/view.gif"
+               id="org.eclipse.ui.tests.multieditor.editorAction.action"
+               label="MockMultiEditorAction"
+               style="push"
+               toolbarPath="Normal/Presentation"
+               tooltip="MultiEditorActionThing"/>
+      </actionSet>
+      
    </extension>
    <extension
          point="org.eclipse.ui.viewActions">
@@ -1995,7 +2010,21 @@
             default="true"
             name="Editor w/Outline"
             id="org.eclipse.ui.tests.perf_outline"
-            extensions="perf_outline"/>    
+            extensions="perf_outline"/>
+      <editor
+            class="org.eclipse.ui.tests.multieditor.TiledEditor"
+            default="false"
+            icon="icons/editor.gif"
+            id="org.eclipse.ui.tests.multieditor.TiledEditor"
+            name="%Editors.TiledEditor"/>
+      <editor
+            class="org.eclipse.ui.tests.multieditor.TestEditor"
+            contributorClass="org.eclipse.ui.tests.multieditor.TestActionBarContributor"
+            default="false"
+            extensions="etest"
+            icon="icons/binary_co.gif"
+            id="org.eclipse.ui.tests.multieditor.TestEditor"
+            name="%Editors.TestEditor"/>    
    </extension>
    <extension
          point="org.eclipse.ui.perspectives">
@@ -2318,4 +2347,13 @@
             icon="icons/anything.gif"
             id="org.eclipse.category1"/>   
    </extension>
-</plugin>            
\ No newline at end of file
+   <extension
+         id="org.eclipse.ui.tests.multieditor.ASPA"
+         name="ASPA"
+         point="org.eclipse.ui.actionSetPartAssociations">
+      <actionSetPartAssociation targetID="org.eclipse.ui.tests.multieditor.actionSet">
+         <part id="org.eclipse.ui.tests.multieditor.TestEditor"/>
+      </actionSetPartAssociation>
+   </extension>
+   
+</plugin>            
Index: UI Test Utils/org/eclipse/ui/tests/util/CallHistory.java
===================================================================
RCS file: /home/eclipse/org.eclipse.ui.tests/UI Test Utils/org/eclipse/ui/tests/util/CallHistory.java,v
retrieving revision 1.8
diff -u -r1.8 CallHistory.java
--- UI Test Utils/org/eclipse/ui/tests/util/CallHistory.java	25 Feb 2005 20:51:38 -0000	1.8
+++ UI Test Utils/org/eclipse/ui/tests/util/CallHistory.java	30 Jun 2005 18:07:59 -0000
@@ -39,6 +39,8 @@
 
     private Class classType;
 
+	private boolean fValidateMethods;
+
     /**
      * Creates a new call history for an object.  
      * 
@@ -47,6 +49,7 @@
     public CallHistory(Object target) {
         methodList = new ArrayList();
         classType = target.getClass();
+        fValidateMethods = true;
     }
 
     /**
@@ -54,6 +57,8 @@
      * for the given target class.
      */
     private void testMethodName(String methodName) {
+    	if (!fValidateMethods) return;
+    	
         Method[] methods = classType.getMethods();
         for (int i = 0; i < methods.length; i++)
             if (methods[i].getName().equals(methodName))
@@ -62,6 +67,16 @@
                 + classType.getName() + ") does not contain method: "
                 + methodName);
     }
+    
+    /**
+     * Enable/disable the restriction that you can only add
+     * public methods to the call history.
+     * 
+     * @param b true - only public methods are allowed.
+     */
+    public void validateMethods(boolean b) {
+    	fValidateMethods = b;
+    }
 
     /**
      * Adds a method name to the call history.  
@@ -145,6 +160,6 @@
      */
     public void printToConsole() {
         for (int i = 0; i < methodList.size(); i++)
-            System.out.println(methodList.get(i));
+            System.err.println(methodList.get(i));
     }
 }
Index: Eclipse UI Tests/org/eclipse/ui/tests/multieditor/MultiEditorTest.java
===================================================================
RCS file: Eclipse UI Tests/org/eclipse/ui/tests/multieditor/MultiEditorTest.java
diff -N Eclipse UI Tests/org/eclipse/ui/tests/multieditor/MultiEditorTest.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Eclipse UI Tests/org/eclipse/ui/tests/multieditor/MultiEditorTest.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,280 @@
+package org.eclipse.ui.tests.multieditor;
+
+import junit.framework.TestSuite;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.ILog;
+import org.eclipse.core.runtime.ILogListener;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.ToolBarContributionItem;
+import org.eclipse.jface.action.ToolBarManager;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+import org.eclipse.ui.IActionBars2;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorRegistry;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.internal.WorkbenchPage;
+import org.eclipse.ui.internal.WorkbenchPlugin;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.MultiEditor;
+import org.eclipse.ui.part.MultiEditorInput;
+import org.eclipse.ui.tests.util.CallHistory;
+import org.eclipse.ui.tests.util.UITestCase;
+
+public class MultiEditorTest extends UITestCase {
+	private static final String TEST04_PROPERTIES = "test04.properties";
+
+	private static final String TESTEDITOR_COOLBAR = "org.eclipse.ui.tests.multieditor.TestEditor";
+
+	private static final String TEST03_ETEST = "test03.etest";
+
+	private static final String BUILD_XML = "build.xml";
+
+	private static final String EDITOR_FAIL_LOG = "Unable to create editor ID ";
+
+	public static final String TILED_EDITOR_ID = "org.eclipse.ui.tests.multieditor.TiledEditor";
+
+	private static final String TEST01_TXT = "test01.txt";
+
+	private static final String TEST02_TXT = "test02.txt";
+
+	private NPEListener fNpeListener;
+
+	public static TestSuite suite() {
+		return new TestSuite(MultiEditorTest.class);
+	}
+
+	public MultiEditorTest(String tc) {
+		super(tc);
+	}
+
+	public static class NPEListener implements ILogListener {
+		public boolean noNPE = true;
+
+		public void logging(IStatus status, String plugin) {
+			String msg = status.getMessage();
+			if (msg != null
+					&& msg.indexOf(MultiEditorTest.EDITOR_FAIL_LOG
+							+ MultiEditorTest.TILED_EDITOR_ID) >= 0) {
+				noNPE = false;
+			}
+		}
+	}
+
+	public void testOpenBasicEditor() throws Throwable {
+		final String[] simpleFiles = { TEST01_TXT, TEST02_TXT };
+
+		setupNpe();
+		IWorkbenchWindow window = fWorkbench.getActiveWorkbenchWindow();
+
+		// Create a blurb file.
+		IWorkbenchPage page = window.getActivePage();
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		IProject testProject = workspace.getRoot().getProject(
+				"TiledEditorProject");
+		if (!testProject.exists()) {
+			testProject.create(null);
+		}
+		testProject.open(null);
+
+		MultiEditorInput input = generateEditorInput(simpleFiles, testProject);
+
+		openAndValidateEditor(page, input);
+		// listItems((WorkbenchPage) page);
+	}
+
+	public void testOpenBuildFile() throws Throwable {
+		final String[] simpleFiles = { TEST01_TXT, TEST02_TXT,
+				TEST04_PROPERTIES, BUILD_XML, TEST03_ETEST };
+
+		setupNpe();
+		IWorkbenchWindow window = fWorkbench.getActiveWorkbenchWindow();
+
+		WorkbenchPage page = (WorkbenchPage) window.getActivePage();
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		IProject testProject = workspace.getRoot().getProject(
+				"TiledEditorProject");
+		if (!testProject.exists()) {
+			testProject.create(null);
+		}
+		testProject.open(null);
+
+		MultiEditorInput input = generateEditorInput(simpleFiles, testProject);
+
+		IEditorPart editor = openAndValidateEditor(page, input);
+		assertTrue(editor instanceof MultiEditor);
+		MultiEditor multiEditor = (MultiEditor) editor;
+		chewUpEvents();
+
+		IEditorPart activeEditor = multiEditor.getActiveEditor();
+		//checkView(page);
+		listItems(page);
+		// getInfo(page);
+
+		IContributionItem contribution = ((IActionBars2) page.getActionBars())
+				.getCoolBarManager().find(TESTEDITOR_COOLBAR);
+		assertNotNull(contribution);
+		System.err.println("contribution " + contribution.getClass().getName());
+
+		assertFalse("We open in the default text editor", contribution
+				.isVisible());
+		assertTrue("And we're good to go", contribution.isEnabled());
+
+		IEditorPart[] innerEditors = multiEditor.getInnerEditors();
+		innerEditors[innerEditors.length - 1].setFocus();
+
+		chewUpEvents();
+		// listHistory(((TiledEditor) multiEditor).callHistory);
+		listItems(page);
+		// getInfo(page);
+
+		activeEditor = multiEditor.getActiveEditor();
+
+		assertNotNull(contribution);
+		assertTrue("We are in the test editor", contribution.isVisible());
+		assertTrue("And we're good to go", contribution.isEnabled());
+
+		// extra test
+		innerEditors[innerEditors.length - 2].setFocus();
+		chewUpEvents();
+
+		listItems(page);
+		// getInfo(page);
+
+		innerEditors[innerEditors.length - 3].setFocus();
+		chewUpEvents();
+
+		listItems(page);
+		// getInfo(page);
+}
+
+	private void checkView(WorkbenchPage page) {
+		IViewPart[] views = page.getViews();
+		for (int i=0; i<views.length; ++i) {
+			System.err.println("view: " + views[i].getViewSite().getId()
+					+ "/" + views[i].getViewSite().getRegisteredName());
+		}
+	}
+
+	private void listHistory(CallHistory history) {
+		history.printToConsole();
+	}
+
+	private void listItems(WorkbenchPage page) {
+		checkView(page);
+		IContributionItem[] items = ((IActionBars2) page.getActionBars())
+				.getCoolBarManager().getItems();
+		System.err.println("Length: " + items.length);
+		for (int i = 0; i < items.length; ++i) {
+			System.err.println("" + items[i].isEnabled() + ":"
+					+ items[i].isVisible() + " " + items[i].getId() + "\n\t"
+					+ items[i].getClass().getName());
+			if (items[i] instanceof ToolBarContributionItem) {
+				displayItem(items[i]);
+			}
+		}
+		System.err.println("----");
+	}
+
+	private void getInfo(WorkbenchPage page) {
+		IContributionItem[] items = ((IActionBars2) page.getActionBars())
+				.getCoolBarManager().getItems();
+		for (int i = 0; i < items.length; ++i) {
+			IContributionItem contributionItem = items[i];
+			if (contributionItem.getId().equals(
+					"org.eclipse.ui.edit.text.actionSet.presentation")
+					|| contributionItem.getId().equals(
+							"org.eclipse.ui.tests.multieditor.actionSet")) {
+				System.err.println("----\n" + contributionItem.getId());
+				displayItem(contributionItem);
+			}
+		}
+	}
+
+	private void displayItem(IContributionItem contributionItem) {
+		ToolBarManager toolBarManager = (ToolBarManager) ((ToolBarContributionItem) contributionItem)
+				.getToolBarManager();
+		ToolBar bar = toolBarManager.getControl();
+		if (bar == null) {
+			System.err.println("\tInfo-items: -1");
+		} else {
+			System.err.println("\tInfo-items: " + bar.getItemCount() + "/"
+					+ bar.getEnabled() + "/" + bar.isEnabled() + "/"
+					+ bar.isVisible());
+			ToolItem[] tools = bar.getItems();
+			for (int t = 0; t < tools.length; ++t) {
+				System.err.println("\t\titem: " + tools[t].getEnabled() + " "
+						+ tools[t].getToolTipText());
+			}
+		}
+	}
+
+	/**
+	 * After an internal action, see if there are any outstanding SWT events.
+	 */
+	private void chewUpEvents() throws InterruptedException {
+		Thread.sleep(250);
+		Display display = Display.getCurrent();
+		while (display.readAndDispatch())
+			;
+		Thread.sleep(5000);
+	}
+
+	private IEditorPart openAndValidateEditor(IWorkbenchPage page,
+			MultiEditorInput input) throws PartInitException {
+		IEditorPart editorPart = page.openEditor(input,
+				MultiEditorTest.TILED_EDITOR_ID);
+		// System.err.println("Editor " + editorPart.getClass().getName());
+		assertNotNull(editorPart);
+		// 3.1.0 only
+		// assertFalse("Blew up", editorPart instanceof ErrorEditorPart);
+
+		assertTrue("Unable to create " + MultiEditorTest.TILED_EDITOR_ID,
+				fNpeListener.noNPE);
+		return editorPart;
+	}
+
+	private void setupNpe() {
+		final ILog log = WorkbenchPlugin.getDefault().getLog();
+		fNpeListener = new NPEListener();
+		log.addLogListener(fNpeListener);
+	}
+
+	private MultiEditorInput generateEditorInput(String[] simpleFiles,
+			IProject testProject) throws CoreException {
+		String[] ids = new String[simpleFiles.length];
+		IEditorInput[] inputs = new IEditorInput[simpleFiles.length];
+		IEditorRegistry registry = fWorkbench.getEditorRegistry();
+
+		for (int f = 0; f < simpleFiles.length; ++f) {
+			IFile f1 = testProject.getFile(simpleFiles[f]);
+			if (!f1.exists()) {
+				f1.create(getClass().getResourceAsStream(simpleFiles[f]), true,
+						null);
+			}
+			ids[f] = registry.getDefaultEditor(f1.getName()).getId();
+			inputs[f] = new FileEditorInput(f1);
+		}
+
+		MultiEditorInput input = new MultiEditorInput(ids, inputs);
+		return input;
+	}
+
+	protected void doTearDown() throws Exception {
+		fWorkbench.getActiveWorkbenchWindow().getActivePage().closeAllEditors(
+				false);
+		super.doTearDown();
+	}
+
+}
Index: Eclipse UI Tests/org/eclipse/ui/tests/multieditor/TestActionBarContributor.java
===================================================================
RCS file: Eclipse UI Tests/org/eclipse/ui/tests/multieditor/TestActionBarContributor.java
diff -N Eclipse UI Tests/org/eclipse/ui/tests/multieditor/TestActionBarContributor.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Eclipse UI Tests/org/eclipse/ui/tests/multieditor/TestActionBarContributor.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,18 @@
+package org.eclipse.ui.tests.multieditor;
+
+import org.eclipse.jface.action.ICoolBarManager;
+import org.eclipse.ui.part.EditorActionBarContributor;
+
+public class TestActionBarContributor extends EditorActionBarContributor {
+
+	public TestActionBarContributor() {
+		super();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.part.EditorActionBarContributor#contributeToCoolBar(org.eclipse.jface.action.ICoolBarManager)
+	 */
+	public void contributeToCoolBar(ICoolBarManager coolBarManager) {
+		super.contributeToCoolBar(coolBarManager);
+	}
+}
Index: Eclipse UI Tests/org/eclipse/ui/tests/multieditor/TestEditor.java
===================================================================
RCS file: Eclipse UI Tests/org/eclipse/ui/tests/multieditor/TestEditor.java
diff -N Eclipse UI Tests/org/eclipse/ui/tests/multieditor/TestEditor.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Eclipse UI Tests/org/eclipse/ui/tests/multieditor/TestEditor.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,73 @@
+package org.eclipse.ui.tests.multieditor;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.RowLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.part.EditorPart;
+
+public class TestEditor extends EditorPart {
+
+	private Composite fMainPanel;
+
+	public TestEditor() {
+		super();
+		// TODO Auto-generated constructor stub
+	}
+
+	public void doSave(IProgressMonitor monitor) {
+		// TODO Auto-generated method stub
+
+	}
+
+	public void doSaveAs() {
+		// TODO Auto-generated method stub
+
+	}
+
+	public void init(IEditorSite site, IEditorInput input)
+			throws PartInitException {
+		if (!(input instanceof IFileEditorInput))
+			throw new PartInitException(
+					"Invalid Input: Must be IFileEditorInput");
+		setSite(site);
+		setInput(input);
+
+	}
+
+	public boolean isDirty() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public boolean isSaveAsAllowed() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public void createPartControl(Composite parent) {
+		fMainPanel = new Composite(parent, SWT.NONE);
+		fMainPanel.setLayout(new RowLayout(SWT.VERTICAL));
+
+		Label l = new Label(fMainPanel, SWT.NONE);
+		l.setText("Editor Title:");
+
+		l = new Label(fMainPanel, SWT.BORDER);
+		l.setText(getEditorInput().getName());
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
+	 */
+	public void setFocus() {
+		fMainPanel.setFocus();
+	}
+
+}
Index: Eclipse UI Tests/org/eclipse/ui/tests/multieditor/TiledEditor.java
===================================================================
RCS file: Eclipse UI Tests/org/eclipse/ui/tests/multieditor/TiledEditor.java
diff -N Eclipse UI Tests/org/eclipse/ui/tests/multieditor/TiledEditor.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Eclipse UI Tests/org/eclipse/ui/tests/multieditor/TiledEditor.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,166 @@
+/*
+ * (c) Copyright 2001 MyCorporation.
+ * All Rights Reserved.
+ */
+package org.eclipse.ui.tests.multieditor;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.custom.ViewForm;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IPropertyListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.part.MultiEditor;
+import org.eclipse.ui.part.MultiEditorInput;
+import org.eclipse.ui.tests.util.CallHistory;
+
+/**
+ * Implementation of a TiledEditor
+ */
+public class TiledEditor extends MultiEditor {
+	
+	private CLabel innerEditorTitle[];
+	public CallHistory callHistory;
+	
+	public TiledEditor() {
+		super();
+		callHistory = new CallHistory(this);
+		callHistory.validateMethods(false);
+	}
+	
+	/*
+	 * @see IWorkbenchPart#createPartControl(Composite)
+	 */
+	public void createPartControl(Composite parent) {
+		callHistory.add("createPartControl");
+		
+		parent = new Composite(parent, SWT.BORDER);
+
+		parent.setLayout(new FillLayout());
+		SashForm sashForm = new SashForm(parent, SWT.HORIZONTAL);
+		IEditorPart innerEditors[] = getInnerEditors();
+		
+		for (int i = 0; i < innerEditors.length; i++) {
+			final IEditorPart e = innerEditors[i];
+			ViewForm viewForm = new ViewForm(sashForm, SWT.NONE);
+			viewForm.marginWidth = 0;
+			viewForm.marginHeight = 0;
+
+			createInnerEditorTitle(i, viewForm);
+			
+			Composite content = createInnerPartControl(viewForm,e);
+			
+			viewForm.setContent(content);
+			updateInnerEditorTitle(e, innerEditorTitle[i]);
+			
+			final int index = i;
+			e.addPropertyListener(new IPropertyListener() {
+				public void propertyChanged(Object source, int property) {
+					if (property == IEditorPart.PROP_DIRTY || property == IWorkbenchPart.PROP_TITLE)
+						if (source instanceof IEditorPart)
+							updateInnerEditorTitle((IEditorPart) source, innerEditorTitle[index]);
+				}
+			});
+		}
+	}
+	
+	/**
+	 * Draw the gradient for the specified editor.
+	 */
+	protected void drawGradient(IEditorPart innerEditor, Gradient g) {
+		callHistory.add("drawGradient");
+		
+		CLabel label = innerEditorTitle[getIndex(innerEditor)];
+		if((label == null) || label.isDisposed())
+			return;
+			
+		label.setForeground(g.fgColor);
+		label.setBackground(g.bgColors, g.bgPercents);
+	}
+	
+	/*
+	 * Create the label for each inner editor. 
+	 */
+	protected void createInnerEditorTitle(int index, ViewForm parent) {
+		
+		CLabel titleLabel = new CLabel(parent, SWT.SHADOW_NONE);
+		//hookFocus(titleLabel);
+		titleLabel.setAlignment(SWT.LEFT);
+		titleLabel.setBackground(null, null);
+		parent.setTopLeft(titleLabel);
+		if (innerEditorTitle == null)
+			innerEditorTitle = new CLabel[getInnerEditors().length];
+		innerEditorTitle[index] = titleLabel;
+	}
+	
+	/*
+	 * Update the tab for an editor.  This is typically called
+	 * by a site when the tab title changes.
+	 */
+	public void updateInnerEditorTitle(IEditorPart editor, CLabel label) {
+		callHistory.add("updateInnerEditorTitle");
+		
+		if((label == null) || label.isDisposed())
+			return;
+		String title = editor.getTitle();
+		if (editor.isDirty())
+			title = "*" + title; //$NON-NLS-1$
+		label.setText(title);
+		Image image = editor.getTitleImage();
+		if (image != null)
+			if (!image.equals(label.getImage()))
+				label.setImage(image);
+		label.setToolTipText(editor.getTitleToolTip());
+	}
+	
+	/*
+	 * 
+	 */
+	protected int getIndex(IEditorPart editor) {
+		callHistory.add("getIndex");
+		
+		IEditorPart innerEditors[] = getInnerEditors();
+		for (int i = 0; i < innerEditors.length; i++) {
+			if (innerEditors[i] == editor)
+				return i;
+		}
+		return -1;
+	}
+
+	protected void activateEditor(IEditorPart part) {
+		callHistory.add("activateEditor");
+		super.activateEditor(part);
+	}
+
+	public Composite createInnerPartControl(Composite parent, IEditorPart e) {
+		callHistory.add("createInnerPartControl");
+		return super.createInnerPartControl(parent, e);
+	}
+
+	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
+		callHistory.add("init");
+		super.init(site, input);
+	}
+
+	public void init(IEditorSite site, MultiEditorInput input) throws PartInitException {
+		callHistory.add("init");
+		super.init(site, input);
+	}
+
+	public void setFocus() {
+		callHistory.add("");
+		super.setFocus();
+	}
+
+	public void updateGradient(IEditorPart editor) {
+		callHistory.add("updateGradient");
+		super.updateGradient(editor);
+	}
+}
Index: Eclipse UI Tests/org/eclipse/ui/tests/multieditor/build.xml
===================================================================
RCS file: Eclipse UI Tests/org/eclipse/ui/tests/multieditor/build.xml
diff -N Eclipse UI Tests/org/eclipse/ui/tests/multieditor/build.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Eclipse UI Tests/org/eclipse/ui/tests/multieditor/build.xml	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ====================================================================== 
+     Jun 27, 2005 10:23:13 AM                                                        
+
+     project    
+     description
+                   
+     pwebster                                                                
+     ====================================================================== -->
+<project name="project" default="default">
+    <description>
+            description
+    </description>
+
+    <!-- ================================= 
+          target: default              
+         ================================= -->
+    <target name="default" depends="depends" description="--> description">
+        
+    </target>
+
+    <!-- - - - - - - - - - - - - - - - - - 
+          target: depends                      
+         - - - - - - - - - - - - - - - - - -->
+    <target name="depends">
+    </target>
+
+</project>
+
Index: Eclipse UI Tests/org/eclipse/ui/tests/multieditor/items.txt
===================================================================
RCS file: Eclipse UI Tests/org/eclipse/ui/tests/multieditor/items.txt
diff -N Eclipse UI Tests/org/eclipse/ui/tests/multieditor/items.txt
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Eclipse UI Tests/org/eclipse/ui/tests/multieditor/items.txt	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,207 @@
+Length: 14
+true:false group.file
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.ui.workbench.file
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 3/true/true/true
+		item: true New
+		item: false Save
+		item: false Print
+true:false additions
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.debug.ui.launchActionSet
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 1/true/true/true
+		item: true External Tools
+true:true org.eclipse.search.searchActionSet
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 1/true/true/true
+		item: true Search
+true:false group.nav
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.ui.workbench.navigate
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 3/true/true/true
+		item: false Last Edit Location
+		item: false Back
+		item: false Forward
+true:false group.editor
+	org.eclipse.jface.action.GroupMarker
+true:false org.eclipse.ui.tests.multieditor.TestEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: -1
+true:false org.eclipse.ant.ui.internal.editor.AntEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: -1
+true:false org.eclipse.jdt.ui.PropertiesFileEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: -1
+true:true org.eclipse.ui.DefaultTextEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 0/true/true/true
+true:false group.help
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.ui.workbench.help
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 0/true/true/true
+----
+contribution org.eclipse.jface.action.ToolBarContributionItem
+Length: 15
+true:false group.file
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.ui.workbench.file
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 3/true/true/true
+		item: true New
+		item: false Save
+		item: false Print
+true:false additions
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.debug.ui.launchActionSet
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 1/true/true/true
+		item: true External Tools
+true:true org.eclipse.search.searchActionSet
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 1/true/true/true
+		item: true Search
+true:true org.eclipse.ui.tests.multieditor.actionSet
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 1/true/true/true
+		item: true MultiEditorActionThing
+true:false group.nav
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.ui.workbench.navigate
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 3/true/true/true
+		item: false Last Edit Location
+		item: false Back
+		item: false Forward
+true:false group.editor
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.ui.tests.multieditor.TestEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 0/true/true/true
+true:false org.eclipse.ant.ui.internal.editor.AntEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: -1
+true:false org.eclipse.jdt.ui.PropertiesFileEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: -1
+true:false org.eclipse.ui.DefaultTextEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 0/true/true/true
+true:false group.help
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.ui.workbench.help
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 0/true/true/true
+----
+Length: 16
+true:false group.file
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.ui.workbench.file
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 3/true/true/true
+		item: true New
+		item: false Save
+		item: false Print
+true:false additions
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.debug.ui.launchActionSet
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 1/true/true/true
+		item: true External Tools
+true:true org.eclipse.search.searchActionSet
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 1/true/true/true
+		item: true Search
+true:true org.eclipse.ui.edit.text.actionSet.presentation
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 2/true/true/true
+		item: false Toggle Ant Editor Auto Reconcile
+		item: false Toggle Ant Mark Occurrences
+true:true org.eclipse.ui.tests.multieditor.actionSet
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 0/true/true/true
+true:false group.nav
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.ui.workbench.navigate
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 3/true/true/true
+		item: false Last Edit Location
+		item: false Back
+		item: false Forward
+true:false group.editor
+	org.eclipse.jface.action.GroupMarker
+true:false org.eclipse.ui.tests.multieditor.TestEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 0/true/true/true
+true:true org.eclipse.ant.ui.internal.editor.AntEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 0/true/true/true
+true:false org.eclipse.jdt.ui.PropertiesFileEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: -1
+true:false org.eclipse.ui.DefaultTextEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 0/true/true/true
+true:false group.help
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.ui.workbench.help
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 0/true/true/true
+----
+Length: 16
+true:false group.file
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.ui.workbench.file
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 3/true/true/true
+		item: true New
+		item: false Save
+		item: false Print
+true:false additions
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.debug.ui.launchActionSet
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 1/true/true/true
+		item: true External Tools
+true:true org.eclipse.search.searchActionSet
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 1/true/true/true
+		item: true Search
+true:true org.eclipse.ui.edit.text.actionSet.presentation
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 0/true/true/true
+true:true org.eclipse.ui.tests.multieditor.actionSet
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 0/true/true/true
+true:false group.nav
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.ui.workbench.navigate
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 3/true/true/true
+		item: false Last Edit Location
+		item: false Back
+		item: false Forward
+true:false group.editor
+	org.eclipse.jface.action.GroupMarker
+true:false org.eclipse.ui.tests.multieditor.TestEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 0/true/true/true
+true:false org.eclipse.ant.ui.internal.editor.AntEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 0/true/true/true
+true:true org.eclipse.jdt.ui.PropertiesFileEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 0/true/true/true
+true:false org.eclipse.ui.DefaultTextEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 0/true/true/true
+true:false group.help
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.ui.workbench.help
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 0/true/true/true
+----
Index: Eclipse UI Tests/org/eclipse/ui/tests/multieditor/items302.txt
===================================================================
RCS file: Eclipse UI Tests/org/eclipse/ui/tests/multieditor/items302.txt
diff -N Eclipse UI Tests/org/eclipse/ui/tests/multieditor/items302.txt
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Eclipse UI Tests/org/eclipse/ui/tests/multieditor/items302.txt	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,179 @@
+Length: 12
+true:false group.file
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.ui.workbench.file
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 3/true/true/true
+		item: true New
+		item: false Save
+		item: false Print
+true:false additions
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.debug.ui.launchActionSet
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 1/true/true/true
+		item: true External Tools
+true:true org.eclipse.search.searchActionSet
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 1/true/true/true
+		item: true Search
+true:false group.nav
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.ui.workbench.navigate
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 3/true/true/true
+		item: false Last Edit Location
+		item: false Back
+		item: false Forward
+true:false group.editor
+	org.eclipse.jface.action.GroupMarker
+true:false org.eclipse.ui.tests.multieditor.TestEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: -1
+true:false org.eclipse.ant.ui.internal.editor.AntEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: -1
+true:false org.eclipse.jdt.ui.DefaultTextEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: -1
+true:true org.eclipse.ui.DefaultTextEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 0/true/true/true
+----
+contribution org.eclipse.jface.action.ToolBarContributionItem
+Length: 13
+true:false group.file
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.ui.workbench.file
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 3/true/true/true
+		item: true New
+		item: false Save
+		item: false Print
+true:false additions
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.debug.ui.launchActionSet
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 1/true/true/true
+		item: true External Tools
+true:true org.eclipse.search.searchActionSet
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 1/true/true/true
+		item: true Search
+true:true org.eclipse.ui.tests.multieditor.actionSet
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 1/true/true/true
+		item: true MultiEditorActionThing
+true:false group.nav
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.ui.workbench.navigate
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 3/true/true/true
+		item: false Last Edit Location
+		item: false Back
+		item: false Forward
+true:false group.editor
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.ui.tests.multieditor.TestEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 0/true/true/true
+true:false org.eclipse.ant.ui.internal.editor.AntEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: -1
+true:false org.eclipse.jdt.ui.DefaultTextEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: -1
+true:false org.eclipse.ui.DefaultTextEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 0/true/true/true
+----
+Length: 13
+true:false group.file
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.ui.workbench.file
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 3/true/true/true
+		item: true New
+		item: false Save
+		item: false Print
+true:false additions
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.debug.ui.launchActionSet
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 1/true/true/true
+		item: true External Tools
+true:true org.eclipse.search.searchActionSet
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 1/true/true/true
+		item: true Search
+true:true org.eclipse.ui.tests.multieditor.actionSet
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 0/true/true/true
+true:false group.nav
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.ui.workbench.navigate
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 3/true/true/true
+		item: false Last Edit Location
+		item: false Back
+		item: false Forward
+true:false group.editor
+	org.eclipse.jface.action.GroupMarker
+true:false org.eclipse.ui.tests.multieditor.TestEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 0/true/true/true
+true:true org.eclipse.ant.ui.internal.editor.AntEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 0/true/true/true
+true:false org.eclipse.jdt.ui.DefaultTextEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: -1
+true:false org.eclipse.ui.DefaultTextEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 0/true/true/true
+----
+Length: 13
+true:false group.file
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.ui.workbench.file
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 3/true/true/true
+		item: true New
+		item: false Save
+		item: false Print
+true:false additions
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.debug.ui.launchActionSet
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 1/true/true/true
+		item: true External Tools
+true:true org.eclipse.search.searchActionSet
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 1/true/true/true
+		item: true Search
+true:true org.eclipse.ui.tests.multieditor.actionSet
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 0/true/true/true
+true:false group.nav
+	org.eclipse.jface.action.GroupMarker
+true:true org.eclipse.ui.workbench.navigate
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 3/true/true/true
+		item: false Last Edit Location
+		item: false Back
+		item: false Forward
+true:false group.editor
+	org.eclipse.jface.action.GroupMarker
+true:false org.eclipse.ui.tests.multieditor.TestEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 0/true/true/true
+true:false org.eclipse.ant.ui.internal.editor.AntEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 0/true/true/true
+true:true org.eclipse.jdt.ui.DefaultTextEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 0/true/true/true
+true:false org.eclipse.ui.DefaultTextEditor
+	org.eclipse.jface.action.ToolBarContributionItem
+	Info-items: 0/true/true/true
+----
Index: Eclipse UI Tests/org/eclipse/ui/tests/multieditor/test01.txt
===================================================================
RCS file: Eclipse UI Tests/org/eclipse/ui/tests/multieditor/test01.txt
diff -N Eclipse UI Tests/org/eclipse/ui/tests/multieditor/test01.txt
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Eclipse UI Tests/org/eclipse/ui/tests/multieditor/test01.txt	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,3 @@
+test file 01
+
+test for MultiEditor
Index: Eclipse UI Tests/org/eclipse/ui/tests/multieditor/test02.txt
===================================================================
RCS file: Eclipse UI Tests/org/eclipse/ui/tests/multieditor/test02.txt
diff -N Eclipse UI Tests/org/eclipse/ui/tests/multieditor/test02.txt
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Eclipse UI Tests/org/eclipse/ui/tests/multieditor/test02.txt	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,3 @@
+test file 02
+
+test for MultiEditor
Index: Eclipse UI Tests/org/eclipse/ui/tests/multieditor/test03.etest
===================================================================
RCS file: Eclipse UI Tests/org/eclipse/ui/tests/multieditor/test03.etest
diff -N Eclipse UI Tests/org/eclipse/ui/tests/multieditor/test03.etest
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Eclipse UI Tests/org/eclipse/ui/tests/multieditor/test03.etest	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,3 @@
+test file 03
+
+test for MultiEditor
Index: Eclipse UI Tests/org/eclipse/ui/tests/multieditor/test04.properties
===================================================================
RCS file: Eclipse UI Tests/org/eclipse/ui/tests/multieditor/test04.properties
diff -N Eclipse UI Tests/org/eclipse/ui/tests/multieditor/test04.properties
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Eclipse UI Tests/org/eclipse/ui/tests/multieditor/test04.properties	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,2 @@
+org.eclipse.ui.tests.multieditor.good = MultiEditorTest
+org.eclipse.ui.tests.multieditor.bad = TiledEditor
Index: icons/editor.gif
===================================================================
RCS file: icons/editor.gif
diff -N icons/editor.gif
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ icons/editor.gif	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,2 @@
+GIF89a�??�?��߿�߿����ߟ������___���!�
	,G0�I+=8�SO1`hH'����
+�el��t�a.��˗��6q��d�쩛�n˦�3�z��bL.[Ε;