Ignore:
Timestamp:
2018-08-11T16:10:32+02:00 (16 months ago)
Author:
Don-vip
Message:

see #15229 - deprecate all Main methods returning an URL

Location:
trunk/src/org/openstreetmap/josm/tools
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java

    r12869 r14119  
    1010import java.util.function.Supplier;
    1111
    12 import org.openstreetmap.josm.Main;
    1312import org.openstreetmap.josm.data.Bounds;
    1413import org.openstreetmap.josm.data.coor.EastNorth;
     
    1716import org.openstreetmap.josm.data.projection.Projection;
    1817import org.openstreetmap.josm.data.projection.Projections;
     18import org.openstreetmap.josm.spi.preferences.Config;
    1919
    2020/**
     
    290290        double lon = Math.round(dlon * decimals);
    291291        lon /= decimals;
    292         return Main.getOSMWebsite() + "/#map="+zoom+'/'+lat+'/'+lon;
     292        return Config.getUrls().getOSMWebsite() + "/#map="+zoom+'/'+lat+'/'+lon;
    293293    }
    294294}
  • trunk/src/org/openstreetmap/josm/tools/WikiReader.java

    r12846 r14119  
    66import java.net.URL;
    77
    8 import org.openstreetmap.josm.Main;
    98import org.openstreetmap.josm.spi.preferences.Config;
    109import org.openstreetmap.josm.tools.LanguageInfo.LocaleType;
     
    3130     */
    3231    public WikiReader() {
    33         this(Config.getPref().get("help.baseurl", Main.getJOSMWebsite()));
     32        this(Config.getPref().get("help.baseurl", Config.getUrls().getJOSMWebsite()));
    3433    }
    3534
  • trunk/src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java

    r13901 r14119  
    1616import javax.xml.xpath.XPathFactory;
    1717
    18 import org.openstreetmap.josm.Main;
     18import org.openstreetmap.josm.spi.preferences.Config;
    1919import org.openstreetmap.josm.tools.HttpClient;
    2020import org.openstreetmap.josm.tools.HttpClient.Response;
     
    136136
    137137    private static String getJOSMTicketURL() {
    138         return Main.getJOSMWebsite() + "/josmticket";
     138        return Config.getUrls().getJOSMWebsite() + "/josmticket";
    139139    }
    140140
Note: See TracChangeset for help on using the changeset viewer.