Skip to content

File.listFiles does not guarantee order but this code depends on alph… #1

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
ProgrammerDan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

File.listFiles does not guarantee order but this code depends on alph… #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion src/haven/Resource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public ImageReadException() {
}
}

public static BufferedImage readimage(InputStream fp) throws IOException {
public static BufferedImage readimage(final InputStream fp) throws IOException {
try {
/* This can crash if not privileged due to ImageIO
* creating tempfiles without doing that privileged
Expand Down Expand Up @@ -1480,6 +1480,11 @@ private void loadfromdecode(String full) throws Exception {
Constructor<? extends Layer> cons;

df = l[i].listFiles();
Arrays.sort(df, new Comparator<File>() {
public int compare(File a, File b) {
return a.getName().compareTo(b.getName());
}
});
switch (n) {
case "image":
case "tile": { /* .data + .png */
Expand Down