Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenInCompareAction.java')
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenInCompareAction.java50
1 files changed, 25 insertions, 25 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenInCompareAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenInCompareAction.java
index 9d139ae12..4ac48f61d 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenInCompareAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenInCompareAction.java
@@ -104,11 +104,11 @@ public class OpenInCompareAction extends Action {
// all files
IResource resources[] = Utils.getResources(elements);
for (int i = 0; i < resources.length; i++) {
- if (resources[i].getType() != IResource.FILE) {
- // Only supported if all the items are files.
- return false;
- }
- }
+ if (resources[i].getType() != IResource.FILE) {
+ // Only supported if all the items are files.
+ return false;
+ }
+ }
}
return true;
}
@@ -210,32 +210,32 @@ public class OpenInCompareAction extends Action {
return page;
}
- public static void openCompareEditor(CompareEditorInput input, IWorkbenchPage page) {
- // try to reuse editors, if possible
+ public static void openCompareEditor(CompareEditorInput input, IWorkbenchPage page) {
+ // try to reuse editors, if possible
openCompareEditor(input, page, true);
}
- public static void openCompareEditor(CompareEditorInput input, IWorkbenchPage page, boolean reuseEditorIfPossible) {
- if (page == null || input == null)
- return;
+ public static void openCompareEditor(CompareEditorInput input, IWorkbenchPage page, boolean reuseEditorIfPossible) {
+ if (page == null || input == null)
+ return;
IEditorPart editor = Utils.findReusableCompareEditor(input, page,
new Class[] { SyncInfoCompareInput.class,
ModelCompareEditorInput.class });
- // reuse editor only for single selection
- if(editor != null && reuseEditorIfPossible) {
- IEditorInput otherInput = editor.getEditorInput();
- if(otherInput.equals(input)) {
- // simply provide focus to editor
- page.activate(editor);
- } else {
- // if editor is currently not open on that input either re-use existing
- CompareUI.reuseCompareEditor(input, (IReusableEditor)editor);
- page.activate(editor);
- }
- } else {
- CompareUI.openCompareEditorOnPage(input, page);
- }
- }
+ // reuse editor only for single selection
+ if(editor != null && reuseEditorIfPossible) {
+ IEditorInput otherInput = editor.getEditorInput();
+ if(otherInput.equals(input)) {
+ // simply provide focus to editor
+ page.activate(editor);
+ } else {
+ // if editor is currently not open on that input either re-use existing
+ CompareUI.reuseCompareEditor(input, (IReusableEditor)editor);
+ page.activate(editor);
+ }
+ } else {
+ CompareUI.openCompareEditorOnPage(input, page);
+ }
+ }
/**
* Returns an editor handle if a SyncInfoCompareInput compare editor is opened on

Back to the top