Changeset 28246 in osm for applications/editors/josm


Ignore:
Timestamp:
2012-04-11T19:26:28+02:00 (13 years ago)
Author:
donvip
Message:

[josm_opendata] rely on jts plugin to reduce jar size

Location:
applications/editors/josm/plugins/opendata
Files:
108 deleted
3 edited

Legend:

Unmodified
Added
Removed

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

    r28191 r28246  
    1515        <classpathentry kind="src" path="modules/fr.toulouse/resources"/>
    1616        <classpathentry kind="src" path="util"/>
    17         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
     17        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_31"/>
    1818        <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
     19        <classpathentry kind="lib" path="/JOSM/dist/jts.jar"/>
    1920        <classpathentry kind="output" path="bin"/>
    2021</classpath>

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

    r28191 r28246  
    3131    <!-- should not be necessary to change the following properties -->
    3232    <property name="josm" location="../../core/dist/josm-custom.jar"/>
     33    <property name="jts" location="../../dist/jts.jar"/>
    3334    <property name="plugin.build.dir" value="build"/>
    3435    <property name="plugin.src.dir" value="src"/>
    … …  
    9394    -->
    9495    <target name="compile_geotools" depends="init">
    95         <echo message="compiling JTS ... "/>
    96         <javac srcdir="includes/com/vividsolutions/jts" debug="false" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="ISO-8859-1" />
    9796        <echo message="compiling JSR-275 ... "/>
    9897        <javac srcdir="includes/javax/measure" debug="false" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="UTF-8" />
    … …  
    10099        <javac srcdir="includes/javax/vecmath" debug="false" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="ISO-8859-1" />
    101100        <echo message="compiling GeoTools ... "/>
    102         <javac debug="true" sourcepath="" srcdir="includes" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="ISO-8859-1">
     101        <javac debug="false" sourcepath="" srcdir="includes" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="ISO-8859-1">
    103102            <include name="org/geotools/**/*.java"/>
    104103                <include name="org/opengis/**/*.java"/>
     104            <classpath>
     105                <pathelement location="${jts}"/>
     106            </classpath>
    105107        </javac>
    106108    </target>
    107109    <!--
    108110    **********************************************************
    109     ** compile_naptune - compiles Neptune classes
     111    ** compile_neptune - compiles Neptune classes
    110112    **********************************************************
    111113    -->
    … …  
    125127                    <pathelement path="${plugin.build.dir}"/>
    126128                <pathelement location="${josm}"/>
     129                <pathelement location="${jts}"/>
    127130            </classpath>
    128131            <compilerarg value="-Xlint:deprecation"/>
    … …  
    177180                <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/OpenData"/>
    178181                <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
    179                 <!--<attribute name="Plugin-Requires" value="jts"/>-->
     182                <attribute name="Plugin-Requires" value="jts"/>
    180183                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
    181184            </manifest>

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java

    r28191 r28246  
    6666        private static OdPlugin instance;
    6767       
    68         public final XmlImporter xmlImporter;
     68        public final XmlImporter xmlImporter = new XmlImporter();
    6969       
    7070        private final JMenu menu;
    … …  
    8282                                new KmlKmzImporter(), new ShpImporter(), new MifTabImporter(), new GmlImporter(), // Geographic file formats
    8383                                new ZipImporter(), // Archive containing any of the others
    84                                 xmlImporter = new XmlImporter() // Generic importer for XML files (currently used for Neptune files)
     84                                xmlImporter // Generic importer for XML files (currently used for Neptune files)
    8585                })) {
    8686                        ExtensionFileFilter.importers.add(0, importer);
Note: See TracChangeset for help on using the changeset viewer.