Changeset 35829 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/actions

Timestamp:

2021-10-03T14:14:25+02:00 (4 years ago)

Author:

Don-vip

Message:

update to JOSM 18173

Location:

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions

Files:

• CreateRelationAction.java (modified) (2 diffs)
• ReconstructPolygonAction.java (modified) (2 diffs)
• SplittingMultipolygons.java (modified) (1 diff)

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

@@ -27 +27 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompComboBox;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
@@ -103 +103 @@
         panel.add(new JLabel(tr("Choose a type for the relation:")), GBC.eol().insets(0, 0, 0, 5));
 
-        final AutoCompletingComboBox keys = new AutoCompletingComboBox();
-        keys.setPossibleItems(RELATION_TYPES);
+        final AutoCompComboBox<String> keys = new AutoCompComboBox<>();
+        keys.getModel().addAllElements(RELATION_TYPES);
         keys.setEditable(true);
         keys.getEditor().setItem(Config.getPref().get(PREF_LASTTYPE, "multipolygon"));

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

@@ -34 +34 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -52 +51 @@
     public ReconstructPolygonAction(ChosenRelation rel) {
         super(tr("Reconstruct polygon"), "dialogs/filter", tr("Reconstruct polygon from multipolygon relation"),
-                Shortcut.registerShortcut("reltoolbox:reconstructpoly", tr("Relation Toolbox: {0}", tr("Reconstruct polygon from multipolygon relation")),
+                Shortcut.registerShortcut("reltoolbox:reconstructpoly", tr("Relation Toolbox: {0}",
+                        tr("Reconstruct polygon from multipolygon relation")),
                         KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), false);
         this.rel = rel;

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

@@ -150 +150 @@
      * Splits a way with regard to containing relations. This modifies the way and the relation, be prepared.
      * @param w The way.
-     * @param n The node to split at.
+     * @param n1 The first node to split at.
+     * @param n2 The second node to split at.
      * @param commands List of commands to add way/relation changing to. If null, never mind.
      * @return Newly created ways. <b>Warning:</b> if commands is no not, newWays contains {@code w}.