diff options
Diffstat (limited to 'plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SvnFormatWorker.java')
-rw-r--r-- | plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SvnFormatWorker.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SvnFormatWorker.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SvnFormatWorker.java index 8e99055ef94d..bfdadef54cc8 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SvnFormatWorker.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SvnFormatWorker.java @@ -33,11 +33,11 @@ import org.jetbrains.idea.svn.SvnUtil; import org.jetbrains.idea.svn.SvnVcs; import org.jetbrains.idea.svn.WorkingCopyFormat; import org.jetbrains.idea.svn.api.ClientFactory; +import org.jetbrains.idea.svn.api.EventAction; +import org.jetbrains.idea.svn.api.ProgressEvent; +import org.jetbrains.idea.svn.api.ProgressTracker; import org.tmatesoft.svn.core.SVNCancelException; import org.tmatesoft.svn.core.SVNException; -import org.tmatesoft.svn.core.wc.ISVNEventHandler; -import org.tmatesoft.svn.core.wc.SVNEvent; -import org.tmatesoft.svn.core.wc.SVNEventAction; import java.io.File; import java.util.ArrayList; @@ -111,7 +111,7 @@ public class SvnFormatWorker extends Task.Backgroundable { String cleanupMessage = SvnBundle.message("action.Subversion.cleanup.progress.text", path.getAbsolutePath()); String upgradeMessage = SvnBundle.message("action.change.wcopy.format.task.progress.text", path.getAbsolutePath(), wcInfo.getFormat(), myNewFormat); - ISVNEventHandler handler = createUpgradeHandler(indicator, cleanupMessage, upgradeMessage); + ProgressTracker handler = createUpgradeHandler(indicator, cleanupMessage, upgradeMessage); getFactory(path, myNewFormat).createUpgradeClient().upgrade(path, myNewFormat, handler); } catch (Throwable e) { @@ -155,22 +155,22 @@ public class SvnFormatWorker extends Task.Backgroundable { return result; } - private static ISVNEventHandler createUpgradeHandler(@NotNull final ProgressIndicator indicator, + private static ProgressTracker createUpgradeHandler(@NotNull final ProgressIndicator indicator, @NotNull final String cleanupMessage, @NotNull final String upgradeMessage) { - return new ISVNEventHandler() { + return new ProgressTracker() { @Override - public void handleEvent(SVNEvent event, double progress) throws SVNException { + public void consume(ProgressEvent event) throws SVNException { if (event.getFile() != null) { - if (SVNEventAction.UPGRADED_PATH.equals(event.getAction())) { + if (EventAction.UPGRADED_PATH.equals(event.getAction())) { indicator.setText2("Upgraded path " + VcsUtil.getPathForProgressPresentation(event.getFile())); } // fake event indicating cleanup start - if (SVNEventAction.UPDATE_STARTED.equals(event.getAction())) { + if (EventAction.UPDATE_STARTED.equals(event.getAction())) { indicator.setText(cleanupMessage); } // fake event indicating upgrade start - if (SVNEventAction.UPDATE_COMPLETED.equals(event.getAction())) { + if (EventAction.UPDATE_COMPLETED.equals(event.getAction())) { indicator.setText(upgradeMessage); } } |