more tweaks to installer output display
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/97312efd Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/97312efd Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/97312efd Branch: refs/heads/develop Commit: 97312efd1da4c30076037010ea5f2bac496f634c Parents: 53ad7d3 Author: Alex Harui <[email protected]> Authored: Wed Jan 15 15:20:47 2014 -0800 Committer: Alex Harui <[email protected]> Committed: Wed Jan 15 15:20:47 2014 -0800 ---------------------------------------------------------------------- installer/src/InstallApacheFlex.mxml | 41 +++++++++++++++++++------------ 1 file changed, 25 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/97312efd/installer/src/InstallApacheFlex.mxml ---------------------------------------------------------------------- diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml index 329f26d..f9065ed 100644 --- a/installer/src/InstallApacheFlex.mxml +++ b/installer/src/InstallApacheFlex.mxml @@ -231,30 +231,35 @@ variables are not required because the locations of these pieces are known. [Bindable] public var _messages:ArrayCollection = new ArrayCollection(); + private var _lastTag:String; private var _lastPublicMessage:String; - public function get lastPublicMessage():String - { - return _lastPublicMessage; - } public function set lastPublicMessage(s:String):void { - _lastPublicMessage = s; + var tag:String; + var c:int; + + c = s.indexOf("["); + if (c != -1) + { + var c2:int = s.indexOf("] "); + if (c2 != -1) + { + tag = s.substring(c + 1, c2); + s = s.substr(c2 + 2); + } + } + if (tag && tag == _lastTag && tag == "get") + _lastPublicMessage += "\n" + s; + else + _lastPublicMessage = s; + _lastTag = tag; dispatchEvent(new Event("messageChanged")); } [Bindable("messageChanged")] public function get lastFilteredPublicMessage():String { - var s:String = lastPublicMessage; - if (s.indexOf("[") != -1) - { - var c:int = s.indexOf("] "); - if (c != -1) - { - return s.substr(c + 1); - } - } - return s; + return _lastPublicMessage; } private function getInvoke():void { @@ -1054,6 +1059,10 @@ variables are not required because the locations of these pieces are known. if (configOverride != "") { context["xml.properties"] = configOverride; } + if (resourceManager.localeChain.length > 1) + { + context["bundle"] = resourceManager.localeChain[0]; + } for (var p:String in licensePropertyMap) { if (InstallerComponentVO(licensePropertyMap[p]).selected) @@ -1102,7 +1111,7 @@ variables are not required because the locations of these pieces are known. private function output(s:String):void { var isPublic:Boolean = true; - if (s.indexOf(":") != -1) + if (s.indexOf(":") != -1 && s.charAt(0) == "\n") { // target output is a newline then the target name then a colon if (currentStep < stepLabels.length && "\n" + stepIDs[currentStep] + ":" == s)
