Changeset 3120

Timestamp:

07/08/13 14:27:42 (12 years ago)

Author:

olhsha

Message:

Bug 322 (visible in Opera and 50% f times in Chrome) seems to be fixed by: splitting up BrowserService?.ITEM_LOADED event into ComponentListService?.COMPONENTS_LOADED and ProfilesListService?.PROFILES_LOADED, and running load infor page only AFTER BOTH these events have dispatched.

Location:

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry

Files:

• browser/Browse.mxml (modified) (4 diffs)
• services/BrowserService.as (modified) (2 diffs)
• services/ComponentListService.as (modified) (2 diffs)
• services/ProfileListService.as (modified) (3 diffs)

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/browser/Browse.mxml

@@ -17 +17 @@
                         import clarin.cmdi.componentregistry.common.components.BrowseContextMenu;
                         import clarin.cmdi.componentregistry.common.components.RegistryViewStack;
-                        import clarin.cmdi.componentregistry.services.BrowserService;
                         import clarin.cmdi.componentregistry.services.ComponentInfoService;
                         import clarin.cmdi.componentregistry.services.ComponentListService;
@@ -25 +24 @@
                         import clarin.cmdi.componentregistry.services.ProfileListService;
                         
+                        //debug
+                        import clarin.cmdi.componentregistry.common.Profile;
+                        
                         public static const START_ITEM_LOADED:String = "startItemLoaded";
                         
@@ -91 +93 @@
                                 startupItemId = Config.instance.startupItem;
                                 startupPanel = Config.instance.browserPanel;
-                                if (startupItemId) { //only load this once on startup
-                                        componentsSrv.addEventListener(BrowserService.ITEMS_LOADED, componentsLoaded);
-                                        profilesSrv.addEventListener(BrowserService.ITEMS_LOADED, profilesLoaded);
-                                }
-                                
-                                refresh();
+                                if (startupItemId) { //only load this once on startup                                   
+                                        profilesSrv.addEventListener(ProfileListService.PROFILES_LOADED, profilesLoaded);
+                                        componentsSrv.addEventListener(ComponentListService.COMPONENTS_LOADED, componentsLoaded);                                       
+                                        profilesSrv.load();
+                                }
+                                else{
+                                        refresh();
+                                }
                         }
                         
                         public function refresh():void {
                                 componentsSrv.load();
-                                profilesSrv.load();
-                                
+                                profilesSrv.load();                             
                                 selectedComponentSrv = new ComponentInfoService();
                                 selectedProfileSrv = new ProfileInfoService();
                         }
                         
-                        private function profilesLoaded(event:Event):void {
+                        
+                        
+                        private function profilesLoaded(event:Event):void {                             
+                                profilesSrv.removeEventListener(ProfileListService.PROFILES_LOADED, profilesLoaded);
+                                componentsSrv.load();   
+                        }
+                        
+                        private function componentsLoaded(event:Event):void {                                   
+                                componentsSrv.removeEventListener(ComponentListService.COMPONENTS_LOADED, componentsLoaded);
+                                
                                 var item:ItemDescription = ProfileListService.findDescription(startupItemId);
-                                loadStartupItem(item);
-                                profileInfoPage.infoPanel.setPanel(Config.instance.browserPanel);                               
-                                profilesSrv.removeEventListener(BrowserService.ITEMS_LOADED, profilesLoaded);
-                        }
-                        
-                        private function componentsLoaded(event:Event):void {
-                                var item:ItemDescription = ComponentListService.findDescription(startupItemId);
-                                if(item != null){
+                                if(item != null){                                       
+                                        selectedProfileSrv = new ProfileInfoService();
                                         loadStartupItem(item);
-                                        componentInfoPage.infoPanel.setPanel(Config.instance.browserPanel);                             
-                                        componentsSrv.removeEventListener(BrowserService.ITEMS_LOADED, componentsLoaded);
+                                        profileInfoPage.infoPanel.setPanel(Config.instance.browserPanel);       
+                                }
+                                
+                                item = ComponentListService.findDescription(startupItemId);
+                                if(item != null){                                       
+                                        selectedComponentSrv = new ComponentInfoService();
+                                        loadStartupItem(item);
+                                        componentInfoPage.infoPanel.setPanel(Config.instance.browserPanel);     
                                 }
                         }
@@ -204 +216 @@
                                         return false;
                                 }
+                        }
+                        
+                        private function debugProfile():Profile{
+                                trace("in mxml: "+selectedProfileSrv.profile.components.length + "components for the given profile");
+                                return selectedProfileSrv.profile;
                         }
                         

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/services/BrowserService.as

@@ -9 +9 @@
         
         
-        [Event(name="itemsLoaded", type="flash.events.Event")]
+        // [Event(name="itemsLoaded", type="flash.events.Event")]
         public class BrowserService extends ComponentRegistryService {
-        public static const ITEMS_LOADED:String = "itemsLoaded";
+        // public static const ITEMS_LOADED:String = "itemsLoaded";
 
                 /**
@@ -39 +39 @@
                  */
                 override protected function result(resultEvent:ResultEvent):void {
-                        dispatchEvent(new Event(ITEMS_LOADED));
+                        //dispatchEvent(new Event(ITEMS_LOADED));
                 }
 

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/services/ComponentListService.as

@@ -5 +5 @@
         import mx.collections.ArrayCollection;
         import mx.rpc.events.ResultEvent;
+        import flash.events.Event;
 
+        [Event(name="componentsLoaded", type="flash.events.Event")]
         public class ComponentListService extends BrowserService {
 
+                public static const COMPONENTS_LOADED:String = "componentsLoaded";
+                
                 private static var _instance:ComponentListService = new ComponentListService();
                 private static var _userSpaceInstance:ComponentListService = new ComponentListService(true);
@@ -28 +32 @@
                         tempArray.refresh();
             setItemDescriptions(new ArrayCollection(tempArray.toArray()));
-                    super.result(resultEvent);
+                        trace(itemDescriptions.length + " components are loaded");
+                        dispatchEvent(new Event(COMPONENTS_LOADED));
+                    // super.result(resultEvent);
                 }
 

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/services/ProfileListService.as

@@ -4 +4 @@
         
         import mx.collections.ArrayCollection;
-        import mx.rpc.events.ResultEvent;
-
+        import mx.rpc.events.ResultEvent;       
+        import flash.events.Event;
+        
+        
+        [Event(name="profilesLoaded", type="flash.events.Event")]
         public class ProfileListService extends BrowserService {
                 
@@ -11 +14 @@
                 private static var _userSpaceInstance:ProfileListService = new ProfileListService(true);
 
+                public static const PROFILES_LOADED:String = "profilesLoaded";
+                
                 public function ProfileListService(userSpace:Boolean=false) {
                         super(Config.instance.profileListUrl, userSpace);
@@ -26 +31 @@
                         tempArray.sort = BrowserColumns.getInitialSortForProfiles();
                         tempArray.refresh();
-                        setItemDescriptions(new ArrayCollection(tempArray.toArray()));
-                    super.result(resultEvent);
+                        setItemDescriptions(new ArrayCollection(tempArray.toArray()));                  
+                        trace(itemDescriptions.length + " profiles are loaded");
+                        dispatchEvent(new Event(PROFILES_LOADED));
+                    //super.result(resultEvent);
                 }