Changeset 4026 in josm


Ignore:
Timestamp:
2011-04-15T21:25:08+02:00 (10 years ago)
Author:
stoecker
Message:

fix #6213 - license info wrong

Location:
trunk/src/org/openstreetmap/josm
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/osm/User.java

    r4025 r4026  
    110110    }
    111111
    112     public static void loadRelicensingInformation() {
     112    public static void initRelicensingInformation() {
     113        if(relicensingUsers == null) {
     114            loadRelicensingInformation(false);
     115        }
     116    }
     117
     118    public static void loadRelicensingInformation(boolean clean) {
    113119        relicensingUsers = new HashSet<Long>();
    114120        try {
    115121            MirroredInputStream stream = new MirroredInputStream(Main.pref.get("url.licensechange",
    116             "http://planet.openstreetmap.org/users_agreed/users_agreed.txt"), 7200);
     122            "http://planet.openstreetmap.org/users_agreed/users_agreed.txt"), clean ? 1 : 7200);
    117123            try {
    118124                InputStreamReader r;
  • trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java

    r3995 r4026  
    169169    public void showDialog() {
    170170        super.showDialog();
     171        User.initRelicensingInformation();
    171172        Layer layer = Main.main.getActiveLayer();
    172173        if (layer instanceof OsmDataLayer) {
     
    278279        @Override
    279280        public void actionPerformed(ActionEvent e) {
    280             User.loadRelicensingInformation();
     281            User.loadRelicensingInformation(true);
    281282            Layer layer = Main.main.getActiveLayer();
    282283            if (layer instanceof OsmDataLayer) {
Note: See TracChangeset for help on using the changeset viewer.