Fixed DiagramToCompositeMappings to compile after Hannu's changes in r23825.

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@23842 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/DiagramToCompositeMapping3.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/DiagramToCompositeMapping3.java
index 8b41b0da4ec64e70d80c0d62616311457d9c21fc..240874fe5f0fe5aab1a9afb3afbd760c33dfea80 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/DiagramToCompositeMapping3.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/DiagramToCompositeMapping3.java
@@ -51,16 +51,16 @@ public class DiagramToCompositeMapping3 extends org.simantics.modeling.mapping.D
         \r
         if_(bf(OrderedSetElementsPredicate.INSTANCE, Diagram, Element),\r
                 query(\r
-                    if_(and(bf(b.InstanceOf, Element, ElementType),\r
-                               bf(mr.SymbolToComponentType, ElementType, ComponentType)\r
+                    if_(and(bf(L0.InstanceOf, Element, ElementType),\r
+                               bf(MOD.SymbolToComponentType, ElementType, ComponentType)\r
                         ),\r
                         // If element type of the element has a corresponding component type\r
                         createComponentRule(),\r
                     \r
-                        if_(and(b(dr.Connection, Element), bf(b.InstanceOf, Element, ElementType), bf(mr.DiagramConnectionTypeToConnectionType, ElementType, ComponentType)),\r
+                        if_(and(b(DIA.Connection, Element), bf(L0.InstanceOf, Element, ElementType), bf(MOD.DiagramConnectionTypeToConnectionType, ElementType, ComponentType)),\r
                                 createNormalConnectionRule(),\r
 \r
-                                if_(b(dr.Flag, Element),\r
+                                if_(b(DIA.Flag, Element),\r
                                         createFlagRule()\r
                                 )\r
                         )\r
@@ -72,27 +72,27 @@ public class DiagramToCompositeMapping3 extends org.simantics.modeling.mapping.D
     @Override\r
     protected IRuleInstruction destructiveRule() {\r
         return\r
-        if_(and(bf(b.ConsistsOf, Configuration, Component),\r
+        if_(and(bf(L0.ConsistsOf, Configuration, Component),\r
                 b(mapped, Component) // handle only mapped components\r
         ),\r
         query(\r
-                if_(and(bf(mr.ComponentToElement, Component, Element),\r
+                if_(and(bf(MOD.ComponentToElement, Component, Element),\r
                         bf(new InversePredicate(OrderedSetElementsPredicate.INSTANCE), Element, Diagram)\r
                 ),\r
                 // If component has a corresponding element in the diagram\r
-                if_(and(statement_bff(Component, ConnectionRelation, Connection, sr.IsConnectedTo),\r
+                if_(and(statement_bff(Component, ConnectionRelation, Connection, STR.IsConnectedTo),\r
                         b(mapped, Connection)\r
                 ),\r
                 // If component has a mapped connection\r
                 unless(\r
-                        bf(mr.ConnectionToDiagramConnection, Connection, DiagramConnectionRelation),\r
+                        bf(MOD.ConnectionToDiagramConnection, Connection, DiagramConnectionRelation),\r
                         // If the configuration connection does not have a correspondence in the diagram remove it\r
                         and(deny(exists(Connection)))\r
                 )\r
                 ),\r
 \r
                 unless(\r
-                        bf(mr.ConnectionToDiagramConnection, Component, Element),\r
+                        bf(MOD.ConnectionToDiagramConnection, Component, Element),\r
                         // If the configuration connection does not have a correspondence in the diagram remove it\r
                         and(deny(exists(Component)))\r
                 )\r
@@ -105,11 +105,11 @@ public class DiagramToCompositeMapping3 extends org.simantics.modeling.mapping.D
     @Override\r
     protected IInstruction claimBasicConnection() {\r
         return and(exists(\r
-                bf(mr.DiagramConnectionToConnection, Element, Connection),\r
+                bf(MOD.DiagramConnectionToConnection, Element, Connection),\r
                 Connection\r
         ),\r
-        bb(b.InstanceOf, Connection, ComponentType),\r
-        bb(b.PartOf, Connection, Configuration),\r
+        bb(L0.InstanceOf, Connection, ComponentType),\r
+        bb(L0.PartOf, Connection, Configuration),\r
         b(mapped, Connection)\r
 \r
         );\r
@@ -118,12 +118,12 @@ public class DiagramToCompositeMapping3 extends org.simantics.modeling.mapping.D
 //    @Override\r
 //    protected IInstruction claimBasicConnection() {\r
 //        return and(exists(\r
-//                bf(mr.DiagramConnectionToConnection, Element, Connection),\r
+//                bf(MOD.DiagramConnectionToConnection, Element, Connection),\r
 //                Connection\r
 //        ),\r
-//        bb(b.InstanceOf, Connection, ComponentType),\r
+//        bb(L0.InstanceOf, Connection, ComponentType),\r
 //        b(mapped, Connection),\r
-//        bb(b.PartOf, Connection, Configuration)\r
+//        bb(L0.PartOf, Connection, Configuration)\r
 //        );\r
 //    }\r
 }\r