diff options
Diffstat (limited to 'plugins/svn4idea/src/org/jetbrains/idea/svn/upgrade')
3 files changed, 18 insertions, 22 deletions
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/upgrade/CmdUpgradeClient.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/upgrade/CmdUpgradeClient.java index 3a4e6eb6ce92..f27615423904 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/upgrade/CmdUpgradeClient.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/upgrade/CmdUpgradeClient.java @@ -7,14 +7,10 @@ import com.intellij.util.containers.Convertor; 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.FileStatusResultParser; +import org.jetbrains.idea.svn.api.*; import org.jetbrains.idea.svn.commandLine.CommandUtil; import org.jetbrains.idea.svn.commandLine.LineCommandAdapter; import org.jetbrains.idea.svn.commandLine.SvnCommandName; -import org.tmatesoft.svn.core.wc.ISVNEventHandler; -import org.tmatesoft.svn.core.wc.SVNEvent; -import org.tmatesoft.svn.core.wc.SVNEventAction; import org.tmatesoft.svn.core.wc2.SvnTarget; import java.io.File; @@ -34,11 +30,11 @@ public class CmdUpgradeClient extends BaseSvnClient implements UpgradeClient { private static final Pattern CHANGED_PATH = Pattern.compile(STATUS + PATH); @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()); // fake event indicating upgrade start - callHandler(handler, createEvent(path, SVNEventAction.UPDATE_COMPLETED)); + callHandler(handler, createEvent(path, EventAction.UPDATE_COMPLETED)); List<String> parameters = new ArrayList<String>(); @@ -64,9 +60,9 @@ public class CmdUpgradeClient extends BaseSvnClient implements UpgradeClient { return result; } - private static class UpgradeStatusConvertor implements Convertor<Matcher, SVNEvent> { + private static class UpgradeStatusConvertor implements Convertor<Matcher, ProgressEvent> { - public SVNEvent convert(@NotNull Matcher matcher) { + public ProgressEvent convert(@NotNull Matcher matcher) { String statusMessage = matcher.group(1); String path = matcher.group(2); @@ -74,11 +70,11 @@ public class CmdUpgradeClient extends BaseSvnClient implements UpgradeClient { } @Nullable - public static SVNEventAction createAction(@NotNull String code) { - SVNEventAction result = null; + public static EventAction createAction(@NotNull String code) { + EventAction result = null; if ("Upgraded".equals(code)) { - result = SVNEventAction.UPGRADED_PATH; + result = EventAction.UPGRADED_PATH; } return result; 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()); } } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/upgrade/UpgradeClient.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/upgrade/UpgradeClient.java index 2d22acf08c45..22d916f158fd 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/upgrade/UpgradeClient.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/upgrade/UpgradeClient.java @@ -4,8 +4,8 @@ import com.intellij.openapi.vcs.VcsException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.svn.WorkingCopyFormat; +import org.jetbrains.idea.svn.api.ProgressTracker; import org.jetbrains.idea.svn.api.SvnClient; -import org.tmatesoft.svn.core.wc.ISVNEventHandler; import java.io.File; import java.util.List; @@ -15,7 +15,7 @@ import java.util.List; */ public interface UpgradeClient extends SvnClient { - void upgrade(@NotNull File path, @NotNull WorkingCopyFormat format, @Nullable ISVNEventHandler handler) throws VcsException; + void upgrade(@NotNull File path, @NotNull WorkingCopyFormat format, @Nullable ProgressTracker handler) throws VcsException; List<WorkingCopyFormat> getSupportedFormats() throws VcsException; } |