diff --git a/interface_segregation/bad/src/Bird.java b/interface_segregation/bad/src/Bird.java index 512faf1..68fda42 100644 --- a/interface_segregation/bad/src/Bird.java +++ b/interface_segregation/bad/src/Bird.java @@ -2,6 +2,5 @@ * Created by mrk on 4/7/14. */ public interface Bird { - public void fly(); public void molt(); } diff --git a/interface_segregation/bad/src/Eagle.java b/interface_segregation/bad/src/Eagle.java index e06ae18..768f256 100644 --- a/interface_segregation/bad/src/Eagle.java +++ b/interface_segregation/bad/src/Eagle.java @@ -1,7 +1,7 @@ /** * Created by mrk on 4/7/14. */ -public class Eagle implements Bird { +public class Eagle implements Bird, FlyBird { String currentLocation; int numberOfFeathers; diff --git a/interface_segregation/bad/src/FlyBird.java b/interface_segregation/bad/src/FlyBird.java new file mode 100644 index 0000000..723ab46 --- /dev/null +++ b/interface_segregation/bad/src/FlyBird.java @@ -0,0 +1,4 @@ + +public interface FlyBird { + public void fly(); +} diff --git a/interface_segregation/bad/src/Penguin.java b/interface_segregation/bad/src/Penguin.java index 81d89fa..a2e2f65 100644 --- a/interface_segregation/bad/src/Penguin.java +++ b/interface_segregation/bad/src/Penguin.java @@ -1,7 +1,7 @@ /** * Created by mrk on 4/7/14. */ -public class Penguin implements Bird { +public class Penguin implements Bird, SwimBird { String currentLocation; int numberOfFeathers; @@ -13,10 +13,6 @@ public void molt() { this.numberOfFeathers -= 1; } - public void fly() { - throw new UnsupportedOperationException(); - } - public void swim() { this.currentLocation = "in the water"; } diff --git a/interface_segregation/bad/src/SwimBird.java b/interface_segregation/bad/src/SwimBird.java new file mode 100644 index 0000000..d25da03 --- /dev/null +++ b/interface_segregation/bad/src/SwimBird.java @@ -0,0 +1,3 @@ +public interface Bird { + public void swim(); +} diff --git a/liskov_substitution/bad/src/BedroomAdder.java b/liskov_substitution/bad/src/BedroomAdder.java new file mode 100644 index 0000000..5116bc1 --- /dev/null +++ b/liskov_substitution/bad/src/BedroomAdder.java @@ -0,0 +1,5 @@ +public class BedroomAdder { + public void addBedroom(PenthouseSuite penthouse){ + penthouse.numberOfBedrooms +=1; + } +} diff --git a/liskov_substitution/bad/src/PenthouseSuite.java b/liskov_substitution/bad/src/PenthouseSuite.java index 5a19622..7fbcedc 100644 --- a/liskov_substitution/bad/src/PenthouseSuite.java +++ b/liskov_substitution/bad/src/PenthouseSuite.java @@ -1,7 +1,10 @@ /** * Created by mrk on 4/8/14. */ -public class PenthouseSuite extends Apartment { +public class PenthouseSuite { + int squareFootage; + int numberOfBedrooms; + public PenthouseSuite() { this.numberOfBedrooms = 4; } diff --git a/liskov_substitution/bad/src/Studio.java b/liskov_substitution/bad/src/Studio.java index 60c9124..4ef0ab0 100644 --- a/liskov_substitution/bad/src/Studio.java +++ b/liskov_substitution/bad/src/Studio.java @@ -1,7 +1,10 @@ /** * Created by mrk on 4/8/14. */ -public class Studio extends Apartment { +public class Studio { + int squareFootage; + int numberOfRooms; + public Studio() { this.numberOfBedrooms = 0; }