Merge pull request #23 from moosetechnology/traits-update

Traits management update

Author: NicolasAnquetil

lib/src/main/java/ch/akuhn/fame/codegen/CodeGeneration.java

@@ -340,7 +340,7 @@ private void acceptClass(MetaDescription metaDescription) throws IOException {
         }
         // Properties from my traits that are not in my own properties
         Set<PropertyDescription> propertyDescriptionSet = new HashSet<>();
-        metaDescription.getTraits().stream()
+        metaDescription.computeAllTraits().stream()
                 .map(c -> c.getProperties().stream()
                         .filter(traitProperty -> propertyDescriptions.stream().noneMatch(myProperty -> myProperty.getName().equals(traitProperty.getName())))
                         .collect(Collectors.toList()))
@@ -365,7 +365,7 @@ private void acceptTrait(FM3Trait m) throws IOException {
         code.setTraits(m.getTraits().stream().map(FM3Type::getName).collect(Collectors.toList()));
         code.addImport(FameDescription.class);
         code.addImport(FamePackage.class);
-        for (FM3Trait t : m.computeAllTraits()) {
+        for (FM3Trait t : m.getTraits()) {
             code.addImport(packageName(t.getPackage()), t.getName());
         }
 

lib/src/main/java/ch/akuhn/fame/fm3/FM3Trait.java

@@ -86,13 +86,21 @@ public FM3Trait(String name) {
         super(name);
     }
 
-    FM3Type traitOwner;
-    @FameProperty(name = "owner", opposite = "traits")
-    public FM3Type getTraitOwner() {
-        return traitOwner;
+    private Map<String, FM3Type> users = new HashMap<String, FM3Type>();
+
+    @FameProperty(name = "users", opposite = "traits")
+    public Collection<FM3Type> getUsers() {
+        return users.values();
     }
-    public void setTraitOwner(FM3Type traitOwner){
-        this.traitOwner = traitOwner;
+
+    public void setUsers(Collection<FM3Type> users){
+        for (FM3Type user : users) {
+            this.addUser(user);
+        }
     }
 
-}
+    public void addUser(FM3Type user) {
+        users.put(user.getName(), user);
+    }
+    
+}

lib/src/main/java/ch/akuhn/fame/fm3/FM3Type.java

@@ -156,7 +156,7 @@ public void setTraits(Collection<FM3Trait> traits) {
         }
     }
 
-    @FameProperty(name="traits", opposite = "owner")
+    @FameProperty(name="traits", opposite = "users")
     public Collection<FM3Trait> getTraits() {
         return traits.values();
     }
@@ -174,11 +174,16 @@ public boolean isRoot() {
     }
 
     public Set<FM3Trait> computeAllTraits() {
-        Set<FM3Trait> traits = new HashSet<>();
-        traits.addAll(getTraits());
-        for (FM3Trait t : traits) {
-            traits.addAll(t.computeAllTraits());
+        Set<FM3Trait> computedTraits = new HashSet<>();
+        computedTraits.addAll(getTraits());
+        Set<FM3Trait> transitiveTraits = new HashSet<>();
+        
+        for (FM3Trait t : computedTraits) {
+            transitiveTraits.addAll(t.computeAllTraits());
         }
-        return traits;
+
+        computedTraits.addAll(transitiveTraits);
+        return computedTraits;
     }
+    
 }