Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/RevisionAnnotationController.java')
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/RevisionAnnotationController.java70
1 files changed, 35 insertions, 35 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/RevisionAnnotationController.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/RevisionAnnotationController.java
index e3b931542..02c54d98a 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/RevisionAnnotationController.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/RevisionAnnotationController.java
@@ -138,7 +138,7 @@ public abstract class RevisionAnnotationController {
} catch (PartInitException e) {
}
- return null;
+ return null;
}
/**
@@ -165,29 +165,29 @@ public abstract class RevisionAnnotationController {
}
- private static ITextEditor getEditor(String id, Object fileRevision, IStorage storage) throws PartInitException {
- final IWorkbench workbench= PlatformUI.getWorkbench();
- final IWorkbenchWindow window= workbench.getActiveWorkbenchWindow();
- IWorkbenchPage page= window.getActivePage();
+ private static ITextEditor getEditor(String id, Object fileRevision, IStorage storage) throws PartInitException {
+ final IWorkbench workbench= PlatformUI.getWorkbench();
+ final IWorkbenchWindow window= workbench.getActiveWorkbenchWindow();
+ IWorkbenchPage page= window.getActivePage();
IEditorPart part = page.openEditor(new FileRevisionEditorInput(fileRevision, storage), id);
- if (part instanceof ITextEditor) {
- return (ITextEditor)part;
- } else {
- // We asked for a text editor but didn't get one
- // so open a vanilla text editor
- page.closeEditor(part, false);
- part = page.openEditor(new FileRevisionEditorInput(fileRevision, storage), EditorsUI.DEFAULT_TEXT_EDITOR_ID);
- if (part instanceof ITextEditor) {
- return (ITextEditor)part;
- } else {
- // There is something really wrong so just bail
- throw new PartInitException(TeamUIMessages.RevisionAnnotationController_0);
- }
- }
- }
-
- private static String getEditorId(IStorage storage) {
- String id;
+ if (part instanceof ITextEditor) {
+ return (ITextEditor)part;
+ } else {
+ // We asked for a text editor but didn't get one
+ // so open a vanilla text editor
+ page.closeEditor(part, false);
+ part = page.openEditor(new FileRevisionEditorInput(fileRevision, storage), EditorsUI.DEFAULT_TEXT_EDITOR_ID);
+ if (part instanceof ITextEditor) {
+ return (ITextEditor)part;
+ } else {
+ // There is something really wrong so just bail
+ throw new PartInitException(TeamUIMessages.RevisionAnnotationController_0);
+ }
+ }
+ }
+
+ private static String getEditorId(IStorage storage) {
+ String id;
IEditorRegistry registry = PlatformUI.getWorkbench().getEditorRegistry();
IEditorDescriptor descriptor = registry.getDefaultEditor(storage.getName());
if (descriptor == null || !descriptor.isInternal()) {
@@ -203,8 +203,8 @@ public abstract class RevisionAnnotationController {
id = EditorsUI.DEFAULT_TEXT_EDITOR_ID;
}
}
- return id;
- }
+ return id;
+ }
@@ -212,7 +212,7 @@ public abstract class RevisionAnnotationController {
if (file == null)
return null;
FileEditorInput input = new FileEditorInput(file);
- IEditorPart[] editors = findOpenEditorsForFile(page, input);
+ IEditorPart[] editors = findOpenEditorsForFile(page, input);
return findTextEditor(page, editors, input);
}
@@ -235,8 +235,8 @@ public abstract class RevisionAnnotationController {
for (int i = 0; i < parts.length; i++) {
IEditorPart editorPart = parts[i];
if (editorPart instanceof AbstractDecoratedTextEditor) {
- page.activate(mpep);
- mpep.setActiveEditor(editorPart);
+ page.activate(mpep);
+ mpep.setActiveEditor(editorPart);
return (AbstractDecoratedTextEditor) editorPart;
}
}
@@ -245,15 +245,15 @@ public abstract class RevisionAnnotationController {
}
private static IEditorPart[] findOpenEditorsForFile(IWorkbenchPage page, FileEditorInput input) {
- final IEditorReference[] references= page.findEditors(input, null, IWorkbenchPage.MATCH_INPUT);
- final List<IEditorPart> editors = new ArrayList<>();
+ final IEditorReference[] references= page.findEditors(input, null, IWorkbenchPage.MATCH_INPUT);
+ final List<IEditorPart> editors = new ArrayList<>();
for (int i= 0; i < references.length; i++) {
IEditorReference reference= references[i];
IEditorPart editor= reference.getEditor(false);
editors.add(editor);
}
- return editors.toArray(new IEditorPart[editors.size()]);
+ return editors.toArray(new IEditorPart[editors.size()]);
}
private static AbstractDecoratedTextEditor findOpenTextEditorFor(IWorkbenchPage page, Object object) {
@@ -263,9 +263,9 @@ public abstract class RevisionAnnotationController {
IFile file = (IFile) object;
return findOpenTextEditorForFile(page, file);
}
- final IWorkbench workbench= PlatformUI.getWorkbench();
- final IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();
- IEditorReference[] references= window.getActivePage().getEditorReferences();
+ final IWorkbench workbench= PlatformUI.getWorkbench();
+ final IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();
+ IEditorReference[] references= window.getActivePage().getEditorReferences();
for (int i= 0; i < references.length; i++) {
IEditorReference reference= references[i];
try {
@@ -279,7 +279,7 @@ public abstract class RevisionAnnotationController {
}
}
- return null;
+ return null;
}
private static IRevisionRulerColumnExtension findEditorRevisonRulerColumn(IWorkbenchPage page, Object object) {

Back to the top