see #18140 - reorganization of data(_nodist), images(_nodist), styles…

…(_nodist), IDE and native files in a more practical file tree.

- Everything belonging to the jar is now in resources (data, images, styles)
- Everything not belonging to the jar is now in nodist (data, images, styles)
- Everything related to OS native functions is now in native (linux, macosx, windows)
- Everything related to an IDE is now in ide (eclipse, netbeans)

git-svn-id: https://josm.openstreetmap.de/svn/trunk@16006 0c6e7542-c601-0410-84e7-c038aed88b3b

.checkstyle

@@ -25,26 +25,18 @@
     <filter-data value="bintest"/>
     <filter-data value="build"/>
     <filter-data value="build2"/>
-    <filter-data value="data"/>
-    <filter-data value="data_nodist"/>
     <filter-data value="dist"/>
-    <filter-data value="eclipse"/>
-    <filter-data value="images"/>
-    <filter-data value="images_nodist"/>
+    <filter-data value="ide"/>
     <filter-data value="javadoc"/>
-    <filter-data value="linux"/>
-    <filter-data value="macosx"/>
-    <filter-data value="netbeans"/>
+    <filter-data value="native"/>
+    <filter-data value="nodist"/>
     <filter-data value="patches"/>
     <filter-data value="resources"/>
-    <filter-data value="styles"/>
-    <filter-data value="styles_nodist"/>
     <filter-data value="test/build"/>
     <filter-data value="test/config"/>
     <filter-data value="test/data"/>
     <filter-data value="test/lib"/>
     <filter-data value="test/report"/>
     <filter-data value="tools"/>
-    <filter-data value="windows"/>
   </filter>
 </fileset-config>

.classpath

@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry excluding="org/apache/commons/compress/PasswordRequiredException.java|org/apache/commons/compress/archivers/|org/apache/commons/compress/changes/|org/apache/commons/compress/compressors/CompressorException.java|org/apache/commons/compress/compressors/CompressorStreamFactory.java|org/apache/commons/compress/compressors/CompressorStreamProvider.java|org/apache/commons/compress/compressors/FileNameUtil.java|org/apache/commons/compress/compressors/brotli/|org/apache/commons/compress/compressors/bzip2/BZip2Utils.java|org/apache/commons/compress/compressors/deflate/|org/apache/commons/compress/compressors/gzip/|org/apache/commons/compress/compressors/lz4/|org/apache/commons/compress/compressors/lz77support/|org/apache/commons/compress/compressors/lzma/|org/apache/commons/compress/compressors/pack200/|org/apache/commons/compress/compressors/snappy/|org/apache/commons/compress/compressors/xz/XZUtils.java|org/apache/commons/compress/compressors/z/|org/apache/commons/compress/compressors/zstandard/|org/apache/commons/compress/parallel/|org/apache/commons/compress/utils/ArchiveUtils.java|org/apache/commons/jcs/JCS.java|org/apache/commons/jcs/access/GroupCacheAccess.java|org/apache/commons/jcs/access/PartitionedCacheAccess.java|org/apache/commons/jcs/access/behavior/IGroupCacheAccess.java|org/apache/commons/jcs/access/exception/InvalidGroupException.java|org/apache/commons/jcs/admin/servlet/|org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCacheMonitor.java|org/apache/commons/jcs/auxiliary/disk/jdbc/|org/apache/commons/jcs/auxiliary/lateral/|org/apache/commons/jcs/auxiliary/remote/AbstractRemoteAuxiliaryCache.java|org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheListener.java|org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java|org/apache/commons/jcs/auxiliary/remote/RemoteCache.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheFactory.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheListener.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheMonitor.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWait.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheRestore.java|org/apache/commons/jcs/auxiliary/remote/http/|org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheStartupServlet.java|org/apache/commons/jcs/auxiliary/remote/server/TimeoutConfigurableRMISocketFactory.java|org/apache/commons/jcs/engine/CacheAdaptor.java|org/apache/commons/jcs/engine/CacheGroup.java|org/apache/commons/jcs/engine/CacheWatchRepairable.java|org/apache/commons/jcs/engine/ZombieCacheService.java|org/apache/commons/jcs/engine/ZombieCacheServiceNonLocal.java|org/apache/commons/jcs/engine/ZombieCacheWatch.java|org/apache/commons/jcs/engine/logging/CacheEventLoggerDebugLogger.java|org/apache/commons/jcs/utils/access/|org/apache/commons/jcs/utils/discovery/|org/apache/commons/jcs/utils/net/|org/apache/commons/jcs/utils/props/|org/apache/commons/jcs/utils/servlet/|org/apache/commons/logging/impl/AvalonLogger.java|org/apache/commons/logging/impl/Jdk13LumberjackLogger.java|org/apache/commons/logging/impl/Log4JLogger.java|org/apache/commons/logging/impl/LogKitLogger.java|org/apache/commons/logging/impl/ServletContextCleaner.java|org/openstreetmap/gui/jmapviewer/Demo.java|org/openstreetmap/gui/jmapviewer/JMapViewerTree.java|org/openstreetmap/gui/jmapviewer/checkBoxTree/" kind="src" path="src"/>
 	<classpathentry kind="src" path="resources"/>
