Skip to content
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

Resolution for issue #70 #87

Closed
wants to merge 8 commits into from
Closed

Resolution for issue #70 #87

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
883cce6
Fixed both reported bugs involving the file explorer
KyleKing54 Oct 13, 2021
e7b1286
Removed else block on null file check
KyleKing54 Oct 13, 2021
b80635e
Merge pull request #1 from ThreeFingerDeathPunch/Kyle_bugfix
CooperDavis00 Oct 13, 2021
1dda13c
Removed file extension check
KyleKing54 Oct 14, 2021
3bec776
Removed file extension check (#2)
KyleKing54 Oct 14, 2021
d8e4b01
Removed debugging on line 293
KyleKing54 Oct 16, 2021
5387015
Merge branch 'master' into Kyle_bugfix
KyleKing54 Oct 16, 2021
12db30f
Merge pull request #3 from ThreeFingerDeathPunch/Kyle_bugfix
KyleKing54 Oct 16, 2021
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
15 changes: 8 additions & 7 deletions imagelab/ImageLab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,13 +288,14 @@ public void actionPerformed(final ActionEvent e) {
fd = new FileDialog(frame, "Pick an image", FileDialog.LOAD);
fd.setVisible(true);
String theFile = fd.getFile();
String theDir = fd.getDirectory();
//System.out.println("The file's name is " + theDir + theFile);
improvider = new ImgProvider(theDir + theFile);
improvider.setLab(theLab);
improvider.showImage(theDir + theFile);
images.add(improvider);
impro = improvider; //current image provider is set
if (theFile != null) {
String theDir = fd.getDirectory();
improvider = new ImgProvider(theDir + theFile);
improvider.setLab(theLab);
improvider.showImage(theDir + theFile);
images.add(improvider);
impro = improvider; //current image provider is set
}
} //actionPerformed
};
} // makeOpenListener
Expand Down