View | Details | Raw Unified | Return to bug 96129 | Differences between
and this patch

Collapse All | Expand All

(-)plugin.xml (-2 / +40 lines)
Lines 646-651 Link Here
646
               id="org.eclipse.ui.tests.markers.delete">
646
               id="org.eclipse.ui.tests.markers.delete">
647
         </action>
647
         </action>
648
      </actionSet>
648
      </actionSet>
649
      <actionSet
650
            label="TestEditorMulti"
651
            visible="false"
652
            id="org.eclipse.ui.tests.multieditor.actionSet">
653
         <action
654
               class="org.eclipse.ui.tests.api.MockEditorActionDelegate"
655
               disabledIcon="icons/binary_co.gif"
656
               icon="icons/view.gif"
657
               id="org.eclipse.ui.tests.multieditor.editorAction.action"
658
               label="MockMultiEditorAction"
659
               style="push"
660
               toolbarPath="Normal/Presentation"
661
               tooltip="MultiEditorActionThing"/>
662
      </actionSet>
663
      
649
   </extension>
664
   </extension>
650
   <extension
665
   <extension
651
         point="org.eclipse.ui.viewActions">
666
         point="org.eclipse.ui.viewActions">
Lines 1995-2001 Link Here
1995
            default="true"
2010
            default="true"
1996
            name="Editor w/Outline"
2011
            name="Editor w/Outline"
1997
            id="org.eclipse.ui.tests.perf_outline"
2012
            id="org.eclipse.ui.tests.perf_outline"
1998
            extensions="perf_outline"/>    
2013
            extensions="perf_outline"/>
2014
      <editor
2015
            class="org.eclipse.ui.tests.multieditor.TiledEditor"
2016
            default="false"
2017
            icon="icons/editor.gif"
2018
            id="org.eclipse.ui.tests.multieditor.TiledEditor"
2019
            name="%Editors.TiledEditor"/>
2020
      <editor
2021
            class="org.eclipse.ui.tests.multieditor.TestEditor"
2022
            contributorClass="org.eclipse.ui.tests.multieditor.TestActionBarContributor"
2023
            default="false"
2024
            extensions="etest"
2025
            icon="icons/binary_co.gif"
2026
            id="org.eclipse.ui.tests.multieditor.TestEditor"
2027
            name="%Editors.TestEditor"/>    
1999
   </extension>
2028
   </extension>
2000
   <extension
2029
   <extension
2001
         point="org.eclipse.ui.perspectives">
2030
         point="org.eclipse.ui.perspectives">
Lines 2318-2321 Link Here
2318
            icon="icons/anything.gif"
2347
            icon="icons/anything.gif"
2319
            id="org.eclipse.category1"/>   
2348
            id="org.eclipse.category1"/>   
2320
   </extension>
2349
   </extension>
2321
</plugin>            
2350
   <extension
2351
         id="org.eclipse.ui.tests.multieditor.ASPA"
2352
         name="ASPA"
2353
         point="org.eclipse.ui.actionSetPartAssociations">
2354
      <actionSetPartAssociation targetID="org.eclipse.ui.tests.multieditor.actionSet">
2355
         <part id="org.eclipse.ui.tests.multieditor.TestEditor"/>
2356
      </actionSetPartAssociation>
2357
   </extension>
2358
   
2359
</plugin>            
(-)UI Test Utils/org/eclipse/ui/tests/util/CallHistory.java (-1 / +16 lines)
Lines 39-44 Link Here
39
39
40
    private Class classType;
40
    private Class classType;
41
41
42
	private boolean fValidateMethods;
43
42
    /**
44
    /**
43
     * Creates a new call history for an object.  
45
     * Creates a new call history for an object.  
44
     * 
46
     * 
Lines 47-52 Link Here
47
    public CallHistory(Object target) {
49
    public CallHistory(Object target) {
48
        methodList = new ArrayList();
50
        methodList = new ArrayList();
49
        classType = target.getClass();
51
        classType = target.getClass();
52
        fValidateMethods = true;
50
    }
53
    }
51
54
52
    /**
55
    /**
Lines 54-59 Link Here
54
     * for the given target class.
57
     * for the given target class.
55
     */
58
     */
56
    private void testMethodName(String methodName) {
59
    private void testMethodName(String methodName) {
60
    	if (!fValidateMethods) return;
61
    	
57
        Method[] methods = classType.getMethods();
62
        Method[] methods = classType.getMethods();
58
        for (int i = 0; i < methods.length; i++)
63
        for (int i = 0; i < methods.length; i++)
59
            if (methods[i].getName().equals(methodName))
64
            if (methods[i].getName().equals(methodName))
Lines 62-67 Link Here
62
                + classType.getName() + ") does not contain method: "
67
                + classType.getName() + ") does not contain method: "
63
                + methodName);
68
                + methodName);
64
    }
69
    }
70
    
71
    /**
72
     * Enable/disable the restriction that you can only add
73
     * public methods to the call history.
74
     * 
75
     * @param b true - only public methods are allowed.
76
     */
77
    public void validateMethods(boolean b) {
78
    	fValidateMethods = b;
79
    }
65
80
66
    /**
81
    /**
67
     * Adds a method name to the call history.  
82
     * Adds a method name to the call history.  
Lines 145-150 Link Here
145
     */
160
     */
146
    public void printToConsole() {
161
    public void printToConsole() {
147
        for (int i = 0; i < methodList.size(); i++)
162
        for (int i = 0; i < methodList.size(); i++)
148
            System.out.println(methodList.get(i));
163
            System.err.println(methodList.get(i));
149
    }
164
    }
