From b126dd006834129f563a4cf2d465ab3440624dee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B0=D1=88=D0=B8=D0=BD=20=D0=9C=D0=B0=D0=BA=D1=81?= =?UTF-8?q?=D0=B8=D0=BC?= Date: Tue, 13 Dec 2022 20:50:52 +0400 Subject: [PATCH] fix --- src/DrawingObjectGasolineTanker.java | 2 +- src/ExtentionGasolineTanker.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/DrawingObjectGasolineTanker.java b/src/DrawingObjectGasolineTanker.java index 53b932c..e96315d 100644 --- a/src/DrawingObjectGasolineTanker.java +++ b/src/DrawingObjectGasolineTanker.java @@ -45,7 +45,7 @@ public class DrawingObjectGasolineTanker implements IDrawingObject { } public static IDrawingObject Create(String data){ - return new DrawingObjectGasolineTanker(ExtentionGasolineTanker.CreateDrawingWarship(data)); + return new DrawingObjectGasolineTanker(ExtentionGasolineTanker.CreateDrawingGasolineTanker(data)); } public DrawingGasolineTanker GetGasolineTanker() { diff --git a/src/ExtentionGasolineTanker.java b/src/ExtentionGasolineTanker.java index a140b2c..1baaf0d 100644 --- a/src/ExtentionGasolineTanker.java +++ b/src/ExtentionGasolineTanker.java @@ -3,13 +3,13 @@ import java.awt.*; public class ExtentionGasolineTanker { private static final char _separatorForObject=':'; - public static DrawingGasolineTanker CreateDrawingWarship(String info){ + public static DrawingGasolineTanker CreateDrawingGasolineTanker(String info){ String[] strs = info.split(Character.toString(_separatorForObject)); int spd=Integer.parseInt(strs[0]); float wght = Float.parseFloat(strs[1]); Color bodyClr=new Color(Integer.parseInt(strs[2])); - IDrawningObjectWheels block = switch(strs[3]) { + IDrawningObjectWheels wheels = switch(strs[3]) { case "DrawingWheels" -> new DrawingWheels(Integer.parseInt(strs[4])); case "DrawingOrnamentWheelsFirst" -> new DrawingOrnamentWheelsFirst(Integer.parseInt(strs[4])); case "DrawingOrnamentWheelsSecond" -> new DrawingOrnamentWheelsSecond(Integer.parseInt(strs[4])); @@ -17,14 +17,14 @@ public class ExtentionGasolineTanker { }; if (strs.length==5){ EntityGasolineTanker ent=new EntityGasolineTanker(spd,wght,bodyClr); - return new DrawingGasolineTanker(ent,block); + return new DrawingGasolineTanker(ent,wheels); } if(strs.length==8){ Color dopClr=new Color(Integer.parseInt(strs[5])); boolean bdkit=Boolean.parseBoolean(strs[6]); boolean ant=Boolean.parseBoolean(strs[7]); EntityImprovedGasolineTanker ent = new EntityImprovedGasolineTanker(spd,wght,bodyClr,dopClr,bdkit,ant); - return new DrawingImprovedGasolineTanker(ent,block); + return new DrawingImprovedGasolineTanker(ent,wheels); } return null; }