Move util-rt utility classes to a more familiar place

This commit is contained in:
Roman Shevchenko
2012-03-21 09:44:05 +01:00
parent 60a2342b4f
commit 71f910e1cf
12 changed files with 11 additions and 12 deletions
@@ -29,7 +29,7 @@ import org.codehaus.groovy.GroovyException;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jps.MacroExpander;
import org.jetbrains.jps.javac.JavacServer;
import org.jetbrains.util.rt.FileUtilRt;
import com.intellij.openapi.util.io.FileUtilRt;
import org.objectweb.asm.ClassWriter;
import javax.tools.*;
@@ -15,7 +15,7 @@
*/
package com.intellij.openapi.util;
import org.jetbrains.util.rt.StringUtilRt;
import com.intellij.openapi.util.text.StringUtilRt;
import java.util.Arrays;
import java.util.Collection;
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.util.rt;
package com.intellij.openapi.util;
/**
* Stripped-down version of {@code com.intellij.openapi.util.SystemInfo}.
@@ -13,13 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.util.rt;
package com.intellij.openapi.util.io;
import com.intellij.openapi.diagnostic.Logger;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import com.intellij.openapi.util.text.StringUtilRt;
import com.intellij.openapi.util.SystemInfoRt;
import java.io.*;
import java.util.UUID;
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.util.rt;
package com.intellij.openapi.util.text;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -17,7 +17,6 @@ package com.intellij.openapi.util;
import com.intellij.openapi.util.text.StringUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.util.rt.SystemInfoRt;
import java.io.File;
import java.util.List;
@@ -34,7 +34,6 @@ import org.intellij.lang.annotations.RegExp;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.util.rt.FileUtilRt;
import java.io.*;
import java.lang.reflect.Method;
@@ -27,7 +27,6 @@ import com.intellij.util.text.LineReader;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.util.rt.StringUtilRt;
import java.beans.Introspector;
import java.io.ByteArrayInputStream;
@@ -22,7 +22,7 @@ import org.apache.xmlrpc.XmlRpcClientLite;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.git4idea.util.ScriptGenerator;
import org.jetbrains.util.rt.FileUtilRt;
import com.intellij.openapi.util.io.FileUtilRt;
import java.io.File;
import java.io.IOException;
@@ -20,7 +20,7 @@ import com.trilead.ssh2.*;
import com.trilead.ssh2.crypto.PEMDecoder;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.util.rt.FileUtilRt;
import com.intellij.openapi.util.io.FileUtilRt;
import java.io.*;
import java.util.*;
@@ -21,7 +21,7 @@ import com.intellij.util.PathUtil;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.util.rt.FileUtilRt;
import com.intellij.openapi.util.io.FileUtilRt;
import java.io.File;
import java.io.FileWriter;
@@ -58,7 +58,7 @@ import org.jetbrains.idea.maven.project.MavenProjectsManager;
import org.jetbrains.idea.maven.utils.MavenLog;
import org.jetbrains.idea.maven.utils.MavenProgressIndicator;
import org.jetbrains.idea.maven.utils.MavenUtil;
import org.jetbrains.util.rt.SystemInfoRt;
import com.intellij.openapi.util.SystemInfoRt;
import java.io.File;
import java.nio.charset.Charset;