From 02103b76f5d9689c2a3b590f223a762f10f45f28 Mon Sep 17 00:00:00 2001 From: marsouf Date: Tue, 27 Mar 2018 10:50:51 +0100 Subject: [PATCH 1/2] Updated [Shape brainatwork.pattern.creational.factorypattern.ShapeFactory#getShape(String)] --- .../factorypattern/ShapeFactory.java | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/brainatwork/pattern/creational/factorypattern/ShapeFactory.java b/src/brainatwork/pattern/creational/factorypattern/ShapeFactory.java index 5cbb1e2..39e3207 100644 --- a/src/brainatwork/pattern/creational/factorypattern/ShapeFactory.java +++ b/src/brainatwork/pattern/creational/factorypattern/ShapeFactory.java @@ -4,16 +4,15 @@ public class ShapeFactory { //use getShape method to get object of type shape public Shape getShape(String shapeType){ - if(shapeType == null){ - return null; - } - if(shapeType.equalsIgnoreCase("CIRCLE")){ - return new Circle(); - } - else if(shapeType.equalsIgnoreCase("SQUARE")){ - return new Square(); - } - - return null; + if ("CIRCLE".equalsIgnoreCase(shapeType)) + { + return new Circle(); + } + else if ("SQUARE".equalsIgnoreCase(shapeType)) + { + return new Square(); + } + + return null; } } From 665f6dccb0f35a2e202a1ce559f80ed5b00216a7 Mon Sep 17 00:00:00 2001 From: marsouf Date: Tue, 27 Mar 2018 11:56:37 +0100 Subject: [PATCH 2/2] Updated [Shape brainatwork.pattern.creational.factorypattern.ShapeFactory#getShape(String)] 2 --- .../pattern/creational/factorypattern/ShapeFactory.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/brainatwork/pattern/creational/factorypattern/ShapeFactory.java b/src/brainatwork/pattern/creational/factorypattern/ShapeFactory.java index 39e3207..87872cb 100644 --- a/src/brainatwork/pattern/creational/factorypattern/ShapeFactory.java +++ b/src/brainatwork/pattern/creational/factorypattern/ShapeFactory.java @@ -8,7 +8,8 @@ public Shape getShape(String shapeType){ { return new Circle(); } - else if ("SQUARE".equalsIgnoreCase(shapeType)) + + if ("SQUARE".equalsIgnoreCase(shapeType)) { return new Square(); }