150
}
165
}
(-)Eclipse (+280 lines)
Added Link Here
1
package org.eclipse.ui.tests.multieditor;
2
3
import junit.framework.TestSuite;
4
5
import org.eclipse.core.resources.IFile;
6
import org.eclipse.core.resources.IProject;
7
import org.eclipse.core.resources.IWorkspace;
8
import org.eclipse.core.resources.ResourcesPlugin;
9
import org.eclipse.core.runtime.CoreException;
10
import org.eclipse.core.runtime.ILog;
11
import org.eclipse.core.runtime.ILogListener;
12
import org.eclipse.core.runtime.IStatus;
13
import org.eclipse.jface.action.IContributionItem;
14
import org.eclipse.jface.action.ToolBarContributionItem;
15
import org.eclipse.jface.action.ToolBarManager;
16
import org.eclipse.swt.widgets.Display;
17
import org.eclipse.swt.widgets.ToolBar;
18
import org.eclipse.swt.widgets.ToolItem;
19
import org.eclipse.ui.IActionBars2;
20
import org.eclipse.ui.IEditorInput;
21
import org.eclipse.ui.IEditorPart;
22
import org.eclipse.ui.IEditorRegistry;
23
import org.eclipse.ui.IViewPart;
24
import org.eclipse.ui.IWorkbenchPage;
25
import org.eclipse.ui.IWorkbenchWindow;
26
import org.eclipse.ui.PartInitException;
27
import org.eclipse.ui.internal.WorkbenchPage;
28
import org.eclipse.ui.internal.WorkbenchPlugin;
29
import org.eclipse.ui.part.FileEditorInput;
30
import org.eclipse.ui.part.MultiEditor;
31
import org.eclipse.ui.part.MultiEditorInput;
32
import org.eclipse.ui.tests.util.CallHistory;
33
import org.eclipse.ui.tests.util.UITestCase;
34
35
public class MultiEditorTest extends UITestCase {
36
	private static final String TEST04_PROPERTIES = "test04.properties";
37
38
	private static final String TESTEDITOR_COOLBAR = "org.eclipse.ui.tests.multieditor.TestEditor";
39
40
	private static final String TEST03_ETEST = "test03.etest";
41
42
	private static final String BUILD_XML = "build.xml";
43
44
	private static final String EDITOR_FAIL_LOG = "Unable to create editor ID ";
45
46
	public static final String TILED_EDITOR_ID = "org.eclipse.ui.tests.multieditor.TiledEditor";
47
48
	private static final String TEST01_TXT = "test01.txt";
49
50
	private static final String TEST02_TXT = "test02.txt";
51
52
	private NPEListener fNpeListener;
53
54
	public static TestSuite suite() {
55
		return new TestSuite(MultiEditorTest.class);
56
	}
57
58
	public MultiEditorTest(String tc) {
59
		super(tc);
60
	}
61
62
	public static class NPEListener implements ILogListener {
63
		public boolean noNPE = true;
64
65
		public void logging(IStatus status, String plugin) {
66
			String msg = status.getMessage();
67
			if (msg != null
68
					&& msg.indexOf(MultiEditorTest.EDITOR_FAIL_LOG
69
							+ MultiEditorTest.TILED_EDITOR_ID) >= 0) {
70
				noNPE = false;
71
			}
72
		}
73
	}
74
75
	public void testOpenBasicEditor() throws Throwable {
76
		final String[] simpleFiles = { TEST01_TXT, TEST02_TXT };
77
78
		setupNpe();
79
		IWorkbenchWindow window = fWorkbench.getActiveWorkbenchWindow();
80
81
		// Create a blurb file.
82
		IWorkbenchPage page = window.getActivePage();
83
		IWorkspace workspace = ResourcesPlugin.getWorkspace();
84
		IProject testProject = workspace.getRoot().getProject(
85
				"TiledEditorProject");
86
		if (!testProject.exists()) {
87
			testProject.create(null);
88
		}
89
		testProject.open(null);
90
91
		MultiEditorInput input = generateEditorInput(simpleFiles, testProject);
92
93
		openAndValidateEditor(page, input);
94
		// listItems((WorkbenchPage) page);
95
	}
96
97
	public void testOpenBuildFile() throws Throwable {
98
		final String[] simpleFiles = { TEST01_TXT, TEST02_TXT,
99
				TEST04_PROPERTIES, BUILD_XML, TEST03_ETEST };
100
101
		setupNpe();
102
		IWorkbenchWindow window = fWorkbench.getActiveWorkbenchWindow();
103
104
		WorkbenchPage page = (WorkbenchPage) window.getActivePage();
105
		IWorkspace workspace = ResourcesPlugin.getWorkspace();
106
		IProject testProject = workspace.getRoot().getProject(
107
				"TiledEditorProject");
108
		if (!testProject.exists()) {
109
			testProject.create(null);
110
		}
111
		testProject.open(null);
112
113
		MultiEditorInput input = generateEditorInput(simpleFiles, testProject);
114
115
		IEditorPart editor = openAndValidateEditor(page, input);
116
		assertTrue(editor instanceof MultiEditor);
117
		MultiEditor multiEditor = (MultiEditor) editor;
118
		chewUpEvents();
119
120
		IEditorPart activeEditor = multiEditor.getActiveEditor();
121
		//checkView(page);
122
		listItems(page);
123
		// getInfo(page);
124
125
		IContributionItem contribution = ((IActionBars2) page.getActionBars())
126
				.getCoolBarManager().find(TESTEDITOR_COOLBAR);
127
		assertNotNull(contribution);
128
		System.err.println("contribution " + contribution.getClass().getName());
129
130
		assertFalse("We open in the default text editor", contribution
131
				.isVisible());
132
		assertTrue("And we're good to go", contribution.isEnabled());
133
134
		IEditorPart[] innerEditors = multiEditor.getInnerEditors();
135
		innerEditors[innerEditors.length - 1].setFocus();
136
137
		chewUpEvents();
138
		// listHistory(((TiledEditor) multiEditor).callHistory);
139
		listItems(page);
140
		// getInfo(page);
141
142
		activeEditor = multiEditor.getActiveEditor();
143
144
		assertNotNull(contribution);
145
		assertTrue("We are in the test editor", contribution.isVisible());
146
		assertTrue("And we're good to go", contribution.isEnabled());
147
148
		// extra test
149
		innerEditors[innerEditors.length - 2].setFocus();
150
		chewUpEvents();
151
152
		listItems(page);
153
		// getInfo(page);
154
155
		innerEditors[innerEditors.length - 3].setFocus();
156
		chewUpEvents();
157
158
		listItems(page);
159
		// getInfo(page);
160
}
161
162
	private void checkView(WorkbenchPage page) {
163
		IViewPart[] views = page.getViews();
164
		for (int i=0; i<views.length; ++i) {
165
			System.err.println("view: " + views[i].getViewSite().getId()
166
					+ "/" + views[i].getViewSite().getRegisteredName());
167
		}
168
	}
169
170
	private void listHistory(CallHistory history) {
171
		history.printToConsole();
172
	}
173
174
	private void listItems(WorkbenchPage page) {
175
		checkView(page);
176
		IContributionItem[] items = ((IActionBars2) page.getActionBars())
177
				.getCoolBarManager().getItems();
178
		System.err.println("Length: " + items.length);
179
		for (int i = 0; i < items.length; ++i) {
180
			System.err.println("" + items[i].isEnabled() + ":"
181
					+ items[i].isVisible() + " " + items[i].getId() + "\n\t"
182
					+ items[i].getClass().getName());
183
			if (items[i] instanceof ToolBarContributionItem) {
184
				displayItem(items[i]);
185
			}
186
		}
187
		System.err.println("----");
188
	}
189
190
	private void getInfo(WorkbenchPage page) {
191
		IContributionItem[] items = ((IActionBars2) page.getActionBars())
192
				.getCoolBarManager().getItems();
193
		for (int i = 0; i < items.length; ++i) {
194
			IContributionItem contributionItem = items[i];
195
			if (contributionItem.getId().equals(
196
					"org.eclipse.ui.edit.text.actionSet.presentation")
197
					|| contributionItem.getId().equals(
198
							"org.eclipse.ui.tests.multieditor.actionSet")) {
199
				System.err.println("----\n" + contributionItem.getId());
200
				displayItem(contributionItem);
201
			}
202
		}
203
	}
204
205
	private void displayItem(IContributionItem contributionItem) {
206
		ToolBarManager toolBarManager = (ToolBarManager) ((ToolBarContributionItem) contributionItem)
207
				.getToolBarManager();
208
		ToolBar bar = toolBarManager.getControl();
209
		if (bar == null) {
210
			System.err.println("\tInfo-items: -1");
211
		} else {
212
			System.err.println("\tInfo-items: " + bar.getItemCount() + "/"
213
					+ bar.getEnabled() + "/" + bar.isEnabled() + "/"
214
					+ bar.isVisible());
215
			ToolItem[] tools = bar.getItems();
216
			for (int t = 0; t < tools.length; ++t) {
217
				System.err.println("\t\titem: " + tools[t].getEnabled() + " "
218
						+ tools[t].getToolTipText());
219
			}
220
		}
221
	}
222
223
	/**
224
	 * After an internal action, see if there are any outstanding SWT events.
225
	 */
226
	private void chewUpEvents() throws InterruptedException {
227
		Thread.sleep(250);
228
		Display display = Display.getCurrent();
229
		while (display.readAndDispatch())
230
			;
231
		Thread.sleep(5000);
232
	}
233
234
	private IEditorPart openAndValidateEditor(IWorkbenchPage page,
235
			MultiEditorInput input) throws PartInitException {
236
		IEditorPart editorPart = page.openEditor(input,
237
				MultiEditorTest.TILED_EDITOR_ID);
238
		// System.err.println("Editor " + editorPart.getClass().getName());
239
		assertNotNull(editorPart);
240
		// 3.1.0 only
241
		// assertFalse("Blew up", editorPart instanceof ErrorEditorPart);
242
243
		assertTrue("Unable to create " + MultiEditorTest.TILED_EDITOR_ID,
244
				fNpeListener.noNPE);
245
		return editorPart;
246
	}
247
248
	private void setupNpe() {
249
		final ILog log = WorkbenchPlugin.getDefault().getLog();
250
		fNpeListener = new NPEListener();
251
		log.addLogListener(fNpeListener);
252
	}
253
254
	private MultiEditorInput generateEditorInput(String[] simpleFiles,
255
			IProject testProject) throws CoreException {
256
		String[] ids = new String[simpleFiles.length];
257
		IEditorInput[] inputs = new IEditorInput[simpleFiles.length];
258
		IEditorRegistry registry = fWorkbench.getEditorRegistry();
259
260
		for (int f = 0; f < simpleFiles.length; ++f) {
261
			IFile f1 = testProject.getFile(simpleFiles[f]);
262
			if (!f1.exists()) {
263
				f1.create(getClass().getResourceAsStream(simpleFiles[f]), true,
264
						null);
265
			}
266
			ids[f] = registry.getDefaultEditor(f1.getName()).getId();
267
			inputs[f] = new FileEditorInput(f1);
268
		}
269
270
		MultiEditorInput input = new MultiEditorInput(ids, inputs);
271
		return input;
272
	}
273
274
	protected void doTearDown() throws Exception {
275
		fWorkbench.getActiveWorkbenchWindow().getActivePage().closeAllEditors(
276
				false);
277
		super.doTearDown();
278
	}
279
280
}
(-)Eclipse (+18 lines)
Added Link Here
1
package org.eclipse.ui.tests.multieditor;
2
3
import org.eclipse.jface.action.ICoolBarManager;
4
import org.eclipse.ui.part.EditorActionBarContributor;
5
6
public class TestActionBarContributor extends EditorActionBarContributor {
7
8
	public TestActionBarContributor() {
9
		super();
10
	}
11
12
	/* (non-Javadoc)
13
	 * @see org.eclipse.ui.part.EditorActionBarContributor#contributeToCoolBar(org.eclipse.jface.action.ICoolBarManager)
14
	 */
15
	public void contributeToCoolBar(ICoolBarManager coolBarManager) {
16
		super.contributeToCoolBar(coolBarManager);
17
	}
18
}
(-)Eclipse (+73 lines)
Added Link Here
1
package org.eclipse.ui.tests.multieditor;
2
3
import org.eclipse.core.runtime.IProgressMonitor;
4
import org.eclipse.swt.SWT;
5
import org.eclipse.swt.layout.RowLayout;
6
import org.eclipse.swt.widgets.Composite;
7
import org.eclipse.swt.widgets.Label;
8
import org.eclipse.ui.IEditorInput;
9
import org.eclipse.ui.IEditorSite;
10
import org.eclipse.ui.IFileEditorInput;
11
import org.eclipse.ui.PartInitException;
12
import org.eclipse.ui.part.EditorPart;
13
14
public class TestEditor extends EditorPart {
15
16
	private Composite fMainPanel;
17
18
	public TestEditor() {
19
		super();
20
		// TODO Auto-generated constructor stub
21
	}
22
23
	public void doSave(IProgressMonitor monitor) {
24
		// TODO Auto-generated method stub
25
26
	}
27
28
	public void doSaveAs() {
29
		// TODO Auto-generated method stub
30
31
	}
32
33
	public void init(IEditorSite site, IEditorInput input)
34
			throws PartInitException {
35
		if (!(input instanceof IFileEditorInput))
36
			throw new PartInitException(
37
					"Invalid Input: Must be IFileEditorInput");
38
		setSite(site);
39
		setInput(input);
40
41
	}
42
43
	public boolean isDirty() {
44
		// TODO Auto-generated method stub
45
		return false;
46
	}
47
48
	public boolean isSaveAsAllowed() {
49
		// TODO Auto-generated method stub
50
		return false;
51
	}
52
53
	public void createPartControl(Composite parent) {
54
		fMainPanel = new Composite(parent, SWT.NONE);
55
		fMainPanel.setLayout(new RowLayout(SWT.VERTICAL));
56
57
		Label l = new Label(fMainPanel, SWT.NONE);
58
		l.setText("Editor Title:");
59
60
		l = new Label(fMainPanel, SWT.BORDER);
61
		l.setText(getEditorInput().getName());
62
	}
63
64
	/*
65
	 * (non-Javadoc)
66
	 * 
67
	 * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
68
	 */
69
	public void setFocus() {
70
		fMainPanel.setFocus();
71
	}
72
73
}
(-)Eclipse (+166 lines)
Added Link Here
1
/*
2
 * (c) Copyright 2001 MyCorporation.
3
 * All Rights Reserved.
4
 */
