Taylor Smock: 1 Use jakarta.json instead of javax.json 41 files changed, 578 insertions(+), 95 deletions(-)
Copy & paste the following snippet into your terminal to import this patchset into git:
curl -s https://lists.sr.ht/~qeef/damn-dev/patches/54168/mbox | git am -3Learn more about email & git
Also replace gradle with maven. The JOSM gradle plugin isn't well maintained. Since this plugin doesn't use the common ant scripts, the images are additionally moved to the standard maven location. Signed-off-by: Taylor Smock <tsmock@meta.com> --- .mvn/wrapper/maven-wrapper.properties | 19 ++ mvnw | 259 ++++++++++++++++++ mvnw.cmd | 149 ++++++++++ pom.xml | 100 +++++++ .../josm/plugins/damn/DamnDialog.java | 10 +- .../plugins/damn/actions/GetAreaAction.java | 10 +- .../damn/actions/GetAreaGeometryAction.java | 10 +- .../plugins/damn/actions/GetAreasAction.java | 10 +- .../damn/actions/GetWorkingOnAction.java | 14 +- .../damn/actions/PostDoneSquareAction.java | 9 +- .../actions/PostLockSquareOfAreaAction.java | 11 +- .../damn/actions/PostMapAreaAction.java | 10 +- .../damn/actions/PostMapSquareAction.java | 9 +- .../damn/actions/PostReviewAreaAction.java | 10 +- .../damn/actions/PostReviewSquareAction.java | 9 +- .../damn/actions/PostSplitSquareAction.java | 9 +- .../plugins/damn/actions/SetMapAction.java | 1 - .../plugins/damn/actions/SetReviewAction.java | 1 - .../damn/actions/SetWhichMapperAction.java | 1 - .../damn/callbacks/GetAreaCallback.java | 2 +- .../callbacks/GetAreaGeometryCallback.java | 2 +- .../damn/callbacks/GetAreasCallback.java | 2 +- .../damn/callbacks/GetWorkingOnCallback.java | 2 +- .../callbacks/PostDoneSquareCallback.java | 2 +- .../PostLockSquareOfAreaCallback.java | 2 +- .../damn/callbacks/PostMapAreaCallback.java | 2 +- .../damn/callbacks/PostMapSquareCallback.java | 2 +- .../callbacks/PostReviewAreaCallback.java | 2 +- .../callbacks/PostReviewSquareCallback.java | 2 +- .../callbacks/PostSplitSquareCallback.java | 2 +- .../main/resources/images}/actions/areas.svg | 0 .../main/resources/images}/actions/border.svg | 0 .../main/resources/images}/actions/done.svg | 0 .../main/resources/images}/actions/lock.svg | 0 .../main/resources/images}/actions/map.svg | 0 .../main/resources/images}/actions/osm.svg | 0 .../main/resources/images}/actions/q.svg | 0 .../main/resources/images}/actions/review.svg | 0 .../main/resources/images}/actions/split.svg | 0 .../resources/images}/actions/workingon.svg | 0 .../main/resources/images}/dialogs/damn.svg | 0 41 files changed, 578 insertions(+), 95 deletions(-) create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100755 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml rename {images => src/main/resources/images}/actions/areas.svg (100%) rename {images => src/main/resources/images}/actions/border.svg (100%) rename {images => src/main/resources/images}/actions/done.svg (100%) rename {images => src/main/resources/images}/actions/lock.svg (100%) rename {images => src/main/resources/images}/actions/map.svg (100%) rename {images => src/main/resources/images}/actions/osm.svg (100%) rename {images => src/main/resources/images}/actions/q.svg (100%) rename {images => src/main/resources/images}/actions/review.svg (100%) rename {images => src/main/resources/images}/actions/split.svg (100%) rename {images => src/main/resources/images}/actions/workingon.svg (100%) rename {images => src/main/resources/images}/dialogs/damn.svg (100%) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..f95f1ee --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip diff --git a/mvnw b/mvnw new file mode 100755 index 0000000..19529dd --- /dev/null +++ b/mvnw @@ -0,0 +1,259 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.2 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash> +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..b150b91 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,149 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash> +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..7546f4a --- /dev/null +++ b/pom.xml @@ -0,0 +1,100 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<modelVersion>4.0.0</modelVersion> + <groupId>org.openstreetmap.josm.plugins</groupId> + <artifactId>damn</artifactId> + <version>1.0-SNAPSHOT</version> + <properties> + <plugin.main.version>19067</plugin.main.version> + </properties> + <repositories> + <repository> + <id>JOSM-releases</id> + <url>https://josm.openstreetmap.de/nexus/content/repositories/releases/</url> + </repository> + <repository> + <id>JOSM-snapshots</id> + <url>https://josm.openstreetmap.de/nexus/content/repositories/snapshots/</url> + </repository> + <repository> + <id>JOSM-central</id> + <url>https://josm.openstreetmap.de/nexus/content/repositories/central/</url> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>JOSM-central</id> + <url>https://josm.openstreetmap.de/nexus/content/repositories/central/</url> + </pluginRepository> + </pluginRepositories> + <dependencies> + <dependency> + <groupId>org.openstreetmap.josm</groupId> + <artifactId>josm</artifactId> + <version>${plugin.main.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.openstreetmap.josm</groupId> + <artifactId>josm-unittest</artifactId> + <version>SNAPSHOT</version> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>3.4.2</version> + <configuration> + <archive> + <manifestEntries> + <!-- For full documentation, see https://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins#ThemanifestfileforaJOSMplugin --> + <Plugin-Mainversion>${plugin.main.version}</Plugin-Mainversion> + <Plugin-Version>${project.version}</Plugin-Version> + <Plugin-Class>org.openstreetmap.josm.plugins.damn.DamnPlugin</Plugin-Class> + <Plugin-Description>Divide and Map. Now.</Plugin-Description> + <!-- These are optional, but are either added almost all the time or can be auto generated --> + <Plugin-Date>${maven.build.timestamp}</Plugin-Date> + <Author>qeef</Author> + <Plugin-Link>https://damn-project.org</Plugin-Link> + <Plugin-Icon>images/dialogs/damn.svg</Plugin-Icon> + </manifestEntries> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.13.0</version> + <configuration> + <release>11</release> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>3.4.1</version> + <executions> + <execution> + <id>enforce-versions</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireMavenVersion> + <version>3.6.3</version> + </requireMavenVersion> + <requireJavaVersion> + <version>17</version> + </requireJavaVersion> + </rules> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file diff --git a/src/main/java/org/openstreetmap/josm/plugins/damn/DamnDialog.java b/src/main/java/org/openstreetmap/josm/plugins/damn/DamnDialog.java index 72bfafd..b2714ce 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/damn/DamnDialog.java +++ b/src/main/java/org/openstreetmap/josm/plugins/damn/DamnDialog.java @@ -21,17 +21,17 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.json.JsonValue; import javax.swing.DefaultListModel; import javax.swing.JLabel; import javax.swing.JList; import javax.swing.JPanel; import javax.swing.JScrollPane; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; +import jakarta.json.JsonValue; import org.openstreetmap.josm.actions.downloadtasks.DownloadGeoJsonTask; import org.openstreetmap.josm.actions.downloadtasks.DownloadNotesTask; import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask; diff --git a/src/main/java/org/openstreetmap/josm/plugins/damn/actions/GetAreaAction.java b/src/main/java/org/openstreetmap/josm/plugins/damn/actions/GetAreaAction.java index 644c6dc..f58019c 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/damn/actions/GetAreaAction.java +++ b/src/main/java/org/openstreetmap/josm/plugins/damn/actions/GetAreaAction.java @@ -1,18 +1,14 @@ package org.openstreetmap.josm.plugins.damn.actions; -import static org.openstreetmap.josm.gui.help.HelpUtil.ht; import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; import java.io.BufferedReader; import java.net.URL; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.json.JsonValue; - +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.openstreetmap.josm.actions.JosmAction; import org.openstreetmap.josm.spi.preferences.Config; import org.openstreetmap.josm.tools.HttpClient; diff --git a/src/main/java/org/openstreetmap/josm/plugins/damn/actions/GetAreaGeometryAction.java b/src/main/java/org/openstreetmap/josm/plugins/damn/actions/GetAreaGeometryAction.java index 1ff87f6..a9278d0 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/damn/actions/GetAreaGeometryAction.java +++ b/src/main/java/org/openstreetmap/josm/plugins/damn/actions/GetAreaGeometryAction.java @@ -1,18 +1,14 @@ package org.openstreetmap.josm.plugins.damn.actions; -import static org.openstreetmap.josm.gui.help.HelpUtil.ht; import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; import java.io.BufferedReader; import java.net.URL; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.json.JsonValue; - +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.openstreetmap.josm.actions.JosmAction; import org.openstreetmap.josm.spi.preferences.Config; import org.openstreetmap.josm.tools.HttpClient; diff --git a/src/main/java/org/openstreetmap/josm/plugins/damn/actions/GetAreasAction.java b/src/main/java/org/openstreetmap/josm/plugins/damn/actions/GetAreasAction.java index f4206a6..72226d9 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/damn/actions/GetAreasAction.java +++ b/src/main/java/org/openstreetmap/josm/plugins/damn/actions/GetAreasAction.java @@ -1,18 +1,14 @@ package org.openstreetmap.josm.plugins.damn.actions; -import static org.openstreetmap.josm.gui.help.HelpUtil.ht; import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; import java.io.BufferedReader; import java.net.URL; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.json.JsonValue; - +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonReader; import org.openstreetmap.josm.actions.JosmAction; import org.openstreetmap.josm.spi.preferences.Config; import org.openstreetmap.josm.tools.HttpClient; diff --git a/src/main/java/org/openstreetmap/josm/plugins/damn/actions/GetWorkingOnAction.java b/src/main/java/org/openstreetmap/josm/plugins/damn/actions/GetWorkingOnAction.java index aba77ed..b57e5ab 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/damn/actions/GetWorkingOnAction.java +++ b/src/main/java/org/openstreetmap/josm/plugins/damn/actions/GetWorkingOnAction.java @@ -1,21 +1,15 @@ package org.openstreetmap.josm.plugins.damn.actions; -import static org.openstreetmap.josm.gui.help.HelpUtil.ht; import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; import java.io.BufferedReader; import java.net.URL; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.TimeZone; - -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.json.JsonValue; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.openstreetmap.josm.actions.JosmAction; import org.openstreetmap.josm.spi.preferences.Config; import org.openstreetmap.josm.tools.HttpClient; diff --git a/src/main/java/org/openstreetmap/josm/plugins/damn/actions/PostDoneSquareAction.java b/src/main/java/org/openstreetmap/josm/plugins/damn/actions/PostDoneSquareAction.java index f7507b6..0967e89 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/damn/actions/PostDoneSquareAction.java +++ b/src/main/java/org/openstreetmap/josm/plugins/damn/actions/PostDoneSquareAction.java @@ -1,19 +1,16 @@ package org.openstreetmap.josm.plugins.damn.actions; -import static org.openstreetmap.josm.gui.help.HelpUtil.ht; import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; import java.io.BufferedReader; import java.net.URL; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.json.JsonValue; import javax.swing.JOptionPane; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.openstreetmap.josm.actions.JosmAction; import org.openstreetmap.josm.spi.preferences.Config; import org.openstreetmap.josm.tools.HttpClient; diff --git a/src/main/java/org/openstreetmap/josm/plugins/damn/actions/PostLockSquareOfAreaAction.java b/src/main/java/org/openstreetmap/josm/plugins/damn/actions/PostLockSquareOfAreaAction.java index 3d7ffa9..772786b 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/damn/actions/PostLockSquareOfAreaAction.java +++ b/src/main/java/org/openstreetmap/josm/plugins/damn/actions/PostLockSquareOfAreaAction.java @@ -1,19 +1,16 @@ package org.openstreetmap.josm.plugins.damn.actions; -import static org.openstreetmap.josm.gui.help.HelpUtil.ht; import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; import java.io.BufferedReader; import java.net.URL; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.json.JsonValue; import javax.swing.JOptionPane; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.openstreetmap.josm.actions.JosmAction; import org.openstreetmap.josm.spi.preferences.Config; import org.openstreetmap.josm.tools.HttpClient; @@ -24,7 +21,7 @@ import org.openstreetmap.josm.plugins.damn.callbacks.PostLockSquareOfAreaCallbac /** * Manual square lock * - * @see https://damn-project.org/#manual-square-lock + * @see <a href="https://damn-project.org/#manual-square-lock">manual square lock</a> * @author qeef * @since xxx */ diff --git a/src/main/java/org/openstreetmap/josm/plugins/damn/actions/PostMapAreaAction.java b/src/main/java/org/openstreetmap/josm/plugins/damn/actions/PostMapAreaAction.java index 0baf121..141575f 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/damn/actions/PostMapAreaAction.java +++ b/src/main/java/org/openstreetmap/josm/plugins/damn/actions/PostMapAreaAction.java @@ -1,18 +1,14 @@ package org.openstreetmap.josm.plugins.damn.actions; -import static org.openstreetmap.josm.gui.help.HelpUtil.ht; import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; import java.io.BufferedReader; import java.net.URL; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.json.JsonValue; - +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.openstreetmap.josm.actions.JosmAction; import org.openstreetmap.josm.spi.preferences.Config; import org.openstreetmap.josm.tools.HttpClient; diff --git a/src/main/java/org/openstreetmap/josm/plugins/damn/actions/PostMapSquareAction.java b/src/main/java/org/openstreetmap/josm/plugins/damn/actions/PostMapSquareAction.java index 487b705..8d6902b 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/damn/actions/PostMapSquareAction.java +++ b/src/main/java/org/openstreetmap/josm/plugins/damn/actions/PostMapSquareAction.java @@ -1,19 +1,16 @@ package org.openstreetmap.josm.plugins.damn.actions; -import static org.openstreetmap.josm.gui.help.HelpUtil.ht; import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; import java.io.BufferedReader; import java.net.URL; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.json.JsonValue; import javax.swing.JOptionPane; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.openstreetmap.josm.actions.JosmAction; import org.openstreetmap.josm.spi.preferences.Config; import org.openstreetmap.josm.tools.HttpClient; diff --git a/src/main/java/org/openstreetmap/josm/plugins/damn/actions/PostReviewAreaAction.java b/src/main/java/org/openstreetmap/josm/plugins/damn/actions/PostReviewAreaAction.java index 4a9b7de..759e8d5 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/damn/actions/PostReviewAreaAction.java +++ b/src/main/java/org/openstreetmap/josm/plugins/damn/actions/PostReviewAreaAction.java @@ -1,18 +1,14 @@ package org.openstreetmap.josm.plugins.damn.actions; -import static org.openstreetmap.josm.gui.help.HelpUtil.ht; import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; import java.io.BufferedReader; import java.net.URL; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.json.JsonValue; - +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.openstreetmap.josm.actions.JosmAction; import org.openstreetmap.josm.spi.preferences.Config; import org.openstreetmap.josm.tools.HttpClient; diff --git a/src/main/java/org/openstreetmap/josm/plugins/damn/actions/PostReviewSquareAction.java b/src/main/java/org/openstreetmap/josm/plugins/damn/actions/PostReviewSquareAction.java index 2c632f2..35f3980 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/damn/actions/PostReviewSquareAction.java +++ b/src/main/java/org/openstreetmap/josm/plugins/damn/actions/PostReviewSquareAction.java @@ -1,19 +1,16 @@ package org.openstreetmap.josm.plugins.damn.actions; -import static org.openstreetmap.josm.gui.help.HelpUtil.ht; import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; import java.io.BufferedReader; import java.net.URL; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.json.JsonValue; import javax.swing.JOptionPane; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.openstreetmap.josm.actions.JosmAction; import org.openstreetmap.josm.spi.preferences.Config; import org.openstreetmap.josm.tools.HttpClient; diff --git a/src/main/java/org/openstreetmap/josm/plugins/damn/actions/PostSplitSquareAction.java b/src/main/java/org/openstreetmap/josm/plugins/damn/actions/PostSplitSquareAction.java index 492d374..ff1bc55 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/damn/actions/PostSplitSquareAction.java +++ b/src/main/java/org/openstreetmap/josm/plugins/damn/actions/PostSplitSquareAction.java @@ -1,17 +1,14 @@ package org.openstreetmap.josm.plugins.damn.actions; -import static org.openstreetmap.josm.gui.help.HelpUtil.ht; import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; import java.io.BufferedReader; import java.net.URL; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.json.JsonValue; - +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.openstreetmap.josm.actions.JosmAction; import org.openstreetmap.josm.spi.preferences.Config; import org.openstreetmap.josm.tools.HttpClient; diff --git a/src/main/java/org/openstreetmap/josm/plugins/damn/actions/SetMapAction.java b/src/main/java/org/openstreetmap/josm/plugins/damn/actions/SetMapAction.java index 7b27896..20e372e 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/damn/actions/SetMapAction.java +++ b/src/main/java/org/openstreetmap/josm/plugins/damn/actions/SetMapAction.java @@ -1,6 +1,5 @@ package org.openstreetmap.josm.plugins.damn.actions; -import static org.openstreetmap.josm.gui.help.HelpUtil.ht; import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; diff --git a/src/main/java/org/openstreetmap/josm/plugins/damn/actions/SetReviewAction.java b/src/main/java/org/openstreetmap/josm/plugins/damn/actions/SetReviewAction.java index 1c53d9e..5770a35 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/damn/actions/SetReviewAction.java +++ b/src/main/java/org/openstreetmap/josm/plugins/damn/actions/SetReviewAction.java @@ -1,6 +1,5 @@ package org.openstreetmap.josm.plugins.damn.actions; -import static org.openstreetmap.josm.gui.help.HelpUtil.ht; import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; diff --git a/src/main/java/org/openstreetmap/josm/plugins/damn/actions/SetWhichMapperAction.java b/src/main/java/org/openstreetmap/josm/plugins/damn/actions/SetWhichMapperAction.java index c7f7cac..19e0e42 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/damn/actions/SetWhichMapperAction.java +++ b/src/main/java/org/openstreetmap/josm/plugins/damn/actions/SetWhichMapperAction.java @@ -1,6 +1,5 @@ package org.openstreetmap.josm.plugins.damn.actions; -import static org.openstreetmap.josm.gui.help.HelpUtil.ht; import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; diff --git a/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/GetAreaCallback.java b/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/GetAreaCallback.java index cd680cd..67ae5ce 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/GetAreaCallback.java +++ b/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/GetAreaCallback.java @@ -1,6 +1,6 @@ package org.openstreetmap.josm.plugins.damn.callbacks; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public interface GetAreaCallback { void onGetArea(JsonObject callArea, JsonObject gotArea); diff --git a/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/GetAreaGeometryCallback.java b/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/GetAreaGeometryCallback.java index 3e98c87..a863162 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/GetAreaGeometryCallback.java +++ b/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/GetAreaGeometryCallback.java @@ -1,6 +1,6 @@ package org.openstreetmap.josm.plugins.damn.callbacks; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public interface GetAreaGeometryCallback { void onGetAreaGeometry(JsonObject gotAreaGeometry); diff --git a/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/GetAreasCallback.java b/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/GetAreasCallback.java index f7f95ae..991a764 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/GetAreasCallback.java +++ b/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/GetAreasCallback.java @@ -1,6 +1,6 @@ package org.openstreetmap.josm.plugins.damn.callbacks; -import javax.json.JsonArray; +import jakarta.json.JsonArray; public interface GetAreasCallback { void onGetAreas(JsonArray l); diff --git a/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/GetWorkingOnCallback.java b/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/GetWorkingOnCallback.java index 64b80f4..ec401da 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/GetWorkingOnCallback.java +++ b/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/GetWorkingOnCallback.java @@ -1,6 +1,6 @@ package org.openstreetmap.josm.plugins.damn.callbacks; -import javax.json.JsonArray; +import jakarta.json.JsonArray; public interface GetWorkingOnCallback { void onGetWorkingOn(JsonArray l); diff --git a/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/PostDoneSquareCallback.java b/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/PostDoneSquareCallback.java index d69d22d..0b1543f 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/PostDoneSquareCallback.java +++ b/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/PostDoneSquareCallback.java @@ -1,6 +1,6 @@ package org.openstreetmap.josm.plugins.damn.callbacks; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public interface PostDoneSquareCallback { void onPostDoneSquare(JsonObject doneSquare, JsonObject gotCommit); diff --git a/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/PostLockSquareOfAreaCallback.java b/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/PostLockSquareOfAreaCallback.java index 0af1e9e..8f85390 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/PostLockSquareOfAreaCallback.java +++ b/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/PostLockSquareOfAreaCallback.java @@ -1,6 +1,6 @@ package org.openstreetmap.josm.plugins.damn.callbacks; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public interface PostLockSquareOfAreaCallback { void onPostLockSquareOfArea(JsonObject mapArea, JsonObject gotSquare); diff --git a/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/PostMapAreaCallback.java b/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/PostMapAreaCallback.java index aa21634..c941bc8 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/PostMapAreaCallback.java +++ b/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/PostMapAreaCallback.java @@ -1,6 +1,6 @@ package org.openstreetmap.josm.plugins.damn.callbacks; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public interface PostMapAreaCallback { void onPostMapArea(JsonObject mapArea, JsonObject gotSquare); diff --git a/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/PostMapSquareCallback.java b/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/PostMapSquareCallback.java index 3edc93b..62d9c77 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/PostMapSquareCallback.java +++ b/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/PostMapSquareCallback.java @@ -1,6 +1,6 @@ package org.openstreetmap.josm.plugins.damn.callbacks; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public interface PostMapSquareCallback { void onPostMapSquare(JsonObject mapSquare, JsonObject gotCommit); diff --git a/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/PostReviewAreaCallback.java b/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/PostReviewAreaCallback.java index 2032164..d5b452b 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/PostReviewAreaCallback.java +++ b/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/PostReviewAreaCallback.java @@ -1,6 +1,6 @@ package org.openstreetmap.josm.plugins.damn.callbacks; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public interface PostReviewAreaCallback { void onPostReviewArea(JsonObject reviewArea, JsonObject gotSquare); diff --git a/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/PostReviewSquareCallback.java b/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/PostReviewSquareCallback.java index 1e902d7..ba73256 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/PostReviewSquareCallback.java +++ b/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/PostReviewSquareCallback.java @@ -1,6 +1,6 @@ package org.openstreetmap.josm.plugins.damn.callbacks; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public interface PostReviewSquareCallback { void onPostReviewSquare(JsonObject mapSquare, JsonObject gotCommit); diff --git a/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/PostSplitSquareCallback.java b/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/PostSplitSquareCallback.java index da32a5d..7ae035d 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/PostSplitSquareCallback.java +++ b/src/main/java/org/openstreetmap/josm/plugins/damn/callbacks/PostSplitSquareCallback.java @@ -1,6 +1,6 @@ package org.openstreetmap.josm.plugins.damn.callbacks; -import javax.json.JsonObject; +import jakarta.json.JsonObject; public interface PostSplitSquareCallback { void onPostSplitSquare(JsonObject splitSquare, JsonObject splittedSquare); diff --git a/images/actions/areas.svg b/src/main/resources/images/actions/areas.svg similarity index 100% rename from images/actions/areas.svg rename to src/main/resources/images/actions/areas.svg diff --git a/images/actions/border.svg b/src/main/resources/images/actions/border.svg similarity index 100% rename from images/actions/border.svg rename to src/main/resources/images/actions/border.svg diff --git a/images/actions/done.svg b/src/main/resources/images/actions/done.svg similarity index 100% rename from images/actions/done.svg rename to src/main/resources/images/actions/done.svg diff --git a/images/actions/lock.svg b/src/main/resources/images/actions/lock.svg similarity index 100% rename from images/actions/lock.svg rename to src/main/resources/images/actions/lock.svg diff --git a/images/actions/map.svg b/src/main/resources/images/actions/map.svg similarity index 100% rename from images/actions/map.svg rename to src/main/resources/images/actions/map.svg diff --git a/images/actions/osm.svg b/src/main/resources/images/actions/osm.svg similarity index 100% rename from images/actions/osm.svg rename to src/main/resources/images/actions/osm.svg diff --git a/images/actions/q.svg b/src/main/resources/images/actions/q.svg similarity index 100% rename from images/actions/q.svg rename to src/main/resources/images/actions/q.svg diff --git a/images/actions/review.svg b/src/main/resources/images/actions/review.svg similarity index 100% rename from images/actions/review.svg rename to src/main/resources/images/actions/review.svg diff --git a/images/actions/split.svg b/src/main/resources/images/actions/split.svg similarity index 100% rename from images/actions/split.svg rename to src/main/resources/images/actions/split.svg diff --git a/images/actions/workingon.svg b/src/main/resources/images/actions/workingon.svg similarity index 100% rename from images/actions/workingon.svg rename to src/main/resources/images/actions/workingon.svg diff --git a/images/dialogs/damn.svg b/src/main/resources/images/dialogs/damn.svg similarity index 100% rename from images/dialogs/damn.svg rename to src/main/resources/images/dialogs/damn.svg -- 2.45.2
builds.sr.ht <builds@sr.ht>damn-plugin/patches/.build.yml: FAILED in 36s [Use jakarta.json instead of javax.json][0] from [Taylor Smock][1] [0]: https://lists.sr.ht/~qeef/damn-dev/patches/54168 [1]: mailto:smocktaylor@gmail.com ✗ #1288341 FAILED damn-plugin/patches/.build.yml https://builds.sr.ht/~qeef/job/1288341