Changeset 34130 in osm

Timestamp:

2018-03-26T21:18:53+02:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 13564

Location:

applications/editors/josm/plugins/reltoolbox

Files:

• build.xml (modified) (1 diff)
• src/relcontext/ChosenRelation.java (modified) (1 diff)
• src/relcontext/RelContextDialog.java (modified) (3 diffs)
• src/relcontext/actions/FindRelationAction.java (modified) (2 diffs)

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

@@ -4 +4 @@
     <property name="commit.message" value="RelToolbox: make natural sort for relation and find relation lists"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="13522"/>
+    <property name="plugin.main.version" value="13564"/>
 
     <property name="plugin.author" value="Ilya Zverev"/>

applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelation.java

@@ -82 +82 @@
     /**
      * Check if the relation type assumes all ways inside it form a multipolygon.
+     * @return true if the relation type assumes all ways inside it form a multipolygon
      */
     public boolean isMultipolygon() {

applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java

@@ -65 +65 @@
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
+import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -72 +73 @@
 import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
 import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
+import org.openstreetmap.josm.gui.PrimitiveRenderer;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
@@ -284 +285 @@
 
         TableColumnModel columns = relationsTable.getColumnModel();
-        columns.getColumn(0).setCellRenderer(new OsmPrimitivRenderer() {
-            @Override
-            protected String getComponentToolTipText(OsmPrimitive value) {
+        columns.getColumn(0).setCellRenderer(new PrimitiveRenderer() {
+            @Override
+            protected String getComponentToolTipText(IPrimitive value) {
                 return null;
             }

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/FindRelationAction.java

@@ -33 +33 @@
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
 import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
+import org.openstreetmap.josm.gui.PrimitiveRenderer;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -63 +63 @@
         relationsList.setSelectionModel(relationsData.getSelectionModel());
         relationsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        relationsList.setCellRenderer(new OsmPrimitivRenderer());
+        relationsList.setCellRenderer(new PrimitiveRenderer());
         panel.add(new JScrollPane(relationsList,
                 JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER), BorderLayout.CENTER);