Changeset 1469 for trunk/modelicaml/org.openmodelica.modelicaml.common/src/org

Timestamp:

03/29/12 23:08:56 (13 years ago)

Author:

wschamai

Message:

BUG FIX: concurrent list modification

File:

• trunk/modelicaml/org.openmodelica.modelicaml.common/src/org/openmodelica/modelicaml/common/contentassist/ModelicaMLContentAssist.java (modified) (3 diffs)

trunk/modelicaml/org.openmodelica.modelicaml.common/src/org/openmodelica/modelicaml/common/contentassist/ModelicaMLContentAssist.java

@@ -281 +281 @@
         // add the rest (predefined properties) in order to support the validation
         
-        // TODO: here a concurrent modification error occurres somtimes 
+        // TODO: here a concurrent modification error occurs sometimes 
         sortedList.addAll(predefinedVariablePropertiesList);
         sortedList.addAll(predefinedFunctionsList);
@@ -287 +287 @@
         
         // if it is a component modification then add all possible sub components of the component being modified
-        if (propertyName != null) {
-            sortedList.addAll(getFullModifiedComponentReferenceSortedList());
-        }
+//      if (propertyName != null) {
+            // !!!!!!!! This causes concurrent modification of the predefinedVariablePropertiesList
+//          sortedList.addAll(getFullModifiedComponentReferenceSortedList());
+//      }
         
         Collections.sort(sortedList, String.CASE_INSENSITIVE_ORDER);
@@ -400 +401 @@
             }
             // collect the predefined properties
-            for (String reference : predefinedVariablePropertiesList) {
+            HashSet<String> predefinedVarListProp = new HashSet<String>();
+            predefinedVarListProp.addAll(predefinedVariablePropertiesList);
+            for (String reference : predefinedVarListProp) {
                 if (reference.startsWith(propertyName)) {
                     //sortedList.add(reference); // IMPORTANT: this is used for component tree in order to enable modifications that are stored in first level components.