diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/SvnCommandLineInfoClient.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/SvnCommandLineInfoClient.java
index 12c5abecc557..937e2963d1d3 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/SvnCommandLineInfoClient.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/SvnCommandLineInfoClient.java
@@ -28,7 +28,6 @@ import org.tmatesoft.svn.core.wc.ISVNInfoHandler;
 import org.tmatesoft.svn.core.wc.SVNInfo;
 import org.tmatesoft.svn.core.wc.SVNRevision;
 import org.xml.sax.SAXException;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
@@ -36,7 +35,6 @@ import javax.xml.parsers.SAXParserFactory;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
-import java.io.StringBufferInputStream;
 import java.util.Collection;
 
 /**
@@ -150,7 +148,7 @@ public class SvnCommandLineInfoClient extends SvnkitSvnWcClient {
   @Override
   public void doInfo(SVNURL url, SVNRevision pegRevision, SVNRevision revision, SVNDepth depth, ISVNInfoHandler handler)
     throws SVNException {
-    throw new NotImplementedException();
+    throw new UnsupportedOperationException();
   }
 
   @Override
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/portable/InfoConvertor.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/portable/InfoConvertor.java
index 5e65a0757af6..faea19ee6107 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/portable/InfoConvertor.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/portable/InfoConvertor.java
@@ -24,8 +24,8 @@ import org.tmatesoft.svn.core.SVNException;
 import org.tmatesoft.svn.core.SVNProperty;
 import org.tmatesoft.svn.core.SVNURL;
 import org.tmatesoft.svn.core.internal.wc.SVNConflictVersion;
-import org.tmatesoft.svn.core.wc.*;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
+import org.tmatesoft.svn.core.wc.SVNInfo;
+import org.tmatesoft.svn.core.wc.SVNTreeConflictDescription;
 
 import java.io.File;
 import java.util.Set;
@@ -40,7 +40,7 @@ public class InfoConvertor {
   private static final Logger LOG = Logger.getInstance("#org.jetbrains.idea.svn.portable.InfoConvertor");
 
   public static Info convert(SVNInfo info) {
-    throw new NotImplementedException();
+    throw new UnsupportedOperationException();
   }
 
   public static SVNInfo convert(Info info) throws SVNException {