diff options
Diffstat (limited to 'plugins/svn4idea/src/org/jetbrains/idea/svn/NestedCopiesBuilder.java')
-rw-r--r-- | plugins/svn4idea/src/org/jetbrains/idea/svn/NestedCopiesBuilder.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/NestedCopiesBuilder.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/NestedCopiesBuilder.java index 7934761fce12..d0eafb77bc4b 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/NestedCopiesBuilder.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/NestedCopiesBuilder.java @@ -20,10 +20,10 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vcs.FilePath; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; +import org.jetbrains.idea.svn.status.Status; +import org.jetbrains.idea.svn.status.StatusType; import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.SVNURL; -import org.tmatesoft.svn.core.wc.SVNStatus; -import org.tmatesoft.svn.core.wc.SVNStatusType; import java.io.File; import java.util.HashSet; @@ -42,9 +42,9 @@ public class NestedCopiesBuilder implements StatusReceiver { mySet = new HashSet<NestedCopyInfo>(); } - public void process(final FilePath path, final SVNStatus status) throws SVNException { + public void process(final FilePath path, final Status status) throws SVNException { VirtualFile file = path.getVirtualFile(); - if (file != null && SvnVcs.svnStatusIs(status, SVNStatusType.STATUS_EXTERNAL)) { + if (file != null && status.is(StatusType.STATUS_EXTERNAL)) { // We do not determine here url, repository url - because url, repository url in status will determine location in the // repository where folder is located and not where svn:externals property points. We want the later parameters - they'll // determined while creating RootUrlInfos later. Format will be also determined later. @@ -55,7 +55,7 @@ public class NestedCopiesBuilder implements StatusReceiver { } if (file == null || status.getURL() == null) return; - if (!SvnVcs.svnStatusIsUnversioned(status) && status.isSwitched()) { + if (!status.is(StatusType.STATUS_UNVERSIONED) && status.isSwitched()) { // this one called when there is switched directory under nested working copy // TODO: some other cases? final NestedCopyInfo |