5
package org.eclipse.ui.tests.multieditor;
6
7
import org.eclipse.swt.SWT;
8
import org.eclipse.swt.custom.CLabel;
9
import org.eclipse.swt.custom.SashForm;
10
import org.eclipse.swt.custom.ViewForm;
11
import org.eclipse.swt.graphics.Image;
12
import org.eclipse.swt.layout.FillLayout;
13
import org.eclipse.swt.widgets.Composite;
14
import org.eclipse.ui.IEditorInput;
15
import org.eclipse.ui.IEditorPart;
16
import org.eclipse.ui.IEditorSite;
17
import org.eclipse.ui.IPropertyListener;
18
import org.eclipse.ui.IWorkbenchPart;
19
import org.eclipse.ui.PartInitException;
20
import org.eclipse.ui.part.MultiEditor;
21
import org.eclipse.ui.part.MultiEditorInput;
22
import org.eclipse.ui.tests.util.CallHistory;
23
24
/**
25
 * Implementation of a TiledEditor
26
 */
27
public class TiledEditor extends MultiEditor {
28
	
29
	private CLabel innerEditorTitle[];
30
	public CallHistory callHistory;
31
	
32
	public TiledEditor() {
33
		super();
34
		callHistory = new CallHistory(this);
35
		callHistory.validateMethods(false);
36
	}
37
	
38
	/*
39
	 * @see IWorkbenchPart#createPartControl(Composite)
40
	 */
41
	public void createPartControl(Composite parent) {
42
		callHistory.add("createPartControl");
43
		
44
		parent = new Composite(parent, SWT.BORDER);
45
46
		parent.setLayout(new FillLayout());
47
		SashForm sashForm = new SashForm(parent, SWT.HORIZONTAL);
48
		IEditorPart innerEditors[] = getInnerEditors();
49
		
50
		for (int i = 0; i < innerEditors.length; i++) {
51
			final IEditorPart e = innerEditors[i];
52
			ViewForm viewForm = new ViewForm(sashForm, SWT.NONE);
53
			viewForm.marginWidth = 0;
54
			viewForm.marginHeight = 0;
55
56
			createInnerEditorTitle(i, viewForm);
57
			
58
			Composite content = createInnerPartControl(viewForm,e);
59
			
60
			viewForm.setContent(content);
61
			updateInnerEditorTitle(e, innerEditorTitle[i]);
62
			
63
			final int index = i;
64
			e.addPropertyListener(new IPropertyListener() {
65
				public void propertyChanged(Object source, int property) {
66
					if (property == IEditorPart.PROP_DIRTY || property == IWorkbenchPart.PROP_TITLE)
67
						if (source instanceof IEditorPart)
68
							updateInnerEditorTitle((IEditorPart) source, innerEditorTitle[index]);
69
				}
70
			});
71
		}
72
	}
73
	
74
	/**
75
	 * Draw the gradient for the specified editor.
76
	 */
77
	protected void drawGradient(IEditorPart innerEditor, Gradient g) {
78
		callHistory.add("drawGradient");
79
		
80
		CLabel label = innerEditorTitle[getIndex(innerEditor)];
81
		if((label == null) || label.isDisposed())
82
			return;
83
			
84
		label.setForeground(g.fgColor);
85
		label.setBackground(g.bgColors, g.bgPercents);
86
	}
87
	
88
	/*
89
	 * Create the label for each inner editor. 
90
	 */
91
	protected void createInnerEditorTitle(int index, ViewForm parent) {
92
		
93
		CLabel titleLabel = new CLabel(parent, SWT.SHADOW_NONE);
94
		//hookFocus(titleLabel);
95
		titleLabel.setAlignment(SWT.LEFT);
96
		titleLabel.setBackground(null, null);
97
		parent.setTopLeft(titleLabel);
98
		if (innerEditorTitle == null)
99
			innerEditorTitle = new CLabel[getInnerEditors().length];
100
		innerEditorTitle[index] = titleLabel;
101
	}
102
	
103
	/*
104
	 * Update the tab for an editor.  This is typically called
105
	 * by a site when the tab title changes.
106
	 */
107
	public void updateInnerEditorTitle(IEditorPart editor, CLabel label) {
108
		callHistory.add("updateInnerEditorTitle");
109
		
110
		if((label == null) || label.isDisposed())
111
			return;
112
		String title = editor.getTitle();
113
		if (editor.isDirty())
114
			title = "*" + title; //$NON-NLS-1$
115
		label.setText(title);
116
		Image image = editor.getTitleImage();
117
		if (image != null)
118
			if (!image.equals(label.getImage()))
119
				label.setImage(image);
120
		label.setToolTipText(editor.getTitleToolTip());
121
	}
122
	
123
	/*
124
	 * 
125
	 */
126
	protected int getIndex(IEditorPart editor) {
127
		callHistory.add("getIndex");
128
		
129
		IEditorPart innerEditors[] = getInnerEditors();
130
		for (int i = 0; i < innerEditors.length; i++) {
131
			if (innerEditors[i] == editor)
132
				return i;
133
		}
134
		return -1;
135
	}
136
137
	protected void activateEditor(IEditorPart part) {
138
		callHistory.add("activateEditor");
139
		super.activateEditor(part);
140
	}
141
142
	public Composite createInnerPartControl(Composite parent, IEditorPart e) {
143
		callHistory.add("createInnerPartControl");
144
		return super.createInnerPartControl(parent, e);
145
	}
146
147
	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
148
		callHistory.add("init");
149
		super.init(site, input);
150
	}
