Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipantActionGroup.java')
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipantActionGroup.java40
1 files changed, 20 insertions, 20 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipantActionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipantActionGroup.java
index 94ac3f6b0..b3222d10e 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipantActionGroup.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipantActionGroup.java
@@ -120,10 +120,10 @@ public class ModelSynchronizeParticipantActionGroup extends SynchronizePageActio
@Override
public void fillActionBars(IActionBars actionBars) {
super.fillActionBars(actionBars);
- if (actionBars != null && showPreferences != null) {
- IMenuManager menu = actionBars.getMenuManager();
- appendToGroup(menu, ISynchronizePageConfiguration.PREFERENCES_GROUP, showPreferences);
- }
+ if (actionBars != null && showPreferences != null) {
+ IMenuManager menu = actionBars.getMenuManager();
+ appendToGroup(menu, ISynchronizePageConfiguration.PREFERENCES_GROUP, showPreferences);
+ }
}
@Override
@@ -134,22 +134,22 @@ public class ModelSynchronizeParticipantActionGroup extends SynchronizePageActio
addMergeActions(cmm);
}
Object[] elements = ((IStructuredSelection)getContext().getSelection()).toArray();
- if (elements.length > 0 && openInCompareAction != null) {
- IContributionItem fileGroup = findGroup(menu, ISynchronizePageConfiguration.FILE_GROUP);
- if (fileGroup != null) {
- ModelSynchronizeParticipant msp = ((ModelSynchronizeParticipant)getConfiguration().getParticipant());
- boolean allElementsHaveCompareInput = true;
- for (int i = 0; i < elements.length; i++) {
- if (!msp.hasCompareInputFor(elements[i])) {
- allElementsHaveCompareInput = false;
- break;
- }
- }
- if (allElementsHaveCompareInput) {
- menu.appendToGroup(fileGroup.getId(), openInCompareAction);
- }
- }
- }
+ if (elements.length > 0 && openInCompareAction != null) {
+ IContributionItem fileGroup = findGroup(menu, ISynchronizePageConfiguration.FILE_GROUP);
+ if (fileGroup != null) {
+ ModelSynchronizeParticipant msp = ((ModelSynchronizeParticipant)getConfiguration().getParticipant());
+ boolean allElementsHaveCompareInput = true;
+ for (int i = 0; i < elements.length; i++) {
+ if (!msp.hasCompareInputFor(elements[i])) {
+ allElementsHaveCompareInput = false;
+ break;
+ }
+ }
+ if (allElementsHaveCompareInput) {
+ menu.appendToGroup(fileGroup.getId(), openInCompareAction);
+ }
+ }
+ }
}
/*

Back to the top