Changeset 1811 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java

Timestamp:

2009-07-19T17:38:55+02:00 (15 years ago)

Author:

jttt

Message:

PleaseWait refactoring. Progress is now reported using ProgressMonitor interface, that is available through PleaseWaitRunnable.

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (modified) (10 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java

@@ -28 +28 @@
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
-import javax.swing.SwingUtilities;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
@@ -87 +86 @@
      * unregisters a {@see HistoryBrowserDialog}
      * @param id the id of the primitive whose history dialog is to be unregistered
-     * 
+     *
      */
     public static void unregisterHistoryBrowserDialog(long id) {
@@ -98 +97 @@
      * replies the history dialog for the primitive with id <code>id</code>; null, if
      * no such {@see HistoryBrowserDialog} is currently showing
-     * 
+     *
      * @param id the id of the primitive
      * @return the dialog; null, if no such dialog is showing
@@ -119 +118 @@
     /**
      * builds the row with the command buttons
-     * 
+     *
      * @return the rows with the command buttons
      */
@@ -209 +208 @@
     /**
      * shows the {@see HistoryBrowserDialog} for a given {@see History}
-     * 
+     *
      * @param h the history. Must not be null.
      * @exception IllegalArgumentException thrown, if h is null
@@ -225 +224 @@
     /**
      * invoked after the asynchronous {@see HistoryLoadTask} is finished.
-     * 
+     *
      * @param task the task which is calling back.
      */
@@ -261 +260 @@
     /**
      * The table model with the history items
-     * 
+     *
      */
     class HistoryItemDataModel extends DefaultTableModel implements SelectionChangedListener{
@@ -397 +396 @@
         }
 
-        /**
-         * update the title of the {@see PleaseWaitDialog} with information about
-         * which primitive is currently loaded
-         * 
-         * @param primitive the primitive to be loaded
-         */
-        protected void notifyStartLoadingHistory(final OsmPrimitive primitive) {
-            SwingUtilities.invokeLater(
-                    new Runnable() {
-                        public void run() {
-                            Main.pleaseWaitDlg.setTitle(
-                                    tr("Loading history for {0} with id {1}",
-                                            OsmPrimitiveType.from(primitive).getLocalizedDisplayNameSingular(),
-                                            Long.toString(primitive.id)
-                                    )
-                            );
-                        }
-                    }
-            );
-        }
-
-        /**
-         * enables/disables interminate progress indication in the {@see PleaseWaitDialog}
-         * 
-         * @param enabled true, if interminate progress indication is to enabled; false, otherwise
-         */
-        protected void setInterminateEnabled(final boolean enabled) {
-            SwingUtilities.invokeLater(
-                    new Runnable() {
-                        public void run() {
-                            Main.pleaseWaitDlg.setIndeterminate(enabled);
-                        }
-                    }
-            );
-        }
-
         @Override
         protected void realRun() throws SAXException, IOException, OsmTransferException {
             Collection<OsmPrimitive> selection = Main.ds.getSelected();
             Iterator<OsmPrimitive> it = selection.iterator();
-            setInterminateEnabled(true);
             try {
                 while(it.hasNext()) {
@@ -447 +409 @@
                         continue;
                     }
-                    notifyStartLoadingHistory(primitive);
+                    progressMonitor.indeterminateSubTask(tr("Loading history for {0} with id {1}",
+                            OsmPrimitiveType.from(primitive).getLocalizedDisplayNameSingular(),
+                            Long.toString(primitive.id)));
                     OsmServerHistoryReader reader = null;
                     HistoryDataSet ds = null;
                     try {
                         reader = new OsmServerHistoryReader(OsmPrimitiveType.from(primitive), primitive.id);
-                        ds = reader.parseHistory();
+                        ds = reader.parseHistory(progressMonitor.createSubTaskMonitor(1, false));
                     } catch(OsmTransferException e) {
                         if (cancelled)
@@ -463 +427 @@
                 lastException = e;
                 return;
-            } finally {
-                setInterminateEnabled(false);
             }
         }