Index: /applications/editors/josm/plugins/reltoolbox/build.xml
===================================================================
--- /applications/editors/josm/plugins/reltoolbox/build.xml	(revision 35828)
+++ /applications/editors/josm/plugins/reltoolbox/build.xml	(revision 35829)
@@ -4,5 +4,5 @@
     <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="14208"/>
+    <property name="plugin.main.version" value="18173"/>
 
     <property name="plugin.author" value="Ilya Zverev"/>
@@ -29,5 +29,3 @@
         </copy>
     </target>
-
-    
 </project>
Index: /applications/editors/josm/plugins/reltoolbox/src/relcontext/ExtraNameFormatHook.java
===================================================================
--- /applications/editors/josm/plugins/reltoolbox/src/relcontext/ExtraNameFormatHook.java	(revision 35828)
+++ /applications/editors/josm/plugins/reltoolbox/src/relcontext/ExtraNameFormatHook.java	(revision 35829)
@@ -15,5 +15,5 @@
 
     @Override
-    public String checkRelationTypeName(IRelation relation, String defaultName) {
+    public String checkRelationTypeName(IRelation<?> relation, String defaultName) {
         return null;
     }
@@ -25,5 +25,5 @@
 
     @Override
-    public String checkFormat(IWay way, String defaultName) {
+    public String checkFormat(IWay<?> way, String defaultName) {
         if (way.get("place") != null && way.get("name") == null && way.get("place_name") != null)
             return way.get("place_name") + " " + defaultName;
@@ -32,5 +32,5 @@
 
     @Override
-    public String checkFormat(IRelation relation, String defaultName) {
+    public String checkFormat(IRelation<?> relation, String defaultName) {
         String type = relation.get("type");
         if (type != null) {
Index: /applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java
===================================================================
--- /applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java	(revision 35828)
+++ /applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java	(revision 35829)
@@ -78,5 +78,5 @@
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
-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;
@@ -481,6 +481,6 @@
             }
         }
-        final AutoCompletingComboBox role = new AutoCompletingComboBox();
-        role.setPossibleItems(items);
+        final AutoCompComboBox<String> role = new AutoCompComboBox<>();
+        role.getModel().addAllElements(items);
         role.setEditable(true);
 
Index: /applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java
===================================================================
--- /applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java	(revision 35828)
+++ /applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java	(revision 35829)
@@ -27,5 +27,5 @@
 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,6 +103,6 @@
         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"));
Index: /applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java
===================================================================
--- /applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java	(revision 35828)
+++ /applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java	(revision 35829)
@@ -34,5 +34,4 @@
 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,5 +51,6 @@
     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;
Index: /applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SplittingMultipolygons.java
===================================================================
--- /applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SplittingMultipolygons.java	(revision 35828)
+++ /applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SplittingMultipolygons.java	(revision 35829)
@@ -150,5 +150,6 @@
      * 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}.