Changeset 5468 in josm

Timestamp:

2012-08-21T21:40:47+02:00 (12 years ago)

Author:

jttt

Message:

EDT violation

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (modified) (12 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java

@@ -59 +59 @@
         }
     }
-    
+
     private PluginPreference() {
         super("plugin", tr("Plugins"), tr("Configure available plugins."));
@@ -74 +74 @@
                     downloaded.size(),
                     downloaded.size()
-            ));
+                    ));
             sb.append("<ul>");
             for(PluginInformation pi: downloaded) {
@@ -87 +87 @@
                     failed.size(),
                     failed.size()
-            ));
+                    ));
             sb.append("<ul>");
             for(PluginInformation pi: failed) {
@@ -156 +156 @@
                     }
                 }
-        );
+                );
 
         pnl.add(spPluginPreferences, BorderLayout.CENTER);
@@ -194 +194 @@
                         tr("Accept the new plugin sites and close the dialog"),
                         null /* no special help topic */
-                ),
-                new ButtonSpec(
-                        tr("Cancel"),
-                        ImageProvider.get("cancel"),
-                        tr("Close the dialog"),
-                        null /* no special help topic */
-                )
+                        ),
+                        new ButtonSpec(
+                                tr("Cancel"),
+                                ImageProvider.get("cancel"),
+                                tr("Close the dialog"),
+                                null /* no special help topic */
+                                )
         };
         PluginConfigurationSitesPanel pnl = new PluginConfigurationSitesPanel();
@@ -213 +213 @@
                 options[0],
                 null /* no help topic */
-        );
+                );
         if (answer != 0 /* OK */)
             return;
@@ -323 +323 @@
                     !failed.isEmpty() ? JOptionPane.WARNING_MESSAGE : JOptionPane.INFORMATION_MESSAGE,
                             HelpUtil.ht("/Preferences/Plugins")
-            );
+                    );
         }
 
         protected void alertNothingToUpdate() {
-            HelpAwareOptionPane.showOptionDialog(
-                    pnlPluginPreferences,
-                    tr("All installed plugins are up to date. JOSM does not have to download newer versions."),
-                    tr("Plugins up to date"),
-                    JOptionPane.INFORMATION_MESSAGE,
-                    null // FIXME: provide help context
-            );
+            try {
+                SwingUtilities.invokeAndWait(new Runnable() {
+                    public void run() {
+                        HelpAwareOptionPane.showOptionDialog(
+                                pnlPluginPreferences,
+                                tr("All installed plugins are up to date. JOSM does not have to download newer versions."),
+                                tr("Plugins up to date"),
+                                JOptionPane.INFORMATION_MESSAGE,
+                                null // FIXME: provide help context
+                                );
+                    };
+                });
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
 
@@ -343 +351 @@
                     toUpdate,
                     tr("Update plugins")
-            );
+                    );
             // the async task for downloading plugin information
             final ReadRemotePluginInformationTask pluginInfoDownloadTask = new ReadRemotePluginInformationTask(Main.pref.getPluginSites());
@@ -456 +464 @@
                             tr("Enter URL"),
                             JOptionPane.QUESTION_MESSAGE
-                    );
+                            );
                     if (s != null) {
                         model.addElement(s);
@@ -470 +478 @@
                                 tr("Warning"),
                                 JOptionPane.WARNING_MESSAGE
-                        );
+                                );
                         return;
                     }
@@ -481 +489 @@
                             null,
                             list.getSelectedValue()
-                    );
+                            );
                     if (s != null) {
                         model.setElementAt(s, list.getSelectedIndex());
@@ -495 +503 @@
                                 tr("Warning"),
                                 JOptionPane.WARNING_MESSAGE
-                        );
+                                );
                         return;
                     }