Merge pull request #28 from gravitystorm/docs
authorRichard Fairhurst <richard@systemeD.net>
Sun, 4 Mar 2012 14:32:54 +0000 (06:32 -0800)
committerRichard Fairhurst <richard@systemeD.net>
Sun, 4 Mar 2012 14:32:54 +0000 (06:32 -0800)
Docs

1  2 
build.xml
net/systemeD/halcyon/styleparser/RuleSet.as

diff --combined build.xml
index 179ca4e63d1b46383b8b67e5c40f205c3afb7fb4,8dc21d66633d26fa9650e82af0e58db178ca6707..7b9ec07688e90108f2076f03ff1a321af5fce6b4
+++ b/build.xml
    <!-- note that there's an asdoc target in Flex 4, if/when we move to that -->
    <target name="docs" depends="manifests,makeLocalesList">
      <exec executable="${ASDOC}" failonerror="true">
-       <arg line="-source-path ."/>
-       <arg line="-doc-sources net/systemeD/"/>
+       <arg line="-source-path=."/>
+       <arg line="-doc-sources=net/systemeD/"/>
        <arg line="-external-library-path=lib/"/>
        <arg line="-external-library-path=${FLEX_HOME}/frameworks/libs/"/>
        <arg line="-external-library-path=${FLEX_HOME}/frameworks/libs/player/10.2/"/>
        <arg line="-lenient"/>
-       <arg line="-target-player 10.2.0"/>
-       <arg line="-exclude-classes ${org_classes} ${it_classes} ${hxasm_classes} ${com_classes}"/>
-       <arg line="-output resources/docs/"/>
-       <arg line="-window-title 'Halcyon and Potlatch2 Developer documentation'" />
-       <arg line="-main-title 'Halcyon and Potlatch2 Developer documentation'" />
-       <arg line="-footer 'Found an error? Help us fix it. http://wiki.openstreetmap.org/wiki/Potlatch2'"/>
+       <arg line="-target-player=10.2.0"/>
+       <arg line="-exclude-classes=${org_classes},${it_classes},${hxasm_classes},${com_classes}"/>
+       <arg line="-output=resources/docs/"/>
+       <arg line="-window-title='Halcyon and Potlatch2 Developer documentation'" />
+       <arg line="-main-title='Halcyon and Potlatch2 Developer documentation'" />
+       <arg line="-footer='Found an error? Help us fix it. http://wiki.openstreetmap.org/wiki/Potlatch2'"/>
        <arg line="-package net.systemeD.controls 'Custom-built controls used in Potlatch2'" />
        <arg line="-package net.systemeD.halcyon 'The AS3 rendering library'" />
        <arg line="-package net.systemeD.halcyon.connection 'The connection to the main OSM server, and the entities'" />
@@@ -94,9 -94,8 +94,8 @@@
        <arg line="-package net.systemeD.potlatch2.tools 'Data manipulation tools'" />
        <arg line="-package net.systemeD.potlatch2.utils 'Data loading utilities'" />
        
-       <arg line="-left-frameset-width 300" />
-       <arg line="-locale=${locales.list}" />
-       <arg line="-allow-source-path-overlap true" />
+       <arg line="-left-frameset-width=300" />
+       <arg line="-allow-source-path-overlap=true" />
      </exec>
    </target>
  
  
          <fileset id="com_sources" dir="${basedir}/com/" />
          <!-- convert the names of excluded classes to packages with class names -->
-         <pathconvert property="com_classes" pathsep=" " refid="com_sources">
+         <pathconvert property="com_classes" pathsep="," refid="com_sources">
                  <chainedmapper>
                          <globmapper from="${basedir}/*" to="*"/>
                          <mapper type="package" from="*.as" to="*"/>
          <!-- Get the list of all files in the org directory -->
          <fileset id="org_sources" dir="${basedir}/org/" />
          <!-- convert the names of excluded classes to packages with class names -->
-         <pathconvert property="org_classes" pathsep=" " refid="org_sources">
+         <pathconvert property="org_classes" pathsep="," refid="org_sources">
                  <chainedmapper>
                          <globmapper from="${basedir}/*" to="*"/>
                          <mapper type="package" from="*.as" to="*"/>
  
          <fileset id="it_sources" dir="${basedir}/it/" />
          <!-- convert the names of excluded classes to packages with class names -->
-         <pathconvert property="it_classes" pathsep=" " refid="it_sources">
+         <pathconvert property="it_classes" pathsep="," refid="it_sources">
                  <chainedmapper>
                          <globmapper from="${basedir}/*" to="*"/>
                          <mapper type="package" from="*.as" to="*"/>
  
          <fileset id="hxasm_sources" dir="${basedir}/hxasm/" />
          <!-- convert the names of excluded classes to packages with class names -->
-         <pathconvert property="hxasm_classes" pathsep=" " refid="hxasm_sources">
+         <pathconvert property="hxasm_classes" pathsep="," refid="hxasm_sources">
                  <chainedmapper>
                          <globmapper from="${basedir}/*" to="*"/>
                          <mapper type="package" from="*.as" to="*"/>
         
        <!-- Sets java.awt.headless=true so font compilation works in headless environments -->
        <compiler.headless-server>true</compiler.headless-server>
 -      <target-player>10.0.0</target-player>
 +      <target-player>10.2.0</target-player>
       </mxmlc>
       
       <echo message="The ${test.application.name}.swf test runner has been created in ${test.bin.dir}" />
  
  
          <source-path path-element="${basedir}/l10n/locale/@{locale}"/>
 +        <source-path path-element="${basedir}/l10n/locale/en_US"/>
          <include-resource-bundles>help_dialog</include-resource-bundles>
          <include-resource-bundles>p2_main</include-resource-bundles>
  
      <ac:for param="dirname">
        <path>
          <dirset dir="${basedir}/l10n/locale/">
 +          <include name="*"/>
            <exclude name="bundles"/>
 -          <include name="??_??"/>
          </dirset>
        </path>
        <sequential>
index d26d68e6de7b0316d381696ec7ebac7dbe56bc42,98ba825127ec0073c4d5faf4ab79665d41af1467..6a8d6a015fef1dda52b38a08015078c7a0bf23f5
@@@ -9,13 -9,15 +9,15 @@@ package net.systemeD.halcyon.styleparse
      import net.systemeD.halcyon.ImageBank;
  
      import net.systemeD.halcyon.connection.*;
-       
-       /** A complete stylesheet, as loaded from a MapCSS file. It contains all selectors, declarations, 
-               and embedded images.                                                                                                                                                            </p><p>
-               
-               The RuleSet class has two principal methods: getStyles, which calculates the styles that apply
-               to an entity (returned as a StyleList); and parse, which parses a MapCSS stylesheet into
-               a complete RuleSet. */
+     /**
+     * A complete stylesheet, as loaded from a MapCSS file. It contains all selectors, declarations,
+     * and embedded images.
+     *
+     * <p>The RuleSet class has two principal methods: getStyles, which calculates the styles that apply
+     * to an entity (returned as a StyleList); and parse, which parses a MapCSS stylesheet into
+     * a complete RuleSet.</p>
+     */
  
        public class RuleSet {
  
  
          public static function parseCSSColor(colorStr:String):uint {
              colorStr = colorStr.toLowerCase();
 -            if (CSSCOLORS[colorStr]) {
 +            if (CSSCOLORS[colorStr] != undefined) {
                  return CSSCOLORS[colorStr];
              } else {
                  var match:Object = HEX.exec(colorStr);