doct0rX
diff --git a/‎SoftwareConstruction_DataAbstraction/finalProject/SimpleDrawingPlayer-starter/.DS_Store
6 KB b/‎SoftwareConstruction_DataAbstraction/finalProject/SimpleDrawingPlayer-starter/.DS_Store
6 KB
diff --git a/‎SoftwareConstruction_DataAbstraction/finalProject/SimpleDrawingPlayer-starter/.idea/artifacts/SimpleDrawingPlayer_jar.xml
+10 b/‎SoftwareConstruction_DataAbstraction/finalProject/SimpleDrawingPlayer-starter/.idea/artifacts/SimpleDrawingPlayer_jar.xml
+10
diff --git a/‎SoftwareConstruction_DataAbstraction/finalProject/SimpleDrawingPlayer-starter/.idea/workspace.xml
+260-102 b/‎SoftwareConstruction_DataAbstraction/finalProject/SimpleDrawingPlayer-starter/.idea/workspace.xml
+260-102
diff --git a/‎SoftwareConstruction_DataAbstraction/finalProject/SimpleDrawingPlayer-starter/out/artifacts/.DS_Store
6 KB b/‎SoftwareConstruction_DataAbstraction/finalProject/SimpleDrawingPlayer-starter/out/artifacts/.DS_Store
6 KB
diff --git a/‎SoftwareConstruction_DataAbstraction/finalProject/SimpleDrawingPlayer-starter/out/artifacts/SimpleDrawingPlayer_jar/SimpleDrawingPlayer.jar
384 KB b/‎SoftwareConstruction_DataAbstraction/finalProject/SimpleDrawingPlayer-starter/out/artifacts/SimpleDrawingPlayer_jar/SimpleDrawingPlayer.jar
384 KB
diff --git a/‎SoftwareConstruction_DataAbstraction/finalProject/SimpleDrawingPlayer-starter/out/production/SimpleDrawingPlayer/META-INF/MANIFEST.MF
+3 b/‎SoftwareConstruction_DataAbstraction/finalProject/SimpleDrawingPlayer-starter/out/production/SimpleDrawingPlayer/META-INF/MANIFEST.MF
+3
diff --git a/‎SoftwareConstruction_DataAbstraction/finalProject/SimpleDrawingPlayer-starter/out/production/SimpleDrawingPlayer/model/Oval.class
33 Bytes b/‎SoftwareConstruction_DataAbstraction/finalProject/SimpleDrawingPlayer-starter/out/production/SimpleDrawingPlayer/model/Oval.class
33 Bytes
diff --git a/‎SoftwareConstruction_DataAbstraction/finalProject/SimpleDrawingPlayer-starter/out/production/SimpleDrawingPlayer/model/Rectangle.class
0 Bytes b/‎SoftwareConstruction_DataAbstraction/finalProject/SimpleDrawingPlayer-starter/out/production/SimpleDrawingPlayer/model/Rectangle.class
0 Bytes
diff --git a/‎SoftwareConstruction_DataAbstraction/finalProject/SimpleDrawingPlayer-starter/out/production/SimpleDrawingPlayer/model/Shape.class
0 Bytes b/‎SoftwareConstruction_DataAbstraction/finalProject/SimpleDrawingPlayer-starter/out/production/SimpleDrawingPlayer/model/Shape.class
0 Bytes
diff --git a/‎SoftwareConstruction_DataAbstraction/finalProject/SimpleDrawingPlayer-starter/src/META-INF/MANIFEST.MF
+3 b/‎SoftwareConstruction_DataAbstraction/finalProject/SimpleDrawingPlayer-starter/src/META-INF/MANIFEST.MF
+3
diff --git a/‎SoftwareConstruction_DataAbstraction/finalProject/SimpleDrawingPlayer-starter/src/model/Oval.java
+1 b/‎SoftwareConstruction_DataAbstraction/finalProject/SimpleDrawingPlayer-starter/src/model/Oval.java
+1
diff --git a/‎SoftwareConstruction_DataAbstraction/finalProject/SimpleDrawingPlayer-starter/src/model/Shape.java
+1-1 b/‎SoftwareConstruction_DataAbstraction/finalProject/SimpleDrawingPlayer-starter/src/model/Shape.java
+1-1
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: ui.DrawingEditor
+
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: ui.DrawingEditor
+
@@ -9,6 +9,7 @@ public class Oval extends Shape {
     public Oval(Point topLeft, MidiSynth midiSynth) {
         super(topLeft, midiSynth);
         PLAYING_COLOR = new Color(231, 22, 229);
+        instrument = 11;
     }
 
     // EFFECTS: return true if this Oval contains the given Point point, else return false
 
@@ -15,7 +15,7 @@ public abstract class Shape {
     private boolean selected;
 
     private MidiSynth midiSynth;
-    private int instrument;
+    protected int instrument;
     private int playLineCoord;
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+Manifest-Version: 1.0`
	`2`	`+Main-Class: ui.DrawingEditor`
	`3`	`+`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ public class Oval extends Shape {`
`9`	`9`	`public Oval(Point topLeft, MidiSynth midiSynth) {`
`10`	`10`	`super(topLeft, midiSynth);`
`11`	`11`	`PLAYING_COLOR = new Color(231, 22, 229);`
	`12`	`+ instrument = 11;`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`// EFFECTS: return true if this Oval contains the given Point point, else return false`