[Mmil-commits] r20 - trunk/src/fr/loria/led/mmil

alexandredenis at users.gforge.inria.fr alexandredenis at users.gforge.inria.fr
Mar 3 Oct 12:47:54 CEST 2006


Author: alexandredenis
Date: 2006-10-03 10:47:53 +0000 (Tue, 03 Oct 2006)
New Revision: 20

Modified:
   trunk/src/fr/loria/led/mmil/MMILComponent.java
   trunk/src/fr/loria/led/mmil/MMILEntity.java
Log:


Modified: trunk/src/fr/loria/led/mmil/MMILComponent.java
===================================================================
--- trunk/src/fr/loria/led/mmil/MMILComponent.java	2006-10-03 10:41:42 UTC (rev 19)
+++ trunk/src/fr/loria/led/mmil/MMILComponent.java	2006-10-03 10:47:53 UTC (rev 20)
@@ -522,7 +522,7 @@
             MMILEntity ent2 = entities.get(i+1);
             MMILEntity unif = ent1.unify(ent2);
             System.out.println("Entity 1 is\n"+ent1);
-            System.out.println("Entity 2 is\n"+ent1);
+            System.out.println("Entity 2 is\n"+ent2);
             if (unif!=null)
             {
                 moveRelations(ent1, unif);

Modified: trunk/src/fr/loria/led/mmil/MMILEntity.java
===================================================================
--- trunk/src/fr/loria/led/mmil/MMILEntity.java	2006-10-03 10:41:42 UTC (rev 19)
+++ trunk/src/fr/loria/led/mmil/MMILEntity.java	2006-10-03 10:47:53 UTC (rev 20)
@@ -259,17 +259,21 @@
         for(MMILFeature feat : features)
         {
             List<String> values = entity.getValuesOf(feat.getName());
-            if ((values.isEmpty() || values.contains(feat.getValue())) &&
-                !ret.hasFeature(feat.getNamespace(), feat.getName(), feat.getValue()))
-                ret.add(feat);
+            if (values.isEmpty() || values.contains(feat.getValue()))
+            {
+                if (!ret.hasFeature(feat.getNamespace(), feat.getName(), feat.getValue()))
+                    ret.add(feat);
+            }
             else return null;
         }
         for(MMILFeature feat : entity.getFeatures())
         {
             List<String> values = getValuesOf(feat.getName());
-            if ((values.isEmpty() || values.contains(feat.getValue())) && 
-                !ret.hasFeature(feat.getNamespace(), feat.getName(), feat.getValue()))
-                ret.add(feat);
+            if (values.isEmpty() || values.contains(feat.getValue()))
+            {
+                if (!ret.hasFeature(feat.getNamespace(), feat.getName(), feat.getValue()))
+                    ret.add(feat);
+            }
             else return null;
         }
         return ret;         






Plus d'informations sur la liste de diffusion Mmil-commits