Changeset 18962 in osm for applications/editors


Ignore:
Timestamp:
2009-12-05T18:54:28+01:00 (15 years ago)
Author:
jttt
Message:

Encalupse OsmPrimitive.incomplete

Location:
applications/editors/josm/plugins
Files:
3 added
23 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/cadastre-fr/build.xml

    r18920 r18962  
    3434
    3535    <property name="commit.message" value="Updated to new referrer support in OsmPrimitive" />         
    36     <property name="plugin.main.version" value="2565" />
     36    <property name="plugin.main.version" value="2578" />
    3737       
    3838    <target name="init">

  • applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java

    r18544 r18962  
    192192        double epsilon = 0.05; // smallest distance considering duplicate node
    193193        for (Node n : nodes) {
    194             if (!n.isDeleted() && !n.incomplete) {
     194            if (!n.isDeleted() && !n.isIncomplete()) {
    195195                double dist = n.getEastNorth().distance(nodeToAdd.getEastNorth());
    196196                if (dist < epsilon) {

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

    r18595 r18962  
    2626                <attribute name="Plugin-Description" value="Allows the user to anonymize timestamps and delete parts of huge GPX tracks very fast." />
    2727                <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/EditGpx" />
    28                 <attribute name="Plugin-Mainversion" value="2450" />
     28                <attribute name="Plugin-Mainversion" value="2578" />
    2929                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
    3030            </manifest>

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

    r18595 r18962  
    144144        //add all ways
    145145        for (Way w : dataSet.getWays()) {
    146             if (w.incomplete || w.isDeleted()) continue;
     146            if (w.isIncomplete() || w.isDeleted()) continue;
    147147            GpxTrack trk = new GpxTrack();
    148148            gpxData.tracks.add(trk);
    … …  
    153153            ArrayList<WayPoint> trkseg = null;
    154154            for (Node n : w.getNodes()) {
    155                 if (n.incomplete || n.isDeleted()) {
     155                if (n.isIncomplete() || n.isDeleted()) {
    156156                    trkseg = null;
    157157                    continue;
    … …  
    180180        // add nodes as waypoints
    181181        for (Node n : dataSet.getNodes()) {
    182             if (n.incomplete || n.isDeleted() || doneNodes.contains(n)) continue;
     182            if (n.isIncomplete() || n.isDeleted() || doneNodes.contains(n)) continue;
    183183
    184184            Date tstamp = n.getTimestamp();

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

    r18593 r18962  
    5757                <attribute name="Plugin-Description" value="Visualizes routing information as a routing graph."/>
    5858                <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Graphview"/>
    59                 <attribute name="Plugin-Mainversion" value="2450"/>
     59                <attribute name="Plugin-Mainversion" value="2578"/>
    6060                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
    6161            </manifest>

  • applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/data/JOSMDataSource.java

    r18415 r18962  
    3838                List<RelationMember> members = new ArrayList<RelationMember>(relation.getMembersCount());
    3939                for (org.openstreetmap.josm.data.osm.RelationMember member : relation.getMembers()) {
    40                         if (!member.getMember().isDeleted() && !member.getMember().incomplete) {
     40                        if (!member.getMember().isDeleted() && !member.getMember().isIncomplete()) {
    4141                                members.add(new RelationMemberImpl(member));
    4242                        }
    … …  
    149149
    150150                protected boolean accept(P primitive) {
    151                         return !primitive.isDeleted() && !primitive.incomplete;
     151                        return !primitive.isDeleted() && !primitive.isIncomplete();
    152152                }
    153153        }
    … …  
    167167                        boolean complete = true;
    168168                        for (org.openstreetmap.josm.data.osm.RelationMember member : relation.getMembers()) {
    169                                 if (member.getMember() == null || member.getMember().isDeleted() || member.getMember().incomplete) {
     169                                if (member.getMember() == null || member.getMember().isDeleted() || member.getMember().isIncomplete()) {
    170170                                        complete = false;
    171171                                }

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

    r5695 r18962  
    22<classpath>
    33        <classpathentry kind="src" path="src"/>
    4         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
     4        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 5"/>
    55        <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
    66        <classpathentry kind="output" path="build"/>

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

    r18595 r18962  
    2525                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
    2626                <attribute name="Plugin-Description" value="Provide a measurement dialog and a layer to measure length and angle of segments, area surrounded by a (simple) closed way and create measurement paths (which also can be imported from a gps layer)."/>
    27                 <attribute name="Plugin-Mainversion" value="2450"/>
     27                <attribute name="Plugin-Mainversion" value="2578"/>
    2828                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
    2929            </manifest>

  • applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java

    r17377 r18962  
    114114                for(OsmPrimitive p:arg0){
    115115                                    // ignore incomplete nodes
    116                                     if(p instanceof Node && !((Node)p).incomplete){
     116                                    if(p instanceof Node && !((Node)p).isIncomplete()){
    117117                                        Node n =(Node)p;
    118118                                        if(lastNode == null){

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

    r18415 r18962  
    22<classpath>
    33        <classpathentry kind="src" path="src"/>
    4         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 6"/>
     4        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 5"/>
    55        <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
    66        <classpathentry kind="output" path="bin"/>

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

    r18832 r18962  
    5050    <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
    5151    <attribute name="Plugin-Link" value="http://svn.openstreetmap.org/applications/editors/josm/plugins/multipoly/"/>
    52     <attribute name="Plugin-Mainversion" value="2381"/>
     52    <attribute name="Plugin-Mainversion" value="2578"/>
    5353   </manifest>
    5454  </jar>

  • applications/editors/josm/plugins/multipoly/src/multipoly/MultipolyAction.java

    r18799 r18962  
    5656  * @param e Action Event
    5757  */
    58  @Override public void actionPerformed(ActionEvent e) {
     58 public void actionPerformed(ActionEvent e) {
    5959
    6060  // Get all ways in some type=multipolygon relation

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

    r4088 r18962  
    44        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
    55        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
    6         <classpathentry kind="src" path="/josm"/>
     6        <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
    77        <classpathentry kind="output" path="bin"/>
    88</classpath>

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

    r18595 r18962  
    2626                <attribute name="Plugin-Description" value="Imports issues from OpenStreetBugs"/>
    2727                <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/OpenStreetBugs"/>
    28                 <attribute name="Plugin-Mainversion" value="2450"/>
     28                <attribute name="Plugin-Mainversion" value="2578"/>
    2929                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
    3030            </manifest>

  • applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/DownloadAction.java

    r18482 r18962  
    8585            Node osmNode = new Node(Long.parseLong(m.group(1)));
    8686            osmNode.setCoor(latlon);
    87             osmNode.incomplete = false;
     87            osmNode.setIncomplete(false);
    8888            osmNode.put("id", m.group(1));
    8989            osmNode.put("note", m.group(4));

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

    r1467 r18962  
    22<classpath>
    33        <classpathentry kind="src" path="src"/>
    4         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
    5         <classpathentry kind="lib" path="lib/looks-2.0.4.jar"/>
     4        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 5"/>
     5        <classpathentry kind="lib" path="/home/jirka/osm/josm/plugins/plastic_laf/lib/looks-2.2.1.jar"/>
    66        <classpathentry kind="output" path="bin"/>
    77</classpath>

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

    r18597 r18962  
    4444                <attribute name="Plugin-Description" value="Provides routing capabilities."/>
    4545                <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Routing"/>
    46                 <attribute name="Plugin-Mainversion" value="2450"/>
     46                <attribute name="Plugin-Mainversion" value="2578"/>
    4747                <attribute name="Plugin-Stage" value="50"/>
    4848                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>

  • applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java

    r18597 r18962  
    135135        double minDist = 0;
    136136        for (Way w : dataLayer.data.getWays()) {
    137             if (w.isDeleted() || w.incomplete || w.get("highway")==null) continue;
     137            if (w.isDeleted() || w.isIncomplete() || w.get("highway")==null) continue;
    138138            for (Node n : w.getNodes()) {
    139                 if (n.isDeleted() || n.incomplete) continue;
     139                if (n.isDeleted() || n.isIncomplete()) continue;
    140140
    141141                Point P = Main.map.mapView.getPoint(n);

  • applications/editors/josm/plugins/tagging-preset-tester/.classpath

    r3639 r18962  
    33        <classpathentry kind="src" path="src"/>
    44        <classpathentry including="images/" kind="src" path=""/>
    5         <classpathentry combineaccessrules="false" exported="true" kind="src" path="/josm"/>
    6         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
     5        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 5"/>
     6        <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
    77        <classpathentry kind="output" path="bin"/>
    88</classpath>

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

    r18957 r18962  
    2727        -->
    2828        <property name="commit.message" value="Made build file more robust" />
    29         <property name="plugin.main.version" value="2565" />
     29        <property name="plugin.main.version" value="2578" />
    3030
    3131

  • applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java

    r18152 r18962  
    104104    @Override public void visit(Collection<OsmPrimitive> selection) {
    105105        for (OsmPrimitive p : selection)
    106             if (!p.isDeleted() && !p.incomplete)
     106            if (!p.isDeleted() && !p.isIncomplete())
    107107                check(p);
    108108    }

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

    r18614 r18962  
    2727        -->
    2828        <property name="commit.message" value="Publishing: various fixes and improvements, see 18613" />               
    29         <property name="plugin.main.version" value="2457" />
     29        <property name="plugin.main.version" value="2578" />
    3030       
    3131       

  • applications/editors/josm/plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java

    r18617 r18962  
    88import java.util.Collection;
    99import java.util.Collections;
    10 import java.util.LinkedList;
    1110import java.util.List;
    1211import java.util.concurrent.Future;
    … …  
    265264        for (Node candidate: candidates) {
    266265            if (!candidate.equals(referenceNode)
    267                     && !candidate.incomplete
     266                    && !candidate.isIncomplete()
    268267                    && candidate.getCoor().equals(referenceNode.getCoor()))
    269268                return candidate;
Note: See TracChangeset for help on using the changeset viewer.