1 files changed, 10 insertions, 9 deletions

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/properties/CmdPropertyClient.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/properties/CmdPropertyClient.java
index 60ab43c3baba..e855abe1ec2e 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/properties/CmdPropertyClient.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/properties/CmdPropertyClient.java
@@ -5,12 +5,13 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.svn.SvnUtil;
 import org.jetbrains.idea.svn.api.BaseSvnClient;
+import org.jetbrains.idea.svn.api.Depth;
 import org.jetbrains.idea.svn.commandLine.CommandExecutor;
 import org.jetbrains.idea.svn.commandLine.CommandUtil;
 import org.jetbrains.idea.svn.commandLine.SvnCommandName;
+import org.jetbrains.idea.svn.info.Info;
 import org.tmatesoft.svn.core.*;
 import org.tmatesoft.svn.core.wc.ISVNPropertyHandler;
-import org.tmatesoft.svn.core.wc.SVNInfo;
 import org.tmatesoft.svn.core.wc.SVNPropertyData;
 import org.tmatesoft.svn.core.wc.SVNRevision;
 import org.tmatesoft.svn.core.wc2.SvnTarget;
@@ -63,7 +64,7 @@ public class CmdPropertyClient extends BaseSvnClient implements PropertyClient {
   public void getProperty(@NotNull SvnTarget target,
                           @NotNull String property,
                           @Nullable SVNRevision revision,
-                          @Nullable SVNDepth depth,
+                          @Nullable Depth depth,
                           @Nullable ISVNPropertyHandler handler) throws VcsException {
     List<String> parameters = new ArrayList<String>();
 
@@ -77,7 +78,7 @@ public class CmdPropertyClient extends BaseSvnClient implements PropertyClient {
   @Override
   public void list(@NotNull SvnTarget target,
                    @Nullable SVNRevision revision,
-                   @Nullable SVNDepth depth,
+                   @Nullable Depth depth,
                    @Nullable ISVNPropertyHandler handler) throws VcsException {
     List<String> parameters = new ArrayList<String>();
     fillListParameters(target, revision, depth, parameters, true);
@@ -90,7 +91,7 @@ public class CmdPropertyClient extends BaseSvnClient implements PropertyClient {
   public void setProperty(@NotNull File file,
                           @NotNull String property,
                           @Nullable SVNPropertyValue value,
-                          @Nullable SVNDepth depth,
+                          @Nullable Depth depth,
                           boolean force) throws VcsException {
     runSetProperty(SvnTarget.fromFile(file), property, null, depth, value, force);
   }
@@ -101,7 +102,7 @@ public class CmdPropertyClient extends BaseSvnClient implements PropertyClient {
     currentProperties.putAll(properties);
 
     for (String propertyName : currentProperties.nameSet()) {
-      setProperty(file, propertyName, currentProperties.getSVNPropertyValue(propertyName), SVNDepth.EMPTY, true);
+      setProperty(file, propertyName, currentProperties.getSVNPropertyValue(propertyName), Depth.EMPTY, true);
     }
   }
 
@@ -109,7 +110,7 @@ public class CmdPropertyClient extends BaseSvnClient implements PropertyClient {
   private SVNProperties collectPropertiesToDelete(@NotNull File file) throws VcsException {
     final SVNProperties result = new SVNProperties();
 
-    list(SvnTarget.fromFile(file), null, SVNDepth.EMPTY, new ISVNPropertyHandler() {
+    list(SvnTarget.fromFile(file), null, Depth.EMPTY, new ISVNPropertyHandler() {
       @Override
       public void handleProperty(File path, SVNPropertyData property) throws SVNException {
         // null indicates property will be deleted
@@ -140,7 +141,7 @@ public class CmdPropertyClient extends BaseSvnClient implements PropertyClient {
   private void runSetProperty(@NotNull SvnTarget target,
                               @NotNull String property,
                               @Nullable SVNRevision revision,
-                              @Nullable SVNDepth depth,
+                              @Nullable Depth depth,
                               @Nullable SVNPropertyValue value,
                               boolean force) throws VcsException {
     List<String> parameters = new ArrayList<String>();
@@ -169,7 +170,7 @@ public class CmdPropertyClient extends BaseSvnClient implements PropertyClient {
 
   private void fillListParameters(@NotNull SvnTarget target,
                                   @Nullable SVNRevision revision,
-                                  @Nullable SVNDepth depth,
+                                  @Nullable Depth depth,
                                   @NotNull List<String> parameters,
                                   boolean verbose) {
     CommandUtil.put(parameters, target);
@@ -266,7 +267,7 @@ public class CmdPropertyClient extends BaseSvnClient implements PropertyClient {
 
     // base should be resolved manually - could not set revision to BASE to get revision property
     if (SVNRevision.BASE.equals(revision)) {
-      SVNInfo info = myVcs.getInfo(path, SVNRevision.BASE);
+      Info info = myVcs.getInfo(path, SVNRevision.BASE);
 
       result = info != null ? info.getRevision().getNumber() : -1;
     }