151
152
	public void init(IEditorSite site, MultiEditorInput input) throws PartInitException {
153
		callHistory.add("init");
154
		super.init(site, input);
155
	}
156
157
	public void setFocus() {
158
		callHistory.add("");
159
		super.setFocus();
160
	}
161
162
	public void updateGradient(IEditorPart editor) {
163
		callHistory.add("updateGradient");
164
		super.updateGradient(editor);
165
	}
166
}
(-)Eclipse (+29 lines)
Added Link Here
1
<?xml version="1.0" encoding="UTF-8"?>
2
<!-- ====================================================================== 
3
     Jun 27, 2005 10:23:13 AM                                                        
4
5
     project    
6
     description
7
                   
8
     pwebster                                                                
9
     ====================================================================== -->
10
<project name="project" default="default">
11
    <description>
12
            description
13
    </description>
14
15
    <!-- ================================= 
16
          target: default              
17
         ================================= -->
18
    <target name="default" depends="depends" description="--> description">
19
        
20
    </target>
21
22
    <!-- - - - - - - - - - - - - - - - - - 
23
          target: depends                      
24
         - - - - - - - - - - - - - - - - - -->
25
    <target name="depends">
26
    </target>
27
28
</project>
29
(-)Eclipse (+207 lines)
Added Link Here
1
Length: 14
2
true:false group.file
3
	org.eclipse.jface.action.GroupMarker
