Ignore:
Timestamp:
2021-10-03T14:14:25+02:00 (3 years ago)
Author:
Don-vip
Message:

update to JOSM 18173

Location:
applications/editors/josm/plugins/reltoolbox/src/relcontext
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/reltoolbox/src/relcontext/ExtraNameFormatHook.java

    r33530 r35829  
    1515
    1616    @Override
    17     public String checkRelationTypeName(IRelation relation, String defaultName) {
     17    public String checkRelationTypeName(IRelation<?> relation, String defaultName) {
    1818        return null;
    1919    }
     
    2525
    2626    @Override
    27     public String checkFormat(IWay way, String defaultName) {
     27    public String checkFormat(IWay<?> way, String defaultName) {
    2828        if (way.get("place") != null && way.get("name") == null && way.get("place_name") != null)
    2929            return way.get("place_name") + " " + defaultName;
     
    3232
    3333    @Override
    34     public String checkFormat(IRelation relation, String defaultName) {
     34    public String checkFormat(IRelation<?> relation, String defaultName) {
    3535        String type = relation.get("type");
    3636        if (type != null) {
  • applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java

    r34788 r35829  
    7878import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
    7979import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
    80 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;
     80import org.openstreetmap.josm.gui.tagging.ac.AutoCompComboBox;
    8181import org.openstreetmap.josm.spi.preferences.Config;
    8282import org.openstreetmap.josm.tools.GBC;
     
    481481            }
    482482        }
    483         final AutoCompletingComboBox role = new AutoCompletingComboBox();
    484         role.setPossibleItems(items);
     483        final AutoCompComboBox<String> role = new AutoCompComboBox<>();
     484        role.getModel().addAllElements(items);
    485485        role.setEditable(true);
    486486
  • applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java

    r34551 r35829  
    2727import org.openstreetmap.josm.data.osm.RelationMember;
    2828import org.openstreetmap.josm.gui.MainApplication;
    29 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;
     29import org.openstreetmap.josm.gui.tagging.ac.AutoCompComboBox;
    3030import org.openstreetmap.josm.spi.preferences.Config;
    3131import org.openstreetmap.josm.tools.GBC;
     
    103103        panel.add(new JLabel(tr("Choose a type for the relation:")), GBC.eol().insets(0, 0, 0, 5));
    104104
    105         final AutoCompletingComboBox keys = new AutoCompletingComboBox();
    106         keys.setPossibleItems(RELATION_TYPES);
     105        final AutoCompComboBox<String> keys = new AutoCompComboBox<>();
     106        keys.getModel().addAllElements(RELATION_TYPES);
    107107        keys.setEditable(true);
    108108        keys.getEditor().setItem(Config.getPref().get(PREF_LASTTYPE, "multipolygon"));
  • applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java

    r35602 r35829  
    3434import org.openstreetmap.josm.data.osm.Way;
    3535import org.openstreetmap.josm.gui.MainApplication;
    36 import org.openstreetmap.josm.tools.ImageProvider;
    3736import org.openstreetmap.josm.tools.Shortcut;
    3837
     
    5251    public ReconstructPolygonAction(ChosenRelation rel) {
    5352        super(tr("Reconstruct polygon"), "dialogs/filter", tr("Reconstruct polygon from multipolygon relation"),
    54                 Shortcut.registerShortcut("reltoolbox:reconstructpoly", tr("Relation Toolbox: {0}", tr("Reconstruct polygon from multipolygon relation")),
     53                Shortcut.registerShortcut("reltoolbox:reconstructpoly", tr("Relation Toolbox: {0}",
     54                        tr("Reconstruct polygon from multipolygon relation")),
    5555                        KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), false);
    5656        this.rel = rel;
  • applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SplittingMultipolygons.java

    r34972 r35829  
    150150     * Splits a way with regard to containing relations. This modifies the way and the relation, be prepared.
    151151     * @param w The way.
    152      * @param n The node to split at.
     152     * @param n1 The first node to split at.
     153     * @param n2 The second node to split at.
    153154     * @param commands List of commands to add way/relation changing to. If null, never mind.
    154155     * @return Newly created ways. <b>Warning:</b> if commands is no not, newWays contains {@code w}.
Note: See TracChangeset for help on using the changeset viewer.