Changeset 1522

Timestamp:

02/21/2012 11:05:44 AM (3 months ago)

Author:

michael.kriegel

Message:

small fix handling simultaneous requests of adding sub-containers to a storage container. Previously all but one request would be discarded now, the initial properties of every single one are applied

Location:

libs/cmion/cmionMain/src/cmion

Files:

• level3/MindAction.java (modified) (4 diffs)
• storage/CmionStorageContainer.java (modified) (2 diffs)

libs/cmion/cmionMain/src/cmion/level3/MindAction.java

@@ -31 +31 @@
 
 import java.util.ArrayList;
+import java.util.List;
 import java.util.HashMap;
 
@@ -43 +44 @@
         /** create a new mind action with the specified name and parameters, if the action has
          * no parameters, the second parameter of this constructor may be null*/
-        public MindAction(String subject, String name, ArrayList<String> parameters)
+        public MindAction(String subject, String name, List<String> parameters)
         {
                 this.subject = subject;
@@ -171 +172 @@
         
         /** the parameters of this action */
-        protected ArrayList<String> parameters;
+        protected List<String> parameters;
         
         /** returns the name/identifier of this action */
@@ -186 +187 @@
 
         /** returns the parameters of this action */
-        public ArrayList<String> getParameters()
+        public List<String> getParameters()
         {
                 return parameters;

libs/cmion/cmionMain/src/cmion/storage/CmionStorageContainer.java

@@ -353 +353 @@
                                                 container.requestSetProperty(propertyName, initialProperties.get(propertyName));
                                 }
-                }       
+                } 
+                else if (initialProperties!=null) // the container already exists, however we will still add the properties
+                {
+                        CmionStorageContainer container = subContainers.get(name);
+                        
+                        // don't do this if the conatainer types don't match
+                        if (!type.equals(container.getContainerType())) return;
+                        
+                        // go through all properties and set them
+                        for (String propertyName : initialProperties.keySet())
+                        {       
+                                if (persistentProperties!=null)
+                                {
+                                        boolean persistent = persistentProperties.contains(propertyName);
+                                        container.requestSetProperty(propertyName, initialProperties.get(propertyName),persistent);                                     
+                                }
+                                else
+                                        container.requestSetProperty(propertyName, initialProperties.get(propertyName));
+                        }
+                }
         }
 
@@ -508 +527 @@
                 // create an array list for remembering the properties that were
                 // requested to change during this simulation step
-                ArrayList<String> propertiesSet = new ArrayList<String>();
+                HashSet<String> propertiesSet = new HashSet<String>();
                 
                 // iterate through requests