4
true:true org.eclipse.ui.workbench.file
5
	org.eclipse.jface.action.ToolBarContributionItem
6
	Info-items: 3/true/true/true
7
		item: true New
8
		item: false Save
9
		item: false Print
10
true:false additions
11
	org.eclipse.jface.action.GroupMarker
12
true:true org.eclipse.debug.ui.launchActionSet
13
	org.eclipse.jface.action.ToolBarContributionItem
14
	Info-items: 1/true/true/true
15
		item: true External Tools
16
true:true org.eclipse.search.searchActionSet
17
	org.eclipse.jface.action.ToolBarContributionItem
18
	Info-items: 1/true/true/true
19
		item: true Search
20
true:false group.nav
21
	org.eclipse.jface.action.GroupMarker
22
true:true org.eclipse.ui.workbench.navigate
23
	org.eclipse.jface.action.ToolBarContributionItem
24
	Info-items: 3/true/true/true
25
		item: false Last Edit Location
26
		item: false Back
27
		item: false Forward
28
true:false group.editor
29
	org.eclipse.jface.action.GroupMarker
30
true:false org.eclipse.ui.tests.multieditor.TestEditor
31
	org.eclipse.jface.action.ToolBarContributionItem
32
	Info-items: -1
33
true:false org.eclipse.ant.ui.internal.editor.AntEditor
34
	org.eclipse.jface.action.ToolBarContributionItem
