diff options
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelSynchronizePage.java')
-rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelSynchronizePage.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelSynchronizePage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelSynchronizePage.java index 154c1eef4..8be0393bb 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelSynchronizePage.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelSynchronizePage.java @@ -25,7 +25,7 @@ import org.eclipse.team.ui.synchronize.*; /** * A synchronize page for displaying a {@link ModelSynchronizeParticipant}. - * + * * @since 3.2 **/ public class ModelSynchronizePage extends AbstractSynchronizePage { @@ -39,8 +39,8 @@ public class ModelSynchronizePage extends AbstractSynchronizePage { public ModelSynchronizePage(ISynchronizePageConfiguration configuration) { super(configuration); this.participant = (ModelSynchronizeParticipant)configuration.getParticipant(); - configuration.setComparisonType(isThreeWay() - ? ISynchronizePageConfiguration.THREE_WAY + configuration.setComparisonType(isThreeWay() + ? ISynchronizePageConfiguration.THREE_WAY : ISynchronizePageConfiguration.TWO_WAY); configuration.addActionContribution(new RefreshActionContribution()); } @@ -84,7 +84,7 @@ public class ModelSynchronizePage extends AbstractSynchronizePage { updateMode(getConfiguration().getMode()); return commonViewerAdvisor; } - + /* (non-Javadoc) * @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizePage#createChangesSection() */ @@ -92,7 +92,7 @@ public class ModelSynchronizePage extends AbstractSynchronizePage { protected ChangesSection createChangesSection(Composite parent) { return new DiffTreeChangesSection(parent, this, getConfiguration()); } - + @Override public void init(ISynchronizePageSite site) { super.init(site); @@ -108,7 +108,7 @@ public class ModelSynchronizePage extends AbstractSynchronizePage { } } } - + @Override public boolean aboutToChangeProperty(ISynchronizePageConfiguration configuration, String key, Object newValue) { if (key.equals(ModelSynchronizeParticipant.P_VISIBLE_MODEL_PROVIDER)) { @@ -118,7 +118,7 @@ public class ModelSynchronizePage extends AbstractSynchronizePage { String currentSetting = (String)configuration.getProperty(ModelSynchronizeParticipant.P_VISIBLE_MODEL_PROVIDER); if (currentSetting != null && currentSetting.equals(newValue)) return false; - + Object input = getViewerInput(configuration,(String) newValue); if (input instanceof ModelProvider) { ModelProvider provider = (ModelProvider) input; @@ -146,7 +146,7 @@ public class ModelSynchronizePage extends AbstractSynchronizePage { String currentSetting = (String)configuration.getProperty(ITeamContentProviderManager.PROP_PAGE_LAYOUT); if (currentSetting != null && currentSetting.equals(newValue)) return false; - + IDialogSettings pageSettings = configuration.getSite().getPageSettings(); if(pageSettings != null) { pageSettings.put(ITeamContentProviderManager.PROP_PAGE_LAYOUT, (String) newValue); @@ -168,7 +168,7 @@ public class ModelSynchronizePage extends AbstractSynchronizePage { ModelProvider provider = getModelProvider(providerId); if (provider != null) { input = provider; - } + } } else { input = (ISynchronizationContext)configuration.getProperty(ITeamContentProviderManager.P_SYNCHRONIZATION_CONTEXT); } |