Changeset 7182 in josm for trunk/netbeans


Ignore:
Timestamp:
2014-05-26T09:22:25+02:00 (5 years ago)
Author:
akks
Message:

see #10072: color large GPS points like the track segments
use draw.rawgps.large.alpha parameter for transparency
updated Netbeans project (JAXB)

Location:
trunk/netbeans
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/netbeans/nbbuild.xml

    r7008 r7182  
    1313    <property name="javacc.home" location="../tools"/>
    1414    <property name="mapcss.dir" location="../src/org/openstreetmap/josm/gui/mappaint/mapcss"/>
     15    <property name="imagerytypes.dir" location="${src.dir}/org/openstreetmap/josm/data/imagery/types"/>
    1516
    1617    <import file="nbproject/build-impl.xml"/>
     
    111112            <arg value="${javacc.home}/javacc.jar"/>
    112113            <arg value="javacc"/>
    113             <arg value="-OUTPUT_DIRECTORY=${mapcss.dir}/parsergen"/>
     114            <arg value="-DEBUG_PARSER=false"/>
     115            <arg value="-DEBUG_TOKEN_MANAGER=false"/>
    114116            <arg value="-JDK_VERSION=1.7"/>
    115117            <arg value="-GRAMMAR_ENCODING=UTF-8"/>
     118            <arg value="-OUTPUT_DIRECTORY=${mapcss.dir}/parsergen"/>
    116119            <arg value="${mapcss.dir}/MapCSSParser.jj"/>
    117120        </exec>
    118121    </target>
    119     <target name="-pre-compile" depends="javacc">
     122    <target name="jaxb" depends="init" unless="jaxb.notRequired">
     123        <taskdef name="xjc" classname="com.sun.tools.xjc.XJCTask">
     124            <classpath>
     125                <fileset dir="${src.dir}/../tools/jaxb" includes="*.jar"/>
     126            </classpath>
     127        </taskdef>
     128        <xjc schema="../data_nodist/wms-cache.xsd" destdir="${src.dir}" encoding="UTF-8">
     129            <depends dir="${src.dir}/org/openstreetmap/josm/data/imagery" includes="WmsCache.java"/>
     130            <produces dir="${imagerytypes.dir}" includes="*.java"/>
     131        </xjc>
     132    </target>
     133
     134    <target name="-pre-compile" depends="javacc,jaxb">
    120135<!--        <javacc target="${mapcss.dir}/MapCSSParser.jj" javacchome="${javacc.home}" outputdirectory="${mapcss.dir}/parsergen"/>-->
    121136    </target>   
  • trunk/netbeans/nbproject/project.properties

    r7008 r7182  
    3939javac.classpath=
    4040# Space-separated list of extra javac options
    41 javac.compilerargs=-Xlint:unchecked
     41javac.compilerargs=-Xlint:unchecked -Xlint:cast -Xlint:dep-ann -Xlint:divzero -Xlint:empty -Xlint:finally -Xlint:overrides -Xlint:static -Xlint:try  -Xlint:deprecation 
    4242javac.deprecation=true
    4343javac.processorpath=\
Note: See TracChangeset for help on using the changeset viewer.