Changeset 35601 in osm


Ignore:
Timestamp:
2020-10-18T19:30:35+02:00 (4 years ago)
Author:
Don-vip
Message:

upgrade to JOSM 16548

Location:
applications/editors/josm/plugins/MicrosoftStreetside
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/MicrosoftStreetside

    • Property svn:ignore

      •  

        old new  
        1111checkstyle-josm-MicrosoftStreetside.xml
        1212spotbugs-josm-MicrosoftStreetside.xml
         13bintest

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

    r34428 r35601  
    88        </classpathentry>
    99        <classpathentry kind="src" path="config"/>
    10         <classpathentry kind="src" output="bin/test" path="test/unit">
     10        <classpathentry kind="src" output="bintest" path="test/unit">
    1111                <attributes>
     12                        <attribute name="test" value="true"/>
    1213                        <attribute name="gradle_scope" value="test"/>
    1314                        <attribute name="gradle_used_by_scope" value="test"/>
    … …  
    2021                </attributes>
    2122        </classpathentry>
    22         <classpathentry kind="src" output="bin/test" path="test/data">
     23        <classpathentry kind="src" output="bintest" path="test/data">
    2324                <attributes>
     25                        <attribute name="test" value="true"/>
    2426                        <attribute name="gradle_scope" value="test"/>
    2527                        <attribute name="gradle_used_by_scope" value="test"/>
    … …  
    2830        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
    2931        <classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
     32        <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
     33        <classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=JOSM-MicrosoftStreetside&amp;ivyXmlPath=ivy.xml&amp;confs=*"/>
     34        <classpathentry combineaccessrules="false" kind="src" path="/JOSM-javafx"/>
     35        <classpathentry combineaccessrules="false" kind="src" path="/JOSM-apache-commons"/>
     36        <classpathentry combineaccessrules="false" kind="src" path="/JOSM-apache-http"/>
     37        <classpathentry combineaccessrules="false" kind="src" path="/JOSM-utilsplugin2"/>
    3038        <classpathentry kind="output" path="bin/default"/>
    3139</classpath>

  • applications/editors/josm/plugins/MicrosoftStreetside/.project

    r34577 r35601  
    3232                <nature>ch.acanda.eclipse.pmd.builder.PMDNature</nature>
    3333                <nature>org.eclipse.buildship.core.gradleprojectnature</nature>
     34                <nature>org.apache.ivyde.eclipse.ivynature</nature>
    3435        </natures>
    3536</projectDescription>

  • applications/editors/josm/plugins/MicrosoftStreetside/gradle.properties

    r34772 r35601  
    88# Minimum required JOSM version to run this plugin, choose the lowest version possible that is compatible.
    99# You can check if the plugin compiles against this version by executing `./gradlew minJosmVersionClasses`.
    10 plugin.main.version=14460
     10plugin.main.version=16548
    1111#plugin.version=
    1212# Version of JOSM against which the plugin is compiled
    1313# Please check, if the specified version is available for download from https://josm.openstreetmap.de/download/ .
    1414# If not, choose the next higher number that is available, or the gradle build will break.
    15 plugin.compile.version=14460
     15plugin.compile.version=17084
    1616plugin.requires=apache-commons;apache-http;utilsplugin2;javafx
    1717

  • applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideData.java

    r35466 r35601  
    44import java.util.Arrays;
    55import java.util.Collection;
     6import java.util.Collections;
    67import java.util.List;
    78import java.util.Objects;
    … …  
    1314import org.apache.commons.jcs3.access.CacheAccess;
    1415import org.openstreetmap.josm.data.Bounds;
     16import org.openstreetmap.josm.data.Data;
     17import org.openstreetmap.josm.data.DataSource;
    1518import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
    1619import org.openstreetmap.josm.gui.MainApplication;
    … …  
    3134 * @see StreetsideSequence
    3235 */
    33 public class StreetsideData {
     36public class StreetsideData implements Data {
    3437  private final Set<StreetsideAbstractImage> images = ConcurrentHashMap.newKeySet();
    3538  /**
    … …  
    412415    }
    413416  }
     417
     418  @Override
     419  public Collection<DataSource> getDataSources() {
     420        return Collections.emptyList();
     421  }
    414422}

  • applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideLayer.java

    r34577 r35601  
    184184         * @return The {@link StreetsideData} object that stores the database.
    185185         */
     186        @Override
    186187        public StreetsideData getData() {
    187188                return data;
Note: See TracChangeset for help on using the changeset viewer.