Commit dca714e1 authored by Christophe Demarey's avatar Christophe Demarey

Add a transitive (scadescendant) and reflexive (scadescendant-or-self) axis for scachild.

parent 04c1328c
FraSCAti Script 1.3
---------------------
* Add a transitive (scadescendant) and reflexive (scadescendant-or-self) axis for scachild
FraSCAti Script 1.2
---------------------
* Architecture refactoring
......
......@@ -31,6 +31,8 @@ import org.objectweb.fractal.api.Interface;
import org.objectweb.fractal.api.NoSuchInterfaceException;
import org.objectweb.fractal.fscript.model.Model;
import org.objectweb.fractal.fscript.model.Property;
import org.objectweb.fractal.fscript.model.ReflectiveAxis;
import org.objectweb.fractal.fscript.model.TransitiveAxis;
import org.objectweb.fractal.fscript.model.fractal.FractalModel;
import org.ow2.frascati.factory.runtime.domain.api.Domain;
import org.ow2.frascati.factory.runtime.domain.api.DomainConfig;
......@@ -100,16 +102,16 @@ public class FraSCAtiModel
addAxis(new ScaBindingAxis(this));
addAxis(new ScaIntentAxis(this));
// Transitive axes
// addAxis(new TransitiveAxis(getAxis("child"), "descendant"));
// addAxis(new TransitiveAxis(getAxis("parent"), "ancestor"));
addAxis(new TransitiveAxis(getAxis("scachild"), "scadescendant"));
// addAxis(new TransitiveAxis(getAxis("scaparent"), "scaancestor"));
// Composed axes
// addAxis(new ComposedAxis("sibling", getAxis("parent"), getAxis("child")));
// addAxis(new ComposedAxis("sibling", getAxis("scaparent"), getAxis("scachild")));
// Reflective axes
// addAxis(new ReflectiveAxis(getAxis("child")));
// addAxis(new ReflectiveAxis(getAxis("parent")));
// addAxis(new ReflectiveAxis(getAxis("descendant")));
// addAxis(new ReflectiveAxis(getAxis("ancestor")));
// addAxis(new ReflectiveAxis(getAxis("sibling")));
addAxis(new ReflectiveAxis(getAxis("scachild")));
// addAxis(new ReflectiveAxis(getAxis("scaparent")));
addAxis(new ReflectiveAxis(getAxis("scadescendant")));
// addAxis(new ReflectiveAxis(getAxis("scaancestor")));
// addAxis(new ReflectiveAxis(getAxis("scasibling")));
}
/**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment