Skip to content

getRessourcePath bug fix #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
faisalpk29 wants to merge 3 commits into
base: java7
Choose a base branch
from
Open

getRessourcePath bug fix #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e31f185
trimFront method added to remove FORWARD_SLASH from given path.
faisalpk29 Oct 20, 2015
5fef472
trimFront method Added in FileCommands.java
faisalpk29 Nov 25, 2015
5ee26eb
trimFront method added to remove FORWARD_SLASH from given file path.
faisalpk29 Nov 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions src/org/sugarj/common/FileCommands.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public static void main(String[] args) {
}

public final static boolean DO_DELETE = true;

public final static String FORWARD_SLASH = "/";
public final static String TMP_DIR;
static {
try {
Expand Down Expand Up @@ -469,13 +469,12 @@ public static File createDir(File dir, int hash) throws IOException {
*/
public static String toCygwinPath(String filepath) {
// XXX hacky

if (System.getProperty("os.name").toLowerCase().contains("win")) {
filepath = filepath.replace("\\", "/");
filepath = filepath.replace("/C:/", "/cygdrive/C/");
filepath = filepath.replace("C:/", "/cygdrive/C/");
}

return filepath;
}

Expand All @@ -490,7 +489,6 @@ public static String toWindowsPath(String filepath) {
filepath = filepath.replace("/C:", "C:");
filepath = filepath.replace("/", "\\");
}

return filepath;
}

Expand Down Expand Up @@ -797,7 +795,7 @@ public static java.nio.file.Path getRessourcePath(URL url) {

// have we found the class file?
try {
return Paths.get(path);
return Paths.get(trimFront(path));
} catch (InvalidPathException e) {
return null;
}
Expand Down Expand Up @@ -833,4 +831,12 @@ public static void unpackJarfile(File outdir, File jar) throws IOException {
}
}
}

public static String trimFront(String path) {
if (System.getProperty("os.name").toLowerCase().contains("win")) {
while (path.startsWith(FORWARD_SLASH))
path = path.substring(1, path.length());
}
return path;
}
}