You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ma...@apache.org on 2013/10/11 12:14:05 UTC
git commit: [flex-sdk] [refs/heads/develop] - - fixed error in
experimental build trying to access AnimationTarget ( internal => public ) -
fixed error in asdoc / build accessing ViewMenuLayout ( wrong manifest uri) -
removed remainder of obsolete experi
Updated Branches:
refs/heads/develop dd4de4f4c -> 5ae5a8477
- fixed error in experimental build trying to access AnimationTarget ( internal => public )
- fixed error in asdoc / build accessing ViewMenuLayout ( wrong manifest uri)
- removed remainder of obsolete experimental classes ( CallOutDropDownController and CallOutSkin)
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/5ae5a847
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/5ae5a847
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/5ae5a847
Branch: refs/heads/develop
Commit: 5ae5a84778fa1e9a9a61aa218fad6244d1e9cdb1
Parents: dd4de4f
Author: mamsellem <ma...@systar.com>
Authored: Fri Oct 11 12:13:45 2013 +0200
Committer: mamsellem <ma...@systar.com>
Committed: Fri Oct 11 12:13:45 2013 +0200
----------------------------------------------------------------------
asdoc/build.xml | 3 +-
flex-sdk-description.xml | 6 +-
frameworks/projects/experimental/defaults.css | 9 -
.../experimental/src/ExperimentalClasses.as | 1 -
.../supportClasses/AnimationTarget.as | 68 ------
.../supportClasses/CallOutDropDownController.as | 78 ------
.../src/spark/skins/spark/CallOutSkin.mxml | 235 -------------------
.../supportClasses/AnimationTarget.as | 2 +-
8 files changed, 5 insertions(+), 397 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5ae5a847/asdoc/build.xml
----------------------------------------------------------------------
diff --git a/asdoc/build.xml b/asdoc/build.xml
index ef93d4f..930abca 100644
--- a/asdoc/build.xml
+++ b/asdoc/build.xml
@@ -147,7 +147,6 @@
<doc-namespaces uri="http://ns.adobe.com/2009/mx-mxml"/>
<doc-namespaces uri="http://www.adobe.com/2006/advancedgridsmxml"/>
<doc-namespaces uri="http://www.adobe.com/2006/charts"/>
- <doc-namespaces uri="library://ns.adobe.com/flex/spark-mobilecomponents"/>
<doc-namespaces uri="library://ns.adobe.com/flex/spark-dmv"/>
<!-- added for Apache -->
<doc-namespaces uri="http://flex.apache.org/ns"/>
@@ -166,7 +165,7 @@
<namespace uri="http://www.adobe.com/2006/mxml" manifest="${flexlib}/mxml-manifest.xml"/>
<namespace uri="library://ns.adobe.com/flex/spark" manifest="${flexlib}/projects/spark/manifest.xml"/>
<namespace uri="library://ns.adobe.com/flex/mx" manifest="${flexlib}/mxml-manifest.xml"/>
- <namespace uri="library://ns.adobe.com/flex/spark-mobilecomponents" manifest="${flexlib}/projects/mobilecomponents/manifest.xml"/>
+ <namespace uri="library://ns.adobe.com/flex/spark" manifest="${flexlib}/projects/mobilecomponents/manifest.xml"/>
<namespace uri="library://ns.adobe.com/flex/spark-dmv" manifest="${flexlib}/projects/spark_dmv/manifest_spark_dmv.xml"/>
<!-- added for Apache -->
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5ae5a847/flex-sdk-description.xml
----------------------------------------------------------------------
diff --git a/flex-sdk-description.xml b/flex-sdk-description.xml
index 217ef12..117d002 100644
--- a/flex-sdk-description.xml
+++ b/flex-sdk-description.xml
@@ -18,8 +18,8 @@
-->
<flex-sdk-description>
-<name>Apache Flex 4.10.0 FP11.1 AIR3.7 en_US</name>
-<version>4.10.0</version>
-<build>20130801</build>
+<name>Apache Flex 4.11.0 FP11.1 AIR3.8 en_US</name>
+<version>4.11.0</version>
+<build>20131011</build>
</flex-sdk-description>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5ae5a847/frameworks/projects/experimental/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/experimental/defaults.css b/frameworks/projects/experimental/defaults.css
index 9cf29cd..eb5e83b 100644
--- a/frameworks/projects/experimental/defaults.css
+++ b/frameworks/projects/experimental/defaults.css
@@ -39,15 +39,6 @@ BorderDataNavigator
skinClass: ClassReference("spark.skins.BorderDataNavigatorSkin");
}
-CallOut
-{
- skinClass: ClassReference("spark.skins.spark.CallOutSkin");
-}
-
-/*CallOutArrow
-{
- skinClass: ClassReference("spark.skins.spark.CallOutArrowSkin");
-}*/
ColorPicker
{
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5ae5a847/frameworks/projects/experimental/src/ExperimentalClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/experimental/src/ExperimentalClasses.as b/frameworks/projects/experimental/src/ExperimentalClasses.as
index 8a6ea2f..7eeb3ca 100644
--- a/frameworks/projects/experimental/src/ExperimentalClasses.as
+++ b/frameworks/projects/experimental/src/ExperimentalClasses.as
@@ -31,7 +31,6 @@ package
import spark.components.itemRenderers.MenuCoreItemRenderer; MenuCoreItemRenderer;
import spark.components.itemRenderers.MenuItemRenderer; MenuItemRenderer;
import spark.components.listClasses.IListItemRenderer; IListItemRenderer;
- import spark.components.supportClasses.AnimationTarget; AnimationTarget;
import spark.components.supportClasses.IDropDownContainer; IDropDownContainer;
import spark.containers.supportClasses.DeferredCreationPolicy; DeferredCreationPolicy;
import spark.containers.Accordion; Accordion;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5ae5a847/frameworks/projects/experimental/src/spark/components/supportClasses/AnimationTarget.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/experimental/src/spark/components/supportClasses/AnimationTarget.as b/frameworks/projects/experimental/src/spark/components/supportClasses/AnimationTarget.as
deleted file mode 100644
index 2c09ca9..0000000
--- a/frameworks/projects/experimental/src/spark/components/supportClasses/AnimationTarget.as
+++ /dev/null
@@ -1,68 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// 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.
-//
-////////////////////////////////////////////////////////////////////////////////
-package spark.components.supportClasses
-{
- import spark.effects.animation.Animation;
- import spark.effects.animation.IAnimationTarget;
-
- public class AnimationTarget implements IAnimationTarget
- {
- public var updateFunction:Function;
- public var startFunction:Function;
- public var stopFunction:Function;
- public var endFunction:Function;
- public var repeatFunction:Function;
-
- public function AnimationTarget(updateFunction:Function = null)
- {
- this.updateFunction = updateFunction;
- }
-
- public function animationStart(animation:Animation):void
- {
- if (startFunction != null)
- startFunction(animation);
- }
-
- public function animationEnd(animation:Animation):void
- {
- if (endFunction != null)
- endFunction(animation);
- }
-
- public function animationStop(animation:Animation):void
- {
- if (stopFunction != null)
- stopFunction(animation);
- }
-
- public function animationRepeat(animation:Animation):void
- {
- if (repeatFunction != null)
- repeatFunction(animation);
- }
-
- public function animationUpdate(animation:Animation):void
- {
- if (updateFunction != null)
- updateFunction(animation);
- }
-
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5ae5a847/frameworks/projects/experimental/src/spark/components/supportClasses/CallOutDropDownController.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/experimental/src/spark/components/supportClasses/CallOutDropDownController.as b/frameworks/projects/experimental/src/spark/components/supportClasses/CallOutDropDownController.as
deleted file mode 100644
index bff579b..0000000
--- a/frameworks/projects/experimental/src/spark/components/supportClasses/CallOutDropDownController.as
+++ /dev/null
@@ -1,78 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// 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.
-//
-////////////////////////////////////////////////////////////////////////////////
-package spark.components.supportClasses
-{
- import flash.display.DisplayObject;
- import flash.events.Event;
-
- import mx.collections.ArrayCollection;
- import mx.core.mx_internal;
-
- import spark.components.supportClasses.DropDownController;
- //import spark.events.DropDownEvent;
-
- import spark.components.CallOutButton;
-
- use namespace mx_internal;
-
- public class CallOutDropDownController extends DropDownController
- {
- //private var openDropDowns:ArrayCollection;
-
- public function CallOutDropDownController()
- {
- super();
-
- //openDropDowns = new ArrayCollection();
-
- //this.addEventListener(DropDownEvent.OPEN, onOpenDropDown);
- }
-
- override mx_internal function systemManager_mouseDownHandler(event:Event):void
- {
- if((openButton as CallOutButton).subCallOut != null)
- {
- if( this.hitAreaAdditions)
- {
- if(this.hitAreaAdditions.indexOf((openButton as CallOutButton).subCallOut) == -1)
- this.hitAreaAdditions = Vector.<DisplayObject>( [ (openButton as CallOutButton).subCallOut ] ).concat( this.hitAreaAdditions );
- }
- else
- {
- this.hitAreaAdditions = Vector.<DisplayObject>( [ (openButton as CallOutButton).subCallOut ] );
- }
- }
-
- super.mx_internal::systemManager_mouseDownHandler(event);
- }
- /*
- private function onOpenDropDown(event:DropDownEvent):void
- {
- var test:String = "neu";
-
- openDropDowns.addItem({dropDownController:event.target});
- }
-
- override public function closeDropDown(commit:Boolean):void
- {
- var test:String = "neu";
- }
- */
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5ae5a847/frameworks/projects/experimental/src/spark/skins/spark/CallOutSkin.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/experimental/src/spark/skins/spark/CallOutSkin.mxml b/frameworks/projects/experimental/src/spark/skins/spark/CallOutSkin.mxml
deleted file mode 100644
index f992899..0000000
--- a/frameworks/projects/experimental/src/spark/skins/spark/CallOutSkin.mxml
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0"?>
-<!--
-////////////////////////////////////////////////////////////////////////////////
-//
-// 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.
-//
-////////////////////////////////////////////////////////////////////////////////
--->
-<s:SparkSkin xmlns:fx="http://ns.adobe.com/mxml/2009"
- xmlns:s="library://ns.adobe.com/flex/spark">
-
- <fx:Metadata>
- [HostComponent("spark.components.CallOut")]
- </fx:Metadata>
-
- <fx:Script>
- <![CDATA[
- import mx.core.mx_internal;
-
- import spark.components.ArrowDirection;
-
- public static const ARROW_SIDE_LENGHT:int = 24;
-
- public static const RADIUS:int = 5;
-
- public static const CONTENT_GAP:int = 10;
-
- private static const BORDER_THICKNESS:int = 2;
-
- use namespace mx_internal;
-
- override protected function updateDisplayList(unscaledWidth:Number, unscaledHeight:Number):void
- {
- updateArrow(unscaledWidth, unscaledHeight);
-
- super.updateDisplayList(unscaledWidth, unscaledHeight);
- }
-
- private function updateArrow(uw:Number, uh:Number):void
- {
- var arDi:String = hostComponent.arrowDirection;
- var aHP:String = hostComponent.mx_internal::actualHorizontalPosition;
- var aVP:String = hostComponent.mx_internal::actualVerticalPosition;
-
- if(arDi != ArrowDirection.NONE)
- {
- if(arDi == "left")
- {
- arrowGraphic.height = ARROW_SIDE_LENGHT;
- arrowGraphic.width = ARROW_SIDE_LENGHT/2;
-
- arrowPath.data = "M " + ARROW_SIDE_LENGHT/2 + " 0 L " + ARROW_SIDE_LENGHT/2 + " " + ARROW_SIDE_LENGHT + " L 0 " + ARROW_SIDE_LENGHT/2 + " Z";
-
- backgroundGroup.left = arrowGraphic.width - BORDER_THICKNESS;
- backgroundGroup.right = arrowGraphic.width * -1;
-
- contentGroup.left = CONTENT_GAP + arrowGraphic.width - BORDER_THICKNESS;
- contentGroup.right = CONTENT_GAP - arrowGraphic.width;
-
- coverRect.top = coverRect.bottom = BORDER_THICKNESS + 1;
- coverRect.width = BORDER_THICKNESS;
- coverRect.right = 0;
- arrowGraphic.left = 0;
- }
- else if(arDi == "right")
- {
- arrowGraphic.height = ARROW_SIDE_LENGHT;
- arrowGraphic.width = ARROW_SIDE_LENGHT/2;
-
- arrowPath.data = "M 0 0 L " + ARROW_SIDE_LENGHT/2 + " " + ARROW_SIDE_LENGHT/2 + " L 0 " + ARROW_SIDE_LENGHT + " Z";
-
- backgroundGroup.left = arrowGraphic.width * -1;
- backgroundGroup.right = arrowGraphic.width - BORDER_THICKNESS ;
-
- contentGroup.left = CONTENT_GAP - arrowGraphic.width;
- contentGroup.right = CONTENT_GAP + arrowGraphic.width- BORDER_THICKNESS ;
-
- coverRect.top = coverRect.bottom = BORDER_THICKNESS + 1;
- coverRect.width = BORDER_THICKNESS;
- coverRect.left = 0;
-
- arrowGraphic.right = 0;
- }
- else if(arDi == "up")
- {
- arrowGraphic.height = ARROW_SIDE_LENGHT/2;
- arrowGraphic.width = ARROW_SIDE_LENGHT;
-
- arrowPath.data = "M 0 " + ARROW_SIDE_LENGHT/2 + " L " + ARROW_SIDE_LENGHT + " " + ARROW_SIDE_LENGHT/2 + " L " + ARROW_SIDE_LENGHT/2 + " 0 Z";
-
- backgroundGroup.top = arrowGraphic.height - BORDER_THICKNESS;
- backgroundGroup.bottom = arrowGraphic.height * -1;
-
- contentGroup.top = CONTENT_GAP + arrowGraphic.height - BORDER_THICKNESS;
- contentGroup.bottom = CONTENT_GAP - arrowGraphic.height;
-
- coverRect.left = coverRect.right = BORDER_THICKNESS + 1;
- coverRect.height = BORDER_THICKNESS;
- coverRect.bottom = 0;
-
- arrowGraphic.top = 0;
-
- }
- else if(arDi == "down")
- {
- arrowGraphic.height = ARROW_SIDE_LENGHT/2;
- arrowGraphic.width = ARROW_SIDE_LENGHT;
-
- arrowPath.data = "M 0 0 L " + ARROW_SIDE_LENGHT/2 + " " + ARROW_SIDE_LENGHT/2 + " L " + ARROW_SIDE_LENGHT + " 0 Z";
-
- backgroundGroup.top = arrowGraphic.height * -1;
- backgroundGroup.bottom = arrowGraphic.height + BORDER_THICKNESS + 1;
-
- contentGroup.top = CONTENT_GAP - arrowGraphic.height;
- contentGroup.bottom = CONTENT_GAP + arrowGraphic.height + BORDER_THICKNESS + 1;
-
- coverRect.left = coverRect.right = BORDER_THICKNESS + 1;
- coverRect.height = BORDER_THICKNESS;
- coverRect.top = 0;
- arrowGraphic.bottom = 0;
-
- }
-
- if(arDi == "up" || arDi == "down")
- {
- if(aHP == "start")
- {
- arrowGraphic.left = RADIUS;
- }
- else if(aHP == "middle")
- {
- arrowGraphic.horizontalCenter = 0;
- }
- else if(aHP == "end")
- {
- arrowGraphic.right = RADIUS;
- }
- }
- else if(arDi == "left" || arDi == "right")
- {
- if(aVP == "start")
- {
- arrowGraphic.top = RADIUS;
- }
- else if(aVP == "middle")
- {
- arrowGraphic.verticalCenter = 0;
- }
- if(aVP == "end")
- {
- arrowGraphic.bottom = RADIUS;
- }
- }
- }
- }
-
- ]]>
- </fx:Script>
-
- <s:states>
- <s:State name="normal"/>
- <s:State name="disabled"/>
- <s:State name="closed" stateGroups="closedGroup"/>
- <s:State name="disabledAndClosed" stateGroups="closedGroup"/>
- </s:states>
-
- <s:transitions>
- <s:Transition fromState="closed" toState="normal" autoReverse="true">
- <s:Fade duration="150" target="{chrome}"/>
- </s:Transition>
-
- <s:Transition fromState="disabledAndClosed" toState="disabled" autoReverse="true">
- <s:Fade duration="150" target="{chrome}"/>
- </s:Transition>
-
- <s:Transition fromState="normal" toState="closed" autoReverse="true">
- <s:Fade duration="150" target="{chrome}"/>
- </s:Transition>
-
- <s:Transition fromState="disabled" toState="disabledAndClosed" autoReverse="true">
- <s:Fade duration="150" target="{chrome}"/>
- </s:Transition>
- </s:transitions>
-
- <s:Group id="chrome" left="0" right="0" top="0" bottom="0" visible.closedGroup="false">
- <s:Group id="backgroundGroup" left="0" right="0" top="0" bottom="0">
-
- <s:Rect left="0" right="0" top="0" bottom="0" radiusX="{RADIUS}" radiusY="{RADIUS}">
- <s:stroke>
- <s:SolidColorStroke weight="2" color="0x808080"/>
- <!--
- <s:LinearGradientStroke weight="1"/>
- -->
- </s:stroke>
- <s:fill>
- <s:SolidColor color="0xFFFFFF"/>
- </s:fill>
- <s:filters>
- <s:DropShadowFilter id="shadow" blurX="7" blurY="7" alpha="0.4" distance="5" angle="90" knockout="false"/>
- </s:filters>
- </s:Rect>
- </s:Group>
-
- <s:Group id="contentGroup" left="{CONTENT_GAP}" right="{CONTENT_GAP}" top="{CONTENT_GAP}" bottom="{CONTENT_GAP}" minWidth="0" minHeight="0" fontSize="12"/>
-
- <s:Graphic id="arrowGraphic" x="0" y="0">
- <s:Path id="arrowPath" left="0" right="0" top="0" bottom="0">
- <s:stroke>
- <s:SolidColorStroke weight="{BORDER_THICKNESS}" color="0x808080"/>
- </s:stroke>
- <s:fill>
- <s:SolidColor color="0xFFFFFF"/>
- </s:fill>
- </s:Path>
- <s:Rect id="coverRect" >
- <s:fill>
- <s:SolidColor color="0xFFFFFF"/>
- </s:fill>
- </s:Rect>
- </s:Graphic>
- </s:Group>
-</s:SparkSkin>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5ae5a847/frameworks/projects/spark/src/spark/components/supportClasses/AnimationTarget.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/spark/src/spark/components/supportClasses/AnimationTarget.as b/frameworks/projects/spark/src/spark/components/supportClasses/AnimationTarget.as
index 8d83328..be90dfc 100644
--- a/frameworks/projects/spark/src/spark/components/supportClasses/AnimationTarget.as
+++ b/frameworks/projects/spark/src/spark/components/supportClasses/AnimationTarget.as
@@ -22,7 +22,7 @@ package spark.components.supportClasses
import spark.effects.animation.Animation;
import spark.effects.animation.IAnimationTarget;
-internal class AnimationTarget implements IAnimationTarget
+public class AnimationTarget implements IAnimationTarget
{
public var updateFunction:Function;
public var startFunction:Function;