diff --git a/factory-method/src/main/java/me/zbl/factory/method/FoodType.java b/factory-method/src/main/java/me/zbl/factory/method/FoodType.java index 4fe0c1a..2b167c4 100644 --- a/factory-method/src/main/java/me/zbl/factory/method/FoodType.java +++ b/factory-method/src/main/java/me/zbl/factory/method/FoodType.java @@ -24,7 +24,7 @@ package me.zbl.factory.method; /** - * 食物类型 + * 食物类型-枚举类型 */ public enum FoodType { diff --git a/factory-method/src/main/java/me/zbl/factory/method/WesternFood.java b/factory-method/src/main/java/me/zbl/factory/method/WesternFood.java index 63850e4..e165e5c 100644 --- a/factory-method/src/main/java/me/zbl/factory/method/WesternFood.java +++ b/factory-method/src/main/java/me/zbl/factory/method/WesternFood.java @@ -41,6 +41,6 @@ public FoodType getFoodType() { @Override public String toString() { - return foodType.getName() + "西餐"; + return foodType.getName() + "西餐1"; } } diff --git a/prototype/src/main/java/me/zbl/prototype/Application.java b/prototype/src/main/java/me/zbl/prototype/Application.java index bae87f5..3a8185a 100644 --- a/prototype/src/main/java/me/zbl/prototype/Application.java +++ b/prototype/src/main/java/me/zbl/prototype/Application.java @@ -31,30 +31,30 @@ */ public class Application { - private static final Logger LOGGER = LoggerFactory.getLogger(Application.class); + private static final Logger LOGGER = LoggerFactory.getLogger(Application.class); - public static void main(String[] args) { - Driver driver; - Passenger passenger; - Vehicle vehicle; - TeamFactory factory; + public static void main(String[] args) { + Driver driver; + Passenger passenger; + Vehicle vehicle; + TeamFactory factory; - factory = new TeamFactoryImpl(new EstateDriver(), new EstatePassanger(), new EstateVehicle()); - driver = factory.createDriver(); - passenger = factory.createPassenger(); - vehicle = factory.createVehicle(); - LOGGER.info(">> 开始生产旅行车组合"); - LOGGER.info(driver.toString()); - LOGGER.info(passenger.toString()); - LOGGER.info(vehicle.toString()); + factory = new TeamFactoryImpl(new EstateDriver(), new EstatePassanger(), new EstateVehicle()); + driver = factory.createDriver(); + passenger = factory.createPassenger(); + vehicle = factory.createVehicle(); + LOGGER.info(">> 开始生产旅行车组合"); + LOGGER.info(driver.toString()); + LOGGER.info(passenger.toString()); + LOGGER.info(vehicle.toString()); - factory = new TeamFactoryImpl(new OffRoadDriver(), new OffRoadPassanger(), new OffRoadVehicle()); - driver = factory.createDriver(); - passenger = factory.createPassenger(); - vehicle = factory.createVehicle(); - LOGGER.info(">> 开始生产越野车组合"); - LOGGER.info(driver.toString()); - LOGGER.info(passenger.toString()); - LOGGER.info(vehicle.toString()); - } + factory = new TeamFactoryImpl(new OffRoadDriver(), new OffRoadPassanger(), new OffRoadVehicle()); + driver = factory.createDriver(); + passenger = factory.createPassenger(); + vehicle = factory.createVehicle(); + LOGGER.info(">> 开始生产越野车组合"); + LOGGER.info(driver.toString()); + LOGGER.info(passenger.toString()); + LOGGER.info(vehicle.toString()); + } } diff --git a/prototype/src/main/java/me/zbl/prototype/TeamFactory.java b/prototype/src/main/java/me/zbl/prototype/TeamFactory.java index 2f68084..ed70bbb 100644 --- a/prototype/src/main/java/me/zbl/prototype/TeamFactory.java +++ b/prototype/src/main/java/me/zbl/prototype/TeamFactory.java @@ -33,4 +33,6 @@ public interface TeamFactory { Passenger createPassenger(); Vehicle createVehicle(); + + }