Changeset 34737 in osm


Ignore:
Timestamp:
2018-11-25T13:34:03+01:00 (6 years ago)
Author:
donvip
Message:

see #josm16995 - update to JOSM 14434

Location:
applications/editors/josm/plugins/editgpx
Files:
2 added
10 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/editgpx/.classpath

    r32680 r34737  
    22<classpath>
    33        <classpathentry kind="src" path="src"/>
    4         <classpathentry excluding="src/" including="images/" kind="src" path=""/>
     4        <classpathentry excluding="src/|test/unit/|test/unit/" including="images/" kind="src" path=""/>
     5        <classpathentry kind="src" output="bintest" path="test/unit">
     6                <attributes>
     7                        <attribute name="test" value="true"/>
     8                </attributes>
     9        </classpathentry>
    510        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
    611        <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>

  • applications/editors/josm/plugins/editgpx/.settings/org.eclipse.jdt.core.prefs

    r32699 r34737  
    99org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
    1010org.eclipse.jdt.core.compiler.compliance=1.8
     11org.eclipse.jdt.core.compiler.doc.comment.support=enabled
    1112org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
    1213org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
    … …  
    3233org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
    3334org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
     35org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
     36org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
     37org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
     38org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
     39org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
    3440org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
    3541org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
    … …  
    3844org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
    3945org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
     46org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
     47org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
     48org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
     49org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
     50org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
     51org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
     52org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
     53org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
    4054org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
    4155org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled

  • applications/editors/josm/plugins/editgpx/.settings/org.sonarlint.eclipse.core.prefs

    r32155 r34737  
    22eclipse.preferences.version=1
    33extraProperties=
    4 moduleKey=josm-plugins
    5 serverId=josm
     4fileExclusions=

  • applications/editors/josm/plugins/editgpx/build.xml

    r34505 r34737  
    44    <property name="commit.message" value="Changed constructor signature of plugin main class"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="14153"/>
     6    <property name="plugin.main.version" value="14434"/>
    77   
    88    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java

    r34505 r34737  
    131131     * convert a DataSet to GPX
    132132     *
    133      * @param boolean anonTime If true set all time and date in GPX to 01/01/1970 00:00 ?
    134      * @return GPXData
     133     * @param anonTime If true set all time and date in GPX to 01/01/1970 00:00 ?
     134     * @return GpxData
    135135     */
    136136    private GpxData toGpxData(boolean anonTime) {

  • applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxMode.java

    r34505 r34737  
    107107    /**
    108108     * create rectangle out of two given corners
     109     * @param p1 first corner
     110     * @param p2 second corner
     111     * @return rectangle
    109112     */
    110113    public Rectangle createRect(Point p1, Point p2) {
    … …  
    137140    /**
    138141     * Draw a selection rectangle on screen.
     142     * @param p1 first corner
     143     * @param p2 second corner
    139144     */
    140145    private void paintRect(Point p1, Point p2) {

  • applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxData.java

    r30737 r34737  
    7171     * time of the oldest waypoint in the set of non-deleted waypoints
    7272     * in this data (in seconds since Epoch)
     73     * @return time in seconds since Epoch
    7374     */
    7475    public double minNonDeletedTime() {
    … …  
    8081                try {
    8182                    double t = track.minNonDeletedTime();
    82                     if ((!foundOne) || (t < minTime)) {
     83                    if (!foundOne || t < minTime) {
    8384                        minTime = t;
    8485                    }

  • applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrack.java

    r30737 r34737  
    55import java.util.ArrayList;
    66import java.util.Collection;
    7 import java.util.Date;
    87import java.util.HashMap;
    98import java.util.List;
    … …  
    4241
    4342        final DateFormat iso8601 =
    44             new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
     43                new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
    4544        final TimeZone utc = TimeZone.getTimeZone("UTC");
    4645        iso8601.setTimeZone(utc);
    … …  
    5453                        for (WayPoint w : points) {
    5554                            double t = w.time - minTime;
    56                             w.attr.put("time", iso8601.format(
    57                                     new Date((long)(t * 1000))));
    58                             w.setTime();
     55                            w.setTimeInMillis((long)(t * 1000));
    5956                            assert w.time == t;
    6057                            if (w.attr.containsKey("name")) {
    … …  
    8784     * time of the oldest waypoint in the set of non-deleted waypoints
    8885     * in this track (in seconds since Epoch)
     86     * @return time in seconds since Epoch
    8987     */
    9088    public double minNonDeletedTime() {
    … …  
    9694                try {
    9795                    double t = segment.minNonDeletedTime();
    98                     if ((!foundOne) || (t < minTime)) {
     96                    if (!foundOne || t < minTime) {
    9997                        minTime = t;
    10098                    }

  • applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxTrackSegment.java

    r30737 r34737  
    4646     * time of the oldest waypoint in the set of non-deleted waypoints
    4747     * in this segment (in seconds since Epoch)
     48     * @return time in seconds since Epoch
    4849     */
    4950    public double minNonDeletedTime() {

  • applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/data/EditGpxWayPoint.java

    r33782 r34737  
    3636    /**
    3737     * returns this waypoint's time in seconds since Epoch
     38     * @return time in seconds since Epoch
    3839     */
    3940    public double getTime() {
Note: See TracChangeset for help on using the changeset viewer.