35
	Info-items: -1
36
true:false org.eclipse.jdt.ui.PropertiesFileEditor
37
	org.eclipse.jface.action.ToolBarContributionItem
38
	Info-items: -1
39
true:true org.eclipse.ui.DefaultTextEditor
40
	org.eclipse.jface.action.ToolBarContributionItem
41
	Info-items: 0/true/true/true
42
true:false group.help
43
	org.eclipse.jface.action.GroupMarker
44
true:true org.eclipse.ui.workbench.help
45
	org.eclipse.jface.action.ToolBarContributionItem
46
	Info-items: 0/true/true/true
47
----
48
contribution org.eclipse.jface.action.ToolBarContributionItem
49
Length: 15
50
true:false group.file
51
	org.eclipse.jface.action.GroupMarker
52
true:true org.eclipse.ui.workbench.file
53
	org.eclipse.jface.action.ToolBarContributionItem
54
	Info-items: 3/true/true/true
55
		item: true New
56
		item: false Save
57
		item: false Print
58
true:false additions
59
	org.eclipse.jface.action.GroupMarker
60
true:true org.eclipse.debug.ui.launchActionSet
61
	org.eclipse.jface.action.ToolBarContributionItem
62
	Info-items: 1/true/true/true
63
		item: true External Tools
64
true:true org.eclipse.search.searchActionSet
65
	org.eclipse.jface.action.ToolBarContributionItem
66
	Info-items: 1/true/true/true
67
		item: true Search
68
true:true org.eclipse.ui.tests.multieditor.actionSet
69
	org.eclipse.jface.action.ToolBarContributionItem
70
	Info-items: 1/true/true/true
71
		item: true MultiEditorActionThing
72
true:false group.nav
73
	org.eclipse.jface.action.GroupMarker
74
true:true org.eclipse.ui.workbench.navigate
75
	org.eclipse.jface.action.ToolBarContributionItem
76
	Info-items: 3/true/true/true
77
		item: false Last Edit Location
78
		item: false Back
79
		item: false Forward
80
true:false group.editor
81
	org.eclipse.jface.action.GroupMarker
82
true:true org.eclipse.ui.tests.multieditor.TestEditor
83
	org.eclipse.jface.action.ToolBarContributionItem
84
	Info-items: 0/true/true/true
85
true:false org.eclipse.ant.ui.internal.editor.AntEditor
86
	org.eclipse.jface.action.ToolBarContributionItem
87
	Info-items: -1
88
true:false org.eclipse.jdt.ui.PropertiesFileEditor
89
	org.eclipse.jface.action.ToolBarContributionItem
90
	Info-items: -1
91
true:false org.eclipse.ui.DefaultTextEditor
92
	org.eclipse.jface.action.ToolBarContributionItem
93
	Info-items: 0/true/true/true
94
true:false group.help
95
	org.eclipse.jface.action.GroupMarker
96
true:true org.eclipse.ui.workbench.help
97
	org.eclipse.jface.action.ToolBarContributionItem
98
	Info-items: 0/true/true/true
99
----
100
Length: 16
101
true:false group.file
102
	org.eclipse.jface.action.GroupMarker
103
true:true org.eclipse.ui.workbench.file
104
	org.eclipse.jface.action.ToolBarContributionItem
105
	Info-items: 3/true/true/true
106
		item: true New
107
		item: false Save
108
		item: false Print
109
true:false additions
110
	org.eclipse.jface.action.GroupMarker
111
true:true org.eclipse.debug.ui.launchActionSet
112
	org.eclipse.jface.action.ToolBarContributionItem
113
	Info-items: 1/true/true/true
114
		item: true External Tools
115
true:true org.eclipse.search.searchActionSet
116
	org.eclipse.jface.action.ToolBarContributionItem
117
	Info-items: 1/true/true/true
118
		item: true Search
119
true:true org.eclipse.ui.edit.text.actionSet.presentation
120
	org.eclipse.jface.action.ToolBarContributionItem
121
	Info-items: 2/true/true/true
122
		item: false Toggle Ant Editor Auto Reconcile
123
		item: false Toggle Ant Mark Occurrences
124
true:true org.eclipse.ui.tests.multieditor.actionSet
125
	org.eclipse.jface.action.ToolBarContributionItem
126
	Info-items: 0/true/true/true
127
true:false group.nav
128
	org.eclipse.jface.action.GroupMarker
129
true:true org.eclipse.ui.workbench.navigate
130
	org.eclipse.jface.action.ToolBarContributionItem
131
	Info-items: 3/true/true/true
132
		item: false Last Edit Location
133
		item: false Back
134
		item: false Forward
135
true:false group.editor
136
	org.eclipse.jface.action.GroupMarker
137
true:false org.eclipse.ui.tests.multieditor.TestEditor
138
	org.eclipse.jface.action.ToolBarContributionItem
139
	Info-items: 0/true/true/true
140
true:true org.eclipse.ant.ui.internal.editor.AntEditor
141
	org.eclipse.jface.action.ToolBarContributionItem
142
	Info-items: 0/true/true/true
143
true:false org.eclipse.jdt.ui.PropertiesFileEditor
144
	org.eclipse.jface.action.ToolBarContributionItem
145
	Info-items: -1
146
true:false org.eclipse.ui.DefaultTextEditor
147
	org.eclipse.jface.action.ToolBarContributionItem
148
	Info-items: 0/true/true/true
149
true:false group.help
150
	org.eclipse.jface.action.GroupMarker
151
true:true org.eclipse.ui.workbench.help
152
	org.eclipse.jface.action.ToolBarContributionItem
153
	Info-items: 0/true/true/true
154
----
155
Length: 16
156
true:false group.file
157
	org.eclipse.jface.action.GroupMarker
