Fixed weird color issue

rtealwitter · Dec 9, 2017 · 685f623 · 685f623
1 parent 516c927
commit 685f623
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/CS201 Final Project/src/hw9/Set.java b/CS201 Final Project/src/hw9/Set.java
@@ -384,12 +384,14 @@ public void paint(Graphics g) {
 
 	public Color lighten(Color color) {
 		// lightens darker color to lighter color
+		Color lighter;
 		if (color == Colors.dteal)
-			return Colors.lteal;
-		if (color == Colors.dlave)
-			return Colors.llave;
+			lighter = Colors.lteal;
+		else if (color == Colors.dlave)
+			lighter = Colors.llave;
 		else // == dsalm
-			return Colors.lsalm;
+			lighter = Colors.lsalm;
+		return lighter;
 	}
 
 	public Color getColor(int i) {
@@ -402,7 +404,7 @@ public Color getFilling(Color color, int i) {
 		Color filling;
 		if (i == 0)
 			filling = Color.white;
-		if (i == 1)
+		else if (i == 1)
 			filling = lighten(color);
 		else // i == 2
 			filling = color;