diff options
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/AbstractCommitAction.java')
-rw-r--r-- | bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/AbstractCommitAction.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/AbstractCommitAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/AbstractCommitAction.java index 8cfbcd909..38d60aaeb 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/AbstractCommitAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/AbstractCommitAction.java @@ -42,7 +42,7 @@ public abstract class AbstractCommitAction extends CVSModelProviderAction { @Override public void execute() { - final List resources = new ArrayList(); + final List resources = new ArrayList(); try { final IStructuredSelection selection = getActualSelection(); PlatformUI.getWorkbench().getProgressService().busyCursorWhile(monitor -> { @@ -61,12 +61,12 @@ public abstract class AbstractCommitAction extends CVSModelProviderAction { Utils.handleError(getConfiguration().getSite().getShell(), e, null, null); } if (!resources.isEmpty() && ((IResource[])resources.get(0)).length > 0) { - Shell shell= getConfiguration().getSite().getShell(); - try { - CommitWizard.run(getConfiguration().getSite().getPart(), shell, ((IResource[])resources.get(0))); - } catch (CVSException e) { - CVSUIPlugin.log(e); - } + Shell shell= getConfiguration().getSite().getShell(); + try { + CommitWizard.run(getConfiguration().getSite().getPart(), shell, ((IResource[])resources.get(0))); + } catch (CVSException e) { + CVSUIPlugin.log(e); + } } } @@ -76,7 +76,7 @@ public abstract class AbstractCommitAction extends CVSModelProviderAction { protected abstract ResourceTraversal[] getCommitTraversals(IStructuredSelection selection, IProgressMonitor monitor) throws CoreException; - public static IResource[] getOutgoingChanges(final IResourceDiffTree tree, ResourceTraversal[] traversals, IProgressMonitor monitor) { + public static IResource[] getOutgoingChanges(final IResourceDiffTree tree, ResourceTraversal[] traversals, IProgressMonitor monitor) { final List<IResource> resources = new ArrayList<>(); IDiff[] diffs = tree.getDiffs(traversals); for (int i = 0; i < diffs.length; i++) { @@ -88,8 +88,8 @@ public abstract class AbstractCommitAction extends CVSModelProviderAction { } } return resources.toArray(new IResource[resources.size()]); - } - + } + public static boolean hasLocalChange(IDiff diff) { if (diff instanceof IThreeWayDiff) { IThreeWayDiff twd = (IThreeWayDiff) diff; |