158
true:true org.eclipse.ui.workbench.file
159
	org.eclipse.jface.action.ToolBarContributionItem
160
	Info-items: 3/true/true/true
161
		item: true New
162
		item: false Save
163
		item: false Print
164
true:false additions
165
	org.eclipse.jface.action.GroupMarker
166
true:true org.eclipse.debug.ui.launchActionSet
167
	org.eclipse.jface.action.ToolBarContributionItem
168
	Info-items: 1/true/true/true
169
		item: true External Tools
170
true:true org.eclipse.search.searchActionSet
171
	org.eclipse.jface.action.ToolBarContributionItem
172
	Info-items: 1/true/true/true
173
		item: true Search
174
true:true org.eclipse.ui.edit.text.actionSet.presentation
175
	org.eclipse.jface.action.ToolBarContributionItem
176
	Info-items: 0/true/true/true
177
true:true org.eclipse.ui.tests.multieditor.actionSet
178
	org.eclipse.jface.action.ToolBarContributionItem
179
	Info-items: 0/true/true/true
180
true:false group.nav
181
	org.eclipse.jface.action.GroupMarker
182
true:true org.eclipse.ui.workbench.navigate
183
	org.eclipse.jface.action.ToolBarContributionItem
184
	Info-items: 3/true/true/true
185
		item: false Last Edit Location
186
		item: false Back
187
		item: false Forward
188
true:false group.editor
189
	org.eclipse.jface.action.GroupMarker
190
true:false org.eclipse.ui.tests.multieditor.TestEditor
191
	org.eclipse.jface.action.ToolBarContributionItem
192
	Info-items: 0/true/true/true
193
true:false org.eclipse.ant.ui.internal.editor.AntEditor
194
	org.eclipse.jface.action.ToolBarContributionItem
195
	Info-items: 0/true/true/true
196
true:true org.eclipse.jdt.ui.PropertiesFileEditor
197
	org.eclipse.jface.action.ToolBarContributionItem
198
	Info-items: 0/true/true/true
199
true:false org.eclipse.ui.DefaultTextEditor
200
	org.eclipse.jface.action.ToolBarContributionItem
201
	Info-items: 0/true/true/true
202
true:false group.help
203
	org.eclipse.jface.action.GroupMarker
204
true:true org.eclipse.ui.workbench.help
205
	org.eclipse.jface.action.ToolBarContributionItem
206
	Info-items: 0/true/true/true
207
----
(-)Eclipse (+179 lines)
Added Link Here
1
Length: 12
2
true:false group.file
3
	org.eclipse.jface.action.GroupMarker
4
true:true org.eclipse.ui.workbench.file
5
	org.eclipse.jface.action.ToolBarContributionItem
6
	Info-items: 3/true/true/true
7
		item: true New
8
		item: false Save
9
		item: false Print
10
true:false additions
11
	org.eclipse.jface.action.GroupMarker
12
true:true org.eclipse.debug.ui.launchActionSet
13
	org.eclipse.jface.action.ToolBarContributionItem
14
	Info-items: 1/true/true/true
15
		item: true External Tools
16
true:true org.eclipse.search.searchActionSet
17
	org.eclipse.jface.action.ToolBarContributionItem
18
	Info-items: 1/true/true/true
19
		item: true Search
20
true:false group.nav
21
	org.eclipse.jface.action.GroupMarker
22
true:true org.eclipse.ui.workbench.navigate
23
	org.eclipse.jface.action.ToolBarContributionItem
24
	Info-items: 3/true/true/true
25
		item: false Last Edit Location
26
		item: false Back
27
		item: false Forward
28
true:false group.editor
29
	org.eclipse.jface.action.GroupMarker
30
true:false org.eclipse.ui.tests.multieditor.TestEditor
31
	org.eclipse.jface.action.ToolBarContributionItem
32
	Info-items: -1
33
true:false org.eclipse.ant.ui.internal.editor.AntEditor
34
	org.eclipse.jface.action.ToolBarContributionItem
35
	Info-items: -1
36
true:false org.eclipse.jdt.ui.DefaultTextEditor
37
	org.eclipse.jface.action.ToolBarContributionItem
38
	Info-items: -1
39
true:true org.eclipse.ui.DefaultTextEditor
40
	org.eclipse.jface.action.ToolBarContributionItem
41
	Info-items: 0/true/true/true
42
----
43
contribution org.eclipse.jface.action.ToolBarContributionItem
44
Length: 13
45
true:false group.file
46
	org.eclipse.jface.action.GroupMarker
47
true:true org.eclipse.ui.workbench.file
48
	org.eclipse.jface.action.ToolBarContributionItem
49
	Info-items: 3/true/true/true
50
		item: true New
51
		item: false Save
52
		item: false Print
53
true:false additions
54
	org.eclipse.jface.action.GroupMarker
55
true:true org.eclipse.debug.ui.launchActionSet
56
	org.eclipse.jface.action.ToolBarContributionItem
57
	Info-items: 1/true/true/true
58
		item: true External Tools
59
true:true org.eclipse.search.searchActionSet
60
	org.eclipse.jface.action.ToolBarContributionItem
61
	Info-items: 1/true/true/true
62
		item: true Search
63
true:true org.eclipse.ui.tests.multieditor.actionSet
64
	org.eclipse.jface.action.ToolBarContributionItem
65
	Info-items: 1/true/true/true
66
		item: true MultiEditorActionThing
67
true:false group.nav
68
	org.eclipse.jface.action.GroupMarker
69
true:true org.eclipse.ui.workbench.navigate
70
	org.eclipse.jface.action.ToolBarContributionItem
71
	Info-items: 3/true/true/true
72
		item: false Last Edit Location
73
		item: false Back
74
		item: false Forward
