Changeset 3016 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2010-02-18T20:52:48+01:00 (14 years ago)

Author:

bastiK

Message:

pop up the conflict dialog when a conflict has been detected

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/downloadtasks/DownloadReferrersTask.java (modified) (1 diff)
• gui/dialogs/ToggleDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java

@@ -183 +183 @@
                 JOptionPane.WARNING_MESSAGE
         );
+        Main.map.conflictDialog.unfurlDialog();
+        Main.map.repaint();
     }
 

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

@@ -187 +187 @@
 
     /**
+     * Changes the state of the dialog such that the user can see the content
+     * and takes care of the panel reconstruction.
+     */
+    public void unfurlDialog()
+    {
+        if (isDialogInDefaultView())
+            return;
+        if (isDialogInCollapsedView()) {
+            expand();
+            dialogsPanel.reconstruct(Action.COLLAPSED_TO_DEFAULT, this);
+        } else if (!isDialogShowing()) {
+            showDialog();
+            if (isDocked && isCollapsed) {
+                expand();
+            }
+            if (isDocked) {
+                dialogsPanel.reconstruct(Action.INVISIBLE_TO_DEFAULT, this);
+            }
+        }
+    }
+
+    /**
      * Hides the dialog
      */
@@ -343 +365 @@
                         @Override
                         public void mouseClicked(MouseEvent e) {
-                            // toggleExpandedState();
+                            // toggleExpandedState
                             if (isCollapsed) {
                                 expand();