diff options
author | Tor Norbye <tnorbye@google.com> | 2014-07-25 20:12:40 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-24 20:55:36 +0000 |
commit | 6044be7330c93bc8dacb0f63e62da8029f39a16f (patch) | |
tree | 0ba72f5de1949e0527874a799baa224cbe1537e0 /plugins/svn4idea/src/org/jetbrains/idea/svn/upgrade/SvnKitUpgradeClient.java | |
parent | b03a5855292feb8c331815f883fe64372aacd872 (diff) | |
parent | e5266e2343c8d275d79fa0be725180d0fe3a993c (diff) | |
download | idea-6044be7330c93bc8dacb0f63e62da8029f39a16f.tar.gz |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'plugins/svn4idea/src/org/jetbrains/idea/svn/upgrade/SvnKitUpgradeClient.java')
-rw-r--r-- | plugins/svn4idea/src/org/jetbrains/idea/svn/upgrade/SvnKitUpgradeClient.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/upgrade/SvnKitUpgradeClient.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/upgrade/SvnKitUpgradeClient.java index 66b5f71b4911..f583ad2c8eda 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/upgrade/SvnKitUpgradeClient.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/upgrade/SvnKitUpgradeClient.java @@ -5,11 +5,11 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.svn.WorkingCopyFormat; import org.jetbrains.idea.svn.api.BaseSvnClient; +import org.jetbrains.idea.svn.api.EventAction; +import org.jetbrains.idea.svn.api.ProgressTracker; import org.jetbrains.idea.svn.checkout.SvnKitCheckoutClient; import org.jetbrains.idea.svn.commandLine.SvnBindException; import org.tmatesoft.svn.core.SVNException; -import org.tmatesoft.svn.core.wc.ISVNEventHandler; -import org.tmatesoft.svn.core.wc.SVNEventAction; import org.tmatesoft.svn.core.wc.SVNWCClient; import java.io.File; @@ -21,12 +21,12 @@ import java.util.List; public class SvnKitUpgradeClient extends BaseSvnClient implements UpgradeClient { @Override - public void upgrade(@NotNull File path, @NotNull WorkingCopyFormat format, @Nullable ISVNEventHandler handler) throws VcsException { + public void upgrade(@NotNull File path, @NotNull WorkingCopyFormat format, @Nullable ProgressTracker handler) throws VcsException { validateFormat(format, getSupportedFormats()); SVNWCClient client = myVcs.getSvnKitManager().createWCClient(); - client.setEventHandler(handler); + client.setEventHandler(toEventHandler(handler)); try { cleanupIfNecessary(path, format, client, handler); upgrade(path, format, client, handler); @@ -44,11 +44,11 @@ public class SvnKitUpgradeClient extends BaseSvnClient implements UpgradeClient private static void cleanupIfNecessary(@NotNull File path, @NotNull WorkingCopyFormat format, @NotNull SVNWCClient client, - @Nullable ISVNEventHandler handler) throws SVNException, VcsException { + @Nullable ProgressTracker handler) throws SVNException, VcsException { // cleanup is executed only for SVNKit as it could handle both 1.6 and 1.7 formats if (WorkingCopyFormat.ONE_DOT_SEVEN.equals(format)) { // fake event indicating cleanup start - callHandler(handler, createEvent(path, SVNEventAction.UPDATE_STARTED)); + callHandler(handler, createEvent(path, EventAction.UPDATE_STARTED)); client.doCleanup(path); } } @@ -56,9 +56,9 @@ public class SvnKitUpgradeClient extends BaseSvnClient implements UpgradeClient private static void upgrade(@NotNull File path, @NotNull WorkingCopyFormat format, @NotNull SVNWCClient client, - @Nullable ISVNEventHandler handler) throws SVNException, VcsException { + @Nullable ProgressTracker handler) throws SVNException, VcsException { // fake event indicating upgrade start - callHandler(handler, createEvent(path, SVNEventAction.UPDATE_COMPLETED)); + callHandler(handler, createEvent(path, EventAction.UPDATE_COMPLETED)); client.doSetWCFormat(path, format.getFormat()); } } |