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

diff --git a/bundles/org.simantics.modeling/src/org/simantics/modeling/flags/ExpandFlags.java b/bundles/org.simantics.modeling/src/org/simantics/modeling/flags/ExpandFlags.java
index b5279641d..fb2522a31 100644
--- a/bundles/org.simantics.modeling/src/org/simantics/modeling/flags/ExpandFlags.java
+++ b/bundles/org.simantics.modeling/src/org/simantics/modeling/flags/ExpandFlags.java
@@ -1,246 +1,246 @@
-/*******************************************************************************
- * 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 java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-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.OrderedSetUtils;
-import org.simantics.db.exception.DatabaseException;
-import org.simantics.diagram.stubs.DiagramResource;
-import org.simantics.diagram.stubs.G2DResource;
-import org.simantics.diagram.synchronization.graph.AddElement;
-import org.simantics.diagram.synchronization.graph.CopyAdvisorUtil;
-import org.simantics.g2d.elementclass.FlagClass;
-import org.simantics.layer0.Layer0;
-import org.simantics.modeling.ModelingResources;
-import org.simantics.scl.commands.Commands;
-import org.simantics.structural.stubs.StructuralResource2;
-
-/**
- * @author Hannu Niemistö
- */
-public class ExpandFlags {
-    
-    static class Connector {
-        Resource element;
-        Resource terminal;
-        
-        public Connector(Resource element, Resource terminal) {        
-            this.element = element;
-            this.terminal = terminal;
-        }
-    }
-    
-    private static ArrayList<Connector> getConnectors(ReadGraph g, Resource connection) throws DatabaseException {
-        StructuralResource2 STR = StructuralResource2.getInstance(g);
-        
-        ArrayList<Connector> result = new ArrayList<Connector>();
-        for(Resource connector : g.getObjects(connection, STR.IsConnectedTo)) {
-            for(Statement stat : g.getStatements(connector, STR.Connects)) 
-                if(!connection.equals(stat.getObject())) {
-                    result.add(new Connector(stat.getObject(), g.getInverse(stat.getPredicate())));
-                }
-        }
-        return result;
-    }
-
-    public static Resource[] expandFlag(WriteGraph graph, Resource flag) throws DatabaseException {
-        return (Resource[])Commands.get(graph, "Simantics/Flag/expandFlag")
-                .execute(graph, graph.syncRequest(new IndexRoot(flag)), flag);
-    }
-    
-    /**
-     * @param graph
-     * @param flag
-     * @return the flags that result from the expansion operation
-     * @throws DatabaseException
-     */
-	public static Resource[] expandFlagWithoutMetadata(WriteGraph graph, Resource flag) throws DatabaseException {
-		DiagramResource DIA = DiagramResource.getInstance(graph);
-		G2DResource G2D = G2DResource.getInstance(graph);
-		StructuralResource2 STR = StructuralResource2.getInstance(graph);
-		Layer0 L0 = Layer0.getInstance(graph);
-        ModelingResources MOD = ModelingResources.getInstance(graph);
-        
-		// Find joins and check if this is multiflag
-		Collection<Resource> joins_ = graph.getObjects(flag, DIA.FlagIsJoinedBy);
-		if(joins_.size() <= 1)
-			return Resource.NONE; // Nothing to do
-				
-		// Analyze expanded flag
-		Resource diagram = OrderedSetUtils.getSubjects(graph, flag).iterator().next();
-		Resource flagType = graph.getSingleObject(flag, DIA.HasFlagType);
-		double[] transform = graph.getRelatedValue(flag, DIA.HasTransform);
-		Resource connector = graph.getSingleObject(flag, DIA.Flag_ConnectionPoint);
-		Statement connectsStatement = null;
-		for(Statement temp : graph.getStatements(connector, STR.Connects))
-		    if(!flag.equals(temp.getObject())) {
-		        connectsStatement = temp;
-		        break;
-		    }
-
-        if(connectsStatement == null)
-            return Resource.NONE;
-		Resource arrowType = connectsStatement.getPredicate();
-		Resource diagramConnection = connectsStatement.getObject();
-		Resource connection = graph.getSingleObject(diagramConnection, MOD.DiagramConnectionToConnection);
-		
-        ArrayList<Connector> connectors = getConnectors(graph, diagramConnection);
-        if(connectors.size()==2) {
-            Iterator<Connector> it = connectors.iterator();
-            while(it.hasNext()) {
-                if(it.next().element.equals(flag))
-                    it.remove();
-            }
-        }
-        Resource diagramRelation = connectors.size()!=1 ? null : 
-            connectors.get(0).terminal;
-        Resource connectionPoint = diagramRelation == null ? null :
-            graph.getPossibleObject(diagramRelation, MOD.DiagramConnectionRelationToConnectionRelation); 
-        Resource element=connectors.size()==1 ? connectors.get(0).element : null, 
-                component=null, connectionType=null;
-        Resource routeLine = null;
-        if(connectionPoint != null && 
-                !graph.isInstanceOf(connectionPoint, L0.FunctionalRelation)) {
-            component = graph.getSingleObject(element, MOD.ElementToComponent);
-            connectionType = graph.getSingleObject(diagramConnection, STR.HasConnectionType);
-        }
-        else if(element != null && graph.isInstanceOf(element, MOD.ReferenceElement)) {
-            component = graph.getSingleObject(element, MOD.HasParentComponent);
-            connectionPoint = graph.getSingleObject(element, MOD.HasReferenceRelation);
-            connectionType = graph.getSingleObject(diagramConnection, STR.HasConnectionType);
-        }
-        else {
-            routeLine = graph.getSingleObject(connector, DIA.AreConnected);       
-
-            if(!graph.isInstanceOf(routeLine, DIA.RouteLine)) {
-                Resource otherConnector = routeLine;
-                routeLine = graph.newResource();
-                graph.deny(connector, DIA.AreConnected, otherConnector);
-                graph.claim(routeLine, L0.InstanceOf, DIA.RouteLine);
-                graph.claim(diagramConnection, DIA.HasInteriorRouteNode, routeLine);
-                graph.claimLiteral(routeLine, DIA.HasPosition, transform[4]-FlagClass.DEFAULT_WIDTH*0.5);
-                graph.claimLiteral(routeLine, DIA.IsHorizontal, false);
-                graph.claim(routeLine, DIA.AreConnected, connector);
-                graph.claim(routeLine, DIA.AreConnected, otherConnector);
-            }	
-        }
-
-		Resource[] joins = joins_.toArray(new Resource[joins_.size()]);
-		Resource[] flags = new Resource[joins.length];
-
-		final double flagSeparation = FlagClass.DEFAULT_HEIGHT;
-
-		flags[0] = flag;
-		for(int i=1;i<flags.length;++i) {
-			Resource newFlag = graph.newResource();
-			flags[i] = newFlag;
-			graph.claim(newFlag, L0.InstanceOf, DIA.Flag);
-			graph.claim(newFlag, DIA.HasFlagType, flagType);
-			OrderedSetUtils.add(graph, diagram, newFlag);
-			graph.claim(diagram, L0.ConsistsOf, newFlag);
-			graph.deny(flag, DIA.FlagIsJoinedBy, joins[i]);
-			for(Resource otherFlag : graph.getObjects(joins[i], DIA.JoinsFlag)) {
-				for(Statement label : graph.getStatements(otherFlag, L0.HasLabel)) {
-					if (!label.isAsserted(otherFlag)) {
-						Resource literalCopy = CopyAdvisorUtil.copy(graph, label.getObject(), null);
-						graph.claim(newFlag, label.getPredicate(), literalCopy);
-					}
-				}
-			}
-			graph.claim(newFlag, DIA.FlagIsJoinedBy, joins[i]);
-
-			// URI: Make new flag a part of the diagram and give it a fresh name
-			graph.claim(diagram, L0.ConsistsOf, newFlag);
-			AddElement.claimFreshElementName(graph, diagram, newFlag);
-
-			double[] newTransform = new double[] {
-				transform[0], transform[1], transform[2], transform[3],	
-				transform[4] + i*flagSeparation*transform[2], 
-				transform[5] + i*flagSeparation*transform[3]
-			};
-			graph.claimLiteral(newFlag, DIA.HasTransform, G2D.Transform, newTransform);
-
-			// TODO: Handle branching and non-branching connections differently
-			
-			if(routeLine == null) {
-			    Resource newConnector1 = graph.newResource();
-			    Resource newDiagramConnection = graph.newResource();
-			    Resource newConnector2 = graph.newResource();
-			    Resource newConnection = graph.newResource();
-			    
-			    graph.claim(newConnector1, L0.InstanceOf, DIA.Connector);
-			    graph.claim(newDiagramConnection, L0.InstanceOf, DIA.RouteGraphConnection);
-			    graph.claim(newDiagramConnection, STR.HasConnectionType, connectionType);
-			    graph.claim(newConnector2, L0.InstanceOf, DIA.Connector);
-			    graph.claim(newConnection, L0.InstanceOf, STR.Connection);
-			    
-			    Resource arrow = graph.getInverse(arrowType);
-			    Resource otherArrow = arrow.equals(DIA.HasPlainConnector) ?
-			        DIA.HasArrowConnector : DIA.HasPlainConnector;
-			    
-			    graph.claim(element, diagramRelation, newConnector1);
-			    graph.claim(newDiagramConnection, otherArrow, newConnector1);
-			    graph.claim(newDiagramConnection, arrow, newConnector2);
-			    graph.claim(newConnector1, DIA.AreConnected, newConnector2);
-			    graph.claim(newFlag, DIA.Flag_ConnectionPoint, newConnector2);
-			    
-			    graph.claim(component, connectionPoint, newConnection);
-			    graph.deny(joins[i], STR.Joins, connection);
-			    graph.claim(joins[i], STR.Joins, newConnection);
-			    
-			    graph.claim(newDiagramConnection, MOD.DiagramConnectionToConnection, newConnection);
-			    graph.claim(newConnection, MOD.Mapped, newConnection);
-			    
-			    AddElement.claimFreshElementName(graph, diagram, newDiagramConnection);
-			    
-			    OrderedSetUtils.addFirst(graph, diagram, newDiagramConnection);
-			    graph.claim(diagram, L0.ConsistsOf, newDiagramConnection);
-			}
-			else {
-			    Resource newConnector = graph.newResource();
-	            graph.claim(newConnector, L0.InstanceOf, DIA.Connector);
-	            graph.claim(newFlag, DIA.Flag_ConnectionPoint, newConnector);
-			    graph.claim(newConnector, arrowType, diagramConnection);
-			    graph.claim(newConnector, DIA.AreConnected, routeLine);
-			}
-		}
-
-		return flags;
-	}
-	
-	public static void collectGroupedFlags(ReadGraph graph, Resource composite, ArrayList<Resource> groups) throws DatabaseException {
-	    DiagramResource DIA = DiagramResource.getInstance(graph);
-        ModelingResources MOD = ModelingResources.getInstance(graph);
-        Layer0 L0 = Layer0.getInstance(graph);
-        
-        Resource diagram = graph.getPossibleObject(composite, MOD.CompositeToDiagram);
-        if(diagram == null)
-            return;
-        
-        for(Resource element : graph.getObjects(diagram, L0.ConsistsOf))
-            if(graph.isInstanceOf(element, DIA.Flag)) {
-            	Collection<Resource> objects = (Collection<Resource>) graph.getObjects(element, DIA.FlagIsJoinedBy);
-            	if (objects.size() > 1) {
-            		groups.add(element);
-            	}
-            }
-	}
-
-}
+/*******************************************************************************
+ * 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 java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+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.OrderedSetUtils;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.diagram.stubs.DiagramResource;
+import org.simantics.diagram.stubs.G2DResource;
+import org.simantics.diagram.synchronization.graph.AddElement;
+import org.simantics.diagram.synchronization.graph.CopyAdvisorUtil;
+import org.simantics.g2d.elementclass.FlagClass;
+import org.simantics.layer0.Layer0;
+import org.simantics.modeling.ModelingResources;
+import org.simantics.scl.commands.Commands;
+import org.simantics.structural.stubs.StructuralResource2;
+
+/**
+ * @author Hannu Niemist&ouml;
+ */
+public class ExpandFlags {
+    
+    static class Connector {
+        Resource element;
+        Resource terminal;
+        
+        public Connector(Resource element, Resource terminal) {        
+            this.element = element;
+            this.terminal = terminal;
+        }
+    }
+    
+    private static ArrayList<Connector> getConnectors(ReadGraph g, Resource connection) throws DatabaseException {
+        StructuralResource2 STR = StructuralResource2.getInstance(g);
+        
+        ArrayList<Connector> result = new ArrayList<Connector>();
+        for(Resource connector : g.getObjects(connection, STR.IsConnectedTo)) {
+            for(Statement stat : g.getStatements(connector, STR.Connects)) 
+                if(!connection.equals(stat.getObject())) {
+                    result.add(new Connector(stat.getObject(), g.getInverse(stat.getPredicate())));
+                }
+        }
+        return result;
+    }
+
+    public static Resource[] expandFlag(WriteGraph graph, Resource flag) throws DatabaseException {
+        return (Resource[])Commands.get(graph, "Simantics/Flag/expandFlag")
+                .execute(graph, graph.syncRequest(new IndexRoot(flag)), flag);
+    }
+    
+    /**
+     * @param graph
+     * @param flag
+     * @return the flags that result from the expansion operation
+     * @throws DatabaseException
+     */
+	public static Resource[] expandFlagWithoutMetadata(WriteGraph graph, Resource flag) throws DatabaseException {
+		DiagramResource DIA = DiagramResource.getInstance(graph);
+		G2DResource G2D = G2DResource.getInstance(graph);
+		StructuralResource2 STR = StructuralResource2.getInstance(graph);
+		Layer0 L0 = Layer0.getInstance(graph);
+        ModelingResources MOD = ModelingResources.getInstance(graph);
+        
+		// Find joins and check if this is multiflag
+		Collection<Resource> joins_ = graph.getObjects(flag, DIA.FlagIsJoinedBy);
+		if(joins_.size() <= 1)
+			return Resource.NONE; // Nothing to do
+				
+		// Analyze expanded flag
+		Resource diagram = OrderedSetUtils.getSubjects(graph, flag).iterator().next();
+		Resource flagType = graph.getSingleObject(flag, DIA.HasFlagType);
+		double[] transform = graph.getRelatedValue(flag, DIA.HasTransform);
+		Resource connector = graph.getSingleObject(flag, DIA.Flag_ConnectionPoint);
+		Statement connectsStatement = null;
+		for(Statement temp : graph.getStatements(connector, STR.Connects))
+		    if(!flag.equals(temp.getObject())) {
+		        connectsStatement = temp;
+		        break;
+		    }
+
+        if(connectsStatement == null)
+            return Resource.NONE;
+		Resource arrowType = connectsStatement.getPredicate();
+		Resource diagramConnection = connectsStatement.getObject();
+		Resource connection = graph.getSingleObject(diagramConnection, MOD.DiagramConnectionToConnection);
+		
+        ArrayList<Connector> connectors = getConnectors(graph, diagramConnection);
+        if(connectors.size()==2) {
+            Iterator<Connector> it = connectors.iterator();
+            while(it.hasNext()) {
+                if(it.next().element.equals(flag))
+                    it.remove();
+            }
+        }
+        Resource diagramRelation = connectors.size()!=1 ? null : 
+            connectors.get(0).terminal;
+        Resource connectionPoint = diagramRelation == null ? null :
+            graph.getPossibleObject(diagramRelation, MOD.DiagramConnectionRelationToConnectionRelation); 
+        Resource element=connectors.size()==1 ? connectors.get(0).element : null, 
+                component=null, connectionType=null;
+        Resource routeLine = null;
+        if(connectionPoint != null && 
+                !graph.isInstanceOf(connectionPoint, L0.FunctionalRelation)) {
+            component = graph.getSingleObject(element, MOD.ElementToComponent);
+            connectionType = graph.getSingleObject(diagramConnection, STR.HasConnectionType);
+        }
+        else if(element != null && graph.isInstanceOf(element, MOD.ReferenceElement)) {
+            component = graph.getSingleObject(element, MOD.HasParentComponent);
+            connectionPoint = graph.getSingleObject(element, MOD.HasReferenceRelation);
+            connectionType = graph.getSingleObject(diagramConnection, STR.HasConnectionType);
+        }
+        else {
+            routeLine = graph.getSingleObject(connector, DIA.AreConnected);       
+
+            if(!graph.isInstanceOf(routeLine, DIA.RouteLine)) {
+                Resource otherConnector = routeLine;
+                routeLine = graph.newResource();
+                graph.deny(connector, DIA.AreConnected, otherConnector);
+                graph.claim(routeLine, L0.InstanceOf, DIA.RouteLine);
+                graph.claim(diagramConnection, DIA.HasInteriorRouteNode, routeLine);
+                graph.claimLiteral(routeLine, DIA.HasPosition, transform[4]-FlagClass.DEFAULT_WIDTH*0.5);
+                graph.claimLiteral(routeLine, DIA.IsHorizontal, false);
+                graph.claim(routeLine, DIA.AreConnected, connector);
+                graph.claim(routeLine, DIA.AreConnected, otherConnector);
+            }	
+        }
+
+		Resource[] joins = joins_.toArray(new Resource[joins_.size()]);
+		Resource[] flags = new Resource[joins.length];
+
+		final double flagSeparation = FlagClass.DEFAULT_HEIGHT;
+
+		flags[0] = flag;
+		for(int i=1;i<flags.length;++i) {
+			Resource newFlag = graph.newResource();
+			flags[i] = newFlag;
+			graph.claim(newFlag, L0.InstanceOf, DIA.Flag);
+			graph.claim(newFlag, DIA.HasFlagType, flagType);
+			OrderedSetUtils.add(graph, diagram, newFlag);
+			graph.claim(diagram, L0.ConsistsOf, newFlag);
+			graph.deny(flag, DIA.FlagIsJoinedBy, joins[i]);
+			for(Resource otherFlag : graph.getObjects(joins[i], DIA.JoinsFlag)) {
+				for(Statement label : graph.getStatements(otherFlag, L0.HasLabel)) {
+					if (!label.isAsserted(otherFlag)) {
+						Resource literalCopy = CopyAdvisorUtil.copy(graph, label.getObject(), null);
+						graph.claim(newFlag, label.getPredicate(), literalCopy);
+					}
+				}
+			}
+			graph.claim(newFlag, DIA.FlagIsJoinedBy, joins[i]);
+
+			// URI: Make new flag a part of the diagram and give it a fresh name
+			graph.claim(diagram, L0.ConsistsOf, newFlag);
+			AddElement.claimFreshElementName(graph, diagram, newFlag);
+
+			double[] newTransform = new double[] {
+				transform[0], transform[1], transform[2], transform[3],	
+				transform[4] + i*flagSeparation*transform[2], 
+				transform[5] + i*flagSeparation*transform[3]
+			};
+			graph.claimLiteral(newFlag, DIA.HasTransform, G2D.Transform, newTransform);
+
+			// TODO: Handle branching and non-branching connections differently
+			
+			if(routeLine == null) {
+			    Resource newConnector1 = graph.newResource();
+			    Resource newDiagramConnection = graph.newResource();
+			    Resource newConnector2 = graph.newResource();
+			    Resource newConnection = graph.newResource();
+			    
+			    graph.claim(newConnector1, L0.InstanceOf, DIA.Connector);
+			    graph.claim(newDiagramConnection, L0.InstanceOf, DIA.RouteGraphConnection);
+			    graph.claim(newDiagramConnection, STR.HasConnectionType, connectionType);
+			    graph.claim(newConnector2, L0.InstanceOf, DIA.Connector);
+			    graph.claim(newConnection, L0.InstanceOf, STR.Connection);
+			    
+			    Resource arrow = graph.getInverse(arrowType);
+			    Resource otherArrow = arrow.equals(DIA.HasPlainConnector) ?
+			        DIA.HasArrowConnector : DIA.HasPlainConnector;
+			    
+			    graph.claim(element, diagramRelation, newConnector1);
+			    graph.claim(newDiagramConnection, otherArrow, newConnector1);
+			    graph.claim(newDiagramConnection, arrow, newConnector2);
+			    graph.claim(newConnector1, DIA.AreConnected, newConnector2);
+			    graph.claim(newFlag, DIA.Flag_ConnectionPoint, newConnector2);
+			    
+			    graph.claim(component, connectionPoint, newConnection);
+			    graph.deny(joins[i], STR.Joins, connection);
+			    graph.claim(joins[i], STR.Joins, newConnection);
+			    
+			    graph.claim(newDiagramConnection, MOD.DiagramConnectionToConnection, newConnection);
+			    graph.claim(newConnection, MOD.Mapped, newConnection);
+			    
+			    AddElement.claimFreshElementName(graph, diagram, newDiagramConnection);
+			    
+			    OrderedSetUtils.addFirst(graph, diagram, newDiagramConnection);
+			    graph.claim(diagram, L0.ConsistsOf, newDiagramConnection);
+			}
+			else {
+			    Resource newConnector = graph.newResource();
+	            graph.claim(newConnector, L0.InstanceOf, DIA.Connector);
+	            graph.claim(newFlag, DIA.Flag_ConnectionPoint, newConnector);
+			    graph.claim(newConnector, arrowType, diagramConnection);
+			    graph.claim(newConnector, DIA.AreConnected, routeLine);
+			}
+		}
+
+		return flags;
+	}
+	
+	public static void collectGroupedFlags(ReadGraph graph, Resource composite, ArrayList<Resource> groups) throws DatabaseException {
+	    DiagramResource DIA = DiagramResource.getInstance(graph);
+        ModelingResources MOD = ModelingResources.getInstance(graph);
+        Layer0 L0 = Layer0.getInstance(graph);
+        
+        Resource diagram = graph.getPossibleObject(composite, MOD.CompositeToDiagram);
+        if(diagram == null)
+            return;
+        
+        for(Resource element : graph.getObjects(diagram, L0.ConsistsOf))
+            if(graph.isInstanceOf(element, DIA.Flag)) {
+            	Collection<Resource> objects = (Collection<Resource>) graph.getObjects(element, DIA.FlagIsJoinedBy);
+            	if (objects.size() > 1) {
+            		groups.add(element);
+            	}
+            }
+	}
+
+}