Changeset 5699

Timestamp:

10/09/14 14:04:19 (10 years ago)

Author:

olhsha@mpi.nl

Message:

another attempt to commit my changes for groups

Location:

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex

Files:

• clarin/cmdi/componentregistry/browser/Browse.mxml (modified) (6 diffs)
• clarin/cmdi/componentregistry/browser/BrowserOverviewList.mxml (modified) (9 diffs)
• clarin/cmdi/componentregistry/browser/CommentsPanel.as (modified) (1 diff)
• clarin/cmdi/componentregistry/common/Group.as (modified) (1 diff)
• clarin/cmdi/componentregistry/common/ItemDescription.as (modified) (4 diffs)
• clarin/cmdi/componentregistry/common/ShowInfoPopUp.mxml (modified) (1 diff)
• clarin/cmdi/componentregistry/common/components/BrowseContextMenu.as (modified) (2 diffs)
• clarin/cmdi/componentregistry/common/components/ExpandingComponentLabel.as (modified) (1 diff)
• clarin/cmdi/componentregistry/common/components/LoginLabelButton.as (modified) (1 diff)
• clarin/cmdi/componentregistry/common/components/RegistryViewStack.as (modified) (4 diffs)
• clarin/cmdi/componentregistry/common/components/RssDescriptionsContextMenu.as (modified) (1 diff)
• clarin/cmdi/componentregistry/common/components/SpaceSwitch.mxml (modified) (2 diffs)
• clarin/cmdi/componentregistry/editor/ComponentSummary.mxml (modified) (1 diff)
• clarin/cmdi/componentregistry/editor/Editor.mxml (modified) (1 diff)
• clarin/cmdi/componentregistry/editor/EditorAS.as (modified) (8 diffs)
• clarin/cmdi/componentregistry/editor/EditorButtonBar.mxml (modified) (5 diffs)
• clarin/cmdi/componentregistry/importer/Importer.mxml (modified) (1 diff)
• clarin/cmdi/componentregistry/services/BaseRemoteService.as (modified) (1 diff)
• clarin/cmdi/componentregistry/services/BrowserService.as (modified) (1 diff)
• clarin/cmdi/componentregistry/services/CommentListService.as (modified) (2 diffs)
• clarin/cmdi/componentregistry/services/CommentPostService.as (modified) (1 diff)
• clarin/cmdi/componentregistry/services/ComponentInfoService.as (modified) (1 diff)
• clarin/cmdi/componentregistry/services/ComponentListService.as (modified) (2 diffs)
• clarin/cmdi/componentregistry/services/ComponentRegistryService.as (modified) (3 diffs)
• clarin/cmdi/componentregistry/services/ComponentUsageService.as (modified) (1 diff)
• clarin/cmdi/componentregistry/services/Config.as (modified) (11 diffs)
• clarin/cmdi/componentregistry/services/DeleteService.as (modified) (3 diffs)
• clarin/cmdi/componentregistry/services/ListUserGroupsMembershipService.as (modified) (1 diff)
• clarin/cmdi/componentregistry/services/ProfileInfoService.as (modified) (1 diff)
• clarin/cmdi/componentregistry/services/ProfileListService.as (modified) (2 diffs)
• clarin/cmdi/componentregistry/services/UploadService.as (modified) (2 diffs)
• main.mxml (modified) (3 diffs)

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

@@ -26 +26 @@
                         import clarin.cmdi.componentregistry.services.ProfileInfoService;
                         import clarin.cmdi.componentregistry.services.ProfileListService;
+                        import clarin.cmdi.componentregistry.services.RegistrySpace;
                         
                         import mx.controls.Alert;
                         import mx.events.IndexChangedEvent;
+                        import mx.utils.object_proxy;
                         
                         public static const START_ITEM_LOADED:String = "startItemLoaded";
                         
                         private var startupItemLoaded:Boolean = false;
-                        private var _userSpace:String = Config.SPACE_PUBLIC;
-                        
-                        [Bindable]
-                        private var componentsSrv:ComponentListService = Config.instance.getComponentsSrv(Config.instance.space);
-                        [Bindable]
-                        private var profilesSrv:ProfileListService = Config.instance.getProfilesSrv(Config.instance.space);
+                        
+                        [Bindable]
+                        private var componentsSrv:ComponentListService = Config.instance.getComponentsSrv();
+                        [Bindable]
+                        private var profilesSrv:ProfileListService = Config.instance.getProfilesSrv();
                         
                         [Bindable]
@@ -76 +77 @@
                                 _deleteSrvComponents.addEventListener(_deleteSrvComponents.ITEM_DELETED, handleItemDeleted);
                                 
-                                Config.instance.addEventListener(Config.USER_SPACE_TOGGLE_EVENT, toggleUserSpace);
-                                Config.instance.addEventListener(Config.USER_SPACE_TOGGLE_EVENT, setUserSpace);
-                        
-                                setUserSpace();
-
-                        }
-                        
-                        private function toggleUserSpace(event:Event):void {
-                                _userSpace = Config.instance.space;
-                                componentsSrv = Config.instance.getComponentsSrv(_userSpace);
-                                profilesSrv = Config.instance.getProfilesSrv(_userSpace);
-                                refresh();
+                                Config.instance.addEventListener(Config.REGISTRY_SPACE_TOGGLE_EVENT, toggleRegistrySpace);
+                                
+                        }
+                        
+                        private function toggleRegistrySpace(event:Event):void {
+                                componentsSrv = Config.instance.getComponentsSrv();
+                                profilesSrv = Config.instance.getProfilesSrv();
+                                refresh();                              
+                                registrySpaceComboBox.setSelectedIndex();
                         }
                         
@@ -137 +135 @@
                                                 componentInfoPage.infoPanel.setPanel(Config.instance.browserPanel);     
                                         } else
-                                                loadGroupItem(startupItemId);
-                                }
-                        }
-                        
-                        private function loadGroupItem(startupItemId:String):void{
-                                Config.instance.getComponentsSrv(Config.instance.space).getComponent(startupItemId, function(item:ItemDescription):void{
-                                        Config.instance.getListGroupsOfItemService().addEventListener(ListGroupsOfItemService.GROUPS_LOADED, function():void{
-                                                var group:Group = (Config.instance.getListGroupsOfItemService().groups.getItemAt(0)) as Group;
-                                                if (item.isProfile){
-                                                        selectedProfileSrv = new ProfileInfoService();
-                                                        profileInfoPage.infoPanel.setPanel(Config.instance.browserPanel);       
-                                                } else {
-                                                        selectedComponentSrv = new ComponentInfoService();
-                                                        componentInfoPage.infoPanel.setPanel(Config.instance.browserPanel);     
-                                                }
-
-                                                userSpaceCB.setSelectedItem(null, ""+group.id);
-                                                Config.instance.selectedGroup = ""+group.id;
-                                                Config.instance.userSpace = Config.SPACE_USER;
-                                                loadStartupItem(item);
-                                                Config.instance.dispatchEvent(new GroupSelectionEvent(""+group.id, group.name));
-                                        });
-                                        Config.instance.getListGroupsOfItemService().loadGroupsForItem(startupItemId);
-                                }
-                        );
-                        }
+                                                throw "Cannot find the item "+startupItemId+" in the current registries.  :S"
+                                }
+                        }
+                        
+                
                         
                         private function loadStartupItem(item:ItemDescription):void {
@@ -183 +160 @@
                         }
                         
