diff options
Diffstat (limited to 'plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java')
| -rw-r--r-- | plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java index 790cdae37629..6f5013c4a929 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java @@ -26,13 +26,14 @@ import com.intellij.openapi.util.Ref; import com.intellij.openapi.vcs.changes.VcsAnnotationRefresher; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; +import org.jetbrains.idea.svn.api.Depth; import org.jetbrains.idea.svn.auth.SvnAuthenticationManager; import org.jetbrains.idea.svn.auth.SvnAuthenticationProvider; import org.jetbrains.idea.svn.auth.SvnInteractiveAuthenticationProvider; import org.jetbrains.idea.svn.config.SvnServerFileKeys; +import org.jetbrains.idea.svn.diff.DiffOptions; import org.jetbrains.idea.svn.update.MergeRootInfo; import org.jetbrains.idea.svn.update.UpdateRootInfo; -import org.tmatesoft.svn.core.SVNDepth; import org.tmatesoft.svn.core.SVNErrorMessage; import org.tmatesoft.svn.core.SVNURL; import org.tmatesoft.svn.core.auth.ISVNAuthenticationProvider; @@ -41,7 +42,6 @@ import org.tmatesoft.svn.core.internal.wc.ISVNAuthenticationStorage; import org.tmatesoft.svn.core.internal.wc.SVNConfigFile; import org.tmatesoft.svn.core.internal.wc.SVNFileUtil; import org.tmatesoft.svn.core.wc.ISVNOptions; -import org.tmatesoft.svn.core.wc.SVNDiffOptions; import org.tmatesoft.svn.core.wc.SVNWCUtil; import java.io.File; @@ -76,9 +76,6 @@ public class SvnConfiguration implements PersistentStateComponent<SvnConfigurati private SvnAuthenticationManager myInteractiveManager; public static final AuthStorage RUNTIME_AUTH_CACHE = new AuthStorage(); - // TODO: update depth is not stored in configuration as SVNDepth has wrong type for DefaultJDOMExternalizer - // TODO: check if it should be stored - public SVNDepth UPDATE_DEPTH = SVNDepth.UNKNOWN; private final Map<File, MergeRootInfo> myMergeRootInfos = new HashMap<File, MergeRootInfo>(); private final Map<File, UpdateRootInfo> myUpdateRootInfos = new HashMap<File, UpdateRootInfo>(); @@ -109,8 +106,9 @@ public class SvnConfiguration implements PersistentStateComponent<SvnConfigurati } } - public SVNDiffOptions getMergeOptions() { - return new SVNDiffOptions(isIgnoreSpacesInMerge(), isIgnoreSpacesInMerge(), isIgnoreSpacesInMerge()); + @NotNull + public DiffOptions getMergeOptions() { + return new DiffOptions(isIgnoreSpacesInMerge(), isIgnoreSpacesInMerge(), isIgnoreSpacesInMerge()); } private void initServers() { @@ -180,12 +178,12 @@ public class SvnConfiguration implements PersistentStateComponent<SvnConfigurati myState.sslProtocols = sslProtocols; } - public SVNDepth getUpdateDepth() { - return UPDATE_DEPTH; + public Depth getUpdateDepth() { + return myState.UPDATE_DEPTH; } - public void setUpdateDepth(SVNDepth updateDepth) { - this.UPDATE_DEPTH = updateDepth; + public void setUpdateDepth(Depth updateDepth) { + myState.UPDATE_DEPTH = updateDepth; } public UseAcceleration getUseAcceleration() { |