From 1f0ede6098d72ab1323fc0e39b84df8c8ec82031 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Fri, 28 Dec 2012 19:17:41 +0400 Subject: [PATCH] Move splitPath method to the FileUtil. --- .../com/intellij/ide/util/DirectoryChooser.java | 15 ++------------- .../com/intellij/openapi/util/io/FileUtil.java | 13 +++++++++++++ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooser.java b/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooser.java index f698b920bf62..b703c2c5c749 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooser.java +++ b/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooser.java @@ -30,6 +30,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.SystemInfo; +import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; @@ -186,23 +187,11 @@ public class DirectoryChooser extends DialogWrapper { return "chooseDestDirectoryDialog"; } - private static String[] splitPath(String path) { - ArrayList list = new ArrayList(); - int index = 0; - int nextSeparator; - while ((nextSeparator = path.indexOf(File.separatorChar, index)) != -1) { - list.add(path.substring(index, nextSeparator)); - index = nextSeparator + 1; - } - list.add(path.substring(index, path.length())); - return ArrayUtil.toStringArray(list); - } - private void buildFragments() { ArrayList pathes = new ArrayList(); for (int i = 0; i < myView.getItemsSize(); i++) { ItemWrapper item = myView.getItemByIndex(i); - pathes.add(splitPath(item.getPresentableUrl())); + pathes.add(ArrayUtil.toStringArray(FileUtil.splitPath(item.getPresentableUrl()))); } FragmentBuilder headBuilder = new FragmentBuilder(pathes){ protected void append(String fragment, StringBuffer buffer) { diff --git a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java index 863766ce8ff7..3a18481857e7 100644 --- a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java +++ b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java @@ -1318,6 +1318,19 @@ public class FileUtil extends FileUtilRt { return FileUtilRt.loadBytes(stream, length); } + @NotNull + public static List splitPath(@NotNull String path) { + ArrayList list = new ArrayList(); + int index = 0; + int nextSeparator; + while ((nextSeparator = path.indexOf(File.separatorChar, index)) != -1) { + list.add(path.substring(index, nextSeparator)); + index = nextSeparator + 1; + } + list.add(path.substring(index, path.length())); + return list; + } + private static final class CompletedFuture implements Future { public boolean cancel(boolean mayInterruptIfRunning) { return false;