Changeset 2603

Timestamp:

02/21/13 13:58:18 (11 years ago)

Author:

olhsha

Message:

Making DeleteService? non-static. Making three instances of DeleteService?: for profiles (in Browse.mxml), for components (in Browse.mxml) and for comments (CommentsPanel?.as, also transferred to CommepPanel?.as as a parameter of its contructor))

Location:

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

Files:

• browser/Browse.mxml (modified) (2 diffs)
• browser/CommentPanel.as (modified) (2 diffs)
• browser/CommentsPanel.as (modified) (3 diffs)
• services/DeleteService.as (modified) (5 diffs)

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

@@ -38 +38 @@
                         private var selectedComponentSrv:ComponentInfoService = new ComponentInfoService();
                         
-                        private var deleteSrv:DeleteService = DeleteService.instance;
+                        private var _deleteSrvProfiles:DeleteService;
+                        private var _deleteSrvComponents:DeleteService;
                         
                         [Bindable]
@@ -55 +56 @@
                         
                         public function init():void {
+                                
+                                _deleteSrvProfiles=new DeleteService();
+                                _deleteSrvComponents=new DeleteService();
+                                
                                 profilesMenu = new BrowseContextMenu();
                                 profilesMenu.viewStack = this.parent as RegistryViewStack;
-                                profilesMenu.deleteService = deleteSrv;
+                                profilesMenu.deleteService = _deleteSrvProfiles;
                                 componentsMenu = new BrowseContextMenu(true);
                                 componentsMenu.viewStack = this.parent as RegistryViewStack;
-                                componentsMenu.deleteService = deleteSrv;
-                                deleteSrv.addEventListener(DeleteService.ITEM_DELETED, handleItemDeleted);
+                                componentsMenu.deleteService = _deleteSrvProfiles;
+                                
+                                _deleteSrvProfiles.addEventListener(_deleteSrvProfiles.ITEM_DELETED, handleItemDeleted);
+                                _deleteSrvComponents.addEventListener(_deleteSrvComponents.ITEM_DELETED, handleItemDeleted);
                                 
                                 Config.instance.addEventListener(Config.USER_SPACE_TOGGLE_EVENT, toggleUserSpace);

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/browser/CommentPanel.as

@@ -21 +21 @@
                 private var commentText:Text = new Text();
                 private var comment:Comment;
+                private var _deleteSrvOfCommentsPanel:DeleteService;
                 
-                public function CommentPanel(comment:Comment)
+                public function CommentPanel(comment:Comment, deleteSrvOfCommentsPanel:DeleteService)
                 {
                         super();
                         this.comment = comment;
+                        this._deleteSrvOfCommentsPanel = deleteSrvOfCommentsPanel;
                         
                         initLayout();
@@ -75 +77 @@
                 private function deleteHandler(event:CloseEvent):void {
                         if(event.detail == Alert.OK){
-                                DeleteService.instance.deleteComment(comment);
+                                _deleteSrvOfCommentsPanel.deleteComment(comment);
                         }       
                 }

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/browser/CommentsPanel.as

@@ -36 +36 @@
                 [Bindable]
                 private var _itemDescription:ItemDescription;
+                
                 private var service:CommentListService;
-                
+                private var _deleteSrvComments:DeleteService;
                 private var commentsBox:VBox;
                 
@@ -59 +60 @@
                         this.setStyle("paddingBottom", hPadding);
                         
-                        DeleteService.instance.addEventListener(DeleteService.COMMENT_DELETED, commentDeletedHandler);
+                        _deleteSrvComments=new DeleteService();
+                        _deleteSrvComments.addEventListener(_deleteSrvComments.COMMENT_DELETED, commentDeletedHandler);
                 }
                 
@@ -126 +128 @@
                                 if(commentsCount > 0) {
                                         for each(var comment:Comment in service.comments) {
-                                                var panel:CommentPanel = new CommentPanel(comment);
+                                                var panel:CommentPanel = new CommentPanel(comment, _deleteSrvComments);
                                                 commentsBox.addChild(panel);
                                         }

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

@@ -19 +19 @@
         
         public class DeleteService extends EventDispatcher {
-                public static const ITEM_DELETED:String = "itemDeleted";
-                public static const COMMENT_DELETED:String = "commentDeleted";
+                public const ITEM_DELETED:String = "itemDeleted";
+                public const COMMENT_DELETED:String = "commentDeleted";
+
                 private var service:HTTPService;
-                private static const DELETE_METHOD:Object = {"method": "delete"};
+                private const DELETE_METHOD:Object = {"method": "delete"};
                 
                 
-                // the item to be deleted can be either a comment, or profile/component
-                // depending on int, different events should be issues because different processing will take place
-                // default value is false
-                private var _isComment:Boolean=false;
-                
-                private static var _instance:DeleteService = new DeleteService();
-                
                 public function DeleteService() {
-                        if (_instance != null) {
-                                throw new Error("DeleteService should only be accessed through DeleteService.instance");
-                        }
                         service = new HTTPService();
                         service.addEventListener(FaultEvent.FAULT, handleError);
@@ -73 +64 @@
                 
                 public function deleteComment(comment:Comment):void {
-                        // mark the moment that we want to delete a comment but not rofile/component
-                        _isComment = true;
                         CursorManager.setBusyCursor();
                         var url:URI = new URI(comment.dataUrl);
@@ -91 +80 @@
                         CursorManager.removeBusyCursor();
                         if (resultEvent.statusCode >= 200 && resultEvent.statusCode < 300) {
-                                if (_isComment) {
-                                        dispatchEvent(new Event(COMMENT_DELETED));
-                                        // do not forget to reset the value back to false when a comment is deleated
-                                        _isComment=false;
-                                }
-                                else  {
                                         dispatchEvent(new Event(ITEM_DELETED));
-                                }
                         } else {
                                 Alert.show("Unexpected error, server returned status: " + resultEvent.statusCode + "\n Message = ");
@@ -105 +87 @@
                 
                 public function handleError(faultEvent:FaultEvent):void {
-                        _isComment = false;
                         CursorManager.removeBusyCursor();
                         if (faultEvent.statusCode == 401) { //Apparrently depending on browser status codes and errormessages are sometimes not passed along to flash.
@@ -116 +97 @@
                 }
                 
-                public static function get instance():DeleteService {
-                        return _instance;
-                }
+                
         }
 }