[model] added overwrite import to rest of objects

jub77 · jub77 · commit 43a17bf0d3d1 · 2024-11-18T21:29:21.000+01:00
diff --git a/grafikon-model/src/main/java/net/parostroj/timetable/model/Route.java b/grafikon-model/src/main/java/net/parostroj/timetable/model/Route.java
@@ -4,6 +4,7 @@
 
 import com.google.common.collect.Iterables;
 
+import com.google.common.collect.Lists;
 import net.parostroj.timetable.utils.TransformUtil;
 import net.parostroj.timetable.visitors.TrainDiagramVisitor;
 import net.parostroj.timetable.visitors.Visitable;
@@ -43,6 +44,11 @@ public Route(String id, Route route) {
         segments = new LinkedList<>(route.segments);
     }
 
+    public Route(String id, TrainDiagram diagram, Iterable<RouteSegment> segments) {
+        this(id, diagram);
+        this.segments = Lists.newLinkedList(segments);
+    }
+
     @SafeVarargs
     public Route(String id, TrainDiagram diagram, RouteSegment... segments) {
         this(id, diagram);
@@ -55,6 +61,8 @@ public Route(String id, TrainDiagram diagram, String name, RouteSegment... segme
         this.setName(name);
     }
 
+
+
     public List<RouteSegment> getSegments() {
         return segments;
     }
@@ -122,8 +130,7 @@ public void add(Route route) {
     public boolean checkDuplicateNodes() {
         Set<Node> dNodes = new HashSet<>();
         for (RouteSegment segment : segments) {
-            if (segment instanceof Node) {
-                Node node = (Node) segment;
+            if (segment instanceof Node node) {
                 if (dNodes.contains(node)) {
                     return true;
                 } else {
diff --git a/grafikon-model/src/main/java/net/parostroj/timetable/model/imports/CompanyImport.java b/grafikon-model/src/main/java/net/parostroj/timetable/model/imports/CompanyImport.java
@@ -23,17 +23,21 @@ public CompanyImport(TrainDiagram diagram, ImportMatch match, boolean overwrite)
     @Override
     protected ObjectWithId importObjectImpl(ObjectWithId o) {
         // check class
-        if (!(o instanceof Company))
+        if (!(o instanceof Company importedCompany)) {
             return null;
-        Company importedCompany = (Company)o;
+        }
 
         // check existence
         Company checkedCompany = this.getCompany(importedCompany);
         if (checkedCompany != null) {
-            String message = "company already exists";
-            this.addError(importedCompany, message);
-            log.debug("{}: {}", message, checkedCompany);
-            return null;
+            if (overwrite) {
+                this.getDiagram().getCompanies().remove(checkedCompany);
+            } else {
+                String message = "company already exists";
+                this.addError(importedCompany, message);
+                log.debug("{}: {}", message, checkedCompany);
+                return null;
+            }
         }
 
         // create new company
diff --git a/grafikon-model/src/main/java/net/parostroj/timetable/model/imports/GroupImport.java b/grafikon-model/src/main/java/net/parostroj/timetable/model/imports/GroupImport.java
@@ -23,17 +23,21 @@ public GroupImport(TrainDiagram diagram, ImportMatch match, boolean overwrite) {
     @Override
     protected ObjectWithId importObjectImpl(ObjectWithId o) {
         // check class
-        if (!(o instanceof Group))
+        if (!(o instanceof Group importedGroup)) {
             return null;
-        Group importedGroup = (Group)o;
+        }
 
         // check existence
         Group checkedGroup = this.getGroup(importedGroup);
         if (checkedGroup != null) {
-            String message = "group already exists";
-            this.addError(importedGroup, message);
-            log.debug("{}: {}", message, checkedGroup);
-            return null;
+            if (overwrite) {
+                this.getDiagram().getGroups().remove(checkedGroup);
+            } else {
+                String message = "group already exists";
+                this.addError(importedGroup, message);
+                log.debug("{}: {}", message, checkedGroup);
+                return null;
+            }
         }
 
         // create new group
diff --git a/grafikon-model/src/main/java/net/parostroj/timetable/model/imports/RouteImport.java b/grafikon-model/src/main/java/net/parostroj/timetable/model/imports/RouteImport.java
@@ -24,24 +24,27 @@ public RouteImport(TrainDiagram diagram, ImportMatch match, boolean overwrite) {
     @Override
     protected ObjectWithId importObjectImpl(ObjectWithId importedObject) {
         // check class
-        if (!(importedObject instanceof Route)) {
+        if (!(importedObject instanceof Route importedRoute)) {
             // skip other objects
             return null;
         }
-        Route importedRoute = (Route) importedObject;
 
         // check if the route already exist
         Route checkedRoute = this.getRoute(importedRoute);
         if (checkedRoute != null) {
-            String message = "route already exists";
-            this.addError(importedRoute, message);
-            log.debug("{}: {}", message, checkedRoute);
-            return null;
+            if (overwrite) {
+                this.getDiagram().getRoutes().remove(checkedRoute);
+            } else {
+                String message = "route already exists";
+                this.addError(importedRoute, message);
+                log.debug("{}: {}", message, checkedRoute);
+                return null;
+            }
         }
 
         // create route
-        NetSegment<?>[] segments = getSegments(importedRoute);
-        if (segments == null) {
+        List<RouteSegment> segments = getSegments(importedRoute);
+        if (segments.isEmpty()) {
             String message = "nodes missing";
             this.addError(importedRoute, message);
             log.debug("{}: {}", message, importedRoute);
@@ -58,15 +61,15 @@ protected ObjectWithId importObjectImpl(ObjectWithId importedObject) {
         return route;
     }
 
-    private NetSegment<?>[] getSegments(Route oRoute) {
-        List<NetSegment<?>> result = new LinkedList<>();
+    private List<RouteSegment> getSegments(Route oRoute) {
+        List<RouteSegment> result = new LinkedList<>();
         for (RouteSegment oSeg : oRoute.getSegments()) {
             if (oSeg instanceof Line) {
                 result.add(this.getLine((Line) oSeg));
             } else if (oSeg instanceof Node) {
                 result.add(this.getNode((Node) oSeg));
             }
         }
-        return result.toArray(new NetSegment[0]);
+        return result;
     }
 }
diff --git a/grafikon-model/src/main/java/net/parostroj/timetable/model/imports/TrainTypeImport.java b/grafikon-model/src/main/java/net/parostroj/timetable/model/imports/TrainTypeImport.java
@@ -24,17 +24,21 @@ public TrainTypeImport(TrainDiagram diagram, ImportMatch match, boolean overwrit
     @Override
     protected ObjectWithId importObjectImpl(ObjectWithId o) {
         // check class
-        if (!(o instanceof TrainType))
+        if (!(o instanceof TrainType importedType)) {
             return null;
-        TrainType importedType = (TrainType)o;
+        }
 
         // check existence
         TrainType checkedType = this.getTrainType(importedType);
         if (checkedType != null) {
-            String message = "train type already exists";
-            this.addError(importedType, message);
-            log.debug("{}: {}", message, checkedType);
-            return null;
+            if (overwrite) {
+                this.getDiagram().getTrainTypes().remove(checkedType);
+            } else {
+                String message = "train type already exists";
+                this.addError(importedType, message);
+                log.debug("{}: {}", message, checkedType);
+                return null;
+            }
         }
 
         // get category
diff --git a/grafikon-model/src/main/java/net/parostroj/timetable/model/imports/TrainsCycleImport.java b/grafikon-model/src/main/java/net/parostroj/timetable/model/imports/TrainsCycleImport.java
@@ -25,19 +25,22 @@ public TrainsCycleImport(TrainDiagram diagram, ImportMatch match, boolean overwr
     @Override
     protected ObjectWithId importObjectImpl(ObjectWithId importedObject) {
         // check class
-        if (!(importedObject instanceof TrainsCycle)) {
+        if (!(importedObject instanceof TrainsCycle importedCycle)) {
             // skip other objects
             return null;
         }
-        TrainsCycle importedCycle = (TrainsCycle) importedObject;
 
         // check if cycle already exist
         TrainsCycle checkedCycle = this.getCycle(importedCycle);
         if (checkedCycle != null) {
-            String message = "circulation already exists";
-            this.addError(importedCycle, message);
-            log.debug("{}: {}", message, checkedCycle);
-            return null;
+            if (overwrite) {
+                checkedCycle.getType().getCycles().remove(checkedCycle);
+            } else {
+                String message = "circulation already exists";
+                this.addError(importedCycle, message);
+                log.debug("{}: {}", message, checkedCycle);
+                return null;
+            }
         }
 
         // create a new cycle
diff --git a/grafikon-model/src/main/java/net/parostroj/timetable/model/imports/TrainsCycleTypeImport.java b/grafikon-model/src/main/java/net/parostroj/timetable/model/imports/TrainsCycleTypeImport.java
@@ -21,19 +21,22 @@ public TrainsCycleTypeImport(TrainDiagram diagram, ImportMatch match, boolean ov
     @Override
     protected ObjectWithId importObjectImpl(ObjectWithId importedObject) {
         // check class
-        if (!(importedObject instanceof TrainsCycleType)) {
+        if (!(importedObject instanceof TrainsCycleType importedCycleType)) {
             // skip other objects
             return null;
         }
-        TrainsCycleType importedCycleType = (TrainsCycleType) importedObject;
 
         // check if cycle type already exist
         TrainsCycleType checkedCycleType = this.getCycleType(importedCycleType);
         if (checkedCycleType != null) {
-            String message = "circulation type already exists";
-            this.addError(importedCycleType, message);
-            log.debug("{}: {}", message, checkedCycleType);
-            return null;
+            if (overwrite) {
+                this.getDiagram().getCycleTypes().remove(checkedCycleType);
+            } else {
+                String message = "circulation type already exists";
+                this.addError(importedCycleType, message);
+                log.debug("{}: {}", message, checkedCycleType);
+                return null;
+            }
         }
 
         TrainsCycleType type = new TrainsCycleType(this.getId(importedCycleType), this.getDiagram());
diff --git a/grafikon-model/src/main/java/net/parostroj/timetable/model/validators/CompanyRemoveValidator.java b/grafikon-model/src/main/java/net/parostroj/timetable/model/validators/CompanyRemoveValidator.java
@@ -19,8 +19,8 @@ public CompanyRemoveValidator(TrainDiagram diagram) {
 
     @Override
     public boolean validate(Event event) {
-        if (event.getSource() instanceof TrainDiagram && event.getType() == Type.REMOVED && event.getObject() instanceof Company) {
-            Company removedCompany = (Company) event.getObject();
+        if (event.getSource() instanceof TrainDiagram && event.getType() == Type.REMOVED
+                && event.getObject() instanceof Company removedCompany) {
             // remove company from circulations...
             for (TrainsCycleType type : diagram.getCycleTypes()) {
                 for (TrainsCycle circulation : type.getCycles()) {
@@ -30,6 +30,13 @@ public boolean validate(Event event) {
                     }
                 }
             }
+            // remove company from nodes
+            for (Node node : diagram.getNet().getNodes()) {
+                Company company = node.getCompany();
+                if (company == removedCompany) {
+                    node.removeAttribute(Node.ATTR_COMPANY);
+                }
+            }
             return true;
         }
         return false;
diff --git a/grafikon-model/src/main/java/net/parostroj/timetable/model/validators/GroupRemoveValidator.java b/grafikon-model/src/main/java/net/parostroj/timetable/model/validators/GroupRemoveValidator.java
@@ -22,13 +22,13 @@ public GroupRemoveValidator(TrainDiagram diagram) {
     @Override
     public boolean validate(Event event) {
         if (event.getSource() instanceof TrainDiagram && event.getType() == Type.REMOVED
-                && event.getObject() instanceof Group) {
-            Group group = (Group) event.getObject();
+                && event.getObject() instanceof Group group) {
             // remove group from trains ...
             for (Train train : diagram.getTrains()) {
                 Group trainGroup = train.getAttributes().get(Train.ATTR_GROUP, Group.class);
-                if (group.equals(trainGroup))
+                if (group.equals(trainGroup)) {
                     train.removeAttribute(Train.ATTR_GROUP);
+                }
             }
             return true;
         }
diff --git a/grafikon-model/src/main/java/net/parostroj/timetable/model/validators/TrainTypeValidator.java b/grafikon-model/src/main/java/net/parostroj/timetable/model/validators/TrainTypeValidator.java
@@ -24,6 +24,13 @@ public boolean validate(Event event) {
                 }
             }
             return true;
+        } else if (event.getSource() instanceof TrainDiagram && event.getType() == Type.REMOVED
+                && event.getObject() instanceof TrainType type) {
+            for (Train train : diagram.getTrains()) {
+                if (train.getType() == type) {
+                    train.setType(null);
+                }
+            }
         }
         return false;
     }
diff --git a/grafikon-model/src/main/java/net/parostroj/timetable/model/validators/TrainsCycleValidator.java b/grafikon-model/src/main/java/net/parostroj/timetable/model/validators/TrainsCycleValidator.java
@@ -28,9 +28,8 @@ public boolean validate(Event event) {
         if (event.getSource() instanceof TrainsCycle) {
             validated = handleTrainsCycleEvent(event);
         }
-        if (event.getSource() instanceof TrainDiagram && event.getObject() instanceof TrainsCycle
+        if (event.getSource() instanceof TrainDiagram && event.getObject() instanceof TrainsCycle deleted
                 && event.getType() == Event.Type.REMOVED) {
-            TrainsCycle deleted = (TrainsCycle) event.getObject();
             // handle sequence of circulations
             if (deleted.isPartOfSequence()) {
                 deleted.removeFromSequence();
@@ -77,7 +76,7 @@ private void distributeAttributesInSequence(TrainsCycle circulation, AttributeCh
     }
 
     private void recalculateEngineClassChange(TrainsCycle circulation) {
-        for (TrainsCycleItem item : new ArrayList<TrainsCycleItem>(circulation.getItems())) {
+        for (TrainsCycleItem item : new ArrayList<>(circulation.getItems())) {
             item.getTrain().recalculate();
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ public CompanyRemoveValidator(TrainDiagram diagram) {`
`19`	`19`
`20`	`20`	`@Override`
`21`	`21`	`public boolean validate(Event event) {`
`22`		`- if (event.getSource() instanceof TrainDiagram && event.getType() == Type.REMOVED && event.getObject() instanceof Company) {`
`23`		`- Company removedCompany = (Company) event.getObject();`
	`22`	`+ if (event.getSource() instanceof TrainDiagram && event.getType() == Type.REMOVED`
	`23`	`+ && event.getObject() instanceof Company removedCompany) {`
`24`	`24`	`// remove company from circulations...`
`25`	`25`	`for (TrainsCycleType type : diagram.getCycleTypes()) {`
`26`	`26`	`for (TrainsCycle circulation : type.getCycles()) {`
`@@ -30,6 +30,13 @@ public boolean validate(Event event) {`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`	`}`
	`33`	`+ // remove company from nodes`
	`34`	`+ for (Node node : diagram.getNet().getNodes()) {`
	`35`	`+ Company company = node.getCompany();`
	`36`	`+ if (company == removedCompany) {`
	`37`	`+ node.removeAttribute(Node.ATTR_COMPANY);`
	`38`	`+ }`
	`39`	`+ }`
`33`	`40`	`return true;`
`34`	`41`	`}`
`35`	`42`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,13 @@ public boolean validate(Event event) {`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`	`return true;`
	`27`	`+ } else if (event.getSource() instanceof TrainDiagram && event.getType() == Type.REMOVED`
	`28`	`+ && event.getObject() instanceof TrainType type) {`
	`29`	`+ for (Train train : diagram.getTrains()) {`
	`30`	`+ if (train.getType() == type) {`
	`31`	`+ train.setType(null);`
	`32`	`+ }`
	`33`	`+ }`
`27`	`34`	`}`
`28`	`35`	`return false;`
`29`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,8 @@ public boolean validate(Event event) {`
`28`	`28`	`if (event.getSource() instanceof TrainsCycle) {`
`29`	`29`	`validated = handleTrainsCycleEvent(event);`
`30`	`30`	`}`
`31`		`- if (event.getSource() instanceof TrainDiagram && event.getObject() instanceof TrainsCycle`
	`31`	`+ if (event.getSource() instanceof TrainDiagram && event.getObject() instanceof TrainsCycle deleted`
`32`	`32`	`&& event.getType() == Event.Type.REMOVED) {`
`33`		`- TrainsCycle deleted = (TrainsCycle) event.getObject();`
`34`	`33`	`// handle sequence of circulations`
`35`	`34`	`if (deleted.isPartOfSequence()) {`
`36`	`35`	`deleted.removeFromSequence();`
`@@ -77,7 +76,7 @@ private void distributeAttributesInSequence(TrainsCycle circulation, AttributeCh`
`77`	`76`	`}`
`78`	`77`
`79`	`78`	`private void recalculateEngineClassChange(TrainsCycle circulation) {`
`80`		`- for (TrainsCycleItem item : new ArrayList<TrainsCycleItem>(circulation.getItems())) {`
	`79`	`+ for (TrainsCycleItem item : new ArrayList<>(circulation.getItems())) {`
`81`	`80`	`item.getTrain().recalculate();`
`82`	`81`	`}`
`83`	`82`	`}`