Changeset 7182 in josm for trunk/netbeans

Timestamp:

2014-05-26T09:22:25+02:00 (10 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:

• nbbuild.xml (modified) (2 diffs)
• nbproject/project.properties (modified) (1 diff)

trunk/netbeans/nbbuild.xml

@@ -13 +13 @@
     <property name="javacc.home" location="../tools"/>
     <property name="mapcss.dir" location="../src/org/openstreetmap/josm/gui/mappaint/mapcss"/>
+    <property name="imagerytypes.dir" location="${src.dir}/org/openstreetmap/josm/data/imagery/types"/>
 
     <import file="nbproject/build-impl.xml"/>
@@ -111 +112 @@
             <arg value="${javacc.home}/javacc.jar"/>
             <arg value="javacc"/>
-            <arg value="-OUTPUT_DIRECTORY=${mapcss.dir}/parsergen"/>
+            <arg value="-DEBUG_PARSER=false"/>
+            <arg value="-DEBUG_TOKEN_MANAGER=false"/>
             <arg value="-JDK_VERSION=1.7"/>
             <arg value="-GRAMMAR_ENCODING=UTF-8"/>
+            <arg value="-OUTPUT_DIRECTORY=${mapcss.dir}/parsergen"/>
             <arg value="${mapcss.dir}/MapCSSParser.jj"/>
         </exec>
     </target>
-    <target name="-pre-compile" depends="javacc">
+    <target name="jaxb" depends="init" unless="jaxb.notRequired">
+        <taskdef name="xjc" classname="com.sun.tools.xjc.XJCTask">
+            <classpath>
+                <fileset dir="${src.dir}/../tools/jaxb" includes="*.jar"/>
+            </classpath>
+        </taskdef>
+        <xjc schema="../data_nodist/wms-cache.xsd" destdir="${src.dir}" encoding="UTF-8">
+            <depends dir="${src.dir}/org/openstreetmap/josm/data/imagery" includes="WmsCache.java"/>
+            <produces dir="${imagerytypes.dir}" includes="*.java"/>
+        </xjc>
+    </target>
+
+    <target name="-pre-compile" depends="javacc,jaxb">
 <!--        <javacc target="${mapcss.dir}/MapCSSParser.jj" javacchome="${javacc.home}" outputdirectory="${mapcss.dir}/parsergen"/>-->
     </target>    

trunk/netbeans/nbproject/project.properties

@@ -39 +39 @@
 javac.classpath=
 # Space-separated list of extra javac options
-javac.compilerargs=-Xlint:unchecked
+javac.compilerargs=-Xlint:unchecked -Xlint:cast -Xlint:dep-ann -Xlint:divzero -Xlint:empty -Xlint:finally -Xlint:overrides -Xlint:static -Xlint:try  -Xlint:deprecation  
 javac.deprecation=true
 javac.processorpath=\