Changeset 14410 in josm for trunk/src/org

Timestamp:

2018-11-03T22:09:03+01:00 (5 years ago)

Author:

Don-vip

Message:

fix #16943 - ChangesetCacheManagerTest: fix for non-headless mode (patch by ris)

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset

Files:

• ChangesetCacheManager.java (modified) (1 diff)
• query/ChangesetQueryDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java

@@ -393 +393 @@
         public void actionPerformed(ActionEvent evt) {
             Window parent = GuiHelper.getWindowAncestorFor(evt);
-            if (!GraphicsEnvironment.isHeadless()) {
-                ChangesetQueryDialog dialog = new ChangesetQueryDialog(parent);
-                dialog.initForUserInput();
-                dialog.setVisible(true);
-                if (dialog.isCanceled())
-                    return;
-
-                try {
-                    ChangesetQuery query = dialog.getChangesetQuery();
-                    if (query != null) {
-                        ChangesetCacheManager.getInstance().runDownloadTask(new ChangesetQueryTask(parent, query));
-                    }
-                } catch (IllegalStateException e) {
-                    Logging.error(e);
-                    JOptionPane.showMessageDialog(parent, e.getMessage(), tr("Error"), JOptionPane.ERROR_MESSAGE);
+            ChangesetQueryDialog dialog = new ChangesetQueryDialog(parent);
+            dialog.initForUserInput();
+            dialog.setVisible(true);
+            if (dialog.isCanceled())
+                return;
+
+            try {
+                ChangesetQuery query = dialog.getChangesetQuery();
+                if (query != null) {
+                    ChangesetCacheManager.getInstance().runDownloadTask(new ChangesetQueryTask(parent, query));
                 }
+            } catch (IllegalStateException e) {
+                Logging.error(e);
+                JOptionPane.showMessageDialog(parent, e.getMessage(), tr("Error"), JOptionPane.ERROR_MESSAGE);
             }
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java

@@ -73 +73 @@
         JPanel pnl = new JPanel(new FlowLayout(FlowLayout.CENTER));
 
-        pnl.add(new JButton(new QueryAction()));
-        pnl.add(new JButton(new CancelAction()));
+        final JButton queryButton = new JButton(new QueryAction());
+        queryButton.setName("queryButton");
+        pnl.add(queryButton);
+        final JButton cancelButton = new JButton(new CancelAction());
+        cancelButton.setName("cancelButton");
+        pnl.add(cancelButton);
         pnl.add(new JButton(new ContextSensitiveHelpAction(HelpUtil.ht("/Dialog/ChangesetQuery"))));