Ignore:
Timestamp:
2017-08-27T18:12:20+02:00 (2 years ago)
Author:
Don-vip
Message:

see #15182 - move the Swing-based ProgressMonitor implementations from gui.progress to gui.progress.swing. Progress monitor concept is used in very large parts of JOSM, a console-based implementation could be added later

Location:
trunk/src/org/openstreetmap/josm/gui/progress
Files:
2 added
2 edited
3 moved

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java

    r12369 r12675  
    2727    private final CancelHandler cancelHandler;
    2828
    29     protected enum State {
     29    /**
     30     * Progress monitor state
     31     * @since 12675 (visibility)
     32     */
     33    public enum State {
     34        /** Initialization. Next valid states are {@link #IN_TASK} or {@link #FINISHED} */
    3035        INIT,
     36        /** In task. Next valid states are {@link #IN_SUBTASK} or {@link #FINISHED} */
    3137        IN_TASK,
     38        /** In subtask. Next valid states is {@link #IN_TASK} */
    3239        IN_SUBTASK,
     40        /** Finished. Can't change state after that */
    3341        FINISHED
    3442    }
  • trunk/src/org/openstreetmap/josm/gui/progress/ProgressRenderer.java

    r12369 r12675  
    11// License: GPL. For details, see LICENSE file.
    22package org.openstreetmap.josm.gui.progress;
     3
     4import org.openstreetmap.josm.gui.progress.swing.SwingRenderingProgressMonitor;
    35
    46/**
  • trunk/src/org/openstreetmap/josm/gui/progress/swing/PleaseWaitProgressMonitor.java

    r12674 r12675  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.progress;
     2package org.openstreetmap.josm.gui.progress.swing;
    33
    44import java.awt.Component;
     
    1616import org.openstreetmap.josm.gui.MapStatus.BackgroundProgressMonitor;
    1717import org.openstreetmap.josm.gui.PleaseWaitDialog;
     18import org.openstreetmap.josm.gui.progress.AbstractProgressMonitor;
     19import org.openstreetmap.josm.gui.progress.CancelHandler;
     20import org.openstreetmap.josm.gui.progress.ProgressException;
     21import org.openstreetmap.josm.gui.progress.ProgressTaskId;
    1822import org.openstreetmap.josm.gui.util.GuiHelper;
    1923import org.openstreetmap.josm.tools.bugreport.BugReport;
     
    2327 * <p>
    2428 * Progress is displayed in a dialog window ({@link PleaseWaitDialog}).
     29 * @since 12675 (moved from {@code gui.progress} package}
    2530 */
    2631public class PleaseWaitProgressMonitor extends AbstractProgressMonitor {
  • trunk/src/org/openstreetmap/josm/gui/progress/swing/ProgressMonitorExecutor.java

    r12674 r12675  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.progress;
     2package org.openstreetmap.josm.gui.progress.swing;
    33
    44import java.util.concurrent.LinkedBlockingQueue;
     
    1313 * Similar to Executors.newSingleThreadExecutor(), but displays the
    1414 * progress monitor whenever a new task is executed.
     15 * @since 12675 (moved from {@code gui.progress} package}
    1516 */
    1617public class ProgressMonitorExecutor extends ThreadPoolExecutor {
  • trunk/src/org/openstreetmap/josm/gui/progress/swing/SwingRenderingProgressMonitor.java

    r12674 r12675  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui.progress;
     2package org.openstreetmap.josm.gui.progress.swing;
    33
    44import java.awt.Component;
    55
    66import org.openstreetmap.josm.Main;
     7import org.openstreetmap.josm.gui.progress.AbstractProgressMonitor;
     8import org.openstreetmap.josm.gui.progress.CancelHandler;
     9import org.openstreetmap.josm.gui.progress.ProgressRenderer;
     10import org.openstreetmap.josm.gui.progress.ProgressTaskId;
    711import org.openstreetmap.josm.gui.util.GuiHelper;
    812import org.openstreetmap.josm.tools.CheckParameterUtil;
     
    1216 * of progress information to a {@link ProgressRenderer}.
    1317 * Methods of the progress renderer are always called on the Swing EDT.
    14  *
     18 * @since 12675 (moved from {@code gui.progress} package}
    1519 */
    1620public class SwingRenderingProgressMonitor extends AbstractProgressMonitor {
Note: See TracChangeset for help on using the changeset viewer.