diff options
Diffstat (limited to 'plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/CommandUtil.java')
-rw-r--r-- | plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/CommandUtil.java | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/CommandUtil.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/CommandUtil.java index 84794b7249a8..eee798737846 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/CommandUtil.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/CommandUtil.java @@ -4,10 +4,10 @@ import com.intellij.openapi.application.PathManager; import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.tmatesoft.svn.core.SVNDepth; -import org.tmatesoft.svn.core.wc.SVNDiffOptions; +import org.jetbrains.idea.svn.api.Depth; +import org.jetbrains.idea.svn.diff.DiffOptions; +import org.jetbrains.idea.svn.status.StatusType; import org.tmatesoft.svn.core.wc.SVNRevision; -import org.tmatesoft.svn.core.wc.SVNStatusType; import org.tmatesoft.svn.core.wc2.SvnTarget; import javax.xml.bind.JAXBContext; @@ -90,12 +90,12 @@ public class CommandUtil { } } - public static void put(@NotNull List<String> parameters, @Nullable SVNDepth depth) { + public static void put(@NotNull List<String> parameters, @Nullable Depth depth) { put(parameters, depth, false); } - public static void put(@NotNull List<String> parameters, @Nullable SVNDepth depth, boolean sticky) { - if (depth != null && !SVNDepth.UNKNOWN.equals(depth)) { + public static void put(@NotNull List<String> parameters, @Nullable Depth depth, boolean sticky) { + if (depth != null && !Depth.UNKNOWN.equals(depth)) { parameters.add("--depth"); parameters.add(depth.getName()); @@ -113,7 +113,7 @@ public class CommandUtil { } } - public static void put(@NotNull List<String> parameters, @Nullable SVNDiffOptions diffOptions) { + public static void put(@NotNull List<String> parameters, @Nullable DiffOptions diffOptions) { if (diffOptions != null) { StringBuilder builder = new StringBuilder(); @@ -172,29 +172,29 @@ public class CommandUtil { } @NotNull - public static SVNStatusType getStatusType(@Nullable String type) { + public static StatusType getStatusType(@Nullable String type) { return getStatusType(getStatusChar(type)); } @NotNull - public static SVNStatusType getStatusType(char first) { - final SVNStatusType contentsStatus; + public static StatusType getStatusType(char first) { + final StatusType contentsStatus; if ('A' == first) { - contentsStatus = SVNStatusType.STATUS_ADDED; + contentsStatus = StatusType.STATUS_ADDED; } else if ('D' == first) { - contentsStatus = SVNStatusType.STATUS_DELETED; + contentsStatus = StatusType.STATUS_DELETED; } else if ('U' == first) { - contentsStatus = SVNStatusType.CHANGED; + contentsStatus = StatusType.CHANGED; } else if ('C' == first) { - contentsStatus = SVNStatusType.CONFLICTED; + contentsStatus = StatusType.CONFLICTED; } else if ('G' == first) { - contentsStatus = SVNStatusType.MERGED; + contentsStatus = StatusType.MERGED; } else if ('R' == first) { - contentsStatus = SVNStatusType.STATUS_REPLACED; + contentsStatus = StatusType.STATUS_REPLACED; } else if ('E' == first) { - contentsStatus = SVNStatusType.STATUS_OBSTRUCTED; + contentsStatus = StatusType.STATUS_OBSTRUCTED; } else { - contentsStatus = SVNStatusType.STATUS_NORMAL; + contentsStatus = StatusType.STATUS_NORMAL; } return contentsStatus; } |