X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.objmap2%2Fsrc%2Forg%2Fsimantics%2Fobjmap%2Fgraph%2Fschema%2FMappingSchemas.java;h=b863fbadca0d1b2924433edef63266abfa632b8c;hb=d08b28566d477295d9f14023f36de9f7406cdb5d;hp=0007d2bae54cac80b7f356a1538b78dc8daa070b;hpb=289aaab900078ef56efc8779e4b15830e472149e;p=simantics%2F3d.git

diff --git a/org.simantics.objmap2/src/org/simantics/objmap/graph/schema/MappingSchemas.java b/org.simantics.objmap2/src/org/simantics/objmap/graph/schema/MappingSchemas.java
index 0007d2ba..b863fbad 100644
--- a/org.simantics.objmap2/src/org/simantics/objmap/graph/schema/MappingSchemas.java
+++ b/org.simantics.objmap2/src/org/simantics/objmap/graph/schema/MappingSchemas.java
@@ -28,6 +28,8 @@ import org.simantics.objmap.graph.annotations.HasCollectionAdder;
 import org.simantics.objmap.graph.annotations.HasCollectionRemover;
 import org.simantics.objmap.graph.annotations.HasSetter;
 import org.simantics.objmap.graph.annotations.OptionalRelatedElements;
+import org.simantics.objmap.graph.annotations.OrderedElementsGet;
+import org.simantics.objmap.graph.annotations.OrderedSetType;
 import org.simantics.objmap.graph.annotations.RelatedElements;
 import org.simantics.objmap.graph.annotations.RelatedElementsGet;
 import org.simantics.objmap.graph.annotations.RelatedGetObj;
@@ -37,6 +39,7 @@ import org.simantics.objmap.graph.annotations.RelatedValue;
 import org.simantics.objmap.graph.annotations.UpdateMethod;
 import org.simantics.objmap.graph.annotations.factories.CompoundRelatedGetSetValueRuleFactory;
 import org.simantics.objmap.graph.annotations.factories.OptionalRelatedElementsRuleFactory;
+import org.simantics.objmap.graph.annotations.factories.OrderedElementsRuleFactory;
 import org.simantics.objmap.graph.annotations.factories.RelatedElementsRuleFactory;
 import org.simantics.objmap.graph.annotations.factories.RelatedElementsRuleFactory2;
 import org.simantics.objmap.graph.annotations.factories.RelatedGetSetObjRuleFactory;
@@ -80,6 +83,13 @@ public class MappingSchemas {
 		    
 		    return new DynamicSimpleLinkType<Object>(g.getResource(dynamicType.value()), clazz, rules);
 	    }
+	    OrderedSetType orderedSetType = clazz.getAnnotation(OrderedSetType.class);
+	    if (orderedSetType != null) {
+	    	ArrayList<IBidirectionalMappingRule<Resource, Object>> rules = new ArrayList<IBidirectionalMappingRule<Resource, Object>>();
+		    collectRulesFromAnnotations(g, clazz, rules);
+		    
+		    return new OrderedSetSimpleLinkType<Object>(g.getResource(orderedSetType.value()), clazz, rules);
+	    }
 	    throw new IllegalArgumentException("Class " + clazz.toString() + " does not contain annotations.");
 	}
 	
@@ -228,6 +238,8 @@ public class MappingSchemas {
 	public static ICollectionRuleFactory<Resource,Object> createCollectionRuleFactory(ReadGraph g, Annotation annotation, Method getter) {
 		if (annotation.annotationType().equals(RelatedElementsGet.class))
 			return new RelatedElementsRuleFactory2<Object>();
+		if (annotation.annotationType().equals(OrderedElementsGet.class))
+			return new OrderedElementsRuleFactory<Object>();
 		return null;
 	}