Ignore:
Timestamp:
2019-09-26T03:18:53+02:00 (5 years ago)
Author:
donvip
Message:

see #josm17933 - see #josm17976 - upgrade to EJML 0.34 and JTS 1.16.1 (versions required by GeoTools 22.0)

Location:
applications/editors/josm/plugins
Files:
30 added
33 deleted
4 edited

Legend:

Unmodified
Added
Removed

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

    r34125 r35122  
    44        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
    55        <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
    6         <classpathentry kind="lib" path="lib/ejml-cdense-0.32.jar" sourcepath="lib/ejml-cdense-0.32-sources.jar">
     6        <classpathentry kind="lib" path="lib/ejml-cdense-0.34.jar" sourcepath="lib/ejml-cdense-0.34-sources.jar">
    77                <attributes>
    8                         <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-cdense-0.32-javadoc.jar!/"/>
     8                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-cdense-0.34-javadoc.jar!/"/>
    99                </attributes>
    1010        </classpathentry>
    11         <classpathentry kind="lib" path="lib/ejml-core-0.32.jar" sourcepath="lib/ejml-core-0.32-sources.jar">
     11        <classpathentry kind="lib" path="lib/ejml-core-0.34.jar" sourcepath="lib/ejml-core-0.34-sources.jar">
    1212                <attributes>
    13                         <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-core-0.32-javadoc.jar!/"/>
     13                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-core-0.34-javadoc.jar!/"/>
    1414                </attributes>
    1515        </classpathentry>
    16         <classpathentry kind="lib" path="lib/ejml-ddense-0.32.jar" sourcepath="lib/ejml-ddense-0.32-sources.jar">
     16        <classpathentry kind="lib" path="lib/ejml-ddense-0.34.jar" sourcepath="lib/ejml-ddense-0.34-sources.jar">
    1717                <attributes>
    18                         <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-ddense-0.32-javadoc.jar!/"/>
     18                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-ddense-0.34-javadoc.jar!/"/>
    1919                </attributes>
    2020        </classpathentry>
    21         <classpathentry kind="lib" path="lib/ejml-dsparse-0.32.jar" sourcepath="lib/ejml-dsparse-0.32-sources.jar">
     21        <classpathentry kind="lib" path="lib/ejml-dsparse-0.34.jar" sourcepath="lib/ejml-dsparse-0.34-sources.jar">
    2222                <attributes>
    23                         <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-dsparse-0.32-javadoc.jar!/"/>
     23                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-dsparse-0.34-javadoc.jar!/"/>
    2424                </attributes>
    2525        </classpathentry>
    26         <classpathentry kind="lib" path="lib/ejml-experimental-0.32.jar" sourcepath="lib/ejml-experimental-0.32-sources.jar">
     26        <classpathentry kind="lib" path="lib/ejml-experimental-0.34.jar" sourcepath="lib/ejml-experimental-0.34-sources.jar">
    2727                <attributes>
    28                         <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-experimental-0.32-javadoc.jar!/"/>
     28                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-experimental-0.34-javadoc.jar!/"/>
    2929                </attributes>
    3030        </classpathentry>
    31         <classpathentry kind="lib" path="lib/ejml-fdense-0.32.jar" sourcepath="lib/ejml-fdense-0.32-sources.jar">
     31        <classpathentry kind="lib" path="lib/ejml-fdense-0.34.jar" sourcepath="lib/ejml-fdense-0.34-sources.jar">
    3232                <attributes>
    33                         <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-fdense-0.32-javadoc.jar!/"/>
     33                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-fdense-0.34-javadoc.jar!/"/>
    3434                </attributes>
    3535        </classpathentry>
    36         <classpathentry kind="lib" path="lib/ejml-simple-0.32.jar" sourcepath="lib/ejml-simple-0.32-sources.jar">
     36        <classpathentry kind="lib" path="lib/ejml-simple-0.34.jar" sourcepath="lib/ejml-simple-0.34-sources.jar">
    3737                <attributes>
    38                         <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-simple-0.32-javadoc.jar!/"/>
     38                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-simple-0.34-javadoc.jar!/"/>
    3939                </attributes>
    4040        </classpathentry>
    41         <classpathentry kind="lib" path="lib/ejml-zdense-0.32.jar" sourcepath="lib/ejml-zdense-0.32-sources.jar">
     41        <classpathentry kind="lib" path="lib/ejml-zdense-0.34.jar" sourcepath="lib/ejml-zdense-0.34-sources.jar">
    4242                <attributes>
    43                         <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-zdense-0.32-javadoc.jar!/"/>
     43                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-EJML/lib/ejml-zdense-0.34-javadoc.jar!/"/>
    4444                </attributes>
    4545        </classpathentry>

  • applications/editors/josm/plugins/ejml/README

    r34126 r35122  
    44    * Licensed under GPL v3 (see LICENSE)
    55
    6 The current embedded version of EJML is 0.32 (version needed by GeoTools, see https://osgeo-org.atlassian.net/browse/GEOT-5300).
     6The current embedded version of EJML is 0.34 (version needed by GeoTools, see https://osgeo-org.atlassian.net/browse/GEOT-6384).

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

    r34524 r35122  
    44        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
    55        <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
    6         <classpathentry exported="true" kind="lib" path="lib/jts-core-1.14.0.jar" sourcepath="lib/jts-core-1.14.0-sources.jar">
     6        <classpathentry exported="true" kind="lib" path="lib/jts-core-1.16.1.jar" sourcepath="lib/jts-core-1.16.1-sources.jar">
    77                <attributes>
    8                         <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-jts/lib/jts-core-1.14.0-javadoc.jar!/"/>
     8                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-jts/lib/jts-core-1.16.1-javadoc.jar!/"/>
    99                </attributes>
    1010        </classpathentry>
    11         <classpathentry exported="true" kind="lib" path="lib/jts-io-1.14.0.jar" sourcepath="lib/jts-io-1.14.0-sources.jar">
     11        <classpathentry exported="true" kind="lib" path="lib/jts-io-common-1.16.1.jar" sourcepath="lib/jts-io-common-1.16.1-sources.jar">
    1212                <attributes>
    13                         <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-jts/lib/jts-io-1.14.0-javadoc.jar!/"/>
    14                 </attributes>
    15         </classpathentry>
    16         <classpathentry exported="true" kind="lib" path="lib/jts-example-1.14.0.jar" sourcepath="lib/jts-example-1.14.0-sources.jar">
    17                 <attributes>
    18                         <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-jts/lib/jts-example-1.14.0-javadoc.jar!/"/>
     13                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-jts/lib/jts-io-common-1.16.1-javadoc.jar!/"/>
    1914                </attributes>
    2015        </classpathentry>

  • applications/editors/josm/plugins/jts/src/org/openstreetmap/josm/plugins/jts/JTSConverter.java

    r35064 r35122  
    99import org.openstreetmap.josm.data.osm.Way;
    1010
    11 import com.vividsolutions.jts.geom.Coordinate;
    12 import com.vividsolutions.jts.geom.CoordinateSequence;
    13 import com.vividsolutions.jts.geom.Geometry;
    14 import com.vividsolutions.jts.geom.GeometryFactory;
    15 import com.vividsolutions.jts.geom.LineString;
    16 import com.vividsolutions.jts.geom.LinearRing;
    17 import com.vividsolutions.jts.geom.Point;
    18 import com.vividsolutions.jts.geom.Polygon;
    19 import com.vividsolutions.jts.geom.PrecisionModel;
    20 import com.vividsolutions.jts.geom.impl.CoordinateArraySequence;
     11import org.locationtech.jts.geom.Coordinate;
     12import org.locationtech.jts.geom.CoordinateSequence;
     13import org.locationtech.jts.geom.Geometry;
     14import org.locationtech.jts.geom.GeometryFactory;
     15import org.locationtech.jts.geom.LineString;
     16import org.locationtech.jts.geom.LinearRing;
     17import org.locationtech.jts.geom.Point;
     18import org.locationtech.jts.geom.Polygon;
     19import org.locationtech.jts.geom.PrecisionModel;
     20import org.locationtech.jts.geom.impl.CoordinateArraySequence;
    2121
    2222/**
    … …  
    8484    public Point convertNode(Node node) {
    8585        Coordinate[] coords = {convertNodeToCoordinate(node)};
    86         return new com.vividsolutions.jts.geom.Point(new CoordinateArraySequence(coords), getGeometryFactory());
     86        return new org.locationtech.jts.geom.Point(new CoordinateArraySequence(coords), getGeometryFactory());
    8787    }
    8888
Note: See TracChangeset for help on using the changeset viewer.