Changeset 238
- Timestamp:
- 03/17/10 13:03:11 (14 years ago)
- Location:
- ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry
- Files:
-
- 3 added
- 1 deleted
- 15 edited
- 3 moved
Legend:
- Unmodified
- Added
- Removed
-
ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/browser/CMDComponentXMLBrowser.as
r206 r238 1 package clarin.cmdi.componentregistry.common.components { 2 import clarin.cmdi.componentregistry.common.ComponentMD; 1 package clarin.cmdi.componentregistry.browser { 3 2 import clarin.cmdi.componentregistry.common.StyleConstants; 4 3 import clarin.cmdi.componentregistry.common.components.ConceptLinkRenderer; 4 import clarin.cmdi.componentregistry.common.components.ExpandingComponentLabel; 5 5 6 import flash.display.DisplayObject; 6 7 import mx.collections.XMLListCollection;8 import mx.controls.ComboBox;9 7 10 8 /** -
ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/browser/XMLBrowser.as
r225 r238 1 package clarin.cmdi.componentregistry.common.components { 2 import clarin.cmdi.componentregistry.editor.CMDSpecRenderer; 1 package clarin.cmdi.componentregistry.browser { 3 2 import clarin.cmdi.componentregistry.common.ComponentMD; 4 3 import clarin.cmdi.componentregistry.common.StyleConstants; 4 import clarin.cmdi.componentregistry.editor.CMDSpecRenderer; 5 5 import clarin.cmdi.componentregistry.editor.model.CMDAttribute; 6 6 import clarin.cmdi.componentregistry.editor.model.CMDComponent; 7 7 import clarin.cmdi.componentregistry.editor.model.CMDComponentElement; 8 8 import clarin.cmdi.componentregistry.editor.model.CMDSpec; 9 9 10 10 import flash.display.DisplayObject; 11 11 import flash.utils.getTimer; 12 12 13 13 import mx.collections.ArrayCollection; 14 14 import mx.collections.XMLListCollection; … … 26 26 public class XMLBrowser extends Form implements IFocusManagerComponent, CMDSpecRenderer { 27 27 28 28 //Label names 29 29 public static const CONCEPTLINK:String = "ConceptLink"; 30 30 public static const COMPONENT:String = "Component"; … … 77 77 78 78 protected function createAndAddFormChild(name:String, value:String):void { 79 if (value != "" && value != null) { //only add if we have somekind of value79 if (value) { //only add if we have somekind of value 80 80 addFormChild(createFormItem(name, value)); 81 81 } … … 134 134 protected function createAndAddValueScheme(value:String = null, valuePattern:String = null, valueList:XMLListCollection = null):void { 135 135 var formItem:FormItem; 136 if (value != null && value != "") { 137 formItem = createFormItem("ValueScheme", value); 138 } else if (valuePattern != null && valuePattern != "") { 139 formItem = createFormItem("ValueScheme", valuePattern); 140 } else { 136 if (valueList) { 141 137 formItem = createFormItem("ValueScheme", null); 142 138 var enumeration:DisplayObject = createEnumeration(valueList); 143 139 formItem.addChild(enumeration); 140 } else if (valuePattern) { 141 formItem = createFormItem("ValueScheme", valuePattern); 142 } else { 143 formItem = createFormItem("ValueScheme", value); 144 144 } 145 145 addFormChild(formItem); … … 147 147 148 148 private function createEnumeration(enumeration:XMLListCollection):DisplayObject { 149 var result:ComboBox = createValueSchemeComboBox(); 150 result.dataProvider = enumeration; 151 return result; 152 } 153 154 public static function createValueSchemeComboBox():ComboBox { 149 155 var result:ComboBox = new ComboBox(); 150 result.dataProvider = enumeration;151 156 result.labelFunction = function(item:Object):String { 152 157 var xmlItem:XML = item as XML; 153 if (item. .hasOwnProperty("@" + ComponentMD.APP_INFO)) {158 if (item.hasOwnProperty("@" + ComponentMD.APP_INFO) && xmlItem.attribute(ComponentMD.APP_INFO) != "") { //TODO PD what about conceptlinks? also not shown in Browser. 154 159 return xmlItem.attribute(ComponentMD.APP_INFO) + " - " + xmlItem.text(); 155 160 } else { … … 159 164 return result; 160 165 } 161 162 166 163 167 /** … … 170 174 field.label = name; 171 175 field.styleName = StyleConstants.XMLBROWSER_FIELD; 172 if (value 173 174 176 if (value != null && value != "") { 177 var fieldValue:DisplayObject = createFormItemFieldValue(name, value); 178 field.addChild(fieldValue); 175 179 } 176 180 return field; -
ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/browser/xmlBrowsePanel.mxml
r206 r238 1 1 <?xml version="1.0" encoding="utf-8"?> 2 2 <mx:Canvas xmlns:mx="http://www.adobe.com/2006/mxml" 3 xmlns: comp="clarin.cmdi.componentregistry.common.components.*" >3 xmlns:browser="clarin.cmdi.componentregistry.browser.*" > 4 4 <mx:Script> 5 5 <![CDATA[ … … 9 9 10 10 <mx:XML id="cmdComponent"/> 11 < comp:CMDComponentXMLBrowser id="xmlBrowse"11 <browser:CMDComponentXMLBrowser id="xmlBrowse" 12 12 cmdSpec="{CMDModelFactory.createModel(cmdComponent)}" 13 13 width="100%" -
ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/common/components/ExpandingComponentLabel.as
r206 r238 1 1 package clarin.cmdi.componentregistry.common.components { 2 import clarin.cmdi.componentregistry. editor.CMDSpecRenderer;2 import clarin.cmdi.componentregistry.browser.CMDComponentXMLBrowser; 3 3 import clarin.cmdi.componentregistry.common.Component; 4 4 import clarin.cmdi.componentregistry.common.ItemDescription; 5 5 import clarin.cmdi.componentregistry.common.StyleConstants; 6 import clarin.cmdi.componentregistry.editor.CMDComponentXMLEditor; 7 import clarin.cmdi.componentregistry.editor.CMDSpecRenderer; 6 8 import clarin.cmdi.componentregistry.editor.model.CMDModelFactory; 7 9 import clarin.cmdi.componentregistry.services.ComponentInfoService; … … 32 34 styleName = StyleConstants.EXPANDING_COMPONENT; 33 35 } 34 36 35 37 protected override function createChildren():void { 36 38 super.createChildren(); 37 39 var id:Label = new Label(); 38 40 id.text = componentId; … … 40 42 id.addEventListener(MouseEvent.MOUSE_OVER, mouseOver); 41 43 id.addEventListener(MouseEvent.MOUSE_OUT, mouseOut); 42 44 addChild(id); 43 45 } 44 46 45 47 private function handleClick(event:MouseEvent):void { 46 48 if (isExpanded) { -
ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/AttributeListEdit.as
r224 r238 1 1 package clarin.cmdi.componentregistry.editor { 2 2 import clarin.cmdi.componentregistry.common.StyleConstants; 3 import clarin.cmdi.componentregistry.common.components.CMDComponentXMLEditor;4 3 import clarin.cmdi.componentregistry.editor.model.CMDAttribute; 5 4 6 import flash.display.DisplayObject;7 5 import flash.events.Event; 8 6 import flash.events.MouseEvent; 9 7 8 import mx.binding.utils.BindingUtils; 10 9 import mx.collections.ArrayCollection; 10 import mx.collections.XMLListCollection; 11 11 import mx.containers.Form; 12 12 import mx.containers.FormItem; … … 49 49 attributeBox.styleName = StyleConstants.XMLBROWSER; 50 50 addEditBar(attribute, attributeBox); 51 if (attribute.type != null) { 52 attributeBox.addChild(new FormItemInputLine("Type", attribute.type, function(val:String):void { 53 attribute.type = val; 54 })); 55 } else { 56 attributeBox.addChild(createAndAddValueScheme(attribute)); 57 } 51 attributeBox.addChild(createAndAddValueScheme(attribute)); 58 52 return attributeBox; 59 53 } 60 54 61 55 private function createAndAddValueScheme(attribute:CMDAttribute):UIComponent { 56 var valueSchemeInput:ValueSchemeInput = new ValueSchemeInput("Type"); 57 BindingUtils.bindSetter(function(val:String):void { 58 attribute.valueSchemePattern = val; 59 attribute.valueSchemeEnumeration = null; 60 attribute.type = ""; 61 }, valueSchemeInput, "valueSchemePattern"); 62 BindingUtils.bindSetter(function(val:String):void { 63 attribute.type = val; 64 attribute.valueSchemePattern =""; 65 attribute.valueSchemeEnumeration = null; 66 }, valueSchemeInput, "valueSchemeSimple"); 67 BindingUtils.bindSetter(function(val:XMLListCollection):void { 68 attribute.valueSchemeEnumeration = val; 69 attribute.type = ""; 70 attribute.valueSchemePattern = ""; 71 }, valueSchemeInput, "valueSchemeEnumeration"); 62 72 if (attribute.valueSchemeEnumeration == null) { 63 return new FormItemInputLine("ValueScheme", attribute.valueSchemePattern, function(val:String):void { 64 attribute.valueSchemePattern = val; 65 }); 73 if (attribute.valueSchemePattern != null) { 74 valueSchemeInput.valueSchemePattern = attribute.valueSchemePattern; 75 } else { 76 valueSchemeInput.valueSchemeSimple = attribute.type; 77 } 66 78 } else { 67 return new EnumerationEdit(attribute.valueSchemeEnumeration, this);79 valueSchemeInput.valueSchemeEnumeration = attribute.valueSchemeEnumeration; 68 80 } 81 return valueSchemeInput; 69 82 } 70 83 -
ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/CMDComponentXMLEditor.as
r224 r238 1 package clarin.cmdi.componentregistry.common.components { 1 package clarin.cmdi.componentregistry.editor { 2 import clarin.cmdi.componentregistry.browser.XMLBrowser; 2 3 import clarin.cmdi.componentregistry.common.ItemDescription; 3 4 import clarin.cmdi.componentregistry.common.StyleConstants; 4 import clarin.cmdi.componentregistry.editor.CMDSpecRenderer;5 import clarin.cmdi.componentregistry.editor.ComponentEdit;6 import clarin.cmdi.componentregistry.editor.FormItemInputLine;7 import clarin.cmdi.componentregistry.editor.FormItemInputText;8 5 import clarin.cmdi.componentregistry.editor.model.CMDComponent; 9 6 import clarin.cmdi.componentregistry.editor.model.CMDSpec; … … 105 102 spec.headerName = val; 106 103 })); 107 addChild(new FormItemInputLine("Id", spec.headerId, function(val:String):void {104 var idInput:FormItemInputLine = new FormItemInputLine("Id", spec.headerId, function(val:String):void { 108 105 spec.headerId = val; 109 })); 106 }, false); 107 idInput.toolTip="Id will be generated"; 108 addChild(idInput); 110 109 addChild(new FormItemInputText(XMLBrowser.DESCRIPTION, spec.headerDescription, function(val:String):void { 111 110 spec.headerDescription = val; -
ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/ComponentEdit.as
r224 r238 1 1 package clarin.cmdi.componentregistry.editor { 2 import clarin.cmdi.componentregistry.browser.XMLBrowser; 2 3 import clarin.cmdi.componentregistry.common.ItemDescription; 3 4 import clarin.cmdi.componentregistry.common.StyleConstants; 4 import clarin.cmdi.componentregistry.common.components.CMDComponentXMLEditor;5 5 import clarin.cmdi.componentregistry.common.components.ExpandingComponentLabel; 6 import clarin.cmdi.componentregistry.common.components.XMLBrowser;7 6 import clarin.cmdi.componentregistry.editor.model.CMDComponent; 8 7 import clarin.cmdi.componentregistry.editor.model.CMDComponentElement; -
ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/Editor.mxml
r224 r238 3 3 xmlns:browser="clarin.cmdi.componentregistry.browser.*" 4 4 xmlns:common="clarin.cmdi.componentregistry.common.*" 5 xmlns: comp="clarin.cmdi.componentregistry.common.components.*"5 xmlns:editor="clarin.cmdi.componentregistry.editor.*" 6 6 width="100%" 7 7 height="100%" … … 35 35 <mx:VBox width="100%" 36 36 height="80%"> 37 < comp:CMDComponentXMLEditor id="xmlEditor"38 cmdSpec="{cmdSpec}"39 editorChange="handleEditorChange(event)"/>37 <editor:CMDComponentXMLEditor id="xmlEditor" 38 cmdSpec="{cmdSpec}" 39 editorChange="handleEditorChange(event)"/> 40 40 <mx:VBox styleName="borderStyles"> 41 41 <mx:Label text="Drag items onto edit canvas"/> 42 42 <mx:HBox id="palette"> 43 43 <mx:Canvas width="60" … … 46 46 borderStyle="solid" 47 47 id="ComponentDrag" 48 mouseMove="enableComponentDrag(event);" 49 > 48 mouseMove="enableComponentDrag(event);"> 50 49 </mx:Canvas> 51 50 <mx:Canvas width="45" -
ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/EditorManager.as
r224 r238 1 1 package clarin.cmdi.componentregistry.editor { 2 2 3 /** 4 * Manages static Editor components5 * 6 **/ 3 /** 4 * Manages static Editor components 5 * 6 **/ 7 7 public final class EditorManager { 8 8 9 9 private static var _isocatSearchPopUp:IsocatSearchPopUp; 10 private static var _valueSchemePopUp:ValueSchemePopUp; 10 11 11 12 public static function getIsocatSearchPopUp():IsocatSearchPopUp { … … 16 17 } 17 18 19 public static function getValueSchemePopUp():ValueSchemePopUp { 20 if (!_valueSchemePopUp) { 21 _valueSchemePopUp = new ValueSchemePopUp(); 22 } 23 return _valueSchemePopUp; 24 } 25 18 26 } 19 27 } -
ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/ElementEdit.as
r224 r238 1 1 package clarin.cmdi.componentregistry.editor { 2 import clarin.cmdi.componentregistry.browser.XMLBrowser; 2 3 import clarin.cmdi.componentregistry.common.StyleConstants; 3 import clarin.cmdi.componentregistry.common.components.XMLBrowser;4 4 import clarin.cmdi.componentregistry.editor.model.CMDComponentElement; 5 5 … … 7 7 import flash.events.MouseEvent; 8 8 9 import mx.binding.utils.BindingUtils; 10 import mx.binding.utils.ChangeWatcher; 11 import mx.collections.XMLListCollection; 9 12 import mx.containers.Form; 10 13 import mx.containers.FormItem; … … 82 85 83 86 private function createAndAddValueScheme():void { 87 var valueSchemeInput:ValueSchemeInput = new ValueSchemeInput("Type"); 88 BindingUtils.bindSetter(function(val:String):void { 89 _element.valueSchemePattern = val; 90 _element.valueSchemeSimple = ""; 91 _element.valueSchemeEnumeration = null; 92 }, valueSchemeInput, "valueSchemePattern"); 93 BindingUtils.bindSetter(function(val:String):void { 94 _element.valueSchemeSimple = val; 95 _element.valueSchemeEnumeration = null; 96 _element.valueSchemePattern = ""; 97 }, valueSchemeInput, "valueSchemeSimple"); 98 BindingUtils.bindSetter(function(val:XMLListCollection):void { 99 _element.valueSchemeEnumeration = val; 100 _element.valueSchemeSimple = ""; 101 _element.valueSchemePattern = ""; 102 }, valueSchemeInput, "valueSchemeEnumeration"); 103 84 104 if (_element.valueSchemeEnumeration == null) { 85 105 if (_element.valueSchemePattern != null) { 86 addChild(new FormItemInputLine("ValueScheme", _element.valueSchemePattern, function(val:String):void { 87 _element.valueSchemeSimple = val; 88 })); 106 valueSchemeInput.valueSchemePattern = _element.valueSchemePattern; 89 107 } else { 90 addChild(new FormItemInputLine("ValueScheme", _element.valueSchemeSimple, function(val:String):void { 91 _element.valueSchemeSimple = val; 92 })); 108 valueSchemeInput.valueSchemeSimple = _element.valueSchemeSimple; 93 109 } 94 110 } else { 95 addChild(new EnumerationEdit(_element.valueSchemeEnumeration, this)); 111 valueSchemeInput.valueSchemeEnumeration = _element.valueSchemeEnumeration; 112 96 113 } 114 addChild(valueSchemeInput); 97 115 } 98 116 -
ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/FormItemInputLine.as
r224 r238 9 9 private var editField:TextInput = new TextInput(); 10 10 11 public function FormItemInputLine(name:String, value:String, bindingFunction:Function ) {11 public function FormItemInputLine(name:String, value:String, bindingFunction:Function, editable:Boolean=true) { 12 12 super(); 13 13 label = name; … … 16 16 editField.width = 300; 17 17 editField.text = value; 18 editField.editable=editable; 18 19 BindingUtils.bindSetter(bindingFunction, editField, "text"); 19 20 } -
ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/IsocatSearchPopUp.mxml
r224 r238 4 4 showCloseButton="true" 5 5 close="cleanUp();" 6 label="Search isocat..."7 creationComplete="PopUpManager.centerPopUp(this)">6 creationComplete="PopUpManager.centerPopUp(this)" 7 title="Search in Isocat.org"> 8 8 9 9 <mx:Script> … … 20 20 21 21 private function cleanUp():void { 22 searchService.close(); 22 23 PopUpManager.removePopUp(this); 23 24 } … … 79 80 </mx:columns> 80 81 </mx:DataGrid> 81 <mx:HBox> 82 <mx:HBox width="100%"> 83 <mx:Spacer width="100%"/> 82 84 <mx:Button label="OK" 83 85 click="setItem()"/> -
ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/model/CMDAttribute.as
r224 r238 13 13 public var valueSchemeEnumeration:XMLListCollection; // enumeration 14 14 15 //TODO Patrick see element?? check usage in xmlBrowser16 17 18 15 public function CMDAttribute() { 19 16 } 20 17 21 18 public function toXml():XML { 22 var result:XML = <Attribute></Attribute>;19 var result:XML = <Attribute></Attribute>; 23 20 result.appendChild(<Name>{name}</Name>); 24 21 if (valueSchemePattern) { 25 result.appendChild(< pattern>{valueSchemePattern}</pattern>);22 result.appendChild(<ValueScheme><pattern>{valueSchemePattern}</pattern></ValueScheme>); 26 23 } else if (valueSchemeEnumeration) { 27 result.appendChild(<enumeration>{valueSchemeEnumeration}</enumeration>); 24 var enumerationScheme:XML = <enumeration></enumeration>; 25 for each(var item:XML in valueSchemeEnumeration) { 26 enumerationScheme.appendChild(item); 27 } 28 result.appendChild(<ValueScheme>{enumerationScheme}</ValueScheme>); 28 29 } else { 29 30 result.appendChild(<Type>{type}</Type>); -
ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/model/CMDAttributeTest.as
r224 r238 1 1 package clarin.cmdi.componentregistry.editor.model { 2 import clarin.cmdi.componentregistry.common.ComponentMD; 3 2 4 import flexunit.framework.TestCase; 3 5 import flexunit.framework.TestSuite; 6 7 import mx.collections.XMLListCollection; 4 8 5 9 public class CMDAttributeTest extends TestCase { … … 23 27 } 24 28 25 //public function testToXmlValueSchemePattern():void {} 26 //public function testToXmlValueSchemeEnumeration():void {} 29 public function testToXmlValueSchemePattern():void { 30 var result:CMDAttribute = new CMDAttribute(); 31 result.name = "aap"; 32 result.valueSchemePattern = "[a-zA-Z]+"; 33 var expected:XML = <Attribute> 34 <Name>aap</Name> 35 <ValueScheme> 36 <pattern>[a-zA-Z]+</pattern> 37 </ValueScheme> 38 </Attribute>; 39 assertEquals(expected.toXMLString(), result.toXml().toXMLString()); 40 } 41 42 public function testToXmlValueSchemeEnumeration():void { 43 var result:CMDAttribute = new CMDAttribute(); 44 result.name = "aap"; 45 result.valueSchemeEnumeration = new XMLListCollection(); 46 result.valueSchemeEnumeration.addItem(<item {ComponentMD.APP_INFO}="" {ComponentMD.CONCEPTLINK}="">Male</item>); 47 var expected:XML = <Attribute> 48 <Name>aap</Name> 49 <ValueScheme> 50 <enumeration> 51 <item AppInfo="" ConceptLink="">Male</item> 52 </enumeration> 53 </ValueScheme> 54 </Attribute>; 55 assertEquals(expected.toXMLString(), result.toXml().toXMLString()); 56 } 27 57 } 28 58 } -
ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/model/CMDComponentElement.as
r224 r238 1 1 package clarin.cmdi.componentregistry.editor.model { 2 2 import clarin.cmdi.componentregistry.common.XmlAble; 3 3 4 4 import mx.collections.ArrayCollection; 5 5 import mx.collections.XMLListCollection; … … 26 26 27 27 public function toXml():XML { 28 var result:XML = <CMD_Element></CMD_Element>; //TODO PD implement28 var result:XML = <CMD_Element></CMD_Element>; 29 29 if (name) 30 30 result.@name = name; … … 45 45 } 46 46 if (valueSchemePattern) { 47 result.appendChild(<ValueScheme><pattern> </pattern>{valueSchemePattern}</ValueScheme>)47 result.appendChild(<ValueScheme><pattern>{valueSchemePattern}</pattern></ValueScheme>) 48 48 } 49 49 if (valueSchemeEnumeration != null) { 50 var enumerationScheme:XML = <ValueScheme><enumeration></enumeration></ValueScheme>; 51 enumerationScheme.appendChild(valueSchemeEnumeration); 52 result.appendChild(enumerationScheme); 50 var enumerationScheme:XML = <enumeration></enumeration>; 51 for each(var item:XML in valueSchemeEnumeration) { 52 enumerationScheme.appendChild(item); 53 } 54 result.appendChild(<ValueScheme>{enumerationScheme}</ValueScheme>); 53 55 } 54 56 return result; -
ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/model/CMDComponentElementTest.as
r224 r238 1 1 package clarin.cmdi.componentregistry.editor.model { 2 import clarin.cmdi.componentregistry.common.ComponentMD; 3 2 4 import flexunit.framework.TestCase; 3 5 import flexunit.framework.TestSuite; 6 7 import mx.collections.XMLListCollection; 4 8 5 9 public class CMDComponentElementTest extends TestCase { … … 31 35 } 32 36 37 public function testToXmlValueScheme():void { 38 var result:CMDComponentElement = new CMDComponentElement(); 39 result.name = "Sex"; 40 result.conceptLink = "http://www.isocat.org/datcat/DC-2560"; 41 result.valueSchemeEnumeration = new XMLListCollection(); 42 result.valueSchemeEnumeration.addItem(<item {ComponentMD.APP_INFO}="" {ComponentMD.CONCEPTLINK}="">Male</item>); 43 result.valueSchemeEnumeration.addItem(<item {ComponentMD.APP_INFO}="" {ComponentMD.CONCEPTLINK}="">Female</item>); 44 result.valueSchemeEnumeration.addItem(<item {ComponentMD.APP_INFO}="" {ComponentMD.CONCEPTLINK}="">Unknown</item>); 45 var expected:XML = <CMD_Element name="Sex" ConceptLink="http://www.isocat.org/datcat/DC-2560" CardinalityMin="1" CardinalityMax="1"> 46 <ValueScheme> 47 <enumeration> 48 <item AppInfo="" ConceptLink="">Male</item> 49 <item AppInfo="" ConceptLink="">Female</item> 50 <item AppInfo="" ConceptLink="">Unknown</item> 51 </enumeration> 52 </ValueScheme> 53 </CMD_Element>; 54 55 assertEquals(expected.toXMLString(), result.toXml().toXMLString()); 56 } 57 58 public function testToXmlValueSchemePattern():void { 59 var result:CMDComponentElement = new CMDComponentElement(); 60 result.name = "Test"; 61 result.cardinalityMax="5" 62 result.valueSchemePattern = "[a-z]"; 63 64 var expected:XML = <CMD_Element name="Test" CardinalityMin="1" CardinalityMax="5"> 65 <ValueScheme> 66 <pattern>[a-z]</pattern> 67 </ValueScheme> 68 </CMD_Element>; 69 70 assertEquals(expected.toXMLString(), result.toXml().toXMLString()); 71 } 72 33 73 } 34 74 } -
ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/services/IsocatService.as
r224 r238 1 1 package clarin.cmdi.componentregistry.services { 2 2 import com.adobe.net.URI; 3 3 4 4 import flash.events.ErrorEvent; 5 5 import flash.events.EventDispatcher; 6 6 7 7 import mx.controls.Alert; 8 8 import mx.managers.CursorManager; 9 9 import mx.utils.StringUtil; 10 10 11 11 import org.httpclient.HttpClient; 12 12 import org.httpclient.events.HttpDataEvent; … … 25 25 26 26 public function IsocatService() { 27 service = new HttpClient();28 service.listener.onComplete = handleResult;29 service.listener.onError = handleError;30 service.listener.onData = handleData;31 27 } 32 28 33 29 public function load(keyword:String):void { 34 30 if (keyword) { 31 createClient(); 35 32 CursorManager.setBusyCursor(); 36 33 var uri:URI = new URI(Config.instance.isocatSearchUrl); … … 44 41 } 45 42 46 public function handleData(event:HttpDataEvent):void { 43 public function close():void { 44 if (service) { 45 service.close(); 46 } 47 CursorManager.removeBusyCursor(); 48 } 49 50 private function createClient():void { 51 service = new HttpClient(); 52 service.listener.onComplete = handleResult; 53 service.listener.onError = handleError; 54 service.listener.onData = handleData; 55 } 56 57 private function handleData(event:HttpDataEvent):void { 47 58 var data:XML = new XML(event.bytes); 48 59 searchResults = data.dcif::dataCategory; … … 58 69 } 59 70 60 p ublicfunction handleError(faultEvent:ErrorEvent):void {71 private function handleError(faultEvent:ErrorEvent):void { 61 72 CursorManager.removeBusyCursor(); 62 73 var errorMessage:String = StringUtil.substitute("Error in {0}: {1}", this, faultEvent.text); 63 74 Alert.show(errorMessage); 64 75 } 65 76 -
ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/services/UploadService.as
r224 r238 61 61 fileRef.addEventListener(SecurityErrorEvent.SECURITY_ERROR, securityErrorHandler); 62 62 fileRef.addEventListener(IOErrorEvent.IO_ERROR, ioErrorHandler); 63 64 63 } 65 64 … … 139 138 addToMessage("Server Failed to handle registration. Unexpected error, try again later. (httpstatus code was: " + event.response.code + ")\n"); 140 139 } 140 httpClient.close(); 141 141 } 142 142
Note: See TracChangeset
for help on using the changeset viewer.