Changeset 1262 for trunk/org.modelica.mdt.core

Timestamp:

01/31/12 00:40:51 (13 years ago)

Author:

masberg

Message:

Fix bug that caused some elements to retain their old position in the source file after an update.

File:

• trunk/org.modelica.mdt.core/src/org/modelica/mdt/internal/core/InnerClass.java (modified) (3 diffs)

trunk/org.modelica.mdt.core/src/org/modelica/mdt/internal/core/InnerClass.java

@@ -245 +245 @@
         }
 
-        for (final ElementInfo info : CompilerProxy.getElements(fullName)) {
+        Collection<ElementInfo> fullNameElements = CompilerProxy.getElements(fullName);
+        for (final ElementInfo info : fullNameElements) {
             String elementType = info.getElementType();
             IModelicaElement.Visibility vis;
@@ -393 +394 @@
     public Collection<IModelicaElementChange> reload()
             throws ConnectException, UnexpectedReplyException, InvocationError, CompilerInstantiationException, CoreException {
-        /*
-         * the reload strategy is as follows:
-         */
-
-        /*
-         * all class attribute fields are just reset and
-         * lazily reloaded as they are queried
-         */
+        // The reload strategy is as follows:
+        // * all class attribute fields are just reset and
+        //   lazily reloaded as they are queried
+        // * new class component are fetched and compared to
+        //   the old in order to generate a change events list.
+        // * components that are not new or were removed are notified
+        //   of the change to give them a chance to update their state
         super.reload();
-
-        /*
-         * new class component are fetched and compared to
-         * the old in order to generate a change events list.
-         *
-         * components that are not new or were removed are notified
-         * of the change to give them a chance to update thier's state
-         */
+        
         LinkedList<IModelicaElementChange> changes = new LinkedList<IModelicaElementChange>();
 
-        if (children == null) {
-            /* if children are not loaded, then we can't reload */
-            return changes;
-        }
-
-        Hashtable<String, IModelicaElement> newChildren = loadElements();
-
-        @SuppressWarnings("unchecked")
-        Hashtable<String, IModelicaElement> oldChildren = (Hashtable<String, IModelicaElement>)children.clone();
-
-        for (IModelicaElement element : newChildren.values()) {
-            ModelicaElement oldElement = (ModelicaElement)oldChildren.remove(element.getElementName());
-
-            if (oldElement == null) {
-                /* new element added */
-                children.put(element.getElementName(), element);
-                changes.add(new ModelicaElementChange(this, element, null));
-            }
-            else {
-                /* element present before, refresh ! */
-                // adrpo 2006-10-16
-                // - the IModelicaComponent doesn't have reload
-                //   so we have to set it here!
-                // - otherwise the image doesn't get updated
-                if (oldElement instanceof IModelicaComponent && element instanceof IModelicaComponent) {
-                    ((ModelicaComponent)oldElement).setModelicaComponent((ModelicaComponent)element);
-                }
-                changes.addAll(oldElement.reload());
-            }
-        }
-
-        /* now there is only removed elements in the oldChildren table */
-        for (IModelicaElement element : oldChildren.values()) {
-            children.remove(element.getElementName());
-            changes.add(new ModelicaElementChange(element, ChangeType.REMOVED, null));
+        // if children are not loaded, then we can't reload
+        if (children != null) {
+            Hashtable<String, IModelicaElement> newChildrenMap = loadElements();
+
+            @SuppressWarnings("unchecked")
+            Hashtable<String, IModelicaElement> oldChildren = (Hashtable<String, IModelicaElement>)children.clone();
+            Collection<IModelicaElement> newChildren = newChildrenMap.values();
+
+            for (IModelicaElement element : newChildren) {
+                String elementName = element.getElementName();
+                ModelicaElement oldElement = (ModelicaElement)oldChildren.remove(elementName);
+
+                if (oldElement == null) {
+                    // new element added
+                    ModelicaElementChange modelicaElementChange = new ModelicaElementChange(this, element, null); 
+                    changes.add(modelicaElementChange);
+                }
+                else {
+                    /* element present before, refresh ! */
+                    // adrpo 2006-10-16
+                    // - the IModelicaComponent doesn't have reload
+                    //   so we have to set it here!
+                    // - otherwise the image doesn't get updated
+                    if (oldElement instanceof IModelicaComponent && element instanceof IModelicaComponent) {
+                        ((ModelicaComponent)oldElement).setModelicaComponent((ModelicaComponent)element);
+                    }
+                    
+                    changes.addAll(oldElement.reload());
+                }
+            }
+
+            // now there is only removed elements in the oldChildren table
+            for (IModelicaElement element : oldChildren.values()) {
+                changes.add(new ModelicaElementChange(element, ChangeType.REMOVED, null));
+            }
+
+            if (children.size() != newChildren.size()) {
+                ErrorManager.logBug("org.modelica.mdt.core", "Problem in InnerClass.reload(), children and newChildren don't have the same size.");
+            }
+
+            children = newChildrenMap;
         }
 
@@ -468 +467 @@
             ErrorManager.logError(e); 
         }
-        
+
         IFile f = null;