You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2014/10/20 01:25:35 UTC
[1/3] git commit: [flex-utilities] [refs/heads/develop] - FLEX-34606
redundant variable fix
Repository: flex-utilities
Updated Branches:
refs/heads/develop 67cfb096a -> aed9b1e58
FLEX-34606 redundant variable fix
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/f923fc18
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/f923fc18
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/f923fc18
Branch: refs/heads/develop
Commit: f923fc18303bb555bb8da8c19560b40bd119bd47
Parents: 67cfb09
Author: Justin Mclean <jm...@apache.org>
Authored: Mon Oct 20 08:57:43 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon Oct 20 08:57:43 2014 +1100
----------------------------------------------------------------------
installer/src/InstallApacheFlex.mxml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/f923fc18/installer/src/InstallApacheFlex.mxml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml
index 09267cc..cbb616d 100644
--- a/installer/src/InstallApacheFlex.mxml
+++ b/installer/src/InstallApacheFlex.mxml
@@ -51,7 +51,7 @@ variables are not required because the locations of these pieces are known.
<fx:Component className="CacheDialog" >
<s:TitleWindow title="Download Cache Configuration" width="400" height="130"
backgroundColor="0xDDDDDD" close="closeUp()">
- <fx:Script>
+ <fx:Script>
<![CDATA[
import mx.managers.PopUpManager;
@@ -98,7 +98,7 @@ variables are not required because the locations of these pieces are known.
</s:TitleWindow>
</fx:Component>
</fx:Declarations>
- <fx:Script><![CDATA[
+ <fx:Script><![CDATA[
import flash.globalization.LocaleID;
import flash.globalization.StringTools;
@@ -2464,7 +2464,7 @@ variables are not required because the locations of these pieces are known.
return;
}
- var file:File = file = _flexHomeDir.resolvePath("installer.log");
+ var file:File = _flexHomeDir.resolvePath("installer.log");
var fs:FileStream = new FileStream();
try {
[3/3] git commit: [flex-utilities] [refs/heads/develop] - don;
t need panel skin anymore
Posted by jm...@apache.org.
don;t need panel skin anymore
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/aed9b1e5
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/aed9b1e5
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/aed9b1e5
Branch: refs/heads/develop
Commit: aed9b1e58e4bfd1d4dc03018ed7c819e19efb6e6
Parents: 3190de2
Author: Justin Mclean <jm...@apache.org>
Authored: Mon Oct 20 09:10:47 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon Oct 20 09:10:47 2014 +1100
----------------------------------------------------------------------
.../src/spark/controls/skins/TDFPanelSkin.mxml | 171 -------------------
1 file changed, 171 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/aed9b1e5/TourDeFlex/TourDeFlex3/src/spark/controls/skins/TDFPanelSkin.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/spark/controls/skins/TDFPanelSkin.mxml b/TourDeFlex/TourDeFlex3/src/spark/controls/skins/TDFPanelSkin.mxml
deleted file mode 100644
index f9151dc..0000000
--- a/TourDeFlex/TourDeFlex3/src/spark/controls/skins/TDFPanelSkin.mxml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-
-
-<!--- Custom Spark Panel Skin created for Tour de Flex.
-
-@langversion 3.0
-@playerversion Flash 10
-@playerversion AIR 1.5
-@productversion Flex 4
--->
-<s:SparkSkin xmlns:fx="http://ns.adobe.com/mxml/2009" xmlns:s="library://ns.adobe.com/flex/spark" alpha.disabled="0.5"
- blendMode.disabled="layer">
-
- <fx:Metadata>
- <![CDATA[
- /**
- * @copy spark.skins.spark.ApplicationSkin#hostComponent
- */
- [HostComponent("spark.components.Panel")]
- ]]>
- </fx:Metadata>
-
- <fx:Script>
- /* Define the skin elements that should not be colorized.
- For panel, border and title backround are skinned, but the content area and title text are not. */
- static private const exclusions:Array = ["background", "titleDisplay", "contentGroup", "bgFill"];
-
- /**
- * @copy spark.skins.SparkSkin#colorizeExclusions
- */
- override public function get colorizeExclusions():Array {return exclusions;}
-
- /* Define the content fill items that should be colored by the "contentBackgroundColor" style. */
- static private const contentFill:Array = [];
-
- /**
- * @inheritDoc
- */
- override public function get contentItems():Array {return contentFill};
- </fx:Script>
-
- <s:states>
- <s:State name="normal" />
- <s:State name="disabled" />
- <s:State name="normalWithControlBar" />
- <s:State name="disabledWithControlBar" />
- </s:states>
-
- <!-- drop shadow -->
- <s:RectangularDropShadow id="shadow" blurX="20" blurY="20" alpha="0.32" distance="11"
- angle="90" color="#000000" left="0" top="0" right="0" bottom="0"/>
-
- <!-- layer 1: border -->
- <s:Rect left="0" right="0" top="0" bottom="0">
- <s:stroke>
- <s:SolidColorStroke color="0" alpha="0.50" weight="1" />
- </s:stroke>
- </s:Rect>
-
-
- <!-- layer 2: background fill -->
- <!-- This layer was modified for Tour de Flex samples to have a gradient border at the bottom. -->
- <s:Rect left="0" right="0" bottom="0" height="15">
- <s:fill>
- <s:LinearGradient rotation="90">
- <s:GradientEntry color="0xE2E2E2" />
- <s:GradientEntry color="0x000000" />
- </s:LinearGradient>
- </s:fill>
- </s:Rect>
-
- <!-- layer 3: contents -->
- <!--- contains the vertical stack of titlebar content and controlbar -->
- <s:Group left="1" right="1" top="1" bottom="1" >
- <s:layout>
- <s:VerticalLayout gap="0" horizontalAlign="justify" />
- </s:layout>
-
- <s:Group id="topGroup" >
- <!-- layer 0: title bar fill -->
- <!-- Note: We have custom skinned the title bar to be solid black for Tour de Flex -->
- <s:Rect id="tbFill" left="0" right="0" top="0" bottom="1" >
- <s:fill>
- <s:SolidColor color="0x000000" />
- </s:fill>
- </s:Rect>
-
- <!-- layer 1: title bar highlight -->
- <s:Rect id="tbHilite" left="0" right="0" top="0" bottom="0" >
- <s:stroke>
- <s:LinearGradientStroke rotation="90" weight="1">
- <s:GradientEntry color="0xEAEAEA" />
- <s:GradientEntry color="0xD9D9D9" />
- </s:LinearGradientStroke>
- </s:stroke>
- </s:Rect>
-
- <!-- layer 2: title bar divider -->
- <s:Rect id="tbDiv" left="0" right="0" height="1" bottom="0">
- <s:fill>
- <s:SolidColor color="0xC0C0C0" />
- </s:fill>
- </s:Rect>
-
- <!-- layer 3: text -->
- <!--- Defines the appearance of the PanelSkin class's title bar. -->
- <!-- Note: The title text display has been slightly modified for Tour de Flex. -->
- <s:Label id="titleDisplay" lineBreak="explicit"
- left="9" top="1" bottom="0" minHeight="30"
- verticalAlign="middle" fontWeight="bold" color="#E2E2E2">
- </s:Label>
- </s:Group>
-
- <!--
- Note: setting the minimum size to 0 here so that changes to the host component's
- size will not be thwarted by this skin part's minimum size. This is a compromise,
- more about it here: http://bugs.adobe.com/jira/browse/SDK-21143
- -->
- <s:Group id="contentGroup" width="100%" height="100%" minWidth="0" minHeight="0">
- </s:Group>
-
- <s:Group id="bottomGroup" minWidth="0" minHeight="0"
- includeIn="normalWithControlBar, disabledWithControlBar" >
-
- <!-- layer 0: control bar background -->
- <!-- Note: We are skinning this to be the gradient in case we do specify control
- bar content, but it will only display if there's a controlBarContent
- property specified.-->
- <s:Rect left="0" right="0" bottom="0" top="0" height="15">
- <s:fill>
- <s:LinearGradient rotation="90">
- <s:GradientEntry color="0xE2E2E2" />
- <s:GradientEntry color="0x000000" />
- </s:LinearGradient>
- </s:fill>
- </s:Rect>
-
- <!-- layer 1: control bar divider line -->
- <s:Rect left="0" right="0" top="0" height="1" >
- <s:fill>
- <s:SolidColor color="0xCDCDCD" />
- </s:fill>
- </s:Rect>
-
- <!-- layer 2: control bar -->
- <s:Group id="controlBarGroup" left="0" right="0" top="1" bottom="0" minWidth="0" minHeight="0">
- <s:layout>
- <s:HorizontalLayout paddingLeft="10" paddingRight="10" paddingTop="10" paddingBottom="10" />
- </s:layout>
- </s:Group>
- </s:Group>
- </s:Group>
-</s:SparkSkin>
[2/3] git commit: [flex-utilities] [refs/heads/develop] - FLEX-34393
installer should remember language
Posted by jm...@apache.org.
FLEX-34393 installer should remember language
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/3190de22
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/3190de22
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/3190de22
Branch: refs/heads/develop
Commit: 3190de228aec290836009b9c7a8834a0050ae1d9
Parents: f923fc1
Author: Justin Mclean <jm...@apache.org>
Authored: Mon Oct 20 09:06:03 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon Oct 20 09:06:03 2014 +1100
----------------------------------------------------------------------
installer/src/InstallApacheFlex.mxml | 62 +++++++++++++++++++++++--------
1 file changed, 47 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/3190de22/installer/src/InstallApacheFlex.mxml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml
index cbb616d..a10fb4b 100644
--- a/installer/src/InstallApacheFlex.mxml
+++ b/installer/src/InstallApacheFlex.mxml
@@ -145,7 +145,7 @@ variables are not required because the locations of these pieces are known.
import ws.tink.spark.skins.controls.InstallApacheFlexSkin;
// embed us strings so we can always have them if we can't get to the locale files
- [Embed(source="properties/en_US.properties",mimeType="application/octet-stream")]
+ [Embed(source="properties/en_US.properties", mimeType="application/octet-stream")]
private var en_US_Properties:Class;
private var cleanedUp:Boolean;
@@ -160,6 +160,7 @@ variables are not required because the locations of these pieces are known.
private var showDevBuilds:Boolean = false;
private var usingDownloadCache:Boolean;
private var downloadCacheFolder:String;
+ private var userDefaultLanguage:String;
private var firstTime:Boolean = true;
private var legacy:Boolean = true;
private var nocache:Boolean = true;
@@ -393,6 +394,7 @@ variables are not required because the locations of these pieces are known.
var so:SharedObject = SharedObject.getLocal("InstallApacheFlex");
usingDownloadCache = so.data.usingDownloadCache;
downloadCacheFolder = so.data.downloadCacheFolder;
+ userDefaultLanguage = so.data.userDefaultLanguage;
}
protected function handleApplicationComplete(event:FlexEvent):void
@@ -460,9 +462,9 @@ variables are not required because the locations of these pieces are known.
private function getIndexOfEnUS():int
{
- for (var i:int = 0; i < _langSelect.dataProvider.length; i++)
+ for (var i:int = 0; i < _langSelect.dataProvider.length; i++)
{
- if(_langSelect.dataProvider.getItemAt(i).data == "en_US")
+ if (_langSelect.dataProvider.getItemAt(i).data == "en_US")
{
return i;
}
@@ -491,11 +493,22 @@ variables are not required because the locations of these pieces are known.
{
loadLanguage("en_US", loadUSComplete);
}
+
private function loadUSComplete():void
{
- var userLocale:String = new StringTools(LocaleID.DEFAULT).actualLocaleIDName.replace("-", "_");
+ var userLocale:String;
+
+ if (userDefaultLanguage)
+ {
+ userLocale = userDefaultLanguage;
+ }
+ else
+ {
+ userLocale = new StringTools(LocaleID.DEFAULT).actualLocaleIDName.replace("-", "_");
+ }
- if (languageOverride) {
+ if (languageOverride)
+ {
userLocale = languageOverride;
}
@@ -583,16 +596,28 @@ variables are not required because the locations of these pieces are known.
{
resourceManager.localeChain = [ ViewResourceConstants.DEFAULT_LANGUAGE ];
- var userLocale:String = new StringTools(LocaleID.DEFAULT).actualLocaleIDName.replace("-", "_");
+ var userLocale:String;
- if (languageOverride) {
+ if (userDefaultLanguage)
+ {
+ userLocale = userDefaultLanguage;
+ }
+ else
+ {
+ userLocale = new StringTools(LocaleID.DEFAULT).actualLocaleIDName.replace("-", "_");
+ }
+
+ if (languageOverride)
+ {
userLocale = languageOverride;
}
log("Using Locale: " + userLocale);
var n:int = supportedLanguages.length;
- for (var i:int = 0; i < n; i++) {
- if (supportedLanguages[i].data == userLocale) {
+ for (var i:int = 0; i < n; i++)
+ {
+ if (supportedLanguages[i].data == userLocale)
+ {
_langSelect.selectedIndex = i;
resourceManager.localeChain = [ userLocale, "en_US" ];
@@ -611,7 +636,7 @@ variables are not required because the locations of these pieces are known.
updateWindow();
_mirrorURLUtil.logMessages = new LogMessagesVO(_viewResourceConstants.FETCH_MIRROR_CGI, _viewResourceConstants.FETCH_MIRROR_CGI_DONE,
- _viewResourceConstants.FETCH_MIRROR_CGI_ERROR);
+ _viewResourceConstants.FETCH_MIRROR_CGI_ERROR);
_mirrorURLUtil.getMirrorURL(Constants.APACHE_FLEX_URL + _mirrorURLCGI, getMirrorURLResultHandler);
CursorManager.removeBusyCursor();
@@ -1093,7 +1118,7 @@ variables are not required because the locations of these pieces are known.
var flashVersionID:String = flashPlayerVersion.selectedItem.versionID;
setXMLVariables(); // as AIR and Flash version may of changed
-
+
log("SDK version " + APACHE_FLEX_BIN_DISTRO_VERSION_DISPLAY);
if (flexVersion.selectedItem.needsAIR) {
@@ -2510,11 +2535,18 @@ variables are not required because the locations of these pieces are known.
{
var defaultLanguage:String = ViewResourceConstants.DEFAULT_LANGUAGE;
- if (_langSelect.selectedItem["data"] == defaultLanguage) {
+ var so:SharedObject = SharedObject.getLocal("InstallApacheFlex");
+ so.data.userDefaultLanguage = _langSelect.selectedItem["data"];
+ so.flush();
+
+ if (_langSelect.selectedItem["data"] == defaultLanguage)
+ {
resourceManager.localeChain = [ defaultLanguage ];
resourceManager.update();
setButtonWidths();
- } else {
+ }
+ else
+ {
loadLanguage(_langSelect.selectedItem["data"], _langSelect_changeCompleteHandler);
}
}
@@ -2662,7 +2694,7 @@ variables are not required because the locations of these pieces are known.
}
if (usingDownloadCache && !nocache)
{
- var cacheURL:String
+ var cacheURL:String;
if (_useMirror && url.indexOf(useMirrorPath(_mirrorURLUtil.mirrorURL)) != -1)
{
cacheURL = url.substr(useMirrorPath(_mirrorURLUtil.mirrorURL).length);
@@ -2705,7 +2737,7 @@ variables are not required because the locations of these pieces are known.
{
if (debugMode)
log("download complete preparing to cache");
- var cacheURL:String
+ var cacheURL:String;
if (_useMirror && url.indexOf(useMirrorPath(_mirrorURLUtil.mirrorURL)) != -1)
{
cacheURL = url.substr(useMirrorPath(_mirrorURLUtil.mirrorURL).length);