Skip to content

Commit c8998a3

Browse files
authored
Remove calls to the deprecated static methods in the platform FileUtil class (#13)
These methods are marked as being removed in the future in the platform.
1 parent bac0be5 commit c8998a3

File tree

2 files changed

+36
-2
lines changed

2 files changed

+36
-2
lines changed

third_party/src/main/java/com/jetbrains/lang/dart/ide/actions/DartPubBuildDialog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.intellij.openapi.ui.TextComponentAccessor;
99
import com.intellij.openapi.ui.TextFieldWithBrowseButton;
1010
import com.intellij.openapi.ui.ValidationInfo;
11-
import com.intellij.openapi.util.SystemInfo;
1211
import com.intellij.openapi.util.io.FileUtil;
1312
import com.intellij.openapi.util.text.StringUtil;
1413
import com.intellij.openapi.vfs.VirtualFile;
@@ -17,6 +16,7 @@
1716
import com.jetbrains.lang.dart.DartBundle;
1817
import com.jetbrains.lang.dart.pubServer.DartWebdev;
1918
import com.jetbrains.lang.dart.sdk.DartSdk;
19+
import com.jetbrains.lang.dart.util.PathUtil;
2020
import org.jetbrains.annotations.NotNull;
2121
import org.jetbrains.annotations.Nullable;
2222

@@ -79,7 +79,7 @@ public DartPubBuildDialog(final @NotNull Project project, final @NotNull Virtual
7979
@Override
8080
public String getText(JTextField component) {
8181
final String path = component.getText();
82-
if (SystemInfo.isWindows && FileUtil.isWindowsAbsolutePath(path) || !SystemInfo.isWindows && FileUtil.isUnixAbsolutePath(path)) {
82+
if (PathUtil.isAbsolutePlatformIndependent(path)) {
8383
return path;
8484
}
8585
return packagePathSlash + path;
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package com.jetbrains.lang.dart.util;
2+
3+
import com.intellij.openapi.util.SystemInfo;
4+
import com.intellij.openapi.util.io.OSAgnosticPathUtil;
5+
import org.jetbrains.annotations.NotNull;
6+
7+
public class PathUtil {
8+
private PathUtil() {
9+
}
10+
11+
public static boolean isAbsolutePlatformIndependent(@NotNull String path) {
12+
return (SystemInfo.isWindows && PathUtil.isWindowsAbsolutePath(path))
13+
|| (!SystemInfo.isWindows && PathUtil.isUnixAbsolutePath(path));
14+
}
15+
16+
/**
17+
* See documentation in Community's FileUtil.java, this method intentionally matches the deprecated version from the
18+
* platform.
19+
*/
20+
public static boolean isUnixAbsolutePath(@NotNull String path) {
21+
return path.startsWith("/");
22+
23+
}
24+
25+
/**
26+
* See documentation in Community's FileUtil.java, this method intentionally matches the deprecated version from the
27+
* platform.
28+
*/
29+
public static boolean isWindowsAbsolutePath(@NotNull String path) {
30+
return path.length() <= 2 && OSAgnosticPathUtil.startsWithWindowsDrive(path)
31+
|| OSAgnosticPathUtil.isAbsoluteDosPath(path);
32+
33+
}
34+
}

0 commit comments

Comments
 (0)