Changeset 8528 in josm

Timestamp:

2015-06-24T23:30:02+02:00 (9 years ago)

Author:

Don-vip

Message:

see #11255 - remove references to imagery/types folder deleted since r8526

Location:

trunk

Files:

• .checkstyle (modified) (1 diff)
• build.xml (modified) (3 diffs)
• netbeans/nbbuild.xml (modified) (2 diffs)
• src/org/openstreetmap/josm/data/imagery (modified) (1 prop)

trunk/.checkstyle

@@ -15 +15 @@
     <filter-data value="src/org/jdesktop"/>
     <filter-data value="src/org/openstreetmap/gui"/>
-    <filter-data value="src/org/openstreetmap/josm/data/imagery/types"/>
     <filter-data value="src/org/openstreetmap/josm/gui/mappaint/mapcss/parsergen"/>
     <filter-data value="src/org/w3"/>

trunk/build.xml

@@ -15 +15 @@
     <property name="javacc.home" location="tools"/>
     <property name="mapcss.dir" location="${src.dir}/org/openstreetmap/josm/gui/mappaint/mapcss"/>
-    <property name="imagerytypes.dir" location="${src.dir}/org/openstreetmap/josm/data/imagery/types"/>
     <!-- build parameter: compression level (ant -Dclevel=N)
              N ranges from 0 (no compression) to 9 (maximum compression)
@@ -291 +290 @@
         <delete dir="dist"/>
         <delete dir="${mapcss.dir}/parsergen"/>
-        <delete dir="${imagerytypes.dir}"/>
     </target>
     <path id="test.classpath">
@@ -578 +576 @@
         <checkstyle config="tools/checkstyle/josm_checks.xml">
             <fileset dir="${basedir}/src/org/openstreetmap/josm" includes="**/*.java" 
-                excludes="data/imagery/types/*.java,gui/mappaint/mapcss/parsergen/*.java"/>
+                excludes="gui/mappaint/mapcss/parsergen/*.java"/>
             <fileset dir="${basedir}/test" includes="**/*.java"/>
             <formatter type="xml" toFile="checkstyle-josm.xml"/>

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"/>
     <!-- For Windows-specific stuff -->
     <condition property="isWindows">
@@ -109 +108 @@
             <srcfiles dir="${mapcss.dir}" includes="MapCSSParser.jj"/>
         </uptodate>
-        <uptodate property="jaxb.notRequired" targetfile="${src.dir}/org/openstreetmap/josm/data/imagery/types/package-info.java" >
-            <srcfiles dir="../data_nodist" includes="wms-cache.xsd"/>
-        </uptodate>
     </target>   
     <target name="javacc" depends="check-javacc" unless="javacc.notRequired">