Changeset 373

Timestamp:

10/26/08 17:03:17 (16 years ago)

Author:

bjn8

Message:

Fixed bug

File:

• trunk/src/org/expeditee/gui/FrameUtils.java (modified) (2 diffs)

trunk/src/org/expeditee/gui/FrameUtils.java

@@ -966 +966 @@
                                                                 continue;
                                                         }
-                                                        Frame overlayFrame = FrameIO.LoadFrame(link);
+                                                        Frame overlayFrame = null;
+                                                        
+                                                        Frame current = DisplayIO.getCurrentFrame();
+                                                        if (current != null) {
+                                                                for (Overlay o : current.getOverlays()) {
+                                                                        if (o.Frame.getName().equalsIgnoreCase(link))
+                                                                                overlayFrame = o.Frame;
+                                                                }
+                                                        }
+                                                        if (overlayFrame == null) overlayFrame = FrameIO.LoadFrame(link);
+                                                        
                                                         // get level if specified
                                                         String level = new AttributeValuePair(i.getText())
@@ -1075 +1085 @@
                 FrameIO.ResumeCache();
 
-                synchronized (toParse) { // BROOK: This does not appear to do
-                        // anything! Their seems to be no
-                        // thread-safe protocol for this project...
-                        toParse.clearOverlays();
-                        toParse.clearVectors();
-                        toParse.addAllOverlays(overlays);
-                        toParse.addAllVectors(vectors);
-                }
+                toParse.clearOverlays();
+                toParse.clearVectors();
+                toParse.addAllOverlays(overlays);
+                toParse.addAllVectors(vectors);
+                
         }