MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Alexey Kudravtsev
2015-05-21 14:15:45 +03:00
parent bf17c93b1d
commit dd2580a028
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/LocalFileSystemBase.java
+1 -1
View File
@@ -224,7 +224,7 @@ public abstract class LocalFileSystemBase extends LocalFileSystem {
return FileUtil.normalize(path);
}
private static boolean isAbsoluteFileOrDriveLetter(File file) {
private static boolean isAbsoluteFileOrDriveLetter(@NotNull File file) {
String path = file.getPath();
if (SystemInfo.isWindows && path.length() == 2 && path.charAt(1) == ':') {
// just drive letter.
platform/util/src/com/intellij/openapi/util/io/FileUtil.java
+8 -9
View File
@@ -667,7 +667,7 @@ public class FileUtil extends FileUtilRt {
if (path == null || path.isEmpty()) {
return path;
}
else if (".".equals(path)) {
if (".".equals(path)) {
return "";
}
@@ -677,7 +677,8 @@ public class FileUtil extends FileUtilRt {
}
StringBuilder result = new StringBuilder(path.length());
int start = processRoot(path, result), dots = 0;
int start = processRoot(path, result);
int dots = 0;
boolean separator = true;
for (int i = start; i < path.length(); ++i) {
@@ -720,7 +721,7 @@ public class FileUtil extends FileUtilRt {
return result.toString();
}
private static int processRoot(String path, StringBuilder result) {
private static int processRoot(@NotNull String path, @NotNull StringBuilder result) {
if (SystemInfo.isWindows && path.length() > 1 && path.charAt(0) == '/' && path.charAt(1) == '/') {
result.append("//");
@@ -742,20 +743,18 @@ public class FileUtil extends FileUtilRt {
return shareEnd;
}
else if (path.length() > 0 && path.charAt(0) == '/') {
if (!path.isEmpty() && path.charAt(0) == '/') {
result.append('/');
return 1;
}
else if (path.length() > 2 && path.charAt(1) == ':' && path.charAt(2) == '/') {
if (path.length() > 2 && path.charAt(1) == ':' && path.charAt(2) == '/') {
result.append(path, 0, 3);
return 3;
}
else {
return 0;
}
return 0;
}
private static void processDots(StringBuilder result, int dots, int start) {
private static void processDots(@NotNull StringBuilder result, int dots, int start) {
if (dots == 2) {
int pos = -1;
if (!StringUtil.endsWith(result, "/../") && !StringUtil.equals(result, "../")) {