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 64043 | Differences between
and this patch

Collapse All | Expand All

(-)Eclipse UI/org/eclipse/ui/internal/EditorManager.java (-1 / +8 lines)
Lines 40-45 Link Here
40
import org.eclipse.jface.window.ApplicationWindow;
40
import org.eclipse.jface.window.ApplicationWindow;
41
import org.eclipse.swt.custom.BusyIndicator;
41
import org.eclipse.swt.custom.BusyIndicator;
42
import org.eclipse.swt.program.Program;
42
import org.eclipse.swt.program.Program;
43
import org.eclipse.swt.widgets.Control;
43
import org.eclipse.swt.widgets.Display;
44
import org.eclipse.swt.widgets.Display;
44
import org.eclipse.ui.IEditorActionBarContributor;
45
import org.eclipse.ui.IEditorActionBarContributor;
45
import org.eclipse.ui.IEditorInput;
46
import org.eclipse.ui.IEditorInput;
Lines 798-804 Link Here
798
					String workbookID = ref.getMemento().getString(IWorkbenchConstants.TAG_WORKBOOK);
799
					String workbookID = ref.getMemento().getString(IWorkbenchConstants.TAG_WORKBOOK);
799
					editorPresentation.setActiveEditorWorkbookFromID(workbookID);
800
					editorPresentation.setActiveEditorWorkbookFromID(workbookID);
800
					openInternalEditor(ref, desc, editorInput, false);
801
					openInternalEditor(ref, desc, editorInput, false);
801
					ref.getPane().createChildControl();
802
					
803
					Control ctrl = ref.getPane().getControl();
804
                    if (ctrl == null)
805
                    	ref.getPane().createControl(page.getClientComposite());
806
                    else 
807
                    	ref.getPane().createChildControl();
808
                    
802
					// TODO commented during presentation refactor ((EditorPane)ref.getPane()).getWorkbook().updateEditorTab(ref);
809
					// TODO commented during presentation refactor ((EditorPane)ref.getPane()).getWorkbook().updateEditorTab(ref);
803
				} catch (PartInitException e) {
810
				} catch (PartInitException e) {
804
					WorkbenchPlugin.log("Exception creating editor: " + e.getMessage()); //$NON-NLS-1$
811
					WorkbenchPlugin.log("Exception creating editor: " + e.getMessage()); //$NON-NLS-1$

Return to bug 64043