X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2Fcontributions%2FChangeMappingTypeHandler.java;h=3b33020f452d5e1252c7fc72193f53da437a3e1a;hb=44fb5c76f6e8a4d4669de3bbbf48850a3d724049;hp=1047dc13e8b6f953192e487684c90fc9ff02f0c4;hpb=00103b12908c5071e641ca2bea2c42030ff67770;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/ChangeMappingTypeHandler.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/ChangeMappingTypeHandler.java
index 1047dc13..3b33020f 100644
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/ChangeMappingTypeHandler.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/ChangeMappingTypeHandler.java
@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
+import java.util.stream.Collectors;
 
 import javax.inject.Named;
 
@@ -48,6 +49,7 @@ import org.simantics.db.exception.ValidationException;
 import org.simantics.db.layer0.SelectionHints;
 import org.simantics.db.procedure.Procedure;
 import org.simantics.db.request.Read;
+import org.simantics.district.network.DistrictNetworkUtil;
 import org.simantics.district.network.ontology.DistrictNetworkResource;
 import org.simantics.district.network.ui.function.Functions;
 import org.simantics.district.network.ui.internal.Activator;
@@ -146,15 +148,11 @@ public class ChangeMappingTypeHandler {
                                 
                                 @Override
                                 public void perform(WriteGraph graph) throws DatabaseException {
-                                    DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
-                                    
                                     for (Map.Entry<Resource, Collection<NamedResource>> entry : results.entrySet()) {
-                                        Resource newMapping = entry.getKey();
-                                        Collection<NamedResource> elements = entry.getValue();
-                                        for (NamedResource element : elements) {
-                                            graph.deny(element.getResource(), DN.HasMapping);
-                                            graph.claim(element.getResource(), DN.HasMapping, newMapping);
-                                        }
+                                        List<Resource> elements = entry.getValue().stream()
+                                            .map(NamedResource::getResource)
+                                            .collect(Collectors.toList());
+                                        DistrictNetworkUtil.changeMappingType(graph, entry.getKey(), elements);
                                     }
                                 }
                             });
@@ -183,18 +181,12 @@ public class ChangeMappingTypeHandler {
         
         private Map<NamedResource, Map<String, Resource>> possibleMappings = new HashMap<>();
         
-        private Resource defaultVertexMapping;
-
         protected SelectMappingDialog(Shell parentShell, CompletableFuture<Map<NamedResource, Collection<NamedResource>>> elements) {
             super(parentShell);
             this.elements = elements;
             setTitle("Change mappings");
         }
 
-        public Resource getDefaultVertexMapping() {
-            return defaultVertexMapping;
-        }
-
         @Override
         protected Control createDialogArea(Composite parent) {
             composite = (Composite) super.createDialogArea(parent);