Index: /trunk/netbeans/nbbuild.xml
===================================================================
--- /trunk/netbeans/nbbuild.xml	(revision 7181)
+++ /trunk/netbeans/nbbuild.xml	(revision 7182)
@@ -13,4 +13,5 @@
     <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,11 +112,25 @@
             <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>    
Index: /trunk/netbeans/nbproject/project.properties
===================================================================
--- /trunk/netbeans/nbproject/project.properties	(revision 7181)
+++ /trunk/netbeans/nbproject/project.properties	(revision 7182)
@@ -39,5 +39,5 @@
 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=\
Index: /trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 7181)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 7182)
@@ -463,4 +463,6 @@
         boolean colorModeDynamic = Main.pref.getBoolean("draw.rawgps.colors.dynamic", spec, false);
         int hdopfactor = Main.pref.getInteger("hdop.factor", 25);
+
+        int largePointAlpha = Main.pref.getInteger("draw.rawgps.large.alpha", -1) & 0xFF;
 
         Stroke storedStroke = g.getStroke();
@@ -746,4 +748,9 @@
                 }
                 Point screen = mv.getPoint(trkPnt.getEastNorth());
+                if (!hdopcircle) {
+                    // color the large GPS points like the gps lines
+                    trkPnt.customColoringTransparent = new Color(
+                        trkPnt.customColoring.getRed(), trkPnt.customColoring.getGreen(), trkPnt.customColoring.getBlue(), largePointAlpha);
+                }
                 g.setColor(trkPnt.customColoringTransparent);
                 if (hdopcircle && trkPnt.attr.get("hdop") != null) {