From cd494d75fda0b64732a3f683828c173577ce5076 Mon Sep 17 00:00:00 2001 From: Matthias Betz <matthias.betz@hft-stuttgart.de> Date: Fri, 12 Mar 2021 11:24:16 +0100 Subject: [PATCH] removing unused interface methods --- .../stuttgart/citydoctor2/check/Check.java | 12 +------- .../citydoctor2/check/Requirement.java | 5 ++++ .../citydoctor2/checks/CheckContainer.java | 8 +----- .../citydoctor2/checks/CheckPrototype.java | 7 +---- .../checks/geometry/NullAreaCheck.java | 14 +--------- .../checks/geometry/PlanarCheck.java | 28 ++++--------------- .../checks/semantics/IsWallCheck.java | 14 +--------- .../RoofSurfaceUnfragmentedCheck.java | 14 +--------- 8 files changed, 17 insertions(+), 85 deletions(-) diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/Check.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/Check.java index 20db528..85cd9cf 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/Check.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/Check.java @@ -310,7 +310,7 @@ public abstract class Check { * * @param params the parameter map containing the parameters for the check in * String form. The key should be the same String provided by the - * {@link Check#getDefaultParameter()} method + * {@link Requirement#getDefaultParameter()} method * @param config sometimes there are global parameters which can be used by * checks. Those are be stored in this container */ @@ -318,16 +318,6 @@ public abstract class Check { } - /** - * This methods gives checks the possibility to declare default parameters, used - * primarily in the GUI. - * - * @return a list of default parameters, not null - */ - public List<DefaultParameter> getDefaultParameter() { - return Collections.emptyList(); - } - @Override public String toString() { return "Check [id=" + getCheckId() + "]"; diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/Requirement.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/Requirement.java index 2368be5..e78c29c 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/Requirement.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/check/Requirement.java @@ -33,6 +33,7 @@ public class Requirement implements Serializable { private static final String DEGENERATED_POLYGON_TOLERANCE = "degeneratedPolygonTolerance"; private static final String LOWER_ANGLE_NAME = "lowerAngle"; private static final String UPPER_ANGLE_NAME = "upperAngle"; + private static final String MAX_ANGLE_DEVIATION = "maxAngleDeviation"; public static final Requirement R_GE_R_TOO_FEW_POINTS = new Requirement("R_GE_R_TOO_FEW_POINTS", RequirementType.GEOMETRY); public static final Requirement R_GE_R_NOT_CLOSED = new Requirement("R_GE_R_NOT_CLOSED", RequirementType.GEOMETRY); @@ -79,6 +80,10 @@ public class Requirement implements Serializable { defaultParameters.add(new DefaultParameter(LOWER_ANGLE_NAME, "45", Unit.DEGREE)); defaultParameters.add(new DefaultParameter(UPPER_ANGLE_NAME, "135", Unit.DEGREE)); R_SE_BS_IS_WALL.parameters = Collections.unmodifiableList(defaultParameters); + + defaultParameters.add(new DefaultParameter(MAX_ANGLE_DEVIATION, "1", Unit.DEGREE)); + R_SE_BS_ROOF_UNFRAGMENTED.parameters = Collections.unmodifiableList(defaultParameters); + } private String id; diff --git a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/CheckContainer.java b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/CheckContainer.java index eb9ee05..8040f6b 100644 --- a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/CheckContainer.java +++ b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/CheckContainer.java @@ -29,10 +29,9 @@ import de.hft.stuttgart.citydoctor2.check.Check; import de.hft.stuttgart.citydoctor2.check.CheckError; import de.hft.stuttgart.citydoctor2.check.CheckId; import de.hft.stuttgart.citydoctor2.check.CheckResult; -import de.hft.stuttgart.citydoctor2.check.RequirementType; import de.hft.stuttgart.citydoctor2.check.Checkable; -import de.hft.stuttgart.citydoctor2.check.DefaultParameter; import de.hft.stuttgart.citydoctor2.check.Requirement; +import de.hft.stuttgart.citydoctor2.check.RequirementType; import de.hft.stuttgart.citydoctor2.check.ResultStatus; import de.hft.stuttgart.citydoctor2.check.error.UnknownCheckError; import de.hft.stuttgart.citydoctor2.datastructure.AbstractBuilding; @@ -105,11 +104,6 @@ public class CheckContainer extends Check { c.addCheckResult(cr); } - @Override - public List<DefaultParameter> getDefaultParameter() { - return check.getDefaultParameter(); - } - @Override public List<CheckId> getDependencies() { return check.getDependencies(); diff --git a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/CheckPrototype.java b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/CheckPrototype.java index 975e959..4529905 100644 --- a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/CheckPrototype.java +++ b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/CheckPrototype.java @@ -23,9 +23,8 @@ import java.util.Set; import de.hft.stuttgart.citydoctor2.check.Check; import de.hft.stuttgart.citydoctor2.check.CheckId; -import de.hft.stuttgart.citydoctor2.check.RequirementType; -import de.hft.stuttgart.citydoctor2.check.DefaultParameter; import de.hft.stuttgart.citydoctor2.check.Requirement; +import de.hft.stuttgart.citydoctor2.check.RequirementType; /** * This class is for having a read only access to a check for accessing meta @@ -60,10 +59,6 @@ public class CheckPrototype { return c.getDependencies(); } - public List<DefaultParameter> getDefaultParameter() { - return c.getDefaultParameter(); - } - public RequirementType getType() { return c.getType(); } diff --git a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/geometry/NullAreaCheck.java b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/geometry/NullAreaCheck.java index 3b5a6fb..fdba67d 100644 --- a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/geometry/NullAreaCheck.java +++ b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/geometry/NullAreaCheck.java @@ -27,11 +27,9 @@ import java.util.Set; import de.hft.stuttgart.citydoctor2.check.Check; import de.hft.stuttgart.citydoctor2.check.CheckId; import de.hft.stuttgart.citydoctor2.check.CheckResult; -import de.hft.stuttgart.citydoctor2.check.RequirementType; -import de.hft.stuttgart.citydoctor2.check.DefaultParameter; import de.hft.stuttgart.citydoctor2.check.Requirement; +import de.hft.stuttgart.citydoctor2.check.RequirementType; import de.hft.stuttgart.citydoctor2.check.ResultStatus; -import de.hft.stuttgart.citydoctor2.check.Unit; import de.hft.stuttgart.citydoctor2.check.error.NullAreaError; import de.hft.stuttgart.citydoctor2.checks.util.CollectionUtils; import de.hft.stuttgart.citydoctor2.datastructure.LinearRing; @@ -48,7 +46,6 @@ public class NullAreaCheck extends Check { private static final String DELTA_NAME = "delta"; private static final List<CheckId> dependencies; - private static final List<DefaultParameter> defaultParameters; static { ArrayList<CheckId> deps = new ArrayList<>(); @@ -56,10 +53,6 @@ public class NullAreaCheck extends Check { deps.add(CheckId.C_GE_R_NOT_CLOSED); deps.add(CheckId.C_GE_R_DUPLICATE_POINT); dependencies = Collections.unmodifiableList(deps); - - ArrayList<DefaultParameter> defParameters = new ArrayList<>(); - defParameters.add(new DefaultParameter(DELTA_NAME, "0.0001", Unit.SQUARE_METER)); - defaultParameters = Collections.unmodifiableList(defParameters); } private double delta = 0.0001; @@ -71,11 +64,6 @@ public class NullAreaCheck extends Check { } } - @Override - public List<DefaultParameter> getDefaultParameter() { - return defaultParameters; - } - @Override public void check(LinearRing lr) { boolean areaIsNull = checkWithDistanceToRegressionLine(lr, delta); diff --git a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/geometry/PlanarCheck.java b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/geometry/PlanarCheck.java index 46b42ff..f0b1d3e 100644 --- a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/geometry/PlanarCheck.java +++ b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/geometry/PlanarCheck.java @@ -29,11 +29,9 @@ import de.hft.stuttgart.citydoctor2.check.Check; import de.hft.stuttgart.citydoctor2.check.CheckError; import de.hft.stuttgart.citydoctor2.check.CheckId; import de.hft.stuttgart.citydoctor2.check.CheckResult; -import de.hft.stuttgart.citydoctor2.check.RequirementType; -import de.hft.stuttgart.citydoctor2.check.DefaultParameter; import de.hft.stuttgart.citydoctor2.check.Requirement; +import de.hft.stuttgart.citydoctor2.check.RequirementType; import de.hft.stuttgart.citydoctor2.check.ResultStatus; -import de.hft.stuttgart.citydoctor2.check.Unit; import de.hft.stuttgart.citydoctor2.check.error.DegeneratedPolygonError; import de.hft.stuttgart.citydoctor2.check.error.NonPlanarPolygonDistancePlaneError; import de.hft.stuttgart.citydoctor2.check.error.NonPlanarPolygonNormalsDeviation; @@ -61,14 +59,13 @@ import de.hft.stuttgart.citydoctor2.tesselation.TesselatedPolygon; */ public class PlanarCheck extends Check { - public static final String DISTANCE = "distance"; - public static final String DISTANCE_TOLERANCE = "distanceTolerance"; - public static final String ANGLE_TOLERANCE = "angleTolerance"; - public static final String TYPE = "type"; - public static final String DEGENERATED_POLYGON_TOLERANCE = "degeneratedPolygonTolerance"; + private static final String DISTANCE = "distance"; + private static final String DISTANCE_TOLERANCE = "distanceTolerance"; + private static final String ANGLE_TOLERANCE = "angleTolerance"; + private static final String TYPE = "type"; + private static final String DEGENERATED_POLYGON_TOLERANCE = "degeneratedPolygonTolerance"; private static final List<CheckId> dependencies; - private static final List<DefaultParameter> defaultParameters; static { ArrayList<CheckId> deps = new ArrayList<>(4); @@ -77,14 +74,6 @@ public class PlanarCheck extends Check { deps.add(CheckId.C_GE_R_DUPLICATE_POINT); deps.add(CheckId.C_GE_R_SELF_INTERSECTION); dependencies = Collections.unmodifiableList(deps); - - ArrayList<DefaultParameter> defParameters = new ArrayList<>(3); - defParameters.add(new DefaultParameter(TYPE, DISTANCE, Unit.NONE)); - defParameters.add(new DefaultParameter(DISTANCE_TOLERANCE, "0.01", Unit.METER)); - defParameters.add(new DefaultParameter(ANGLE_TOLERANCE, "1", Unit.DEGREE)); - defParameters.add(new DefaultParameter(DEGENERATED_POLYGON_TOLERANCE, "0.00000", Unit.METER)); - defaultParameters = Collections.unmodifiableList(defParameters); - } private String planarCheckType = DISTANCE; @@ -111,11 +100,6 @@ public class PlanarCheck extends Check { } } - @Override - public List<DefaultParameter> getDefaultParameter() { - return defaultParameters; - } - @Override public void check(Polygon p) { if (DISTANCE.equals(planarCheckType)) { diff --git a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/semantics/IsWallCheck.java b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/semantics/IsWallCheck.java index 4cfb380..dfcfedd 100644 --- a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/semantics/IsWallCheck.java +++ b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/semantics/IsWallCheck.java @@ -27,11 +27,9 @@ import java.util.Set; import de.hft.stuttgart.citydoctor2.check.Check; import de.hft.stuttgart.citydoctor2.check.CheckId; import de.hft.stuttgart.citydoctor2.check.CheckResult; -import de.hft.stuttgart.citydoctor2.check.RequirementType; -import de.hft.stuttgart.citydoctor2.check.DefaultParameter; import de.hft.stuttgart.citydoctor2.check.Requirement; +import de.hft.stuttgart.citydoctor2.check.RequirementType; import de.hft.stuttgart.citydoctor2.check.ResultStatus; -import de.hft.stuttgart.citydoctor2.check.Unit; import de.hft.stuttgart.citydoctor2.check.error.NotWallError; import de.hft.stuttgart.citydoctor2.checks.util.CollectionUtils; import de.hft.stuttgart.citydoctor2.datastructure.BoundarySurface; @@ -55,7 +53,6 @@ public class IsWallCheck extends Check { private static final String UPPER_ANGLE_NAME = "upperAngle"; private static final List<CheckId> dependencies; - private static final List<DefaultParameter> defaultParameters; static { ArrayList<CheckId> deps = new ArrayList<>(); @@ -66,10 +63,6 @@ public class IsWallCheck extends Check { deps.add(CheckId.C_GE_P_NON_PLANAR); dependencies = Collections.unmodifiableList(deps); - ArrayList<DefaultParameter> defParameters = new ArrayList<>(3); - defParameters.add(new DefaultParameter(LOWER_ANGLE_NAME, "45", Unit.DEGREE)); - defParameters.add(new DefaultParameter(UPPER_ANGLE_NAME, "135", Unit.DEGREE)); - defaultParameters = Collections.unmodifiableList(defParameters); } private static final Vector3d Z_AXIS = new Vector3d(0, 0, 1); @@ -140,11 +133,6 @@ public class IsWallCheck extends Check { return CollectionUtils.singletonSet(Requirement.R_SE_BS_IS_WALL); } - @Override - public List<DefaultParameter> getDefaultParameter() { - return defaultParameters; - } - @Override public RequirementType getType() { return RequirementType.SEMANTIC; diff --git a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/semantics/RoofSurfaceUnfragmentedCheck.java b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/semantics/RoofSurfaceUnfragmentedCheck.java index e2e535f..4996b70 100644 --- a/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/semantics/RoofSurfaceUnfragmentedCheck.java +++ b/CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/checks/semantics/RoofSurfaceUnfragmentedCheck.java @@ -27,10 +27,8 @@ import java.util.Set; import de.hft.stuttgart.citydoctor2.check.Check; import de.hft.stuttgart.citydoctor2.check.CheckId; import de.hft.stuttgart.citydoctor2.check.CheckResult; -import de.hft.stuttgart.citydoctor2.check.RequirementType; -import de.hft.stuttgart.citydoctor2.check.DefaultParameter; import de.hft.stuttgart.citydoctor2.check.Requirement; -import de.hft.stuttgart.citydoctor2.check.Unit; +import de.hft.stuttgart.citydoctor2.check.RequirementType; import de.hft.stuttgart.citydoctor2.checks.util.CollectionUtils; import de.hft.stuttgart.citydoctor2.checks.util.UnfragmentedCheck; import de.hft.stuttgart.citydoctor2.datastructure.BoundarySurface; @@ -46,17 +44,12 @@ import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration; public class RoofSurfaceUnfragmentedCheck extends Check { private static final List<CheckId> dependencies; - private static final List<DefaultParameter> defaultParameters; private static final String MAX_ANGLE_DEVIATION = "maxAngleDeviation"; private double maxAngleDeviation = Math.toRadians(1); static { - ArrayList<DefaultParameter> defParameters = new ArrayList<>(3); - defParameters.add(new DefaultParameter(MAX_ANGLE_DEVIATION, "1", Unit.DEGREE)); - defaultParameters = Collections.unmodifiableList(defParameters); - ArrayList<CheckId> deps = new ArrayList<>(); deps.add(CheckId.C_GE_R_TOO_FEW_POINTS); deps.add(CheckId.C_GE_R_NOT_CLOSED); @@ -90,11 +83,6 @@ public class RoofSurfaceUnfragmentedCheck extends Check { return dependencies; } - @Override - public List<DefaultParameter> getDefaultParameter() { - return defaultParameters; - } - @Override public Set<Requirement> appliesToRequirements() { return CollectionUtils.singletonSet(Requirement.R_SE_BS_ROOF_UNFRAGMENTED); -- GitLab