diff options
Diffstat (limited to 'plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/IntegrateEventHandler.java')
-rw-r--r-- | plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/IntegrateEventHandler.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/IntegrateEventHandler.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/IntegrateEventHandler.java index 75533d8801c3..d043c95f1f1d 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/IntegrateEventHandler.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/IntegrateEventHandler.java @@ -19,22 +19,22 @@ import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.vcs.update.FileGroup; import org.jetbrains.idea.svn.SvnBundle; import org.jetbrains.idea.svn.SvnVcs; +import org.jetbrains.idea.svn.api.EventAction; +import org.jetbrains.idea.svn.api.ProgressEvent; +import org.jetbrains.idea.svn.status.StatusType; import org.jetbrains.idea.svn.update.UpdateEventHandler; -import org.tmatesoft.svn.core.wc.SVNEvent; -import org.tmatesoft.svn.core.wc.SVNEventAction; -import org.tmatesoft.svn.core.wc.SVNStatusType; public class IntegrateEventHandler extends UpdateEventHandler { public IntegrateEventHandler(final SvnVcs vcs, final ProgressIndicator progressIndicator) { super(vcs, progressIndicator, null); } - protected boolean handleInDescendants(final SVNEvent event) { - if ((event.getAction() == SVNEventAction.UPDATE_UPDATE) && (event.getContentsStatus() == SVNStatusType.UNCHANGED) && - (event.getPropertiesStatus() == SVNStatusType.UNKNOWN)) { + protected boolean handleInDescendants(final ProgressEvent event) { + if ((event.getAction() == EventAction.UPDATE_UPDATE) && (event.getContentsStatus() == StatusType.UNCHANGED) && + (event.getPropertiesStatus() == StatusType.UNKNOWN)) { myText2 = SvnBundle.message("progres.text2.updated", event.getFile().getName()); return true; - } else if (event.getAction() == SVNEventAction.DELETE) { + } else if (event.getAction() == EventAction.DELETE) { addFileToGroup(FileGroup.REMOVED_FROM_REPOSITORY_ID, event); myText2 = SvnBundle.message("progress.text2.deleted", event.getFile().getName()); return true; |