Changeset 22477 in osm for applications/editors/josm/plugins

Timestamp:

2010-07-29T08:49:30+02:00 (14 years ago)

Author:

jttt

Message:

Adapt to latest JOSM

Location:

applications/editors/josm/plugins/turnrestrictions

Files:

• .classpath (added)
• .project (added)
• build.xml (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java (modified) (6 diffs)

applications/editors/josm/plugins/turnrestrictions/build.xml

@@ -33 +33 @@
         <property name="commit.message" value="Update to josm core" />
         <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-        <property name="plugin.main.version" value="3210" />
+        <property name="plugin.main.version" value="3392" />
 
         <!--
@@ -157 +157 @@
 
         <!--
-        ************************** Publishing the plugin *********************************** 
+        ************************** Publishing the plugin ***********************************
         -->
         <!--
-                ** extracts the JOSM release for the JOSM version in ../core and saves it in the 
+                ** extracts the JOSM release for the JOSM version in ../core and saves it in the
                 ** property ${coreversion.info.entry.revision}
                 **
@@ -209 +209 @@
 
         <!--
-                ** commits the plugin.jar 
+                ** commits the plugin.jar
                 -->
         <target name="commit-dist">
                 <echo>
         ***** Properties of published ${plugin.jar} *****
-        Commit message    : '${commit.message}'                                 
+        Commit message    : '${commit.message}'
         Plugin-Mainversion: ${plugin.main.version}
         JOSM build version: ${coreversion.info.entry.revision}
         Plugin-Version    : ${version.entry.commit.revision}
-        ***** / Properties of published ${plugin.jar} *****                                     
-                                                
+        ***** / Properties of published ${plugin.jar} *****
+
         Now commiting ${plugin.jar} ...
         </echo>

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java

@@ -12 +12 @@
 import org.openstreetmap.josm.actions.SplitWayAction.SplitWayResult;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
@@ -28 +29 @@
 
         /**
-         * Create the issue 
-         * 
-         * @param parent the parent model 
+         * Create the issue
+         *
+         * @param parent the parent model
          * @param role the role of the way which should be splitted
          * @param from the way with role 'from'
@@ -46 +47 @@
 
         @Override
-        public String getText() {               
+        public String getText() {
                 String msg = null;
                 switch(role){
@@ -55 +56 @@
                                 role.getOsmRole(),
                                 interesect.getDisplayName(DefaultNameFormatter.getInstance()),
-                                to.getDisplayName(DefaultNameFormatter.getInstance())                           
+                                to.getDisplayName(DefaultNameFormatter.getInstance())
                         );
                         break;
@@ -70 +71 @@
                 return msg;
         }
-        
+
         class SplitAction extends AbstractAction {
                 public SplitAction() {
@@ -83 +84 @@
                         }
                         SplitWayResult result = SplitWayAction.split(
-                                        parent.getEditorModel().getLayer(), 
-                                        way, 
-                                        Collections.singletonList(interesect)
+                                        parent.getEditorModel().getLayer(),
+                                        way,
+                                        Collections.singletonList(interesect),
+                                        Collections.<OsmPrimitive>emptyList()
                         );
                         if (result != null){
                                 Main.main.undoRedo.add(result.getCommand());
                         }
-                }               
+                }
         }
 }