diff options
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageSaveablePart.java')
-rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageSaveablePart.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageSaveablePart.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageSaveablePart.java index 50458b981..d563cb125 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageSaveablePart.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageSaveablePart.java @@ -137,7 +137,7 @@ public class ParticipantPageSaveablePart extends PageSaveablePart implements ICo if (source instanceof DiffNode) { commit(new NullProgressMonitor(), (DiffNode) source); } else if (source instanceof LocalResourceTypedElement) { - ((LocalResourceTypedElement) source).commit(new NullProgressMonitor()); + ((LocalResourceTypedElement) source).commit(new NullProgressMonitor()); } } catch (CoreException e) { Utils.handle(e); @@ -237,7 +237,7 @@ public class ParticipantPageSaveablePart extends PageSaveablePart implements ICo @Override protected void prepareInput(final ICompareInput input, CompareConfiguration configuration, IProgressMonitor monitor) throws InvocationTargetException { monitor.beginTask(TeamUIMessages.SyncInfoCompareInput_3, 100); - monitor.setTaskName(TeamUIMessages.SyncInfoCompareInput_3); + monitor.setTaskName(TeamUIMessages.SyncInfoCompareInput_3); try { // First, see if the active buffer is changing checkForBufferChange(pageConfiguration.getSite().getShell(), input, false /* cancel not allowed */, monitor); @@ -256,8 +256,8 @@ public class ParticipantPageSaveablePart extends PageSaveablePart implements ICo } catch (CoreException e) { throw new InvocationTargetException(e); } finally { - monitor.done(); - } + monitor.done(); + } } private void checkForBufferChange(Shell shell, final ICompareInput input, boolean cancelAllowed, IProgressMonitor monitor) throws CoreException { @@ -286,11 +286,11 @@ public class ParticipantPageSaveablePart extends PageSaveablePart implements ICo private static void commit(IProgressMonitor pm, DiffNode node) throws CoreException { ITypedElement left = node.getLeft(); if (left instanceof LocalResourceTypedElement) - ((LocalResourceTypedElement) left).commit(pm); + ((LocalResourceTypedElement) left).commit(pm); ITypedElement right = node.getRight(); if (right instanceof LocalResourceTypedElement) - ((LocalResourceTypedElement) right).commit(pm); + ((LocalResourceTypedElement) right).commit(pm); IDiffElement[] children = node.getChildren(); for (int i = 0; i < children.length; i++) { |