Changeset 30110 in osm

Timestamp:

2013-12-07T20:30:09+01:00 (11 years ago)

Author:

donvip

Message:

[josm_plugins] update against recent core changes

Location:

applications/editors/josm/plugins

Files:

• photo_geotagging/build.xml (modified) (1 diff)
• photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java (modified) (2 diffs)
• tageditor/build.xml (modified) (1 diff)
• tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java (modified) (3 diffs)
• tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagSpecificationAwareTagCellEditor.java (modified) (2 diffs)
• tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/TagSpecifications.java (modified) (3 diffs)
• turnrestrictions/build.xml (modified) (1 diff)
• turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/MemberRoleCellEditor.java (modified) (2 diffs)

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

@@ -5 +5 @@
     <property name="commit.message" value="write elevation to EXIF (see josm #7710)"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6162"/>
+    <property name="plugin.main.version" value="6450"/>
 
     <property name="plugin.author" value="Paul Hartmann"/>

applications/editors/josm/plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java

@@ -66 +66 @@
              /* Only write lat/lon to the file, if the position is known and
                 we have a time from the correlation to the gpx track. */
-            if (e.getPos() != null && e.getGpsTime() != null) {
+            if (e.getPos() != null && e.hasGpsTime()) {
                 images.add(e);
             }
@@ -372 +372 @@
     private boolean enabled(GeoImageLayer layer) {
         for (ImageEntry e : layer.getImages()) {
-            if (e.getPos() != null && e.getGpsTime() != null)
+            if (e.getPos() != null && e.hasGpsTime())
                 return true;
         }

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

@@ -2 +2 @@
 <project name="tageditor" default="dist" basedir=".">
     <property name="commit.message" value="Tageditor:  help shortcut parser, rebuild"/>
-    <property name="plugin.main.version" value="6316"/>
+    <property name="plugin.main.version" value="6437"/>
     
         <property name="plugin.author" value="Karl Guggisberg"/>

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java

@@ -12 +12 @@
 import javax.swing.table.TableCellRenderer;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionListItem;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPritority;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPriority;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -25 +25 @@
 
     /** the icon used to decorate items of priority
-     *  {@link AutoCompletionItemPritority#IS_IN_STANDARD}
+     *  {@link AutoCompletionItemPriority#IS_IN_STANDARD}
      */
     private Icon iconStandard;
 
     /** the icon used to decorate items of priority
-     *  {@link AutoCompletionItemPritority#IS_IN_SELECTION}
+     *  {@link AutoCompletionItemPriority#IS_IN_SELECTION}
      */
     private Icon iconSelection;
@@ -69 +69 @@
      */
     protected void prepareRendererIcon(AutoCompletionListItem item) {
-        if (item.getPriority().equals(AutoCompletionItemPritority.IS_IN_STANDARD)) {
+        if (item.getPriority().equals(AutoCompletionItemPriority.IS_IN_STANDARD)) {
             if (iconStandard != null) {
                 setIcon(iconStandard);
             }
-        } else if (item.getPriority().equals(AutoCompletionItemPritority.IS_IN_SELECTION)) {
+        } else if (item.getPriority().equals(AutoCompletionItemPriority.IS_IN_SELECTION)) {
             if (iconSelection != null) {
                 setIcon(iconSelection);

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagSpecificationAwareTagCellEditor.java

@@ -7 +7 @@
 import org.openstreetmap.josm.gui.tagging.TagModel;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionListItem;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPritority;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPriority;
 import org.openstreetmap.josm.plugins.tageditor.ac.AutoCompletionContext;
 import org.openstreetmap.josm.plugins.tageditor.tagspec.TagSpecifications;
@@ -94 +94 @@
                 //logger.info("adding ac item " + value + " with priority IN_SELECTION");;
                 autoCompletionList.add(
-                        new AutoCompletionListItem(value, AutoCompletionItemPritority.IS_IN_SELECTION)
+                        new AutoCompletionListItem(value, AutoCompletionItemPriority.IS_IN_SELECTION)
                 );
             }

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/TagSpecifications.java

@@ -11 +11 @@
 import java.util.logging.Logger;
 
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPritority;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPriority;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionListItem;
 import org.openstreetmap.josm.plugins.tageditor.ac.AutoCompletionContext;
@@ -131 +131 @@
             AutoCompletionListItem item = new AutoCompletionListItem();
             item.setValue(spec.getKey());
-            item.setPriority(AutoCompletionItemPritority.IS_IN_STANDARD);
+            item.setPriority(AutoCompletionItemPriority.IS_IN_STANDARD);
             keys.add(item);
         }
@@ -148 +148 @@
                     AutoCompletionListItem item = new AutoCompletionListItem();
                     item.setValue(l.getValue());
-                    item.setPriority(AutoCompletionItemPritority.IS_IN_STANDARD);
+                    item.setPriority(AutoCompletionItemPriority.IS_IN_STANDARD);
                     items.add(item);
                 }

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

@@ -4 +4 @@
     <property name="commit.message" value="Adapt to JOSM core change (DefaultNameFormatter)"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6340"/>
+    <property name="plugin.main.version" value="6437"/>
 
     <property name="test.build.dir" value="test/build"/>

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/MemberRoleCellEditor.java

@@ -9 +9 @@
 
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPritority;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPriority;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionListItem;
@@ -32 +32 @@
         autoCompletionList = new AutoCompletionList();
         editor.setAutoCompletionList(autoCompletionList);
-        autoCompletionList.add(new AutoCompletionListItem("from", AutoCompletionItemPritority.IS_IN_STANDARD));
-        autoCompletionList.add(new AutoCompletionListItem("to", AutoCompletionItemPritority.IS_IN_STANDARD));
-        autoCompletionList.add(new AutoCompletionListItem("via", AutoCompletionItemPritority.IS_IN_STANDARD));
-        autoCompletionList.add(new AutoCompletionListItem("location_hint", AutoCompletionItemPritority.IS_IN_STANDARD));
+        autoCompletionList.add(new AutoCompletionListItem("from", AutoCompletionItemPriority.IS_IN_STANDARD));
+        autoCompletionList.add(new AutoCompletionListItem("to", AutoCompletionItemPriority.IS_IN_STANDARD));
+        autoCompletionList.add(new AutoCompletionListItem("via", AutoCompletionItemPriority.IS_IN_STANDARD));
+        autoCompletionList.add(new AutoCompletionListItem("location_hint", AutoCompletionItemPriority.IS_IN_STANDARD));
     }