diff options
| author | Andre Weinand | 2003-07-14 16:17:48 +0000 |
|---|---|---|
| committer | Andre Weinand | 2003-07-14 16:17:48 +0000 |
| commit | 5430266abe865fd1e42f389b77dd9011bf0b4e6c (patch) | |
| tree | ff25f58a92b81f23ffec89920737a6932507ef84 /bundles/org.eclipse.compare/compare | |
| parent | 1089889a98dd15dceaeb46854f96e0eac419064e (diff) | |
| download | eclipse.platform.team-5430266abe865fd1e42f389b77dd9011bf0b4e6c.tar.gz eclipse.platform.team-5430266abe865fd1e42f389b77dd9011bf0b4e6c.tar.xz eclipse.platform.team-5430266abe865fd1e42f389b77dd9011bf0b4e6c.zip | |
tmp code for #38770
Diffstat (limited to 'bundles/org.eclipse.compare/compare')
| -rw-r--r-- | bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java | 4 | ||||
| -rw-r--r-- | bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java | 13 |
2 files changed, 13 insertions, 4 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java index f0a885b6a..b0d09e2bd 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java @@ -57,7 +57,11 @@ public class CompareEditor extends EditorPart implements IReusableEditor { private Control fControl; + + static CompareEditor fgCurrentCompareEditor; + public CompareEditor() { + fgCurrentCompareEditor= this; } /* package */ CompareConfiguration getCompareConfiguration() { diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java index f05c019bd..a5a2fd311 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java @@ -306,10 +306,15 @@ public final class CompareUIPlugin extends AbstractUIPlugin { if (page == null) page= getActivePage(); if (page != null) { - try { - page.openEditor(input, COMPARE_EDITOR); - } catch (PartInitException e) { - MessageDialog.openError(getShell(), Utilities.getString("CompareUIPlugin.openEditorError"), e.getMessage()); //$NON-NLS-1$ + if (false && CompareEditor.fgCurrentCompareEditor instanceof IReusableEditor) { + IReusableEditor e= (IReusableEditor) CompareEditor.fgCurrentCompareEditor; + e.setInput(input); + } else { + try { + page.openEditor(input, COMPARE_EDITOR); + } catch (PartInitException e) { + MessageDialog.openError(getShell(), Utilities.getString("CompareUIPlugin.openEditorError"), e.getMessage()); //$NON-NLS-1$ + } } } else { MessageDialog.openError(getShell(), |