Changeset 12665 in josm


Ignore:
Timestamp:
2017-08-26T14:26:50+02:00 (7 years ago)
Author:
Don-vip
Message:

see #15182 - fix #15186 - fix #15192 - fix initialization of Main.worker (regression)

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

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/Main.java

    r12647 r12665  
    109109     */
    110110    @Deprecated
    111     public static final ExecutorService worker = MainApplication.worker;
     111    public static ExecutorService worker;
    112112
    113113    /**

  • trunk/src/org/openstreetmap/josm/gui/MainApplication.java

    r12659 r12665  
    130130 * @author imi
    131131 */
     132@SuppressWarnings("deprecation")
    132133public class MainApplication extends Main {
    133134
    … …  
    170171     */
    171172    public static final ExecutorService worker = new ProgressMonitorExecutor("main-worker-%d", Thread.NORM_PRIORITY);
     173    static {
     174        Main.worker = worker;
     175    }
    172176
    173177    /**
Note: See TracChangeset for help on using the changeset viewer.