diff options
Diffstat (limited to 'plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/IdeaCommitHandler.java')
-rw-r--r-- | plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/IdeaCommitHandler.java | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/IdeaCommitHandler.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/IdeaCommitHandler.java index 3b78ac667efa..2dc46692cf59 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/IdeaCommitHandler.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/IdeaCommitHandler.java @@ -27,11 +27,10 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.svn.SvnBundle; -import org.jetbrains.idea.svn.SvnUtil; +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.wc.ISVNEventHandler; -import org.tmatesoft.svn.core.wc.SVNEvent; -import org.tmatesoft.svn.core.wc.SVNEventAction; import java.io.File; import java.util.List; @@ -42,7 +41,7 @@ import java.util.List; * Date: 2/26/13 * Time: 11:13 AM */ -public class IdeaCommitHandler implements CommitEventHandler, ISVNEventHandler { +public class IdeaCommitHandler implements CommitEventHandler, ProgressTracker { private static final Logger LOG = Logger.getInstance(IdeaCommitHandler.class); @@ -81,8 +80,8 @@ public class IdeaCommitHandler implements CommitEventHandler, ISVNEventHandler { myProgress.setText2(SvnBundle.message("status.text.comitted.revision", revNum)); } - public void handleEvent(SVNEvent event, double p) { - final String path = SvnUtil.getPathForProgress(event); + public void consume(ProgressEvent event) { + final String path = event.getPath(); if (path != null) { CommitEventType eventType = convert(event.getAction()); @@ -120,7 +119,7 @@ public class IdeaCommitHandler implements CommitEventHandler, ISVNEventHandler { } } - private void trackDeletedFile(@NotNull SVNEvent event) { + private void trackDeletedFile(@NotNull ProgressEvent event) { @NonNls final String filePath = "file://" + event.getFile().getAbsolutePath().replace(File.separatorChar, '/'); VirtualFile virtualFile = ApplicationManager.getApplication().runReadAction(new Computable<VirtualFile>() { @Nullable @@ -135,22 +134,22 @@ public class IdeaCommitHandler implements CommitEventHandler, ISVNEventHandler { } @NotNull - private static CommitEventType convert(@NotNull SVNEventAction action) { + private static CommitEventType convert(@NotNull EventAction action) { CommitEventType result = CommitEventType.unknown; - if (SVNEventAction.COMMIT_ADDED.equals(action)) { + if (EventAction.COMMIT_ADDED.equals(action)) { result = CommitEventType.adding; - } else if (SVNEventAction.COMMIT_DELETED.equals(action)) { + } else if (EventAction.COMMIT_DELETED.equals(action)) { result = CommitEventType.deleting; - } else if (SVNEventAction.COMMIT_MODIFIED.equals(action)) { + } else if (EventAction.COMMIT_MODIFIED.equals(action)) { result = CommitEventType.sending; - } else if (SVNEventAction.COMMIT_REPLACED.equals(action)) { + } else if (EventAction.COMMIT_REPLACED.equals(action)) { result = CommitEventType.replacing; - } else if (SVNEventAction.COMMIT_DELTA_SENT.equals(action)) { + } else if (EventAction.COMMIT_DELTA_SENT.equals(action)) { result = CommitEventType.transmittingDeltas; - } else if (SVNEventAction.SKIP.equals(action)) { + } else if (EventAction.SKIP.equals(action)) { result = CommitEventType.skipped; - } else if (SVNEventAction.FAILED_OUT_OF_DATE.equals(action)) { + } else if (EventAction.FAILED_OUT_OF_DATE.equals(action)) { result = CommitEventType.failedOutOfDate; } |