diff options
| author | Andrey Loskutov | 2019-01-15 22:21:37 +0000 |
|---|---|---|
| committer | Andrey Loskutov | 2019-01-15 22:21:37 +0000 |
| commit | 2d9e70c20b9a8400a565934e74de9406497d4f8a (patch) | |
| tree | 647da9bf91a5c1e08ab53b91d6fa874f5992571a /bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelCompareEditorInput.java | |
| parent | d7e34dabfab460f62eed04eb36cbeb6f46506e03 (diff) | |
| download | eclipse.platform.team-I20190116-1800.tar.gz eclipse.platform.team-I20190116-1800.tar.xz eclipse.platform.team-I20190116-1800.zip | |
Bug 543478 - harmonized import settings and organized importsY20190116-2200I20190116-1800I20190115-1800
Use org.eclipse.jdt.ui.ondemandthreshold=99 in all projects
Change-Id: I45fc5a90242a9a889138fd2c94f522e6f390c1dd
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelCompareEditorInput.java')
| -rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelCompareEditorInput.java | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelCompareEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelCompareEditorInput.java index 330f0d15e..37e38eec3 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelCompareEditorInput.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelCompareEditorInput.java @@ -13,17 +13,25 @@ *******************************************************************************/ package org.eclipse.team.internal.ui.synchronize.patch; -import org.eclipse.compare.*; +import org.eclipse.compare.CompareViewerPane; +import org.eclipse.compare.ICompareNavigator; +import org.eclipse.compare.IResourceProvider; import org.eclipse.compare.internal.CompareEditorInputNavigator; import org.eclipse.compare.internal.patch.PatchFileDiffNode; import org.eclipse.compare.structuremergeviewer.ICompareInput; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IStatus; -import org.eclipse.jface.action.*; -import org.eclipse.jface.viewers.*; -import org.eclipse.team.internal.ui.*; -import org.eclipse.team.internal.ui.mapping.*; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.action.IMenuManager; +import org.eclipse.jface.action.Separator; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.team.internal.ui.TeamUIMessages; +import org.eclipse.team.internal.ui.TeamUIPlugin; +import org.eclipse.team.internal.ui.Utils; +import org.eclipse.team.internal.ui.mapping.ModelCompareEditorInput; +import org.eclipse.team.internal.ui.mapping.ResourceMarkAsMergedHandler; +import org.eclipse.team.internal.ui.mapping.ResourceMergeHandler; import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration; import org.eclipse.team.ui.synchronize.ModelSynchronizeParticipant; import org.eclipse.ui.IWorkbenchActionConstants; |