Merge remote-tracking branch 'origin/master'
commit
34af4f3c6e
|
@ -57,7 +57,7 @@ public class BufferedImageWrapper implements Serializable {
|
|||
|
||||
// custom writeObject method that allows writing an otherwise unserializable method to disk
|
||||
@Serial
|
||||
public void writeObject(ObjectOutputStream out) throws IOException {
|
||||
private void writeObject(ObjectOutputStream out) throws IOException {
|
||||
// save whether the image is flipped
|
||||
out.writeObject(flipImage);
|
||||
// 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
|
||||
@Serial
|
||||
public void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
|
||||
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
|
||||
Object o;
|
||||
// read whether the image is flipped or not
|
||||
flipImage = (Boolean)in.readObject();
|
||||
|
|
|
@ -21,13 +21,13 @@ public class SoundWrapper implements Serializable {
|
|||
public SoundWrapper() {}
|
||||
|
||||
@Serial
|
||||
public void writeObject(ObjectOutputStream out) throws IOException {
|
||||
private void writeObject(ObjectOutputStream out) throws IOException {
|
||||
// write location of .wav file (soundString)
|
||||
out.writeObject(soundString);
|
||||
}
|
||||
|
||||
@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
|
||||
Object o;
|
||||
o = in.readObject();
|
||||
|
|
Loading…
Reference in New Issue