Changeset 9616 in josm for trunk/src

Timestamp:

2016-01-24T16:25:58+01:00 (8 years ago)

Author:

Don-vip

Message:

fix unit test (forgot data file + headless mode)

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/preferences/plugin/PluginPreference.java (modified) (2 diffs)
• plugins/PluginHandler.java (modified) (2 diffs)

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

@@ -7 +7 @@
 import java.awt.BorderLayout;
 import java.awt.Component;
+import java.awt.GraphicsEnvironment;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -143 +144 @@
         }
         sb.append("</html>");
-        GuiHelper.runInEDTAndWait(new Runnable() {
-            @Override
-            public void run() {
-                HelpAwareOptionPane.showOptionDialog(
-                        parent,
-                        sb.toString(),
-                        tr("Update plugins"),
-                        !failed.isEmpty() ? JOptionPane.WARNING_MESSAGE : JOptionPane.INFORMATION_MESSAGE,
-                                HelpUtil.ht("/Preferences/Plugins")
-                        );
-            }
-        });
+        if (!GraphicsEnvironment.isHeadless()) {
+            GuiHelper.runInEDTAndWait(new Runnable() {
+                @Override
+                public void run() {
+                    HelpAwareOptionPane.showOptionDialog(
+                            parent,
+                            sb.toString(),
+                            tr("Update plugins"),
+                            !failed.isEmpty() ? JOptionPane.WARNING_MESSAGE : JOptionPane.INFORMATION_MESSAGE,
+                                    HelpUtil.ht("/Preferences/Plugins")
+                            );
+                }
+            });
+        }
     }
 

trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -1205 +1205 @@
     /**
      * Determines if the specified file is a valid and accessible JAR file.
-     * @param jar The fil to check
+     * @param jar The file to check
      * @return true if file can be opened as a JAR file.
      * @since 5723
@@ -1214 +1214 @@
                 new JarFile(jar).close();
             } catch (Exception e) {
+                Main.warn(e);
                 return false;
             }
             return true;
+        } else if (jar != null) {
+            Main.warn("Invalid jar file ''"+jar+"'' (exists: "+jar.exists()+", canRead: "+jar.canRead()+")");
         }
         return false;