Merge remote-tracking branch 'origin/master'

master
Chara1236 2022-06-20 21:31:03 -04:00
commit 34af4f3c6e
2 changed files with 4 additions and 4 deletions

View File

@ -57,7 +57,7 @@ public class BufferedImageWrapper implements Serializable {
// custom writeObject method that allows writing an otherwise unserializable method to disk // custom writeObject method that allows writing an otherwise unserializable method to disk
@Serial @Serial
public void writeObject(ObjectOutputStream out) throws IOException { private void writeObject(ObjectOutputStream out) throws IOException {
// save whether the image is flipped // save whether the image is flipped
out.writeObject(flipImage); out.writeObject(flipImage);
// if the imageString is present, write that to disk to prevent excessive disk writes // if the imageString is present, write that to disk to prevent excessive disk writes
@ -70,7 +70,7 @@ public class BufferedImageWrapper implements Serializable {
// custom readObject method that allows reading an otherwise unserializable method from disk // custom readObject method that allows reading an otherwise unserializable method from disk
@Serial @Serial
public void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
Object o; Object o;
// read whether the image is flipped or not // read whether the image is flipped or not
flipImage = (Boolean)in.readObject(); flipImage = (Boolean)in.readObject();

View File

@ -21,13 +21,13 @@ public class SoundWrapper implements Serializable {
public SoundWrapper() {} public SoundWrapper() {}
@Serial @Serial
public void writeObject(ObjectOutputStream out) throws IOException { private void writeObject(ObjectOutputStream out) throws IOException {
// write location of .wav file (soundString) // write location of .wav file (soundString)
out.writeObject(soundString); out.writeObject(soundString);
} }
@Serial @Serial
public void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException, UnsupportedAudioFileException, LineUnavailableException { private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException, UnsupportedAudioFileException, LineUnavailableException {
// read .wav file located at soundString // read .wav file located at soundString
Object o; Object o;
o = in.readObject(); o = in.readObject();