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/lock/SvnKitLockClient.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/lock/SvnKitLockClient.java')
-rw-r--r-- | plugins/svn4idea/src/org/jetbrains/idea/svn/lock/SvnKitLockClient.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/lock/SvnKitLockClient.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/lock/SvnKitLockClient.java index d11aec262b09..2db2650aab04 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/lock/SvnKitLockClient.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/lock/SvnKitLockClient.java @@ -4,9 +4,9 @@ import com.intellij.openapi.vcs.VcsException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.svn.api.BaseSvnClient; +import org.jetbrains.idea.svn.api.ProgressTracker; 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.SVNWCClient; import java.io.File; @@ -17,7 +17,7 @@ import java.io.File; public class SvnKitLockClient extends BaseSvnClient implements LockClient { @Override - public void lock(@NotNull File file, boolean force, @NotNull String message, @Nullable ISVNEventHandler handler) throws VcsException { + public void lock(@NotNull File file, boolean force, @NotNull String message, @Nullable ProgressTracker handler) throws VcsException { try { getClient(handler).doLock(new File[]{file}, force, message); } @@ -27,7 +27,7 @@ public class SvnKitLockClient extends BaseSvnClient implements LockClient { } @Override - public void unlock(@NotNull File file, boolean force, @Nullable ISVNEventHandler handler) throws VcsException { + public void unlock(@NotNull File file, boolean force, @Nullable ProgressTracker handler) throws VcsException { try { getClient(handler).doUnlock(new File[]{file}, force); } @@ -37,10 +37,10 @@ public class SvnKitLockClient extends BaseSvnClient implements LockClient { } @NotNull - private SVNWCClient getClient(@Nullable ISVNEventHandler handler) { + private SVNWCClient getClient(@Nullable ProgressTracker handler) { SVNWCClient client = myVcs.getSvnKitManager().createWCClient(); - client.setEventHandler(handler); + client.setEventHandler(toEventHandler(handler)); return client; } |