Update README for current maintainer

Also, update preferred formatting to conform more closesly with JOSM.
This is largely to make it easier to move code from the Mapillary JOSM
plugin to JOSM in the future.

Signed-off-by: Taylor Smock <[email protected]>

Author: tsmock

.idea/codeStyles/Project.xml

@@ -13,8 +13,10 @@ All contributions to this repository are licensed under the GNU General Public L
 ## Code formatting
 
 The following format of source code files is preferred in this repository:
-* Indentation with 2 spaces per indentation level
+* Indentation with 4 spaces per indentation level
 * line endings should be UNIX-style line endings (LF)
 * one newline (LF) at the end of the file
 * where possible don't make lines longer than 120 characters
 * avoid trailing whitespace
+
+For ease of moving code to JOSM, code should be formatted the same way JOSM formats code.

CONTRIBUTING.md

@@ -9,12 +9,10 @@ A plugin for showing Mapillary images inside the OpenStreetMap-Editor JOSM.
 
 You can both download images from mapillary.com or import them from your harddrive.
 
-Support for uploading images and modifying images on Mapillary-servers is in the works, stay tuned.
-
 For instructions on setting up your local copy of this repository, see [INSTALL.md](INSTALL.md).
 
 Our contribution guidelines can be found in [CONTRIBUTING.md](CONTRIBUTING.md).
 
-* Maintainer: nokutu <[email protected]>
+* Maintainer: Taylor Smock <[email protected]>
 * License: [GPL v2 or later](./LICENSE.md)
 * Feel free to contact me for any bug or suggestion.

README.md

@@ -114,16 +114,14 @@ spotless {
     target("**/*.gradle", "**.*.md", "**/.gitignore")
 
     trimTrailingWhitespace()
-    indentWithSpaces(2)
+    indentWithSpaces(4)
     endWithNewline()
   }
   java {
-    // Exclude datepicker -- this should eventually become another plugin (needs to be in JOSM plugin svn or the replacement thereof)
-    targetExclude("src/main/java/org/openstreetmap/josm/plugins/datepicker/**/*")
     // Avoid large formatting commits.
     ratchetFrom("origin/master")
     trimTrailingWhitespace()
-    indentWithSpaces(2)
+    indentWithSpaces(4)
     endWithNewline()
     removeUnusedImports()
     eclipse().configFile("config/format/code_format.xml")

build.gradle.kts

@@ -220,7 +220,7 @@
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/>
+        <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>

config/format/code_format.xml

@@ -1,4 +1,4 @@
-plugin.author=nokutu, floscher <incoming+josm-plugin-mapillary-8564565-issue-@incoming.gitlab.com>
+plugin.author=nokutu, floscher, taylor.smock <incoming+josm-plugin-mapillary-8564565-issue-@incoming.gitlab.com>
 plugin.canloadatruntime=true
 plugin.class=org.openstreetmap.josm.plugins.mapillary.MapillaryPlugin
 plugin.description=Allows the user to work with pictures hosted at mapillary.com