-                        public function setSelectedDescription(desc:ItemDescription):void {
+                        public function setSelectedDescription(desc:ItemDescription):void {                             
                                 if (desc.isProfile) {
                                         tabnav.selectedIndex = 0;
@@ -219 +196 @@
                         }
                         
-                        private function setUserSpace(event:Event = null):void {
-                                _userSpace=Config.instance.space;
-                                userSpaceCB.setSelectedItem(Config.instance.space, Config.instance.selectedGroup);
-                        }
+                
                         
                         private function getSelectedIndex():int{
@@ -272 +246 @@
                                 horizontalCenter="-110"
                                 >
-                        <components:SpaceSwitch id="userSpaceCB" width="110" />
+                        <components:SpaceSwitch id="registrySpaceComboBox" 
+                                                                        width="150" />
+                        
+                        
                 </mx:Box>
                 

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

@@ -79 +79 @@
                         
                         private function init():void{
-                                Config.instance.addEventListener(Config.USER_SPACE_TOGGLE_EVENT, onSpaceChanged);
+                                Config.instance.addEventListener(Config.REGISTRY_SPACE_TOGGLE_EVENT, onSpaceChanged);
                                 groups.addItem("Move to group...");
                                 Config.instance.getListUserGroupsMembershipService().addEventListener(ListUserGroupsMembershipService.GROUPS_LOADED, onGroupsLoaded);
-                                Config.instance.addEventListener(Config.USER_SPACE_TOGGLE_EVENT, updateGroupVisibility);
+                                Config.instance.addEventListener(Config.REGISTRY_SPACE_TOGGLE_EVENT, updateGroupVisibility);
                                 Config.instance.getListUserGroupsMembershipService().loadGroupsForUser();
                                 Config.instance.addEventListener(GroupSelectionEvent.GROUP_SELECTED, onGroupSelected);
@@ -89 +89 @@
                         
                         private function onSpaceChanged(event:Event):void{
-                                userSpaceCB.setSelectedItem(Config.instance.space, Config.instance.selectedGroup);
-                                createNewButton.visible = (!Config.instance.selectedGroup);
-                                createNewButton.includeInLayout = (!Config.instance.selectedGroup);
-                                importButton.visible = (!Config.instance.selectedGroup);
-                                importButton.includeInLayout = (!Config.instance.selectedGroup);
+                                
+                                createNewButton.visible = true;
+                                createNewButton.includeInLayout = true;
+                                createNewButton.enabled = true;
+                                
+                                editAsNew.visible = Config.instance.registrySpace.space == Config.SPACE_PUBLISHED;
+                                editAsNew.includeInLayout = Config.instance.registrySpace.space  == Config.SPACE_PUBLISHED;
+                                editAsNew.enabled = Config.instance.registrySpace.space  == Config.SPACE_PUBLISHED  && dataGrid.selectedItem != null;
+                                
+                                edit.visible = Config.instance.registrySpace.space == Config.SPACE_PRIVATE || Config.instance.registrySpace.space == Config.SPACE_GROUP;
+                                edit.includeInLayout = Config.instance.registrySpace.space  == Config.SPACE_PRIVATE || Config.instance.registrySpace.space == Config.SPACE_GROUP;
+                                edit.enabled = (Config.instance.registrySpace.space  == Config.SPACE_PRIVATE || Config.instance.registrySpace.space == Config.SPACE_GROUP) && dataGrid.selectedItem != null;
+                                        
+                                importButton.visible = Config.instance.registrySpace.space == Config.SPACE_PRIVATE;
+                                importButton.includeInLayout = Config.instance.registrySpace.space == Config.SPACE_PRIVATE;
+                                importButton.enabled = Config.instance.registrySpace.space == Config.SPACE_PRIVATE;
+                        
+                                groupPanel.visible = Config.instance.registrySpace.space == Config.SPACE_PRIVATE || Config.instance.registrySpace.space == Config.SPACE_GROUP;
+                                groupPanel.includeInLayout = Config.instance.registrySpace.space == Config.SPACE_PRIVATE || Config.instance.registrySpace.space == Config.SPACE_GROUP;
+                                groupPanel.enabled = (Config.instance.registrySpace.space == Config.SPACE_PRIVATE || Config.instance.registrySpace.space == Config.SPACE_GROUP) && dataGrid.selectedItem != null;
+                                
+                                groupBox.visible = Config.instance.registrySpace.space == Config.SPACE_PRIVATE || Config.instance.registrySpace.space == Config.SPACE_GROUP;
+                                groupBox.includeInLayout = Config.instance.registrySpace.space == Config.SPACE_PRIVATE || Config.instance.registrySpace.space == Config.SPACE_GROUP;
+                                groupBox.enabled = (Config.instance.registrySpace.space == Config.SPACE_PRIVATE || Config.instance.registrySpace.space == Config.SPACE_GROUP) && dataGrid.selectedItem != null;
+                                
+                                moveToGroupBtn.visible = Config.instance.registrySpace.space == Config.SPACE_PRIVATE || Config.instance.registrySpace.space == Config.SPACE_GROUP;
+                                moveToGroupBtn.includeInLayout = Config.instance.registrySpace.space == Config.SPACE_PRIVATE || Config.instance.registrySpace.space == Config.SPACE_GROUP;
+                                moveToGroupBtn.enabled = (Config.instance.registrySpace.space == Config.SPACE_PRIVATE || Config.instance.registrySpace.space == Config.SPACE_GROUP) && dataGrid.selectedItem != null;                   
                         }
 
@@ -126 +149 @@
                         
                         private function editItem():void {
-                                var item:ItemDescription = dataGrid.selectedItem as ItemDescription;
-                                viewStack.switchToEditor(item);
-                        }
-                        
-                        private function importItem():void{
-                                viewStack.switchToImport();
-                        }
-                        
-                        private function dispatchCreateNewEvent():void{
+                                var item:ItemDescription = dataGrid.selectedItem as ItemDescription;    
+                                viewStack.switchToEditor(item); 
+                        }
+                        
+                        private function importItem():void{             
+                                viewStack.switchToImport();     
+                        }
+                        
+                        private function dispatchCreateNewEvent():void{ 
                                 dispatchEvent(new CreateNewComponentEvent());
                         }
@@ -140 +163 @@
                         
                         private function goToFeed():void{
-                                var request:URLRequest = new URLRequest(Config.getRssUriDescriptions(typeOfDescription));
+                                var request:URLRequest = new URLRequest(Config.getRssUriDescriptions(typeOfDescription, Config.instance.registrySpace));
                                 navigateToURL(request, "_blank");
                         }
@@ -149 +172 @@
                                 
                                 for each (var group:Group in Config.instance.getListUserGroupsMembershipService().groups) {
-                                        groups.addItem({label:group.name, space:Config.SPACE_USER, groupId:group.id});                                  
+                                        groups.addItem({label:group.name, space:Config.SPACE_GROUP, groupId:group.id});                                 
                                 }
                                 updateGroupVisibility(event);
@@ -156 +179 @@
                         
                         private function updateGroupVisibility(event:Event):void{
-                                var showGroups:Boolean = Config.instance.getListUserGroupsMembershipService().groups.length>0 && Config.instance.space != Config.SPACE_PUBLIC;
+                                var showGroups:Boolean = Config.instance.getListUserGroupsMembershipService().groups.length>0;
                                 groupPanel.visible = showGroups;
                                 groupBox.selectedIndex = 0;
@@ -208 +231 @@
                         
                         
+                        
+                        public function updateSelectedIndexForRegistryComobBox():void {
+                                this.registrySpaceComboBox.setSelectedIndex();
+                        }
                 ]]>
         </mx:Script>
         
-        <mx:HBox paddingLeft="5" 
+        <mx:HBox 
+                         paddingLeft="5" 
                          paddingRight="5"
                          width="100%">
                 
-                <mx:Box paddingTop="5" paddingLeft="5" 
+                <mx:Box 
+                            paddingTop="5" paddingLeft="5" 
                                 visible="{spaceSwitchEnabled}" 
                                 includeInLayout="{spaceSwitchEnabled}">
-                        <comp:SpaceSwitch id="userSpaceCB" />
+                        <comp:SpaceSwitch id="registrySpaceComboBox"
+                                                          />
                 </mx:Box>
                 
@@ -231 +261 @@
                                            label="Create new" 
                                            toolTip="Create a new item in the private workspace"
+                                           visible="{true}" 
+                                           includeInLayout="{true}"
+                                           enabled="{true}"
                                            click="dispatchCreateNewEvent()"
                                            />
-                        <mx:Button label="Edit"
+                        <mx:Button 
+                                       id = "edit"
+                                       label="Edit"
                                            toolTip="Edit the selected item in the editor"
-                                           visible="{Config.instance.space == Config.SPACE_USER}" 
-                                           includeInLayout="{Config.instance.space == Config.SPACE_USER}"
-                                           enabled="{Config.instance.space == Config.SPACE_USER &amp;&amp; dataGrid.selectedItem != null}" 
+                                           visible="{Config.instance.registrySpace.space == Config.SPACE_PRIVATE || Config.instance.registrySpace.space == Config.SPACE_GROUP}" 
+                                           includeInLayout="{Config.instance.registrySpace.space  == Config.SPACE_PRIVATE || Config.instance.registrySpace.space == Config.SPACE_GROUP}"
+                                           enabled="{(Config.instance.registrySpace.space  == Config.SPACE_PRIVATE || Config.instance.registrySpace.space == Config.SPACE_GROUP) &amp;&amp; dataGrid.selectedItem != null}" 
                                            click="editItem()" />
-                        <mx:Button label="Edit as new"   
-                                           toolTip="Edit the selected item as a new item in the private workspace"
-                                           visible="{Config.instance.space != Config.SPACE_USER}" 
-                                           includeInLayout="{Config.instance.space != Config.SPACE_USER}"
-                                           enabled="{Config.instance.space != Config.SPACE_USER &amp;&amp; dataGrid.selectedItem != null}" 
+                        <mx:Button id = "editAsNew"
+                                       label="Edit as new"   
+                                           toolTip="Edit the selected item as a new item in the private or group workspace"
+                                           visible="{Config.instance.registrySpace.space == Config.SPACE_PUBLISHED}" 
+                                           includeInLayout="{Config.instance.registrySpace.space == Config.SPACE_PUBLISHED}"
+                                           enabled="{Config.instance.registrySpace.space == Config.SPACE_PUBLISHED &amp;&amp; dataGrid.selectedItem != null}" 
                                            click="editItem()" />
                         <mx:Button id="importButton"
                                            label="Import"
+                                           visible="{Config.instance.registrySpace.space == Config.SPACE_PRIVATE}" 
+                                           includeInLayout="{Config.instance.registrySpace.space == Config.SPACE_PRIVATE}"
+                                           enabled="{Config.instance.registrySpace.space == Config.SPACE_PRIVATE}"
                                            toolTip="Import an item from a local file"
                                            click="importItem()" />
                         
                         <mx:HBox id="groupPanel" 
-                                         visible="true"
-                                         enabled="{Config.instance.space == Config.SPACE_USER &amp;&amp; dataGrid.selectedItem != null}" 
+                                         visible="{Config.instance.registrySpace.space != Config.SPACE_PUBLISHED}"
+                                         includeInLayout="{Config.instance.registrySpace.space != Config.SPACE_PUBLISHED}"
+                                         enabled="{Config.instance.registrySpace.space != Config.SPACE_PUBLISHED &amp;&amp; dataGrid.selectedItem != null}" 
                                          >
                                 <mx:ComboBox id="groupBox"
+                                                         visible="{Config.instance.registrySpace.space != Config.SPACE_PUBLISHED}"
+                                                         includeInLayout="{Config.instance.registrySpace.space != Config.SPACE_PUBLISHED}"
+                                                         enabled="{Config.instance.registrySpace.space != Config.SPACE_PUBLISHED &amp;&amp; dataGrid.selectedItem != null}" 
                                                          dataProvider="{groups}"
                                                          />
                                 <mx:Button id="moveToGroupBtn"
                                                    label="Move to group"
+                                                   visible="{Config.instance.registrySpace.space != Config.SPACE_PUBLISHED}"
+                                                   includeInLayout="{Config.instance.registrySpace.space != Config.SPACE_PUBLISHED}"
+                                                   enabled="{Config.instance.registrySpace.space != Config.SPACE_PUBLISHED &amp;&amp; dataGrid.selectedItem != null}" 
                                                    click="onMoveToGroupButtonClicked(event)"/>
                         </mx:HBox>
@@ -273 +319 @@
            </mx:HBox>
                 <comp:RssLinkButton 
-                        enabled ="{Config.instance.space != Config.SPACE_USER}"
-                        visible="{Config.instance.space != Config.SPACE_USER}"
+                        enabled ="{Config.instance.registrySpace.space != Config.SPACE_PRIVATE}"
+                        visible="{Config.instance.registrySpace.space != Config.SPACE_PRIVATE}"
                         contextMenu = "{(new RssDescriptionsContextMenu(typeOfDescription)).cm}"
                         click="goToFeed()"

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

@@ -90 +90 @@
                                 
                                 // Do actual loading
-                                service = new CommentListService(_itemDescription, _itemDescription.space);
+                                service = new CommentListService(_itemDescription);
                                 service.addEventListener(CommentListService.COMMENTS_LOADED, commentsLoaded);
                                 service.load();
                                 
                                 // Rss feed "button"
-                                if  (_itemDescription.space != Config.SPACE_USER){
+                                if  (_itemDescription.isPrivate != Config.SPACE_PRIVATE){
                                         var spacer:Spacer = new Spacer();
                                         spacer.percentWidth=100;

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/common/Group.as

@@ -10 +10 @@
         {
                 [Bindable]
-                public var id:uint;
+                public var id:String;
                 
                 [Bindable]

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/common/ItemDescription.as

@@ -15 +15 @@
                 public var registrationDate:String;
                 public var registrationDateValue:Date;
-                public var space:String;
+                public var isPrivate:Boolean;
                 public var commentsCount:int;
 
@@ -22 +22 @@
                 }
 
-                private function create(itemDescription:XML, infoUrl:String, isProfileValue:Boolean, space:String):void {
+                private function create(itemDescription:XML, infoUrl:String, isProfileValue:Boolean, isPrivate:Boolean):void {
                         this.id = itemDescription.id;
                         this.name = itemDescription.name;                       
@@ -32 +32 @@
                         this.commentsCount = itemDescription.commentsCount;
                         this.isProfile = isProfileValue;
-                        this.space = space;
+                        this.isPrivate = isPrivate;
                         
                         // getting ISO-8601 (GMT/UTC timezone) dates from the server. Need to convert this, flex does not support ISO-8601 times out of the box.
@@ -41 +41 @@
                 }
 
-                public function createProfile(itemDescription:XML, space:String):void {
-                        create(itemDescription, Config.instance.profileInfoUrl, true, space);
+                public function createProfile(itemDescription:XML, isPrivate:Boolean):void {
+                        create(itemDescription, Config.instance.profileInfoUrl, true, isPrivate);
                 }
 
-                public function createComponent(itemDescription:XML, space:String):void {
-                        create(itemDescription, Config.instance.componentInfoUrl, false, space);
+                public function createComponent(itemDescription:XML, isPrivate:Boolean):void {
+                        create(itemDescription, Config.instance.componentInfoUrl, false, isPrivate);
                 }
                 

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/common/ShowInfoPopUp.mxml

@@ -43 +43 @@
                         
                         private function getBookmarkText():String {
-                            if (item.space == Config.SPACE_USER) {
+                            if (item.isPrivate) {
                                 return "Bookmark link (requires login):";
                             } else {
                                 return "Bookmark link:";
                             }
+                
                         }
 

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/common/components/BrowseContextMenu.as

@@ -45 +45 @@
                         setItemStates();
                         
-                        Config.instance.addEventListener(Config.USER_SPACE_TOGGLE_EVENT, setItemStates);
+                        Config.instance.addEventListener(Config.REGISTRY_SPACE_TOGGLE_EVENT, setItemStates);
                 }
 
@@ -77 +77 @@
                 
                 private function setItemStates(event:Event = null):void {
-                        editMenuItem.visible = Config.instance.space == Config.SPACE_USER;
-                        editAsNewMenuItem.visible = (Config.instance.space!= Config.SPACE_USER);
+                        editMenuItem.visible = (Config.instance.registrySpace.space == Config.SPACE_PRIVATE || Config.instance.registrySpace.space == Config.SPACE_GROUP);
+                        editAsNewMenuItem.visible = (Config.instance.registrySpace.space == Config.SPACE_PUBLISHED);
                 }
 

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/common/components/ExpandingComponentLabel.as

@@ -41 +41 @@
                         this.editable = editable;
                         this.componentId = componentId;                 
-                        this.item = Config.instance.getComponentsSrv(Config.SPACE_USER).findDescription(componentId);
-                        if (this.item==null) {
-                                this.item = Config.instance.getComponentsSrv(Config.SPACE_PUBLIC).findDescription(componentId);
-                        }
+                        this.item = Config.instance.getComponentsSrv().findDescription(componentId);                    
                         styleName = StyleConstants.EXPANDING_COMPONENT;
-                        if (item && item.space == Config.SPACE_USER) {
+                        if (item && item.isPrivate) {
                                 this.setStyle("borderColor", StyleConstants.USER_BORDER_COLOR);
                         }
                         if (item!=null)
                                 updateView();
-                        //unfortunately the componend and profile services may overlook components from groups, so we have to ask the backend
-                        else{
-                                Config.instance.getComponentsSrv(Config.SPACE_USER).getComponent(componentId, function(item:ItemDescription):void{
-                                        setStyle("borderColor", StyleConstants.GROUP_BORDER_COLOR);
-                                        setItem(item);
-                                        updateView();
-                                });
-                        }
+                
                 }
                 

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/common/components/LoginLabelButton.as

@@ -35 +35 @@
                         }
                         if (itemId) {
-                                uri.setQueryValue(Config.REGISTRY_PARAM_ITEM, itemId);
+                                uri.setQueryValue(Config.REGISTRY_PARAM_ITEM_ID, itemId);
                         }
                         req.url = uri.toString();

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/common/components/RegistryViewStack.as

@@ -8 +8 @@
         import clarin.cmdi.componentregistry.importer.Importer;
         import clarin.cmdi.componentregistry.services.Config;
+        import clarin.cmdi.componentregistry.services.RegistrySpace;
         
         import flash.events.Event;
@@ -54 +55 @@
                 
                 public function loadStartup():void {
-                        if (Config.instance.space == Config.SPACE_USER && !Credentials.instance.isLoggedIn()) {
+                        if ((Config.instance.registrySpace.space == Config.SPACE_PRIVATE || Config.instance.registrySpace.space == Config.SPACE_GROUP) && !Credentials.instance.isLoggedIn()) {
                                 checkLogin();
                         } else {
@@ -76 +77 @@
                 
                 public function switchToBrowse(itemDescription:ItemDescription):void {
-                        if (itemDescription != null) {
-                                if (Config.instance.space == itemDescription.space) {
-                                        browse.refresh();
-                                } else {
-                                        Config.instance.userSpace = itemDescription.space;
+                        if (itemDescription != null) {                          
+                                
+                                if (itemDescription.isPrivate && Config.instance.registrySpace.space == Config.SPACE_PUBLISHED) {
+                                        Config.instance.registrySpace = new RegistrySpace( Config.SPACE_PRIVATE, "");
+                                } else {                                        
+                                        if (!itemDescription.isPrivate && Config.instance.registrySpace.space != Config.SPACE_PUBLISHED) {
+                                                // the item has been published, go to public space
+                                                Config.instance.registrySpace = new RegistrySpace( Config.SPACE_PUBLISHED, "");
+                                        } else {
+                                                browse.refresh();
+                                        }
                                 }
                                 browse.setSelectedDescription(itemDescription);
-                        }
+                        } 
                         this.selectedItem = itemDescription;
                         this.selectedChild = browse;
@@ -110 +117 @@
                                         itemId = selectedItem.id;
                                 }
-                                loginPanel.show(this, RegistryView(this.selectedChild).getType(), Config.instance.space, itemId);
+                                loginPanel.show(this, RegistryView(this.selectedChild).getType(), Config.instance.registrySpace.space, itemId);
                         }
                 }

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/common/components/RssDescriptionsContextMenu.as

@@ -21 +21 @@
                 
                 override protected function copyRssLink(event:ContextMenuEvent):void {
-                        System.setClipboard(Config.getRssUriDescriptions(_typeOfDescription));
+                        System.setClipboard(Config.getRssUriDescriptions(_typeOfDescription, Config.instance.registrySpace));
                 }
                                 
                 override protected function showRssLink(event:ContextMenuEvent):void{
-                        navigateToURL(new URLRequest(Config.getRssUriDescriptions(_typeOfDescription)), "_blank");
+                        navigateToURL(new URLRequest(Config.getRssUriDescriptions(_typeOfDescription, Config.instance.registrySpace)), "_blank");
                 }
                 
                 override protected function menuUpdateCaption(event:ContextMenuEvent):void {
-                        _showRssLinkMenuItem.caption = Config.getRssUriDescriptions(_typeOfDescription);
+                        _showRssLinkMenuItem.caption = Config.getRssUriDescriptions(_typeOfDescription, Config.instance.registrySpace);
                 }
         }

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/common/components/SpaceSwitch.mxml

@@ -3 +3 @@
                                  dataProvider="{spaces}"
                                  width="110"
-                                 close="userSpaceCloseHandler(event)"
+                                 close="registrySpaceCloseHandler(event)"
                                  initialize="init()"
                                  change="onSelectionChanged(event)"
@@ -15 +15 @@
                         import clarin.cmdi.componentregistry.services.Config;
                         import clarin.cmdi.componentregistry.services.ListUserGroupsMembershipService;
+                        import clarin.cmdi.componentregistry.services.RegistrySpace;
                         
                         import mx.collections.ArrayCollection;
                         import mx.controls.Alert;
                         
-                        private static const USERSPACE_LABEL:String = "Work space";
-                        private static const PUBLICSPACE_LABEL:String = "Public space";
+                        private static const PRIVATE_SPACE_LABEL:String = "Private space";
+                        private static const PUBLIC_SPACE_LABEL:String = "Public space";
                         [Bindable]
-                        public static var spaces:ArrayCollection;
+                        public var spaces:ArrayCollection;
                         
-                        private static function initSpaces():void{
-                                spaces = new ArrayCollection([{label: PUBLICSPACE_LABEL, space: Config.SPACE_PUBLIC, groupId:null}, {label: USERSPACE_LABEL, space: Config.SPACE_USER, groupId:null}]);
+                        //before groups are known
+                        private function initSpaces():void{
+                                spaces = new ArrayCollection([{label: PUBLIC_SPACE_LABEL, space: Config.SPACE_PUBLISHED, groupId:null}, {label: PRIVATE_SPACE_LABEL, space: Config.SPACE_PRIVATE, groupId:null}]);
                         }
                         
                         private function onSelectionChanged(event:Event):void{
-                                var groupId:String = getSelectedGroup(event);
-                                Config.instance.selectedGroup = ComboBox(event.target).selectedItem.groupId;
-                                Config.instance.userSpace = ComboBox(event.target).selectedItem.space;
+                                var space:String = ComboBox(event.target).selectedItem.space;
+                                var groupId:String = ComboBox(event.target).selectedItem.groupId;
+                                if ((groupId != null) && (groupId != "")) {
+                                        space = Config.SPACE_GROUP; 
+                                }
+                                Config.instance.registrySpace = new RegistrySpace(space, groupId);
                         }
+                        
+                
+
+                        public function init():void{
+                                Config.instance.getListUserGroupsMembershipService().addEventListener(ListUserGroupsMembershipService.GROUPS_LOADED, onGroupsLoaded);
+                                Config.instance.getListUserGroupsMembershipService().loadGroupsForUser(); // triggers the event ListUserGroupsMembershipService.GROUPS_LOADED
+                                }
+                        
+                        
                         
                         public function onGroupsLoaded(event:Event):void{
                                 initSpaces();
                                 for each (var group:Group in Config.instance.getListUserGroupsMembershipService().groups) {
-                                        spaces.addItem({label:group.name, space:Config.SPACE_USER, groupId:group.id});                                  
-                                }
-                                if (Config.instance.space == Config.SPACE_PUBLIC)
-                                        this.selectedIndex = 0;
-                                else
-                                if (Config.instance.space == Config.SPACE_USER){
-                                        this.selectedIndex = 1;
-                                }
+                                        spaces.addItem({label:group.name, space:Config.SPACE_GROUP, groupId:group.id});                                 
+                                } 
+                                setSelectedIndex();
                         }
-
-                        public function init():void{
-                                Config.instance.getListUserGroupsMembershipService().addEventListener(ListUserGroupsMembershipService.GROUPS_LOADED, onGroupsLoaded);
-                                Config.instance.getListUserGroupsMembershipService().loadGroupsForUser();
-                        }
-                        
-                        private function getSelectedSpace(event:Event):String{
-                                return ComboBox(event.target).selectedItem.space;
-                        }
-
-                        private function getSelectedGroup(event:Event):String{
-                                var s:String;
-                                var cb:ComboBox = ComboBox(event.target);
-                                return cb.selectedItem.groupId;
-                        }
-
-                        private function userSpaceCloseHandler(event:Event):void {
+                
+                        private function registrySpaceCloseHandler(event:Event):void {
                                 if (Credentials.instance.isLoggedIn()) {
-                                } else if (selectedIndex != 0) {
-                                        selectedIndex = 0;
-                                        new Login().show(this.parent.parent, Config.VIEW_BROWSE, Config.SPACE_USER, null);
+                                } else {
+                                        if (Config.instance.registrySpace.space != Config.SPACE_PUBLISHED) {
+                                                new Login().show(this.parent.parent, Config.VIEW_BROWSE, Config.instance.registrySpace.space, null);
+                                                //setSelectedIndex(); 
+                                        } 
+                                        
                                 }
                         }
                         
-                        public function setSelectedItem(space:String, groupId:String):void{
-                                var index:int = 0;
-                                var found:Boolean = false;
-                                if (groupId)
-                                for each (var item:Object in spaces) {
-                                        if (item.groupId==groupId){
-                                                this.selectedIndex = index;
-                                                found = true;
-                                                break;
+                        public function setSelectedIndex():void{        
+                                
+                                if (Config.instance.registrySpace.space==Config.SPACE_PUBLISHED) {
+                                        this.selectedIndex = 0;
+                                        return;
+                                }
+                                if (Config.instance.registrySpace.space==Config.SPACE_PRIVATE) {
+                                        this.selectedIndex = 1;
+                                        return;
+                                }
+                                
+                                var index:int;
+                                if (Config.instance.registrySpace.space==Config.SPACE_GROUP) {
+                                        for (index=2;index<spaces.length; index++) {
+                                                if (spaces[index].groupId==Config.instance.registrySpace.groupId){
+                                                        trace("indeces:" + index+" " +Config.instance.registrySpace.groupId +" " +spaces[index].groupId);
+                                                        this.selectedIndex = index;
+                                                        return;
+                                                }
                                         }
-                                        index++;
                                 }
-                                index = 0;
-                                if (!found)
-                                for each (var item:Object in spaces) {
-                                        if (item.space==space){
-                                                this.selectedIndex = index;
-                                                break;
+                                
+                                // in case of #$%^-up:                          
+                                var spacesDump:String= spaces[0].space + "; "+spaces[1].space;
+                                for (index=2;index<spaces.length; index++) {
+                                        spacesDump=spacesDump+";  "+spaces[index].space + " " +spaces[index].groupId;
                                         }
-                                        index++;
-                                }
+                                
+                                throw "Cannot indetify the selection index for registry-space combobox. space = "+Config.instance.registrySpace.space+ " group "+Config.instance.registrySpace.groupId + spacesDump;
                         }
+                                
+                        
                 ]]>
         </mx:Script>

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/ComponentSummary.mxml

@@ -29 +29 @@
                                  >                      
                         <mx:Label text="ComponentId: " fontWeight="bold"/>
-                        <mx:Label text="{Config.instance.getComponentsSrv(Config.instance.space).findDescription(component.componentId).name}" />
+                        <mx:Label text="{Config.instance.getComponentsSrv().findDescription(component.componentId).name}" />
                 </mx:HBox>
                 

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/Editor.mxml

@@ -19 +19 @@
                                                                         width="100%"
                                                                         height="90"
-                                                                        saveClick="saveSpec(Config.SPACE_USER, UploadService.UPDATE)"
-                                                                        saveAsNewClick="saveSpec(Config.SPACE_USER, UploadService.NEW)"
+                                                                        saveClick="saveSpec(Config.SPACE_PRIVATE, UploadService.UPDATE)"
+                                                                        saveAsNewClick="saveSpec(Config.SPACE_PRIVATE, UploadService.NEW)"
                                                                         publishClick="publishSpec()"
                                                                         cancelClick="cancel()"

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/EditorAS.as

@@ -13 +13 @@
 import clarin.cmdi.componentregistry.services.Config;
 import clarin.cmdi.componentregistry.services.ProfileInfoService;
+import clarin.cmdi.componentregistry.services.ProfileListService;
+import clarin.cmdi.componentregistry.services.RegistrySpace;
 import clarin.cmdi.componentregistry.services.UploadService;
 
@@ -28 +30 @@
 
 [Bindable]
-private var componentsSrv:ComponentListService = Config.instance.getComponentsSrv(Config.instance.space);
+private var componentsSrv:ComponentListService = Config.instance.getComponentsSrv();
+
+[Bindable]
+private var profilesSrv:ProfileListService = Config.instance.getProfilesSrv();
 
 [Bindable]
@@ -51 +56 @@
         uploadService.addEventListener(UploadCompleteEvent.UPLOAD_COMPLETE, handleSaveComplete);
         uploadService.init(uploadProgress);
-        Config.instance.addEventListener(Config.USER_SPACE_TOGGLE_EVENT, toggleUserSpace);
+        Config.instance.addEventListener(Config.REGISTRY_SPACE_TOGGLE_EVENT, toggleRegistrySpace);
         viewStack = this.parent as RegistryViewStack;
 }
 
 
-private function toggleUserSpace(event:Event):void {
-        componentsSrv = Config.instance.getComponentsSrv(Config.instance.space);
+private function toggleRegistrySpace(event:Event):void {
+        componentsSrv = Config.instance.getComponentsSrv();
+        profilesSrv = Config.instance.getProfilesSrv();
 }
 
 private function determineSaveButtonEnabled():void {
-        buttonBar.saveBtn.enabled = (itemDescription != null && itemDescription.space == Config.SPACE_USER && null != itemDescription.id && null != xmlEditor.cmdSpec.headerId); 
+        buttonBar.saveBtn.enabled =  (itemDescription != null && itemDescription.isPrivate && itemDescription.id != null && xmlEditor.cmdSpec.headerId != null && ( Config.instance.registrySpace.space == Config.SPACE_PRIVATE || Config.SPACE_GROUP));
 }
 
@@ -111 +117 @@
 private function handlePublishAlert(event:CloseEvent):void {
         if (event.detail == Alert.OK) {
-                saveSpec(Config.SPACE_PUBLIC, UploadService.PUBLISH);
-                Config.instance.userSpace = Config.SPACE_PUBLIC;
-        }
-}
-
-private function saveSpec(space:String, uploadAction:int):void {
+                saveSpec(Config.SPACE_PUBLISHED, UploadService.PUBLISH);
+                Config.instance.registrySpace = new RegistrySpace(Config.SPACE_PUBLISHED, "");
+        }
+}
+
+private function saveSpec(registrySpace:String, uploadAction:int):void {
         if (xmlEditor.validate()) {
                 var item:ItemDescription = new ItemDescription();
@@ -124 +130 @@
                 item.groupName = xmlEditor.cmdSpec.groupName;
                 item.domainName = xmlEditor.cmdSpec.domainName;
-                item.space = space;
-                if (itemDescription && itemDescription.space == Config.SPACE_USER) {
+                item.isPrivate = (registrySpace ==  Config.SPACE_PRIVATE || registrySpace == Config.SPACE_GROUP);
+                if (itemDescription && itemDescription.isPrivate ) {
                         item.id = xmlEditor.cmdSpec.headerId;
                 }
                 
                 // Private components that are in updated require usage check call. If in use, the user can choose whether or not to save the changes .
-                if(space == Config.SPACE_USER && uploadAction == UploadService.UPDATE && !item.isProfile){
-                        checkUsage(item, space);
+                if((registrySpace == Config.SPACE_PRIVATE || registrySpace == Config.SPACE_GROUP) && uploadAction == UploadService.UPDATE && !item.isProfile){
+                        checkUsage(item, registrySpace);
                 }else{
                         doUpload(uploadAction,item);
                 }
+                
+                // if we are in public or group space but do "save as new" (i.e. in a private space)
+                // then we need to switch to the private space
+                if (registrySpace == Config.SPACE_PRIVATE) {
+                        Config.instance.registrySpace=new RegistrySpace(Config.SPACE_PRIVATE, "");
+                }
+                
         } else {
                 errorMessageField.text = "Validation errors: red colored fields are invalid.";
@@ -156 +169 @@
  * Calls usage check for the specified component. If in use, asks user whether to proceed; if positive, initiates update.
  */
-private function checkUsage(item:ItemDescription, space:String, uploadAction:int = UploadService.UPDATE):void{
-        var componentUsageService:ComponentUsageService = new ComponentUsageService(item,space);
+private function checkUsage(item:ItemDescription, space:String, uploadAction:int = 0):void{
+        var componentUsageService:ComponentUsageService = new ComponentUsageService(item);
         componentUsageService.addEventListener(ComponentUsageCheckEvent.COMPONENT_IN_USE, 
                 function (event:ComponentUsageCheckEvent):void{
@@ -183 +196 @@
 }
 
-private function handleSaveComplete(event:UploadCompleteEvent):void {
+private function handleSaveComplete(event:UploadCompleteEvent):void {   
         setDescription(event.itemDescription);
-        parentApplication.viewStack.switchToBrowse(event.itemDescription);
+        parentApplication.viewStack.switchToBrowse(event.itemDescription);      
 }
 
@@ -209 +222 @@
 private function onGroupsLoaded(event:Event):void{
         var groups:ArrayCollection = Config.instance.getListGroupsOfItemService().groups;
-        //buttonBar.groupPanel.visible = (Config.instance.space != Config.SPACE_PUBLIC) && Config.instance.getListUserGroupsMembershipService().groups.length>0;
         if (groups.length < 1);
         else{

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/EditorButtonBar.mxml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:VBox xmlns:mx="http://www.adobe.com/2006/mxml"
+                 xmlns:editor="clarin.cmdi.componentregistry.editor.*"
                  width="400"
                  creationComplete="init()"
@@ -13 +14 @@
         </mx:Metadata>
                 
-        <mx:HBox width="400" height="30">
+        <mx:HBox width="800" height="30">
         <mx:Button id="saveBtn"
                            label="Save"
-                           click="dispatchEvent(new MouseEvent('saveClick'))"
-                           enabled="false"
-                           />
+                           click="dispatchEvent(new MouseEvent('saveClick'))"/>
         <mx:Button id="saveAsNewBtn"
-                           label="Save as new"
+                           label="Save as new in your private space"
                            click="dispatchEvent(new MouseEvent('saveAsNewClick'))"/>
         <mx:Button id="publishBtn"
@@ -29 +28 @@
                            label="Cancel"
                            click="dispatchEvent(new MouseEvent('cancelClick'))"/>
-
         </mx:HBox>
         
@@ -35 +33 @@
                 <![CDATA[
                         import clarin.cmdi.componentregistry.services.Config;
-                        
                         import mx.collections.ArrayCollection;
                         import mx.controls.Alert;
@@ -46 +43 @@
                         private static var currentSelectedGroup:String="";
                         
+                        
                         public function init():void{
                         }
+                        
+                        
                         
                 ]]>

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/importer/Importer.mxml

@@ -44 +44 @@
                                                 item.domainName = domainName.selectedItem.data;
                                         item.isProfile = isProfile;
-                                        item.space = Config.SPACE_USER; //We only allow import into workspace it can be published from there.
+                                        item.isPrivate = true; //We only allow import into workspace it can be published from there.
                                         if (loadedXML) {
                                                 updateXMLFromFormFields(loadedXML);

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

@@ -59 +59 @@
                         this.handleXmlResult(resultXml);
                         this.dispatchEvent(new Event(this.successEventName));
+                        
                 }
 

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

@@ -16 +16 @@
                 public var itemDescriptions:ArrayCollection;
                 
-                protected var groupId:String;
+                        
+                protected var registrySpace:RegistrySpace;
                 
-                public function BrowserService(successEvent:String, restUrl:URI, space:String) {
+                public function BrowserService(successEvent:String, restUrl:URI, registrySpace_:RegistrySpace) {
                         super(successEvent, restUrl);
-                        this.space = space;
+                        this.registrySpace = registrySpace_;
                 }
                 
-                public function setGroupId(id:String):void{
-                        this.groupId = id;
+                [Bindable(event=REGISTRY_SPACE_TOGGLE_EVENT)]
+                public function setRegistrySpace(registrySpace_:RegistrySpace):void{
+                        this.registrySpace = registrySpace_;
                 }
+                
 
+                // propagates to two child calsses: component and profile list services
                 override protected function dispatchRequest(url:URI):void {
                         var copy:URI = new URI();
                         copy.copyURI(url);
-                        if (space  == Config.SPACE_USER) {
-                                copy.setQueryValue(Config.PARAM_USERSPACE, "true");
-                        }
-                        if (groupId){
-                                copy.setQueryValue("groupid",groupId);
-                        } else
-                                copy.setQueryValue("groupid",null);
+                        if (this.registrySpace.space) {
+                                copy.setQueryValue(Config.REGISTRY_PARAM_SPACE, this.registrySpace.space);
+                                if ((this.registrySpace.space) == Config.SPACE_GROUP) {
+                                        if (this.registrySpace.groupId == null || this.registrySpace.groupId == "") {
+                                                throw "Group Id is not given";
+                                        }
+                                        copy.setQueryValue(Config.REGISTRY_PARAM_GROUP_ID, this.registrySpace.groupId);
+                                } 
+                        } 
                         super.dispatchRequest(copy);
                 }

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

@@ -19 +19 @@
                 public var comments:ArrayCollection;
                 
-                public function CommentListService(itemDescription:ItemDescription, userSpace:String) {
+                public function CommentListService(itemDescription:ItemDescription) {
                         var url:String;
                         if(itemDescription.isProfile){
@@ -29 +29 @@
                         
                         this.itemDescription = itemDescription;
-                        this.space = userSpace;
                 }
                 

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

@@ -44 +44 @@
                 public function upload(comment:Comment, itemDescription:ItemDescription):void {
                         createAndInitRequest();
-                        var uri:URI = createUri(comment,itemDescription.space);
+                        var uri:URI = createUri(comment, itemDescription);
                         submit(createByteArray(comment.toXml()), uri);
                 }
                 
-                private function createUri(comment:Comment, userSpace:String):URI {
+                private function createUri(comment:Comment, itemDescription:ItemDescription):URI {
                         var uri:URI = null;
-                        if(comment.componentId){
-                                uri = new URI(Config.instance.getComponentCommentsPath(comment.componentId));
+                        if(itemDescription){
+                                if (itemDescription.isProfile) {
+                                uri = new URI(Config.instance.getProfileCommentsPath(itemDescription.id));
+                                } else {
+                                uri = new URI(Config.instance.getComponentCommentsPath(itemDescription.id));
+                                }
                         } else{
                                 return null;
                         }
-                        if (userSpace == Config.SPACE_USER){
-                                uri.setQueryValue(Config.PARAM_USERSPACE, "true");
-                        }
+                        
                         return uri;
                 }

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

@@ -26 +26 @@
                         component.description = item;
                         var url:URI = new URI(item.dataUrl);
-                        if (item.space == Config.SPACE_USER) {
-                                url.setQueryValue(Config.PARAM_USERSPACE, "true");
-                        }
                         dispatchRequest(url);
                 }

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

@@ -13 +13 @@
                 public  const COMPONENTS_LOADED:String = "componentsLoaded";
                 
-                public function ComponentListService(space:String) {
-                        super(COMPONENTS_LOADED, new URI(Config.instance.componentListUrl), space);
+                public function ComponentListService(registrySpace:RegistrySpace) {
+                        super(COMPONENTS_LOADED, new URI(Config.instance.componentListUrl), registrySpace);
                 }
                 
@@ -23 +23 @@
                         for each (var node:XML in nodes) {
                                 var item:ItemDescription = new ItemDescription();
-                                item.createComponent(node, space);
+                                var isPrivate:Boolean = (Config.instance.registrySpace.space == Config.SPACE_PRIVATE || Config.instance.registrySpace.space == Config.SPACE_GROUP);
+                                item.createComponent(node, isPrivate);
                                 tempArray.addItem(item);
                         }

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

@@ -14 +14 @@
                 
                 protected var serviceUrl:URI;
-                protected var space:String;
                 
                 public function ComponentRegistryService(successEvent:String, serviceUrl:URI) {
@@ -21 +20 @@
                 }
                 
+                
                 override protected function dispatchRequest(url:URI):void {
                         url.setQueryValue("unique", new Date().getTime().toString());
-                        if (space == Config.SPACE_USER) {
-                                url.setQueryValue(Config.PARAM_USERSPACE, "true");
-                        } else
-                                url.setQueryValue(Config.PARAM_USERSPACE, null);
+                        if (Config.instance.registrySpace != null) {
+                                url.setQueryValue(Config.REGISTRY_PARAM_SPACE, Config.instance.registrySpace.space);
+                                if (Config.instance.registrySpace.space==Config.SPACE_GROUP) {
+                                        url.setQueryValue(Config.REGISTRY_PARAM_GROUP_ID, Config.instance.registrySpace.groupId);
+                                }
+                        } else {
+                                throw "Registry space is lost."
+                        }
                         super.dispatchRequest(url);
                 }
+                
+                
                 
                 public function load():void {
@@ -35 +41 @@
                 
                 public function getComponent(componentId:String, callback:Function):void{
-                        readService.setUrl(new URI(Config.instance.serviceRootUrl+Config.ITEMS_URL+"/"+componentId+"?userspace=true"));
+                        readService.setUrl(new URI(Config.instance.serviceRootUrl+Config.ITEMS_URL+"/"+componentId));
                         var token:AsyncToken = readService.send();
                         token.addResponder(new Responder(function(resultEvent):void{

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

@@ -27 +27 @@
                 private var service:HTTPService;
                 
-                public function ComponentUsageService(itemDescription:ItemDescription, space:String)
+                public function ComponentUsageService(itemDescription:ItemDescription)
                 {
-                        var url:URI = new URI(Config.instance.componentUsageUrl + itemDescription.id);
-                        if (space == Config.SPACE_USER) {
-                                url.setQueryValue(Config.PARAM_USERSPACE, "true");
-                        }
-
+                        var url:URI = new URI(Config.instance.componentUsageUrl + itemDescription.id);                  
                         service = new HTTPService();
                         service.url = url.toString();

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

@@ -12 +12 @@
         import mx.controls.List;
  
-        [Event(name="userSpaceToggle", type="flash.events.Event")]
+        [Event(name="registrySpaceToggle", type="flash.events.Event")]
         public final class Config extends EventDispatcher {
-                public static const USER_SPACE_TOGGLE_EVENT:String = "userSpaceToggle";
+                public static const REGISTRY_SPACE_TOGGLE_EVENT:String = "registrySpaceToggle";
 
                 public static const CLARIN_REGISTER_URL:String = "http://www.clarin.eu/user/register";
-                public static const PARAM_USERSPACE:String = "userspace";
                 public static const REGISTRY_PARAM_VIEW:String = "view";
                 public static const REGISTRY_PARAM_BROWSER_VIEW:String = "browserview";
-                public static const REGISTRY_PARAM_ITEM:String = "item";
-                public static const REGISTRY_PARAM_SPACE:String = "space";
+                public static const REGISTRY_PARAM_ITEM_ID:String = "itemId";
+                public static const REGISTRY_PARAM_SPACE:String = "registrySpace";
                 public static const REGISTRY_PARAM_DEBUG:String = "debug";
+                public static const REGISTRY_PARAM_GROUP_ID:String = "groupId"
                 
                 // REGISTRY_ID, COMPONENT_PREFIX, and PROFILE_PREFIX must be the same as on the server!
@@ -37 +37 @@
                 public static const VIEW_EDIT:String = "edit";
                 public static const VIEW_IMPORT:String = "import";
-                public static const FLAVOUR_PROFILES = "profiles";
-                public static const FLAVOUR_COMPONENTS = "components";
+                public static const FLAVOUR_PROFILES:String = "profiles";
+                public static const FLAVOUR_COMPONENTS:String = "components";
                 //Possible browser views to start with
                 public static const BROWSER_PANEL_VIEW:String = "view"; 
@@ -44 +44 @@
                 public static const BROWSER_PANEL_COMMENTS:String = "comments"; 
                 //Possible space to start with.
-                public static const SPACE_USER:String = "user";
-                public static const SPACE_PUBLIC:String = "public";
+                public static const SPACE_PRIVATE:String = "private";
+                public static const SPACE_PUBLISHED:String = "published";
+                public static const SPACE_GROUP:String = "group";
                 
                 public static const COMPONENT_LIST_URL:String = "/rest/registry/components";
@@ -66 +67 @@
                 
                 
-                private var _startupItem:String; //item to be selected at startup, can be specified as a url parameter
+                private var _startupItemId:String; //item to be selected at startup, can be specified as a url parameter
                 private var _serviceRootUrl:String = "http://localhost:8080/ComponentRegistry";
                 //Default _serviceRootUrl value can be useful for testing. Set the proper value in your (index.)html that embeds the flash object.
@@ -73 +74 @@
                 private var _view:String = VIEW_BROWSE;
                 private var _browserPanel:String = BROWSER_PANEL_VIEW;
-                private var _space:String = SPACE_PUBLIC;
-                private var _selectedGroup:String = "";
+                private var _registrySpace:RegistrySpace = new RegistrySpace(SPACE_PUBLISHED, "");
                 private var _debug:Boolean = false;
-                private var _activeFlavour = FLAVOUR_PROFILES;
-                
-                private var publicComponentsSrv:ComponentListService;
-                private var publicProfilesSrv:ProfileListService;
-                private var userComponentsSrv:ComponentListService;
-                private var userProfilesSrv:ProfileListService;
+                private var _activeFlavour:String = FLAVOUR_PROFILES;
+                
+                private var componentsSrv:ComponentListService;
+                private var profilesSrv:ProfileListService;
                 private var listUserGroupsMembershipService:ListUserGroupsMembershipService;
                 private var listGroupsOfItemService:ListGroupsOfItemService;
@@ -103 +101 @@
                 }
                 
-                public function set selectedGroup(value:String):void{
-                        _selectedGroup=value;
-                }
-
-                public function get selectedGroup():String{
-                        return _selectedGroup;
-                }
+                
 
                 private function init(applicationParameters:Object):void {
-                        var serviceRootUrl:String = applicationParameters.serviceRootUrl;
-                        if (serviceRootUrl) {
-                                _serviceRootUrl = serviceRootUrl;
-                        }
-                        var item:String = applicationParameters.item;
-                        if (item) {
-                                _startupItem = item;
-                        }
-                        var view:String = applicationParameters.view;
-                        if (view) {
-                                _view = view;
-                        }
-                        var browserPanel:String = applicationParameters.browserview;
-                        if(browserPanel){
-                                _browserPanel = browserPanel;
-                        }
-                        var space:String = applicationParameters.space;
-                        if (space) {
-                                _space = space;
-                        }
-                        var debug:int = applicationParameters.debug;
-                        if(debug) {
-                                _debug = Boolean(debug);
-                        }
-                        
-                        publicProfilesSrv = new ProfileListService(SPACE_PUBLIC);
-                        userProfilesSrv = new ProfileListService(SPACE_USER);
-                        publicComponentsSrv = new ComponentListService(SPACE_PUBLIC);
-                        userComponentsSrv = new ComponentListService(SPACE_USER);
+                        var serviceRootUrl_:String = applicationParameters.serviceRootUrl;
+                        if (serviceRootUrl_) {
+                                _serviceRootUrl = serviceRootUrl_;
+                        }
+                        var itemId:String = applicationParameters.itemId;
+                        if (itemId) {
+                                _startupItemId = itemId;
+                        }
+                        var view_:String = applicationParameters.view;
+                        if (view_) {
+                                _view = view_;
+                        }
+                        var browserPanel_:String = applicationParameters.browserview;
+                        if(browserPanel_){
+                                _browserPanel = browserPanel_;
+                        }
+                        
+                        var space_:String = applicationParameters.registrySpace;
+                        if (!space_) {
+                                space_ = SPACE_PUBLISHED;
+                        };
+                        
+                        var groupId_:String = applicationParameters.groupId;
+                        if (!groupId_) {
+                                groupId_ = "";
+                        };
+                        
+                        registrySpace = new RegistrySpace(space_, groupId_);
+                        
+                        var debug_:int = applicationParameters.debug;
+                        if(debug_) {
+                                _debug = Boolean(debug_);                               
+                        }
+                        
                         listUserGroupsMembershipService = new ListUserGroupsMembershipService();
-                        listGroupsOfItemService = new ListGroupsOfItemService();
+                        listGroupsOfItemService = new ListGroupsOfItemService();                        
+                        
                 }
                 
@@ -149 +147 @@
                 }
 
-                public function getProfilesSrv(userSpace:String):ProfileListService{
-                        if (userSpace == SPACE_USER) {
-                                userProfilesSrv.setGroupId(_selectedGroup);
-                                return userProfilesSrv;
-                        }
-                        else
-                        if (userSpace == SPACE_PUBLIC) {
-                                return publicProfilesSrv;
-                        }
-                        else throw "No selection";
-                }
-                
-                public function getComponentsSrv(userSpace:String):ComponentListService{
-                        if (userSpace == SPACE_USER) {
-                                userComponentsSrv.setGroupId(_selectedGroup);
-                                return userComponentsSrv;
-                        }
-                        else
-                        if (userSpace == SPACE_PUBLIC) {
-                                return publicComponentsSrv;
-                        }
-                        else throw "unknown component server";
+                public function getProfilesSrv():ProfileListService{
+                                return profilesSrv;             
+                }
+                
+                public function getComponentsSrv():ComponentListService{                
+                                return componentsSrv;
                 }
                 
@@ -246 +228 @@
                 }
 
-                public function set userSpace(userSpace:String):void {
-                        _space = userSpace;
-                        if (userSpace == Config.SPACE_PUBLIC){
-                                _selectedGroup = "";
-                        }
-                        dispatchEvent(new Event(USER_SPACE_TOGGLE_EVENT));
+                public function set registrySpace(registrySpace:RegistrySpace):void {
+                        _registrySpace = registrySpace;
+                        profilesSrv = new ProfileListService(registrySpace);                    
+                        componentsSrv = new ComponentListService(registrySpace);
+                        
+                        // everything is ready to open new componentBrowser instance
+                        dispatchEvent(new Event(REGISTRY_SPACE_TOGGLE_EVENT));
                 }
 
                 public function get startupItem():String {
-                        return _startupItem;
+                        return _startupItemId;
                 }
 
@@ -266 +249 @@
                 }
 
-                [Bindable(event="userSpaceToggle")]
-                public function get space():String {
-                        return _space;
+                [Bindable(event=REGISTRY_SPACE_TOGGLE_EVENT)]
+                public function get registrySpace():RegistrySpace {
+                        return _registrySpace;
                 }
                 
@@ -276 +259 @@
 
                 public static function getBookmarkUrl(item:ItemDescription):String {
-                        var uri:URI = new URI(Config.instance.serviceRootUrl);
-                    uri.setQueryValue(REGISTRY_PARAM_ITEM, item.id);
-                        if (item.space == Config.SPACE_USER) {
-                                uri.setQueryValue(REGISTRY_PARAM_SPACE, SPACE_USER);
-                        }
+                        var uri:URI = new URI(Config.instance.serviceRootUrl);  
+                        uri.setQueryValue(REGISTRY_PARAM_SPACE, Config.instance.registrySpace.space);
+                        if (Config.instance.registrySpace.space == SPACE_GROUP){
+                                uri.setQueryValue(REGISTRY_PARAM_GROUP_ID, Config.instance.registrySpace.groupId);                              
+                        }
+                    uri.setQueryValue(REGISTRY_PARAM_ITEM_ID, item.id);
                         return uri.toString();
                 }
                 
-                public static function getRssUriDescriptions(typeOfDescription:String):String {
+                public static function getRssUriDescriptions(typeOfDescription:String, registrySpace:RegistrySpace):String {
                         var baseUri:String = (new URI(Config.instance.serviceRootUrl)).toString();
                         var result:String=baseUri+"/rest/registry/"+typeOfDescription+"/rss";
-                        if (Config.instance.space == SPACE_USER) result=result+"?userspace=true";
+                        if (registrySpace.space == Config.SPACE_PRIVATE) {
+                                result = result + "?registrySpace=private";
+                        }
+                        if (registrySpace.space == Config.SPACE_GROUP) {
+                                result = result + "?registrySpace=group&groupId="+registrySpace.groupId;
+                        }
                         return result;
                 }
@@ -296 +285 @@
                         if (item.isProfile) {typeOfDescription="profiles/";}
                         else typeOfDescription="components/";
-                        var result:String=baseUri+"/rest/registry/"+typeOfDescription+item.id+"/comments/rss";
-                        if (item.space == Config.SPACE_USER) result=result+"?userspace=true";
+                        var result:String=baseUri+"/rest/registry/"+typeOfDescription+item.id+"/comments/rss";                  
                         return result;
                 }

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

@@ -37 +37 @@
                         
                         var deleteUrl:URI = new URI(item.dataUrl);
-                        if (item.space == Config.SPACE_USER) {
-                                deleteUrl.setQueryValue(Config.PARAM_USERSPACE, "true");
+                        
+                        if (item.isProfile) {
+                                sendDelete(deleteUrl);
+                                return;
                         }
                         
-                        var usageService:ComponentUsageService = new ComponentUsageService(item, item.space);
+                        var usageService:ComponentUsageService = new ComponentUsageService(item);
                         usageService.addEventListener(ComponentUsageCheckEvent.COMPONENT_IN_USE, 
                                 function (event:ComponentUsageCheckEvent):void{
@@ -50 +52 @@
                                         }
                                 });
-                        usageService.checkUsage();
+                        usageService.checkUsage(); // dispatching the event
                 }
                 
@@ -64 +66 @@
                 public function deleteComment(comment:Comment):void {
                         CursorManager.setBusyCursor();
-                        var url:URI = new URI(comment.dataUrl);
-                        if (comment.itemDescription.space == Config.SPACE_USER) {
-                                url.setQueryValue(Config.PARAM_USERSPACE, "true");
-                        }
+                        var url:URI = new URI(comment.dataUrl);         
                         sendDelete(url);
                 }

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

@@ -23 +23 @@
                 }
 
-                public function loadGroupsForUser():void{
-                        if (groups!=null){
-                                this.dispatchEvent(new Event(this.successEventName));
-                                return;
-                        }
+                public function loadGroupsForUser():void{                       
                         groups = new ArrayCollection();
                         var url:String;
                         url = Config.instance.getListGroupsOfUserPath();
                         dispatchRequest(new URI(url));
+                        
                 }
                 

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

@@ -22 +22 @@
                         profile = new Profile();
                         profile.description = item;
-                        var url:URI = new URI(item.dataUrl);
-                        if (item.space == Config.SPACE_USER) {
-                                url.setQueryValue(Config.PARAM_USERSPACE, "true");
-                        }
+                        var url:URI = new URI(item.dataUrl);                    
                         super.dispatchRequest(url);
                 }

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

@@ -11 +11 @@
                 public const PROFILES_LOADED:String = "profilesLoaded";
                 
-                public function ProfileListService(space:String) {
-                        super(PROFILES_LOADED, new URI(Config.instance.profileListUrl), space);
+                public function ProfileListService(registrySpace:RegistrySpace) {
+                        super(PROFILES_LOADED, new URI(Config.instance.profileListUrl), registrySpace);
                 }
                 
@@ -20 +20 @@
                         for each (var node:XML in nodes) {
                                 var item:ItemDescription = new ItemDescription();
-                                item.createProfile(node, space);
+                                var isPrivate:Boolean = (Config.instance.registrySpace.space == Config.SPACE_PRIVATE || Config.instance.registrySpace.space == Config.SPACE_GROUP);
+                                item.createProfile(node, isPrivate);
                                 tempArray.addItem(item);
                         }

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

@@ -108 +108 @@
                         switch (action) {
                                 case UPDATE:
-                                        uri = new URI(uriBase + "/" + desc.id + "/update");
-                                        if (desc.space  == Config.SPACE_USER) {
-                                                uri.setQueryValue(Config.PARAM_USERSPACE, "true");
-                                        }
+                                        uri = new URI(uriBase + "/" + desc.id + "/update");                                     
                                         break;
                                 case NEW:
                                         uri = new URI(uriBase);
-                                        if (desc.space == Config.SPACE_USER) {
-                                                uri.setQueryValue(Config.PARAM_USERSPACE, "true");
-                                        }
                                         break;
                                 case PUBLISH:
@@ -237 +231 @@
                         if (response.@registered == true) {
                                 var item:ItemDescription = new ItemDescription();
-                                var isInUserSpace:Boolean = response.@isInUserSpace == true;
+                                var isPrivate:Boolean = response.@isPrivate == true;
                                 if (response.@isProfile == true) {
-                                        item.createProfile(response.description[0], isInUserSpace?Config.SPACE_USER:Config.SPACE_PUBLIC);
+                                        item.createProfile(response.description[0], isPrivate);
                                 } else {
-                                        item.createComponent(response.description[0], isInUserSpace?Config.SPACE_USER:Config.SPACE_PUBLIC);
+                                        item.createComponent(response.description[0], isPrivate);
                                 }
                                 dispatchEvent(new UploadCompleteEvent(item));

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/main.mxml

@@ -9 +9 @@
         <mx:Script>
                 <![CDATA[
-                        import com.flexspy.FlexSpy;
-                        
-                        import mx.controls.Button;
-                        import mx.managers.PopUpManager;
-                        
                         import clarin.cmdi.componentregistry.common.AboutPopup;
                         import clarin.cmdi.componentregistry.common.Credentials;
@@ -19 +14 @@
                         import clarin.cmdi.componentregistry.services.Config;
                         import clarin.cmdi.componentregistry.services.PingSessionService;
+                        import clarin.cmdi.componentregistry.services.RegistrySpace;
                         import clarin.cmdi.componentregistry.services.remote.ClientServiceFactoryImpl;
+                        
+                        import com.flexspy.FlexSpy;
+                        
+                        import mx.controls.Button;
+                        import mx.managers.PopUpManager;
                         
                         import org.hasseg.externalMouseWheel.ExternalMouseWheelSupport;
@@ -61 +62 @@
                                 sessionPinger = PingSessionService.INSTANCE
                                 sessionPinger.startPinging();
-                                if (Credentials.instance.isLoggedIn() && (Config.instance.space == Config.SPACE_USER)) {
-                                        Config.instance.userSpace = Config.SPACE_USER;
-                                }
+                                /* if (Credentials.instance.isLoggedIn() && (Config.instance.registrySpace.space == Config.SPACE_PRIVATE || Config.instance.registrySpace.space == Config.SPACE_GROUP)) {
+                                        Config.instance.registrySpace= new RegistrySpace(Config.SPACE_PRIVATE, "");
+                                } */
                                 viewStack.loadStartup();