-	<classpathentry including="data/|images/|styles/" kind="src" path=""/>
 	<classpathentry kind="src" output="bintest" path="test/unit">
 		<attributes>
 			<attribute name="test" value="true"/>

.pmd

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pmd>
+    <useProjectRuleSet>true</useProjectRuleSet>
+    <ruleSetFile>tools\pmd\josm-ruleset.xml</ruleSetFile>
+    <includeDerivedFiles>false</includeDerivedFiles>
+    <violationsAsErrors>false</violationsAsErrors>
+    <fullBuildEnabled>false</fullBuildEnabled>
+</pmd>

.project

@@ -35,6 +35,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.sonarlint.eclipse.core.sonarlintNature</nature>
@@ -43,5 +48,6 @@
 		<nature>sf.eclipse.javacc.javaccnature</nature>
 		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 		<nature>org.apache.ivyde.eclipse.ivynature</nature>
+		<nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
 	</natures>
 </projectDescription>

.settings/org.eclipse.core.resources.prefs

@@ -1,3 +1,3 @@
 eclipse.preferences.version=1
-encoding//windows/locale=ISO-8859-1
+encoding//native/windows/locale=ISO-8859-1
 encoding/<project>=UTF-8

README

@@ -57,26 +57,20 @@ Files & directories
 This is an overview of the files and directories in the JOSM code repository:
 - build.xml                 ant build file (standard way to create a JOSM binary)
 - CONTRIBUTION              list of major code contributors
-- data/                     data files that will be included in the JOSM jar file
-    - fonts/                font files used for map rendering
-    - gpx/                  different color gradients for gpx drawing
-    - projection/           projection files
-      - custom-epsg         list of projection definitions, auto-generated file created by ant task 'epsg'
-    - security/*.pem        certificates that we like to accept for TLS connections, but are missing in the
-                            default Java certificate store
-    - validator/            data files used by the JOSM validator
-      - *.cfg               files designed for the old tagchecker, still in use
-      - *.mapcss            default validation rules for the MapCSS-based tagchecker
-    - boundaries.osm        OSM file containing boundary data for the states of the earth, including
-                            data for right and left-hand traffic
-    - defaultpresets.xml    data file for the core tagging presets
-    - help-browser.css      CSS file for the help sites (HTML content is downloaded from the website
-                            on demand, but displayed inside the programm in a Java web browser component.)
-    - overpass-wizard.js    Javascript code to provide a wizard-GUI for creating Overpass requests
-                            (external library, see https://github.com/tyrasd/overpass-wizard)
-    - *.lang                translation data
-    - *.xsd                 xml schema files for validation of configuration files
-- data_nodist/              data files that are useful for development, but not distributed
+- gpl-2.0.txt, gpl-3.0.txt  full text of the GNU General Public License
+- ide                       IDE-specific files
+  - eclipse/                preconfigured Eclipse configuration files
+  - netbeans/               preconfigured Netbeans project
+- josm.jnlp                 Java Web Start launcher file (used on the website for the tested version)
+- josm-latest.jnlp          Java Web Start launcher file (used on the website for the latest version)
+- LICENSE                   the JOSM license terms
+- native/                   OS-specific files
+  - linux/                  files useful for Linux distributions, including Appdata files, .desktop
+                            files, Debian/Ubuntu scripts, man pages, icons, etc.
+  - macosx/                 files needed to create the MacOS X package
+  - windows/                files needed to create the Windows installer
+- nodist/                   files not included in JOSM binary
+  - data/                   data files that are useful for development, but not distributed
     - exif-direction-example.jpg
                             sample image, that contains direction information in the EXIF header
                             (keys: Exif.GPSInfo.GPSImgDirectionRef, Exif.GPSInfo.GPSImgDirection)
@@ -106,22 +100,36 @@ This is an overview of the files and directories in the JOSM code repository:
                             by the server for localization of the services;
                             currently contains plugin descriptions in order to include translations
                             in the downloaded plugin list
-- gpl-2.0.txt, gpl-3.0.txt  full text of the GNU General Public License
-- images/                   images distributed with the JOSM binary
-    - icons                 images for the Potlatch 2 style
-    - presets               images for the main mappaint style and the internal presets
-- images_nodist/            images, which are not for distribution, but may be useful later (e.g. high
+  - images/                 images, which are not for distribution, but may be useful later (e.g. high
                             resolution and vector versions)
-- josm.jnlp                 Java Web Start launcher file (used on the website for the tested version)
-- josm-latest.jnlp          Java Web Start launcher file (used on the website for the latest version)
-- LICENSE                   the JOSM license terms
-- linux/                    files useful for Linux distributions, including Appdata files, .desktop
-                            files, Debian/Ubuntu scripts, man pages, icons, etc.
-- macosx/                   files needed to create the MacOS X package
-- netbeans/                 preconfigured Netbeans project
+  - styles/                 files needed for map style maintenance
+    - potlatch2/README      infos on how to update the Potlatch 2 style from upstream sources
 - patches/                  patches for external libraries used in JOSM (see below)
 - README                    this file
 - resources/                resource files that will be included in the JOSM jar file
+  - data/                   data files that will be included in the JOSM jar file
+    - fonts/                font files used for map rendering
+    - gpx/                  different color gradients for gpx drawing
+    - projection/           projection files
+      - custom-epsg         list of projection definitions, auto-generated file created by ant task 'epsg'
+    - security/*.pem        certificates that we like to accept for TLS connections, but are missing in the
+                            default Java certificate store
+    - validator/            data files used by the JOSM validator
+      - *.cfg               files designed for the old tagchecker, still in use
+      - *.mapcss            default validation rules for the MapCSS-based tagchecker
+    - boundaries.osm        OSM file containing boundary data for the states of the earth, including
+                            data for right and left-hand traffic
+    - defaultpresets.xml    data file for the core tagging presets
+    - help-browser.css      CSS file for the help sites (HTML content is downloaded from the website
+                            on demand, but displayed inside the programm in a Java web browser component.)
+    - overpass-wizard.js    Javascript code to provide a wizard-GUI for creating Overpass requests
+                            (external library, see https://github.com/tyrasd/overpass-wizard)
+    - *.lang                translation data
+    - *.xsd                 xml schema files for validation of configuration files
+  - images/                 images distributed with the JOSM binary
+    - icons                 images for the Potlatch 2 style
+    - presets               images for the main mappaint style and the internal presets
+  - styles/                 map styles included in JOSM
 - scripts/                  various scripts used by JOSM developers
   - BuildProjectionDefinitions.java
                             called from the ant build file to combine the files epsg and josm-epsg
@@ -136,9 +144,6 @@ This is an overview of the files and directories in the JOSM code repository:
   - TagInfoExtract.java     extracts tag information for the taginfo project
 - src/                      the source code of the application
 - start.html                HTML page to run the applet version of JOSM
-- styles/                   map styles included in JOSM
-- sytles_nodist/            files needed for map style maintenance
-    - potlatch2/README      infos on how to update the Potlatch 2 style from upstream sources
 - test/                     automated software tests
     - data/                 resources used for some tests
     - functional/           functional tests (source code)
@@ -152,15 +157,15 @@ This is an overview of the files and directories in the JOSM code repository:
     - checkstyle/           libs and config files for checkstyle (automatically detects code style
                             problems in source code); can be launched as an ant target in build.xml
     - error_prone_ant.jar   used to detect code errors during compilation
-    - spotbugs/             libs and config files for spotbugs (automatically detects common bugs and potential
-                            problems in source code); can be launched as an ant target in build.xml
+    - ivy/                  Apache Ivy binary, configuration file, and downloaded dependencies 
     - jacocoant.jar         used to include coverage data into JUnit test reports
     - japicc/               used to generate a compatibility report between optimized jar and normal one
     - javacc.jar            used in the build process to generate some .java files from a javacc source file
                             (src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj)
     - proguard.jar          optimize final binary jar - see build.xml (not used in production so far)
+    - spotbugs/             libs and config files for spotbugs (automatically detects common bugs and potential
+                            problems in source code); can be launched as an ant target in build.xml
     - xmltask.jar           used to edit XML files from Ant for the OSX package
-- windows/                  files needed to create the Windows installer
 
 The 'patches' directory
 -----------------------

build.xml

@@ -50,7 +50,7 @@
         <property name="proj-build.dir" location="${base.dir}/build2"/>
         <property name="script-build.dir" location="${base.dir}/build2"/>
         <property name="checkstyle-build.dir" location="${base.dir}/build2"/>
-        <property name="epsg.output" location="${base.dir}/data/projection/custom-epsg"/>
+        <property name="epsg.output" location="${base.dir}/resources/data/projection/custom-epsg"/>
         <property name="error_prone_core.jar" location="${tools.dir}/error_prone_core.jar"/>
         <property name="error_prone_javac.jar" location="${tools.dir}/error_prone_javac.jar"/>
         <property name="auto-value-annotations.jar" location="${tools.dir}/auto-value-annotations.jar"/>
@@ -96,6 +96,7 @@
                 <include name="**/*.jar"/>
             </fileset>
             <pathelement path="${build.dir}"/>
+            <pathelement path="${base.dir}/resources"/>
             <pathelement path="${failureaccess.jar}"/>
             <pathelement path="${guava.jar}"/>
             <pathelement path="${commons-lang3.jar}"/>
@@ -186,8 +187,8 @@ Build-Date: ${build.tstamp}
       ** Check internal XML files against their XSD
     -->
     <target name="check-schemas" unless="check-schemas.notRequired" depends="init-properties">
-        <schemavalidate file="data/defaultpresets.xml" >
-            <schema namespace="http://josm.openstreetmap.de/tagging-preset-1.0" file="data/tagging-preset.xsd" />
+        <schemavalidate file="resources/data/defaultpresets.xml" >
+            <schema namespace="http://josm.openstreetmap.de/tagging-preset-1.0" file="resources/data/tagging-preset.xsd" />
         </schemavalidate>
     </target>
     <!--
@@ -214,9 +215,6 @@ Build-Date: ${build.tstamp}
                 <attribute name="Add-Opens" value="java.base/java.lang java.base/java.nio java.base/jdk.internal.loader java.base/jdk.internal.ref java.desktop/javax.imageio.spi java.desktop/javax.swing.text.html java.prefs/java.util.prefs" />
             </manifest>
             <service type="java.text.spi.DecimalFormatSymbolsProvider" provider="org.openstreetmap.josm.tools.JosmDecimalFormatSymbolsProvider" />
-            <zipfileset dir="images" prefix="images"/>
-            <zipfileset dir="data" prefix="data"/>
-            <zipfileset dir="styles" prefix="styles"/>
             <zipfileset dir="${src.dir}/org/openstreetmap/gui/jmapviewer/images" prefix="org/openstreetmap/gui/jmapviewer/images"/>
         </jar>
     </target>
@@ -493,7 +491,7 @@ Build-Date: ${build.tstamp}
             </javac>
         </sequential>
     </macrodef>
-    <target name="test-compile" depends="test-init,compile">
+    <target name="test-compile" depends="test-init,compile,epsg">
         <call-javac testfamily="unit">
             <cp-elements>
                 <path refid="test.classpath"/>

ide/eclipse/JOSM (Java 8).launch

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/JOSM/src/org/openstreetmap/josm/gui/MainApplication.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.openstreetmap.josm.gui.MainApplication"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--debug"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="JOSM"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Xverify:none"/>
+</launchConfiguration>

data_nodist/tagchecker.cfg → nodist/data/tagchecker.cfg

@@ -44,4 +44,4 @@
 #way  : W : oneway != BOOLEAN_FALSE && /.*:(backward|forward)/ == *    # oneway combined with *:backward/forward
 
 
-# all former checks are now located in data/validator/*mapcss :-)
+# all former checks are now located in resources/data/validator/*mapcss :-)