Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CityDoctor
CityDoctor2
Commits
bb86c38b
Commit
bb86c38b
authored
Apr 15, 2025
by
Riegel
Browse files
Refactor: Remove obsolete collection functions
parent
6b8e786f
Changes
24
Hide whitespace changes
Inline
Side-by-side
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractBuilding.java
View file @
bb86c38b
...
...
@@ -204,29 +204,6 @@ public abstract class AbstractBuilding extends CityObject {
}
}
@Override
public
void
collectContainedErrors
(
List
<
CheckError
>
errors
)
{
super
.
collectContainedErrors
(
errors
);
for
(
Installation
bi
:
buildingInstallations
)
{
bi
.
collectContainedErrors
(
errors
);
}
for
(
BoundarySurface
bs
:
boundarySurfaceList
)
{
bs
.
collectContainedErrors
(
errors
);
}
for
(
BuildingRoom
br
:
buildingRooms
)
{
br
.
collectContainedErrors
(
errors
);
}
for
(
BuildingRoomFurniture
bfr
:
buildingRoomFurnitureList
)
{
bfr
.
collectContainedErrors
(
errors
);
}
for
(
Storey
storey
:
buildingStoreys
)
{
storey
.
collectContainedErrors
(
errors
);
}
for
(
BuildingUnit
bu
:
buildingUnits
)
{
bu
.
collectContainedErrors
(
errors
);
}
}
@Override
public
void
clearAllContainedCheckResults
()
{
super
.
clearAllContainedCheckResults
();
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractBuildingSubdivision.java
View file @
bb86c38b
...
...
@@ -168,22 +168,6 @@ public abstract class AbstractBuildingSubdivision extends CityObject {
}
}
@Override
public
void
collectContainedErrors
(
List
<
CheckError
>
errors
)
{
super
.
collectContainedErrors
(
errors
);
for
(
Installation
bi
:
buildingInstallations
)
{
bi
.
collectContainedErrors
(
errors
);
}
for
(
BoundarySurface
bs
:
boundarySurfaceList
)
{
bs
.
collectContainedErrors
(
errors
);
}
for
(
BuildingRoom
br
:
buildingRooms
)
{
br
.
collectContainedErrors
(
errors
);
}
for
(
BuildingRoomFurniture
bfr
:
buildingRoomFurnitureList
)
{
bfr
.
collectContainedErrors
(
errors
);
}
}
@Override
public
void
clearAllContainedCheckResults
()
{
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractFurniture.java
View file @
bb86c38b
...
...
@@ -42,14 +42,6 @@ public abstract class AbstractFurniture extends CityObject {
}
}
@Override
public
void
collectContainedErrors
(
List
<
CheckError
>
errors
)
{
super
.
collectContainedErrors
(
errors
);
for
(
BoundarySurface
boundarySurface
:
boundarySurfaceList
)
{
boundarySurface
.
collectContainedErrors
(
errors
);
}
}
@Override
public
void
clearAllContainedCheckResults
()
{
super
.
clearAllContainedCheckResults
();
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractRoom.java
View file @
bb86c38b
...
...
@@ -48,17 +48,6 @@ public abstract class AbstractRoom extends CityObject {
}
}
@Override
public
void
collectContainedErrors
(
List
<
CheckError
>
errors
)
{
super
.
collectContainedErrors
(
errors
);
for
(
Installation
roomInstallation
:
roomInstallations
)
{
roomInstallation
.
collectContainedErrors
(
errors
);
}
for
(
BoundarySurface
boundarySurface
:
boundarySurfaceList
)
{
boundarySurface
.
collectContainedErrors
(
errors
);
}
}
@Override
public
void
clearAllContainedCheckResults
()
{
super
.
clearAllContainedCheckResults
();
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractTunnel.java
View file @
bb86c38b
...
...
@@ -186,29 +186,6 @@ public abstract class AbstractTunnel extends CityObject {
}
}
@Override
public
void
collectContainedErrors
(
List
<
CheckError
>
errors
)
{
super
.
collectContainedErrors
(
errors
);
for
(
Installation
bi
:
tunnelInstallations
)
{
bi
.
collectContainedErrors
(
errors
);
}
for
(
BoundarySurface
bs
:
boundarySurfaceList
)
{
bs
.
collectContainedErrors
(
errors
);
}
for
(
TunnelHollow
th
:
tunnelHollows
)
{
th
.
collectContainedErrors
(
errors
);
}
for
(
TunnelFurniture
tfr
:
tunnelFurnitureList
)
{
tfr
.
collectContainedErrors
(
errors
);
}
for
(
TunnelConstructiveElement
te
:
tunnelConstructiveElements
)
{
te
.
collectContainedErrors
(
errors
);
}
for
(
TunnelPart
tp
:
tunnelParts
)
{
tp
.
collectContainedErrors
(
errors
);
}
}
@Override
public
void
clearAllContainedCheckResults
()
{
super
.
clearAllContainedCheckResults
();
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BoundarySurface.java
View file @
bb86c38b
...
...
@@ -153,14 +153,6 @@ public class BoundarySurface extends CityObject {
}
}
@Override
public
void
collectContainedErrors
(
List
<
CheckError
>
errors
)
{
super
.
collectContainedErrors
(
errors
);
for
(
Opening
o
:
openings
)
{
o
.
collectContainedErrors
(
errors
);
}
}
@Override
public
void
accept
(
Check
c
)
{
super
.
accept
(
c
);
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BridgeConstructiveElement.java
View file @
bb86c38b
...
...
@@ -116,14 +116,6 @@ public class BridgeConstructiveElement extends CityObject {
}
}
@Override
public
void
collectContainedErrors
(
List
<
CheckError
>
errors
)
{
super
.
collectContainedErrors
(
errors
);
for
(
BoundarySurface
bs
:
boundarySurfaceList
)
{
bs
.
collectContainedErrors
(
errors
);
}
}
@Override
public
void
clearAllContainedCheckResults
()
{
super
.
clearAllContainedCheckResults
();
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BridgeObject.java
View file @
bb86c38b
...
...
@@ -213,41 +213,6 @@ public class BridgeObject extends CityObject {
}
}
@Override
public
void
collectContainedErrors
(
List
<
CheckError
>
errors
)
{
super
.
collectContainedErrors
(
errors
);
for
(
BoundarySurface
bs
:
boundarySurfaces
)
{
bs
.
collectContainedErrors
(
errors
);
}
for
(
Installation
bi
:
bridgeInstallations
)
{
bi
.
collectContainedErrors
(
errors
);
}
for
(
BridgeObject
part
:
parts
)
{
part
.
collectContainedErrors
(
errors
);
}
for
(
BridgeConstructiveElement
ele
:
elements
)
{
ele
.
collectContainedErrors
(
errors
);
}
for
(
BridgeRoom
br
:
bridgeRooms
)
{
br
.
collectContainedErrors
(
errors
);
}
for
(
BridgeRoomFurniture
bri
:
bridgeFurniture
)
{
bri
.
collectContainedErrors
(
errors
);
}
}
private
boolean
doPartsContainError
(
CheckId
checkIdentifier
)
{
for
(
BridgeObject
part
:
parts
)
{
if
(
part
.
containsError
(
checkIdentifier
))
{
return
true
;
}
}
return
false
;
}
@Override
public
void
accept
(
Check
c
)
{
super
.
accept
(
c
);
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Building.java
View file @
bb86c38b
...
...
@@ -75,14 +75,6 @@ public class Building extends AbstractBuilding {
}
}
@Override
public
void
collectContainedErrors
(
List
<
CheckError
>
errors
)
{
super
.
collectContainedErrors
(
errors
);
for
(
BuildingPart
bp
:
buildingParts
)
{
bp
.
collectContainedErrors
(
errors
);
}
}
public
void
addBuildingPart
(
BuildingPart
buildingPart
)
{
buildingParts
.
add
(
buildingPart
);
}
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/BuildingUnit.java
View file @
bb86c38b
...
...
@@ -41,14 +41,6 @@ public class BuildingUnit extends AbstractBuildingSubdivision {
}
}
@Override
public
void
collectContainedErrors
(
List
<
CheckError
>
errors
)
{
super
.
collectContainedErrors
(
errors
);
for
(
Storey
storey
:
storeys
)
{
storey
.
collectContainedErrors
(
errors
);
}
}
@Override
public
void
clearAllContainedCheckResults
()
{
super
.
clearAllContainedCheckResults
();
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/CityObject.java
View file @
bb86c38b
...
...
@@ -156,14 +156,6 @@ public abstract class CityObject extends GmlElement {
}
}
@Override
public
void
collectContainedErrors
(
List
<
CheckError
>
errors
)
{
super
.
collectContainedErrors
(
errors
);
for
(
Geometry
geom
:
geometryList
)
{
geom
.
collectContainedErrors
(
errors
);
}
}
public
Geometry
getGeometry
(
GeometryType
type
,
Lod
lod
)
{
for
(
Geometry
geom
:
geometryList
)
{
if
(
geom
.
getType
()
==
type
&&
geom
.
getLod
()
==
lod
)
{
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/ConcretePolygon.java
View file @
bb86c38b
...
...
@@ -213,27 +213,6 @@ public class ConcretePolygon extends Polygon {
return
exterior
.
isRingConnectedViaPoint
(
other
.
getExteriorRing
());
}
/*
* (non-Javadoc)
*
* @see
* de.hft.stuttgart.citydoctor2.datastructure.Polygon#collectContainedErrors(
* java.util.List)
*/
@Override
public
void
collectContainedErrors
(
List
<
CheckError
>
errors
)
{
super
.
collectContainedErrors
(
errors
);
if
(
exterior
!=
null
)
{
exterior
.
collectContainedErrors
(
errors
);
}
if
(
innerRings
!=
null
)
{
for
(
LinearRing
lr
:
innerRings
)
{
lr
.
collectContainedErrors
(
errors
);
}
}
}
/*
* (non-Javadoc)
*
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/GenericCityObject.java
View file @
bb86c38b
...
...
@@ -120,14 +120,6 @@ public class GenericCityObject extends CityObject {
}
}
@Override
public
void
collectContainedErrors
(
List
<
CheckError
>
errors
)
{
super
.
collectContainedErrors
(
errors
);
for
(
BoundarySurface
bs
:
boundarySurfaceList
)
{
bs
.
collectContainedErrors
(
errors
);
}
}
@Override
public
void
clearAllContainedCheckResults
()
{
super
.
clearAllContainedCheckResults
();
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Geometry.java
View file @
bb86c38b
...
...
@@ -215,14 +215,6 @@ public class Geometry extends GmlElement {
}
}
@Override
public
void
collectContainedErrors
(
List
<
CheckError
>
errors
)
{
super
.
collectContainedErrors
(
errors
);
for
(
Polygon
p
:
polygons
)
{
p
.
collectContainedErrors
(
errors
);
}
}
@Override
public
void
accept
(
Check
c
)
{
super
.
accept
(
c
);
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/ImplicitGeometryHolder.java
View file @
bb86c38b
...
...
@@ -68,13 +68,6 @@ public class ImplicitGeometryHolder extends Geometry {
prototypeGeometry
.
clearAllContainedCheckResults
();
}
@Override
public
void
collectContainedErrors
(
List
<
CheckError
>
errors
)
{
prototypeGeometry
.
clearAllContainedCheckResults
();
}
@Override
public
boolean
isValidated
()
{
return
prototypeGeometry
.
isValidated
();
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Installation.java
View file @
bb86c38b
...
...
@@ -134,14 +134,6 @@ public class Installation extends CityObject {
}
}
@Override
public
void
collectContainedErrors
(
List
<
CheckError
>
errors
)
{
super
.
collectContainedErrors
(
errors
);
for
(
BoundarySurface
bs
:
boundarySurfaces
)
{
bs
.
collectContainedErrors
(
errors
);
}
}
public
void
setParent
(
CityObject
parent
)
{
this
.
parent
=
parent
;
}
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/LinkedPolygon.java
View file @
bb86c38b
...
...
@@ -117,11 +117,6 @@ public class LinkedPolygon extends Polygon {
poly
.
addCheckResult
(
cr
);
}
@Override
public
void
collectContainedErrors
(
List
<
CheckError
>
errors
)
{
poly
.
collectContainedErrors
(
errors
);
}
@Override
public
boolean
containsAnyError
()
{
return
poly
.
containsAnyError
();
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/ReliefObject.java
View file @
bb86c38b
...
...
@@ -88,14 +88,6 @@ public class ReliefObject extends CityObject {
}
}
@Override
public
void
collectContainedErrors
(
List
<
CheckError
>
errors
)
{
super
.
collectContainedErrors
(
errors
);
for
(
TinObject
tin
:
components
)
{
tin
.
collectContainedErrors
(
errors
);
}
}
@Override
public
void
reCreateGeometries
(
GeometryFactory
factory
,
ParserConfiguration
config
)
{
// no geometries
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/Storey.java
View file @
bb86c38b
...
...
@@ -40,14 +40,6 @@ public class Storey extends AbstractBuildingSubdivision {
}
}
@Override
public
void
collectContainedErrors
(
List
<
CheckError
>
errors
)
{
super
.
collectContainedErrors
(
errors
);
for
(
BuildingUnit
buildingUnit
:
buildingUnits
)
{
buildingUnit
.
collectContainedErrors
(
errors
);
}
}
@Override
public
void
clearAllContainedCheckResults
()
{
super
.
clearAllContainedCheckResults
();
...
...
CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/TopLevelTransportFeature.java
View file @
bb86c38b
...
...
@@ -102,17 +102,6 @@ public class TopLevelTransportFeature extends TransportationSpace {
}
}
@Override
public
void
collectContainedErrors
(
List
<
CheckError
>
errors
)
{
super
.
collectContainedErrors
(
errors
);
for
(
TransportSection
section
:
sections
)
{
section
.
collectContainedErrors
(
errors
);
}
for
(
TransportSection
section
:
intersections
)
{
section
.
collectContainedErrors
(
errors
);
}
}
@Override
public
void
accept
(
Check
c
)
{
super
.
accept
(
c
);
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment