From: lehtonen <lehtonen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Thu, 5 Jan 2012 16:24:55 +0000 (+0000)
Subject: Fixed DiagramToCompositeMappings to compile after Hannu's changes in r23825.
X-Git-Tag: simantics-1.6~63
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=36338e14cf4d558dfc4406a8293d38e6e2e1ef6c;p=simantics%2Fsysdyn.git

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