[duplicate code] Unify scheduling of merge jobs
commit308ebeed15005e4a990ec91b0bd51727a4dec48d
authorThomas Wolf <thomas.wolf@paranor.ch>
Sat, 31 Dec 2016 14:58:46 +0000 (31 15:58 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Thu, 5 Jan 2017 14:07:24 +0000 (5 15:07 +0100)
treed5cd3f8c9689f2051caffe8e214fdc3e4d293e6e
parentecc5dd1cf600d8f22467583b1f5a1c6900add628
[duplicate code] Unify scheduling of merge jobs

MergeActionHandler and the history view's MergeHandler had lots of
duplicated code. Refactor to avoid code duplication and use JobUtil to
schedule the job.

Change-Id: I111133a92e16381d4defcfef3915ff4e5c3cc7a4
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
org.eclipse.egit.ui/src/org/eclipse/egit/ui/JobFamilies.java
org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/MergeActionHandler.java
org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/MergeHandler.java