X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.modeling%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2Fflags%2FMergeFlags.java;h=c8babc497adb4d643256ca3d119d7cd3d28e1701;hb=b055bfb36cca301ceed0591028d245e152c8c32d;hp=5f26760b09b801f75e44bc7438e5af73a2052c8a;hpb=969bd23cab98a79ca9101af33334000879fb60c5;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/flags/MergeFlags.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/flags/MergeFlags.java
index 5f26760b0..c8babc497 100644
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/flags/MergeFlags.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/flags/MergeFlags.java
@@ -1,382 +1,382 @@
-/*******************************************************************************
- * Copyright (c) 2012 Association for Decentralized Information Management in
- * Industry THTH ry.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     VTT Technical Research Centre of Finland - initial API and implementation
- *******************************************************************************/
-package org.simantics.modeling.flags;
-
-import gnu.trove.map.hash.THashMap;
-import gnu.trove.set.hash.THashSet;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.simantics.db.ReadGraph;
-import org.simantics.db.Resource;
-import org.simantics.db.Statement;
-import org.simantics.db.WriteGraph;
-import org.simantics.db.common.request.IndexRoot;
-import org.simantics.db.common.utils.NameUtils;
-import org.simantics.db.common.utils.OrderedSetUtils;
-import org.simantics.db.exception.DatabaseException;
-import org.simantics.diagram.content.ConnectionUtil;
-import org.simantics.diagram.stubs.DiagramResource;
-import org.simantics.layer0.Layer0;
-import org.simantics.modeling.ModelingResources;
-import org.simantics.scl.commands.Commands;
-import org.simantics.scl.runtime.tuple.Tuple2;
-import org.simantics.structural.stubs.StructuralResource2;
-
-public class MergeFlags {
-
-    private static class CP {
-        public final Resource component;
-        public final Resource connectionPoint;
-        
-        public CP(Resource component, Resource connectionPoint) {
-            super();
-            this.component = component;
-            this.connectionPoint = connectionPoint;
-        }
-
-        @Override
-        public int hashCode() {
-            return component.hashCode() + 31 * connectionPoint.hashCode();
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj)
-                return true;
-            if (obj == null)
-                return false;
-            if (getClass() != obj.getClass())
-                return false;
-            CP other = (CP) obj;
-            return component.equals(other.component) 
-                    && connectionPoint.equals(other.connectionPoint);
-        }
-    }
-    
-    public static String validateForMerge(ReadGraph g,
-            List<Resource> flags) throws DatabaseException {
-        if(flags.size() <= 1)
-            return "At least two flags must be chosen.";
-        
-        DiagramResource DIA = DiagramResource.getInstance(g);
-        StructuralResource2 STR = StructuralResource2.getInstance(g);
-        
-        for(Resource flag : flags)
-            if(!g.hasStatement(flag, DIA.FlagIsJoinedBy))
-                return "All flags are not joined to other flags.";
-
-        List<Resource> connectors = getPossibleRelated(g, flags, DIA.Flag_ConnectionPoint);
-        for(Resource connector : connectors) {
-            if(connector == null)
-                return "All flags are not connected";
-        }
-        
-        List<Resource> connections = getConnection(g, flags, connectors);
-        for(Resource connection : connections) {
-            if(connection == null)
-                return "Invalid flag. Didn't find configuration connection.";
-        }
-        
-        THashSet<Resource> uniqueConnections = new THashSet<Resource>(connections.size());
-        for(Resource connection : connections) {
-            uniqueConnections.add(connection);
-        }
-        
-        if(uniqueConnections.size() == 1)
-            return null;
-                
-        Iterator<Resource> it = uniqueConnections.iterator();
-        THashSet<CP> cps = getConnectionPoints(g, STR, it.next());
-        while(it.hasNext()) {
-            cps.retainAll(getConnectionPoints(g, STR, it.next()));
-            if(cps.isEmpty())
-                return "Flags are not connected to a common terminal.";
-        }
-        
-        return null;
-    }
-    
-    private static THashSet<CP> getConnectionPoints(ReadGraph g, StructuralResource2 STR, Resource connection) throws DatabaseException {
-        THashSet<CP> result = new THashSet<CP>(); 
-        for(Statement stat : g.getStatements(connection, STR.Connects))
-            result.add(new CP(stat.getObject(), g.getInverse(stat.getPredicate())));
-        return result;
-    }
-    
-    /**
-     * Merges all flags in the given list to one or two flags.
-     * @param g
-     * @param flags to join
-     * @return Error message or empty string if the operation succeeded.
-     */
-    public static String merge(WriteGraph g, List<Resource> flags) throws DatabaseException {
-        return (String)Commands.get(g, "Simantics/Flag/mergeFlags").execute(g, g.syncRequest(new IndexRoot(flags.get(0))), flags);
-    }
-    
-    public static String mergeWithoutMetadata(WriteGraph g, List<Resource> flags) throws DatabaseException {
-        THashMap<Tuple2, ArrayList<Resource>> groups = 
-                new THashMap<Tuple2, ArrayList<Resource>>();
-        
-        DiagramResource DIA = DiagramResource.getInstance(g);
-        StructuralResource2 STR = StructuralResource2.getInstance(g);
-        for(Resource flag : flags) {
-            Resource connector = g.getSingleObject(flag, DIA.Flag_ConnectionPoint);
-            Resource connection = null;
-            for(Resource temp : g.getObjects(connector, STR.Connects))
-                if(!temp.equals(flag)) {
-                    connection = temp;
-                    break;
-                }
-            if(connection == null)
-                continue;
-            
-            Resource flagType = g.getSingleObject(flag, DIA.HasFlagType);
-            Resource connectionType = g.getPossibleObject(connection, STR.HasConnectionType);
-            
-            Tuple2 tuple = new Tuple2(flagType, connectionType);
-            ArrayList<Resource> group = groups.get(tuple);
-            if(group == null) {
-                group = new ArrayList<Resource>();
-                groups.put(tuple, group);
-            }
-            group.add(flag);
-        }
-    
-        String errorMessage = "";
-        for(ArrayList<Resource> group : groups.values()) {
-            if(group.size() > 1) {
-                String temp = mergeAux(g, group);
-                if(temp != null)
-                    errorMessage = temp;
-            }
-        }
-        return errorMessage;
-    }
-    
-    /**
-     * Merges all flags in the given list to the first flag of the list.
-     * @param g
-     * @param flags to join
-     * @return Error message or null if the operation succeeded.
-     */
-    private static String mergeAux(WriteGraph g, List<Resource> flags) throws DatabaseException {
-        if(flags.size() <= 1)
-            return null; // Nothing to do
-        
-        DiagramResource DIA = DiagramResource.getInstance(g);
-        StructuralResource2 STR = StructuralResource2.getInstance(g);
-        
-        // Find connectors
-        List<Resource> connectors = getPossibleRelated(g, flags, DIA.Flag_ConnectionPoint);
-        for(Resource connector : connectors) {
-            if(connector == null)
-                return "All flags are not connected";
-        }        
-        
-        // Find configuration connections
-        List<Resource> connections = getConnection(g, flags, connectors);
-        for(Resource connection : connections) {
-            if(connection == null)
-                return "Invalid flag. Didn't find configuration connection.";
-        }
-        
-        // Choose canonical flag and connection where other flags are merged to
-        Resource canonicalFlag = flags.get(0);
-        Resource canonicalConnection = connections.get(0);
-        
-        // Do the merging
-        for(int i=1;i<flags.size();++i) {
-            Resource flag = flags.get(i);
-            Resource connection = connections.get(i);
-            
-            // Replace references in joins to the canonical flag and connection
-            for(Resource join : g.getObjects(flag, DIA.FlagIsJoinedBy)) {
-                g.denyStatement(flag, DIA.FlagIsJoinedBy, join);
-                g.claim(canonicalFlag, DIA.FlagIsJoinedBy, join);
-                g.denyStatement(join, STR.Joins, connection);
-                g.claim(join, STR.Joins, canonicalConnection);
-            }
-            
-            // Remove flag and its connector
-            removeElement(g, flag);
-            g.deny(connectors.get(i));
-        }
-        
-        // Clean up connections (remove extra route lines and complete connections)
-        THashSet<Resource> uniqueConnections = new THashSet<Resource>(connections.size());
-        for(int i=1;i<connections.size();++i)
-            uniqueConnections.add(connections.get(i));
-        
-        for(Resource connection : uniqueConnections)
-            cleanUpConnection(g, connection);
-        
-        return null;
-    }
-
-    private static void cleanUpConnection(WriteGraph g, Resource connection) throws DatabaseException {
-        DiagramResource DIA = DiagramResource.getInstance(g);
-        StructuralResource2 STR = StructuralResource2.getInstance(g);
-        ModelingResources MOD = ModelingResources.getInstance(g);
-        
-        Resource diagramConnection = g.getSingleObject(connection, MOD.ConnectionToDiagramConnection);
-        
-        // If connection is degenerated, remove it
-        if(g.getObjects(connection, STR.IsJoinedBy).size() == 0 &&  
-                g.getObjects(connection, STR.Connects).size() <= 1) {
-            g.deny(connection);
-            // Garbage collection removes interior route nodes etc. stuff
-            //removeElement(g, diagramConnection);
-            // platform #4473: Remove connection completely to not leave behind stray connectors.
-            new ConnectionUtil(g).removeConnection(diagramConnection);
-        }
-        // Otherwise just remove degenerated route nodes
-        else {
-            boolean modifiedSomething = true;
-            while(modifiedSomething) { // loop until no modification are made (O(n^2) algorithm)
-                modifiedSomething = false;
-                for(Resource routeNode : g.getObjects(diagramConnection, DIA.HasInteriorRouteNode))
-                    if(g.getObjects(routeNode, DIA.AreConnected).size() <= 1) {
-                        g.deny(routeNode);
-                        modifiedSomething = true;
-                    }
-            }
-        }
-    }
-    
-    private static void removeElement(WriteGraph g, Resource element) throws DatabaseException {
-        OrderedSetUtils.remove(g, OrderedSetUtils.getSingleOwnerList(g, element), element);
-        g.deny(element);
-    }
-
-    private static List<Resource> getConnection(ReadGraph g, List<Resource> flags, List<Resource> connectors) throws DatabaseException {
-        ArrayList<Resource> result = new ArrayList<Resource>(flags.size());
-        for(int i=0;i<flags.size();++i)
-            result.add(getConnection(g, flags.get(i), connectors.get(i)));
-        return result;
-    }
-    
-    private static Resource getConnection(ReadGraph g, Resource flag, Resource connector) throws DatabaseException {
-        StructuralResource2 STR = StructuralResource2.getInstance(g);
-        ModelingResources MOD = ModelingResources.getInstance(g);
-        for(Resource diagramConnection : g.getObjects(connector, STR.Connects)) {
-            if(!flag.equals(diagramConnection)) {
-                return g.getPossibleObject(diagramConnection, MOD.DiagramConnectionToConnection);
-            }
-        }
-        return null;
-    }
-    
-    private static List<Resource> getPossibleRelated(ReadGraph g, List<Resource> subjects, Resource relation) throws DatabaseException {
-        ArrayList<Resource> result = new ArrayList<Resource>(subjects.size());
-        for(int i=0;i<subjects.size();++i)
-            result.add(g.getPossibleObject(subjects.get(i), relation));
-        return result;
-    }
-
-	public static void expandFlagSet(ReadGraph graph, List<Resource> flags) throws DatabaseException {
-		DiagramResource DIA = DiagramResource.getInstance(graph);
-		StructuralResource2 STR = StructuralResource2.getInstance(graph);
-				
-		THashSet<Resource> connectionSet = new THashSet<Resource>();
-		
-		for(Resource flag : flags) {
-			for(Resource connector : graph.getObjects(flag, STR.IsConnectedTo))
-				for(Resource connection : graph.getObjects(connector, STR.Connects))
-					if(!connection.equals(flag))
-						connectionSet.add(connection);
-		}
-		
-		for(Resource connection : connectionSet.toArray(new Resource[connectionSet.size()])) {
-			for(Resource connector : graph.getObjects(connection, STR.IsConnectedTo))
-				for(Statement stat : graph.getStatements(connector, STR.Connects))
-					if(!stat.getObject().equals(connection))
-						for(Resource connector2 : graph.getObjects(stat.getObject(), graph.getInverse(stat.getPredicate())))
-							if(!connector2.equals(connector))
-								for(Resource connection2 : graph.getObjects(connector2, STR.Connects))
-									if(graph.isInstanceOf(connection2, DIA.Connection))
-										connectionSet.add(connection2);
-		}
-		
-		THashSet<Resource> visited = new THashSet<Resource>(flags);
-						
-		for(Resource connection : connectionSet) {
-			visited.add(connection);
-			for(Resource connector : graph.getObjects(connection, STR.IsConnectedTo))
-				for(Resource flag : graph.getObjects(connector, STR.Connects))
-					if(visited.add(flag) && graph.isInstanceOf(flag, DIA.Flag)
-					        && graph.hasStatement(flag, DIA.FlagIsJoinedBy))
-						flags.add(flag);
-		}					
-	}   
-	
-	public static void collectFlagGroupsInComposite(ReadGraph g, Resource composite, ArrayList<ArrayList<Resource>> groups) throws DatabaseException {
-	    DiagramResource DIA = DiagramResource.getInstance(g);
-        ModelingResources MOD = ModelingResources.getInstance(g);
-        Layer0 L0 = Layer0.getInstance(g);
-        
-        Resource diagram = g.getPossibleObject(composite, MOD.CompositeToDiagram);
-        if(diagram == null)
-            return;
-        
-        THashSet<Resource> flags = new THashSet<Resource>();
-        for(Resource element : g.getObjects(diagram, L0.ConsistsOf))
-            if(g.isInstanceOf(element, DIA.Flag) && g.hasStatement(element, DIA.FlagIsJoinedBy))
-                flags.add(element);
-        
-        for(Resource flag : flags.toArray(new Resource[flags.size()])) 
-            if(flags.contains(flag)) {
-                ArrayList<Resource> group = new ArrayList<Resource>();
-                group.add(flag);
-                expandFlagSet(g, group);
-                flags.removeAll(group);
-                if(group.size() > 1)
-                    groups.add(group);
-            }
-	}
-	
-	public static void expandCompositeSet(ReadGraph g, THashSet<Resource> composites) throws DatabaseException {
-	    for(Resource composite : composites.toArray(new Resource[composites.size()]))
-	        expandCompositeSet(g, composite, composites);
-	}
-
-    private static void expandCompositeSet(ReadGraph g, Resource composite,
-            THashSet<Resource> composites) throws DatabaseException {
-        Layer0 L0 = Layer0.getInstance(g);
-        StructuralResource2 STR = StructuralResource2.getInstance(g);
-        for(Resource child : g.getObjects(composite, L0.ConsistsOf))
-            if(g.isInstanceOf(child, STR.Composite))
-                if(composites.add(child))
-                    expandCompositeSet(g, child, composites);
-    }
-    
-    public static String mergeFlags (WriteGraph graph, Resource diagram ) throws DatabaseException {
-    	
-    	ArrayList<ArrayList<Resource>> groups = new ArrayList<ArrayList<Resource>>();
-    	MergeFlags.collectFlagGroupsInComposite(graph, diagram, groups);
-        for(ArrayList<Resource> group : groups) {
-        	MergeFlags.merge(graph, group);
-        }
-
-		return "Merged flags in diagram resource: " + diagram.toString() + " and name: " + NameUtils.getSafeName(graph, diagram);
-    }
-    
-    public static void expandFlags(WriteGraph graph, Resource diagram) throws DatabaseException {
-    	ArrayList<Resource> groups = new ArrayList<Resource>();
-    	ExpandFlags.collectGroupedFlags(graph, diagram, groups);
-    	for(Resource group : groups) {
-    		ExpandFlags.expandFlag(graph, group);
-    	}
-    }    
-}
+/*******************************************************************************
+ * Copyright (c) 2012 Association for Decentralized Information Management in
+ * Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.modeling.flags;
+
+import gnu.trove.map.hash.THashMap;
+import gnu.trove.set.hash.THashSet;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.Statement;
+import org.simantics.db.WriteGraph;
+import org.simantics.db.common.request.IndexRoot;
+import org.simantics.db.common.utils.NameUtils;
+import org.simantics.db.common.utils.OrderedSetUtils;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.diagram.content.ConnectionUtil;
+import org.simantics.diagram.stubs.DiagramResource;
+import org.simantics.layer0.Layer0;
+import org.simantics.modeling.ModelingResources;
+import org.simantics.scl.commands.Commands;
+import org.simantics.scl.runtime.tuple.Tuple2;
+import org.simantics.structural.stubs.StructuralResource2;
+
+public class MergeFlags {
+
+    private static class CP {
+        public final Resource component;
+        public final Resource connectionPoint;
+        
+        public CP(Resource component, Resource connectionPoint) {
+            super();
+            this.component = component;
+            this.connectionPoint = connectionPoint;
+        }
+
+        @Override
+        public int hashCode() {
+            return component.hashCode() + 31 * connectionPoint.hashCode();
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj)
+                return true;
+            if (obj == null)
+                return false;
+            if (getClass() != obj.getClass())
+                return false;
+            CP other = (CP) obj;
+            return component.equals(other.component) 
+                    && connectionPoint.equals(other.connectionPoint);
+        }
+    }
+    
+    public static String validateForMerge(ReadGraph g,
+            List<Resource> flags) throws DatabaseException {
+        if(flags.size() <= 1)
+            return "At least two flags must be chosen.";
+        
+        DiagramResource DIA = DiagramResource.getInstance(g);
+        StructuralResource2 STR = StructuralResource2.getInstance(g);
+        
+        for(Resource flag : flags)
+            if(!g.hasStatement(flag, DIA.FlagIsJoinedBy))
+                return "All flags are not joined to other flags.";
+
+        List<Resource> connectors = getPossibleRelated(g, flags, DIA.Flag_ConnectionPoint);
+        for(Resource connector : connectors) {
+            if(connector == null)
+                return "All flags are not connected";
+        }
+        
+        List<Resource> connections = getConnection(g, flags, connectors);
+        for(Resource connection : connections) {
+            if(connection == null)
+                return "Invalid flag. Didn't find configuration connection.";
+        }
+        
+        THashSet<Resource> uniqueConnections = new THashSet<Resource>(connections.size());
+        for(Resource connection : connections) {
+            uniqueConnections.add(connection);
+        }
+        
+        if(uniqueConnections.size() == 1)
+            return null;
+                
+        Iterator<Resource> it = uniqueConnections.iterator();
+        THashSet<CP> cps = getConnectionPoints(g, STR, it.next());
+        while(it.hasNext()) {
+            cps.retainAll(getConnectionPoints(g, STR, it.next()));
+            if(cps.isEmpty())
+                return "Flags are not connected to a common terminal.";
+        }
+        
+        return null;
+    }
+    
+    private static THashSet<CP> getConnectionPoints(ReadGraph g, StructuralResource2 STR, Resource connection) throws DatabaseException {
+        THashSet<CP> result = new THashSet<CP>(); 
+        for(Statement stat : g.getStatements(connection, STR.Connects))
+            result.add(new CP(stat.getObject(), g.getInverse(stat.getPredicate())));
+        return result;
+    }
+    
+    /**
+     * Merges all flags in the given list to one or two flags.
+     * @param g
+     * @param flags to join
+     * @return Error message or empty string if the operation succeeded.
+     */
+    public static String merge(WriteGraph g, List<Resource> flags) throws DatabaseException {
+        return (String)Commands.get(g, "Simantics/Flag/mergeFlags").execute(g, g.syncRequest(new IndexRoot(flags.get(0))), flags);
+    }
+    
+    public static String mergeWithoutMetadata(WriteGraph g, List<Resource> flags) throws DatabaseException {
+        THashMap<Tuple2, ArrayList<Resource>> groups = 
+                new THashMap<Tuple2, ArrayList<Resource>>();
+        
+        DiagramResource DIA = DiagramResource.getInstance(g);
+        StructuralResource2 STR = StructuralResource2.getInstance(g);
+        for(Resource flag : flags) {
+            Resource connector = g.getSingleObject(flag, DIA.Flag_ConnectionPoint);
+            Resource connection = null;
+            for(Resource temp : g.getObjects(connector, STR.Connects))
+                if(!temp.equals(flag)) {
+                    connection = temp;
+                    break;
+                }
+            if(connection == null)
+                continue;
+            
+            Resource flagType = g.getSingleObject(flag, DIA.HasFlagType);
+            Resource connectionType = g.getPossibleObject(connection, STR.HasConnectionType);
+            
+            Tuple2 tuple = new Tuple2(flagType, connectionType);
+            ArrayList<Resource> group = groups.get(tuple);
+            if(group == null) {
+                group = new ArrayList<Resource>();
+                groups.put(tuple, group);
+            }
+            group.add(flag);
+        }
+    
+        String errorMessage = "";
+        for(ArrayList<Resource> group : groups.values()) {
+            if(group.size() > 1) {
+                String temp = mergeAux(g, group);
+                if(temp != null)
+                    errorMessage = temp;
+            }
+        }
+        return errorMessage;
+    }
+    
+    /**
+     * Merges all flags in the given list to the first flag of the list.
+     * @param g
+     * @param flags to join
+     * @return Error message or null if the operation succeeded.
+     */
+    private static String mergeAux(WriteGraph g, List<Resource> flags) throws DatabaseException {
+        if(flags.size() <= 1)
+            return null; // Nothing to do
+        
+        DiagramResource DIA = DiagramResource.getInstance(g);
+        StructuralResource2 STR = StructuralResource2.getInstance(g);
+        
+        // Find connectors
+        List<Resource> connectors = getPossibleRelated(g, flags, DIA.Flag_ConnectionPoint);
+        for(Resource connector : connectors) {
+            if(connector == null)
+                return "All flags are not connected";
+        }        
+        
+        // Find configuration connections
+        List<Resource> connections = getConnection(g, flags, connectors);
+        for(Resource connection : connections) {
+            if(connection == null)
+                return "Invalid flag. Didn't find configuration connection.";
+        }
+        
+        // Choose canonical flag and connection where other flags are merged to
+        Resource canonicalFlag = flags.get(0);
+        Resource canonicalConnection = connections.get(0);
+        
+        // Do the merging
+        for(int i=1;i<flags.size();++i) {
+            Resource flag = flags.get(i);
+            Resource connection = connections.get(i);
+            
+            // Replace references in joins to the canonical flag and connection
+            for(Resource join : g.getObjects(flag, DIA.FlagIsJoinedBy)) {
+                g.denyStatement(flag, DIA.FlagIsJoinedBy, join);
+                g.claim(canonicalFlag, DIA.FlagIsJoinedBy, join);
+                g.denyStatement(join, STR.Joins, connection);
+                g.claim(join, STR.Joins, canonicalConnection);
+            }
+            
+            // Remove flag and its connector
+            removeElement(g, flag);
+            g.deny(connectors.get(i));
+        }
+        
+        // Clean up connections (remove extra route lines and complete connections)
+        THashSet<Resource> uniqueConnections = new THashSet<Resource>(connections.size());
+        for(int i=1;i<connections.size();++i)
+            uniqueConnections.add(connections.get(i));
+        
+        for(Resource connection : uniqueConnections)
+            cleanUpConnection(g, connection);
+        
+        return null;
+    }
+
+    private static void cleanUpConnection(WriteGraph g, Resource connection) throws DatabaseException {
+        DiagramResource DIA = DiagramResource.getInstance(g);
+        StructuralResource2 STR = StructuralResource2.getInstance(g);
+        ModelingResources MOD = ModelingResources.getInstance(g);
+        
+        Resource diagramConnection = g.getSingleObject(connection, MOD.ConnectionToDiagramConnection);
+        
+        // If connection is degenerated, remove it
+        if(g.getObjects(connection, STR.IsJoinedBy).size() == 0 &&  
+                g.getObjects(connection, STR.Connects).size() <= 1) {
+            g.deny(connection);
+            // Garbage collection removes interior route nodes etc. stuff
+            //removeElement(g, diagramConnection);
+            // platform #4473: Remove connection completely to not leave behind stray connectors.
+            new ConnectionUtil(g).removeConnection(diagramConnection);
+        }
+        // Otherwise just remove degenerated route nodes
+        else {
+            boolean modifiedSomething = true;
+            while(modifiedSomething) { // loop until no modification are made (O(n^2) algorithm)
+                modifiedSomething = false;
+                for(Resource routeNode : g.getObjects(diagramConnection, DIA.HasInteriorRouteNode))
+                    if(g.getObjects(routeNode, DIA.AreConnected).size() <= 1) {
+                        g.deny(routeNode);
+                        modifiedSomething = true;
+                    }
+            }
+        }
+    }
+    
+    private static void removeElement(WriteGraph g, Resource element) throws DatabaseException {
+        OrderedSetUtils.remove(g, OrderedSetUtils.getSingleOwnerList(g, element), element);
+        g.deny(element);
+    }
+
+    private static List<Resource> getConnection(ReadGraph g, List<Resource> flags, List<Resource> connectors) throws DatabaseException {
+        ArrayList<Resource> result = new ArrayList<Resource>(flags.size());
+        for(int i=0;i<flags.size();++i)
+            result.add(getConnection(g, flags.get(i), connectors.get(i)));
+        return result;
+    }
+    
+    private static Resource getConnection(ReadGraph g, Resource flag, Resource connector) throws DatabaseException {
+        StructuralResource2 STR = StructuralResource2.getInstance(g);
+        ModelingResources MOD = ModelingResources.getInstance(g);
+        for(Resource diagramConnection : g.getObjects(connector, STR.Connects)) {
+            if(!flag.equals(diagramConnection)) {
+                return g.getPossibleObject(diagramConnection, MOD.DiagramConnectionToConnection);
+            }
+        }
+        return null;
+    }
+    
+    private static List<Resource> getPossibleRelated(ReadGraph g, List<Resource> subjects, Resource relation) throws DatabaseException {
+        ArrayList<Resource> result = new ArrayList<Resource>(subjects.size());
+        for(int i=0;i<subjects.size();++i)
+            result.add(g.getPossibleObject(subjects.get(i), relation));
+        return result;
+    }
+
+	public static void expandFlagSet(ReadGraph graph, List<Resource> flags) throws DatabaseException {
+		DiagramResource DIA = DiagramResource.getInstance(graph);
+		StructuralResource2 STR = StructuralResource2.getInstance(graph);
+				
+		THashSet<Resource> connectionSet = new THashSet<Resource>();
+		
+		for(Resource flag : flags) {
+			for(Resource connector : graph.getObjects(flag, STR.IsConnectedTo))
+				for(Resource connection : graph.getObjects(connector, STR.Connects))
+					if(!connection.equals(flag))
+						connectionSet.add(connection);
+		}
+		
+		for(Resource connection : connectionSet.toArray(new Resource[connectionSet.size()])) {
+			for(Resource connector : graph.getObjects(connection, STR.IsConnectedTo))
+				for(Statement stat : graph.getStatements(connector, STR.Connects))
+					if(!stat.getObject().equals(connection))
+						for(Resource connector2 : graph.getObjects(stat.getObject(), graph.getInverse(stat.getPredicate())))
+							if(!connector2.equals(connector))
+								for(Resource connection2 : graph.getObjects(connector2, STR.Connects))
+									if(graph.isInstanceOf(connection2, DIA.Connection))
+										connectionSet.add(connection2);
+		}
+		
+		THashSet<Resource> visited = new THashSet<Resource>(flags);
+						
+		for(Resource connection : connectionSet) {
+			visited.add(connection);
+			for(Resource connector : graph.getObjects(connection, STR.IsConnectedTo))
+				for(Resource flag : graph.getObjects(connector, STR.Connects))
+					if(visited.add(flag) && graph.isInstanceOf(flag, DIA.Flag)
+					        && graph.hasStatement(flag, DIA.FlagIsJoinedBy))
+						flags.add(flag);
+		}					
+	}   
+	
+	public static void collectFlagGroupsInComposite(ReadGraph g, Resource composite, ArrayList<ArrayList<Resource>> groups) throws DatabaseException {
+	    DiagramResource DIA = DiagramResource.getInstance(g);
+        ModelingResources MOD = ModelingResources.getInstance(g);
+        Layer0 L0 = Layer0.getInstance(g);
+        
+        Resource diagram = g.getPossibleObject(composite, MOD.CompositeToDiagram);
+        if(diagram == null)
+            return;
+        
+        THashSet<Resource> flags = new THashSet<Resource>();
+        for(Resource element : g.getObjects(diagram, L0.ConsistsOf))
+            if(g.isInstanceOf(element, DIA.Flag) && g.hasStatement(element, DIA.FlagIsJoinedBy))
+                flags.add(element);
+        
+        for(Resource flag : flags.toArray(new Resource[flags.size()])) 
+            if(flags.contains(flag)) {
+                ArrayList<Resource> group = new ArrayList<Resource>();
+                group.add(flag);
+                expandFlagSet(g, group);
+                flags.removeAll(group);
+                if(group.size() > 1)
+                    groups.add(group);
+            }
+	}
+	
+	public static void expandCompositeSet(ReadGraph g, THashSet<Resource> composites) throws DatabaseException {
+	    for(Resource composite : composites.toArray(new Resource[composites.size()]))
+	        expandCompositeSet(g, composite, composites);
+	}
+
+    private static void expandCompositeSet(ReadGraph g, Resource composite,
+            THashSet<Resource> composites) throws DatabaseException {
+        Layer0 L0 = Layer0.getInstance(g);
+        StructuralResource2 STR = StructuralResource2.getInstance(g);
+        for(Resource child : g.getObjects(composite, L0.ConsistsOf))
+            if(g.isInstanceOf(child, STR.Composite))
+                if(composites.add(child))
+                    expandCompositeSet(g, child, composites);
+    }
+    
+    public static String mergeFlags (WriteGraph graph, Resource diagram ) throws DatabaseException {
+    	
+    	ArrayList<ArrayList<Resource>> groups = new ArrayList<ArrayList<Resource>>();
+    	MergeFlags.collectFlagGroupsInComposite(graph, diagram, groups);
+        for(ArrayList<Resource> group : groups) {
+        	MergeFlags.merge(graph, group);
+        }
+
+		return "Merged flags in diagram resource: " + diagram.toString() + " and name: " + NameUtils.getSafeName(graph, diagram);
+    }
+    
+    public static void expandFlags(WriteGraph graph, Resource diagram) throws DatabaseException {
+    	ArrayList<Resource> groups = new ArrayList<Resource>();
+    	ExpandFlags.collectGroupedFlags(graph, diagram, groups);
+    	for(Resource group : groups) {
+    		ExpandFlags.expandFlag(graph, group);
+    	}
+    }    
+}