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

artifact editor: trim slashes when adding to classpath

Browse Source
This commit is contained in:
nik
2009-11-20 16:01:24 +03:00
parent a881b8e3c6
commit 026eb88560
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/openapi/src/com/intellij/openapi/deployment/DeploymentUtil.java
+13 -4
View File
@@ -69,11 +69,20 @@ public abstract class DeploymentUtil {
return builder.toString();
}
public static String appendToPath(@NotNull String path, @NotNull String name) {
if (!StringUtil.endsWithChar(path, '/') && !path.endsWith(File.separator)) {
path += "/";
public static String appendToPath(@NotNull String basePath, @NotNull String relativePath) {
final boolean endsWithSlash = StringUtil.endsWithChar(basePath, '/') || StringUtil.endsWithChar(basePath, '\\');
final boolean startsWithSlash = StringUtil.startsWithChar(relativePath, '/') || StringUtil.startsWithChar(relativePath, '\\');
String tail;
if (endsWithSlash && startsWithSlash) {
tail = trimForwardSlashes(relativePath);
}
return path + trimForwardSlashes(name);
else if (!endsWithSlash && !startsWithSlash && basePath.length() > 0 && relativePath.length() > 0) {
tail = "/" + relativePath;
}
else {
tail = relativePath;
}
return basePath + tail;
}
public abstract BuildRecipe createBuildRecipe();