Repository: flex-asjs Updated Branches: refs/heads/develop 9d0d9888a -> b02859ac4
try to fix asdoc build Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b02859ac Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b02859ac Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b02859ac Branch: refs/heads/develop Commit: b02859ac403247b2c2c1a2328a3e1956d7f4efb9 Parents: 6dbeaa0 Author: Alex Harui <[email protected]> Authored: Thu Dec 17 23:35:02 2015 -0800 Committer: Alex Harui <[email protected]> Committed: Thu Dec 17 23:35:12 2015 -0800 ---------------------------------------------------------------------- asdoc/build.xml | 80 +-------- frameworks/asdoc-config.xml | 162 ++++++++++++++++--- .../org/apache/flex/maps/google/GoogleMap.as | 3 + .../flex/maps/google/beads/GoogleMapView.as | 24 +-- .../apache/flex/maps/google/models/MapModel.as | 13 +- 5 files changed, 169 insertions(+), 113 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b02859ac/asdoc/build.xml ---------------------------------------------------------------------- diff --git a/asdoc/build.xml b/asdoc/build.xml index 74b0651..2b8cee3 100644 --- a/asdoc/build.xml +++ b/asdoc/build.xml @@ -71,89 +71,15 @@ window-title="Apache FlexJS API Reference" main-title="${release.name} ${release.version} API Reference " footer="${manifest.Implementation-Vendor}" > - + <arg line="+frameworks_dir=${flexlib}" /> <load-config filename="${flexlib}/asdoc-config.xml" /> - <exclude-classes>org.apache.flex.utils.Language</exclude-classes> - <exclude-classes>org.apache.flex.core.IFlexJSElement</exclude-classes> - <exclude-classes>org.apache.flex.core.WrappedHTMLElement</exclude-classes> - <exclude-classes>org.apache.flex.events.BrowserEvent</exclude-classes> - <exclude-sources path-element="${project_home}/Core/as/src/org/apache/flex/utils/Language.as" /> - <exclude-sources path-element="${project_home}/Core/as/src/org/apache/flex/core/WrappedHTMLElement.as" /> - <exclude-sources path-element="${project_home}/Core/as/src/org/apache/flex/events/BrowserEvent.as" /> - <exclude-sources path-element="${project_home}/Core/as/src/org/apache/flex/core/IFlexJSElement.as" /> + <jvmarg line="${asdoc.jvm.args}"/> - <!-- source path for asdoc --> - <compiler.source-path path-element="${project_home}/Binding/as/src"/> - <compiler.source-path path-element="${project_home}/Charts/as/src"/> - <compiler.source-path path-element="${project_home}/Collections/as/src"/> - <compiler.source-path path-element="${project_home}/Core/as/src"/> - <compiler.source-path path-element="${project_home}/CreateJS/as/src"/> - <compiler.source-path path-element="${project_home}/DragDrop/as/src"/> - <compiler.source-path path-element="${project_home}/Effects/as/src"/> - <compiler.source-path path-element="${project_home}/Formatters/as/src"/> - <compiler.source-path path-element="${project_home}/GoogleMaps/as/src"/> - <compiler.source-path path-element="${project_home}/Graphics/as/src"/> - <compiler.source-path path-element="${project_home}/HTML/as/src"/> - <compiler.source-path path-element="${project_home}/HTML5/as/src"/> - <compiler.source-path path-element="${project_home}/JQuery/as/src"/> - <compiler.source-path path-element="${project_home}/Mobile/as/src"/> - <compiler.source-path path-element="${project_home}/Network/as/src"/> - - <!-- namespaces to include in asdoc --> - <doc-namespaces uri="library://ns.apache.org/flexjs/basic"/> - <doc-namespaces uri="library://ns.apache.org/flexjs/createjs"/> - <doc-namespaces uri="library://ns.apache.org/flexjs/google"/> - <doc-namespaces uri="library://ns.apache.org/flexjs/html5"/> - <doc-namespaces uri="library://ns.apache.org/flexjs/jquery"/> - - <!-- classes to include in asdoc --> - <doc-sources path-element="${project_home}/Binding/as/src"/> - <doc-sources path-element="${project_home}/Charts/as/src"/> - <doc-sources path-element="${project_home}/Collections/as/src"/> - <doc-sources path-element="${project_home}/Core/as/src"/> - <doc-sources path-element="${project_home}/CreateJS/as/src"/> - <doc-sources path-element="${project_home}/DragDrop/as/src"/> - <doc-sources path-element="${project_home}/Effects/as/src"/> - <doc-sources path-element="${project_home}/Formatters/as/src"/> - <doc-sources path-element="${project_home}/GoogleMaps/as/src"/> - <doc-sources path-element="${project_home}/Graphics/as/src"/> - <doc-sources path-element="${project_home}/HTML/as/src"/> - <doc-sources path-element="${project_home}/HTML5/as/src"/> - <doc-sources path-element="${project_home}/JQuery/as/src"/> - <doc-sources path-element="${project_home}/Mobile/as/src"/> - <doc-sources path-element="${project_home}/Network/as/src"/> - - <!-- namespace declaration for asdoc --> - <namespace uri="library://ns.apache.org/flexjs/basic" manifest="${project_home}/Binding/basic-manifest.xml" /> - <namespace uri="library://ns.apache.org/flexjs/basic" manifest="${project_home}/Charts/basic-manifest.xml" /> - <namespace uri="library://ns.apache.org/flexjs/basic" manifest="${project_home}/Collections/basic-manifest.xml" /> - <namespace uri="library://ns.apache.org/flexjs/basic" manifest="${project_home}/Core/basic-manifest.xml" /> - <namespace uri="library://ns.apache.org/flexjs/createjs" manifest="${project_home}/CreateJS/createjs-manifest.xml" /> - <namespace uri="library://ns.apache.org/flexjs/basic" manifest="${project_home}/DragDrop/basic-manifest.xml" /> - <namespace uri="library://ns.apache.org/flexjs/basic" manifest="${project_home}/Effects/basic-manifest.xml" /> - <namespace uri="library://ns.apache.org/flexjs/basic" manifest="${project_home}/Formatters/basic-manifest.xml" /> - <namespace uri="library://ns.apache.org/flexjs/google" manifest="${project_home}/GoogleMaps/google-manifest.xml" /> - <namespace uri="library://ns.apache.org/flexjs/basic" manifest="${project_home}/Graphics/basic-manifest.xml" /> - <namespace uri="library://ns.apache.org/flexjs/basic" manifest="${project_home}/HTML/basic-manifest.xml" /> - <namespace uri="library://ns.apache.org/flexjs/html5" manifest="${project_home}/HTML5/html5-manifest.xml" /> - <namespace uri="library://ns.apache.org/flexjs/jquery" manifest="${project_home}/JQuery/jquery-manifest.xml" /> - <namespace uri="library://ns.apache.org/flexjs/basic" manifest="${project_home}/Mobile/basic-manifest.xml" /> - <namespace uri="library://ns.apache.org/flexjs/basic" manifest="${project_home}/Network/basic-manifest.xml" /> - - <library-path/> <external-library-path dir="${env.AIR_HOME}/frameworks/libs/air"> <include name="airglobal.swc"/> </external-library-path> - - <jvmarg line="${asdoc.jvm.args}"/> - - <define name="COMPILE::AS3" value="true"/> - <define name="COMPILE::JS" value="false"/> - <define name="CONFIG::debug" value="false"/> - <define name="CONFIG::release" value="true"/> - <define name="CONFIG::LOGGING" value="false"/> - <define name="CONFIG::performanceInstrumentation" value="false"/> + </asdoc> </target> </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b02859ac/frameworks/asdoc-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/asdoc-config.xml b/frameworks/asdoc-config.xml index 802807f..9ab4231 100644 --- a/frameworks/asdoc-config.xml +++ b/frameworks/asdoc-config.xml @@ -29,6 +29,13 @@ <compiler> + <define><name>COMPILE::AS3</name><value>true</value></define> + <define><name>COMPILE::JS</name><value>false</value></define> + <define><name>CONFIG::debug</name><value>false</value></define> + <define><name>CONFIG::release</name><value>true</value></define> + <define><name>CONFIG::LOGGING</name><value>false</value></define> + <define><name>CONFIG::performanceInstrumentation</name><value>false</value></define> + <!-- Turn on generation of accessible SWFs. --> <accessible>true</accessible> @@ -44,6 +51,23 @@ <path-element>string</path-element> </source-path> --> + <source-path> + <path-element>${frameworks_dir}/projects/Binding/as/src</path-element> + <path-element>${frameworks_dir}/projects/Charts/as/src</path-element> + <path-element>${frameworks_dir}/projects/Collections/as/src</path-element> + <path-element>${frameworks_dir}/projects/Core/as/src</path-element> + <path-element>${frameworks_dir}/projects/CreateJS/as/src</path-element> + <path-element>${frameworks_dir}/projects/DragDrop/as/src</path-element> + <path-element>${frameworks_dir}/projects/Effects/as/src</path-element> + <path-element>${frameworks_dir}/projects/Formatters/as/src</path-element> + <path-element>${frameworks_dir}/projects/GoogleMaps/as/src</path-element> + <path-element>${frameworks_dir}/projects/Graphics/as/src</path-element> + <path-element>${frameworks_dir}/projects/HTML/as/src</path-element> + <path-element>${frameworks_dir}/projects/HTML5/as/src</path-element> + <path-element>${frameworks_dir}/projects/JQuery/as/src</path-element> + <path-element>${frameworks_dir}/projects/Mobile/as/src</path-element> + <path-element>${frameworks_dir}/projects/Network/as/src</path-element> + </source-path> <!-- Allow the source-path to have path-elements which contain other path-elements --> <allow-source-path-overlap>false</allow-source-path-overlap> @@ -58,12 +82,6 @@ <debug>true</debug> --> - <!-- List of SWC files or directories to compile against but to omit from --> - <!-- linking. --> - <external-library-path> - <path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}/playerglobal.swc</path-element> - </external-library-path> - <!-- Turn on writing of generated/*.as files to disk. These files are generated by --> <!-- the compiler during mxml translation and are helpful with understanding and --> <!-- debugging Flex applications. --> @@ -78,26 +96,78 @@ <!-- List of SWC files or directories that contain SWC files. --> <library-path> - <path-element>libs</path-element> + <path-element>${flexlib}/libs/core.swc</path-element> + <path-element>${flexlib}/libs/framework.swc</path-element> <path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}</path-element> </library-path> - <namespaces> - <!-- Specify a URI to associate with a manifest of components for use as MXML --> - <!-- elements. --> - <namespace> - <uri>library://ns.apache.org/flexjs/basic</uri> - <manifest>projects/Core/basic-manifest.xml</manifest> - </namespace> - <namespace> - <uri>library://ns.apache.org/flexjs/html5</uri> - <manifest>projects/HTML5/html5-manifest.xml</manifest> - </namespace> - <namespace> - <uri>library://ns.apache.org/flexjs/svg</uri> - <manifest>projects/HTML/svg-manifest.xml</manifest> - </namespace> - </namespaces> + <!-- namespace declaration for asdoc --> + <namespaces> + <namespace> + <uri>library://ns.apache.org/flexjs/basic</uri> + <manifest>${frameworks_dir}/projects/Binding/basic-manifest.xml</manifest> + </namespace> + <namespace> + <uri>library://ns.apache.org/flexjs/basic</uri> + <manifest>${frameworks_dir}/projects/Charts/basic-manifest.xml</manifest> + </namespace> + <namespace> + <uri>library://ns.apache.org/flexjs/basic</uri> + <manifest>${frameworks_dir}/projects/Collections/basic-manifest.xml</manifest> + </namespace> + <namespace> + <uri>library://ns.apache.org/flexjs/basic</uri> + <manifest>${frameworks_dir}/projects/Core/basic-manifest.xml</manifest> + </namespace> + <namespace> + <uri>library://ns.apache.org/flexjs/createjs</uri> + <manifest>${frameworks_dir}/projects/CreateJS/createjs-manifest.xml</manifest> + </namespace> + <namespace> + <uri>library://ns.apache.org/flexjs/basic</uri> + <manifest>${frameworks_dir}/projects/DragDrop/basic-manifest.xml</manifest> + </namespace> + <namespace> + <uri>library://ns.apache.org/flexjs/basic</uri> + <manifest>${frameworks_dir}/projects/Effects/basic-manifest.xml</manifest> + </namespace> + <namespace> + <uri>library://ns.apache.org/flexjs/basic</uri> + <manifest>${frameworks_dir}/projects/Formatters/basic-manifest.xml</manifest> + </namespace> + <namespace> + <uri>library://ns.apache.org/flexjs/google</uri> + <manifest>${frameworks_dir}/projects/GoogleMaps/google-manifest.xml</manifest> + </namespace> + <namespace> + <uri>library://ns.apache.org/flexjs/basic</uri> + <manifest>${frameworks_dir}/projects/Graphics/basic-manifest.xml</manifest> + </namespace> + <namespace> + <uri>library://ns.apache.org/flexjs/basic</uri> + <manifest>${frameworks_dir}/projects/HTML/basic-manifest.xml</manifest> + </namespace> + <namespace> + <uri>library://ns.apache.org/flexjs/html5</uri> + <manifest>${frameworks_dir}/projects/HTML5/html5-manifest.xml</manifest> + </namespace> + <namespace> + <uri>library://ns.apache.org/flexjs/jquery</uri> + <manifest>${frameworks_dir}/projects/JQuery/jquery-manifest.xml</manifest> + </namespace> + <namespace> + <uri>library://ns.apache.org/flexjs/basic</uri> + <manifest>${frameworks_dir}/projects/Mobile/basic-manifest.xml</manifest> + </namespace> + <namespace> + <uri>library://ns.apache.org/flexjs/basic</uri> + <manifest>${frameworks_dir}/projects/Network/basic-manifest.xml</manifest> + </namespace> + <namespace> + <uri>library://ns.apache.org/flexjs/svg</uri> + <manifest>${frameworks_dir}/projects/HTML/svg-manifest.xml</manifest> + </namespace> + </namespaces> <!-- Enable post-link SWF optimization. --> <optimize>true</optimize> @@ -350,4 +420,50 @@ <language>EN</language> </metadata> + <exclude-classes> + <class>org.apache.flex.utils.Language</class> + <class>org.apache.flex.core.IFlexJSElement</class> + <class>org.apache.flex.core.WrappedHTMLElement</class> + <class>org.apache.flex.events.BrowserEvent</class> + <class>org.apache.flex.maps.google.beads.MapView_original</class> + </exclude-classes> + + <exclude-sources> + <path-element>${frameworks_dir}/projects/Core/as/src/org/apache/flex/utils/Language.as</path-element> + <path-element>${frameworks_dir}/projects/Core/as/src/org/apache/flex/core/WrappedHTMLElement.as</path-element> + <path-element>${frameworks_dir}/projects/Core/as/src/org/apache/flex/events/BrowserEvent.as</path-element> + <path-element>${frameworks_dir}/projects/Core/as/src/org/apache/flex/core/IFlexJSElement.as</path-element> + <path-element>${frameworks_dir}/projects/GoogleMaps/as/src/org/apache/flex/maps/google/beads/MapView_original.as</path-element> + </exclude-sources> + + <!-- source path for asdoc --> + + <!-- namespaces to include in asdoc --> + <doc-namespaces> + <uri>library://ns.apache.org/flexjs/basic</uri> + <uri>library://ns.apache.org/flexjs/createjs</uri> + <uri>library://ns.apache.org/flexjs/google</uri> + <uri>library://ns.apache.org/flexjs/html5</uri> + <uri>library://ns.apache.org/flexjs/jquery</uri> + </doc-namespaces> + + <!-- classes to include in asdoc --> + <doc-sources> + <path-element>${frameworks_dir}/projects/Binding/as/src</path-element> + <path-element>${frameworks_dir}/projects/Charts/as/src</path-element> + <path-element>${frameworks_dir}/projects/Collections/as/src</path-element> + <path-element>${frameworks_dir}/projects/Core/as/src</path-element> + <path-element>${frameworks_dir}/projects/CreateJS/as/src</path-element> + <path-element>${frameworks_dir}/projects/DragDrop/as/src</path-element> + <path-element>${frameworks_dir}/projects/Effects/as/src</path-element> + <path-element>${frameworks_dir}/projects/Formatters/as/src</path-element> + <path-element>${frameworks_dir}/projects/GoogleMaps/as/src</path-element> + <path-element>${frameworks_dir}/projects/Graphics/as/src</path-element> + <path-element>${frameworks_dir}/projects/HTML/as/src</path-element> + <path-element>${frameworks_dir}/projects/HTML5/as/src</path-element> + <path-element>${frameworks_dir}/projects/JQuery/as/src</path-element> + <path-element>${frameworks_dir}/projects/Mobile/as/src</path-element> + <path-element>${frameworks_dir}/projects/Network/as/src</path-element> + </doc-sources> + </flex-config> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b02859ac/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/GoogleMap.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/GoogleMap.as b/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/GoogleMap.as index e662e41..9265692 100644 --- a/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/GoogleMap.as +++ b/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/GoogleMap.as @@ -74,6 +74,7 @@ package org.apache.flex.maps.google MapModel(model).token = value; } + COMPILE::JS public function get selectedMarker():Marker { return MapModel(model).selectedMarker; @@ -99,6 +100,7 @@ package org.apache.flex.maps.google GoogleMapView(view).centerOnAddress(address); } + COMPILE::JS public function setCenter(location:LatLng):void { GoogleMapView(view).setCenter(location); @@ -114,6 +116,7 @@ package org.apache.flex.maps.google GoogleMapView(view).markAddress(address); } + COMPILE::JS public function createMarker(location:LatLng):Marker { return GoogleMapView(view).createMarker(location); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b02859ac/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/beads/GoogleMapView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/beads/GoogleMapView.as b/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/beads/GoogleMapView.as index e705f80..71a6c3a 100644 --- a/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/beads/GoogleMapView.as +++ b/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/beads/GoogleMapView.as @@ -36,18 +36,18 @@ package org.apache.flex.maps.google.beads COMPILE::JS { import goog.bind; - } - import google.maps.event; - import google.maps.Geocoder; - import google.maps.GeocoderResult; - import google.maps.GeocoderStatus; - import google.maps.LatLng; - import google.maps.Map; - import google.maps.Marker; - import google.maps.places.PlaceResult; - import google.maps.places.PlacesService; - import google.maps.places.PlacesServiceStatus; + import google.maps.event; + import google.maps.Geocoder; + import google.maps.GeocoderResult; + import google.maps.GeocoderStatus; + import google.maps.LatLng; + import google.maps.Map; + import google.maps.Marker; + import google.maps.places.PlaceResult; + import google.maps.places.PlacesService; + import google.maps.places.PlacesServiceStatus; + } /** * The MapView bead class displays a Google Map using HTMLLoader. @@ -510,6 +510,7 @@ package org.apache.flex.maps.google.beads * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ + COMPILE::JS public function createMarker(location:LatLng):Marker { return null; @@ -549,6 +550,7 @@ package org.apache.flex.maps.google.beads * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ + COMPILE::JS public function setCenter( location:LatLng ):void { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b02859ac/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/models/MapModel.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/models/MapModel.as b/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/models/MapModel.as index 6184143..3f412c6 100644 --- a/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/models/MapModel.as +++ b/frameworks/projects/GoogleMaps/as/src/org/apache/flex/maps/google/models/MapModel.as @@ -23,8 +23,11 @@ package org.apache.flex.maps.google.models import org.apache.flex.events.Event; import org.apache.flex.events.EventDispatcher; - import google.maps.LatLng; - import google.maps.Marker; + COMPILE::JS + { + import google.maps.LatLng; + import google.maps.Marker; + } /** * The data model for the Map class, this holds the maps current center @@ -78,6 +81,7 @@ package org.apache.flex.maps.google.models dispatchEvent(new Event("tokenChanged")); } + COMPILE::JS private var _currentCenter:LatLng; /** @@ -88,17 +92,20 @@ package org.apache.flex.maps.google.models * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ + COMPILE::JS public function get currentCenter():LatLng { return _currentCenter; } + COMPILE::JS public function set currentCenter(value:LatLng):void { _currentCenter = value; dispatchEvent( new Event("currentCenterChanged") ); } + COMPILE::JS private var _selectedMarker:Marker; /** @@ -109,11 +116,13 @@ package org.apache.flex.maps.google.models * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ + COMPILE::JS public function get selectedMarker():Marker { return _selectedMarker; } + COMPILE::JS public function set selectedMarker(value:Marker):void { _selectedMarker = value;