75
true:false group.editor
76
	org.eclipse.jface.action.GroupMarker
77
true:true org.eclipse.ui.tests.multieditor.TestEditor
78
	org.eclipse.jface.action.ToolBarContributionItem
79
	Info-items: 0/true/true/true
80
true:false org.eclipse.ant.ui.internal.editor.AntEditor
81
	org.eclipse.jface.action.ToolBarContributionItem
82
	Info-items: -1
83
true:false org.eclipse.jdt.ui.DefaultTextEditor
84
	org.eclipse.jface.action.ToolBarContributionItem
85
	Info-items: -1
86
true:false org.eclipse.ui.DefaultTextEditor
87
	org.eclipse.jface.action.ToolBarContributionItem
88
	Info-items: 0/true/true/true
89
----
90
Length: 13
91
true:false group.file
92
	org.eclipse.jface.action.GroupMarker
93
true:true org.eclipse.ui.workbench.file
94
	org.eclipse.jface.action.ToolBarContributionItem
95
	Info-items: 3/true/true/true
96
		item: true New
97
		item: false Save
98
		item: false Print
99
true:false additions
100
	org.eclipse.jface.action.GroupMarker
101
true:true org.eclipse.debug.ui.launchActionSet
102
	org.eclipse.jface.action.ToolBarContributionItem
103
	Info-items: 1/true/true/true
104
		item: true External Tools
105
true:true org.eclipse.search.searchActionSet
106
	org.eclipse.jface.action.ToolBarContributionItem
107
	Info-items: 1/true/true/true
108
		item: true Search
109
true:true org.eclipse.ui.tests.multieditor.actionSet
110
	org.eclipse.jface.action.ToolBarContributionItem
111
	Info-items: 0/true/true/true
112
true:false group.nav
113
	org.eclipse.jface.action.GroupMarker
114
true:true org.eclipse.ui.workbench.navigate
115
	org.eclipse.jface.action.ToolBarContributionItem
116
	Info-items: 3/true/true/true
117
		item: false Last Edit Location
118
		item: false Back
119
		item: false Forward
120
true:false group.editor
121
	org.eclipse.jface.action.GroupMarker
122
true:false org.eclipse.ui.tests.multieditor.TestEditor
123
	org.eclipse.jface.action.ToolBarContributionItem
124
	Info-items: 0/true/true/true
125
true:true org.eclipse.ant.ui.internal.editor.AntEditor
126
	org.eclipse.jface.action.ToolBarContributionItem
127
	Info-items: 0/true/true/true
128
true:false org.eclipse.jdt.ui.DefaultTextEditor
129
	org.eclipse.jface.action.ToolBarContributionItem
130
	Info-items: -1
131
true:false org.eclipse.ui.DefaultTextEditor
132
	org.eclipse.jface.action.ToolBarContributionItem
133
	Info-items: 0/true/true/true
134
----
135
Length: 13
136
true:false group.file
137
	org.eclipse.jface.action.GroupMarker
138
true:true org.eclipse.ui.workbench.file
139
	org.eclipse.jface.action.ToolBarContributionItem
140
	Info-items: 3/true/true/true
141
		item: true New
142
		item: false Save
143
		item: false Print
144
true:false additions
145
	org.eclipse.jface.action.GroupMarker
146
true:true org.eclipse.debug.ui.launchActionSet
147
	org.eclipse.jface.action.ToolBarContributionItem
148
	Info-items: 1/true/true/true
149
		item: true External Tools
150
true:true org.eclipse.search.searchActionSet
151
	org.eclipse.jface.action.ToolBarContributionItem
152
	Info-items: 1/true/true/true
153
		item: true Search
154
true:true org.eclipse.ui.tests.multieditor.actionSet
155
	org.eclipse.jface.action.ToolBarContributionItem
156
	Info-items: 0/true/true/true
157
true:false group.nav
158
	org.eclipse.jface.action.GroupMarker
159
true:true org.eclipse.ui.workbench.navigate
160
	org.eclipse.jface.action.ToolBarContributionItem
161
	Info-items: 3/true/true/true
162
		item: false Last Edit Location
163
		item: false Back
164
		item: false Forward
165
true:false group.editor
166
	org.eclipse.jface.action.GroupMarker
167
true:false org.eclipse.ui.tests.multieditor.TestEditor
168
	org.eclipse.jface.action.ToolBarContributionItem
169
	Info-items: 0/true/true/true
170
true:false org.eclipse.ant.ui.internal.editor.AntEditor
171
	org.eclipse.jface.action.ToolBarContributionItem
172
	Info-items: 0/true/true/true
173
true:true org.eclipse.jdt.ui.DefaultTextEditor
174
	org.eclipse.jface.action.ToolBarContributionItem
175
	Info-items: 0/true/true/true
176
true:false org.eclipse.ui.DefaultTextEditor
177
	org.eclipse.jface.action.ToolBarContributionItem
178
	Info-items: 0/true/true/true
179
----
(-)Eclipse (+3 lines)
Added Link Here
1
test file 01
2
3
test for MultiEditor
(-)Eclipse (+3 lines)
Added Link Here
1
test file 02
2
3
test for MultiEditor
(-)Eclipse (+3 lines)
Added Link Here
1
test file 03
2
3
test for MultiEditor
(-)Eclipse (+2 lines)
Added Link Here
1
org.eclipse.ui.tests.multieditor.good = MultiEditorTest
2
org.eclipse.ui.tests.multieditor.bad = TiledEditor
(-)icons/editor.gif (+2 lines)
Added Link Here
1
GIF89a�??�?��߿�߿����ߟ������___���!�	,G0�I+=8�SO1`hH'����
2
�el��t�a.��˗��6q��d�쩛�n˦�3�z��bL.[Ε;

Return to bug 96129