Index: applications/editors/josm/plugins/pt_assistant/.gitignore =================================================================== --- applications/editors/josm/plugins/pt_assistant/.gitignore (revision 34253) +++ applications/editors/josm/plugins/pt_assistant/.gitignore (revision 34253) @@ -0,0 +1,4 @@ +/.gradle/ +/.idea/ +/.settings/ +/build/ Index: applications/editors/josm/plugins/pt_assistant/.tx/config =================================================================== --- applications/editors/josm/plugins/pt_assistant/.tx/config (revision 34253) +++ applications/editors/josm/plugins/pt_assistant/.tx/config (revision 34253) @@ -0,0 +1,10 @@ +[main] +host = https://www.transifex.com + +[josm.josm-plugin_pt_assistant] +file_filter = poSrc/.po +lang_map = ca@valencia: ca-valencia +minimum_perc=50 +source_file = build/i18n/josm-plugin_pt_assistant.pot +source_lang = en +type = PO Index: applications/editors/josm/plugins/pt_assistant/build.gradle =================================================================== --- applications/editors/josm/plugins/pt_assistant/build.gradle (revision 34253) +++ applications/editors/josm/plugins/pt_assistant/build.gradle (revision 34253) @@ -0,0 +1,104 @@ +import java.util.regex.Pattern + +plugins { + id 'eclipse' + id 'org.openstreetmap.josm' version '0.4.6' +} + +repositories { + jcenter() +} +dependencies { + testImplementation "org.openstreetmap.josm:josm-unittest:" + def junitVersion = "5.2.0" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion" + testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion" + testImplementation "org.junit.vintage:junit-vintage-engine:$junitVersion" +} + +version = getVersion() +josm.i18n { + pathTransformer = getGithubPathTransformer("JOSM/pt_assistant") +} + +sourceSets { + main { + java { + srcDirs = ["$projectDir/src"] + } + lang { + srcDirs = ["$projectDir/data"] + } + po { + srcDirs = ["$projectDir/poSrc"] + } + resources { + srcDirs = ["$projectDir"] + include "images/**" + include "GPL-*" + include "README" + include "LICENSE" + } + } + test { + java { + srcDirs = ["test/unit"] + } + resources { + srcDirs = ["test/data"] + } + } +} + +/** + * @return the current version of the repo as determined by the first of these commands that returns a valid result: + * + */ +def getVersion() { + // First attempt: Check if the commit has a git-svn-id, return SVN revision + def result = getVersion("git-svn-id: .*@([1-9][0-9]*) .*", "git", "log", "-1", "--format=%b") + if (result == null) { + // Second attempt: Check if the commit can be git-described, return the description by git + result = getVersion("(.+)", "git", "describe", "--always", "--dirty") + if (result == null) { + // Third attempt: Check if we are in an SVN repo, return revision number + result = getVersion("Revision: ([1-9][0-9]*)", "svn", "info") + if (result == null) { + result = "UNKNOWN" + } else { + result = "r$result" + } + } + } else { + result = "r$result" + def dirtyProcess = new ProcessBuilder("git", "diff-index", "--quiet", "HEAD").start() + if (dirtyProcess.waitFor() != 0) { + result += "-dirty" + } + } + return result +} + +/** + * Runs the specified command, matches the lines of the output with the given linePattern. + * @param linePattern the linePattern to match the lines against + * @param command the command to execute + * @return if a line matches, return the first RegEx group, else return null + */ +def getVersion(String linePattern, String... command) { + def process = new ProcessBuilder(command).directory(project.projectDir).start() + if (process.waitFor() != 0) { + return null + } + def pattern = Pattern.compile(linePattern) + return Arrays.stream(process.inputStream.text.split("\n")) + .map { pattern.matcher(it)} + .filter { it.matches() } + .map { it.group(1).trim() } + .findFirst() + .orElse(null) +} Index: applications/editors/josm/plugins/pt_assistant/build.xml =================================================================== --- applications/editors/josm/plugins/pt_assistant/build.xml (revision 34252) +++ applications/editors/josm/plugins/pt_assistant/build.xml (revision 34253) @@ -4,13 +4,7 @@ - - - - - - - - + + Index: applications/editors/josm/plugins/pt_assistant/gradle.properties =================================================================== --- applications/editors/josm/plugins/pt_assistant/gradle.properties (revision 34253) +++ applications/editors/josm/plugins/pt_assistant/gradle.properties (revision 34253) @@ -0,0 +1,12 @@ +plugin.author=Biswesh Mohapatra biswesh123@gmail.com +plugin.class=org.openstreetmap.josm.plugins.pt_assistant.PTAssistantPlugin +plugin.description=Provides validation and fixing for public transport route according to version 2 of the public transport schema +plugin.icon=... +plugin.link=https://wiki.openstreetmap.org/wiki/JOSM/Plugins/PT_Assistant +plugin.canloadatruntime=true +plugin.requires=utilsplugin2 + +# Minimum JOSM version (any numeric version) +plugin.main.version=13729 +# JOSM version to compile against (any numeric version available for download, or the special values "tested" or "latest") +plugin.compile.version=13878 Index: applications/editors/josm/plugins/pt_assistant/gradle/wrapper/gradle-wrapper.properties =================================================================== --- applications/editors/josm/plugins/pt_assistant/gradle/wrapper/gradle-wrapper.properties (revision 34253) +++ applications/editors/josm/plugins/pt_assistant/gradle/wrapper/gradle-wrapper.properties (revision 34253) @@ -0,0 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionSha256Sum=da9600da2a28a43f5f77364deecbb9b01c1ddb7d3ecafe1d5c93bcd8a8059ab1 Index: applications/editors/josm/plugins/pt_assistant/gradlew =================================================================== --- applications/editors/josm/plugins/pt_assistant/gradlew (revision 34253) +++ applications/editors/josm/plugins/pt_assistant/gradlew (revision 34253) @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +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" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" Index: applications/editors/josm/plugins/pt_assistant/gradlew.bat =================================================================== --- applications/editors/josm/plugins/pt_assistant/gradlew.bat (revision 34253) +++ applications/editors/josm/plugins/pt_assistant/gradlew.bat (revision 34253) @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega