Merge pull request #12 from iandees/fix_build

Fix build
iandees · Mar 15, 2017 · cca6bb9 · cca6bb9
2 parents 119e7a3 + 43042fc
commit cca6bb9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: java
 jdk:
-- oraclejdk7
-- openjdk6
+- oraclejdk8
 install:
   - "curl --silent --output josm-custom.jar https://josm.openstreetmap.de/josm-tested.jar"
 script:

diff --git a/build.xml b/build.xml
@@ -12,8 +12,8 @@
     <property name="plugin.icon" value="images/preferences/mbtiles.png"/>
     <property name="plugin.link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Mbtiles"/>
 
-    <property name="josm" location="../josm/dist/josm-custom.jar"/>
-    <property name="plugin.dist.dir" value="../josm/dist"/>
+    <property name="josm" location="josm-custom.jar"/>
+    <property name="plugin.dist.dir" value="dist"/>
     <property name="plugin.build.dir" value="build"/>
     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
     <property name="ant.build.javac.target" value="1.7"/>
@@ -39,9 +39,6 @@
         <copy todir="${plugin.build.dir}/images">
             <fileset dir="images"/>
         </copy>
-        <copy todir="${plugin.build.dir}/data">
-            <fileset dir="data"/>
-        </copy>
         <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
             <zipfileset src="lib/sqlite-jdbc-3.8.11.2.jar" includes="**/*"/>
             <manifest>

diff --git a/src/org/openstreetmap/josm/plugins/mbtiles/MbtilesLayer.java b/src/org/openstreetmap/josm/plugins/mbtiles/MbtilesLayer.java
@@ -126,7 +126,7 @@ protected TileLoaderFactory getTileLoaderFactory() {
     }
 
     @Override
-    protected AbstractTMSTileSource getTileSource(ImageryInfo info) {
+    protected AbstractTMSTileSource getTileSource() {
         return new TMSTileSource(info);
     }
 }
diff --git a/src/org/openstreetmap/josm/plugins/mbtiles/MbtilesTileLoaderFactory.java b/src/org/openstreetmap/josm/plugins/mbtiles/MbtilesTileLoaderFactory.java
@@ -15,14 +15,9 @@ public MbtilesTileLoaderFactory(Connection connection) {
         this.connection = connection;
     }
 
-    @Override
-    public TileLoader makeTileLoader(TileLoaderListener listener) {
-         return makeTileLoader(listener, null);
-    }
-
     @Override
     public TileLoader makeTileLoader(TileLoaderListener listener, Map<String, String> headers) {
         return new MbtilesTileLoader(listener, this.connection);
     }
 
-}
+}